Changeset 12017

Timestamp:

06/14/09 15:32:51 (14 years ago)

Author:

ehuelsmann

Message:

Performance improvement for non-recursive #= and ##:

In the non-recursive case it's not required to
recurse into each of the branches of the structure.

File:

• trunk/abcl/src/org/armedbear/lisp/boot.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/boot.lisp

@@ -252 +252 @@
            :format-arguments (list label)))
   (let* ((tag (gensym))
-         (*sharp-sharp-alist* (acons label tag *sharp-sharp-alist*))
+         (*sharp-sharp-alist* (cons (list label tag nil) *sharp-sharp-alist*))
          (obj (read stream t nil t)))
     (when (eq obj tag)
@@ -260 +260 @@
              :format-arguments (list label)))
     (push (list label tag obj) *sharp-equal-alist*)
-    (let ((*sharp-equal-circle-table* (make-hash-table :test 'eq :size 20)))
-      (circle-subst *sharp-equal-alist* obj))))
+    (when (third (car *sharp-sharp-alist*)) ;; set to T on circularity
+      (let ((*sharp-equal-circle-table* (make-hash-table :test 'eq :size 20)))
+        (circle-subst *sharp-equal-alist* obj)))
+    obj))
 
 (defun sharp-sharp (stream ignore label)
@@ -277 +279 @@
                    :format-control "Object is not labelled #~S#"
                    :format-arguments (list label)))
-          (cdr pair)))))
+          (setf (third pair) t)
+          (second pair)))))
 
 (set-dispatch-macro-character #\# #\= #'sharp-equal +standard-readtable+)