Changeset 4405 for branches

Timestamp:

2016-06-07T19:34:32-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/infix-printer.lisp (modified) (1 diff)

branches/f4grobner/infix-printer.lisp

@@ -81 +81 @@
   (cond 
     ;; Handle *print-level*
-   ((and (numberp *print-level*)
-         (> print-level *print-level*))
-    (format stream "#"))
+    ((and (numberp *print-level*)
+          (> print-level *print-level*))
+     (format stream "#"))
 
-   ;; Null expression is an error
-   ((null expr)
-    (error "Null expression."))
+    ;; Null expression is an error
+    ((null expr)
+     (error "Null expression."))
 
-   ;; Atoms are printed using ~A format directive
-   ((atom expr)
-    (format stream "~a" expr))
+    ;; Atoms are printed using ~A format directive
+    ((atom expr)
+     (format stream "~a" expr))
    
-   ;; Check if the operator of this expression has lower precedence
-   ;; than the surrounding operator, and parenthesize if necessary
-   ((and op 
-         (operator-lessp (car expr) op))
-    (format stream "(")
-    (infix-print expr stream nil (1+ print-level))
-    (format stream ")"))
+    ;; Check if the operator of this expression has lower precedence
+    ;; than the surrounding operator, and parenthesize if necessary
+    ((and op 
+          (operator-lessp (car expr) op))
+     (format stream "(")
+     (infix-print expr stream nil (1+ print-level))
+     (format stream ")"))
 
-   ;; Unary minus needs special handling
-   ((and (eq (car expr) '-) (endp (cddr expr)))
-    (format stream "-")
-    ;; Print the second element in product context
-    (infix-print (cadr expr) stream '* (1+ print-level)))
+    ;; Unary minus needs special handling
+    ((and (eq (car expr) '-) (endp (cddr expr)))
+     (format stream "-")
+     ;; Print the second element in product context
+     (infix-print (cadr expr) stream '* (1+ print-level)))
 
-   ;; All other operators
-   (t 
-    (case (car expr)
+    ;; All other operators
+    (t 
+     (case (car expr)
 
-      ;; Arithmetic operators
-      ((+ - * /)
-       (infix-print-separated-list
-        (cdr expr)                      
-        (car expr)                      
-        stream
-        (car expr)                      
-        (1+ print-level)                
-        (cond ((eq (car expr) '+) '-)
-              ((eq (car expr) '-) '-)
-              (t nil))))
+       ;; Arithmetic operators
+       ((+ - * /)
+        (infix-print-separated-list
+         (cdr expr)                     
+         (car expr)                     
+         stream
+         (car expr)                     
+         (1+ print-level)               
+         (cond ((eq (car expr) '+) '-)
+               ((eq (car expr) '-) '-)
+               (t nil))))
 
-      ;; Exponentials
-      (expt
-       (unless (= (length (cdr expr)) 2)
-         (error "expt must take 2 arguments."))
-       (infix-print-separated-list
-        (cdr expr)
-        '^
-        stream
-        '^
-        (1+ print-level)))
+       ;; Exponentials
+       (expt
+        (unless (= (length (cdr expr)) 2)
+          (error "expt must take 2 arguments."))
+        (infix-print-separated-list
+         (cdr expr)
+         '^
+         stream
+         '^
+         (1+ print-level)))
 
-      ;; Assuming function call
-      (otherwise                
-       (cond
+       ;; Assuming function call
+       (otherwise               
+        (cond
 
-         ;; Handle array references
-         ((eq (car expr) 'aref)
-          ;; Special syntax for subscripted variables
-          ;; consistent with the infix package.
-          (format stream "~a[" (cadr expr))
-          (infix-print-separated-list (cddr expr) '\, stream '\, (1+ print-level))
-          (format stream "]"))
+          ;; Handle array references
+          ((eq (car expr) 'aref)
+           ;; Special syntax for subscripted variables
+           ;; consistent with the infix package.
+           (format stream "~a[" (cadr expr))
+           (infix-print-separated-list (cddr expr) '\, stream '\, (1+ print-level))
+           (format stream "]"))
 
-         ;; Handle lists
-         ((and (symbolp (car expr))
-               (string= (symbol-name (car expr)) "["))
-          (format stream "[")
-          (infix-print-separated-list (cdr expr) '\, stream '\, (1+ print-level))
-          (format stream "]"))
+          ;; Handle lists
+          ((and (symbolp (car expr))
+                (string= (symbol-name (car expr)) "["))
+           (format stream "[")
+           (infix-print-separated-list (cdr expr) '\, stream '\, (1+ print-level))
+           (format stream "]"))
 
-         ;; Handle generic function call syntax
-         (t
-          (format stream "~a(" (car expr))
-          (infix-print-arg-list (cdr expr) stream (1+ print-level))
-          (format stream ")")))))))
+          ;; Handle generic function call syntax
+          (t
+           (format stream "~a(" (car expr))
+           (infix-print-arg-list (cdr expr) stream (1+ print-level))
+           (format stream ")")))))))
   (values))