Changeset 3149

Timestamp:

12/04/08 11:39:12 (12 months ago)

Author:

sukyoungryu

Message:

[ast refactoring] Eliminated _RewriteFieldRef.

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (1 diff)
• src/com/sun/fortress/compiler/desugarer/DesugaringVisitor.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/Evaluator.java (modified) (4 diffs)
• src/com/sun/fortress/interpreter/evaluator/LHSEvaluator.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/LHSToLValue.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (7 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/tools/FortressAstToConcrete.java (modified) (1 diff)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -1020 +1020 @@
                              */
                             FieldRef(Id field);
-                            /**
-                             * A rewritten field ref (not a getter/setter)
-                             * also used to disambiguate lexical references to self/parent
-                             * and within objectexprs to get access to outer scopes
-                             * where the vars in the outer scopes may in turn have been
-                             * API-qualified.
-                             *
-                             * If the reference to outer scope can be "fixed" (there is
-                             * only one out scope) then it might be good to narrow this
-                             * back down to an Id.
-                             *
-                             * Names of "field" must be unqualified.
-                             */
-                            _RewriteFieldRef(Name field);
                         /**
                          * The rewriting to explicitly name self and parent

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

@@ -425 +425 @@
                                                                 rhs);
                     }
-                    public Node for_RewriteFieldRef(_RewriteFieldRef lhs_that) {
-                        if ( lhs_that.getField() instanceof Id) {
-                            Expr obj = (Expr) lhs_that.getObj().accept(DesugaringVisitor.this);
-                            Expr rhs = rhs_result;
-                            if ( that.getAssignOp().isSome() ) {
-                                Expr _lhs = (Expr)lhs_that.accept(DesugaringVisitor.this);
-                                rhs = ExprFactory.makeOpExpr(span, lhs_that.getExprType(),
-                                                             that.getAssignOp().unwrap(),
-                                                             _lhs, rhs);
-                            }
-                            return ExprFactory.makeMethodInvocation(span,
-                                                                    that.isParenthesized(),
-                                                                    voidType, obj,
-                                                                    (Id)lhs_that.getField(),
-                                                                    rhs);
-                        } else
-                            return ExprFactory.makeAssignment(span, voidType,
-                                                              that.getLhs(),
-                                                              that.getAssignOp(),
-                                                              rhs_result);
-                    }
                 });
     }
@@ -540 +519 @@
 
     @Override
-    public Node for_RewriteFieldRefOnly(_RewriteFieldRef that, Option<Type> exprType_result,
-                                        Expr obj_result, Name field_result) {
-        if ( field_result instanceof Id)
-            return ExprFactory.makeMethodInvocation(that, obj_result, (Id)field_result,
-                                                    ExprFactory.makeVoidLiteralExpr(that.getSpan()));
-        else
-            return ExprFactory.make_RewriteFieldRef(that, obj_result,
-                                                    field_result);
-    }
-
-    @Override
     public Node forObjectExpr(ObjectExpr that) {
         DesugaringVisitor newVisitor = extend(that.getDecls());

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

@@ -137 +137 @@
 import com.sun.fortress.nodes.VoidLiteralExpr;
 import com.sun.fortress.nodes.While;
-import com.sun.fortress.nodes._RewriteFieldRef;
 import com.sun.fortress.nodes._RewriteFnApp;
 import com.sun.fortress.nodes._RewriteFnRef;
@@ -780 +779 @@
     @Override
     public FValue forFieldRef(FieldRef x) {
-        return forFieldRefCommon(x, x.getField());
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.fortress.nodes.NodeAbstractVisitor#for_RewriteFieldRef(com.sun.fortress.nodes._RewriteFieldRef)
-     */
-    @Override
-    public FValue for_RewriteFieldRef(_RewriteFieldRef x) {
         return forFieldRefCommon(x, x.getField());
     }
@@ -1385 +1376 @@
             return ((FieldRef)arf).getField();
         }
-        if (arf instanceof _RewriteFieldRef) {
-            return ((_RewriteFieldRef)arf).getField();
-
-        }
         return bug("Unexpected AbstractFieldRef " + arf);
 
@@ -1415 +1402 @@
             return juxtMemberSelection(x, fobj, fld, exprs);
 
-        } else if (fcnExpr instanceof _RewriteFieldRef) {
-            // In this case, open code the FieldRef evaluation
-            // so that the object can be preserved. Alternate
-            // strategy might be to generate a closure from
-            // the field selection.
-            _RewriteFieldRef fld_sel = (_RewriteFieldRef) fcnExpr;
-            Expr obj = fld_sel.getObj();
-            Name fld = fld_sel.getField();
-            if (fld instanceof Id) {
-                FValue fobj = obj.accept(this);
-                return juxtMemberSelection(x, fobj, (Id) fld, exprs);
-            } else {
-                NI.nyi("Field selector of dotted");
-            }
         } else if (fcnExpr instanceof _RewriteFnRef) {
             // Only come here if there are static args -- must be generic

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

@@ -55 +55 @@
 import com.sun.fortress.nodes.Type;
 import com.sun.fortress.nodes.VarRef;
-import com.sun.fortress.nodes._RewriteFieldRef;
 import com.sun.fortress.useful.HasAt;
 import com.sun.fortress.useful.NI;
@@ -106 +105 @@
     @Override
     public Voidoid forFieldRef(FieldRef x) {
-        return forFieldRefCommon(x, x.getField());
-    }
-
-    /* (non-Javadoc)
-     * @see com.sun.fortress.nodes.NodeAbstractVisitor#for_RewriteFieldRef(com.sun.fortress.nodes._RewriteFieldRef)
-     */
-    @Override
-    public Voidoid for_RewriteFieldRef(_RewriteFieldRef x) {
         return forFieldRefCommon(x, x.getField());
     }

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

@@ -34 +34 @@
 import com.sun.fortress.nodes.TupleExpr;
 import com.sun.fortress.nodes.VarRef;
-import com.sun.fortress.nodes._RewriteFieldRef;
 import com.sun.fortress.interpreter.evaluator._WrappedFValue;
 import com.sun.fortress.nodes_util.ExprFactory;
@@ -107 +106 @@
     }
 
-
-    @Override
-    public Lhs for_RewriteFieldRef(_RewriteFieldRef x) {
-        Expr from = wrapEval(x.getObj(), "Non-object in field selection");
-        // TODO need to generalize to dotted names.
-        return new _RewriteFieldRef(x.getSpan(), false, from, x.getField());
-    }
-
     public Lhs forVarRef(VarRef x) {
         return x;

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

@@ -109 +109 @@
 import com.sun.fortress.nodes.WhereConstraint;
 import com.sun.fortress.nodes.While;
-import com.sun.fortress.nodes._RewriteFieldRef;
 import com.sun.fortress.nodes._RewriteFnRef;
 import com.sun.fortress.nodes._RewriteObjectExpr;
@@ -221 +220 @@
         @Override
         Expr replacement(VarRef original) {
-            return new _RewriteFieldRef(original.getSpan(), false,
-                                        // Use this constructor
-                                        // here because it is a
-                                        // rewrite.
-                                        dottedReference(original.getSpan(),
-                                                        objectNestingDepth - objectNestedness),
-                                        filterQID(original.getVarId()));
+            return new FieldRef(original.getSpan(), false,
+                                // Use this constructor
+                                // here because it is a
+                                // rewrite.
+                                dottedReference(original.getSpan(),
+                                                objectNestingDepth - objectNestedness),
+                                filterQID(original.getVarId()));
         }
 
@@ -459 +458 @@
         }
         if (i > 0) {
-            return new _RewriteFieldRef(s, false, dottedReference(s, i - 1),
-                                      new Id(s,WellKnownNames.secretParentName));
+            return new FieldRef(s, false, dottedReference(s, i - 1),
+                                new Id(s,WellKnownNames.secretParentName));
         } else {
             throw new Error("Confusion in member reference numbering.");
@@ -911 +910 @@
                 Id newName = new Id(at, "$" + element_index);
                 newdecls.add(new VarDecl(at, Useful.list(lv),
-                                         Option.<Expr>some(new _RewriteFieldRef(at, false, init, newName))));
+                                         Option.<Expr>some(new FieldRef(at, false, init, newName))));
                 element_index++;
             }
@@ -1609 +1608 @@
                                     visitedArgs));
             }
-        } else  if (expr instanceof _RewriteFieldRef) {
-
-            _RewriteFieldRef selfDotSomething = (_RewriteFieldRef) visit(first);
+        } else  if (expr instanceof FieldRef) {
+
+            FieldRef selfDotSomething = (FieldRef) visit(first);
 
             return new MethodInvocation(node.getSpan(),
                                     false,
                                     selfDotSomething.getObj(), // this will rewrite in the future.
-                                    (Id) selfDotSomething.getField(),
+                                    selfDotSomething.getField(),
                                     visitedArgs.size() == 0 ? ExprFactory.makeVoidLiteralExpr(node.getSpan()) : //TODO wrong span
                                     visitedArgs.size() == 1 ? visitedArgs.get(0) :
@@ -1634 +1633 @@
         // perhaps FieldRefs are too general
         // Recursive visits here
-        _RewriteFieldRef selfDotSomething = (_RewriteFieldRef) visit(first);
+        FieldRef selfDotSomething = (FieldRef) visit(first);
         //        List<MathItem> visitedArgs = visitList(exprs);
         Node arg = visit(((ExprMI)node.getRest().get(0)).getExpr());
@@ -1641 +1640 @@
                                 false,
                                 selfDotSomething.getObj(), // this will rewrite in the future.
-                                (Id) selfDotSomething.getField(),
+                                selfDotSomething.getField(),
                                     (Expr)arg
                                     /*

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

@@ -252 +252 @@
     public String forFieldRef(FieldRef node) {
         return node.getObj().accept(this) + "." + forId(node.getField());
-    }
-
-    public String for_RewriteFieldRef(FieldRef node) {
-        return node.getObj().accept(this) + "." + forName(node.getField());
     }
 

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

@@ -429 +429 @@
     }
 
-    public static MethodInvocation makeMethodInvocation(_RewriteFieldRef that,
-                                                        Expr obj, Id field,
-                                                        Expr expr) {
-        return new MethodInvocation(that.getSpan(), that.isParenthesized(), obj,
-                                    field, expr);
-    }
-
     public static VarRef makeVarRef(VarRef old, int depth) {
         return new VarRef(old.getSpan(), old.isParenthesized(), old.getVarId(),
@@ -519 +512 @@
     }
 
-    public static _RewriteFieldRef make_RewriteFieldRef(_RewriteFieldRef expr,
-                                                        Expr receiver, Name field) {
-        return new _RewriteFieldRef(expr.getSpan(), expr.isParenthesized(),
-                                    expr.getExprType(), receiver, field);
+    public static FieldRef make_RewriteFieldRef(FieldRef expr,
+                                                Expr receiver, Id field) {
+        return new FieldRef(expr.getSpan(), expr.isParenthesized(),
+                            expr.getExprType(), receiver, field);
     }
 

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

@@ -1667 +1667 @@
     }
 
-    @Override public String for_RewriteFieldRefOnly(_RewriteFieldRef that, Option<String> exprType_result,
-                                                    String obj_result,
-                                                    String field_result) {
-        StringBuilder s = new StringBuilder();
-
-        s.append( obj_result ).append( "." ).append( field_result ) ;
-
-        return handleParen( s.toString(),
-                            that.isParenthesized() );
-    }
-
     @Override public String forFnRefOnly(FnRef that, Option<String> exprType_result,
                                          List<String> staticArgs_result,