Fix toggle mask compilation and evaluation:

- Toggle bitmasks were built from term indices instead of field indices, which is wrong for OR chains that collapse into one field.
- Constrained AND-toggle checks to currently set fields, so OR candidates do not get rejected just because sibling terms in the OR group are unset.

Author: 60k41p

distr/flecs.c

@@ -79961,12 +79961,13 @@ int flecs_query_insert_toggle(
                 }
 
                 /* Source matches, set flag */
+                uint64_t field_bit = 1ull << term->field_index;
                 if (term->oper == EcsNot) {
-                    not_toggles |= (1llu << j);
+                    not_toggles |= field_bit;
                 } else if (term->oper == EcsOptional) {
-                    optional_toggles |= (1llu << j);
+                    optional_toggles |= field_bit;
                 } else {
-                    and_toggles |= (1llu << j);
+                    and_toggles |= field_bit;
                 }
 
                 fields_done |= (1llu << j);
@@ -79999,7 +80000,7 @@ int flecs_query_insert_toggle(
              * set, separate instructions let the query engine backtrack to get 
              * the right results. */
             if (optional_toggles) {
-                for (j = i; j < term_count; j ++) {
+                for (j = 0; j < q->field_count; j ++) {
                     uint64_t field_bit = 1ull << j;
                     if (!(optional_toggles & field_bit)) {
                         continue;
@@ -85462,7 +85463,7 @@ bool flecs_query_toggle(
         op_ctx->prev_set_fields = it->set_fields;
     }
 
-    ecs_flags64_t and_fields = op->first.entity;
+    ecs_flags64_t and_fields = op->first.entity & op_ctx->prev_set_fields;
     ecs_flags64_t not_fields = op->second.entity & op_ctx->prev_set_fields;
 
     return flecs_query_toggle_cmp(

src/query/compiler/compiler.c

@@ -771,12 +771,13 @@ int flecs_query_insert_toggle(
                 }
 
                 /* Source matches, set flag */
+                uint64_t field_bit = 1ull << term->field_index;
                 if (term->oper == EcsNot) {
-                    not_toggles |= (1llu << j);
+                    not_toggles |= field_bit;
                 } else if (term->oper == EcsOptional) {
-                    optional_toggles |= (1llu << j);
+                    optional_toggles |= field_bit;
                 } else {
-                    and_toggles |= (1llu << j);
+                    and_toggles |= field_bit;
                 }
 
                 fields_done |= (1llu << j);
@@ -809,7 +810,7 @@ int flecs_query_insert_toggle(
              * set, separate instructions let the query engine backtrack to get 
              * the right results. */
             if (optional_toggles) {
-                for (j = i; j < term_count; j ++) {
+                for (j = 0; j < q->field_count; j ++) {
                     uint64_t field_bit = 1ull << j;
                     if (!(optional_toggles & field_bit)) {
                         continue;

src/query/engine/eval_toggle.c

@@ -299,7 +299,7 @@ bool flecs_query_toggle(
         op_ctx->prev_set_fields = it->set_fields;
     }
 
-    ecs_flags64_t and_fields = op->first.entity;
+    ecs_flags64_t and_fields = op->first.entity & op_ctx->prev_set_fields;
     ecs_flags64_t not_fields = op->second.entity & op_ctx->prev_set_fields;
 
     return flecs_query_toggle_cmp(