Changeset 3289 for branches

Timestamp:

2015-06-23T08:39:32-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/monom.lisp (modified) (3 diffs)

branches/f4grobner/monom.lisp

@@ -56 +56 @@
    (exponents :initarg :exponents :accessor monom-exponents
               :documentation "The powers of the variables."))
+  ;; default-initargs are not needed, they are handled by SHARED-INITIALIZE
+  ;;(:default-initargs :dimension 'foo :exponents 'bar :exponent 'baz)
   (:documentation 
    "Implements a monomial, i.e. a product of powers
@@ -70 +72 @@
 (defmethod shared-initialize :after ((self monom) slot-names
                                      &key 
-                                       dimension
-                                       exponents
-                                       exponent
+                                       (dimension 0 dimension-supplied-p)
+                                       (exponents nil exponents-supplied-p)
+                                       (exponent  nil exponent-supplied-p)
                                      &allow-other-keys
                                        )
@@ -79 +81 @@
     (case slot-name
       (dimension 
-       (cond (dimension 
+       (cond (dimension-supplied-p 
               (setf (slot-value self 'dimension) dimension))
-             (exponents
+             (exponents-supplied-p
               (setf (slot-value self 'dimension) (length exponents)))
              (t 
-              (error "DIMENSION or EXPONENTS must not be NIL"))))
+              (error "DIMENSION or EXPONENTS must be supplied."))))
       (exponents  
        (cond 
-         ;; when exponents are supplied
-         (exponents
+         (exponents-supplied-p
           (let ((dim (length exponents)))
-            (when (and dimension (/= dimension dim))
+            (when (and dimension-supplied-p (/= dimension dim))
               (error "EXPONENTS must have length DIMENSION")) 
             (setf (slot-value self 'dimension) dim