Changeset 2164

Timestamp:

07/02/08 12:56:22 (2 months ago)

Author:

jmaessen

Message:

[Libraries]
Changed Integral to be a parametric type Integral[\I\]. This
hopefully is a start to resolving some problems Guy and I were having
integrating unsigned integer types.

Note that this means that the Number hierarchy is no longer strictly
closed (since we can't write a comprises clause that mentions
Integral[\I\]). As a result you may find that you need to add
"excludes { Number }" to traits involving some of the crazier sorts of
overloading (mostly involving overloadings at numeric and non-numeric
types). Several tests were changed as a result.

Two bugs were tickled: one was an oversight in exclusion checking (it
turns out checking a subtype condition one-sidedly wasn't good enough,
as our transitive guarantees are quite strong enough for this to find
an obvious exclusion relationship). The other was a known bug in
static constraint solving, now raising its head in a place where
wasn't previously occurring; this is Ticket #143.

Files:

• trunk/Library/FortressLibrary.fsi (modified) (7 diffs)
• trunk/Library/FortressLibrary.fss (modified) (15 diffs)
• trunk/ProjectFortress/LibraryBuiltin/FortressBuiltin.fsi (modified) (4 diffs)
• trunk/ProjectFortress/LibraryBuiltin/FortressBuiltin.fss (modified) (5 diffs)
• trunk/ProjectFortress/demos/lutx.fss (modified) (1 diff)
• trunk/ProjectFortress/src/com/sun/fortress/compiler/StaticJUTest.java (modified) (2 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FType.java (modified) (5 diffs)
• trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/values/OverloadedFunction.java (modified) (4 diffs)
• trunk/ProjectFortress/tests/BitTwiddle.fss (modified) (2 diffs)
• trunk/ProjectFortress/tests/asifTest.fss (modified) (1 diff)
• trunk/ProjectFortress/tests/initOrder.fss (modified) (1 diff)
• trunk/ProjectFortress/tests/overloadTest7.fss (modified) (1 diff)
• trunk/ProjectFortress/tests/overloadTest8.fss (modified) (1 diff)
• trunk/ProjectFortress/tests/tupleInfer.fss (modified) (1 diff)

trunk/Library/FortressLibrary.fsi

@@ -265 +265 @@
-    opr juxtaposition(self, other:Self): Self
-    (** Exponentiation need only deal with natural exponents. **)
-Integral
+ZZ64
-end
-
@@ -320 +320 @@
-end
-
-
+Any
-    (** returns true if the value is an IEEE NaN **)
-    getter isNaN(): Boolean
@@ -335 +335 @@
-    (** obtain the raw bits of the IEEE floating-point representation of this value. **)
-    getter rawBits():ZZ64
+    (** next higher IEEE float **)
+    getter nextUp():RR64
+    (** next lower IEEE float **)
+    getter nextDown():RR64
-    (** %MINNUM% and %MAXNUM% return a numeric result where possible (avoiding NaN).
-        Note that %MINNUM% and %MAX% form a lattice with NaN at the top, and
@@ -342 +346 @@
-end
-
-
+
+
+
-        comprises { ZZ64, IntLiteral }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    narrow(self):ZZ32
-end
-
-trait ZZ64 extends Integral comprises { Long, ZZ32 }
-end
-
@@ -451 +457 @@
-        the predicate p are retained.  Natural order and cross product
-        properties are otherwise preserved. **)
- 
+
-
-    (** Cross product of two generators.  This is specifically
@@ -1631 +1637 @@
-    getter g(): Generator[\E\]
-    getter p(): E -> Condition[\()\]
- 
+
-    generate[\R\](r:Reduction[\R\], m: E->R): R
-    reduce(r: Reduction[\E\]): E
- 
+
-    seq(self)
-end
@@ -1737 +1743 @@
-
-(** The %#% and %:% operators serve as factories for parallel ranges. **)
-
+Any
-opr #(lo:IntLiteral, ex:IntLiteral): Range[\ZZ32\]
-Integral, J extends 
+AnyIntegral, J extends Any
-     (lo:(I,J), ex:(I,J)): Range[\(I,J)\]
-Integral, J extends Integral, K extends 
+AnyIntegral, J extends AnyIntegral, K extends Any
-     (lo:(I,J,K), ex:(I,J,K)): Range[\(I,J,K)\]
-
+Any
-opr :(lo:IntLiteral, ex:IntLiteral): FullRange[\ZZ32\]
-Integral, J extends 
+AnyIntegral, J extends Any
-     (lo:(I,J), hi:(I,J)): Range[\(I,J)\]
-Integral, J extends Integral, K extends 
+AnyIntegral, J extends AnyIntegral, K extends Any
-     (lo:(I,J,K), hi:(I,J,K)): Range[\(I,J,K)\]
-

trunk/Library/FortressLibrary.fss

@@ -318 +318 @@
-    opr juxtaposition(self, other:Self): Self = self TIMES other
-    (** Exponentiation need only deal with natural exponents. **)
-Integral
+ZZ64
-end
-
@@ -397 +397 @@
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Float$Pow")
-    (** Shouldn't need this extra declaration. **)
-Integral
+ZZ64
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Float$Pow")
-    sin(self):RR64 =
@@ -429 +429 @@
-end
-
-
+Any
-    (** returns true if the value is an IEEE NaN **)
-    getter isNaN(): Boolean =
@@ -480 +480 @@
-end
-
-
+
+
+
-        comprises { ZZ64, IntLiteral }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    opr |x:ZZ64| : ZZ64 = if x>=0 then x else -x end
-
@@ -541 +518 @@
-    opr <(self, b:ZZ64):Boolean =
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Less")
+
+    opr -(self):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Negate")
+    opr +(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Add")
+    opr -(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Sub")
+    opr DOT(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Mul")
+    opr TIMES(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Mul")
+    opr juxtaposition(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Mul")
+    opr DIV(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Div")
+    opr REM(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Rem")
+    opr MOD(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Mod")
+    opr GCD(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Gcd")
+    opr LCM(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Lcm")
+    opr CHOOSE(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Choose")
+    opr BITAND(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$BitAnd")
+    opr BITOR(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$BitOr")
+    opr BITXOR(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$BitXor")
+    opr LSHIFT(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$LShift")
+    opr RSHIFT(self,b:ZZ64):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$RShift")
+    opr BITNOT(self):ZZ64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$BitNot")
+    opr ^(self, b:ZZ64):RR64 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$Pow")
+    narrow(self):ZZ32 =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.Long$FromLong")
-end
-
@@ -1709 +1727 @@
-        __Proxy[\ZZ32\] => vector[\T,s0\]()
-        __Proxy[\ZZ64\] => vector[\T,s0\]()
-        __Proxy[\Integral\] => vector[\T,s0\]()
-        __Proxy[\RR64\] => vector[\T,s0\]()
-        __Proxy[\Number\] => vector[\T,s0\]()
@@ -2006 +2023 @@
-        __Proxy[\ZZ32\] => matrix[\T,s0,s1\]()
-        __Proxy[\ZZ64\] => matrix[\T,s0,s1\]()
-        __Proxy[\Integral\] => matrix[\T,s0,s1\]()
-        __Proxy[\RR64\] => matrix[\T,s0,s1\]()
-        __Proxy[\Number\] => matrix[\T,s0,s1\]()
@@ -2745 +2761 @@
-  end
-
-Integral, b:Integral
+Number, b:Number
-
-(** Non-traditional subtraction of bounds, elementwise on tuples **)
@@ -2760 +2776 @@
-  end
-
-Integral\](a:T, b:T):T = 1
+MultiplicativeRing[\T\]\](a:T, b:T):T = a.one()
-
-(** join upper and lower bounds comparisons (total or partial) to
@@ -2966 +2982 @@
-generators.  They generate |self| numbers, incrementing by 1, starting
-with lower() (that's the canonical ordering). *)
-
+[\N\]
-        extends { FullRange[\N\] }
-        comprises { ParRange[\N\], SeqRange[\N\] }
@@ -2987 +3003 @@
-end
-
-
+[\N\]
-        extends ScalarRange[\N\]
-    getter extent() = ex
@@ -3057 +3073 @@
-        end
-end
-
+[\N\]
-        extends { ScalarRange[\N\], SequentialGenerator[\N\] }
-    getter extent() = ex
@@ -3090 +3106 @@
-end
-
-, M extends Integral
+[\N\], M extends Integral[\M\]
-                  (l1:N,l2:M,x1:N,x2:M)
-        extends { TupleRange[\(N,M)\], DelegatedIndexed[\(N,M),(N,M)\] }
@@ -3122 +3138 @@
-end
-
-, N2 extends Integral, N3 extends Integral
+[\N1\], N2 extends Integral[\N2\], N3 extends Integral[\N3\]
-                  (l1:N1,l2:N2,l3:N3,x1:N1,x2:N2,x3:N3)
-        extends { TupleRange[\(N1,N2,N3)\],
@@ -3160 +3176 @@
-
-(** The # and : operators serve as factories for parallel ranges. **)
-
+
+
-opr #(lo:IntLiteral, ex:IntLiteral): ParRange[\ZZ32\] = ParRange[\ZZ32\](lo,ex)
-
+
+
-     (lo:(I,J), ex:(I,J)): Tuple2Range[\I,J\] =
-    do (l1,l2)=lo; (x1,x2)=ex; Tuple2Range[\I,J\](l1,l2,x1,x2) end
-Integral, J extends Integral, K extends 
+AnyIntegral, J extends AnyIntegral, K extends Any
-     (lo:(I,J,K), ex:(I,J,K)): Tuple3Range[\I,J,K\] =
-    do (l1,l2,l3)=lo; (x1,x2,x3)=ex; Tuple3Range[\I,J,K\](l1,l2,l3,x1,x2,x3) end
-
-
+Any
-        ParRange[\I\](lo,hi-lo+1)
+(*
-opr :(lo:IntLiteral, hi:IntLiteral): ParRange[\ZZ32\] =
-        ParRange[\ZZ32\](lo,hi-lo+1)
-
+
+
-     (lo:(I,J), hi:(I,J)): Tuple2Range[\I,J\] =
-    do (l1,l2)=lo; (h1,h2)=hi; Tuple2Range[\I,J\](l1,l2,h1-l1+1,h2-l2+1) end
-Integral, J extends Integral, K extends 
+AnyIntegral, J extends AnyIntegral, K extends Any
-     (lo:(I,J,K), hi:(I,J,K)): Tuple3Range[\I,J,K\] = do
-    (l1,l2,l3)=lo; (h1,h2,h3)=hi

trunk/ProjectFortress/LibraryBuiltin/FortressBuiltin.fsi

@@ -25 +25 @@
-
-value object ZZ32 extends ZZ64
+    getter zero(): Number
+    getter one(): Number
+
+    opr |self| : ZZ32
-    opr =(self, b:ZZ32):Boolean
-    opr <(self, b:ZZ32):Boolean
@@ -42 +46 @@
-    opr BITOR(self,b:ZZ32):ZZ32
-    opr BITXOR(self,b:ZZ32):ZZ32
-Integral
-Integral
+ZZ64
+ZZ64
-    opr BITNOT(self):ZZ32
-Integral):Number
+ZZ64):RR64
-    widen(self):ZZ64
-    partitionL(self):ZZ32
@@ -53 +57 @@
-end
-
-
+[\IntLiteral\]
-    opr =(self, b: IntLiteral):Boolean
-    opr <(self, other:IntLiteral): Boolean
@@ -75 +79 @@
-    opr BITOR(self, b: IntLiteral): IntLiteral
-    opr BITXOR(self, b: IntLiteral): IntLiteral
-Integral
-Integral
+ZZ64
+ZZ64
-    opr BITNOT(self): IntLiteral
-Integral):Number
+ZZ64):RR64
-end
-

trunk/ProjectFortress/LibraryBuiltin/FortressBuiltin.fss

@@ -29 +29 @@
-
-value object ZZ32 extends { StandardTotalOrder[\ZZ32\], ZZ64 }
-Number
-Number
+ZZ32
+ZZ32
-
-    opr |self| : ZZ32 = if self>=0 then self else -self end
@@ -66 +66 @@
-    opr BITXOR(self,b:ZZ32):ZZ32 =
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.ZZ32$BitXor")
-Integral
+ZZ64
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.ZZ32$LShift")
-Integral
+ZZ64
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.ZZ32$RShift")
-    opr BITNOT(self):ZZ32 =
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.ZZ32$BitNot")
-Integral
+ZZ64
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.ZZ32$Pow")
-    widen(self):ZZ64 =
@@ -83 +83 @@
-end
-
-
+
+
+
+
-    opr |self| : ZZ32 = if self>=0 then self else -self end
-    opr =(self, b: IntLiteral):Boolean =
@@ -104 +107 @@
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$Mul")
-    opr juxtaposition(self, b: IntLiteral): IntLiteral =
+        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$Mul")
+    opr TIMES(self, b: IntLiteral): IntLiteral =
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$Mul")
-    opr DIV(self, b: IntLiteral): IntLiteral =
@@ -123 +128 @@
-    opr BITXOR(self, b: IntLiteral): IntLiteral =
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$BitXor")
-Integral
+ZZ64
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$LShift")
-Integral
+ZZ64
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$RShift")
-    opr BITNOT(self): IntLiteral =
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$BitNot")
-Integral
+ZZ64
-        builtinPrimitive("com.sun.fortress.interpreter.glue.prim.IntLiteral$Pow")
-end

trunk/ProjectFortress/demos/lutx.fss

@@ -24 +24 @@
-
-
-
+Any
-  (x1,n1) = a
-  (x2,n2) = b

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

@@ -27 +27 @@
-
-public class StaticJUTest extends TestCaseWrapper {
-
+
-    private final static String STATIC_TESTS_DIR = ProjectProperties.BASEDIR + "static_tests/";
-    private final static List<String> FAILING_DISAMBIGUATOR = Arrays.asList();
-    private final static List<String> FAILING_TYPE_CHECKER = Arrays.asList(
-        /* "XXXMultipleRefErrors.fss",
-   
+    
-        "CrossOverloaded.fss",
-        "SimpleObject.fss",
@@ -47 +47 @@
-        "MethodInvocationStaticInfer1.fss",
-        "MethodInvocationStaticInfer2.fss",
-
+
+
-    );
-
+
-    public static TestSuite suite() {
-        return new StaticTestSuite("StaticJUTest",
-                                   STATIC_TESTS_DIR,
-                                   FAILING_DISAMBIGUATOR,
-     
+
-    }
-}

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FType.java

@@ -173 +173 @@
-
-    private void computeTransitiveExcludes() {
+        exclDump("Computing transitive excludes for ",this,":");
-        for (FType t : getExtends()) {
-            for (FType x : t.getExcludes()) {
-                addExclude(x);
-" ",t," excludes ",x
+t," excludes ",x,"; "
-            }
-        }
@@ -229 +230 @@
-            return true;
-        if (excludesOtherSimply(other)) {
-            exclDump("Ought to return true now.");
-            return true;
-        }
@@ -282 +282 @@
-        }
-        // Next, check that a supertype of other isn't excluded by us.
+        exclDump("\nChecking for supertype exclusion of ",this,": ");
-        for (FType t1 : other.getTransitiveExtends()) {
-            if (excludes.contains(t1)) {
@@ -288 +289 @@
-                return true;
-            }
+            exclDump("Not ",t1,"; ");
+        }
+        // And vice versa.
+        exclDump("\nChecking for supertype exclusion of ",other,": ");
+        Set<FType> oexcl = other.getExcludes();
+        for (FType t1 : this.getTransitiveExtends()) {
+            if (oexcl.contains(t1)) {
+                exclDumpln("Excludes supertype ", t1, ".");
+                addExclude(other);
+                return true;
+            }
+            exclDump("Not ",t1,"; ");
-        }
-        // We shouldn't need to check the other way 'round by reflexivity.
@@ -300 +313 @@
-        for (FType t1 : getTransitiveComprises()) {
-            for (FType t2 : other.getTransitiveComprises()) {
-
+,"; "
-                if (!t1.excludesOther(t2)) {
-                    return false;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/values/OverloadedFunction.java

@@ -74 +74 @@
-
-    static final boolean DUMP_EXCLUSION = false;
-0
+
-
-    public static void exclDump(Object... os) {
@@ -500 +500 @@
-                }
-            }
-
+
-
-            describeOverloadingFailure(o1, o2, within, pl1,
@@ -526 +526 @@
-            if (p1better < 0 && p2better < 0 && selfIndex < 0)
-                return false;
-
+
-            if (result1Subtype2Failure || result2Subtype1Failure)
-                return false;
@@ -582 +582 @@
-                error(o1, o2, within, explanation);
-            }
-
+
-            if (result1Subtype2Failure) {
-                String explanation = errorMsg("Overloading of ", o1, " and ", o2,

trunk/ProjectFortress/tests/BitTwiddle.fss

@@ -19 +19 @@
-export Executable
-
-
+[\I\]
-  n_bar = BITNOT n
-  z : I = 0
@@ -51 +51 @@
-  doit(n,32)
-  println("ZZ32 OK")
-[\ZZ64\]
+
-  println("ZZ64 OK")
-end

trunk/ProjectFortress/tests/asifTest.fss

@@ -107 +107 @@
-    (* Mixed generic and overloaded method, at supertype. *)
-    typecase z = (3 asif RR64) + 17 of
-Integral => println("FAIL, got ZZ32
+ZZ64 => println("FAIL, got ZZ64
-        RR64 => println("PASS, got RR64 " z)
-        else => println("Got unknown typed " z)

trunk/ProjectFortress/tests/initOrder.fss

@@ -24 +24 @@
-
-(* Everything must extend this trait, or the bug will disappear. *)
-
+ excludes { Number }
-end
-

trunk/ProjectFortress/tests/overloadTest7.fss

@@ -23 +23 @@
-   derived automatically for any two object types.
-
- *)
+
-
-
+
+
+
+
-
-trait super extends {notRR64} end

trunk/ProjectFortress/tests/overloadTest8.fss

@@ -23 +23 @@
-   derived automatically for any two object types.
-
- *)
+
-
-
+
+
+
+
-
-trait super extends {notRR64} end

trunk/ProjectFortress/tests/tupleInfer.fss

@@ -20 +20 @@
-
-(* Tests that we can instantiate generics inside tuples *)
-
+Any
-
-run(args:String...):()=do