Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03b4b8cf19ca
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0fc33ac73378
Choose a head ref
  • 1 commit
  • 224 files changed
  • 1 contributor

Commits on Jan 3, 2015

  1. [Truffle] Organise imports.

    @chrisseaton
    chrisseaton committed Jan 3, 2015
    Copy the full SHA
    0fc33ac View commit details
Showing with 1,068 additions and 1,075 deletions.
  1. +3 −6 core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
  2. +1 −3 core/src/main/java/org/jruby/truffle/TruffleMethod.java
  3. +3 −5 core/src/main/java/org/jruby/truffle/nodes/DefinedNode.java
  4. +7 −5 core/src/main/java/org/jruby/truffle/nodes/ReadConstantNode.java
  5. +12 −9 core/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
  6. +4 −9 core/src/main/java/org/jruby/truffle/nodes/RubyNode.java
  7. +7 −6 core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java
  8. +1 −5 core/src/main/java/org/jruby/truffle/nodes/RubyTypes.java
  9. +6 −7 core/src/main/java/org/jruby/truffle/nodes/WriteConstantNode.java
  10. +8 −6 core/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
  11. +8 −8 core/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java
  12. +4 −1 core/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java
  13. +7 −8 core/src/main/java/org/jruby/truffle/nodes/cast/LambdaNode.java
  14. +9 −6 core/src/main/java/org/jruby/truffle/nodes/cast/ProcCastNode.java
  15. +9 −6 core/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java
  16. +7 −8 core/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
  17. +8 −7 core/src/main/java/org/jruby/truffle/nodes/cast/StringToSymbolNode.java
  18. +3 −4 core/src/main/java/org/jruby/truffle/nodes/control/AndNode.java
  19. +5 −8 core/src/main/java/org/jruby/truffle/nodes/control/BreakNode.java
  20. +1 −1 core/src/main/java/org/jruby/truffle/nodes/control/DoWhileNode.java
  21. +7 −6 core/src/main/java/org/jruby/truffle/nodes/control/ElidableResultNode.java
  22. +4 −6 core/src/main/java/org/jruby/truffle/nodes/control/EnsureNode.java
  23. +6 −8 core/src/main/java/org/jruby/truffle/nodes/control/FlipFlopNode.java
  24. +7 −8 core/src/main/java/org/jruby/truffle/nodes/control/IfNode.java
  25. +5 −9 core/src/main/java/org/jruby/truffle/nodes/control/NextNode.java
  26. +5 −7 core/src/main/java/org/jruby/truffle/nodes/control/NotNode.java
  27. +0 −1 core/src/main/java/org/jruby/truffle/nodes/control/OnceNode.java
  28. +3 −7 core/src/main/java/org/jruby/truffle/nodes/control/OrNode.java
  29. +0 −3 core/src/main/java/org/jruby/truffle/nodes/control/PassthroughNode.java
  30. +5 −7 core/src/main/java/org/jruby/truffle/nodes/control/RedoNode.java
  31. +4 −4 core/src/main/java/org/jruby/truffle/nodes/control/RescueAnyNode.java
  32. +8 −6 core/src/main/java/org/jruby/truffle/nodes/control/RescueClassesNode.java
  33. +4 −4 core/src/main/java/org/jruby/truffle/nodes/control/RescueNode.java
  34. +8 −6 core/src/main/java/org/jruby/truffle/nodes/control/RescueSplatNode.java
  35. +5 −7 core/src/main/java/org/jruby/truffle/nodes/control/RetryNode.java
  36. +5 −7 core/src/main/java/org/jruby/truffle/nodes/control/ReturnNode.java
  37. +7 −6 core/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
  38. +10 −8 core/src/main/java/org/jruby/truffle/nodes/control/TryNode.java
  39. +1 −1 core/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java
  40. +12 −9 core/src/main/java/org/jruby/truffle/nodes/control/WhileNode.java
  41. +0 −1 core/src/main/java/org/jruby/truffle/nodes/core/ArrayAllocationSite.java
  42. +1 −1 core/src/main/java/org/jruby/truffle/nodes/core/ArrayBuilderNode.java
  43. +5 −6 core/src/main/java/org/jruby/truffle/nodes/core/ArrayConcatNode.java
  44. +2 −2 core/src/main/java/org/jruby/truffle/nodes/core/ArrayCoreMethodNode.java
  45. +1 −2 core/src/main/java/org/jruby/truffle/nodes/core/ArrayGetTailNode.java
  46. +8 −6 core/src/main/java/org/jruby/truffle/nodes/core/ArrayIndexNode.java
  47. +6 −6 core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
  48. +4 −5 core/src/main/java/org/jruby/truffle/nodes/core/ArrayPushNode.java
  49. +10 −7 core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
  50. +7 −8 core/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
  51. +8 −5 core/src/main/java/org/jruby/truffle/nodes/core/BindingNodes.java
  52. +5 −3 core/src/main/java/org/jruby/truffle/nodes/core/ClassNodes.java
  53. +4 −4 core/src/main/java/org/jruby/truffle/nodes/core/ComparableNodes.java
  54. +4 −1 core/src/main/java/org/jruby/truffle/nodes/core/CoreClass.java
  55. +5 −3 core/src/main/java/org/jruby/truffle/nodes/core/CoreMethod.java
  56. +4 −5 core/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNode.java
  57. +1 −4 core/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
  58. +11 −9 core/src/main/java/org/jruby/truffle/nodes/core/DirNodes.java
  59. +0 −4 core/src/main/java/org/jruby/truffle/nodes/core/EncodingConverterNodes.java
  60. +2 −2 core/src/main/java/org/jruby/truffle/nodes/core/EncodingNodes.java
  61. +8 −4 core/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
  62. +3 −4 core/src/main/java/org/jruby/truffle/nodes/core/FalseClassNodes.java
  63. +6 −4 core/src/main/java/org/jruby/truffle/nodes/core/FiberNodes.java
  64. +9 −9 core/src/main/java/org/jruby/truffle/nodes/core/FileNodes.java
  65. +10 −8 core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
  66. +0 −1 core/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
  67. +5 −7 core/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
  68. +2 −1 core/src/main/java/org/jruby/truffle/nodes/core/GCNodes.java
  69. +0 −1 core/src/main/java/org/jruby/truffle/nodes/core/GeneralDivModNode.java
  70. +9 −8 core/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
  71. +4 −1 core/src/main/java/org/jruby/truffle/nodes/core/IONodes.java
  72. +4 −2 core/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java
  73. +6 −9 core/src/main/java/org/jruby/truffle/nodes/core/InterpolatedStringNode.java
  74. +24 −16 core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  75. +7 −4 core/src/main/java/org/jruby/truffle/nodes/core/MainNodes.java
  76. +5 −4 core/src/main/java/org/jruby/truffle/nodes/core/MatchDataNodes.java
  77. +6 −4 core/src/main/java/org/jruby/truffle/nodes/core/MathNodes.java
  78. +15 −7 core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  79. +3 −4 core/src/main/java/org/jruby/truffle/nodes/core/NilClassNodes.java
  80. +12 −6 core/src/main/java/org/jruby/truffle/nodes/core/ObjectSpaceNodes.java
  81. +11 −9 core/src/main/java/org/jruby/truffle/nodes/core/ProcNodes.java
  82. +3 −3 core/src/main/java/org/jruby/truffle/nodes/core/ProcessNodes.java
  83. +12 −8 core/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
  84. +7 −4 core/src/main/java/org/jruby/truffle/nodes/core/RegexpNodes.java
  85. +5 −4 core/src/main/java/org/jruby/truffle/nodes/core/SignalNodes.java
  86. +4 −6 core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
  87. +7 −5 core/src/main/java/org/jruby/truffle/nodes/core/SymbolNodes.java
  88. +11 −9 core/src/main/java/org/jruby/truffle/nodes/core/SystemNode.java
  89. +4 −6 core/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java
  90. +6 −5 core/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java
  91. +3 −4 core/src/main/java/org/jruby/truffle/nodes/core/TrueClassNodes.java
  92. +9 −6 core/src/main/java/org/jruby/truffle/nodes/core/TruffleDebugNodes.java
  93. +0 −1 core/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java
  94. +0 −1 core/src/main/java/org/jruby/truffle/nodes/core/UnaryCoreMethodNode.java
  95. +6 −6 core/src/main/java/org/jruby/truffle/nodes/core/YieldingCoreMethodNode.java
  96. +0 −1 core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java
  97. +0 −1 core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java
  98. +0 −1 core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedMethodMissingDispatchNode.java
  99. +0 −1 core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedReturnMissingDispatchNode.java
  100. +0 −1 core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedSymbolDispatchNode.java
  101. +0 −3 core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java
  102. +0 −1 core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedUnboxedDispatchNode.java
  103. +5 −3 core/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchHeadNode.java
  104. +4 −3 core/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchNode.java
  105. +6 −4 core/src/main/java/org/jruby/truffle/nodes/dispatch/UncachedDispatchNode.java
  106. +5 −7 core/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
  107. +1 −2 core/src/main/java/org/jruby/truffle/nodes/globals/CheckMatchVariableTypeNode.java
  108. +0 −2 core/src/main/java/org/jruby/truffle/nodes/globals/CheckProgramNameVariableTypeNode.java
  109. +0 −2 core/src/main/java/org/jruby/truffle/nodes/globals/CheckRecordSeparatorVariableTypeNode.java
  110. +0 −4 core/src/main/java/org/jruby/truffle/nodes/globals/CheckStdoutVariableTypeNode.java
  111. +0 −3 core/src/main/java/org/jruby/truffle/nodes/globals/WriteReadOnlyGlobalNode.java
  112. +1 −1 core/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java
  113. +5 −5 core/src/main/java/org/jruby/truffle/nodes/literal/ArrayLiteralNode.java
  114. +6 −6 core/src/main/java/org/jruby/truffle/nodes/literal/BooleanLiteralNode.java
  115. +6 −6 core/src/main/java/org/jruby/truffle/nodes/literal/FloatLiteralNode.java
  116. +8 −7 core/src/main/java/org/jruby/truffle/nodes/literal/HashLiteralNode.java
  117. +4 −7 core/src/main/java/org/jruby/truffle/nodes/literal/ObjectLiteralNode.java
  118. +6 −6 core/src/main/java/org/jruby/truffle/nodes/literal/RangeLiteralNode.java
  119. +4 −6 core/src/main/java/org/jruby/truffle/nodes/literal/StringLiteralNode.java
  120. +10 −6 core/src/main/java/org/jruby/truffle/nodes/methods/AddMethodNode.java
  121. +7 −7 core/src/main/java/org/jruby/truffle/nodes/methods/AliasNode.java
  122. +0 −1 core/src/main/java/org/jruby/truffle/nodes/methods/AssertCompilationConstantNode.java
  123. +10 −9 core/src/main/java/org/jruby/truffle/nodes/methods/BlockDefinitionNode.java
  124. +1 −2 core/src/main/java/org/jruby/truffle/nodes/methods/CatchBreakAsReturnNode.java
  125. +6 −7 core/src/main/java/org/jruby/truffle/nodes/methods/CatchNextNode.java
  126. +1 −1 core/src/main/java/org/jruby/truffle/nodes/methods/CatchRetryAsErrorNode.java
  127. +7 −6 core/src/main/java/org/jruby/truffle/nodes/methods/CatchReturnAsErrorNode.java
  128. +6 −8 core/src/main/java/org/jruby/truffle/nodes/methods/CatchReturnNode.java
  129. +1 −4 core/src/main/java/org/jruby/truffle/nodes/methods/CatchReturnPlaceholderNode.java
  130. +14 −8 core/src/main/java/org/jruby/truffle/nodes/methods/MethodDefinitionNode.java
  131. +1 −1 core/src/main/java/org/jruby/truffle/nodes/methods/RedoableNode.java
  132. +0 −1 core/src/main/java/org/jruby/truffle/nodes/methods/SetFrameVisibilityNode.java
  133. +1 −3 core/src/main/java/org/jruby/truffle/nodes/methods/UndefNode.java
  134. +2 −2 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/BehaveAsBlockNode.java
  135. +8 −9 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/CheckArityNode.java
  136. +2 −3 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/IsNilNode.java
  137. +5 −5 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadAllArgumentsNode.java
  138. +6 −7 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadBlockNode.java
  139. +1 −1 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadKeywordArgumentNode.java
  140. +3 −2 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadKeywordRestArgumentNode.java
  141. +6 −7 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadOptionalArgumentNode.java
  142. +5 −4 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadPostArgumentNode.java
  143. +8 −5 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadPreArgumentNode.java
  144. +9 −7 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ReadRestArgumentNode.java
  145. +5 −4 core/src/main/java/org/jruby/truffle/nodes/methods/arguments/ShouldDestructureNode.java
  146. +3 −4 core/src/main/java/org/jruby/truffle/nodes/methods/locals/FlipFlopStateNode.java
  147. +8 −5 core/src/main/java/org/jruby/truffle/nodes/methods/locals/FrameSlotNode.java
  148. +5 −5 core/src/main/java/org/jruby/truffle/nodes/methods/locals/InitFlipFlopSlotNode.java
  149. +6 −4 core/src/main/java/org/jruby/truffle/nodes/methods/locals/LevelFlipFlopStateNode.java
  150. +4 −3 core/src/main/java/org/jruby/truffle/nodes/methods/locals/LocalFlipFlopStateNode.java
  151. +10 −6 core/src/main/java/org/jruby/truffle/nodes/methods/locals/ReadLevelVariableNode.java
  152. +8 −6 core/src/main/java/org/jruby/truffle/nodes/methods/locals/ReadLocalVariableNode.java
  153. +10 −6 core/src/main/java/org/jruby/truffle/nodes/methods/locals/WriteLevelVariableNode.java
  154. +8 −6 core/src/main/java/org/jruby/truffle/nodes/methods/locals/WriteLocalVariableNode.java
  155. +3 −3 core/src/main/java/org/jruby/truffle/nodes/objects/ClassNode.java
  156. +8 −6 core/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetClassNode.java
  157. +9 −6 core/src/main/java/org/jruby/truffle/nodes/objects/DefineOrGetModuleNode.java
  158. +8 −6 core/src/main/java/org/jruby/truffle/nodes/objects/OpenModuleNode.java
  159. +7 −7 core/src/main/java/org/jruby/truffle/nodes/objects/ReadClassVariableNode.java
  160. +6 −5 core/src/main/java/org/jruby/truffle/nodes/objects/ReadInstanceVariableNode.java
  161. +5 −4 core/src/main/java/org/jruby/truffle/nodes/objects/SelfNode.java
  162. +4 −5 core/src/main/java/org/jruby/truffle/nodes/objects/SingletonClassNode.java
  163. +7 −7 core/src/main/java/org/jruby/truffle/nodes/objects/WriteClassVariableNode.java
  164. +5 −4 core/src/main/java/org/jruby/truffle/nodes/objects/WriteInstanceVariableNode.java
  165. +9 −5 core/src/main/java/org/jruby/truffle/nodes/supercall/AbstractGeneralSuperCallNode.java
  166. +11 −7 core/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperCallNode.java
  167. +1 −1 core/src/main/java/org/jruby/truffle/nodes/supercall/GeneralSuperReCallNode.java
  168. +5 −6 core/src/main/java/org/jruby/truffle/nodes/yield/CachedYieldDispatchNode.java
  169. +0 −2 core/src/main/java/org/jruby/truffle/nodes/yield/GeneralYieldDispatchNode.java
  170. +4 −5 core/src/main/java/org/jruby/truffle/nodes/yield/UninitializedYieldDispatchNode.java
  171. +0 −2 core/src/main/java/org/jruby/truffle/nodes/yield/YieldDispatchHeadNode.java
  172. +4 −4 core/src/main/java/org/jruby/truffle/nodes/yield/YieldDispatchNode.java
  173. +8 −7 core/src/main/java/org/jruby/truffle/nodes/yield/YieldNode.java
  174. +0 −6 core/src/main/java/org/jruby/truffle/runtime/DebugOperations.java
  175. +4 −3 core/src/main/java/org/jruby/truffle/runtime/RubyArguments.java
  176. +6 −6 core/src/main/java/org/jruby/truffle/runtime/RubyCallStack.java
  177. +16 −21 core/src/main/java/org/jruby/truffle/runtime/RubyContext.java
  178. +4 −1 core/src/main/java/org/jruby/truffle/runtime/RubyOperations.java
  179. +0 −2 core/src/main/java/org/jruby/truffle/runtime/backtrace/Activation.java
  180. +0 −1 core/src/main/java/org/jruby/truffle/runtime/backtrace/DebugBacktraceFormatter.java
  181. +0 −4 core/src/main/java/org/jruby/truffle/runtime/backtrace/ImplementationDebugBacktraceFormatter.java
  182. +0 −3 core/src/main/java/org/jruby/truffle/runtime/backtrace/MRIBacktraceFormatter.java
  183. +1 −2 core/src/main/java/org/jruby/truffle/runtime/control/BreakException.java
  184. +1 −1 core/src/main/java/org/jruby/truffle/runtime/control/BreakShellException.java
  185. +1 −3 core/src/main/java/org/jruby/truffle/runtime/control/NextException.java
  186. +1 −1 core/src/main/java/org/jruby/truffle/runtime/control/QuitException.java
  187. +1 −1 core/src/main/java/org/jruby/truffle/runtime/control/RedoException.java
  188. +1 −1 core/src/main/java/org/jruby/truffle/runtime/control/RetryException.java
  189. +1 −2 core/src/main/java/org/jruby/truffle/runtime/control/ReturnException.java
  190. +1 −2 core/src/main/java/org/jruby/truffle/runtime/control/ThreadExitException.java
  191. +1 −2 core/src/main/java/org/jruby/truffle/runtime/control/ThrowException.java
  192. +1 −2 core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
  193. +0 −7 core/src/main/java/org/jruby/truffle/runtime/core/RubyArray.java
  194. +0 −20 core/src/main/java/org/jruby/truffle/runtime/core/RubyBasicObject.java
  195. +1 −1 core/src/main/java/org/jruby/truffle/runtime/core/RubyBinding.java
  196. +6 −5 core/src/main/java/org/jruby/truffle/runtime/core/RubyClass.java
  197. +7 −4 core/src/main/java/org/jruby/truffle/runtime/core/RubyFiber.java
  198. +3 −3 core/src/main/java/org/jruby/truffle/runtime/core/RubyFile.java
  199. +1 −11 core/src/main/java/org/jruby/truffle/runtime/core/RubyHash.java
  200. +1 −1 core/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
  201. +0 −3 core/src/main/java/org/jruby/truffle/runtime/core/RubyNilClass.java
  202. +2 −2 core/src/main/java/org/jruby/truffle/runtime/core/RubyProc.java
  203. +0 −7 core/src/main/java/org/jruby/truffle/runtime/core/RubyString.java
  204. +7 −5 core/src/main/java/org/jruby/truffle/runtime/core/RubySymbol.java
  205. +3 −6 core/src/main/java/org/jruby/truffle/runtime/core/RubyThread.java
  206. +1 −0 core/src/main/java/org/jruby/truffle/runtime/core/RubyTime.java
  207. +4 −3 core/src/main/java/org/jruby/truffle/runtime/core/StringFormatter.java
  208. +4 −4 core/src/main/java/org/jruby/truffle/runtime/methods/RubyMethod.java
  209. +4 −2 core/src/main/java/org/jruby/truffle/runtime/subsystems/AtExitManager.java
  210. +9 −11 core/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
  211. +5 −4 core/src/main/java/org/jruby/truffle/runtime/subsystems/FiberManager.java
  212. +9 −6 core/src/main/java/org/jruby/truffle/runtime/subsystems/ObjectSpaceManager.java
  213. +7 −6 core/src/main/java/org/jruby/truffle/runtime/subsystems/ThreadManager.java
  214. +0 −1 core/src/main/java/org/jruby/truffle/runtime/subsystems/TraceManager.java
  215. +0 −2 core/src/main/java/org/jruby/truffle/runtime/util/ArrayUtils.java
  216. +0 −1 core/src/main/java/org/jruby/truffle/runtime/util/TypeConversionUtils.java
  217. +5 −7 core/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
  218. +4 −5 core/src/main/java/org/jruby/truffle/translator/DeadNode.java
  219. +1 −3 core/src/main/java/org/jruby/truffle/translator/LoadArgumentsTranslator.java
  220. +15 −9 core/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
  221. +9 −6 core/src/main/java/org/jruby/truffle/translator/ModuleTranslator.java
  222. +0 −1 core/src/main/java/org/jruby/truffle/translator/ParameterCollector.java
  223. +21 −13 core/src/main/java/org/jruby/truffle/translator/TranslatorDriver.java
  224. +14 −9 core/src/main/java/org/jruby/truffle/translator/TranslatorEnvironment.java
9 changes: 3 additions & 6 deletions core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
View file
Original file line number Diff line number Diff line change
@@ -9,24 +9,21 @@
*/
package org.jruby.truffle;

import com.oracle.truffle.api.source.BytesDecoder;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.frame.MaterializedFrame;
import com.oracle.truffle.api.source.BytesDecoder;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.source.SourceSection;

import org.jcodings.specific.UTF8Encoding;
import org.jruby.TruffleBridge;
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.TopLevelRaiseHandler;
import org.jruby.truffle.nodes.control.SequenceNode;
import org.jruby.truffle.nodes.core.*;
import org.jruby.truffle.nodes.methods.SetFrameVisibilityNode;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyClass;
import org.jruby.truffle.translator.NodeWrapper;
import org.jruby.truffle.translator.TranslatorDriver;
import org.jruby.util.cli.Options;
4 changes: 1 addition & 3 deletions core/src/main/java/org/jruby/truffle/TruffleMethod.java
View file
Original file line number Diff line number Diff line change
@@ -9,9 +9,7 @@
*/
package org.jruby.truffle;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;

import com.oracle.truffle.api.CallTarget;
import org.jruby.RubyModule;
import org.jruby.TruffleBridge;
import org.jruby.internal.runtime.methods.DynamicMethod;
8 changes: 3 additions & 5 deletions core/src/main/java/org/jruby/truffle/nodes/DefinedNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,11 +9,9 @@
*/
package org.jruby.truffle.nodes;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.nodes.*;
import org.jruby.truffle.runtime.*;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.runtime.RubyContext;

/**
* Switches execution to the parallel {@link RubyNode#isDefined} semantic path. Represents the
12 changes: 7 additions & 5 deletions core/src/main/java/org/jruby/truffle/nodes/ReadConstantNode.java
View file
Original file line number Diff line number Diff line change
@@ -10,14 +10,16 @@
package org.jruby.truffle.nodes;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.dispatch.Dispatch;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.control.*;
import org.jruby.truffle.runtime.core.RubyModule;
import org.jruby.truffle.runtime.LexicalScope;
import org.jruby.truffle.runtime.ModuleOperations;
import org.jruby.truffle.runtime.RubyConstant;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyModule;

public class ReadConstantNode extends RubyNode {

21 changes: 12 additions & 9 deletions core/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,21 +9,24 @@
*/
package org.jruby.truffle.nodes;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.nodes.*;
import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.ExplodeLoop;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.BranchProfile;
import org.jruby.truffle.nodes.cast.ProcOrNullNode;
import org.jruby.truffle.nodes.cast.ProcOrNullNodeFactory;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
import org.jruby.truffle.nodes.cast.ProcOrNullNode;
import org.jruby.truffle.nodes.cast.ProcOrNullNodeFactory;
import org.jruby.truffle.nodes.dispatch.Dispatch;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.ModuleOperations;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.methods.*;
import org.jruby.truffle.runtime.core.RubyProc;
import org.jruby.truffle.runtime.methods.RubyMethod;
import org.jruby.truffle.runtime.util.ArrayUtils;

import java.util.Arrays;
13 changes: 4 additions & 9 deletions core/src/main/java/org/jruby/truffle/nodes/RubyNode.java
View file
Original file line number Diff line number Diff line change
@@ -10,22 +10,17 @@
package org.jruby.truffle.nodes;

import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.ImportGuards;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.dsl.TypeSystemReference;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.dispatch.Dispatch;
import org.jruby.truffle.nodes.yield.YieldDispatchNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.LexicalScope;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.UndefinedPlaceholder;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyHash;
import org.jruby.truffle.runtime.core.RubyRange;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.hash.HashSearchResult;

import java.math.BigInteger;

13 changes: 7 additions & 6 deletions core/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,15 @@
*/
package org.jruby.truffle.nodes;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.nodes.*;
import org.jruby.truffle.runtime.DebugOperations;
import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.ExecutionContext;
import com.oracle.truffle.api.frame.FrameDescriptor;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.NodeUtil;
import com.oracle.truffle.api.nodes.RootNode;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.methods.SharedMethodInfo;
import org.jruby.util.cli.Options;

/**
* The root node in an AST for a method. Unlike {@link RubyNode}, this has a single entry point,
6 changes: 1 addition & 5 deletions core/src/main/java/org/jruby/truffle/nodes/RubyTypes.java
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,9 @@

import com.oracle.truffle.api.dsl.TypeSystem;
import org.jruby.truffle.nodes.dispatch.Dispatch;
import org.jruby.truffle.runtime.LexicalScope;
import org.jruby.truffle.runtime.UndefinedPlaceholder;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyHash;
import org.jruby.truffle.runtime.core.RubyRange;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.LexicalScope;

/**
* The list of types and type conversions that the AST interpreter knows about and can specialise
13 changes: 6 additions & 7 deletions core/src/main/java/org/jruby/truffle/nodes/WriteConstantNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,13 @@
*/
package org.jruby.truffle.nodes;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.nodes.*;
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.runtime.LexicalScope;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.core.RubyModule;

/**
* Represents writing a constant into some module.
14 changes: 8 additions & 6 deletions core/src/main/java/org/jruby/truffle/nodes/cast/ArrayCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,16 @@
*/
package org.jruby.truffle.nodes.cast;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.frame.*;
import org.jruby.truffle.nodes.*;
import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.dispatch.Dispatch;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyBasicObject;
16 changes: 8 additions & 8 deletions core/src/main/java/org/jruby/truffle/nodes/cast/BooleanCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@
*/
package org.jruby.truffle.nodes.cast;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.nodes.*;
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.core.*;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyNilClass;

/**
* Casts a value into a boolean.
5 changes: 4 additions & 1 deletion core/src/main/java/org/jruby/truffle/nodes/cast/HashCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,10 @@
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyBignum;
import org.jruby.truffle.runtime.core.RubyHash;
import org.jruby.truffle.runtime.core.RubyNilClass;

// TODO(CS): copy and paste of ArrayCastNode

15 changes: 7 additions & 8 deletions core/src/main/java/org/jruby/truffle/nodes/cast/LambdaNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,13 @@
*/
package org.jruby.truffle.nodes.cast;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.frame.*;
import com.oracle.truffle.api.nodes.*;
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.methods.*;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyProc;
import org.jruby.truffle.runtime.methods.RubyMethod;

public class LambdaNode extends RubyNode {

15 changes: 9 additions & 6 deletions core/src/main/java/org/jruby/truffle/nodes/cast/ProcCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,13 +9,16 @@
*/
package org.jruby.truffle.nodes.cast;

import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.frame.*;
import org.jruby.truffle.nodes.*;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.core.*;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyBasicObject;
import org.jruby.truffle.runtime.core.RubyNilClass;
import org.jruby.truffle.runtime.core.RubyProc;

/**
* Casts an object to a Ruby Proc object.
15 changes: 9 additions & 6 deletions core/src/main/java/org/jruby/truffle/nodes/cast/ProcOrNullNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,12 +9,15 @@
*/
package org.jruby.truffle.nodes.cast;

import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.frame.*;
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.core.*;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.RubyTypesGen;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyNilClass;
import org.jruby.truffle.runtime.core.RubyProc;

/**
* Wraps some node that will produce either a {@link RubyProc} or a {@link RubyNilClass} and
15 changes: 7 additions & 8 deletions core/src/main/java/org/jruby/truffle/nodes/cast/SplatCastNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,21 +9,20 @@
*/
package org.jruby.truffle.nodes.cast;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.frame.*;
import org.jruby.RubyNil;
import org.jruby.truffle.nodes.*;
import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.core.ArrayDupNode;
import org.jruby.truffle.nodes.core.ArrayDupNodeFactory;
import org.jruby.truffle.nodes.dispatch.Dispatch;
import org.jruby.truffle.nodes.dispatch.DispatchHeadNode;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyNilClass;
import org.jruby.truffle.runtime.core.RubyString;

/**
* Splat as used to cast a value to an array if it isn't already, as in {@code *value}.
15 changes: 8 additions & 7 deletions core/src/main/java/org/jruby/truffle/nodes/cast/StringToSymbolNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,13 +9,14 @@
*/
package org.jruby.truffle.nodes.cast;

import com.oracle.truffle.api.*;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.dsl.*;
import com.oracle.truffle.api.nodes.*;
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.core.*;
import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.dsl.NodeChild;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyString;
import org.jruby.truffle.runtime.core.RubySymbol;

/**
* Creates a symbol from a string.
7 changes: 3 additions & 4 deletions core/src/main/java/org/jruby/truffle/nodes/control/AndNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,15 +9,14 @@
*/
package org.jruby.truffle.nodes.control;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
import org.jruby.truffle.nodes.cast.BooleanCastNodeFactory;
import org.jruby.truffle.runtime.RubyContext;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.utilities.ConditionProfile;

/**
* Represents a Ruby {@code and} or {@code &&} expression.
*/
Loading