Changeset 2185

Timestamp:

07/05/08 03:45:31 (2 months ago)

Author:

mspiegel

Message:

[environments] rewrote import field generation in compiled environments to throw an exception if an unexpected type of import statement is observed.

Files:

• trunk/ProjectFortress/src/com/sun/fortress/compiler/environments/TopLevelEnvGen.java (modified) (5 diffs)

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

@@ -52 +52 @@
-import com.sun.fortress.nodes.Id;
-import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
+import com.sun.fortress.nodes.Import;
-import com.sun.fortress.nodes.ImportApi;
-import com.sun.fortress.nodes.AliasedAPIName;
-import com.sun.fortress.nodes.ImportedNames;
-import com.sun.fortress.nodes.NodeDepthFirstVisitor_void;
-import com.sun.fortress.nodes_util.NodeUtil;
-import com.sun.fortress.useful.HasAt;
@@ -185 +185 @@
-            className = className + COMPONENT_ENV_SUFFIX;
-
-
+
+
-                              components.get(componentName), env);
-
-
+
+
+
+
+
-        }
-
@@ -227 +231 @@
-        Relation<String, Integer> apiEnvHashCode = new IndexedRelation<String,Integer>();
-
-ompUnitIndex, cw
-ompUnitIndex, cw
+w, compUnitIndex
+w, compUnitIndex
-        writeMethodInit(cw, className);
-
@@ -245 +249 @@
-    }
-
-
-ClassWriter cw, 
+lassWriter cw, C
+
-        CompilationUnit comp = compUnitIndex.ast();
-        final Vector<String> importedApiNames = new Vector<String>();
-        
-comp.accept(new NodeDepthFirstVisitor_void(
-        @Override
-        public void forImportedNamesDoFirst(ImportedNames that) {
-           importedApiNames.add( NodeUtil.nameString(that.getApi()) );
-}
-
-        @Override
-        public void forImportApi(ImportApi that){
-            for ( AliasedAPIName api : that.getApis() ){
-                   importedApiNames.add( NodeUtil.nameString(api.getApi()) );
-            }
-        
-    }); 
+for(Import imports : comp.getImports()
+           if (imports instanceof ImportApi) {
+                   ImportApi importApi = (ImportApi) imports;
+                   for (AliasedAPIName api : importApi.getApis()) {
+           importedApiNames.add(NodeUtil.nameString(api.getApi()));                                
+
+           } else if (imports instanceof ImportedNames) {
+                   ImportedNames importNames = (ImportedNames) imports;
+                   importedApiNames.add(NodeUtil.nameString(importNames.getApi()));
+           } else {
+                   throw StaticError.make("Unrecognized import type in bytecode generation", imports);
+           
+   }
-        
-        for(String apiName : importedApiNames) {
@@ -272 +276 @@
-        }
-
-
-ClassWriter cw, 
+lassWriter cw, C
+
-            Relation<String, Integer> fTypeHashCode) {
-