SanderMertens#1957 Fix issue with resolving enum type in binary expressions

Author: SanderMertens

distr/flecs.c

@@ -95944,7 +95944,16 @@ int flecs_expr_binary_visit_type(
         goto error;
     }
 
-    if (flecs_expr_visit_type_priv(script, node->right, cur, desc)) {
+    ecs_meta_cursor_t right_cur = *cur;
+    if (node->right->kind == EcsExprIdentifier) {
+        if (ecs_get(script->world, node->left->type, EcsEnum) != NULL) {
+            /* If the left hand side is an enum, interpret untyped identifiers
+             * on the right hand side as enum constants of the same type. */
+            right_cur = ecs_meta_cursor(script->world, node->left->type, NULL);
+        }
+    }
+
+    if (flecs_expr_visit_type_priv(script, node->right, &right_cur, desc)) {
         goto error;
     }
 

src/addons/script/expr/visit_type.c

@@ -1096,7 +1096,16 @@ int flecs_expr_binary_visit_type(
         goto error;
     }
 
-    if (flecs_expr_visit_type_priv(script, node->right, cur, desc)) {
+    ecs_meta_cursor_t right_cur = *cur;
+    if (node->right->kind == EcsExprIdentifier) {
+        if (ecs_get(script->world, node->left->type, EcsEnum) != NULL) {
+            /* If the left hand side is an enum, interpret untyped identifiers
+             * on the right hand side as enum constants of the same type. */
+            right_cur = ecs_meta_cursor(script->world, node->left->type, NULL);
+        }
+    }
+
+    if (flecs_expr_visit_type_priv(script, node->right, &right_cur, desc)) {
         goto error;
     }
 

test/script/project.json

@@ -419,7 +419,9 @@
                 "tree_parent_nested_w_for_scope",
                 "tree_parent_nested_w_pair_scope",
                 "tree_parent_nested_w_with_scope",
-                "update_after_add_remove_tree_parent"
+                "update_after_add_remove_tree_parent",
+                "assign_eq_enum_to_component",
+                "assign_eq_enum_to_const"
             ]
         }, {
             "id": "Template",
@@ -704,11 +706,13 @@
                 "cond_eq_bool",
                 "cond_eq_int",
                 "cond_eq_enum",
+                "cond_eq_enum_literal",
                 "cond_eq_string",
                 "cond_eq_entity",
                 "cond_neq_bool",
                 "cond_neq_int",
                 "cond_neq_enum",
+                "cond_neq_enum_literal",
                 "cond_neq_string",
                 "cond_neq_entity",
                 "cond_eq_bool_int",
@@ -718,15 +722,23 @@
                 "cond_gt_bool",
                 "cond_gt_int",
                 "cond_gt_flt",
+                "cond_gt_enum",
+                "cond_gt_enum_literal",
                 "cond_gteq_bool",
                 "cond_gteq_int",
                 "cond_gteq_flt",
+                "cond_gteq_enum",
+                "cond_gteq_enum_literal",
                 "cond_lt_bool",
                 "cond_lt_int",
                 "cond_lt_flt",
+                "cond_lt_enum",
+                "cond_lt_enum_literal",
                 "cond_lteq_bool",
                 "cond_lteq_int",
                 "cond_lteq_flt",
+                "cond_lteq_enum",
+                "cond_lteq_enum_literal",
                 "min_lparen_int_rparen",
                 "min_lparen_int_add_int_rparen",
                 "min_number_hex",

test/script/src/Eval.c

@@ -13745,3 +13745,107 @@ void Eval_update_after_add_remove_tree_parent(void) {
 
     ecs_fini(world);
 }
+
+void Eval_assign_eq_enum_to_component(void) {
+    ecs_world_t *world = ecs_init();
+
+    typedef struct {
+        bool value;
+    } SomeType;
+
+    ecs_entity_t ecs_id(SomeType) = ecs_struct(world, {
+        .entity = ecs_entity(world, { .name = "SomeType" }),
+        .members = {{ "value", ecs_id(ecs_bool_t) }}
+    });
+
+    const char *expr =
+    HEAD "enum Color {"
+    LINE "  Red, Green, Blue"
+    LINE "}"
+    LINE ""
+    LINE "const c = Color: Red"
+    LINE ""
+    LINE "e1 {"
+    LINE "  SomeType: {value: c == Red}"
+    LINE "}"
+    LINE "e2 {"
+    LINE "  SomeType: {value: c == Green}"
+    LINE "}";
+
+    test_assert(ecs_script_run(world, NULL, expr, NULL) == 0);
+    
+    {
+        ecs_entity_t e = ecs_lookup(world, "e1");
+        test_assert(e != 0);
+        test_assert(ecs_has(world, e, SomeType));
+
+        const SomeType *ptr = ecs_get(world, e, SomeType);
+        test_assert(ptr != NULL);
+        test_int(ptr->value, true);
+    }
+
+    {
+        ecs_entity_t e = ecs_lookup(world, "e2");
+        test_assert(e != 0);
+        test_assert(ecs_has(world, e, SomeType));
+
+        const SomeType *ptr = ecs_get(world, e, SomeType);
+        test_assert(ptr != NULL);
+        test_int(ptr->value, false);
+    }
+
+    ecs_fini(world);
+}
+
+void Eval_assign_eq_enum_to_const(void) {
+    ecs_world_t *world = ecs_init();
+
+    typedef struct {
+        bool value;
+    } SomeType;
+
+    ecs_entity_t ecs_id(SomeType) = ecs_struct(world, {
+        .entity = ecs_entity(world, { .name = "SomeType" }),
+        .members = {{ "value", ecs_id(ecs_bool_t) }}
+    });
+
+    const char *expr =
+    HEAD "enum Color {"
+    LINE "  Red, Green, Blue"
+    LINE "}"
+    LINE ""
+    LINE "const c = Color: Red"
+    LINE "const r1: c == Red"
+    LINE "const r2: c == Green"
+    LINE ""
+    LINE "e1 {"
+    LINE "  SomeType: {value: r1}"
+    LINE "}"
+    LINE "e2 {"
+    LINE "  SomeType: {value: r2}"
+    LINE "}";
+
+    test_assert(ecs_script_run(world, NULL, expr, NULL) == 0);
+    
+    {
+        ecs_entity_t e = ecs_lookup(world, "e1");
+        test_assert(e != 0);
+        test_assert(ecs_has(world, e, SomeType));
+
+        const SomeType *ptr = ecs_get(world, e, SomeType);
+        test_assert(ptr != NULL);
+        test_int(ptr->value, true);
+    }
+
+    {
+        ecs_entity_t e = ecs_lookup(world, "e2");
+        test_assert(e != 0);
+        test_assert(ecs_has(world, e, SomeType));
+
+        const SomeType *ptr = ecs_get(world, e, SomeType);
+        test_assert(ptr != NULL);
+        test_int(ptr->value, false);
+    }
+
+    ecs_fini(world);
+}