vtrutil: Add support for modulo operator to expression evaluator

Author: kmurray

libs/libvtrutil/src/vtr_expr_eval.cpp

@@ -322,13 +322,17 @@ static void get_formula_object(const char* ch, int& ichar, const t_formula_data&
                 fobj->type = E_FML_OPERATOR;
                 fobj->data.op = E_OP_SUB;
                 break;
+            case '*':
+                fobj->type = E_FML_OPERATOR;
+                fobj->data.op = E_OP_MULT;
+                break;
             case '/':
                 fobj->type = E_FML_OPERATOR;
                 fobj->data.op = E_OP_DIV;
                 break;
-            case '*':
+            case '%':
                 fobj->type = E_FML_OPERATOR;
-                fobj->data.op = E_OP_MULT;
+                fobj->data.op = E_OP_MOD;
                 break;
             case '(':
                 fobj->type = E_FML_BRACKET;
@@ -365,13 +369,14 @@ static int get_fobj_precedence(const Formula_Object& fobj) {
                 precedence = 2;
                 break;
             case E_OP_MULT: //fallthrough
-            case E_OP_DIV:
+            case E_OP_DIV: //fallthrough
+            case E_OP_MOD:
                 precedence = 3;
                 break;
             case E_OP_MIN: //fallthrough
             case E_OP_MAX: //fallthrough
             case E_OP_LCM: //fallthrough
-            case E_OP_GCD: //fallthrough
+            case E_OP_GCD:
                 precedence = 4;
                 break;
             default:
@@ -606,6 +611,9 @@ static int apply_rpn_op(const Formula_Object& arg1, const Formula_Object& arg2,
         case E_OP_DIV:
             result = arg1.data.num / arg2.data.num;
             break;
+        case E_OP_MOD:
+            result = arg1.data.num % arg2.data.num;
+            break;
         case E_OP_MAX:
             result = std::max(arg1.data.num, arg2.data.num);
             break;
@@ -643,8 +651,9 @@ static bool is_operator(const char ch) {
     switch (ch) {
         case '+': //fallthrough
         case '-': //fallthrough
-        case '/': //fallthrough
         case '*': //fallthrough
+        case '/': //fallthrough
+        case '%': //fallthrough
         case ')': //fallthrough
         case '(': //fallthrough
         case ',':

libs/libvtrutil/src/vtr_expr_eval.h

@@ -60,6 +60,7 @@ typedef enum e_operator {
     E_OP_SUB,
     E_OP_MULT,
     E_OP_DIV,
+    E_OP_MOD,
     E_OP_MIN,
     E_OP_MAX,
     E_OP_GCD,
@@ -108,6 +109,8 @@ class Formula_Object {
                 return "*";
             } else if (data.op == E_OP_DIV) {
                 return "/";
+            } else if (data.op == E_OP_MOD) {
+                return "%";
             } else if (data.op == E_OP_MIN) {
                 return "min";
             } else if (data.op == E_OP_MAX) {

libs/libvtrutil/test/test_expr_eval.cpp

@@ -24,6 +24,9 @@ TEST_CASE("Simple Expressions", "[vtr_expr_eval]") {
     //Floor arithmetic
     REQUIRE(parser.parse_formula("5 / 10", vars) == 0);
     REQUIRE(parser.parse_formula("10 / 9", vars) == 1);
+
+    REQUIRE(parser.parse_formula("5 % 10", vars) == 5);
+    REQUIRE(parser.parse_formula("10 % 9", vars) == 1);
 }
 
 TEST_CASE("Negative Literals", "[vtr_expr_eval]") {