Tweaks

2 files changed, 3 insertions, 6 deletions

diff --git a/environment.c b/environment.c
index 60857c2c..0f0e18d2 100644
--- a/environment.c
+++ b/environment.c
@@ -19,6 +19,7 @@ static type_t *namespace_type(const char *name, table_t *ns)
         struct {const char *name; binding_t *binding; } *entry = Table_entry(ns, i);
         fields = new(arg_t, .next=fields, .name=entry->name, .type=entry->binding->type);
     }
+    name = heap_strf("%s_namespace", name);
     return Type(StructType, .name=name, .fields=fields);
 }
 
@@ -65,7 +66,8 @@ env_t *new_compilation_unit(void)
     for (size_t i = 0; i < sizeof(global_types)/sizeof(global_types[0]); i++) {
         table_t *ns = new(table_t);
         *ns = global_types[i].namespace;
-        Table_str_set(env->globals, global_types[i].name, new(binding_t, .type=namespace_type(global_types[i].name, ns)));
+        binding_t *binding = new(binding_t, .type=namespace_type(global_types[i].name, ns));
+        Table_str_set(env->globals, global_types[i].name, binding);
         Table_str_set(env->types, global_types[i].name, global_types[i].type);
     }
 
diff --git a/typecheck.c b/typecheck.c
index a83ba144..3d408857 100644
--- a/typecheck.c
+++ b/typecheck.c
@@ -241,11 +241,6 @@ type_t *get_type(env_t *env, ast_t *ast)
         auto var = Match(ast, Var);
         binding_t *b = get_binding(env, var->name);
         if (b) return b->type;
-        // const char *suggestion = spellcheck(env->bindings, name);
-        // if (suggestion)
-        //     code_err(ast, "I don't know what this variable is referring to. Did you mean '%s'?", suggestion); 
-        // else
-        //     code_err(ast, "I don't know what this variable is referring to."); 
         code_err(ast, "I don't know what \"%s\" refers to", var->name);
     }
     case Array: {