Changeset 2022

Timestamp:

06/19/08 18:16:57 (5 months ago)

Author:

sukyoungryu

Message:

[astgen] Deleted a node: FieldRefForSure?

Files:

• trunk/ProjectFortress/astgen/Fortress.ast (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/desugarer/DesugaringVisitor.java (modified) (2 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeChecker.java (modified) (11 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/Evaluator.java (modified) (3 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/LHSEvaluator.java (modified) (2 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/LHSToLValue.java (modified) (2 diffs)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -1120 +1120 @@
-                    FieldRef(Id field);
-                    /**
-                     * A field selection, for sure
-                     * (though its implementation might be a getter/setter)
-                     * Names of "field" must be unqualified.
-                     *
-                     * field reference rewritten by interpreter.evaluator.LHSToLValue
-                     */
-                    FieldRefForSure(Id field);
-                    /**
-                     * A rewritten field ref (not a getter/setter)
-                     * also used to disambiguate lexical references to self/parent

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

@@ -728 +728 @@
-//    }
-//
-//    public Node forFieldRefForSureOnly(FieldRefForSure that, Expr obj_result, Id field_result) {
-//        if (that.getObj() == obj_result && that.getField() == field_result) return that;
-//        else return new FieldRefForSure(that.getSpan(), that.isParenthesized(), obj_result, field_result);
-//    }
-//
-//    public Node for_RewriteFieldRefOnly(_RewriteFieldRef that, Expr obj_result, Name field_result) {
-//        if (that.getObj() == obj_result && that.getField() == field_result) return that;
@@ -1931 +1926 @@
-//    }
-//
-//    public Node forFieldRefForSure(FieldRefForSure that) {
-//        Expr obj_result = (Expr) that.getObj().accept(this);
-//        Id field_result = (Id) that.getField().accept(this);
-//        return forFieldRefForSureOnly(that, obj_result, field_result);
-//    }
-//
-//    public Node for_RewriteFieldRef(_RewriteFieldRef that) {
-//        Expr obj_result = (Expr) that.getObj().accept(this);

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

@@ -1725 +1725 @@
-                        }
-                        @Override
-                        public Option<? extends IdOrOpOrAnonymousName> forFieldRefForSure(
-                                        FieldRefForSure that) {
-                                return Option.some(that.getField());
-                        }
-                        @Override
-                        public Option<? extends IdOrOpOrAnonymousName> forLValueBind(
-                                        LValueBind that) {
@@ -2273 +2268 @@
-                        subtypeChecker, function_result, argument_result, result);
-    }
-
+
-    @Override
-        public TypeCheckerResult for_RewriteObjectRefOnly(_RewriteObjectRef that,
-                        TypeCheckerResult obj_result,
-                        List<TypeCheckerResult> staticArgs_result) {
-
+
-        if( obj_result.type().isNone() ) {
-                return TypeCheckerResult.compose(that, subtypeChecker, obj_result,
@@ -2293 +2288 @@
-                if( match ) {
-                        // make a trait type that is GenericType instantiated
- 
+
-                                        uninstantiated_t.isParenthesized(), uninstantiated_t.getName(), that.getStaticArgs());
-                        return TypeCheckerResult.compose(that, t, subtypeChecker, obj_result,
-                           
+
-                }
-                else {
@@ -2303 +2298 @@
-                        TypeCheckerResult e_result = new TypeCheckerResult(that, TypeError.make(err, that));
-                        return TypeCheckerResult.compose(that, subtypeChecker, obj_result, e_result,
-                           
+
-                }
-        }
@@ -2310 +2305 @@
-        }
-        }
-
+
-    // Checks the chunk given, and returns the result and a new expression.
-    // Requires that all TypeCheckerResults passed in actually have a type.
@@ -2317 +2312 @@
-        assert(!chunk.isEmpty());
-        // The non-functions in each chunk, if any, are replaced by a single element consisting of the non-functions grouped
- 
+
-        Option<Expr> last_non_fn = Option.none();
-        List<Expr> fns = new LinkedList<Expr>();
@@ -2342 +2337 @@
-        }
-        // We are done. result_expr must be some or this method wasn't implemented correctly.
- 
+
-                        IterUtil.asList(IterUtil.pairFirsts(chunk)));
-        return Pair.make(result, result_expr.unwrap());
-    }
-
+
-    @Override
-        public TypeCheckerResult forLooseJuxtOnly(LooseJuxt that,
@@ -2355 +2350 @@
-        // the ordering of association is different.
-        // Notice also that tightJuxt has to be recursive, but loose juxt is not, due to specification.
-
+
-        // Did any subexpressions fail to typecheck?
-        for( TypeCheckerResult r : exprs_result ) {
-                if( r.type().isNone())
-                  
-
-
+
+
+
-        if( that.getExprs().size() != exprs_result.size() ) {
-                bug("Number of types don't match number of sub-expressions");
@@ -2371 +2366 @@
-                Iterator<Expr> expr_iter = that.getExprs().iterator();
-                boolean seen_non_fn = false;
- 
- 
- 
+
+
+
-                for( TypeCheckerResult r : exprs_result ) {
- 
+
-                        if( is_arrow && seen_non_fn ) {
-                                // finished last chunk
@@ -2399 +2394 @@
-        List<Expr> new_juxt_exprs = IterUtil.asList(IterUtil.pairSeconds(checked_chunks));
-        List<TypeCheckerResult> new_juxt_results = IterUtil.asList(IterUtil.pairFirsts(checked_chunks));
-
+
-        if( checked_chunks.size() == 1 ) {
-                Expr expr = IterUtil.first(new_juxt_exprs);
@@ -2408 +2403 @@
-        // (1) If any element that remains has type String, then it is a static error if any two adjacent elements are not of type String.
-        // TODO: Separate pass?
-   
+
-        OpExpr multi_op_expr = new OpExpr(that.getSpan(), that.getMultiJuxt(), new_juxt_exprs);
-        TypeCheckerResult multi_op_result = multi_op_expr.accept(this);

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

@@ -92 +92 @@
-import com.sun.fortress.nodes.ExtentRange;
-import com.sun.fortress.nodes.FieldRef;
-import com.sun.fortress.nodes.FieldRefForSure;
-import com.sun.fortress.nodes.Link;
-import com.sun.fortress.nodes.MethodInvocation;
@@ -805 +804 @@
-    }
-
-    @Override
-    public FValue forFieldRefForSure(FieldRefForSure x) {
-        return forFieldRefCommon(x, x.getField());
-    }
-
-    private FValue forFieldRefCommon(AbstractFieldRef x, Name fld) throws FortressException,
-            ProgramError {
@@ -1361 +1355 @@
-            return ((FieldRef)arf).getField();
-        }
-        if (arf instanceof FieldRefForSure) {
-            return ((FieldRefForSure)arf).getField();
-
-        }
-        if (arf instanceof _RewriteFieldRef) {
-            return ((_RewriteFieldRef)arf).getField();

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

@@ -45 +45 @@
-import com.sun.fortress.interpreter.glue.WellKnownNames;
-import com.sun.fortress.nodes.AbstractFieldRef;
-import com.sun.fortress.nodes.FieldRefForSure;
-import com.sun.fortress.nodes.Name;
-import com.sun.fortress.nodes.NodeAbstractVisitor;
@@ -127 +126 @@
-    }
-
-    @Override
-    public Voidoid forFieldRefForSure(FieldRefForSure x) {
-        return forFieldRefCommon(x, x.getField());
-    }
-
-
-
-    LHSEvaluator(Evaluator evaluator, FValue value) {
-        this.evaluator = evaluator; this.value = value;

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

@@ -24 +24 @@
-import com.sun.fortress.interpreter.evaluator.values.FObject;
-import com.sun.fortress.interpreter.evaluator.values.FValue;
-import com.sun.fortress.nodes.FieldRefForSure;
-import com.sun.fortress.nodes.NodeAbstractVisitor;
-import com.sun.fortress.nodes.Expr;
@@ -115 +114 @@
-
-    @Override
-    public LHS forFieldRefForSure(FieldRefForSure x) {
-        Expr from = wrapEval(x.getObj(), "Non-object in field selection");
-        // TODO need to generalize to dotted names.
-        return new FieldRefForSure(x.getSpan(), false, from, x.getField());
-    }
-
-
-    @Override
-    public LHS for_RewriteFieldRef(_RewriteFieldRef x) {
-        Expr from = wrapEval(x.getObj(), "Non-object in field selection");