From 582fdc28691a8837af19ac1e9b3ad27ee2eeb315 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 1 Mar 2019 15:35:29 -0500 Subject: fix dependency loops, pub, tests, use decls, root source * fix dependency loop detection - closes #679 - closes #1500 * fix `pub` * fix tests * fix use decls * main package file gets a special "" namespace path --- src/codegen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/codegen.cpp') diff --git a/src/codegen.cpp b/src/codegen.cpp index e43628fcfc..1bf4f2ee54 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -7748,7 +7748,7 @@ static Error define_builtin_compile_vars(CodeGen *g) { g->std_package->package_table.put(buf_create_from_str("builtin"), g->compile_var_package); g->std_package->package_table.put(buf_create_from_str("std"), g->std_package); g->compile_var_import = add_source_file(g, g->compile_var_package, builtin_zig_path, contents, - SourceKindNonRoot); + SourceKindPkgMain); return ErrorNone; } @@ -7987,7 +7987,7 @@ static ZigType *add_special_code(CodeGen *g, ZigPackage *package, const char *ba zig_panic("unable to open '%s': %s\n", buf_ptr(&path_to_code_src), err_str(err)); } - return add_source_file(g, package, resolved_path, import_code, SourceKindNonRoot); + return add_source_file(g, package, resolved_path, import_code, SourceKindPkgMain); } static ZigPackage *create_bootstrap_pkg(CodeGen *g, ZigPackage *pkg_with_main) { -- cgit v1.2.3