DynamicJava: Fix for bug when array initializer is assigned to a non-array type.

dlsmith · dlsmith · commit 942ecab3a5c7 · 2010-04-11T04:35:00.000Z
git-svn-id: file:///tmp/test-svn/trunk@5216 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ExpressionChecker.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ExpressionChecker.java
@@ -837,7 +837,11 @@ private DJClass resolveThis(Option<String> outerName, Node node) {
       // (and that can be turned on or off depending on preferences),
       // the stated element type is always required and checked
       // TODO: Store the *Type* as an attribute on the initializer, instead of a *TypeName*?
-      Type elementType = checkTypeName(node.getElementType());
+      TypeName elementTypeName = node.getElementType();
+      if (elementTypeName == null) {
+        throw new ExecutionError("array.initializer.type", node);
+      }
+      Type elementType = checkTypeName(elementTypeName);
       if (expected.isSome() && ts.isArray(expected.unwrap())) {
         checkList(node.getCells(), ts.arrayElementType(expected.unwrap()));
       }
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/resources/messages.properties b/dynamicjava/src/koala/dynamicjava/interpreter/resources/messages.properties
@@ -170,6 +170,8 @@ array.dimension.type       = Bad array dimension expression type
 # Used by TypeChecker
 array.index.type           = Bad array index expression type
 
+array.initializer.type     = Array initializer must be assigned to an array type
+
 # Used by ClassInfoCompiler, TypeChecker
 array.required             = '%0' is not an array
 
