X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=b339e802a53d3364af2bea92c1998b4ed437261b;hb=aacd771e49387a91a86fb14bc96c4c13d9996085;hp=1bd40d7ea3f7645a4eedfee16eddce0f756c6dc5;hpb=dc9f3ec2fc1537d7b3aa0a0444ae50af93a68541;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 1bd40d7..b339e80 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.79 2003/06/24 08:32:32 kevin Exp $
+;;;; $Id: mop.lisp,v 1.81 2003/07/08 04:00:56 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -101,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)
 
@@ -225,10 +224,15 @@
 (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))
-	 (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
+  (declare (ignore cl #+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)
@@ -236,17 +240,17 @@
     (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)))))
+	  (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))))
+	  (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))))
+	  (aif (slot-value dsd 'sql-name)
+	       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