Changeset 4848


Ignore:
Timestamp:
11/20/03 18:01:08 (18 years ago)
Author:
piso
Message:

Moved CLASS-SLOTS, CLASS-DIRECT-SLOTS, etc. from StandardClass?.java to SlotClass?.java.

File:
1 edited

Legend:

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

    r4778 r4848  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: Autoload.java,v 1.105 2003-11-16 14:58:17 piso Exp $
     5 * $Id: Autoload.java,v 1.106 2003-11-20 18:01:08 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    6565            }
    6666        }
    67         symbol.setSymbolFunction(new Autoload(symbol, null,
    68                                               "org.armedbear.lisp.".concat(className)));
     67        if (symbol.getSymbolFunction() == null)
     68            symbol.setSymbolFunction(new Autoload(symbol, null,
     69                                                  "org.armedbear.lisp.".concat(className)));
    6970    }
    7071
     
    294295        autoload(PACKAGE_SYS, "%open-output-file", "open");
    295296        autoload(PACKAGE_SYS, "%set-class-direct-methods", "LispClass");
    296         autoload(PACKAGE_SYS, "%set-class-direct-slots", "StandardClass");
    297         autoload(PACKAGE_SYS, "%set-class-slots", "StandardClass");
     297        autoload(PACKAGE_SYS, "%set-class-direct-slots", "SlotClass");
     298        autoload(PACKAGE_SYS, "%set-class-slots", "SlotClass");
    298299        autoload(PACKAGE_SYS, "%set-generic-function-discriminating-function", "GenericFunction");
    299300        autoload(PACKAGE_SYS, "%string-capitalize", "StringFunctions");
     
    323324        autoload(PACKAGE_SYS, "allocate-std-instance", "StandardObject");
    324325        autoload(PACKAGE_SYS, "class-direct-methods", "LispClass");
    325         autoload(PACKAGE_SYS, "class-direct-slots", "StandardClass");
    326         autoload(PACKAGE_SYS, "class-slots", "StandardClass");
     326        autoload(PACKAGE_SYS, "class-direct-slots", "SlotClass");
     327        autoload(PACKAGE_SYS, "class-slots", "SlotClass");
    327328        autoload(PACKAGE_SYS, "default-time-zone", "Time");
    328329        autoload(PACKAGE_SYS, "generic-function-discriminating-function", "GenericFunction");
Note: See TracChangeset for help on using the changeset viewer.