Changeset 14357

Timestamp:

01/16/13 12:27:33 (11 years ago)

Author:

Mark Evenson

Message:

Fixes #294: Reader doesn't recognize terminating characters in some cases.

Patch and test by Stas.

Location:

trunk/abcl

Files:

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

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

@@ -740 +740 @@
 
     {
-        switch (c) {
-        case '"':
-        case '\'':
-        case '(':
-        case ')':
-        case ',':
-        case ';':
-        case '`':
-            return true;
-        default:
-            return rt.isWhitespace(c);
-        }
+        byte type = rt.getSyntaxType(c);
+
+        return type == Readtable.SYNTAX_TYPE_TERMINATING_MACRO ||
+                type == Readtable.SYNTAX_TYPE_WHITESPACE;
+        
     }
 
@@ -910 +903 @@
                 if (rt.isWhitespace(c))
                     break;
-                if (c == '(' || c == ')') {
+                if (rt.getSyntaxType(c) == 
+                    Readtable.SYNTAX_TYPE_TERMINATING_MACRO) {
                     _unreadChar(c);
                     break;

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

@@ -134 +134 @@
   ((0.0 . 0) (0.0 . 1)))
 
+
+;; http://trac.common-lisp.net/armedbear/ticket/294
+(deftest bugs.reader.1
+    (let ((*readtable* *readtable*))
+      (set-macro-character #\? (lambda (stream char) (code-char (read stream nil nil t))))
+      '(a .?0))
+  (A . #\Null))
+