Merge branches 'mdw/doc-reorg' and 'mdw/parser-fixes'

[sod] / src / class-make-impl.lisp

diff --git a/src/class-make-impl.lisp b/src/class-make-impl.lisp
index 78f8fed0a892d87f9da5f57bec95758e445a66f7..7495c0182e631b4b02eb49fb0a9ab8995c2e1101 100644 (file)
--- a/src/class-make-impl.lisp
+++ b/src/class-make-impl.lisp
@@ -146,9 +146,10 @@ (defmethod shared-initialize :after
 
 (defmethod make-sod-user-initarg
     ((class sod-class) name type pset &optional default location)
 
 (defmethod make-sod-user-initarg
     ((class sod-class) name type pset &optional default location)

-  (declare (ignore pset))

   (with-slots (initargs) class
   (with-slots (initargs) class

-    (push (make-instance 'sod-user-initarg :location (file-location location)
+    (push (make-instance (get-property pset :initarg-class :symbol
+                                      'sod-user-initarg)
+                        :location (file-location location)

                         :class class :name name :type type :default default)
          initargs)))
 
                         :class class :name name :type type :default default)
          initargs)))
 


@@ -159,10 +160,10 @@ (defmethod make-sod-slot-initarg
 
 (defmethod make-sod-slot-initarg-using-slot
     ((class sod-class) name (slot sod-slot) pset &optional location)
 
 (defmethod make-sod-slot-initarg-using-slot
     ((class sod-class) name (slot sod-slot) pset &optional location)

-  (declare (ignore pset))

   (with-slots (initargs) class
     (with-slots ((type %type)) slot
   (with-slots (initargs) class
     (with-slots ((type %type)) slot

-      (push (make-instance 'sod-slot-initarg
+      (push (make-instance (get-property pset :initarg-class :symbol
+                                        'sod-slot-initarg)

                           :location (file-location location)
                           :class class :name name :type type :slot slot)
            initargs))))
                           :location (file-location location)
                           :class class :name name :type type :slot slot)
            initargs))))