Changeset 3146

Timestamp:

12/04/08 07:22:05 (12 months ago)

Author:

sukyoungryu

Message:

[ast refactoring] Merged _RewriteObjectRef and VarRef?.

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (2 diffs)
• src/com/sun/fortress/compiler/desugarer/DesugaringVisitor.java (modified) (1 diff)
• src/com/sun/fortress/compiler/disambiguator/ExprDisambiguator.java (modified) (8 diffs)
• src/com/sun/fortress/compiler/typechecker/TypeChecker.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/evaluator/Evaluator.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (6 diffs)
• src/com/sun/fortress/interpreter/rewrite/RewriteInPresenceOfTypeInfoVisitor.java (modified) (3 diffs)
• src/com/sun/fortress/nodes_util/ErrorMsgMaker.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/ExprFactory.java (modified) (7 diffs)
• src/com/sun/fortress/nodes_util/NodeUtil.java (modified) (1 diff)
• src/com/sun/fortress/parser/Expression.rats (modified) (2 diffs)
• src/com/sun/fortress/syntax_abstractions/phases/Transform.java (modified) (1 diff)
• src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (1 diff)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -992 +992 @@
                          * Primary ::= self
                          * e.g.) length
-                         */
-                        VarRef(Id varId, int lexicalDepth=-2147483648) implements Lhs;
-                        /**
+                         *
+                         * <staticArgs>
                          * A reference to a singleton object. Created at typechecking or disambiguation-time.
                          * Necessary because object references are initially parsed as FnRefs.
@@ -1001 +1000 @@
                          * object Foo[\T\] ... end
                          */
-                        _RewriteObjectRef(Id obj, List<StaticArg> staticArgs);
+                        VarRef(Id varId,
+                               List<StaticArg> staticArgs,
+                               int lexicalDepth=-2147483648) implements Lhs;
                         /**
                          * Temporarily, until closure conversion is always on-line,

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

@@ -498 +498 @@
     @Override
     public Node forVarRefOnly(VarRef that, Option<Type> exprType_result,
-                              Id varResult) {
+                              Id varResult, List<StaticArg> staticArg_result) {
         // After disambiguation, the Id in a VarRef should have an empty API.
         assert(varResult.getApiName().isNone());

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

@@ -72 +72 @@
 import com.sun.fortress.nodes.OpRef;
 import com.sun.fortress.nodes.Param;
+import com.sun.fortress.nodes.StaticArg;
 import com.sun.fortress.nodes.StaticParam;
 import com.sun.fortress.nodes.TaggedDimType;
@@ -87 +88 @@
 import com.sun.fortress.nodes.VoidLiteralExpr;
 import com.sun.fortress.nodes.While;
-import com.sun.fortress.nodes._RewriteObjectRef;
 import com.sun.fortress.nodes_util.ExprFactory;
 import com.sun.fortress.nodes_util.NodeFactory;
@@ -949 +949 @@
     @Override public Node forVarRef(VarRef that) {
         Id name = that.getVarId();
+
+        // singleton object
+        if ( NodeUtil.isSingletonObject(that) ) {
+            Set<Id> objs = _env.explicitTypeConsNames(name);
+            if( objs.isEmpty() ) {
+                objs = _env.onDemandTypeConsNames(name);
+            }
+
+            if( objs.isEmpty() ) {
+                return that;
+            }
+            else if( objs.size() == 1 ) {
+                return new VarRef(that.getSpan(), IterUtil.first(objs), that.getStaticArgs());
+            }
+            else {
+                error("Name may refer to: " + NodeUtil.namesString(objs), that);
+                return that;
+            }
+        }
+
         Option<APIName> api = name.getApiName();
         ConsList<Id> fields = ConsList.empty();
@@ -966 +986 @@
                         return that;
                     }
-                    else { result = new VarRef(newId.getSpan(), newId); }
+                    else { result = new VarRef(newId.getSpan(), newId,
+                                               Collections.<StaticArg>emptyList()); }
                 }
                 else if (_env.hasQualifiedFunction(newId)) {
@@ -1004 +1025 @@
                     return that;
                 }
-                else { result = new VarRef(that.getSpan(), newName); }
+                else { result = new VarRef(that.getSpan(), newName,
+                                           Collections.<StaticArg>emptyList()); }
             }
             else if (vars.isEmpty() && !fns.isEmpty() ) {
@@ -1029 +1051 @@
                 }
                 else {
-                    result = new VarRef(name.getSpan(), name);
+                    result = new VarRef(name.getSpan(), name,
+                                        Collections.<StaticArg>emptyList());
                 }
                 // error("Unrecognized name: " + NodeUtil.nameString(name), that);
@@ -1047 +1070 @@
 
 
-
-    @Override
-        public Node for_RewriteObjectRef(_RewriteObjectRef that) {
-        Id obj_name = that.getObj();
-
-        Set<Id> objs = _env.explicitTypeConsNames(obj_name);
-        if( objs.isEmpty() ) {
-            objs = _env.onDemandTypeConsNames(obj_name);
-        }
-
-        if( objs.isEmpty() ) {
-            return that;
-        }
-        else if( objs.size() == 1 ) {
-            return new _RewriteObjectRef(that.getSpan(), IterUtil.first(objs), that.getStaticArgs());
-        }
-        else {
-            error("Name may refer to: " + NodeUtil.namesString(objs), that);
-            return that;
-        }
-    }
 
     @Override
@@ -1083 +1085 @@
             if( !types.isEmpty() ) {
                 // create _RewriteObjectRef
-                _RewriteObjectRef obj = new _RewriteObjectRef(that.getSpan(), fn_name, that.getStaticArgs());
+                VarRef obj = new VarRef(that.getSpan(), fn_name, that.getStaticArgs());
                 return obj.accept(this);
             }

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

@@ -946 +946 @@
         }
 
-        @Override
-        public TypeCheckerResult for_RewriteObjectRefOnly(_RewriteObjectRef that, Option<TypeCheckerResult> exprType_result,
+        public TypeCheckerResult for_RewriteObjectRefOnly(VarRef that, Option<TypeCheckerResult> exprType_result,
                                                           TypeCheckerResult obj_result,
                                                           List<TypeCheckerResult> staticArgs_result) {
@@ -986 +985 @@
             }
 
-            Node new_node = new _RewriteObjectRef(that.getSpan(), that.isParenthesized(),
-                                                  Option.<Type>some(t),
-                                                  (Id) obj_result.ast(),
-                                                  (List<StaticArg>) TypeCheckerResult.astFromResults(staticArgs_result));
+            Node new_node = new VarRef(that.getSpan(), that.isParenthesized(),
+                                       Option.<Type>some(t),
+                                       (Id) obj_result.ast(),
+                                       (List<StaticArg>) TypeCheckerResult.astFromResults(staticArgs_result));
             return TypeCheckerResult.compose(new_node, t, subtypeChecker, obj_result,
                                              TypeCheckerResult.compose(that, subtypeChecker, staticArgs_result),
@@ -4362 +4361 @@
 
         @Override
-        public TypeCheckerResult forVarRefOnly(VarRef that, Option<TypeCheckerResult> exprType_result, TypeCheckerResult var_result) {
-                Option<Type> varType = var_result.type();
-
-                VarRef new_node = new VarRef(that.getSpan(),
-                                varType,
-                                (Id)var_result.ast());
-
-                return TypeCheckerResult.compose(new_node, varType, subtypeChecker, var_result);
+        public TypeCheckerResult forVarRefOnly(VarRef that,
+                                               Option<TypeCheckerResult> exprType_result,
+                                               TypeCheckerResult var_result,
+                                               List<TypeCheckerResult> staticArgs_result) {
+            if ( NodeUtil.isSingletonObject(that) )
+                return for_RewriteObjectRefOnly(that, exprType_result, var_result,
+                                                staticArgs_result);
+
+            Option<Type> varType = var_result.type();
+
+            VarRef new_node = new VarRef(that.getSpan(),
+                                         varType,
+                                         (Id)var_result.ast(),
+                                         Collections.<StaticArg>emptyList());
+
+            return TypeCheckerResult.compose(new_node, varType, subtypeChecker, var_result);
         }
 

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

@@ -142 +142 @@
 import com.sun.fortress.nodes._RewriteObjectExpr;
 import com.sun.fortress.nodes._RewriteObjectExprRef;
-import com.sun.fortress.nodes._RewriteObjectRef;
 import com.sun.fortress.nodes_util.ExprFactory;
 import com.sun.fortress.nodes_util.NodeUtil;
@@ -1643 +1642 @@
 
     public FValue forVarRef(VarRef x) {
+        if ( NodeUtil.isSingletonObject(x) ) {
+            Id name = x.getVarId();
+            FValue g = forIdOfTLRef(name);
+            return applyToActualStaticArgs(g,x.getStaticArgs(),x);
+        }
+
 //        Id id = x.getVar();
 //        String s= id.getText();
@@ -1706 +1711 @@
     }
 
-    @Override
-    public FValue for_RewriteObjectRef(_RewriteObjectRef that) {
-        Id name = that.getObj();
-        FValue g = forIdOfTLRef(name);
-
-        if( that.getStaticArgs().isEmpty() )
-            return g;
-        else
-            return applyToActualStaticArgs(g,that.getStaticArgs(),that);
-    }
-
     private FValue forIdOfTLRef(Id x) {
         FValue res = e.getValueNull(x, Environment.TOP_LEVEL);

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

@@ -112 +112 @@
 import com.sun.fortress.nodes._RewriteFnRef;
 import com.sun.fortress.nodes._RewriteObjectExpr;
-import com.sun.fortress.nodes._RewriteObjectRef;
 import com.sun.fortress.useful.BATree;
 import com.sun.fortress.useful.BASet;
@@ -371 +370 @@
     Expr newName(VarRef vre, String s) {
         Thing t = rewrites.get(s);
-        if (t == null) {
-            noteUse(s, vre);
+
+        if ( NodeUtil.isSingletonObject(vre) ) {
+            if (t == null) {
+                return vre;
+            } else {
+            }
             return vre;
         } else {
-            return t.replacement(vre);
-        }
-
+            if (t == null) {
+                noteUse(s, vre);
+                return vre;
+            } else {
+                return t.replacement(vre);
+            }
+        }
     }
 
@@ -408 +415 @@
         }
 
-    }
-
-    Expr newName(_RewriteObjectRef vre, String s) {
-        Thing t = rewrites.get(s);
-        if (t == null) {
-            return vre;
-        } else {
-        }
-        return vre;
     }
 
@@ -678 +676 @@
     }
     @Override
-    public Node for_RewriteObjectRef(_RewriteObjectRef vre) {
-        String s = NodeUtil.stringName(vre.getObj());
-        return visitNode(newName(vre, s));
-    }
-    @Override
     public Node forAmbiguousMultifixOpExpr(AmbiguousMultifixOpExpr op) {
      // NEB: This code is temporary. Very soon the static end will
@@ -715 +708 @@
         return visitNode(expr);
     }
+
     @Override
     public Node forVarRef(VarRef vre) {
+        if ( NodeUtil.isSingletonObject(vre) ) {
+            String s = NodeUtil.stringName(vre.getVarId());
+            return visitNode(newName(vre, s));
+        }
+
         String s = vrToString(vre);
         StaticParam tp = visibleGenericParameters.get(s);
@@ -1104 +1103 @@
         Node rewrittenExpr =  visit(body);
 
-        Expr in_fn = new VarRef(sp, NodeFactory.makeId(WellKnownNames.fortressBuiltin, WellKnownNames.thread));
+        Expr in_fn = new VarRef(sp, NodeFactory.makeId(WellKnownNames.fortressBuiltin,
+                                                       WellKnownNames.thread),
+                                Collections.<StaticArg>emptyList());
         List<StaticArg> args = new ArrayList<StaticArg>();
         args.add(new TypeArg(sp,new VarType(sp,

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

@@ -19 +19 @@
 
 import java.util.List;
+import java.util.Collections;
 
 import com.sun.fortress.nodes.FnRef;
@@ -40 +41 @@
     @Override
     public Node forFnRef(FnRef fr) {
-        
+
         List<Id> fns = fr.getFns(); // ignore this for now.
         List<StaticArg> sargs = fr.getStaticArgs();
@@ -48 +49 @@
             return (new _RewriteFnRef(fr.getSpan(),
                 fr.isParenthesized(),
-                                           new VarRef(idn.getSpan(),
-                                                      idn),
+                                      new VarRef(idn.getSpan(),
+                                                 idn,
+                                                 Collections.<StaticArg>emptyList()),
                 sargs)).accept(this);
 
         else {
             //throw new Error("Unexpected FnRef " + fr);
-            return (new VarRef(idn.getSpan(), fr.isParenthesized(), idn)).accept(this);
+            return (new VarRef(idn.getSpan(), fr.isParenthesized(), idn,
+                               Collections.<StaticArg>emptyList())).accept(this);
         }
-        
+
     }
 

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

@@ -222 +222 @@
 
     public String forVarRef(VarRef node) {
-        return NodeUtil.nameString(node.getVarId());
+        List<StaticArg> sargs = node.getStaticArgs();
+        if ( NodeUtil.isSingletonObject(node) )
+            return forId(node.getVarId()) +
+                (sargs.size() > 0 ? Useful.listInOxfords(sargs) : "");
+        else
+            return NodeUtil.nameString(node.getVarId());
     }
 
@@ -243 +248 @@
     public String forExponentConstraint(ExponentConstraint node) {
         return forOpConstraint(node, "^");
-    }
-
-    public String for_RewriteObjectRef(_RewriteObjectRef node) {
-        List<StaticArg> sargs = node.getStaticArgs();
-        return forId(node.getObj()) +
-               (sargs.size() > 0 ? Useful.listInOxfords(sargs) : "");
     }
 

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

@@ -437 +437 @@
 
     public static VarRef makeVarRef(VarRef old, int depth) {
-        return new VarRef(old.getSpan(), old.isParenthesized(), old.getVarId(), depth);
+        return new VarRef(old.getSpan(), old.isParenthesized(), old.getVarId(),
+                          Collections.<StaticArg>emptyList(),
+                          depth);
     }
 
     public static VarRef makeVarRef(VarRef var, Option<Type> type, Id name) {
-        return new VarRef(var.getSpan(), var.isParenthesized(), type, name);
+        return new VarRef(var.getSpan(), var.isParenthesized(), type, name,
+                          Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(Span span, Option<Type> type, Id name) {
-        return new VarRef(span, false, type, name);
+        return new VarRef(span, false, type, name,
+                          Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(Span span, String s) {
-        return new VarRef(span, false, NodeFactory.makeId(span, s));
+        return new VarRef(span, false, NodeFactory.makeId(span, s),
+                          Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(Span span, String s, int lexical_depth) {
-        return new VarRef(span, false, NodeFactory.makeId(span, s), lexical_depth);
+        return new VarRef(span, false, NodeFactory.makeId(span, s),
+                          Collections.<StaticArg>emptyList(),
+                          lexical_depth);
     }
 
@@ -465 +472 @@
 
     public static VarRef makeVarRef(Span sp, Id id) {
-        return new VarRef(sp, false, id);
+        return new VarRef(sp, false, id, Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(Span sp, Id id, Option<Type> type) {
-        return new VarRef(sp, false, type, id);
+        return new VarRef(sp, false, type, id, Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(Id id) {
-        return new VarRef(id.getSpan(), false, id);
+        return new VarRef(id.getSpan(), false, id,
+                          Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(Iterable<Id> apiIds, Id name) {
         Id qName = NodeFactory.makeId(apiIds, name);
-        return new VarRef(qName.getSpan(), false, qName);
+        return new VarRef(qName.getSpan(), false, qName,
+                          Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(Span span, Iterable<Id> apiIds, Id name) {
         Id qName = NodeFactory.makeId(span, apiIds, name);
-        return new VarRef(span, false, qName);
+        return new VarRef(span, false, qName,
+                          Collections.<StaticArg>emptyList());
     }
 
@@ -489 +499 @@
     public static VarRef makeVarRef(Iterable<Id> ids) {
         Id qName = NodeFactory.makeId(ids);
-        return new VarRef(qName.getSpan(), false, qName);
+        return new VarRef(qName.getSpan(), false, qName,
+                          Collections.<StaticArg>emptyList());
     }
 
     public static VarRef makeVarRef(APIName api, Id name) {
         Id qName = NodeFactory.makeId(api, name);
-        return new VarRef(qName.getSpan(), false, qName);
+        return new VarRef(qName.getSpan(), false, qName,
+                          Collections.<StaticArg>emptyList());
     }
 
@@ -705 +717 @@
                 return new _RewriteFnApp(that.getSpan(),true,that.getFunction(),that.getArgument());
             }
-        @Override
-            public Expr for_RewriteObjectRef(_RewriteObjectRef that) {
-                return new _RewriteObjectRef(that.getSpan(),true,that.getObj(),that.getStaticArgs());
-            }
         public Expr forAsExpr(AsExpr e) {
             return new AsExpr(e.getSpan(), true, e.getExpr(), e.getAnnType());
@@ -842 +850 @@
         }
         public Expr forVarRef(VarRef e) {
-            return new VarRef(e.getSpan(), true, e.getVarId());
+            return new VarRef(e.getSpan(), true, e.getVarId(),
+                              e.getStaticArgs());
         }
         public Expr forArrayComprehension(ArrayComprehension e) {
@@ -988 +997 @@
 
     public static TemplateGapFnExpr makeTemplateGapFnExpr(Span s, Id id, List<Id> params) {
-        Expr body = new VarRef(id.getSpan(), id);
+        Expr body = new VarRef(id.getSpan(), id,
+                               Collections.<StaticArg>emptyList());
         return new TemplateGapFnExpr(s, id, params);
     }
@@ -1033 +1043 @@
 
     public static Expr make_RewriteObjectRef(boolean parenthesized, Id in_obj, List<StaticArg> static_args) {
-        return new _RewriteObjectRef(in_obj.getSpan(), parenthesized, in_obj, static_args);
+        return new VarRef(in_obj.getSpan(), parenthesized, in_obj, static_args);
     }
 

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

@@ -166 +166 @@
         else if (def instanceof FnExpr) { return Option.some(((FnExpr)def).getBody()); }
         else { return Option.none(); }
+    }
+
+    public static boolean isSingletonObject(VarRef v) {
+        return (! v.getStaticArgs().isEmpty());
     }
 

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

@@ -110 +110 @@
      }
    / a1:QualifiedName
-     { yyValue = new VarRef(createSpan(yyStart,yyCount), false, a1); };
+     { yyValue = new VarRef(createSpan(yyStart,yyCount), false, a1,
+                            Collections.<StaticArg>emptyList()); };
 
 constant transient Action<Expr> AssignLeftTail =
@@ -439 +440 @@
    / a1:Id a2:StaticArgs?
      { if (a2 == null)
-            yyValue = new VarRef(createSpan(yyStart,yyCount),false,a1);
+            yyValue = new VarRef(createSpan(yyStart,yyCount),false,a1,
+                                 Collections.<StaticArg>emptyList());
        else yyValue = ExprFactory.makeFnRef(createSpan(yyStart,yyCount),a1,a2);
      };

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

@@ -116 +116 @@
         Id var_result = syntaxEnvironment.lookup(that.getVarId());
         Debug.debug(Debug.Type.SYNTAX, 2, "Looking up var ref " + that.getVarId() + " in hygiene environment = " + var_result);
-        return forVarRefOnly(that, exprType_result, var_result);
+        return forVarRefOnly(that, exprType_result, var_result, that.getStaticArgs());
     }
 

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

@@ -1641 +1641 @@
 
     @Override public String forVarRefOnly(VarRef that, Option<String> exprType_result,
-                                          String var_result) {
-        return handleParen( var_result,
-                            that.isParenthesized() );
-    }
-
-    @Override public String for_RewriteObjectRefOnly(_RewriteObjectRef that, Option<String> exprType_result,
-                                                     String obj_result,
-                                                     List<String> staticArgs_result) {
-        StringBuilder s = new StringBuilder();
-
-        s.append( obj_result );
-        inOxfordBrackets(s, staticArgs_result);
-
-        return handleParen( s.toString(),
-                            that.isParenthesized() );
+                                          String var_result,
+                                          List<String> staticArgs_result) {
+        if ( NodeUtil.isSingletonObject( that ) ) {
+            StringBuilder s = new StringBuilder();
+
+            s.append( var_result );
+            inOxfordBrackets(s, staticArgs_result);
+
+            return handleParen( s.toString(),
+                                that.isParenthesized() );
+        } else
+            return handleParen( var_result,
+                                that.isParenthesized() );
     }