Changeset 1789 for branches/f4grobner/mx-grobner.lisp

Timestamp:

2015-06-15T11:34:24-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/mx-grobner.lisp (modified) (1 diff)

branches/f4grobner/mx-grobner.lisp

@@ -409 +409 @@
      (poly->maxima
       ,value-type
-      (symbol-macrolet ((,ring-and-order-var ,(find-ring-and-order-by-name))
-                        (,ring-var (ro-ring ring-and-order)))
-        (let ,(let ((args nil))
-                   (dolist (p polynomials args)
-                     (setf args (cons `(,p (maxima->poly ,p ,vars ,ring-and-order-var)) args)))
-                   (dolist (p poly-lists args)
-                     (setf args (cons `(,p (maxima->poly-list ,p ,vars ,ring-and-order-var)) args)))
-                   (dolist (p poly-list-lists args)
-                     (setf args (cons `(,p (maxima->poly-list-list ,p ,vars ,ring-and-order-var)) args))))
-          . ,body))
+      (let ((,ring-and-order-var ,(find-ring-and-order-by-name)))
+        ;; Define a shorthand to RING
+        (symbol-macrolet (,ring-var (ro-ring ring-and-order))
+          (let ,(let ((args nil))
+                     (dolist (p polynomials args)
+                       (setf args (cons `(,p (maxima->poly ,p ,vars ,ring-and-order-var)) args)))
+                     (dolist (p poly-lists args)
+                       (setf args (cons `(,p (maxima->poly-list ,p ,vars ,ring-and-order-var)) args)))
+                     (dolist (p poly-list-lists args)
+                       (setf args (cons `(,p (maxima->poly-list-list ,p ,vars ,ring-and-order-var)) args))))
+            . ,body)))
       ,(if new-vars-supplied-p
            `(append ,vars ,new-vars)