Add missing ecs_rule_var_count function

SanderMertens · May 7, 2023 · 83d7468 · 83d7468
1 parent 80b88a7
commit 83d7468
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/flecs.c b/flecs.c
@@ -38626,6 +38626,12 @@ int32_t ecs_rule_find_var(
     return (int32_t)var_id;
 }
 
+int32_t ecs_rule_var_count(
+    const ecs_rule_t *rule)
+{
+    return rule->var_pub_count;
+}
+
 static
 const char* flecs_term_id_var_name(
     ecs_term_id_t *term_id)

diff --git a/src/addons/rules/compile.c b/src/addons/rules/compile.c
@@ -200,6 +200,12 @@ int32_t ecs_rule_find_var(
     return (int32_t)var_id;
 }
 
+int32_t ecs_rule_var_count(
+    const ecs_rule_t *rule)
+{
+    return rule->var_pub_count;
+}
+
 static
 const char* flecs_term_id_var_name(
     ecs_term_id_t *term_id)

diff --git a/test/addons/project.json b/test/addons/project.json
@@ -786,7 +786,8 @@
                 "parse_2_vars_w_spaces",
                 "parse_0_var_paren_w_spaces",
                 "parse_1_var_paren_w_spaces",
-                "parse_2_vars_paren_w_spaces"
+                "parse_2_vars_paren_w_spaces",
+                "var_count"
             ]
         }, {
             "id": "RulesOperators",

diff --git a/test/addons/src/RulesVariables.c b/test/addons/src/RulesVariables.c
@@ -5785,3 +5785,16 @@ void RulesVariables_parse_2_vars_paren_w_spaces() {
 
     ecs_fini(world);
 }
+
+void RulesVariables_var_count() {
+    ecs_world_t *world = ecs_init();
+
+    ecs_rule_t *r = ecs_rule(world, {
+        .expr = "$x($this, $y), $x($this), $y($this)"
+    });
+    test_assert(r != NULL);
+
+    test_int(ecs_rule_var_count(r), 3);
+
+    ecs_fini(world);
+}
diff --git a/test/addons/src/main.c b/test/addons/src/main.c
@@ -770,6 +770,7 @@ void RulesVariables_parse_2_vars_w_spaces(void);
 void RulesVariables_parse_0_var_paren_w_spaces(void);
 void RulesVariables_parse_1_var_paren_w_spaces(void);
 void RulesVariables_parse_2_vars_paren_w_spaces(void);
+void RulesVariables_var_count(void);
 
 // Testsuite 'RulesOperators'
 void RulesOperators_2_and_not(void);
@@ -4375,6 +4376,10 @@ bake_test_case RulesVariables_testcases[] = {
     {
         "parse_2_vars_paren_w_spaces",
         RulesVariables_parse_2_vars_paren_w_spaces
+    },
+    {
+        "var_count",
+        RulesVariables_var_count
     }
 };
 
@@ -6641,7 +6646,7 @@ static bake_test_suite suites[] = {
         "RulesVariables",
         NULL,
         NULL,
-        90,
+        91,
         RulesVariables_testcases
     },
     {