Changeset 8773


Ignore:
Timestamp:
03/14/05 20:23:24 (16 years ago)
Author:
piso
Message:

Cleanup.

File:
1 edited

Legend:

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

    r8660 r8773  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Lisp.java,v 1.325 2005-02-28 02:50:03 piso Exp $
     5 * $Id: Lisp.java,v 1.326 2005-03-14 20:23:24 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    633633        if (arg instanceof LispCharacter)
    634634            return String.valueOf(new char[] {((LispCharacter)arg).value});
    635         signal(new TypeError(arg.writeToString() + " cannot be coerced to a string."));
     635        signal(new TypeError("The value " + arg.writeToString() +
     636                             " cannot be coerced to a string."));
    636637        // Not reached.
    637638        return null;
     
    903904        }
    904905        catch (ClassCastException e) {
    905             signal(new TypeError(obj, "function"));
     906            signal(new TypeError(obj, Symbol.FUNCTION));
    906907            // Not reached.
    907908            return null;
     
    932933        if (obj == null)
    933934            throw new NullPointerException();
    934         signal(new TypeError(obj, "character input stream"));
     935        signal(new TypeError("The value " + obj.writeToString() +
     936                             " is not a character input stream."));
    935937        // Not reached.
    936938        return null;
     
    945947        if (obj == null)
    946948            throw new NullPointerException();
    947         signal(new TypeError(obj, "character output stream"));
     949        signal(new TypeError("The value " + obj.writeToString() +
     950                             " is not a character output stream."));
    948951        // Not reached.
    949952        return null;
     
    958961        if (obj == null)
    959962            throw new NullPointerException();
    960         signal(new TypeError(obj, "binary input stream"));
     963        signal(new TypeError("The value " + obj.writeToString() +
     964                             " is not a binary input stream."));
    961965        // Not reached.
    962966        return null;
     
    979983                return stream;
    980984        }
    981         signal(new TypeError(obj, "character input stream"));
     985        signal(new TypeError("The value " + obj.writeToString() +
     986                             " is not a character input stream."));
    982987        // Not reached.
    983988        return null;
     
    10001005                return stream;
    10011006        }
    1002         signal(new TypeError(obj, "character output stream"));
     1007        signal(new TypeError("The value " + obj.writeToString() +
     1008                             " is not a character output stream."));
    10031009        // Not reached.
    10041010        return null;
     
    10291035        }
    10301036        catch (ClassCastException e) {
    1031             signal(new TypeError(obj, "environment"));
     1037            signal(new TypeError(obj, Symbol.ENVIRONMENT));
    10321038            // Not reached.
    10331039            return null;
     
    11081114        }
    11091115        if (list != NIL)
    1110             signal(new TypeError(String.valueOf(listArg) + " is not a proper list."));
     1116            signal(new TypeError("The value " + listArg.writeToString() +
     1117                                 " is not a proper list."));
    11111118        return false;
    11121119    }
     
    11221129        }
    11231130        if (list != NIL)
    1124             signal(new TypeError(listArg.writeToString() +
     1131            signal(new TypeError("The value " + listArg.writeToString() +
    11251132                                 " is not a proper list."));
    11261133        return false;
Note: See TracChangeset for help on using the changeset viewer.