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

Modified Files: lisp-syntax.lisp Log Message: Make `sharpsign-sharpsign-lexeme' a complete form (and change its name).

--- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2007/01/15 22:13:16 1.17 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2007/01/17 13:31:50 1.18 @@ -375,7 +375,7 @@ (defclass delimiter-lexeme (lisp-lexeme) ()) (defclass text-lexeme (lisp-lexeme) ()) (defclass sharpsign-equals-lexeme (lisp-lexeme) ()) -(defclass sharpsign-sharpsign-lexeme (form-lexeme) ()) +(defclass sharpsign-sharpsign-form (form-lexeme complete-form-mixin) ()) (defclass reader-conditional-positive-lexeme (lisp-lexeme) ()) (defclass reader-conditional-negative-lexeme (lisp-lexeme) ()) (defclass uninterned-symbol-lexeme (lisp-lexeme) ()) @@ -525,7 +525,7 @@ (#= (fo) (make-instance 'sharpsign-equals-lexeme)) (## (fo) - (make-instance 'sharpsign-sharpsign-lexeme)) + (make-instance 'sharpsign-sharpsign-form)) (#+ (fo) (make-instance 'reader-conditional-positive-lexeme)) (#- (fo) @@ -2743,7 +2743,7 @@ (let ((string (form-string syntax (first (children form))))) (parse-integer string :start 1 :end (1- (length string)) :radix 10)))

-(defmethod extract-label ((syntax lisp-syntax) (form sharpsign-sharpsign-lexeme)) +(defmethod extract-label ((syntax lisp-syntax) (form sharpsign-sharpsign-form)) (let ((string (form-string syntax form))) (parse-integer string :start 1 :end (1- (length string)) :radix 10)))

@@ -3101,7 +3101,7 @@ &rest args) (apply #'register-form-label syntax form args))

-(defmethod form-to-object ((syntax lisp-syntax) (form sharpsign-sharpsign-lexeme) +(defmethod form-to-object ((syntax lisp-syntax) (form sharpsign-sharpsign-form) &rest args) (apply #'label-placeholder syntax form (extract-label syntax form) t args))