#1859 Fix assert when using set_var for query with one cascade term

Author: SanderMertens

distr/flecs.h

@@ -28631,7 +28631,7 @@ struct field_ptrs {
         fields_[index].ptr = ecs_field_w_size(iter, sizeof(A), 
             static_cast<int8_t>(index));
         fields_[index].is_ref = false;
-        ecs_assert(iter->sources[index] == 0, ECS_INTERNAL_ERROR, NULL);
+        // ecs_assert(iter->sources[index] == 0, ECS_INTERNAL_ERROR, NULL);
         populate_self(iter, index + 1, comps ...);
     }
 

include/flecs/addons/cpp/delegate.hpp

@@ -105,7 +105,7 @@ struct field_ptrs {
         fields_[index].ptr = ecs_field_w_size(iter, sizeof(A), 
             static_cast<int8_t>(index));
         fields_[index].is_ref = false;
-        ecs_assert(iter->sources[index] == 0, ECS_INTERNAL_ERROR, NULL);
+        // ecs_assert(iter->sources[index] == 0, ECS_INTERNAL_ERROR, NULL);
         populate_self(iter, index + 1, comps ...);
     }
 

test/cpp/project.json

@@ -986,6 +986,7 @@
                 "any_wildcard",
                 "cascade",
                 "cascade_w_relationship",
+                "cascade_w_set_var",
                 "up_w_type",
                 "cascade_w_type",
                 "cascade_desc",

test/cpp/src/QueryBuilder.cpp

@@ -2940,6 +2940,32 @@ void QueryBuilder_cascade_w_relationship(void) {
     test_int(count, 3);
 }
 
+void QueryBuilder_cascade_w_set_var(void) {
+    flecs::world ecs;
+
+    flecs::entity sun = ecs.entity()
+        .set<Position>({1, 2});
+
+    flecs::entity earth = ecs.entity()
+        .child_of(sun);
+
+    flecs::query q = ecs.query_builder<const Position*>()
+        .term_at(0)
+        .cascade()
+        .build();
+
+    int32_t count = 0;
+    q.set_var(0, earth).each([&](flecs::entity e, const Position* p) {
+        count ++;
+        test_assert(e == earth);
+        test_assert(p != nullptr);
+        test_int(p->x, 1);
+        test_int(p->y, 2);
+    });
+
+    test_int(count, 1);
+}
+
 void QueryBuilder_up_w_type(void) {
     flecs::world ecs;
 

test/cpp/src/main.cpp

@@ -952,6 +952,7 @@ void QueryBuilder_create_w_no_template_args(void);
 void QueryBuilder_any_wildcard(void);
 void QueryBuilder_cascade(void);
 void QueryBuilder_cascade_w_relationship(void);
+void QueryBuilder_cascade_w_set_var(void);
 void QueryBuilder_up_w_type(void);
 void QueryBuilder_cascade_w_type(void);
 void QueryBuilder_cascade_desc(void);
@@ -5370,6 +5371,10 @@ bake_test_case QueryBuilder_testcases[] = {
         "cascade_w_relationship",
         QueryBuilder_cascade_w_relationship
     },
+    {
+        "cascade_w_set_var",
+        QueryBuilder_cascade_w_set_var
+    },
     {
         "up_w_type",
         QueryBuilder_up_w_type
@@ -8202,7 +8207,7 @@ static bake_test_suite suites[] = {
         "QueryBuilder",
         QueryBuilder_setup,
         NULL,
-        179,
+        180,
         QueryBuilder_testcases,
         1,
         QueryBuilder_params