r9341: fix case reading

diff --git a/symbols.lisp b/symbols.lisp
index 3621ac4a9d5a38d14c84bc6a0285137ae8ac934e..f4fc111a7f477221726ac5461b041910e26fb404 100644 (file)
--- a/symbols.lisp
+++ b/symbols.lisp
@@ -47,15 +47,19 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (char= #\a (schar (symbol-name '#:a) 0))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (char= #\a (schar (symbol-name '#:a) 0))

-    (pushnew :lowercase-reader *features*))
-  (when (not (eql '#:a '#:A))
-    (pushnew :case-sensitive *features*)))
+    (pushnew :kmrcl-lowercase-reader *features*))
+  (when (not (string= (symbol-name '#:a)
+                     (symbol-name '#:A)))
+    (pushnew :kmrcl-case-sensitive *features*)))

 
 (defun string-default-case (str)
 
 (defun string-default-case (str)

-  #-lowercase-reader
-  (string-upcase str)
-  #+lowercase-reader
-  (string-downcase str))
+  #+kmrcl-case-sensitive str
+  #+(and (not kmrcl-case-sensitive) (not kmrcl-lowercase-reader)) (string-upcase str)
+  #+(and (not kmrcl-case-sensitive) kmrcl-lowercase-reader) (string-downcase str))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (setq cl:*features* (delete :kmrcl-lowercase-reader *features*))
+  (setq cl:*features* (delete :kmrcl-case-sensitive *features*)))

 
 (defun concat-symbol-pkg (pkg &rest args)
   (declare (dynamic-extent args))
 
 (defun concat-symbol-pkg (pkg &rest args)
   (declare (dynamic-extent args))