X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=hyperobject.lisp;h=60d34831d14e5165d62de1f5c6868f02a0a97681;hb=9d3930d7b2bacd5327ce55ad9fb0ce1392fe746b;hp=e95b8118ed2ac2197c5b2cacd586af85fa3e09cb;hpb=c257d1813b0eb826e8473ea267b60a16cf5d531c;p=hyperobject.git
diff --git a/hyperobject.lisp b/hyperobject.lisp
index e95b811..60d3483 100644
--- a/hyperobject.lisp
+++ b/hyperobject.lisp
@@ -11,7 +11,7 @@
;;;; in Text, HTML, and XML formats. This includes hyperlinking
;;;; capability and sub-objects.
;;;;
-;;;; $Id: hyperobject.lisp,v 1.3 2002/11/04 18:02:13 kevin Exp $
+;;;; $Id: hyperobject.lisp,v 1.14 2002/11/25 04:47:23 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
@@ -19,157 +19,267 @@
(in-package :hyperobject)
-
(eval-when (:compile-toplevel :execute)
(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (shadowing-import
+ #+allegro
+ `(mop::class-slots mop::slot-definition-name mop:finalize-inheritance
+ mop::standard-direct-slot-definition mop::standard-effective-slot-definition
+ mop:direct-slot-definition-class mop:compute-effective-slot-definition
+ excl::compute-effective-slot-definition-initargs)
+ #+lispworks
+ `(clos:class-slots clos::slot-definition-name clos:finalize-inheritance
+ clos::standard-direct-slot-definition clos::standard-effective-slot-definition
+ clos:direct-slot-definition-class clos:compute-effective-slot-definition
+ clos::compute-effective-slot-definition-initargs)
+ #+sbcl
+ `(sb-pcl:class-of sb-pcl:class-name sb-pcl:class-slots sb-pcl::standard-class
+ sb-pcl::slot-definition-name sb-pcl:finalize-inheritance
+ sb-pcl::standard-direct-slot-definition
+ sb-pcl::standard-effective-slot-definition sb-pcl::validate-superclass
+ sb-pcl:direct-slot-definition-class sb-pcl:compute-effective-slot-definition
+ sb-pcl::compute-effective-slot-definition-initargs)
+ #+cmu
+ `(pcl:class-of pcl:class-name pcl:class-slots pcl::standard-class
+ pcl::slot-definition-name pcl:finalize-inheritance
+ pcl::standard-direct-slot-definition pcl::standard-effective-slot-definition
+ pcl::validate-superclass pcl:direct-slot-definition-class
+ pcl:compute-effective-slot-definition
+ pcl::compute-effective-slot-definition-initargs)
+
+ :hyperobject))
+
+
+;; Slot definitions
-;; Utilities
-(defun kmr-class-of (obj)
- #-(or cmu sbcl) (class-of obj)
- #+sbcl (sb-pcl:class-of obj)
- #+cmu (pcl:class-of obj))
+(defclass hyperobject-dsd (standard-direct-slot-definition)
+ ((ho-type :initarg :ho-type :initform nil)
+ (print-formatter :initarg :print-formatter :initform nil)
+ (subobject :initarg :subobject :initform nil)
+ (reference :initarg :reference :initform nil)
+ (description :initarg :description :initform nil)
+ ))
-(defun kmr-class-name (obj)
- #-(or cmu sbcl) (class-name obj)
- #+sbcl (sb-pcl:class-name obj)
- #+cmu (pcl:class-name obj))
+(defclass hyperobject-esd (standard-effective-slot-definition)
+ ((ho-type :initarg :ho-type :initform nil :accessor esd-ho-type)
+ (print-formatter :initarg :print-formatter :initform nil :accessor esd-print-formatter)
+ (subobject :initarg :subobject :initform nil :accessor esd-subobject)
+ (reference :initarg :reference :initform nil :accessor esd-reference)
+ (description :initarg :description :initform nil :accessor esd-description)
+ ))
;; Main class
-(defclass hyperobject-class (#-(or cmu sbcl) standard-class
- #+cmu pcl::standard-class
- #+sbcl sb-pcl::standard-class)
- ((title :initarg :title :type string :reader ml-std-title
- :documentation
-"Print Title for class")
- (fields :initarg :fields :reader ml-std-fields
- :documentation
-"List of field lists for printing. Format is
- ((fieldname type optional-formatter) ... )")
- (subobjects-lists
- :initarg :subobjects-lists :reader ml-std-subobjects-lists
- :documentation
-"List of fields that contain a list of subobjects objects.")
- (ref-fields
- :initarg :ref-fields :type list :reader ml-std-ref-field
- :documentation
- "List of fields that can be referred to by browsers.
-Format is ((field-name field-lookup-func other-link-params) ...)")
-
+(defclass hyperobject-class (standard-class)
+ ( ;; slots initialized in defclass
+ (title :initarg :title :type string :initform nil
+ :documentation "Print Title for class")
+ (print-slots :initarg :print-slots :type list :initform nil
+ :documentation "List of slots to print")
+ (description :initarg :description :initform nil
+ :documentation "Class description")
+
;;; The remainder of these fields are calculated one time
;;; in finalize-inheritence.
- (value-func :initform nil :type function :reader ml-std-value-func)
- (xmlvalue-func :initform nil :type function :reader ml-std-xmlvalue-func)
- (fmtstr-text :initform nil :type string :reader ml-std-fmtstr-text)
- (fmtstr-html :initform nil :type string :reader ml-std-fmtstr-html)
- (fmtstr-xml :initform nil :type string :reader ml-std-fmtstr-xml)
- (fmtstr-text-labels :initform nil :type string :reader ml-std-fmtstr-text-labels)
- (fmtstr-html-labels :initform nil :type string :reader ml-std-fmtstr-html-labels)
- (fmtstr-xml-labels :initform nil :type string :reader ml-std-fmtstr-xml-labels)
- (fmtstr-html-ref :initform nil :type string :reader ml-std-fmtstr-html-ref)
- (fmtstr-xml-ref :initform nil :type string :reader ml-std-fmtstr-xml-ref)
- (fmtstr-html-ref-labels :initform nil :type string :reader ml-std-fmtstr-html-ref-labels)
- (fmtstr-xml-ref-labels :initform nil :type string :reader ml-std-fmtstr-xml-ref-labels)
+
+ (subobjects :initform nil :documentation
+ "List of fields that contain a list of subobjects objects.")
+ (references :type list :initform nil :documentation
+ "List of fields that have references")
+
+ (value-func :initform nil :type function)
+ (xmlvalue-func :initform nil :type function)
+ (fmtstr-text :initform nil :type string)
+ (fmtstr-html :initform nil :type string)
+ (fmtstr-xml :initform nil :type string)
+ (fmtstr-text-labels :initform nil :type string)
+ (fmtstr-html-labels :initform nil :type string)
+ (fmtstr-xml-labels :initform nil :type string)
+ (fmtstr-html-ref :initform nil :type string)
+ (fmtstr-xml-ref :initform nil :type string)
+ (fmtstr-html-ref-labels :initform nil :type string)
+ (fmtstr-xml-ref-labels :initform nil :type string)
)
- (:default-initargs :title nil :fields nil :subobjects-lists nil :ref-fields nil)
(:documentation "Metaclass for Markup Language classes."))
-#+cmu
-(defmethod pcl:finalize-inheritance :after ((cl hyperobject-class))
- (init-hyperobject-class cl))
+(defclass subobject ()
+ ((name :type symbol :initform nil :initarg :name :reader name)
+ (reader :type function :initform nil :initarg :reader :reader reader)))
-#+scl
-(defmethod clos:finalize-inheritance :after ((cl hyperobject-class))
- (init-hyperobject-class cl))
+(defmethod print-object ((obj subobject) (s stream))
+ (print-unreadable-object (obj s :type t :identity t)
+ (format s "~S" (name obj))))
+(defclass reference ()
+ ((name :type symbol :initform nil :initarg :name :reader name)
+ (lookup :type function :initform nil :initarg :lookup :reader lookup)
+ (link-parameters :type list :initform nil :initarg :link-parameters
+ :reader link-parameters)))
-#+sbcl
-(defmethod sb-pcl:finalize-inheritance :after ((cl hyperobject-class))
- (init-hyperobject-class cl))
+(defmethod print-object ((obj reference) (s stream))
+ (print-unreadable-object (obj s :type t :identity t)
+ (format s "~S" (name obj))))
-
-#+cmu
-(defmethod pcl:validate-superclass ((class hyperobject-class) (superclass pcl::standard-class))
+#+(or cmu scl sbcl)
+(defmethod validate-superclass ((class hyperobject-class) (superclass standard-class))
t)
-#+scl
-(defmethod clos:validate-superclass ((class hyperobject-class) (superclass standard-class))
- t)
+(defmethod finalize-inheritance :after ((cl hyperobject-class))
+ (init-hyperobject-class cl))
-#+sbcl
-(defmethod sb-pcl:validate-superclass ((class hyperobject-class) (superclass sb-pcl::standard-class))
- t)
+;; Slot definitions
+(defmethod direct-slot-definition-class ((cl hyperobject-class)
+ #+allegro &rest
+ iargs)
+ (find-class 'hyperobject-dsd))
+
+(defmacro define-class-option (slot-name &optional required)
+ #+lispworks
+ `(defmethod clos:process-a-class-option ((class hyperobject-class)
+ (name (eql ,slot-name))
+ value)
+ (when (and ,required (null value))
+ (error "hyperobject class slot ~A must have a value" name))
+ (if (null (cdr value))
+ (list name (car value))
+ (list name `',value)))
+ #+(or allegro sbcl cmu scl)
+ (declare (ignore slot-name required))
+ )
-#+allegro
-(defmethod mop:finalize-inheritance :after ((cl hyperobject-class))
- (init-hyperobject-class cl))
+(defmacro define-slot-option (slot-name)
+ #+lispworks
+ `(defmethod clos:process-a-slot-option ((class hyperobject-class)
+ (option (eql ,slot-name))
+ value
+ already-processed-other-options
+ slot)
+ (if (null (cdr value))
+ (list option (car value))
+ (list option `',value)))
+ #-lispworks
+ (declare (ignore slot-name))
+ )
-#+lispworks
-(defmethod clos:finalize-inheritance :after ((cl hyperobject-class))
- (init-hyperobject-class cl))
+(define-class-option :title)
+(define-class-option :print-slots)
+(define-class-option :description)
+
+(define-slot-option :ho-type)
+(define-slot-option :print-formatter)
+(define-slot-option :subobject)
+(define-slot-option :reference)
+(define-slot-option :description)
+
+
+
+(defmethod compute-effective-slot-definition :around
+ ((cl hyperobject-class) #+(or allegro lispworks) name dsds)
+ #+allergo (declare (ignore name))
+ (let* ((dsd (car dsds))
+ (ho-type (slot-value dsd 'type)))
+ (setf (slot-value dsd 'ho-type) ho-type)
+ (setf (slot-value dsd 'type) (convert-ho-type ho-type))
+ (let ((ia (compute-effective-slot-definition-initargs
+ cl #+lispworks name dsds)))
+ (apply
+ #'make-instance 'hyperobject-esd
+ :ho-type ho-type
+ :print-formatter (slot-value dsd 'print-formatter)
+ :subobject (slot-value dsd 'subobject)
+ :reference (slot-value dsd 'reference)
+ :description (slot-value dsd 'description)
+ ia)))
+ )
-#+lispworks
-(defmethod clos:process-a-class-option ((class hyperobject-class)
- (name (eql :title))
- value)
- (unless value
- (error "hyperobject-class title must have a value"))
- (if (null (cdr value))
- (list name (car value))
- (list name `',value)))
-
-#+lispworks
-(defmethod clos:process-a-class-option ((class hyperobject-class)
- (name (eql :fields))
- value)
- (unless value
- (error "hyperobject-class fields must have a value"))
- (list name `',value))
-
-#+lispworks
-(defmethod clos:process-a-class-option ((class hyperobject-class)
- (name (eql :ref-fields))
- value)
- (unless value
- (error "hyperobject-class ref-fields must have a value"))
- (list name `',value))
-
-#+lispworks
-(defmethod clos:process-a-class-option ((class hyperobject-class)
- (name (eql :subobjects-lists))
- value)
- (unless value
- (error "hyperobject-class subobjects-lists must have a value"))
- (list name `',value))
+(defun convert-ho-type (ho-type)
+ (check-type ho-type symbol)
+ (case (intern (symbol-name ho-type) (symbol-name :keyword))
+ (:string
+ 'string)
+ (:fixnum
+ 'fixnum)
+ (:boolean
+ 'boolean)
+ (:integer
+ 'integer)
+ (:cdata
+ 'string)
+ (:float
+ 'float)
+ (otherwise
+ ho-type)))
;;;; Class initialization function
-
-(defun init-hyperobject-class (cl)
- (let ((fmtstr-text "")
- (fmtstr-html "")
- (fmtstr-xml "")
- (fmtstr-text-labels "")
- (fmtstr-html-labels "")
- (fmtstr-xml-labels "")
- (fmtstr-html-ref "")
- (fmtstr-xml-ref "")
- (fmtstr-html-ref-labels "")
- (fmtstr-xml-ref-labels "")
- (first-field t)
- (value-func '())
- (xmlvalue-func '())
- (classname (class-name cl))
- (package (symbol-package (kmr-class-name cl)))
- (ref-fields (slot-value cl 'ref-fields)))
- (declare (ignore classname))
- (dolist (f (slot-value cl 'fields))
- (let ((name (car f))
- (namestr (symbol-name (car f)))
- (namestr-lower (string-downcase (symbol-name (car f))))
- (type (cadr f))
- (formatter (caddr f))
+
+(defun find-slot-by-name (cl name)
+ (find name (class-slots cl) :key #'slot-definition-name))
+
+
+(defun process-subobjects (cl)
+ "Process class subobjects slot"
+ (setf (slot-value cl 'subobjects)
+ (let ((subobjects '()))
+ (dolist (slot (class-slots cl))
+ (when (slot-value slot 'subobject)
+ (push (make-instance 'subobject :name (slot-definition-name slot)
+ :reader (if (eq t (esd-subobject slot))
+ (slot-definition-name slot)
+ (esd-subobject slot)))
+ subobjects)))
+ subobjects)))
+
+(defun process-documentation (cl)
+ "Calculate class documentation slot"
+ (awhen (slot-value cl 'title)
+ (setf (slot-value cl 'title) (car it)))
+ (awhen (slot-value cl 'description)
+ (setf (slot-value cl 'description) (car it)))
+
+ (let ((*print-circle* nil))
+ (setf (documentation (class-name cl) 'class)
+ (format nil "Hyperobject~A~A~A~A"
+ (aif (slot-value cl 'title)
+ (format nil ": ~A" it ""))
+ (aif (slot-value cl 'description)
+ (format nil "~%Class description: ~A" it) "")
+ (aif (slot-value cl 'subobjects)
+ (format nil "~%Subobjects:~{ ~A~}" (mapcar #'name it)) "")
+ (aif (slot-value cl 'print-slots)
+ (format nil "~%Print-slots:~{ ~A~}" it) "")
+ ))))
+
+(defun process-views (cl)
+ "Calculate all view slots for a hyperobject class"
+ (let ((fmtstr-text "")
+ (fmtstr-html "")
+ (fmtstr-xml "")
+ (fmtstr-text-labels "")
+ (fmtstr-html-labels "")
+ (fmtstr-xml-labels "")
+ (fmtstr-html-ref "")
+ (fmtstr-xml-ref "")
+ (fmtstr-html-ref-labels "")
+ (fmtstr-xml-ref-labels "")
+ (first-field t)
+ (value-func '())
+ (xmlvalue-func '())
+ (classname (class-name cl))
+ (package (symbol-package (class-name cl)))
+ (references nil))
+ (declare (ignore classname))
+ (dolist (slot-name (slot-value cl 'print-slots))
+ (let ((slot (find-slot-by-name cl slot-name)))
+ (unless slot
+ (error "Slot ~A is not found in class ~S" slot-name cl))
+ (let ((name (slot-definition-name slot))
+ (namestr (symbol-name (slot-definition-name slot)))
+ (namestr-lower (string-downcase (symbol-name (slot-definition-name slot))))
+ (type (slot-value slot 'ho-type))
+ (print-formatter (slot-value slot 'print-formatter))
(value-fmt "~a")
(plain-value-func nil)
html-str xml-str html-label-str xml-label-str)
@@ -177,25 +287,22 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(when (or (eql type :integer) (eql type :fixnum))
(setq value-fmt "~d"))
- (when (eql type :commainteger)
- (setq value-fmt "~:d"))
-
(when (eql type :boolean)
(setq value-fmt "~a"))
-
+
(if first-field
(setq first-field nil)
- (progn
- (string-append fmtstr-text " ")
- (string-append fmtstr-html " ")
- (string-append fmtstr-xml " ")
- (string-append fmtstr-text-labels " ")
- (string-append fmtstr-html-labels " ")
- (string-append fmtstr-xml-labels " ")
- (string-append fmtstr-html-ref " ")
- (string-append fmtstr-xml-ref " ")
- (string-append fmtstr-html-ref-labels " ")
- (string-append fmtstr-xml-ref-labels " ")))
+ (progn
+ (string-append fmtstr-text " ")
+ (string-append fmtstr-html " ")
+ (string-append fmtstr-xml " ")
+ (string-append fmtstr-text-labels " ")
+ (string-append fmtstr-html-labels " ")
+ (string-append fmtstr-xml-labels " ")
+ (string-append fmtstr-html-ref " ")
+ (string-append fmtstr-xml-ref " ")
+ (string-append fmtstr-html-ref-labels " ")
+ (string-append fmtstr-xml-ref-labels " ")))
(setq html-str (concatenate 'string "" value-fmt ""))
(setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt ""))
@@ -209,116 +316,116 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(string-append fmtstr-html-labels html-label-str)
(string-append fmtstr-xml-labels xml-label-str)
- (if (find name ref-fields :key #'car)
- (progn
- (string-append fmtstr-html-ref "<~~a>" value-fmt "")
- (string-append fmtstr-xml-ref "<~~a>" value-fmt "")
- (string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "")
- (string-append fmtstr-xml-ref-labels " <~~a>" value-fmt ""))
- (progn
- (string-append fmtstr-html-ref html-str)
- (string-append fmtstr-xml-ref xml-str)
- (string-append fmtstr-html-ref-labels html-label-str)
- (string-append fmtstr-xml-ref-labels xml-label-str)))
+ (if (esd-reference slot)
+ (progn
+ (string-append fmtstr-html-ref "<~~a>" value-fmt "")
+ (string-append fmtstr-xml-ref "<~~a>" value-fmt "")
+ (string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "")
+ (string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "")
+ (push (make-instance 'reference :name name :lookup (esd-reference slot))
+ references))
+ (progn
+ (string-append fmtstr-html-ref html-str)
+ (string-append fmtstr-xml-ref xml-str)
+ (string-append fmtstr-html-ref-labels html-label-str)
+ (string-append fmtstr-xml-ref-labels xml-label-str)))
- (if formatter
+ (if print-formatter
+ (setq plain-value-func
+ (list `(,print-formatter (,(intern namestr package) x))))
(setq plain-value-func
- (list `(,formatter (,(intern namestr package) x))))
- (setq plain-value-func
- (list `(,(intern namestr package) x))))
+ (list `(,(intern namestr package) x))))
(setq value-func (append value-func plain-value-func))
(if (eql type :cdata)
(setq xmlvalue-func (append xmlvalue-func (list `(xml-cdata ,@plain-value-func))))
- (setq xmlvalue-func (append xmlvalue-func plain-value-func)))
- ))
-
- (if value-func
- (setq value-func `(lambda (x) (values ,@value-func)))
+ (setq xmlvalue-func (append xmlvalue-func plain-value-func)))
+ )))
+
+ (setf (slot-value cl 'references) references)
+
+ (if value-func
+ (setq value-func `(lambda (x) (values ,@value-func)))
(setq value-func `(lambda () (values))))
- (setq value-func (compile nil (eval value-func)))
-
- (if xmlvalue-func
- (setq xmlvalue-func `(lambda (x) (values ,@xmlvalue-func)))
+ (setq value-func (compile nil (eval value-func)))
+
+ (if xmlvalue-func
+ (setq xmlvalue-func `(lambda (x) (values ,@xmlvalue-func)))
(setq xmlvalue-func `(lambda () (values))))
- (setq xmlvalue-func (compile nil (eval xmlvalue-func)))
-
- (setf (slot-value cl 'fmtstr-text) fmtstr-text)
- (setf (slot-value cl 'fmtstr-html) fmtstr-html)
- (setf (slot-value cl 'fmtstr-xml) fmtstr-xml)
- (setf (slot-value cl 'fmtstr-text-labels) fmtstr-text-labels)
- (setf (slot-value cl 'fmtstr-html-labels) fmtstr-html-labels)
- (setf (slot-value cl 'fmtstr-xml-labels) fmtstr-xml-labels)
- (setf (slot-value cl 'fmtstr-html-ref) fmtstr-html-ref)
- (setf (slot-value cl 'fmtstr-xml-ref) fmtstr-xml-ref)
- (setf (slot-value cl 'fmtstr-html-ref-labels) fmtstr-html-ref-labels)
- (setf (slot-value cl 'fmtstr-xml-ref-labels) fmtstr-xml-ref-labels)
- (setf (slot-value cl 'value-func) value-func)
- (setf (slot-value cl 'xmlvalue-func) xmlvalue-func))
- (values))
+ (setq xmlvalue-func (compile nil (eval xmlvalue-func)))
+
+ (setf (slot-value cl 'fmtstr-text) fmtstr-text)
+ (setf (slot-value cl 'fmtstr-html) fmtstr-html)
+ (setf (slot-value cl 'fmtstr-xml) fmtstr-xml)
+ (setf (slot-value cl 'fmtstr-text-labels) fmtstr-text-labels)
+ (setf (slot-value cl 'fmtstr-html-labels) fmtstr-html-labels)
+ (setf (slot-value cl 'fmtstr-xml-labels) fmtstr-xml-labels)
+ (setf (slot-value cl 'fmtstr-html-ref) fmtstr-html-ref)
+ (setf (slot-value cl 'fmtstr-xml-ref) fmtstr-xml-ref)
+ (setf (slot-value cl 'fmtstr-html-ref-labels) fmtstr-html-ref-labels)
+ (setf (slot-value cl 'fmtstr-xml-ref-labels) fmtstr-xml-ref-labels)
+ (setf (slot-value cl 'value-func) value-func)
+ (setf (slot-value cl 'xmlvalue-func) xmlvalue-func))
+ (values))
+(defun init-hyperobject-class (cl)
+ "Initialize a hyperobject class. Calculates all class slots"
+ (process-subobjects cl)
+ (process-views cl)
+ (process-documentation cl))
(defun hyperobject-class-fmtstr-text (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-text))
+ (slot-value (class-of obj) 'fmtstr-text))
(defun hyperobject-class-fmtstr-html (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-html))
+ (slot-value (class-of obj) 'fmtstr-html))
(defun hyperobject-class-fmtstr-xml (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-xml))
+ (slot-value (class-of obj) 'fmtstr-xml))
(defun hyperobject-class-fmtstr-text-labels (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-text-labels))
+ (slot-value (class-of obj) 'fmtstr-text-labels))
(defun hyperobject-class-fmtstr-html-labels (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-html-labels))
+ (slot-value (class-of obj) 'fmtstr-html-labels))
(defun hyperobject-class-fmtstr-xml-labels (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-xml-labels))
+ (slot-value (class-of obj) 'fmtstr-xml-labels))
(defun hyperobject-class-value-func (obj)
- (slot-value (kmr-class-of obj) 'value-func))
+ (slot-value (class-of obj) 'value-func))
(defun hyperobject-class-xmlvalue-func (obj)
- (slot-value (kmr-class-of obj) 'xmlvalue-func))
+ (slot-value (class-of obj) 'xmlvalue-func))
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun hyperobject-class-title (obj)
- (awhen (slot-value (kmr-class-of obj) 'title)
+ (awhen (slot-value (class-of obj) 'title)
(if (consp it)
(car it)
it))))
-(defun hyperobject-class-subobjects-lists (obj)
- (slot-value (kmr-class-of obj) 'subobjects-lists))
+(defun hyperobject-class-subobjects (obj)
+ (slot-value (class-of obj) 'subobjects))
-(defun hyperobject-class-ref-fields (obj)
- (slot-value (kmr-class-of obj) 'ref-fields))
+(defun hyperobject-class-references (obj)
+ (slot-value (class-of obj) 'references))
(defun hyperobject-class-fields (obj)
- (slot-value (kmr-class-of obj) 'fields))
+ (class-slots (class-of obj)))
(defun hyperobject-class-fmtstr-html-ref (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-html-ref))
+ (slot-value (class-of obj) 'fmtstr-html-ref))
(defun hyperobject-class-fmtstr-xml-ref (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-xml-ref))
+ (slot-value (class-of obj) 'fmtstr-xml-ref))
(defun hyperobject-class-fmtstr-html-ref-labels (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-html-ref-labels))
+ (slot-value (class-of obj) 'fmtstr-html-ref-labels))
(defun hyperobject-class-fmtstr-xml-ref-labels (obj)
- (slot-value (kmr-class-of obj) 'fmtstr-xml-ref-labels))
-
-;;; Class name functions
+ (slot-value (class-of obj) 'fmtstr-xml-ref-labels))
-(defgeneric hyperobject-class-stdname (x))
-(defmethod hyperobject-class-stdname ((name string))
- (string-downcase (subseq name 1)))
-
-(defmethod hyperobject-class-stdname ((cl standard-object))
- (string-downcase (subseq (kmr-class-name (kmr-class-of cl)) 1)))
-
;;;; Generic Print functions
(defparameter *default-textformat* nil)
@@ -410,7 +517,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(defun class-name-of (obj)
- (string-downcase (kmr-class-name (kmr-class-of obj))))
+ (string-downcase (class-name (class-of obj))))
(defun htmlformat-list-start-value-func (x nitems)
(values (hyperobject-class-title x) nitems (class-name-of x)))
@@ -654,12 +761,16 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(funcall (funcall (obj-data-value-func fmt) x) x))))
;; make list of reference link fields for printing to refstr template
- (dolist (field (hyperobject-class-ref-fields x))
+ (dolist (ref (hyperobject-class-references x))
(let ((link-start
- (make-link-start x (link-ref fmt) (car field) (cadr field)
- (nth (position (car field) (hyperobject-class-fields x) :key #'car) field-values)
- (append (caddr field) refvars)))
- (link-end (make-link-end x (link-ref fmt) (car field))))
+ (make-link-start x (link-ref fmt) (name ref) (lookup ref)
+ (nth (position (name ref)
+ (hyperobject-class-fields x)
+ :key #'(lambda (x)
+ (slot-definition-name x)))
+ field-values)
+ (append (link-parameters ref) refvars)))
+ (link-end (make-link-end x (link-ref fmt) (name ref))))
(push link-start refvalues)
(push link-end refvalues)))
(setq refvalues (nreverse refvalues))
@@ -697,9 +808,9 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(when objs
(let ((objlist (mklist objs)))
(dolist (obj objlist)
- (awhen (hyperobject-class-subobjects-lists obj) ;; access list of functions
+ (awhen (hyperobject-class-subobjects obj) ;; access list of functions
(dolist (child-obj it) ;; for each child function
- (awhen (funcall (car child-obj) obj)
+ (awhen (funcall (reader child-obj) obj)
(load-all-subobjects it))))))
objs))
@@ -723,12 +834,12 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(fmt-obj-start obj fmt strm indent)
(fmt-obj-data obj fmt strm (1+ indent) label refvars)
(if subobjects
- (awhen (hyperobject-class-subobjects-lists obj) ;; access list of functions
+ (awhen (hyperobject-class-subobjects obj) ;; access list of functions
(dolist (child-obj it) ;; for each child function
- (awhen (funcall (car child-obj) obj) ;; access set of child objects
+ (awhen (funcall (reader child-obj) obj) ;; access set of child objects
(print-hyperobject-class it fmt strm label
- english-only-function
- (1+ indent) subobjects refvars)))))
+ (1+ indent) english-only-function
+ subobjects refvars)))))
(fmt-obj-end obj fmt strm indent)))
(fmt-list-end (car objs) fmt strm indent nobjs))
t))
@@ -743,7 +854,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
(if file-wrapper
(fmt-file-start fmt os))
(when objs
- (print-hyperobject-class objs fmt os label english-only-function 0 subobjects refvars))
+ (print-hyperobject-class objs fmt os label 0 english-only-function subobjects refvars))
(if file-wrapper
(fmt-file-end fmt os)))
objs)