Changeset 4118 for trunk/ProjectFortress/LibraryBuiltin

Timestamp:

08/31/09 12:39:22 (3 months ago)

Author:

dr2chase

Message:

Functional methods are somewhat working as they are supposed to; native wrapping is no longer in-place; bootclasspath is no longer necessary; bytecodes now pass verification; there is an instance of native overloading that will probably fail because it is not (and did not, previously) dodge overlapping bytecode names out of the way; ZZ32 is NOT a subtype of ZZ64, RR32 is NOT a subtype of RR64; this would be a good time to get coercion working.

Location:

trunk/ProjectFortress/LibraryBuiltin

Files:

• CompilerBuiltin.fsi (modified) (3 diffs)
• CompilerBuiltin.fss (modified) (3 diffs)

trunk/ProjectFortress/LibraryBuiltin/CompilerBuiltin.fsi

@@ -45 +45 @@
 end
 
-trait ZZ32 extends ZZ64 comprises { IntLiteral }
+trait ZZ32 extends Number comprises { IntLiteral }
     asZZ32(): ZZ32
     asString(): String
@@ -65 +65 @@
 end
 
-trait RR64 extends Number comprises { RR32 }
+trait RR64 extends Number comprises {FloatLiteral}
     asString(): String
     opr |self| : RR64
@@ -83 +83 @@
 end
 
-trait RR32 extends RR64 comprises { FloatLiteral }
+trait RR32 extends Number 
 end
 
-object FloatLiteral extends RR32
+object FloatLiteral extends RR64
 end
 

trunk/ProjectFortress/LibraryBuiltin/CompilerBuiltin.fss

@@ -77 +77 @@
 end
 
-trait ZZ32 extends ZZ64 comprises { IntLiteral }
+trait ZZ32 extends Number comprises { IntLiteral }
     asZZ32(): ZZ32 = self
     asString(): String = jIntToString(self)
@@ -97 +97 @@
 end
 
-trait RR64 extends Number comprises { RR32 }
+trait RR64 extends Number comprises {FloatLiteral}
     asString(): String = jDoubleToString(self)
     opr |self| : RR64 = jDoubleAbs(self)
@@ -125 +125 @@
 end
 
-trait RR32 extends RR64 comprises {FloatLiteral}
+trait RR32 extends Number
 end
 
-object FloatLiteral extends RR32
+object FloatLiteral extends RR64
 end