From bde2a0b33833af613ab7d8949f25864ec268cb1e Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sun, 3 Mar 2024 13:44:22 -0500
Subject: [PATCH] Cleanup/fixes

---
 builtins/table.h | 3 +--
 enums.c          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/builtins/table.h b/builtins/table.h
index 023df21..14a9797 100644
--- a/builtins/table.h
+++ b/builtins/table.h
@@ -13,8 +13,7 @@
                        .data=memcpy(GC_MALLOC(sizeof($ents)), $ents, sizeof($ents)), \
                        .length=sizeof($ents)/sizeof($ents[0]), \
                        .stride=(void*)&$ents[1] - (void*)&$ents[0], \
-                       }, &((TypeInfo){.size=sizeof(table_t), .align=__alignof__(table_t), .tag=TableInfo, \
-                            .TableInfo.key=key_info, .TableInfo.value=value_info})); \
+                       }, $TableInfo(key_info, value_info)); \
     $table.fallback = fb; \
     $table.default_value = def; \
     $table; })
diff --git a/enums.c b/enums.c
index 8366373..afd009f 100644
--- a/enums.c
+++ b/enums.c
@@ -115,7 +115,7 @@ void compile_enum_def(env_t *env, ast_t *ast)
 
     type_t *t = Table_str_get(env->types, def->name);
     CORD typeinfo = CORD_asprintf("public const TypeInfo %s = {%zu, %zu, {.tag=CustomInfo, .CustomInfo={",
-                                  def->name, def->name, type_size(t), type_align(t));
+                                  def->name, type_size(t), type_align(t));
 
     env->code->funcs = CORD_all(
         env->code->funcs,