Changeset 2404 for trunk/ProjectFortress/src/com/sun/fortress/compiler/AnalyzeResult.java

Timestamp:

07/28/08 19:59:00 (16 months ago)

Author:

mspiegel

Message:

[static analysis] Another refactoring of Shell.java. Static phases are now declared in package com.sun.fortress.compiler.phases.

Files:

• trunk/ProjectFortress/src/com/sun/fortress/compiler/AnalyzeResult.java (modified) (1 diff)

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

@@ -44 +44 @@
     
     public AnalyzeResult(Iterable<? extends StaticError> errors) {
-        this(new HashMap<APIName, ApiIndex>(), new HashMap<APIName, ComponentIndex>(), errors);
-    }
-
-    public AnalyzeResult(Map<APIName, ApiIndex> apis,
-                         Map<APIName, ComponentIndex> components,
-                         Iterable<? extends StaticError> errors) {
-        super(errors);
-        _apis = apis;
-        _components = components;
-        _typeEnvAtNode = Option.none();
+        this(new HashMap<APIName, ApiIndex>(), new HashMap<APIName, ComponentIndex>(), 
+                        errors, Option.<Map<Pair<Node,Span>, TypeEnv>>none());
     }
     
     public AnalyzeResult(Map<APIName, ApiIndex> apis,
             Map<APIName, ComponentIndex> components,
-            Iterable<? extends StaticError> errors, Map<Pair<Node,Span>, TypeEnv> typeEnvAtNode) {
+            Iterable<? extends StaticError> errors, Option<Map<Pair<Node,Span>, TypeEnv>> typeEnvAtNode) {
         super(errors);
         _apis = apis;
         _components = components;
-        _typeEnvAtNode = Option.some(typeEnvAtNode);
+        _typeEnvAtNode = typeEnvAtNode;
     }