(in-package :lisp-on-lines)
(define-layered-function display-using-description (description object component)
-; (:argument-precedence-order )
(:method-combination wrapping-standard)
(:documentation
"Render the object in component,
(let* ((description (find-occurence object)))
(if description
- (dletf (((description.type description) type)
+ (dletf (((description-type description) type)
((attributes description) (or
(attributes description)
- (list-slots object))))
+ (list-attributes description))))
;; apply the default line to the description
(funcall-with-description
description
"Displays OBJECT in COMPONENT."))
(define-layered-method display ((component t) (object t)
- &rest properties
- &key type (line #'line-in)
- &allow-other-keys)
+ &rest properties)
" The default display dispatch method
DISPLAY takes two required arguments,
that is to say the parameters that come together to create the output.
The default display calls out via FUNCALL-WITH-LAYERS to tche DISPLAY-USING-DESCRIPTION method."
-
- (let* ((description (find-occurence object)))
-
- (if description
- (dletf (((description.type description) type)
- ((attributes description) (or
- (attributes description)
- (list-slots object))))
- ;; apply the default line to the description
- (funcall-with-description
- description
- (funcall line object)
- ;; apply the passed in arguments and call display-using-description
- #'(lambda ()
- (funcall-with-description
- description
- properties
- #'display-using-description description object component))))
- (error "no description for ~A" object))))
+ (funcall (apply 'make-display-function component object properties)
+ 'display-using-description))
;;;;; Macros
(defun funcall-with-description (description properties function &rest args)
(if description
- (dletf* (((description.type description) (or
+ (dletf* (((description-type description) (or
(getf properties :type)
- (description.type description)))
+ (description-type description)))
- ((description.layers description) (append
- (description.layers description)
+ ((description-layers description) (append
+ (description-layers description)
(getf properties :layers)))
- ((description.properties description) (append (description.properties description) properties)))
+ ((description-properties description) (append (description-properties description) properties)))
(funcall-with-layers
- (description.layers description)
+ (description-layers description)
#'(lambda ()
(contextl::funcall-with-special-initargs
(list (cons description properties))
(declare (ignorable self))
(flet ((display* (thing &rest args)
(apply #'display ,component thing args))
- (display-attribute (attribute obj &optional props)
+ (display-attribute (attribute obj &rest
+ props)
(if props
(funcall-with-description
attribute props
component)
(t
(setf c component)
- `(,c component))))
+ `(,c t))))
(with-component (,c)
,@(cdr tail)))))))))