Fixed the evaluation of 'replace' built-in function

jxfzzzt · Nov 21, 2024 · 3fabeb7 · 3fabeb7
1 parent d759022
commit 3fabeb7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/pmml-evaluator/src/main/java/org/jpmml/evaluator/Functions.java b/pmml-evaluator/src/main/java/org/jpmml/evaluator/Functions.java
@@ -585,6 +585,9 @@ public String evaluate(String input, String regex, String replacement){
 
 			Matcher matcher = pattern.matcher(input);
 
+			// Replace PCRE-style dollar literal with Java-style dollar literal
+			replacement = replacement.replace("$$", "\\$");
+
 			return matcher.replaceAll(replacement);
 		}
 

diff --git a/pmml-evaluator/src/test/java/org/jpmml/evaluator/FunctionTest.java b/pmml-evaluator/src/test/java/org/jpmml/evaluator/FunctionTest.java
@@ -407,6 +407,26 @@ public void evaluateRegularExpressionFunctions(){
 		assertEquals("c", evaluate(Functions.REPLACE, "BBBB", "B+", "c"));
 		assertEquals("cccc", evaluate(Functions.REPLACE, "BBBB", "B+?", "c"));
 
+		try {
+			evaluate(Functions.REPLACE, "BBBB", "B", "$");
+
+			fail();
+		} catch(IllegalArgumentException iae){
+			// Ignored
+		}
+
+		assertEquals("$$$$", evaluate(Functions.REPLACE, "BBBB", "B", "$$"));
+
+		try {
+			evaluate(Functions.REPLACE, "BBBB", "B", "\\");
+
+			fail();
+		} catch(IllegalArgumentException iae){
+			// Ignored
+		}
+
+		assertEquals("\\\\\\\\", evaluate(Functions.REPLACE, "BBBB", "B", "\\\\"));
+
 		// See http://www.w3.org/TR/xquery-operators/#func-replace
 		assertEquals("a*cada*", evaluate(Functions.REPLACE, "abracadabra", "bra", "*"));
 		assertEquals("*", evaluate(Functions.REPLACE, "abracadabra", "a.*a", "*"));