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

Modified Files: lisp-syntax.lisp Log Message: Literal objects are now always considered complete forms, fixes issue reported by Christophe Rhodes.

--- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2006/12/13 20:41:56 1.14 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2007/01/03 13:08:04 1.15 @@ -387,7 +387,7 @@ (defclass bit-vector-form (form-lexeme complete-form-mixin) ()) (defclass number-lexeme (form-lexeme complete-form-mixin) ()) (defclass token-mixin () ()) -(defclass literal-object-lexeme (form-lexeme) ()) +(defclass literal-object-form (form-lexeme complete-form-mixin) ()) (defclass complete-token-lexeme (token-mixin form-lexeme complete-form-mixin) ()) (defclass multiple-escape-start-lexeme (lisp-lexeme) ()) (defclass multiple-escape-end-lexeme (lisp-lexeme) ()) @@ -539,7 +539,7 @@ (t (cond ((or (constituentp object) (eql object #\)) (lex-token syntax scan)) - (t (fo) (make-instance 'literal-object-lexeme)))))))) + (t (fo) (make-instance 'literal-object-form))))))))

(defmethod lex ((syntax lisp-syntax) (state lexer-list-state) scan) (macrolet ((fo () `(forward-object scan))) @@ -1880,7 +1880,7 @@ (t (call-next-method)))))) (call-next-method)))

-(defmethod display-parse-tree ((parser-symbol literal-object-lexeme) stream (drei drei) +(defmethod display-parse-tree ((parser-symbol literal-object-form) stream (drei drei) (syntax lisp-syntax)) (updating-output (stream :unique-id (list drei parser-symbol) @@ -2890,7 +2890,7 @@ (when read (read-from-string (form-string syntax form))))

-(defmethod form-to-object ((syntax lisp-syntax) (form literal-object-lexeme) &key &allow-other-keys) +(defmethod form-to-object ((syntax lisp-syntax) (form literal-object-form) &key &allow-other-keys) (object-after (start-mark form)))

(defmethod form-to-object ((syntax lisp-syntax) (form pathname-form) &key &allow-other-keys)