Changeset 3295 for branches

Timestamp:

2015-06-23T08:59:45-07:00 (9 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
                                        )
-(flet ((slot-accessible-p (slot-name))
-       (or (eq slot-names t) (member 'dimension slot-names)))
-
-  (when (and dimension-supplied-p (slot-accessible-p 'dimension))
+  (flet ((slot-accessible-p (slot-name))
+         (or (eq slot-names t) (member 'dimension slot-names)))
+    (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 (or exponent 0)
-                        :element-type 'exponent))))))
+    (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 (or exponent 0)
+                          :element-type 'exponent))))))
 
 (defmethod r-equalp ((m1 monom) (m2 monom))