aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/compile.c15
-rw-r--r--src/tomo.c103
2 files changed, 14 insertions, 104 deletions
diff --git a/src/compile.c b/src/compile.c
index 76f519c8..ce00b479 100644
--- a/src/compile.c
+++ b/src/compile.c
@@ -4483,7 +4483,20 @@ CORD compile_statement_type_header(env_t *env, Path_t header_path, ast_t *ast)
Path_t build_dir = Path$resolved(Path$parent(header_path), Path$current_dir());
switch (use->what) {
case USE_MODULE: {
- return CORD_all("#include <", use->path, "/", use->path, ".h>\n");
+ glob_t tm_files;
+ if (glob(String(TOMO_PREFIX"/share/tomo/installed/", use->path, "/[!._0-9]*.tm"), GLOB_TILDE, NULL, &tm_files) != 0)
+ code_err(ast, "Could not find library");
+
+ CORD includes = CORD_EMPTY;
+ for (size_t i = 0; i < tm_files.gl_pathc; i++) {
+ const char *filename = tm_files.gl_pathv[i];
+ Path_t tm_file = Path$from_str(filename);
+ Path_t lib_build_dir = Path$with_component(Path$parent(tm_file), Text(".build"));
+ Path_t header = Path$with_component(lib_build_dir, Texts(Path$base_name(tm_file), Text(".h")));
+ includes = CORD_all(includes, "#include \"", Path$as_c_string(header), "\"\n");
+ }
+ globfree(&tm_files);
+ return with_source_info(env, ast, includes);
}
case USE_LOCAL: {
Path_t used_path = Path$resolved(Path$from_str(use->path), source_dir);
diff --git a/src/tomo.c b/src/tomo.c
index 1691bdfb..8efac784 100644
--- a/src/tomo.c
+++ b/src/tomo.c
@@ -366,95 +366,6 @@ Path_t build_file(Path_t path, const char *extension)
return Path$with_component(build_dir, Texts(Path$base_name(path), Text$from_str(extension)));
}
-typedef struct {
- env_t *env;
- Table_t *used_imports;
- FILE *output;
- Path_t header_path;
-} libheader_info_t;
-
-static void _compile_statement_header_for_library(libheader_info_t *info, ast_t *ast)
-{
- if (ast->tag == Use) {
- DeclareMatch(use, ast, Use);
- if (use->what == USE_LOCAL)
- return;
-
- Path_t path = Path$from_str(use->path);
- if (!Table$has_value(*info->used_imports, path, Table$info(&Path$info, &Void$info))) {
- Table$set(info->used_imports, &path, NULL, Table$info(&Text$info, &Void$info));
- CORD_put(compile_statement_type_header(info->env, info->header_path, ast), info->output);
- CORD_put(compile_statement_namespace_header(info->env, info->header_path, ast), info->output);
- }
- } else {
- CORD_put(compile_statement_type_header(info->env, info->header_path, ast), info->output);
- CORD_put(compile_statement_namespace_header(info->env, info->header_path, ast), info->output);
- }
-}
-
-static void _make_typedefs_for_library(libheader_info_t *info, ast_t *ast)
-{
- if (ast->tag == StructDef) {
- DeclareMatch(def, ast, StructDef);
- CORD struct_name = namespace_name(info->env, info->env->namespace, CORD_all(def->name, "$$struct"));
- CORD type_name = namespace_name(info->env, info->env->namespace, CORD_all(def->name, "$$type"));
- CORD_put(CORD_all("typedef struct ", struct_name, " ", type_name, ";\n"), info->output);
- } else if (ast->tag == EnumDef) {
- DeclareMatch(def, ast, EnumDef);
- CORD struct_name = namespace_name(info->env, info->env->namespace, CORD_all(def->name, "$$struct"));
- CORD type_name = namespace_name(info->env, info->env->namespace, CORD_all(def->name, "$$type"));
- CORD_put(CORD_all("typedef struct ", struct_name, " ", type_name, ";\n"), info->output);
-
- for (tag_ast_t *tag = def->tags; tag; tag = tag->next) {
- if (!tag->fields) continue;
- CORD tag_struct_name = namespace_name(info->env, info->env->namespace, CORD_all(def->name, "$", tag->name, "$$struct"));
- CORD tag_type_name = namespace_name(info->env, info->env->namespace, CORD_all(def->name, "$", tag->name, "$$type"));
- CORD_put(CORD_all("typedef struct ", tag_struct_name, " ", tag_type_name, ";\n"), info->output);
- }
- } else if (ast->tag == LangDef) {
- DeclareMatch(def, ast, LangDef);
- CORD_put(CORD_all("typedef Text_t ", namespace_name(info->env, info->env->namespace, CORD_all(def->name, "$$type")), ";\n"), info->output);
- }
-}
-
-static void _compile_file_header_for_library(env_t *env, Path_t header_path, Path_t path, Table_t *visited_files, Table_t *used_imports, FILE *output)
-{
- if (Table$has_value(*visited_files, path, Table$info(&Path$info, &Void$info)))
- return;
-
- Table$set(visited_files, &path, NULL, Table$info(&Path$info, &Void$info));
-
- ast_t *file_ast = parse_file(Path$as_c_string(path), NULL);
- if (!file_ast) print_err("Could not parse file ", path);
- env_t *module_env = load_module_env(env, file_ast);
-
- libheader_info_t info = {
- .env=module_env,
- .used_imports=used_imports,
- .output=output,
- .header_path=header_path,
- };
-
- // Visit files in topological order:
- for (ast_list_t *stmt = Match(file_ast, Block)->statements; stmt; stmt = stmt->next) {
- ast_t *ast = stmt->ast;
- if (ast->tag != Use) continue;
-
- DeclareMatch(use, ast, Use);
- if (use->what == USE_LOCAL) {
- Path_t resolved = Path$resolved(Path$from_str(use->path), Path$parent(path));
- _compile_file_header_for_library(env, header_path, resolved, visited_files, used_imports, output);
- }
- }
-
- visit_topologically(
- Match(file_ast, Block)->statements, (Closure_t){.fn=(void*)_make_typedefs_for_library, &info});
- visit_topologically(
- Match(file_ast, Block)->statements, (Closure_t){.fn=(void*)_compile_statement_header_for_library, &info});
-
- CORD_put(CORD_all("void ", namespace_name(module_env, module_env->namespace, "$initialize"), "(void);\n"), output);
-}
-
void build_library(Path_t lib_dir)
{
lib_dir = Path$resolved(lib_dir, Path$current_dir());
@@ -469,20 +380,6 @@ void build_library(Path_t lib_dir)
compile_files(env, tm_files, &object_files, &extra_ldlibs);
- // Build a "whatever.h" header that loads all the headers:
- Path_t header_path = Path$with_component(lib_dir, Texts(lib_dir_name, Text(".h")));
- FILE *header = fopen(String(header_path), "w");
- fputs("#pragma once\n", header);
- fputs("#include <tomo/tomo.h>\n", header);
- Table_t visited_files = {};
- Table_t used_imports = {};
- for (int64_t i = 0; i < tm_files.length; i++) {
- Path_t f = *(Path_t*)(tm_files.data + i*tm_files.stride);
- _compile_file_header_for_library(env, header_path, f, &visited_files, &used_imports, header);
- }
- if (fclose(header) == -1)
- print_err("Failed to write header file: ", header_path);
-
Path_t shared_lib = Path$with_component(lib_dir, Texts(Text("lib"), lib_dir_name, Text(SHARED_SUFFIX)));
if (!is_stale_for_any(shared_lib, object_files)) {
if (verbose) whisper("Unchanged: ", shared_lib);
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-01 19:31:45 +0000