Skip to content

Solve the return type ambiguity #1628

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
merged 22 commits into from
Oct 15, 2018
Merged

Solve the return type ambiguity #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ce257a8
Changed container and initializer syntax
Hejsil Oct 3, 2018
28603ff
Changed container and initializer syntax
Hejsil Oct 4, 2018
aedc8f5
Merge branch 'solve-return-type-problem' of github.com:ziglang/zig in…
Hejsil Oct 4, 2018
9499575
Fixed build error
Hejsil Oct 4, 2018
0765209
Added two token lookahead for the dot suffix operators
Hejsil Oct 4, 2018
cb539b7
dynamic_library code not building with stage2
Hejsil Oct 4, 2018
f9b4df7
Merge branch 'master' into solve-return-type-problem
Hejsil Oct 4, 2018
c3d326d
Made translate-c use new syntax
Hejsil Oct 4, 2018
a3f2610
Used zig fmt to fix std lib
Hejsil Oct 4, 2018
8223be8
Fixed translate_c tests
Hejsil Oct 4, 2018
8ca6209
Fixed runtime_safety tests
Hejsil Oct 4, 2018
9c361cc
Fixed compile_errors tests
Hejsil Oct 4, 2018
ea9cd3c
Fixed compare-output tests
Hejsil Oct 4, 2018
5c4977a
Fixed gen_h tests
Hejsil Oct 4, 2018
2b9047e
Fixed compile_rt tests
Hejsil Oct 4, 2018
e7d30a1
Fixed examples
Hejsil Oct 4, 2018
1c48ca6
Fixed docgen
Hejsil Oct 4, 2018
12709f6
Updated langref. All tests pass locally
Hejsil Oct 4, 2018
718fa90
Converted to newest type, and literal syntax
Hejsil Oct 15, 2018
7ed41fe
Merged with master
Hejsil Oct 15, 2018
a04e974
Self hosted parser now parses newest syntax
Hejsil Oct 15, 2018
abdf668
Ran fmt on code
Hejsil Oct 15, 2018
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
20 changes: 10 additions & 10 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub fn build(b: *Builder) !void {

const rel_zig_exe = try os.path.relative(b.allocator, b.build_root, b.zig_exe);
const langref_out_path = os.path.join(b.allocator, b.cache_root, "langref.html") catch unreachable;
var docgen_cmd = b.addCommand(null, b.env_map, [][]const u8{
var docgen_cmd = b.addCommand(null, b.env_map, [][]const u8.{
docgen_exe.getOutputPath(),
rel_zig_exe,
"doc" ++ os.path.sep_str ++ "langref.html.in",
Expand All @@ -31,12 +31,12 @@ pub fn build(b: *Builder) !void {
const test_step = b.step("test", "Run all the tests");

// find the stage0 build artifacts because we're going to re-use config.h and zig_cpp library
const build_info = try b.exec([][]const u8{
const build_info = try b.exec([][]const u8.{
b.zig_exe,
"BUILD_INFO",
});
var index: usize = 0;
var ctx = Context{
var ctx = Context.{
.cmake_binary_dir = nextValue(&index, build_info),
.cxx_compiler = nextValue(&index, build_info),
.llvm_config_exe = nextValue(&index, build_info),
Expand Down Expand Up @@ -141,29 +141,29 @@ fn addCppLib(b: *Builder, lib_exe_obj: var, cmake_binary_dir: []const u8, lib_na
lib_exe_obj.addObjectFile(os.path.join(b.allocator, cmake_binary_dir, "zig_cpp", b.fmt("{}{}{}", lib_prefix, lib_name, lib_exe_obj.target.libFileExt())) catch unreachable);
}

const LibraryDep = struct {
const LibraryDep = struct.{
libdirs: ArrayList([]const u8),
libs: ArrayList([]const u8),
system_libs: ArrayList([]const u8),
includes: ArrayList([]const u8),
};

fn findLLVM(b: *Builder, llvm_config_exe: []const u8) !LibraryDep {
const libs_output = try b.exec([][]const u8{
const libs_output = try b.exec([][]const u8.{
llvm_config_exe,
"--libs",
"--system-libs",
});
const includes_output = try b.exec([][]const u8{
const includes_output = try b.exec([][]const u8.{
llvm_config_exe,
"--includedir",
});
const libdir_output = try b.exec([][]const u8{
const libdir_output = try b.exec([][]const u8.{
llvm_config_exe,
"--libdir",
});

var result = LibraryDep{
var result = LibraryDep.{
.libs = ArrayList([]const u8).init(b.allocator),
.system_libs = ArrayList([]const u8).init(b.allocator),
.includes = ArrayList([]const u8).init(b.allocator),
Expand Down Expand Up @@ -268,7 +268,7 @@ fn configureStage2(b: *Builder, exe: var, ctx: Context) !void {
dependOnLib(exe, ctx.llvm);

if (exe.target.getOs() == builtin.Os.linux) {
const libstdcxx_path_padded = try b.exec([][]const u8{
const libstdcxx_path_padded = try b.exec([][]const u8.{
ctx.cxx_compiler,
"-print-file-name=libstdc++.a",
});
Expand Down Expand Up @@ -298,7 +298,7 @@ fn configureStage2(b: *Builder, exe: var, ctx: Context) !void {
exe.linkSystemLibrary("c");
}

const Context = struct {
const Context = struct.{
cmake_binary_dir: []const u8,
cxx_compiler: []const u8,
llvm_config_exe: []const u8,
Expand Down
Loading