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: a408b5179856
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab609bd3b7b5
Choose a head ref
  • 13 commits
  • 179 files changed
  • 1 contributor

Commits on Dec 30, 2016

  1. [Truffle] Dead code.

    chrisseaton committed Dec 30, 2016
    Copy the full SHA
    5e35530 View commit details
  2. Copy the full SHA
    408ce51 View commit details
  3. Copy the full SHA
    a0f9681 View commit details
  4. [Truffle] Maintain character offset and length for the current line i…

    …n the lexer, and verify we can make correct SourceSections with these.
    chrisseaton committed Dec 30, 2016
    Copy the full SHA
    fd6ebb3 View commit details
  5. Copy the full SHA
    2cf2e9d View commit details
  6. Copy the full SHA
    26acff3 View commit details
  7. Copy the full SHA
    55f927e View commit details
  8. [Truffle] Normalise the terminology in our nodes and TempSourceSectio…

    …n to that in SourceSection.
    chrisseaton committed Dec 30, 2016
    Copy the full SHA
    852c1ea View commit details
  9. Copy the full SHA
    62068e6 View commit details

Commits on Dec 31, 2016

  1. Copy the full SHA
    effc527 View commit details
  2. Copy the full SHA
    f820c07 View commit details
  3. Copy the full SHA
    56289d8 View commit details
  4. Copy the full SHA
    ab609bd View commit details
Showing with 855 additions and 858 deletions.
  1. +5 −0 truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodArrayArgumentsNode.java
  2. +5 −0 truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodNode.java
  3. +4 −4 truffle/src/main/java/org/jruby/truffle/builtins/CoreMethodNodeManager.java
  4. +5 −0 truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveArrayArgumentsNode.java
  5. +5 −0 truffle/src/main/java/org/jruby/truffle/builtins/PrimitiveNode.java
  6. +7 −1 truffle/src/main/java/org/jruby/truffle/builtins/YieldingCoreMethodNode.java
  7. +4 −3 truffle/src/main/java/org/jruby/truffle/core/MathNodes.java
  8. +2 −1 truffle/src/main/java/org/jruby/truffle/core/RaiseIfFrozenNode.java
  9. +3 −2 truffle/src/main/java/org/jruby/truffle/core/VMPrimitiveNodes.java
  10. +10 −10 truffle/src/main/java/org/jruby/truffle/core/array/ArrayLiteralNode.java
  11. +2 −1 truffle/src/main/java/org/jruby/truffle/core/cast/NumericToFloatNode.java
  12. +13 −12 truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
  13. +2 −1 truffle/src/main/java/org/jruby/truffle/core/method/MethodNodes.java
  14. +2 −1 truffle/src/main/java/org/jruby/truffle/core/method/UnboundMethodNodes.java
  15. +11 −11 truffle/src/main/java/org/jruby/truffle/core/module/ModuleNodes.java
  16. +3 −3 truffle/src/main/java/org/jruby/truffle/core/symbol/SymbolNodes.java
  17. +29 −25 truffle/src/main/java/org/jruby/truffle/language/RubyBaseNode.java
  18. +2 −3 truffle/src/main/java/org/jruby/truffle/language/RubyNode.java
  19. +51 −0 truffle/src/main/java/org/jruby/truffle/language/SourceIndexLength.java
  20. +2 −2 truffle/src/main/java/org/jruby/truffle/language/control/SequenceNode.java
  21. +4 −3 truffle/src/main/java/org/jruby/truffle/language/control/WhileNode.java
  22. +2 −2 truffle/src/main/java/org/jruby/truffle/language/locals/InstrumentedWriteLocalVariableNode.java
  23. +2 −2 truffle/src/main/java/org/jruby/truffle/language/locals/WriteDeclarationVariableNode.java
  24. +3 −3 truffle/src/main/java/org/jruby/truffle/language/locals/WriteLocalVariableNode.java
  25. +2 −1 truffle/src/main/java/org/jruby/truffle/language/methods/GetDefaultDefineeNode.java
  26. +2 −1 truffle/src/main/java/org/jruby/truffle/language/methods/LookupMethodNode.java
  27. +4 −13 truffle/src/main/java/org/jruby/truffle/language/objects/AllocateObjectNode.java
  28. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/DefineClassNode.java
  29. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/DefineModuleNode.java
  30. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/DynamicLexicalScopeNode.java
  31. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/FreezeNode.java
  32. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/IsANode.java
  33. +2 −3 truffle/src/main/java/org/jruby/truffle/language/objects/IsFrozenNode.java
  34. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/LexicalScopeNode.java
  35. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/LogicalClassNode.java
  36. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/MetaClassNode.java
  37. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/ReadClassVariableNode.java
  38. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/ReadInstanceVariableNode.java
  39. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/RunModuleDefinitionNode.java
  40. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/SingletonClassNode.java
  41. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/WriteClassVariableNode.java
  42. +2 −2 truffle/src/main/java/org/jruby/truffle/language/objects/WriteInstanceVariableNode.java
  43. +2 −1 truffle/src/main/java/org/jruby/truffle/language/supercall/LookupSuperMethodNode.java
  44. +99 −98 truffle/src/main/java/org/jruby/truffle/parser/BodyTranslator.java
  45. +12 −11 truffle/src/main/java/org/jruby/truffle/parser/LoadArgumentsTranslator.java
  46. +13 −45 truffle/src/main/java/org/jruby/truffle/parser/MethodTranslator.java
  47. +2 −1 truffle/src/main/java/org/jruby/truffle/parser/ReadLocalDummyParseNode.java
  48. +9 −8 truffle/src/main/java/org/jruby/truffle/parser/ReloadArgumentsTranslator.java
  49. +0 −75 truffle/src/main/java/org/jruby/truffle/parser/TempSourceSection.java
  50. +16 −24 truffle/src/main/java/org/jruby/truffle/parser/Translator.java
  51. +8 −7 truffle/src/main/java/org/jruby/truffle/parser/TranslatorDriver.java
  52. +3 −2 truffle/src/main/java/org/jruby/truffle/parser/TranslatorEnvironment.java
  53. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/AliasParseNode.java
  54. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/AndParseNode.java
  55. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ArgsCatParseNode.java
  56. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/ArgsParseNode.java
  57. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ArgsPushParseNode.java
  58. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/ArgumentParseNode.java
  59. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/ArrayParseNode.java
  60. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/AssignableParseNode.java
  61. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/AttrAssignParseNode.java
  62. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/BackRefParseNode.java
  63. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/BeginParseNode.java
  64. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/BignumParseNode.java
  65. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/BlockArgParseNode.java
  66. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/BlockParseNode.java
  67. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/BlockPassParseNode.java
  68. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/BreakParseNode.java
  69. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/CallParseNode.java
  70. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/CaseParseNode.java
  71. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ClassParseNode.java
  72. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ClassVarAsgnParseNode.java
  73. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ClassVarDeclParseNode.java
  74. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ClassVarParseNode.java
  75. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/Colon2ConstParseNode.java
  76. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/Colon2ImplicitParseNode.java
  77. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/Colon2ParseNode.java
  78. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/Colon3ParseNode.java
  79. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ComplexParseNode.java
  80. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ConstDeclParseNode.java
  81. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ConstParseNode.java
  82. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/DAsgnParseNode.java
  83. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/DParseNode.java
  84. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/DRegexpParseNode.java
  85. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/DStrParseNode.java
  86. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/DSymbolParseNode.java
  87. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/DVarParseNode.java
  88. +4 −4 truffle/src/main/java/org/jruby/truffle/parser/ast/DXStrParseNode.java
  89. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/DefinedParseNode.java
  90. +4 −4 truffle/src/main/java/org/jruby/truffle/parser/ast/DefnParseNode.java
  91. +4 −4 truffle/src/main/java/org/jruby/truffle/parser/ast/DefsParseNode.java
  92. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/DotParseNode.java
  93. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/EncodingParseNode.java
  94. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/EnsureParseNode.java
  95. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/EvStrParseNode.java
  96. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/FCallParseNode.java
  97. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/FalseParseNode.java
  98. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/FileParseNode.java
  99. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/FixnumParseNode.java
  100. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/FlipParseNode.java
  101. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/FloatParseNode.java
  102. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ForParseNode.java
  103. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/GlobalAsgnParseNode.java
  104. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/GlobalVarParseNode.java
  105. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/HashParseNode.java
  106. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/IfParseNode.java
  107. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/InstAsgnParseNode.java
  108. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/InstVarParseNode.java
  109. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/IterParseNode.java
  110. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/KeywordArgParseNode.java
  111. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/KeywordRestArgParseNode.java
  112. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/LambdaParseNode.java
  113. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/ListParseNode.java
  114. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/LiteralParseNode.java
  115. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/LocalAsgnParseNode.java
  116. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/LocalVarParseNode.java
  117. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/Match2CaptureParseNode.java
  118. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/Match2ParseNode.java
  119. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/Match3ParseNode.java
  120. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/MatchParseNode.java
  121. +4 −4 truffle/src/main/java/org/jruby/truffle/parser/ast/MethodDefParseNode.java
  122. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ModuleParseNode.java
  123. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/MultipleAsgnParseNode.java
  124. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/NewlineParseNode.java
  125. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/NextParseNode.java
  126. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/NilParseNode.java
  127. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/NthRefParseNode.java
  128. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/NumericParseNode.java
  129. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/OpAsgnAndParseNode.java
  130. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/OpAsgnConstDeclParseNode.java
  131. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/OpAsgnOrParseNode.java
  132. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/OpAsgnParseNode.java
  133. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/OpElementAsgnParseNode.java
  134. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/OptArgParseNode.java
  135. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/OrParseNode.java
  136. +13 −15 truffle/src/main/java/org/jruby/truffle/parser/ast/ParseNode.java
  137. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/PostExeParseNode.java
  138. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/PreExe19ParseNode.java
  139. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/PreExeParseNode.java
  140. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RationalParseNode.java
  141. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RedoParseNode.java
  142. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RegexpParseNode.java
  143. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RescueBodyParseNode.java
  144. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RescueModParseNode.java
  145. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RescueParseNode.java
  146. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RestArgParseNode.java
  147. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/RetryParseNode.java
  148. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ReturnParseNode.java
  149. +4 −4 truffle/src/main/java/org/jruby/truffle/parser/ast/RootParseNode.java
  150. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/SClassParseNode.java
  151. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/SValueParseNode.java
  152. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/SelfParseNode.java
  153. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/SplatParseNode.java
  154. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/StarParseNode.java
  155. +4 −4 truffle/src/main/java/org/jruby/truffle/parser/ast/StrParseNode.java
  156. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/SuperParseNode.java
  157. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/SymbolParseNode.java
  158. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/TrueParseNode.java
  159. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/TruffleFragmentParseNode.java
  160. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/UndefParseNode.java
  161. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/UnnamedRestArgParseNode.java
  162. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/UntilParseNode.java
  163. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/VAliasParseNode.java
  164. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/VCallParseNode.java
  165. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/WhenOneArgParseNode.java
  166. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/WhenParseNode.java
  167. +3 −3 truffle/src/main/java/org/jruby/truffle/parser/ast/WhileParseNode.java
  168. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/XStrParseNode.java
  169. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/YieldParseNode.java
  170. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ZArrayParseNode.java
  171. +2 −2 truffle/src/main/java/org/jruby/truffle/parser/ast/ZSuperParseNode.java
  172. +49 −26 truffle/src/main/java/org/jruby/truffle/parser/lexer/RubyLexer.java
  173. +0 −7 truffle/src/main/java/org/jruby/truffle/parser/lexer/SyntaxException.java
  174. +4 −4 truffle/src/main/java/org/jruby/truffle/parser/parser/ArgsTailHolder.java
  175. +66 −55 truffle/src/main/java/org/jruby/truffle/parser/parser/ParserSupport.java
  176. +68 −68 truffle/src/main/java/org/jruby/truffle/parser/parser/RubyParser.java
  177. +4 −3 truffle/src/main/java/org/jruby/truffle/parser/parser/RubyParser.y
  178. +6 −7 truffle/src/main/java/org/jruby/truffle/parser/scope/StaticScope.java
  179. +1 −1 truffle/src/test/java/org/jruby/truffle/parser/SourceSectionTest.java
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.SourceIndexLength;

@NodeChild(value = "arguments", type = RubyNode[].class)
public abstract class CoreMethodArrayArgumentsNode extends CoreMethodNode {
@@ -24,4 +25,8 @@ public CoreMethodArrayArgumentsNode(RubyContext context, SourceSection sourceSec
super(context, sourceSection);
}

public CoreMethodArrayArgumentsNode(RubyContext context, SourceIndexLength sourceSection) {
super(context, sourceSection);
}

}
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.SourceIndexLength;

@GenerateNodeFactory
public abstract class CoreMethodNode extends RubyNode {
@@ -24,4 +25,8 @@ public CoreMethodNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

public CoreMethodNode(RubyContext context, SourceIndexLength sourceSection) {
super(context, sourceSection);
}

}
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.RubyRootNode;
import org.jruby.truffle.parser.TempSourceSection;
import org.jruby.truffle.language.SourceIndexLength;
import org.jruby.truffle.language.Visibility;
import org.jruby.truffle.language.arguments.MissingArgumentBehavior;
import org.jruby.truffle.language.arguments.ProfileArgumentNode;
@@ -187,21 +187,21 @@ private static CallTarget makeGenericMethod(RubyContext context, MethodDetails m
final CoreMethod method = methodDetails.getMethodAnnotation();

final SourceSection sourceSection = sharedMethodInfo.getSourceSection();
final TempSourceSection tempSourceSection = new TempSourceSection(sourceSection);
final SourceIndexLength sourceIndexLength = new SourceIndexLength(sourceSection.getCharIndex(), sourceSection.getCharLength());

final RubyNode methodNode = createCoreMethodNode(context, sourceSection, methodDetails.getNodeFactory(), method);

if (CHECK_DSL_USAGE) {
AmbiguousOptionalArgumentChecker.verifyNoAmbiguousOptionalArguments(methodDetails);
}

final RubyNode checkArity = Translator.createCheckArityNode(context, sourceSection.getSource(), tempSourceSection, sharedMethodInfo.getArity());
final RubyNode checkArity = Translator.createCheckArityNode(context, sourceSection.getSource(), sourceIndexLength, sharedMethodInfo.getArity());

RubyNode node;
if (!isSafe(context, method.unsafe())) {
node = new UnsafeNode(context, sourceSection);
} else {
node = Translator.sequence(context, sourceSection.getSource(), tempSourceSection, Arrays.asList(checkArity, methodNode));
node = Translator.sequence(context, sourceSection.getSource(), sourceIndexLength, Arrays.asList(checkArity, methodNode));
node = transformResult(method, node);
}

Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.SourceIndexLength;

@GenerateNodeFactory
@NodeChild(value = "arguments", type = RubyNode[].class)
@@ -26,4 +27,8 @@ public PrimitiveArrayArgumentsNode(RubyContext context, SourceSection sourceSect
super(context, sourceSection);
}

public PrimitiveArrayArgumentsNode(RubyContext context, SourceIndexLength sourceSection) {
super(context, sourceSection);
}

}
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.SourceIndexLength;

@GenerateNodeFactory
public abstract class PrimitiveNode extends RubyNode {
@@ -27,4 +28,8 @@ public PrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

public PrimitiveNode(RubyContext context, SourceIndexLength sourceSection) {
super(context, sourceSection);
}

}
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.cast.BooleanCastNode;
import org.jruby.truffle.core.cast.BooleanCastNodeGen;
import org.jruby.truffle.language.SourceIndexLength;
import org.jruby.truffle.language.yield.YieldNode;

public abstract class YieldingCoreMethodNode extends CoreMethodArrayArgumentsNode {
@@ -24,14 +25,19 @@ public abstract class YieldingCoreMethodNode extends CoreMethodArrayArgumentsNod
@Child private BooleanCastNode booleanCastNode;

public YieldingCoreMethodNode() {
this(null, null);
this(null, (SourceSection) null);
}

public YieldingCoreMethodNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
dispatchNode = new YieldNode(context);
}

public YieldingCoreMethodNode(RubyContext context, SourceIndexLength sourceSection) {
super(context, sourceSection);
dispatchNode = new YieldNode(context);
}

public Object yield(VirtualFrame frame, DynamicObject block, Object... arguments) {
return dispatchNode.dispatch(frame, block, arguments);
}
7 changes: 4 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/MathNodes.java
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@
import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode;
import org.jruby.truffle.core.cast.ToFNode;
import org.jruby.truffle.language.NotProvided;
import org.jruby.truffle.language.SourceIndexLength;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.objects.IsANode;
import org.jruby.truffle.language.objects.IsANodeGen;
@@ -394,7 +395,7 @@ public abstract static class LGammaNode extends CoreMethodArrayArgumentsNode {

public LGammaNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
isANode = IsANodeGen.create(context, sourceSection, null, null);
isANode = IsANodeGen.create(context, new SourceIndexLength(sourceSection), null, null);
toFNode = ToFNode.create();
}

@@ -586,7 +587,7 @@ protected SimpleMonadicMathNode() {

protected SimpleMonadicMathNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
isANode = IsANodeGen.create(context, sourceSection, null, null);
isANode = IsANodeGen.create(context, new SourceIndexLength(sourceSection), null, null);
toFNode = ToFNode.create();
}

@@ -642,7 +643,7 @@ protected SimpleDyadicMathNode() {

protected SimpleDyadicMathNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
isANode = IsANodeGen.create(context, sourceSection, null, null);
isANode = IsANodeGen.create(context, new SourceIndexLength(sourceSection), null, null);
floatANode = ToFNode.create();
floatBNode = ToFNode.create();
}
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.SourceIndexLength;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.objects.IsFrozenNode;
import org.jruby.truffle.language.objects.IsFrozenNodeGen;
@@ -29,7 +30,7 @@ public class RaiseIfFrozenNode extends RubyNode {
public RaiseIfFrozenNode(RubyContext context, SourceSection sourceSection, RubyNode child) {
super(context, sourceSection);
this.child = child;
isFrozenNode = IsFrozenNodeGen.create(context, sourceSection, null);
isFrozenNode = IsFrozenNodeGen.create(context, new SourceIndexLength(sourceSection), null);
}

@Override
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@
import org.jruby.truffle.core.proc.ProcSignalHandler;
import org.jruby.truffle.core.string.StringOperations;
import org.jruby.truffle.language.RubyGuards;
import org.jruby.truffle.language.SourceIndexLength;
import org.jruby.truffle.language.control.ExitException;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.control.ThrowException;
@@ -214,7 +215,7 @@ public static abstract class VMObjectClassPrimitiveNode extends PrimitiveArrayAr

public VMObjectClassPrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
classNode = LogicalClassNodeGen.create(context, sourceSection, null);
classNode = LogicalClassNodeGen.create(context, new SourceIndexLength(sourceSection), null);
}

@Specialization
@@ -242,7 +243,7 @@ public static abstract class VMObjectKindOfPrimitiveNode extends PrimitiveArrayA

public VMObjectKindOfPrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
isANode = IsANodeGen.create(context, sourceSection, null, null);
isANode = IsANodeGen.create(context, new SourceIndexLength(sourceSection), null, null);
}

@Specialization
Original file line number Diff line number Diff line change
@@ -19,23 +19,23 @@
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.CoreLibrary;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.parser.TempSourceSection;
import org.jruby.truffle.language.SourceIndexLength;
import org.jruby.truffle.language.objects.AllocateObjectNode;
import org.jruby.truffle.language.objects.AllocateObjectNodeGen;

public abstract class ArrayLiteralNode extends RubyNode {

public static ArrayLiteralNode create(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public static ArrayLiteralNode create(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
return new UninitialisedArrayLiteralNode(context, sourceSection, values);
}

@Children protected final RubyNode[] values;
@Child protected AllocateObjectNode allocateObjectNode;

public ArrayLiteralNode(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public ArrayLiteralNode(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
super(context, sourceSection);
this.values = values;
this.allocateObjectNode = AllocateObjectNodeGen.create(context, (TempSourceSection) null, false, null, null);
this.allocateObjectNode = AllocateObjectNodeGen.create(context, (SourceIndexLength) null, false, null, null);
}

protected DynamicObject makeGeneric(VirtualFrame frame, Object[] alreadyExecuted) {
@@ -97,7 +97,7 @@ public RubyNode stealNode(int index) {

private static class EmptyArrayLiteralNode extends ArrayLiteralNode {

public EmptyArrayLiteralNode(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public EmptyArrayLiteralNode(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
super(context, sourceSection, values);
}

@@ -110,7 +110,7 @@ public Object execute(VirtualFrame frame) {

private static class FloatArrayLiteralNode extends ArrayLiteralNode {

public FloatArrayLiteralNode(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public FloatArrayLiteralNode(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
super(context, sourceSection, values);
}

@@ -144,7 +144,7 @@ private DynamicObject makeGeneric(VirtualFrame frame, final double[] executedVal

private static class IntegerArrayLiteralNode extends ArrayLiteralNode {

public IntegerArrayLiteralNode(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public IntegerArrayLiteralNode(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
super(context, sourceSection, values);
}

@@ -178,7 +178,7 @@ private DynamicObject makeGeneric(VirtualFrame frame, final int[] executedValues

private static class LongArrayLiteralNode extends ArrayLiteralNode {

public LongArrayLiteralNode(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public LongArrayLiteralNode(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
super(context, sourceSection, values);
}

@@ -212,7 +212,7 @@ private DynamicObject makeGeneric(VirtualFrame frame, final long[] executedValue

private static class ObjectArrayLiteralNode extends ArrayLiteralNode {

public ObjectArrayLiteralNode(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public ObjectArrayLiteralNode(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
super(context, sourceSection, values);
}

@@ -232,7 +232,7 @@ public Object execute(VirtualFrame frame) {

private static class UninitialisedArrayLiteralNode extends ArrayLiteralNode {

public UninitialisedArrayLiteralNode(RubyContext context, TempSourceSection sourceSection, RubyNode[] values) {
public UninitialisedArrayLiteralNode(RubyContext context, SourceIndexLength sourceSection, RubyNode[] values) {
super(context, sourceSection, values);
}

Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.language.RubyNode;
import org.jruby.truffle.language.SourceIndexLength;
import org.jruby.truffle.language.control.RaiseException;
import org.jruby.truffle.language.dispatch.CallDispatchHeadNode;
import org.jruby.truffle.language.dispatch.DispatchHeadNodeFactory;
@@ -40,7 +41,7 @@ public abstract class NumericToFloatNode extends RubyNode {

public NumericToFloatNode(RubyContext context, SourceSection sourceSection, String method) {
super(context, sourceSection);
isANode = IsANodeGen.create(context, sourceSection, null, null);
isANode = IsANodeGen.create(context, new SourceIndexLength(sourceSection), null, null);
this.method = method;
}

Loading