Changeset 10373


Ignore:
Timestamp:
11/05/05 19:33:06 (16 years ago)
Author:
piso
Message:

layout.getLispClass() => layout.lispClass

File:
1 edited

Legend:

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

    r10362 r10373  
    33 *
    44 * Copyright (C) 2003-2005 Peter Graves
    5  * $Id: StandardObject.java,v 1.51 2005-11-05 01:29:20 piso Exp $
     5 * $Id: StandardObject.java,v 1.52 2005-11-05 19:33:06 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    7171    public final LispClass getLispClass()
    7272    {
    73         return layout.getLispClass();
     73        return layout.lispClass;
    7474    }
    7575
    7676    public LispObject typeOf()
    7777    {
    78         // "For objects of metaclass structure-class or standard-class, and for
    79         // conditions, type-of returns the proper name of the class returned by
    80         // class-of if it has a proper name, and otherwise returns the class
     78        // "For objects of metaclass STRUCTURE-CLASS or STANDARD-CLASS, and for
     79        // conditions, TYPE-OF returns the proper name of the class returned by
     80        // CLASS-OF if it has a proper name, and otherwise returns the class
    8181        // itself."
    82         LispClass c1 = layout.getLispClass();
     82        final LispClass c1 = layout.lispClass;
    8383        // The proper name of a class is "a symbol that names the class whose
    8484        // name is that symbol".
    85         Symbol symbol = c1.getSymbol();
     85        final Symbol symbol = c1.getSymbol();
    8686        if (symbol != NIL) {
    8787            // TYPE-OF.9
    88             LispObject c2 = LispClass.findClass(symbol);
     88            final LispObject c2 = LispClass.findClass(symbol);
    8989            if (c2 == c1)
    9090                return symbol;
    9191        }
    92         return layout.getLispClass();
     92        return c1;
    9393    }
    9494
    9595    public LispObject classOf()
    9696    {
    97         return layout.getLispClass();
     97        return layout.lispClass;
    9898    }
    9999
     
    104104        if (type == StandardClass.STANDARD_OBJECT)
    105105            return T;
    106         LispClass cls = layout != null ? layout.getLispClass() : null;
     106        LispClass cls = layout != null ? layout.lispClass : null;
    107107        if (cls != null) {
    108108            if (type == cls)
     
    146146        Debug.assertTrue(layout.isInvalid());
    147147        Layout oldLayout = layout;
    148         LispClass cls = oldLayout.getLispClass();
     148        LispClass cls = oldLayout.lispClass;
    149149        Layout newLayout = cls.getClassLayout();
    150150        Debug.assertTrue(!newLayout.isInvalid());
     
    310310        {
    311311            try {
    312                 return ((StandardObject)arg).layout.getLispClass();
     312                return ((StandardObject)arg).layout.lispClass;
    313313            }
    314314            catch (ClassCastException e) {
Note: See TracChangeset for help on using the changeset viewer.