jruby · May 5, 2015 · May 5, 2015 · May 5, 2015 · May 5, 2015
diff --git a/core/src/main/java/org/jruby/ast/ForNode.java b/core/src/main/java/org/jruby/ast/ForNode.java
@@ -68,11 +68,6 @@ public Node getIterNode() {
         return iterNode;
     }
 
-    @Override
-    public int getArgumentType() {
-        return BlockBody.asArgumentType(BlockBody.getArgumentTypeWackyHack(this));
-    }
-
     /**
      * Accept for the visitor pattern.
      * @param iVisitor the visitor

diff --git a/core/src/main/java/org/jruby/ast/IterNode.java b/core/src/main/java/org/jruby/ast/IterNode.java
@@ -71,10 +71,6 @@ public IterNode(ISourcePosition position, ArgsNode args, Node body, StaticScope
         this.scope = scope;
     }
 
-    public int getArgumentType() {
-        return BlockBody.asArgumentType(varNode.getNodeType());
-    }
-
     public NodeType getNodeType() {
         return NodeType.ITERNODE;
     }

diff --git a/core/src/main/java/org/jruby/ast/MultipleAsgn19Node.java b/core/src/main/java/org/jruby/ast/MultipleAsgn19Node.java
diff --git a/core/src/main/java/org/jruby/ast/MultipleAsgnNode.java b/core/src/main/java/org/jruby/ast/MultipleAsgnNode.java
@@ -1,5 +1,4 @@
-/*
- ***** BEGIN LICENSE BLOCK *****
+/***** BEGIN LICENSE BLOCK *****
  * Version: EPL 1.0/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Eclipse Public
@@ -12,10 +11,7 @@
  * implied. See the License for the specific language governing
  * rights and limitations under the License.
  *
- * Copyright (C) 2002 Jan Arne Petersen <jpetersen@uni-bonn.de>
- * Copyright (C) 2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
- * Copyright (C) 2002-2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
- * Copyright (C) 2004-2005 Thomas E Enebo <enebo@acm.org>
+ * Copyright (C) 2008 Thomas E Enebo <enebo@acm.org>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -36,58 +32,50 @@
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.ISourcePosition;
 
+/**
+ *
+ */
 public class MultipleAsgnNode extends AssignableNode {
     private final ListNode pre;
     private final Node rest;
-
-    public MultipleAsgnNode(ISourcePosition position, ListNode pre, Node rest) {
+    private final ListNode post;
+
+    public MultipleAsgnNode(ISourcePosition position, ListNode pre, Node rest, ListNode post) {
         super(position);
         this.pre = pre;
         this.rest = rest;
+        this.post = post;
     }
 
     public NodeType getNodeType() {
         return NodeType.MULTIPLEASGNNODE;
     }
-
-    /**
-     * Accept for the visitor pattern.
-     * @param iVisitor the visitor
-     **/
+
     public <T> T accept(NodeVisitor<T> iVisitor) {
         return iVisitor.visitMultipleAsgnNode(this);
     }
 
-    /**
-     * Gets the headNode.
-     * @return Returns a ListNode
-     */
-    public ListNode getHeadNode() {
-        return pre;
+    public Node getRest() {
+        return rest;
     }
 
     public ListNode getPre() {
         return pre;
     }
-
-    /**
-     * Gets the argsNode.
-     * @return Returns a INode
-     */
-    public Node getArgsNode() {
-        return rest;
+
+    public int getPreCount() {
+        return pre == null ? 0 : pre.size();
     }
 
-    public Node getRest() {
-        return rest;
+    public int getPostCount() {
+        return post == null ? 0 : post.size();
     }
-    
-    public List<Node> childNodes() {
-        return Node.createList(pre, rest, getValueNode());
+
+    public ListNode getPost() {
+        return post;
     }
 
-    @Override
-    public boolean needsDefinitionCheck() {
-        return false;
+    public List<Node> childNodes() {
+        return Node.createList(pre, rest, getValueNode());
     }
 }
diff --git a/core/src/main/java/org/jruby/ast/NodeType.java b/core/src/main/java/org/jruby/ast/NodeType.java
@@ -38,13 +38,13 @@ public enum NodeType {
     ENSURENODE, EVSTRNODE, FALSENODE, FCALLNODE, FIXNUMNODE, FLIPNODE, FLOATNODE, FORNODE,
     GLOBALASGNNODE, GLOBALVARNODE, HASHNODE, IFNODE, INSTASGNNODE, INSTVARNODE, ISCOPINGNODE,
     ITERNODE, LISTNODE, LOCALASGNNODE, LOCALVARNODE, MATCH2NODE, MATCH3NODE, MATCHNODE,MODULENODE,
-    MULTIPLEASGNNODE, NEWLINENODE, NEXTNODE, NILNODE, NOTNODE, NTHREFNODE, OPASGNANDNODE,
+    NEWLINENODE, NEXTNODE, NILNODE, NOTNODE, NTHREFNODE, OPASGNANDNODE,
     OPASGNNODE, OPASGNORNODE, OPELEMENTASGNNODE, ORNODE, PREEXENODE, POSTEXENODE, REDONODE, 
     REGEXPNODE, RESCUEBODYNODE, RESCUENODE, RETRYNODE, RETURNNODE, SCLASSNODE, SCOPENODE,
     SELFNODE, SPLATNODE, STARNODE, STRNODE, SUPERNODE, SVALUENODE, SYMBOLNODE,
     TRUENODE, UNDEFNODE, UNTILNODE, VALIASNODE, VCALLNODE, WHENNODE, WHILENODE, XSTRNODE, YIELDNODE,
     ZARRAYNODE, ZEROARGNODE, ZSUPERNODE, COMMENTNODE, ROOTNODE, ATTRASSIGNNODE, ARGSPUSHNODE,
-    OPTARGNODE, ARGAUXILIARYNODE, LAMBDANODE, MULTIPLEASGN19NODE, RESTARG, ENCODINGNODE,
+    OPTARGNODE, ARGAUXILIARYNODE, LAMBDANODE, MULTIPLEASGNNODE, RESTARG, ENCODINGNODE,
     LITERALNODE, BLOCKARG18NODE, KEYWORDARGNODE, KEYWORDRESTARGNODE, RATIONALNODE, COMPLEXNODE,
     REQUIRED_KEYWORD_ARGUMENT_VALUE;
 

diff --git a/core/src/main/java/org/jruby/ast/visitor/AbstractNodeVisitor.java b/core/src/main/java/org/jruby/ast/visitor/AbstractNodeVisitor.java
@@ -358,11 +358,6 @@ public T visitMultipleAsgnNode(MultipleAsgnNode node) {
         return defaultVisit(node);
     }
 
-    @Override
-    public T visitMultipleAsgnNode(MultipleAsgn19Node node) {
-        return defaultVisit(node);
-    }
-
     @Override
     public T visitMatch2Node(Match2Node node) {
         return defaultVisit(node);

diff --git a/core/src/main/java/org/jruby/ast/visitor/NodeVisitor.java b/core/src/main/java/org/jruby/ast/visitor/NodeVisitor.java
@@ -101,7 +101,6 @@ public interface NodeVisitor<T> {
     public T visitLocalAsgnNode(LocalAsgnNode iVisited);
     public T visitLocalVarNode(LocalVarNode iVisited);
     public T visitMultipleAsgnNode(MultipleAsgnNode iVisited);
-    public T visitMultipleAsgnNode(MultipleAsgn19Node iVisited);
     public T visitMatch2Node(Match2Node iVisited);
     public T visitMatch3Node(Match3Node iVisited);
     public T visitMatchNode(MatchNode iVisited);

diff --git a/core/src/main/java/org/jruby/evaluator/ASTInterpreter.java b/core/src/main/java/org/jruby/evaluator/ASTInterpreter.java