Changeset 4312


Ignore:
Timestamp:
10/11/03 18:49:18 (19 years ago)
Author:
piso
Message:

Moved CLASS-DIRECT-METHODS and %SET-CLASS-DIRECT-METHODS to LispClass?.java.

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

Legend:

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

    r4302 r4312  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: Autoload.java,v 1.86 2003-10-11 00:17:51 piso Exp $
     5 * $Id: Autoload.java,v 1.87 2003-10-11 18:49:18 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    253253        autoload(PACKAGE_SYS, "%open-input-file", "open");
    254254        autoload(PACKAGE_SYS, "%open-output-file", "open");
    255         autoload(PACKAGE_SYS, "%set-class-direct-methods", "StandardClass");
     255        autoload(PACKAGE_SYS, "%set-class-direct-methods", "LispClass");
    256256        autoload(PACKAGE_SYS, "%set-class-direct-slots", "StandardClass");
    257257        autoload(PACKAGE_SYS, "%set-class-slots", "StandardClass");
     
    281281        autoload(PACKAGE_SYS, "%time", "Time");
    282282        autoload(PACKAGE_SYS, "allocate-std-instance", "StandardObject");
    283         autoload(PACKAGE_SYS, "class-direct-methods", "StandardClass");
     283        autoload(PACKAGE_SYS, "class-direct-methods", "LispClass");
    284284        autoload(PACKAGE_SYS, "class-direct-slots", "StandardClass");
    285285        autoload(PACKAGE_SYS, "class-slots", "StandardClass");
  • trunk/j/src/org/armedbear/lisp/StandardClass.java

    r4303 r4312  
    33 *
    44 * Copyright (C) 2003 Peter Graves
    5  * $Id: StandardClass.java,v 1.10 2003-10-11 02:06:38 piso Exp $
     5 * $Id: StandardClass.java,v 1.11 2003-10-11 18:48:46 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    2626    private LispObject directSlots = NIL;
    2727    private LispObject effectiveSlots = NIL;
    28     private LispObject directMethods = NIL;
    2928
    3029    public StandardClass()
     
    123122        }
    124123    };
    125 
    126     // ### class-direct-methods
    127     private static final Primitive1 CLASS_DIRECT_METHODS =
    128         new Primitive1("class-direct-methods", PACKAGE_SYS, false)
    129     {
    130         public LispObject execute(LispObject arg)
    131             throws ConditionThrowable
    132         {
    133             if (arg instanceof StandardClass)
    134                 return ((StandardClass)arg).directMethods;
    135             throw new ConditionThrowable(new TypeError(arg, "standard class"));
    136         }
    137     };
    138 
    139     // ### %set-class-direct-methods
    140     private static final Primitive2 _SET_CLASS_DIRECT_METHODS =
    141         new Primitive2("%set-class-direct-methods", PACKAGE_SYS, false)
    142     {
    143         public LispObject execute(LispObject first, LispObject second)
    144             throws ConditionThrowable
    145         {
    146             if (first instanceof StandardClass) {
    147                 ((StandardClass)first).directMethods = second;
    148                 return second;
    149             }
    150             throw new ConditionThrowable(new TypeError(first, "standard class"));
    151         }
    152     };
    153124}
Note: See TracChangeset for help on using the changeset viewer.