Changeset 13442


Ignore:
Timestamp:
08/05/11 21:51:28 (12 years ago)
Author:
ehuelsmann
Message:

Remove .toString() methods which override default Java output to be 'lispy';
we have princToString() for that now...

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

Legend:

Unmodified
Added
Removed

  • trunk/abcl/src/org/armedbear/lisp/ByteArrayInputStream.java

    r13441 r13442  
    7070    }
    7171
    72     @Override
    73     public String toString()
    74     {
    75         return unreadableString("BYTE-ARRAY-INPUT-STREAM");
    76     }
    77 
    7872    // ### %make-byte-array-input-stream
    7973    // %make-byte-array-input-stream bytes &optional element-type => byte-array-input-stream

  • trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java

    r12513 r13442  
    9393    }
    9494
    95     @Override
    96     public String toString()
    97     {
    98         return unreadableString("BYTE-ARRAY-OUTPUT-STREAM");
    99     }
    100 
    10195    // ### %make-byte-array-output-stream
    10296    // %make-byte-array-output-stream &optional element-type => byte-array-output-stream

  • trunk/abcl/src/org/armedbear/lisp/EchoStream.java

    r12362 r13442  
    240240    }
    241241
    242     @Override
    243     public String toString()
    244     {
    245         return unreadableString("ECHO-STREAM");
    246     }
    247 
    248242    // ### make-echo-stream
    249243    // input-stream output-stream => echo-stream

  • trunk/abcl/src/org/armedbear/lisp/Nil.java

    r12713 r13442  
    158158    }
    159159
    160     @Override
    161     public String toString()
    162     {
    163         if (Symbol.PRINT_READABLY.symbolValueNoThrow() != NIL)
    164             return "|COMMON-LISP|::|NIL|";
    165         return "NIL";
    166     }
    167 
    168160    public Object readResolve() throws java.io.ObjectStreamException {
    169161       return NIL;

  • trunk/abcl/src/org/armedbear/lisp/NilVector.java

    r12288 r13442  
    238238
    239239    @Override
    240     public String toString()
    241     {
    242         return unreadableString("NIL-VECTOR");
    243     }
    244 
    245     @Override
    246240    public int sxhash()
    247241    {

  • trunk/abcl/src/org/armedbear/lisp/Package.java

    r13440 r13442  
    854854            sb.append("\")");
    855855            return sb.toString();
    856         } else
    857             return toString();
    858     }
    859    
    860     @Override
    861     public String toString() {
    862          if (name != null) {
    863             StringBuilder sb = new StringBuilder("#<PACKAGE \"");
    864             sb.append(name);
    865             sb.append("\">");
    866             return sb.toString();
    867         } else
    868             return unreadableString("PACKAGE");
     856        } else {
     857             if (name != null) {
     858                StringBuilder sb = new StringBuilder("#<PACKAGE \"");
     859                sb.append(name);
     860                sb.append("\">");
     861                return sb.toString();
     862            } else
     863                return unreadableString("PACKAGE");
     864        }
    869865    }
    870866

  • trunk/abcl/src/org/armedbear/lisp/Pathname.java

    r13440 r13442  
    25142514    }
    25152515   
    2516     public String toString() {
    2517         return getNamestring();
    2518     }
    2519 
    25202516    public URL toURL() {
    25212517        try {

  • trunk/abcl/src/org/armedbear/lisp/Readtable.java

    r13440 r13442  
    193193  }
    194194
    195   @Override
    196   public final String toString()
    197   {
    198     return unreadableString("READTABLE");
    199   }
    200 
    201195  public final LispObject getReadtableCase()
    202196  {

  • trunk/abcl/src/org/armedbear/lisp/SlimeInputStream.java

    r12362 r13442  
    139139    }
    140140
    141 
    142     @Override
    143     public String toString()
    144     {
    145         return unreadableString("SLIME-INPUT-STREAM");
    146     }
    147 
    148141    // ### make-slime-input-stream
    149142    // make-slime-input-stream function output-stream => slime-input-stream

  • trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java

    r12513 r13442  
    138138    }
    139139
    140     @Override
    141     public String toString()
    142     {
    143         return unreadableString("SLIME-OUTPUT-STREAM");
    144     }
    145 
    146140    // ### %make-slime-output-stream
    147141    // %make-slime-output-stream function => stream

  • trunk/abcl/src/org/armedbear/lisp/SocketStream.java

    r12288 r13442  
    8181  }
    8282    }
    83 
    84     @Override
    85     public String toString()
    86     {
    87         return unreadableString("SOCKET-STREAM");
    88     }
    8983}

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

    r13440 r13442  
    15771577    }
    15781578
    1579     @Override
    1580     public String toString() {
    1581         return unreadableString("STREAM");
    1582     }
    1583 
    15841579    // read-byte stream &optional eof-error-p eof-value => byte
    15851580    // Reads an 8-bit byte.

  • trunk/abcl/src/org/armedbear/lisp/StringInputStream.java

    r12362 r13442  
    9393
    9494    @Override
    95     public String toString()
    96     {
    97         return unreadableString("STRING-INPUT-STREAM");
    98     }
    99 
    100     @Override
    10195    public int getOffset() {
    10296        return start + super.getOffset();

  • trunk/abcl/src/org/armedbear/lisp/StringOutputStream.java

    r12513 r13442  
    9999    }
    100100
    101     @Override
    102     public String toString()
    103     {
    104         return unreadableString("STRING-OUTPUT-STREAM");
    105     }
    106 
    107101    // ### %make-string-output-stream
    108102    // %make-string-output-stream element-type => string-stream

  • trunk/abcl/src/org/armedbear/lisp/Symbol.java

    r13440 r13442  
    270270    sb.append(n);
    271271    return sb.toString();
    272   }
    273 
    274   @Override
    275   public String toString() {
    276       return getQualifiedName();
    277272  }
    278273
Note: See TracChangeset for help on using the changeset viewer.