All ArrayNodes for args list are lightweight. Simplify buildCallArgs …

…a little more
godfat · Dec 30, 2014 · 8d89919 · 8d89919
1 parent 6cfa5bb
commit 8d89919
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 84 deletions.
diff --git a/core/src/main/java/org/jruby/ast/AttrAssignNode.java b/core/src/main/java/org/jruby/ast/AttrAssignNode.java
@@ -53,7 +53,7 @@ public AttrAssignNode(ISourcePosition position, Node receiverNode, String name,
 
         this.receiverNode = receiverNode;
         this.name = name;
-        setArgsInternal(argsNode);
+        this.argsNode = argsNode;
     }
 
     public NodeType getNodeType() {
@@ -95,74 +95,15 @@ public Node getArgsNode() {
         return argsNode;
     }
 
-
-    protected Node newAttrAssignNode(ArrayNode argsNode) {
-        int size = argsNode.size();
-
-        switch (size) {
-            case 1:
-                return new AttrAssignOneArgNode(getPosition(), receiverNode, name, argsNode);
-            case 2:
-                return new AttrAssignTwoArgNode(getPosition(), receiverNode, name, argsNode);
-            case 3:
-                return new AttrAssignThreeArgNode(getPosition(), receiverNode, name, argsNode);
-            default:
-                return new AttrAssignNode(getPosition(), receiverNode, name, argsNode);
-        }
-    }
-
-    protected Node newMutatedAttrAssignNode(ArrayNode argsNode) {
-        int size = argsNode.size();
-
-        switch (size) {
-            case 1:
-                if (!(this instanceof AttrAssignOneArgNode)) {
-                    return new AttrAssignOneArgNode(getPosition(), receiverNode, name, argsNode);
-                } else {
-                    return this;
-                }
-            case 2:
-                if (!(this instanceof AttrAssignTwoArgNode)) {
-                    return new AttrAssignTwoArgNode(getPosition(), receiverNode, name, argsNode);
-                } else {
-                    return this;
-                }
-            case 3:
-                if (!(this instanceof AttrAssignThreeArgNode)) {
-                    return new AttrAssignThreeArgNode(getPosition(), receiverNode, name, argsNode);
-                } else {
-                    return this;
-                }
-            default:
-                return new AttrAssignNode(getPosition(), receiverNode, name, argsNode);
-        }
-    }
-
     /**
      * Set the argsNode
      * 
      * @param argsNode set the arguments for this node.
      */
     public Node setArgsNode(Node argsNode) {
-        // Empirical Observations:
-        // null -> Some arity
-        // argsNode == this.argsNode then check for arity changes
-        // newline(splatnode) -> argspushnode
-        if (this.argsNode == null && argsNode instanceof ArrayNode) {
-            return newAttrAssignNode((ArrayNode) argsNode);
-        } else if (this.argsNode == argsNode) {
-            return newMutatedAttrAssignNode((ArrayNode)argsNode);
-        }
-
-        setArgsInternal(argsNode);
-
-        return this;
-    }
-
-    private void setArgsInternal(Node argsNode) {
         this.argsNode = argsNode;
-        
-        if (argsNode instanceof ArrayNode) ((ArrayNode)argsNode).setLightweight(true);
+
+        return this;
     }
 
     public List<Node> childNodes() {

diff --git a/core/src/main/java/org/jruby/ast/CallNode.java b/core/src/main/java/org/jruby/ast/CallNode.java
@@ -55,7 +55,7 @@ public CallNode(ISourcePosition position, Node receiverNode, String name, Node a
 
         this.name = name;
         this.receiverNode = receiverNode;
-        setArgsNode(argsNode);
+        this.argsNode = argsNode;
         this.iterNode = iterNode;
     }
 
@@ -96,11 +96,7 @@ public Node getArgsNode() {
      */
     public Node setArgsNode(Node argsNode) {
         this.argsNode = argsNode;
-        // If we have more than one arg, make sure the array created to contain them is not ObjectSpaced
-        if (argsNode instanceof ArrayNode) {
-            ((ArrayNode)argsNode).setLightweight(true);
-        }
-
+
         return argsNode;
     }
 

diff --git a/core/src/main/java/org/jruby/ast/FCallNode.java b/core/src/main/java/org/jruby/ast/FCallNode.java
@@ -51,7 +51,7 @@ public FCallNode(ISourcePosition position, String name) {
     public FCallNode(ISourcePosition position, String name, Node argsNode, Node iterNode) {
         super(position);
         this.name = name;
-        setArgsNode(argsNode);
+        this.argsNode = argsNode;
         this.iterNode = iterNode;
     }
 
@@ -89,16 +89,11 @@ public Node getArgsNode() {
     }
 
     /**
-     * Set the argsNode.  This is for re-writer and general interpretation.
-     * 
-     * @param argsNode set the arguments for this node.
+     * Set the argsNode.  Changes to parser means fcall is made before actual
+     * args are associated with fcall so we need a setter.
      */
     public Node setArgsNode(Node argsNode) {
         this.argsNode = argsNode;
-        // If we have more than one arg, make sure the array created to contain them is not ObjectSpaced
-        if (argsNode instanceof ArrayNode) {
-            ((ArrayNode)argsNode).setLightweight(true);
-        }
 
         return argsNode;
     }

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -579,15 +579,10 @@ protected Operand buildCallArgs(List<Operand> argsList, Node args, IRScope s) {
             }
             case ARRAYNODE: {
                 ArrayNode arrayNode = (ArrayNode)args;
-                if (arrayNode.isLightweight()) {
-                    List<Node> children = arrayNode.childNodes();
+                List<Node> children = arrayNode.childNodes();
                     // explode array, it's an internal "args" array
-                    for (Node n: children) {
-                        argsList.add(build(n, s));
-                    }
-                } else {
-                    // use array as-is, it's a literal array
-                    argsList.add(build(arrayNode, s));
+                for (Node n: children) {
+                    argsList.add(build(n, s));
                 }
                 break;
             }