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

Fix issue with importing modules

Browse Source
This commit is contained in:
Bruce Hill 2024-06-06 16:36:49 -04:00
parent 8c7d530080
commit f834073264
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environment.h
View File

@ -12,7 +12,6 @@ typedef struct {
CORD staticdefs;
CORD funcs;
CORD typeinfos;
CORD object_files;
} compilation_unit_t;
typedef struct {

17
typecheck.c
View File

@ -110,13 +110,6 @@ static env_t *load_module(env_t *env, ast_t *use_ast)
if (module_env)
return module_env;
module_env = new_compilation_unit();
module_env->file_prefix = heap_strf("%s$", name);
module_env->scope_prefix = module_env->file_prefix;
Table$str_set(module_env->imports, name, module_env);
const char *my_name = heap_strn(CORD_to_const_char_star(env->file_prefix), CORD_len(env->file_prefix)-1);
Table$str_set(module_env->imports, my_name, env);
const char *resolved_path = resolve_path(use->raw_path, use_ast->file->filename, getenv("TOMO_IMPORT_PATH"));
if (!resolved_path)
code_err(use_ast, "No such file exists: \"%s\"", use->raw_path);
@ -126,15 +119,7 @@ static env_t *load_module(env_t *env, ast_t *use_ast)
ast_t *ast = parse_file(f, NULL);
if (!ast) errx(1, "Could not compile!");
for (ast_list_t *stmt = Match(ast, Block)->statements; stmt; stmt = stmt->next) {
prebind_statement(module_env, stmt->ast);
}
for (ast_list_t *stmt = Match(ast, Block)->statements; stmt; stmt = stmt->next) {
bind_statement(module_env, stmt->ast);
}
Table$str_set(env->imports, name, module_env);
return module_env;
return load_module_env(env, ast);
}
void prebind_statement(env_t *env, ast_t *statement)