Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Bugfix for namespaced declarations that initialize and static

Browse Source 
definitions
This commit is contained in:
Bruce Hill 2025-03-01 22:14:32 -05:00
parent ba1abd4615
commit 5cb66f2ba8
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
compile.c
View File

@ -4310,18 +4310,14 @@ CORD compile_top_level_code(env_t *env, ast_t *ast)
} }
} }
CORD compile_file(env_t *env, ast_t *ast) static void initialize_vars_and_statics(env_t *env, ast_t *ast)
{ {
CORD top_level_code = compile_top_level_code(env, ast); if (!ast) return;
CORD use_imports = CORD_EMPTY;
// First prepare variable initializers to prevent unitialized access:
for (ast_list_t *stmt = Match(ast, Block)->statements; stmt; stmt = stmt->next) { for (ast_list_t *stmt = Match(ast, Block)->statements; stmt; stmt = stmt->next) {
if (stmt->ast->tag == InlineCCode) { if (stmt->ast->tag == InlineCCode) {
CORD code = compile_statement(env, stmt->ast); CORD code = compile_statement(env, stmt->ast);
env->code->staticdefs = CORD_all(env->code->staticdefs, code, "\n"); env->code->staticdefs = CORD_all(env->code->staticdefs, code, "\n");
} else if (stmt->ast->tag == Use) {
use_imports = CORD_all(use_imports, compile_statement(env, stmt->ast));
} else if (stmt->ast->tag == Declare) { } else if (stmt->ast->tag == Declare) {
auto decl = Match(stmt->ast, Declare); auto decl = Match(stmt->ast, Declare);
const char *decl_name = Match(decl->var, Var)->name; const char *decl_name = Match(decl->var, Var)->name;
@ -4345,12 +4341,37 @@ CORD compile_file(env_t *env, ast_t *ast)
full_name, " = ", val_code, ",\n", full_name, " = ", val_code, ",\n",
full_name, "$initialized = true;\n"))); full_name, "$initialized = true;\n")));
} }
} else if (stmt->ast->tag == StructDef) {
initialize_vars_and_statics(namespace_env(env, Match(stmt->ast, StructDef)->name),
Match(stmt->ast, StructDef)->namespace);
} else if (stmt->ast->tag == EnumDef) {
initialize_vars_and_statics(namespace_env(env, Match(stmt->ast, EnumDef)->name),
Match(stmt->ast, EnumDef)->namespace);
} else if (stmt->ast->tag == LangDef) {
initialize_vars_and_statics(namespace_env(env, Match(stmt->ast, LangDef)->name),
Match(stmt->ast, LangDef)->namespace);
} else if (stmt->ast->tag == Use) {
continue;
} else { } else {
CORD code = compile_statement(env, stmt->ast); CORD code = compile_statement(env, stmt->ast);
if (code) code_err(stmt->ast, "I did not expect this to generate code"); if (code) code_err(stmt->ast, "I did not expect this to generate code");
assert(!code); assert(!code);
} }
} }
}
CORD compile_file(env_t *env, ast_t *ast)
{
CORD top_level_code = compile_top_level_code(env, ast);
CORD use_imports = CORD_EMPTY;
// First prepare variable initializers to prevent unitialized access:
for (ast_list_t *stmt = Match(ast, Block)->statements; stmt; stmt = stmt->next) {
if (stmt->ast->tag == Use)
use_imports = CORD_all(use_imports, compile_statement(env, stmt->ast));
}
initialize_vars_and_statics(env, ast);
const char *name = file_base_name(ast->file->filename); const char *name = file_base_name(ast->file->filename);
return CORD_all( return CORD_all(