X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=4ea60683b33184e8e93e2d66b54380639512baf1;hb=6ff5ef506bb52b4a98cb7a0b3726f5d3a9637944;hp=0a6f6f1da3fdd7fcc09d63e11f5745aa7e012818;hpb=247fa39146e69b658f5adf5145a3472487eab321;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 0a6f6f1..4ea6068 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.78 2003/06/20 08:50:38 kevin Exp $
+;;;; $Id: mop.lisp,v 1.83 2003/07/11 18:02:41 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -56,6 +56,9 @@
    (direct-rules :type list :initform nil :initarg :direct-rules
 		 :accessor direct-rules
 		 :documentation "List of rules to fire on slot changes.")
+   (direct-views :type list :initform nil :initarg :direct-views
+		 :accessor direct-views
+		 :documentation "List of views")
    (class-id :type integer :initform nil
 	     :accessor class-id
 	     :documentation "Unique ID for the class")
@@ -101,7 +104,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)
 
@@ -149,7 +151,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))
     )
 
@@ -225,28 +227,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
@@ -390,7 +397,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.
@@ -419,7 +426,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)
@@ -445,7 +452,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)))
@@ -470,7 +477,8 @@ SQL name"
 				   (user-name cl))
 		    2)))
 
-  (dolist (name '(user-name description version guid sql-name))
+  (dolist (name '(user-name description version guid sql-name
+		  direct-views direct-rules))
     (awhen (slot-value cl name)
 	   (setf (slot-value cl name)
 		 (etypecase (slot-value cl name)