Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv12867
Modified Files: syntax.lisp lisp-syntax.lisp Log Message: Fixed some string-upcasing issues with my earlier changes. Made lisp-syntax accept attribute-line specified packages that aren't in the image yet (like IN-PACKAGE handling does).
--- /project/climacs/cvsroot/climacs/syntax.lisp 2006/05/02 19:59:21 1.63 +++ /project/climacs/cvsroot/climacs/syntax.lisp 2006/05/06 11:57:23 1.64 @@ -218,7 +218,7 @@
(defmethod eval-option :around (syntax (name string) value) ;; Convert the name to a keyword symbol... - (eval-option syntax (intern name (find-package :keyword)) + (eval-option syntax (intern (string-upcase name) (find-package :keyword)) value))
(defmacro define-option-for-syntax --- /project/climacs/cvsroot/climacs/lisp-syntax.lisp 2006/05/03 16:14:27 1.63 +++ /project/climacs/cvsroot/climacs/lisp-syntax.lisp 2006/05/06 11:57:23 1.64 @@ -50,7 +50,7 @@ (option-specified-package :accessor option-specified-package :initform nil :documentation "The package - specified in the local options + specified in the attribute line (may be overridden by (in-package) forms).")) (:name "Lisp") @@ -59,8 +59,7 @@
(define-option-for-syntax lisp-syntax "Package" (syntax package-name) (let ((specified-package (find-package package-name))) - (when specified-package - (setf (option-specified-package syntax) specified-package)))) + (setf (option-specified-package syntax) (or specified-package package-name))))
(define-option-for-syntax lisp-syntax "Base" (syntax base) (let ((integer-base (parse-integer base :junk-allowed t)))