Changeset 3289

Timestamp:

01/05/09 12:04:20 (10 months ago)

Author:

dr2chase

Message:

Feeding generated APIs to static analysis, not yet working

Location:

trunk/ProjectFortress

Files:

• not_passing_yet/trivialForeignImport.fss (added)
• src/com/sun/fortress/compiler/disambiguator/TypeDisambiguator.java (modified) (2 diffs)
• src/com/sun/fortress/repository/ForeignJava.java (modified) (4 diffs)
• src/com/sun/fortress/repository/GraphRepository.java (modified) (2 diffs)

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

@@ -1 +1 @@
 /*******************************************************************************
-    Copyright 2008 Sun Microsystems, Inc.,
+    Copyright 2009 Sun Microsystems, Inc.,
     4150 Network Circle, Santa Clara, California 95054, U.S.A.
     All rights reserved.
@@ -303 +303 @@
             Option<APIName> realApiOpt = _env.apiName(originalApi);
             if (realApiOpt.isNone()) {
+                // retry for debugging purposes
+                realApiOpt = _env.apiName(originalApi);
                 error("Undefined API: " + NodeUtil.nameString(originalApi), originalApi);
                 return that;

trunk/ProjectFortress/src/com/sun/fortress/repository/ForeignJava.java

@@ -64 +64 @@
 public class ForeignJava {
 
-    /** given an API Name, what Java classes does it import?  (Name of existing
-     * Java class, not its wrapper.)
+    /** given an API Name, what Java classes does it import?  (Existing
+     * Java class, not its compiled Fortress wrapper class.)
      */
     MultiMap<APIName, Class> javaImplementedAPIs = new MultiMap<APIName, Class>();
@@ -263 +263 @@
         generatedImports.putItem(importing_package, api_name);
         
+        /*
+         * Ensure that the API and class appear.
+         */
+        javaImplementedAPIs.putItem(api_name,imported_class);
+        
         Id name = NodeFactory.makeId(span, imported_class.getSimpleName());
         
@@ -396 +401 @@
             Set<APIName> gi = generatedImports.get(name);
             if (gi != null)
-            for (APIName a : gi) {
-                AliasedAPIName aan = NodeFactory.makeAliasedAPIName(a);
-                /*
-                 * Hoping to lie, slightly, to static analysis. This is
-                 * technically speaking a "foreign" import, but the import is
-                 * already known to the ForeignJava data structures, and this
-                 * allows use of fully qualified (hence unambiguous) references
-                 * to classes from other packages in the generated API.
-                 * 
-                 * So, one lie -- no foreign annotation.
-                 */
-                ImportApi iapi = NodeFactory.makeImportApi(span, Option
-                        .<String> none(), Useful.list(aan));
-                imports.add(iapi);
-            }
-
+                for (APIName a : gi) {
+                    importAnApi(imports, a);
+                }
+            // Implicitly import.
+            importAnApi(imports, NodeFactory.makeAPIName(span, "FortressLibrary"));
+            
             List<Decl> decls = new ArrayList<Decl>();
             for (Decl d : apiToStaticDecls.get(name)) {
@@ -422 +417 @@
         }
         return result;
-        
+
+    }
+
+    private void importAnApi(List<Import> imports, APIName a) {
+        AliasedAPIName aan = NodeFactory.makeAliasedAPIName(a);
+        /*
+         * Hoping to lie, slightly, to static analysis. This is
+         * technically speaking a "foreign" import, but the import
+         * is already known to the ForeignJava data structures, and
+         * this allows use of fully qualified (hence unambiguous)
+         * references to classes from other packages in the
+         * generated API.
+         * 
+         * So, one lie -- no foreign annotation.
+         */
+        ImportApi iapi = NodeFactory.makeImportApi(span, Option
+                .<String> none(), Useful.list(aan));
+        imports.add(iapi);
     }
     

trunk/ProjectFortress/src/com/sun/fortress/repository/GraphRepository.java

@@ -460 +460 @@
                 @Override
                 public Boolean apply(GraphNode g){
-                    return g instanceof ApiGraphNode && staleOrDependsOnStale.get(g);
+                    return g instanceof ApiGraphNode && (staleOrDependsOnStale.get(g) ||
+                            // TODO need to fix the whole date-stamp thing for APIs.
+                            foreignJava.definesApi(((ApiGraphNode)g).getName())
+                            );
                 }
             };
@@ -628 +631 @@
         try{
             APIName api_name = node.getName();
-            File fdot = findFile(api_name, ProjectProperties.API_SOURCE_SUFFIX);
-            CompilationUnit api = Parser.parseFileConvertExn(fdot);
-            if (api instanceof Api) {
-                return (Api) api;
+            if (foreignJava.definesApi(api_name)) {
+                return (Api) foreignJava.fakeApi(api_name).ast();
             } else {
-                throw StaticError.make("Unexpected parse of API " + api_name, "");
+                File fdot = findFile(api_name, ProjectProperties.API_SOURCE_SUFFIX);
+                CompilationUnit api = Parser.parseFileConvertExn(fdot);
+                if (api instanceof Api) {
+                    return (Api) api;
+                } else {
+                    throw StaticError.make("Unexpected parse of API " + api_name, "");
+                }
             }
         } catch ( FileNotFoundException e ){