String variable was not recognized when passed as a param (#258)

Co-authored-by: Fanime Fartoon <[email protected]>
ezylang · May 25, 2021 · cb66e70 · cb66e70
1 parent 2e23b46
commit cb66e70
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/main/java/com/udojava/evalex/Expression.java b/src/main/java/com/udojava/evalex/Expression.java
@@ -1452,7 +1452,8 @@ public BigDecimal eval() {
                         }
 
                         public String getString() {
-                            return token.surface;
+                        	LazyNumber lazyVariable = variables.get(token.surface);
+                            return lazyVariable.getString();
                         }
                     });
                     break;

diff --git a/src/test/java/com/udojava/evalex/TestCustoms.java b/src/test/java/com/udojava/evalex/TestCustoms.java
@@ -229,4 +229,39 @@ public BigDecimal eval(BigDecimal v1, BigDecimal v2) {
 
         assertEquals("1", e.eval().toPlainString());
     }
-}
+
+    @Test
+    public void testCustomFunctionWithStringParams() {
+        Expression e = new Expression("INDEXOF(STRING1, STRING2)");
+        e.addLazyFunction(new AbstractLazyFunction("INDEXOF", 2) {
+            @Override
+            public LazyNumber lazyEval(List<LazyNumber> lazyParams) {
+                String st1 = lazyParams.get(0).getString();
+                String st2 = lazyParams.get(1).getString();
+                final int index = st1.indexOf(st2);
+
+                return new LazyNumber() {
+                    @Override
+                    public BigDecimal eval() {
+                        return new BigDecimal(index);
+                    }
+
+                    @Override
+                    public String getString() {
+                        return Integer.toString(index);
+                    }
+                };
+            }
+        });
+
+        e.setVariable("STRING1", "The quick brown fox");
+        e.setVariable("STRING2", "The");
+
+        assertEquals("0", e.eval().toPlainString());
+
+        e.setVariable("STRING1", "The quick brown fox");
+        e.setVariable("STRING2", "brown");
+
+        assertEquals("10", e.eval().toPlainString());
+    }
+}