X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=symbols.lisp;h=3621ac4a9d5a38d14c84bc6a0285137ae8ac934e;hp=f4e3b6dda0d35612da9659696eba8942cf2c0ab0;hb=93ac7eed8f69f19013472f078b544be145619ff5;hpb=d11d6cc43fd9227a8aeed28dc2cfecdbc587ec4a

diff --git a/symbols.lisp b/symbols.lisp
index f4e3b6d..3621ac4 100644
--- a/symbols.lisp
+++ b/symbols.lisp
@@ -47,15 +47,15 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (char= #\a (schar (symbol-name '#:a) 0))
-    (pushnew :lowercase-reader *features*)))
+    (pushnew :lowercase-reader *features*))
+  (when (not (eql '#:a '#:A))
+    (pushnew :case-sensitive *features*)))
 
 (defun string-default-case (str)
-   #+(and (not case-sensitive) (not lowercase-reader))
-   (string-upcase str)
-   #+(and (not case-sensitive) lowercase-reader)
-   (string-downcase str)
-   #+case-sensitive
-   str)
+  #-lowercase-reader
+  (string-upcase str)
+  #+lowercase-reader
+  (string-downcase str))
 
 (defun concat-symbol-pkg (pkg &rest args)
   (declare (dynamic-extent args))
@@ -66,8 +66,8 @@
              (symbol
               (symbol-name arg)))))
     (let ((str (apply #'concatenate 'string (mapcar #'stringify args))))
-      (intern (string-default-case str)
-	      (if pkg pkg *package*)))))
+      (nth-value 0 (intern (string-default-case str)
+			   (if pkg pkg *package*))))))
 
 
 (defun concat-symbol (&rest args)
@@ -77,8 +77,16 @@
   "Returns keyword for a name"
   (etypecase name
     (keyword name)
-    (string (intern (string-default-case name) :keyword))
-    (symbol (intern (symbol-name name) :keyword))))
+    (string (nth-value 0 (intern (string-default-case name) :keyword)))
+    (symbol (nth-value 0 (intern (symbol-name name) :keyword)))))
+
+(defun ensure-keyword-upcase (desig)
+  (nth-value 0 (intern (string-upcase
+			(symbol-name (ensure-keyword desig))) :keyword)))
+
+(defun ensure-keyword-default-case (desig)
+  (nth-value 0 (intern (string-default-case
+			(symbol-name (ensure-keyword desig))) :keyword)))
 
 (defun show (&optional (what :variables) (package *package*))
   (ecase what