r8580: add tests/improvements to ensure-keyword-*

diff --git a/os.lisp b/os.lisp
index b31d4bad074778e58d27548677d4457511e2a281..589eac4b74e89a2ef798ce01030315a3770a87b9 100644 (file)
--- a/os.lisp
+++ b/os.lisp
@@ -80,11 +80,8 @@ returns (VALUES output-string pid)"
     
     
     #+allegro
     
     
     #+allegro

-    (multiple-value-bind (output dummy pid)
-       (excl:run-shell-command command :input nil :output :stream
-                               :wait nil)
-      (declare (ignore dummy))
-      (values output pid))
+    (excl:run-shell-command command :input nil :output nil
+                           :wait t)

 
     #+lispworks
     (system:call-system-showing-output
 
     #+lispworks
     (system:call-system-showing-output

diff --git a/symbols.lisp b/symbols.lisp
index eb7ba14944c6379540c4a3bd267a422e371a7e1a..3621ac4a9d5a38d14c84bc6a0285137ae8ac934e 100644 (file)
--- 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))
 
 (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)
 
 (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))
 
 (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))))
              (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)
 
 
 (defun concat-symbol (&rest args)


@@ -77,14 +77,16 @@
   "Returns keyword for a name"
   (etypecase name
     (keyword name)
   "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)
 
 (defun ensure-keyword-upcase (desig)

-  (intern (string-upcase (symbol-name (ensure-keyword desig))) :keyword))
+  (nth-value 0 (intern (string-upcase
+                       (symbol-name (ensure-keyword desig))) :keyword)))

 
 (defun ensure-keyword-default-case (desig)
 
 (defun ensure-keyword-default-case (desig)

-  (intern (string-default-case (symbol-name (ensure-keyword desig))) :keyword))
+  (nth-value 0 (intern (string-default-case
+                       (symbol-name (ensure-keyword desig))) :keyword)))

 
 (defun show (&optional (what :variables) (package *package*))
   (ecase what
 
 (defun show (&optional (what :variables) (package *package*))
   (ecase what

diff --git a/tests.lisp b/tests.lisp
index b4aa20c3d2b74f9a0eff8b867d5d577d70d46c63..ad50708b5dd6c7b64be0e20150a5e4ba0c7413e2 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -315,31 +315,37 @@
                                 :value-range 0.05 :saturation-range 0
                                 :black-limit 0 :gray-limit .1) nil)
 
                                 :value-range 0.05 :saturation-range 0
                                 :black-limit 0 :gray-limit .1) nil)
 

+#+ignore
+(progn

 (deftest dst.1
     (is-dst-change-usa-spring-utime
      (encode-universal-time 0 0 0 2 4 2000)) t)
 (deftest dst.1
     (is-dst-change-usa-spring-utime
      (encode-universal-time 0 0 0 2 4 2000)) t)

-

 (deftest dst.2
     (is-dst-change-usa-spring-utime
      (encode-universal-time 0 0 0 1 4 2000)) nil)
 (deftest dst.2
     (is-dst-change-usa-spring-utime
      (encode-universal-time 0 0 0 1 4 2000)) nil)

-

 (deftest dst.3
     (is-dst-change-usa-spring-utime
      (encode-universal-time 0 0 0 3 4 2000)) nil)
 (deftest dst.3
     (is-dst-change-usa-spring-utime
      (encode-universal-time 0 0 0 3 4 2000)) nil)

-

 (deftest dst.4
     (is-dst-change-usa-fall-utime
      (encode-universal-time 0 0 0 31 10 2004)) t)
 (deftest dst.4
     (is-dst-change-usa-fall-utime
      (encode-universal-time 0 0 0 31 10 2004)) t)

-

 (deftest dst.5
     (is-dst-change-usa-fall-utime
      (encode-universal-time 0 0 0 30 10 2004)) nil)
 (deftest dst.5
     (is-dst-change-usa-fall-utime
      (encode-universal-time 0 0 0 30 10 2004)) nil)

-

 (deftest dst.6
     (is-dst-change-usa-fall-utime
      (encode-universal-time 0 0 0 1 11 2000)) nil)
 (deftest dst.6
     (is-dst-change-usa-fall-utime
      (encode-universal-time 0 0 0 1 11 2000)) nil)

+)
+
+
+(deftest ekdc.1
+    (ensure-keyword-default-case (read-from-string "TYPE")) :type)
+
+(deftest ekdc.2
+    (ensure-keyword-default-case (read-from-string "type")) :type)
+

 
 

-;;; MOP Testing
+ ;;; MOP Testing

 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (find-package '#:kmr-mop)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (when (find-package '#:kmr-mop)