[elephant-cvs] CVS elephant/src/elephant

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/elephant
In directory clnet:/tmp/cvs-serv24934/src/elephant

Modified Files:
	collections.lisp 
Log Message:
Fixing collection comparison bugs

--- /project/elephant/cvsroot/elephant/src/elephant/collections.lisp	2007/07/10 21:03:23	1.33
+++ /project/elephant/cvsroot/elephant/src/elephant/collections.lisp	2007/10/19 16:06:01	1.34
@@ -400,13 +400,13 @@
 	(typecase a
 	  (number (<= a b))
 	  (persistent (<= (oid a) (oid b)))
-	  (string (string<= a b))
-	  (symbol (string<= (symbol-name a) (symbol-name b)))
-	  (pathname (string<= (namestring a) (namestring b)))
+	  (string (string-not-greaterp a b))
+	  (symbol (string-not-greaterp (symbol-name a) (symbol-name b)))
+	  (pathname (string-not-greaterp (namestring a) (namestring b)))
 	  (t nil)))))
 
 (defun lisp-compare-equal (a b)
-  (equal a b))
+  (equalp a b))
 
 (defgeneric map-btree (fn btree &rest args &key start end value from-end collect &allow-other-keys)
   (:documentation   "Map btree maps over a btree from the value start to the value of end.
@@ -507,7 +507,7 @@
 		     (if from-end 
 			 (cursor-current cur)
 			 (cursor-pnext-nodup cur)))
-		   (map-values () 
+		   (map-values ()
 		     ;; Handle the next key value
 		     (multiple-value-bind (exists? skey val pkey)
 			 (value-increment)