1 files changed, 85 insertions, 83 deletions

diff --git a/json.c b/json.c
index 94dab1d..05ea3fb 100644
--- a/json.c
+++ b/json.c
@@ -9,86 +9,86 @@
 #include "string.h"
 
 typedef struct {
-  JSON *value;
-  uptr pos;
+    JSON *value;
+    uptr pos;
 } parse_any_result;
 parse_any_result parse_any(Arena *a, byte *src, uptr pos);
 
 typedef struct {
-  int *value;
-  uptr pos;
+    int *value;
+    uptr pos;
 } parse_integer_result;
 
 parse_integer_result parse_integer(Arena *a, byte *src, uptr pos) {
-  byte ints[16];
-  int i = 0;
-  while (isdigit(src[pos + i])) {
-    int val = (src[pos + i] - '0');
-    ints[i] = val;
-    i++;
-  }
-  int *result = new (a, int, 1);
-  for (int j = 0; j < i; j++) {
-    *result += ints[j] * pow(10, (i - j - 1));
-  }
-  return (parse_integer_result){result, pos + i};
+    byte ints[16];
+    int i = 0;
+    while (isdigit(src[pos + i])) {
+        int val = (src[pos + i] - '0');
+        ints[i] = val;
+        i++;
+    }
+    int *result = new(a, int, 1);
+    for (int j = 0; j < i; j++) {
+        *result += ints[j] * pow(10, (i - j - 1));
+    }
+    return (parse_integer_result){result, pos + i};
 }
 
 uptr absorb_whitespaces(byte *src, uptr pos) {
-  int i = 0;
-  while (isspace(src[pos + i])) {
-    i++;
-  }
-  return pos + i;
+    int i = 0;
+    while (isspace(src[pos + i])) {
+        i++;
+    }
+    return pos + i;
 }
 
 typedef struct {
-  Vec *items; // Vec<JSON>
-  uptr pos;
+    Vec *items; // Vec<JSON>
+    uptr pos;
 } parse_array_result;
 
 parse_array_result parse_array(Arena *a, byte *src, uptr pos) {
-  assert(src[pos] == '[');
-  pos++;
-  Vec items = Vec_new(a, JSON, 2);
-  for (;;) {
-    pos = absorb_whitespaces(src, pos);
-    parse_any_result result = parse_any(a, src, pos);
-    Vec_push(a, &items, result.value);
-    pos = result.pos;
-    pos = absorb_whitespaces(src, pos);
-    if (src[pos] == ',') {
-      pos++;
-    } else {
-      break;
-    }
-  };
-  assert(src[pos] == ']');
+    assert(src[pos] == '[');
+    pos++;
+    Vec items = Vec_new(a, JSON, 2);
+    for (;;) {
+        pos = absorb_whitespaces(src, pos);
+        parse_any_result result = parse_any(a, src, pos);
+        Vec_push(a, &items, result.value);
+        pos = result.pos;
+        pos = absorb_whitespaces(src, pos);
+        if (src[pos] == ',') {
+            pos++;
+        } else {
+            break;
+        }
+    };
+    assert(src[pos] == ']');
 
-  return (parse_array_result){&items, pos + 1};
+    return (parse_array_result){&items, pos + 1};
 }
 
 typedef struct {
-  Str *string;
-  uptr pos;
+    Str *string;
+    uptr pos;
 } parse_string_result;
 
 parse_string_result parse_string(Arena *a, byte *src, uptr pos) {
-  assert(src[pos] == '"');
-  int i = 1;
+    assert(src[pos] == '"');
+    int i = 1;
 
-  while (src[pos + i] != '"' && src[pos + i - 1] != '\\') {
-    i++;
-  }
-  assert(src[pos + i] == '"');
-  Str* s = Str_copy(a, &src[pos + 1], i - 1);
+    while (src[pos + i] != '"' && src[pos + i - 1] != '\\') {
+        i++;
+    }
+    assert(src[pos + i] == '"');
+    Str *s = Str_copy(a, &src[pos + 1], i - 1);
 
-  return (parse_string_result){s, pos + i + 1};
+    return (parse_string_result){s, pos + i + 1};
 }
 
 typedef struct {
-  JSONObject *object;
-  uptr pos;
+    JSONObject *object;
+    uptr pos;
 } parse_object_result;
 
 parse_object_result parse_object(Arena *a, byte *src, uptr pos) {
@@ -107,59 +107,61 @@ parse_object_result parse_object(Arena *a, byte *src, uptr pos) {
         Str *key = str_result.string;
         pos = absorb_whitespaces(src, str_result.pos);
         assert(src[pos] == ':');
-        pos = absorb_whitespaces(src,  pos+1);
+        pos = absorb_whitespaces(src, pos + 1);
         parse_any_result any_result = parse_any(a, src, pos);
         object->len++;
         Vec_push(a, &object->keys, key);
         Vec_push(a, &object->values, any_result.value);
         pos = absorb_whitespaces(src, any_result.pos);
-        if (src[pos] != ',') {break;}
-        pos = absorb_whitespaces(src, pos +1);
+        if (src[pos] != ',') {
+            break;
+        }
+        pos = absorb_whitespaces(src, pos + 1);
     }
     assert(src[pos] == '}');
-    return (parse_object_result){object, pos+1};
+    return (parse_object_result){object, pos + 1};
 }
 
 parse_any_result parse_any(Arena *a, byte *src, uptr pos) {
-  JSON *value = new (a, JSON, 1);
-  if (isdigit(src[pos])) {
-    parse_integer_result result = parse_integer(a, src, pos);
-    value->integer = result.value;
-    pos = result.pos;
-  } else if (src[pos] == '[') {
-    parse_array_result result = parse_array(a, src, pos);
-    value->array = result.items;
-    pos = result.pos;
-  } else if (src[pos] == '"') {
-    parse_string_result result = parse_string(a, src, pos);
-    value->string = result.string;
-    pos = result.pos;
-  } else if (src[pos] == '{') {
-    parse_object_result result = parse_object(a, src, pos);
-    value->object = result.object;
-    pos = result.pos;
-  }
+    JSON *value = new(a, JSON, 1);
+    if (isdigit(src[pos])) {
+        parse_integer_result result = parse_integer(a, src, pos);
+        value->integer = result.value;
+        pos = result.pos;
+    } else if (src[pos] == '[') {
+        parse_array_result result = parse_array(a, src, pos);
+        value->array = result.items;
+        pos = result.pos;
+    } else if (src[pos] == '"') {
+        parse_string_result result = parse_string(a, src, pos);
+        value->string = result.string;
+        pos = result.pos;
+    } else if (src[pos] == '{') {
+        parse_object_result result = parse_object(a, src, pos);
+        value->object = result.object;
+        pos = result.pos;
+    }
 
-  return (parse_any_result){value, pos};
+    return (parse_any_result){value, pos};
 }
 
 JSON JSON_parse(Arena *a, byte *src) {
-  parse_any_result result = parse_any(a, src, 0);
-  return *result.value;
+    parse_any_result result = parse_any(a, src, 0);
+    return *result.value;
 }
 
 JSON JSON_Int(Arena *a, int val) {
-  JSON json = {0};
-  json.integer = new (a, int, 1);
-  *json.integer = val;
-  return json;
+    JSON json = {0};
+    json.integer = new(a, int, 1);
+    *json.integer = val;
+    return json;
 }
 
-JSON* JSONObject_get(JSONObject *obj, Str key) {
+JSON *JSONObject_get(JSONObject *obj, Str key) {
     for (size i = 0; i < obj->len; i++) {
         if (Str_equals(*Vec_get(&obj->keys, Str, i), key)) {
             return Vec_get(&obj->values, JSON, i);
         }
     }
-    return NULL;
+    return 0;
 }