Commit ff477361b005f059591e92e079d62e68153365e1 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-06-27 19:16:24-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-06-27 19:16:24-04:00
log	ff477361b005f059591e92e079d62e68153365e1
tree	8b3edf357fa9b73d824753ba9ebebee158e9e8b2
parent	0a0c11685fd8faf73392d88dbdee7c744cc83386
parent	69c7c5de09e16e96a6ea5207ef8b3a21e9d119f9
signature	Commit is signed but in an unrecognized format.

Merge branch 'emekoi-root-import'

3 files changed, 15 insertions(+), 7 deletions(-)

src
- all_types.hpp
- codegen.cpp
std
- special
  - bootstrap.zig

src/all_types.hpp+2

...	@@ -1110,6 +1110,8 @@ struct ZigPackage {	...	@@ -1110,6 +1110,8 @@ struct ZigPackage {
1110		1110
1111	// reminder: hash tables must be initialized before use	1111	// reminder: hash tables must be initialized before use
1112	HashMap<Buf , ZigPackage , buf_hash, buf_eql_buf> package_table;	1112	HashMap<Buf , ZigPackage , buf_hash, buf_eql_buf> package_table;
		1113
		1114	bool added_to_cache;
1113	};	1115	};
1114		1116
1115	// Stuff that only applies to a struct which is the implicit root struct of a file	1117	// Stuff that only applies to a struct which is the implicit root struct of a file

src/codegen.cpp+11-4

std/special/bootstrap.zig+2-3

...	@@ -1,7 +1,6 @@	...	@@ -1,7 +1,6 @@
1	// This file is in a package which has the root source file exposed as "@root".	1	// This file is included in the compilation unit when exporting an executable.
2	// It is included in the compilation unit when exporting an executable.
3		2
4	const root = @import("@root");	3	const root = @import("root");
5	const std = @import("std");	4	const std = @import("std");
6	const builtin = @import("builtin");	5	const builtin = @import("builtin");
7	const assert = std.debug.assert;	6	const assert = std.debug.assert;

...	@@ -180,6 +180,8 @@ CodeGen codegen_create(Buf main_pkg_path, Buf *root_src_path, const ZigTarget	...	@@ -180,6 +180,8 @@ CodeGen codegen_create(Buf main_pkg_path, Buf *root_src_path, const ZigTarget
180	g->root_package = new_package(".", "", "");	180	g->root_package = new_package(".", "", "");
181	}	181	}
182		182
		183	g->root_package->package_table.put(buf_create_from_str("root"), g->root_package);
		184
183	g->zig_std_special_dir = buf_alloc();	185	g->zig_std_special_dir = buf_alloc();
184	os_path_join(g->zig_std_dir, buf_sprintf("special"), g->zig_std_special_dir);	186	os_path_join(g->zig_std_dir, buf_sprintf("special"), g->zig_std_special_dir);
185		187
...	@@ -8053,6 +8055,8 @@ static Error define_builtin_compile_vars(CodeGen *g) {	...	@@ -8053,6 +8055,8 @@ static Error define_builtin_compile_vars(CodeGen *g) {
8053	g->root_package->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);	8055	g->root_package->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);
8054	g->std_package->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);	8056	g->std_package->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);
8055	g->std_package->package_table.put(buf_create_from_str("std"), g->std_package);	8057	g->std_package->package_table.put(buf_create_from_str("std"), g->std_package);
		8058	g->std_package->package_table.put(buf_create_from_str("root"),
		8059	g->is_test_build ? g->test_runner_package : g->root_package);
8056	g->compile_var_import = add_source_file(g, g->compile_var_package, builtin_zig_path, contents,	8060	g->compile_var_import = add_source_file(g, g->compile_var_package, builtin_zig_path, contents,
8057	SourceKindPkgMain);	8061	SourceKindPkgMain);
8058		8062
...	@@ -8522,7 +8526,7 @@ static ZigType add_special_code(CodeGen g, ZigPackage package, const char ba	...	@@ -8522,7 +8526,7 @@ static ZigType add_special_code(CodeGen g, ZigPackage package, const char ba
8522		8526
8523	static ZigPackage create_bootstrap_pkg(CodeGen g, ZigPackage *pkg_with_main) {	8527	static ZigPackage create_bootstrap_pkg(CodeGen g, ZigPackage *pkg_with_main) {
8524	ZigPackage *package = codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "bootstrap.zig", "std.special");	8528	ZigPackage *package = codegen_create_package(g, buf_ptr(g->zig_std_special_dir), "bootstrap.zig", "std.special");
8525	package->package_table.put(buf_create_from_str("@root"), pkg_with_main);	8529	package->package_table.put(buf_create_from_str("root"), pkg_with_main);
8526	return package;	8530	return package;
8527	}	8531	}
8528		8532
...	@@ -9375,6 +9379,7 @@ void codegen_add_time_event(CodeGen g, const char name) {	...	@@ -9375,6 +9379,7 @@ void codegen_add_time_event(CodeGen g, const char name) {
9375	static void add_cache_pkg(CodeGen g, CacheHash ch, ZigPackage *pkg) {	9379	static void add_cache_pkg(CodeGen g, CacheHash ch, ZigPackage *pkg) {
9376	if (buf_len(&pkg->root_src_path) == 0)	9380	if (buf_len(&pkg->root_src_path) == 0)
9377	return;	9381	return;
		9382	pkg->added_to_cache = true;
9378		9383
9379	Buf *rel_full_path = buf_alloc();	9384	Buf *rel_full_path = buf_alloc();
9380	os_path_join(&pkg->root_src_dir, &pkg->root_src_path, rel_full_path);	9385	os_path_join(&pkg->root_src_dir, &pkg->root_src_path, rel_full_path);
...	@@ -9386,9 +9391,7 @@ static void add_cache_pkg(CodeGen g, CacheHash ch, ZigPackage *pkg) {	...	@@ -9386,9 +9391,7 @@ static void add_cache_pkg(CodeGen g, CacheHash ch, ZigPackage *pkg) {
9386	if (!entry)	9391	if (!entry)
9387	break;	9392	break;
9388		9393
9389	// TODO: I think we need a more sophisticated detection of	9394	if (!pkg->added_to_cache) {
9390	// packages we have already seen
9391	if (entry->value != pkg) {
9392	cache_buf(ch, entry->key);	9395	cache_buf(ch, entry->key);
9393	add_cache_pkg(g, ch, entry->value);	9396	add_cache_pkg(g, ch, entry->value);
9394	}	9397	}
...	@@ -9645,6 +9648,10 @@ ZigPackage codegen_create_package(CodeGen g, const char *root_src_dir, const c	...	@@ -9645,6 +9648,10 @@ ZigPackage codegen_create_package(CodeGen g, const char *root_src_dir, const c
9645	if (g->std_package != nullptr) {	9648	if (g->std_package != nullptr) {
9646	assert(g->compile_var_package != nullptr);	9649	assert(g->compile_var_package != nullptr);
9647	pkg->package_table.put(buf_create_from_str("std"), g->std_package);	9650	pkg->package_table.put(buf_create_from_str("std"), g->std_package);
		9651
		9652	ZigPackage *main_pkg = g->is_test_build ? g->test_runner_package : g->root_package;
		9653	pkg->package_table.put(buf_create_from_str("root"), main_pkg);
		9654
9648	pkg->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);	9655	pkg->package_table.put(buf_create_from_str("builtin"), g->compile_var_package);
9649	}	9656	}
9650	return pkg;	9657	return pkg;