match("foo") throws an ugly exception

quattor · Mar 10, 2020 · cecaa99 · cecaa99
1 parent 2724470
commit cecaa99
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/panc/src/main/java/org/quattor/pan/dml/functions/Match.java b/panc/src/main/java/org/quattor/pan/dml/functions/Match.java
@@ -53,9 +53,9 @@ public static Operation getInstance(SourceRange sourceRange,
 
 		// Optimize the operation if compile time constants are given for the
 		// regular expression and match flags.
-		if (operations.length > 0
-				&& operations[1] instanceof StringProperty
-				&& (operations.length < 3 || operations[2] instanceof StringProperty)) {
+		if (operations.length == 2
+				&& operations[0] instanceof StringProperty
+				&& operations[1] instanceof StringProperty) {
 			return StaticMatch.getInstance(sourceRange, operations);
 		} else {
 			return new Match(sourceRange, operations);

diff --git a/panc/src/test/java/org/quattor/pan/dml/functions/MatchTest.java b/panc/src/test/java/org/quattor/pan/dml/functions/MatchTest.java
@@ -100,6 +100,11 @@ public void invalidCallWithNoArguments() throws SyntaxException {
 		Match.getInstance(null);
 	}
 
+	@Test(expected = SyntaxException.class)
+	public void invalidCallWithOneArgument() throws SyntaxException {
+		Match.getInstance(null, StringProperty.getInstance("a"));
+	}
+
 	@Test(expected = SyntaxException.class)
 	public void invalidCallWithTooManyArguments() throws SyntaxException {
 		Match.getInstance(null, StringProperty.getInstance("a"), StringProperty

diff --git a/panc/src/test/pan/Functionality/regexp/regexp4.pan b/panc/src/test/pan/Functionality/regexp/regexp4.pan
@@ -0,0 +1,9 @@
+#
+# too few args should give a nice error message
+#
+# @expect=org.quattor.pan.exceptions.SyntaxException
+#
+
+object template regexp4;
+
+"/bug" = match("12323");