Changeset 5906


Ignore:
Timestamp:
02/23/04 15:12:17 (17 years ago)
Author:
piso
Message:

LispString? => ComplexString?

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

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/FillPointerOutputStream.java

    r5900 r5906  
    33 *
    44 * Copyright (C) 2003-2004 Peter Graves
    5  * $Id: FillPointerOutputStream.java,v 1.8 2004-02-23 14:54:35 piso Exp $
     5 * $Id: FillPointerOutputStream.java,v 1.9 2004-02-23 15:11:37 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    2424public final class FillPointerOutputStream extends Stream
    2525{
    26     private LispString string;
     26    private ComplexString string;
    2727
    28     private FillPointerOutputStream(LispString string)
     28    private FillPointerOutputStream(ComplexString string)
    2929    {
    3030        elementType = Symbol.CHARACTER;
     
    4343        public LispObject execute(LispObject arg) throws ConditionThrowable
    4444        {
    45             if (arg instanceof LispString) {
    46                 LispString string = (LispString) arg;
     45            if (arg instanceof ComplexString) {
     46                ComplexString string = (ComplexString) arg;
    4747                if (string.getFillPointer() >= 0)
    4848                    return new FillPointerOutputStream(string);
    4949            }
    50             return signal(new TypeError(arg, "string with a fill pointer"));
     50            return signal(new TypeError(String.valueOf(arg) +
     51                                        " is not a string with a fill pointer."));
    5152        }
    5253    };
  • trunk/j/src/org/armedbear/lisp/adjust_array.java

    r5849 r5906  
    33 *
    44 * Copyright (C) 2004 Peter Graves
    5  * $Id: adjust_array.java,v 1.4 2004-02-16 01:48:59 piso Exp $
     5 * $Id: adjust_array.java,v 1.5 2004-02-23 15:12:17 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    6969            }
    7070        }
    71         if (array instanceof LispString) {
    72             LispString s = (LispString) array;
     71        if (array instanceof ComplexString) {
     72            ComplexString s = (ComplexString) array;
    7373            LispObject newSize = null;
    7474            if (dimensions instanceof Cons) {
  • trunk/j/src/org/armedbear/lisp/make_array.java

    r5897 r5906  
    33 *
    44 * Copyright (C) 2003-2004 Peter Graves
    5  * $Id: make_array.java,v 1.11 2004-02-23 14:24:48 piso Exp $
     5 * $Id: make_array.java,v 1.12 2004-02-23 15:12:04 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    9797            if (upgradedType == Symbol.CHARACTER) {
    9898                if (fillPointer != NIL || adjustable != NIL)
    99                     v = new LispString(size);
     99                    v = new ComplexString(size);
    100100                else
    101101                    v = new SimpleString(size);
Note: See TracChangeset for help on using the changeset viewer.