Fix issue with parsing bitmask expressions with spaces

SanderMertens · Sep 21, 2023 · 40abcf1 · 40abcf1
1 parent e3e83c2
commit 40abcf1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/flecs.c b/flecs.c
@@ -46556,7 +46556,6 @@ const char *ecs_parse_expr_token(
     const char *ptr,
     char *token)
 {
-    const char *start = ptr;
     char *token_ptr = token;
 
     if (ptr[0] == '/') {
@@ -46594,12 +46593,11 @@ const char *ecs_parse_expr_token(
 
     while ((ptr = ecs_parse_token(name, expr, ptr, token_ptr, 0))) {
         if (ptr[0] == '|' && ptr[1] != '|') {
-            token_ptr = &token_ptr[ptr - start];
+            token_ptr = &token_ptr[ecs_os_strlen(token_ptr)];
             token_ptr[0] = '|';
             token_ptr[1] = '\0';
             token_ptr ++;
             ptr ++;
-            start = ptr;
         } else {
             break;
         }

diff --git a/src/addons/expr/deserialize.c b/src/addons/expr/deserialize.c
@@ -149,7 +149,6 @@ const char *ecs_parse_expr_token(
     const char *ptr,
     char *token)
 {
-    const char *start = ptr;
     char *token_ptr = token;
 
     if (ptr[0] == '/') {
@@ -187,12 +186,11 @@ const char *ecs_parse_expr_token(
 
     while ((ptr = ecs_parse_token(name, expr, ptr, token_ptr, 0))) {
         if (ptr[0] == '|' && ptr[1] != '|') {
-            token_ptr = &token_ptr[ptr - start];
+            token_ptr = &token_ptr[ecs_os_strlen(token_ptr)];
             token_ptr[0] = '|';
             token_ptr[1] = '\0';
             token_ptr ++;
             ptr ++;
-            start = ptr;
         } else {
             break;
         }

diff --git a/test/meta/src/BitmaskTypes.c b/test/meta/src/BitmaskTypes.c
@@ -196,15 +196,3 @@ void BitmaskTypes_bitmask_w_short_notation(void) {
 
     ecs_fini(world);
 }
-
-void BitmaskTypes_constant_w_name_prefix(void) {
-    // Implement testcase
-}
-
-void BitmaskTypes_constant_w_type_prefix(void) {
-    // Implement testcase
-}
-
-void BitmaskTypes_constant_w_name_type_prefix(void) {
-    // Implement testcase
-}
diff --git a/test/meta/src/DeserializeFromExpr.c b/test/meta/src/DeserializeFromExpr.c
@@ -348,6 +348,13 @@ void DeserializeFromExpr_bitmask(void) {
     test_uint(value, Lettuce|Bacon|Tomato|Cheese);
     }
 
+    {
+    uint32_t value = 0;
+    const char *ptr = ecs_parse_expr(world, "Lettuce | Bacon | Tomato | Cheese", &(ecs_value_t){t, &value}, NULL);
+    test_assert(ptr != NULL);
+    test_uint(value, Lettuce|Bacon|Tomato|Cheese);
+    }
+
     {
     uint32_t value = 0;
     const char *ptr = ecs_parse_expr(world, "BLT", &(ecs_value_t){t, &value}, NULL);