fix to MVEL interpreter edge case with contains operator with compoun…

…d expression on RHS.
cubita-io · Jan 22, 2013 · 86ee3a3 · 86ee3a3
1 parent 7bf9dbb
commit 86ee3a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/org/mvel2/compiler/AbstractParser.java b/src/main/java/org/mvel2/compiler/AbstractParser.java
@@ -469,6 +469,11 @@ else if (((NewObjectNode) lastNode).getTypeDescr().isUndimensionedArray()) {
                 }
 
                 return (ASTNode) splitAccumulator.pop();
+
+              case CONTAINS:
+                lastWasIdentifier = false;
+                return lastNode = new OperatorNode(Operator.CONTAINS, expr, st, pCtx);
+
             }
           }
 

diff --git a/src/test/java/org/mvel2/tests/core/ComparisonTests.java b/src/test/java/org/mvel2/tests/core/ComparisonTests.java
@@ -185,6 +185,9 @@ public void testContains6() {
     assertEquals(true, test("bwahbwah = 'mikebrock'; testVar10 = 'mike'; bwahbwah contains testVar10"));
   }
 
+  public void testContains7() {
+     assertEquals(true, test("sentence contains ('fox')"));
+   }
 
   public void testSoundex() {
     assertTrue((Boolean) test("'foobar' soundslike 'fubar'"));