From 26e790fae4ea1762d1828cc5ed3d32429f3616ad Mon Sep 17 00:00:00 2001 From: Chris Seaton Date: Mon, 9 May 2016 17:02:50 +0100 Subject: [PATCH] [Truffle] Organise imports. --- truffle/src/main/java/org/jruby/truffle/Layouts.java | 2 +- truffle/src/main/java/org/jruby/truffle/RubyContext.java | 2 +- .../org/jruby/truffle/builtins/CoreMethodNodeManager.java | 2 +- .../truffle/builtins/PrimitiveArrayArgumentsNode.java | 1 - .../jruby/truffle/builtins/PrimitiveCallConstructor.java | 2 +- .../src/main/java/org/jruby/truffle/core/CoreLibrary.java | 2 +- .../src/main/java/org/jruby/truffle/core/ObjectNodes.java | 2 +- .../jruby/truffle/core/adapaters/OutputStreamAdapter.java | 2 +- .../org/jruby/truffle/core/array/ArrayAppendManyNode.java | 2 +- .../org/jruby/truffle/core/array/ArrayAppendOneNode.java | 2 +- .../org/jruby/truffle/core/array/ArrayBuilderNode.java | 2 +- .../org/jruby/truffle/core/array/ArrayConcatNode.java | 2 +- .../org/jruby/truffle/core/array/ArrayDropTailNode.java | 2 +- .../java/org/jruby/truffle/core/array/ArrayDupNode.java | 2 +- .../jruby/truffle/core/array/ArrayEnsureCapacityNode.java | 2 +- .../org/jruby/truffle/core/array/ArrayGeneralizeNode.java | 2 +- .../org/jruby/truffle/core/array/ArrayGetTailNode.java | 2 +- .../java/org/jruby/truffle/core/array/ArrayHelpers.java | 2 +- .../org/jruby/truffle/core/array/ArrayLiteralNode.java | 2 +- .../java/org/jruby/truffle/core/array/ArrayNodes.java | 2 +- .../org/jruby/truffle/core/array/ArrayPopOneNode.java | 2 +- .../truffle/core/array/ArrayReadDenormalizedNode.java | 2 +- .../jruby/truffle/core/array/ArrayReadNormalizedNode.java | 2 +- .../core/array/ArrayReadSliceDenormalizedNode.java | 2 +- .../truffle/core/array/ArrayReadSliceNormalizedNode.java | 2 +- .../java/org/jruby/truffle/core/array/ArraySliceNode.java | 2 +- .../truffle/core/array/ArrayWriteNormalizedNode.java | 2 +- .../java/org/jruby/truffle/core/binding/BindingNodes.java | 2 +- .../java/org/jruby/truffle/core/cast/ArrayCastNode.java | 2 +- .../main/java/org/jruby/truffle/core/cast/CmpIntNode.java | 2 +- .../org/jruby/truffle/core/cast/NameToJavaStringNode.java | 2 +- .../jruby/truffle/core/cast/NameToSymbolOrStringNode.java | 2 +- .../org/jruby/truffle/core/cast/SingleValueCastNode.java | 2 +- .../java/org/jruby/truffle/core/cast/SplatCastNode.java | 2 +- .../org/jruby/truffle/core/cast/StringToSymbolNode.java | 2 +- .../main/java/org/jruby/truffle/core/cast/ToAryNode.java | 2 +- .../main/java/org/jruby/truffle/core/cast/ToFNode.java | 2 +- .../main/java/org/jruby/truffle/core/cast/ToIntNode.java | 2 +- .../main/java/org/jruby/truffle/core/cast/ToProcNode.java | 2 +- .../main/java/org/jruby/truffle/core/cast/ToStrNode.java | 2 +- .../main/java/org/jruby/truffle/core/dir/DirNodes.java | 2 +- .../truffle/core/encoding/EncodingConverterNodes.java | 2 +- .../org/jruby/truffle/core/encoding/EncodingNodes.java | 2 +- .../org/jruby/truffle/core/exception/CoreExceptions.java | 2 +- .../org/jruby/truffle/core/exception/ExceptionNodes.java | 2 +- .../jruby/truffle/core/exception/ExceptionOperations.java | 2 +- .../java/org/jruby/truffle/core/fiber/FiberManager.java | 2 +- .../java/org/jruby/truffle/core/fiber/FiberNodes.java | 2 +- .../org/jruby/truffle/core/format/convert/ToLongNode.java | 2 +- .../jruby/truffle/core/format/convert/ToStringNode.java | 2 +- .../truffle/core/format/format/FormatIntegerNode.java | 2 +- .../core/format/read/bytes/ReadBase64StringNode.java | 2 +- .../core/format/read/bytes/ReadBinaryStringNode.java | 2 +- .../truffle/core/format/read/bytes/ReadBitStringNode.java | 2 +- .../truffle/core/format/read/bytes/ReadHexStringNode.java | 2 +- .../core/format/read/bytes/ReadMIMEStringNode.java | 2 +- .../truffle/core/format/read/bytes/ReadUUStringNode.java | 2 +- .../truffle/core/format/write/bytes/WriteBERNode.java | 2 +- .../java/org/jruby/truffle/core/hash/BucketsStrategy.java | 2 +- .../java/org/jruby/truffle/core/hash/HashLiteralNode.java | 2 +- .../main/java/org/jruby/truffle/core/hash/HashNodes.java | 2 +- .../java/org/jruby/truffle/core/hash/HashOperations.java | 2 +- .../java/org/jruby/truffle/core/hash/LookupEntryNode.java | 2 +- .../org/jruby/truffle/core/hash/PackedArrayStrategy.java | 2 +- .../main/java/org/jruby/truffle/core/hash/SetNode.java | 2 +- .../java/org/jruby/truffle/core/kernel/AtExitManager.java | 2 +- .../java/org/jruby/truffle/core/kernel/KernelNodes.java | 2 +- .../java/org/jruby/truffle/core/kernel/TraceManager.java | 2 +- .../java/org/jruby/truffle/core/klass/ClassNodes.java | 2 +- .../java/org/jruby/truffle/core/method/MethodNodes.java | 2 +- .../org/jruby/truffle/core/method/UnboundMethodNodes.java | 2 +- .../java/org/jruby/truffle/core/module/ModuleFields.java | 4 +--- .../java/org/jruby/truffle/core/module/ModuleNodes.java | 6 ++---- .../org/jruby/truffle/core/module/ModuleOperations.java | 2 +- .../java/org/jruby/truffle/core/mutex/MutexNodes.java | 2 +- .../org/jruby/truffle/core/mutex/MutexOperations.java | 2 +- .../java/org/jruby/truffle/core/numeric/BignumNodes.java | 8 ++++---- .../org/jruby/truffle/core/numeric/BignumOperations.java | 2 +- .../java/org/jruby/truffle/core/numeric/FixnumNodes.java | 6 +++--- .../java/org/jruby/truffle/core/numeric/FloatNodes.java | 2 +- .../org/jruby/truffle/core/numeric/GeneralDivModNode.java | 2 +- .../java/org/jruby/truffle/core/numeric/IntegerNodes.java | 2 +- .../jruby/truffle/core/numeric/TruffleFixnumNodes.java | 2 +- .../jruby/truffle/core/objectspace/ObjectSpaceNodes.java | 2 +- .../main/java/org/jruby/truffle/core/proc/ProcNodes.java | 2 +- .../org/jruby/truffle/core/proc/ProcSignalHandler.java | 2 +- .../java/org/jruby/truffle/core/queue/QueueNodes.java | 2 +- .../org/jruby/truffle/core/queue/SizedQueueNodes.java | 2 +- .../java/org/jruby/truffle/core/range/RangeNodes.java | 4 ++-- .../jruby/truffle/core/regexp/InterpolatedRegexpNode.java | 2 +- .../org/jruby/truffle/core/regexp/MatchDataNodes.java | 2 +- .../java/org/jruby/truffle/core/regexp/RegexpNodes.java | 2 +- .../main/java/org/jruby/truffle/core/rope/RopeNodes.java | 6 +++++- .../java/org/jruby/truffle/core/rope/RopeOperations.java | 2 +- .../jruby/truffle/core/rubinius/AtomicReferenceNodes.java | 2 +- .../org/jruby/truffle/core/rubinius/ByteArrayNodes.java | 2 +- .../truffle/core/rubinius/IOBufferPrimitiveNodes.java | 2 +- .../org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java | 2 +- .../truffle/core/rubinius/PointerPrimitiveNodes.java | 2 +- .../java/org/jruby/truffle/core/rubinius/PosixNodes.java | 2 +- .../jruby/truffle/core/rubinius/RegexpPrimitiveNodes.java | 2 +- .../truffle/core/rubinius/RubiniusSingleBlockArgNode.java | 2 +- .../jruby/truffle/core/rubinius/RubiniusTypeNodes.java | 2 +- .../jruby/truffle/core/rubinius/StatPrimitiveNodes.java | 2 +- .../org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java | 2 +- .../java/org/jruby/truffle/core/string/FrozenStrings.java | 2 +- .../java/org/jruby/truffle/core/string/StringNodes.java | 2 +- .../org/jruby/truffle/core/string/StringOperations.java | 2 +- .../java/org/jruby/truffle/core/symbol/SymbolNodes.java | 2 +- .../java/org/jruby/truffle/core/symbol/SymbolTable.java | 2 +- .../java/org/jruby/truffle/core/thread/ThreadManager.java | 2 +- .../java/org/jruby/truffle/core/thread/ThreadNodes.java | 6 +++--- .../main/java/org/jruby/truffle/core/time/TimeNodes.java | 2 +- .../truffle/core/tracepoint/TracePointEventNode.java | 2 +- .../jruby/truffle/core/tracepoint/TracePointNodes.java | 2 +- .../main/java/org/jruby/truffle/debug/DebugHelpers.java | 1 - .../java/org/jruby/truffle/debug/TruffleDebugNodes.java | 2 +- .../org/jruby/truffle/extra/AttachmentsInternalNodes.java | 2 +- .../java/org/jruby/truffle/extra/AttachmentsManager.java | 2 +- .../jruby/truffle/interop/ForeignExecuteHelperNode.java | 2 +- .../interop/ForeignReadStringCachingHelperNode.java | 3 ++- .../main/java/org/jruby/truffle/interop/InteropNodes.java | 2 +- .../org/jruby/truffle/interop/RubyMessageResolution.java | 2 +- .../java/org/jruby/truffle/interop/ToJavaStringNode.java | 2 +- .../java/org/jruby/truffle/language/CallStackManager.java | 2 +- .../main/java/org/jruby/truffle/language/DataNode.java | 2 +- .../java/org/jruby/truffle/language/RubyBaseNode.java | 2 +- .../java/org/jruby/truffle/language/RubyConstant.java | 2 +- .../java/org/jruby/truffle/language/RubyObjectType.java | 2 +- .../java/org/jruby/truffle/language/SafepointManager.java | 2 +- .../java/org/jruby/truffle/language/TruffleBootNodes.java | 4 ++-- .../language/arguments/ArgumentDescriptorUtils.java | 2 +- .../language/arguments/ReadKeywordRestArgumentNode.java | 2 +- .../language/arguments/ReadOptionalArgumentNode.java | 2 +- .../truffle/language/arguments/ReadRestArgumentNode.java | 2 +- .../truffle/language/backtrace/BacktraceFormatter.java | 2 +- .../jruby/truffle/language/constants/GetConstantNode.java | 2 +- .../truffle/language/constants/LookupConstantNode.java | 2 +- .../constants/LookupConstantWithLexicalScopeNode.java | 2 +- .../constants/ReadConstantWithLexicalScopeNode.java | 2 +- .../language/constants/ReadLiteralConstantNode.java | 2 +- .../language/dispatch/CachedBoxedDispatchNode.java | 2 +- .../language/dispatch/CachedBoxedSymbolDispatchNode.java | 2 +- .../dispatch/CachedMethodMissingDispatchNode.java | 2 +- .../dispatch/CachedReturnMissingDispatchNode.java | 2 +- .../language/dispatch/CachedSingletonDispatchNode.java | 2 +- .../org/jruby/truffle/language/dispatch/RubyCallNode.java | 2 +- .../truffle/language/dispatch/UnresolvedDispatchNode.java | 2 +- .../truffle/language/exceptions/TopLevelRaiseHandler.java | 2 +- .../truffle/language/globals/ReadMatchReferenceNode.java | 2 +- .../org/jruby/truffle/language/loader/CodeLoader.java | 4 ---- .../org/jruby/truffle/language/loader/FeatureLoader.java | 2 +- .../org/jruby/truffle/language/methods/AddMethodNode.java | 2 +- .../truffle/language/methods/CallBoundMethodNode.java | 2 +- .../language/methods/ExceptionTranslatingNode.java | 2 +- .../jruby/truffle/language/methods/LookupMethodNode.java | 2 +- .../truffle/language/objects/AllocateObjectNode.java | 2 +- .../jruby/truffle/language/objects/DefineClassNode.java | 2 +- .../jruby/truffle/language/objects/DefineModuleNode.java | 2 +- .../org/jruby/truffle/language/objects/FreezeNode.java | 2 +- .../java/org/jruby/truffle/language/objects/IsANode.java | 2 +- .../org/jruby/truffle/language/objects/IsFrozenNode.java | 2 +- .../org/jruby/truffle/language/objects/IsTaintedNode.java | 2 +- .../jruby/truffle/language/objects/LogicalClassNode.java | 2 +- .../org/jruby/truffle/language/objects/MetaClassNode.java | 2 +- .../org/jruby/truffle/language/objects/ObjectGraph.java | 2 +- .../truffle/language/objects/ObjectIDOperations.java | 2 +- .../truffle/language/objects/RunModuleDefinitionNode.java | 2 +- .../truffle/language/objects/SingletonClassNode.java | 2 +- .../org/jruby/truffle/language/objects/TaintNode.java | 2 +- .../truffle/language/parser/jruby/BodyTranslator.java | 4 ++-- .../truffle/language/supercall/LookupSuperMethodNode.java | 2 +- .../language/threadlocal/ThreadLocalObjectNode.java | 2 +- .../org/jruby/truffle/language/yield/CallBlockNode.java | 2 +- .../java/org/jruby/truffle/language/yield/YieldNode.java | 2 +- .../java/org/jruby/truffle/stdlib/CoverageManager.java | 2 -- .../main/java/org/jruby/truffle/stdlib/CoverageNodes.java | 2 +- .../main/java/org/jruby/truffle/stdlib/ObjSpaceNodes.java | 2 +- .../BigDecimalCoreMethodArrayArgumentsNode.java | 2 -- .../stdlib/bigdecimal/BigDecimalCoreMethodNode.java | 2 +- .../jruby/truffle/stdlib/bigdecimal/BigDecimalNodes.java | 2 +- .../truffle/stdlib/bigdecimal/GetIntegerConstantNode.java | 2 -- .../java/org/jruby/truffle/stdlib/digest/DigestNodes.java | 2 +- .../org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java | 2 +- .../org/jruby/truffle/stdlib/psych/PsychParserNodes.java | 2 +- .../jruby/truffle/tools/InstrumentationServerManager.java | 2 +- .../org/jruby/truffle/tools/simpleshell/SimpleShell.java | 2 +- 187 files changed, 197 insertions(+), 208 deletions(-) diff --git a/truffle/src/main/java/org/jruby/truffle/Layouts.java b/truffle/src/main/java/org/jruby/truffle/Layouts.java index 82d770b0246..122e459f22a 100644 --- a/truffle/src/main/java/org/jruby/truffle/Layouts.java +++ b/truffle/src/main/java/org/jruby/truffle/Layouts.java @@ -18,6 +18,7 @@ import org.jruby.truffle.core.basicobject.BasicObjectLayoutImpl; import org.jruby.truffle.core.binding.BindingLayout; import org.jruby.truffle.core.binding.BindingLayoutImpl; +import org.jruby.truffle.core.dir.DirLayout; import org.jruby.truffle.core.dir.DirLayoutImpl; import org.jruby.truffle.core.encoding.EncodingConverterLayout; import org.jruby.truffle.core.encoding.EncodingConverterLayoutImpl; @@ -61,7 +62,6 @@ import org.jruby.truffle.core.rubinius.AtomicReferenceLayoutImpl; import org.jruby.truffle.core.rubinius.ByteArrayLayout; import org.jruby.truffle.core.rubinius.ByteArrayLayoutImpl; -import org.jruby.truffle.core.dir.DirLayout; import org.jruby.truffle.core.rubinius.IOBufferLayout; import org.jruby.truffle.core.rubinius.IOBufferLayoutImpl; import org.jruby.truffle.core.rubinius.IOLayout; diff --git a/truffle/src/main/java/org/jruby/truffle/RubyContext.java b/truffle/src/main/java/org/jruby/truffle/RubyContext.java index f9847e89bea..1465531d390 100644 --- a/truffle/src/main/java/org/jruby/truffle/RubyContext.java +++ b/truffle/src/main/java/org/jruby/truffle/RubyContext.java @@ -17,6 +17,7 @@ import com.oracle.truffle.api.instrumentation.Instrumenter; import com.oracle.truffle.api.object.DynamicObject; import org.jruby.Ruby; +import org.jruby.truffle.builtins.PrimitiveManager; import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.core.exception.CoreExceptions; import org.jruby.truffle.core.kernel.AtExitManager; @@ -24,7 +25,6 @@ import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.core.objectspace.ObjectSpaceManager; import org.jruby.truffle.core.rope.RopeTable; -import org.jruby.truffle.builtins.PrimitiveManager; import org.jruby.truffle.core.string.CoreStrings; import org.jruby.truffle.core.string.FrozenStrings; import org.jruby.truffle.core.symbol.SymbolTable; diff --git a/truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodNodeManager.java b/truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodNodeManager.java index 359fbe32080..554e8d629ce 100644 --- a/truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodNodeManager.java +++ b/truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodNodeManager.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import org.jruby.runtime.Visibility; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.RaiseIfFrozenNode; import org.jruby.truffle.core.ReturnEnumeratorIfNoBlockNode; import org.jruby.truffle.core.array.ArrayUtils; diff --git a/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveArrayArgumentsNode.java b/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveArrayArgumentsNode.java index 6e795f561f0..1cf12dfe143 100644 --- a/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveArrayArgumentsNode.java +++ b/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveArrayArgumentsNode.java @@ -13,7 +13,6 @@ import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.source.SourceSection; import org.jruby.truffle.RubyContext; -import org.jruby.truffle.builtins.PrimitiveNode; import org.jruby.truffle.language.RubyNode; @GenerateNodeFactory diff --git a/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveCallConstructor.java b/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveCallConstructor.java index 241d5a98fcc..15f93dbc9ce 100644 --- a/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveCallConstructor.java +++ b/truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveCallConstructor.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.method.MethodNodesFactory; import org.jruby.truffle.language.NotProvided; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java index 4e772caf38d..7926f62f1b5 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java +++ b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java @@ -103,10 +103,10 @@ import org.jruby.truffle.language.parser.ParserContext; import org.jruby.truffle.platform.RubiniusTypes; import org.jruby.truffle.platform.signal.SignalManager; -import org.jruby.truffle.stdlib.bigdecimal.BigDecimalNodesFactory; import org.jruby.truffle.stdlib.CoverageNodesFactory; import org.jruby.truffle.stdlib.EtcNodesFactory; import org.jruby.truffle.stdlib.ObjSpaceNodesFactory; +import org.jruby.truffle.stdlib.bigdecimal.BigDecimalNodesFactory; import org.jruby.truffle.stdlib.digest.DigestNodesFactory; import org.jruby.truffle.stdlib.psych.PsychEmitterNodesFactory; import org.jruby.truffle.stdlib.psych.PsychParserNodesFactory; diff --git a/truffle/src/main/java/org/jruby/truffle/core/ObjectNodes.java b/truffle/src/main/java/org/jruby/truffle/core/ObjectNodes.java index 17d7f2c072e..683b3b36875 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/ObjectNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/ObjectNodes.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.language.objects.IsTaintedNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/adapaters/OutputStreamAdapter.java b/truffle/src/main/java/org/jruby/truffle/core/adapaters/OutputStreamAdapter.java index e3a9c7f994a..67bc5c9f9c6 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/adapaters/OutputStreamAdapter.java +++ b/truffle/src/main/java/org/jruby/truffle/core/adapaters/OutputStreamAdapter.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.object.DynamicObject; import org.jcodings.Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.string.StringOperations; import org.jruby.util.ByteList; import org.jruby.util.StringSupport; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java index e4ecd367ac1..a0daba81155 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendManyNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import static org.jruby.truffle.core.array.ArrayHelpers.getSize; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendOneNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendOneNode.java index 2859e3debdc..a6fb8b43502 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendOneNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayAppendOneNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChildren({ diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java index 0560c1a9328..6bed8804863 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayBuilderNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; /* * TODO(CS): how does this work when when multithreaded? Could a node get replaced by someone else and diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java index 970dc6c1a43..2f2b3e81907 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDropTailNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDropTailNode.java index c3fae520b39..f650b2be77a 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDropTailNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDropTailNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import static org.jruby.truffle.core.array.ArrayHelpers.createArray; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDupNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDupNode.java index 008fc40aec0..b0aa829c7ad 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDupNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayDupNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.objects.AllocateObjectNode; import org.jruby.truffle.language.objects.AllocateObjectNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayEnsureCapacityNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayEnsureCapacityNode.java index f9bc122c243..506f2bd09b5 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayEnsureCapacityNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayEnsureCapacityNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChildren({ diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGeneralizeNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGeneralizeNode.java index c9259c029d4..9569ec5ed59 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGeneralizeNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGeneralizeNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChildren({ diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGetTailNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGetTailNode.java index 78b37d93933..675eb19a70d 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGetTailNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayGetTailNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import static org.jruby.truffle.core.array.ArrayHelpers.createArray; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayHelpers.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayHelpers.java index 59f9a29fb05..38fd6ca9ac2 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayHelpers.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayHelpers.java @@ -10,8 +10,8 @@ package org.jruby.truffle.core.array; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; public abstract class ArrayHelpers { diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayLiteralNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayLiteralNode.java index ae94b499e30..4b0e96dcd35 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayLiteralNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayLiteralNode.java @@ -16,9 +16,9 @@ import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.CoreLibrary; -import org.jruby.truffle.Layouts; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.objects.AllocateObjectNode; import org.jruby.truffle.language.objects.AllocateObjectNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java index 3f762d72059..db315eea0ba 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java @@ -31,13 +31,13 @@ import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; import org.jruby.truffle.builtins.CoreSourceSection; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.builtins.YieldingCoreMethodNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayPopOneNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayPopOneNode.java index c1af09dc40e..e7dfd63507f 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayPopOneNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayPopOneNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChildren({ diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java index 7692c320fc1..516c552b1ac 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadDenormalizedNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChildren({ diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadNormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadNormalizedNode.java index 7bf353789e9..f0828cba494 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadNormalizedNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadNormalizedNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChildren({ diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java index e492addc360..300be9904f9 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceDenormalizedNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChildren({ diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceNormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceNormalizedNode.java index 03dd7782f3b..28b50c07b1e 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceNormalizedNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceNormalizedNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.objects.AllocateObjectNode; import org.jruby.truffle.language.objects.AllocateObjectNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArraySliceNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArraySliceNode.java index 11b478d335d..c1d18df1f27 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArraySliceNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArraySliceNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import static org.jruby.truffle.core.array.ArrayHelpers.createArray; diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayWriteNormalizedNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayWriteNormalizedNode.java index 487b4d6fb45..295a94b0009 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayWriteNormalizedNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayWriteNormalizedNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import static org.jruby.truffle.core.array.ArrayHelpers.getSize; diff --git a/truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java b/truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java index 53b218a762c..d892dcc9830 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java @@ -20,11 +20,11 @@ import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.array.ArrayHelpers; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/ArrayCastNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/ArrayCastNode.java index d7839e02f84..7c21a04a6f4 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/ArrayCastNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/ArrayCastNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/CmpIntNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/CmpIntNode.java index 86397d462a7..6935e027dc0 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/CmpIntNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/CmpIntNode.java @@ -28,8 +28,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; import org.jruby.truffle.language.dispatch.CallDispatchHeadNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/NameToJavaStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/NameToJavaStringNode.java index 517e92ce4c8..176ea5db977 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/NameToJavaStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/NameToJavaStringNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/NameToSymbolOrStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/NameToSymbolOrStringNode.java index da6f8733c66..9cde25c0357 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/NameToSymbolOrStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/NameToSymbolOrStringNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/SingleValueCastNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/SingleValueCastNode.java index f78a3db9a16..15dc3e4aeab 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/SingleValueCastNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/SingleValueCastNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChild(value = "child", type = RubyNode.class) diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/SplatCastNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/SplatCastNode.java index d8e3ab87224..b8eed415ff4 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/SplatCastNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/SplatCastNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.array.ArrayDupNode; import org.jruby.truffle.core.array.ArrayDupNodeGen; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/StringToSymbolNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/StringToSymbolNode.java index f15711fff12..2b822f2aaf7 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/StringToSymbolNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/StringToSymbolNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; /** diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/ToAryNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/ToAryNode.java index 5cf6f4f05b6..90c623c6106 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/ToAryNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/ToAryNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/ToFNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/ToFNode.java index 8ba50086be1..d8b7b7188ec 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/ToFNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/ToFNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; import org.jruby.truffle.language.dispatch.CallDispatchHeadNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/ToIntNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/ToIntNode.java index 216aa6ef39a..bf36bb63d6f 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/ToIntNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/ToIntNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; -import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.Layouts; +import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.core.numeric.FloatNodes; import org.jruby.truffle.core.numeric.FloatNodesFactory; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/ToProcNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/ToProcNode.java index 2fa6d28d00b..b1c621616cb 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/ToProcNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/ToProcNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/cast/ToStrNode.java b/truffle/src/main/java/org/jruby/truffle/core/cast/ToStrNode.java index 3dcca512b05..0dbce20ab20 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/cast/ToStrNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/cast/ToStrNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/dir/DirNodes.java b/truffle/src/main/java/org/jruby/truffle/core/dir/DirNodes.java index 2bb7d45abe3..52519a4531d 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/dir/DirNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/dir/DirNodes.java @@ -43,8 +43,8 @@ import com.oracle.truffle.api.source.SourceSection; import jnr.constants.platform.Errno; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterNodes.java b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterNodes.java index 9771945f641..ec890835ac5 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingConverterNodes.java @@ -29,11 +29,11 @@ import org.jruby.Ruby; import org.jruby.runtime.Visibility; import org.jruby.runtime.builtin.IRubyObject; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java index ef72945a6a4..0136f59f97e 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingNodes.java @@ -24,11 +24,11 @@ import org.jcodings.specific.UTF8Encoding; import org.jcodings.util.CaseInsensitiveBytesHash; import org.jcodings.util.Hash; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java b/truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java index aaf7e1354ed..bb66d15273d 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java +++ b/truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java @@ -15,8 +15,8 @@ import jnr.constants.platform.Errno; import org.jcodings.specific.UTF8Encoding; import org.jruby.runtime.Visibility; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.encoding.EncodingOperations; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.core.rope.Rope; diff --git a/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionNodes.java b/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionNodes.java index abdafd4bd64..93c6ff75a5c 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionNodes.java @@ -17,11 +17,11 @@ import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionOperations.java b/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionOperations.java index 489dbaf7ba7..51b2c3be2c1 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionOperations.java @@ -12,8 +12,8 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.object.DynamicObject; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.backtrace.Backtrace; import org.jruby.truffle.language.backtrace.BacktraceFormatter; diff --git a/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberManager.java b/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberManager.java index 07598ef3a37..de0dc0f6fd7 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberManager.java +++ b/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberManager.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import java.util.Collections; diff --git a/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java b/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java index 8b873438de3..1cb09297d5a 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/fiber/FiberNodes.java @@ -18,12 +18,12 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.DynamicObjectFactory; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.cast.SingleValueCastNode; import org.jruby.truffle.core.cast.SingleValueCastNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToLongNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToLongNode.java index 07bd597aee8..e8c0cb4bac3 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToLongNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToLongNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.exceptions.CantConvertException; import org.jruby.truffle.core.format.exceptions.NoImplicitConversionException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java index 102dd38f227..7e413a98cad 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/convert/ToStringNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.exceptions.NoImplicitConversionException; import org.jruby.truffle.core.kernel.KernelNodes; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatIntegerNode.java index 056a49a8924..b9e432af337 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatIntegerNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/format/FormatIntegerNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.dsl.NodeChildren; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.printf.PrintfTreeBuilder; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java index ebba43c9b8e..eea511a0808 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBase64StringNode.java @@ -51,8 +51,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import org.jcodings.specific.ASCIIEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.exceptions.InvalidFormatException; import org.jruby.truffle.core.format.read.SourceNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBinaryStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBinaryStringNode.java index e1990bb87c5..34990bfff67 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBinaryStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBinaryStringNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import org.jcodings.specific.ASCIIEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.read.SourceNode; import org.jruby.truffle.core.rope.AsciiOnlyLeafRope; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBitStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBitStringNode.java index d068b9a712d..c699b4fe9e4 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBitStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadBitStringNode.java @@ -50,8 +50,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import org.jcodings.specific.USASCIIEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.read.SourceNode; import org.jruby.truffle.core.rope.AsciiOnlyLeafRope; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java index 44df4f8c10e..3b922dcb418 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadHexStringNode.java @@ -50,8 +50,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import org.jcodings.specific.USASCIIEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.read.SourceNode; import org.jruby.truffle.core.rope.AsciiOnlyLeafRope; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java index 0dfb46ed28a..fdd1ef2eb59 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadMIMEStringNode.java @@ -50,8 +50,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import org.jcodings.specific.USASCIIEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.read.SourceNode; import org.jruby.truffle.core.rope.AsciiOnlyLeafRope; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java index 73badcb3312..61851da1da3 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/read/bytes/ReadUUStringNode.java @@ -50,8 +50,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import org.jcodings.specific.USASCIIEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.read.SourceNode; import org.jruby.truffle.core.rope.AsciiOnlyLeafRope; diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteBERNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteBERNode.java index e9109036530..1451056f3a3 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteBERNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/format/write/bytes/WriteBERNode.java @@ -52,8 +52,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.format.FormatGuards; import org.jruby.truffle.core.format.FormatNode; import org.jruby.truffle.core.format.exceptions.CantCompressNegativeException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/BucketsStrategy.java b/truffle/src/main/java/org/jruby/truffle/core/hash/BucketsStrategy.java index f03606e80f3..9cc17df65ae 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/hash/BucketsStrategy.java +++ b/truffle/src/main/java/org/jruby/truffle/core/hash/BucketsStrategy.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import java.util.Arrays; diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/HashLiteralNode.java b/truffle/src/main/java/org/jruby/truffle/core/hash/HashLiteralNode.java index 43bbe4a3fe0..8741b1bb00b 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/hash/HashLiteralNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/hash/HashLiteralNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.dispatch.CallDispatchHeadNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java index 70d430bd1cc..0993db1ae1b 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java @@ -24,12 +24,12 @@ import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.YieldingCoreMethodNode; import org.jruby.truffle.core.array.ArrayBuilderNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/HashOperations.java b/truffle/src/main/java/org/jruby/truffle/core/hash/HashOperations.java index 2c510cfee4b..8fb771d139e 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/hash/HashOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/core/hash/HashOperations.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import java.util.Collections; diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java b/truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java index 687542e9aed..e44a02f19e8 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/hash/LookupEntryNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.basicobject.BasicObjectNodes; import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory; import org.jruby.truffle.language.RubyBaseNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/PackedArrayStrategy.java b/truffle/src/main/java/org/jruby/truffle/core/hash/PackedArrayStrategy.java index 9ee21c89f9d..3c01bfdf8be 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/hash/PackedArrayStrategy.java +++ b/truffle/src/main/java/org/jruby/truffle/core/hash/PackedArrayStrategy.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import java.util.Iterator; import java.util.Map; diff --git a/truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java b/truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java index c466d9daafd..923be220223 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/hash/SetNode.java @@ -20,8 +20,8 @@ import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.basicobject.BasicObjectNodes; import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/AtExitManager.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/AtExitManager.java index 34d903473ed..bb48ba7f8d3 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/kernel/AtExitManager.java +++ b/truffle/src/main/java/org/jruby/truffle/core/kernel/AtExitManager.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.proc.ProcOperations; import org.jruby.truffle.language.backtrace.BacktraceFormatter; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java index f56e32c13fd..169ddc92240 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java @@ -40,12 +40,12 @@ import org.jcodings.specific.UTF8Encoding; import org.jruby.common.IRubyWarnings; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.ObjectNodes; import org.jruby.truffle.core.ObjectNodesFactory; diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/TraceManager.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/TraceManager.java index 4818f579e99..af5ba21df33 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/kernel/TraceManager.java +++ b/truffle/src/main/java/org/jruby/truffle/core/kernel/TraceManager.java @@ -24,8 +24,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.arguments.RubyArguments; diff --git a/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java b/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java index db071ea6a80..8e68535e36b 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/klass/ClassNodes.java @@ -20,11 +20,11 @@ import com.oracle.truffle.api.object.ObjectType; import com.oracle.truffle.api.source.SourceSection; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.module.ModuleFields; import org.jruby.truffle.core.module.ModuleNodes; import org.jruby.truffle.core.module.ModuleNodesFactory; diff --git a/truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java b/truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java index b57732b0555..3ef545eb9bc 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java @@ -23,11 +23,11 @@ import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; import org.jruby.runtime.ArgumentDescriptor; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.basicobject.BasicObjectNodes.ReferenceEqualNode; import org.jruby.truffle.core.basicobject.BasicObjectNodesFactory; diff --git a/truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodNodes.java b/truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodNodes.java index 1c8a6082dae..c8b359eee6c 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodNodes.java @@ -17,11 +17,11 @@ import org.jcodings.specific.UTF8Encoding; import org.jruby.runtime.ArgumentDescriptor; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java index 595516e9ec6..9101035052c 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java +++ b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleFields.java @@ -17,18 +17,16 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.utilities.CyclicAssumption; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreSourceSection; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.klass.ClassNodes; import org.jruby.truffle.core.method.MethodFilter; import org.jruby.truffle.language.RubyConstant; import org.jruby.truffle.language.RubyGuards; -import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; import org.jruby.truffle.language.methods.InternalMethod; import org.jruby.truffle.language.objects.IsFrozenNode; -import org.jruby.truffle.language.objects.IsFrozenNodeGen; import org.jruby.truffle.language.objects.ObjectGraphNode; import org.jruby.truffle.language.objects.ObjectIDOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java index 2e962bff67a..164a90b440e 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java @@ -28,23 +28,20 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeUtil; import com.oracle.truffle.api.object.DynamicObject; -import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.profiles.ValueProfile; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.Encoding; import org.jcodings.specific.UTF8Encoding; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.RaiseIfFrozenNode; import org.jruby.truffle.core.array.ArrayHelpers; -import org.jruby.truffle.core.cast.BooleanCastNode; -import org.jruby.truffle.core.cast.BooleanCastNodeGen; import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen; import org.jruby.truffle.core.cast.NameToJavaStringNode; import org.jruby.truffle.core.cast.NameToJavaStringNodeGen; @@ -98,6 +95,7 @@ import org.jruby.truffle.language.yield.YieldNode; import org.jruby.truffle.platform.UnsafeGroup; import org.jruby.util.IdUtil; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java index b2b39c4f281..bb31654d751 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/core/module/ModuleOperations.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import org.jruby.runtime.Visibility; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.LexicalScope; import org.jruby.truffle.language.RubyConstant; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexNodes.java b/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexNodes.java index 8823c0073aa..ada65b6a1c0 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexNodes.java @@ -15,11 +15,11 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.kernel.KernelNodes; import org.jruby.truffle.language.NotProvided; diff --git a/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexOperations.java b/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexOperations.java index c9e0647c920..5bf367beccd 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/core/mutex/MutexOperations.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.thread.ThreadManager; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java index e7d976413dd..b803b7bcafe 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumNodes.java @@ -18,15 +18,15 @@ import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.USASCIIEncoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; -import org.jruby.truffle.builtins.Primitive; -import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; -import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; +import org.jruby.truffle.builtins.Primitive; +import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.builtins.UnaryCoreMethodNode; +import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.core.cast.BooleanCastNode; import org.jruby.truffle.core.cast.BooleanCastNodeGen; import org.jruby.truffle.core.cast.ToIntNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumOperations.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumOperations.java index 464ab16cc0b..9473ba45073 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/core/numeric/BignumOperations.java @@ -1,8 +1,8 @@ package org.jruby.truffle.core.numeric; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import java.math.BigInteger; diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java index 7e4c037a572..ccdb4d2d163 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/numeric/FixnumNodes.java @@ -21,14 +21,14 @@ import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.USASCIIEncoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; +import org.jruby.truffle.builtins.CoreMethod; +import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.CoreLibrary; -import org.jruby.truffle.builtins.CoreMethod; -import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.rope.LazyIntRope; import org.jruby.truffle.language.NotProvided; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java index 0e7b899abac..e86764cbe24 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/numeric/FloatNodes.java @@ -21,11 +21,11 @@ import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.USASCIIEncoding; import org.jcodings.specific.UTF8Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.language.NotProvided; diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/GeneralDivModNode.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/GeneralDivModNode.java index 1b4994dc811..3aba7067de7 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/numeric/GeneralDivModNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/numeric/GeneralDivModNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyBaseNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java index c6698da38ba..3135ab8ee6b 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java @@ -16,10 +16,10 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.LoopConditionProfile; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.YieldingCoreMethodNode; import org.jruby.truffle.language.NotProvided; import org.jruby.truffle.language.dispatch.CallDispatchHeadNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java b/truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java index 4dee1aebc53..de18d036be9 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/numeric/TruffleFixnumNodes.java @@ -11,9 +11,9 @@ import com.oracle.truffle.api.dsl.Specialization; import org.jruby.truffle.builtins.CoreClass; -import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.UnaryCoreMethodNode; +import org.jruby.truffle.core.CoreLibrary; @CoreClass("Truffle::Fixnum") public abstract class TruffleFixnumNodes { diff --git a/truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceNodes.java b/truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceNodes.java index 4df847a339a..699d441758d 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/objectspace/ObjectSpaceNodes.java @@ -17,11 +17,11 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.YieldingCoreMethodNode; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.NotProvided; diff --git a/truffle/src/main/java/org/jruby/truffle/core/proc/ProcNodes.java b/truffle/src/main/java/org/jruby/truffle/core/proc/ProcNodes.java index 61c20d0b07b..d959d6399af 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/proc/ProcNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/proc/ProcNodes.java @@ -21,10 +21,10 @@ import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; import org.jruby.runtime.ArgumentDescriptor; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.builtins.YieldingCoreMethodNode; import org.jruby.truffle.core.binding.BindingNodes; diff --git a/truffle/src/main/java/org/jruby/truffle/core/proc/ProcSignalHandler.java b/truffle/src/main/java/org/jruby/truffle/core/proc/ProcSignalHandler.java index c69114a6fc8..886017cf630 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/proc/ProcSignalHandler.java +++ b/truffle/src/main/java/org/jruby/truffle/core/proc/ProcSignalHandler.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.SafepointAction; import org.jruby.truffle.platform.signal.Signal; diff --git a/truffle/src/main/java/org/jruby/truffle/core/queue/QueueNodes.java b/truffle/src/main/java/org/jruby/truffle/core/queue/QueueNodes.java index 64fccb49c1a..3ba90528e46 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/queue/QueueNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/queue/QueueNodes.java @@ -18,12 +18,12 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen; import org.jruby.truffle.core.thread.ThreadManager.BlockingAction; diff --git a/truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueNodes.java b/truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueNodes.java index 9bd4008c13f..f1052187a0d 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/queue/SizedQueueNodes.java @@ -17,11 +17,11 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen; import org.jruby.truffle.core.thread.ThreadManager.BlockingAction; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/range/RangeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/range/RangeNodes.java index d53881cedd4..1a758ccac55 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/range/RangeNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/range/RangeNodes.java @@ -19,16 +19,16 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; -import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.builtins.YieldingCoreMethodNode; +import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.core.array.ArrayBuilderNode; import org.jruby.truffle.core.cast.BooleanCastNodeGen; import org.jruby.truffle.core.cast.BooleanCastWithDefaultNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/InterpolatedRegexpNode.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/InterpolatedRegexpNode.java index 62987aa4640..996555a97fb 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/regexp/InterpolatedRegexpNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/regexp/InterpolatedRegexpNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.rope.Rope; import org.jruby.truffle.core.rope.RopeOperations; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java index 62ab5c2364e..1de622054e6 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/regexp/MatchDataNodes.java @@ -19,11 +19,11 @@ import org.jcodings.Encoding; import org.joni.Region; import org.joni.exception.ValueException; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.array.ArrayOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java index 93a3f00da9f..46c26203964 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java @@ -41,11 +41,11 @@ import org.joni.Syntax; import org.joni.exception.SyntaxException; import org.joni.exception.ValueException; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.core.cast.ToStrNode; import org.jruby.truffle.core.cast.ToStrNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java index 697b7294d01..d7f6a595f7d 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java @@ -17,7 +17,11 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.ExactMath; -import com.oracle.truffle.api.dsl.*; +import com.oracle.truffle.api.dsl.Cached; +import com.oracle.truffle.api.dsl.ImportStatic; +import com.oracle.truffle.api.dsl.NodeChild; +import com.oracle.truffle.api.dsl.NodeChildren; +import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java index 46a938b1946..549f18968d7 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java @@ -30,8 +30,8 @@ import org.jcodings.specific.UTF8Encoding; import org.jruby.Ruby; import org.jruby.RubyEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.RubyGuards; import org.jruby.util.ByteList; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceNodes.java index cca9e326863..03e49f3edc5 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceNodes.java @@ -12,11 +12,11 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.language.objects.AllocateObjectNode; import org.jruby.truffle.language.objects.AllocateObjectNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java index 3c8613e1f6b..7dc47e14bab 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/ByteArrayNodes.java @@ -16,10 +16,10 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.DynamicObjectFactory; import com.oracle.truffle.api.profiles.ConditionProfile; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.core.rope.Rope; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java index f8c59c215f2..e8a17980399 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java @@ -44,8 +44,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import jnr.constants.platform.Errno; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.exception.ExceptionOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java index 610e4097db1..38c87e60db2 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java @@ -48,8 +48,8 @@ import jnr.constants.platform.Fcntl; import jnr.posix.DefaultNativeTimeval; import jnr.posix.Timeval; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.array.ArrayOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerPrimitiveNodes.java index f2b63a8187f..5c41a20f913 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerPrimitiveNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/PointerPrimitiveNodes.java @@ -18,8 +18,8 @@ import com.oracle.truffle.api.source.SourceSection; import jnr.ffi.Pointer; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.rope.Rope; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/PosixNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/PosixNodes.java index a5cd163be8e..43e50955f74 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/PosixNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/PosixNodes.java @@ -19,11 +19,11 @@ import jnr.ffi.Pointer; import org.jcodings.specific.UTF8Encoding; import org.jruby.platform.Platform; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.rope.CodeRange; import org.jruby.truffle.core.rope.RopeNodes; import org.jruby.truffle.core.rope.RopeNodesFactory; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RegexpPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RegexpPrimitiveNodes.java index 04abd8429ca..41a287d9c11 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RegexpPrimitiveNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RegexpPrimitiveNodes.java @@ -18,8 +18,8 @@ import org.jcodings.Encoding; import org.joni.Matcher; import org.joni.Regex; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.regexp.RegexpGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java index d85495af05f..d44c46dcf9c 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusSingleBlockArgNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.arguments.RubyArguments; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusTypeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusTypeNodes.java index b2366cb043a..b342aab408e 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusTypeNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/RubiniusTypeNodes.java @@ -12,9 +12,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.YieldingCoreMethodNode; @CoreClass("Rubinius::Type") diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/StatPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/StatPrimitiveNodes.java index 2b450e161b7..22c22f45719 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/StatPrimitiveNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/StatPrimitiveNodes.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import jnr.posix.FileStat; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java index 80795169642..be4a323ec2f 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/rubinius/VMPrimitiveNodes.java @@ -48,8 +48,8 @@ import jnr.posix.Passwd; import jnr.posix.Times; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.basicobject.BasicObjectNodes; diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/FrozenStrings.java b/truffle/src/main/java/org/jruby/truffle/core/string/FrozenStrings.java index 6e680066320..698d6949cdf 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/string/FrozenStrings.java +++ b/truffle/src/main/java/org/jruby/truffle/core/string/FrozenStrings.java @@ -10,8 +10,8 @@ package org.jruby.truffle.core.string; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.rope.Rope; import java.util.Map; diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java index 3c8867c03db..b323ac9404a 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java @@ -83,12 +83,12 @@ import org.jcodings.specific.USASCIIEncoding; import org.jcodings.specific.UTF8Encoding; import org.jruby.runtime.builtin.IRubyObject; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java index 16c255e5ec3..6659cda14c0 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java @@ -39,8 +39,8 @@ import com.oracle.truffle.api.object.DynamicObject; import org.jcodings.Encoding; import org.jruby.RubyEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.array.ArrayOperations; import org.jruby.truffle.core.encoding.EncodingNodes; import org.jruby.truffle.core.rope.CodeRange; diff --git a/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java b/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java index 075c37ef9b0..b30576c459e 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java @@ -20,11 +20,11 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import org.jruby.runtime.ArgumentDescriptor; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.BinaryCoreMethodNode; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.builtins.UnaryCoreMethodNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolTable.java b/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolTable.java index e4b3890477f..9c352b9caac 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolTable.java +++ b/truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolTable.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import org.jcodings.specific.USASCIIEncoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.rope.Rope; import org.jruby.truffle.core.rope.RopeOperations; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadManager.java b/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadManager.java index 38afa5d86bb..e37ac483942 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadManager.java +++ b/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadManager.java @@ -16,9 +16,9 @@ import jnr.posix.DefaultNativeTimeval; import jnr.posix.Timeval; import org.jruby.RubyThread.Status; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.InterruptMode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.fiber.FiberManager; import org.jruby.truffle.core.fiber.FiberNodes; import org.jruby.truffle.core.proc.ProcOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java b/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java index 9e9ce6338fd..3c68d5c1676 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java @@ -18,16 +18,16 @@ import com.oracle.truffle.api.source.SourceSection; import org.jruby.RubyThread.Status; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; +import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; -import org.jruby.truffle.core.InterruptMode; -import org.jruby.truffle.Layouts; -import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.builtins.YieldingCoreMethodNode; +import org.jruby.truffle.core.InterruptMode; import org.jruby.truffle.core.exception.ExceptionOperations; import org.jruby.truffle.language.NotProvided; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/time/TimeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/time/TimeNodes.java index 5d8b1b8c572..5d60143e2b2 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/time/TimeNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/time/TimeNodes.java @@ -24,12 +24,12 @@ import org.joda.time.tz.FixedDateTimeZone; import org.jruby.runtime.Helpers; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.Primitive; import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointEventNode.java b/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointEventNode.java index c6c23f31368..02237507c4e 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointEventNode.java +++ b/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointEventNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.instrumentation.ExecutionEventNode; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.yield.YieldNode; diff --git a/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointNodes.java b/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointNodes.java index a2562df2b99..b460d032480 100644 --- a/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointNodes.java @@ -19,11 +19,11 @@ import com.oracle.truffle.api.instrumentation.SourceSectionFilter; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.UnaryCoreMethodNode; import org.jruby.truffle.builtins.YieldingCoreMethodNode; import org.jruby.truffle.core.kernel.TraceManager; diff --git a/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java b/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java index afb4113c180..ae914eb32df 100644 --- a/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java +++ b/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java @@ -9,7 +9,6 @@ */ package org.jruby.truffle.debug; -import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.api.frame.FrameDescriptor; diff --git a/truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java b/truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java index e7e62943bb3..e2befabcfb4 100644 --- a/truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java @@ -17,11 +17,11 @@ import com.oracle.truffle.api.object.DynamicObject; import org.jcodings.specific.USASCIIEncoding; import org.jcodings.specific.UTF8Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.array.ArrayStrategy; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.backtrace.BacktraceFormatter; diff --git a/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsInternalNodes.java b/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsInternalNodes.java index 0c4602e863c..c266e0b34a9 100644 --- a/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsInternalNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsInternalNodes.java @@ -13,10 +13,10 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.instrumentation.EventBinding; import com.oracle.truffle.api.object.DynamicObject; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; @CoreClass("Truffle::Attachments::Internal") public abstract class AttachmentsInternalNodes { diff --git a/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsManager.java b/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsManager.java index 25a0bdf3c55..1dfa73da905 100644 --- a/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsManager.java +++ b/truffle/src/main/java/org/jruby/truffle/extra/AttachmentsManager.java @@ -21,8 +21,8 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.Source; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.binding.BindingNodes; import org.jruby.truffle.core.proc.ProcOperations; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteHelperNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteHelperNode.java index ac731b60874..21e175b5089 100644 --- a/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteHelperNode.java +++ b/truffle/src/main/java/org/jruby/truffle/interop/ForeignExecuteHelperNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.methods.CallBoundMethodNode; import org.jruby.truffle.language.methods.CallBoundMethodNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadStringCachingHelperNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadStringCachingHelperNode.java index 0e58ac74caa..1ea2fcf1aa0 100644 --- a/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadStringCachingHelperNode.java +++ b/truffle/src/main/java/org/jruby/truffle/interop/ForeignReadStringCachingHelperNode.java @@ -9,6 +9,7 @@ * GNU General Public License version 2 * GNU Lesser General Public License version 2.1 */ + import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.ImportStatic; @@ -17,8 +18,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.rope.Rope; import org.jruby.truffle.core.rope.RopeOperations; import org.jruby.truffle.core.string.StringCachingGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java b/truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java index 164928362a2..c269b566b3e 100644 --- a/truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java @@ -30,10 +30,10 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.source.Source; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.rope.Rope; import org.jruby.truffle.core.string.StringCachingGuards; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/interop/RubyMessageResolution.java b/truffle/src/main/java/org/jruby/truffle/interop/RubyMessageResolution.java index a0712840c3a..6fdf0b7f891 100644 --- a/truffle/src/main/java/org/jruby/truffle/interop/RubyMessageResolution.java +++ b/truffle/src/main/java/org/jruby/truffle/interop/RubyMessageResolution.java @@ -21,9 +21,9 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.RubyLanguage; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.rope.Rope; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/interop/ToJavaStringNode.java b/truffle/src/main/java/org/jruby/truffle/interop/ToJavaStringNode.java index 7af0a4f61b3..9e99382585c 100644 --- a/truffle/src/main/java/org/jruby/truffle/interop/ToJavaStringNode.java +++ b/truffle/src/main/java/org/jruby/truffle/interop/ToJavaStringNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.rope.Rope; import org.jruby.truffle.core.string.StringCachingGuards; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java b/truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java index da06de43768..ca6d88be77c 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java +++ b/truffle/src/main/java/org/jruby/truffle/language/CallStackManager.java @@ -16,9 +16,9 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreSourceSection; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.arguments.RubyArguments; import org.jruby.truffle.language.backtrace.Activation; diff --git a/truffle/src/main/java/org/jruby/truffle/language/DataNode.java b/truffle/src/main/java/org/jruby/truffle/language/DataNode.java index 8105b93bb86..d87c40d1362 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/DataNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/DataNode.java @@ -12,8 +12,8 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.string.StringOperations; import org.jruby.util.ByteList; diff --git a/truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java b/truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java index a24f61aad7e..5226c55c0fb 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java @@ -20,9 +20,9 @@ import com.oracle.truffle.api.source.SourceSection; import jnr.ffi.provider.MemoryManager; import org.jcodings.Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.CoreLibrary; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.exception.CoreExceptions; import org.jruby.truffle.core.kernel.TraceManager; import org.jruby.truffle.core.numeric.BignumOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/language/RubyConstant.java b/truffle/src/main/java/org/jruby/truffle/language/RubyConstant.java index 5719e847cda..1d804b3adb3 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/RubyConstant.java +++ b/truffle/src/main/java/org/jruby/truffle/language/RubyConstant.java @@ -11,8 +11,8 @@ import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; public class RubyConstant { diff --git a/truffle/src/main/java/org/jruby/truffle/language/RubyObjectType.java b/truffle/src/main/java/org/jruby/truffle/language/RubyObjectType.java index b28ca44d1a8..cf7bb0943c5 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/RubyObjectType.java +++ b/truffle/src/main/java/org/jruby/truffle/language/RubyObjectType.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.ObjectType; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.rope.RopeOperations; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.interop.RubyMessageResolutionAccessor; diff --git a/truffle/src/main/java/org/jruby/truffle/language/SafepointManager.java b/truffle/src/main/java/org/jruby/truffle/language/SafepointManager.java index be883334b16..eee71cc4743 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/SafepointManager.java +++ b/truffle/src/main/java/org/jruby/truffle/language/SafepointManager.java @@ -18,9 +18,9 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import org.jruby.RubyThread.Status; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.InterruptMode; -import org.jruby.truffle.Layouts; import java.util.Collections; import java.util.Set; diff --git a/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java b/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java index 8249fce8332..8e751377065 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/language/TruffleBootNodes.java @@ -20,13 +20,13 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.Source; import org.jcodings.specific.UTF8Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; -import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; import org.jruby.truffle.builtins.CoreMethodNode; -import org.jruby.truffle.Layouts; +import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.control.RaiseException; import org.jruby.truffle.language.loader.CodeLoader; diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ArgumentDescriptorUtils.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ArgumentDescriptorUtils.java index 00d815f5229..20fd4a9e1c6 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/arguments/ArgumentDescriptorUtils.java +++ b/truffle/src/main/java/org/jruby/truffle/language/arguments/ArgumentDescriptorUtils.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import org.jruby.runtime.ArgumentDescriptor; import org.jruby.runtime.ArgumentType; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; public class ArgumentDescriptorUtils { diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadKeywordRestArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadKeywordRestArgumentNode.java index 5717adb6dea..8a9ccc97095 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadKeywordRestArgumentNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadKeywordRestArgumentNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.hash.BucketsStrategy; import org.jruby.truffle.core.hash.HashOperations; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java index 6554c185c35..98ffdcd1ec1 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadOptionalArgumentNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.array.ArrayReadNormalizedNode; import org.jruby.truffle.core.array.ArrayReadNormalizedNodeGen; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java index f20399b09cd..64fb64ff1ea 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/arguments/ReadRestArgumentNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.array.ArrayUtils; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java b/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java index bbe59c363bf..9b9e53d0a1c 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java +++ b/truffle/src/main/java/org/jruby/truffle/language/backtrace/BacktraceFormatter.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyRootNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/language/constants/GetConstantNode.java b/truffle/src/main/java/org/jruby/truffle/language/constants/GetConstantNode.java index fece49035c5..4fcd1184d86 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/constants/GetConstantNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/constants/GetConstantNode.java @@ -19,8 +19,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.kernel.KernelNodes.RequireNode; import org.jruby.truffle.core.kernel.KernelNodesFactory; import org.jruby.truffle.language.RubyConstant; diff --git a/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java b/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java index e702e6d1f70..17730228b6b 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantNode.java @@ -20,8 +20,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.LexicalScope; import org.jruby.truffle.language.RubyConstant; diff --git a/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantWithLexicalScopeNode.java b/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantWithLexicalScopeNode.java index fcc34874002..f61a4019342 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantWithLexicalScopeNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/constants/LookupConstantWithLexicalScopeNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.LexicalScope; import org.jruby.truffle.language.RubyConstant; diff --git a/truffle/src/main/java/org/jruby/truffle/language/constants/ReadConstantWithLexicalScopeNode.java b/truffle/src/main/java/org/jruby/truffle/language/constants/ReadConstantWithLexicalScopeNode.java index 5aed2823d46..28ef4d4a2ac 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/constants/ReadConstantWithLexicalScopeNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/constants/ReadConstantWithLexicalScopeNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.LexicalScope; import org.jruby.truffle.language.RubyConstant; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/constants/ReadLiteralConstantNode.java b/truffle/src/main/java/org/jruby/truffle/language/constants/ReadLiteralConstantNode.java index 3b056134966..b883bf24298 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/constants/ReadLiteralConstantNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/constants/ReadLiteralConstantNode.java @@ -12,8 +12,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyConstant; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedDispatchNode.java index 27573d755d2..c533d7bbd71 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedDispatchNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedDispatchNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.nodes.InvalidAssumptionException; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.methods.InternalMethod; public class CachedBoxedDispatchNode extends CachedDispatchNode { diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedSymbolDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedSymbolDispatchNode.java index c913b105d08..9180027ca12 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedSymbolDispatchNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedBoxedSymbolDispatchNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.InvalidAssumptionException; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.methods.InternalMethod; diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedMethodMissingDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedMethodMissingDispatchNode.java index 3a24de3d2d2..5ad0b46c512 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedMethodMissingDispatchNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedMethodMissingDispatchNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.InvalidAssumptionException; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.array.ArrayUtils; import org.jruby.truffle.language.methods.InternalMethod; import org.jruby.truffle.language.objects.MetaClassNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedReturnMissingDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedReturnMissingDispatchNode.java index 5a7ae976572..028cd39c046 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedReturnMissingDispatchNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedReturnMissingDispatchNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.InvalidAssumptionException; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.objects.MetaClassNode; import org.jruby.truffle.language.objects.MetaClassNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedSingletonDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedSingletonDispatchNode.java index 4c8f0ceebfc..0def3034047 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedSingletonDispatchNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/dispatch/CachedSingletonDispatchNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.InvalidAssumptionException; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.methods.InternalMethod; /** diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/RubyCallNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/RubyCallNode.java index de8f8f33508..e23bcd0b4da 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/dispatch/RubyCallNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/dispatch/RubyCallNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.array.ArrayUtils; import org.jruby.truffle.core.cast.BooleanCastNode; import org.jruby.truffle.core.cast.BooleanCastNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/language/dispatch/UnresolvedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/language/dispatch/UnresolvedDispatchNode.java index 4d85323efd4..88cc2073dd9 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/dispatch/UnresolvedDispatchNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/dispatch/UnresolvedDispatchNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameInstance; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.arguments.RubyArguments; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/language/exceptions/TopLevelRaiseHandler.java b/truffle/src/main/java/org/jruby/truffle/language/exceptions/TopLevelRaiseHandler.java index c489f0b94cc..fd97aaea867 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/exceptions/TopLevelRaiseHandler.java +++ b/truffle/src/main/java/org/jruby/truffle/language/exceptions/TopLevelRaiseHandler.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.cast.IntegerCastNode; import org.jruby.truffle.core.cast.IntegerCastNodeGen; import org.jruby.truffle.core.kernel.AtExitManager; diff --git a/truffle/src/main/java/org/jruby/truffle/language/globals/ReadMatchReferenceNode.java b/truffle/src/main/java/org/jruby/truffle/language/globals/ReadMatchReferenceNode.java index cf916a74ee2..7e9ac584868 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/globals/ReadMatchReferenceNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/globals/ReadMatchReferenceNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; public class ReadMatchReferenceNode extends RubyNode { diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/CodeLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/CodeLoader.java index 6548485f34c..5ff22cbef56 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/loader/CodeLoader.java +++ b/truffle/src/main/java/org/jruby/truffle/language/loader/CodeLoader.java @@ -12,9 +12,7 @@ import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.Truffle; -import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.api.frame.FrameDescriptor; -import com.oracle.truffle.api.frame.FrameInstance; import com.oracle.truffle.api.frame.MaterializedFrame; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.IndirectCallNode; @@ -22,10 +20,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.Source; import org.jcodings.Encoding; -import org.jcodings.specific.UTF8Encoding; import org.jruby.runtime.Visibility; import org.jruby.truffle.RubyContext; -import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.RubyRootNode; import org.jruby.truffle.language.arguments.RubyArguments; import org.jruby.truffle.language.methods.DeclarationContext; diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java index 2953aaf24f7..d35045f3432 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java +++ b/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java @@ -22,9 +22,9 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.Source; import org.jcodings.specific.UTF8Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.RubyLanguage; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.array.ArrayOperations; import org.jruby.truffle.core.array.ArrayUtils; import org.jruby.truffle.core.string.StringOperations; diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/AddMethodNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/AddMethodNode.java index c0fd3e8dabc..6b1d87960aa 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/methods/AddMethodNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/methods/AddMethodNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; import org.jruby.runtime.Visibility; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.objects.SingletonClassNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/CallBoundMethodNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/CallBoundMethodNode.java index 2d1ce3fe4a6..2cca50a534f 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/methods/CallBoundMethodNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/methods/CallBoundMethodNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.arguments.RubyArguments; diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java index 84ed95fea18..9950054da0f 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/methods/ExceptionTranslatingNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/language/methods/LookupMethodNode.java b/truffle/src/main/java/org/jruby/truffle/language/methods/LookupMethodNode.java index 2d0bf831cd5..0b0c222a760 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/methods/LookupMethodNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/methods/LookupMethodNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/AllocateObjectNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/AllocateObjectNode.java index a41cf103a77..7cca92c3af1 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/AllocateObjectNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/AllocateObjectNode.java @@ -24,8 +24,8 @@ import com.oracle.truffle.api.object.DynamicObjectFactory; import com.oracle.truffle.api.source.SourceSection; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.hash.Entry; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java index 23a3f074a83..8b4971ff2cd 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.klass.ClassNodes; import org.jruby.truffle.language.RubyConstant; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/DefineModuleNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/DefineModuleNode.java index 287179ad76d..765c06c8d7a 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/DefineModuleNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/DefineModuleNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.profiles.BranchProfile; import com.oracle.truffle.api.profiles.ConditionProfile; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.module.ModuleNodes; import org.jruby.truffle.language.LexicalScope; import org.jruby.truffle.language.RubyConstant; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/FreezeNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/FreezeNode.java index 31e4f1ed1c3..654bb48bed0 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/FreezeNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/FreezeNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChild(value = "child") diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java index 129d92efe24..b1123077dff 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java @@ -18,8 +18,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/IsFrozenNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/IsFrozenNode.java index f4f401ed8c0..551d8b07693 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/IsFrozenNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/IsFrozenNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/IsTaintedNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/IsTaintedNode.java index 1319ca2ae93..75e11b1e9e9 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/IsTaintedNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/IsTaintedNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChild(value = "child", type = RubyNode.class) diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/LogicalClassNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/LogicalClassNode.java index d4eadb21bbc..f0e78f9e44e 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/LogicalClassNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/LogicalClassNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @ImportStatic(ShapeCachingGuards.class) diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/MetaClassNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/MetaClassNode.java index 541ce30688d..140a8bf1734 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/MetaClassNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/MetaClassNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @ImportStatic(ShapeCachingGuards.class) diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectGraph.java b/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectGraph.java index 1bea5a7d78e..0926a09f9f9 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectGraph.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectGraph.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Property; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.hash.Entry; import org.jruby.truffle.language.SafepointAction; import org.jruby.truffle.language.arguments.RubyArguments; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectIDOperations.java b/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectIDOperations.java index 4d1b9346d83..795b330e0b9 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectIDOperations.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/ObjectIDOperations.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.ExactMath; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Property; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.numeric.BignumOperations; import java.math.BigInteger; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/RunModuleDefinitionNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/RunModuleDefinitionNode.java index 59c45992a65..b4fc2d689c2 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/RunModuleDefinitionNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/RunModuleDefinitionNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.LexicalScope; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.arguments.RubyArguments; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java index a2f6eea7fc1..96b96531178 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.klass.ClassNodes; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/TaintNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/TaintNode.java index af10ba57cd5..9d495da448c 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/objects/TaintNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/objects/TaintNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java b/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java index 118ac0ad2c3..ce6b39f5eae 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java +++ b/truffle/src/main/java/org/jruby/truffle/language/parser/jruby/BodyTranslator.java @@ -27,10 +27,11 @@ import org.jruby.runtime.ArgumentDescriptor; import org.jruby.runtime.Helpers; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; +import org.jruby.truffle.builtins.PrimitiveConstructor; import org.jruby.truffle.core.CoreLibrary; import org.jruby.truffle.core.IsRubiniusUndefinedNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.RaiseIfFrozenNode; import org.jruby.truffle.core.array.ArrayAppendOneNodeGen; import org.jruby.truffle.core.array.ArrayConcatNode; @@ -65,7 +66,6 @@ import org.jruby.truffle.core.rope.RopeConstants; import org.jruby.truffle.core.rubinius.RubiniusLastStringReadNode; import org.jruby.truffle.core.rubinius.RubiniusLastStringWriteNodeGen; -import org.jruby.truffle.builtins.PrimitiveConstructor; import org.jruby.truffle.core.rubinius.RubiniusSingleBlockArgNode; import org.jruby.truffle.core.string.InterpolatedStringNode; import org.jruby.truffle.core.string.StringNodesFactory; diff --git a/truffle/src/main/java/org/jruby/truffle/language/supercall/LookupSuperMethodNode.java b/truffle/src/main/java/org/jruby/truffle/language/supercall/LookupSuperMethodNode.java index d90b718cd0f..1b6eaf62bb2 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/supercall/LookupSuperMethodNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/supercall/LookupSuperMethodNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.module.ModuleOperations; import org.jruby.truffle.language.RubyGuards; import org.jruby.truffle.language.RubyNode; diff --git a/truffle/src/main/java/org/jruby/truffle/language/threadlocal/ThreadLocalObjectNode.java b/truffle/src/main/java/org/jruby/truffle/language/threadlocal/ThreadLocalObjectNode.java index 7140a1c2af9..2993b4088f5 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/threadlocal/ThreadLocalObjectNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/threadlocal/ThreadLocalObjectNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; public abstract class ThreadLocalObjectNode extends RubyNode { diff --git a/truffle/src/main/java/org/jruby/truffle/language/yield/CallBlockNode.java b/truffle/src/main/java/org/jruby/truffle/language/yield/CallBlockNode.java index 89488d3d129..d454838530e 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/yield/CallBlockNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/yield/CallBlockNode.java @@ -20,8 +20,8 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; import org.jruby.truffle.language.arguments.RubyArguments; import org.jruby.truffle.language.methods.DeclarationContext; diff --git a/truffle/src/main/java/org/jruby/truffle/language/yield/YieldNode.java b/truffle/src/main/java/org/jruby/truffle/language/yield/YieldNode.java index bb54c0a5471..7943c67f798 100644 --- a/truffle/src/main/java/org/jruby/truffle/language/yield/YieldNode.java +++ b/truffle/src/main/java/org/jruby/truffle/language/yield/YieldNode.java @@ -13,8 +13,8 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.methods.DeclarationContext; public class YieldNode extends Node { diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageManager.java b/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageManager.java index 3b03ef5d032..36308e1651d 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageManager.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageManager.java @@ -28,9 +28,7 @@ import java.util.Arrays; import java.util.BitSet; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageNodes.java b/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageNodes.java index 97a444f84cb..5a6c343a6d9 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/CoverageNodes.java @@ -14,10 +14,10 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.Source; import org.jcodings.specific.UTF8Encoding; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.control.RaiseException; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/ObjSpaceNodes.java b/truffle/src/main/java/org/jruby/truffle/stdlib/ObjSpaceNodes.java index a129e1bd8b3..5745ef924d0 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/ObjSpaceNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/ObjSpaceNodes.java @@ -12,10 +12,10 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.object.DynamicObject; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.string.StringOperations; import org.jruby.truffle.language.objects.ObjectGraph; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodArrayArgumentsNode.java b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodArrayArgumentsNode.java index 5edaa28b850..8909e9aae1d 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodArrayArgumentsNode.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodArrayArgumentsNode.java @@ -10,8 +10,6 @@ package org.jruby.truffle.stdlib.bigdecimal; import com.oracle.truffle.api.dsl.NodeChild; -import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyNode; @NodeChild(value = "arguments", type = RubyNode[].class) diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodNode.java b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodNode.java index 66a15920fb0..914ee2e53e7 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodNode.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalCoreMethodNode.java @@ -12,8 +12,8 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; -import org.jruby.truffle.builtins.CoreMethodNode; import org.jruby.truffle.Layouts; +import org.jruby.truffle.builtins.CoreMethodNode; import org.jruby.truffle.core.cast.IntegerCastNode; import org.jruby.truffle.core.cast.IntegerCastNodeGen; import org.jruby.truffle.language.RubyGuards; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalNodes.java b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalNodes.java index 8c741201098..0232868f298 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/BigDecimalNodes.java @@ -22,10 +22,10 @@ import org.jcodings.specific.UTF8Encoding; import org.jruby.ext.bigdecimal.RubyBigDecimal; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.builtins.NonStandard; import org.jruby.truffle.core.cast.IntegerCastNode; import org.jruby.truffle.core.cast.IntegerCastNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/GetIntegerConstantNode.java b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/GetIntegerConstantNode.java index 18f03e5be83..4da0272a159 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/GetIntegerConstantNode.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/bigdecimal/GetIntegerConstantNode.java @@ -15,8 +15,6 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.object.DynamicObject; -import com.oracle.truffle.api.source.SourceSection; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.core.cast.IntegerCastNode; import org.jruby.truffle.core.cast.IntegerCastNodeGen; import org.jruby.truffle.core.cast.ToIntNode; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/digest/DigestNodes.java b/truffle/src/main/java/org/jruby/truffle/stdlib/digest/DigestNodes.java index f9123a949be..1e888a856ed 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/digest/DigestNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/digest/DigestNodes.java @@ -14,11 +14,11 @@ import com.oracle.truffle.api.object.DynamicObject; import org.jcodings.specific.ASCIIEncoding; import org.jruby.ext.digest.BubbleBabble; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.rope.BytesVisitor; import org.jruby.truffle.core.rope.CodeRange; import org.jruby.truffle.core.rope.Rope; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java b/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java index d8305a9b354..be2cd568722 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java @@ -46,11 +46,11 @@ import com.oracle.truffle.api.source.SourceSection; import org.jcodings.Encoding; import org.jruby.runtime.Visibility; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.adapaters.OutputStreamAdapter; import org.jruby.truffle.core.array.ArrayOperations; import org.jruby.truffle.language.NotProvided; diff --git a/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychParserNodes.java b/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychParserNodes.java index 74bfe959622..71fa17815a5 100644 --- a/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychParserNodes.java +++ b/truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychParserNodes.java @@ -50,11 +50,11 @@ import org.jcodings.unicode.UnicodeEncoding; import org.jruby.RubyEncoding; import org.jruby.runtime.Helpers; +import org.jruby.truffle.Layouts; import org.jruby.truffle.RubyContext; import org.jruby.truffle.builtins.CoreClass; import org.jruby.truffle.builtins.CoreMethod; import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; -import org.jruby.truffle.Layouts; import org.jruby.truffle.core.adapaters.InputStreamAdapter; import org.jruby.truffle.core.cast.ToStrNode; import org.jruby.truffle.core.cast.ToStrNodeGen; diff --git a/truffle/src/main/java/org/jruby/truffle/tools/InstrumentationServerManager.java b/truffle/src/main/java/org/jruby/truffle/tools/InstrumentationServerManager.java index 845df42ccfd..4cba7dfd579 100644 --- a/truffle/src/main/java/org/jruby/truffle/tools/InstrumentationServerManager.java +++ b/truffle/src/main/java/org/jruby/truffle/tools/InstrumentationServerManager.java @@ -16,8 +16,8 @@ import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.SafepointAction; import org.jruby.truffle.language.backtrace.Backtrace; import org.jruby.truffle.language.backtrace.BacktraceFormatter; diff --git a/truffle/src/main/java/org/jruby/truffle/tools/simpleshell/SimpleShell.java b/truffle/src/main/java/org/jruby/truffle/tools/simpleshell/SimpleShell.java index 1faa4470bae..d59b2019cdc 100644 --- a/truffle/src/main/java/org/jruby/truffle/tools/simpleshell/SimpleShell.java +++ b/truffle/src/main/java/org/jruby/truffle/tools/simpleshell/SimpleShell.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.source.Source; import org.jcodings.specific.UTF8Encoding; -import org.jruby.truffle.RubyContext; import org.jruby.truffle.Layouts; +import org.jruby.truffle.RubyContext; import org.jruby.truffle.language.RubyRootNode; import org.jruby.truffle.language.arguments.RubyArguments; import org.jruby.truffle.language.backtrace.Activation;