support parsing numbers as integers

Author: Guiorgy

examples/03_parsing_database.c

@@ -8,9 +8,9 @@
 
 typedef struct {
     const char *name;
-    double age;
+    long long age;
     const char *location;
-    double body_count;
+    double cash;
 } Person;
 
 typedef struct {
@@ -26,11 +26,11 @@ bool parse_person(Jimp *jimp, Person *p)
         if (strcmp(jimp->member, "name") == 0) {
             if (!jimp_string(jimp, &p->name))       return false;
         } else if (strcmp(jimp->member, "age") == 0) {
-            if (!jimp_number(jimp, &p->age))        return false;
+            if (!jimp_int(jimp, &p->age))        return false;
         } else if (strcmp(jimp->member, "location") == 0) {
             if (!jimp_string(jimp, &p->location))   return false;
-        } else if (strcmp(jimp->member, "body_count") == 0) {
-            if (!jimp_number(jimp, &p->body_count)) return false;
+        } else if (strcmp(jimp->member, "cash") == 0) {
+            if (!jimp_float(jimp, &p->cash)) return false;
         } else {
             jimp_unknown_member(jimp);
             return false;
@@ -54,14 +54,14 @@ bool parse_people(Jimp *jimp, People *ps)
 
 void print_person(const Person *p)
 {
-    printf("name       = %s\n",  p->name);
-    printf("age        = %lf\n", p->age);
-    printf("location   = %s\n",  p->location);
-    printf("body_count = %lf\n", p->body_count);
+    printf("name     = %s\n",     p->name);
+    printf("age      = %lld\n",   p->age);
+    printf("location = %s\n",     p->location);
+    printf("cash     = $%.2lf\n", p->cash);
 }
 
 typedef struct {
-    long *items;
+    JimpNumber *items;
     size_t count;
     size_t capacity;
 } Numbers;
@@ -92,7 +92,7 @@ int main()
         } else if (strcmp(jimp.member, "number") == 0) {
             if (!jimp_array_begin(&jimp)) return 1;
             while (jimp_array_item(&jimp)) {
-                double x = 0;
+                JimpNumber x = {0};
                 if (!jimp_number(&jimp, &x)) return 1;
                 da_append(&xs, x);
             }
@@ -109,8 +109,11 @@ int main()
         printf("\n");
     }
     printf("------------------------------\n");
-    da_foreach(long, x, &xs) {
-        printf("%ld ", *x);
+    da_foreach(JimpNumber, x, &xs) {
+        if (x->type == JIMP_INTEGER)
+            printf("%lld ", x->value.i);
+        else
+            printf("%lf ",  x->value.f);
     }
     printf("\n");
 

examples/database.json

@@ -1,66 +1,66 @@
 {
-    "number": [69, 420, 1337, 80085],
+    "number": [69, 420, 1337, 80085, .69, 42.123, 123., 9007199254740993, 9007199254740993.0],
     "profile": [
         {
             "location": "Wonderland",
             "location": "Wonderland",
-            "body_count": 150,
+            "cash": 1.5,
             "name": "Alice Smith",
             "age": 34
         },
         {
             "name": "Bob Johnson",
             "age": 45,
             "location": "Atlantis",
-            "body_count": 300
+            "cash": 3
         },
         {
             "name": "Charlie Brown",
             "age": 28,
             "location": "Chocolate Factory",
-            "body_count": 200
+            "cash": 2
         },
         {
             "name": "Diana Prince",
             "age": 32,
             "location": "Themyscira",
-            "body_count": 250
+            "cash": 2.5
         },
         {
             "name": "Ethan Hunt",
             "age": 40,
             "location": "Mission HQ",
-            "body_count": 350
+            "cash": 3.5
         },
         {
             "name": "Fiona Apple",
             "age": 37,
             "location": "Music City",
-            "body_count": 180
+            "cash": 1.8
         },
         {
             "name": "George Lucas",
             "age": 75,
             "location": "Galaxy Far Far Away",
-            "body_count": 500
+            "cash": 5
         },
         {
             "name": "Hannah Montana",
             "age": 25,
             "location": "Nashville",
-            "body_count": 100
+            "cash": 1
         },
         {
             "name": "Ian Malcolm",
             "age": 60,
             "location": "Jurassic Park",
-            "body_count": 400
+            "cash": 4
         },
         {
             "name": "Jessica Rabbit",
             "age": 30,
             "location": "Toontown",
-            "body_count": 220
+            "cash": 2.2
         }
     ]
 }

jimp.h

@@ -35,6 +35,21 @@ typedef enum {
     JIMP_NUMBER,
 } Jimp_Token;
 
+typedef enum {
+    JIMP_FLOATING,
+    JIMP_INTEGER
+} JimpNumberType;
+
+union JimpNumberValue {
+    double f;
+    long long i;
+};
+
+typedef struct {
+    JimpNumberType type;
+    union JimpNumberValue value;
+} JimpNumber;
+
 typedef struct {
     const char *file_path;
     const char *start;
@@ -47,14 +62,16 @@ typedef struct {
     char *string;
     size_t string_count;
     size_t string_capacity;
-    double number;
+    JimpNumber number;
 
     const char *member;
 } Jimp;
 
 // TODO: how do null-s fit into this entire system?
 bool jimp_bool(Jimp *jimp, bool *boolean);
-bool jimp_number(Jimp *jimp, double *number);
+bool jimp_number(Jimp *jimp, JimpNumber *number);
+bool jimp_float(Jimp *jimp, double *number);
+bool jimp_int(Jimp *jimp, long long *number);
 bool jimp_string(Jimp *jimp, const char **string);
 bool jimp_object_begin(Jimp *jimp);
 bool jimp_object_member(Jimp *jimp);
@@ -145,8 +162,16 @@ static bool jimp__get_token(Jimp *jimp)
     }
 
     char *endptr = NULL;
-    jimp->number = strtod(jimp->point, &endptr); // TODO: this implies that jimp->end is a valid address and *jimp->end == 0
+    jimp->number.value.i = strtoull(jimp->point, &endptr, 0); // TODO: this implies that jimp->end is a valid address and *jimp->end == 0
+    if (jimp->point != endptr && *endptr != '.') {
+        jimp->number.type = JIMP_INTEGER;
+        jimp->point = endptr;
+        jimp->token = JIMP_NUMBER;
+        return true;
+    }
+    jimp->number.value.f = strtod(jimp->point, &endptr);
     if (jimp->point != endptr) {
+        jimp->number.type = JIMP_FLOATING;
         jimp->point = endptr;
         jimp->token = JIMP_NUMBER;
         return true;
@@ -298,13 +323,27 @@ bool jimp_bool(Jimp *jimp, bool *boolean)
     return true;
 }
 
-bool jimp_number(Jimp *jimp, double *number)
+bool jimp_number(Jimp *jimp, JimpNumber *number)
 {
     if (!jimp__get_and_expect_token(jimp, JIMP_NUMBER)) return false;
     *number = jimp->number;
     return true;
 }
 
+bool jimp_float(Jimp *jimp, double *number)
+{
+    if (!jimp__get_and_expect_token(jimp, JIMP_NUMBER)) return false;
+    *number = jimp->number.type == JIMP_FLOATING ? jimp->number.value.f : jimp->number.value.i;
+    return true;
+}
+
+bool jimp_int(Jimp *jimp, long long *number)
+{
+    if (!jimp__get_and_expect_token(jimp, JIMP_NUMBER) || jimp->number.type != JIMP_INTEGER) return false;
+    *number = jimp->number.value.i;
+    return true;
+}
+
 static bool jimp__get_and_expect_token(Jimp *jimp, Jimp_Token token)
 {
     if (!jimp__get_token(jimp)) return false;