Changeset 3078

Timestamp:

11/18/08 12:54:36 (12 months ago)

Author:

sukyoungryu

Message:

[ast] Eliminated the Export node.

Location:

trunk

Files:

• Library/FortressSyntax.fsi (modified) (1 diff)
• ProjectFortress/astgen/Fortress.ast (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/desugarer/ObjectExpressionVisitor.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/compiler/disambiguator/TopLevelEnv.java (modified) (31 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/environments/TopLevelEnvGen.java (modified) (29 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/index/ComponentIndex.java (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/typechecker/SubtypeCheckerJUTest.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeAnalyzerJUTest.java (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeChecker.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/Driver.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/env/CUWrapper.java (modified) (13 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/env/ComponentWrapper.java (modified) (9 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/nodes_util/NodeUtil.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/parser/Compilation.rats (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/parser/preparser/PreCompilation.rats (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/syntax_abstractions/parser/PreParser.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/tests/unit_tests/ConstructorsJUTest.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (2 diffs)

trunk/Library/FortressSyntax.fsi

@@ -29 +29 @@
     Component : Component
     Api : Api
-    Exports : List[\Export\]
-    Export : Export
+    Exports : List[\APIName\]
     Imports : List[\Import\]
     Import : Import

trunk/ProjectFortress/astgen/Fortress.ast

@@ -162 +162 @@
              * component declaration
              * Component ::= native? component APIName Imports? Exports Decls? end
+             * Export ::= export APINames
              * e.g.) component Hello
              *         export Executable
@@ -168 +169 @@
              */
             Component(boolean _native = false, APIName name, List<Import> imports,
-                      List<Export> exports, List<Decl> decls,
+                      List<APIName> exports, List<Decl> decls,
                       List<_RewriteObjectExpr> objectExprs =
                            Collections.<_RewriteObjectExpr>emptyList(),
@@ -226 +227 @@
         AliasedAPIName(APIName api,
                        Option<Id> alias = Option.<Id>none());
-        /**
-         * export statement
-         * Export ::= export APINames
-         * e.g.) export Executable
-         */
-        Export(List<APIName> apis);
         /**
          * trait or object declaration in components or APIs

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

@@ -170 +170 @@
     public Node forComponentOnly(Component that, APIName name_result,
                                      List<Import> imports_result,
-                                     List<Export> exports_result,
+                                     List<APIName> exports_result,
                                      List<Decl> decls_result,
                                      List<_RewriteObjectExpr> objectExprs) {

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

@@ -46 +46 @@
 import com.sun.fortress.nodes.Component;
 import com.sun.fortress.nodes.Enclosing;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.IdOrOpName;
@@ -76 +75 @@
 public class TopLevelEnv extends NameEnv {
     private static final Set<String> WELL_KNOWN_APIS = Useful.set(WellKnownNames.fortressLibrary, WellKnownNames.fortressBuiltin, WellKnownNames.anyTypeName);
-    
+
     private final GlobalEnvironment _originalGlobalEnv; // environment as it is created by the compiler
     private final GlobalEnvironment _filteredGlobalEnv; // environment that only includes "imported" names
@@ -95 +94 @@
         _current = current;
         _errors = errors;
-        
+
         GlobalEnvironment filtered_global_env;
         if( current instanceof ApiIndex ) {
@@ -105 +104 @@
             //  Filter env based on what this component imports
             Map<APIName,ApiIndex> filtered = filterApis(globalEnv.apis(), ((Component)current.ast()));
-            filtered_global_env = new GlobalEnvironment.FromMap(filtered);            
+            filtered_global_env = new GlobalEnvironment.FromMap(filtered);
         }
         else {
@@ -111 +110 @@
         }
         _filteredGlobalEnv = filtered_global_env;
-        
+
         _onDemandImportedApis = Collections.unmodifiableMap(initializeOnDemandImportedApis(filtered_global_env, current));
         _onDemandTypeConsNames = Collections.unmodifiableMap(initializeOnDemandTypeConsNames(_onDemandImportedApis));
@@ -123 +122 @@
 
     /**
-     * Initializes the map of imported API names to ApiIndices. 
+     * Initializes the map of imported API names to ApiIndices.
      * Adds all imported and implicitly imported
      * Apis to a map that it returns.
@@ -131 +130 @@
         // TODO: Fix to support other kinds of imports.
         Set<APIName> imports = current.imports();
-        Map<APIName, ApiIndex> result = new HashMap<APIName, ApiIndex>(); 
+        Map<APIName, ApiIndex> result = new HashMap<APIName, ApiIndex>();
 
         // The following APIs are always imported, provided they exist.
@@ -184 +183 @@
         // TODO: Fix to support explicit imports and api imports. I don't think this is still a 'to-do'
         Map<Id, Set<Id>> result = new HashMap<Id, Set<Id>>();
-        
+
         for (Map.Entry<APIName, ApiIndex> apiEntry: imported_apis.entrySet()) {
             for (Map.Entry<Id, TypeConsIndex> typeEntry: apiEntry.getValue().typeConses().entrySet()) {
@@ -216 +215 @@
 
     private static OpName copyOpNameWithNewAPIName(OpName op, final APIName api) {
-        OpName result = 
+        OpName result =
                 op.accept(new NodeDepthFirstVisitor<OpName>(){
                         @Override
@@ -232 +231 @@
         return result;
     }
-    
+
     private static Pair<Map<Id, Set<Id>>, Map<OpName, Set<OpName>>> initializeOnDemandFunctionNames(Map<APIName, ApiIndex> imported_apis) {
         Map<Id, Set<Id>> fun_result = new HashMap<Id, Set<Id>>();
         Map<OpName, Set<OpName>> ops_result =  new HashMap<OpName, Set<OpName>>();
-        
+
         for (Map.Entry<APIName, ApiIndex> apiEntry: imported_apis.entrySet()) {
             for (IdOrOpOrAnonymousName fnName: apiEntry.getValue().functions().firstSet()) {
@@ -253 +252 @@
                         fun_result.put(_fnName, matches);
                     }
-                } 
+                }
                 else { // fnName instanceof OpName
                     OpName _opName = (OpName)fnName;
@@ -299 +298 @@
         }
     }
-    
+
     @Override
     public Option<StaticParam> hasTypeParam(IdOrOpName name) {
@@ -321 +320 @@
                 _current.units().containsKey(name)) {
 
-            // A name defined in this CU should only be qualified if this is an API 
+            // A name defined in this CU should only be qualified if this is an API
             Id result_id;
             if( _current instanceof ApiIndex )
@@ -327 +326 @@
             else if( _current instanceof ComponentIndex )
                 result_id = apiQualifyIfComponentExports(((ComponentIndex)_current), name);
-            else 
+            else
                 result_id = name;
 
@@ -345 +344 @@
     private Id apiQualifyIfComponentExports(ComponentIndex comp, Id name) {
         Option<Id> result_ = Option.none();
-        
+
         for( APIName api_name : comp.exports() ) {
-            
+
             // TODO: We don't really need this, but for now since there is no Executable...
             if( !_originalGlobalEnv.definesApi(api_name) ) continue;
-            
+
             ApiIndex api = _originalGlobalEnv.api(api_name);
-            
+
             if( api.typeConses().containsKey(name) ) {
-                if( result_.isSome() ) 
+                if( result_.isSome() )
                     return NI.nyi("Disambiguator cannot yet handle the same Component providing the implementation for multiple APIs: " + name);
-                
+
                 result_ = Option.some(NodeFactory.makeId(api_name, name, name.getSpan()));
             }
         }
-        
+
         if( result_.isNone() )
             return name;
@@ -367 +366 @@
     }
 
-    public Set<Id> explicitVariableNames(Id name) {     
+    public Set<Id> explicitVariableNames(Id name) {
         Set<Id> result = Collections.emptySet();
         if (_current.variables().containsKey(name) ||
                 _current.units().containsKey(name)) {
-            
+
             // A name defined in this CU should only be qualified if this is an API
             Id result_id;
@@ -394 +393 @@
     public Set<Id> explicitFunctionNames(Id name) {
         Set<Id> result = Collections.emptySet();
-        
+
         // Add fns from this component
         if (_current.functions().containsFirst(name)) {
@@ -403 +402 @@
             else
                 result_id = name;
-            
+
             result = CollectUtil.union(result, Collections.singleton(result_id));
         }
-        
+
         // Also add imports
         result = CollectUtil.union(result, this.onDemandFunctionNames(name));
@@ -424 +423 @@
             else
                 result_id = name;
-                
+
             result = CollectUtil.union(result, Collections.singleton(result_id));
         }
@@ -584 +583 @@
         }
     }
-    
+
     /**
      * Returns API names in the given list of exports that can be imported implicitly.
      * This helps, for example, when compiling FortressLibrary, since that is one API that
-     * is normally imported implicitly. 
+     * is normally imported implicitly.
      */
-    private static Set<APIName> findWellKnownExports(List<Export> exports) {
-        return IterUtil.fold(exports, new HashSet<APIName>(),new Lambda2<HashSet<APIName>,Export, HashSet<APIName>>(){
-            public HashSet<APIName> value(HashSet<APIName> arg0, Export arg1) {
-                for( APIName api : arg1.getApis() ) {
-                    if( WELL_KNOWN_APIS.contains(api.getText()) ) {
-                        arg0.add(api);
-                    }
+    private static Set<APIName> findWellKnownExports(List<APIName> exports) {
+        return IterUtil.fold(exports, new HashSet<APIName>(),new Lambda2<HashSet<APIName>,APIName, HashSet<APIName>>(){
+            public HashSet<APIName> value(HashSet<APIName> arg0, APIName api) {
+                if( WELL_KNOWN_APIS.contains(api.getText()) ) {
+                    arg0.add(api);
                 }
                 return arg0;
             }});
     }
-    
+
     private static  Map<APIName, ApiIndex> filterApis(Map<APIName,ApiIndex> apis, Component comp) {
         Set<APIName> dont_import = findWellKnownExports(comp.getExports());
@@ -611 +608 @@
         // need them at a minimum.
         Import this_api_import = new ImportStar(NodeFactory.makeSpan("implicit import, TopLevelEnv"), api.getName(), Collections.<IdOrOpOrAnonymousName>emptyList());
-        return filterApis(Collections.unmodifiableMap(apis), 
-                Useful.concat(Collections.singletonList(this_api_import), 
+        return filterApis(Collections.unmodifiableMap(apis),
+                Useful.concat(Collections.singletonList(this_api_import),
                         api.getImports()
                         )
@@ -618 +615 @@
     }
 
-    private static <K, T> Map<K,T> filterMap(Map<K,T> map, Set<? super K> set, 
+    private static <K, T> Map<K,T> filterMap(Map<K,T> map, Set<? super K> set,
             Predicate<K> pred) {
-        
+
         Map<K,T> result = new HashMap<K,T>();
         for( Map.Entry<K, T> entry : map.entrySet() ) {
@@ -629 +626 @@
         return result;
     }
-    
+
     private static <K, T> Map<K,T> removeHelper(Map<K,T> map, final Set<? super K> set) {
         Predicate<K> pred = new Predicate<K>() {
@@ -635 +632 @@
                 return !set.contains(arg1);
             }};
-        
+
         return filterMap(map, set, pred);
     }
-    
+
     private static ApiIndex remove(ApiIndex index,
             final Set<IdOrOpOrAnonymousName> exceptions_) {
-        
+
         Predicate2<IdOrOpOrAnonymousName,Function> pred = new Predicate2<IdOrOpOrAnonymousName,Function>(){
 
@@ -647 +644 @@
                 return !exceptions_.contains(arg0);
             }
-            
+
         };
-        
+
         return new ApiIndex((Api)index.ast(),
                             removeHelper(index.variables(), exceptions_),
@@ -659 +656 @@
                             index.modifiedDate());
     }
-    
+
     private static <K, T> Map<K,T> keepHelper(Map<K,T> map, final Set<? super K> set) {
         Predicate<K> pred = new Predicate<K>() {
@@ -665 +662 @@
                 return set.contains(arg1);
             }};
-        
+
         return filterMap(map, set, pred);
     }
-    
+
     private static ApiIndex keep(ApiIndex index,
             final Set<IdOrOpOrAnonymousName> allowed_) {
-        
+
         Predicate2<IdOrOpOrAnonymousName,Function> pred = new Predicate2<IdOrOpOrAnonymousName,Function>(){
 
@@ -677 +674 @@
                 return allowed_.contains(arg0);
             }
-            
+
         };
-        
+
         return new ApiIndex((Api)index.ast(),
                 keepHelper(index.variables(), allowed_),
@@ -689 +686 @@
                 index.modifiedDate());
     }
-    
+
     /**
      * Filter out whole apis or parts of apis based on the imports of a component or
-     * api. FortressBuiltin and AnyType are always imported, and FortressLibrary is only 
+     * api. FortressBuiltin and AnyType are always imported, and FortressLibrary is only
      * imported implicitly if it is not imported explicitly. If {@code do_not_import} contains
      * api names, those apis will not beimported no matter what.
      */
-    private static Map<APIName,ApiIndex> filterApis(Map<APIName, ApiIndex> apis, List<Import> imports, Set<APIName> do_not_import) { 
+    private static Map<APIName,ApiIndex> filterApis(Map<APIName, ApiIndex> apis, List<Import> imports, Set<APIName> do_not_import) {
         final Map<APIName, Set<IdOrOpOrAnonymousName>> exceptions = new HashMap<APIName, Set<IdOrOpOrAnonymousName>>();
         final Map<APIName, Set<IdOrOpOrAnonymousName>> allowed = new HashMap<APIName, Set<IdOrOpOrAnonymousName>>();
@@ -722 +719 @@
 
                 // TODO Handle these aliased names more thoroughly
-                List<IdOrOpOrAnonymousName> names = CollectUtil.makeList(IterUtil.map(that.getAliasedNames(), 
+                List<IdOrOpOrAnonymousName> names = CollectUtil.makeList(IterUtil.map(that.getAliasedNames(),
                         new Lambda<AliasedSimpleName,IdOrOpOrAnonymousName>(){
                     public IdOrOpOrAnonymousName value(
@@ -772 +769 @@
                 Set<IdOrOpOrAnonymousName> allowed_ = allowed.get(name);
                 result.put(name, keep(index, allowed_));
-            } 
+            }
             else if( name.getText().equals(WellKnownNames.fortressBuiltin) ) {
                 // Fortress builtin is always implicitly imported

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

@@ -78 +78 @@
 
     public static String mangleClassIdentifier(String identifier) {
-        String mangledString = identifier.replaceAll("\\.", "\\$");  
-        return mangledString;         
-    }
-    
+        String mangledString = identifier.replaceAll("\\.", "\\$");
+        return mangledString;
+    }
+
     /**
      * http://blogs.sun.com/jrose/entry/symbolic_freedom_in_the_vm
@@ -115 +115 @@
             mangledString = "\\=" + mangledString;
         }
-        return mangledString; 
+        return mangledString;
     }
 
@@ -146 +146 @@
         return new CompilationUnitResult(compiledApis, errors);
     }
- 
+
     /**
      * Given a list of components, generate a Java bytecode compiled environment
@@ -232 +232 @@
                 ImportApi importApi = (ImportApi) imports;
                 for (AliasedAPIName api : importApi.getApis()) {
-                    importedApiNames.add(NodeUtil.nameString(api.getApi()));                    
+                    importedApiNames.add(NodeUtil.nameString(api.getApi()));
                 }
             } else if (imports instanceof ImportedNames) {
@@ -241 +241 @@
             }
         }
-        
+
         // XXX: SUPER DUPER HACKY
         // Rewrite the AST to include these builtin imports!
         for(String builtinLib : WellKnownNames.defaultLibrary) {
-            importedApiNames.add(builtinLib);            
-        }
-        
+            importedApiNames.add(builtinLib);
+        }
+
         // Any names that are exported, are also "imported", which is to say,
         // the disambiguator will generate references to them, so we had better
@@ -253 +253 @@
         if (comp instanceof Component) {
             Component ccomp = (Component) comp;
-            for (Export e : ccomp.getExports()) {
-                for (APIName api : e.getApis()) {
-                    importedApiNames.add(NodeUtil.nameString(api));
-                }
-            }
-        }
-        
-        namesToFields(EnvironmentClass.ENVIRONMENT, cw, symbolNames, importedApiNames);        
+            for (APIName api : ccomp.getExports()) {
+                importedApiNames.add(NodeUtil.nameString(api));
+            }
+        }
+
+        namesToFields(EnvironmentClass.ENVIRONMENT, cw, symbolNames, importedApiNames);
     }
 
@@ -271 +269 @@
         // Create all variables as fields in the environment
         Set<String> idStringSet = new HashSet<String>();
-        for(Id id : compUnitIndex.variables().keySet()) {                        
+        for(Id id : compUnitIndex.variables().keySet()) {
             String idString = NodeUtil.nameString(id);
             if (idString.equals("_")) {
@@ -285 +283 @@
                 // apply further mangling.
             }
-            idStringSet.add(idString);            
-        }
-        namesToFields(EnvironmentClass.FVALUE, cw, symbolNames, idStringSet);        
+            idStringSet.add(idString);
+        }
+        namesToFields(EnvironmentClass.FVALUE, cw, symbolNames, idStringSet);
 
         // Create all functions as fields in the environment
@@ -293 +291 @@
         for(IdOrOpOrAnonymousName id : compUnitIndex.functions().firstSet()) {
             String idString = NodeUtil.nameString(id);
-            idStringSet.add(idString);            
-        }        
-        namesToFields(EnvironmentClass.FVALUE, cw, symbolNames, idStringSet);        
+            idStringSet.add(idString);
+        }
+        namesToFields(EnvironmentClass.FVALUE, cw, symbolNames, idStringSet);
 
         // Create all types as fields in the environment
@@ -303 +301 @@
             idStringSet.add(idString);
         }
-        namesToFields(EnvironmentClass.FTYPE, cw, symbolNames, idStringSet); 
+        namesToFields(EnvironmentClass.FTYPE, cw, symbolNames, idStringSet);
 
         // Special case for singleton objects; get to the object through
@@ -314 +312 @@
                 if (oti.constructor().isNone()) {
                     String idString = WellKnownNames.obfuscatedSingletonConstructorName(NodeUtil.nameString(id), id);
-                    idStringSet.add(idString);                    
+                    idStringSet.add(idString);
                 }
             }
         }
-        namesToFields(EnvironmentClass.FVALUE, cw, symbolNames, idStringSet);        
-        
+        namesToFields(EnvironmentClass.FVALUE, cw, symbolNames, idStringSet);
+
         handleWeirdToplevelDecls(cw, compUnitIndex, symbolNames);
-        
+
         writeImportFields(cw, compUnitIndex, symbolNames);
     }
-    
+
     /**
      * Emits additional names for overloaded functions,
      * for temporaries generated by multiple assignment/init,
      * and for object expressions.
-     * 
+     *
      * @param cw
      * @param compUnitIndex
@@ -355 +353 @@
                 }
             }
-        
+
         // Scan for all object exprs in a component; the interpreter will
         // promote those to top level.
@@ -373 +371 @@
             compUnit.accept(visitor);
         }
-    }    
-    
+    }
+
     private static void namesToFields(EnvironmentClass nameSpace,
             ClassWriter cw, EnvSymbolNames symbolNames, Set<String> idStringSet) {
@@ -388 +386 @@
         cw.visitField(Opcodes.ACC_PUBLIC, mangleIdentifier(idString), nameSpace.descriptor(), null, null).visitEnd();
         return;
-    }    
+    }
 
     /**
@@ -394 +392 @@
      * This constructors calls the method setToplevel().
      * If this environment is not a top-level environment, then a default
-     * constructor does not need to be created.  (ASM will generate a 
+     * constructor does not need to be created.  (ASM will generate a
      * default constructor).
      */
@@ -414 +412 @@
     /**
      * Implementing "static reflection" for the method getFooRaw so the
-     * interpreter uses a switch instruction for ***GetRaw 
+     * interpreter uses a switch instruction for ***GetRaw
      * based on the hash values of String names in this namespace.
      */
@@ -439 +437 @@
         Collections.sort(sortedCodes);
         Label returnNull = new Label();
-        
+
         getRawHelper(mv, className, hashCodeRelation, environmentClass, sortedCodes, returnNull);
 
         mv.visitLabel(returnNull);
         mv.visitInsn(Opcodes.ACONST_NULL);
-        mv.visitInsn(Opcodes.ARETURN);        
-        
+        mv.visitInsn(Opcodes.ARETURN);
+
         Label endFunction = new Label();
         mv.visitLabel(endFunction);
@@ -451 +449 @@
         mv.visitLocalVariable("queryString", "Ljava/lang/String;", null, beginFunction, endFunction, 1);
         mv.visitLocalVariable("queryHashCode", "I", null, beginLoop, endFunction, 2);
-        // See comment above on ClassWriter.COMPUTE_FRAMES        
+        // See comment above on ClassWriter.COMPUTE_FRAMES
         mv.visitMaxs(2, 3);
         mv.visitEnd();
@@ -505 +503 @@
     /**
      * Implementing "static reflection" for the method putRaw so the
-     * interpreter uses a switch instruction for ***PutRaw 
+     * interpreter uses a switch instruction for ***PutRaw
      * based on the hash values of String names in this namespace.
      */
@@ -524 +522 @@
         mv.visitLabel(beginLoop);
 
-        Relation<String, Integer> hashCodeRelation = symbolNames.makeHashCodeRelation(environmentClass);        
+        Relation<String, Integer> hashCodeRelation = symbolNames.makeHashCodeRelation(environmentClass);
         ArrayList<Integer> sortedCodes = new ArrayList<Integer>(hashCodeRelation.secondSet());
         Collections.sort(sortedCodes);
@@ -530 +528 @@
         putRawHelper(mv, className, environmentClass, hashCodeRelation, sortedCodes, notFound);
         mv.visitLabel(notFound);
-        mv.visitInsn(Opcodes.RETURN);        
-        Label endFunction = new Label();                
+        mv.visitInsn(Opcodes.RETURN);
+        Label endFunction = new Label();
         mv.visitLabel(endFunction);
         mv.visitLocalVariable("this", "L" + className + ";", null,
@@ -539 +537 @@
         mv.visitLocalVariable("value", environmentClass.descriptor(), null, beginFunction, endFunction, 2);
         mv.visitLocalVariable("queryHashCode", "I", null, beginLoop, endFunction, 3);
-        // See comment above on ClassWriter.COMPUTE_FRAMES        
+        // See comment above on ClassWriter.COMPUTE_FRAMES
         mv.visitMaxs(2, 4);
         mv.visitEnd();
@@ -560 +558 @@
             mv.visitLabel(labels[i]);
             putRawBaseCase(mv, className, hashCodeRelation, environmentClass, codes[i], notFound);
-        }        
-        
+        }
+
     }
 
     private static void putRawBaseCase(MethodVisitor mv, String className,
-            Relation<String, Integer> hashCodeRelation, EnvironmentClass environmentClass, 
+            Relation<String, Integer> hashCodeRelation, EnvironmentClass environmentClass,
             int code, Label notFound ) {
 
@@ -603 +601 @@
         mv.visitLocalVariable("this", "L" + className + ";", null, l0, l1, 0);
         mv.visitLocalVariable("str", "Ljava/lang/String;", null, l0, l1, 1);
-        // See comment above on ClassWriter.COMPUTE_FRAMES        
+        // See comment above on ClassWriter.COMPUTE_FRAMES
         mv.visitMaxs(1, 2);
         mv.visitEnd();
@@ -619 +617 @@
         mv.visitLocalVariable("str", "Ljava/lang/String;", null, l0, l1, 1);
         mv.visitLocalVariable("f2", "Ljava/lang/Number;", null, l0, l1, 2);
-        // See comment above on ClassWriter.COMPUTE_FRAMES        
+        // See comment above on ClassWriter.COMPUTE_FRAMES
         mv.visitMaxs(0, 3);
         mv.visitEnd();
@@ -642 +640 @@
         mv.visitLocalVariable("this", "L" + className + ";", null, l0, l2, 0);
         mv.visitLocalVariable("name", "Ljava/lang/String;", null, l0, l2, 1);
-        // See comment above on ClassWriter.COMPUTE_FRAMES        
+        // See comment above on ClassWriter.COMPUTE_FRAMES
         mv.visitMaxs(3, 2);
         mv.visitEnd();
@@ -714 +712 @@
         mv.visitLocalVariable("this", "L" + className + ";", null, l0, l9, 0);
         mv.visitLocalVariable("a", "Ljava/lang/Appendable;", null, l0, l9, 1);
-        // See comment above on ClassWriter.COMPUTE_FRAMES        
+        // See comment above on ClassWriter.COMPUTE_FRAMES
         mv.visitMaxs(2, 2);
         mv.visitEnd();
@@ -783 +781 @@
             Pair<String,byte[]> compOutput = compiledCompUnits.get(componentName);
             String fileName = ProjectProperties.BYTECODE_CACHE_DIR + File.separator + compOutput.getA() + ".class";
-             outputClassFile(compOutput.getB(), fileName, errors); 
+             outputClassFile(compOutput.getB(), fileName, errors);
         }
     }
@@ -811 +809 @@
 
 }
-
-

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

@@ -26 +26 @@
 import com.sun.fortress.nodes.APIName;
 import com.sun.fortress.nodes.Component;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
@@ -45 +44 @@
                           Map<Id, Unit> units,
                           long modifiedDate) {
-        super(ast, variables, functions, typeConses, 
+        super(ast, variables, functions, typeConses,
               dimensions, units, modifiedDate);
         _initializers = initializers;
@@ -55 +54 @@
 
     @Override
-    public Set<APIName> exports() { 
-        List<Export> exports = ((Component)ast()).getExports();
+    public Set<APIName> exports() {
+        List<APIName> exports = ((Component)ast()).getExports();
         Set<APIName> result = new HashSet<APIName>();
 
-        for( Export export : exports ) {
-            result.addAll(export.getApis());
-        }
+        result.addAll(exports);
         return 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.<Export>emptyList(),
+                                      Collections.<APIName>emptyList(),
                                       traitDecls);
         return new ComponentIndex(ast,

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

@@ -41 +41 @@
 
     static Span span = NodeFactory.makeSpan("TypeAnalyzerJUTest");
-    
+
     public static void main(String... args) {
       junit.textui.TestRunner.run(TypeAnalyzerJUTest.class);
@@ -429 +429 @@
         Component ast = new Component(span, NodeFactory.makeAPIName(name),
                                       Collections.<Import>emptyList(),
-                                      Collections.<Export>emptyList(),
+                                      Collections.<APIName>emptyList(),
                                       traitDecls);
         return new ComponentIndex(ast,
@@ -514 +514 @@
         s = s.trim();
         int opIndex;
- 
+
         opIndex = findAtTop(s, "->");
         if (opIndex >= 0) {

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

@@ -2042 +2042 @@
                                         (APIName)name_result.ast(),
                                         (List<Import>)TypeCheckerResult.astFromResults(imports_result),
-                                        (List<Export>)TypeCheckerResult.astFromResults(exports_result),
+                                        (List<APIName>)TypeCheckerResult.astFromResults(exports_result),
                                         (List<Decl>)TypeCheckerResult.astFromResults(decls_result));
 
@@ -2209 +2209 @@
 
                 return TypeCheckerResult.compose(new_node, Types.BOTTOM, subtypeChecker, withResult);
-        }
-
-        @Override
-        public TypeCheckerResult forExportOnly(Export that, List<TypeCheckerResult> apis_result) {
-                return new TypeCheckerResult(that);
         }
 

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

@@ -70 +70 @@
 import com.sun.fortress.nodes.Component;
 import com.sun.fortress.nodes.Decl;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.FnAbsDeclOrDecl;
 import com.sun.fortress.nodes.FnDecl;
@@ -510 +509 @@
 
             List<APIWrapper> exports_list = new ArrayList<APIWrapper>(1);
-            for (Export ex : comp.getExports())
-                for (APIName ex_apiname : ex.getApis()) {
-                    String ex_name = NodeUtil.nameString(ex_apiname);
-                    Api newapi = readTreeOrSourceApi(ex_name, ex_name, fr);
-                    exports_list.add( new APIWrapper(newapi, linker, WellKnownNames.defaultLibrary) );
-                }
+            for (APIName ex_apiname : comp.getExports()) {
+                String ex_name = NodeUtil.nameString(ex_apiname);
+                Api newapi = readTreeOrSourceApi(ex_name, ex_name, fr);
+                exports_list.add( new APIWrapper(newapi, linker, WellKnownNames.defaultLibrary) );
+            }
 
             comp_wrapper = new ComponentWrapper(comp_index, exports_list, linker, WellKnownNames.defaultLibrary);

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

@@ -42 +42 @@
 import com.sun.fortress.nodes.CompilationUnit;
 import com.sun.fortress.nodes.Component;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.Import;
 import com.sun.fortress.nodes_util.NodeUtil;
@@ -53 +52 @@
 
 public class CUWrapper {
-    
+
     private final static boolean loadCompiledEnvs =
         ProjectProperties.getBoolean("fortress.test.compiled.environments", true);
-    
+
     CompilationUnit comp_unit;
 
@@ -68 +67 @@
      */
     protected String[]  implicitLibs;
-    
+
     public BASet<String> ownNames = new BASet<String>(com.sun.fortress.useful.StringHashComparer.V);
     public BASet<String> excludedImportNames = new BASet<String>(com.sun.fortress.useful.StringHashComparer.V);
 
     /**
-     * If a variable/value/function name is missing when an API is initialized, 
-     * store it here, in case it is found later (that is, imported into the 
+     * If a variable/value/function name is missing when an API is initialized,
+     * store it here, in case it is found later (that is, imported into the
      * component through some other API).
      */
@@ -89 +88 @@
      */
     //public BASet<String> missingExportedTypes = new BASet<String>(com.sun.fortress.useful.StringHashComparer.V);
-    
+
     public Set<AbstractNode> unresolvedExports = new HashSet<AbstractNode>();
-       
+
     protected DesugarerVisitor desugarer;
 
@@ -105 +104 @@
             }
         this.exports = null;
-        
-    }
-    
+
+    }
+
     Visitor2<String, Object> nameCollector = new Visitor2<String, Object>() {
 
         @Override
         public void visit(String t, Object u) {
-            
+
             ownNames.add(t);
         }
@@ -122 +121 @@
        if (comp == null)
             throw new NullPointerException("Null component (1st parameter to constructor) not allowed");
-       
+
          comp_unit = comp;
-        
+
          String fortressFileName = comp_unit.getName().getText();
-        
+
          try {
-            
+
                 Environment e = loadCompiledEnvs ?
                     SimpleClassLoader.loadEnvironment(fortressFileName, false) :
@@ -136 +135 @@
                         new BuildNativeEnvironment(e, linker) :
                         new BuildTopLevelEnvironments(e, linker));
-                List<Export> component_exports = comp.getExports();
-                for (Export exp : component_exports) {
+                List<APIName> component_exports = comp.getExports();
+                for (APIName exp : component_exports) {
                     // TODO work in progress, this might not be the best place
                 }
-            
+
         } catch (IOException ex) {
             bug("Failed to load class (" + ex + ") for " + comp);
@@ -154 +153 @@
         if (api == null)
             throw new NullPointerException("Null api (1st parameter to constructor) not allowed");
-        
+
          //comp_unit = (Api) RewriteInPresenceOfTypeInfoVisitor.Only.visit(api);
         comp_unit = api; // do nothing?
-        
+
          String fortressFileName = comp_unit.getName().getText();
-        
+
          try {
                 Environment e = loadCompiledEnvs ?
@@ -166 +165 @@
                 e.setTopLevel();
                 be = new BuildApiEnvironment(e, linker);
-            
+
         } catch (IOException ex) {
             bug("Failed to load class (" + ex + ") for " + api);
@@ -189 +188 @@
     public CUWrapper(Component comp, List<APIWrapper> api_list, HashMap<String, ComponentWrapper> linker, String[] implicitLibs) {
         this(comp, linker, implicitLibs);
-        for (APIWrapper api : api_list) 
+        for (APIWrapper api : api_list)
             exports.put(NodeUtil.nameString(api.getCompilationUnit().getName()), api);
     }
-    
+
 
 
@@ -219 +218 @@
         return exports.values();
     }
-    
+
     public void touchExports(boolean suppressDebugDump) {
         if (visitState != UNVISITED)
@@ -258 +257 @@
         return desugarer.injectAtTopLevel(putName, getName, getFrom.desugarer, excluded);
     }
-    
- 
-
- 
+
+
+
+
     public void initTypes() {
         if (visitState == POPULATED) {
@@ -303 +302 @@
 
     protected void registerObjectExprs(Environment environment) {
-        
+
     }
 

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

@@ -35 +35 @@
 import com.sun.fortress.nodes.CompilationUnit;
 import com.sun.fortress.nodes.Component;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.Param;
 import com.sun.fortress.nodes.StaticParam;
@@ -53 +52 @@
 public class ComponentWrapper extends CUWrapper {
 
-    /* 
+    /*
      * Next three lines are for the "cache" of rewritten ASTs
      */
@@ -60 +59 @@
         public String apply(APIName x) {
             return ProjectProperties.compFileName(ProjectProperties.INTERPRETER_CACHE_DIR, CacheBasedRepository.deCaseName(x));
-        } 
+        }
     };
     private static IOAst componentReaderWriter = new IOAst(toCompFileName);
-    private static DerivedFiles<CompilationUnit> componentCache = 
+    private static DerivedFiles<CompilationUnit> componentCache =
         new DerivedFiles<CompilationUnit>(componentReaderWriter);
-    
+
     public static boolean noCache;
-    
+
     Component transformed;
     boolean cacheDisabled;
-    
-    
+
+
     private Component getCached(ComponentIndex comp) {
         if (cacheDisabled)
@@ -78 +77 @@
             return  (Component) componentCache.get(comp.ast().getName(), comp.modifiedDate());
     }
-    
+
     public ComponentWrapper(ComponentIndex comp, HashMap<String, ComponentWrapper> linker,
             String[] implicitLibs) {
         super((Component) comp.ast(), linker, implicitLibs);
         cacheDisabled = noCache;
-        
+
         transformed = getCached(comp);
         // TODO Auto-generated constructor stub
@@ -125 +124 @@
             }
         }
-        
+
         if (!cacheDisabled && exportsMain(transformed)) {
             // It's not a library, no point keeping this copy in memory.
@@ -136 +135 @@
         be.getEnvironment().visit(nameCollector);
         comp_unit = cu;
-         
+
         for (String implicitLibraryName : implicitLibs) {
             be.importAPIName(implicitLibraryName);
         }
-        
+
         for (CUWrapper api: exports.values()) {
             be.importAPIName(api.name());
         }
-        
+
         for (APIWrapper api: exports.values()) {
             api.populateOne(this);
@@ -151 +150 @@
         return cu;
     }
-    
+
     private boolean exportsMain(Component transformed2) {
-        List<Export> exports = transformed2.getExports();
-        for (Export e : exports) {
-            List<APIName> apis = e.getApis();
-            for (APIName a : apis)
-                if (a.getText().equals("Executable"))
-                    return true;
+        List<APIName> exports = transformed2.getExports();
+        for (APIName a : exports) {
+            if (a.getText().equals("Executable"))
+                return true;
         }
         return false;
@@ -170 +167 @@
     protected void registerObjectExprs(Environment env) {
         Component comp = (Component) comp_unit;
-        
+
             for (_RewriteObjectExpr oe : comp.getObjectExprs()) {
                 String name = oe.getGenSymName();
@@ -196 +193 @@
                 }
             }
-        
+
     }
     public Set<String> getTopLevelRewriteNames() {

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

@@ -66 +66 @@
 import com.sun.fortress.nodes.DoFront;
 import com.sun.fortress.nodes.EnsuresClause;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.Expr;
 import com.sun.fortress.nodes.ExprMI;
@@ -655 +654 @@
         APIName name_result = (APIName) recur(com.getName());
         List<Import> imports_result = recurOnListOfImport(com.getImports());
-        List<Export> exports_result = recurOnListOfExport(com.getExports());
+        List<APIName> exports_result = recurOnListOfAPIName(com.getExports());
         List<Decl> decls_result = recurOnListOfDecl(com.getDecls());
 

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

@@ -93 +93 @@
 
                 @Override
-                public void forExport(Export that){
-                    Debug.debug(Debug.Type.SYNTAX, 2, "Add export api ", that.getApis());
-                    all.addAll(that.getApis());
-                }
-
-                @Override
                 public void forImportApi(ImportApi that){
                     for (AliasedAPIName api : that.getApis()){
@@ -106 +100 @@
                 }
             });
+        for (APIName api : comp.getExports()) {
+            all.add(api);
+        }
         return removeExecutableApi(all);
     }

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

@@ -296 +296 @@
 
 /* Exports ::= Export (br Export)* */
-private List<Export> Exports = a1:Export a2s:(br Export)*
-     { yyValue = FortressUtil.mkList(a1, a2s.list()); };
+private List<APIName> Exports = a1:Export a2s:(br Export)*
+     { yyValue = a1;
+       for (List<APIName> export : a2s.list()) {
+           a1.addAll(export);
+       }
+     };
 
 /* Export ::= export w APINames */
-private Export Export = export w a1:APINames
-     { yyValue = new Export(createSpan(yyStart,yyCount), a1); };
+private List<APIName> Export = export w APINames ;
 
 /* APINames ::=

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

@@ -93 +93 @@
    / a1:(native w)? component w a2:APIName a3:(w yyValue:Imports w semicolon?)? w a4:Exports w (_)*
      { if (a3 == null) a3 = Collections.<Import>emptyList();
-       // List<Export> a4 = Collections.<Export>emptyList();
        List<Decl> a5 = Collections.<Decl>emptyList();
        Span span = createSpan(yyStart,yyCount);
@@ -263 +262 @@
 
 /* Exports ::= Export (br Export)* */
-private List<Export> Exports = a1:Export a2s:(br Export)*
-     { yyValue = FortressUtil.mkList(a1, a2s.list()); };
+private List<APIName> Exports = a1:Export a2s:(br Export)*
+     { yyValue = a1;
+       for (List<APIName> export : a2s.list()) {
+           a1.addAll(export);
+       }
+     };
 
 /* Export ::= export w APINames */
-private Export Export = export w a1:APINames
-     { yyValue = new Export(createSpan(yyStart,yyCount), a1); };
+private List<APIName> Export = export w APINames;
 
 /* APINames ::=

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/parser/PreParser.java

@@ -34 +34 @@
 import com.sun.fortress.nodes.CompilationUnit;
 import com.sun.fortress.nodes.Component;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.Id;
 import com.sun.fortress.nodes.Import;

trunk/ProjectFortress/src/com/sun/fortress/tests/unit_tests/ConstructorsJUTest.java

@@ -24 +24 @@
 
 import com.sun.fortress.nodes.APIName;
-import com.sun.fortress.nodes.Export;
 import com.sun.fortress.nodes.Expr;
 import com.sun.fortress.nodes.FloatLiteralExpr;
@@ -126 +125 @@
     }
 
-    public void testExport() {
-        Span span1 = newSpan("cat", 1, 2, 3);
-        Export e1 = new Export(span1, FortressUtil.mkList(newAPIName("some", "exported", "apiname")));
-        Export e2 = new Export(span1, FortressUtil.mkList(newAPIName("some", "exported", "apiname")));
-        Export e3 = new Export(span1, FortressUtil.mkList(newAPIName("an", "exported", "apiname")));
-
-        een(e1, e2, e3);
-    }
-
     /**
      * @param e1

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

@@ -287 +287 @@
             s.append( import_ ).append( "\n" );
         }
-        for ( String export_ : exports_result ){
-            s.append( export_ ).append( "\n" );
-        }
+        if (exports_result.size() == 0)
+            return bug(that, "A component should have at least one export statement.");
+        else
+            s = optCurlyBraces(s,"export ", exports_result, "");
+        s.append( "\n" );
         for ( String decl_ : decls_result ){
             s.append( decl_ ).append( "\n\n" );
@@ -373 +375 @@
         }
         return s.toString();
-    }
-
-    @Override public String forExportOnly(Export that, List<String> apis_result) {
-        StringBuilder s = new StringBuilder();
-        if (apis_result.size() == 0)
-            return bug(that, "An export statement should have at least one API name.");
-        else
-            return optCurlyBraces(s,"export ", apis_result, "").toString();
     }