[armedbear-cvs] r13119 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Jan  2 15:27:23 2011
New Revision: 13119

Log:
Fix ANSI-TEST regressions from r13096:
  Arrays with an element-type of NIL can't store anything, not even NIL,
  because the type of NIL is NULL.

Modified:
   trunk/abcl/src/org/armedbear/lisp/make_array.java

Modified: trunk/abcl/src/org/armedbear/lisp/make_array.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/make_array.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/make_array.java	Sun Jan  2 15:27:23 2011
@@ -183,7 +183,7 @@
         else if (upgradedType == NIL)
           {
             v = new NilVector(size);
-            defaultInitialElement = NIL;
+            defaultInitialElement = null;
           }
         else
           {
@@ -219,7 +219,8 @@
           }
         else
           {
-            v.fill(defaultInitialElement);
+            if (defaultInitialElement != null)
+              v.fill(defaultInitialElement);
           }
         if (fillPointer != NIL)
           v.setFillPointer(fillPointer);