fix to mario's fix for array type declarations.

cubita-io · Nov 2, 2011 · f82790f · f82790f
1 parent e6468e8
commit f82790f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -216,7 +216,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/main/java/org/mvel2/ast/TypeDescriptor.java b/src/main/java/org/mvel2/ast/TypeDescriptor.java
@@ -132,7 +132,15 @@ public int getEndRange() {
   public void setEndRange(int endRange) {
     this.endRange = endRange;
   }
-
+
+  public Class<?> getClassReference() throws ClassNotFoundException {
+    return getClassReference(null, this);
+  }
+
+  public Class<?> getClassReference(ParserContext ctx) throws ClassNotFoundException {
+    return getClassReference(ctx,this);
+  }
+
   public static Class getClassReference(Class baseType,
                                         TypeDescriptor tDescr,
                                         VariableResolverFactory factory, ParserContext ctx) throws ClassNotFoundException {

diff --git a/src/main/java/org/mvel2/compiler/AbstractParser.java b/src/main/java/org/mvel2/compiler/AbstractParser.java
@@ -1041,11 +1041,11 @@ else if ((cursor - 1) != start || (!isDigit(expr[cursor - 1])) && isDigit(lookAh
                     }
 
                     if (isCast) {
-                        st = cursor;
-                        captureToEOS();
+                      st = cursor;
+                      captureToEOS();
 
-                        return lastNode = new TypeCast(expr, st, cursor - st,
-                            cls, fields, pCtx);
+                      return lastNode = new TypeCast(expr, st, cursor - st,
+                          cls, fields, pCtx);
                     }
                   }
                 }
@@ -1333,10 +1333,16 @@ else if (lastWasIdentifier) {
     }
 
     if (pCtx != null && pCtx.hasImports() && isArrayType(expr, st, end)) {
-      if (pCtx.hasImport(tmp = new String(expr, st, cursor - st - 2))) {
+      if (pCtx.hasImport(new String(expr, st, cursor - st - 2))) {
         lastWasIdentifier = true;
-        Class<?> arrayClass = java.lang.reflect.Array.newInstance((Class<?>)pCtx.getStaticOrClassImport(tmp), 0).getClass();
-        return lastNode = new LiteralNode(arrayClass);
+        TypeDescriptor typeDescriptor = new TypeDescriptor(expr, st, cursor - st, fields);
+
+        try {
+          return lastNode = new LiteralNode(typeDescriptor.getClassReference(pCtx));
+        }
+        catch (ClassNotFoundException e) {
+          throw new CompileException("could not resolve class: " + typeDescriptor.getClassName(), expr, st);
+        }
       }
     }