-(declaim (optimize (speed 2) (space 3) (safety 0)))
-
(in-package :lisp-on-lines)
-(defparameter *default-type* :ucw)
-
(define-layered-class description ()
((description-type
:initarg :type
(description-properties
:accessor description.properties
:initform nil
- :special t)
+ :special t
+ :documentation "TODO: not used much anymore, and shouldn't be relied on")
(described-object
:layered-accessor object
:initform nil
:special t)
+ (description-default-attributes
+ :accessor default-attributes
+ :initarg :default-attributes
+ :initform nil
+ :special t)
(description-attributes
:accessor attributes
:initarg :attributes
:initform nil
+ :special t)
+ (description-default-properties
+ :accessor default-properties
+ :initarg :default-properties
+ :initform '()
:special t)))
+(defmethod attributes :around ((description description))
+ "Add any default properties to the attributes"
+
+ (let ((default-properties (default-properties description)))
+ (if (and (listp default-properties)
+ (not (null default-properties)))
+ (let ((a (mapcar #'(lambda (att)
+ (append (ensure-list att) default-properties))
+ (call-next-method))))
+
+
+ a)
+ (call-next-method))))
+
(defmethod print-object ((self description) stream)
(print-unreadable-object (self stream :type t)
(with-slots (description-type) self
- (format t "~A" description-type))))
+ (format stream "~A" description-type))))
;;;; * Occurences
(defvar *occurence-map* (make-hash-table)
"a display is generated by associating an 'occurence'
with an instance of a class. This is usually keyed off class-name,
-although an arbitrary occurence can be used with an arbitrary class.")
+although an arbitrary occurence could be used with an arbitrary class.")
(define-layered-class
standard-occurence (description)
- ((attribute-map :accessor attribute-map :initform (make-hash-table)))
+ ((occurence-name :accessor name :initarg :name)
+ (attribute-map :accessor attribute-map :initform (make-hash-table)))
(:documentation
"an occurence holds the attributes like a class holds slot-definitions.
Attributes are the metadata used to display, validate, and otherwise manipulate actual values stored in lisp objects."))
(let ((occurence (gethash name *occurence-map*)))
(if occurence
occurence
- (let ((new-occurence (make-instance 'standard-occurence)))
+ (let ((new-occurence (make-instance 'standard-occurence :name name)))
(setf (gethash name *occurence-map*) new-occurence)
new-occurence))))
(occurence :accessor occurence :initarg :occurence :initform nil)
(label :initarg :label :layered-accessor label :initform nil :special t)))
+
;;;; * Attributes
(defmethod print-object ((self attribute) stream)
(print-unreadable-object (self stream :type t)
- (with-slots (name description-type) self
- (format stream "~A ~A" description-type name))))
+ (with-slots (attribute-name description-type) self
+ (format stream "~A ~A" description-type attribute-name))))
(define-layered-class
standard-attribute (attribute)
((setter :accessor setter :initarg :setter :special t :initform nil)
(getter :accessor getter :initarg :getter :special t :initform nil)
- (slot-name :accessor slot-name :initarg :slot-name :special t)
- (id :accessor id :initarg :id :special t :initform (random-string)))
+ (value :accessor value :initarg :value :special t)
+ (slot-name :accessor slot-name :initarg :slot-name :special t :initform nil))
(:documentation "Attributes are used to display a part of a thing, such as a slot of an object, a text label, the car of a list, etc."))
+(define-layered-method label :around ((attribute standard-attribute))
+ (or (call-next-method) (attribute.name attribute)))
+
(defmacro defattribute (name supers slots &rest args)
(let* (
(type-provided-p (second (assoc :type-name args)))
(type (or type-provided-p name))
(layer (or (second (assoc :in-layer args)) nil))
(properties (cdr (assoc :default-properties args)))
- (cargs (remove-if #'(lambda (key)
+ (cargs (remove-if #'(lambda (key)
(or (eql key :type-name)
(eql key :default-properties)
(eql key :default-initargs)
(:default-initargs :properties (list ,@properties)
,@ (cdr (assoc :default-initargs args))))
- ,(unless (not type-provided-p)
- `(defmethod find-attribute-class-for-type ((type (eql ',type)))
+ ,(when (or
+ type-provided-p
+ (not (find-attribute-class-for-type name)))
+ `(defmethod find-attribute-class-for-type ((type (eql ',type)))
',name)))))
-(define-layered-class
- display-attribute (attribute)
- ()
- (:documentation "Presentation Attributes are used to display objects
-using the attributes defined in an occurence. Presentation Attributes are always named using keywords."))
-
(defun clear-attributes (name)
"removes all attributes from an occurance"
(clear-occurence (find-occurence name)))
(defmethod find-attribute-class-for-type (type)
nil)
-(defmethod find-attribute-class-for-name (name)
- "presentation attributes are named using keywords"
- (if (keywordp name)
- 'display-attribute
- 'standard-attribute))
-
-(defun make-attribute (&rest args &key name type &allow-other-keys)
+(defun make-attribute (&rest args &key type &allow-other-keys)
(apply #'make-instance
(or (find-attribute-class-for-type type)
- (find-attribute-class-for-name name))
+ 'standard-attribute)
+ :properties args
args))
(defmethod ensure-attribute ((occurence standard-occurence) &rest args &key name &allow-other-keys)
"Creates an attribute in the given occurence"
(let ((attribute (apply #'make-attribute :occurence occurence args)))
- (setf (description.properties attribute) args)
- (setf (gethash name (attribute-map occurence))
- attribute)))
+ (setf (find-attribute occurence name) attribute)))
+
+(defmethod find-attribute ((occurence null) name)
+ nil)
(defmethod find-attribute ((occurence standard-occurence) name)
- (gethash name (attribute-map occurence)))
+ (or (gethash name (attribute-map occurence))
+ (let* ((class (ignore-errors (find-class (name occurence))))
+ (class-direct-superclasses
+ (when class
+ (closer-mop:class-direct-superclasses
+ class))))
+ (when class-direct-superclasses
+ (let ((attribute
+ (find-attribute
+ (find-occurence (class-name
+ (car
+ class-direct-superclasses)))
+ name)))
+ attribute)))))
(defmethod find-all-attributes ((occurence standard-occurence))
(loop for att being the hash-values of (attribute-map occurence)
- collect att))
+ collect att))
(defmethod ensure-attribute (occurence-name &rest args &key name type &allow-other-keys)
(declare (ignore name type))
ATTRIBUTE-SPEC: a list of (type name &rest initargs)"
(apply #'ensure-attribute occurence-name :name attribute-name :type (first attribute-spec) (rest attribute-spec)))
+(defmethod (setf find-attribute) ((attribute standard-attribute) occurence attribute-name)
+ "Create a new attribute in the occurence.
+ATTRIBUTE-SPEC: a list of (type name &rest initargs)"
+ (setf (gethash attribute-name (attribute-map occurence))
+ attribute))
+
+(defmethod (setf find-attribute) ((attribute null) occurence attribute-name)
+ "Create a new attribute in the occurence.
+ATTRIBUTE-SPEC: a list of (type name &rest initargs)"
+ (setf (gethash attribute-name (attribute-map occurence))
+ attribute))
(defmethod find-attribute ((attribute-with-occurence attribute) attribute-name)
(find-attribute (occurence attribute-with-occurence) attribute-name))
,@(loop for occurence-name in occurence-names
collect `(perform-define-attributes (quote ,occurence-name) (quote ,attribute-definitions)))))
-(defmethod find-display-attribute (occurence name)
- (find-attribute occurence (intern (symbol-name name) "KEYWORD")))
(defmethod find-description (object type)
(let ((occurence (find-occurence object)))
- (or (find-display-attribute
- occurence
- type)
- occurence)))
+ occurence))
+;;"Unused???"
(defmethod setter (attribute)
(warn "Setting ~A in ~A" attribute *context*)
(let ((setter (getf (description.properties attribute) :setter))
(define-layered-function attribute-value (instance attribute)
(:documentation " Like SLOT-VALUE for instances, the base method calls GETTER."))
+(defmethod attribute-slot-value (instance attribute)
+ "Return (VALUES slot-value-or-nil existsp boundp
+
+If this attribute, in its current context, refers to a slot,
+we return slot-value-or nil either boundp or not."
+ (let (existsp boundp slot-value-or-nil)
+ (cond
+ ((and (slot-boundp attribute 'slot-name) (slot-name attribute))
+ (when (slot-exists-p instance (slot-name attribute))
+ (setf existsp t)
+ (when (slot-boundp instance (slot-name attribute))
+ (setf boundp t
+ slot-value-or-nil (slot-value
+ instance
+ (slot-name attribute))))))
+ ((and (slot-exists-p instance (attribute.name attribute)))
+ (setf existsp t)
+ (when (slot-boundp instance (attribute.name attribute))
+ (setf boundp t
+ slot-value-or-nil (slot-value
+ instance
+ (attribute.name attribute))))))
+ (VALUES slot-value-or-nil existsp boundp)))
+
(define-layered-method attribute-value (instance (attribute standard-attribute))
- (with-slots (getter slot-name) attribute
- (cond ((and (slot-boundp attribute 'getter) getter)
- (funcall getter instance))
- ((and (slot-boundp attribute 'slot-name) slot-name)
- (when (slot-boundp instance slot-name)
- (slot-value instance slot-name)))
- ((and (slot-exists-p instance (attribute.name attribute)) )
- (when (slot-boundp instance (attribute.name attribute))
- (slot-value instance (attribute.name attribute)))))))
+ "return the attribute value or NIL if it cannot be found"
+ (with-slots (getter value) attribute
+ (when (slot-boundp attribute 'value)
+ (setf getter (constantly value)))
+ (if (and (slot-boundp attribute 'getter) getter)
+ ;;;; call the getter
+ (funcall getter instance)
+ ;;;; or default to the attribute-slot-value
+ (attribute-slot-value instance attribute))))
(define-layered-function (setf attribute-value) (value instance attribute))
(setf attribute-value) (value instance (attribute standard-attribute))
(with-slots (setter slot-name) attribute
(cond ((and (slot-boundp attribute 'setter) setter)
-
(funcall setter value instance))
((and (slot-boundp attribute 'slot-name) slot-name)
(setf (slot-value instance slot-name) value))
- ((and (slot-exists-p instance (attribute.name attribute)) slot-name)
+ ((and (slot-exists-p instance (attribute.name attribute)))
(setf (slot-value instance (attribute.name attribute)) value))
(t
(error "Cannot set ~A in ~A" attribute instance)))))
;;;; ** Default Attributes
-
-
+;;;; TODO: This is mosty an ugly hack and should be reworked.
+;;;;
;;;; The default mewa class contains the types use as defaults.
;;;; maps meta-model slot-types to slot-presentation
,@body))
(define-attributes (default)
- (boolean mewa-boolean)
- (string mewa-string)
- (number mewa-currency)
- (integer mewa-integer)
- (currency mewa-currency)
- (clsql:generalized-boolean mewa-boolean)
- (foreign-key foreign-key)
- (:viewer mewa-viewer)
- (:editor mewa-editor)
- (:creator mewa-creator)
- (:as-string mewa-one-line-presentation)
- (:one-line mewa-one-line-presentation)
- (:listing mewa-list-presentation :global-properties (:editablep nil) :editablep t)
- (:search-model mewa-object-presentation))
-
-(defun find-presentation-attributes (occurence-name)
- (loop for att in (find-all-attributes occurence-name)
- when (typep att 'display-attribute)
- collect att))
+ (boolean boolean)
+ (string string)
+ (number currency)
+ (integer integer)
+ (currency currency)
+ (clsql:generalized-boolean boolean)
+ (foreign-key has-a))
(defun attribute-to-definition (attribute)
(nconc (list (attribute.name attribute)
(description.properties attribute)))
(defun find-default-presentation-attribute-definitions ()
- (if (eql *default-attributes-class-name* 'default)
- (mapcar #'attribute-to-definition (find-presentation-attributes 'default))
- (remove-duplicates (mapcar #'attribute-to-definition
- (append
- (find-presentation-attributes 'default)
- (find-presentation-attributes
- *default-attributes-class-name*))))))
+ nil)
+
(defun gen-ptype (type)
(let* ((type (if (consp type) (car type) type))
(possible-default (find-attribute *default-attributes-class-name* type))
:slot-name ,slot-name)))
;; This software is Copyright (c) Drew Crampsie, 2004-2005.
-;; You are granted the rights to distribute
-;; and use this software as governed by the terms
-;; of the Lisp Lesser GNU Public License
-;; (http://opensource.franz.com/preamble.html),
-;; known as the LLGPL.
HCoop / clinton / lisp-on-lines.git / blobdiff