Changeset 3848

Timestamp:

09/17/03 18:01:17 (20 years ago)

Author:

piso

Message:

typep()

Location:

trunk/j/src/org/armedbear/lisp

Files:

• AbstractArray.java (modified) (2 diffs)
• AbstractVector.java (modified) (1 diff)
• Array.java (modified) (2 diffs)
• DisplacedArray.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: AbstractArray.java,v 1.7 2003-08-15 17:18:02 piso Exp $
+ * $Id: AbstractArray.java,v 1.8 2003-09-17 17:59:45 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -24 +24 @@
 public abstract class AbstractArray extends LispObject
 {
+    public LispObject typep(LispObject type) throws LispError
+    {
+        if (type == Symbol.ARRAY)
+            return T;
+        if (type == LispClass.ARRAY)
+            return T;
+        return super.typep(type);
+    }
+
     public boolean equalp(LispObject obj) throws LispError
     {

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

@@ -25 +25 @@
     protected int fillPointer = -1; // -1 indicates no fill pointer.
 
-    public LispObject typep(LispObject typeSpecifier) throws LispError
+    public LispObject typep(LispObject type) throws LispError
     {
-        if (typeSpecifier instanceof Symbol) {
-            if (typeSpecifier == Symbol.VECTOR)
-                return T;
-            if (typeSpecifier == Symbol.ARRAY)
-                return T;
-            if (typeSpecifier == Symbol.SEQUENCE)
-                return T;
-            if (typeSpecifier == Symbol.SIMPLE_VECTOR)
-                return isSimpleVector() ? T : NIL;
-            if (typeSpecifier == Symbol.SIMPLE_ARRAY)
-                return fillPointer < 0 ? T : NIL;
-        } else if (typeSpecifier instanceof LispClass) {
-            final String name = typeSpecifier.getName();
-            if (name.equals("VECTOR"))
-                return T;
-            if (name.equals("ARRAY"))
-                return T;
-        }
-        return super.typep(typeSpecifier);
+        if (type == Symbol.VECTOR)
+            return T;
+        if (type == LispClass.VECTOR)
+            return T;
+        if (type == Symbol.SEQUENCE)
+            return T;
+        if (type == LispClass.SEQUENCE)
+            return T;
+        if (type == Symbol.SIMPLE_VECTOR)
+            return isSimpleVector() ? T : NIL;
+        if (type == Symbol.SIMPLE_ARRAY)
+            return fillPointer < 0 ? T : NIL;
+        return super.typep(type);
     }
 

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Array.java,v 1.10 2003-09-17 14:55:59 piso Exp $
+ * $Id: Array.java,v 1.11 2003-09-17 18:00:54 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -131 +131 @@
     public LispObject typep(LispObject typeSpecifier) throws LispError
     {
-        if (typeSpecifier == Symbol.ARRAY)
-            return T;
         if (typeSpecifier == Symbol.SIMPLE_ARRAY)
-            return T;
-        if (typeSpecifier == LispClass.ARRAY)
             return T;
         return super.typep(typeSpecifier);

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: DisplacedArray.java,v 1.9 2003-09-16 19:01:07 piso Exp $
+ * $Id: DisplacedArray.java,v 1.10 2003-09-17 18:01:17 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -57 +57 @@
     }
 
-    public LispObject typep(LispObject typeSpecifier) throws LispError
+    public LispObject typep(LispObject type) throws LispError
     {
-        if (typeSpecifier == Symbol.ARRAY)
-            return T;
-        if (typeSpecifier == Symbol.VECTOR)
+        if (type == Symbol.VECTOR || type == LispClass.VECTOR)
             return VECTORP();
-        if (typeSpecifier == Symbol.BIT_VECTOR)
+        if (type == Symbol.BIT_VECTOR || type == LispClass.BIT_VECTOR)
             return BIT_VECTOR_P();
-        if (typeSpecifier == Symbol.SEQUENCE)
+        if (type == Symbol.SEQUENCE || type == LispClass.SEQUENCE)
             return VECTORP();
-        if (typeSpecifier instanceof LispClass) {
-            final String name = typeSpecifier.getName();
-            if (name.equals("ARRAY"))
-                return T;
-        }
-        return super.typep(typeSpecifier);
+        return super.typep(type);
     }