[mcclim-cvs] CVS mcclim/Drei

[thenriksen]

Update of /project/mcclim/cvsroot/mcclim/Drei
In directory clnet:/tmp/cvs-serv21474

Modified Files:
	lisp-syntax.lisp lisp-syntax-commands.lisp 
Log Message:
Removed `unknown-symbol' presentation type.


--- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp	2007/01/03 13:08:04	1.15
+++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp	2007/01/10 20:54:13	1.16
@@ -1848,36 +1848,25 @@
   (with-face (:error)
     (call-next-method)))
 
-(define-presentation-type unknown-symbol () :inherit-from 'symbol
-                          :description "unknown symbol")
-
-(define-presentation-method presentation-typep (object (type unknown-symbol))
-  (or (symbolp object) (stringp object)))
-
 (defmethod display-parse-tree ((parse-symbol token-mixin) stream (drei drei) (syntax lisp-syntax))
   (if (> (the fixnum (end-offset parse-symbol)) (the fixnum (start-offset parse-symbol)))
-      (let ((string (form-string syntax parse-symbol)))
-        (multiple-value-bind (symbol status)
-            (form-to-object syntax parse-symbol :no-error t)
-          (with-output-as-presentation
-              (stream (if status symbol string)
-                      (if status 'symbol 'unknown-symbol)
-                      :single-box :highlighting)
-            (cond ((eql (buffer-object (buffer syntax) (start-offset parse-symbol)) #\:)
-                   (with-face (:keyword)
-                     (call-next-method)))
-                  ((eql (buffer-object (buffer syntax) (start-offset parse-symbol)) #\&)
-                   (with-face (:lambda-list-keyword)
-                     (call-next-method)))
-                  ((and (macro-function symbol)
-                        (form-operator-p parse-symbol syntax))
-                   (with-face (:macro)
-                     (call-next-method)))
-                  ((and (special-operator-p symbol)
-                        (form-operator-p parse-symbol syntax))
-                   (with-face (:special-form)
-                     (call-next-method)))
-                  (t (call-next-method))))))
+      (let ((symbol (form-to-object syntax parse-symbol :no-error t)))
+        (with-output-as-presentation (stream symbol 'symbol :single-box :highlighting)
+          (cond ((eql (buffer-object (buffer syntax) (start-offset parse-symbol)) #\:)
+                 (with-face (:keyword)
+                   (call-next-method)))
+                ((eql (buffer-object (buffer syntax) (start-offset parse-symbol)) #\&)
+                 (with-face (:lambda-list-keyword)
+                   (call-next-method)))
+                ((and (macro-function symbol)
+                      (form-operator-p parse-symbol syntax))
+                 (with-face (:macro)
+                   (call-next-method)))
+                ((and (special-operator-p symbol)
+                      (form-operator-p parse-symbol syntax))
+                 (with-face (:special-form)
+                   (call-next-method)))
+                (t (call-next-method)))))
       (call-next-method)))
 
 (defmethod display-parse-tree ((parser-symbol literal-object-form) stream (drei drei)
--- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-commands.lisp	2006/12/10 19:28:49	1.4
+++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-commands.lisp	2007/01/10 20:54:13	1.5
@@ -165,9 +165,6 @@
 (define-presentation-to-command-translator lookup-symbol-arglist
     (symbol com-lookup-arglist lisp-table
             :gesture :describe
-            :tester ((object presentation)
-                     (declare (ignore object))
-                     (not (eq (presentation-type presentation) 'unknown-symbol)))
             :documentation "Lookup arglist")
     (object)
   (list object))