Changeset 36 in CGBLisp

Timestamp:

Feb 1, 2009, 11:01:15 AM (15 years ago)

Author:

Marek Rychlik

Message:

Changed order of functions.

File:

• trunk/src/infix-printer.lisp (modified) (2 diffs)

trunk/src/infix-printer.lisp

@@ -15 +15 @@
 
 (in-package "INFIX-PRINTER")
+
+
+
+(defun infix-print-separated-list (lst sep stream op print-level
+                                   &optional (alt-op nil) (alt-sep alt-op)
+                                   &aux
+                                   (beg t)
+                                   (count 0)
+                                   true-sep)
+  (cond
+   ((endp lst) nil)
+   ((and (numberp *print-level*) (> print-level *print-level*))
+    (format stream "#"))
+   (t
+    (dolist (arg lst)
+      (setf true-sep sep)
+      (incf count)
+      (when (and alt-op (> count 1) (consp arg) (eq alt-op (car arg)))
+          (setf arg (cadr arg)
+                true-sep alt-sep))
+      (if beg
+          (setf beg nil)
+        (format stream "~a" true-sep))
+      (when (and (numberp *print-length*) (> count *print-length*))
+        (format stream "..." true-sep)
+        (return-from infix-print-separated-list))
+      (infix-print arg stream op print-level)))))
+
 
 (defun infix-print (expr &optional (stream t) (op nil) (print-level 0))
@@ -69 +97 @@
          (infix-print-separated-list (cdr expr) '\, stream '\, (1+ print-level))
          (format stream ")"))))))))
-
-(defun infix-print-separated-list (lst sep stream op print-level
-                                   &optional (alt-op nil) (alt-sep alt-op)
-                                   &aux
-                                   (beg t)
-                                   (count 0)
-                                   true-sep)
-  (cond
-   ((endp lst) nil)
-   ((and (numberp *print-level*) (> print-level *print-level*))
-    (format stream "#"))
-   (t
-    (dolist (arg lst)
-      (setf true-sep sep)
-      (incf count)
-      (when (and alt-op (> count 1) (consp arg) (eq alt-op (car arg)))
-          (setf arg (cadr arg)
-                true-sep alt-sep))
-      (if beg
-          (setf beg nil)
-        (format stream "~a" true-sep))
-      (when (and (numberp *print-length*) (> count *print-length*))
-        (format stream "..." true-sep)
-        (return-from infix-print-separated-list))
-      (infix-print arg stream op print-level)))))
-
-