Changeset 3841

Timestamp:

09/17/03 15:00:45 (20 years ago)

Author:

piso

Message:

classOf(), typep()

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Array.java (modified) (3 diffs)
• Cons.java (modified) (3 diffs)
• Function.java (modified) (3 diffs)
• Package.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Array.java,v 1.9 2003-09-16 19:01:07 piso Exp $
+ * $Id: Array.java,v 1.10 2003-09-17 14:55:59 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -124 +124 @@
     }
 
+    public LispClass classOf()
+    {
+        return LispClass.ARRAY;
+    }
+
     public LispObject typep(LispObject typeSpecifier) throws LispError
     {
@@ -130 +135 @@
         if (typeSpecifier == Symbol.SIMPLE_ARRAY)
             return T;
-        if (typeSpecifier instanceof LispClass) {
-            final String name = typeSpecifier.getName();
-            if (name.equals("ARRAY"))
-                return T;
-        }
+        if (typeSpecifier == LispClass.ARRAY)
+            return T;
         return super.typep(typeSpecifier);
     }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Cons.java,v 1.25 2003-09-15 05:02:04 piso Exp $
+ * $Id: Cons.java,v 1.26 2003-09-17 14:59:50 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
     }
 
+    public LispClass classOf()
+    {
+        return LispClass.CONS;
+    }
+
     public LispObject typep(LispObject typeSpecifier) throws LispError
     {
@@ -53 +58 @@
             return T;
         if (typeSpecifier == Symbol.SEQUENCE)
+            return T;
+        if (typeSpecifier == LispClass.LIST)
+            return T;
+        if (typeSpecifier == LispClass.CONS)
+            return T;
+        if (typeSpecifier == LispClass.SEQUENCE)
             return T;
         if (typeSpecifier == Symbol.ATOM)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Function.java,v 1.20 2003-08-15 17:18:02 piso Exp $
+ * $Id: Function.java,v 1.21 2003-09-17 15:00:45 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -102 +102 @@
     }
 
+    public LispClass classOf()
+    {
+        return LispClass.FUNCTION;
+    }
+
     public LispObject typep(LispObject typeSpecifier) throws LispError
     {
@@ -107 +112 @@
             return T;
         if (typeSpecifier == Symbol.COMPILED_FUNCTION)
+            return T;
+        if (typeSpecifier == LispClass.FUNCTION)
             return T;
         return super.typep(typeSpecifier);

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Package.java,v 1.42 2003-09-15 04:59:28 piso Exp $
+ * $Id: Package.java,v 1.43 2003-09-17 14:56:53 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -53 +53 @@
     }
 
+    public LispClass classOf()
+    {
+        return LispClass.PACKAGE;
+    }
+
     public LispObject typep(LispObject typeSpecifier) throws LispError
     {
         if (typeSpecifier == Symbol.PACKAGE)
+            return T;
+        if (typeSpecifier == LispClass.PACKAGE)
             return T;
         return super.typep(typeSpecifier);
@@ -210 +217 @@
         for (int i = names.length; i-- > 0;) {
             String symbolName = names[i];
+            // There shouldn't be any internal symbols in the COMMON-LISP
+            // package.
             Debug.assertTrue(internalSymbols.get(symbolName) == null);
+            // The symbol in question may have been exported already. If we
+            // replace an existing symbol, we'll lose any information that
+            // might be associated with it. So we check first...
             if (externalSymbols.get(symbolName) == null)
                 externalSymbols.put(symbolName, new Symbol(symbolName, this));