Changeset 2739 for trunk/Library/FortressLibrary.fss

Timestamp:

08/25/08 07:23:17 (15 months ago)

Author:

black

Message:

Next iteration of CordedStrings?, with substring nodes. Comparison of Strings with substring nodes is a work in progress. This commit fixes bugs in the Range comparison code that were impeding that progress

Files:

• trunk/Library/FortressLibrary.fss (modified) (11 diffs)

trunk/Library/FortressLibrary.fss

@@ -135 +135 @@
     isLeftZero(_:Comparison): Boolean = true
 end
+
+opr BIG LEXICO(): BigReduction[\TotalComparison, TotalComparison\] =
+  BigReduction[\TotalComparison,TotalComparison\](LexicographicReduction)
+  
 
 trait Comparison
@@ -1100 +1104 @@
 trait Condition[\E\] extends { ZeroIndexed[\E\], SequentialGenerator[\E\] }
     getter isEmpty(): Boolean = NOT holds()
+    getter nonEmpty(): Boolean = NOT isEmpty()
     getter holds(): Boolean = cond[\Boolean\](fn (_:E):Boolean => true, fn () => false)
     getter size(): ZZ32 = if holds() then 1 else 0 end
@@ -1453 +1458 @@
         defined as size=0 *)
     getter isEmpty(): Boolean = |self| = 0
-    (** %size()% is depracated; use %|self|%. *)
+    getter nonEmpty(): Boolean = NOT self.isEmpty
+    (** %self.size% is equivalent to %|self|%. *)
     getter size(): ZZ32
     (** bounds() yields a range of indices that are valid for the
@@ -3027 +3033 @@
                 RangeWithExtent[\T\], PartialRange[\T\] }
     excludes { Number }
-    getter isEmpty(): Boolean = (|self| ≤ 0)
+    
     opr[r:Range[\T\]]: Range[\T\] = fail("Unrecognized Range " r)
     opr[_:OpenRange[\Any\]] : Range[\T\] = self
@@ -3284 +3290 @@
             self.lower#r.extent
         else
-            fail(self "[" r "] is not sufficiently large in some dimension")
+            fail(self "[" r "] is too small in some dimension")
         end
     opr[r:CompleteRange[\T\]]: CompleteRange[\T\] =
@@ -3303 +3309 @@
 
     opr =(self, other:CompleteRange[\T\]): Boolean =
-        self.isBounded=other.isBounded AND self.lower=other.lower AND
-        self.extent = other.extent
+    (*    isBounded()=other.isBounded() AND 
+         APB 2008.08.20: this seems bogus: isBounded tells us only whether we were created 
+         using an extent or an upper bound, and should not effect the comparison *)
+         lower()=other.lower() AND extent() = other.extent()    
+         
     opr CMP(self, other:Range[\T\]): Comparison =
         typecase other of
@@ -3315 +3324 @@
                     (LessThan,LessThan) => Unordered
                     (GreaterThan,GreaterThan) => Unordered
-                    (EqualTo,EqualTo) =>
+    (*  This case seems unncessary; the (EqualTo,Comparison) case will cover us    --- APB  2008.08.20
+                    (EqualTo,EqualTo) => EqualTo
                         if self.isBounded = other.isBounded then
                             EqualTo
@@ -3321 +3331 @@
                             Unordered
                         end
+   *)
                     (EqualTo,Comparison) => b
                     (GreaterThan,Comparison) => LessThan
@@ -3676 +3687 @@
      
     opr |self| : ZZ32 = self.size
-    opr CASE_INSENSITIVE_CMP(self, other:String): TotalComparison
-    (** As a convenience, we permit LowerRange indexing to go 1 past the bounds
+       
+    opr CASE_INSENSITIVE_CMP(self, other:String): TotalComparison =
+      ((BIG LEXICO[i <- 0#(|self| MIN |other|) ] self.get(i) CASE_INSENSITIVE_CMP other.get(i)) LEXICO (|self| CMP |other|))
+    
+    opr CMP(self, other:String): TotalComparison =
+      ((BIG LEXICO[i <- 0#(|self| MIN |other|) ] self.get(i) CMP other.get(i)) LEXICO (|self| CMP |other|))
+      
+    opr [i:ZZ32]: Char =
+        (** As a convenience, we permit LowerRange indexing to go 1 past the bounds
         of the String, returning the empty String, in order to permit some convenient
         String-trimming idioms. **)
-    opr [i:ZZ32]: Char =
         if 0 <= i < |self|
         then self.get(i)
@@ -3773 +3790 @@
 
 
-print(a:Any):() = print("" a)
-println(a:Any):() = println("" a)
+print(a:Any):() = print(a.toString)
+println(a:Any):() = println(a.toString)
 (* 0-argument versions handle passing of () to single-argument versions. *)
 print():() = print("")
@@ -3782 +3799 @@
 println(a: JavaString): () = 
         builtinPrimitive("com.sun.fortress.interpreter.glue.prim.StringPrim$Println")
-
 
 forDigit(x:ZZ32, radix:ZZ32): Maybe[\Char\] =