Changeset 2769 for branches

Timestamp:

2015-06-20T19:44:06-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/polynomial.lisp (modified) (1 diff)

branches/f4grobner/polynomial.lisp

@@ -153 +153 @@
   `(defmethod ,add/subtract-method-name ((self poly) (other poly))
      ,@(when doc-string-supplied-p `(,doc-string))
-     (with-slots ((termlist1 termlist) (order1 order))
-         self
-       (with-slots ((termlist2 termlist) (order2 order))
-           other
-         ;; Ensure orders are compatible
-         (unless (eq order1 order2)
-           (setf termlist2 (sort termlist2 order1)
-                 order2 order1))
-         (setf termlist1 (fast-add/subtract 
-                          termlist1 termlist2 #'order1
-                          #',add/subtract-method-name
-                          ,(when uminus-method-name `(function ,uminus-method-name))))))
+     ;; Ensure orders are compatible
+     (unless (eq (poly-term-order order1) (poly-term-order order2))
+       (setf (poly-termlist other) (sort (poly-termlist other) (poly-term-order self))
+             (poly-term-order other (poly-term-order self))))
+     (setf (poly-termlist self) 
+           (fast-add/subtract 
+            (poly-termlist self) 
+            (poly-termlist other)
+            (poly-term-order self)
+            #',add/subtract-method-name
+            ,(when uminus-method-name `(function ,uminus-method-name))))
      self))