Changeset 12593

Timestamp:

04/10/10 20:04:15 (13 years ago)

Author:

ehuelsmann

Message:

Switch Stream.readDispatchChar to use ReadtableAccessors?.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• FaslReader.java (modified) (1 diff)
• LispReader.java (modified) (1 diff)
• Stream.java (modified) (2 diffs)

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

@@ -140 +140 @@
 
         {
-            return stream.readDispatchChar(c, true);
+            return stream.readDispatchChar(c, Stream.faslReadtable);
         }
     };

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

@@ -180 +180 @@
 
         {
-            return stream.readDispatchChar(c, false);
+            return stream.readDispatchChar(c, Stream.currentReadtable);
         }
     };

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

@@ -726 +726 @@
     }
 
-    public LispObject readDispatchChar(char dispChar, boolean useFaslReadtable)
-
+    public LispObject readDispatchChar(char dispChar,
+                                       ReadtableAccessor rta)
     {
         int numArg = -1;
@@ -747 +747 @@
         }
         final LispThread thread = LispThread.currentThread();
-        final Readtable rt;
-        if (useFaslReadtable)
-            rt = FaslReadtable.getInstance();
-        else
-            rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread);
+        final Readtable rt = rta.rt(thread);
         LispObject fun = rt.getDispatchMacroCharacter(dispChar, c);
         if (fun instanceof DispatchMacroFunction)