Changeset 4317 for trunk/ProjectFortress/compiler_tests

Timestamp:

11/06/09 13:16:48 (3 weeks ago)

Author:

dr2chase

Message:

Tweaked Treap Test to have names that would have collided, pre-jar-files

Files:

• trunk/ProjectFortress/compiler_tests/TreapAndTest.fss (modified) (8 diffs)

trunk/ProjectFortress/compiler_tests/TreapAndTest.fss

@@ -84 +84 @@
 singleton(key:ZZ32, val:String): Treap = Treap(leaf1(key,val))
 
-empty: Treap = Treap(TEmpty)
-
-trait TreapNode comprises { NonEmpty, TEmpty }
+empty: Treap = Treap(Empty)
+
+trait TreapNode comprises { NonEmpty, Empty }
     getter isEmpty(): Boolean
     getter hk(): ZZ32
@@ -99 +99 @@
     (* Left subtree of split at key *)
     splitL(key:ZZ32): TreapNode
-    (* Node with given key, or TEmpty *)
+    (* Node with given key, or Empty *)
     nodeWithKey(key:ZZ32): TreapNode
     (* Right subtree of split at key *)
@@ -119 +119 @@
 end
 
-object TEmpty extends TreapNode
+object Empty extends TreapNode
     getter isEmpty(): Boolean = true
     getter hk(): ZZ32 = Min_HK
@@ -133 +133 @@
     (* Left subtree of split at key *)
     splitL(key:ZZ32): TreapNode = self
-    (* Node with given key, or TEmpty *)
+    (* Node with given key, or Empty *)
     nodeWithKey(key:ZZ32): TreapNode = self
     (* Right subtree of split at key *)
@@ -180 +180 @@
     split(key: ZZ32): (TreapNode, TreapNode, TreapNode) =
         if key < k0 then
-            (TEmpty, TEmpty, self)
-        elif key > k0 then
-            (self, TEmpty, TEmpty)
-        else
-            (TEmpty, self, TEmpty)
+            (Empty, Empty, self)
+        elif key > k0 then
+            (self, Empty, Empty)
+        else
+            (Empty, self, Empty)
         end
     *)
     (* Left subtree of split at key *)
     splitL(key:ZZ32): TreapNode =
-        if key > k0 then self else TEmpty end
-    (* Node with given key, or TEmpty *)
+        if key > k0 then self else Empty end
+    (* Node with given key, or Empty *)
     nodeWithKey(key:ZZ32): TreapNode =
-        if key = k0 then self else TEmpty end
+        if key = k0 then self else Empty end
     (* Right subtree of split at key *)
     splitR(key:ZZ32): TreapNode =
-        if key < k0 then self else TEmpty end
+        if key < k0 then self else Empty end
 
     join(r: TreapNode): TreapNode = r.joinNE(self)
     joinNE(l: NonEmpty): NonEmpty =
         if hk0 > l.hk then
-            Node(l, hk0, k0, v0, TEmpty)
+            Node(l, hk0, k0, v0, Empty)
         else
             l.joinNEH(self)
         end
     joinNEH(r: NonEmpty): NonEmpty =
-        Node(TEmpty, hk0, k0, v0, r)
+        Node(Empty, hk0, k0, v0, r)
 
     combine(c: CombiningOp, r: TreapNode): TreapNode =
@@ -275 +275 @@
             left
         end
-    (* Node with given key, or TEmpty *)
+    (* Node with given key, or Empty *)
     nodeWithKey(key:ZZ32): TreapNode =
         if key < k0 then
@@ -338 +338 @@
 
 object IntersectionOp extends CombiningOp
-    leftEmpty(right: TreapNode): TreapNode = TEmpty
-    rightEmpty(left: TreapNode): TreapNode = TEmpty
+    leftEmpty(right: TreapNode): TreapNode = Empty
+    rightEmpty(left: TreapNode): TreapNode = Empty
     combine(leftArg: Leaf1, rightArg: Leaf1): TreapNode = leftArg
 end
 
 object DifferenceOp extends CombiningOp
-    leftEmpty(right: TreapNode): TreapNode = TEmpty
+    leftEmpty(right: TreapNode): TreapNode = Empty
     rightEmpty(left: TreapNode): TreapNode = left
-    combine(leftArg: Leaf1, rightArg: Leaf1): TreapNode = TEmpty
+    combine(leftArg: Leaf1, rightArg: Leaf1): TreapNode = Empty
 end
 
@@ -352 +352 @@
     leftEmpty(right: TreapNode): TreapNode = right
     rightEmpty(left: TreapNode): TreapNode = left
-    combine(leftArg: Leaf1, rightArg: Leaf1): TreapNode = TEmpty
-end
+    combine(leftArg: Leaf1, rightArg: Leaf1): TreapNode = Empty
+end