Changeset 10207


Ignore:
Timestamp:
10/23/05 17:46:16 (16 years ago)
Author:
piso
Message:

Symbol refactoring (work in progress).

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

Legend:

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

    r10202 r10207  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Interpreter.java,v 1.96 2005-10-23 16:39:49 piso Exp $
     5 * $Id: Interpreter.java,v 1.97 2005-10-23 17:46:16 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    488488                try {
    489489                    final LispObject truename =
    490                         _LOAD_TRUENAME_.symbolValue(thread);
     490                        Symbol.LOAD_TRUENAME.symbolValue(thread);
    491491                    if (truename != NIL) {
    492492                        final LispObject stream =
  • trunk/j/src/org/armedbear/lisp/Lisp.java

    r10206 r10207  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Lisp.java,v 1.407 2005-10-23 17:38:10 piso Exp $
     5 * $Id: Lisp.java,v 1.408 2005-10-23 17:46:16 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    333333    {
    334334        final LispThread thread = LispThread.currentThread();
    335         if (_LOAD_TRUENAME_.symbolValue(thread) != NIL)
     335        if (Symbol.LOAD_TRUENAME.symbolValue(thread) != NIL)
    336336            return eval(obj, new Environment(), thread);
    337337        else
     
    850850                coerceToPathname(Symbol.DEFAULT_PATHNAME_DEFAULTS.symbolValue(thread));
    851851        } else {
    852             LispObject loadTruename = _LOAD_TRUENAME_.symbolValue(thread);
     852            LispObject loadTruename = Symbol.LOAD_TRUENAME.symbolValue(thread);
    853853            if (loadTruename instanceof Pathname) {
    854854                defaultPathname = (Pathname) loadTruename;
     
    982982
    983983        try {
    984             LispObject loadTruename = _LOAD_TRUENAME_.symbolValue(thread);
     984            LispObject loadTruename = Symbol.LOAD_TRUENAME.symbolValue(thread);
    985985            String zipFileName = ((Pathname)loadTruename).getNamestring();
    986986            ZipFile zipFile = new ZipFile(zipFileName);
     
    19121912    }
    19131913
    1914     // ### *load-pathname*
    1915     public static final Symbol _LOAD_PATHNAME_ =
    1916         exportSpecial("*LOAD-PATHNAME*", PACKAGE_CL, NIL);
    1917 
    1918     // ### *load-truename*
    1919     public static final Symbol _LOAD_TRUENAME_ =
    1920         exportSpecial("*LOAD-TRUENAME*", PACKAGE_CL, NIL);
     1914//     // ### *load-pathname*
     1915//     public static final Symbol LOAD_PATHNAME =
     1916//         exportSpecial("*LOAD-PATHNAME*", PACKAGE_CL, NIL);
     1917    static {
     1918        Symbol.LOAD_PATHNAME.initializeSpecial(NIL);
     1919    }
     1920
     1921//     // ### *load-truename*
     1922//     public static final Symbol LOAD_TRUENAME =
     1923//         exportSpecial("*LOAD-TRUENAME*", PACKAGE_CL, NIL);
     1924    static {
     1925        Symbol.LOAD_TRUENAME.initializeSpecial(NIL);
     1926    }
    19211927
    19221928    // ### *load-depth*
  • trunk/j/src/org/armedbear/lisp/Load.java

    r10206 r10207  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Load.java,v 1.123 2005-10-23 17:38:10 piso Exp $
     5 * $Id: Load.java,v 1.124 2005-10-23 17:46:16 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    373373            if (pathname == null && truename != null)
    374374                pathname = Pathname.parseNamestring(truename);
    375             thread.bindSpecial(_LOAD_PATHNAME_,
     375            thread.bindSpecial(Symbol.LOAD_PATHNAME,
    376376                               pathname != null ? pathname : NIL);
    377             thread.bindSpecial(_LOAD_TRUENAME_,
     377            thread.bindSpecial(Symbol.LOAD_TRUENAME,
    378378                               pathname != null ? pathname : NIL);
    379379            thread.bindSpecial(_SOURCE_,
  • trunk/j/src/org/armedbear/lisp/Symbol.java

    r10206 r10207  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Symbol.java,v 1.219 2005-10-23 17:38:10 piso Exp $
     5 * $Id: Symbol.java,v 1.220 2005-10-23 17:46:16 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    832832    public static final Symbol GENSYM_COUNTER =
    833833        PACKAGE_CL.addExternalSymbol("*GENSYM-COUNTER*");
    834     public static final Symbol _LOAD_PATHNAME_ =
     834    public static final Symbol LOAD_PATHNAME =
    835835        PACKAGE_CL.addExternalSymbol("*LOAD-PATHNAME*");
    836836    public static final Symbol LOAD_PRINT =
    837837        PACKAGE_CL.addExternalSymbol("*LOAD-PRINT*");
    838     public static final Symbol _LOAD_TRUENAME_ =
     838    public static final Symbol LOAD_TRUENAME =
    839839        PACKAGE_CL.addExternalSymbol("*LOAD-TRUENAME*");
    840840    public static final Symbol LOAD_VERBOSE =
Note: See TracChangeset for help on using the changeset viewer.