X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=bf73c5844eb0f368eb177ab3145dfbd4a10bd665;hb=400a9a2a82a4eff7298a11503e2693a89be8845b;hp=1094c56f0fd4595ab9b97dc7db90a14f6be3bd71;hpb=da95022a6396191e772e59cd7622c7c5919ce605;p=hyperobject.git diff --git a/mop.lisp b/mop.lisp index 1094c56..bf73c58 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.10 2002/12/13 05:44:19 kevin Exp $ +;;;; $Id: mop.lisp,v 1.38 2003/04/04 00:00:07 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -27,24 +27,35 @@ (defclass hyperobject-class (standard-class) ( ;; slots initialized in defclass (user-name :initarg :user-name :type string :initform nil - :documentation "User name for class") + :accessor user-name + :documentation "User name for class") (default-print-slots :initarg :default-print-slots :type list :initform nil + :accessor default-print-slots :documentation "Defaults slots for a view") (description :initarg :description :initform nil + :accessor description :documentation "Class description") (version :initarg :version :initform nil - :documentation "Version number for class") - (sql-name :initarg :table-name :initform nil) + :accessor version + :documentation "Version number for class") + (sql-name :initarg :sql-name :initform nil) ;;; The remainder of these fields are calculated one time ;;; in finalize-inheritence. - (subobjects :initform nil :documentation + (subobjects :initform nil :accessor subobjects + :documentation "List of fields that contain a list of subobjects objects.") - (hyperlinks :type list :initform nil :documentation - "List of fields that have hyperlinks") - (class-id :type integer :initform nil :documentation - "Unique ID for the class") + (hyperlinks :type list :initform nil :accessor hyperlinks + :documentation "List of fields that have hyperlinks") + (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 + :documentation "Unique ID for the class") + (default-view :initform nil :initarg :default-view :accessor default-view + :documentation "The default view for a class") ;; SQL commands (create-table-cmd :initform nil :reader create-table-cmd) @@ -53,8 +64,8 @@ (views :type list :initform nil :initarg :views :accessor views :documentation "List of views") - (default-view :initform nil :initarg :default-view :accessor default-view - :documentation "The default view for a class") + (rules :type list :initform nil :initarg :rules :accessor rules + :documentation "List of rules") ) (:documentation "Metaclass for Markup Language classes.")) @@ -138,7 +149,11 @@ `(,(intern (symbol-name x)) :initarg ,(intern (symbol-name x) (symbol-name :keyword)) - :initform nil)) + :initform nil + :accessor + ,(intern (concatenate 'string + (symbol-name :dsd-) + (symbol-name x))))) *slot-options*)))) (eval `(defclass hyperobject-esd (standard-effective-slot-definition) @@ -146,8 +161,12 @@ `(,(intern (symbol-name x)) :initarg ,(intern (symbol-name x) (symbol-name :keyword)) - :initform nil)) - (append *slot-options* *slot-options-no-initarg*))))) + :initform nil + :accessor + ,(intern (concatenate 'string + (symbol-name :esd-) + (symbol-name x))))) + (append *slot-options* *slot-options-no-initarg*))))) ) ;; eval-when (defun intern-in-keyword (obj) @@ -163,38 +182,47 @@ (t obj))) -(defmethod compute-effective-slot-definition :around - ((cl hyperobject-class) #+(or allegro lispworks) name dsds) - #+allergo (declare (ignore name)) +(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) + #+allegro (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)))) - (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) - 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) @@ -204,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 @@ -255,12 +281,48 @@ (setf (slot-value ,the-instance ,the-slot-name) (,reader ,@keys))))) +#+lispworks +(defun intern-eql-specializer (slot) + `(eql ,slot)) + +#+(or sbcl scl cmu lispworks) +(defun ensure-lazy-reader (class-name 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)) + #-lispworks + `(lambda (the-class the-instance the-slot-name) + (declare (ignore the-class)) + (setf (slot-value the-instance the-slot-name) (,reader ,@keys))) + #+lispworks + '(the-class the-instance the-slot-name) + #+lispworks + '(declare (ignore the-class)) + #+lispworks + `(setf (slot-value the-instance the-slot-name) (,reader ,@keys)) + nil) + (add-method gf + (apply + #'make-instance (generic-function-method-class gf) + ':specializers (list (class-of (find-class class-name)) + (find-class class-name) + (intern-eql-specializer slot-name)) + ':lambda-list '(the-class the-instance the-slot-name) + ':function (compile nil method-lambda) + init-args-values))))) + (defun finalize-subobjects (cl) "Process class subobjects slot" - (setf (slot-value cl 'subobjects) + (setf (subobjects cl) (let ((subobjects '())) (dolist (slot (class-slots cl)) - (let-when (subobj-def (slot-value slot 'subobject)) + (let-when (subobj-def (esd-subobject slot)) (let ((subobject (make-instance 'subobject :name-class (class-name cl) :name-slot (slot-definition-name slot) @@ -271,9 +333,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 lispworks) + (eval + `(hyperobject::def-lazy-reader ,(name-class subobject) + ,(name-slot subobject) ,(lookup subobject) + ,@(lookup-keys subobject))) + #+(or sbcl cmu scl lispworks) + (apply #'ensure-lazy-reader + (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject)) + ) (push subobject subobjects)))) subobjects))) @@ -293,13 +361,13 @@ (let ((*print-circle* nil)) (setf (documentation (class-name cl) 'class) (format nil "Hyperobject~A~A~A~A" - (aif (slot-value cl 'user-name) + (aif (user-name cl) (format nil ": ~A" it "")) - (aif (slot-value cl 'description) + (aif (description cl) (format nil "~%Class description: ~A" it) "") - (aif (slot-value cl 'subobjects) + (aif (subobjects cl) (format nil "~%Subobjects:~{ ~A~}" (mapcar #'name-slot it)) "") - (aif (slot-value cl 'default-print-slots) + (aif (default-print-slots cl) (format nil "~%Default print slots:~{ ~A~}" it) "") )))) @@ -321,6 +389,7 @@ (finalize-views cl) (finalize-hyperlinks cl) (finalize-sql cl) + (finalize-rules cl) (finalize-documentation cl)) @@ -332,16 +401,16 @@ (find name (class-slots cl) :key #'slot-definition-name)) (defun hyperobject-class-user-name (obj) - (awhen (slot-value (class-of obj) 'user-name) + (awhen (user-name (class-of obj)) (if (consp it) (car it) it))) (defun hyperobject-class-subobjects (obj) - (slot-value (class-of obj) 'subobjects)) + (subobjects (class-of obj))) (defun hyperobject-class-hyperlinks (obj) - (slot-value (class-of obj) 'hyperlinks)) + (hyperlinks (class-of obj))) (defun hyperobject-class-fields (obj) (class-slots (class-of obj)))