r10075: * sql/metaclass.lisp: Rework CLISP MOP handling

[clsql.git] / sql / metaclasses.lisp

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index a086288198f03161cfe8ca33cfd0f2a38f1e0054..ae511ee71c9f6c953952f065bcb3b4dfc9cac5e3 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -165,13 +165,11 @@
                (nth (1+ pos) list)))))
     (mapcar #'extract keys)))
 
-(defvar *impl-type-attrib-name* #-clisp 'type #+clisp 'clos::$type)
-
 (defun describe-db-layout (class)
   (flet ((not-db-col (col)
-           (not (member (nth 2 col)  '(nil :base :key))))
+           (not (member (nth 2 col) '(nil :base :key))))
          (frob-slot (slot)
-           (let ((type (slot-value slot *impl-type-attrib-name*)))
+           (let ((type (slot-definition-type slot)))
              (if (eq type t)
                  (setq type nil))
              (list (slot-value slot 'name)
@@ -432,6 +430,8 @@ which does type checking before storing a value in a slot."
       (car list)
       list))
 
+(defvar *impl-type-attrib-name* #-clisp 'type #+clisp 'clos::$type)
+
 (defmethod compute-effective-slot-definition ((class standard-db-class)
                                              #+kmr-normal-cesd slot-name
                                              direct-slots)
@@ -444,9 +444,10 @@ which does type checking before storing a value in a slot."
               (null (specified-type dsd)))
       (setf (specified-type dsd)
        (slot-definition-type dsd))
-      (setf (slot-value dsd *impl-type-attrib-name*)
-       (compute-lisp-type-from-slot-specification 
-        dsd (slot-definition-type dsd))))
+      (setf #-clisp (slot-value dsd 'type)
+           #+clisp (slot-definition-type dsd)
+           (compute-lisp-type-from-slot-specification 
+            dsd (slot-definition-type dsd))))
       
     (let ((esd (call-next-method)))
       (typecase dsd