#608 support NaN and Inf values in serializers

SanderMertens · Jan 22, 2022 · 95a0110 · 95a0110
1 parent 1d8e6c5
commit 95a0110
Show file tree

Hide file tree

Showing 14 changed files with 400 additions and 19 deletions.
diff --git a/flecs.c b/flecs.c
@@ -11077,6 +11077,7 @@ void flecs_bitset_swap(
 }
 
 #include <stdio.h>
+#include <math.h>
 
 /**
  *  stm32tpl --  STM32 C++ Template Peripheral Library
@@ -11105,14 +11106,34 @@ static
 int ecs_strbuf_ftoa(
     ecs_strbuf_t *out, 
     double f, 
-    int precision)
+    int precision,
+    char nan_delim)
 {
     char buf[64];
 	char * ptr = buf;
 	char * p1;
 	char c;
 	int64_t intPart;
 
+    if (isnan(f)) {
+        if (nan_delim) {
+            ecs_strbuf_appendch(out, nan_delim);
+            ecs_strbuf_appendstr(out, "NaN");
+            return ecs_strbuf_appendch(out, nan_delim);
+        } else {
+            return ecs_strbuf_appendstr(out, "NaN");
+        }
+    }
+    if (isinf(f)) {
+        if (nan_delim) {
+            ecs_strbuf_appendch(out, nan_delim);
+            ecs_strbuf_appendstr(out, "Inf");
+            return ecs_strbuf_appendch(out, nan_delim);
+        } else {
+            return ecs_strbuf_appendstr(out, "Inf");
+        }
+    }
+
 	if (precision > MAX_PRECISION) {
 		precision = MAX_PRECISION;
     }
@@ -11469,10 +11490,11 @@ bool ecs_strbuf_appendch(
 
 bool ecs_strbuf_appendflt(
     ecs_strbuf_t *b,
-    double flt)
+    double flt,
+    char nan_delim)
 {
     ecs_assert(b != NULL, ECS_INVALID_PARAMETER, NULL); 
-    return ecs_strbuf_ftoa(b, flt, 2);
+    return ecs_strbuf_ftoa(b, flt, 2, nan_delim);
 }
 
 bool ecs_strbuf_appendstr_zerocpy(
@@ -23089,10 +23111,10 @@ int expr_ser_primitive(
         ecs_strbuf_append(str, "%lld", *(int64_t*)base);
         break;
     case EcsF32:
-        ecs_strbuf_appendflt(str, (double)*(float*)base);
+        ecs_strbuf_appendflt(str, (double)*(float*)base, 0);
         break;
     case EcsF64:
-        ecs_strbuf_appendflt(str, *(double*)base);
+        ecs_strbuf_appendflt(str, *(double*)base, 0);
         break;
     case EcsIPtr:
         ecs_strbuf_append(str, "%i", *(intptr_t*)base);
@@ -25328,7 +25350,7 @@ void json_number(
     ecs_strbuf_t *buf,
     double value)
 {
-    ecs_strbuf_appendflt(buf, value);
+    ecs_strbuf_appendflt(buf, value, '"');
 }
 
 void json_true(
@@ -25621,6 +25643,14 @@ int json_ser_type_op(
         /* Should not be parsed as single op */
         ecs_throw(ECS_INVALID_PARAMETER, NULL);
         break;
+    case EcsOpF32:
+        ecs_strbuf_appendflt(str, 
+            (ecs_f64_t)*(ecs_f32_t*)ECS_OFFSET(ptr, op->offset), '"');
+        break;
+    case EcsOpF64:
+        ecs_strbuf_appendflt(str, 
+            *(ecs_f64_t*)ECS_OFFSET(ptr, op->offset), '"');
+        break;
     case EcsOpEnum:
         if (json_ser_enum(world, op, ECS_OFFSET(ptr, op->offset), str)) {
             goto error;

diff --git a/flecs.h b/flecs.h
@@ -1710,7 +1710,8 @@ bool ecs_strbuf_appendch(
 FLECS_API
 bool ecs_strbuf_appendflt(
     ecs_strbuf_t *buffer,
-    double v);
+    double v,
+    char nan_delim);
 
 /* Append source buffer to destination buffer.
  * Returns false when max is reached, true when there is still space */

diff --git a/include/flecs/private/strbuf.h b/include/flecs/private/strbuf.h
@@ -115,7 +115,8 @@ bool ecs_strbuf_appendch(
 FLECS_API
 bool ecs_strbuf_appendflt(
     ecs_strbuf_t *buffer,
-    double v);
+    double v,
+    char nan_delim);
 
 /* Append source buffer to destination buffer.
  * Returns false when max is reached, true when there is still space */

diff --git a/src/addons/expr/serialize.c b/src/addons/expr/serialize.c
@@ -85,10 +85,10 @@ int expr_ser_primitive(
         ecs_strbuf_append(str, "%lld", *(int64_t*)base);
         break;
     case EcsF32:
-        ecs_strbuf_appendflt(str, (double)*(float*)base);
+        ecs_strbuf_appendflt(str, (double)*(float*)base, 0);
         break;
     case EcsF64:
-        ecs_strbuf_appendflt(str, *(double*)base);
+        ecs_strbuf_appendflt(str, *(double*)base, 0);
         break;
     case EcsIPtr:
         ecs_strbuf_append(str, "%i", *(intptr_t*)base);

diff --git a/src/addons/json/json.c b/src/addons/json/json.c
@@ -19,7 +19,7 @@ void json_number(
     ecs_strbuf_t *buf,
     double value)
 {
-    ecs_strbuf_appendflt(buf, value);
+    ecs_strbuf_appendflt(buf, value, '"');
 }
 
 void json_true(

diff --git a/src/addons/json/serialize.c b/src/addons/json/serialize.c
@@ -207,6 +207,14 @@ int json_ser_type_op(
         /* Should not be parsed as single op */
         ecs_throw(ECS_INVALID_PARAMETER, NULL);
         break;
+    case EcsOpF32:
+        ecs_strbuf_appendflt(str, 
+            (ecs_f64_t)*(ecs_f32_t*)ECS_OFFSET(ptr, op->offset), '"');
+        break;
+    case EcsOpF64:
+        ecs_strbuf_appendflt(str, 
+            *(ecs_f64_t*)ECS_OFFSET(ptr, op->offset), '"');
+        break;
     case EcsOpEnum:
         if (json_ser_enum(world, op, ECS_OFFSET(ptr, op->offset), str)) {
             goto error;

diff --git a/src/datastructures/strbuf.c b/src/datastructures/strbuf.c
@@ -1,5 +1,6 @@
 #include "../private_api.h"
 #include <stdio.h>
+#include <math.h>
 
 /**
  *  stm32tpl --  STM32 C++ Template Peripheral Library
@@ -28,14 +29,34 @@ static
 int ecs_strbuf_ftoa(
     ecs_strbuf_t *out, 
     double f, 
-    int precision)
+    int precision,
+    char nan_delim)
 {
     char buf[64];
 	char * ptr = buf;
 	char * p1;
 	char c;
 	int64_t intPart;
 
+    if (isnan(f)) {
+        if (nan_delim) {
+            ecs_strbuf_appendch(out, nan_delim);
+            ecs_strbuf_appendstr(out, "NaN");
+            return ecs_strbuf_appendch(out, nan_delim);
+        } else {
+            return ecs_strbuf_appendstr(out, "NaN");
+        }
+    }
+    if (isinf(f)) {
+        if (nan_delim) {
+            ecs_strbuf_appendch(out, nan_delim);
+            ecs_strbuf_appendstr(out, "Inf");
+            return ecs_strbuf_appendch(out, nan_delim);
+        } else {
+            return ecs_strbuf_appendstr(out, "Inf");
+        }
+    }
+
 	if (precision > MAX_PRECISION) {
 		precision = MAX_PRECISION;
     }
@@ -392,10 +413,11 @@ bool ecs_strbuf_appendch(
 
 bool ecs_strbuf_appendflt(
     ecs_strbuf_t *b,
-    double flt)
+    double flt,
+    char nan_delim)
 {
     ecs_assert(b != NULL, ECS_INVALID_PARAMETER, NULL); 
-    return ecs_strbuf_ftoa(b, flt, 2);
+    return ecs_strbuf_ftoa(b, flt, 2, nan_delim);
 }
 
 bool ecs_strbuf_appendstr_zerocpy(

diff --git a/test/collections/project.json b/test/collections/project.json
@@ -121,7 +121,11 @@
                 "append_511_chars",
                 "append_512_chars",
                 "append_513_chars",
-                "append_flt"
+                "append_flt",
+                "append_nan",
+                "append_inf",
+                "append_nan_delim",
+                "append_inf_delim"
             ]
         }]
     }

diff --git a/test/collections/src/Strbuf.c b/test/collections/src/Strbuf.c
@@ -1,4 +1,5 @@
 #include <collections.h>
+#include <math.h>
 
 void Strbuf_setup() {
     ecs_os_set_api_defaults();
@@ -234,10 +235,72 @@ void Strbuf_append_513_chars() {
 
 void Strbuf_append_flt() {
     ecs_strbuf_t b = ECS_STRBUF_INIT;
-    ecs_strbuf_appendflt(&b, 10.5);
+    ecs_strbuf_appendflt(&b, 10.5, 0);
 
     char *str = ecs_strbuf_get(&b);
     test_assert(str != NULL);
     test_str(str, "10.50");
     ecs_os_free(str);
 }
+
+void Strbuf_append_nan() {
+    ecs_strbuf_t b = ECS_STRBUF_INIT;
+    ecs_strbuf_appendflt(&b, NAN, 0);
+
+    char *str = ecs_strbuf_get(&b);
+    test_assert(str != NULL);
+    test_str(str, "NaN");
+    ecs_os_free(str);
+}
+
+void Strbuf_append_inf() {
+    {
+        ecs_strbuf_t b = ECS_STRBUF_INIT;
+        ecs_strbuf_appendflt(&b, INFINITY, 0);
+
+        char *str = ecs_strbuf_get(&b);
+        test_assert(str != NULL);
+        test_str(str, "Inf");
+        ecs_os_free(str);
+    }
+    {
+        ecs_strbuf_t b = ECS_STRBUF_INIT;
+        ecs_strbuf_appendflt(&b, -INFINITY, 0);
+
+        char *str = ecs_strbuf_get(&b);
+        test_assert(str != NULL);
+        test_str(str, "Inf");
+        ecs_os_free(str);
+    }
+}
+
+void Strbuf_append_nan_delim() {
+    ecs_strbuf_t b = ECS_STRBUF_INIT;
+    ecs_strbuf_appendflt(&b, NAN, '"');
+
+    char *str = ecs_strbuf_get(&b);
+    test_assert(str != NULL);
+    test_str(str, "\"NaN\"");
+    ecs_os_free(str);
+}
+
+void Strbuf_append_inf_delim() {
+    {
+        ecs_strbuf_t b = ECS_STRBUF_INIT;
+        ecs_strbuf_appendflt(&b, INFINITY, '"');
+
+        char *str = ecs_strbuf_get(&b);
+        test_assert(str != NULL);
+        test_str(str, "\"Inf\"");
+        ecs_os_free(str);
+    }
+    {
+        ecs_strbuf_t b = ECS_STRBUF_INIT;
+        ecs_strbuf_appendflt(&b, -INFINITY, '"');
+
+        char *str = ecs_strbuf_get(&b);
+        test_assert(str != NULL);
+        test_str(str, "\"Inf\"");
+        ecs_os_free(str);
+    }
+}
diff --git a/test/collections/src/main.c b/test/collections/src/main.c
@@ -111,6 +111,10 @@ void Strbuf_append_511_chars(void);
 void Strbuf_append_512_chars(void);
 void Strbuf_append_513_chars(void);
 void Strbuf_append_flt(void);
+void Strbuf_append_nan(void);
+void Strbuf_append_inf(void);
+void Strbuf_append_nan_delim(void);
+void Strbuf_append_inf_delim(void);
 
 bake_test_case Vector_testcases[] = {
     {
@@ -489,6 +493,22 @@ bake_test_case Strbuf_testcases[] = {
     {
         "append_flt",
         Strbuf_append_flt
+    },
+    {
+        "append_nan",
+        Strbuf_append_nan
+    },
+    {
+        "append_inf",
+        Strbuf_append_inf
+    },
+    {
+        "append_nan_delim",
+        Strbuf_append_nan_delim
+    },
+    {
+        "append_inf_delim",
+        Strbuf_append_inf_delim
     }
 };
 
@@ -518,7 +538,7 @@ static bake_test_suite suites[] = {
         "Strbuf",
         Strbuf_setup,
         NULL,
-        19,
+        23,
         Strbuf_testcases
     }
 };

diff --git a/test/meta/project.json b/test/meta/project.json
@@ -358,6 +358,10 @@
                 "entity",
                 "enum",
                 "bitmask",
+                "float_nan",
+                "float_inf",
+                "double_nan",
+                "double_inf",
                 "struct_enum",
                 "struct_bitmask",
                 "struct_i32",
@@ -436,6 +440,10 @@
                 "struct_string",
                 "struct_entity",
                 "struct_entity_after_float",
+                "struct_float_nan",
+                "struct_float_inf",
+                "struct_double_nan",
+                "struct_double_inf",
                 "struct_enum",
                 "struct_bitmask",
                 "struct_i32_i32",