X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=f40287473d92d2e75fa272f407b3774e3216ecac;hb=509f5717bbb67f567741531ca7f2b34a9f8939f9;hp=84962823c874719170d5b8ba5ece212d0753c3f4;hpb=21c4e5bd0f49bf0349ce0778fed676d05f11f78e;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 8496282..f402874 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.13 2002/12/13 22:26:41 kevin Exp $
+;;;; $Id: mop.lisp,v 1.21 2003/03/29 07:09:41 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -38,7 +38,7 @@
    (version :initarg :version :initform nil
 	    :accessor version
 	    :documentation "Version number for class")
-   (sql-name :initarg :table-name :initform nil)
+   (sql-name :initarg :sql-name :initform nil)
 
    ;;; The remainder of these fields are calculated one time
    ;;; in finalize-inheritence.
@@ -48,7 +48,8 @@
 	       "List of fields that contain a list of subobjects objects.")
    (hyperlinks :type list :initform nil :accessor hyperlinks
 	       :documentation "List of fields that have hyperlinks")
-   (direct-rules :type list :initform nil :accessor direct-rules
+   (direct-rules :type list :initform nil :initarg :direct-rules
+		 :accessor direct-rules
 		 :documentation "List of rules to fire on slot changes.")
    (class-id :type integer :initform nil
 	     :accessor class-id
@@ -181,42 +182,47 @@
     (t
      obj)))
 
+(defun canonicalize-value-type (vt)
+  (typecase vt
+    (atom
+     (ensure-keyword vt))
+    (cons
+     (cons (ensure-keyword (car vt)) (cdr vt)))
+    (t
+     t)))
+
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
 						      #+(or allegro lispworks) name
 						      dsds)
   #+allergo (declare (ignore name))
   (let* ((dsd (car dsds))
-	 (ho-type (intern-in-keyword (slot-value dsd 'type)))
-	 (sql-type (ho-type-to-sql-type ho-type))
-	 (length (when (consp ho-type) (cadr ho-type))))
-  #+allergo (declare (ignore name))
-    (setf (slot-value dsd 'ho-type) ho-type)
-    (setf (slot-value dsd 'sql-type) sql-type)
-    (setf (slot-value dsd 'type) (ho-type-to-lisp-type ho-type))
-    (let ((ia (compute-effective-slot-definition-initargs
-	       cl #+lispworks name dsds)))
-      (apply
-       #'make-instance 'hyperobject-esd 
-       :ho-type ho-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))))
-
-(defun ho-type-to-lisp-type (ho-type)
-  (when (consp ho-type)
-    (setq ho-type (car ho-type)))
-  (check-type ho-type symbol)
-  (case ho-type
-    ((or :string :cdata :varchar :char)
+	 (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)))))
+  
+(defun value-type-to-lisp-type (value-type)
+  (case (if (atom value-type)
+	    value-type
+	    (car value-type))
+    ((:string :cdata :varchar :char)
      'string)
     (:character
      'character)
@@ -226,37 +232,35 @@
      'boolean)
     (:integer
      'integer)
-    ((or :float :single-float)
+    ((:float :single-float)
      'single-float)
     (:double-float
      'double-float)
-    (nil
-     t)
     (otherwise
-     ho-type)))
-
-(defun ho-type-to-sql-type (ho-type)
-  (when (consp ho-type)
-    (setq ho-type (car ho-type)))
-  (check-type ho-type symbol)
-  (case ho-type
-    ((or :string :cdata)
-     'string)
-    (:fixnum
-     'integer)
-    (:boolean
-     'boolean)
-    (:integer
-     'integer)
-    ((or :float :single-float)
-     'single-float)
-    (:double-float
-     'double-float)
-    (nil
-     t)
-    (otherwise
-     ho-type)))
-
+     t)))
+
+(defun value-type-to-sql-type (value-type)
+  "Return two values, the sql type and field length."
+  (let ((type (if (atom value-type)
+		  value-type
+		  (car value-type)))
+	(length (when (consp value-type)
+		  (cadr value-type))))
+    (values
+     (case type
+       ((:string :cdata)
+	:string)
+       ((:fixnum :integer)
+	:integer)
+       (:boolean
+	:boolean)
+       ((:float :single-float)
+	:single-float)
+       (:double-float
+	:double-float)
+       (otherwise
+	:text))
+     length)))
 
 ;;;; Class initialization function
 
@@ -277,6 +281,29 @@
        (setf (slot-value ,the-instance ,the-slot-name)
 	   (,reader ,@keys)))))
 
+
+(defparameter *queued-definitions-pathname*
+  (make-pathname :directory '(:absolute "tmp")
+		 :name (format nil "hyperobject-def-~d" (get-universal-time))
+		 :type "lisp"))
+(defparameter *queued-definitions-stream* nil)
+
+(defun add-definition (def)
+  (unless *queued-definitions-stream*
+    (setq *queued-definitions-stream* (open *queued-definitions-pathname*
+					    :direction :output
+					    :if-exists :supersede)))
+  (format *queued-definitions-stream* "~A~%" def))
+
+(defun process-queued-definitions ()
+  (when *queued-definitions-stream*
+    (close *queued-definitions-stream*)
+    (compile-file *queued-definitions-pathname*)
+    (load (compile-file-pathname *queued-definitions-pathname*))
+    (delete-file *queued-definitions-pathname*) 
+    (delete-file (compile-file-pathname *queued-definitions-pathname*))
+    (setq *queued-definitions-stream* nil)))
+
 (defun finalize-subobjects (cl)
   "Process class subobjects slot"
   (setf (subobjects cl)
@@ -293,9 +320,10 @@
 							   nil
 							   (cdr subobj-def)))))
 	    (unless (eq (lookup subobject) t)
-	      (eval `(def-lazy-reader ,(name-class subobject)
-			 ,(name-slot subobject) ,(lookup subobject)
-			 ,@(lookup-keys subobject))))
+	      (add-definition
+	       `(def-lazy-reader ,(name-class subobject)
+		 ,(name-slot subobject) ,(lookup subobject)
+		 ,@(lookup-keys subobject))))
 	    (push subobject subobjects))))
       subobjects)))
 
@@ -369,55 +397,3 @@
 (defun hyperobject-class-fields (obj)
   (class-slots (class-of obj)))
 
-;;; Slot accessor and class rules
-
-(defclass rule ()
-  ((dependants :initarg dependants :initform nil :accessor dependants)
-   (volatile :initarg modifieds :initform nil :accessor modifieds)
-   (source-code :initarg source-code :initform nil :accessor source-code)
-   (function :initform nil :accessor function)))
-
-(defun compile-rule (source-code cl)
-  )
-  
-(defun finalize-rules (cl)
-  (let* ((direct-rules (direct-rules cl))
-	 (rule-vector (make-vector (length direct-rules) :fill-pointer nil
-				   :adjustable nil)))
-    (dotimes (i (length direct-rules))
-      (destructuring-bind (name (&key dependants volatile) &rest source-code)
-	  (nth i direct-rules)
-	(setf (aref rule-vector i) (make-instance 'rule
-						  :name name
-						  :dependants depedenants
-						  :volatile volatile
-						  :source-code source-code
-						  :function (compile-rule source-code cl)))))
-    (setf (rules cl) rule-vector)))
-
-(defun fire-class-rules (cl obj)
-  "Fire all class rules. Called after a slot is modified."
-  (dolist (rule (direct-rules cl))
-    (cmsg "firing rule: ~a" rule)))
-
-
-(defmethod (setf slot-value-using-class) 
-    :around (new-value (cl hyperobject-class) obj
-	     (slot standard-effective-slot-definition))
-  (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 obj)))
-      (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)
-      (fire-class-rules cl obj)
-      new-value))))
-  
-(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))