Skip to content

Commit dab44d7

Browse files
committed
Adopt changes with InterpolatedSymbolNode node
1 parent ac968dc commit dab44d7

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,6 @@ public RubyNode visitConstantReadNode(Nodes.ConstantReadNode node) {
625625
}
626626

627627
public RubyNode visitConstantWriteNode(Nodes.ConstantWriteNode node) {
628-
final RubyNode rubyNode;
629628
final String name = toString(node.name_loc);
630629
final RubyNode value = translateNodeOrDeadNode(node.value, "YARPTranslator#visitConstantWriteNode");
631630
final RubyNode moduleNode;
@@ -641,7 +640,7 @@ public RubyNode visitConstantWriteNode(Nodes.ConstantWriteNode node) {
641640
moduleNode = new LexicalScopeNode(environment.getStaticLexicalScope());
642641
}
643642

644-
rubyNode = new WriteConstantNode(name, moduleNode, value);
643+
final RubyNode rubyNode = new WriteConstantNode(name, moduleNode, value);
645644

646645
assignNodePositionInSource(node, rubyNode);
647646
return rubyNode;
@@ -966,21 +965,9 @@ public RubyNode visitInterpolatedStringNode(Nodes.InterpolatedStringNode node) {
966965
public RubyNode visitInterpolatedSymbolNode(Nodes.InterpolatedSymbolNode node) {
967966
final ToSNode[] children = new ToSNode[node.parts.length];
968967

969-
// a special case for `:"abc"` literal - convert to Symbol ourselves
970-
if (node.parts.length == 1 && node.parts[0] instanceof Nodes.StringNode s) {
971-
final RubySymbol symbol = language.getSymbol(toString(s));
972-
final RubyNode rubyNode = new ObjectLiteralNode(symbol);
973-
974-
assignNodePositionInSource(node, rubyNode);
975-
copyNewlineFlag(s, rubyNode);
976-
977-
return rubyNode;
978-
}
979-
980968
for (int i = 0; i < node.parts.length; i++) {
981-
var part = node.parts[i];
982-
983-
children[i] = ToSNodeGen.create(part.accept(this));
969+
final RubyNode expression = node.parts[i].accept(this);
970+
children[i] = ToSNodeGen.create(expression);
984971
}
985972

986973
final RubyNode stringNode = new InterpolatedStringNode(children, sourceEncoding.jcoding);

0 commit comments

Comments
 (0)