Fix missing `without-special-symbol-access' in `funcall-with-attribute-context'

[clinton/lisp-on-lines.git] / src / display.lisp

diff --git a/src/display.lisp b/src/display.lisp
index a0be611..8fecac9 100644 (file)
--- a/src/display.lisp
+++ b/src/display.lisp
@@ -15,12 +15,35 @@
     (setf context (remove-layer (find-description d)
                                context)))
   (dolist (d activate context)
-    (setf context (adjoin-layer (find-description d)
+    (setf context (adjoin-layer (find-description (if (consp d) (car d) d))
                                context))))
-  
-
-
 
+(defun funcall-with-attribute-context (attribute thunk)
+  (funcall-with-layer-context 
+   (modify-layer-context (current-layer-context)
+                        :activate (attribute-active-descriptions attribute)
+                        :deactivate (attribute-inactive-descriptions attribute))
+   (lambda ()
+     (with-special-symbol-access
+       (contextl::funcall-with-special-initargs
+       (without-special-symbol-access
+         (mappend (lambda (desc)
+                    (when (consp desc)
+                      (let ((description (find-description (car desc))))
+                        (loop 
+                           :for (key val) :on (cdr desc) :by #'cddr
+                           :collect (list (find key (description-attributes description) 
+                                                :key #'attribute-keyword)
+                                          :value val)))))
+                  (attribute-active-descriptions attribute)))
+       (lambda ()
+         (without-special-symbol-access
+           (funcall thunk))))))))
+
+(defmacro with-attribute-context ((attribute) &body body)
+  `(funcall-with-attribute-context ,attribute (lambda () ,@body)))
+  
+  
 (defun display (display object &rest args &key deactivate activate &allow-other-keys)
   (funcall-with-layer-context 
    (modify-layer-context (current-layer-context) 
@@ -30,8 +53,9 @@
      (apply #'display-using-description (description-of object) display object args))))
 
 (define-layered-method display-using-description 
-  :around (description display object &rest args)
+  :around ((description standard-description-object) display object &rest args)
   (declare (ignorable args))
+#+nil  (break "Entering DISPLAY for ~A on ~A using ~A" object display description)
   (let ((*display* display))
     (apply #'funcall-with-described-object 
      (lambda ()
@@ -41,7 +65,6 @@
 
 
 
-
 (defun display/d (&rest args)
   (apply #'display-using-description args))
 
@@ -72,7 +95,7 @@ OMGWTF! If you didn't do this, it's a bug!" description display object args))
                        (list (first description-spec)
                             (if (eq 'description (second description-spec))
                                     'description
-                                    (defining-description (second description-spec)))))
+                                    (contextl::defining-layer (defining-description (second description-spec))))))
                   ,display-spec
                   ,object-spec &rest args)
                   (declare (ignorable args))