fix for loop parsing

billows-hu · Nov 19, 2020 · f33227e · f33227e
1 parent bac95e0
commit f33227e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/main/java/org/mvel2/ast/ForEachNode.java b/src/main/java/org/mvel2/ast/ForEachNode.java
@@ -17,6 +17,8 @@
  */
 package org.mvel2.ast;
 
+import java.lang.reflect.Array;
+
 import org.mvel2.CompileException;
 import org.mvel2.DataConversion;
 import org.mvel2.MVEL;
@@ -27,9 +29,9 @@
 import org.mvel2.integration.impl.ItemResolverFactory;
 import org.mvel2.util.ParseTools;
 
-import java.lang.reflect.Array;
-
-import static org.mvel2.util.ParseTools.*;
+import static org.mvel2.util.ParseTools.createStringTrimmed;
+import static org.mvel2.util.ParseTools.getBaseComponentType;
+import static org.mvel2.util.ParseTools.subCompileExpression;
 
 /**
  * @author Christopher Brock
@@ -178,11 +180,10 @@ private void handleCond(char[] condition, int start, int offset, int fields, Par
 
     int x;
     if ((x = (item = createStringTrimmed(condition, start, cursor - start)).indexOf(' ')) != -1) {
-      String tk = new String(condition, start, x).trim();
+      String tk = item.substring(0, x);
       try {
         itemType = ParseTools.findClass(null, tk, pCtx);
-        item = new String(condition, start + x, (cursor - start) - x).trim();
-
+        item = item.substring( item.lastIndexOf( ' ' )+1, item.length() );
       }
       catch (ClassNotFoundException e) {
         throw new CompileException("cannot resolve identifier: " + tk, condition, start);

diff --git a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
@@ -4899,4 +4899,23 @@ public void testGetBestCandidateForBigDecimalArg() {
     assertEquals(double.class, method.getReturnType());
     Assert.assertArrayEquals(new Class<?>[] {double.class, int.class}, method.getParameterTypes());
   }
+
+  public void testForLoopWithSpaces() {
+    VariableResolverFactory factory = new MapVariableResolverFactory(new HashMap<String, Object>());
+    factory.createVariable("strings", Arrays.asList( "test" ));
+
+    ParserConfiguration pconf = new ParserConfiguration();
+    ParserContext pctx = new ParserContext(pconf);
+    pctx.setStrictTypeEnforcement(true);
+    pctx.setStrongTyping(true);
+    pctx.addInput("strings", List.class);
+
+    String expression =
+            "for (   String   s : strings ) {\n" +
+            "  return s;\n" +
+            "}";
+
+    Serializable compiledExpr = MVEL.compileExpression(expression, pctx);
+    assertEquals( "test", MVEL.executeExpression(compiledExpr, null, factory));
+  }
 }