r5292: *** empty log message ***

[hyperobject.git] / mop.lisp

diff --git a/mop.lisp b/mop.lisp
index 0a6f6f1da3fdd7fcc09d63e11f5745aa7e012818..4ea60683b33184e8e93e2d66b54380639512baf1 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking\r
 ;;;; capability and sub-objects.\r
 ;;;;\r
-;;;; $Id: mop.lisp,v 1.78 2003/06/20 08:50:38 kevin Exp $\r
+;;;; $Id: mop.lisp,v 1.83 2003/07/11 18:02:41 kevin Exp $\r
 ;;;;\r
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg\r
 ;;;; *************************************************************************\r
@@ -56,6 +56,9 @@
    (direct-rules :type list :initform nil :initarg :direct-rules\r
                 :accessor direct-rules\r
                 :documentation "List of rules to fire on slot changes.")\r
+   (direct-views :type list :initform nil :initarg :direct-views\r
+                :accessor direct-views\r
+                :documentation "List of views")\r
    (class-id :type integer :initform nil\r
             :accessor class-id\r
             :documentation "Unique ID for the class")\r
@@ -101,7 +104,6 @@
   (print-unreadable-object (obj s :type t :identity t)\r
     (format s "~S" (name obj))))\r
 \r
-#+(or cmu scl sbcl)\r
 (defmethod validate-superclass ((class hyperobject-class) (superclass standard-class))\r
   t)\r
 \r
@@ -149,7 +151,7 @@
       (when (and ,required (null value))\r
        (error "hyperobject class slot ~A must have a value" name))\r
       (list name `',value))\r
-    #+(or allegro sbcl cmu scl)\r
+    #+(or allegro sbcl cmu scl openmcl)\r
     (declare (ignore slot-name required))\r
     )\r
 \r
@@ -225,28 +227,33 @@
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)\r
                                                      #+ho-normal-cesd name\r
                                                      dsds)\r
-  #+ho-normal-cesd (declare (ignore name))\r
-  (let* ((esd (call-next-method))\r
-        (dsd (car dsds))\r
+  (declare (ignore #+ho-normal-cesd name))\r
+  (let ((esd (call-next-method)))\r
+    (if (typep esd 'hyperobject-esd)\r
+       (compute-hyperobject-esd esd dsds)\r
+       esd)))\r
+\r
+(defun compute-hyperobject-esd (esd dsds)\r
+  (let* ((dsd (car dsds))\r
         (value-type (canonicalize-value-type (slot-value dsd 'value-type))))\r
     (multiple-value-bind (sql-type sql-length) \r
        (value-type-to-sql-type value-type)\r
-      (setf (slot-value esd 'sql-type) sql-type)\r
-      (setf (slot-value esd 'sql-length) sql-length))\r
+      (setf (esd-sql-type esd) sql-type)\r
+      (setf (esd-sql-length esd) sql-length))\r
     (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))\r
-    (setf (slot-value esd 'value-type) value-type)\r
-    (setf (slot-value esd 'user-name)\r
-      (aif (slot-value dsd 'user-name)\r
-          it\r
-          (string-downcase (symbol-name (slot-definition-name dsd)))))\r
-    (setf (slot-value esd 'sql-name)\r
-      (aif (slot-value dsd 'sql-name)\r
-          it\r
-          (lisp-name-to-sql-name (slot-definition-name dsd))))\r
-    (setf (slot-value esd 'sql-name)\r
-      (aif (slot-value dsd 'sql-name)\r
-          it\r
-          (lisp-name-to-sql-name (slot-definition-name dsd))))\r
+    (setf (esd-value-type esd) value-type)\r
+    (setf (esd-user-name esd)\r
+         (aif (dsd-user-name dsd)\r
+              it\r
+              (string-downcase (symbol-name (slot-definition-name dsd)))))\r
+    (setf (esd-sql-name esd)\r
+         (aif (dsd-sql-name dsd)\r
+              it\r
+              (lisp-name-to-sql-name (slot-definition-name dsd))))\r
+    (setf (esd-sql-name esd)\r
+         (aif (dsd-sql-name dsd)\r
+              it\r
+              (lisp-name-to-sql-name (slot-definition-name dsd))))\r
     (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters\r
                    description value-constraint indexed null-allowed\r
                    unique short-description void-text read-only-groups\r
@@ -390,7 +397,7 @@ SQL name"
                   ':function (compile nil method-lambda)\r
                   init-args-values)))))\r
 \r
-#+(or allegro scl)\r
+#+(or allegro scl openmcl)\r
 (progn\r
   ;; One entry for each class with lazy readers defined.  The value is a plist mapping\r
   ;; slot-name to a lazy reader, each of which is a list of a function and slot-names.\r
@@ -419,7 +426,7 @@ SQL name"
     (setf (getf (gethash (find-class class-name) *lazy-readers*) slot-name)\r
          nil))\r
   \r
-  ) ;; #+(or allegro scl)\r
+  ) ;; #+(or allegro sc openmcll)\r
 \r
 \r
 (defun finalize-subobjects (cl)\r
@@ -445,7 +452,7 @@ SQL name"
                  `(hyperobject::def-lazy-reader ,(name-class subobject)\r
                    ,(name-slot subobject) ,(lookup subobject)\r
                    ,@(lookup-keys subobject)))\r
-                #+(or sbcl cmu lispworks allegro scl)\r
+                #+(or sbcl cmu lispworks allegro scl openmcl)\r
                 (apply #'ensure-lazy-reader \r
                        (name-class subobject) (name-slot subobject)\r
                        (lookup subobject) (lookup-keys subobject)))\r
@@ -470,7 +477,8 @@ SQL name"
                                   (user-name cl))\r
                    2)))\r
 \r
-  (dolist (name '(user-name description version guid sql-name))\r
+  (dolist (name '(user-name description version guid sql-name\r
+                 direct-views direct-rules))\r
     (awhen (slot-value cl name)\r
           (setf (slot-value cl name)\r
                 (etypecase (slot-value cl name)\r