Changeset 142

Timestamp:

Dec 19, 2003, 3:34:26 PM (21 years ago)

Author:

Gary Byers

Message:

Keep count of splay-tree nodes; PRINT-OBJECT methods.

File:

• trunk/ccl/library/splay-tree.lisp (modified) (3 diffs)

trunk/ccl/library/splay-tree.lisp

@@ -31 +31 @@
   )
 
+(defmethod print-object ((node tree-node) stream)
+  (print-unreadable-object (node stream :type t :identity t)
+    (let* ((*print-circle* t))
+      (format stream "~s -> ~s" (tree-node-key node) (tree-node-value node)))))
+
 
 (defun tree-node-is-leaf (n)
@@ -65 +70 @@
   equal                                 ; true if x = y
   less                                  ; true if x < y
+  (count 0)
   )
+
+(defmethod print-object ((tree splay-tree) stream)
+  (print-unreadable-object (tree stream :type t :identity t)
+    (format stream "count = ~d, root = ~s"
+            (splay-tree-count tree)
+            (splay-tree-root tree))))
+            
 
 
@@ -97 +110 @@
         (if (funcall less key (tree-node-key current))
           (setq current (tree-node-left current))
-          (setq current (tree-node-right current)))))))
+          (setq current (tree-node-right current))))))
+  (incf (splay-tree-count tree)))