Changeset 12594


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

Switch Stream.readList 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

    r12593 r12594  
    112112
    113113        {
    114             return stream.readList(false, true);
     114            return stream.readList(false, Stream.faslReadtable);
    115115        }
    116116    };
     
    154154        {
    155155            final LispThread thread = LispThread.currentThread();
    156             LispObject list = stream.readList(true, true);
     156            LispObject list = stream.readList(true, Stream.faslReadtable);
    157157            if (_BACKQUOTE_COUNT_.symbolValue(thread).zerop()) {
    158158                if (n >= 0) {
  • trunk/abcl/src/org/armedbear/lisp/LispReader.java

    r12593 r12594  
    139139
    140140        {
    141             return stream.readList(false, false);
     141            return stream.readList(false, Stream.currentReadtable);
    142142        }
    143143    };
     
    194194        {
    195195            final LispThread thread = LispThread.currentThread();
    196             LispObject list = stream.readList(true, false);
     196            LispObject list = stream.readList(true, Stream.currentReadtable);
    197197            if (_BACKQUOTE_COUNT_.symbolValue(thread).zerop()) {
    198198                if (n >= 0) {
  • trunk/abcl/src/org/armedbear/lisp/Stream.java

    r12593 r12594  
    643643    }
    644644
    645     public LispObject readList(boolean requireProperList, boolean useFaslReadtable)
    646 
     645    public LispObject readList(boolean requireProperList,
     646                               ReadtableAccessor rta)
    647647    {
    648648        final LispThread thread = LispThread.currentThread();
    649649        Cons first = null;
    650650        Cons last = null;
    651         Readtable rt = null;
    652         if (useFaslReadtable)
    653             rt = FaslReadtable.getInstance();
     651        Readtable rt;
    654652        try {
    655653            while (true) {
    656                 if (!useFaslReadtable)
    657                     rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread);
     654                rt = rta.rt(thread);
    658655                char c = flushWhitespace(rt);
    659656                if (c == ')') {
Note: See TracChangeset for help on using the changeset viewer.