Changeset 3293

Timestamp:

2015-06-23T08:57:34-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
                                        )
-  (if (eq slot-names t) (setf slot-names '(dimension exponents)))
-  (dolist (slot-name slot-names)
-    (case slot-name
-      (dimension 
-       (cond (dimension-supplied-p 
-              (setf (slot-value self 'dimension) dimension))
-             (exponents-supplied-p
-              (setf (slot-value self 'dimension) (length exponents)))
-             (t 
-              (error "DIMENSION or EXPONENTS must be supplied."))))
-      (exponents  
-       (cond 
-         (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))))
-         ;; when all exponents are to be identical
-         (t
-          (let ((dim (slot-value self 'dimension)))
-            (setf (slot-value self 'exponents)
-                  (make-array (list dim) :initial-element (or exponent 0)
-                              :element-type 'exponent)))))))))
+(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."))
+    (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))