Changeset 10896

Timestamp:

09/13/05 14:40:59 (3 years ago)

Author:

rtoy

Message:

Convert extended LOOP constructs in pprint annotations to equivalent
(I hope) DO expressions.

Files:

• trunk/src/code/pprint.lisp (modified) (2 diffs)

trunk/src/code/pprint.lisp

@@ -1393 +1393 @@
            stream list))
 
+(defun pprint-declare (stream list &rest noise)
+  (declare (ignore noise))
+  (pprint-logical-block (stream list :prefix "(" :suffix ")")
+    ;; Output "declare"
+    (output-object (pprint-pop) stream)
+    (pprint-exit-if-list-exhausted)
+    (pprint-newline :miser stream)
+    (write-char #\space stream)
+    (pprint-indent :current 0 stream)
+    ;; Print out each spec.
+    (loop
+       (let ((spec (pprint-pop)))
+         ;; If the spec begins with TYPE, we indent it so that vars
+         ;; are lined up after the actual type.  Otherwise, we just
+         ;; make them all line up after the first symbol of the
+         ;; spec.
+         (pprint-logical-block (stream spec :prefix "(" :suffix ")")
+           (when (eq (car spec) 'type)
+             (output-object (pprint-pop) stream)
+             (pprint-exit-if-list-exhausted)
+             (pprint-newline :miser stream)
+             (write-char #\space stream))
+           (output-object (pprint-pop) stream)
+           (pprint-exit-if-list-exhausted)
+           (pprint-newline :miser stream)
+           (write-char #\space stream)
+           (pprint-indent :current 0 stream)
+           (loop
+              (output-object (pprint-pop) stream)
+              (pprint-exit-if-list-exhausted)
+              (write-char #\space stream)
+              (pprint-newline :fill stream))))
+       (pprint-exit-if-list-exhausted)
+       (write-char #\space stream)
+       (pprint-newline :linear stream))))
+
 (defun pprint-defun (stream list &rest noise)
   (declare (ignore noise))
@@ -1697 +1733 @@
     (throw pprint-block)
     (unwind-protect pprint-block)
+    (declare pprint-declare)
     
     ;; Macros.