Skip to content

Commit 3493741

Browse files
committed
Adopt changes in Prism Node constructor signatures
1 parent 744467c commit 3493741

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/main/java/org/truffleruby/parser/YARPTranslator.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,16 +1800,16 @@ public RubyNode visitIndexOperatorWriteNode(Nodes.IndexOperatorWriteNode node) {
18001800
readArguments[i] = expression.getReadYARPNode();
18011801
}
18021802

1803-
final Nodes.Node read = new Nodes.CallNode(readReceiver, "[]",
1804-
new Nodes.ArgumentsNode(readArguments, (short) 0, 0, 0), blockArgument, (short) 0, 0, 0);
1803+
final Nodes.Node read = new Nodes.CallNode(NO_FLAGS, readReceiver, "[]",
1804+
new Nodes.ArgumentsNode(NO_FLAGS, readArguments, 0, 0), blockArgument, 0, 0);
18051805
final Nodes.Node executeOperator = callNode(node, read, node.operator, node.value);
18061806

18071807
final Nodes.Node[] readArgumentsAndResult = new Nodes.Node[argumentsCount + 1];
18081808
System.arraycopy(readArguments, 0, readArgumentsAndResult, 0, argumentsCount);
18091809
readArgumentsAndResult[argumentsCount] = executeOperator;
18101810

1811-
final Nodes.Node write = new Nodes.CallNode(readReceiver, "[]=",
1812-
new Nodes.ArgumentsNode(readArgumentsAndResult, (short) 0, 0, 0), blockArgument, (short) 0, 0, 0);
1811+
final Nodes.Node write = new Nodes.CallNode(NO_FLAGS, readReceiver, "[]=",
1812+
new Nodes.ArgumentsNode(NO_FLAGS, readArgumentsAndResult, 0, 0), blockArgument, 0, 0);
18131813
final RubyNode writeNode = write.accept(this);
18141814
final RubyNode writeArgumentsNode = sequence(Arrays.asList(writeArgumentsNodes));
18151815
final RubyNode rubyNode;
@@ -1878,16 +1878,16 @@ private RubyNode translateIndexOrAndIndexAndWriteNodes(boolean isAndOperator, No
18781878
blockArgument = null;
18791879
}
18801880

1881-
final Nodes.Node read = new Nodes.CallNode(readReceiver, "[]",
1882-
new Nodes.ArgumentsNode(readArguments, (short) 0, 0, 0), blockArgument, (short) 0, 0, 0);
1881+
final Nodes.Node read = new Nodes.CallNode(NO_FLAGS, readReceiver, "[]",
1882+
new Nodes.ArgumentsNode(NO_FLAGS, readArguments, 0, 0), blockArgument, 0, 0);
18831883
final RubyNode readNode = read.accept(this);
18841884

18851885
final Nodes.Node[] readArgumentsAndValue = new Nodes.Node[arguments.length + 1];
18861886
System.arraycopy(readArguments, 0, readArgumentsAndValue, 0, arguments.length);
18871887
readArgumentsAndValue[arguments.length] = value;
18881888

1889-
final Nodes.Node write = new Nodes.CallNode(readReceiver, "[]=",
1890-
new Nodes.ArgumentsNode(readArgumentsAndValue, (short) 0, 0, 0), blockArgument, (short) 0, 0, 0);
1889+
final Nodes.Node write = new Nodes.CallNode(NO_FLAGS, readReceiver, "[]=",
1890+
new Nodes.ArgumentsNode(NO_FLAGS, readArgumentsAndValue, 0, 0), blockArgument, 0, 0);
18911891
final RubyNode writeNode = write.accept(this);
18921892

18931893
final RubyNode operatorNode;
@@ -1988,7 +1988,7 @@ public RubyNode visitIntegerNode(Nodes.IntegerNode node) {
19881988
public RubyNode visitInterpolatedMatchLastLineNode(Nodes.InterpolatedMatchLastLineNode node) {
19891989
// replace regexp with /.../ =~ $_
19901990

1991-
final var regexp = new Nodes.InterpolatedRegularExpressionNode(node.parts, node.flags, node.startOffset,
1991+
final var regexp = new Nodes.InterpolatedRegularExpressionNode(node.flags, node.parts, node.startOffset,
19921992
node.length);
19931993
final var regexpNode = regexp.accept(this);
19941994
final var lastLineNode = ReadGlobalVariableNodeGen.create("$_");
@@ -2197,7 +2197,7 @@ public RubyNode visitLocalVariableTargetNode(Nodes.LocalVariableTargetNode node)
21972197
public RubyNode visitMatchLastLineNode(Nodes.MatchLastLineNode node) {
21982198
// replace regexp with /.../ =~ $_
21992199

2200-
final var regexp = new Nodes.RegularExpressionNode(node.unescaped, node.flags, node.startOffset, node.length);
2200+
final var regexp = new Nodes.RegularExpressionNode(node.flags, node.unescaped, node.startOffset, node.length);
22012201
final var regexpNode = regexp.accept(this);
22022202
final var lastLineNode = ReadGlobalVariableNodeGen.create("$_");
22032203

@@ -2764,7 +2764,7 @@ public RubyNode visitWhileNode(Nodes.WhileNode node) {
27642764
@Override
27652765
public RubyNode visitXStringNode(Nodes.XStringNode node) {
27662766
// TODO: pass flags, needs https://github.com/ruby/yarp/issues/1567
2767-
var stringNode = new Nodes.StringNode((short) 0, node.unescaped, node.startOffset, node.length);
2767+
var stringNode = new Nodes.StringNode(NO_FLAGS, node.unescaped, node.startOffset, node.length);
27682768
final RubyNode string = stringNode.accept(this);
27692769

27702770
final RubyNode rubyNode = createCallNode(new SelfNode(), "`", string);
@@ -3142,12 +3142,12 @@ public RubyNode translateCallTargetNode(Nodes.CallNode node) {
31423142
arguments[arguments.length - 1] = new Nodes.NilNode(0, 0);
31433143

31443144
if (node.arguments == null) {
3145-
argumentsNode = new Nodes.ArgumentsNode(arguments, (short) 0, 0, 0);
3145+
argumentsNode = new Nodes.ArgumentsNode(NO_FLAGS, arguments, 0, 0);
31463146
} else {
3147-
argumentsNode = new Nodes.ArgumentsNode(arguments, node.arguments.flags, node.arguments.startOffset,
3147+
argumentsNode = new Nodes.ArgumentsNode(node.arguments.flags, arguments, node.arguments.startOffset,
31483148
node.arguments.length);
31493149
}
3150-
node = new Nodes.CallNode(node.receiver, node.name, argumentsNode, node.block, node.flags, node.startOffset,
3150+
node = new Nodes.CallNode(node.flags, node.receiver, node.name, argumentsNode, node.block, node.startOffset,
31513151
node.length);
31523152
}
31533153

@@ -3315,8 +3315,8 @@ protected static RubyNode sequence(List<RubyNode> sequence) {
33153315

33163316
protected static Nodes.CallNode callNode(Nodes.Node location, Nodes.Node receiver, String methodName,
33173317
Nodes.Node... arguments) {
3318-
return new Nodes.CallNode(receiver, methodName,
3319-
new Nodes.ArgumentsNode(arguments, NO_FLAGS, location.startOffset, location.length), null, NO_FLAGS,
3318+
return new Nodes.CallNode(NO_FLAGS, receiver, methodName,
3319+
new Nodes.ArgumentsNode(NO_FLAGS, arguments, location.startOffset, location.length), null,
33203320
location.startOffset, location.length);
33213321
}
33223322

0 commit comments

Comments
 (0)