Changeset 4131 for trunk/ProjectFortress/demos

Timestamp:

09/06/09 05:19:15 (3 months ago)

Author:

sukyoungryu

Message:

[demos] Fixed more getter call syntax in demos.

Location:

trunk/ProjectFortress/demos

Files:

• Lambda.fss (modified) (1 diff)
• Syntax.fsi (modified) (1 diff)
• Syntax.fss (modified) (1 diff)
• aStar.fss (modified) (4 diffs)

trunk/ProjectFortress/demos/Lambda.fss

@@ -88 +88 @@
 trait Var extends Term comprises { FreeVar, BoundVar }
     getter name(): String
-    pretty(_:ZZ32): String = name()
+    pretty(_:ZZ32): String = self.name
     subst(v:Var, val:Term): Term = if self=v then val else self end
     hasFreeVar(v:Var): Boolean = self = v

trunk/ProjectFortress/demos/Syntax.fsi

@@ -1 +1 @@
 (*******************************************************************************
-    Copyright 2008 Sun Microsystems, Inc.,
+    Copyright 2009 Sun Microsystems, Inc.,
     4150 Network Circle, Santa Clara, California 95054, U.S.A.
     All rights reserved.

trunk/ProjectFortress/demos/Syntax.fss

@@ -1 +1 @@
 (*******************************************************************************
-    Copyright 2008 Sun Microsystems, Inc.,
+    Copyright 2009 Sun Microsystems, Inc.,
     4150 Network Circle, Santa Clara, California 95054, U.S.A.
     All rights reserved.

trunk/ProjectFortress/demos/aStar.fss

@@ -68 +68 @@
         generate() method. **)
     generate[\R\](r: Reduction[\R\], body: Self->R): R =
-        children().generate[\R\](r,body)
+        self.children.generate[\R\](r,body)
 end
 
@@ -152 +152 @@
         end
     getter cost(): ZZ32 = 6 81 - 5 props - cands
-    getter isComplete(): ZZ32 = isConsistent() AND: props = 81
+    getter isComplete(): ZZ32 = self.isConsistent AND: props = 81
     getter longString(): String =
         (BIG ||[i<-0#9] (
@@ -172 +172 @@
              end))
     getter children(): Generator[\Sudoku\] =
-        if isConsistent() then
+        if self.isConsistent then
             incons : Sudoku = Sudoku(0,props+1,state)
             <|  if state[iMax,jMax,k].working() then
@@ -352 +352 @@
     getter asString(): String =
         if i = 0 then "0"
-        elif i >= 10^9 then sec() "s"
-        elif i >= 10^6 then ms() "ms"
-        elif i >= 10^3 then us() "µs"
-        else ns() "ns"
+        elif i >= 10^9 then self.sec "s"
+        elif i >= 10^6 then self.ms "ms"
+        elif i >= 10^3 then self.us "µs"
+        else self.ns "ns"
         end
     opr +(self, other:NanoInterval): NanoInterval =