Changeset 10202


Ignore:
Timestamp:
10/23/05 16:39:49 (16 years ago)
Author:
piso
Message:

Symbol refactoring (work in progress).

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

Legend:

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

    r10115 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: AbstractArray.java,v 1.44 2005-10-15 17:10:02 piso Exp $
     5 * $Id: AbstractArray.java,v 1.45 2005-10-23 16:39:48 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    171171        FastStringBuffer sb = new FastStringBuffer();
    172172        LispThread thread = LispThread.currentThread();
    173         LispObject printReadably = _PRINT_READABLY_.symbolValue(thread);
    174         if (printReadably != NIL || _PRINT_ARRAY_.symbolValue(thread) != NIL) {
     173        LispObject printReadably = Symbol.PRINT_READABLY.symbolValue(thread);
     174        if (printReadably != NIL || Symbol.PRINT_ARRAY.symbolValue(thread) != NIL) {
    175175            int maxLevel = Integer.MAX_VALUE;
    176176            if (printReadably != NIL) {
     
    230230        } else {
    231231            final LispObject printReadably =
    232                 _PRINT_READABLY_.symbolValue(thread);
     232                Symbol.PRINT_READABLY.symbolValue(thread);
    233233            int maxLength = Integer.MAX_VALUE;
    234234            int maxLevel = Integer.MAX_VALUE;
    235235            if (printReadably == NIL) {
    236236                final LispObject printLength =
    237                     _PRINT_LENGTH_.symbolValue(thread);
     237                    Symbol.PRINT_LENGTH.symbolValue(thread);
    238238                if (printLength instanceof Fixnum)
    239239                    maxLength = ((Fixnum)printLength).value;
  • trunk/j/src/org/armedbear/lisp/AbstractBitVector.java

    r8835 r10202  
    33 *
    44 * Copyright (C) 2004-2005 Peter Graves
    5  * $Id: AbstractBitVector.java,v 1.11 2005-03-25 03:19:20 piso Exp $
     5 * $Id: AbstractBitVector.java,v 1.12 2005-10-23 16:39:48 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    166166        final LispThread thread = LispThread.currentThread();
    167167        final int length = length();
    168         if (_PRINT_READABLY_.symbolValue(thread) != NIL ||
     168        if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL ||
    169169            _PRINT_ARRAY_.symbolValue(thread) != NIL)
    170170        {
  • trunk/j/src/org/armedbear/lisp/AbstractString.java

    r9633 r10202  
    33 *
    44 * Copyright (C) 2004 Peter Graves
    5  * $Id: AbstractString.java,v 1.9 2005-07-10 15:20:44 piso Exp $
     5 * $Id: AbstractString.java,v 1.10 2005-10-23 16:39:48 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    7676            endIndex = limit;
    7777        final LispThread thread = LispThread.currentThread();
    78         if (_PRINT_ESCAPE_.symbolValue(thread) != NIL ||
    79             _PRINT_READABLY_.symbolValue(thread) != NIL)
     78        if (Symbol.PRINT_ESCAPE.symbolValue(thread) != NIL ||
     79            Symbol.PRINT_READABLY.symbolValue(thread) != NIL)
    8080        {
    8181            FastStringBuffer sb = new FastStringBuffer('"');
  • trunk/j/src/org/armedbear/lisp/AbstractVector.java

    r10103 r10202  
    183183    {
    184184        final LispThread thread = LispThread.currentThread();
    185         if (_PRINT_READABLY_.symbolValue(thread) != NIL) {
    186             StringBuffer sb = new StringBuffer("#(");
     185        if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL) {
     186            FastStringBuffer sb = new FastStringBuffer("#(");
    187187            final int limit = length();
    188188            for (int i = 0; i < limit; i++) {
  • trunk/j/src/org/armedbear/lisp/CellError.java

    r9501 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: CellError.java,v 1.6 2005-06-23 00:41:08 piso Exp $
     5 * $Id: CellError.java,v 1.7 2005-10-23 16:39:48 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    8282    public String writeToString() throws ConditionThrowable
    8383    {
    84         if (_PRINT_ESCAPE_.symbolValue() == NIL)
     84        if (Symbol.PRINT_ESCAPE.symbolValue() == NIL)
    8585            return super.writeToString();
    8686        StringBuffer sb = new StringBuffer(typeOf().writeToString());
  • trunk/j/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java

    r8835 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: ComplexArray_UnsignedByte8.java,v 1.3 2005-03-25 03:19:20 piso Exp $
     5 * $Id: ComplexArray_UnsignedByte8.java,v 1.4 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    203203    public String writeToString() throws ConditionThrowable
    204204    {
    205         if (_PRINT_READABLY_.symbolValue() != NIL) {
     205        if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
    206206            signal(new PrintNotReadable(list2(Keyword.OBJECT, this)));
    207207            // Not reached.
  • trunk/j/src/org/armedbear/lisp/Condition.java

    r9530 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: Condition.java,v 1.41 2005-06-25 20:07:53 piso Exp $
     5 * $Id: Condition.java,v 1.42 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    158158    {
    159159        final LispThread thread = LispThread.currentThread();
    160         if (_PRINT_ESCAPE_.symbolValue(thread) == NIL) {
     160        if (Symbol.PRINT_ESCAPE.symbolValue(thread) == NIL) {
    161161            String s = getMessage();
    162162            if (s != null)
  • trunk/j/src/org/armedbear/lisp/DoubleFloat.java

    r9899 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: DoubleFloat.java,v 1.4 2005-08-23 12:20:08 piso Exp $
     5 * $Id: DoubleFloat.java,v 1.5 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    508508        String s1 = String.valueOf(value);
    509509        LispThread thread = LispThread.currentThread();
    510         if (_PRINT_READABLY_.symbolValue(thread) != NIL ||
     510        if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL ||
    511511            !memq(_READ_DEFAULT_FLOAT_FORMAT_.symbolValue(thread),
    512512                  list2(Symbol.DOUBLE_FLOAT, Symbol.LONG_FLOAT)))
  • trunk/j/src/org/armedbear/lisp/Interpreter.java

    r10201 r10202  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Interpreter.java,v 1.95 2005-10-23 16:22:05 piso Exp $
     5 * $Id: Interpreter.java,v 1.96 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    311311                            sb.append("  ");
    312312                            final LispThread thread = LispThread.currentThread();
    313                             thread.bindSpecial(_PRINT_ESCAPE_, NIL);
     313                            thread.bindSpecial(Symbol.PRINT_ESCAPE, NIL);
    314314                            sb.append(c.getCondition().writeToString());
    315315                            sb.append(separator);
     
    485485                final LispThread thread = LispThread.currentThread();
    486486                final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    487                 thread.bindSpecial(_PRINT_ESCAPE_, NIL);
     487                thread.bindSpecial(Symbol.PRINT_ESCAPE, NIL);
    488488                try {
    489489                    final LispObject truename =
  • trunk/j/src/org/armedbear/lisp/Lisp.java

    r10201 r10202  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Lisp.java,v 1.402 2005-10-23 16:19:42 piso Exp $
     5 * $Id: Lisp.java,v 1.403 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    16051605                            LispObject obj = args[j++];
    16061606                            SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    1607                             thread.bindSpecial(_PRINT_ESCAPE_, NIL);
    1608                             thread.bindSpecial(_PRINT_READABLY_, NIL);
     1607                            thread.bindSpecial(Symbol.PRINT_ESCAPE, NIL);
     1608                            thread.bindSpecial(Symbol.PRINT_READABLY, NIL);
    16091609                            sb.append(obj.writeToString());
    16101610                            thread.lastSpecialBinding = lastSpecialBinding;
     
    16141614                            LispObject obj = args[j++];
    16151615                            SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    1616                             thread.bindSpecial(_PRINT_ESCAPE_, T);
     1616                            thread.bindSpecial(Symbol.PRINT_ESCAPE, T);
    16171617                            sb.append(obj.writeToString());
    16181618                            thread.lastSpecialBinding = lastSpecialBinding;
     
    16221622                            LispObject obj = args[j++];
    16231623                            SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    1624                             thread.bindSpecial(_PRINT_ESCAPE_, NIL);
     1624                            thread.bindSpecial(Symbol.PRINT_ESCAPE, NIL);
    16251625                            thread.bindSpecial(_PRINT_RADIX_, NIL);
    16261626                            thread.bindSpecial(_PRINT_BASE_, new Fixnum(10));
     
    16321632                            LispObject obj = args[j++];
    16331633                            SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    1634                             thread.bindSpecial(_PRINT_ESCAPE_, NIL);
     1634                            thread.bindSpecial(Symbol.PRINT_ESCAPE, NIL);
    16351635                            thread.bindSpecial(_PRINT_RADIX_, NIL);
    16361636                            thread.bindSpecial(_PRINT_BASE_, new Fixnum(16));
     
    20292029        exportSpecial("*PRINT-CIRCLE*", PACKAGE_CL, NIL);
    20302030
    2031     public static final Symbol _PRINT_ESCAPE_ =
    2032         exportSpecial("*PRINT-ESCAPE*", PACKAGE_CL, T);
    2033 
    2034     public static final Symbol _PRINT_GENSYM_ =
    2035         exportSpecial("*PRINT-GENSYM*", PACKAGE_CL, T);
     2031//     public static final Symbol Symbol.PRINT_ESCAPE =
     2032//         exportSpecial("*PRINT-ESCAPE*", PACKAGE_CL, T);
     2033    static {
     2034        Symbol.PRINT_ESCAPE.initializeSpecial(T);
     2035    }
     2036
     2037//     public static final Symbol Symbol.PRINT_GENSYM =
     2038//         exportSpecial("*PRINT-GENSYM*", PACKAGE_CL, T);
     2039    static {
     2040        Symbol.PRINT_GENSYM.initializeSpecial(T);
     2041    }
    20362042
    20372043    public static final Symbol _PRINT_LENGTH_ =
     
    20562062        exportSpecial("*PRINT-RADIX*", PACKAGE_CL, NIL);
    20572063
    2058     public static final Symbol _PRINT_READABLY_ = Symbol._PRINT_READABLY_;
    20592064    static {
    2060         _PRINT_READABLY_.initializeSpecial(NIL);
     2065        Symbol.PRINT_READABLY.initializeSpecial(NIL);
    20612066    }
    20622067
  • trunk/j/src/org/armedbear/lisp/LispCharacter.java

    r10119 r10202  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: LispCharacter.java,v 1.66 2005-10-16 02:00:31 piso Exp $
     5 * $Id: LispCharacter.java,v 1.67 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    181181    {
    182182        final LispThread thread = LispThread.currentThread();
    183         boolean printReadably = (_PRINT_READABLY_.symbolValue(thread) != NIL);
     183        boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL);
    184184        // "Specifically, if *PRINT-READABLY* is true, printing proceeds as if
    185185        // *PRINT-ESCAPE*, *PRINT-ARRAY*, and *PRINT-GENSYM* were also true,
     
    187187        // false."
    188188        boolean printEscape =
    189             printReadably || (_PRINT_ESCAPE_.symbolValue(thread) != NIL);
     189            printReadably || (Symbol.PRINT_ESCAPE.symbolValue(thread) != NIL);
    190190        FastStringBuffer sb = new FastStringBuffer();
    191191        if (printEscape) {
  • trunk/j/src/org/armedbear/lisp/LogicalPathname.java

    r10059 r10202  
    33 *
    44 * Copyright (C) 2004-2005 Peter Graves
    5  * $Id: LogicalPathname.java,v 1.20 2005-09-28 17:50:09 piso Exp $
     5 * $Id: LogicalPathname.java,v 1.21 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    221221    {
    222222        final LispThread thread = LispThread.currentThread();
    223         boolean printReadably = (_PRINT_READABLY_.symbolValue(thread) != NIL);
    224         boolean printEscape = (_PRINT_ESCAPE_.symbolValue(thread) != NIL);
     223        boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL);
     224        boolean printEscape = (Symbol.PRINT_ESCAPE.symbolValue(thread) != NIL);
    225225        FastStringBuffer sb = new FastStringBuffer();
    226226        if (printReadably || printEscape)
  • trunk/j/src/org/armedbear/lisp/Nil.java

    r9600 r10202  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Nil.java,v 1.41 2005-07-07 05:27:29 piso Exp $
     5 * $Id: Nil.java,v 1.42 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    200200    public String toString()
    201201    {
    202         if (_PRINT_READABLY_.symbolValueNoThrow() != NIL)
     202        if (Symbol.PRINT_READABLY.symbolValueNoThrow() != NIL)
    203203            return "|COMMON-LISP|::|NIL|";
    204204        return "NIL";
  • trunk/j/src/org/armedbear/lisp/Pathname.java

    r10201 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: Pathname.java,v 1.107 2005-10-23 16:20:20 piso Exp $
     5 * $Id: Pathname.java,v 1.108 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    429429        try {
    430430            final LispThread thread = LispThread.currentThread();
    431             boolean printReadably = (_PRINT_READABLY_.symbolValue(thread) != NIL);
    432             boolean printEscape = (_PRINT_ESCAPE_.symbolValue(thread) != NIL);
     431            boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL);
     432            boolean printEscape = (Symbol.PRINT_ESCAPE.symbolValue(thread) != NIL);
    433433            boolean useNamestring;
    434434            String s = null;
  • trunk/j/src/org/armedbear/lisp/PrintNotReadable.java

    r10024 r10202  
    33 *
    44 * Copyright (C) 2004-2005 Peter Graves
    5  * $Id: PrintNotReadable.java,v 1.10 2005-09-24 19:58:50 piso Exp $
     5 * $Id: PrintNotReadable.java,v 1.11 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    6868            final LispThread thread = LispThread.currentThread();
    6969            final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    70             thread.bindSpecial(_PRINT_READABLY_, NIL);
    71             thread.bindSpecial(_PRINT_ARRAY_, NIL);
     70            thread.bindSpecial(Symbol.PRINT_READABLY, NIL);
     71            thread.bindSpecial(Symbol.PRINT_ARRAY, NIL);
    7272            try {
    7373                sb.append(object.writeToString());
  • trunk/j/src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java

    r9729 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: SimpleArray_UnsignedByte16.java,v 1.2 2005-07-26 04:49:56 piso Exp $
     5 * $Id: SimpleArray_UnsignedByte16.java,v 1.3 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    263263    public String writeToString() throws ConditionThrowable
    264264    {
    265         if (_PRINT_READABLY_.symbolValue() != NIL) {
     265        if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
    266266            signal(new PrintNotReadable(list2(Keyword.OBJECT, this)));
    267267            // Not reached.
  • trunk/j/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java

    r8835 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: SimpleArray_UnsignedByte32.java,v 1.3 2005-03-25 03:19:22 piso Exp $
     5 * $Id: SimpleArray_UnsignedByte32.java,v 1.4 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    254254    public String writeToString() throws ConditionThrowable
    255255    {
    256         if (_PRINT_READABLY_.symbolValue() != NIL) {
     256        if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
    257257            signal(new PrintNotReadable(list2(Keyword.OBJECT, this)));
    258258            // Not reached.
  • trunk/j/src/org/armedbear/lisp/SimpleArray_UnsignedByte8.java

    r8835 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: SimpleArray_UnsignedByte8.java,v 1.3 2005-03-25 03:19:22 piso Exp $
     5 * $Id: SimpleArray_UnsignedByte8.java,v 1.4 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    251251    public String writeToString() throws ConditionThrowable
    252252    {
    253         if (_PRINT_READABLY_.symbolValue() != NIL) {
     253        if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
    254254            signal(new PrintNotReadable(list2(Keyword.OBJECT, this)));
    255255            // Not reached.
  • trunk/j/src/org/armedbear/lisp/SingleFloat.java

    r9406 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: SingleFloat.java,v 1.3 2005-06-16 17:22:55 piso Exp $
     5 * $Id: SingleFloat.java,v 1.4 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    492492        String s1 = String.valueOf(value);
    493493        LispThread thread = LispThread.currentThread();
    494         if (_PRINT_READABLY_.symbolValue(thread) != NIL ||
     494        if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL ||
    495495            !memq(_READ_DEFAULT_FLOAT_FORMAT_.symbolValue(thread),
    496496                  list2(Symbol.SINGLE_FLOAT, Symbol.SHORT_FLOAT)))
  • trunk/j/src/org/armedbear/lisp/Stream.java

    r10194 r10202  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: Stream.java,v 1.140 2005-10-23 13:05:24 piso Exp $
     5 * $Id: Stream.java,v 1.141 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    14031403        LispThread thread = LispThread.currentThread();
    14041404        SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    1405         thread.bindSpecial(_PRINT_ESCAPE_, T);
     1405        thread.bindSpecial(Symbol.PRINT_ESCAPE, T);
    14061406        try {
    14071407            _writeString(obj.writeToString());
     
    14191419    public LispObject fileLength() throws ConditionThrowable
    14201420    {
    1421         return signal(new TypeError(this, Symbol.FILE_STREAM));
     1421        return signalTypeError(this, Symbol.FILE_STREAM);
    14221422    }
    14231423
  • trunk/j/src/org/armedbear/lisp/Symbol.java

    r10201 r10202  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Symbol.java,v 1.216 2005-10-23 16:20:45 piso Exp $
     5 * $Id: Symbol.java,v 1.217 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    101101        final LispThread thread = LispThread.currentThread();
    102102        SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    103         thread.bindSpecial(_PRINT_ESCAPE_, NIL);
     103        thread.bindSpecial(Symbol.PRINT_ESCAPE, NIL);
    104104        try {
    105105            FastStringBuffer sb = new FastStringBuffer("The symbol ");
     
    376376        final String n = name.getStringValue();
    377377        final LispThread thread = LispThread.currentThread();
    378         boolean printEscape = (_PRINT_ESCAPE_.symbolValue(thread) != NIL);
     378        boolean printEscape = (PRINT_ESCAPE.symbolValue(thread) != NIL);
    379379        LispObject printCase = _PRINT_CASE_.symbolValue(thread);
    380380        final LispObject readtableCase =
    381381            ((Readtable)_READTABLE_.symbolValue(thread)).getReadtableCase();
    382         boolean printReadably = (_PRINT_READABLY_.symbolValue(thread) != NIL);
     382        boolean printReadably = (PRINT_READABLY.symbolValue(thread) != NIL);
    383383        if (printReadably) {
    384384            if (readtableCase != Keyword.UPCASE ||
     
    446446        }
    447447        if (pkg == NIL) {
    448             if (printReadably || _PRINT_GENSYM_.symbolValue(thread) != NIL)
     448            if (printReadably || PRINT_GENSYM.symbolValue(thread) != NIL)
    449449                return "#:".concat(symbolName);
    450450            else
     
    830830    public static final Symbol _FEATURES_ =
    831831        PACKAGE_CL.addExternalSymbol("*FEATURES*");
    832     public static final Symbol _GENSYM_COUNTER_ =
     832    public static final Symbol GENSYM_COUNTER =
    833833        PACKAGE_CL.addExternalSymbol("*GENSYM-COUNTER*");
    834834    public static final Symbol _LOAD_PATHNAME_ =
     
    846846    public static final Symbol _PACKAGE_ =
    847847        PACKAGE_CL.addExternalSymbol("*PACKAGE*");
    848     public static final Symbol _PRINT_ARRAY_ =
     848    public static final Symbol PRINT_ARRAY =
    849849        PACKAGE_CL.addExternalSymbol("*PRINT-ARRAY*");
    850850    public static final Symbol _PRINT_BASE_ =
    851851        PACKAGE_CL.addExternalSymbol("*PRINT-BASE*");
    852     public static final Symbol _PRINT_CASE_ =
     852    public static final Symbol PRINT_CASE =
    853853        PACKAGE_CL.addExternalSymbol("*PRINT-CASE*");
    854854    public static final Symbol _PRINT_CIRCLE_ =
    855855        PACKAGE_CL.addExternalSymbol("*PRINT-CIRCLE*");
    856     public static final Symbol _PRINT_ESCAPE_ =
     856    public static final Symbol PRINT_ESCAPE =
    857857        PACKAGE_CL.addExternalSymbol("*PRINT-ESCAPE*");
    858     public static final Symbol _PRINT_GENSYM_ =
     858    public static final Symbol PRINT_GENSYM =
    859859        PACKAGE_CL.addExternalSymbol("*PRINT-GENSYM*");
    860     public static final Symbol _PRINT_LENGTH_ =
     860    public static final Symbol PRINT_LENGTH =
    861861        PACKAGE_CL.addExternalSymbol("*PRINT-LENGTH*");
    862862    public static final Symbol _PRINT_LEVEL_ =
     
    872872    public static final Symbol _PRINT_RADIX_ =
    873873        PACKAGE_CL.addExternalSymbol("*PRINT-RADIX*");
    874     public static final Symbol _PRINT_READABLY_ =
     874    public static final Symbol PRINT_READABLY =
    875875        PACKAGE_CL.addExternalSymbol("*PRINT-READABLY*");
    876876    public static final Symbol _PRINT_RIGHT_MARGIN_ =
  • trunk/j/src/org/armedbear/lisp/TypeError.java

    r9945 r10202  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: TypeError.java,v 1.30 2005-09-08 16:13:37 piso Exp $
     5 * $Id: TypeError.java,v 1.31 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    124124            final LispThread thread = LispThread.currentThread();
    125125            final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    126             thread.bindSpecial(_PRINT_ESCAPE_, T);
     126            thread.bindSpecial(Symbol.PRINT_ESCAPE, T);
    127127            try {
    128128                String s = super.getMessage();
  • trunk/j/src/org/armedbear/lisp/UnboundVariable.java

    r9495 r10202  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: UnboundVariable.java,v 1.14 2005-06-22 19:12:38 piso Exp $
     5 * $Id: UnboundVariable.java,v 1.15 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    3838        LispThread thread = LispThread.currentThread();
    3939        SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
    40         thread.bindSpecial(_PRINT_ESCAPE_, T);
     40        thread.bindSpecial(Symbol.PRINT_ESCAPE, T);
    4141        StringBuffer sb = new StringBuffer("The variable ");
    4242        // FIXME
  • trunk/j/src/org/armedbear/lisp/ZeroRankArray.java

    r9614 r10202  
    33 *
    44 * Copyright (C) 2004-2005 Peter Graves
    5  * $Id: ZeroRankArray.java,v 1.11 2005-07-09 04:07:53 piso Exp $
     5 * $Id: ZeroRankArray.java,v 1.12 2005-10-23 16:39:49 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    112112    {
    113113        final LispThread thread = LispThread.currentThread();
    114         boolean printReadably = (_PRINT_READABLY_.symbolValue(thread) != NIL);
     114        boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL);
    115115        if (printReadably) {
    116116            if (elementType != T) {
Note: See TracChangeset for help on using the changeset viewer.