Changeset 3748

Timestamp:

09/14/03 11:45:45 (19 years ago)

Author:

piso

Message:

Work in progress.

File:

• trunk/j/src/org/armedbear/lisp/make_array.java (modified) (4 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: make_array.java,v 1.1 2003-09-14 11:35:44 piso Exp $
+ * $Id: make_array.java,v 1.2 2003-09-14 11:45:45 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -48 +48 @@
         }
         final int rank = dimensions.listp() ? dimensions.length() : 1;
+        int[] dimv = new int[rank];
+        if (dimensions.listp()) {
+            for (int i = 0; i < rank; i++) {
+                LispObject dim = dimensions.car();
+                dimv[i] = Fixnum.getValue(dim);
+                dimensions = dimensions.cdr();
+            }
+        } else
+            dimv[0] = Fixnum.getValue(dimensions);
         if (displacedTo != NIL) {
             final AbstractArray array = checkArray(displacedTo);
@@ -59 +68 @@
             if (initialContents != NIL)
                 throw new LispError(":INITIAL-CONTENTS must not be specified with :DISPLACED-TO");
-            int[] dimv = new int[rank];
-            for (int i = 0; i < rank; i++) {
-                LispObject dim = dimensions.car();
-                dimv[i] = Fixnum.getValue(dim);
-                dimensions = dimensions.cdr();
-            }
             return new DisplacedArray(dimv, array, offset);
         }
         if (rank == 1) {
-            final int size;
-            if (dimensions instanceof Cons)
-                size = Fixnum.getValue(dimensions.car());
-            else
-                size = Fixnum.getValue(dimensions);
+            final int size = dimv[0];
             int limit =
                 Fixnum.getValue(Symbol.ARRAY_DIMENSION_LIMIT.getSymbolValue());
@@ -119 +118 @@
         }
         // rank != 1
-        int[] dimv = new int[rank];
-        for (int i = 0; i < rank; i++) {
-            LispObject dim = dimensions.car();
-            dimv[i] = Fixnum.getValue(dim);
-            dimensions = dimensions.cdr();
-        }
         Array array;
         if (initialContents != NIL) {