Correct test cases, cleanup each_term implementations for queries/rules

SanderMertens · Sep 15, 2023 · ca73ed2 · ca73ed2
1 parent 49478e7
commit ca73ed2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/flecs.h b/flecs.h
@@ -27996,14 +27996,7 @@ struct query_base {
 
     template <typename Func>
     void each_term(const Func& func) const {
-        const ecs_filter_t *f = ecs_query_get_filter(m_query);
-        ecs_assert(f != NULL, ECS_INVALID_PARAMETER, NULL);
-
-        for (int i = 0; i < f->term_count; i ++) {
-            flecs::term t(m_world, f->terms[i]);
-            func(t);
-            t.reset(); // prevent freeing resources
-        }
+        this->filter().each_term(func);
     }
 
     filter_base filter() const {
@@ -29341,6 +29334,11 @@ struct rule_base {
         }
     }
 
+    template <typename Func>
+    void each_term(const Func& func) const {
+        this->filter().each_term(func);
+    }
+
     /** Move the rule. */
     void move(flecs::rule_base&& obj) {
         this->destruct();

diff --git a/include/flecs/addons/cpp/mixins/query/impl.hpp b/include/flecs/addons/cpp/mixins/query/impl.hpp
@@ -97,14 +97,7 @@ struct query_base {
 
     template <typename Func>
     void each_term(const Func& func) const {
-        const ecs_filter_t *f = ecs_query_get_filter(m_query);
-        ecs_assert(f != NULL, ECS_INVALID_PARAMETER, NULL);
-
-        for (int i = 0; i < f->term_count; i ++) {
-            flecs::term t(m_world, f->terms[i]);
-            func(t);
-            t.reset(); // prevent freeing resources
-        }
+        this->filter().each_term(func);
     }
 
     filter_base filter() const {

diff --git a/include/flecs/addons/cpp/mixins/rule/impl.hpp b/include/flecs/addons/cpp/mixins/rule/impl.hpp
@@ -52,6 +52,11 @@ struct rule_base {
         }
     }
 
+    template <typename Func>
+    void each_term(const Func& func) const {
+        this->filter().each_term(func);
+    }
+
     /** Move the rule. */
     void move(flecs::rule_base&& obj) {
         this->destruct();

diff --git a/test/cpp_api/src/Query.cpp b/test/cpp_api/src/Query.cpp
@@ -831,7 +831,7 @@ void Query_inspect_terms_w_each(void) {
 void Query_inspect_terms_w_expr(void) {
     flecs::world ecs;
 
-    flecs::filter<> f = ecs.filter_builder()
+    flecs::query<> f = ecs.query_builder()
         .expr("(ChildOf,0)")
         .build();
 

diff --git a/test/cpp_api/src/RuleBuilder.cpp b/test/cpp_api/src/RuleBuilder.cpp
@@ -801,7 +801,7 @@ void RuleBuilder_iter_w_stage(void) {
 void RuleBuilder_inspect_terms_w_expr(void) {
     flecs::world ecs;
 
-    flecs::filter<> f = ecs.filter_builder()
+    flecs::rule<> f = ecs.rule_builder()
         .expr("(ChildOf,0)")
         .build();
 
@@ -812,4 +812,6 @@ void RuleBuilder_inspect_terms_w_expr(void) {
     });
 
     test_int(count, 1);
+
+    f.destruct();
 }