Changeset 3112

Timestamp:

11/26/08 16:48:07 (12 months ago)

Author:

sukyoungryu

Message:

[ast refactoring] Got rid of objectExprs and functionalMethodNames fields from Component, replaced with appropriate top-level decl nodes.

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (5 diffs)
• src/com/sun/fortress/compiler/desugarer/ObjectExpressionVisitor.java (modified) (1 diff)
• src/com/sun/fortress/compiler/typechecker/SubtypeCheckerJUTest.java (modified) (1 diff)
• src/com/sun/fortress/compiler/typechecker/TypeAnalyzerJUTest.java (modified) (1 diff)
• src/com/sun/fortress/compiler/typechecker/TypeChecker.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/env/ComponentWrapper.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/evaluator/BuildEnvironments.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/BuildTopLevelEnvironments.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (1 diff)
• src/com/sun/fortress/nodes_util/NodeUtil.java (modified) (1 diff)
• src/com/sun/fortress/parser/Compilation.rats (modified) (2 diffs)
• src/com/sun/fortress/parser/preparser/PreCompilation.rats (modified) (2 diffs)
• src/com/sun/fortress/parser_util/NameAndImportCollector.java (modified) (2 diffs)
• src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (2 diffs)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -141 +141 @@
              * CompilationUnit ::= Component | Api
              */
-            abstract CompilationUnit(APIName name, List<Import> imports);
+            abstract CompilationUnit(APIName name, List<Import> imports,
+                                     List<Decl> decls);
                 /**
                  * component declaration
@@ -151 +152 @@
                  *       end
                  */
-                Component(boolean _native = false,
-                          List<APIName> exports, List<Decl> decls,
-                          List<_RewriteObjectExpr> objectExprs =
-                               Collections.<_RewriteObjectExpr>emptyList(),
-                          List<String> functionalMethodNames =
-                               Collections.<String>emptyList());
-                /* the list of object expressions is a temporary hack to allow
-                   progress towards earlier rewriting and caching of ASTs. -- DRC */
+                Component(boolean _native = false, List<APIName> exports);
                 /**
                  * API declaration
@@ -166 +160 @@
                  *       end
                  */
-                Api(List<Decl> decls);
+                Api();
             /**
              * import statement
@@ -343 +337 @@
                 VarDecl(List<LValue> lhs, Option<Expr> init);
                 /**
-                 * Overloading specification
-                 */
-                _RewriteFnOverloadDecl(IdOrOpName name,
-                                       List<IdOrOpName> fns);
-                /**
                  * functional declaration in components or APIs
                  * Names must be unqualified.
@@ -384 +373 @@
                        Option<Id> implementsUnambiguousName = Option.<Id>none())
                       implements Applicable, GenericDecl;
+                /**
+                 * Overloading specification
+                 */
+                _RewriteFnOverloadDecl(IdOrOpName name, List<IdOrOpName> fns);
+                /* the list of object expressions is a temporary hack to allow
+                   progress towards earlier rewriting and caching of ASTs. -- DRC */
+                /**
+                 * Lifted object expressions
+                 */
+                _RewriteObjectExprDecl(List<_RewriteObjectExpr> objectExprs);
+                /**
+                 * Injected functional methods
+                 */
+                _RewriteFunctionalMethodDecl(List<String> functionalMethodNames);
                 /**
                  * dimension and unit declaration

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

@@ -171 +171 @@
     @Override
     public Node forComponentOnly(Component that, APIName name_result,
-                                     List<Import> imports_result,
-                                     List<APIName> exports_result,
-                                     List<Decl> decls_result,
-                                     List<_RewriteObjectExpr> objectExprs) {
-        // note objectExprs parameter is a temporary hack.
+                                 List<Import> imports_result,
+                                 List<Decl> decls_result,
+                                 List<APIName> exports_result) {
         decls_result.addAll(newObjectDecls);
         return super.forComponentOnly(that, name_result,
-                        imports_result, exports_result, decls_result, objectExprs);
+                        imports_result, decls_result, exports_result);
     }
 

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

@@ -356 +356 @@
         Component ast = new Component(span, NodeFactory.makeAPIName(span, name),
                                       Collections.<Import>emptyList(),
-                                      Collections.<APIName>emptyList(),
-                                      traitDecls);
+                                      traitDecls,
+                                      Collections.<APIName>emptyList());
         return new ComponentIndex(ast,
                                   Collections.<Id, Variable>emptyMap(),

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

@@ -429 +429 @@
         Component ast = new Component(span, NodeFactory.makeAPIName(name),
                                       Collections.<Import>emptyList(),
-                                      Collections.<APIName>emptyList(),
-                                      traitDecls);
+                                      traitDecls,
+                                      Collections.<APIName>emptyList());
         return new ComponentIndex(ast,
                                   Collections.<Id, Variable>emptyMap(),

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

@@ -2012 +2012 @@
         @Override
         public TypeCheckerResult forComponentOnly(Component that,
-                        TypeCheckerResult name_result,
-                        List<TypeCheckerResult> imports_result,
-                        List<TypeCheckerResult> exports_result,
-                        List<TypeCheckerResult> decls_result,
-                        List<TypeCheckerResult> objectExprs
-        ) {
-                // note objectExprs parameter is a temporary hack.
-                // It should be ok to ignore it below, because it is
-                // empty until a later phase.
-
+                                                  TypeCheckerResult name_result,
+                                                  List<TypeCheckerResult> imports_result,
+                                                  List<TypeCheckerResult> decls_result,
+                                                  List<TypeCheckerResult> exports_result) {
                 Component new_comp =
                         new Component(that.getSpan(),
                                         (APIName)name_result.ast(),
                                         (List<Import>)TypeCheckerResult.astFromResults(imports_result),
+                                        (List<Decl>)TypeCheckerResult.astFromResults(decls_result),
                                         that.is_native(),
-                                        (List<APIName>)TypeCheckerResult.astFromResults(exports_result),
-                                        (List<Decl>)TypeCheckerResult.astFromResults(decls_result));
+                                        (List<APIName>)TypeCheckerResult.astFromResults(exports_result));
 
                 return TypeCheckerResult.compose(new_comp,

trunk/ProjectFortress/src/com/sun/fortress/interpreter/env/ComponentWrapper.java

@@ -168 +168 @@
         Component comp = (Component) comp_unit;
 
-            for (_RewriteObjectExpr oe : comp.getObjectExprs()) {
+            for (_RewriteObjectExpr oe : NodeUtil.getObjectExprs( comp )) {
                 String name = oe.getGenSymName();
                 List<StaticParam> params = oe.getStaticParams();
@@ -201 +201 @@
     public Set<String> getFunctionals() {
         if (transformed != null) {
-            return Useful.set(transformed.getFunctionalMethodNames());
+            return Useful.set(NodeUtil.getFunctionalMethodNames( transformed ));
         }
         return desugarer.functionals;

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

@@ -170 +170 @@
     }
 
-
-
-
      protected static void doDefs(BuildEnvironments inner, List<Decl> defs) {
         for (Decl def : defs) {

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

@@ -46 +46 @@
 import com.sun.fortress.nodes.TraitDecl;
 import com.sun.fortress.nodes._RewriteFnOverloadDecl;
+import com.sun.fortress.nodes._RewriteObjectExprDecl;
+import com.sun.fortress.nodes._RewriteFunctionalMethodDecl;
 import com.sun.fortress.nodes_util.NodeUtil;
 
@@ -139 +141 @@
         return null;
 
+    }
+
+    public Boolean for_RewriteObjectExprDecl(_RewriteObjectExprDecl x) {
+        return null;
+    }
+
+    public Boolean for_RewriteFunctionalMethodDecl(_RewriteFunctionalMethodDecl x) {
+        return null;
     }
 

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

@@ -666 +666 @@
         List<Decl> decls_result = recurOnListOfDecl(com.getDecls());
 
+        decls_result.add( new _RewriteObjectExprDecl(com.getSpan(), objectExprs) );
+        decls_result.add( new _RewriteFunctionalMethodDecl(com.getSpan(), Useful.list(functionals)) );
+
         AbstractNode nn =
          new Component(com.getSpan(),
-                 name_result, imports_result, com.is_native(),
-                 exports_result, decls_result,
-                 objectExprs, Useful.list(functionals));
+                       name_result, imports_result, decls_result,
+                       com.is_native(), exports_result);
 
         if (debug && ! suppressDebugDump)

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

@@ -37 +37 @@
 
 public class NodeUtil {
+
+    public static List<_RewriteObjectExpr> getObjectExprs(Component comp) {
+        for ( Decl d : comp.getDecls() ) {
+            if ( d instanceof _RewriteObjectExprDecl )
+                return ((_RewriteObjectExprDecl)d).getObjectExprs();
+        }
+        return new ArrayList<_RewriteObjectExpr>();
+    }
+
+    public static List<String> getFunctionalMethodNames(Component comp) {
+        for ( Decl d : comp.getDecls() ) {
+            if ( d instanceof _RewriteFunctionalMethodDecl )
+                return ((_RewriteFunctionalMethodDecl)d).getFunctionalMethodNames();
+        }
+        return new ArrayList<String>();
+    }
 
     /* get the declared name of a component or api */

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

@@ -68 +68 @@
        String file = span.begin.getFileName();
        APIName name = NodeFactory.makeAPINameFromPath(span, file, "\\.");
-       yyValue = new Component(span, name, a1, a2, a3);
+       yyValue = new Component(span, name, a1, a3, a2);
      }
    / a1:Imports w semicolon? a2:(w yyValue:AbsDecls w semicolon?)?
@@ -120 +120 @@
        if (a5 == null) a5 = Collections.<Decl>emptyList();
        if (a1 == null)
-           yyValue = new Component(span, a2, a3, a4, a5);
+           yyValue = new Component(span, a2, a3, a5, a4);
        else
-           yyValue = new Component(span, a2, a3, true, a4, a5);
+           yyValue = new Component(span, a2, a3, a5, true, a4);
      };
 

trunk/ProjectFortress/src/com/sun/fortress/parser/preparser/PreCompilation.rats

@@ -62 +62 @@
        String file = span.begin.getFileName();
        APIName name = NodeFactory.makeAPINameFromPath(span, file, "\\.");
-       yyValue = new Component(span, name, a1, a2, a3);
+       yyValue = new Component(span, name, a1, a3, a2);
      }
    / _
@@ -96 +96 @@
        Span span = createSpan(yyStart,yyCount);
        if (a1 == null)
-           yyValue = new Component(span, a2, a3, a4, a5);
+           yyValue = new Component(span, a2, a3, a5, a4);
        else
-           yyValue = new Component(span, a2, a3, true, a4, a5);
+           yyValue = new Component(span, a2, a3, a5, true, a4);
      };
 

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

@@ -44 +44 @@
 
         @Override
-        public List<Import> forComponentOnly(Component that,
-                        List<Import> name_result, List<List<Import>> imports_result,
-                        List<List<Import>> exports_result, List<List<Import>> decls_result,
-                        List<List<Import>> objectExprs) {
-                // note objectExprs parameter is a temporary hack.
+            public List<Import> forComponentOnly(Component that,
+                                                 List<Import> name_result, List<List<Import>> imports_result,
+                                                 List<List<Import>> decls_result,
+                                                 List<List<Import>> exports_result) {
                 this.namesAndImports = new NameAndImportCollection();
                 this.namesAndImports.setComponentName(that.getName());
@@ -54 +53 @@
 
                 return super.forComponentOnly(that, name_result, imports_result,
-                                exports_result, decls_result, objectExprs);
+                                              decls_result, exports_result);
         }
 

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

@@ -277 +277 @@
     @Override public String forComponentOnly(Component that, String name_result,
                                              List<String> imports_result,
-                                             List<String> exports_result,
                                              List<String> decls_result,
-                                             List<String> objectExprs) {
+                                             List<String> exports_result) {
         inComponent = true;
         // note objectExprs parameter is a temporary hack.
@@ -596 +595 @@
     }
 
+    @Override public String for_RewriteObjectExprDeclOnly(_RewriteObjectExprDecl that,
+                                                          List<String> objExprs_result) {
+        return "(* _RewriteObjectExprDecl() *)";
+    }
+
+    @Override public String for_RewriteFunctionalMethodDeclOnly(_RewriteFunctionalMethodDecl that) {
+        return "(* _RewriteFunctionalMethodDecl() *)";
+    }
 
     /****************************************/