Changeset 3298

Timestamp:

2015-06-23T09:11:31-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -82 +82 @@
                                        &allow-other-keys
                                        )
-    (when (and dimension-supplied-p (slot-accessible-p 'dimension))
-      (setf (slot-value self 'dimension) dimension))
-
-    (when (and exponents-supplied-p (slot-accessible-p 'exponents))
-      (let ((dim (length exponents)))
-        (when (and dimension-supplied-p (/= dimension dim))
-          (error "EXPONENTS must have length DIMENSION")) 
-        (setf (slot-value self 'dimension) dim
-              (slot-value self 'exponents) (make-array dim :initial-contents exponents))
-        (setf (slot-value self 'dimension) (length exponents))))
-
-    ;; when all exponents are to be identical
-    (when (and exponent-supplied-p (slot-accessible-p 'exponents))
-      (unless (slot-boundp self 'dimension)
-        (error "Slot DIMENSION is unbound, but must be known if EXPONENT is supplied."))
-      (let ((dim (slot-value self 'dimension)))
-        (setf (slot-value self 'exponents)
-              (make-array (list dim) :initial-element exponent
-                          :element-type 'exponent))))))
+  (when dimension-supplied-p 
+    (setf (slot-value self 'dimension) dimension))
+
+  (when exponents-supplied-p
+    (let ((dim (length exponents)))
+      (when (and dimension-supplied-p (/= dimension dim))
+        (error "EXPONENTS must have length DIMENSION")) 
+      (setf (slot-value self 'dimension) dim
+            (slot-value self 'exponents) (make-array dim :initial-contents exponents))
+      (setf (slot-value self 'dimension) (length exponents))))
+
+  ;; when all exponents are to be identical
+  (when (and exponent-supplied-p (slot-accessible-p 'exponents))
+    (unless (slot-boundp self 'dimension)
+      (error "Slot DIMENSION is unbound, but must be known if EXPONENT is supplied."))
+    (let ((dim (slot-value self 'dimension)))
+      (setf (slot-value self 'exponents)
+            (make-array (list dim) :initial-element exponent
+                        :element-type 'exponent)))))
 
 (defmethod r-equalp ((m1 monom) (m2 monom))