Skip to content

made @root package available to userland code #2659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewrk merged 3 commits into from
Jun 27, 2019
Merged

made @root package available to userland code #2659

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ea7685
made root package available to all other packages
emekoi Jun 11, 2019
e12c7d8
made root package available to itself
emekoi Jun 11, 2019
3ed6acd
fixed infinite loop when caching packages
emekoi Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget
g->root_package = new_package(".", "", "");
}

g->root_package->package_table.put(buf_create_from_str("@root"), g->root_package);

g->zig_std_special_dir = buf_alloc();
os_path_join(g->zig_std_dir, buf_sprintf("special"), g->zig_std_special_dir);

Expand Down Expand Up @@ -8505,10 +8507,8 @@ static ZigType *add_special_code(CodeGen *g, ZigPackage *package, const char *ba
return add_source_file(g, package, resolved_path, import_code, SourceKindPkgMain);
}

static ZigPackage *create_bootstrap_pkg(CodeGen *g, ZigPackage *pkg_with_main) {
ZigPackage *package = codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "bootstrap.zig", "std.special");
package->package_table.put(buf_create_from_str("@root"), pkg_with_main);
return package;
static ZigPackage *create_bootstrap_pkg(CodeGen *g) {
return codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "bootstrap.zig", "std.special");
}

static ZigPackage *create_test_runner_pkg(CodeGen *g) {
Expand Down Expand Up @@ -8632,20 +8632,20 @@ static void gen_root_source(CodeGen *g) {
!g->have_c_main && !g->have_winmain && !g->have_winmain_crt_startup &&
((g->have_pub_main && g->out_type == OutTypeObj) || g->out_type == OutTypeExe))
{
g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g, g->root_package), "bootstrap.zig");
g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g), "bootstrap.zig");
}
if (g->zig_target->os == OsWindows && !g->have_dllmain_crt_startup &&
g->out_type == OutTypeLib && g->is_dynamic)
{
g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g, g->root_package), "bootstrap_lib.zig");
g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g), "bootstrap_lib.zig");
}

if (!g->error_during_imports) {
semantic_analyze(g);
}
if (g->is_test_build) {
create_test_compile_var_and_add_test_runner(g);
g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g, g->test_runner_package), "bootstrap.zig");
g->bootstrap_import = add_special_code(g, create_bootstrap_pkg(g), "bootstrap.zig");

if (!g->error_during_imports) {
semantic_analyze(g);
Expand Down Expand Up @@ -9373,6 +9373,8 @@ static void add_cache_pkg(CodeGen *g, CacheHash *ch, ZigPackage *pkg) {
// TODO: I think we need a more sophisticated detection of
// packages we have already seen
if (entry->value != pkg) {
auto root = pkg->package_table.maybe_get(buf_create_from_str("@root"));
if (root != nullptr && entry->value == root->value) continue;
cache_buf(ch, entry->key);
add_cache_pkg(g, ch, entry->value);
}
Expand Down Expand Up @@ -9629,6 +9631,13 @@ ZigPackage *codegen_create_package(CodeGen *g, const char *root_src_dir, const c
if (g->std_package != nullptr) {
assert(g->compile_var_package != nullptr);
pkg->package_table.put(buf_create_from_str("std"), g->std_package);

if (g->is_test_build) {
pkg->package_table.put(buf_create_from_str("@root"), g->test_runner_package);
} else {
pkg->package_table.put(buf_create_from_str("@root"), g->root_package);
}

pkg->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);
}
return pkg;
Expand Down