1 files changed, 22 insertions, 35 deletions

diff --git a/src/stdlib/optionals.c b/src/stdlib/optionals.c
index 36683241..a6f943ae 100644
--- a/src/stdlib/optionals.c
+++ b/src/stdlib/optionals.c
@@ -9,22 +9,19 @@
 #include "text.h"
 #include "util.h"
 
-public PUREFUNC bool is_none(const void *obj, const TypeInfo_t *non_optional_type)
-{
-    if (non_optional_type->metamethods.is_none)
-        return non_optional_type->metamethods.is_none(obj, non_optional_type);
+public
+PUREFUNC bool is_none(const void *obj, const TypeInfo_t *non_optional_type) {
+    if (non_optional_type->metamethods.is_none) return non_optional_type->metamethods.is_none(obj, non_optional_type);
 
     const void *dest = (obj + non_optional_type->size);
-    return *(bool*)dest;
+    return *(bool *)dest;
 }
 
-PUREFUNC public uint64_t Optional$hash(const void *obj, const TypeInfo_t *type)
-{
+PUREFUNC public uint64_t Optional$hash(const void *obj, const TypeInfo_t *type) {
     return is_none(obj, type->OptionalInfo.type) ? 0 : generic_hash(obj, type->OptionalInfo.type);
 }
 
-PUREFUNC public int32_t Optional$compare(const void *x, const void *y, const TypeInfo_t *type)
-{
+PUREFUNC public int32_t Optional$compare(const void *x, const void *y, const TypeInfo_t *type) {
     if (x == y) return 0;
     bool x_is_null = is_none(x, type->OptionalInfo.type);
     bool y_is_null = is_none(y, type->OptionalInfo.type);
@@ -33,8 +30,7 @@ PUREFUNC public int32_t Optional$compare(const void *x, const void *y, const Typ
     else return generic_compare(x, y, type->OptionalInfo.type);
 }
 
-PUREFUNC public bool Optional$equal(const void *x, const void *y, const TypeInfo_t *type)
-{
+PUREFUNC public bool Optional$equal(const void *x, const void *y, const TypeInfo_t *type) {
     if (x == y) return true;
 
     bool x_is_null = is_none(x, type->OptionalInfo.type);
@@ -44,46 +40,37 @@ PUREFUNC public bool Optional$equal(const void *x, const void *y, const TypeInfo
     else return generic_equal(x, y, type->OptionalInfo.type);
 }
 
-public Text_t Optional$as_text(const void *obj, bool colorize, const TypeInfo_t *type)
-{
-    if (!obj)
-        return Text$concat(generic_as_text(obj, colorize, type->OptionalInfo.type), Text("?"));
+public
+Text_t Optional$as_text(const void *obj, bool colorize, const TypeInfo_t *type) {
+    if (!obj) return Text$concat(generic_as_text(obj, colorize, type->OptionalInfo.type), Text("?"));
 
-    if (is_none(obj, type->OptionalInfo.type))
-        return colorize ? Text("\x1b[31mnone\x1b[m") : Text("none");
+    if (is_none(obj, type->OptionalInfo.type)) return colorize ? Text("\x1b[31mnone\x1b[m") : Text("none");
     return generic_as_text(obj, colorize, type->OptionalInfo.type);
 }
 
-public void Optional$serialize(const void *obj, FILE *out, Table_t *pointers, const TypeInfo_t *type)
-{
+public
+void Optional$serialize(const void *obj, FILE *out, Table_t *pointers, const TypeInfo_t *type) {
     bool has_value = !is_none(obj, type->OptionalInfo.type);
     assert(fputc((int)has_value, out) != EOF);
-    if (has_value)
-        _serialize(obj, out, pointers, type->OptionalInfo.type);
+    if (has_value) _serialize(obj, out, pointers, type->OptionalInfo.type);
 }
 
-public void Optional$deserialize(FILE *in, void *outval, List_t *pointers, const TypeInfo_t *type)
-{
+public
+void Optional$deserialize(FILE *in, void *outval, List_t *pointers, const TypeInfo_t *type) {
     bool has_value = (bool)fgetc(in);
     const TypeInfo_t *nonnull = type->OptionalInfo.type;
     if (has_value) {
         memset(outval, 0, (size_t)type->size);
         _deserialize(in, outval, pointers, nonnull);
     } else {
-        if (nonnull->tag == TextInfo)
-            *(Text_t*)outval = NONE_TEXT;
-        else if (nonnull->tag == ListInfo)
-            *(List_t*)outval = (List_t){.length=-1};
-        else if (nonnull->tag == TableInfo)
-            *(Table_t*)outval = (Table_t){.entries={.length=-1}};
-        else if (nonnull == &Num$info)
-            *(double*)outval = (double)NAN;
-        else if (nonnull == &Num32$info)
-            *(float*)outval = (float)NAN;
+        if (nonnull->tag == TextInfo) *(Text_t *)outval = NONE_TEXT;
+        else if (nonnull->tag == ListInfo) *(List_t *)outval = (List_t){.length = -1};
+        else if (nonnull->tag == TableInfo) *(Table_t *)outval = (Table_t){.entries = {.length = -1}};
+        else if (nonnull == &Num$info) *(double *)outval = (double)NAN;
+        else if (nonnull == &Num32$info) *(float *)outval = (float)NAN;
         else if (nonnull->tag == StructInfo || (nonnull->tag == OpaqueInfo && type->size > nonnull->size))
             memset(outval + type->size, -1, (size_t)(type->size - nonnull->size));
-        else
-            memset(outval, 0, (size_t)type->size);
+        else memset(outval, 0, (size_t)type->size);
     }
 }