Changeset 12593


Ignore:
Timestamp:
04/10/10 20:04:15 (11 years ago)
Author:
ehuelsmann
Message:

Switch Stream.readDispatchChar to use ReadtableAccessors?.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/FaslReader.java

    r12592 r12593  
    140140
    141141        {
    142             return stream.readDispatchChar(c, true);
     142            return stream.readDispatchChar(c, Stream.faslReadtable);
    143143        }
    144144    };
  • trunk/abcl/src/org/armedbear/lisp/LispReader.java

    r12592 r12593  
    180180
    181181        {
    182             return stream.readDispatchChar(c, false);
     182            return stream.readDispatchChar(c, Stream.currentReadtable);
    183183        }
    184184    };
  • trunk/abcl/src/org/armedbear/lisp/Stream.java

    r12592 r12593  
    726726    }
    727727
    728     public LispObject readDispatchChar(char dispChar, boolean useFaslReadtable)
    729 
     728    public LispObject readDispatchChar(char dispChar,
     729                                       ReadtableAccessor rta)
    730730    {
    731731        int numArg = -1;
     
    747747        }
    748748        final LispThread thread = LispThread.currentThread();
    749         final Readtable rt;
    750         if (useFaslReadtable)
    751             rt = FaslReadtable.getInstance();
    752         else
    753             rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread);
     749        final Readtable rt = rta.rt(thread);
    754750        LispObject fun = rt.getDispatchMacroCharacter(dispChar, c);
    755751        if (fun instanceof DispatchMacroFunction)
Note: See TracChangeset for help on using the changeset viewer.