Changeset 3770

Timestamp:

09/14/03 16:46:20 (20 years ago)

Author:

piso

Message:

Work in progress.

File:

• trunk/j/src/org/armedbear/lisp/DisplacedArray.java (modified) (5 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: DisplacedArray.java,v 1.6 2003-09-14 13:07:22 piso Exp $
+ * $Id: DisplacedArray.java,v 1.7 2003-09-14 16:46:20 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -47 +47 @@
     public LispObject typeOf()
     {
-        if (getRank() == 1) {
+        if (dimv.length == 1) {
             if (array instanceof LispString)
                 return Symbol.STRING;
+            if (array instanceof BitVector)
+                return Symbol.BIT_VECTOR;
             return list3(Symbol.VECTOR, T, new Fixnum(size));
         }
@@ -60 +62 @@
             return T;
         if (typeSpecifier == Symbol.VECTOR)
-            return getRank() == 1 ? T : NIL;
+            return VECTORP();
         if (typeSpecifier == Symbol.BIT_VECTOR)
             return BIT_VECTOR_P();
@@ -75 +77 @@
     public LispObject BIT_VECTOR_P()
     {
-        if (getRank() == 1)
+        if (dimv.length == 1)
             return array.BIT_VECTOR_P();
         return NIL;
@@ -82 +84 @@
     public LispObject STRINGP()
     {
-        if (getRank() == 1)
+        if (dimv.length == 1)
             return array.STRINGP();
         return NIL;
+    }
+
+    public boolean vectorp()
+    {
+        return dimv.length == 1;
     }