Fix parser error for structs that use type* pointer syntax

SanderMertens · Oct 15, 2022 · 16c0159 · 16c0159
1 parent d663065
commit 16c0159
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/flecs.c b/flecs.c
@@ -37584,7 +37584,9 @@ const char* parse_c_identifier(
         goto error;
     }
 
-    while ((ch = *ptr) && !isspace(ch) && ch != ';' && ch != ',' && ch != ')' && ch != '>' && ch != '}') {
+    while ((ch = *ptr) && !isspace(ch) && ch != ';' && ch != ',' && ch != ')' && 
+        ch != '>' && ch != '}' && ch != '*') 
+    {
         /* Type definitions can contain macros or templates */
         if (ch == '(' || ch == '<') {
             if (!params) {

diff --git a/src/addons/meta_c.c b/src/addons/meta_c.c
@@ -127,7 +127,9 @@ const char* parse_c_identifier(
         goto error;
     }
 
-    while ((ch = *ptr) && !isspace(ch) && ch != ';' && ch != ',' && ch != ')' && ch != '>' && ch != '}') {
+    while ((ch = *ptr) && !isspace(ch) && ch != ';' && ch != ',' && ch != ')' && 
+        ch != '>' && ch != '}' && ch != '*') 
+    {
         /* Type definitions can contain macros or templates */
         if (ch == '(' || ch == '<') {
             if (!params) {

diff --git a/test/meta/project.json b/test/meta/project.json
@@ -658,7 +658,8 @@
                 "struct_w_nested",
                 "enum_nospace",
                 "struct_nospace",
-                "identifier_w_underscore"
+                "identifier_w_underscore",
+                "struct_w_ptr"
             ]
         }, {
             "id": "Vars",

diff --git a/test/meta/src/MetaUtils.c b/test/meta/src/MetaUtils.c
@@ -30,7 +30,6 @@ ECS_STRUCT(Struct_2_f64, {
     double y;
 });
 
-
 ECS_STRUCT(_Struct_w_underscore, {
     double value;
 });
@@ -43,6 +42,11 @@ ECS_STRUCT(Struct_w_underscore_member_type, {
     _Struct_w_underscore value;
 });
 
+ECS_STRUCT(Struct_w_ptrs, {
+    void *ptr_a;
+    void* ptr_b;
+});
+
 ECS_ENUM(Enum_Default, {
     Red, Green, Blue
 });
@@ -364,3 +368,23 @@ void MetaUtils_identifier_w_underscore() {
 
     ecs_fini(world);
 }
+
+void MetaUtils_struct_w_ptr() {
+    ecs_world_t *world = ecs_init();
+
+    ECS_META_COMPONENT(world, Struct_w_ptrs);
+
+    test_assert(ecs_id(Struct_w_ptrs) != 0);
+    ecs_entity_t s = ecs_id(Struct_w_ptrs);
+
+    {
+        ecs_entity_t m = ecs_lookup_child(world, s, "ptr_a");
+        test_assert(m != 0);
+    }
+    {
+        ecs_entity_t m = ecs_lookup_child(world, s, "ptr_b");
+        test_assert(m != 0);
+    }
+
+    ecs_fini(world);
+}
diff --git a/test/meta/src/main.c b/test/meta/src/main.c
@@ -624,6 +624,7 @@ void MetaUtils_struct_w_nested(void);
 void MetaUtils_enum_nospace(void);
 void MetaUtils_struct_nospace(void);
 void MetaUtils_identifier_w_underscore(void);
+void MetaUtils_struct_w_ptr(void);
 
 // Testsuite 'Vars'
 void Vars_declare_1_var(void);
@@ -3119,6 +3120,10 @@ bake_test_case MetaUtils_testcases[] = {
     {
         "identifier_w_underscore",
         MetaUtils_identifier_w_underscore
+    },
+    {
+        "struct_w_ptr",
+        MetaUtils_struct_w_ptr
     }
 };
 
@@ -3658,7 +3663,7 @@ static bake_test_suite suites[] = {
         "MetaUtils",
         NULL,
         NULL,
-        16,
+        17,
         MetaUtils_testcases
     },
     {