Changeset 4087 for trunk/ProjectFortress/LibraryBuiltin

Timestamp:

08/17/09 13:01:11 (3 months ago)

Author:

dr2chase

Message:

Jan's RR64 patches, plus fixes required to make the rest of the system cope, plus updates to error tests.

Location:

trunk/ProjectFortress/LibraryBuiltin

Files:

• CompilerBuiltin.fsi (modified) (4 diffs)
• CompilerBuiltin.fss (modified) (6 diffs)

trunk/ProjectFortress/LibraryBuiltin/CompilerBuiltin.fsi

@@ -23 +23 @@
 
 trait String
+    asString(): String
 opr || (self, b:String):String
+    opr juxtaposition(self, b:String): String
 end
 
@@ -42 +44 @@
 trait ZZ32 extends ZZ64 comprises { IntLiteral }
     asString(): String
-    opr STR(self): String
+    opr |self| : ZZ32
     opr -(self): ZZ32
     opr +(self, other:ZZ32): ZZ32
@@ -49 +51 @@
     opr <=(self, other:ZZ32): Boolean
     opr >(self, other:ZZ32): Boolean
+    opr >=(self, other:ZZ32): Boolean
     opr =(self, other:ZZ32): Boolean
     opr juxtaposition(self, other:ZZ32): ZZ32
@@ -59 +62 @@
 
 trait RR64 extends Number
+    asString(): String
+    opr |self| : RR64
+    opr -(self): RR64
+    opr +(self, other:RR64): RR64
+    opr -(self, other:RR64): RR64
+    opr <(self, other:RR64): Boolean
+    opr <=(self, other:RR64): Boolean
+    opr >(self, other:RR64): Boolean
+    opr >=(self, other:RR64): Boolean
+    opr =(self, other:RR64): Boolean
+    opr juxtaposition(self, other:RR64): RR64
+    opr DOT(self, other:RR64): RR64
+    opr /(self, other:RR64): RR64
 end
 

trunk/ProjectFortress/LibraryBuiltin/CompilerBuiltin.fss

@@ -28 +28 @@
                                             simpleIntArith.intLE => jIntLE,
                                             simpleIntArith.intGT => jIntGT,
+                                            simpleIntArith.intGE => jIntGE,
                                             simpleIntArith.intEQ => jIntEQ,
                                             simpleIntArith.intNeg => jIntNeg,
-                                            simpleIntArith.parseInt => jParseInt}
+                                            simpleIntArith.parseInt => jParseInt,
+                                            simpleIntArith.intAbs => jIntAbs}
+import java com.sun.fortress.nativeHelpers.{simpleDoubleArith.doubleToString => jDoubleToString,
+                                            simpleDoubleArith.doubleAdd => jDoubleAdd,
+                                            simpleDoubleArith.doubleSub => jDoubleSub,
+                                            simpleDoubleArith.doubleMul => jDoubleMul,
+                                            simpleDoubleArith.doubleDiv => jDoubleDiv,
+                                            simpleDoubleArith.doubleLT => jDoubleLT,
+                                            simpleDoubleArith.doubleLE => jDoubleLE,
+                                            simpleDoubleArith.doubleGT => jDoubleGT,
+                                            simpleDoubleArith.doubleGE => jDoubleGE,
+                                            simpleDoubleArith.doubleEQ => jDoubleEQ,
+                                            simpleDoubleArith.doubleNeg => jDoubleNeg,
+                                            simpleDoubleArith.parseDouble => jParseDouble,
+                                            simpleDoubleArith.doubleAbs => jDoubleAbs}
 import AnyType.{Any}
 export CompilerBuiltin
@@ -38 +53 @@
 
 trait String
+    asString(): String = self
     opr ||(self, b:String): String =  jConcatenate(self, b)
+    opr juxtaposition(self, b:String): String = jConcatenate(self, b)
 end
 
@@ -45 +62 @@
 
 println(s:String):() = jPrintln(s)
-printlnZZ32(x:ZZ32):() = jPrintlnZZ32(x)
+printlnZZ32(x:ZZ32):() = jPrintln(x.asString())
 
 strToInt(s:String):ZZ32 = jParseInt(s)
@@ -57 +74 @@
 trait ZZ32 extends ZZ64 comprises { IntLiteral }
     asString(): String = jIntToString(self)
-    opr STR(self): String = jIntToString(self)
+    opr |self| : ZZ32 = jIntAbs(self)
     opr -(self): ZZ32 = jIntNeg(self)
     opr +(self, other:ZZ32): ZZ32 = jIntAdd(self,other)
@@ -64 +81 @@
     opr <=(self, other:ZZ32): Boolean = jIntLE(self,other)
     opr >(self, other:ZZ32): Boolean = jIntGT(self,other)
+    opr >=(self, other:ZZ32): Boolean = jIntGE(self,other)
     opr =(self, other:ZZ32): Boolean = jIntEQ(self,other)
     opr juxtaposition(self, other:ZZ32): ZZ32 = jIntMul(self,other)
@@ -74 +92 @@
 
 trait RR64 extends Number
+    asString(): String = jDoubleToString(self)
+    opr |self| : RR64 = jDoubleAbs(self)
+    opr -(self): RR64 = jDoubleNeg(self)
+    opr +(self, other:RR64): RR64 = jDoubleAdd(self,other)
+    opr -(self, other:RR64): RR64 = jDoubleSub(self,other)
+    opr <(self, other:RR64): Boolean = jDoubleLT(self,other)
+    opr <=(self, other:RR64): Boolean = jDoubleLE(self,other)
+    opr >(self, other:RR64): Boolean = jDoubleGT(self,other)
+    opr >=(self, other:RR64): Boolean = jDoubleGE(self,other)
+    opr =(self, other:RR64): Boolean = jDoubleEQ(self,other)
+    opr juxtaposition(self, other:RR64): RR64 = jDoubleMul(self,other)
+    opr DOT(self, other:RR64): RR64 = jDoubleMul(self,other)
+    opr /(self, other:RR64): RR64 = jDoubleDiv(self,other)
 end