Changeset 3733

Timestamp:

09/13/03 23:40:54 (19 years ago)

Author:

piso

Message:

Work in progress.

File:

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

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: DisplacedArray.java,v 1.3 2003-09-08 18:28:06 piso Exp $
+ * $Id: DisplacedArray.java,v 1.4 2003-09-13 23:40:54 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -24 +24 @@
 public final class DisplacedArray extends AbstractArray
 {
+    private final int[] dimv;
+    private final int size;
     private final AbstractArray array;
     private final int offset;
 
-    public DisplacedArray(AbstractArray array, int offset)
+    public DisplacedArray(int[] dimv, AbstractArray array, int offset)
     {
+        this.dimv = dimv;
+        size = computeTotalSize(dimv);
         this.array = array;
         this.offset = offset;
+    }
+
+    private static int computeTotalSize(int[] dimensions)
+    {
+        int size = 1;
+        for (int i = dimensions.length; i-- > 0;)
+            size *= dimensions[i];
+        return size;
+    }
+
+    public LispObject typeOf()
+    {
+        if (getRank() == 1) {
+            if (array instanceof LispString)
+                return Symbol.STRING;
+            return list3(Symbol.VECTOR, T, new Fixnum(size));
+        }
+        return list3(Symbol.ARRAY, T, getDimensions());
     }
 
@@ -37 +59 @@
         if (typeSpecifier == Symbol.ARRAY)
             return T;
+        if (typeSpecifier == Symbol.VECTOR)
+            return getRank() == 1 ? T : NIL;
         if (typeSpecifier instanceof LispClass) {
             final String name = typeSpecifier.getName();
@@ -50 +74 @@
     {
         if (getRank() == 1)
-            return array.getDimension(0) - offset;
+            return size;
         throw new TypeError(this, "sequence");
     }
@@ -66 +90 @@
     public int getRank()
     {
-        return array.getRank();
+        return dimv.length;
     }
 
     public LispObject getDimensions()
     {
-        return array.getDimensions();
+        LispObject result = NIL;
+        for (int i = dimv.length; i-- > 0;)
+            result = new Cons(new Fixnum(dimv[i]), result);
+        return result;
     }
 
     public int getDimension(int n) throws LispError
     {
-        return array.getDimension(n);
+        try {
+            return dimv[n];
+        }
+        catch (ArrayIndexOutOfBoundsException e) {
+            throw new TypeError("bad array dimension");
+        }
     }
 
@@ -86 +118 @@
     public int getTotalSize()
     {
-        return array.getTotalSize() - offset;
+        return size;
     }
 
     public LispObject getRowMajor(int index) throws LispError
     {
-        return array.getRowMajor(index + offset);
+        if (index >= 0 && index < size)
+            return array.getRowMajor(index + offset);
+        throw new TypeError("bad row major index " + index);
     }
 
     public void setRowMajor(int index, LispObject newValue) throws LispError
     {
-        array.setRowMajor(index + offset, newValue);
+        if (index >= 0 && index < size)
+            array.setRowMajor(index + offset, newValue);
+        throw new TypeError("bad row major index " + index);
     }