[script] Fix template preprocessing of component pairs and entity names with vars

Author: SanderMertens

distr/flecs.c

@@ -69372,10 +69372,12 @@ int flecs_script_template_eval_prop(
         }
 
         var->value.type = type;
-        var->value.ptr = flecs_stack_alloc(
+        var->value.ptr = flecs_stack_calloc(
             &v->r->stack, ti->size, ti->alignment);
         var->type_info = ti;
 
+        flecs_type_info_ctor(var->value.ptr, 1, ti);
+
         if (flecs_script_eval_expr(v, &node->expr, &var->value)) {
             return -1;
         }
@@ -70332,6 +70334,13 @@ int flecs_script_check_entity(
         }
     }
 
+    if (node->name_expr && !node->name_expr->type_info) {
+        ecs_entity_t type = ecs_id(ecs_string_t);
+        if (flecs_script_check_expr(v, &node->name_expr, &type)) {
+            return -1;
+        }
+    }
+
     ecs_script_entity_t *old_entity = v->entity;
     v->entity = node;
 
@@ -70403,6 +70412,10 @@ int flecs_script_check_component(
     }
 
     if (node->expr) {
+        if (!node->id.eval) {
+            return 0;
+        }
+
         const ecs_type_info_t *ti = ecs_get_type_info(v->world, node->id.eval);
         if (!ti) {
             return 0;
@@ -70922,7 +70935,8 @@ ecs_entity_t flecs_script_eval_name_expr(
         .lookup_ctx = v,
         .vars = v->vars,
         .type = ecs_id(ecs_string_t),
-        .runtime = v->r
+        .runtime = v->r,
+        .disable_dynamic_variable_binding = !v->dynamic_variable_binding
     };
 
     ecs_expr_node_t *expr = *expr_ptr;

src/addons/script/template.c

@@ -358,10 +358,12 @@ int flecs_script_template_eval_prop(
         }
 
         var->value.type = type;
-        var->value.ptr = flecs_stack_alloc(
+        var->value.ptr = flecs_stack_calloc(
             &v->r->stack, ti->size, ti->alignment);
         var->type_info = ti;
 
+        flecs_type_info_ctor(var->value.ptr, 1, ti);
+
         if (flecs_script_eval_expr(v, &node->expr, &var->value)) {
             return -1;
         }

src/addons/script/visit_check.c

@@ -145,6 +145,13 @@ int flecs_script_check_entity(
         }
     }
 
+    if (node->name_expr && !node->name_expr->type_info) {
+        ecs_entity_t type = ecs_id(ecs_string_t);
+        if (flecs_script_check_expr(v, &node->name_expr, &type)) {
+            return -1;
+        }
+    }
+
     ecs_script_entity_t *old_entity = v->entity;
     v->entity = node;
 
@@ -216,6 +223,10 @@ int flecs_script_check_component(
     }
 
     if (node->expr) {
+        if (!node->id.eval) {
+            return 0;
+        }
+
         const ecs_type_info_t *ti = ecs_get_type_info(v->world, node->id.eval);
         if (!ti) {
             return 0;

src/addons/script/visit_eval.c

@@ -181,7 +181,8 @@ ecs_entity_t flecs_script_eval_name_expr(
         .lookup_ctx = v,
         .vars = v->vars,
         .type = ecs_id(ecs_string_t),
-        .runtime = v->r
+        .runtime = v->r,
+        .disable_dynamic_variable_binding = !v->dynamic_variable_binding
     };
 
     ecs_expr_node_t *expr = *expr_ptr;

test/script/project.json

@@ -649,7 +649,9 @@
                 "template_w_tree_parent",
                 "template_w_tree_parent_change_value",
                 "template_w_nested_template_w_with",
-                "template_w_nested_template_w_with_kind_value"
+                "template_w_nested_template_w_with_kind_value",
+                "pair_component_w_entity_prop_target",
+                "child_name_from_string_prop"
             ]
         }, {
             "id": "Error",
@@ -755,7 +757,8 @@
                 "annotation_to_unresolved_identifier_managed_parse_twice_2",
                 "annotation_to_tag",
                 "parse_error_logged",
-                "eval_error_logged"
+                "eval_error_logged",
+                "template_unresolved_var_in_entity_name"
             ]
         }, {
             "id": "Expr",

test/script/src/Error.c

@@ -2145,3 +2145,18 @@ void Error_eval_error_logged(void) {
 
     ecs_fini(world);
 }
+
+void Error_template_unresolved_var_in_entity_name(void) {
+    ecs_world_t *world = ecs_init();
+
+    const char *expr =
+    HEAD "template Foo {"
+    LINE "  \"child_$suffix\" {}"
+    LINE "}"
+    LINE "ent { Foo: {} }";
+
+    ecs_log_set_level(-4);
+    test_assert(ecs_script_run(world, NULL, expr, NULL) != 0);
+
+    ecs_fini(world);
+}

test/script/src/Template.c

@@ -3844,3 +3844,65 @@ void Template_template_w_nested_template_w_with_kind_value(void) {
 
     ecs_fini(world);
 }
+
+void Template_pair_component_w_entity_prop_target(void) {
+    ecs_world_t *world = ecs_init();
+
+    ECS_COMPONENT(world, Position);
+
+    ecs_struct(world, {
+        .entity = ecs_id(Position),
+        .members = {
+            {"x", ecs_id(ecs_f32_t)},
+            {"y", ecs_id(ecs_f32_t)}
+        }
+    });
+
+    const char *expr =
+    LINE "template Foo {\n"
+    LINE "  prop tgt = flecs.meta.entity: flecs\n"
+    LINE "  (Position, $tgt): {5, 6}\n"
+    LINE "}\n"
+    LINE "ent { Foo: {flecs.core} }\n"
+    LINE "\n";
+
+    test_assert(ecs_script_run(world, NULL, expr, NULL) == 0);
+
+    ecs_entity_t foo = ecs_lookup(world, "Foo");
+    ecs_entity_t ent = ecs_lookup(world, "ent");
+
+    test_assert(foo != 0);
+    test_assert(ent != 0);
+
+    test_assert(ecs_has_id(world, ent, foo));
+    test_assert(ecs_has_pair(world, ent, ecs_id(Position), EcsFlecsCore));
+
+    const Position *p = ecs_get_pair(world, ent, Position, EcsFlecsCore);
+    test_assert(p != NULL);
+    test_int(p->x, 5);
+    test_int(p->y, 6);
+
+    ecs_fini(world);
+}
+
+void Template_child_name_from_string_prop(void) {
+    ecs_world_t *world = ecs_init();
+
+    const char *expr =
+    LINE "template Foo {"
+    LINE "  prop suffix = flecs.meta.string: \"a\""
+    LINE "  \"child_$suffix\" {}"
+    LINE "}"
+    LINE "ent { Foo: {suffix: \"hello\"} }"
+    LINE "";
+
+    test_assert(ecs_script_run(world, NULL, expr, NULL) == 0);
+
+    ecs_entity_t ent = ecs_lookup(world, "ent");
+    test_assert(ent != 0);
+
+    ecs_entity_t child = ecs_lookup(world, "ent.child_hello");
+    test_assert(child != 0);
+
+    ecs_fini(world);
+}

test/script/src/main.c

@@ -642,6 +642,8 @@ void Template_template_w_tree_parent(void);
 void Template_template_w_tree_parent_change_value(void);
 void Template_template_w_nested_template_w_with(void);
 void Template_template_w_nested_template_w_with_kind_value(void);
+void Template_pair_component_w_entity_prop_target(void);
+void Template_child_name_from_string_prop(void);
 
 // Testsuite 'Error'
 void Error_multi_line_comment_after_newline_before_newline_scope_open(void);
@@ -746,6 +748,7 @@ void Error_annotation_to_unresolved_identifier_managed_parse_twice_2(void);
 void Error_annotation_to_tag(void);
 void Error_parse_error_logged(void);
 void Error_eval_error_logged(void);
+void Error_template_unresolved_var_in_entity_name(void);
 
 // Testsuite 'Expr'
 void Expr_setup(void);
@@ -4017,6 +4020,14 @@ bake_test_case Template_testcases[] = {
     {
         "template_w_nested_template_w_with_kind_value",
         Template_template_w_nested_template_w_with_kind_value
+    },
+    {
+        "pair_component_w_entity_prop_target",
+        Template_pair_component_w_entity_prop_target
+    },
+    {
+        "child_name_from_string_prop",
+        Template_child_name_from_string_prop
     }
 };
 
@@ -4428,6 +4439,10 @@ bake_test_case Error_testcases[] = {
     {
         "eval_error_logged",
         Error_eval_error_logged
+    },
+    {
+        "template_unresolved_var_in_entity_name",
+        Error_template_unresolved_var_in_entity_name
     }
 };
 
@@ -7409,14 +7424,14 @@ static bake_test_suite suites[] = {
         "Template",
         NULL,
         NULL,
-        83,
+        85,
         Template_testcases
     },
     {
         "Error",
         NULL,
         NULL,
-        102,
+        103,
         Error_testcases
     },
     {