Changeset 3929

Timestamp:

09/20/03 17:02:05 (19 years ago)

Author:

piso

Message:

LispClass? => BuiltInClass?

Location:

trunk/j/src/org/armedbear/lisp

Files:

• AbstractArray.java (modified) (2 diffs)
• AbstractVector.java (modified) (1 diff)
• ArithmeticError.java (modified) (2 diffs)
• Array.java (modified) (2 diffs)
• Autoload.java (modified) (3 diffs)
• Bignum.java (modified) (3 diffs)
• Complex.java (modified) (2 diffs)
• Condition.java (modified) (3 diffs)
• Cons.java (modified) (3 diffs)
• ControlError.java (modified) (2 diffs)
• DisplacedArray.java (modified) (2 diffs)
• Fixnum.java (modified) (3 diffs)
• Function.java (modified) (3 diffs)
• HashTable.java (modified) (2 diffs)
• Interpreter.java (modified) (2 diffs)
• LispCharacter.java (modified) (3 diffs)
• LispError.java (modified) (2 diffs)
• LispFloat.java (modified) (3 diffs)
• LispObject.java (modified) (3 diffs)
• Package.java (modified) (2 diffs)
• PackageError.java (modified) (2 diffs)
• ParseError.java (modified) (2 diffs)
• Primitives.java (modified) (2 diffs)
• ProgramError.java (modified) (2 diffs)
• SimpleCondition.java (modified) (2 diffs)
• SimpleError.java (modified) (2 diffs)
• StreamError.java (modified) (2 diffs)
• StructureObject.java (modified) (2 diffs)
• Symbol.java (modified) (2 diffs)
• TypeError.java (modified) (2 diffs)
• UnboundVariable.java (modified) (2 diffs)
• UndefinedFunction.java (modified) (2 diffs)
• Vector.java (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/AbstractArray.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: AbstractArray.java,v 1.9 2003-09-19 01:46:39 piso Exp $
+ * $Id: AbstractArray.java,v 1.10 2003-09-20 17:01:58 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -28 +28 @@
         if (type == Symbol.ARRAY)
             return T;
-        if (type == LispClass.ARRAY)
+        if (type == BuiltInClass.ARRAY)
             return T;
         return super.typep(type);

trunk/j/src/org/armedbear/lisp/AbstractVector.java

@@ -29 +29 @@
         if (type == Symbol.VECTOR)
             return T;
-        if (type == LispClass.VECTOR)
+        if (type == BuiltInClass.VECTOR)
             return T;
         if (type == Symbol.SEQUENCE)
             return T;
-        if (type == LispClass.SEQUENCE)
+        if (type == BuiltInClass.SEQUENCE)
             return T;
         if (type == Symbol.SIMPLE_VECTOR)

trunk/j/src/org/armedbear/lisp/ArithmeticError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: ArithmeticError.java,v 1.5 2003-09-19 16:04:50 piso Exp $
+ * $Id: ArithmeticError.java,v 1.6 2003-09-20 17:01:59 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     public LispClass classOf()
     {
-        return LispClass.ARITHMETIC_ERROR;
+        return BuiltInClass.ARITHMETIC_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/Array.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Array.java,v 1.14 2003-09-19 14:44:10 piso Exp $
+ * $Id: Array.java,v 1.15 2003-09-20 17:02:00 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -126 +126 @@
     public LispClass classOf()
     {
-        return LispClass.ARRAY;
+        return BuiltInClass.ARRAY;
     }
 

trunk/j/src/org/armedbear/lisp/Autoload.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.69 2003-09-19 11:50:18 piso Exp $
+ * $Id: Autoload.java,v 1.70 2003-09-20 17:02:01 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -209 +209 @@
         autoload("logorc2", "logorc2");
         autoload("logxor", "logxor");
+        autoload("make-condition", "make_condition");
         autoload("make-string-output-stream", "StringOutputStream");
         autoload("namestring", "Pathname");
@@ -228 +229 @@
         autoload("unexport", "PackageFunctions");
         autoload("unuse-package", "PackageFunctions");
+        autoload(PACKAGE_SYS, "%define-condition", "define_condition");
         autoload(PACKAGE_SYS, "%defpackage", "PackageFunctions");
         autoload(PACKAGE_SYS, "%make-array", "make_array");

trunk/j/src/org/armedbear/lisp/Bignum.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Bignum.java,v 1.45 2003-09-19 14:44:10 piso Exp $
+ * $Id: Bignum.java,v 1.46 2003-09-20 17:02:03 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -45 +45 @@
     public LispClass classOf()
     {
-        return LispClass.BIGNUM;
+        return BuiltInClass.BIGNUM;
     }
 
@@ -52 +52 @@
         if (type == Symbol.BIGNUM)
             return T;
-        if (type == LispClass.BIGNUM)
+        if (type == BuiltInClass.BIGNUM)
             return T;
         if (type == Symbol.INTEGER)
             return T;
-        if (type == LispClass.INTEGER)
+        if (type == BuiltInClass.INTEGER)
             return T;
         if (type == Symbol.RATIONAL)
             return T;
-        if (type == LispClass.RATIONAL)
+        if (type == BuiltInClass.RATIONAL)
             return T;
         if (type == Symbol.REAL)
             return T;
-        if (type == LispClass.REAL)
+        if (type == BuiltInClass.REAL)
             return T;
         if (type == Symbol.NUMBER)
             return T;
-        if (type == LispClass.NUMBER)
+        if (type == BuiltInClass.NUMBER)
             return T;
         if (type == Symbol.UNSIGNED_BYTE)

trunk/j/src/org/armedbear/lisp/Complex.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Complex.java,v 1.23 2003-09-19 11:50:18 piso Exp $
+ * $Id: Complex.java,v 1.24 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -69 +69 @@
     public LispClass classOf()
     {
-        return LispClass.COMPLEX;
-    }
-
-    public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
-    {
-        if (typeSpecifier == Symbol.COMPLEX)
-            return T;
-        if (typeSpecifier == Symbol.NUMBER)
-            return T;
-        if (typeSpecifier == LispClass.COMPLEX)
-            return T;
-        if (typeSpecifier == LispClass.NUMBER)
-            return T;
-        return super.typep(typeSpecifier);
+        return BuiltInClass.COMPLEX;
+    }
+
+    public LispObject typep(LispObject type) throws ConditionThrowable
+    {
+        if (type == Symbol.COMPLEX)
+            return T;
+        if (type == Symbol.NUMBER)
+            return T;
+        if (type == BuiltInClass.COMPLEX)
+            return T;
+        if (type == BuiltInClass.NUMBER)
+            return T;
+        return super.typep(type);
     }
 

trunk/j/src/org/armedbear/lisp/Condition.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Condition.java,v 1.8 2003-09-19 16:13:45 piso Exp $
+ * $Id: Condition.java,v 1.9 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-public class Condition extends LispObject
+public class Condition extends StandardObject
 {
     private final String message;
@@ -48 +48 @@
     public LispClass classOf()
     {
-        return LispClass.CONDITION;
+        return BuiltInClass.CONDITION;
     }
 

trunk/j/src/org/armedbear/lisp/Cons.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Cons.java,v 1.28 2003-09-19 11:50:18 piso Exp $
+ * $Id: Cons.java,v 1.29 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -48 +48 @@
     public LispClass classOf()
     {
-        return LispClass.CONS;
+        return BuiltInClass.CONS;
     }
 
@@ -59 +59 @@
         if (typeSpecifier == Symbol.SEQUENCE)
             return T;
-        if (typeSpecifier == LispClass.LIST)
-            return T;
-        if (typeSpecifier == LispClass.CONS)
-            return T;
-        if (typeSpecifier == LispClass.SEQUENCE)
+        if (typeSpecifier == BuiltInClass.LIST)
+            return T;
+        if (typeSpecifier == BuiltInClass.CONS)
+            return T;
+        if (typeSpecifier == BuiltInClass.SEQUENCE)
             return T;
         if (typeSpecifier == Symbol.ATOM)

trunk/j/src/org/armedbear/lisp/ControlError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: ControlError.java,v 1.4 2003-09-19 16:04:50 piso Exp $
+ * $Id: ControlError.java,v 1.5 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     public LispClass classOf()
     {
-        return LispClass.CONTROL_ERROR;
+        return BuiltInClass.CONTROL_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/DisplacedArray.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: DisplacedArray.java,v 1.12 2003-09-19 11:50:18 piso Exp $
+ * $Id: DisplacedArray.java,v 1.13 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -59 +59 @@
     public LispObject typep(LispObject type) throws ConditionThrowable
     {
-        if (type == Symbol.VECTOR || type == LispClass.VECTOR)
+        if (type == Symbol.VECTOR || type == BuiltInClass.VECTOR)
             return VECTORP();
-        if (type == Symbol.BIT_VECTOR || type == LispClass.BIT_VECTOR)
+        if (type == Symbol.BIT_VECTOR || type == BuiltInClass.BIT_VECTOR)
             return BIT_VECTOR_P();
-        if (type == Symbol.SEQUENCE || type == LispClass.SEQUENCE)
+        if (type == Symbol.SEQUENCE || type == BuiltInClass.SEQUENCE)
             return VECTORP();
         return super.typep(type);

trunk/j/src/org/armedbear/lisp/Fixnum.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Fixnum.java,v 1.73 2003-09-19 14:44:10 piso Exp $
+ * $Id: Fixnum.java,v 1.74 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -49 +49 @@
     public LispClass classOf()
     {
-        return LispClass.FIXNUM;
+        return BuiltInClass.FIXNUM;
     }
 
@@ -56 +56 @@
         if (type == Symbol.FIXNUM)
             return T;
-        if (type == LispClass.FIXNUM)
+        if (type == BuiltInClass.FIXNUM)
             return T;
         if (type == Symbol.INTEGER)
             return T;
-        if (type == LispClass.INTEGER)
+        if (type == BuiltInClass.INTEGER)
             return T;
         if (type == Symbol.RATIONAL)
             return T;
-        if (type == LispClass.RATIONAL)
+        if (type == BuiltInClass.RATIONAL)
             return T;
         if (type == Symbol.REAL)
             return T;
-        if (type == LispClass.REAL)
+        if (type == BuiltInClass.REAL)
             return T;
         if (type == Symbol.NUMBER)
             return T;
-        if (type == LispClass.NUMBER)
+        if (type == BuiltInClass.NUMBER)
             return T;
         if (type == Symbol.UNSIGNED_BYTE)

trunk/j/src/org/armedbear/lisp/Function.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Function.java,v 1.23 2003-09-19 01:46:40 piso Exp $
+ * $Id: Function.java,v 1.24 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -104 +104 @@
     public LispClass classOf()
     {
-        return LispClass.FUNCTION;
+        return BuiltInClass.FUNCTION;
     }
 
@@ -113 +113 @@
         if (typeSpecifier == Symbol.COMPILED_FUNCTION)
             return T;
-        if (typeSpecifier == LispClass.FUNCTION)
+        if (typeSpecifier == BuiltInClass.FUNCTION)
             return T;
         return super.typep(typeSpecifier);

trunk/j/src/org/armedbear/lisp/HashTable.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: HashTable.java,v 1.20 2003-09-19 14:44:10 piso Exp $
+ * $Id: HashTable.java,v 1.21 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -69 +69 @@
     public LispClass classOf()
     {
-        return LispClass.HASH_TABLE;
-    }
-
-    public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
-    {
-        if (typeSpecifier == Symbol.HASH_TABLE)
+        return BuiltInClass.HASH_TABLE;
+    }
+
+    public LispObject typep(LispObject type) throws ConditionThrowable
+    {
+        if (type == Symbol.HASH_TABLE)
             return T;
-        if (typeSpecifier == LispClass.HASH_TABLE)
+        if (type == BuiltInClass.HASH_TABLE)
             return T;
-        return super.typep(typeSpecifier);
+        return super.typep(type);
     }
 

trunk/j/src/org/armedbear/lisp/Interpreter.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Interpreter.java,v 1.35 2003-09-20 00:30:04 piso Exp $
+ * $Id: Interpreter.java,v 1.36 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -210 +210 @@
                 catch (ConditionThrowable c) {
                     getStandardInput().clearInput();
+                    getStandardOutput().freshLine();
                     String message = c.getCondition().getMessage();
                     if (message != null)
                         out.writeLine("Error: " + message + ".");
                     else
-                        out.writeLine("Error");
+                        out.writeLine("Error: unhandled condition: " + c.getCondition());
                     thread.backtrace();
                 }

trunk/j/src/org/armedbear/lisp/LispCharacter.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: LispCharacter.java,v 1.26 2003-09-19 11:50:18 piso Exp $
+ * $Id: LispCharacter.java,v 1.27 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -55 +55 @@
     public LispClass classOf()
     {
-        return LispClass.CHARACTER;
+        return BuiltInClass.CHARACTER;
     }
 
@@ -62 +62 @@
         if (type == Symbol.CHARACTER)
             return T;
-        if (type == LispClass.CHARACTER)
+        if (type == BuiltInClass.CHARACTER)
             return T;
         if (type == Symbol.BASE_CHAR)

trunk/j/src/org/armedbear/lisp/LispError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: LispError.java,v 1.6 2003-09-20 00:40:13 piso Exp $
+ * $Id: LispError.java,v 1.7 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     public LispClass classOf()
     {
-        return LispClass.ERROR;
+        return BuiltInClass.ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/LispFloat.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispFloat.java,v 1.48 2003-09-19 14:44:10 piso Exp $
+ * $Id: LispFloat.java,v 1.49 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -41 +41 @@
     public LispClass classOf()
     {
-        return LispClass.FLOAT;
+        return BuiltInClass.FLOAT;
     }
 
@@ -48 +48 @@
         if (typeSpecifier == Symbol.FLOAT)
             return T;
-        if (typeSpecifier == LispClass.FLOAT)
+        if (typeSpecifier == BuiltInClass.FLOAT)
             return T;
         if (typeSpecifier == Symbol.REAL)

trunk/j/src/org/armedbear/lisp/LispObject.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: LispObject.java,v 1.59 2003-09-19 14:44:10 piso Exp $
+ * $Id: LispObject.java,v 1.60 2003-09-20 17:02:04 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -36 +36 @@
     public LispClass classOf()
     {
-        return LispClass.CLASS_T;
+        return BuiltInClass.CLASS_T;
     }
 
@@ -43 +43 @@
         if (typeSpecifier == T)
             return T;
-        if (typeSpecifier == LispClass.CLASS_T)
+        if (typeSpecifier == BuiltInClass.CLASS_T)
             return T;
         if (typeSpecifier == Symbol.ATOM)

trunk/j/src/org/armedbear/lisp/Package.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Package.java,v 1.46 2003-09-19 14:44:10 piso Exp $
+ * $Id: Package.java,v 1.47 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -55 +55 @@
     public LispClass classOf()
     {
-        return LispClass.PACKAGE;
-    }
-
-    public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
-    {
-        if (typeSpecifier == Symbol.PACKAGE)
+        return BuiltInClass.PACKAGE;
+    }
+
+    public LispObject typep(LispObject type) throws ConditionThrowable
+    {
+        if (type == Symbol.PACKAGE)
             return T;
-        if (typeSpecifier == LispClass.PACKAGE)
+        if (type == BuiltInClass.PACKAGE)
             return T;
-        return super.typep(typeSpecifier);
+        return super.typep(type);
     }
 

trunk/j/src/org/armedbear/lisp/PackageError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: PackageError.java,v 1.5 2003-09-19 16:04:50 piso Exp $
+ * $Id: PackageError.java,v 1.6 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     public LispClass classOf()
     {
-        return LispClass.PACKAGE_ERROR;
+        return BuiltInClass.PACKAGE_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/ParseError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: ParseError.java,v 1.6 2003-09-19 16:04:50 piso Exp $
+ * $Id: ParseError.java,v 1.7 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -36 +36 @@
     public LispClass classOf()
     {
-        return LispClass.PARSE_ERROR;
+        return BuiltInClass.PARSE_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.418 2003-09-20 14:15:51 piso Exp $
+ * $Id: Primitives.java,v 1.419 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -1826 +1826 @@
         if (type == Symbol.SIMPLE_ERROR)
             return c.getCondition() instanceof SimpleError;
-        if (type == Symbol.ERROR || type == LispClass.ERROR) {
+        if (type == Symbol.ERROR || type == BuiltInClass.ERROR) {
             Condition condition = c.getCondition();
             if (condition.typep(Symbol.ERROR) == T)

trunk/j/src/org/armedbear/lisp/ProgramError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: ProgramError.java,v 1.8 2003-09-19 16:04:50 piso Exp $
+ * $Id: ProgramError.java,v 1.9 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     public LispClass classOf()
     {
-        return LispClass.PROGRAM_ERROR;
+        return BuiltInClass.PROGRAM_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/SimpleCondition.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: SimpleCondition.java,v 1.3 2003-09-20 00:38:41 piso Exp $
+ * $Id: SimpleCondition.java,v 1.4 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     public LispClass classOf()
     {
-        return LispClass.SIMPLE_CONDITION;
+        return BuiltInClass.SIMPLE_CONDITION;
     }
 

trunk/j/src/org/armedbear/lisp/SimpleError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: SimpleError.java,v 1.3 2003-09-19 16:04:50 piso Exp $
+ * $Id: SimpleError.java,v 1.4 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     public LispClass classOf()
     {
-        return LispClass.SIMPLE_ERROR;
+        return BuiltInClass.SIMPLE_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/StreamError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: StreamError.java,v 1.7 2003-09-19 16:04:50 piso Exp $
+ * $Id: StreamError.java,v 1.8 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -48 +48 @@
     public LispClass classOf()
     {
-        return LispClass.STREAM_ERROR;
+        return BuiltInClass.STREAM_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/StructureObject.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: StructureObject.java,v 1.12 2003-09-19 14:44:10 piso Exp $
+ * $Id: StructureObject.java,v 1.13 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
     }
 
-    public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
-    {
-        if (typeSpecifier == name)
+    public LispObject typep(LispObject type) throws ConditionThrowable
+    {
+        if (type == name)
             return T;
-        if (typeSpecifier == Symbol.STRUCTURE_OBJECT)
+        if (type == Symbol.STRUCTURE_OBJECT)
             return T;
-        if (typeSpecifier == LispClass.STRUCTURE_OBJECT)
+        if (type == BuiltInClass.STRUCTURE_OBJECT)
             return T;
-        return super.typep(typeSpecifier);
+        return super.typep(type);
     }
 

trunk/j/src/org/armedbear/lisp/Symbol.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Symbol.java,v 1.80 2003-09-19 16:04:50 piso Exp $
+ * $Id: Symbol.java,v 1.81 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -183 +183 @@
     public LispClass classOf()
     {
-        return LispClass.SYMBOL;
-    }
-
-    public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
-    {
-        if (typeSpecifier == Symbol.SYMBOL)
+        return BuiltInClass.SYMBOL;
+    }
+
+    public LispObject typep(LispObject type) throws ConditionThrowable
+    {
+        if (type == Symbol.SYMBOL)
             return T;
-        if (typeSpecifier == Symbol.BOOLEAN)
+        if (type == BuiltInClass.SYMBOL)
+            return T;
+        if (type == Symbol.BOOLEAN)
             return this == T ? T : NIL;
-        if (typeSpecifier instanceof LispClass) {
-            final String name = typeSpecifier.getName();
-            if (name.equals("SYMBOL"))
-                return T;
-        }
-        return super.typep(typeSpecifier);
+        return super.typep(type);
     }
 

trunk/j/src/org/armedbear/lisp/TypeError.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: TypeError.java,v 1.6 2003-09-19 16:04:50 piso Exp $
+ * $Id: TypeError.java,v 1.7 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -57 +57 @@
     public LispClass classOf()
     {
-        return LispClass.TYPE_ERROR;
+        return BuiltInClass.TYPE_ERROR;
     }
 

trunk/j/src/org/armedbear/lisp/UnboundVariable.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: UnboundVariable.java,v 1.1 2003-09-19 16:04:29 piso Exp $
+ * $Id: UnboundVariable.java,v 1.2 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -45 +45 @@
     public LispClass classOf()
     {
-        return LispClass.UNBOUND_VARIABLE;
+        return BuiltInClass.UNBOUND_VARIABLE;
     }
 

trunk/j/src/org/armedbear/lisp/UndefinedFunction.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: UndefinedFunction.java,v 1.1 2003-09-19 15:50:19 piso Exp $
+ * $Id: UndefinedFunction.java,v 1.2 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -52 +52 @@
     public LispClass classOf()
     {
-        return LispClass.UNDEFINED_FUNCTION;
+        return BuiltInClass.UNDEFINED_FUNCTION;
     }
 

trunk/j/src/org/armedbear/lisp/Vector.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Vector.java,v 1.25 2003-09-19 14:44:10 piso Exp $
+ * $Id: Vector.java,v 1.26 2003-09-20 17:02:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -54 +54 @@
     public LispClass classOf()
     {
-        return LispClass.VECTOR;
+        return BuiltInClass.VECTOR;
     }