Changeset 4434 for branches/f4grobner/infix-printer.lisp

Timestamp:

2016-06-10T09:50:24-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

 

File:

• branches/f4grobner/infix-printer.lisp (modified) (4 diffs)

branches/f4grobner/infix-printer.lisp

@@ -44 +44 @@
 (defun inverse-op (op)
   (ecase op
+    (+ '-)
     (- '+)
+    (* '/)
     (/ '*)))
 
@@ -53 +55 @@
                                      (beg t)
                                      (count 0)
-                                     true-sep)
+                                     true-sep
+                                     more-args)
   "Print a list LST using SEP as separator, to stream STREAM. Every
 argument is printed usin OP as main operator. PRINT-LEVEL is used to
@@ -87 +90 @@
                  (> count 1)
                  (consp arg)
-                 (endp (cddr arg))
                  (eq alt-op (car arg)))
         (psetf arg (cadr arg)
-               true-sep (if (eq op alt-op) (inverse-op op) alt-op)))
-        
+               more-args (cddr arg))
+        (cond ((endp more-args)
+               (setf true-sep (if (eq op alt-op) (inverse-op op) alt-op)))))
+
+
       ;; Unless at the beginning, print the separator
       (cond
@@ -106 +111 @@
       (infix-print-to-stream arg stream op print-level)
 
+      ;; Print remaining arguments
+      (unless (endp more-args)
+        (let ((x-op (inverse-op op)))
+          (format stream "~a" x-op)
+          (infix-print-separated-list more-args x-op stream sep print-level x-op)))
       )))
   (values))