Add modulo operation to specification parser

Ref. #476
AdaCore · Oct 26, 2020 · 88ef28e · 88ef28e
1 parent 61c6f66
commit 88ef28e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/rflx/specification/grammar.py b/rflx/specification/grammar.py
@@ -57,6 +57,7 @@
     Less,
     LessEqual,
     MessageAggregate,
+    Mod,
     Mul,
     NotEqual,
     NotIn,
@@ -202,7 +203,7 @@ def expression(restricted: bool = False) -> Token:
     expr = Forward()
 
     highest_precedence_operator = Literal("**")
-    multiplying_operator = Literal("*") | Literal("/")
+    multiplying_operator = Literal("*") | Literal("/") | Literal("mod")
     binary_adding_operator = Literal("+") | Literal("-")
     relational_operator = (
         Keyword("=") | Keyword("/=") | Keyword("<=") | Keyword("<") | Keyword(">=") | Keyword(">")
@@ -784,6 +785,7 @@ def parse_mathematical_operator(string: str, location: int, tokens: ParseResults
         "-": Sub,
         "*": Mul,
         "/": Div,
+        "mod": Mod,
         "**": Pow,
     }
     return parse_operator(operators, string, location, tokens)

diff --git a/tests/unit/specification/grammar_test.py b/tests/unit/specification/grammar_test.py
@@ -145,6 +145,13 @@ def test_expression_suffix(string: str, expected: expr.Expr) -> None:
             "A + B * (-8)",
             expr.Add(expr.Variable("A"), expr.Mul(expr.Variable("B"), expr.Number(-8))),
         ),
+        (
+            "A + B mod 8 * 2",
+            expr.Add(
+                expr.Variable("A"),
+                expr.Mul(expr.Mod(expr.Variable("B"), expr.Number(8)), expr.Number(2)),
+            ),
+        ),
     ],
 )
 def test_expression_mathematical(string: str, expected: expr.Expr) -> None: