From: Kevin M. Rosenberg Date: Sat, 14 Dec 2002 02:36:42 +0000 (+0000) Subject: r3627: *** empty log message *** X-Git-Tag: debian-2.11.0-2~223 X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=commitdiff_plain;h=e1b34d8009ffcaf4881205c08bf94b09255a7f6a r3627: *** empty log message *** --- diff --git a/examples/person.lisp b/examples/person.lisp index 63a174b..7a00fc1 100644 --- a/examples/person.lisp +++ b/examples/person.lisp @@ -9,7 +9,7 @@ ;;;; ;;;; A simple example file for hyperobjects ;;;; -;;;; $Id: person.lisp,v 1.3 2002/12/13 22:15:30 kevin Exp $ +;;;; $Id: person.lisp,v 1.4 2002/12/14 02:30:58 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -28,15 +28,16 @@ :value-constraint integerp :input-filter convert-to-date) (resume :value-type string :initarg :resume :reader resume :value-constraint stringp) - (addresses :value-type (list-of subobject) :initarg :addresses :reader addresses)) +;; (addresses :value-type (list-of subobject) :initarg :addresses :reader addresses)) + (addresses :subobject t :initarg :addresses :reader addresses)) (:metaclass hyperobject-class) (:default-initargs :first-name "" :last-name "" :dob 0 :resume nil) (:default-print-slots first-name last-name dob resume) (:user-name "Person") (:description "A Person") (:direct-rules - ((:rule-1 (:depends-on '(last-name first-name)) - (setf full-name (concatentate 'string first-name " " last-name)))))) + (:rule-1 (:dependants (last-name first-name) :volatile full-name) + (setf full-name (concatentate 'string first-name " " last-name))))) (defun format-date (ut) (when (typep ut 'integer) @@ -55,7 +56,7 @@ :value-constraint stringp) (street :value-type (varchar 30) :initarg :street :reader street :value-constraint stringp) - (phones :value-type (list-oj subobject) :initarg :phones :reader phones) + (phones :subobject t :initarg :phones :reader phones)) (:metaclass hyperobject-class) (:default-initargs :title nil :street nil) (:user-name "Address") diff --git a/metaclass.lisp b/metaclass.lisp index f4db4dd..a43df1f 100644 --- a/metaclass.lisp +++ b/metaclass.lisp @@ -8,7 +8,7 @@ ;;;; Date Started: Apr 2000 ;;;; ;;;; -;;;; $Id: metaclass.lisp,v 1.5 2002/12/13 19:40:50 kevin Exp $ +;;;; $Id: metaclass.lisp,v 1.6 2002/12/14 02:30:58 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -27,7 +27,8 @@ (defparameter *slot-options* '(:value-type :print-formatter :description :user-name :subobject :hyperlink :hyperlink-parameters - :index :inverse :unique :sql-name :null-allowed + :index :inverse :unique :sql-name :null-allowed :stored + :input-filter :unbound-lookup :value-constraint :nil-text) "Slot options that can appear as an initarg") (defparameter *slot-options-no-initarg* diff --git a/mop.lisp b/mop.lisp index 8496282..543221a 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.14 2002/12/14 02:30:58 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) - '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) + ((: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 @@ -372,50 +376,57 @@ ;;; 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) - ) + ((name :initarg :name :initform nil :accessor name) + (dependants :initarg :dependants :initform nil :accessor dependants) + (volatile :initarg :volatile :initform nil :accessor volatile) + (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) + #'(lambda (obj) + `(with-slots ,(append dependants volatile) obj + ,@source-code))) (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)) + (rules '())) + (dolist (rule 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) + rule + (setf dependants (mklist dependants) + volatile (mklist volatile)) + (push + (make-instance 'rule :name name :dependants dependants + :volatile volatile :source-code source-code + :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." (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)))) - + (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) + (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)))