Changeset 2163

Timestamp:

07/01/08 15:01:57 (3 months ago)

Author:

nbeckman

Message:

[Disambiguator] There are a lot of changes in this revision.
- I found this bug where tests would sometimes fail if they were run out of order. Added reset method to FTypeGeneric.
- The disambiguator now actually reports errors. This caused me to change a number of tests in very small ways.
- Most tests now run in a random order.
- We can disambiguate methods that are inherited.

Files:

• trunk/Library/FortressLibrary.fss (modified) (11 diffs)
• trunk/Library/List.fss (modified) (1 diff)
• trunk/Library/PureList.fss (modified) (1 diff)
• trunk/Library/Sparse.fss (modified) (1 diff)
• trunk/ProjectFortress/LibraryBuiltin/FortressBuiltin.fss (modified) (2 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/Shell.java (modified) (3 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/Disambiguator.java (modified) (5 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/StaticJUTest.java (modified) (3 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/StaticTestSuite.java (modified) (2 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/disambiguator/ExprDisambiguator.java (modified) (2 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/disambiguator/SelfParamDisambiguator.java (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/FnTypeEnv.java (modified) (3 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/Init.java (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeGeneric.java (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/nodes_util/ExprFactory.java (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/unit_tests/FileTests.java (modified) (5 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/unit_tests/ParserJUTest.java (modified) (3 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/unit_tests/SystemJUTest.java (modified) (1 diff)
• trunk/ProjectFortress/static_tests/DXXEqualityTesting.fss (modified) (1 diff)
• trunk/ProjectFortress/static_tests/DXXMutualSeparateLetFn.fss (deleted)
• trunk/ProjectFortress/static_tests/SimpleTrait.fss (modified) (1 diff)
• trunk/ProjectFortress/tests/atomicList.fss (modified) (1 diff)
• trunk/ProjectFortress/tests/conditionalExtension.fss (modified) (2 diffs)
• trunk/SpecData/examples/basic/Expr.Assign.b.fss (modified) (1 diff)
• trunk/SpecData/examples/basic/Object.Decl.ConsFn.fss (modified) (1 diff)

trunk/Library/FortressLibrary.fss

@@ -1355 +1355 @@
-immutableArray[\E\](x:ZZ32):ImmutableArray[\E,ZZ32\] =
-    __imm1(__Proxy[\E\],reflect(x))
+(*
-immutableArray[\E\](x:ZZ32,y:ZZ32):ImmutableArray[\E,(ZZ32,ZZ32)\] =
-    __imm2(__Proxy[\E\],reflect(x), reflect(y))
-immutableArray[\E\](x:ZZ32,y:ZZ32,z:ZZ32):ImmutableArray[\E,(ZZ32,ZZ32,ZZ32)\] =
-    __imm3(__Proxy[\E\],reflect(x), reflect(y), reflect(z))
+*)
-
-(* This should be local to immutableArray, but we don't support local
@@ -1782 +1784 @@
-  opr |self| : ZZ32 = s0 s1
-  (* Translate from b0,b1-indexing to 0-indexing, checking bounds. *)
-
-
+_1
+_1
-    c0 = a0 - b0
-    c1 = a1 - b1
@@ -1794 +1796 @@
-    end
-  end
-:(ZZ32,ZZ32)):(ZZ32,ZZ32) = do (a0,a1)=t
+_1:(ZZ32,ZZ32)):(ZZ32,ZZ32) = do (a0,a1)=t_1
-  opr[x:ZZ32,y:ZZ32]:=(v:T):() = do self[ (x,y) ] := v end
-  opr[r:Range[\(ZZ32,ZZ32)\]]: Array[\T,(ZZ32,ZZ32)\] = do
@@ -1807 +1809 @@
-  opr[_:OpenRange[\Any\]] : Array2[\T,0,s0,0,s1\] =
-      subarray[\0,s0,0,s1,0,0\]()
-
-
+_1
+_1
-      if o0=0 AND o1=0 then
-          self
@@ -1861 +1863 @@
-        extends Array2[\T, b0, s0, b1, s1\]
-    mem:PrimitiveArray[\T, (s0 s1) \] = PrimitiveArray[\T, (s0 s1) \]()
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32)):T = do (i,j)=t
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32)):T = do (i,j)=t_1
-end
-
@@ -1873 +1875 @@
-  replica[\U\]():Array2[\U,b0,s0,b1,s1\] = mem.replica[\U\]().t()
-
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32)):T = do (i,j)=t
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32)):T = do (i,j)=t_1
-  t() = mem
-end
@@ -1892 +1894 @@
-        extends Array2[\T,b0,s0,b1,s1\]
-    index(a0:ZZ32, a1:ZZ32): (ZZ32,ZZ32) = (m0 a0 + o0, m1 a1 + o1)
-:(ZZ32,ZZ32), v:T): () = mem.init0(index(t
-:(ZZ32,ZZ32), v:T): () = mem.put(index(t
-:(ZZ32,ZZ32)): T = mem.get(index(t
+_1:(ZZ32,ZZ32), v:T): () = mem.init0(index(t_1
+_1:(ZZ32,ZZ32), v:T): () = mem.put(index(t_1
+_1:(ZZ32,ZZ32)): T = mem.get(index(t_1
-end
-
@@ -1905 +1907 @@
-        ivmap[\T\](fn (i:(ZZ32,ZZ32),e:T):T => e - v.get(i))
-    opr -(self): Matrix[\T,s0,s1\] = map[\T\](fn (e:T):T => - e)
-: T): Matrix[\T,s0,s1\] = map[\T\](fn (e:T):T => t
+_1: T): Matrix[\T,s0,s1\] = map[\T\](fn (e:T):T => t_1
-    mul[\ nat s2 \](other: Matrix[\T,s1,s2\]): Matrix[\T,s0,s2\] = do
-        res = matrix[\T,s0,s2\]()
@@ -1966 +1968 @@
-    extends Matrix[\T, s0, s1\]
-  mem:PrimitiveArray[\T, (s0 s1) \] = PrimitiveArray[\T, (s0 s1) \]()
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32)):T = do (i,j)=t
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32)):T = do (i,j)=t_1
-end
-
@@ -1975 +1977 @@
-    replica[\U\]():Array2[\U,0,s0,0,s1\] = mem.replica[\U\]().t()
-
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32), v:T) : () = do (i,j)=t
-:(ZZ32,ZZ32)):T = do (i,j)=t
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32), v:T) : () = do (i,j)=t_1
+_1:(ZZ32,ZZ32)):T = do (i,j)=t_1
-    t(): Matrix[\T,s1,s0\] = mem
-    add(v:TransposedMatrix[\T,s0,s1\]): Matrix[\T,s0,s1\] = mem.add(v.t()).t()
@@ -3169 +3171 @@
-opr :[\I extends Integral\](lo:I, hi:I): ParRange[\I\] =
-        ParRange[\I\](lo,hi-lo+1)
-ex
+hi
-        ParRange[\ZZ32\](lo,hi-lo+1)
-opr :[\I extends Integral, J extends Integral\]

trunk/Library/List.fss

@@ -379 +379 @@
-            fresh.appendR[\T\](other)
-        end
-
-
+_1
+_1
-        fstUsed = firstUsed - lsz
-
+_1
-        ArrayList(underlying,fstUsed,oneShot(),firstUnused,canExtendRight)
-      end
-
-
-
-
-
-
+_1
+_1
+_1
+
+_1
+_1
-        end
-

trunk/Library/PureList.fss

@@ -151 +151 @@
-      it.generate[\R\](r,body)
-  seq(self): SequentialGenerator[\E\] = SeqListGenerator[\E\](it)
-other
+f
-      self || f.generate[\PureList[\E\]\](PLConcat[\E\],singleton[\E\])
-  opr ||(self, f:PureList[\E\]): PureList[\E\] =

trunk/Library/Sparse.fss

@@ -177 +177 @@
-    replica[\U\]() = fail("Csc replica undefined")
-    indexValuePairs():Generator[\((ZZ32,ZZ32),N)\] =
-row
+col
-            fn (i:ZZ32,j:ZZ32,n:N):((ZZ32,ZZ32),N) => ((j,i),n))
-    zeroIndices():Generator[\(ZZ32,ZZ32)\] =
-row
+col
-            fn (i:ZZ32,j:ZZ32,n:N):((ZZ32,ZZ32),N) => (j,i))
-    t() = Csr[\N,m,n\](cols)

trunk/ProjectFortress/LibraryBuiltin/FortressBuiltin.fss

@@ -185 +185 @@
-    getter toString() : String =
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.String$ToString")
-
+self.
-    getter generator() : Generator[\Char\] =
-        indices().map[\Char\](fn (i:ZZ32):Char => self[i])
@@ -208 +208 @@
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.String$Index")
-    opr[r0:Range[\ZZ32\]] : String = do
-
+self.
-        l = r1.lower()
-        self.substr(l, l + |r1|)

trunk/ProjectFortress/src/com/sun/fortress/Shell.java

@@ -469 +469 @@
-        // step, the rawApiEnv is stale and needs to be rebuilt with the new API ASTs.
-        Disambiguator.ApiResult apiDR =
-
+, _repository.apis()
-        if (!apiDR.isSuccessful()) { return apiDR.errors(); }
-
-        Disambiguator.ComponentResult componentDR =
-            Disambiguator.disambiguateComponents(components, env,
-                                                 rawComponentIR.components());
-        if (!componentDR.isSuccessful()) { return componentDR.errors(); }
-
-        if (phase.equals("disambiguate"))
-            return IterUtil.empty();
-
-        // Rebuild ApiIndices.
@@ -484 +476 @@
-            IndexBuilder.buildApis(apiDR.apis(), System.currentTimeMillis());
-        if (!apiIR.isSuccessful()) { return apiIR.errors(); }
+        
+        // Rebuild GlobalEnvironment.
+        GlobalEnvironment apiEnv =
+            new GlobalEnvironment.FromMap(CollectUtil.union(_repository.apis(),
+                                                            apiIR.apis()));
+        
+        Disambiguator.ComponentResult componentDR =
+            Disambiguator.disambiguateComponents(components, apiEnv,
+                                                 rawComponentIR.components());
+        if (!componentDR.isSuccessful()) { return componentDR.errors(); }
+
+        if (phase.equals("disambiguate"))
+            return IterUtil.empty();
-
-        // Rebuild ComponentIndices.
@@ -490 +495 @@
-                                         System.currentTimeMillis());
-        if (!componentIR.isSuccessful()) { return componentIR.errors(); }
-
-        // Rebuild GlobalEnvironment.
-        GlobalEnvironment apiEnv =
-            new GlobalEnvironment.FromMap(CollectUtil.union(_repository.apis(),
-                                                            apiIR.apis()));
-
-        // Rewrite grammars, see GrammarRewriter for more details.

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

@@ -30 +30 @@
-
-import edu.rice.cs.plt.collect.CollectUtil;
+import edu.rice.cs.plt.collect.Relation;
-import edu.rice.cs.plt.iter.IterUtil;
-
@@ -82 +83 @@
- */
-public class Disambiguator {
-
-    /** Result of {@link #disambiguateApis}. */
-    public static class ApiResult extends StaticPhaseResult {
-        private final Iterable<Api> _apis;
-
-        public ApiResult(Iterable<Api> apis, 
-                Iterable<? extends StaticError> errors) {
-            super(errors);
-            _apis = apis;
-        }
-
-        public Iterable<Api> apis() { return _apis; }
-    }
-
-    /**
-     * Disambiguate the given apis. To support circular references,
-     * the apis should appear in the given environment.
-     */
-    public static ApiResult disambiguateApis(Iterable<Api> apis,
-            GlobalEnvironment globalEnv) {
-        List<Api> results = new ArrayList<Api>();
-        List<StaticError> errors = new ArrayList<StaticError>();
-        for (Api api : apis) {
-            ApiIndex index = globalEnv.api(api.getName());
-            NameEnv env = new TopLevelEnv(globalEnv, index, errors);
-            Set<IdOrOpOrAnonymousName> onDemandImports = new HashSet<IdOrOpOrAnonymousName>();
-            
-            SelfParamDisambiguator self_disambig = new SelfParamDisambiguator();
-            Api spd_result = (Api)api.accept(self_disambig);
-            
-            List<StaticError> newErrs = new ArrayList<StaticError>();
-            TypeDisambiguator td = 
-                new TypeDisambiguator(env, onDemandImports, newErrs);
-            Api tdResult = (Api) spd_result.accept(td);
-            if (newErrs.isEmpty()) {
-                ExprDisambiguator ed = 
-                    new ExprDisambiguator(env, onDemandImports, newErrs);
-                Api edResult = (Api) tdResult.accept(ed);
-                if (newErrs.isEmpty()) { results.add(edResult); }
-            }
-
-            if (!newErrs.isEmpty()) { 
-                errors.addAll(newErrs); 
-            }
-        }
-        results = disambiguateGrammarMembers(results, errors, globalEnv);
-        return new ApiResult(results, errors);
-    }
-
-
-    /**
-     * Disambiguate the names of nonterminals.
@@ -153 +104 @@
-    }
-
+    /** Result of {@link #disambiguateApis}. */
+    public static class ApiResult extends StaticPhaseResult {
+        private final Iterable<Api> _apis;
+
+        public ApiResult(Iterable<Api> apis, 
+                Iterable<? extends StaticError> errors) {
+            super(errors);
+            _apis = apis;
+        }
+
+        public Iterable<Api> apis() { return _apis; }
+    }
+
+    /**
+     * Disambiguate the given apis. To support circular references,
+     * the apis should appear in the given environment.
+     * @param apis_to_disambiguate Apis currently being disambiguated.
+     * @param globalEnv The current global environment.
+     * @param repository_apis Apis that already exist in the repository.
+     */
+    public static ApiResult disambiguateApis(Iterable<Api> apis_to_disambiguate,
+            GlobalEnvironment globalEnv, Map<APIName, ApiIndex> repository_apis) {
+        
+        List<StaticError> errors = new ArrayList<StaticError>();
+        
+        // First, loop through apis disambiguating types.
+        List<Api> new_apis = new ArrayList<Api>();
+        for( Api api : apis_to_disambiguate ) {
+                 ApiIndex index = globalEnv.api(api.getName());
+             NameEnv env = new TopLevelEnv(globalEnv, index, errors);
+             Set<IdOrOpOrAnonymousName> onDemandImports = new HashSet<IdOrOpOrAnonymousName>();
+             
+             SelfParamDisambiguator self_disambig = new SelfParamDisambiguator();
+             Api spd_result = (Api)api.accept(self_disambig);
+             
+             List<StaticError> newErrs = new ArrayList<StaticError>();
+             TypeDisambiguator td = 
+                 new TypeDisambiguator(env, onDemandImports, newErrs);
+             Api tdResult = (Api) spd_result.accept(td);
+             
+             if( newErrs.isEmpty() )
+                 new_apis.add(tdResult);
+             else 
+                errors.addAll(newErrs);
+        }
+        
+        // then, rebuild the indices
+        IndexBuilder.ApiResult rebuilt_indx = IndexBuilder.buildApis(new_apis, System.currentTimeMillis());
+        GlobalEnvironment new_global_env = new GlobalEnvironment.FromMap(CollectUtil.union(repository_apis,
+                        rebuilt_indx.apis()));
+
+        // Finally, disambiguate the expressions using the rebuild indices.
+        List<Api> results = new ArrayList<Api>();
+        for( Api api : new_apis ) {
+                ApiIndex index = new_global_env.api(api.getName());
+                NameEnv env = new TopLevelEnv(new_global_env, index, errors);
+                Set<IdOrOpOrAnonymousName> onDemandImports = new HashSet<IdOrOpOrAnonymousName>();
+                
+                List<StaticError> newErrs = new ArrayList<StaticError>();
+                ExprDisambiguator ed = 
+                new ExprDisambiguator(env, onDemandImports, newErrs);
+            Api edResult = (Api) api.accept(ed);
+            if (newErrs.isEmpty())
+                results.add(edResult);
+            else 
+                errors.addAll(newErrs);
+        }
+     
+        results = disambiguateGrammarMembers(results, errors, globalEnv);
+        return new ApiResult(results, errors);
+    }
-
-    /** Result of {@link #disambiguateComponents}. */
@@ -166 +188 @@
-
-    /** Disambiguate the given components. */
-
-
-
-
+
+
+
+
+
-        List<Component> results = new ArrayList<Component>();
-        List<StaticError> errors = new ArrayList<StaticError>();
+        
+        // First, disambiguate the types
+        List<Component> new_comps = new ArrayList<Component>();
-        for (Component comp : components) {
-            ComponentIndex index = indices.get(comp.getName());
@@ -187 +213 @@
-                new TypeDisambiguator(env, onDemandImports, newErrs);
-            Component tdResult = (Component) spdResult.accept(td);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        return new ComponentResult(results, errors);

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

@@ -29 +29 @@
-    
-    private final static String STATIC_TESTS_DIR = ProjectProperties.BASEDIR + "static_tests/";
-
-
-
-
-
-
-
-
-
+
-    private final static List<String> FAILING_TYPE_CHECKER = Arrays.asList(
+        /* "XXXMultipleRefErrors.fss",
-        "GenericFunctionCall.fss",
-        "CrossOverloaded.fss",
@@ -47 +40 @@
-        "CaseExpr.fss",
-        "DXXMutualSeparateLetFn.fss",
-
-
-
-
-
-
-
+
-        // This test the accumulator which is not desugared yet
-         "Sum.fss",
@@ -70 +57 @@
-    }
-}
-//"GenericSingleton.fss"      // FIXME

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

@@ -22 +22 @@
-import java.io.IOException;
-import java.util.ArrayList;
+import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
@@ -64 +65 @@
-        };
-
-
+
+
+
+
-            File f = new File(testCase.getTestDir() + filename);
-

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

@@ -18 +18 @@
-package com.sun.fortress.compiler.disambiguator;
-
+import static edu.rice.cs.plt.tuple.Option.wrap;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-import com.sun.fortress.useful.HasAt;
-import com.sun.fortress.useful.NI;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-/**
@@ -65 +134 @@
-public class ExprDisambiguator extends NodeUpdateVisitor {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-