Regenerated parser state tables to apply modulo precedence changes.

Also added a few test cases to verify it works.

Author: kblaschke

projectm-eval/Compiler.c

@@ -518,11 +518,11 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    78,    78,    79,    89,    93,    94,    98,   102,   103,
-     104,   108,   109,   115,   116,   119,   122,   123,   124,   131,
-     132,   133,   134,   135,   136,   137,   138,   141,   142,   143,
-     144,   145,   146,   149,   150,   153,   156,   159,   162,   163,
-     164,   165,   166,   167,   168,   169,   172,   173,   174,   177
+       0,    77,    77,    78,    88,    92,    93,    97,   101,   102,
+     103,   107,   108,   114,   115,   118,   121,   122,   123,   130,
+     131,   132,   133,   134,   135,   136,   137,   140,   141,   142,
+     143,   144,   145,   148,   149,   152,   155,   158,   161,   162,
+     163,   164,   165,   166,   167,   168,   171,   172,   173,   176
 };
 #endif
 
@@ -575,7 +575,7 @@ static const yytype_int16 yypact[] =
       92,    92,    92,    92,    92,    92,    92,    92,    74,   -35,
      136,    25,    21,   -35,    42,   -35,   243,   278,   278,   311,
      340,   340,   311,   311,   340,   487,   -24,   498,   487,   394,
-     421,   243,   208,   448,   475,   498,   -24,    16,    16,   122,
+     421,   243,   208,   448,   475,   498,   -24,    16,    16,    17,
       17,   -22,    26,   -35,   172,   -35,    92,   -35,   -35,    92,
      -35,    21,   367
 };
@@ -629,8 +629,8 @@ static const yytype_int8 yytable[] =
        0,     5,     6,     0,     0,     0,     7,     0,     5,     6,
        0,     0,     8,     7,     0,     0,     0,     0,     0,    54,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    45,    46,     0,    47,    36,    37,
-      48,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      32,    33,    34,    35,     0,     0,     0,     0,    36,    37,
+       0,    38,    39,    40,    41,    42,    43,    44,    45,    46,
        0,    47,     0,     0,    48,    85,    22,    23,    24,    25,
       26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
        0,     0,     0,     0,    36,    37,     0,    38,    39,    40,
@@ -687,8 +687,8 @@ static const yytype_int8 yycheck[] =
       -1,    29,    30,    -1,    -1,    -1,    34,    -1,    29,    30,
       -1,    -1,    40,    34,    -1,    -1,    -1,    -1,    -1,    40,
        4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    32,    33,    -1,    35,    22,    23,
-      38,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      14,    15,    16,    17,    -1,    -1,    -1,    -1,    22,    23,
+      -1,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       -1,    35,    -1,    -1,    38,    39,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       -1,    -1,    -1,    -1,    22,    23,    -1,    25,    26,    27,

tests/PrecedenceTest.cpp

@@ -0,0 +1,56 @@
+#include "PrecedenceTest.hpp"
+
+void PrecedenceTest::SetUp()
+{
+    m_globalMemory = projectm_eval_memory_buffer_create();
+    m_context = projectm_eval_context_create(m_globalMemory, &m_globalRegisters);
+}
+
+void PrecedenceTest::TearDown()
+{
+    projectm_eval_context_destroy(m_context);
+    projectm_eval_memory_buffer_destroy(m_globalMemory);
+    memset(&m_globalRegisters, 0, sizeof(m_globalRegisters));
+}
+
+TEST_F(PrecedenceTest, DivisionMultiplication)
+{
+    auto code1 = projectm_eval_code_compile(m_context, "3.0 * 2.0 / 5.0 * 7.0;");
+    auto code2 = projectm_eval_code_compile(m_context, "2.0 / 5.0 * 3.0 * 7.0;");
+    auto code3 = projectm_eval_code_compile(m_context, "3.0 * 7.0 * 2.0 / 5.0;");
+
+    auto ret1 = projectm_eval_code_execute(code1);
+    auto ret2 = projectm_eval_code_execute(code2);
+    auto ret3 = projectm_eval_code_execute(code3);
+
+    projectm_eval_code_destroy(code1);
+    projectm_eval_code_destroy(code2);
+    projectm_eval_code_destroy(code3);
+
+    ASSERT_FLOAT_EQ(ret1, 8.4);
+    ASSERT_FLOAT_EQ(ret1, ret2);
+    ASSERT_FLOAT_EQ(ret2, ret3);
+    ASSERT_FLOAT_EQ(ret1, ret3);
+
+}
+
+TEST_F(PrecedenceTest, MultiplicationModulo)
+{
+    auto code1 = projectm_eval_code_compile(m_context, "3.0 * 2.0 % 5.0 * 7.0;");
+    auto code2 = projectm_eval_code_compile(m_context, "2.0 % 5.0 * 3.0 * 7.0;");
+    auto code3 = projectm_eval_code_compile(m_context, "3.0 * 7.0 * 2.0 % 5.0;");
+
+    auto ret1 = projectm_eval_code_execute(code1);
+    auto ret2 = projectm_eval_code_execute(code2);
+    auto ret3 = projectm_eval_code_execute(code3);
+
+    projectm_eval_code_destroy(code1);
+    projectm_eval_code_destroy(code2);
+    projectm_eval_code_destroy(code3);
+
+    ASSERT_FLOAT_EQ(ret1, 42.0);
+    ASSERT_FLOAT_EQ(ret1, ret2);
+    ASSERT_FLOAT_EQ(ret2, ret3);
+    ASSERT_FLOAT_EQ(ret1, ret3);
+}
+

tests/PrecedenceTest.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <gtest/gtest.h>
+
+#include <vector>
+
+#include <projectm-eval/api/projectm-eval.h>
+
+class PrecedenceTest : public testing::Test
+{
+public:
+
+protected:
+
+    void SetUp() override;
+
+    void TearDown() override;
+
+    struct projectm_eval_context* m_context{};
+    projectm_eval_mem_buffer m_globalMemory{};
+    PRJM_EVAL_F m_globalRegisters[100]{};
+};