X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=b34541c11d7982647d1638cda566bd52fb438b38;hb=7f6cbd20ca01e6f29b4fa7d68a0908864e400320;hp=f10dd7388a9ef6b989412a2656a3b32432a7f7be;hpb=6c6ef7e865aba5106164df13ceefb4e4454c54cb;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index f10dd73..b34541c 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.44 2003/04/12 05:16:54 kevin Exp $
+;;;; $Id: mop.lisp,v 1.69 2003/05/06 22:19:09 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -72,7 +72,7 @@
 (defclass subobject ()
   ((name-class :type symbol :initform nil :initarg :name-class :reader name-class)
    (name-slot :type symbol :initform nil :initarg :name-slot :reader name-slot)
-   (lookup :type symbol :initform nil :initarg :lookup :reader lookup)
+   (lookup :type (or function symbol) :initform nil :initarg :lookup :reader lookup)
    (lookup-keys :type list :initform nil :initarg :lookup-keys
 		:reader lookup-keys))
   (:documentation "Contains subobject information"))
@@ -84,7 +84,11 @@
 
 (defclass hyperlink ()
   ((name :type symbol :initform nil :initarg :name :reader name)
-   (lookup :type function :initform nil :initarg :lookup :reader lookup)
+   (lookup
+    ;; The type specifier seems to break sbcl
+    :type (or function symbol)
+    ;;    :type t
+    :initform nil :initarg :lookup :reader lookup)
    (link-parameters :type list :initform nil :initarg :link-parameters
 		    :reader link-parameters)))
 
@@ -100,14 +104,36 @@
   (init-hyperobject-class cl)
   )
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (>= (length (generic-function-lambda-list
+		     (ensure-generic-function
+		      'compute-effective-slot-definition)))
+	    3)
+    (pushnew :ho-normal-cesd cl:*features*))
+  
+    (when (>= (length (generic-function-lambda-list
+		       (ensure-generic-function
+			'direct-slot-definition-class)))
+	    3)
+      (pushnew :ho-normal-dsdc cl:*features*))
+    
+    (when (>= (length (generic-function-lambda-list
+		       (ensure-generic-function
+			'effective-slot-definition-class)))
+	      3)
+      (pushnew :ho-normal-esdc cl:*features*)))
+
 ;; Slot definitions
-(defmethod direct-slot-definition-class ((cl hyperobject-class) 
-					 #+allegro &rest
-					 iargs)
+(defmethod direct-slot-definition-class ((cl hyperobject-class)
+					 #+ho-normal-dsdc &rest iargs)
   (find-class 'hyperobject-dsd))
 
+(defmethod effective-slot-definition-class ((cl hyperobject-class) 
+					    #+ho-normal-esdc &rest iargs)
+  (find-class 'hyperobject-esd))
+
 
-					; Slot definitions
+;;; Slot definitions
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defmacro process-class-option (slot-name &optional required)
@@ -117,7 +143,7 @@
 					     value)
       (when (and ,required (null value))
 	(error "hyperobject class slot ~A must have a value" name))
-      (list name value))
+      (list name `',value))
     #+(or allegro sbcl cmu scl)
     (declare (ignore slot-name required))
     )
@@ -129,7 +155,7 @@
 					    value
 					    already-processed-options
 					    slot)
-      (list* option value already-processed-options))
+      (list* option `',value already-processed-options))
     #-lispworks
     (declare (ignore slot-name))
     )
@@ -191,15 +217,15 @@
     (t
      t)))
 
-#+(or sbcl cmu scl)
-(defmethod compute-effective-slot-definition :around ((cl hyperobject-class) dsds)
+#+ignore
+(defmethod compute-effective-slot-definition :around ((cl hyperobject-class) #+ho-normal-cesd name dsds)
+  #+allegro (declare (ignore name))
   (let* ((dsd (car dsds))
 	 (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
     (multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)
       (setf (slot-value dsd 'sql-type) sql-type)
       (setf (slot-value dsd 'type) (value-type-to-lisp-type value-type))
-      (let ((ia (compute-effective-slot-definition-initargs
-		 cl #+lispworks name dsds)))
+      (let ((ia (compute-effective-slot-definition-initargs cl #+lispworks name dsds)))
 	(apply
 	 #'make-instance 'hyperobject-esd 
 	 :value-type value-type
@@ -216,50 +242,51 @@
 	 :null-allowed (slot-value dsd 'null-allowed)
 	 ia)))))
 
-(defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
-						      #+(or lispworks allegro)
-						      dsds)
-  #+allegro (declare (ignore name))
-  (let* ((dsd (car dsds))
+(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))))
     (multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)
-      (setf (slot-value dsd 'sql-type) sql-type)
-      (setf (slot-value dsd 'type) (value-type-to-lisp-type value-type))
-      (let ((ia (compute-effective-slot-definition-initargs cl #+lispworks name dsds)))
-	(apply
-	 #'make-instance 'hyperobject-esd 
-	 :value-type value-type
-	 :sql-type sql-type
-	 :length length
-	 :print-formatter (slot-value dsd 'print-formatter)
-	 :subobject (slot-value dsd 'subobject)
-	 :hyperlink (slot-value dsd 'hyperlink)
-	 :hyperlink-parameters (slot-value dsd 'hyperlink-parameters)
-	 :description (slot-value dsd 'description)
-	 :user-name (slot-value dsd 'user-name)
-	 :index (slot-value dsd 'index)
-	 :value-constraint (slot-value dsd 'value-constraint)
-	 :null-allowed (slot-value dsd 'null-allowed)
-	 ia)))))
-  
+      (setf (slot-value esd 'sql-type) sql-type)
+      (setf (slot-value esd 'length) length)
+      (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))
+      (setf (slot-value esd 'value-type) value-type)
+      (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters description user-name
+		      value-constraint index null-allowed))
+	(setf (slot-value esd name) (slot-value dsd name)))
+      esd)))
+
+
+#+ho-normal-cesd
+(setq cl:*features* (delete :ho-normal-cesd cl:*features*))
+#+ho-normal-dsdc
+(setq cl:*features* (delete :ho-normal-dsdc cl:*features*))
+#+ho-normal-esdc
+(setq cl:*features* (delete :ho-normal-esdc cl:*features*))
+
+(defun lisp-type-is-a-string (type)
+  (or (eq type 'string)
+      (and (listp type) (some #'(lambda (x) (eq x 'string)) type))))
+
 (defun value-type-to-lisp-type (value-type)
   (case (if (atom value-type)
 	    value-type
 	    (car value-type))
     ((:string :cdata :varchar :char)
-     'string)
+     '(or null string))
     (:character
-     'character)
+     '(or null character))
     (:fixnum
-     'fixnum)
+     '(or null fixnum))
     (:boolean
-     'boolean)
+     '(or null boolean))
     (:integer
-     'integer)
+     '(or null integer))
     ((:float :single-float)
-     'single-float)
+     '(or null single-float))
     (:double-float
-     'double-float)
+     '(or null double-float))
     (otherwise
      t)))
 
@@ -302,8 +329,8 @@
     `(defmethod slot-unbound (,the-class (,the-instance ,class)
 			      (,the-slot-name (eql ',slot-name)))
       (declare (ignore ,the-class))
-      (setf (slot-value ,the-instance ,the-slot-name)
-       (,reader ,@keys)))))
+      (setf (slot-value ,the-instance ,the-slot-name) (,reader ,@keys)))))
+
 
 #+lispworks
 (defun intern-eql-specializer (slot)
@@ -346,29 +373,31 @@
   (setf (subobjects cl)
 	(let ((subobjects '()))
 	  (dolist (slot (class-slots cl))
-	    (let-when (subobj-def (esd-subobject slot))
-		      (let ((subobject (make-instance 'subobject
-						      :name-class (class-name cl)
-						      :name-slot (slot-definition-name slot)
-						      :lookup (if (atom subobj-def)
-								  subobj-def
-								  (car subobj-def))
-						      :lookup-keys (if (atom subobj-def)
-								       nil
-								       (cdr subobj-def)))))
-			(unless (eq (lookup subobject) t)
-			  #-(or sbcl cmu lispworks)
-			  (eval
-			   `(hyperobject::def-lazy-reader ,(name-class subobject)
-			     ,(name-slot subobject) ,(lookup subobject)
-			     ,@(lookup-keys subobject)))
-			  #+(or sbcl cmu lispworks)
-			  (apply #'ensure-lazy-reader 
-				 (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject))
-			  )
-			(push subobject subobjects))))
+	    (let-when
+	     (subobj-def (esd-subobject slot))
+	     (let ((subobject
+		    (make-instance 'subobject
+				   :name-class (class-name cl)
+				   :name-slot (slot-definition-name slot)
+				   :lookup (if (atom subobj-def)
+					       subobj-def
+					       (car subobj-def))
+				   :lookup-keys (if (atom subobj-def)
+						    nil
+						    (cdr subobj-def)))))
+	       (unless (eq (lookup subobject) t)
+		 #-(or sbcl cmu lispworks)
+		 (eval
+		  `(hyperobject::def-lazy-reader ,(name-class subobject)
+		    ,(name-slot subobject) ,(lookup subobject)
+		    ,@(lookup-keys subobject)))
+		 #+(or sbcl cmu lispworks)
+		 (apply #'ensure-lazy-reader 
+			(name-class subobject) (name-slot subobject)
+			(lookup subobject) (lookup-keys subobject)))
+	       (push subobject subobjects))))
 	  ;; sbcl/cmu reverse class-slots compared to the defclass form
-	  ;; subobject is already reversed from the dolist/push loop, so re-reverse on cmu/sbcl
+	  ;; so re-reverse on cmu/sbcl
 	  #+(or cmu sbcl) subobjects
 	  #-(or cmu sbcl) (nreverse subobjects)
 	  )))