Changeset 3876

Timestamp:

06/18/09 20:21:35 (8 months ago)

Author:

EricAllen

Message:

Added API linker and associated hooks (work in progress).
Added some testing of cache cleaning.

Location:

trunk/ProjectFortress

Files:

• compiler_tests/XXX5a.twice.test (added)
• src/com/sun/fortress/compiler/StaticChecker.java (modified) (2 diffs)
• src/com/sun/fortress/compiler/index/CompilationUnitIndex.java (modified) (1 diff)
• src/com/sun/fortress/scala_src/linker (added)
• src/com/sun/fortress/scala_src/linker/ApiLinker.scala (added)
• src/com/sun/fortress/scala_src/linker/CompoundApiChecker.scala (added)

trunk/ProjectFortress/src/com/sun/fortress/compiler/StaticChecker.java

@@ -45 +45 @@
 import com.sun.fortress.nodes.Type;
 import com.sun.fortress.repository.FortressRepository;
+import com.sun.fortress.scala_src.linker.ApiLinker;
+import com.sun.fortress.scala_src.linker.CompoundApiChecker;
 import com.sun.fortress.scala_src.typechecker.CoercionTest;
 import com.sun.fortress.scala_src.typechecker.ExportChecker;
@@ -290 +292 @@
                                              GlobalEnvironment env,
                                              FortressRepository repository) {
+
+        // Check if this is a compound API, and, if so, link it into a single API.
+        List<StaticError> errors = new CompoundApiChecker(env, repository).check(api);
+        if (! errors.isEmpty()) { 
+            return new TypeCheckerResult(api.ast(), errors);
+        }
+        api = new ApiLinker(env, repository).link(api);
+
         // Check type hierarchy to ensure acyclicity.
-        List<StaticError> errors = new TypeHierarchyChecker(api, env, repository).checkHierarchy();
+        errors = new TypeHierarchyChecker(api, env, repository).checkHierarchy();
         if (! errors.isEmpty()) {
             return new TypeCheckerResult(api.ast(), errors);

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

@@ -82 +82 @@
     }
 
+    public Set<APIName> comprises() { 
+        final Set<APIName> result = new HashSet<APIName>();
+        for (APIName _apiName : ast().getComprises()) { 
+            result.add(_apiName);
+        }
+        return result;
+    }
+
     public Map<Id, Variable> variables() { return _variables; }