Changeset 3082

Timestamp:

11/19/08 08:38:20 (12 months ago)

Author:

sukyoungryu

Message:

[ast] Eliminated nodes: LValueBind, Unpasting, UnpastingBind?, and UnpastingSplit?

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (2 diffs)
• src/com/sun/fortress/compiler/IndexBuilder.java (modified) (3 diffs)
• src/com/sun/fortress/compiler/desugarer/DesugaringVisitor.java (modified) (7 diffs)
• src/com/sun/fortress/compiler/desugarer/FreeNameCollector.java (modified) (4 diffs)
• src/com/sun/fortress/compiler/desugarer/MutableVarRefRewriteVisitor.java (modified) (13 diffs)
• src/com/sun/fortress/compiler/desugarer/ObjectExpressionVisitor.java (modified) (1 diff)
• src/com/sun/fortress/compiler/desugarer/VarRefContainer.java (modified) (5 diffs)
• src/com/sun/fortress/compiler/disambiguator/ExprDisambiguator.java (modified) (3 diffs)
• src/com/sun/fortress/compiler/environments/TopLevelEnvGen.java (modified) (2 diffs)
• src/com/sun/fortress/compiler/index/DeclaredVariable.java (modified) (1 diff)
• src/com/sun/fortress/compiler/typechecker/InferenceVarInserter.java (modified) (2 diffs)
• src/com/sun/fortress/compiler/typechecker/LValueTypeEnv.java (modified) (7 diffs)
• src/com/sun/fortress/compiler/typechecker/LocalVarTypeEnv.java (modified) (4 diffs)
• src/com/sun/fortress/compiler/typechecker/TypeChecker.java (modified) (22 diffs)
• src/com/sun/fortress/compiler/typechecker/TypeEnv.java (modified) (5 diffs)
• src/com/sun/fortress/interpreter/Driver.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/BuildApiEnvironment.java (modified) (9 diffs)
• src/com/sun/fortress/interpreter/evaluator/BuildEnvironments.java (modified) (5 diffs)
• src/com/sun/fortress/interpreter/evaluator/BuildLetEnvironments.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/BuildTraitEnvironment.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/Evaluator.java (modified) (4 diffs)
• src/com/sun/fortress/interpreter/evaluator/LHSEvaluator.java (modified) (5 diffs)
• src/com/sun/fortress/interpreter/evaluator/LHSToLValue.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/types/FTypeObject.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (8 diffs)
• src/com/sun/fortress/interpreter/rewrite/IsAnArrowName.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/ApiMaker.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/ErrorMsgMaker.java (modified) (1 diff)
• src/com/sun/fortress/nodes_util/ExprFactory.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/NodeFactory.java (modified) (9 diffs)
• src/com/sun/fortress/nodes_util/NodeUtil.java (modified) (1 diff)
• src/com/sun/fortress/parser/AbsField.rats (modified) (2 diffs)
• src/com/sun/fortress/parser/LocalDecl.rats (modified) (6 diffs)
• src/com/sun/fortress/parser/NoNewlineExpr.rats (modified) (2 diffs)
• src/com/sun/fortress/parser/Variable.rats (modified) (7 diffs)
• src/com/sun/fortress/parser_util/FortressUtil.java (modified) (18 diffs)
• src/com/sun/fortress/parser_util/SyntaxChecker.java (modified) (1 diff)
• src/com/sun/fortress/syntax_abstractions/phases/Transform.java (modified) (2 diffs)
• src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (5 diffs)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -349 +349 @@
          * variable declaration in components or APIs
          */
-        abstract VarAbsDeclOrDecl(List<LValueBind> lhs) implements AbsDeclOrDecl;
+        abstract VarAbsDeclOrDecl(List<LValue> lhs) implements AbsDeclOrDecl;
             /**
              * variable declaration in APIs
@@ -375 +375 @@
         /**
          * left-hand side of variable declaration
-         */
-        abstract LValue();
-            /**
-             * e.g.) var x: ZZ32
-             * Name must be unqualified.
-             */
-            LValueBind(Id name, Option<Type> type = Option.<Type>none(),
-                       List<Modifier> mods = Collections.<Modifier>emptyList(),
-                       boolean mutable = false) implements Lhs, ImplicitGetterSetter;
-            /**
-             * left-hand side of matrix unpasting
-             * Unpasting ::= [ UnpastingElems ]
-             */
-            abstract Unpasting();
-                /**
-                 * simple unpasting
-                 * Names must be unqualified.
-                 * UnpastingElem ::= BindId ([ UnpastingDim ])?
-                 *                 | Unpasting
-                 * UnpastingDim ::= ExtentRange (BY ExtentRange)+
-                 * e.g.) squareShape[m BY m]
-                 */
-                UnpastingBind(Id name, List<ExtentRange> dim);
-                /**
-                 * complex unpasting
-                 * UnpastingElems ::= UnpastingElem RectSeparator UnpastingElems
-                 *                  | UnpastingElem
-                 * e.g.) squareShape[m BY m]  rest
-                 */
-                UnpastingSplit(List<Unpasting> elems, int dim);
+         * e.g.) var x: ZZ32
+         * Name must be unqualified.
+         */
+        LValue(Id name, Option<Type> type = Option.<Type>none(),
+               List<Modifier> mods = Collections.<Modifier>emptyList(),
+               boolean mutable = false) implements Lhs, ImplicitGetterSetter;
         /**
          * Overloading specification

trunk/ProjectFortress/src/com/sun/fortress/compiler/IndexBuilder.java

@@ -387 +387 @@
     private void buildVariables(VarAbsDeclOrDecl ast,
             Map<Id, Variable> variables) {
-        for (LValueBind b : ast.getLhs()) {
+        for (LValue b : ast.getLhs()) {
             variables.put(b.getName(), new DeclaredVariable(b));
         }
@@ -400 +400 @@
             Map<Id, Method> getters,
             Map<Id, Method> setters) {
-        for (LValueBind b : ast.getLhs()) {
+        for (LValue b : ast.getLhs()) {
             ModifierSet mods = extractModifiers(b.getMods());
             // TODO: check for correct modifiers?
@@ -422 +422 @@
             Map<Id, Method> getters,
             Map<Id, Method> setters) {
-        for (LValueBind b : ast.getLhs()) {
+        for (LValue b : ast.getLhs()) {
             ModifierSet mods = extractModifiers(b.getMods());
             // TODO: check for correct modifiers?

trunk/ProjectFortress/src/com/sun/fortress/compiler/desugarer/DesugaringVisitor.java

@@ -97 +97 @@
 
     private boolean mutable(ImplicitGetterSetter field) {
-        if ( field instanceof LValueBind )
-            return ((LValueBind)field).isMutable();
+        if ( field instanceof LValue )
+            return ((LValue)field).isMutable();
 
         for (Modifier mod : field.getMods()) {
@@ -179 +179 @@
         for (Decl decl: decls) {
             if (decl instanceof VarAbsDeclOrDecl) {
-                for (LValueBind binding : (((VarAbsDeclOrDecl)decl).getLhs())) {
+                for (LValue binding : (((VarAbsDeclOrDecl)decl).getLhs())) {
                     newScope.add(binding.getName());
                 }
@@ -197 +197 @@
         for (Decl decl: decls) {
             if (decl instanceof VarAbsDeclOrDecl) {
-                for (LValueBind binding : (((VarAbsDeclOrDecl)decl).getLhs())) {
+                for (LValue binding : (((VarAbsDeclOrDecl)decl).getLhs())) {
                     newScope.add(binding.getName());
                 }
@@ -331 +331 @@
             decl.accept(new NodeAbstractVisitor_void() {
                 public void forVarAbsDeclOrDecl(VarAbsDeclOrDecl decl) {
-                    for (LValueBind binding : decl.getLhs()) {
+                    for (LValue binding : decl.getLhs()) {
                         if (! hidden(binding) &&
                             ! hasExplicitGetter(binding.getName(), decls)) {
@@ -355 +355 @@
             decl.accept(new NodeAbstractVisitor_void() {
                 public void forVarAbsDeclOrDecl(VarAbsDeclOrDecl dec) {
-                    for (LValueBind binding : dec.getLhs()) {
+                    for (LValue binding : dec.getLhs()) {
                         if (! hidden(binding) &&
                             ! hasExplicitGetter(binding.getName(), decls)) {
@@ -374 +374 @@
         return new NodeUpdateVisitor() {
             public Node forVarDecl(VarDecl that) {
-                List<LValueBind> newLVals = new ArrayList<LValueBind>();
-
-                for (LValueBind lval : that.getLhs()) {
+                List<LValue> newLVals = new ArrayList<LValue>();
+
+                for (LValue lval : that.getLhs()) {
                     // System.err.println(mangleName(lval.getName()));
                     newLVals.add(NodeFactory.makeLValue(lval, mangleName(lval.getName())));
@@ -383 +383 @@
             }
             public Node forAbsVarDecl(AbsVarDecl that) {
-                List<LValueBind> newLVals = new ArrayList<LValueBind>();
-
-                for (LValueBind lval : that.getLhs()) {
+                List<LValue> newLVals = new ArrayList<LValue>();
+
+                for (LValue lval : that.getLhs()) {
                     newLVals.add(NodeFactory.makeLValue(lval, mangleName(lval.getName())));
                 }

trunk/ProjectFortress/src/com/sun/fortress/compiler/desugarer/FreeNameCollector.java

@@ -70 +70 @@
      *        pair.first is the VarRef
      *        pair.second is the decl node where the VarRef is declared
-     *            (which is either a Param, LValueBind, or LocalVarDecl)
+     *            (which is either a Param, LValue, or LocalVarDecl)
      *
      * IMPORTANT: Need to use Pair of String & Span as key!
@@ -286 +286 @@
                     declSite = declNode;
                 } else if( declNode instanceof Param ||
-                           declNode instanceof LValueBind ) {
+                           declNode instanceof LValue ) {
                     if( enclosingObjectDecl.isNone() ) {
                             throw new DesugarerError( var.getSpan(),
@@ -666 +666 @@
             List<LValue> lhs = cast.getLhs();
             for(LValue lvalue : lhs) {
-                if ( lvalue instanceof LValueBind )
-                    name += ( "_" + ((LValueBind) lvalue).getName().getText() );
-                else // lvalue instanceof Unpasting
-                    throw new DesugarerError("Unpasting is not yet supported.");
+                name += ( "_" + lvalue.getName().getText() );
             }
             return new Pair<String,Span>( name, cast.getSpan() );
@@ -991 +988 @@
         @Override
         public void forVarDecl(VarDecl that) {
-            recurOnListOfLValueBind(that.getLhs());
+            recurOnListOfLValue(that.getLhs());
         }
 
         @Override
-        public void forLValueBind(LValueBind that) {
+        public void forLValue(LValue that) {
             decledNames.add(that.getName());
         }

trunk/ProjectFortress/src/com/sun/fortress/compiler/desugarer/MutableVarRefRewriteVisitor.java

@@ -26 +26 @@
 import com.sun.fortress.nodes.Expr;
 import com.sun.fortress.nodes.FieldRef;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.LocalVarDecl;
 import com.sun.fortress.nodes.Node;
@@ -39 +39 @@
 
 public class MutableVarRefRewriteVisitor extends NodeUpdateVisitor {
-    // The root of the subtree in AST which we are trying to rewrite 
+    // The root of the subtree in AST which we are trying to rewrite
     // This root can only be either ObjectDecl or LocalVarDecl, which can
     // declare mutable variables captured by ObjectExpr
@@ -45 +45 @@
     // A map mapping from VarRefs to its corresponding boxed type
     private Map<VarRef, VarRefContainer> mutableVarRefContainerMap;
-    // A list of varRefs that are declared directly under entryNode and 
-    // need to be rewriten into its corresponding boxed type; note that 
-    // mutableVarRefContainerMap.keySet() is a superset of varRefsToRewrite 
+    // A list of varRefs that are declared directly under entryNode and
+    // need to be rewriten into its corresponding boxed type; note that
+    // mutableVarRefContainerMap.keySet() is a superset of varRefsToRewrite
     private List<VarRef> varRefsToRewrite;
 
-    public MutableVarRefRewriteVisitor(Node entryNode, 
+    public MutableVarRefRewriteVisitor(Node entryNode,
                 Map<VarRef, VarRefContainer> mutableVarRefContainerMap,
                 List<VarRef> varRefsToRewrite) {
@@ -60 +60 @@
     @Override
     public Node forObjectDecl(ObjectDecl that) {
-        if( entryNode instanceof ObjectDecl && 
-            (that.equals(entryNode) == false || 
+        if( entryNode instanceof ObjectDecl &&
+            (that.equals(entryNode) == false ||
              entryNode.getSpan().equals(that.getSpan()) == false) ) {
             throw new DesugarerError("Wrong entry node for the rewriting " +
-                "pass!  Expected: " + entryNode + " (" + entryNode.getSpan() + 
+                "pass!  Expected: " + entryNode + " (" + entryNode.getSpan() +
                 "); " + "found: " + that + " (" + that.getSpan() + ").");
         }
-        
+
         List<Decl> decls_result = recurOnListOfDecl( that.getDecls() );
 
@@ -73 +73 @@
             VarRefContainer container = mutableVarRefContainerMap.get(var);
             if( container == null ) {
-                throw new DesugarerError(var.getSpan(), 
-                        "VarRefContainer for " + var + 
+                throw new DesugarerError(var.getSpan(),
+                        "VarRefContainer for " + var +
                         " is not found in map while rewriting " + that);
             }
@@ -81 +81 @@
             if( origDeclNode instanceof Param ) {
                 decls_result.add( 0, container.containerField() );
-            } else if( origDeclNode instanceof LValueBind ) {
+            } else if( origDeclNode instanceof LValue ) {
                 insertAfterOrigDecl(decls_result, container);
             } else {
@@ -102 +102 @@
             return super.forLocalVarDecl(that);
         }
-        
+
         LocalVarDecl newLocalVarDecl = null;
         List<Expr> body_result = recurOnListOfExpr( that.getBody() );
@@ -109 +109 @@
             VarRefContainer container = mutableVarRefContainerMap.get(var);
             if( container == null ) {
-                throw new DesugarerError(var.getSpan(), 
-                        "VarRefContainer for " + var + 
+                throw new DesugarerError(var.getSpan(),
+                        "VarRefContainer for " + var +
                         " is not found in map while rewriting " + that);
             }
 
-// Why does this sanity check fail?  
+// Why does this sanity check fail?
 // It fails because this LocalVarDecl may have been rewritten if it refers
 // to any var declared in ObjectDecl which is also captured by the object
@@ -121 +121 @@
 //            Node origDeclNode = container.origDeclNode();
 //            if( origDeclNode.equals(that) == false ) {
-//                throw new DesugarerError(that.getSpan(), 
+//                throw new DesugarerError(that.getSpan(),
 //                    "Unexpected node in rewriteList when rewriting " + that);
 //            } else {
                 if( newLocalVarDecl == null ) {
-                    newLocalVarDecl = 
+                    newLocalVarDecl =
                         container.containerLocalVarDecl(body_result);
                 } else {
                     List<Expr> newBody = new ArrayList<Expr>(1);
                     newBody.add(newLocalVarDecl);
-                    newLocalVarDecl = 
+                    newLocalVarDecl =
                         container.containerLocalVarDecl(newBody);
                 }
@@ -139 +139 @@
         new_body_result.add(newLocalVarDecl);
 
-        return super.forLocalVarDeclOnly( that, that.getExprType(), 
+        return super.forLocalVarDeclOnly( that, that.getExprType(),
                             new_body_result, that.getLhs(), that.getRhs() );
     }
 
-    @Override 
+    @Override
     public Node forVarRef(VarRef that) {
         if( varRefsToRewrite.contains(that) ) {
@@ -152 +152 @@
         }
     }
-    
-    private void insertAfterOrigDecl(List<Decl> decl_result, 
+
+    private void insertAfterOrigDecl(List<Decl> decl_result,
                                      VarRefContainer container) {
         int indexToInsert = 0;
@@ -159 +159 @@
             indexToInsert = indexToInsert + 1;
             if(decl instanceof VarDecl) {
-                VarDecl cast = (VarDecl) decl; 
-                List<LValueBind> lhs = cast.getLhs();
+                VarDecl cast = (VarDecl) decl;
+                List<LValue> lhs = cast.getLhs();
                 if( lhs.contains(container.origDeclNode()) ) {
                     decl_result.add(indexToInsert, container.containerField());
@@ -176 +176 @@
 
 }
-
-

trunk/ProjectFortress/src/com/sun/fortress/compiler/desugarer/ObjectExpressionVisitor.java

@@ -85 +85 @@
      *        pair.first is the varRef
      *        pair.second is the decl node where the varRef is declared
-     *              (which is either a Param, LValueBind, or LocalVarDecl)
+     *              (which is either a Param, LValue, or LocalVarDecl)
      *
      * IMPORTANT: Need to use Pair of String & Span as key!

trunk/ProjectFortress/src/com/sun/fortress/compiler/desugarer/VarRefContainer.java

@@ -27 +27 @@
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.LValue;
-import com.sun.fortress.nodes.LValueBind;
 import com.sun.fortress.nodes.LocalVarDecl;
 import com.sun.fortress.nodes.Modifier;
@@ -59 +58 @@
 
     public VarRefContainer(VarRef origVar,
-                           Node origDeclNode, 
+                           Node origDeclNode,
                            String uniqueSuffix) {
         this.origVar = origVar;
@@ -113 +112 @@
 
     public VarDecl containerField() {
-        List<LValueBind> lhs = new LinkedList<LValueBind>();
+        List<LValue> lhs = new LinkedList<LValue>();
         // set the field to be immutable
-        lhs.add( new LValueBind(origDeclNode.getSpan(), containerVarId(),
-                                containerType(), false) );
+        lhs.add( new LValue(origDeclNode.getSpan(), containerVarId(),
+                            containerType(), false) );
         VarDecl field = new VarDecl( origDeclNode.getSpan(),
                                      lhs, makeCallToContainerObj() );
@@ -131 +130 @@
     public FieldRef containerFieldRef(Span varRefSpan) {
         return ExprFactory.makeFieldRef( varRefSpan,
-                                         this.containerVarRef(varRefSpan), 
+                                         this.containerVarRef(varRefSpan),
                                          origVar.getVar() );
     }
@@ -138 +137 @@
         List<LValue> lhs = new LinkedList<LValue>();
         // set the field to be immutable
-        lhs.add( new LValueBind(origDeclNode.getSpan(), containerVarId(),
-                                containerType(), false) );
+        lhs.add( new LValue(origDeclNode.getSpan(), containerVarId(),
+                            containerType(), false) );
         LocalVarDecl ret = ExprFactory.makeLocalVarDecl( origDeclNode.getSpan(),
                             lhs, makeCallToContainerObj(), bodyExprs );

trunk/ProjectFortress/src/com/sun/fortress/compiler/disambiguator/ExprDisambiguator.java

@@ -59 +59 @@
 import com.sun.fortress.nodes.IntParam;
 import com.sun.fortress.nodes.LValue;
-import com.sun.fortress.nodes.LValueBind;
 import com.sun.fortress.nodes.Label;
 import com.sun.fortress.nodes.LetFn;
@@ -87 +86 @@
 import com.sun.fortress.nodes.UnitDecl;
 import com.sun.fortress.nodes.UnitParam;
-import com.sun.fortress.nodes.UnpastingBind;
-import com.sun.fortress.nodes.UnpastingSplit;
 import com.sun.fortress.nodes.VarDecl;
 import com.sun.fortress.nodes.VarRef;
@@ -354 +351 @@
         for (LValue lv : lvalues) {
             boolean valid = true;
-            if (lv instanceof LValueBind) {
-                Id id = ((LValueBind)lv).getName();
-                valid = (result.add(id) || id.getText().equals("_"));
-            }
-            else if (lv instanceof UnpastingBind) {
-                Id id = ((UnpastingBind)lv).getName();
-                valid = (result.add(id) || id.getText().equals("_"));
-            }
-            else { // lv instanceof UnpastingSplit
-                extractDefinedVarNames(((UnpastingSplit)lv).getElems(), result);
-            }
+            Id id = lv.getName();
+            valid = (result.add(id) || id.getText().equals("_"));
             if (!valid) { error("Duplicate local variable name", lv); }
         }

trunk/ProjectFortress/src/com/sun/fortress/compiler/environments/TopLevelEnvGen.java

@@ -275 +275 @@
                 if (v instanceof DeclaredVariable) {
                     DeclaredVariable dv = (DeclaredVariable) v;
-                    LValueBind lvb = dv.ast();
+                    LValue lvb = dv.ast();
                     idString = WellKnownNames.tempForUnderscore(lvb.getName());
                 } else {
@@ -346 +346 @@
                     // The interpreter rewrites a temporary for multiple assignment.
                     VarDecl vd = (VarDecl) decl;
-                    List<LValueBind> lhs = vd.getLhs();
+                    List<LValue> lhs = vd.getLhs();
                     if (lhs.size() > 1) {
                         String idString = WellKnownNames.tempTupleName(vd);

trunk/ProjectFortress/src/com/sun/fortress/compiler/index/DeclaredVariable.java

@@ -18 +18 @@
 package com.sun.fortress.compiler.index;
 
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 
 public class DeclaredVariable extends Variable {
-    
-    private final LValueBind _ast;
-    
-    public DeclaredVariable(LValueBind ast) { _ast = ast; }
-    
-    public LValueBind ast() { return _ast; }
+
+    private final LValue _ast;
+
+    public DeclaredVariable(LValue ast) { _ast = ast; }
+
+    public LValue ast() { return _ast; }
 }

trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/InferenceVarInserter.java

@@ -26 +26 @@
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.Modifier;
 import com.sun.fortress.nodes.Node;
@@ -48 +48 @@
 
         @Override
-        public Node forLValueBindOnly(LValueBind that, Id name_result,
+        public Node forLValueOnly(LValue that, Id name_result,
                         Option<Type> type_result, List<Modifier> mods_result) {
                 if( type_result.isNone() ) {
                         Option<Type> new_type = Option.<Type>some(NodeFactory.make_InferenceVarType(that.getName().getSpan()));
-                        return new LValueBind(that.getSpan(),name_result,new_type,mods_result,that.isMutable());
+                        return new LValue(that.getSpan(),name_result,new_type,mods_result,that.isMutable());
                 }
                 else {

trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/LValueTypeEnv.java

@@ -26 +26 @@
 
 import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.Node;
 import com.sun.fortress.nodes.StaticParam;
@@ -35 +35 @@
 
 class LValueTypeEnv extends TypeEnv {
-    private final LValueBind[] entries;
+    private final LValue[] entries;
     private final TypeEnv parent;
-    
-    LValueTypeEnv(LValueBind[] _entries, TypeEnv _parent) {
+
+    LValueTypeEnv(LValue[] _entries, TypeEnv _parent) {
         entries = _entries;
         parent = _parent;
     }
 
-    LValueTypeEnv(List<LValueBind> _entries, TypeEnv _parent) {
-        entries = _entries.toArray(new LValueBind[_entries.size()]);
+    LValueTypeEnv(List<LValue> _entries, TypeEnv _parent) {
+        entries = _entries.toArray(new LValue[_entries.size()]);
         parent = _parent;
     }
 
-    private Option<LValueBind> findLVal(IdOrOpOrAnonymousName var) {
+    private Option<LValue> findLVal(IdOrOpOrAnonymousName var) {
         IdOrOpOrAnonymousName no_api_var = removeApi(var);
-        
-        for (LValueBind entry : entries) {
+
+        for (LValue entry : entries) {
             if (var.equals(entry.getName()) || no_api_var.equals(entry.getName())) {
                 return some(entry);
@@ -58 +58 @@
         return none();
     }
-    
+
     /**
      * Return a BindingLookup that binds the given IdOrOpOrAnonymousName to a type
@@ -64 +64 @@
      */
     public Option<BindingLookup> binding(IdOrOpOrAnonymousName var) {
-        Option<LValueBind> lval = findLVal(var);
-        
+        Option<LValue> lval = findLVal(var);
+
         if( lval.isSome() )
                 return some(new BindingLookup(lval.unwrap()));
@@ -75 +75 @@
     public List<BindingLookup> contents() {
         List<BindingLookup> result = new ArrayList<BindingLookup>();
-        for (LValueBind entry : entries) {
+        for (LValue entry : entries) {
             result.add(new BindingLookup(entry));
         }
@@ -84 +84 @@
         @Override
         public Option<Node> declarationSite(IdOrOpOrAnonymousName var) {
-                Option<LValueBind> lval = findLVal(var);
+                Option<LValue> lval = findLVal(var);
 
                 if( lval.isSome() )
@@ -94 +94 @@
         @Override
         public TypeEnv replaceAllIVars(Map<_InferenceVarType, Type> ivars) {
-                LValueBind[] new_entries = new LValueBind[entries.length];
-                
+                LValue[] new_entries = new LValue[entries.length];
+
                 InferenceVarReplacer rep = new InferenceVarReplacer(ivars);
-                
+
                 for( int i = 0; i<entries.length; i++ ) {
-                        new_entries[i] = (LValueBind)entries[i].accept(rep);
+                        new_entries[i] = (LValue)entries[i].accept(rep);
                 }
-                
+
                 return new LValueTypeEnv(new_entries, parent.replaceAllIVars(ivars));
         }

trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/LocalVarTypeEnv.java

@@ -42 +42 @@
     }
 
-    private Option<LValueBind> findLVal(IdOrOpOrAnonymousName var) {
+    private Option<LValue> findLVal(IdOrOpOrAnonymousName var) {
         IdOrOpOrAnonymousName no_api_var = removeApi(var);
 
         for (LValue lval : decl.getLhs()) {
-                if (lval instanceof LValueBind) {
-                        LValueBind _lval = (LValueBind) lval;
-                        if (_lval.getName().equals(var) || _lval.getName().equals(no_api_var)) {
-                                return some(_lval);
-                        }
-                } else {
-                        return NI.nyi();
-                }
+            if (lval.getName().equals(var) || lval.getName().equals(no_api_var)) {
+                return some(lval);
+            }
         }
         return none();
     }
-    
+
     /**
      * Return a BindingLookup that binds the given IdOrOpOrAnonymousName to a type
@@ -63 +58 @@
      */
     public Option<BindingLookup> binding(IdOrOpOrAnonymousName var) {
-        Option<LValueBind> lval = findLVal(var);
-        
+        Option<LValue> lval = findLVal(var);
+
         if(lval.isSome())
                 return some(new BindingLookup(lval.unwrap()));
@@ -75 +70 @@
         List<BindingLookup> result = new ArrayList<BindingLookup>();
         for (LValue lval : decl.getLhs()) {
-            if (lval instanceof LValueBind) {
-                result.add(new BindingLookup((LValueBind) lval));
-            } else {
-                return NI.nyi();
-            }
+            result.add(new BindingLookup( lval));
         }
         result.addAll(parent.contents());
@@ -87 +78 @@
         @Override
         public Option<Node> declarationSite(IdOrOpOrAnonymousName var) {
-                Option<LValueBind> lval = findLVal(var);
-                
+                Option<LValue> lval = findLVal(var);
+
                 if(lval.isSome())
                         return Option.<Node>some(decl);

trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeChecker.java

@@ -132 +132 @@
         }
         static private Type getTypeOfLValue(LValue lval) {
-                // TODO Implement unpasting
-                return
-                lval.accept(new NodeDepthFirstVisitor<Type>(){
-                        @Override
-                        public Type forLValueBind(LValueBind that) {
-                                // All types must exist by the typechecker
-                                return that.getType().unwrap();
-                        }
-                });
+            return lval.getType().unwrap();
         }
         private static boolean isExprMI(MathItem item) {
@@ -156 +148 @@
         }
 
-        private static Type typeFromLValueBinds(List<LValueBind> bindings) {
+        private static Type typeFromLValues(List<LValue> bindings) {
                 List<Type> results = new ArrayList<Type>();
 
-                for (LValueBind binding: bindings) {
+                for (LValue binding: bindings) {
                         if (binding.getType().isSome()) {
                                 results.add(binding.getType().unwrap());
@@ -460 +452 @@
         }
 
-        private TypeChecker extend(List<LValueBind> bindings) {
+        private TypeChecker extend(List<LValue> bindings) {
                 return new TypeChecker(table,
                                 typeEnv.extendWithLValues(bindings),
@@ -631 +623 @@
                                                 else if( field instanceof DeclaredVariable ) {
                                                         DeclaredVariable var = (DeclaredVariable)field;
-                                                        LValueBind bind = var.ast();
+                                                        LValue bind = var.ast();
                                                         return Option.some(bind.getType().unwrap());
                                                 }
@@ -1418 +1410 @@
                         }
 
-                        @Override public Pair<TypeCheckerResult, Type> forLValueBind(LValueBind that) {
+                        @Override public Pair<TypeCheckerResult, Type> forLValue(LValue that) {
                                 if( !that.isMutable() ) {
                                         String err = "Left-hand side of assignment must be mutable.";
@@ -1963 +1955 @@
 
                 // bind id and check the body
-                LValueBind lval = NodeFactory.makeLValue(id_to_bind, that.getMatch());
+                LValue lval = NodeFactory.makeLValue(id_to_bind, that.getMatch());
                 TypeChecker extend_tc = this.extend(Collections.singletonList(lval));
                 TypeCheckerResult body_result = that.getBody().accept(extend_tc);
@@ -2573 +2565 @@
         @Override
         public TypeCheckerResult forFor(For that) {
-                Pair<List<TypeCheckerResult>,List<LValueBind>> pair = recurOnListsOfGeneratorClauseBindings(that.getGens());
+                Pair<List<TypeCheckerResult>,List<LValue>> pair = recurOnListsOfGeneratorClauseBindings(that.getGens());
                 Option<TypeCheckerResult> type_result = recurOnOptionOfType(that.getExprType());
                 TypeChecker extend = this.extend(pair.second());
@@ -2606 +2598 @@
         @Override
         public TypeCheckerResult forGeneratedExpr(GeneratedExpr that) {
-                Pair<List<TypeCheckerResult>,List<LValueBind>> pair = recurOnListsOfGeneratorClauseBindings(that.getGens());
+                Pair<List<TypeCheckerResult>,List<LValue>> pair = recurOnListsOfGeneratorClauseBindings(that.getGens());
                 TypeChecker extend = this.extend(pair.second());
                 TypeCheckerResult body_result = that.getExpr().accept(extend);
@@ -2630 +2622 @@
         }
 
-        private Pair<TypeCheckerResult, List<LValueBind>> forGeneratorClauseGetBindings(GeneratorClause that,
+        private Pair<TypeCheckerResult, List<LValue>> forGeneratorClauseGetBindings(GeneratorClause that,
                         boolean mustBeCondition) {
                 TypeCheckerResult init_result = that.getInit().accept(this);
-                final Pair<TypeCheckerResult, List<LValueBind>> p = forGeneratorClauseOnlyGetBindings(that, init_result, mustBeCondition);
+                final Pair<TypeCheckerResult, List<LValue>> p = forGeneratorClauseOnlyGetBindings(that, init_result, mustBeCondition);
 
                 if( postInference ) {
                         Boolean ok = true;
-                        List<LValueBind> closed_binds = new ArrayList<LValueBind>();
-                        for(LValueBind b : p.second()){
+                        List<LValue> closed_binds = new ArrayList<LValue>();
+                        for(LValue b : p.second()){
                                 Pair<Boolean,Node> temp = TypesUtil.closeConstraints(b, subtypeChecker, p.first());
-                                closed_binds.add((LValueBind)temp.second());
+                                closed_binds.add((LValue)temp.second());
                                 ok&=temp.first();
                         }
@@ -2655 +2647 @@
         }
 
-        private Pair<TypeCheckerResult, List<LValueBind>> forGeneratorClauseOnlyGetBindings(GeneratorClause that,
+        private Pair<TypeCheckerResult, List<LValue>> forGeneratorClauseOnlyGetBindings(GeneratorClause that,
                         TypeCheckerResult init_result, boolean mustBeCondition) {
 
@@ -2670 +2662 @@
 
                         return Pair.make(TypeCheckerResult.compose(new_node, subtypeChecker, init_result, bool_result),
-                                        Collections.<LValueBind>emptyList());
+                                        Collections.<LValue>emptyList());
                 }
 
@@ -2676 +2668 @@
                 int bindings_count = that.getBind().size();
 
-                List<LValueBind> result_bindings;
+                List<LValue> result_bindings;
                 Type lhstype;
                 // Now create the bindings
@@ -2683 +2675 @@
                         // Just one binding
                         lhstype = NodeFactory.make_InferenceVarType(that.getBind().get(0).getSpan());
-                        LValueBind lval = NodeFactory.makeLValue(that.getBind().get(0), lhstype);
+                        LValue lval = NodeFactory.makeLValue(that.getBind().get(0), lhstype);
                         result_bindings = Collections.singletonList(lval);
                 }
@@ -2696 +2688 @@
                         // Now just create the lvalues with the newly created inference variable type
                         Iterator<Id> id_iter = that.getBind().iterator();
-                        result_bindings = new ArrayList<LValueBind>(bindings_count);
+                        result_bindings = new ArrayList<LValue>(bindings_count);
                         for( Type inference_var : inference_vars ) {
                                 result_bindings.add(NodeFactory.makeLValue(id_iter.next(), inference_var));
@@ -2776 +2768 @@
         private Pair<TypeCheckerResult, Option<Type>> forIfClauseWithType(IfClause that) {
                 // For generalized 'if' we must introduce new bindings.
-                Pair<TypeCheckerResult, List<LValueBind>> result_and_binds =
+                Pair<TypeCheckerResult, List<LValue>> result_and_binds =
                         this.forGeneratorClauseGetBindings(that.getTest(), true);
 
                 // Destruct result
                 TypeCheckerResult test_result = result_and_binds.first();
-                List<LValueBind> bindings = result_and_binds.second();
+                List<LValue> bindings = result_and_binds.second();
 
                 // Check body with new bindings
@@ -4279 +4271 @@
                                 meet=this.subtypeChecker.meet(clause.getMatch().get(0),original_type);
                         }
-                        LValueBind bind = NodeFactory.makeLValue(to_bind.get(0), meet);
+                        LValue bind = NodeFactory.makeLValue(to_bind.get(0), meet);
                         extend=this.extend(Collections.singletonList(bind));
                 }else{
@@ -4286 +4278 @@
                         }
                         else{
-                                List<LValueBind> binds=new ArrayList<LValueBind>(to_bind.size());
+                                List<LValue> binds=new ArrayList<LValue>(to_bind.size());
                                 Iterator<Type> mitr=clause.getMatch().iterator();
                                 assert(original_type instanceof TupleType);
@@ -4310 +4302 @@
         @Override
         public TypeCheckerResult forVarDecl(VarDecl that) {
-                List<LValueBind> lhs = that.getLhs();
+                List<LValue> lhs = that.getLhs();
                 Expr init = that.getInit();
 
@@ -4317 +4309 @@
                 TypeCheckerResult subtype_result;
                 if (lhs.size() == 1) { // We have a single variable binding, not a tuple binding
-                        LValueBind var = lhs.get(0);
+                        LValue var = lhs.get(0);
                         Option<Type> varType = var.getType();
                         if (varType.isSome()) {
@@ -4338 +4330 @@
                         }
                 } else { // lhs.size() >= 2
-                        Type varType = typeFromLValueBinds(lhs);
+                        Type varType = typeFromLValues(lhs);
                         if (initResult.type().isNone()) {
                                 // The right hand side could not be typed, which must have resulted in a
@@ -4390 +4382 @@
         @Override
         public TypeCheckerResult forWhile(While that) {
-                Pair<TypeCheckerResult,List<LValueBind>> res = this.forGeneratorClauseGetBindings(that.getTest(), true);
+                Pair<TypeCheckerResult,List<LValue>> res = this.forGeneratorClauseGetBindings(that.getTest(), true);
                 TypeChecker extended = this.extend(res.second());
                 TypeCheckerResult body_result = that.getBody().accept(extended);
@@ -4622 +4614 @@
         // Finally, return all of the bindings so that they can be put in scope in some larger expression, like the
         // body of a for loop, for example.
-        private Pair<List<TypeCheckerResult>, List<LValueBind>> recurOnListsOfGeneratorClauseBindings(List<GeneratorClause> gens) {
+        private Pair<List<TypeCheckerResult>, List<LValue>> recurOnListsOfGeneratorClauseBindings(List<GeneratorClause> gens) {
                 if( gens.isEmpty() )
-                        return Pair.make(Collections.<TypeCheckerResult>emptyList(), Collections.<LValueBind>emptyList());
+                        return Pair.make(Collections.<TypeCheckerResult>emptyList(), Collections.<LValue>emptyList());
                 else if( gens.size() == 1 ) {
-                        Pair<TypeCheckerResult,List<LValueBind>> pair = forGeneratorClauseGetBindings(IterUtil.first(gens), false);
+                        Pair<TypeCheckerResult,List<LValue>> pair = forGeneratorClauseGetBindings(IterUtil.first(gens), false);
                         return Pair.make(Collections.singletonList(pair.first()), pair.second());
                 }
                 else {
-                        Pair<TypeCheckerResult,List<LValueBind>> pair = forGeneratorClauseGetBindings(IterUtil.first(gens), false);
+                        Pair<TypeCheckerResult,List<LValue>> pair = forGeneratorClauseGetBindings(IterUtil.first(gens), false);
                         TypeChecker new_checker = this.extend(pair.second());
                         // recur
-                        Pair<List<TypeCheckerResult>, List<LValueBind>> recur_result =
+                        Pair<List<TypeCheckerResult>, List<LValue>> recur_result =
                                 new_checker.recurOnListsOfGeneratorClauseBindings(CollectUtil.makeList(IterUtil.skipFirst(gens)));
                         return Pair.make( Useful.cons(pair.first(), recur_result.first()),

trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeEnv.java

@@ -58 +58 @@
 import com.sun.fortress.nodes.IntersectionType;
 import com.sun.fortress.nodes.KeywordType;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.LocalVarDecl;
 import com.sun.fortress.nodes.Modifier;
@@ -119 +119 @@
      * Construct a new TypeEnv from the given bindings.
      */
-    public static TypeEnv make(LValueBind... entries) {
+    public static TypeEnv make(LValue... entries) {
         return EmptyTypeEnv.ONLY.extend(entries);
     }
@@ -369 +369 @@
      * compiler to distinguish them from other variants with the same _erased_ signature.
      */
-    public final TypeEnv extend(LValueBind... entries) {
+    public final TypeEnv extend(LValue... entries) {
         if (entries.length == 0) { return this; }
         else { return new LValueTypeEnv(entries, this); }
     }
 
-    public final TypeEnv extendWithLValues(List<LValueBind> entries) {
+    public final TypeEnv extendWithLValues(List<LValue> entries) {
         if (entries.size() == 0) { return this; }
         else { return new LValueTypeEnv(entries, this); }
@@ -437 +437 @@
     /**
      * A wrapper around the binding found in the TypeEnv.  Since some bindings
-     * do not have an Id to be indexed, there is no way to create the LValueBind
+     * do not have an Id to be indexed, there is no way to create the LValue
      * node to represent the binding.  In the case of operators, for example,
      * only a IdOrOpOrAnonymousName exists, so the BindingLookup exports the same methods
-     * that LValueBind does, since an LValueBind cannot be created.
+     * that LValue does, since an LValue cannot be created.
      */
     public static class BindingLookup {
@@ -449 +449 @@
         private final boolean mutable;
 
-        public BindingLookup(LValueBind binding) {
+        public BindingLookup(LValue binding) {
             var = binding.getName();
             type = binding.getType();

trunk/ProjectFortress/src/com/sun/fortress/interpreter/Driver.java

@@ -81 +81 @@
 import com.sun.fortress.nodes.ImportStar;
 import com.sun.fortress.nodes.ImportedNames;
-import com.sun.fortress.nodes.LValueBind;
 import com.sun.fortress.nodes.NodeAbstractVisitor_void;
 import com.sun.fortress.nodes.NodeVisitor_void;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildApiEnvironment.java

@@ -34 +34 @@
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes_util.NodeUtil;
 
 public class BuildApiEnvironment extends BuildTopLevelEnvironments {
-    
+
     @Override
     public Boolean forAbsFnDecl(AbsFnDecl x) {
@@ -73 +73 @@
             FValue fv = exporter.getEnvironment().getValueRaw(fname);
             FType ft = exporter.getEnvironment().getRootTypeNull(fname); // toplevel
-            
+
             // This is overloadable if the object is NOT a singleton.
             if (x.getParams().isSome()) {
                 overloadNames.add(fname);
-                exporter.overloadableExportedFunction.add(fname);             
-                api.overloadableExportedFunction.add(fname);             
+                exporter.overloadableExportedFunction.add(fname);
+                api.overloadableExportedFunction.add(fname);
             }
-            
+
             if (fv != null) {
                 bindInto.putValueRaw(fname, fv);
@@ -98 +98 @@
             }
             handlePossibleFM(x.getDecls());
-            
+
         }
         return change;
@@ -127 +127 @@
         // super.forAbsVarDecl(x);
         Boolean change = Boolean.FALSE;
-        
+
         if (getPass() == 1) {
-            List<LValueBind> lhs = x.getLhs();
-            LValueBind lvb = lhs.get(0); // Have desugared to single vars
+            List<LValue> lhs = x.getLhs();
+            LValue lvb = lhs.get(0); // Have desugared to single vars
             Id name = lvb.getName();
             String sname = NodeUtil.stringName(name);
@@ -149 +149 @@
     CUWrapper exporter;
     CUWrapper api;
-    
+
     @Override
     public void setExporterAndApi(CUWrapper exporter, CUWrapper api) {
@@ -155 +155 @@
         this.api = api;
     }
-    
+
     public BuildApiEnvironment(Environment within,
             Map<String, ComponentWrapper> linker) {
@@ -161 +161 @@
         // TODO Auto-generated constructor stub
     }
-    
+
     private void handlePossibleFM(List<? extends AbsDeclOrDecl> tdecls) {
         for (AbsDeclOrDecl adod : tdecls) {
@@ -179 +179 @@
                 } else {
                     // TODO not handling this quite yet.
-                    
+
                     //exporter.missingExportedVars.put(s);
                 }
@@ -187 +187 @@
     }
 
-    
+
 }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildEnvironments.java

@@ -662 +662 @@
 
     private void forVarDecl1(VarDecl x) {
-        List<LValueBind> lhs = x.getLhs();
+        List<LValue> lhs = x.getLhs();
 
         // List<Modifier> mods;
@@ -668 +668 @@
         // Option<Type> type = x.getType();
         Expr init = x.getInit();
-        LValueBind lvb = lhs.get(0);
+        LValue lvb = lhs.get(0);
 
           Option<Type> type = lvb.getType();
@@ -689 +689 @@
 
 //        for (LValue lv : lhs) {
-//            if (lv instanceof LValueBind) {
-//                LValueBind lvb = (LValueBind) lv;
+//            if (lv instanceof LValue) {
+//                LValue lvb = (LValue) lv;
 //                Option<Type> type = lvb.getType();
 //                Id name = lvb.getName();
@@ -731 +731 @@
     private void forVarDecl4(VarDecl x) {
 
-        List<LValueBind> lhs = x.getLhs();
+        List<LValue> lhs = x.getLhs();
 
         // List<Modifier> mods;
@@ -738 +738 @@
         Expr init = x.getInit();
         // int index = 0;
-        LValueBind lvb = lhs.get(0);
+        LValue lvb = lhs.get(0);
 
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildLetEnvironments.java

@@ -36 +36 @@
 import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
 import com.sun.fortress.nodes.LValue;
-import com.sun.fortress.nodes.LValueBind;
 import com.sun.fortress.nodes.LetExpr;
 import com.sun.fortress.nodes.LetFn;
@@ -128 +127 @@
         } else {
             EvalType eval_type = new EvalType(containing);
-            for (LValue lval : lhs) {
-                if (lval instanceof LValueBind) {
-                    LValueBind lvb = (LValueBind) lval;
-                    if (lvb.isMutable() && lvb.getType().isSome()) {
-                        FValue fv = lval.accept(new_eval);
-                        FType fvt = lvb.getType().unwrap().accept(eval_type);
-                        containing.putVariable(fv.getString(),fvt);
-                    } else {
-                        containing.putValue(lval.accept(new_eval), new IndirectionCell());
-
-                    }
+            for (LValue lvb : lhs) {
+                if (lvb.isMutable() && lvb.getType().isSome()) {
+                    FValue fv = lvb.accept(new_eval);
+                    FType fvt = lvb.getType().unwrap().accept(eval_type);
+                    containing.putVariable(fv.getString(),fvt);
                 } else {
-                    containing.putValue(lval.accept(new_eval), new IndirectionCell());
+                    containing.putValue(lvb.accept(new_eval), new IndirectionCell());
                 }
             }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildTraitEnvironment.java

@@ -31 +31 @@
 import com.sun.fortress.nodes.FnAbsDeclOrDecl;
 import com.sun.fortress.nodes.Id;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.StaticParam;
 import com.sun.fortress.nodes.VarDecl;
@@ -84 +84 @@
     public Boolean forVarDecl(VarDecl x) {
         if (fields != null) {
-            List<LValueBind> lhs = x.getLhs();
-            for (LValueBind lvb : lhs) {
+            List<LValue> lhs = x.getLhs();
+            for (LValue lvb : lhs) {
                 Id name = lvb.getName();
                 String s = NodeUtil.nameString(name);

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/Evaluator.java

@@ -107 +107 @@
 import com.sun.fortress.nodes.Juxt;
 import com.sun.fortress.nodes.KeywordExpr;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.Label;
 import com.sun.fortress.nodes.LetExpr;
@@ -138 +138 @@
 import com.sun.fortress.nodes.Typecase;
 import com.sun.fortress.nodes.TypecaseClause;
-import com.sun.fortress.nodes.UnpastingBind;
-import com.sun.fortress.nodes.UnpastingSplit;
 import com.sun.fortress.nodes.VarRef;
 import com.sun.fortress.nodes.VoidLiteralExpr;
@@ -886 +884 @@
     }
 
-    public FValue forLValueBind(LValueBind x) {
+    public FValue forLValue(LValue x) {
         Id name = x.getName();
         return FString.make(NodeUtil.nameString(name));
@@ -1652 +1650 @@
     }
 
-    public FValue forUnpastingBind(UnpastingBind x) {
-        return NI("forUnpastingBind");
-    }
-
-    public FValue forUnpastingSplit(UnpastingSplit x) {
-        return NI("forUnpastingSplit");
-    }
-
     public FValue forVarRef(VarRef x) {
 //        Id id = x.getVar();

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/LHSEvaluator.java

@@ -49 +49 @@
 import com.sun.fortress.nodes.FieldRef;
 import com.sun.fortress.nodes.Id;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.SubscriptExpr;
 import com.sun.fortress.nodes.Enclosing;
@@ -55 +55 @@
 import com.sun.fortress.nodes.TupleExpr;
 import com.sun.fortress.nodes.Type;
-import com.sun.fortress.nodes.Unpasting;
-import com.sun.fortress.nodes.UnpastingBind;
-import com.sun.fortress.nodes.UnpastingSplit;
 import com.sun.fortress.nodes.VarRef;
 import com.sun.fortress.nodes._RewriteFieldRef;
@@ -129 +126 @@
     public Voidoid forVarRef(VarRef x) {
         String s = x.getVar().getText();
-        
+
         Environment e = evaluator.e.getHomeEnvironment(x.getVar());
         e = BaseEnv.toContainingObjectEnv(e, x.getLexicalDepth());
-        
+
         FType ft = e.getVarTypeNull(s);
         if (ft != null) {
@@ -146 +143 @@
     }
 
-    /* (non-Javadoc)
-     * @see com.sun.fortress.interpreter.nodes.NodeVisitor#forUnpastingBind(com.sun.fortress.interpreter.nodes.UnpastingBind)
-     */
-    @Override
-    public Voidoid forUnpastingBind(UnpastingBind x) {
-        return super.forUnpastingBind(x);
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.fortress.interpreter.nodes.NodeVisitor#forUnpastingSplit(com.sun.fortress.interpreter.nodes.UnpastingSplit)
-     */
-    @Override
-    public Voidoid forUnpastingSplit(UnpastingSplit x) {
-        return super.forUnpastingSplit(x);
-    }
-
-    public Voidoid forLValueBind(LValueBind x) {
+    public Voidoid forLValue(LValue x) {
         Id name = x.getName();
         Option<Type> type = x.getType();
@@ -201 +182 @@
                 if (Glue.extendsGenericTrait(outerType, aname)) {
                     bestGuess = Glue.typeFromGeneric(outerType, aname, WellKnownNames.arrayElementTypeName);
-                    
+
                     // Find and invoke the generic factory arrayK[\ T, size1, ..., sizeK \] ()
                     String genericName = WellKnownNames.arrayMaker(rank);

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/LHSToLValue.java

@@ -30 +30 @@
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.Lhs;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.SubscriptExpr;
 import com.sun.fortress.nodes.ArgExpr;
 import com.sun.fortress.nodes.TupleExpr;
-import com.sun.fortress.nodes.Unpasting;
-import com.sun.fortress.nodes.UnpastingBind;
-import com.sun.fortress.nodes.UnpastingSplit;
 import com.sun.fortress.nodes.VarRef;
 import com.sun.fortress.nodes._RewriteFieldRef;
@@ -123 +120 @@
     }
 
-    /* (non-Javadoc)
-     * @see com.sun.fortress.interpreter.nodes.NodeVisitor#forUnpastingBind(com.sun.fortress.interpreter.nodes.UnpastingBind)
-     */
-    @Override
-    public Lhs forUnpastingBind(UnpastingBind x) {
-        Id name = x.getName();
-        List<ExtentRange> dim = x.getDim();
-        return super.forUnpastingBind(x);
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.fortress.interpreter.nodes.NodeVisitor#forUnpastingSplit(com.sun.fortress.interpreter.nodes.UnpastingSplit)
-     */
-    @Override
-    public Lhs forUnpastingSplit(UnpastingSplit x) {
-        int dim = x.getDim();
-        List<Unpasting> elems = x.getElems();
-        return super.forUnpastingSplit(x);
-    }
-
-    public Lhs forLValueBind(LValueBind x) {
+    public Lhs forLValue(LValue x) {
         return x;
     }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeObject.java

@@ -31 +31 @@
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.Param;
 import com.sun.fortress.nodes.VarAbsDeclOrDecl;
@@ -66 +66 @@
         for(AbsDeclOrDecl v : members) {
             if (v instanceof VarAbsDeclOrDecl) {
-                for (LValueBind lhs : ((VarAbsDeclOrDecl)v).getLhs()) {
+                for (LValue lhs : ((VarAbsDeclOrDecl)v).getLhs()) {
                     fields.add(lhs.getName());
                 }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java

@@ -83 +83 @@
 import com.sun.fortress.nodes.Juxt;
 import com.sun.fortress.nodes.LValue;
-import com.sun.fortress.nodes.LValueBind;
 import com.sun.fortress.nodes.LetFn;
 import com.sun.fortress.nodes.LocalVarDecl;
@@ -113 +112 @@
 import com.sun.fortress.nodes.TypeArg;
 import com.sun.fortress.nodes.Typecase;
-import com.sun.fortress.nodes.Unpasting;
-import com.sun.fortress.nodes.UnpastingBind;
-import com.sun.fortress.nodes.UnpastingSplit;
 import com.sun.fortress.nodes.VarDecl;
 import com.sun.fortress.nodes.VarRef;
@@ -752 +748 @@
     }
     @Override
-    public Node forLValueBind(LValueBind lvb) {
+    public Node forLValue(LValue lvb) {
         Id id = lvb.getName();
         if ("_".equals(id.getText())) {
@@ -875 +871 @@
     public Node forVarDecl(VarDecl vd) {
         atTopLevelInsideTraitOrObject = false;
-        List<LValueBind> lhs = vd.getLhs();
+        List<LValue> lhs = vd.getLhs();
 
         if (lhs.size() > 1) {
@@ -882 +878 @@
             Expr init = vd.getInit();
             init = (Expr) visitNode(init);
-            lhs = (List<LValueBind>) recurOnListOfLValueBind(lhs);
+            lhs = (List<LValue>) recurOnListOfLValue(lhs);
             ArrayList<VarDecl> newdecls = new ArrayList<VarDecl>(1+lhs.size());
             String temp = WellKnownNames.tempTupleName(vd);
@@ -889 +885 @@
             newdecls.add(new_vd);
             int element_index = 0;
-            for (LValueBind lv : lhs) {
+            for (LValue lv : lhs) {
                 Id newName = new Id(at, "$" + element_index);
                 newdecls.add(new VarDecl(at, Useful.list(lv),
@@ -1364 +1360 @@
 
         @Override
-        public void forLValueBind(LValueBind that) {
+        public void forLValue(LValue that) {
             that.getName().accept(this);
         }
@@ -1372 +1368 @@
             String s = that.getText();
             rewrites_put(s, new Local());
-        }
-
-        @Override
-        public void forUnpastingBind(UnpastingBind that) {
-            that.getName().accept(this);
-            for (ExtentRange er : that.getDim())
-                er.accept(this);
-        }
-
-        @Override
-        public void forUnpastingSplit(UnpastingSplit that) {
-            for (Unpasting up : that.getElems())
-                up.accept(this);
         }
 

trunk/ProjectFortress/src/com/sun/fortress/interpreter/rewrite/IsAnArrowName.java

@@ -20 +20 @@
 import com.sun.fortress.nodes.ArrowType;
 import com.sun.fortress.nodes.FnDecl;
-import com.sun.fortress.nodes.LValueBind;
+import com.sun.fortress.nodes.LValue;
 import com.sun.fortress.nodes.Node;
 import com.sun.fortress.nodes.NodeAbstractVisitor;
@@ -45 +45 @@
 
     /* (non-Javadoc)
-     * @see com.sun.fortress.nodes.NodeAbstractVisitor#forLValueBind(com.sun.fortress.nodes.LValueBind)
+     * @see com.sun.fortress.nodes.NodeAbstractVisitor#forLValue(com.sun.fortress.nodes.LValue)
      */
     @Override
-    public ArrowOrFunctional forLValueBind(LValueBind that) {
+    public ArrowOrFunctional forLValue(LValue that) {
         return optionTypeIsArrow(that.getType());
     }

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/ApiMaker.java

@@ -71 +71 @@
 
                 @Override public Boolean forVarDecl(VarDecl that) {
-                    List<LValueBind> lhs = that.getLhs();
+                    List<LValue> lhs = that.getLhs();
                     boolean result = false;
-                    for (LValueBind lv : lhs) {
+                    for (LValue lv : lhs) {
                         if ( containsPrivate(lv.getMods()) )
                             result = true;
@@ -154 +154 @@
     public Option<Node> forVarDecl(VarDecl that) {
         if ( ! isPrivate(that) ) {
-            List<LValueBind> lhs = new ArrayList<LValueBind>();
-            for (LValueBind lvb : that.getLhs()) {
+            List<LValue> lhs = new ArrayList<LValue>();
+            for (LValue lvb : that.getLhs()) {
                 if ( lvb.getType().isNone() )
                     log(lvb, "The type of " + lvb.getName() + " is required.");

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/ErrorMsgMaker.java

@@ -301 +301 @@
     }
 
-    public String forLValueBind(LValueBind node) {
+    public String forLValue(LValue node) {
         String r = "";
         if (node.getType().isSome()) {

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/ExprFactory.java

@@ -607 +607 @@
         Option<Expr> _rhs = Option.some(_r);
         _body.add(_body_expr);
-        _lhs.add(new LValueBind(p.getSpan(), p,false));
+        _lhs.add(new LValue(p.getSpan(), p,false));
         return new LocalVarDecl(FortressUtil.spanTwo(p, _r), _body, _lhs, _rhs);
     }
@@ -616 +616 @@
         Option<Expr> _rhs = Option.some(_r);
         _body.add(_body_expr);
-        _lhs.add(new LValueBind(sp, p,false));
+        _lhs.add(new LValue(sp, p,false));
         return new LocalVarDecl(sp, _body, _lhs, _rhs);
     }

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/NodeFactory.java

@@ -718 +718 @@
     }
 
-    public static LValueBind makeLValue(Id id) {
-        return new LValueBind(id.getSpan(), id);
-    }
-
-    public static LValueBind makeLValue(String name, String type) {
+    public static LValue makeLValue(Id id) {
+        return new LValue(id.getSpan(), id);
+    }
+
+    public static LValue makeLValue(String name, String type) {
         return makeLValue(name, makeVarType(type));
     }
 
-    public static LValueBind makeLValue(Id name, Id type) {
-        return new LValueBind(new Span(name.getSpan(), type.getSpan()),
+    public static LValue makeLValue(Id name, Id type) {
+        return new LValue(new Span(name.getSpan(), type.getSpan()),
                               name,
                               Option.some((Type)makeVarType(type.getSpan(),type)),
@@ -734 +734 @@
     }
 
-    public static LValueBind makeLValue(Id name, Type type) {
-        return new LValueBind(new Span(name.getSpan(), type.getSpan()),
+    public static LValue makeLValue(Id name, Type type) {
+        return new LValue(new Span(name.getSpan(), type.getSpan()),
                 name,
                 Option.some(type),
@@ -742 +742 @@
     }
 
-    public static LValueBind makeLValue(Id name, Option<Type> type) {
-        return new LValueBind(name.getSpan(),
+    public static LValue makeLValue(Id name, Option<Type> type) {
+        return new LValue(name.getSpan(),
                 name,
                 type,
@@ -750 +750 @@
     }
 
-    public static LValueBind makeLValue(String name, Type type) {
-        return new LValueBind(type.getSpan(), makeId(name), Option.some(type),
+    public static LValue makeLValue(String name, Type type) {
+        return new LValue(type.getSpan(), makeId(name), Option.some(type),
                 Collections.<Modifier>emptyList(), false);
     }
 
-    public static LValueBind makeLValue(String name, Type type, List<Modifier> mods) {
-        LValueBind result = makeLValue(name, type);
+    public static LValue makeLValue(String name, Type type, List<Modifier> mods) {
+        LValue result = makeLValue(name, type);
         return makeLValue(result, mods);
     }
 
-    public static LValueBind makeLValue(LValueBind lvb, Id name) {
-        return new LValueBind(lvb.getSpan(), name, lvb.getType(), lvb.getMods(),
+    public static LValue makeLValue(LValue lvb, Id name) {
+        return new LValue(lvb.getSpan(), name, lvb.getType(), lvb.getMods(),
                               lvb.isMutable());
     }
 
-    public static LValueBind makeLValue(LValueBind lvb, boolean mutable) {
-        return new LValueBind(lvb.getSpan(), lvb.getName(), lvb.getType(),
+    public static LValue makeLValue(LValue lvb, boolean mutable) {
+        return new LValue(lvb.getSpan(), lvb.getName(), lvb.getType(),
                               lvb.getMods(), mutable);
     }
 
-    public static LValueBind makeLValue(LValueBind lvb, List<Modifier> mods) {
+    public static LValue makeLValue(LValue lvb, List<Modifier> mods) {
         boolean mutable = lvb.isMutable();
         for (Modifier m : mods) {
@@ -776 +776 @@
                 mutable = true;
         }
-        return new LValueBind(lvb.getSpan(), lvb.getName(), lvb.getType(),
+        return new LValue(lvb.getSpan(), lvb.getName(), lvb.getType(),
                               mods, mutable);
     }
 
-    public static LValueBind makeLValue(LValueBind lvb, List<Modifier> mods,
+    public static LValue makeLValue(LValue lvb, List<Modifier> mods,
             boolean mutable) {
-        return new LValueBind(lvb.getSpan(), lvb.getName(), lvb.getType(),
+        return new LValue(lvb.getSpan(), lvb.getName(), lvb.getType(),
                               mods, mutable);
     }
 
-    public static LValueBind makeLValue(LValueBind lvb, Type ty) {
-        return new LValueBind(lvb.getSpan(), lvb.getName(),
+    public static LValue makeLValue(LValue lvb, Type ty) {
+        return new LValue(lvb.getSpan(), lvb.getName(),
                               Option.some(ty), lvb.getMods(),
                               lvb.isMutable());
     }
 
-    public static LValueBind makeLValue(LValueBind lvb, Type ty,
+    public static LValue makeLValue(LValue lvb, Type ty,
             boolean mutable) {
-        return new LValueBind(lvb.getSpan(), lvb.getName(),
+        return new LValue(lvb.getSpan(), lvb.getName(),
                               Option.some(ty), lvb.getMods(), mutable);
     }
 
-    public static LValueBind makeLValue(LValueBind lvb, Type ty,
+    public static LValue makeLValue(LValue lvb, Type ty,
             List<Modifier> mods) {
         boolean mutable = lvb.isMutable();
@@ -805 +805 @@
                 mutable = true;
         }
-        return new LValueBind(lvb.getSpan(), lvb.getName(),
+        return new LValue(lvb.getSpan(), lvb.getName(),
                               Option.some(ty), mods, mutable);
     }
 
-    public static LValueBind makeLValue(NormalParam param) {
-        return new LValueBind(param.getSpan(), param.getName(),
+    public static LValue makeLValue(NormalParam param) {
+        return new LValue(param.getSpan(), param.getName(),
                 param.getType(), param.getMods(), false);
     }
@@ -1093 +1093 @@
     }
 
-    public static AbsVarDecl makeAbsVarDecl(Span span, List<LValueBind> lvals) {
+    public static AbsVarDecl makeAbsVarDecl(Span span, List<LValue> lvals) {
         FortressUtil.validId(lvals);
         return new AbsVarDecl(span, lvals);
     }
 
-    public static VarDecl makeVarDecl(Span span, List<LValueBind> lvals, Expr init) {
+    public static VarDecl makeVarDecl(Span span, List<LValue> lvals, Expr init) {
         FortressUtil.validId(lvals);
         return new VarDecl(span, lvals, init);
@@ -1105 +1105 @@
     public static VarDecl makeVarDecl(Span span, Id name, Expr init) {
         FortressUtil.validId(name);
-        LValueBind bind = new LValueBind(span, name, Option.<Type>none(),
+        LValue bind = new LValue(span, name, Option.<Type>none(),
                 Collections.<Modifier>emptyList(), true);
-        return new VarDecl(span, Useful.<LValueBind>list(bind), init);
+        return new VarDecl(span, Useful.<LValue>list(bind), init);
     }
 
@@ -1113 +1113 @@
         Id id = new Id(span, name);
         FortressUtil.validId(id);
-        LValueBind bind = new LValueBind(span, id,
+        LValue bind = new LValue(span, id,
                                          Option.<Type>none(),
                                          Collections.<Modifier>emptyList(), true);
-        return new VarDecl(span, Useful.<LValueBind>list(bind), init);
+        return new VarDecl(span, Useful.<LValue>list(bind), init);
     }
 

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/NodeUtil.java

@@ -422 +422 @@
     /* stringNames *********************************************************/
     public static IterableOnce<String> stringNames(LValue lv) {
-        return lv.accept(new NodeAbstractVisitor<IterableOnce<String>>() {
-            public IterableOnce<String> forLValueBind(LValueBind d) {
-                return new UnitIterable<String>(d.getName().getText());
-            }
-            public IterableOnce<String> forUnpastingBind(UnpastingBind d) {
-                return new UnitIterable<String>(d.getName().getText());
-            }
-            public IterableOnce<String> forUnpastingSplit(UnpastingSplit d) {
-                return new IterableOnceForLValueList(d.getElems());
-            }
-        });
+        return new UnitIterable<String>(lv.getName().getText());
     }
 

trunk/ProjectFortress/src/com/sun/fortress/parser/AbsField.rats

@@ -49 +49 @@
      }
    / a1:ApiFldMods? a2:BindIdOrBindIdTuple w colon w a3:NoNewlineType w ellipses
-     { List<LValueBind> lvs;
+     { List<LValue> lvs;
        if (a1 != null) lvs = FortressUtil.ids2Lvs(a2, a1, a3, false);
        else            lvs = FortressUtil.ids2Lvs(a2, a3, false);
@@ -60 +60 @@
        if (a2.size() != tys.size())
            syntaxError(span, "Mismatched numbers of variables and types.");
-       List<LValueBind> lvs;
+       List<LValue> lvs;
        if (a1 != null) lvs = FortressUtil.ids2Lvs(a2, a1, tys, false);
        else            lvs = FortressUtil.ids2Lvs(a2, tys, false);

trunk/ProjectFortress/src/com/sun/fortress/parser/LocalDecl.rats

@@ -116 +116 @@
            a2 = FortressUtil.setMutable(a2, createSpan(yyStart,3));
        }
-       yyValue = FortressUtil.mkLocalVarDecl(createSpan(yyStart,yyCount),
-                                             FortressUtil.toLValueList(a2), a3);
+       yyValue = FortressUtil.mkLocalVarDecl(createSpan(yyStart,yyCount), a2, a3);
      }
    / a1:(var w)? a2:NoNewlineVarWTypes s colonequals w a3:NoNewlineExpr
      { a2 = FortressUtil.setMutable(a2, createSpan(yyStart,3));
-       yyValue = FortressUtil.mkLocalVarDecl(createSpan(yyStart,yyCount),
-                                             FortressUtil.toLValueList(a2), a3);
+       yyValue = FortressUtil.mkLocalVarDecl(createSpan(yyStart,yyCount), a2, a3);
      }
    / a1:(var w)? a2:NoNewlineVarWTypes
      { if (a1 != null) a2 = FortressUtil.setMutable(a2, createSpan(yyStart,3));
-       yyValue = FortressUtil.mkLocalVarDecl(createSpan(yyStart,yyCount),
-                                             FortressUtil.toLValueList(a2));
+       yyValue = FortressUtil.mkLocalVarDecl(createSpan(yyStart,yyCount), a2);
      }
    / a1:VarWoTypes s equals w a2:NoNewlineExpr
@@ -177 +174 @@
      };
 
-LValueBind VarMayType := a1:BindId a2:(s void:colon s NoNewlineType)?
+LValue VarMayType := a1:BindId a2:(s void:colon s NoNewlineType)?
      { if (a2 == null)
-           yyValue = FortressUtil.mkLValueBind(createSpan(yyStart,yyCount),a1);
+           yyValue = FortressUtil.mkLValue(createSpan(yyStart,yyCount),a1);
        else
-           yyValue = FortressUtil.mkLValueBind(createSpan(yyStart,yyCount),a1,a2);
+           yyValue = FortressUtil.mkLValue(createSpan(yyStart,yyCount),a1,a2);
      };
 
@@ -196 +193 @@
 LValue VarWoType =
      a1:BindId
-     { yyValue = FortressUtil.mkLValueBind(createSpan(yyStart,yyCount), a1); }
-   / Unpasting ;
+     { yyValue = FortressUtil.mkLValue(createSpan(yyStart,yyCount), a1); }
+   / Unpasting
+     { Span span = createSpan(yyStart,yyCount);
+       yyValue = FortressUtil.mkLValue(span, new Id(span, "_"));
+     };
 
 /* Unpasting ::= [ w UnpastingElems w ] */
-private Unpasting Unpasting =
+private void Unpasting =
      void:opensquare w UnpastingElems w void:closesquare ;
 
@@ -207 +207 @@
    | UnpastingElem
  */
-private Unpasting UnpastingElems =
-     a1:UnpastingElem a2:RectSeparator a3:UnpastingElems
-     { yyValue = FortressUtil.unpastingCons(createSpan(yyStart,yyCount),
-                                            a1, a2, a3);
-     }
+private void UnpastingElems =
+     UnpastingElem RectSeparator UnpastingElems
    / UnpastingElem ;
 
@@ -218 +215 @@
    | Unpasting
  */
-private Unpasting UnpastingElem =
-     a1:BindId a2:(void:opensquare w UnpastingDim w void:closesquare)?
-     { if (a2 == null)
-           yyValue = new UnpastingBind(createSpan(yyStart,yyCount), a1,
-                                       Collections.<ExtentRange>emptyList());
-       else
-           yyValue = new UnpastingBind(createSpan(yyStart,yyCount), a1, a2);
-     }
+private void UnpastingElem =
+     BindId (void:opensquare w UnpastingDim w void:closesquare)?
    / Unpasting ;
 
@@ -231 +222 @@
 // due to the Rats! module system
 /* UnpastingDim ::= NoNewlineExtentRange (w BY w NoNewlineExtentRange)+  */
-private List<ExtentRange> UnpastingDim =
-     a1:NoNewlineExtentRange a2s:(w cross w NoNewlineExtentRange)+
-     { yyValue = FortressUtil.mkList(a1, a2s.list()); };
+private void UnpastingDim =
+     NoNewlineExtentRange (w cross w NoNewlineExtentRange)+ ;
 
 /* CaseClause ::= NoNewlineExpr w => w BlockElems */

trunk/ProjectFortress/src/com/sun/fortress/parser/NoNewlineExpr.rats

@@ -196 +196 @@
    | ( w NoNewlineVarWType (w , w NoNewlineVarWType)+ w )
  */
-List<LValueBind> NoNewlineVarWTypes =
+List<LValue> NoNewlineVarWTypes =
      a1:NoNewlineVarWType
      { yyValue = FortressUtil.mkList(a1); }
@@ -204 +204 @@
 
 /* NoNewlineVarWType ::= BindId s NoNewlineIsType */
-LValueBind NoNewlineVarWType = a1:BindId s a2:NoNewlineIsType
-     { yyValue = FortressUtil.mkLValueBind(createSpan(yyStart,yyCount),a1,a2); };
+LValue NoNewlineVarWType = a1:BindId s a2:NoNewlineIsType
+     { yyValue = FortressUtil.mkLValue(createSpan(yyStart,yyCount),a1,a2); };
 
 /* NoNewlineIsType ::= : w NoNewlineType */

trunk/ProjectFortress/src/com/sun/fortress/parser/Variable.rats

@@ -59 +59 @@
      }
    / a1:VarImmutableMods? a2:BindIdOrBindIdTuple w equals w a3:NoNewlineExpr
-     { List<LValueBind> lvs;
+     { List<LValue> lvs;
        if (a1 != null) lvs = FortressUtil.ids2Lvs(a2, a1);
        else lvs = FortressUtil.ids2Lvs(a2);
@@ -66 +66 @@
      }
    / a1:VarMods? a2:BindIdOrBindIdTuple w colon w a3:NoNewlineType w ellipses w a4:InitVal
-     { List<LValueBind> lvs;
+     { List<LValue> lvs;
        if (a1 != null) {
            if (a4.getB()) lvs = FortressUtil.ids2Lvs(a2, a1, a3, true);
@@ -82 +82 @@
        if (a2.size() != tys.size())
            syntaxError(span, "Mismatched numbers of variables and types.");
-       List<LValueBind> lvs;
+       List<LValue> lvs;
        if (a1 != null) {
            if (a4.getB()) lvs = FortressUtil.ids2Lvs(a2, a1, tys, true);
@@ -130 +130 @@
    | ( w VarMayType (w , w VarMayType)+ w )
  */
-List<LValueBind> VarMayTypes =
+List<LValue> VarMayTypes =
      a1:VarMayType
      { yyValue = FortressUtil.mkList(a1); }
@@ -137 +137 @@
 
 /* VarMayType ::= BindId (w IsType)? */
-LValueBind VarMayType = a1:BindId a2:(w IsType)
+LValue VarMayType = a1:BindId a2:(w IsType)
      { if (a2 == null)
-           yyValue = FortressUtil.mkLValueBind(createSpan(yyStart,yyCount),a1);
+           yyValue = FortressUtil.mkLValue(createSpan(yyStart,yyCount),a1);
        else
-           yyValue = FortressUtil.mkLValueBind(createSpan(yyStart,yyCount),a1,a2);
+           yyValue = FortressUtil.mkLValue(createSpan(yyStart,yyCount),a1,a2);
      };
 
@@ -163 +163 @@
      }
    / a1:AbsVarMods? a2:BindIdOrBindIdTuple w colon w a3:NoNewlineType w ellipses
-     { List<LValueBind> lvs;
+     { List<LValue> lvs;
        if (a1 != null) lvs = FortressUtil.ids2Lvs(a2, a1, a3, false);
        else            lvs = FortressUtil.ids2Lvs(a2, a3, false);
@@ -174 +174 @@
        if (a2.size() != tys.size())
            syntaxError(span, "Mismatched numbers of variables and types.");
-       List<LValueBind> lvs;
+       List<LValue> lvs;
        if (a1 != null) lvs = FortressUtil.ids2Lvs(a2, a1, tys, false);
        else            lvs = FortressUtil.ids2Lvs(a2, tys, false);

trunk/ProjectFortress/src/com/sun/fortress/parser_util/FortressUtil.java

@@ -132 +132 @@
         l.add(last);
         return l;
-    }
-
-    public static List<LValue> toLValueList(List<LValueBind> lvbs) {
-        List<LValue> result = new ArrayList<LValue>();
-        for (LValueBind lvb : lvbs) {
-            result.add((LValue)lvb);
-        }
-        return result;
     }
 
@@ -347 +339 @@
     public static void validId(List<? extends LValue> lvs) {
         for (LValue lv : lvs) {
-            if (lv instanceof LValueBind) {
-                validId(((LValueBind)lv).getName());
-            } else if (lv instanceof UnpastingBind) {
-                validId(((UnpastingBind)lv).getName());
-            } else // if (lv instanceof UnpastingSplit)
-                validId(((UnpastingSplit)lv).getElems());
+            validId(lv.getName());
         }
     }
@@ -408 +395 @@
     }
 
-    public static void allHaveTypes(List<LValueBind> vars) {
-        for (LValueBind l : vars) {
+    public static void allHaveTypes(List<LValue> vars) {
+        for (LValue l : vars) {
             if (l.getType().isNone())
                 syntaxError(l.getSpan(),
@@ -416 +403 @@
     }
 
-    public static List<LValueBind> setMutable(List<LValueBind> vars) {
-        List<LValueBind> result = new ArrayList<LValueBind>();
-        for (LValueBind l : vars) {
+    public static List<LValue> setMutable(List<LValue> vars) {
+        List<LValue> result = new ArrayList<LValue>();
+        for (LValue l : vars) {
             result.add(NodeFactory.makeLValue(l, true));
         }
@@ -424 +411 @@
     }
 
-    public static List<LValueBind> setMutable(List<LValueBind> vars, Span span) {
-        List<LValueBind> result = new ArrayList<LValueBind>();
-        for (LValueBind l : vars) {
+    public static List<LValue> setMutable(List<LValue> vars, Span span) {
+        List<LValue> result = new ArrayList<LValue>();
+        for (LValue l : vars) {
             List<Modifier> mods = new ArrayList<Modifier>();
             mods.add(new ModifierVar(span));
@@ -434 +421 @@
     }
 
-    public static List<LValueBind> setMods(List<LValueBind> vars,
+    public static List<LValue> setMods(List<LValue> vars,
                                            List<Modifier> mods) {
-        List<LValueBind> result = new ArrayList<LValueBind>();
-        for (LValueBind l : vars) {
+        List<LValue> result = new ArrayList<LValue>();
+        for (LValue l : vars) {
             result.add(NodeFactory.makeLValue(l, mods));
         }
@@ -443 +430 @@
     }
 
-    public static List<LValueBind> setModsAndMutable(List<LValueBind> vars,
+    public static List<LValue> setModsAndMutable(List<LValue> vars,
                                                      List<Modifier> mods) {
-        List<LValueBind> result = new ArrayList<LValueBind>();
-        for (LValueBind l : vars) {
+        List<LValue> result = new ArrayList<LValue>();
+        for (LValue l : vars) {
             result.add(NodeFactory.makeLValue(l, mods, true));
         }
@@ -455 +442 @@
         List<LValue> result = new ArrayList<LValue>();
         for (LValue l : vars) {
-            if (l instanceof LValueBind) {
-                List<Modifier> mods = new ArrayList<Modifier>();
-                mods.add(new ModifierVar(span));
-                result.add(NodeFactory.makeLValue((LValueBind)l, mods));
-            } else syntaxError(l.getSpan(), "Unpasting cannot be mutable.");
+            List<Modifier> mods = new ArrayList<Modifier>();
+            mods.add(new ModifierVar(span));
+            result.add(NodeFactory.makeLValue(l, mods));
         }
         return result;
@@ -467 +452 @@
         List<LValue> result = new ArrayList<LValue>();
         for (LValue l : vars) {
-            if (l instanceof LValueBind)
-                result.add(NodeFactory.makeLValue((LValueBind)l, ty));
-            else syntaxError(l.getSpan(), "Unpasting cannot be set types.");
+            result.add(NodeFactory.makeLValue(l, ty));
         }
         return result;
@@ -478 +461 @@
         int ind = 0;
         for (LValue l : vars) {
-            if (l instanceof LValueBind) {
-                result.add(NodeFactory.makeLValue((LValueBind)l, tys.get(ind)));
-                ind += 1;
-            } else syntaxError(l.getSpan(), "Unpasting cannot be set types.");
+            result.add(NodeFactory.makeLValue(l, tys.get(ind)));
+            ind += 1;
         }
         return result;
@@ -489 +470 @@
         List<LValue> result = new ArrayList<LValue>();
         for (LValue l : vars) {
-            if (l instanceof LValueBind) {
-                result.add(NodeFactory.makeLValue((LValueBind)l, ty, true));
-            } else syntaxError(l.getSpan(), "Unpasting cannot be mutable.");
+            result.add(NodeFactory.makeLValue(l, ty, true));
         }
         return result;
@@ -500 +479 @@
         List<LValue> result = new ArrayList<LValue>();
         for (LValue l : vars) {
-           if (l instanceof LValueBind) {
-               List<Modifier> mods = new ArrayList<Modifier>();
-               mods.add(new ModifierVar(span));
-               result.add(NodeFactory.makeLValue((LValueBind)l, ty, mods));
-           } else syntaxError(l.getSpan(), "Unpasting cannot be mutable.");
+            List<Modifier> mods = new ArrayList<Modifier>();
+            mods.add(new ModifierVar(span));
+            result.add(NodeFactory.makeLValue(l, ty, mods));
         }
         return result;
@@ -514 +491 @@
         int ind = 0;
         for (LValue l : vars) {
-            if (l instanceof LValueBind) {
-                result.add(NodeFactory.makeLValue((LValueBind)l, tys.get(ind),
-                                                  true));
-                ind += 1;
-            } else syntaxError(l.getSpan(), "Unpasting cannot be mutable.");
+            result.add(NodeFactory.makeLValue(l, tys.get(ind), true));
+            ind += 1;
         }
         return result;
@@ -528 +502 @@
         int ind = 0;
         for (LValue l : vars) {
-            if (l instanceof LValueBind) {
-               List<Modifier> mods = new ArrayList<Modifier>();
-               mods.add(new ModifierVar(span));
-               result.add(NodeFactory.makeLValue((LValueBind)l, tys.get(ind),
-                                                 mods));
-               ind += 1;
-            } else syntaxError(l.getSpan(), "Unpasting cannot be mutable.");
-        }
-        return result;
-    }
-
-    public static List<LValueBind> ids2Lvs(List<Id> ids, List<Modifier> mods,
+            List<Modifier> mods = new ArrayList<Modifier>();
+            mods.add(new ModifierVar(span));
+            result.add(NodeFactory.makeLValue(l, tys.get(ind), mods));
+            ind += 1;
+        }
+        return result;
+    }
+
+    public static List<LValue> ids2Lvs(List<Id> ids, List<Modifier> mods,
                                            Option<Type> ty, boolean mutable) {
-        List<LValueBind> lvs = new ArrayList<LValueBind>();
+        List<LValue> lvs = new ArrayList<LValue>();
         for (Id id : ids) {
-            lvs.add(new LValueBind(id.getSpan(), id, ty, mods, mutable));
+            lvs.add(new LValue(id.getSpan(), id, ty, mods, mutable));
         }
         return lvs;
     }
 
-    public static List<LValueBind> ids2Lvs(List<Id> ids, List<Modifier> mods,
+    public static List<LValue> ids2Lvs(List<Id> ids, List<Modifier> mods,
                                            Type ty, boolean mutable) {
         return ids2Lvs(ids, mods, Option.some(ty), mutable);
     }
 
-    public static List<LValueBind> ids2Lvs(List<Id> ids, Type ty,
+    public static List<LValue> ids2Lvs(List<Id> ids, Type ty,
                                            boolean mutable) {
         return ids2Lvs(ids, emptyModifiers(), Option.some(ty), mutable);
     }
 
-    public static List<LValueBind> ids2Lvs(List<Id> ids, List<Modifier> mods) {
+    public static List<LValue> ids2Lvs(List<Id> ids, List<Modifier> mods) {
         return ids2Lvs(ids, mods, Option.<Type>none(), false);
     }
 
-    public static List<LValueBind> ids2Lvs(List<Id> ids) {
+    public static List<LValue> ids2Lvs(List<Id> ids) {
         return ids2Lvs(ids, emptyModifiers(), Option.<Type>none(), false);
     }
 
-    public static List<LValueBind> ids2Lvs(List<Id> ids, List<Modifier> mods,
+    public static List<LValue> ids2Lvs(List<Id> ids, List<Modifier> mods,
                                            List<Type> tys, boolean mutable) {
-        List<LValueBind> lvs = new ArrayList<LValueBind>();
+        List<LValue> lvs = new ArrayList<LValue>();
         int ind = 0;
         for (Id id : ids) {
-            lvs.add(new LValueBind(id.getSpan(), id, Option.some(tys.get(ind)),
+            lvs.add(new LValue(id.getSpan(), id, Option.some(tys.get(ind)),
                                    mods, mutable));
             ind += 1;
@@ -578 +549 @@
     }
 
-    public static List<LValueBind> ids2Lvs(List<Id> ids, List<Type> tys,
+    public static List<LValue> ids2Lvs(List<Id> ids, List<Type> tys,
                                            boolean mutable) {
         return ids2Lvs(ids, emptyModifiers(), tys, mutable);
@@ -655 +626 @@
     }
 
-    public static LValueBind mkLValueBind(Span span, Id id, Type ty) {
-        return new LValueBind(span, id, Option.some(ty), emptyModifiers(),false);
-    }
-    public static LValueBind mkLValueBind(Span span, Id id) {
-        return new LValueBind(span, id, Option.<Type>none(),
+    public static LValue mkLValue(Span span, Id id, Type ty) {
+        return new LValue(span, id, Option.some(ty), emptyModifiers(),false);
+    }
+    public static LValue mkLValue(Span span, Id id) {
+        return new LValue(span, id, Option.<Type>none(),
                               emptyModifiers(), false);
     }
-    public static LValueBind mkLValueBind(Id id, Type ty,
+    public static LValue mkLValue(Id id, Type ty,
                                           List<Modifier> mods) {
-        return new LValueBind(id.getSpan(), id, Option.some(ty), mods,
+        return new LValue(id.getSpan(), id, Option.some(ty), mods,
                               getMutable(mods));
     }
-    public static LValueBind mkLValueBind(Id id, Type ty) {
-        return mkLValueBind(id, ty, emptyModifiers());
+    public static LValue mkLValue(Id id, Type ty) {
+        return mkLValue(id, ty, emptyModifiers());
     }
 
@@ -786 +757 @@
 //                  unpasting_split span dim (one :: elems)
 //            | _ -> Errors.internal_error span "Empty unpasting.")
+/*
     public static Unpasting unpastingCons(Span span, Unpasting one, int sep,
                                           Unpasting two) {
@@ -816 +788 @@
         }
     }
+*/
 
 // let join (one : span) (two : span) : span =

trunk/ProjectFortress/src/com/sun/fortress/parser_util/SyntaxChecker.java

@@ -149 +149 @@
 
     public void forAbsVarDeclOnly(AbsVarDecl that) {
-        for (LValueBind lvb : that.getLhs()) {
+        for (LValue lvb : that.getLhs()) {
             if ( lvb.getType().isNone() )
                 log(lvb, "The type of " + lvb.getName() + " is required.");

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/phases/Transform.java

@@ -126 +126 @@
 
     /* Support renaming for these nodes
-     * LValueBind    ( only for LocalVarDecl ) - done
-     * UnpastingBind ( only for LocalVarDecl ) - done
+     * LValue        ( only for LocalVarDecl ) - done
      * FnDecl        ( only for local function decls ) - done
      * NormalParam   ( only for FnExpr and local function decls ) - done
@@ -372 +371 @@
                 public LValue apply(LValue value){
                     return (LValue) value.accept( new TemplateUpdateVisitor(){
-                        public Node forLValueBindOnly(LValueBind that, Id name_result, Option<Type> type_result, List<Modifier> mods_result) {
+                        public Node forLValueOnly(LValue that, Id name_result, Option<Type> type_result, List<Modifier> mods_result) {
                             Id old = (Id) name_result.accept(transformer);
                             Id generatedId = generateId(old);
                             Debug.debug( Debug.Type.SYNTAX, 2, "Generate new binding for " + old + " = " + generatedId );
                             extendSyntaxEnvironment(old, generatedId);
-                            return new LValueBind(that.getSpan(), generatedId, type_result, mods_result);
-                        }
-                        public Node forUnpastingBindOnly(UnpastingBind that, Id name_result, List<ExtentRange> dim_result) {
-                            Id old = (Id) name_result.accept(transformer);
-                            Id generatedId = generateId(old);
-                            Debug.debug( Debug.Type.SYNTAX, 2, "Generate new binding for " + old + " = " + generatedId );
-                            extendSyntaxEnvironment(old, generatedId);
-                            return new UnpastingBind(that.getSpan(), generatedId, dim_result);
+                            return new LValue(that.getSpan(), generatedId, type_result, mods_result);
                         }
                     });

trunk/ProjectFortress/src/com/sun/fortress/tools/FortressAstToConcrete.java

@@ -603 +603 @@
         return Useful.applyToAll( lhs, new Fn<LValue,Boolean>(){
             public Boolean apply( LValue value ){
-                return value.accept( new NodeDepthFirstVisitor<Boolean>(){
-                    @Override public Boolean forLValueBind(LValueBind that) {
-                        return that.isMutable();
-                    }
-
-                    @Override public Boolean forUnpastingBind(UnpastingBind that) {
-                        return false;
-                    }
-
-                    @Override public Boolean forUnpastingSplit(UnpastingSplit that) {
-                        return false;
-                    }
-                });
+                return value.isMutable();
             }
         });
@@ -627 +615 @@
 
         List<LValue> lhs = new ArrayList<LValue>();
-        for ( LValueBind lv : that.getLhs() ) {
-            lhs.add( (LValue)lv );
+        for ( LValue lv : that.getLhs() ) {
+            lhs.add( lv );
         }