Merge pull request mvel#23 from mariofusco/parenthesis

lookahead to avoid invalid casts
cubita-io · Oct 7, 2011 · 82fcf3a · 82fcf3a
2 parents c02c1dc + 0d41f64
commit 82fcf3a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/main/java/org/mvel2/compiler/AbstractParser.java b/src/main/java/org/mvel2/compiler/AbstractParser.java
@@ -1031,11 +1031,22 @@ else if ((cursor - 1) != start || (!isDigit(expr[cursor - 1])) && isDigit(lookAh
                 Class cls;
                 try {
                   if (tDescr.isClass() && (cls = getClassReference(pCtx, tDescr)) != null) {
-                    st = cursor;
-                    captureToEOS();
 
-                    return lastNode = new TypeCast(expr, st, cursor - st,
-                        cls, fields, pCtx);
+                    // lookahead to check if it could be a real cast
+                    boolean isCast = false;
+                    for (int i = cursor; i < expr.length; i++) {
+                      if (expr[i] == ' ' || expr[i] == '\t') continue;
+                      isCast = isIdentifierPart(expr[i]) || expr[i] == '\'' || expr[i] == '"' || expr[i] == '(';
+                      break;
+                    }
+
+                    if (isCast) {
+                        st = cursor;
+                        captureToEOS();
+
+                        return lastNode = new TypeCast(expr, st, cursor - st,
+                            cls, fields, pCtx);
+                    }
                   }
                 }
                 catch (ClassNotFoundException e) {

diff --git a/src/test/java/org/mvel2/tests/core/UnsupportedFeaturesTests.java b/src/test/java/org/mvel2/tests/core/UnsupportedFeaturesTests.java
@@ -20,6 +20,18 @@ public void testJavaStyleClassLiterals() {
 
     OptimizerFactory.setDefaultOptimizer(OptimizerFactory.DYNAMIC);
 
+    assertEquals(String.class, MVEL.eval("String"));
+    assertEquals(String.class, MVEL.eval("java.lang.String"));
+    assertEquals(java.util.ArrayList.class, MVEL.eval("java.util.ArrayList"));
+
+    assertEquals(String.class, MVEL.eval("(String)"));
+    assertEquals(String.class, MVEL.eval("(java.lang.String)"));
+    assertEquals(java.util.ArrayList.class, MVEL.eval("(java.util.ArrayList)"));
+
+    assertEquals(String.class, MVEL.eval("(String.class)"));
+    assertEquals(String.class, MVEL.eval("(java.lang.String.class)"));
+    assertEquals(java.util.ArrayList.class, MVEL.eval("(java.util.ArrayList.class)"));
+
     assertEquals(String.class, MVEL.eval("String.class"));
     assertEquals(String.class, MVEL.eval("java.lang.String.class"));
     assertEquals(java.util.ArrayList.class, MVEL.eval("java.util.ArrayList.class"));