X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=symbols.lisp;h=870426e3e426169733930484047e168791a43908;hp=12da177a1811d13941506040821540a6dd0a9045;hb=e96b017d2a09ffd9c9279cb4c2341c53f0581022;hpb=1886a1a4a820cc67139972328f5fa9e769729c71

diff --git a/symbols.lisp b/symbols.lisp
index 12da177..870426e 100644
--- a/symbols.lisp
+++ b/symbols.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: symbols.lisp,v 1.5 2003/08/05 23:00:28 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -47,15 +47,18 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (char= #\a (schar (symbol-name '#:a) 0))
-    (pushnew :lowercase-reader *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)
-   #+(and (not case-sensitive) (not lowercase-reader))
-   (string-upcase str)
-   #+(and (not case-sensitive) lowercase-reader)
-   (string-downcase str)
-   #+case-sensitive
-   str)
+  #+(and (not kmrcl-lowercase-reader)) (string-upcase str)
+  #+(and 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))
@@ -66,8 +69,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 +80,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