X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=48f7cc92902e007f7f3bbc669720d7c7eff1fa63;hb=6b46bb865b83dc69fe9a68240fd8b072861b8973;hp=3c9ac2e268dc6069c01070753c70f382ba13d05e;hpb=384290f4271aa9acef79d39ba86deb49ae828cbf;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 3c9ac2e..48f7cc9 100644
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.77 2003/06/20 08:35:21 kevin Exp $
+;;;; $Id: mop.lisp,v 1.82 2003/07/08 07:12:57 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -37,9 +37,6 @@
    (version :initarg :version :initform nil
 	    :accessor version
 	    :documentation "Version number for class")
-   (direct-rules :initarg :direct-rules :initform nil
-		 :accessor dirst-rules
-		 :documentation "Rules to fire on slot changes")
    (closures :initarg :closures :initform nil
 	     :accessor closures
 	     :documentation "Closures to call on slot chnages")
@@ -104,7 +101,6 @@
   (print-unreadable-object (obj s :type t :identity t)
     (format s "~S" (name obj))))
 
-#+(or cmu scl sbcl)
 (defmethod validate-superclass ((class hyperobject-class) (superclass standard-class))
   t)
 
@@ -152,7 +148,7 @@
       (when (and ,required (null value))
 	(error "hyperobject class slot ~A must have a value" name))
       (list name `',value))
-    #+(or allegro sbcl cmu scl)
+    #+(or allegro sbcl cmu scl openmcl)
     (declare (ignore slot-name required))
     )
 
@@ -228,28 +224,33 @@
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
 						      #+ho-normal-cesd name
 						      dsds)
-  #+ho-normal-cesd (declare (ignore name))
-  (let* ((esd (call-next-method))
-	 (dsd (car dsds))
+  (declare (ignore #+ho-normal-cesd name))
+  (let ((esd (call-next-method)))
+    (if (typep esd 'hyperobject-esd)
+	(compute-hyperobject-esd esd dsds)
+	esd)))
+
+(defun compute-hyperobject-esd (esd dsds)
+  (let* ((dsd (car dsds))
 	 (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
     (multiple-value-bind (sql-type sql-length) 
 	(value-type-to-sql-type value-type)
-      (setf (slot-value esd 'sql-type) sql-type)
-      (setf (slot-value esd 'sql-length) sql-length))
+      (setf (esd-sql-type esd) sql-type)
+      (setf (esd-sql-length esd) sql-length))
     (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))
-    (setf (slot-value esd 'value-type) value-type)
-    (setf (slot-value esd 'user-name)
-      (aif (slot-value dsd 'user-name)
-	   it
-	   (string-downcase (symbol-name (slot-definition-name dsd)))))
-    (setf (slot-value esd 'sql-name)
-      (aif (slot-value dsd 'sql-name)
-	   it
-	   (lisp-name-to-sql-name (slot-definition-name dsd))))
-    (setf (slot-value esd 'sql-name)
-      (aif (slot-value dsd 'sql-name)
-	   it
-	   (lisp-name-to-sql-name (slot-definition-name dsd))))
+    (setf (esd-value-type esd) value-type)
+    (setf (esd-user-name esd)
+	  (aif (dsd-user-name dsd)
+	       it
+	       (string-downcase (symbol-name (slot-definition-name dsd)))))
+    (setf (esd-sql-name esd)
+	  (aif (dsd-sql-name dsd)
+	       it
+	       (lisp-name-to-sql-name (slot-definition-name dsd))))
+    (setf (esd-sql-name esd)
+	  (aif (dsd-sql-name dsd)
+	       it
+	       (lisp-name-to-sql-name (slot-definition-name dsd))))
     (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters
 		    description value-constraint indexed null-allowed
 		    unique short-description void-text read-only-groups
@@ -393,7 +394,7 @@ SQL name"
 		   ':function (compile nil method-lambda)
 		   init-args-values)))))
 
-#+(or allegro scl)
+#+(or allegro scl openmcl)
 (progn
   ;; One entry for each class with lazy readers defined.  The value is a plist mapping
   ;; slot-name to a lazy reader, each of which is a list of a function and slot-names.
@@ -422,7 +423,7 @@ SQL name"
     (setf (getf (gethash (find-class class-name) *lazy-readers*) slot-name)
 	  nil))
   
-  ) ;; #+(or allegro scl)
+  ) ;; #+(or allegro sc openmcll)
 
 
 (defun finalize-subobjects (cl)
@@ -448,7 +449,7 @@ SQL name"
 		  `(hyperobject::def-lazy-reader ,(name-class subobject)
 		    ,(name-slot subobject) ,(lookup subobject)
 		    ,@(lookup-keys subobject)))
-		 #+(or sbcl cmu lispworks allegro scl)
+		 #+(or sbcl cmu lispworks allegro scl openmcl)
 		 (apply #'ensure-lazy-reader 
 			(name-class subobject) (name-slot subobject)
 			(lookup subobject) (lookup-keys subobject)))