X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=9925c0f99fcd704acd874b26cc6c1685a5d34fcb;hb=feb0cbfeea77c0fbb0c4a113177b51af1640acb5;hp=cf431f058934c7781e5a2649f428f6c18a5a8b78;hpb=7c770e87ff4bec570e43970ffd79e4e30b3a39e5;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index cf431f0..9925c0f 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.50 2003/04/14 17:36:12 kevin Exp $
+;;;; $Id: mop.lisp,v 1.63 2003/04/25 05:00:58 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -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)))
 
@@ -191,8 +195,15 @@
     (t
      t)))
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (>= (length (generic-function-lambda-list
+		     (ensure-generic-function
+		      'compute-effective-slot-definition)))
+	    3)
+    (push :ho-named-cesd-fun cl:*features*)))
+
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
-						      #-(or cmu scl) name
+						      #+ho-named-cesd-fun name
 						      dsds)
   #+allegro (declare (ignore name))
   (let* ((dsd (car dsds))
@@ -216,25 +227,29 @@
 	 :value-constraint (slot-value dsd 'value-constraint)
 	 :null-allowed (slot-value dsd 'null-allowed)
 	 ia)))))
-  
+
+
+#+ho-named-cesd-fun
+(setq cl:*features* (delete :ho-named-cesd-fun cl:*features*))
+
 (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)))
 
@@ -277,8 +292,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)