Changeset 9242


Ignore:
Timestamp:
05/24/05 18:58:02 (16 years ago)
Author:
piso
Message:

Work in progress (tested).

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

Legend:

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

    r9189 r9242  
    33 *
    44 * Copyright (C) 2002-2005 Peter Graves
    5  * $Id: Package.java,v 1.65 2005-05-16 16:06:52 piso Exp $
     5 * $Id: Package.java,v 1.66 2005-05-24 18:55:54 piso Exp $
    66 *
    77 * This program is free software; you can redistribute it and/or
     
    3030{
    3131    private String name;
     32    private SimpleString lispName;
    3233
    3334    private LispObject propertyList;
     
    4950    {
    5051        this.name = name;
     52        lispName = new SimpleString(name);
    5153    }
    5254
     
    5456    {
    5557        this.name = name;
     58        lispName = new SimpleString(name);
    5659    }
    5760
     
    8992    {
    9093        return name;
     94    }
     95
     96    public final LispObject NAME()
     97    {
     98        return lispName != null ? lispName : NIL;
    9199    }
    92100
     
    129137            }
    130138            name = null;
     139            lispName = null;
    131140            nicknames = null;
    132141            return true;
     
    149158        // Now change the names...
    150159        name = newName;
     160        lispName = new SimpleString(newName);
    151161        nicknames = arrayList;
    152162        // And add the package back.
     
    262272    }
    263273
    264     private synchronized Symbol addSymbol(AbstractString name)
     274    private synchronized Symbol addSymbol(SimpleString name)
    265275    {
    266276        Symbol symbol = new Symbol(name, this);
     
    279289    }
    280290
    281     private synchronized Symbol addSymbol(AbstractString name, int hash)
     291    private synchronized Symbol addSymbol(SimpleString name, int hash)
    282292    {
    283293        Symbol symbol = new Symbol(name, hash, this);
     
    341351    }
    342352
    343     public synchronized Symbol intern(AbstractString symbolName)
     353    public synchronized Symbol intern(SimpleString symbolName)
    344354    {
    345355        final int hash = symbolName.sxhash();
  • trunk/j/src/org/armedbear/lisp/deftype.lisp

    r8640 r9242  
    22;;;
    33;;; Copyright (C) 2004-2005 Peter Graves
    4 ;;; $Id: deftype.lisp,v 1.4 2005-02-26 17:36:19 piso Exp $
     4;;; $Id: deftype.lisp,v 1.5 2005-05-24 18:58:02 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    4444    (loop
    4545      (if (consp type)
    46           (setf tp (car type) i (cdr type))
    47           (setf tp type i nil))
     46          (setf tp (%car type) i (%cdr type))
     47          (setf tp type
     48                i nil))
    4849      (if (and (symbolp tp) (get tp 'deftype-definition))
    4950          (setf type (apply (get tp 'deftype-definition) i))
Note: See TracChangeset for help on using the changeset viewer.