Adopt new ConstantWriteNode node

andrykonchin · andrykonchin · commit ac968dc79b71 · 2023-08-08T21:53:28.000+03:00
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_attribute.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_attribute.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with an attribute"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   Capturing exception to a setter is represented as a `a.foo=()` method call.
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_class_variable.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_class_variable.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with a class variable"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   A class variable capturing is represented with the following simplified AST:
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_constant.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_constant.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with a constant"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   A constant capturing is represented with the following simplified AST:
   
@@ -72,7 +72,7 @@ ast: |
                                                               DeadNode
                                                                   attributes:
                                                                       flags = 0
-                                                                      reason = "YARPTranslator#visitConstantPathWriteNode"
+                                                                      reason = "YARPTranslator#visitConstantWriteNode"
                                       IntegerFixnumLiteralNode
                                           attributes:
                                               flags = 1
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_constant_and_lexical_parent.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_constant_and_lexical_parent.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with a constant with lexical parent (A::B)"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   A constant capturing is represented with the following simplified AST:
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_constant_fully_qualified.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_constant_fully_qualified.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with a fully qualified constant (::A)"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   A constant capturing is represented with the following simplified AST:
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_constant_fully_qualified_and_lexical_parent.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_constant_fully_qualified_and_lexical_parent.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with a constant with fully qualified lexical parent (::A::B)"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   A constant capturing is represented with the following simplified AST:
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_element_reference.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_element_reference.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with element reference"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   Capturing exception to element reference is represented as a `a.[]=()` method call.
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_global_variable.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_global_variable.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with a global variable"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   A global variable capturing is represented with the following simplified AST:
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_instance_variable.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_instance_variable.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with an instance variable"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   An instance variable capturing is represented with the following simplified AST:
   
diff --git a/spec/truffle/parsing/fixtures/rescue/capturing/with_local_variable.yaml b/spec/truffle/parsing/fixtures/rescue/capturing/with_local_variable.yaml
@@ -1,6 +1,6 @@
 subject: "Rescue keyword"
 description: "capturing / with a local variable"
-yarp_specific: true
+yarp_specific: true # an AssignRescueVariableNode node is introduced
 notes: >
   A local variable is represented with the following simplified AST:
   
diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -582,45 +582,24 @@ public RubyNode visitConstantPathOperatorWriteNode(Nodes.ConstantPathOperatorWri
     }
 
     public RubyNode visitConstantPathWriteNode(Nodes.ConstantPathWriteNode node) {
-        assert node.target instanceof Nodes.ConstantPathNode || node.target instanceof Nodes.ConstantReadNode;
+        assert node.target instanceof Nodes.ConstantPathNode;
 
         final RubyNode rubyNode;
         final RubyNode value = translateNodeOrDeadNode(node.value, "YARPTranslator#visitConstantPathWriteNode");
+        final var pathNode = (Nodes.ConstantPathNode) node.target;
+        final String name = toString(pathNode.child);
+        final RubyNode moduleNode;
 
-        if (node.target instanceof Nodes.ConstantPathNode pathNode) {
-            final String name = toString(pathNode.child);
-            final RubyNode moduleNode;
-
-            if (pathNode.parent != null) {
-                // FOO::BAR = 1
-                moduleNode = pathNode.parent.accept(this);
-            } else {
-                // ::FOO = 1
-                moduleNode = new ObjectClassLiteralNode();
-            }
-
-            rubyNode = new WriteConstantNode(name, moduleNode, value);
-        } else if (node.target instanceof Nodes.ConstantReadNode readNode) {
-            // FOO = 1
-            final String name = toString(readNode);
-            final RubyNode moduleNode;
-
-            if (environment.isDynamicConstantLookup()) {
-                if (language.options.LOG_DYNAMIC_CONSTANT_LOOKUP) {
-                    RubyLanguage.LOGGER.info(() -> "set dynamic constant at " +
-                            RubyLanguage.getCurrentContext().fileLine(getSourceSection(node)));
-                }
-
-                moduleNode = new DynamicLexicalScopeNode();
-            } else {
-                moduleNode = new LexicalScopeNode(environment.getStaticLexicalScope());
-            }
-
-            rubyNode = new WriteConstantNode(name, moduleNode, value);
+        if (pathNode.parent != null) {
+            // FOO::BAR = 1
+            moduleNode = pathNode.parent.accept(this);
         } else {
-            throw CompilerDirectives.shouldNotReachHere();
+            // ::FOO = 1
+            moduleNode = new ObjectClassLiteralNode();
         }
 
+        rubyNode = new WriteConstantNode(name, moduleNode, value);
+
         assignNodePositionInSource(node, rubyNode);
         return rubyNode;
     }
@@ -645,6 +624,30 @@ public RubyNode visitConstantReadNode(Nodes.ConstantReadNode node) {
         return rubyNode;
     }
 
+    public RubyNode visitConstantWriteNode(Nodes.ConstantWriteNode node) {
+        final RubyNode rubyNode;
+        final String name = toString(node.name_loc);
+        final RubyNode value = translateNodeOrDeadNode(node.value, "YARPTranslator#visitConstantWriteNode");
+        final RubyNode moduleNode;
+
+        if (environment.isDynamicConstantLookup()) {
+            if (language.options.LOG_DYNAMIC_CONSTANT_LOOKUP) {
+                RubyLanguage.LOGGER.info(() -> "set dynamic constant at " +
+                        RubyLanguage.getCurrentContext().fileLine(getSourceSection(node)));
+            }
+
+            moduleNode = new DynamicLexicalScopeNode();
+        } else {
+            moduleNode = new LexicalScopeNode(environment.getStaticLexicalScope());
+        }
+
+        rubyNode = new WriteConstantNode(name, moduleNode, value);
+
+        assignNodePositionInSource(node, rubyNode);
+        return rubyNode;
+    }
+
+
     public RubyNode visitDefNode(Nodes.DefNode node) {
         return defaultVisit(node);
     }
