Changeset 4112 for trunk/ProjectFortress/LibraryBuiltin

Timestamp:

08/21/09 16:05:08 (3 months ago)

Author:

jmaessen

Message:

[compiler, library, tests] Work on getting RR64 to run
(seems OK so far except for the usual warts that also hold for ZZ32;
eg literals don't support asString due to dotted method inheritance
bugs). Note that ZZ32 and RR64 arithmetic can't be commingled at all
at the moment.

Moved desugaring of loops and generalized if/while to occur before
type checking. This makes these constructs work the same way as
comprehensions and reductions, which had previously been shifted
earlier in compilation. Adjusted the desugarings to generate
_RewriteFnApp or MethodApplication? nodes rather than TightJuxts?. This
should improve future reliability of desugared code.

Added test of floating-point printing. Adjusted Compiled7fo to work
around obvious shortcomings in code generation. Codegen now crashes
on this program, probably due to an outstanding bug that's been
lurking for a long time. Addressing this is probably the next thing
to be done.

Location:

trunk/ProjectFortress/LibraryBuiltin

Files:

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

trunk/ProjectFortress/LibraryBuiltin/CompilerBuiltin.fsi

@@ -65 +65 @@
 end
 
-trait RR64 extends Number
+trait RR64 extends Number comprises { RR32 }
     asString(): String
     opr |self| : RR64
@@ -80 +80 @@
     opr /(self, other:RR64): RR64
     opr ^(self, other:RR64): RR64
+    opr ^(self, other:ZZ32): RR64
 end
 
-trait RR32 extends RR64
+trait RR32 extends RR64 comprises { FloatLiteral }
 end
 

trunk/ProjectFortress/LibraryBuiltin/CompilerBuiltin.fss

@@ -97 +97 @@
 end
 
-trait RR64 extends Number
+trait RR64 extends Number comprises { RR32 }
     asString(): String = jDoubleToString(self)
     opr |self| : RR64 = jDoubleAbs(self)
@@ -112 +112 @@
     opr /(self, other:RR64): RR64 = jDoubleDiv(self,other)
     opr ^(self, other:RR64): RR64 = jDoublePow(self,other)
+    opr ^(self, other:ZZ32): RR64 =
+        if other > 0 then
+            mid = other DIV 2
+            if (mid + mid) = other then
+                (self self)^mid
+            else
+                self (self^(mid-1))
+            end
+        elif other = 0 then 1.0
+        else 1.0 / (self^(-other))
+        end
 end
 
-trait RR32 extends RR64
+trait RR32 extends RR64 comprises {FloatLiteral}
 end