Changeset 4130 for trunk/ProjectFortress/not_passing_yet

Timestamp:

09/05/09 14:21:41 (3 months ago)

Author:

sukyoungryu

Message:

[disambiguator] Fixed handling getters and setters in ExprDisambiguator?. Fixed libraries and tests using getters.

Location:

trunk/ProjectFortress/not_passing_yet

Files:

• testMethodInference.fss (modified) (1 diff)
• tree.fss (modified) (10 diffs)

trunk/ProjectFortress/not_passing_yet/testMethodInference.fss

@@ -27 +27 @@
 
 object true extends Boolean
+getter asString():String = "true"
 apply[\T\](x:T, y:T):T = x
 unary[\T\](x:T):T = x
-asString():String = "true"
 end
 
 object false extends Boolean
+getter asString():String = "false"
 apply[\T\](x:T, y:T):T = y
 unary[\T\](x:T):T = x
-asString():String = "false"
 end
 

trunk/ProjectFortress/not_passing_yet/tree.fss

@@ -275 +275 @@
 trait Tree[\ E, nat k \]
     comprises { Node[\E,k\], Leaf[\E,k\] }
-  asString():String
+  getter asString():String
   map[\F\](f:E->F):Tree[\F,k\]
 end
@@ -281 +281 @@
 object Node[\ E, nat k \](val : E, children : Tree[\E,k\][k])
            extends { Tree[\E,k\] }
-  asString():String = do
-    s : String := "(" val.asString() ";" children[0].asString()
+  getter asString():String = do
+    s : String := "(" val.asString ";" children[0].asString
     for i <- seq(1#k-1) do
-      s := s "|" children[i].asString()
+      s := s "|" children[i].asString
     end
     (s ")")
@@ -305 +305 @@
 object Leaf[\ E, nat k \]() extends { Tree[\E,k\] }
     (* where { E, nat k } singleton only *)
-    asString():String = "."
+    getter asString():String = "."
     map[\F\](f:E->F):Leaf[\F,k\] = Leaf[\F,k\]()
 end
@@ -312 +312 @@
 trait LeafTree[\ E, nat k \]
   comprises { LNode[\E,k\], LLeaf[\E,k\]}
-    asString():String
+    getter asString():String
     mapReduce[\R\](join : (R,R)->R, f : E->R) : R
     mapReduce2[\R,S\](join : (R,S,R,S)->(R,S), f : E->(R,S)) : (R,S)
@@ -320 +320 @@
 object LNode[\ E, nat k \](children : LeafTree[\E,k\][k])
     extends { LeafTree[\E,k\] }
-  asString():String = do
-    s : String := "(" children[0].asString()
+  getter asString():String = do
+    s : String := "(" children[0].asString
     for i <- seq(1#k-1) do
-      s := s "|" children[i].asString()
+      s := s "|" children[i].asString
     end
     (s ")")
@@ -368 +368 @@
 object LLeaf[\ E, nat k \](val : E)
     extends { LeafTree[\E,k\] }
-  asString():String = val.asString()
+  getter asString():String = val.asString
   mapReduce[\R\](join : (R,R)->R, f: E->R) : R = f(val)
   mapReduce2[\R,S\](join : (R,S,R,S)->(R,S), f : E->(R,S)) : (R,S) = f(val)
@@ -414 +414 @@
   d : Tree[\RR64[k],2\] := d_
 
-  asString():String =
+  getter asString():String =
     ("thresh = " thresh //
      "initial_level = " initial_level //
      "compressed = " compressed //
-     "s = " s.asString() //
-     "d = " d.asString())
+     "s = " s.asString //
+     "d = " d.asString)
 
   copy():Function[\k\] =
@@ -727 +727 @@
   f : Function[\ 3 \] = function[\ 3 \](0.01,f_test,0,20)
   println("f is computed")
-  println(f.c.hg.asString())
-  println(f.c.hgT.asString())
-  println(f.c.quad_x.asString())
-  println(f.c.quad_w.asString())
-  println(f.c.quad_phiT.asString())
-  println(f.c.quad_phi.asString())
-  println(f.c.quad_phiWT.asString())
-  println(f.c.r0.asString())
-  println(f.c.rm.asString())
-  println(f.c.rp.asString())
+  println(f.c.hg.asString)
+  println(f.c.hgT.asString)
+  println(f.c.quad_x.asString)
+  println(f.c.quad_w.asString)
+  println(f.c.quad_phiT.asString)
+  println(f.c.quad_phi.asString)
+  println(f.c.quad_phiWT.asString)
+  println(f.c.r0.asString)
+  println(f.c.rm.asString)
+  println(f.c.rp.asString)
   f.reconstruct()
-  println(f.copy().asString())
+  println(f.copy().asString)
   rt2 = SQRT 2.0
   ftv = f_test(rt2-1)
@@ -744 +744 @@
   println( ||f|| ) (* Should also match the above. *)
   f.compress()
-  println(f.asString())
+  println(f.asString)
   f.reconstruct()
-  println(f.asString())
+  println(f.asString)
   println(f.apply(rt2-1) " ~" // ftv)
   g_test(x:RR64):RR64 = 2^(-x)
@@ -752 +752 @@
   gtv = g_test(rt2-1)
   println("Here is G")
-  println(g.asString())
+  println(g.asString)
   println(g.apply(rt2-1) " ~" // gtv)
   println( ||g|| )