X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=0002d566f2f016374a6c3175232660bb9570e7b5;hb=224c382d0d7fa09a5c86bfb1a8479ac380a094c6;hp=46d45141a8147edae11581d77de185c16063bf68;hpb=715a81d8541f2191738f14d84c386c11d2822dd9;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 46d4514..0002d56 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.15 2002/12/14 18:51:56 kevin Exp $
+;;;; $Id: mop.lisp,v 1.27 2003/03/29 20:11:09 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -281,6 +281,29 @@
        (setf (slot-value ,the-instance ,the-slot-name)
 	   (,reader ,@keys)))))
 
+#+(or sbcl scl cmu)
+(defun ensure-lazy-reader (class slot-name reader &rest reader-keys)
+  (let ((keys nil)
+	(gf (ensure-generic-function 'slot-unbound)))
+    (dolist (key reader-keys)
+      (push (list 'slot-value 'the-instance (list 'quote key)) keys))
+    (setq keys (nreverse keys))
+    (multiple-value-bind (method-lambda init-args-values)
+      (make-method-lambda
+       gf
+       (class-prototype (generic-function-method-class gf))
+       `(lambda (the-class the-instance the-slot-name)
+	 (declare (ignore the-class))
+	 (setf (slot-value the-instance the-slot-name) (,reader ,@keys))))
+      	(print init-args-values)
+	(add-method gf
+		  (make-instance (generic-function-method-class gf)
+				 ':specializers (list t class (intern-eql-specializer slot-name))
+				 ':lambda-list '(the-class the-instance the-slot-name)
+				 ':function `(function ,method-lambda)
+				 ;;init-args-values
+				 )))))
+
 (defun finalize-subobjects (cl)
   "Process class subobjects slot"
   (setf (subobjects cl)
@@ -297,9 +320,15 @@
 							   nil
 							   (cdr subobj-def)))))
 	    (unless (eq (lookup subobject) t)
-	      (eval `(def-lazy-reader ,(name-class subobject)
-			 ,(name-slot subobject) ,(lookup subobject)
-			 ,@(lookup-keys subobject))))
+	      #-(or sbcl cmu scl)
+	      (eval
+	       `(hyperobject::def-lazy-reader ,(name-class subobject)
+		 ,(name-slot subobject) ,(lookup subobject)
+		 ,@(lookup-keys subobject)))
+	      #+(or sbcl cmu scl)
+	      (apply #'ensure-lazy-reader 
+		     (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject))
+	      )
 	    (push subobject subobjects))))
       subobjects)))
 
@@ -373,74 +402,3 @@
 (defun hyperobject-class-fields (obj)
   (class-slots (class-of obj)))
 
-;;; Slot accessor and class rules
-
-(defclass rule ()
-  ((name :initarg :name :initform nil :accessor name)
-   (dependants :initarg :dependants :initform nil :accessor dependants)
-   (volatile :initarg :volatile :initform nil :accessor volatile)
-   (access-slots :initarg :access-slots :initform nil :accessor access-slots)
-   (source-code :initarg :source-code :initform nil :accessor source-code)
-   (func :initform nil :initarg :func :accessor func)))
-
-(defun compile-rule (source-code dependants volatile cl)
-  (let ((access (appendnew dependants volatile)))
-;;    (compile nil
-	     (eval
-	      `(lambda (obj)
-		 (when (every #'(lambda (x) (slot-boundp obj x))
-			      (quote ,dependants))
-		   (with-slots ,access obj
-		     ,@source-code))))))
-;;)
-  
-(defun finalize-rules (cl)
-  (let* ((direct-rules (direct-rules cl))
-	 (rules '()))
-    (dolist (rule direct-rules)
-      (destructuring-bind (name (&key dependants volatile) &rest source-code)
-	  rule
-	(setf dependants (mklist dependants)
-	      volatile (mklist volatile))
-	(push
-	 (make-instance 'rule :name name :dependants dependants
-			:volatile volatile :source-code source-code
-			:access-slots (appendnew dependants volatile)
-			:func (compile-rule
-			       source-code dependants volatile cl))
-	 rules)))
-    (setf (rules cl) (nreverse rules))))
-
-
-(defun fire-class-rules (cl obj slot)
-  "Fire all class rules. Called after a slot is modified."
-  (let ((name (slot-definition-name slot)))
-    (dolist (rule (rules cl))
-      (when (find name (dependants rule))
-	(cmsg "firing rule: ~a" rule)
-	(funcall (func rule) obj)))))
-
-(defmethod (setf slot-value-using-class) 
-    :around (new-value (cl hyperobject-class) obj
-		       (slot standard-effective-slot-definition))
-    #+ignore
-    (cmsg-c :verbose "Setf slot value: class: ~s, obj: ~s, slot: ~s, value: ~s" cl (class-of obj) slot new-value)
-    
-    (let ((func (esd-value-constraint slot)))
-      (cond
-	((and func (not (funcall func new-value)))
-	 (warn "Rejected change to value of slot ~a of object ~a"
-	       (slot-definition-name slot) obj)
-	 (slot-value obj (slot-definition-name slot)))
-	(t
-	 (call-next-method)
-	 (when (direct-rules cl)
-	   (fire-class-rules cl obj slot))
-	 new-value))))
-
-#+ignore
-(defmethod slot-value-using-class :around ((cl hyperobject-class) obj
-					   (slot standard-effective-slot-definition))
-  (let ((value (call-next-method)))
-    (cmsg-c :verbose "slot value: class: ~s, obj: ~s, slot: ~s" cl (class-of obj) slot)
-    value))