Changeset 13508

Timestamp:

08/16/11 09:49:25 (14 years ago)

Author:

Mark Evenson

Message:

Fix #148: READTABLE-CASE :invert doesn't work for symbols.

A slightly modified version of the patch provided by Ole Arnedt with a
test.

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/Stream.java (modified) (1 diff)
• test/lisp/abcl/bugs.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Stream.java ¶

@@ -546 +546 @@
         final Readtable rt =
             (Readtable) Symbol.CURRENT_READTABLE.symbolValue(LispThread.currentThread());
-        StringBuilder sb = new StringBuilder();
-        _readToken(sb, rt);
-        return new Symbol(sb.toString());
+        return readSymbol(rt);
     }
 
     public LispObject readSymbol(Readtable rt) {
-        StringBuilder sb = new StringBuilder();
-        _readToken(sb, rt);
-        return new Symbol(sb.toString());
+        final StringBuilder sb = new StringBuilder();
+        final BitSet flags = _readToken(sb, rt);
+        return new Symbol(rt.getReadtableCase() == Keyword.INVERT
+                          ? invert(sb.toString(), flags)
+                          : sb.toString());
     }
 

trunk/abcl/test/lisp/abcl/bugs.lisp ¶

@@ -72 +72 @@
                 
                     
-                    
+
+(deftest bugs.readtable-case.1 
+  (let (original-case result)
+    (setf original-case (readtable-case *readtable*)
+          (readtable-case *readtable*) :invert
+          result (list (string (read-from-string "lower"))
+                       (string (read-from-string "UPPER"))
+                       (string (read-from-string "#:lower"))
+                       (string (read-from-string "#:UPPER")))
+          (readtable-case *readtable*) original-case)
+    (values-list result))
+  "LOWER" "upper" "LOWER" "upper")