fix(engine): add reserved keywords

* add the reserved keywords: "and", "or" * avoid that a conjunction/disjunction is parsed as function name * change the parsing behavior to avoid that a function name contains a reserved keyword like "and"/"or"
camunda · Feb 9, 2022 · 30ed9c6 · 30ed9c6
1 parent da3569a
commit 30ed9c6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 62 deletions.
diff --git a/src/main/scala/org/camunda/feel/impl/parser/FeelParser.scala b/src/main/scala/org/camunda/feel/impl/parser/FeelParser.scala
@@ -34,66 +34,7 @@ import fastparse.{
   StringIn,
   parse
 }
-import org.camunda.feel.syntaxtree.{
-  Addition,
-  ArithmeticNegation,
-  AtLeastOne,
-  ClosedConstRangeBoundary,
-  Conjunction,
-  ConstBool,
-  ConstContext,
-  ConstDate,
-  ConstDateTime,
-  ConstDayTimeDuration,
-  ConstInputValue,
-  ConstList,
-  ConstLocalDateTime,
-  ConstLocalTime,
-  ConstNull,
-  ConstNumber,
-  ConstRange,
-  ConstString,
-  ConstTime,
-  ConstYearMonthDuration,
-  Disjunction,
-  Division,
-  Equal,
-  EveryItem,
-  Exp,
-  Exponentiation,
-  Filter,
-  For,
-  FunctionDefinition,
-  FunctionInvocation,
-  FunctionParameters,
-  GreaterOrEqual,
-  GreaterThan,
-  If,
-  In,
-  InputEqualTo,
-  InputGreaterOrEqual,
-  InputGreaterThan,
-  InputInRange,
-  InputLessOrEqual,
-  InputLessThan,
-  InstanceOf,
-  IterationContext,
-  JavaFunctionInvocation,
-  LessOrEqual,
-  LessThan,
-  Multiplication,
-  NamedFunctionParameters,
-  Not,
-  OpenConstRangeBoundary,
-  PathExpression,
-  PositionalFunctionParameters,
-  QualifiedFunctionInvocation,
-  ConstRangeBoundary,
-  Ref,
-  SomeItem,
-  Subtraction,
-  UnaryTestExpression
-}
+import org.camunda.feel.syntaxtree._
 import org.camunda.feel.{
   Date,
   isOffsetDateTime,
@@ -147,7 +88,9 @@ object FeelParser {
         "return",
         "then",
         "else",
-        "satisfies"
+        "satisfies",
+        "and",
+        "or"
       )
     ).!
 
@@ -490,7 +433,7 @@ object FeelParser {
 
   private def functionInvocation[_: P]: P[Exp] =
     P(
-      (identifierWithWhitespaces
+      ((identifierWithWhitespaces | functionNameWithReservedWord)
         .map(List(_)) | qualifiedName) ~ "(" ~ functionParameters.? ~ ")"
     ).map {
       case (name :: Nil, None) =>
@@ -507,6 +450,13 @@ object FeelParser {
                                     parameters)
     }
 
+  // List all built-in function names that contains a reserved word. These names are not allowed as
+  // regular function names.
+  private def functionNameWithReservedWord[_: P]: P[String] =
+    P(
+      "and" | "or" | "date and time" | "years and months duration"
+    ).!
+
   private def functionParameters[_: P]: P[FunctionParameters] =
     namedParameters | positionalParameters
 

diff --git a/src/test/scala/org/camunda/feel/impl/interpreter/InterpreterBooleanExpressionTest.scala b/src/test/scala/org/camunda/feel/impl/interpreter/InterpreterBooleanExpressionTest.scala
@@ -75,6 +75,14 @@ class InterpreterBooleanExpressionTest
       ValBoolean(true))
   }
 
+  it should "be in conjunction (with parentheses)" in {
+    eval("x and (y)", Map("x" -> true, "y" -> false)) should be(
+      ValBoolean(false))
+
+    eval("(x) and y", Map("x" -> true, "y" -> false)) should be(
+      ValBoolean(false))
+  }
+
   it should "be in disjunction" in {
 
     eval("false or true") should be(ValBoolean(true))
@@ -91,6 +99,12 @@ class InterpreterBooleanExpressionTest
     eval("2 or 4") should be(ValNull)
   }
 
+  it should "be in disjunction (with parentheses)" in {
+    eval("x or (y)", Map("x" -> false, "y" -> true)) should be(ValBoolean(true))
+
+    eval("(x) or y", Map("x" -> false, "y" -> true)) should be(ValBoolean(true))
+  }
+
   it should "be in disjunction with comparison" in {
     eval("1 = 1 or 1 = 2") should be(ValBoolean(true))
   }