Changeset 18 in CGBLisp

Timestamp:

Jan 27, 2009, 1:19:13 AM (15 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• trunk/src/parse.lisp (modified) (1 diff)

trunk/src/parse.lisp

@@ -247 +247 @@
     ((symbolp expr)
      (nth (position expr vars) basis)) 
-    ((eql (car expr ) 'expt)
-     ($poly-expt (poly-eval-1 (cadr expr) vars order ring)
-                 (caddr expr)
-                 n order ring))
-    (t
-     (let ((r (mapcar
-               #'(lambda (e) (poly-eval-1 e vars order ring))
-               (cdr expr))))
-       (ecase (car expr)
-         (+ (reduce #'(lambda (p q) ($poly+ p q n order ring)) r))
-         (-
-          (if (endp (cdr r))
-              ($minus-poly (car r) n ring)
-              ($poly- (car r)
-                      (reduce #'(lambda (p q) ($poly+ p q n order ring)) (cdr r))
-                      n
-                      order ring)))
-         (*
-          (reduce #'(lambda (p q) ($poly* p q n order ring)) r))
-         (/
-          ($poly/ (car r) (cadr r) ring)))))))
+    ((consp expr)
+     (case (car expr)
+       (expt
+        (if (= (length expr) 3)
+            ($poly-expt (poly-eval-1 (cadr expr) vars order ring)
+                        (caddr expr)
+                        n order ring)
+            (error "Too many arguments to EXPT")))
+       (/
+        (if (and (= (length expr) 3)
+                 (numberp (caddr expr)))
+            ($poly/ (cadr expr) (caddr expr) ring)
+            (error "The second argument to / must be a number")))
+       (otherwise
+        (let ((r (mapcar
+                  #'(lambda (e) (poly-eval-1 e vars order ring))
+                  (cdr expr))))
+          (ecase (car expr)
+            (+ (reduce #'(lambda (p q) ($poly+ p q n order ring)) r))
+            (-
+             (if (endp (cdr r))
+                 ($minus-poly (car r) n ring)
+                 ($poly- (car r)
+                         (reduce #'(lambda (p q) ($poly+ p q n order ring)) (cdr r))
+                         n
+                         order ring)))
+            (*
+             (reduce #'(lambda (p q) ($poly* p q n order ring)) r))
+            )))))))