Changeset 1747 for branches

Timestamp:

2015-06-15T08:46:09-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/mx-grobner.lisp (modified) (2 diffs)

branches/f4grobner/mx-grobner.lisp

@@ -370 +370 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defmacro with-ring-and-order (((maxima-vars &optional (maxima-new-vars nil new-vars-supplied-p))
+(defmacro with-ring-and-order (((ring-and-order maxima-vars &optional (maxima-new-vars nil new-vars-supplied-p))
                                 &key (polynomials nil)
                                 (poly-lists nil)
@@ -385 +385 @@
      (poly->maxima
       ,value-type
-      (let ((*ring-and-order* ,(find-ring-and-order-by-name)))
+      (let ((,ring-and-order ,(find-ring-and-order-by-name)))
         (let ,(let ((args nil))
                    (dolist (p polynomials args)
-                     (setf args (cons `(,p (maxima->poly ,p ,vars *ring-and-order*)) args)))
+                     (setf args (cons `(,p (maxima->poly ,p ,vars ,ring-and-order)) args)))
                    (dolist (p poly-lists args)
-                     (setf args (cons `(,p (maxima->poly-list ,p ,vars *ring-and-order*)) args)))
+                     (setf args (cons `(,p (maxima->poly-list ,p ,vars ,ring-and-order)) args)))
                    (dolist (p poly-list-lists args)
-                     (setf args (cons `(,p (maxima->poly-list-list ,p ,vars *ring-and-order*)) args))))
+                     (setf args (cons `(,p (maxima->poly-list-list ,p ,vars ,ring-and-order)) args))))
           . ,body))
       ,(if new-vars-supplied-p