Changeset 3876 for trunk/ProjectFortress/src/com/sun/fortress/compiler/StaticChecker.java

Timestamp:

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

Author:

EricAllen

Message:

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

Files:

• trunk/ProjectFortress/src/com/sun/fortress/compiler/StaticChecker.java (modified) (2 diffs)

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);