Commit 8174f972a779384b287528e46ea086c714ce5553 | zig

CMakeLists.txt+1-1

...	...	@@ -196,7 +196,7 @@ else()
196	196	if(MSVC)
197	197	set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -D_CRT_SECURE_NO_WARNINGS /w")
198	198	else()
199		set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -fno-exceptions -fno-rtti -Wno-comment")
	199	set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -fno-exceptions -fno-rtti -Wno-comment -Wno-class-memaccess -Wno-unknown-warning-option")
200	200	endif()
201	201	set_target_properties(embedded_lld_lib PROPERTIES
202	202	COMPILE_FLAGS ${ZIG_LLD_COMPILE_FLAGS}

README.md+7-4

...	...	@@ -1,9 +1,9 @@
1		![ZIG](http://ziglang.org/zig-logo.svg)
	1	![ZIG](https://ziglang.org/zig-logo.svg)
2	2
3	3	A programming language designed for robustness, optimality, and
4	4	clarity.
5	5
6		[ziglang.org](http://ziglang.org)
	6	[ziglang.org](https://ziglang.org)
7	7
8	8	## Feature Highlights
9	9
...	...	@@ -114,7 +114,7 @@ libc. Create demo games using Zig.
114	114
115	115	## Building
116	116
117		[![Build Status](https://travis-ci.org/zig-lang/zig.svg?branch=master)](https://travis-ci.org/zig-lang/zig)
	117	[![Build Status](https://travis-ci.org/ziglang/zig.svg?branch=master)](https://travis-ci.org/ziglang/zig)
118	118	[![Build status](https://ci.appveyor.com/api/projects/status/4t80mk2dmucrc38i/branch/master?svg=true)](https://ci.appveyor.com/project/andrewrk/zig-d3l86/branch/master)
119	119
120	120	### Stage 1: Build Zig from C++ Source Code
...	...	@@ -161,7 +161,7 @@ bin/zig build --build-file ../build.zig test
161	161
162	162	##### Windows
163	163
164		See https://github.com/zig-lang/zig/wiki/Building-Zig-on-Windows
	164	See https://github.com/ziglang/zig/wiki/Building-Zig-on-Windows
165	165
166	166	### Stage 2: Build Self-Hosted Zig from Zig Source Code
167	167
...	...	@@ -182,6 +182,9 @@ binary.
182	182
183	183	This is the actual compiler binary that we will install to the system.
184	184
	185	*Note: Stage 2 compiler is not yet able to build Stage 3. Building Stage 3 is
	186	not yet supported.*
	187
185	188	#### Debug / Development Build
186	189
187	190	```

build.zig+34-25

...	...	@@ -16,7 +16,7 @@ pub fn build(b: &Builder) !void {
16	16	var docgen_exe = b.addExecutable("docgen", "doc/docgen.zig");
17	17
18	18	const rel_zig_exe = try os.path.relative(b.allocator, b.build_root, b.zig_exe);
19		var docgen_cmd = b.addCommand(null, b.env_map, [][]const u8 {
	19	var docgen_cmd = b.addCommand(null, b.env_map, [][]const u8{
20	20	docgen_exe.getOutputPath(),
21	21	rel_zig_exe,
22	22	"doc/langref.html.in",
...	...	@@ -30,7 +30,10 @@ pub fn build(b: &Builder) !void {
30	30	const test_step = b.step("test", "Run all the tests");
31	31
32	32	// find the stage0 build artifacts because we're going to re-use config.h and zig_cpp library
33		const build_info = try b.exec([][]const u8{b.zig_exe, "BUILD_INFO"});
	33	const build_info = try b.exec([][]const u8{
	34	b.zig_exe,
	35	"BUILD_INFO",
	36	});
34	37	var index: usize = 0;
35	38	const cmake_binary_dir = nextValue(&index, build_info);
36	39	const cxx_compiler = nextValue(&index, build_info);
...	...	@@ -67,7 +70,10 @@ pub fn build(b: &Builder) !void {
67	70	dependOnLib(exe, llvm);
68	71
69	72	if (exe.target.getOs() == builtin.Os.linux) {
70		const libstdcxx_path_padded = try b.exec([][]const u8{cxx_compiler, "-print-file-name=libstdc++.a"});
	73	const libstdcxx_path_padded = try b.exec([][]const u8{
	74	cxx_compiler,
	75	"-print-file-name=libstdc++.a",
	76	});
71	77	const libstdcxx_path = ??mem.split(libstdcxx_path_padded, "\r\n").next();
72	78	if (mem.eql(u8, libstdcxx_path, "libstdc++.a")) {
73	79	warn(
...	...	@@ -111,17 +117,11 @@ pub fn build(b: &Builder) !void {
111	117
112	118	test_step.dependOn(docs_step);
113	119
114		test_step.dependOn(tests.addPkgTests(b, test_filter,
115		"test/behavior.zig", "behavior", "Run the behavior tests",
116		with_lldb));
	120	test_step.dependOn(tests.addPkgTests(b, test_filter, "test/behavior.zig", "behavior", "Run the behavior tests", with_lldb));
117	121
118		test_step.dependOn(tests.addPkgTests(b, test_filter,
119		"std/index.zig", "std", "Run the standard library tests",
120		with_lldb));
	122	test_step.dependOn(tests.addPkgTests(b, test_filter, "std/index.zig", "std", "Run the standard library tests", with_lldb));
121	123
122		test_step.dependOn(tests.addPkgTests(b, test_filter,
123		"std/special/compiler_rt/index.zig", "compiler-rt", "Run the compiler_rt tests",
124		with_lldb));
	124	test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt/index.zig", "compiler-rt", "Run the compiler_rt tests", with_lldb));
125	125
126	126	test_step.dependOn(tests.addCompareOutputTests(b, test_filter));
127	127	test_step.dependOn(tests.addBuildExampleTests(b, test_filter));
...	...	@@ -149,8 +149,7 @@ fn dependOnLib(lib_exe_obj: &std.build.LibExeObjStep, dep: &const LibraryDep) vo
149	149
150	150	fn addCppLib(b: &Builder, lib_exe_obj: &std.build.LibExeObjStep, cmake_binary_dir: []const u8, lib_name: []const u8) void {
151	151	const lib_prefix = if (lib_exe_obj.target.isWindows()) "" else "lib";
152		lib_exe_obj.addObjectFile(os.path.join(b.allocator, cmake_binary_dir, "zig_cpp",
153		b.fmt("{}{}{}", lib_prefix, lib_name, lib_exe_obj.target.libFileExt())) catch unreachable);
	152	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);
154	153	}
155	154
156	155	const LibraryDep = struct {
...	...	@@ -161,11 +160,21 @@ const LibraryDep = struct {
161	160	};
162	161
163	162	fn findLLVM(b: &Builder, llvm_config_exe: []const u8) !LibraryDep {
164		const libs_output = try b.exec([][]const u8{llvm_config_exe, "--libs", "--system-libs"});
165		const includes_output = try b.exec([][]const u8{llvm_config_exe, "--includedir"});
166		const libdir_output = try b.exec([][]const u8{llvm_config_exe, "--libdir"});
	163	const libs_output = try b.exec([][]const u8{
	164	llvm_config_exe,
	165	"--libs",
	166	"--system-libs",
	167	});
	168	const includes_output = try b.exec([][]const u8{
	169	llvm_config_exe,
	170	"--includedir",
	171	});
	172	const libdir_output = try b.exec([][]const u8{
	173	llvm_config_exe,
	174	"--libdir",
	175	});
167	176
168		var result = LibraryDep {
	177	var result = LibraryDep{
169	178	.libs = ArrayList([]const u8).init(b.allocator),
170	179	.system_libs = ArrayList([]const u8).init(b.allocator),
171	180	.includes = ArrayList([]const u8).init(b.allocator),
...	...	@@ -227,17 +236,17 @@ pub fn installCHeaders(b: &Builder, c_header_files: []const u8) void {
227	236	}
228	237
229	238	fn nextValue(index: &usize, build_info: []const u8) []const u8 {
230		const start = *index;
231		while (true) : (*index += 1) {
232		switch (build_info[*index]) {
	239	const start = index.*;
	240	while (true) : (index.* += 1) {
	241	switch (build_info[index.*]) {
233	242	'\n' => {
234		const result = build_info[start..*index];
235		*index += 1;
	243	const result = build_info[start..index.*];
	244	index.* += 1;
236	245	return result;
237	246	},
238	247	'\r' => {
239		const result = build_info[start..*index];
240		*index += 2;
	248	const result = build_info[start..index.*];
	249	index.* += 2;
241	250	return result;
242	251	},
243	252	else => continue,

doc/docgen.zig+117-65

...	...	@@ -95,7 +95,7 @@ const Tokenizer = struct {
95	95	};
96	96
97	97	fn init(source_file_name: []const u8, buffer: []const u8) Tokenizer {
98		return Tokenizer {
	98	return Tokenizer{
99	99	.buffer = buffer,
100	100	.index = 0,
101	101	.state = State.Start,
...	...	@@ -105,7 +105,7 @@ const Tokenizer = struct {
105	105	}
106	106
107	107	fn next(self: &Tokenizer) Token {
108		var result = Token {
	108	var result = Token{
109	109	.id = Token.Id.Eof,
110	110	.start = self.index,
111	111	.end = undefined,
...	...	@@ -197,7 +197,7 @@ const Tokenizer = struct {
197	197	};
198	198
199	199	fn getTokenLocation(self: &Tokenizer, token: &const Token) Location {
200		var loc = Location {
	200	var loc = Location{
201	201	.line = 0,
202	202	.column = 0,
203	203	.line_start = 0,
...	...	@@ -346,7 +346,7 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
346	346	break;
347	347	},
348	348	Token.Id.Content => {
349		try nodes.append(Node {.Content = tokenizer.buffer[token.start..token.end] });
	349	try nodes.append(Node{ .Content = tokenizer.buffer[token.start..token.end] });
350	350	},
351	351	Token.Id.BracketOpen => {
352	352	const tag_token = try eatToken(tokenizer, Token.Id.TagContent);
...	...	@@ -365,11 +365,13 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
365	365	header_stack_size += 1;
366	366
367	367	const urlized = try urlize(allocator, content);
368		try nodes.append(Node{.HeaderOpen = HeaderOpen {
369		.name = content,
370		.url = urlized,
371		.n = header_stack_size,
372		}});
	368	try nodes.append(Node{
	369	.HeaderOpen = HeaderOpen{
	370	.name = content,
	371	.url = urlized,
	372	.n = header_stack_size,
	373	},
	374	});
373	375	if (try urls.put(urlized, tag_token)) \|other_tag_token\| {
374	376	parseError(tokenizer, tag_token, "duplicate header url: #{}", urlized) catch {};
375	377	parseError(tokenizer, other_tag_token, "other tag here") catch {};
...	...	@@ -407,14 +409,14 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
407	409	switch (see_also_tok.id) {
408	410	Token.Id.TagContent => {
409	411	const content = tokenizer.buffer[see_also_tok.start..see_also_tok.end];
410		try list.append(SeeAlsoItem {
	412	try list.append(SeeAlsoItem{
411	413	.name = content,
412	414	.token = see_also_tok,
413	415	});
414	416	},
415	417	Token.Id.Separator => {},
416	418	Token.Id.BracketClose => {
417		try nodes.append(Node {.SeeAlso = list.toOwnedSlice() } );
	419	try nodes.append(Node{ .SeeAlso = list.toOwnedSlice() });
418	420	break;
419	421	},
420	422	else => return parseError(tokenizer, see_also_tok, "invalid see_also token"),
...	...	@@ -438,8 +440,8 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
438	440	}
439	441	};
440	442
441		try nodes.append(Node {
442		.Link = Link {
	443	try nodes.append(Node{
	444	.Link = Link{
443	445	.url = try urlize(allocator, url_name),
444	446	.name = name,
445	447	.token = name_tok,
...	...	@@ -463,24 +465,24 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
463	465	var code_kind_id: Code.Id = undefined;
464	466	var is_inline = false;
465	467	if (mem.eql(u8, code_kind_str, "exe")) {
466		code_kind_id = Code.Id { .Exe = ExpectedOutcome.Succeed };
	468	code_kind_id = Code.Id{ .Exe = ExpectedOutcome.Succeed };
467	469	} else if (mem.eql(u8, code_kind_str, "exe_err")) {
468		code_kind_id = Code.Id { .Exe = ExpectedOutcome.Fail };
	470	code_kind_id = Code.Id{ .Exe = ExpectedOutcome.Fail };
469	471	} else if (mem.eql(u8, code_kind_str, "test")) {
470	472	code_kind_id = Code.Id.Test;
471	473	} else if (mem.eql(u8, code_kind_str, "test_err")) {
472		code_kind_id = Code.Id { .TestError = name};
	474	code_kind_id = Code.Id{ .TestError = name };
473	475	name = "test";
474	476	} else if (mem.eql(u8, code_kind_str, "test_safety")) {
475		code_kind_id = Code.Id { .TestSafety = name};
	477	code_kind_id = Code.Id{ .TestSafety = name };
476	478	name = "test";
477	479	} else if (mem.eql(u8, code_kind_str, "obj")) {
478		code_kind_id = Code.Id { .Obj = null };
	480	code_kind_id = Code.Id{ .Obj = null };
479	481	} else if (mem.eql(u8, code_kind_str, "obj_err")) {
480		code_kind_id = Code.Id { .Obj = name };
	482	code_kind_id = Code.Id{ .Obj = name };
481	483	name = "test";
482	484	} else if (mem.eql(u8, code_kind_str, "syntax")) {
483		code_kind_id = Code.Id { .Obj = null };
	485	code_kind_id = Code.Id{ .Obj = null };
484	486	is_inline = true;
485	487	} else {
486	488	return parseError(tokenizer, code_kind_tok, "unrecognized code kind: {}", code_kind_str);
...	...	@@ -514,17 +516,20 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
514	516	return parseError(tokenizer, end_code_tag, "invalid token inside code_begin: {}", end_tag_name);
515	517	}
516	518	_ = try eatToken(tokenizer, Token.Id.BracketClose);
517		} else unreachable; // TODO issue #707
518		try nodes.append(Node {.Code = Code {
519		.id = code_kind_id,
520		.name = name,
521		.source_token = source_token,
522		.is_inline = is_inline,
523		.mode = mode,
524		.link_objects = link_objects.toOwnedSlice(),
525		.target_windows = target_windows,
526		.link_libc = link_libc,
527		}});
	519	} else
	520	unreachable; // TODO issue #707
	521	try nodes.append(Node{
	522	.Code = Code{
	523	.id = code_kind_id,
	524	.name = name,
	525	.source_token = source_token,
	526	.is_inline = is_inline,
	527	.mode = mode,
	528	.link_objects = link_objects.toOwnedSlice(),
	529	.target_windows = target_windows,
	530	.link_libc = link_libc,
	531	},
	532	});
528	533	tokenizer.code_node_count += 1;
529	534	} else {
530	535	return parseError(tokenizer, tag_token, "unrecognized tag name: {}", tag_name);
...	...	@@ -534,7 +539,7 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
534	539	}
535	540	}
536	541
537		return Toc {
	542	return Toc{
538	543	.nodes = nodes.toOwnedSlice(),
539	544	.toc = toc_buf.toOwnedSlice(),
540	545	.urls = urls,
...	...	@@ -727,16 +732,19 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
727	732	const name_plus_ext = try std.fmt.allocPrint(allocator, "{}.zig", code.name);
728	733	const tmp_source_file_name = try os.path.join(allocator, tmp_dir_name, name_plus_ext);
729	734	try io.writeFile(allocator, tmp_source_file_name, trimmed_raw_source);
730
	735
731	736	switch (code.id) {
732	737	Code.Id.Exe => \|expected_outcome\| {
733	738	const name_plus_bin_ext = try std.fmt.allocPrint(allocator, "{}{}", code.name, exe_ext);
734	739	const tmp_bin_file_name = try os.path.join(allocator, tmp_dir_name, name_plus_bin_ext);
735	740	var build_args = std.ArrayList([]const u8).init(allocator);
736	741	defer build_args.deinit();
737		try build_args.appendSlice([][]const u8 {zig_exe,
738		"build-exe", tmp_source_file_name,
739		"--output", tmp_bin_file_name,
	742	try build_args.appendSlice([][]const u8{
	743	zig_exe,
	744	"build-exe",
	745	tmp_source_file_name,
	746	"--output",
	747	tmp_bin_file_name,
740	748	});
741	749	try out.print("<pre><code class=\"shell\">$ zig build-exe {}.zig", code.name);
742	750	switch (code.mode) {
...	...	@@ -766,10 +774,9 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
766	774	try build_args.append("c");
767	775	try out.print(" --library c");
768	776	}
769		_ = exec(allocator, build_args.toSliceConst()) catch return parseError(
770		tokenizer, code.source_token, "example failed to compile");
	777	_ = exec(allocator, build_args.toSliceConst()) catch return parseError(tokenizer, code.source_token, "example failed to compile");
771	778
772		const run_args = [][]const u8 {tmp_bin_file_name};
	779	const run_args = [][]const u8{tmp_bin_file_name};
773	780
774	781	const result = if (expected_outcome == ExpectedOutcome.Fail) blk: {
775	782	const result = try os.ChildProcess.exec(allocator, run_args, null, null, max_doc_file_size);
...	...	@@ -777,7 +784,10 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
777	784	os.ChildProcess.Term.Exited => \|exit_code\| {
778	785	if (exit_code == 0) {
779	786	warn("{}\nThe following command incorrectly succeeded:\n", result.stderr);
780		for (run_args) \|arg\| warn("{} ", arg) else warn("\n");
	787	for (run_args) \|arg\|
	788	warn("{} ", arg)
	789	else
	790	warn("\n");
781	791	return parseError(tokenizer, code.source_token, "example incorrectly compiled");
782	792	}
783	793	},
...	...	@@ -785,11 +795,9 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
785	795	}
786	796	break :blk result;
787	797	} else blk: {
788		break :blk exec(allocator, run_args) catch return parseError(
789		tokenizer, code.source_token, "example crashed");
	798	break :blk exec(allocator, run_args) catch return parseError(tokenizer, code.source_token, "example crashed");
790	799	};
791	800
792
793	801	const escaped_stderr = try escapeHtml(allocator, result.stderr);
794	802	const escaped_stdout = try escapeHtml(allocator, result.stdout);
795	803
...	...	@@ -802,7 +810,11 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
802	810	var test_args = std.ArrayList([]const u8).init(allocator);
803	811	defer test_args.deinit();
804	812
805		try test_args.appendSlice([][]const u8 {zig_exe, "test", tmp_source_file_name});
	813	try test_args.appendSlice([][]const u8{
	814	zig_exe,
	815	"test",
	816	tmp_source_file_name,
	817	});
806	818	try out.print("<pre><code class=\"shell\">$ zig test {}.zig", code.name);
807	819	switch (code.mode) {
808	820	builtin.Mode.Debug => {},
...	...	@@ -821,13 +833,15 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
821	833	}
822	834	if (code.target_windows) {
823	835	try test_args.appendSlice([][]const u8{
824		"--target-os", "windows",
825		"--target-arch", "x86_64",
826		"--target-environ", "msvc",
	836	"--target-os",
	837	"windows",
	838	"--target-arch",
	839	"x86_64",
	840	"--target-environ",
	841	"msvc",
827	842	});
828	843	}
829		const result = exec(allocator, test_args.toSliceConst()) catch return parseError(
830		tokenizer, code.source_token, "test failed");
	844	const result = exec(allocator, test_args.toSliceConst()) catch return parseError(tokenizer, code.source_token, "test failed");
831	845	const escaped_stderr = try escapeHtml(allocator, result.stderr);
832	846	const escaped_stdout = try escapeHtml(allocator, result.stdout);
833	847	try out.print("\n{}{}</code></pre>\n", escaped_stderr, escaped_stdout);
...	...	@@ -836,7 +850,13 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
836	850	var test_args = std.ArrayList([]const u8).init(allocator);
837	851	defer test_args.deinit();
838	852
839		try test_args.appendSlice([][]const u8 {zig_exe, "test", "--color", "on", tmp_source_file_name});
	853	try test_args.appendSlice([][]const u8{
	854	zig_exe,
	855	"test",
	856	"--color",
	857	"on",
	858	tmp_source_file_name,
	859	});
840	860	try out.print("<pre><code class=\"shell\">$ zig test {}.zig", code.name);
841	861	switch (code.mode) {
842	862	builtin.Mode.Debug => {},
...	...	@@ -858,13 +878,19 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
858	878	os.ChildProcess.Term.Exited => \|exit_code\| {
859	879	if (exit_code == 0) {
860	880	warn("{}\nThe following command incorrectly succeeded:\n", result.stderr);
861		for (test_args.toSliceConst()) \|arg\| warn("{} ", arg) else warn("\n");
	881	for (test_args.toSliceConst()) \|arg\|
	882	warn("{} ", arg)
	883	else
	884	warn("\n");
862	885	return parseError(tokenizer, code.source_token, "example incorrectly compiled");
863	886	}
864	887	},
865	888	else => {
866	889	warn("{}\nThe following command crashed:\n", result.stderr);
867		for (test_args.toSliceConst()) \|arg\| warn("{} ", arg) else warn("\n");
	890	for (test_args.toSliceConst()) \|arg\|
	891	warn("{} ", arg)
	892	else
	893	warn("\n");
868	894	return parseError(tokenizer, code.source_token, "example compile crashed");
869	895	},
870	896	}
...	...	@@ -881,7 +907,11 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
881	907	var test_args = std.ArrayList([]const u8).init(allocator);
882	908	defer test_args.deinit();
883	909
884		try test_args.appendSlice([][]const u8 {zig_exe, "test", tmp_source_file_name});
	910	try test_args.appendSlice([][]const u8{
	911	zig_exe,
	912	"test",
	913	tmp_source_file_name,
	914	});
885	915	switch (code.mode) {
886	916	builtin.Mode.Debug => {},
887	917	builtin.Mode.ReleaseSafe => try test_args.append("--release-safe"),
...	...	@@ -894,13 +924,19 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
894	924	os.ChildProcess.Term.Exited => \|exit_code\| {
895	925	if (exit_code == 0) {
896	926	warn("{}\nThe following command incorrectly succeeded:\n", result.stderr);
897		for (test_args.toSliceConst()) \|arg\| warn("{} ", arg) else warn("\n");
	927	for (test_args.toSliceConst()) \|arg\|
	928	warn("{} ", arg)
	929	else
	930	warn("\n");
898	931	return parseError(tokenizer, code.source_token, "example test incorrectly succeeded");
899	932	}
900	933	},
901	934	else => {
902	935	warn("{}\nThe following command crashed:\n", result.stderr);
903		for (test_args.toSliceConst()) \|arg\| warn("{} ", arg) else warn("\n");
	936	for (test_args.toSliceConst()) \|arg\|
	937	warn("{} ", arg)
	938	else
	939	warn("\n");
904	940	return parseError(tokenizer, code.source_token, "example compile crashed");
905	941	},
906	942	}
...	...	@@ -918,9 +954,15 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
918	954	var build_args = std.ArrayList([]const u8).init(allocator);
919	955	defer build_args.deinit();
920	956
921		try build_args.appendSlice([][]const u8 {zig_exe, "build-obj", tmp_source_file_name,
922		"--color", "on",
923		"--output", tmp_obj_file_name});
	957	try build_args.appendSlice([][]const u8{
	958	zig_exe,
	959	"build-obj",
	960	tmp_source_file_name,
	961	"--color",
	962	"on",
	963	"--output",
	964	tmp_obj_file_name,
	965	});
924	966
925	967	if (!code.is_inline) {
926	968	try out.print("<pre><code class=\"shell\">$ zig build-obj {}.zig", code.name);
...	...	@@ -954,13 +996,19 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
954	996	os.ChildProcess.Term.Exited => \|exit_code\| {
955	997	if (exit_code == 0) {
956	998	warn("{}\nThe following command incorrectly succeeded:\n", result.stderr);
957		for (build_args.toSliceConst()) \|arg\| warn("{} ", arg) else warn("\n");
	999	for (build_args.toSliceConst()) \|arg\|
	1000	warn("{} ", arg)
	1001	else
	1002	warn("\n");
958	1003	return parseError(tokenizer, code.source_token, "example build incorrectly succeeded");
959	1004	}
960	1005	},
961	1006	else => {
962	1007	warn("{}\nThe following command crashed:\n", result.stderr);
963		for (build_args.toSliceConst()) \|arg\| warn("{} ", arg) else warn("\n");
	1008	for (build_args.toSliceConst()) \|arg\|
	1009	warn("{} ", arg)
	1010	else
	1011	warn("\n");
964	1012	return parseError(tokenizer, code.source_token, "example compile crashed");
965	1013	},
966	1014	}
...	...	@@ -975,8 +1023,7 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
975	1023	try out.print("</code></pre>\n");
976	1024	}
977	1025	} else {
978		_ = exec(allocator, build_args.toSliceConst()) catch return parseError(
979		tokenizer, code.source_token, "example failed to compile");
	1026	_ = exec(allocator, build_args.toSliceConst()) catch return parseError(tokenizer, code.source_token, "example failed to compile");
980	1027	}
981	1028	if (!code.is_inline) {
982	1029	try out.print("</code></pre>\n");
...	...	@@ -987,7 +1034,6 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
987	1034	},
988	1035	}
989	1036	}
990
991	1037	}
992	1038
993	1039	fn exec(allocator: &mem.Allocator, args: []const []const u8) !os.ChildProcess.ExecResult {
...	...	@@ -996,13 +1042,19 @@ fn exec(allocator: &mem.Allocator, args: []const []const u8) !os.ChildProcess.Ex
996	1042	os.ChildProcess.Term.Exited => \|exit_code\| {
997	1043	if (exit_code != 0) {
998	1044	warn("{}\nThe following command exited with code {}:\n", result.stderr, exit_code);
999		for (args) \|arg\| warn("{} ", arg) else warn("\n");
	1045	for (args) \|arg\|
	1046	warn("{} ", arg)
	1047	else
	1048	warn("\n");
1000	1049	return error.ChildExitError;
1001	1050	}
1002	1051	},
1003	1052	else => {
1004	1053	warn("{}\nThe following command crashed:\n", result.stderr);
1005		for (args) \|arg\| warn("{} ", arg) else warn("\n");
	1054	for (args) \|arg\|
	1055	warn("{} ", arg)
	1056	else
	1057	warn("\n");
1006	1058	return error.ChildCrashed;
1007	1059	},
1008	1060	}

doc/langref.html.in+133-40

...	...	@@ -96,7 +96,7 @@
96	96	</p>
97	97	<p>
98	98	If you search for something specific in this documentation and do not find it,
99		please <a href="https://github.com/zig-lang/www.ziglang.org/issues/new?title=I%20searched%20for%20___%20in%20the%20docs%20and%20didn%27t%20find%20it">file an issue</a> or <a href="https://webchat.freenode.net/?channels=%23zig">say something on IRC</a>.
	99	please <a href="https://github.com/ziglang/www.ziglang.org/issues/new?title=I%20searched%20for%20___%20in%20the%20docs%20and%20didn%27t%20find%20it">file an issue</a> or <a href="https://webchat.freenode.net/?channels=%23zig">say something on IRC</a>.
100	100	</p>
101	101	<p>
102	102	The code samples in this document are compiled and tested as part of the main test suite of Zig.
...	...	@@ -1232,7 +1232,7 @@ mem.eql(u8, pattern, "ababab")</code></pre>
1232	1232	</td>
1233	1233	</tr>
1234	1234	<tr>
1235		<td><pre><code class="zig">*a<code></pre></td>
	1235	<td><pre><code class="zig">a.*<code></pre></td>
1236	1236	<td>
1237	1237	<ul>
1238	1238	<li>{#link\|Pointers#}</li>
...	...	@@ -1244,7 +1244,7 @@ mem.eql(u8, pattern, "ababab")</code></pre>
1244	1244	<td>
1245	1245	<pre><code class="zig">const x: u32 = 1234;
1246	1246	const ptr = &x;
1247		*x == 1234</code></pre>
	1247	x.* == 1234</code></pre>
1248	1248	</td>
1249	1249	</tr>
1250	1250	<tr>
...	...	@@ -1258,7 +1258,7 @@ const ptr = &x;
1258	1258	<td>
1259	1259	<pre><code class="zig">const x: u32 = 1234;
1260	1260	const ptr = &x;
1261		*x == 1234</code></pre>
	1261	x.* == 1234</code></pre>
1262	1262	</td>
1263	1263	</tr>
1264	1264	</table>
...	...	@@ -1267,8 +1267,8 @@ const ptr = &x;
1267	1267	{#header_open\|Precedence#}
1268	1268	<pre><code>x() x[] x.y
1269	1269	a!b
1270		!x -x -%x ~x *x &x ?x ??x
1271		x{}
	1270	!x -x -%x ~x &x ?x ??x
	1271	x{} x.*
1272	1272	! * / % ** *%
1273	1273	+ - ++ +% -%
1274	1274	<< >>
...	...	@@ -1316,7 +1316,7 @@ var some_integers: [100]i32 = undefined;
1316	1316
1317	1317	test "modify an array" {
1318	1318	for (some_integers) \|*item, i\| {
1319		*item = i32(i);
	1319	item.* = i32(i);
1320	1320	}
1321	1321	assert(some_integers[10] == 10);
1322	1322	assert(some_integers[99] == 99);
...	...	@@ -1357,7 +1357,7 @@ comptime {
1357	1357	var fancy_array = init: {
1358	1358	var initial_value: [10]Point = undefined;
1359	1359	for (initial_value) \|*pt, i\| {
1360		*pt = Point {
	1360	pt.* = Point {
1361	1361	.x = i32(i),
1362	1362	.y = i32(i) * 2,
1363	1363	};
...	...	@@ -1400,7 +1400,7 @@ test "address of syntax" {
1400	1400	const x_ptr = &x;
1401	1401
1402	1402	// Deference a pointer:
1403		assert(*x_ptr == 1234);
	1403	assert(x_ptr.* == 1234);
1404	1404
1405	1405	// When you get the address of a const variable, you get a const pointer.
1406	1406	assert(@typeOf(x_ptr) == &const i32);
...	...	@@ -1409,8 +1409,8 @@ test "address of syntax" {
1409	1409	var y: i32 = 5678;
1410	1410	const y_ptr = &y;
1411	1411	assert(@typeOf(y_ptr) == &i32);
1412		*y_ptr += 1;
1413		assert(*y_ptr == 5679);
	1412	y_ptr.* += 1;
	1413	assert(y_ptr.* == 5679);
1414	1414	}
1415	1415
1416	1416	test "pointer array access" {
...	...	@@ -1448,9 +1448,9 @@ comptime {
1448	1448	// @ptrCast.
1449	1449	var x: i32 = 1;
1450	1450	const ptr = &x;
1451		*ptr += 1;
	1451	ptr.* += 1;
1452	1452	x += 1;
1453		assert(*ptr == 3);
	1453	assert(ptr.* == 3);
1454	1454	}
1455	1455
1456	1456	test "@ptrToInt and @intToPtr" {
...	...	@@ -1492,7 +1492,7 @@ test "nullable pointers" {
1492	1492	var x: i32 = 1;
1493	1493	ptr = &x;
1494	1494
1495		assert(*??ptr == 1);
	1495	assert((??ptr).* == 1);
1496	1496
1497	1497	// Nullable pointers are the same size as normal pointers, because pointer
1498	1498	// value 0 is used as the null value.
...	...	@@ -1505,7 +1505,7 @@ test "pointer casting" {
1505	1505	// conversions are not possible.
1506	1506	const bytes align(@alignOf(u32)) = []u8{0x12, 0x12, 0x12, 0x12};
1507	1507	const u32_ptr = @ptrCast(&const u32, &bytes[0]);
1508		assert(*u32_ptr == 0x12121212);
	1508	assert(u32_ptr.* == 0x12121212);
1509	1509
1510	1510	// Even this example is contrived - there are better ways to do the above than
1511	1511	// pointer casting. For example, using a slice narrowing cast:
...	...	@@ -1610,7 +1610,7 @@ fn foo(bytes: []u8) u32 {
1610	1610	<code>u8</code> can alias any memory.
1611	1611	</p>
1612	1612	<p>As an example, this code produces undefined behavior:</p>
1613		<pre><code class="zig">*@ptrCast(&u32, f32(12.34))</code></pre>
	1613	<pre><code class="zig">@ptrCast(&u32, f32(12.34)).*</code></pre>
1614	1614	<p>Instead, use {#link\|@bitCast#}:
1615	1615	<pre><code class="zig">@bitCast(u32, f32(12.34))</code></pre>
1616	1616	<p>As an added benefit, the <code>@bitcast</code> version works at compile-time.</p>
...	...	@@ -2040,7 +2040,7 @@ const Variant = union(enum) {
2040	2040	Bool: bool,
2041	2041
2042	2042	fn truthy(self: &const Variant) bool {
2043		return switch (*self) {
	2043	return switch (self.*) {
2044	2044	Variant.Int => \|x_int\| x_int != 0,
2045	2045	Variant.Bool => \|x_bool\| x_bool,
2046	2046	};
...	...	@@ -2151,7 +2151,7 @@ test "switch enum" {
2151	2151
2152	2152	// A reference to the matched value can be obtained using `*` syntax.
2153	2153	Item.C => \|*item\| blk: {
2154		(*item).x += 1;
	2154	item.*.x += 1;
2155	2155	break :blk 6;
2156	2156	},
2157	2157
...	...	@@ -2374,7 +2374,7 @@ test "for reference" {
2374	2374	// Iterate over the slice by reference by
2375	2375	// specifying that the capture value is a pointer.
2376	2376	for (items) \|*value\| {
2377		*value += 1;
	2377	value.* += 1;
2378	2378	}
2379	2379
2380	2380	assert(items[0] == 4);
...	...	@@ -2483,7 +2483,7 @@ test "if nullable" {
2483	2483	// Access the value by reference using a pointer capture.
2484	2484	var c: ?u32 = 3;
2485	2485	if (c) \|*value\| {
2486		*value = 2;
	2486	value.* = 2;
2487	2487	}
2488	2488
2489	2489	if (c) \|value\| {
...	...	@@ -2524,7 +2524,7 @@ test "if error union" {
2524	2524	// Access the value by reference using a pointer capture.
2525	2525	var c: error!u32 = 3;
2526	2526	if (c) \|*value\| {
2527		*value = 9;
	2527	value.* = 9;
2528	2528	} else \|err\| {
2529	2529	unreachable;
2530	2530	}
...	...	@@ -2827,7 +2827,7 @@ test "fn reflection" {
2827	2827	</p>
2828	2828	<p>
2829	2829	The number of unique error values across the entire compilation should determine the size of the error set type.
2830		However right now it is hard coded to be a <code>u16</code>. See <a href="https://github.com/zig-lang/zig/issues/786">#768</a>.
	2830	However right now it is hard coded to be a <code>u16</code>. See <a href="https://github.com/ziglang/zig/issues/786">#768</a>.
2831	2831	</p>
2832	2832	<p>
2833	2833	You can implicitly cast an error from a subset to its superset:
...	...	@@ -3111,7 +3111,48 @@ test "error union" {
3111	3111	{#code_end#}
3112	3112	<p>TODO the <code>\|\|</code> operator for error sets</p>
3113	3113	{#header_open\|Inferred Error Sets#}
3114		<p>TODO</p>
	3114	<p>
	3115	Because many functions in Zig return a possible error, Zig supports inferring the error set.
	3116	To infer the error set for a function, use this syntax:
	3117	</p>
	3118	{#code_begin\|test#}
	3119	// With an inferred error set
	3120	pub fn add_inferred(comptime T: type, a: T, b: T) !T {
	3121	var answer: T = undefined;
	3122	return if (@addWithOverflow(T, a, b, &answer)) error.Overflow else answer;
	3123	}
	3124
	3125	// With an explicit error set
	3126	pub fn add_explicit(comptime T: type, a: T, b: T) Error!T {
	3127	var answer: T = undefined;
	3128	return if (@addWithOverflow(T, a, b, &answer)) error.Overflow else answer;
	3129	}
	3130
	3131	const Error = error {
	3132	Overflow,
	3133	};
	3134
	3135	const std = @import("std");
	3136
	3137	test "inferred error set" {
	3138	if (add_inferred(u8, 255, 1)) \|_\| unreachable else \|err\| switch (err) {
	3139	error.Overflow => {}, // ok
	3140	}
	3141	}
	3142	{#code_end#}
	3143	<p>
	3144	When a function has an inferred error set, that function becomes generic and thus it becomes
	3145	trickier to do certain things with it, such as obtain a function pointer, or have an error
	3146	set that is consistent across different build targets. Additionally, inferred error sets
	3147	are incompatible with recursion.
	3148	</p>
	3149	<p>
	3150	In these situations, it is recommended to use an explicit error set. You can generally start
	3151	with an empty error set and let compile errors guide you toward completing the set.
	3152	</p>
	3153	<p>
	3154	These limitations may be overcome in a future version of Zig.
	3155	</p>
3115	3156	{#header_close#}
3116	3157	{#header_close#}
3117	3158	{#header_open\|Error Return Traces#}
...	...	@@ -3872,13 +3913,22 @@ pub fn main() void {
3872	3913	{#header_open\|@addWithOverflow#}
3873	3914	<pre><code class="zig">@addWithOverflow(comptime T: type, a: T, b: T, result: &T) -> bool</code></pre>
3874	3915	<p>
3875		Performs <code>*result = a + b</code>. If overflow or underflow occurs,
	3916	Performs <code>result.* = a + b</code>. If overflow or underflow occurs,
3876	3917	stores the overflowed bits in <code>result</code> and returns <code>true</code>.
3877	3918	If no overflow or underflow occurs, returns <code>false</code>.
3878	3919	</p>
3879	3920	{#header_close#}
3880	3921	{#header_open\|@ArgType#}
3881		<p>TODO</p>
	3922	<pre><code class="zig">@ArgType(comptime T: type, comptime n: usize) -> type</code></pre>
	3923	<p>
	3924	This builtin function takes a function type and returns the type of the parameter at index <code>n</code>.
	3925	</p>
	3926	<p>
	3927	<code>T</code> must be a function type.
	3928	</p>
	3929	<p>
	3930	Note: This function is deprecated. Use {#link\|@typeInfo#} instead.
	3931	</p>
3882	3932	{#header_close#}
3883	3933	{#header_open\|@atomicLoad#}
3884	3934	<pre><code class="zig">@atomicLoad(comptime T: type, ptr: &const T, comptime ordering: builtin.AtomicOrder) -> T</code></pre>
...	...	@@ -4073,9 +4123,9 @@ comptime {
4073	4123	</p>
4074	4124	{#code_begin\|syntax#}
4075	4125	fn cmpxchgStrongButNotAtomic(comptime T: type, ptr: &T, expected_value: T, new_value: T) ?T {
4076		const old_value = *ptr;
	4126	const old_value = ptr.*;
4077	4127	if (old_value == expected_value) {
4078		*ptr = new_value;
	4128	ptr.* = new_value;
4079	4129	return null;
4080	4130	} else {
4081	4131	return old_value;
...	...	@@ -4100,9 +4150,9 @@ fn cmpxchgStrongButNotAtomic(comptime T: type, ptr: &T, expected_value: T, new_v
4100	4150	</p>
4101	4151	{#code_begin\|syntax#}
4102	4152	fn cmpxchgWeakButNotAtomic(comptime T: type, ptr: &T, expected_value: T, new_value: T) ?T {
4103		const old_value = *ptr;
	4153	const old_value = ptr.*;
4104	4154	if (old_value == expected_value and usuallyTrueButSometimesFalse()) {
4105		*ptr = new_value;
	4155	ptr.* = new_value;
4106	4156	return null;
4107	4157	} else {
4108	4158	return old_value;
...	...	@@ -4447,7 +4497,7 @@ mem.copy(u8, dest[0...byte_count], source[0...byte_count]);</code></pre>
4447	4497	This function is a low level intrinsic with no safety mechanisms. Most
4448	4498	code should not use this function, instead using something like this:
4449	4499	</p>
4450		<pre><code class="zig">for (dest[0...byte_count]) \|b\| b = c;</code></pre>
	4500	<pre><code class="zig">for (dest[0...byte_count]) \|b\| b. = c;</code></pre>
4451	4501	<p>
4452	4502	The optimizer is intelligent enough to turn the above snippet into a memset.
4453	4503	</p>
...	...	@@ -4480,22 +4530,63 @@ mem.set(u8, dest, c);</code></pre>
4480	4530	{#header_open\|@mulWithOverflow#}
4481	4531	<pre><code class="zig">@mulWithOverflow(comptime T: type, a: T, b: T, result: &T) -> bool</code></pre>
4482	4532	<p>
4483		Performs <code>result = a b</code>. If overflow or underflow occurs,
	4533	Performs <code>result.* = a * b</code>. If overflow or underflow occurs,
4484	4534	stores the overflowed bits in <code>result</code> and returns <code>true</code>.
4485	4535	If no overflow or underflow occurs, returns <code>false</code>.
4486	4536	</p>
4487	4537	{#header_close#}
	4538	{#header_open\|@newStackCall#}
	4539	<pre><code class="zig">@newStackCall(new_stack: []u8, function: var, args: ...) -> var</code></pre>
	4540	<p>
	4541	This calls a function, in the same way that invoking an expression with parentheses does. However,
	4542	instead of using the same stack as the caller, the function uses the stack provided in the <code>new_stack</code>
	4543	parameter.
	4544	</p>
	4545	{#code_begin\|test#}
	4546	const std = @import("std");
	4547	const assert = std.debug.assert;
	4548
	4549	var new_stack_bytes: [1024]u8 = undefined;
	4550
	4551	test "calling a function with a new stack" {
	4552	const arg = 1234;
	4553
	4554	const a = @newStackCall(new_stack_bytes[0..512], targetFunction, arg);
	4555	const b = @newStackCall(new_stack_bytes[512..], targetFunction, arg);
	4556	_ = targetFunction(arg);
	4557
	4558	assert(arg == 1234);
	4559	assert(a < b);
	4560	}
	4561
	4562	fn targetFunction(x: i32) usize {
	4563	assert(x == 1234);
	4564
	4565	var local_variable: i32 = 42;
	4566	const ptr = &local_variable;
	4567	ptr.* += 1;
	4568
	4569	assert(local_variable == 43);
	4570	return @ptrToInt(ptr);
	4571	}
	4572	{#code_end#}
	4573	{#header_close#}
4488	4574	{#header_open\|@noInlineCall#}
4489	4575	<pre><code class="zig">@noInlineCall(function: var, args: ...) -> var</code></pre>
4490	4576	<p>
4491	4577	This calls a function, in the same way that invoking an expression with parentheses does:
4492	4578	</p>
4493		<pre><code class="zig">const assert = @import("std").debug.assert;
	4579	{#code_begin\|test#}
	4580	const assert = @import("std").debug.assert;
	4581
4494	4582	test "noinline function call" {
4495	4583	assert(@noInlineCall(add, 3, 9) == 12);
4496	4584	}
4497	4585
4498		fn add(a: i32, b: i32) -> i32 { a + b }</code></pre>
	4586	fn add(a: i32, b: i32) i32 {
	4587	return a + b;
	4588	}
	4589	{#code_end#}
4499	4590	<p>
4500	4591	Unlike a normal function call, however, <code>@noInlineCall</code> guarantees that the call
4501	4592	will not be inlined. If the call must be inlined, a compile error is emitted.
...	...	@@ -4705,7 +4796,7 @@ pub const FloatMode = enum {
4705	4796	{#header_open\|@shlWithOverflow#}
4706	4797	<pre><code class="zig">@shlWithOverflow(comptime T: type, a: T, shift_amt: Log2T, result: &T) -> bool</code></pre>
4707	4798	<p>
4708		Performs <code>*result = a << b</code>. If overflow or underflow occurs,
	4799	Performs <code>result.* = a << b</code>. If overflow or underflow occurs,
4709	4800	stores the overflowed bits in <code>result</code> and returns <code>true</code>.
4710	4801	If no overflow or underflow occurs, returns <code>false</code>.
4711	4802	</p>
...	...	@@ -4749,7 +4840,7 @@ pub const FloatMode = enum {
4749	4840	{#header_open\|@subWithOverflow#}
4750	4841	<pre><code class="zig">@subWithOverflow(comptime T: type, a: T, b: T, result: &T) -> bool</code></pre>
4751	4842	<p>
4752		Performs <code>*result = a - b</code>. If overflow or underflow occurs,
	4843	Performs <code>result.* = a - b</code>. If overflow or underflow occurs,
4753	4844	stores the overflowed bits in <code>result</code> and returns <code>true</code>.
4754	4845	If no overflow or underflow occurs, returns <code>false</code>.
4755	4846	</p>
...	...	@@ -5867,7 +5958,7 @@ pub fn main() void {
5867	5958	{#code_begin\|exe#}
5868	5959	{#link_libc#}
5869	5960	const c = @cImport({
5870		// See https://github.com/zig-lang/zig/issues/515
	5961	// See https://github.com/ziglang/zig/issues/515
5871	5962	@cDefine("_NO_CRT_STDIO_INLINE", "1");
5872	5963	@cInclude("stdio.h");
5873	5964	});
...	...	@@ -6210,7 +6301,7 @@ fn readU32Be() u32 {}
6210	6301	<li>Non-Ascii Unicode line endings: U+0085 (NEL), U+2028 (LS), U+2029 (PS).</li>
6211	6302	</ul>
6212	6303	<p>The codepoint U+000a (LF) (which is encoded as the single-byte value 0x0a) is the line terminator character. This character always terminates a line of zig source code (except possbly the last line of the file).</p>
6213		<p>For some discussion on the rationale behind these design decisions, see <a href="https://github.com/zig-lang/zig/issues/663">issue #663</a></p>
	6304	<p>For some discussion on the rationale behind these design decisions, see <a href="https://github.com/ziglang/zig/issues/663">issue #663</a></p>
6214	6305	{#header_close#}
6215	6306	{#header_open\|Grammar#}
6216	6307	<pre><code class="nohighlight">Root = many(TopLevelItem) EOF
...	...	@@ -6341,10 +6432,12 @@ MultiplyOperator = "\|\|" \| "" \| "/" \| "%" \| "" \| "%"
6341	6432
6342	6433	PrefixOpExpression = PrefixOp TypeExpr \| SuffixOpExpression
6343	6434
6344		SuffixOpExpression = ("async" option("<" SuffixOpExpression ">") SuffixOpExpression FnCallExpression) \| PrimaryExpression option(FnCallExpression \| ArrayAccessExpression \| FieldAccessExpression \| SliceExpression)
	6435	SuffixOpExpression = ("async" option("<" SuffixOpExpression ">") SuffixOpExpression FnCallExpression) \| PrimaryExpression option(FnCallExpression \| ArrayAccessExpression \| FieldAccessExpression \| SliceExpression \| PtrDerefExpression)
6345	6436
6346	6437	FieldAccessExpression = "." Symbol
6347	6438
	6439	PtrDerefExpression = ".*"
	6440
6348	6441	FnCallExpression = "(" list(Expression, ",") ")"
6349	6442
6350	6443	ArrayAccessExpression = "[" Expression "]"
...	...	@@ -6357,7 +6450,7 @@ ContainerInitBody = list(StructLiteralField, ",") \| list(Expression, ",")
6357	6450
6358	6451	StructLiteralField = "." Symbol "=" Expression
6359	6452
6360		PrefixOp = "!" \| "-" \| "~" \| "*" \| ("&" option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) \| "?" \| "??" \| "-%" \| "try" \| "await"
	6453	PrefixOp = "!" \| "-" \| "~" \| ("*" option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) \| "?" \| "??" \| "-%" \| "try" \| "await"
6361	6454
6362	6455	PrimaryExpression = Integer \| Float \| String \| CharLiteral \| KeywordLiteral \| GroupedExpression \| BlockExpression(BlockOrExpression) \| Symbol \| ("@" Symbol FnCallExpression) \| ArrayType \| FnProto \| AsmExpression \| ContainerDecl \| ("continue" option(":" Symbol)) \| ErrorSetDecl \| PromiseType
6363	6456
...	...	@@ -6451,7 +6544,7 @@ hljs.registerLanguage("zig", function(t) {
6451	6544	a = t.IR + "\\s*\\(",
6452	6545	c = {
6453	6546	keyword: "const align var extern stdcallcc nakedcc volatile export pub noalias inline struct packed enum union break return try catch test continue unreachable comptime and or asm defer errdefer if else switch while for fn use bool f32 f64 void type noreturn error i8 u8 i16 u16 i32 u32 i64 u64 isize usize i8w u8w i16w i32w u32w i64w u64w isizew usizew c_short c_ushort c_int c_uint c_long c_ulong c_longlong c_ulonglong",
6454		built_in: "atomicLoad breakpoint returnAddress frameAddress fieldParentPtr setFloatMode IntType OpaqueType compileError compileLog setCold setRuntimeSafety setEvalBranchQuota offsetOf memcpy inlineCall setGlobalLinkage setGlobalSection divTrunc divFloor enumTagName intToPtr ptrToInt panic canImplicitCast ptrCast bitCast rem mod memset sizeOf alignOf alignCast maxValue minValue memberCount memberName memberType typeOf addWithOverflow subWithOverflow mulWithOverflow shlWithOverflow shlExact shrExact cInclude cDefine cUndef ctz clz import cImport errorName embedFile cmpxchgStrong cmpxchgWeak fence divExact truncate atomicRmw sqrt field typeInfo",
	6547	built_in: "atomicLoad breakpoint returnAddress frameAddress fieldParentPtr setFloatMode IntType OpaqueType compileError compileLog setCold setRuntimeSafety setEvalBranchQuota offsetOf memcpy inlineCall setGlobalLinkage setGlobalSection divTrunc divFloor enumTagName intToPtr ptrToInt panic canImplicitCast ptrCast bitCast rem mod memset sizeOf alignOf alignCast maxValue minValue memberCount memberName memberType typeOf addWithOverflow subWithOverflow mulWithOverflow shlWithOverflow shlExact shrExact cInclude cDefine cUndef ctz clz import cImport errorName embedFile cmpxchgStrong cmpxchgWeak fence divExact truncate atomicRmw sqrt field typeInfo newStackCall",
6455	6548	literal: "true false null undefined"
6456	6549	},
6457	6550	n = [e, t.CLCM, t.CBCM, s, r];

example/guess_number/main.zig+1-1

...	...	@@ -23,7 +23,7 @@ pub fn main() !void {
23	23
24	24	while (true) {
25	25	try stdout.print("\nGuess a number between 1 and 100: ");
26		var line_buf : [20]u8 = undefined;
	26	var line_buf: [20]u8 = undefined;
27	27
28	28	const line_len = io.readLine(line_buf[0..]) catch \|err\| switch (err) {
29	29	error.InputTooLong => {

example/hello_world/hello_libc.zig+2-3

...	...	@@ -1,5 +1,5 @@
1	1	const c = @cImport({
2		// See https://github.com/zig-lang/zig/issues/515
	2	// See https://github.com/ziglang/zig/issues/515
3	3	@cDefine("_NO_CRT_STDIO_INLINE", "1");
4	4	@cInclude("stdio.h");
5	5	@cInclude("string.h");
...	...	@@ -8,8 +8,7 @@ const c = @cImport({
8	8	const msg = c"Hello, world!\n";
9	9
10	10	export fn main(argc: c_int, argv: &&u8) c_int {
11		if (c.printf(msg) != c_int(c.strlen(msg)))
12		return -1;
	11	if (c.printf(msg) != c_int(c.strlen(msg))) return -1;
13	12
14	13	return 0;
15	14	}

example/mix_o_files/build.zig+1-3

...	...	@@ -4,9 +4,7 @@ pub fn build(b: &Builder) void {
4	4	const obj = b.addObject("base64", "base64.zig");
5	5
6	6	const exe = b.addCExecutable("test");
7		exe.addCompileFlags([][]const u8 {
8		"-std=c99",
9		});
	7	exe.addCompileFlags([][]const u8{"-std=c99"});
10	8	exe.addSourceFile("test.c");
11	9	exe.addObject(obj);
12	10

example/shared_library/build.zig+1-3

...	...	@@ -4,9 +4,7 @@ pub fn build(b: &Builder) void {
4	4	const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0));
5	5
6	6	const exe = b.addCExecutable("test");
7		exe.addCompileFlags([][]const u8 {
8		"-std=c99",
9		});
	7	exe.addCompileFlags([][]const u8{"-std=c99"});
10	8	exe.addSourceFile("test.c");
11	9	exe.linkLibrary(lib);
12	10

src-self-hosted/arg.zig+41-33

...	...	@@ -30,24 +30,22 @@ fn argInAllowedSet(maybe_set: ?[]const []const u8, arg: []const u8) bool {
30	30	}
31	31
32	32	// Modifies the current argument index during iteration
33		fn readFlagArguments(allocator: &Allocator, args: []const []const u8, required: usize,
34		allowed_set: ?[]const []const u8, index: &usize) !FlagArg {
35
	33	fn readFlagArguments(allocator: &Allocator, args: []const []const u8, required: usize, allowed_set: ?[]const []const u8, index: &usize) !FlagArg {
36	34	switch (required) {
37		0 => return FlagArg { .None = undefined }, // TODO: Required to force non-tag but value?
	35	0 => return FlagArg{ .None = undefined }, // TODO: Required to force non-tag but value?
38	36	1 => {
39		if (*index + 1 >= args.len) {
	37	if (index.* + 1 >= args.len) {
40	38	return error.MissingFlagArguments;
41	39	}
42	40
43		*index += 1;
44		const arg = args[*index];
	41	index.* += 1;
	42	const arg = args[index.*];
45	43
46	44	if (!argInAllowedSet(allowed_set, arg)) {
47	45	return error.ArgumentNotInAllowedSet;
48	46	}
49	47
50		return FlagArg { .Single = arg };
	48	return FlagArg{ .Single = arg };
51	49	},
52	50	else => \|needed\| {
53	51	var extra = ArrayList([]const u8).init(allocator);
...	...	@@ -55,12 +53,12 @@ fn readFlagArguments(allocator: &Allocator, args: []const []const u8, required:
55	53
56	54	var j: usize = 0;
57	55	while (j < needed) : (j += 1) {
58		if (*index + 1 >= args.len) {
	56	if (index.* + 1 >= args.len) {
59	57	return error.MissingFlagArguments;
60	58	}
61	59
62		*index += 1;
63		const arg = args[*index];
	60	index.* += 1;
	61	const arg = args[index.*];
64	62
65	63	if (!argInAllowedSet(allowed_set, arg)) {
66	64	return error.ArgumentNotInAllowedSet;
...	...	@@ -69,7 +67,7 @@ fn readFlagArguments(allocator: &Allocator, args: []const []const u8, required:
69	67	try extra.append(arg);
70	68	}
71	69
72		return FlagArg { .Many = extra };
	70	return FlagArg{ .Many = extra };
73	71	},
74	72	}
75	73	}
...	...	@@ -82,7 +80,7 @@ pub const Args = struct {
82	80	positionals: ArrayList([]const u8),
83	81
84	82	pub fn parse(allocator: &Allocator, comptime spec: []const Flag, args: []const []const u8) !Args {
85		var parsed = Args {
	83	var parsed = Args{
86	84	.flags = HashMapFlags.init(allocator),
87	85	.positionals = ArrayList([]const u8).init(allocator),
88	86	};
...	...	@@ -116,11 +114,7 @@ pub const Args = struct {
116	114	};
117	115
118	116	if (flag.mergable) {
119		var prev =
120		if (parsed.flags.get(flag_name_trimmed)) \|entry\|
121		entry.value.Many
122		else
123		ArrayList([]const u8).init(allocator);
	117	var prev = if (parsed.flags.get(flag_name_trimmed)) \|entry\| entry.value.Many else ArrayList([]const u8).init(allocator);
124	118
125	119	// MergeN creation disallows 0 length flag entry (doesn't make sense)
126	120	switch (flag_args) {
...	...	@@ -129,7 +123,7 @@ pub const Args = struct {
129	123	FlagArg.Many => \|inner\| try prev.appendSlice(inner.toSliceConst()),
130	124	}
131	125
132		_ = try parsed.flags.put(flag_name_trimmed, FlagArg { .Many = prev });
	126	_ = try parsed.flags.put(flag_name_trimmed, FlagArg{ .Many = prev });
133	127	} else {
134	128	_ = try parsed.flags.put(flag_name_trimmed, flag_args);
135	129	}
...	...	@@ -163,7 +157,9 @@ pub const Args = struct {
163	157	pub fn single(self: &Args, name: []const u8) ?[]const u8 {
164	158	if (self.flags.get(name)) \|entry\| {
165	159	switch (entry.value) {
166		FlagArg.Single => \|inner\| { return inner; },
	160	FlagArg.Single => \|inner\| {
	161	return inner;
	162	},
167	163	else => @panic("attempted to retrieve flag with wrong type"),
168	164	}
169	165	} else {
...	...	@@ -175,7 +171,9 @@ pub const Args = struct {
175	171	pub fn many(self: &Args, name: []const u8) ?[]const []const u8 {
176	172	if (self.flags.get(name)) \|entry\| {
177	173	switch (entry.value) {
178		FlagArg.Many => \|inner\| { return inner.toSliceConst(); },
	174	FlagArg.Many => \|inner\| {
	175	return inner.toSliceConst();
	176	},
179	177	else => @panic("attempted to retrieve flag with wrong type"),
180	178	}
181	179	} else {
...	...	@@ -207,7 +205,7 @@ pub const Flag = struct {
207	205	}
208	206
209	207	pub fn ArgN(comptime name: []const u8, comptime n: usize) Flag {
210		return Flag {
	208	return Flag{
211	209	.name = name,
212	210	.required = n,
213	211	.mergable = false,
...	...	@@ -220,7 +218,7 @@ pub const Flag = struct {
220	218	@compileError("n must be greater than 0");
221	219	}
222	220
223		return Flag {
	221	return Flag{
224	222	.name = name,
225	223	.required = n,
226	224	.mergable = true,
...	...	@@ -229,7 +227,7 @@ pub const Flag = struct {
229	227	}
230	228
231	229	pub fn Option(comptime name: []const u8, comptime set: []const []const u8) Flag {
232		return Flag {
	230	return Flag{
233	231	.name = name,
234	232	.required = 1,
235	233	.mergable = false,
...	...	@@ -239,26 +237,36 @@ pub const Flag = struct {
239	237	};
240	238
241	239	test "parse arguments" {
242		const spec1 = comptime []const Flag {
	240	const spec1 = comptime []const Flag{
243	241	Flag.Bool("--help"),
244	242	Flag.Bool("--init"),
245	243	Flag.Arg1("--build-file"),
246		Flag.Option("--color", []const []const u8 { "on", "off", "auto" }),
	244	Flag.Option("--color", []const []const u8{
	245	"on",
	246	"off",
	247	"auto",
	248	}),
247	249	Flag.ArgN("--pkg-begin", 2),
248	250	Flag.ArgMergeN("--object", 1),
249	251	Flag.ArgN("--library", 1),
250	252	};
251	253
252		const cliargs = []const []const u8 {
	254	const cliargs = []const []const u8{
253	255	"build",
254	256	"--help",
255	257	"pos1",
256		"--build-file", "build.zig",
257		"--object", "obj1",
258		"--object", "obj2",
259		"--library", "lib1",
260		"--library", "lib2",
261		"--color", "on",
	258	"--build-file",
	259	"build.zig",
	260	"--object",
	261	"obj1",
	262	"--object",
	263	"obj2",
	264	"--library",
	265	"lib1",
	266	"--library",
	267	"lib2",
	268	"--color",
	269	"on",
262	270	"pos2",
263	271	};
264	272

src-self-hosted/introspect.zig+1-3

...	...	@@ -48,9 +48,7 @@ pub fn resolveZigLibDir(allocator: &mem.Allocator) ![]u8 {
48	48	\\Unable to find zig lib directory: {}.
49	49	\\Reinstall Zig or use --zig-install-prefix.
50	50	\\
51		,
52		@errorName(err)
53		);
	51	, @errorName(err));
54	52
55	53	return error.ZigLibDirNotFound;
56	54	};

src-self-hosted/ir.zig-1

...	...	@@ -108,5 +108,4 @@ pub const Instruction = struct {
108	108	ArgType,
109	109	Export,
110	110	};
111
112	111	};

src-self-hosted/main.zig+102-69

...	...	@@ -37,7 +37,7 @@ const usage =
37	37	\\ zen Print zen of zig and exit
38	38	\\
39	39	\\
40		;
	40	;
41	41
42	42	const Command = struct {
43	43	name: []const u8,
...	...	@@ -63,22 +63,61 @@ pub fn main() !void {
63	63	os.exit(1);
64	64	}
65	65
66		const commands = []Command {
67		Command { .name = "build", .exec = cmdBuild },
68		Command { .name = "build-exe", .exec = cmdBuildExe },
69		Command { .name = "build-lib", .exec = cmdBuildLib },
70		Command { .name = "build-obj", .exec = cmdBuildObj },
71		Command { .name = "fmt", .exec = cmdFmt },
72		Command { .name = "run", .exec = cmdRun },
73		Command { .name = "targets", .exec = cmdTargets },
74		Command { .name = "test", .exec = cmdTest },
75		Command { .name = "translate-c", .exec = cmdTranslateC },
76		Command { .name = "version", .exec = cmdVersion },
77		Command { .name = "zen", .exec = cmdZen },
	66	const commands = []Command{
	67	Command{
	68	.name = "build",
	69	.exec = cmdBuild,
	70	},
	71	Command{
	72	.name = "build-exe",
	73	.exec = cmdBuildExe,
	74	},
	75	Command{
	76	.name = "build-lib",
	77	.exec = cmdBuildLib,
	78	},
	79	Command{
	80	.name = "build-obj",
	81	.exec = cmdBuildObj,
	82	},
	83	Command{
	84	.name = "fmt",
	85	.exec = cmdFmt,
	86	},
	87	Command{
	88	.name = "run",
	89	.exec = cmdRun,
	90	},
	91	Command{
	92	.name = "targets",
	93	.exec = cmdTargets,
	94	},
	95	Command{
	96	.name = "test",
	97	.exec = cmdTest,
	98	},
	99	Command{
	100	.name = "translate-c",
	101	.exec = cmdTranslateC,
	102	},
	103	Command{
	104	.name = "version",
	105	.exec = cmdVersion,
	106	},
	107	Command{
	108	.name = "zen",
	109	.exec = cmdZen,
	110	},
78	111
79	112	// undocumented commands
80		Command { .name = "help", .exec = cmdHelp },
81		Command { .name = "internal", .exec = cmdInternal },
	113	Command{
	114	.name = "help",
	115	.exec = cmdHelp,
	116	},
	117	Command{
	118	.name = "internal",
	119	.exec = cmdInternal,
	120	},
82	121	};
83	122
84	123	for (commands) \|command\| {
...	...	@@ -120,9 +159,9 @@ const usage_build =
120	159	\\ --verbose-cimport Enable compiler debug output for C imports
121	160	\\
122	161	\\
123		;
	162	;
124	163
125		const args_build_spec = []Flag {
	164	const args_build_spec = []Flag{
126	165	Flag.Bool("--help"),
127	166	Flag.Bool("--init"),
128	167	Flag.Arg1("--build-file"),
...	...	@@ -148,7 +187,7 @@ const missing_build_file =
148	187	\\
149	188	\\See: `zig build --help` or `zig help` for more options.
150	189	\\
151		;
	190	;
152	191
153	192	fn cmdBuild(allocator: &Allocator, args: []const []const u8) !void {
154	193	var flags = try Args.parse(allocator, args_build_spec, args);
...	...	@@ -317,15 +356,23 @@ const usage_build_generic =
317	356	\\ --ver-patch [ver] Dynamic library semver patch version
318	357	\\
319	358	\\
320		;
	359	;
321	360
322		const args_build_generic = []Flag {
	361	const args_build_generic = []Flag{
323	362	Flag.Bool("--help"),
324		Flag.Option("--color", []const []const u8 { "auto", "off", "on" }),
	363	Flag.Option("--color", []const []const u8{
	364	"auto",
	365	"off",
	366	"on",
	367	}),
325	368
326	369	Flag.ArgMergeN("--assembly", 1),
327	370	Flag.Arg1("--cache-dir"),
328		Flag.Option("--emit", []const []const u8 { "asm", "bin", "llvm-ir" }),
	371	Flag.Option("--emit", []const []const u8{
	372	"asm",
	373	"bin",
	374	"llvm-ir",
	375	}),
329	376	Flag.Bool("--enable-timing-info"),
330	377	Flag.Arg1("--libc-include-dir"),
331	378	Flag.Arg1("--name"),
...	...	@@ -471,7 +518,7 @@ fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Mo
471	518	os.exit(1);
472	519	};
473	520
474		const asm_a= flags.many("assembly");
	521	const asm_a = flags.many("assembly");
475	522	const obj_a = flags.many("object");
476	523	if (in_file == null and (obj_a == null or (??obj_a).len == 0) and (asm_a == null or (??asm_a).len == 0)) {
477	524	try stderr.write("Expected source file argument or at least one --object or --assembly argument\n");
...	...	@@ -493,17 +540,16 @@ fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Mo
493	540	const zig_lib_dir = introspect.resolveZigLibDir(allocator) catch os.exit(1);
494	541	defer allocator.free(zig_lib_dir);
495	542
496		var module =
497		try Module.create(
498		allocator,
499		root_name,
500		zig_root_source_file,
501		Target.Native,
502		out_type,
503		build_mode,
504		zig_lib_dir,
505		full_cache_dir
506		);
	543	var module = try Module.create(
	544	allocator,
	545	root_name,
	546	zig_root_source_file,
	547	Target.Native,
	548	out_type,
	549	build_mode,
	550	zig_lib_dir,
	551	full_cache_dir,
	552	);
507	553	defer module.destroy();
508	554
509	555	module.version_major = try std.fmt.parseUnsigned(u32, flags.single("ver-major") ?? "0", 10);
...	...	@@ -588,10 +634,10 @@ fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Mo
588	634	}
589	635
590	636	if (flags.single("mmacosx-version-min")) \|ver\| {
591		module.darwin_version_min = Module.DarwinVersionMin { .MacOS = ver };
	637	module.darwin_version_min = Module.DarwinVersionMin{ .MacOS = ver };
592	638	}
593	639	if (flags.single("mios-version-min")) \|ver\| {
594		module.darwin_version_min = Module.DarwinVersionMin { .Ios = ver };
	640	module.darwin_version_min = Module.DarwinVersionMin{ .Ios = ver };
595	641	}
596	642
597	643	module.emit_file_type = emit_type;
...	...	@@ -637,15 +683,11 @@ const usage_fmt =
637	683	\\
638	684	\\Options:
639	685	\\ --help Print this help and exit
640		\\ --keep-backups Retain backup entries for every file
641	686	\\
642	687	\\
643		;
	688	;
644	689
645		const args_fmt_spec = []Flag {
646		Flag.Bool("--help"),
647		Flag.Bool("--keep-backups"),
648		};
	690	const args_fmt_spec = []Flag{Flag.Bool("--help")};
649	691
650	692	fn cmdFmt(allocator: &Allocator, args: []const []const u8) !void {
651	693	var flags = try Args.parse(allocator, args_fmt_spec, args);
...	...	@@ -677,7 +719,6 @@ fn cmdFmt(allocator: &Allocator, args: []const []const u8) !void {
677	719	};
678	720	defer tree.deinit();
679	721
680
681	722	var error_it = tree.errors.iterator(0);
682	723	while (error_it.next()) \|parse_error\| {
683	724	const token = tree.tokens.at(parse_error.loc());
...	...	@@ -723,8 +764,7 @@ fn cmdTargets(allocator: &Allocator, args: []const []const u8) !void {
723	764	inline while (i < @memberCount(builtin.Arch)) : (i += 1) {
724	765	comptime const arch_tag = @memberName(builtin.Arch, i);
725	766	// NOTE: Cannot use empty string, see #918.
726		comptime const native_str =
727		if (comptime mem.eql(u8, arch_tag, @tagName(builtin.arch))) " (native)\n" else "\n";
	767	comptime const native_str = if (comptime mem.eql(u8, arch_tag, @tagName(builtin.arch))) " (native)\n" else "\n";
728	768
729	769	try stdout.print(" {}{}", arch_tag, native_str);
730	770	}
...	...	@@ -737,8 +777,7 @@ fn cmdTargets(allocator: &Allocator, args: []const []const u8) !void {
737	777	inline while (i < @memberCount(builtin.Os)) : (i += 1) {
738	778	comptime const os_tag = @memberName(builtin.Os, i);
739	779	// NOTE: Cannot use empty string, see #918.
740		comptime const native_str =
741		if (comptime mem.eql(u8, os_tag, @tagName(builtin.os))) " (native)\n" else "\n";
	780	comptime const native_str = if (comptime mem.eql(u8, os_tag, @tagName(builtin.os))) " (native)\n" else "\n";
742	781
743	782	try stdout.print(" {}{}", os_tag, native_str);
744	783	}
...	...	@@ -751,8 +790,7 @@ fn cmdTargets(allocator: &Allocator, args: []const []const u8) !void {
751	790	inline while (i < @memberCount(builtin.Environ)) : (i += 1) {
752	791	comptime const environ_tag = @memberName(builtin.Environ, i);
753	792	// NOTE: Cannot use empty string, see #918.
754		comptime const native_str =
755		if (comptime mem.eql(u8, environ_tag, @tagName(builtin.environ))) " (native)\n" else "\n";
	793	comptime const native_str = if (comptime mem.eql(u8, environ_tag, @tagName(builtin.environ))) " (native)\n" else "\n";
756	794
757	795	try stdout.print(" {}{}", environ_tag, native_str);
758	796	}
...	...	@@ -774,12 +812,9 @@ const usage_test =
774	812	\\ --help Print this help and exit
775	813	\\
776	814	\\
777		;
778
779		const args_test_spec = []Flag {
780		Flag.Bool("--help"),
781		};
	815	;
782	816
	817	const args_test_spec = []Flag{Flag.Bool("--help")};
783	818
784	819	fn cmdTest(allocator: &Allocator, args: []const []const u8) !void {
785	820	var flags = try Args.parse(allocator, args_build_spec, args);
...	...	@@ -812,21 +847,18 @@ const usage_run =
812	847	\\ --help Print this help and exit
813	848	\\
814	849	\\
815		;
816
817		const args_run_spec = []Flag {
818		Flag.Bool("--help"),
819		};
	850	;
820	851
	852	const args_run_spec = []Flag{Flag.Bool("--help")};
821	853
822	854	fn cmdRun(allocator: &Allocator, args: []const []const u8) !void {
823	855	var compile_args = args;
824		var runtime_args: []const []const u8 = []const []const u8 {};
	856	var runtime_args: []const []const u8 = []const []const u8{};
825	857
826	858	for (args) \|argv, i\| {
827	859	if (mem.eql(u8, argv, "--")) {
828	860	compile_args = args[0..i];
829		runtime_args = args[i+1..];
	861	runtime_args = args[i + 1..];
830	862	break;
831	863	}
832	864	}
...	...	@@ -860,9 +892,9 @@ const usage_translate_c =
860	892	\\ --output [path] Output file to write generated zig file (default: stdout)
861	893	\\
862	894	\\
863		;
	895	;
864	896
865		const args_translate_c_spec = []Flag {
	897	const args_translate_c_spec = []Flag{
866	898	Flag.Bool("--help"),
867	899	Flag.Bool("--enable-timing-info"),
868	900	Flag.Arg1("--libc-include-dir"),
...	...	@@ -936,7 +968,7 @@ const info_zen =
936	968	\\ * Together we serve end users.
937	969	\\
938	970	\\
939		;
	971	;
940	972
941	973	fn cmdZen(allocator: &Allocator, args: []const []const u8) !void {
942	974	try stdout.write(info_zen);
...	...	@@ -951,7 +983,7 @@ const usage_internal =
951	983	\\ build-info Print static compiler build-info
952	984	\\
953	985	\\
954		;
	986	;
955	987
956	988	fn cmdInternal(allocator: &Allocator, args: []const []const u8) !void {
957	989	if (args.len == 0) {
...	...	@@ -959,9 +991,10 @@ fn cmdInternal(allocator: &Allocator, args: []const []const u8) !void {
959	991	os.exit(1);
960	992	}
961	993
962		const sub_commands = []Command {
963		Command { .name = "build-info", .exec = cmdInternalBuildInfo },
964		};
	994	const sub_commands = []Command{Command{
	995	.name = "build-info",
	996	.exec = cmdInternalBuildInfo,
	997	}};
965	998
966	999	for (sub_commands) \|sub_command\| {
967	1000	if (mem.eql(u8, sub_command.name, args[0])) {
...	...	@@ -985,7 +1018,7 @@ fn cmdInternalBuildInfo(allocator: &Allocator, args: []const []const u8) !void {
985	1018	\\ZIG_C_HEADER_FILES {}
986	1019	\\ZIG_DIA_GUIDS_LIB {}
987	1020	\\
988		,
	1021	,
989	1022	std.cstr.toSliceConst(c.ZIG_CMAKE_BINARY_DIR),
990	1023	std.cstr.toSliceConst(c.ZIG_CXX_COMPILER),
991	1024	std.cstr.toSliceConst(c.ZIG_LLVM_CONFIG_EXE),

src-self-hosted/module.zig+9-9

...	...	@@ -96,6 +96,7 @@ pub const Module = struct {
96	96	pub const LinkLib = struct {
97	97	name: []const u8,
98	98	path: ?[]const u8,
	99
99	100	/// the list of symbols we depend on from this lib
100	101	symbols: ArrayList([]u8),
101	102	provided_explicitly: bool,
...	...	@@ -130,9 +131,7 @@ pub const Module = struct {
130	131	}
131	132	};
132	133
133		pub fn create(allocator: &mem.Allocator, name: []const u8, root_src_path: ?[]const u8, target: &const Target,
134		kind: Kind, build_mode: builtin.Mode, zig_lib_dir: []const u8, cache_dir: []const u8) !&Module
135		{
	134	pub fn create(allocator: &mem.Allocator, name: []const u8, root_src_path: ?[]const u8, target: &const Target, kind: Kind, build_mode: builtin.Mode, zig_lib_dir: []const u8, cache_dir: []const u8) !&Module {
136	135	var name_buffer = try Buffer.init(allocator, name);
137	136	errdefer name_buffer.deinit();
138	137
...	...	@@ -148,14 +147,14 @@ pub const Module = struct {
148	147	const module_ptr = try allocator.create(Module);
149	148	errdefer allocator.destroy(module_ptr);
150	149
151		*module_ptr = Module {
	150	module_ptr.* = Module{
152	151	.allocator = allocator,
153	152	.name = name_buffer,
154	153	.root_src_path = root_src_path,
155	154	.module = module,
156	155	.context = context,
157	156	.builder = builder,
158		.target = *target,
	157	.target = target.*,
159	158	.kind = kind,
160	159	.build_mode = build_mode,
161	160	.zig_lib_dir = zig_lib_dir,
...	...	@@ -221,8 +220,10 @@ pub const Module = struct {
221	220
222	221	pub fn build(self: &Module) !void {
223	222	if (self.llvm_argv.len != 0) {
224		var c_compatible_args = try std.cstr.NullTerminated2DArray.fromSlices(self.allocator,
225		[][]const []const u8 { [][]const u8{"zig (LLVM option parsing)"}, self.llvm_argv, });
	223	var c_compatible_args = try std.cstr.NullTerminated2DArray.fromSlices(self.allocator, [][]const []const u8{
	224	[][]const u8{"zig (LLVM option parsing)"},
	225	self.llvm_argv,
	226	});
226	227	defer c_compatible_args.deinit();
227	228	c.ZigLLVMParseCommandLineOptions(self.llvm_argv.len + 1, c_compatible_args.ptr);
228	229	}
...	...	@@ -261,7 +262,6 @@ pub const Module = struct {
261	262
262	263	warn("====llvm ir:====\n");
263	264	self.dump();
264
265	265	}
266	266
267	267	pub fn link(self: &Module, out_file: ?[]const u8) !void {
...	...	@@ -285,7 +285,7 @@ pub const Module = struct {
285	285	}
286	286
287	287	const link_lib = try self.allocator.create(LinkLib);
288		*link_lib = LinkLib {
	288	link_lib.* = LinkLib{
289	289	.name = name,
290	290	.path = null,
291	291	.provided_explicitly = provided_explicitly,

src-self-hosted/target.zig+2-2

...	...	@@ -12,7 +12,7 @@ pub const Target = union(enum) {
12	12	Cross: CrossTarget,
13	13
14	14	pub fn oFileExt(self: &const Target) []const u8 {
15		const environ = switch (*self) {
	15	const environ = switch (self.*) {
16	16	Target.Native => builtin.environ,
17	17	Target.Cross => \|t\| t.environ,
18	18	};
...	...	@@ -30,7 +30,7 @@ pub const Target = union(enum) {
30	30	}
31	31
32	32	pub fn getOs(self: &const Target) builtin.Os {
33		return switch (*self) {
	33	return switch (self.*) {
34	34	Target.Native => builtin.os,
35	35	Target.Cross => \|t\| t.os,
36	36	};

src/all_types.hpp+13-1

...	...	@@ -379,6 +379,7 @@ enum NodeType {
379	379	NodeTypeArrayAccessExpr,
380	380	NodeTypeSliceExpr,
381	381	NodeTypeFieldAccessExpr,
	382	NodeTypePtrDeref,
382	383	NodeTypeUse,
383	384	NodeTypeBoolLiteral,
384	385	NodeTypeNullLiteral,
...	...	@@ -603,13 +604,16 @@ struct AstNodeFieldAccessExpr {
603	604	Buf *field_name;
604	605	};
605	606
	607	struct AstNodePtrDerefExpr {
	608	AstNode *target;
	609	};
	610
606	611	enum PrefixOp {
607	612	PrefixOpInvalid,
608	613	PrefixOpBoolNot,
609	614	PrefixOpBinNot,
610	615	PrefixOpNegation,
611	616	PrefixOpNegationWrap,
612		PrefixOpDereference,
613	617	PrefixOpMaybe,
614	618	PrefixOpUnwrapMaybe,
615	619	};
...	...	@@ -911,6 +915,7 @@ struct AstNode {
911	915	AstNodeCompTime comptime_expr;
912	916	AstNodeAsmExpr asm_expr;
913	917	AstNodeFieldAccessExpr field_access_expr;
	918	AstNodePtrDerefExpr ptr_deref_expr;
914	919	AstNodeContainerDecl container_decl;
915	920	AstNodeStructField struct_field;
916	921	AstNodeStringLiteral string_literal;
...	...	@@ -1340,6 +1345,7 @@ enum BuiltinFnId {
1340	1345	BuiltinFnIdOffsetOf,
1341	1346	BuiltinFnIdInlineCall,
1342	1347	BuiltinFnIdNoInlineCall,
	1348	BuiltinFnIdNewStackCall,
1343	1349	BuiltinFnIdTypeId,
1344	1350	BuiltinFnIdShlExact,
1345	1351	BuiltinFnIdShrExact,
...	...	@@ -1656,8 +1662,13 @@ struct CodeGen {
1656	1662	LLVMValueRef coro_alloc_helper_fn_val;
1657	1663	LLVMValueRef merge_err_ret_traces_fn_val;
1658	1664	LLVMValueRef add_error_return_trace_addr_fn_val;
	1665	LLVMValueRef stacksave_fn_val;
	1666	LLVMValueRef stackrestore_fn_val;
	1667	LLVMValueRef write_register_fn_val;
1659	1668	bool error_during_imports;
1660	1669
	1670	LLVMValueRef sp_md_node;
	1671
1661	1672	const char **clang_argv;
1662	1673	size_t clang_argv_len;
1663	1674	ZigList<const char *> lib_dirs;
...	...	@@ -2280,6 +2291,7 @@ struct IrInstructionCall {
2280	2291	bool is_async;
2281	2292
2282	2293	IrInstruction *async_allocator;
	2294	IrInstruction *new_stack;
2283	2295	};
2284	2296
2285	2297	struct IrInstructionConst {

src/analyze.cpp+7-5

...	...	@@ -25,6 +25,7 @@ static void resolve_struct_type(CodeGen g, TypeTableEntry struct_type);
25	25	static void resolve_struct_zero_bits(CodeGen g, TypeTableEntry struct_type);
26	26	static void resolve_enum_zero_bits(CodeGen g, TypeTableEntry enum_type);
27	27	static void resolve_union_zero_bits(CodeGen g, TypeTableEntry union_type);
	28	static void analyze_fn_body(CodeGen g, FnTableEntry fn_table_entry);
28	29
29	30	ErrorMsg add_node_error(CodeGen g, AstNode node, Buf msg) {
30	31	if (node->owner->c_import_node != nullptr) {
...	...	@@ -1007,7 +1008,7 @@ TypeTableEntry get_fn_type(CodeGen g, FnTypeId *fn_type_id) {
1007	1008	if (fn_type_id->return_type != nullptr) {
1008	1009	ensure_complete_type(g, fn_type_id->return_type);
1009	1010	} else {
1010		zig_panic("TODO implement inferred return types https://github.com/zig-lang/zig/issues/447");
	1011	zig_panic("TODO implement inferred return types https://github.com/ziglang/zig/issues/447");
1011	1012	}
1012	1013
1013	1014	TypeTableEntry *fn_type = new_type_table_entry(TypeTableEntryIdFn);
...	...	@@ -1556,7 +1557,7 @@ static TypeTableEntry analyze_fn_type(CodeGen g, AstNode proto_node, Scope c
1556	1557	return g->builtin_types.entry_invalid;
1557	1558	}
1558	1559	add_node_error(g, proto_node,
1559		buf_sprintf("TODO implement inferred return types https://github.com/zig-lang/zig/issues/447"));
	1560	buf_sprintf("TODO implement inferred return types https://github.com/ziglang/zig/issues/447"));
1560	1561	return g->builtin_types.entry_invalid;
1561	1562	//return get_generic_fn_type(g, &fn_type_id);
1562	1563	}
...	...	@@ -3281,6 +3282,7 @@ void scan_decls(CodeGen g, ScopeDecls decls_scope, AstNode *node) {
3281	3282	case NodeTypeUnreachable:
3282	3283	case NodeTypeAsmExpr:
3283	3284	case NodeTypeFieldAccessExpr:
	3285	case NodeTypePtrDeref:
3284	3286	case NodeTypeStructField:
3285	3287	case NodeTypeContainerInitExpr:
3286	3288	case NodeTypeStructValueField:
...	...	@@ -3879,7 +3881,7 @@ static void define_local_param_variables(CodeGen g, FnTableEntry fn_table_entr
3879	3881	}
3880	3882	}
3881	3883
3882		static bool analyze_resolve_inferred_error_set(CodeGen g, TypeTableEntry err_set_type, AstNode *source_node) {
	3884	bool resolve_inferred_error_set(CodeGen g, TypeTableEntry err_set_type, AstNode *source_node) {
3883	3885	FnTableEntry *infer_fn = err_set_type->data.error_set.infer_fn;
3884	3886	if (infer_fn != nullptr) {
3885	3887	if (infer_fn->anal_state == FnAnalStateInvalid) {
...	...	@@ -3931,7 +3933,7 @@ void analyze_fn_ir(CodeGen g, FnTableEntry fn_table_entry, AstNode *return_typ
3931	3933	}
3932	3934
3933	3935	if (inferred_err_set_type->data.error_set.infer_fn != nullptr) {
3934		if (!analyze_resolve_inferred_error_set(g, inferred_err_set_type, return_type_node)) {
	3936	if (!resolve_inferred_error_set(g, inferred_err_set_type, return_type_node)) {
3935	3937	fn_table_entry->anal_state = FnAnalStateInvalid;
3936	3938	return;
3937	3939	}
...	...	@@ -3961,7 +3963,7 @@ void analyze_fn_ir(CodeGen g, FnTableEntry fn_table_entry, AstNode *return_typ
3961	3963	fn_table_entry->anal_state = FnAnalStateComplete;
3962	3964	}
3963	3965
3964		void analyze_fn_body(CodeGen g, FnTableEntry fn_table_entry) {
	3966	static void analyze_fn_body(CodeGen g, FnTableEntry fn_table_entry) {
3965	3967	assert(fn_table_entry->anal_state != FnAnalStateProbing);
3966	3968	if (fn_table_entry->anal_state != FnAnalStateReady)
3967	3969	return;

src/analyze.hpp+1-1

...	...	@@ -191,7 +191,7 @@ void add_fn_export(CodeGen g, FnTableEntry fn_table_entry, Buf *symbol_name, G
191	191
192	192	ConstExprValue get_builtin_value(CodeGen codegen, const char *name);
193	193	TypeTableEntry get_ptr_to_stack_trace_type(CodeGen g);
194		void analyze_fn_body(CodeGen g, FnTableEntry fn_table_entry);
	194	bool resolve_inferred_error_set(CodeGen g, TypeTableEntry err_set_type, AstNode *source_node);
195	195
196	196	TypeTableEntry get_auto_err_set_type(CodeGen g, FnTableEntry *fn_entry);
197	197

src/ast_render.cpp+9-1

...	...	@@ -66,7 +66,6 @@ static const char *prefix_op_str(PrefixOp prefix_op) {
66	66	case PrefixOpNegationWrap: return "-%";
67	67	case PrefixOpBoolNot: return "!";
68	68	case PrefixOpBinNot: return "~";
69		case PrefixOpDereference: return "*";
70	69	case PrefixOpMaybe: return "?";
71	70	case PrefixOpUnwrapMaybe: return "??";
72	71	}
...	...	@@ -222,6 +221,8 @@ static const char *node_type_str(NodeType node_type) {
222	221	return "AsmExpr";
223	222	case NodeTypeFieldAccessExpr:
224	223	return "FieldAccessExpr";
	224	case NodeTypePtrDeref:
	225	return "PtrDerefExpr";
225	226	case NodeTypeContainerDecl:
226	227	return "ContainerDecl";
227	228	case NodeTypeStructField:
...	...	@@ -696,6 +697,13 @@ static void render_node_extra(AstRender ar, AstNode node, bool grouped) {
696	697	print_symbol(ar, rhs);
697	698	break;
698	699	}
	700	case NodeTypePtrDeref:
	701	{
	702	AstNode *lhs = node->data.ptr_deref_expr.target;
	703	render_node_ungrouped(ar, lhs);
	704	fprintf(ar->f, ".*");
	705	break;
	706	}
699	707	case NodeTypeUndefinedLiteral:
700	708	fprintf(ar->f, "undefined");
701	709	break;

src/codegen.cpp+100-5

...	...	@@ -582,7 +582,7 @@ static LLVMValueRef fn_llvm_value(CodeGen g, FnTableEntry fn_table_entry) {
582	582	addLLVMArgAttr(fn_table_entry->llvm_value, (unsigned)gen_index, "nonnull");
583	583	}
584	584	// Note: byval is disabled on windows due to an LLVM bug:
585		// https://github.com/zig-lang/zig/issues/536
	585	// https://github.com/ziglang/zig/issues/536
586	586	if (is_byval && g->zig_target.os != OsWindows) {
587	587	addLLVMArgAttr(fn_table_entry->llvm_value, (unsigned)gen_index, "byval");
588	588	}
...	...	@@ -938,6 +938,53 @@ static LLVMValueRef get_memcpy_fn_val(CodeGen *g) {
938	938	return g->memcpy_fn_val;
939	939	}
940	940
	941	static LLVMValueRef get_stacksave_fn_val(CodeGen *g) {
	942	if (g->stacksave_fn_val)
	943	return g->stacksave_fn_val;
	944
	945	// declare i8* @llvm.stacksave()
	946
	947	LLVMTypeRef fn_type = LLVMFunctionType(LLVMPointerType(LLVMInt8Type(), 0), nullptr, 0, false);
	948	g->stacksave_fn_val = LLVMAddFunction(g->module, "llvm.stacksave", fn_type);
	949	assert(LLVMGetIntrinsicID(g->stacksave_fn_val));
	950
	951	return g->stacksave_fn_val;
	952	}
	953
	954	static LLVMValueRef get_stackrestore_fn_val(CodeGen *g) {
	955	if (g->stackrestore_fn_val)
	956	return g->stackrestore_fn_val;
	957
	958	// declare void @llvm.stackrestore(i8* %ptr)
	959
	960	LLVMTypeRef param_type = LLVMPointerType(LLVMInt8Type(), 0);
	961	LLVMTypeRef fn_type = LLVMFunctionType(LLVMVoidType(), &param_type, 1, false);
	962	g->stackrestore_fn_val = LLVMAddFunction(g->module, "llvm.stackrestore", fn_type);
	963	assert(LLVMGetIntrinsicID(g->stackrestore_fn_val));
	964
	965	return g->stackrestore_fn_val;
	966	}
	967
	968	static LLVMValueRef get_write_register_fn_val(CodeGen *g) {
	969	if (g->write_register_fn_val)
	970	return g->write_register_fn_val;
	971
	972	// declare void @llvm.write_register.i64(metadata, i64 @value)
	973	// !0 = !{!"sp\00"}
	974
	975	LLVMTypeRef param_types[] = {
	976	LLVMMetadataTypeInContext(LLVMGetGlobalContext()),
	977	LLVMIntType(g->pointer_size_bytes * 8),
	978	};
	979
	980	LLVMTypeRef fn_type = LLVMFunctionType(LLVMVoidType(), param_types, 2, false);
	981	Buf name = buf_sprintf("llvm.write_register.i%d", g->pointer_size_bytes 8);
	982	g->write_register_fn_val = LLVMAddFunction(g->module, buf_ptr(name), fn_type);
	983	assert(LLVMGetIntrinsicID(g->write_register_fn_val));
	984
	985	return g->write_register_fn_val;
	986	}
	987
941	988	static LLVMValueRef get_coro_destroy_fn_val(CodeGen *g) {
942	989	if (g->coro_destroy_fn_val)
943	990	return g->coro_destroy_fn_val;
...	...	@@ -2901,6 +2948,38 @@ static size_t get_async_err_code_arg_index(CodeGen g, FnTypeId fn_type_id) {
2901	2948	return 1 + get_async_allocator_arg_index(g, fn_type_id);
2902	2949	}
2903	2950
	2951
	2952	static LLVMValueRef get_new_stack_addr(CodeGen *g, LLVMValueRef new_stack) {
	2953	LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, new_stack, (unsigned)slice_ptr_index, "");
	2954	LLVMValueRef len_field_ptr = LLVMBuildStructGEP(g->builder, new_stack, (unsigned)slice_len_index, "");
	2955
	2956	LLVMValueRef ptr_value = gen_load_untyped(g, ptr_field_ptr, 0, false, "");
	2957	LLVMValueRef len_value = gen_load_untyped(g, len_field_ptr, 0, false, "");
	2958
	2959	LLVMValueRef ptr_addr = LLVMBuildPtrToInt(g->builder, ptr_value, LLVMTypeOf(len_value), "");
	2960	LLVMValueRef end_addr = LLVMBuildNUWAdd(g->builder, ptr_addr, len_value, "");
	2961	LLVMValueRef align_amt = LLVMConstInt(LLVMTypeOf(end_addr), get_abi_alignment(g, g->builtin_types.entry_usize), false);
	2962	LLVMValueRef align_adj = LLVMBuildURem(g->builder, end_addr, align_amt, "");
	2963	return LLVMBuildNUWSub(g->builder, end_addr, align_adj, "");
	2964	}
	2965
	2966	static void gen_set_stack_pointer(CodeGen *g, LLVMValueRef aligned_end_addr) {
	2967	LLVMValueRef write_register_fn_val = get_write_register_fn_val(g);
	2968
	2969	if (g->sp_md_node == nullptr) {
	2970	Buf *sp_reg_name = buf_create_from_str(arch_stack_pointer_register_name(&g->zig_target.arch));
	2971	LLVMValueRef str_node = LLVMMDString(buf_ptr(sp_reg_name), buf_len(sp_reg_name) + 1);
	2972	g->sp_md_node = LLVMMDNode(&str_node, 1);
	2973	}
	2974
	2975	LLVMValueRef params[] = {
	2976	g->sp_md_node,
	2977	aligned_end_addr,
	2978	};
	2979
	2980	LLVMBuildCall(g->builder, write_register_fn_val, params, 2, "");
	2981	}
	2982
2904	2983	static LLVMValueRef ir_render_call(CodeGen g, IrExecutable executable, IrInstructionCall *instruction) {
2905	2984	LLVMValueRef fn_val;
2906	2985	TypeTableEntry *fn_type;
...	...	@@ -2967,13 +3046,28 @@ static LLVMValueRef ir_render_call(CodeGen g, IrExecutable executable, IrInstr
2967	3046	}
2968	3047
2969	3048	LLVMCallConv llvm_cc = get_llvm_cc(g, fn_type->data.fn.fn_type_id.cc);
2970		LLVMValueRef result = ZigLLVMBuildCall(g->builder, fn_val,
2971		gen_param_values, (unsigned)gen_param_index, llvm_cc, fn_inline, "");
	3049	LLVMValueRef result;
	3050
	3051	if (instruction->new_stack == nullptr) {
	3052	result = ZigLLVMBuildCall(g->builder, fn_val,
	3053	gen_param_values, (unsigned)gen_param_index, llvm_cc, fn_inline, "");
	3054	} else {
	3055	LLVMValueRef stacksave_fn_val = get_stacksave_fn_val(g);
	3056	LLVMValueRef stackrestore_fn_val = get_stackrestore_fn_val(g);
	3057
	3058	LLVMValueRef new_stack_addr = get_new_stack_addr(g, ir_llvm_value(g, instruction->new_stack));
	3059	LLVMValueRef old_stack_ref = LLVMBuildCall(g->builder, stacksave_fn_val, nullptr, 0, "");
	3060	gen_set_stack_pointer(g, new_stack_addr);
	3061	result = ZigLLVMBuildCall(g->builder, fn_val,
	3062	gen_param_values, (unsigned)gen_param_index, llvm_cc, fn_inline, "");
	3063	LLVMBuildCall(g->builder, stackrestore_fn_val, &old_stack_ref, 1, "");
	3064	}
	3065
2972	3066
2973	3067	for (size_t param_i = 0; param_i < fn_type_id->param_count; param_i += 1) {
2974	3068	FnGenParamInfo *gen_info = &fn_type->data.fn.gen_param_info[param_i];
2975	3069	// Note: byval is disabled on windows due to an LLVM bug:
2976		// https://github.com/zig-lang/zig/issues/536
	3070	// https://github.com/ziglang/zig/issues/536
2977	3071	if (gen_info->is_byval && g->zig_target.os != OsWindows) {
2978	3072	addLLVMCallsiteAttr(result, (unsigned)gen_info->gen_index, "byval");
2979	3073	}
...	...	@@ -6171,6 +6265,7 @@ static void define_builtin_fns(CodeGen *g) {
6171	6265	create_builtin_fn(g, BuiltinFnIdSqrt, "sqrt", 2);
6172	6266	create_builtin_fn(g, BuiltinFnIdInlineCall, "inlineCall", SIZE_MAX);
6173	6267	create_builtin_fn(g, BuiltinFnIdNoInlineCall, "noInlineCall", SIZE_MAX);
	6268	create_builtin_fn(g, BuiltinFnIdNewStackCall, "newStackCall", SIZE_MAX);
6174	6269	create_builtin_fn(g, BuiltinFnIdTypeId, "typeId", 1);
6175	6270	create_builtin_fn(g, BuiltinFnIdShlExact, "shlExact", 2);
6176	6271	create_builtin_fn(g, BuiltinFnIdShrExact, "shrExact", 2);
...	...	@@ -6635,7 +6730,7 @@ static void init(CodeGen *g) {
6635	6730	const char *target_specific_features;
6636	6731	if (g->is_native_target) {
6637	6732	// LLVM creates invalid binaries on Windows sometimes.
6638		// See https://github.com/zig-lang/zig/issues/508
	6733	// See https://github.com/ziglang/zig/issues/508
6639	6734	// As a workaround we do not use target native features on Windows.
6640	6735	if (g->zig_target.os == OsWindows) {
6641	6736	target_specific_cpu_args = "";

src/ir.cpp+112-65

...	...	@@ -1102,7 +1102,8 @@ static IrInstruction ir_build_union_field_ptr_from(IrBuilder irb, IrInstructio
1102	1102
1103	1103	static IrInstruction ir_build_call(IrBuilder irb, Scope scope, AstNode source_node,
1104	1104	FnTableEntry fn_entry, IrInstruction fn_ref, size_t arg_count, IrInstruction **args,
1105		bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator)
	1105	bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator,
	1106	IrInstruction *new_stack)
1106	1107	{
1107	1108	IrInstructionCall *call_instruction = ir_build_instruction<IrInstructionCall>(irb, scope, source_node);
1108	1109	call_instruction->fn_entry = fn_entry;
...	...	@@ -1113,6 +1114,7 @@ static IrInstruction ir_build_call(IrBuilder irb, Scope scope, AstNode sourc
1113	1114	call_instruction->arg_count = arg_count;
1114	1115	call_instruction->is_async = is_async;
1115	1116	call_instruction->async_allocator = async_allocator;
	1117	call_instruction->new_stack = new_stack;
1116	1118
1117	1119	if (fn_ref)
1118	1120	ir_ref_instruction(fn_ref, irb->current_basic_block);
...	...	@@ -1120,16 +1122,19 @@ static IrInstruction ir_build_call(IrBuilder irb, Scope scope, AstNode sourc
1120	1122	ir_ref_instruction(args[i], irb->current_basic_block);
1121	1123	if (async_allocator)
1122	1124	ir_ref_instruction(async_allocator, irb->current_basic_block);
	1125	if (new_stack != nullptr)
	1126	ir_ref_instruction(new_stack, irb->current_basic_block);
1123	1127
1124	1128	return &call_instruction->base;
1125	1129	}
1126	1130
1127	1131	static IrInstruction ir_build_call_from(IrBuilder irb, IrInstruction *old_instruction,
1128	1132	FnTableEntry fn_entry, IrInstruction fn_ref, size_t arg_count, IrInstruction **args,
1129		bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator)
	1133	bool is_comptime, FnInline fn_inline, bool is_async, IrInstruction *async_allocator,
	1134	IrInstruction *new_stack)
1130	1135	{
1131	1136	IrInstruction *new_instruction = ir_build_call(irb, old_instruction->scope,
1132		old_instruction->source_node, fn_entry, fn_ref, arg_count, args, is_comptime, fn_inline, is_async, async_allocator);
	1137	old_instruction->source_node, fn_entry, fn_ref, arg_count, args, is_comptime, fn_inline, is_async, async_allocator, new_stack);
1133	1138	ir_link_new_instruction(new_instruction, old_instruction);
1134	1139	return new_instruction;
1135	1140	}
...	...	@@ -4303,7 +4308,37 @@ static IrInstruction ir_gen_builtin_fn_call(IrBuilder irb, Scope *scope, AstNo
4303	4308	}
4304	4309	FnInline fn_inline = (builtin_fn->id == BuiltinFnIdInlineCall) ? FnInlineAlways : FnInlineNever;
4305	4310
4306		IrInstruction *call = ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, fn_inline, false, nullptr);
	4311	IrInstruction *call = ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, fn_inline, false, nullptr, nullptr);
	4312	return ir_lval_wrap(irb, scope, call, lval);
	4313	}
	4314	case BuiltinFnIdNewStackCall:
	4315	{
	4316	if (node->data.fn_call_expr.params.length == 0) {
	4317	add_node_error(irb->codegen, node, buf_sprintf("expected at least 1 argument, found 0"));
	4318	return irb->codegen->invalid_instruction;
	4319	}
	4320
	4321	AstNode *new_stack_node = node->data.fn_call_expr.params.at(0);
	4322	IrInstruction *new_stack = ir_gen_node(irb, new_stack_node, scope);
	4323	if (new_stack == irb->codegen->invalid_instruction)
	4324	return new_stack;
	4325
	4326	AstNode *fn_ref_node = node->data.fn_call_expr.params.at(1);
	4327	IrInstruction *fn_ref = ir_gen_node(irb, fn_ref_node, scope);
	4328	if (fn_ref == irb->codegen->invalid_instruction)
	4329	return fn_ref;
	4330
	4331	size_t arg_count = node->data.fn_call_expr.params.length - 2;
	4332
	4333	IrInstruction *args = allocate<IrInstruction>(arg_count);
	4334	for (size_t i = 0; i < arg_count; i += 1) {
	4335	AstNode *arg_node = node->data.fn_call_expr.params.at(i + 2);
	4336	args[i] = ir_gen_node(irb, arg_node, scope);
	4337	if (args[i] == irb->codegen->invalid_instruction)
	4338	return args[i];
	4339	}
	4340
	4341	IrInstruction *call = ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, FnInlineAuto, false, nullptr, new_stack);
4307	4342	return ir_lval_wrap(irb, scope, call, lval);
4308	4343	}
4309	4344	case BuiltinFnIdTypeId:
...	...	@@ -4513,7 +4548,7 @@ static IrInstruction ir_gen_fn_call(IrBuilder irb, Scope scope, AstNode node
4513	4548	}
4514	4549	}
4515	4550
4516		IrInstruction *fn_call = ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, FnInlineAuto, is_async, async_allocator);
	4551	IrInstruction *fn_call = ir_build_call(irb, scope, node, nullptr, fn_ref, arg_count, args, false, FnInlineAuto, is_async, async_allocator, nullptr);
4517	4552	return ir_lval_wrap(irb, scope, fn_call, lval);
4518	4553	}
4519	4554
...	...	@@ -4574,8 +4609,14 @@ static IrInstruction ir_gen_if_bool_expr(IrBuilder irb, Scope *scope, AstNode
4574	4609	}
4575	4610
4576	4611	static IrInstruction ir_gen_prefix_op_id_lval(IrBuilder irb, Scope scope, AstNode node, IrUnOp op_id, LVal lval) {
4577		assert(node->type == NodeTypePrefixOpExpr);
4578		AstNode *expr_node = node->data.prefix_op_expr.primary_expr;
	4612	AstNode *expr_node;
	4613	if (node->type == NodeTypePrefixOpExpr) {
	4614	expr_node = node->data.prefix_op_expr.primary_expr;
	4615	} else if (node->type == NodeTypePtrDeref) {
	4616	expr_node = node->data.ptr_deref_expr.target;
	4617	} else {
	4618	zig_unreachable();
	4619	}
4579	4620
4580	4621	IrInstruction *value = ir_gen_node_extra(irb, expr_node, scope, lval);
4581	4622	if (value == irb->codegen->invalid_instruction)
...	...	@@ -4716,8 +4757,6 @@ static IrInstruction ir_gen_prefix_op_expr(IrBuilder irb, Scope *scope, AstNod
4716	4757	return ir_lval_wrap(irb, scope, ir_gen_prefix_op_id(irb, scope, node, IrUnOpNegation), lval);
4717	4758	case PrefixOpNegationWrap:
4718	4759	return ir_lval_wrap(irb, scope, ir_gen_prefix_op_id(irb, scope, node, IrUnOpNegationWrap), lval);
4719		case PrefixOpDereference:
4720		return ir_gen_prefix_op_id_lval(irb, scope, node, IrUnOpDereference, lval);
4721	4760	case PrefixOpMaybe:
4722	4761	return ir_lval_wrap(irb, scope, ir_gen_prefix_op_id(irb, scope, node, IrUnOpMaybe), lval);
4723	4762	case PrefixOpUnwrapMaybe:
...	...	@@ -6553,6 +6592,8 @@ static IrInstruction ir_gen_node_raw(IrBuilder irb, AstNode node, Scope scop
6553	6592
6554	6593	return ir_build_load_ptr(irb, scope, node, ptr_instruction);
6555	6594	}
	6595	case NodeTypePtrDeref:
	6596	return ir_gen_prefix_op_id_lval(irb, scope, node, IrUnOpDereference, lval);
6556	6597	case NodeTypeThisLiteral:
6557	6598	return ir_lval_wrap(irb, scope, ir_gen_this_literal(irb, scope, node), lval);
6558	6599	case NodeTypeBoolLiteral:
...	...	@@ -6825,7 +6866,7 @@ bool ir_gen(CodeGen codegen, AstNode node, Scope scope, IrExecutable ir_exec
6825	6866	IrInstruction *args = allocate<IrInstruction >(arg_count);
6826	6867	args[0] = implicit_allocator_ptr; // self
6827	6868	args[1] = mem_slice; // old_mem
6828		ir_build_call(irb, scope, node, nullptr, free_fn, arg_count, args, false, FnInlineAuto, false, nullptr);
	6869	ir_build_call(irb, scope, node, nullptr, free_fn, arg_count, args, false, FnInlineAuto, false, nullptr, nullptr);
6829	6870
6830	6871	IrBasicBlock *resume_block = ir_create_basic_block(irb, scope, "Resume");
6831	6872	ir_build_cond_br(irb, scope, node, resume_awaiter, resume_block, irb->exec->coro_suspend_block, const_bool_false);
...	...	@@ -7592,38 +7633,16 @@ static bool slice_is_const(TypeTableEntry *type) {
7592	7633	return type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.is_const;
7593	7634	}
7594	7635
7595		static bool resolve_inferred_error_set(IrAnalyze ira, TypeTableEntry err_set_type, AstNode *source_node) {
7596		assert(err_set_type->id == TypeTableEntryIdErrorSet);
7597		FnTableEntry *infer_fn = err_set_type->data.error_set.infer_fn;
7598		if (infer_fn != nullptr) {
7599		if (infer_fn->anal_state == FnAnalStateInvalid) {
7600		return false;
7601		} else if (infer_fn->anal_state == FnAnalStateReady) {
7602		analyze_fn_body(ira->codegen, infer_fn);
7603		if (err_set_type->data.error_set.infer_fn != nullptr) {
7604		assert(ira->codegen->errors.length != 0);
7605		return false;
7606		}
7607		} else {
7608		ir_add_error_node(ira, source_node,
7609		buf_sprintf("cannot resolve inferred error set '%s': function '%s' not fully analyzed yet",
7610		buf_ptr(&err_set_type->name), buf_ptr(&err_set_type->data.error_set.infer_fn->symbol_name)));
7611		return false;
7612		}
7613		}
7614		return true;
7615		}
7616
7617	7636	static TypeTableEntry get_error_set_intersection(IrAnalyze ira, TypeTableEntry set1, TypeTableEntry set2,
7618	7637	AstNode *source_node)
7619	7638	{
7620	7639	assert(set1->id == TypeTableEntryIdErrorSet);
7621	7640	assert(set2->id == TypeTableEntryIdErrorSet);
7622	7641
7623		if (!resolve_inferred_error_set(ira, set1, source_node)) {
	7642	if (!resolve_inferred_error_set(ira->codegen, set1, source_node)) {
7624	7643	return ira->codegen->builtin_types.entry_invalid;
7625	7644	}
7626		if (!resolve_inferred_error_set(ira, set2, source_node)) {
	7645	if (!resolve_inferred_error_set(ira->codegen, set2, source_node)) {
7627	7646	return ira->codegen->builtin_types.entry_invalid;
7628	7647	}
7629	7648	if (type_is_global_error_set(set1)) {
...	...	@@ -7762,7 +7781,7 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, TypeTableEntry
7762	7781	return result;
7763	7782	}
7764	7783
7765		if (!resolve_inferred_error_set(ira, contained_set, source_node)) {
	7784	if (!resolve_inferred_error_set(ira->codegen, contained_set, source_node)) {
7766	7785	result.id = ConstCastResultIdUnresolvedInferredErrSet;
7767	7786	return result;
7768	7787	}
...	...	@@ -8151,7 +8170,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8151	8170	err_set_type = ira->codegen->builtin_types.entry_global_error_set;
8152	8171	} else {
8153	8172	err_set_type = prev_inst->value.type;
8154		if (!resolve_inferred_error_set(ira, err_set_type, prev_inst->source_node)) {
	8173	if (!resolve_inferred_error_set(ira->codegen, err_set_type, prev_inst->source_node)) {
8155	8174	return ira->codegen->builtin_types.entry_invalid;
8156	8175	}
8157	8176	update_errors_helper(ira->codegen, &errors, &errors_count);
...	...	@@ -8190,7 +8209,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8190	8209	if (type_is_global_error_set(err_set_type)) {
8191	8210	continue;
8192	8211	}
8193		if (!resolve_inferred_error_set(ira, cur_type, cur_inst->source_node)) {
	8212	if (!resolve_inferred_error_set(ira->codegen, cur_type, cur_inst->source_node)) {
8194	8213	return ira->codegen->builtin_types.entry_invalid;
8195	8214	}
8196	8215	if (type_is_global_error_set(cur_type)) {
...	...	@@ -8256,7 +8275,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8256	8275	continue;
8257	8276	}
8258	8277	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;
8259		if (!resolve_inferred_error_set(ira, cur_err_set_type, cur_inst->source_node)) {
	8278	if (!resolve_inferred_error_set(ira->codegen, cur_err_set_type, cur_inst->source_node)) {
8260	8279	return ira->codegen->builtin_types.entry_invalid;
8261	8280	}
8262	8281	if (type_is_global_error_set(cur_err_set_type)) {
...	...	@@ -8319,7 +8338,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8319	8338	if (err_set_type != nullptr && type_is_global_error_set(err_set_type)) {
8320	8339	continue;
8321	8340	}
8322		if (!resolve_inferred_error_set(ira, cur_type, cur_inst->source_node)) {
	8341	if (!resolve_inferred_error_set(ira->codegen, cur_type, cur_inst->source_node)) {
8323	8342	return ira->codegen->builtin_types.entry_invalid;
8324	8343	}
8325	8344
...	...	@@ -8376,11 +8395,11 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8376	8395	TypeTableEntry *prev_err_set_type = (err_set_type == nullptr) ? prev_type->data.error_union.err_set_type : err_set_type;
8377	8396	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;
8378	8397
8379		if (!resolve_inferred_error_set(ira, prev_err_set_type, cur_inst->source_node)) {
	8398	if (!resolve_inferred_error_set(ira->codegen, prev_err_set_type, cur_inst->source_node)) {
8380	8399	return ira->codegen->builtin_types.entry_invalid;
8381	8400	}
8382	8401
8383		if (!resolve_inferred_error_set(ira, cur_err_set_type, cur_inst->source_node)) {
	8402	if (!resolve_inferred_error_set(ira->codegen, cur_err_set_type, cur_inst->source_node)) {
8384	8403	return ira->codegen->builtin_types.entry_invalid;
8385	8404	}
8386	8405
...	...	@@ -8490,7 +8509,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8490	8509	{
8491	8510	if (err_set_type != nullptr) {
8492	8511	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;
8493		if (!resolve_inferred_error_set(ira, cur_err_set_type, cur_inst->source_node)) {
	8512	if (!resolve_inferred_error_set(ira->codegen, cur_err_set_type, cur_inst->source_node)) {
8494	8513	return ira->codegen->builtin_types.entry_invalid;
8495	8514	}
8496	8515	if (type_is_global_error_set(cur_err_set_type) \|\| type_is_global_error_set(err_set_type)) {
...	...	@@ -8686,6 +8705,10 @@ static void copy_const_val(ConstExprValue dest, ConstExprValue src, bool same_
8686	8705	dest = src;
8687	8706	if (!same_global_refs) {
8688	8707	dest->global_refs = global_refs;
	8708	if (dest->type->id == TypeTableEntryIdStruct) {
	8709	dest->data.x_struct.fields = allocate_nonzero<ConstExprValue>(dest->type->data.structure.src_field_count);
	8710	memcpy(dest->data.x_struct.fields, src->data.x_struct.fields, sizeof(ConstExprValue) * dest->type->data.structure.src_field_count);
	8711	}
8689	8712	}
8690	8713	}
8691	8714
...	...	@@ -9168,7 +9191,7 @@ static IrInstruction ir_analyze_err_set_cast(IrAnalyze ira, IrInstruction *sou
9168	9191	if (!val)
9169	9192	return ira->codegen->invalid_instruction;
9170	9193
9171		if (!resolve_inferred_error_set(ira, wanted_type, source_instr->source_node)) {
	9194	if (!resolve_inferred_error_set(ira->codegen, wanted_type, source_instr->source_node)) {
9172	9195	return ira->codegen->invalid_instruction;
9173	9196	}
9174	9197	if (!type_is_global_error_set(wanted_type)) {
...	...	@@ -9609,7 +9632,7 @@ static IrInstruction ir_analyze_int_to_err(IrAnalyze ira, IrInstruction *sourc
9609	9632	IrInstruction *result = ir_create_const(&ira->new_irb, source_instr->scope,
9610	9633	source_instr->source_node, wanted_type);
9611	9634
9612		if (!resolve_inferred_error_set(ira, wanted_type, source_instr->source_node)) {
	9635	if (!resolve_inferred_error_set(ira->codegen, wanted_type, source_instr->source_node)) {
9613	9636	return ira->codegen->invalid_instruction;
9614	9637	}
9615	9638
...	...	@@ -9707,7 +9730,7 @@ static IrInstruction ir_analyze_err_to_int(IrAnalyze ira, IrInstruction *sourc
9707	9730	zig_unreachable();
9708	9731	}
9709	9732	if (!type_is_global_error_set(err_set_type)) {
9710		if (!resolve_inferred_error_set(ira, err_set_type, source_instr->source_node)) {
	9733	if (!resolve_inferred_error_set(ira->codegen, err_set_type, source_instr->source_node)) {
9711	9734	return ira->codegen->invalid_instruction;
9712	9735	}
9713	9736	if (err_set_type->data.error_set.err_count == 0) {
...	...	@@ -10602,7 +10625,7 @@ static TypeTableEntry ir_analyze_bin_op_cmp(IrAnalyze ira, IrInstructionBinOp
10602	10625	return ira->codegen->builtin_types.entry_invalid;
10603	10626	}
10604	10627
10605		if (!resolve_inferred_error_set(ira, intersect_type, source_node)) {
	10628	if (!resolve_inferred_error_set(ira->codegen, intersect_type, source_node)) {
10606	10629	return ira->codegen->builtin_types.entry_invalid;
10607	10630	}
10608	10631
...	...	@@ -11458,11 +11481,11 @@ static TypeTableEntry ir_analyze_merge_error_sets(IrAnalyze ira, IrInstruction
11458	11481	return ira->codegen->builtin_types.entry_type;
11459	11482	}
11460	11483
11461		if (!resolve_inferred_error_set(ira, op1_type, instruction->op1->other->source_node)) {
	11484	if (!resolve_inferred_error_set(ira->codegen, op1_type, instruction->op1->other->source_node)) {
11462	11485	return ira->codegen->builtin_types.entry_invalid;
11463	11486	}
11464	11487
11465		if (!resolve_inferred_error_set(ira, op2_type, instruction->op2->other->source_node)) {
	11488	if (!resolve_inferred_error_set(ira->codegen, op2_type, instruction->op2->other->source_node)) {
11466	11489	return ira->codegen->builtin_types.entry_invalid;
11467	11490	}
11468	11491
...	...	@@ -11670,7 +11693,8 @@ static TypeTableEntry ir_analyze_instruction_decl_var(IrAnalyze ira, IrInstruc
11670	11693	if (var->mem_slot_index != SIZE_MAX) {
11671	11694	assert(var->mem_slot_index < ira->exec_context.mem_slot_count);
11672	11695	ConstExprValue *mem_slot = &ira->exec_context.mem_slot_list[var->mem_slot_index];
11673		*mem_slot = casted_init_value->value;
	11696	copy_const_val(mem_slot, &casted_init_value->value,
	11697	!is_comptime_var \|\| var->gen_is_const);
11674	11698
11675	11699	if (is_comptime_var \|\| (var_class_requires_const && var->gen_is_const)) {
11676	11700	ir_build_const_from(ira, &decl_var_instruction->base);
...	...	@@ -11987,7 +12011,7 @@ static IrInstruction ir_analyze_async_call(IrAnalyze ira, IrInstructionCall *c
11987	12011	TypeTableEntry *async_return_type = get_error_union_type(ira->codegen, alloc_fn_error_set_type, promise_type);
11988	12012
11989	12013	IrInstruction *result = ir_build_call(&ira->new_irb, call_instruction->base.scope, call_instruction->base.source_node,
11990		fn_entry, fn_ref, arg_count, casted_args, false, FnInlineAuto, true, async_allocator_inst);
	12014	fn_entry, fn_ref, arg_count, casted_args, false, FnInlineAuto, true, async_allocator_inst, nullptr);
11991	12015	result->value.type = async_return_type;
11992	12016	return result;
11993	12017	}
...	...	@@ -12084,7 +12108,7 @@ static bool ir_analyze_fn_call_generic_arg(IrAnalyze ira, AstNode fn_proto_nod
12084	12108	casted_arg->value.type->id == TypeTableEntryIdNumLitFloat)
12085	12109	{
12086	12110	ir_add_error(ira, casted_arg,
12087		buf_sprintf("compiler bug: integer and float literals in var args function must be casted. https://github.com/zig-lang/zig/issues/557"));
	12111	buf_sprintf("compiler bug: integer and float literals in var args function must be casted. https://github.com/ziglang/zig/issues/557"));
12088	12112	return false;
12089	12113	}
12090	12114
...	...	@@ -12285,7 +12309,7 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12285	12309
12286	12310	if (fn_proto_node->data.fn_proto.is_var_args) {
12287	12311	ir_add_error(ira, &call_instruction->base,
12288		buf_sprintf("compiler bug: unable to call var args function at compile time. https://github.com/zig-lang/zig/issues/313"));
	12312	buf_sprintf("compiler bug: unable to call var args function at compile time. https://github.com/ziglang/zig/issues/313"));
12289	12313	return ira->codegen->builtin_types.entry_invalid;
12290	12314	}
12291	12315
...	...	@@ -12357,6 +12381,19 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12357	12381	return ir_finish_anal(ira, return_type);
12358	12382	}
12359	12383
	12384	IrInstruction *casted_new_stack = nullptr;
	12385	if (call_instruction->new_stack != nullptr) {
	12386	TypeTableEntry *u8_ptr = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, false);
	12387	TypeTableEntry *u8_slice = get_slice_type(ira->codegen, u8_ptr);
	12388	IrInstruction *new_stack = call_instruction->new_stack->other;
	12389	if (type_is_invalid(new_stack->value.type))
	12390	return ira->codegen->builtin_types.entry_invalid;
	12391
	12392	casted_new_stack = ir_implicit_cast(ira, new_stack, u8_slice);
	12393	if (type_is_invalid(casted_new_stack->value.type))
	12394	return ira->codegen->builtin_types.entry_invalid;
	12395	}
	12396
12360	12397	if (fn_type->data.fn.is_generic) {
12361	12398	if (!fn_entry) {
12362	12399	ir_add_error(ira, call_instruction->fn_ref,
...	...	@@ -12365,7 +12402,7 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12365	12402	}
12366	12403	if (call_instruction->is_async && fn_type_id->is_var_args) {
12367	12404	ir_add_error(ira, call_instruction->fn_ref,
12368		buf_sprintf("compiler bug: TODO: implement var args async functions. https://github.com/zig-lang/zig/issues/557"));
	12405	buf_sprintf("compiler bug: TODO: implement var args async functions. https://github.com/ziglang/zig/issues/557"));
12369	12406	return ira->codegen->builtin_types.entry_invalid;
12370	12407	}
12371	12408
...	...	@@ -12448,7 +12485,7 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12448	12485	VariableTableEntry *arg_var = get_fn_var_by_index(parent_fn_entry, arg_tuple_i);
12449	12486	if (arg_var == nullptr) {
12450	12487	ir_add_error(ira, arg,
12451		buf_sprintf("compiler bug: var args can't handle void. https://github.com/zig-lang/zig/issues/557"));
	12488	buf_sprintf("compiler bug: var args can't handle void. https://github.com/ziglang/zig/issues/557"));
12452	12489	return ira->codegen->builtin_types.entry_invalid;
12453	12490	}
12454	12491	IrInstruction *arg_var_ptr_inst = ir_get_var_ptr(ira, arg, arg_var, true, false);
...	...	@@ -12583,7 +12620,7 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12583	12620	assert(async_allocator_inst == nullptr);
12584	12621	IrInstruction *new_call_instruction = ir_build_call_from(&ira->new_irb, &call_instruction->base,
12585	12622	impl_fn, nullptr, impl_param_count, casted_args, false, fn_inline,
12586		call_instruction->is_async, nullptr);
	12623	call_instruction->is_async, nullptr, casted_new_stack);
12587	12624
12588	12625	ir_add_alloca(ira, new_call_instruction, return_type);
12589	12626
...	...	@@ -12674,7 +12711,7 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12674	12711
12675	12712
12676	12713	IrInstruction *new_call_instruction = ir_build_call_from(&ira->new_irb, &call_instruction->base,
12677		fn_entry, fn_ref, call_param_count, casted_args, false, fn_inline, false, nullptr);
	12714	fn_entry, fn_ref, call_param_count, casted_args, false, fn_inline, false, nullptr, casted_new_stack);
12678	12715
12679	12716	ir_add_alloca(ira, new_call_instruction, return_type);
12680	12717	return ir_finish_anal(ira, return_type);
...	...	@@ -13792,7 +13829,7 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru
13792	13829	}
13793	13830	err_set_type = err_entry->set_with_only_this_in_it;
13794	13831	} else {
13795		if (!resolve_inferred_error_set(ira, child_type, field_ptr_instruction->base.source_node)) {
	13832	if (!resolve_inferred_error_set(ira->codegen, child_type, field_ptr_instruction->base.source_node)) {
13796	13833	return ira->codegen->builtin_types.entry_invalid;
13797	13834	}
13798	13835	err_entry = find_err_table_entry(child_type, field_name);
...	...	@@ -15923,10 +15960,6 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
15923	15960	FnTableEntry fn_entry = ((TldFn )curr_entry->value)->fn_entry;
15924	15961	assert(!fn_entry->is_test);
15925	15962
15926		analyze_fn_body(ira->codegen, fn_entry);
15927		if (fn_entry->anal_state == FnAnalStateInvalid)
15928		return;
15929
15930	15963	AstNodeFnProto fn_node = (AstNodeFnProto )(fn_entry->proto_node);
15931	15964
15932	15965	ConstExprValue *fn_def_val = create_const_vals(1);
...	...	@@ -16496,6 +16529,7 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t
16496	16529	{
16497	16530	size_t byte_offset = LLVMOffsetOfElement(ira->codegen->target_data_ref, type_entry->type_ref, struct_field->gen_index);
16498	16531	inner_fields[1].data.x_maybe = create_const_vals(1);
	16532	inner_fields[1].data.x_maybe->special = ConstValSpecialStatic;
16499	16533	inner_fields[1].data.x_maybe->type = ira->codegen->builtin_types.entry_usize;
16500	16534	bigint_init_unsigned(&inner_fields[1].data.x_maybe->data.x_bigint, byte_offset);
16501	16535	}
...	...	@@ -17503,7 +17537,7 @@ static TypeTableEntry ir_analyze_instruction_member_count(IrAnalyze ira, IrIns
17503	17537	} else if (container_type->id == TypeTableEntryIdUnion) {
17504	17538	result = container_type->data.unionation.src_field_count;
17505	17539	} else if (container_type->id == TypeTableEntryIdErrorSet) {
17506		if (!resolve_inferred_error_set(ira, container_type, instruction->base.source_node)) {
	17540	if (!resolve_inferred_error_set(ira->codegen, container_type, instruction->base.source_node)) {
17507	17541	return ira->codegen->builtin_types.entry_invalid;
17508	17542	}
17509	17543	if (type_is_global_error_set(container_type)) {
...	...	@@ -17807,7 +17841,7 @@ static TypeTableEntry ir_analyze_instruction_test_err(IrAnalyze ira, IrInstruc
17807	17841	}
17808	17842
17809	17843	TypeTableEntry *err_set_type = type_entry->data.error_union.err_set_type;
17810		if (!resolve_inferred_error_set(ira, err_set_type, instruction->base.source_node)) {
	17844	if (!resolve_inferred_error_set(ira->codegen, err_set_type, instruction->base.source_node)) {
17811	17845	return ira->codegen->builtin_types.entry_invalid;
17812	17846	}
17813	17847	if (!type_is_global_error_set(err_set_type) &&
...	...	@@ -17880,6 +17914,15 @@ static TypeTableEntry ir_analyze_instruction_unwrap_err_payload(IrAnalyze ira,
17880	17914	return ira->codegen->builtin_types.entry_invalid;
17881	17915	TypeTableEntry *ptr_type = value->value.type;
17882	17916
	17917	// Because we don't have Pointer Reform yet, we can't have a pointer to a 'type'.
	17918	// Therefor, we have to check for type 'type' here, so we can output a correct error
	17919	// without asserting the assert below.
	17920	if (ptr_type->id == TypeTableEntryIdMetaType) {
	17921	ir_add_error(ira, value,
	17922	buf_sprintf("expected error union type, found '%s'", buf_ptr(&ptr_type->name)));
	17923	return ira->codegen->builtin_types.entry_invalid;
	17924	}
	17925
17883	17926	// This will be a pointer type because unwrap err payload IR instruction operates on a pointer to a thing.
17884	17927	assert(ptr_type->id == TypeTableEntryIdPointer);
17885	17928
...	...	@@ -18030,7 +18073,11 @@ static TypeTableEntry ir_analyze_instruction_check_switch_prongs(IrAnalyze ira
18030	18073	if (type_is_invalid(end_value->value.type))
18031	18074	return ira->codegen->builtin_types.entry_invalid;
18032	18075
18033		assert(start_value->value.type->id == TypeTableEntryIdEnum);
	18076	if (start_value->value.type->id != TypeTableEntryIdEnum) {
	18077	ir_add_error(ira, range->start, buf_sprintf("not an enum type"));
	18078	return ira->codegen->builtin_types.entry_invalid;
	18079	}
	18080
18034	18081	BigInt start_index;
18035	18082	bigint_init_bigint(&start_index, &start_value->value.data.x_enum_tag);
18036	18083
...	...	@@ -18071,7 +18118,7 @@ static TypeTableEntry ir_analyze_instruction_check_switch_prongs(IrAnalyze ira
18071	18118	}
18072	18119	}
18073	18120	} else if (switch_type->id == TypeTableEntryIdErrorSet) {
18074		if (!resolve_inferred_error_set(ira, switch_type, target_value->source_node)) {
	18121	if (!resolve_inferred_error_set(ira->codegen, switch_type, target_value->source_node)) {
18075	18122	return ira->codegen->builtin_types.entry_invalid;
18076	18123	}
18077	18124

src/parser.cpp+25-18

...	...	@@ -1046,11 +1046,12 @@ static AstNode ast_parse_fn_proto_partial(ParseContext pc, size_t *token_index
1046	1046	}
1047	1047
1048	1048	/*
1049		SuffixOpExpression = ("async" option("<" SuffixOpExpression ">") SuffixOpExpression FnCallExpression) \| PrimaryExpression option(FnCallExpression \| ArrayAccessExpression \| FieldAccessExpression \| SliceExpression)
	1049	SuffixOpExpression = ("async" option("<" SuffixOpExpression ">") SuffixOpExpression FnCallExpression) \| PrimaryExpression option(FnCallExpression \| ArrayAccessExpression \| FieldAccessExpression \| PtrDerefExpression \| SliceExpression)
1050	1050	FnCallExpression : token(LParen) list(Expression, token(Comma)) token(RParen)
1051	1051	ArrayAccessExpression : token(LBracket) Expression token(RBracket)
1052	1052	SliceExpression = "[" Expression ".." option(Expression) "]"
1053	1053	FieldAccessExpression : token(Dot) token(Symbol)
	1054	PtrDerefExpression = ".*"
1054	1055	StructLiteralField : token(Dot) token(Symbol) token(Eq) Expression
1055	1056	*/
1056	1057	static AstNode ast_parse_suffix_op_expr(ParseContext pc, size_t *token_index, bool mandatory) {
...	...	@@ -1131,13 +1132,27 @@ static AstNode ast_parse_suffix_op_expr(ParseContext pc, size_t *token_index,
1131	1132	} else if (first_token->id == TokenIdDot) {
1132	1133	*token_index += 1;
1133	1134
1134		Token *name_token = ast_eat_token(pc, token_index, TokenIdSymbol);
	1135	Token token = &pc->tokens->at(token_index);
	1136
	1137	if (token->id == TokenIdSymbol) {
	1138	*token_index += 1;
1135	1139
1136		AstNode *node = ast_create_node(pc, NodeTypeFieldAccessExpr, first_token);
1137		node->data.field_access_expr.struct_expr = primary_expr;
1138		node->data.field_access_expr.field_name = token_buf(name_token);
	1140	AstNode *node = ast_create_node(pc, NodeTypeFieldAccessExpr, first_token);
	1141	node->data.field_access_expr.struct_expr = primary_expr;
	1142	node->data.field_access_expr.field_name = token_buf(token);
	1143
	1144	primary_expr = node;
	1145	} else if (token->id == TokenIdStar) {
	1146	*token_index += 1;
	1147
	1148	AstNode *node = ast_create_node(pc, NodeTypePtrDeref, first_token);
	1149	node->data.ptr_deref_expr.target = primary_expr;
	1150
	1151	primary_expr = node;
	1152	} else {
	1153	ast_invalid_token_error(pc, token);
	1154	}
1139	1155
1140		primary_expr = node;
1141	1156	} else {
1142	1157	return primary_expr;
1143	1158	}
...	...	@@ -1150,10 +1165,8 @@ static PrefixOp tok_to_prefix_op(Token *token) {
1150	1165	case TokenIdDash: return PrefixOpNegation;
1151	1166	case TokenIdMinusPercent: return PrefixOpNegationWrap;
1152	1167	case TokenIdTilde: return PrefixOpBinNot;
1153		case TokenIdStar: return PrefixOpDereference;
1154	1168	case TokenIdMaybe: return PrefixOpMaybe;
1155	1169	case TokenIdDoubleQuestion: return PrefixOpUnwrapMaybe;
1156		case TokenIdStarStar: return PrefixOpDereference;
1157	1170	default: return PrefixOpInvalid;
1158	1171	}
1159	1172	}
...	...	@@ -1199,7 +1212,7 @@ static AstNode ast_parse_addr_of(ParseContext pc, size_t *token_index) {
1199	1212
1200	1213	/*
1201	1214	PrefixOpExpression = PrefixOp ErrorSetExpr \| SuffixOpExpression
1202		PrefixOp = "!" \| "-" \| "~" \| "*" \| ("&" option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) \| "?" \| "??" \| "-%" \| "try" \| "await"
	1215	PrefixOp = "!" \| "-" \| "~" \| ("*" option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) \| "?" \| "??" \| "-%" \| "try" \| "await"
1203	1216	*/
1204	1217	static AstNode ast_parse_prefix_op_expr(ParseContext pc, size_t *token_index, bool mandatory) {
1205	1218	Token token = &pc->tokens->at(token_index);
...	...	@@ -1222,15 +1235,6 @@ static AstNode ast_parse_prefix_op_expr(ParseContext pc, size_t *token_index,
1222	1235
1223	1236	AstNode *node = ast_create_node(pc, NodeTypePrefixOpExpr, token);
1224	1237	AstNode *parent_node = node;
1225		if (token->id == TokenIdStarStar) {
1226		// pretend that we got 2 star tokens
1227
1228		parent_node = ast_create_node(pc, NodeTypePrefixOpExpr, token);
1229		parent_node->data.prefix_op_expr.primary_expr = node;
1230		parent_node->data.prefix_op_expr.prefix_op = PrefixOpDereference;
1231
1232		node->column += 1;
1233		}
1234	1238
1235	1239	AstNode *prefix_op_expr = ast_parse_error_set_expr(pc, token_index, true);
1236	1240	node->data.prefix_op_expr.primary_expr = prefix_op_expr;
...	...	@@ -3012,6 +3016,9 @@ void ast_visit_node_children(AstNode node, void (visit)(AstNode *, void cont
3012	3016	case NodeTypeFieldAccessExpr:
3013	3017	visit_field(&node->data.field_access_expr.struct_expr, visit, context);
3014	3018	break;
	3019	case NodeTypePtrDeref:
	3020	visit_field(&node->data.ptr_deref_expr.target, visit, context);
	3021	break;
3015	3022	case NodeTypeUse:
3016	3023	visit_field(&node->data.use.expr, visit, context);
3017	3024	break;

src/target.cpp+63-1

...	...	@@ -702,6 +702,7 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
702	702	case OsLinux:
703	703	case OsMacOSX:
704	704	case OsZen:
	705	case OsOpenBSD:
705	706	switch (id) {
706	707	case CIntTypeShort:
707	708	case CIntTypeUShort:
...	...	@@ -742,7 +743,6 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
742	743	case OsKFreeBSD:
743	744	case OsLv2:
744	745	case OsNetBSD:
745		case OsOpenBSD:
746	746	case OsSolaris:
747	747	case OsHaiku:
748	748	case OsMinix:
...	...	@@ -896,3 +896,65 @@ bool target_can_exec(const ZigTarget host_target, const ZigTarget guest_target
896	896
897	897	return false;
898	898	}
	899
	900	const char arch_stack_pointer_register_name(const ArchType arch) {
	901	switch (arch->arch) {
	902	case ZigLLVM_UnknownArch:
	903	zig_unreachable();
	904	case ZigLLVM_x86:
	905	return "sp";
	906	case ZigLLVM_x86_64:
	907	return "rsp";
	908
	909	case ZigLLVM_aarch64:
	910	case ZigLLVM_arm:
	911	case ZigLLVM_thumb:
	912	case ZigLLVM_aarch64_be:
	913	case ZigLLVM_amdgcn:
	914	case ZigLLVM_amdil:
	915	case ZigLLVM_amdil64:
	916	case ZigLLVM_armeb:
	917	case ZigLLVM_arc:
	918	case ZigLLVM_avr:
	919	case ZigLLVM_bpfeb:
	920	case ZigLLVM_bpfel:
	921	case ZigLLVM_hexagon:
	922	case ZigLLVM_lanai:
	923	case ZigLLVM_hsail:
	924	case ZigLLVM_hsail64:
	925	case ZigLLVM_kalimba:
	926	case ZigLLVM_le32:
	927	case ZigLLVM_le64:
	928	case ZigLLVM_mips:
	929	case ZigLLVM_mips64:
	930	case ZigLLVM_mips64el:
	931	case ZigLLVM_mipsel:
	932	case ZigLLVM_msp430:
	933	case ZigLLVM_nios2:
	934	case ZigLLVM_nvptx:
	935	case ZigLLVM_nvptx64:
	936	case ZigLLVM_ppc64le:
	937	case ZigLLVM_r600:
	938	case ZigLLVM_renderscript32:
	939	case ZigLLVM_renderscript64:
	940	case ZigLLVM_riscv32:
	941	case ZigLLVM_riscv64:
	942	case ZigLLVM_shave:
	943	case ZigLLVM_sparc:
	944	case ZigLLVM_sparcel:
	945	case ZigLLVM_sparcv9:
	946	case ZigLLVM_spir:
	947	case ZigLLVM_spir64:
	948	case ZigLLVM_systemz:
	949	case ZigLLVM_tce:
	950	case ZigLLVM_tcele:
	951	case ZigLLVM_thumbeb:
	952	case ZigLLVM_wasm32:
	953	case ZigLLVM_wasm64:
	954	case ZigLLVM_xcore:
	955	case ZigLLVM_ppc:
	956	case ZigLLVM_ppc64:
	957	zig_panic("TODO populate this table with stack pointer register name for this CPU architecture");
	958	}
	959	zig_unreachable();
	960	}

src/target.hpp+2

...	...	@@ -77,6 +77,8 @@ size_t target_arch_count(void);
77	77	const ArchType *get_target_arch(size_t index);
78	78	void get_arch_name(char out_str, const ArchType arch);
79	79
	80	const char arch_stack_pointer_register_name(const ArchType arch);
	81
80	82	size_t target_vendor_count(void);
81	83	ZigLLVM_VendorType get_target_vendor(size_t index);
82	84

src/translate_c.cpp+53-30

...	...	@@ -247,6 +247,12 @@ static AstNode trans_create_node_field_access_str(Context c, AstNode *containe
247	247	return trans_create_node_field_access(c, container, buf_create_from_str(field_name));
248	248	}
249	249
	250	static AstNode trans_create_node_ptr_deref(Context c, AstNode *child_node) {
	251	AstNode *node = trans_create_node(c, NodeTypePtrDeref);
	252	node->data.ptr_deref_expr.target = child_node;
	253	return node;
	254	}
	255
250	256	static AstNode trans_create_node_prefix_op(Context c, PrefixOp op, AstNode *child_node) {
251	257	AstNode *node = trans_create_node(c, NodeTypePrefixOpExpr);
252	258	node->data.prefix_op_expr.prefix_op = op;
...	...	@@ -1412,8 +1418,7 @@ static AstNode trans_create_compound_assign_shift(Context c, ResultUsed result
1412	1418	AstNode *operation_type_cast = trans_c_cast(c, rhs_location,
1413	1419	stmt->getComputationLHSType(),
1414	1420	stmt->getLHS()->getType(),
1415		trans_create_node_prefix_op(c, PrefixOpDereference,
1416		trans_create_node_symbol(c, tmp_var_name)));
	1421	trans_create_node_ptr_deref(c, trans_create_node_symbol(c, tmp_var_name)));
1417	1422
1418	1423	// result_type(... >> u5(rhs))
1419	1424	AstNode *result_type_cast = trans_c_cast(c, rhs_location,
...	...	@@ -1426,7 +1431,7 @@ static AstNode trans_create_compound_assign_shift(Context c, ResultUsed result
1426	1431
1427	1432	// *_ref = ...
1428	1433	AstNode *assign_statement = trans_create_node_bin_op(c,
1429		trans_create_node_prefix_op(c, PrefixOpDereference,
	1434	trans_create_node_ptr_deref(c,
1430	1435	trans_create_node_symbol(c, tmp_var_name)),
1431	1436	BinOpTypeAssign, result_type_cast);
1432	1437
...	...	@@ -1436,7 +1441,7 @@ static AstNode trans_create_compound_assign_shift(Context c, ResultUsed result
1436	1441	// break :x *_ref
1437	1442	child_scope->node->data.block.statements.append(
1438	1443	trans_create_node_break(c, label_name,
1439		trans_create_node_prefix_op(c, PrefixOpDereference,
	1444	trans_create_node_ptr_deref(c,
1440	1445	trans_create_node_symbol(c, tmp_var_name))));
1441	1446	}
1442	1447
...	...	@@ -1483,11 +1488,11 @@ static AstNode trans_create_compound_assign(Context c, ResultUsed result_used,
1483	1488	if (rhs == nullptr) return nullptr;
1484	1489
1485	1490	AstNode *assign_statement = trans_create_node_bin_op(c,
1486		trans_create_node_prefix_op(c, PrefixOpDereference,
	1491	trans_create_node_ptr_deref(c,
1487	1492	trans_create_node_symbol(c, tmp_var_name)),
1488	1493	BinOpTypeAssign,
1489	1494	trans_create_node_bin_op(c,
1490		trans_create_node_prefix_op(c, PrefixOpDereference,
	1495	trans_create_node_ptr_deref(c,
1491	1496	trans_create_node_symbol(c, tmp_var_name)),
1492	1497	bin_op,
1493	1498	rhs));
...	...	@@ -1496,7 +1501,7 @@ static AstNode trans_create_compound_assign(Context c, ResultUsed result_used,
1496	1501	// break :x *_ref
1497	1502	child_scope->node->data.block.statements.append(
1498	1503	trans_create_node_break(c, label_name,
1499		trans_create_node_prefix_op(c, PrefixOpDereference,
	1504	trans_create_node_ptr_deref(c,
1500	1505	trans_create_node_symbol(c, tmp_var_name))));
1501	1506
1502	1507	return child_scope->node;
...	...	@@ -1817,13 +1822,13 @@ static AstNode trans_create_post_crement(Context c, ResultUsed result_used, Tr
1817	1822	// const _tmp = *_ref;
1818	1823	Buf* tmp_var_name = buf_create_from_str("_tmp");
1819	1824	AstNode *tmp_var_decl = trans_create_node_var_decl_local(c, true, tmp_var_name, nullptr,
1820		trans_create_node_prefix_op(c, PrefixOpDereference,
	1825	trans_create_node_ptr_deref(c,
1821	1826	trans_create_node_symbol(c, ref_var_name)));
1822	1827	child_scope->node->data.block.statements.append(tmp_var_decl);
1823	1828
1824	1829	// *_ref += 1;
1825	1830	AstNode *assign_statement = trans_create_node_bin_op(c,
1826		trans_create_node_prefix_op(c, PrefixOpDereference,
	1831	trans_create_node_ptr_deref(c,
1827	1832	trans_create_node_symbol(c, ref_var_name)),
1828	1833	assign_op,
1829	1834	trans_create_node_unsigned(c, 1));
...	...	@@ -1871,14 +1876,14 @@ static AstNode trans_create_pre_crement(Context c, ResultUsed result_used, Tra
1871	1876
1872	1877	// *_ref += 1;
1873	1878	AstNode *assign_statement = trans_create_node_bin_op(c,
1874		trans_create_node_prefix_op(c, PrefixOpDereference,
	1879	trans_create_node_ptr_deref(c,
1875	1880	trans_create_node_symbol(c, ref_var_name)),
1876	1881	assign_op,
1877	1882	trans_create_node_unsigned(c, 1));
1878	1883	child_scope->node->data.block.statements.append(assign_statement);
1879	1884
1880	1885	// break :x *_ref
1881		AstNode *deref_expr = trans_create_node_prefix_op(c, PrefixOpDereference,
	1886	AstNode *deref_expr = trans_create_node_ptr_deref(c,
1882	1887	trans_create_node_symbol(c, ref_var_name));
1883	1888	child_scope->node->data.block.statements.append(trans_create_node_break(c, label_name, deref_expr));
1884	1889
...	...	@@ -1923,7 +1928,7 @@ static AstNode trans_unary_operator(Context c, ResultUsed result_used, TransSc
1923	1928	if (is_fn_ptr)
1924	1929	return value_node;
1925	1930	AstNode *unwrapped = trans_create_node_prefix_op(c, PrefixOpUnwrapMaybe, value_node);
1926		return trans_create_node_prefix_op(c, PrefixOpDereference, unwrapped);
	1931	return trans_create_node_ptr_deref(c, unwrapped);
1927	1932	}
1928	1933	case UO_Plus:
1929	1934	emit_warning(c, stmt->getLocStart(), "TODO handle C translation UO_Plus");
...	...	@@ -4443,27 +4448,45 @@ static AstNode parse_ctok_suffix_op_expr(Context c, CTokenize ctok, size_t t
4443	4448	}
4444	4449	}
4445	4450
4446		static PrefixOp ctok_to_prefix_op(CTok *token) {
4447		switch (token->id) {
4448		case CTokIdBang: return PrefixOpBoolNot;
4449		case CTokIdMinus: return PrefixOpNegation;
4450		case CTokIdTilde: return PrefixOpBinNot;
4451		case CTokIdAsterisk: return PrefixOpDereference;
4452		default: return PrefixOpInvalid;
4453		}
4454		}
4455	4451	static AstNode parse_ctok_prefix_op_expr(Context c, CTokenize ctok, size_t tok_i) {
4456	4452	CTok op_tok = &ctok->tokens.at(tok_i);
4457		PrefixOp prefix_op = ctok_to_prefix_op(op_tok);
4458		if (prefix_op == PrefixOpInvalid) {
4459		return parse_ctok_suffix_op_expr(c, ctok, tok_i);
4460		}
4461		*tok_i += 1;
4462	4453
4463		AstNode *prefix_op_expr = parse_ctok_prefix_op_expr(c, ctok, tok_i);
4464		if (prefix_op_expr == nullptr)
4465		return nullptr;
4466		return trans_create_node_prefix_op(c, prefix_op, prefix_op_expr);
	4454	switch (op_tok->id) {
	4455	case CTokIdBang:
	4456	{
	4457	*tok_i += 1;
	4458	AstNode *prefix_op_expr = parse_ctok_prefix_op_expr(c, ctok, tok_i);
	4459	if (prefix_op_expr == nullptr)
	4460	return nullptr;
	4461	return trans_create_node_prefix_op(c, PrefixOpBoolNot, prefix_op_expr);
	4462	}
	4463	case CTokIdMinus:
	4464	{
	4465	*tok_i += 1;
	4466	AstNode *prefix_op_expr = parse_ctok_prefix_op_expr(c, ctok, tok_i);
	4467	if (prefix_op_expr == nullptr)
	4468	return nullptr;
	4469	return trans_create_node_prefix_op(c, PrefixOpNegation, prefix_op_expr);
	4470	}
	4471	case CTokIdTilde:
	4472	{
	4473	*tok_i += 1;
	4474	AstNode *prefix_op_expr = parse_ctok_prefix_op_expr(c, ctok, tok_i);
	4475	if (prefix_op_expr == nullptr)
	4476	return nullptr;
	4477	return trans_create_node_prefix_op(c, PrefixOpBinNot, prefix_op_expr);
	4478	}
	4479	case CTokIdAsterisk:
	4480	{
	4481	*tok_i += 1;
	4482	AstNode *prefix_op_expr = parse_ctok_prefix_op_expr(c, ctok, tok_i);
	4483	if (prefix_op_expr == nullptr)
	4484	return nullptr;
	4485	return trans_create_node_ptr_deref(c, prefix_op_expr);
	4486	}
	4487	default:
	4488	return parse_ctok_suffix_op_expr(c, ctok, tok_i);
	4489	}
4467	4490	}
4468	4491
4469	4492	static void process_macro(Context c, CTokenize ctok, Buf name, const char char_ptr) {

std/array_list.zig+39-24

...	...	@@ -8,7 +8,7 @@ pub fn ArrayList(comptime T: type) type {
8	8	return AlignedArrayList(T, @alignOf(T));
9	9	}
10	10
11		pub fn AlignedArrayList(comptime T: type, comptime A: u29) type{
	11	pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
12	12	return struct {
13	13	const Self = this;
14	14
...	...	@@ -21,7 +21,7 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type{
21	21
22	22	/// Deinitialize with `deinit` or use `toOwnedSlice`.
23	23	pub fn init(allocator: &Allocator) Self {
24		return Self {
	24	return Self{
25	25	.items = []align(A) T{},
26	26	.len = 0,
27	27	.allocator = allocator,
...	...	@@ -52,7 +52,7 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type{
52	52	/// allocated with `allocator`.
53	53	/// Deinitialize with `deinit` or use `toOwnedSlice`.
54	54	pub fn fromOwnedSlice(allocator: &Allocator, slice: []align(A) T) Self {
55		return Self {
	55	return Self{
56	56	.items = slice,
57	57	.len = slice.len,
58	58	.allocator = allocator,
...	...	@@ -63,7 +63,7 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type{
63	63	pub fn toOwnedSlice(self: &Self) []align(A) T {
64	64	const allocator = self.allocator;
65	65	const result = allocator.alignedShrink(T, A, self.items, self.len);
66		*self = init(allocator);
	66	self.* = init(allocator);
67	67	return result;
68	68	}
69	69
...	...	@@ -71,21 +71,21 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type{
71	71	try l.ensureCapacity(l.len + 1);
72	72	l.len += 1;
73	73
74		mem.copy(T, l.items[n+1..l.len], l.items[n..l.len-1]);
75		l.items[n] = *item;
	74	mem.copy(T, l.items[n + 1..l.len], l.items[n..l.len - 1]);
	75	l.items[n] = item.*;
76	76	}
77	77
78	78	pub fn insertSlice(l: &Self, n: usize, items: []align(A) const T) !void {
79	79	try l.ensureCapacity(l.len + items.len);
80	80	l.len += items.len;
81	81
82		mem.copy(T, l.items[n+items.len..l.len], l.items[n..l.len-items.len]);
83		mem.copy(T, l.items[n..n+items.len], items);
	82	mem.copy(T, l.items[n + items.len..l.len], l.items[n..l.len - items.len]);
	83	mem.copy(T, l.items[n..n + items.len], items);
84	84	}
85	85
86	86	pub fn append(l: &Self, item: &const T) !void {
87	87	const new_item_ptr = try l.addOne();
88		new_item_ptr = item;
	88	new_item_ptr.* = item.*;
89	89	}
90	90
91	91	pub fn appendSlice(l: &Self, items: []align(A) const T) !void {
...	...	@@ -128,8 +128,7 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type{
128	128	}
129	129
130	130	pub fn popOrNull(self: &Self) ?T {
131		if (self.len == 0)
132		return null;
	131	if (self.len == 0) return null;
133	132	return self.pop();
134	133	}
135	134
...	...	@@ -151,7 +150,10 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type{
151	150	};
152	151
153	152	pub fn iterator(self: &const Self) Iterator {
154		return Iterator { .list = self, .count = 0 };
	153	return Iterator{
	154	.list = self,
	155	.count = 0,
	156	};
155	157	}
156	158	};
157	159	}
...	...	@@ -160,13 +162,19 @@ test "basic ArrayList test" {
160	162	var list = ArrayList(i32).init(debug.global_allocator);
161	163	defer list.deinit();
162	164
163		{var i: usize = 0; while (i < 10) : (i += 1) {
164		list.append(i32(i + 1)) catch unreachable;
165		}}
	165	{
	166	var i: usize = 0;
	167	while (i < 10) : (i += 1) {
	168	list.append(i32(i + 1)) catch unreachable;
	169	}
	170	}
166	171
167		{var i: usize = 0; while (i < 10) : (i += 1) {
168		assert(list.items[i] == i32(i + 1));
169		}}
	172	{
	173	var i: usize = 0;
	174	while (i < 10) : (i += 1) {
	175	assert(list.items[i] == i32(i + 1));
	176	}
	177	}
170	178
171	179	for (list.toSlice()) \|v, i\| {
172	180	assert(v == i32(i + 1));
...	...	@@ -179,14 +187,18 @@ test "basic ArrayList test" {
179	187	assert(list.pop() == 10);
180	188	assert(list.len == 9);
181	189
182		list.appendSlice([]const i32 { 1, 2, 3 }) catch unreachable;
	190	list.appendSlice([]const i32{
	191	1,
	192	2,
	193	3,
	194	}) catch unreachable;
183	195	assert(list.len == 12);
184	196	assert(list.pop() == 3);
185	197	assert(list.pop() == 2);
186	198	assert(list.pop() == 1);
187	199	assert(list.len == 9);
188	200
189		list.appendSlice([]const i32 {}) catch unreachable;
	201	list.appendSlice([]const i32{}) catch unreachable;
190	202	assert(list.len == 9);
191	203	}
192	204
...	...	@@ -198,7 +210,7 @@ test "iterator ArrayList test" {
198	210	try list.append(2);
199	211	try list.append(3);
200	212
201		var count : i32 = 0;
	213	var count: i32 = 0;
202	214	var it = list.iterator();
203	215	while (it.next()) \|next\| {
204	216	assert(next == count + 1);
...	...	@@ -216,7 +228,7 @@ test "iterator ArrayList test" {
216	228	}
217	229
218	230	it.reset();
219		assert(?? it.next() == 1);
	231	assert(??it.next() == 1);
220	232	}
221	233
222	234	test "insert ArrayList test" {
...	...	@@ -228,12 +240,15 @@ test "insert ArrayList test" {
228	240	assert(list.items[0] == 5);
229	241	assert(list.items[1] == 1);
230	242
231		try list.insertSlice(1, []const i32 { 9, 8 });
	243	try list.insertSlice(1, []const i32{
	244	9,
	245	8,
	246	});
232	247	assert(list.items[0] == 5);
233	248	assert(list.items[1] == 9);
234	249	assert(list.items[2] == 8);
235	250
236		const items = []const i32 { 1 };
	251	const items = []const i32{1};
237	252	try list.insertSlice(0, items[0..0]);
238	253	assert(list.items[0] == 5);
239	254	}

std/atomic/queue.zig+8-6

...	...	@@ -16,7 +16,7 @@ pub fn Queue(comptime T: type) type {
16	16	data: T,
17	17	};
18	18
19		// TODO: well defined copy elision: https://github.com/zig-lang/zig/issues/287
	19	// TODO: well defined copy elision: https://github.com/ziglang/zig/issues/287
20	20	pub fn init(self: &Self) void {
21	21	self.root.next = null;
22	22	self.head = &self.root;
...	...	@@ -70,7 +70,7 @@ test "std.atomic.queue" {
70	70
71	71	var queue: Queue(i32) = undefined;
72	72	queue.init();
73		var context = Context {
	73	var context = Context{
74	74	.allocator = a,
75	75	.queue = &queue,
76	76	.put_sum = 0,
...	...	@@ -81,16 +81,18 @@ test "std.atomic.queue" {
81	81
82	82	var putters: [put_thread_count]&std.os.Thread = undefined;
83	83	for (putters) \|*t\| {
84		*t = try std.os.spawnThread(&context, startPuts);
	84	t.* = try std.os.spawnThread(&context, startPuts);
85	85	}
86	86	var getters: [put_thread_count]&std.os.Thread = undefined;
87	87	for (getters) \|*t\| {
88		*t = try std.os.spawnThread(&context, startGets);
	88	t.* = try std.os.spawnThread(&context, startGets);
89	89	}
90	90
91		for (putters) \|t\| t.wait();
	91	for (putters) \|t\|
	92	t.wait();
92	93	_ = @atomicRmw(u8, &context.puts_done, builtin.AtomicRmwOp.Xchg, 1, AtomicOrder.SeqCst);
93		for (getters) \|t\| t.wait();
	94	for (getters) \|t\|
	95	t.wait();
94	96
95	97	std.debug.assert(context.put_sum == context.get_sum);
96	98	std.debug.assert(context.get_count == puts_per_thread * put_thread_count);

std/atomic/stack.zig+8-8

...	...	@@ -14,9 +14,7 @@ pub fn Stack(comptime T: type) type {
14	14	};
15	15
16	16	pub fn init() Self {
17		return Self {
18		.root = null,
19		};
	17	return Self{ .root = null };
20	18	}
21	19
22	20	/// push operation, but only if you are the first item in the stack. if you did not succeed in
...	...	@@ -75,7 +73,7 @@ test "std.atomic.stack" {
75	73	var a = &fixed_buffer_allocator.allocator;
76	74
77	75	var stack = Stack(i32).init();
78		var context = Context {
	76	var context = Context{
79	77	.allocator = a,
80	78	.stack = &stack,
81	79	.put_sum = 0,
...	...	@@ -86,16 +84,18 @@ test "std.atomic.stack" {
86	84
87	85	var putters: [put_thread_count]&std.os.Thread = undefined;
88	86	for (putters) \|*t\| {
89		*t = try std.os.spawnThread(&context, startPuts);
	87	t.* = try std.os.spawnThread(&context, startPuts);
90	88	}
91	89	var getters: [put_thread_count]&std.os.Thread = undefined;
92	90	for (getters) \|*t\| {
93		*t = try std.os.spawnThread(&context, startGets);
	91	t.* = try std.os.spawnThread(&context, startGets);
94	92	}
95	93
96		for (putters) \|t\| t.wait();
	94	for (putters) \|t\|
	95	t.wait();
97	96	_ = @atomicRmw(u8, &context.puts_done, builtin.AtomicRmwOp.Xchg, 1, AtomicOrder.SeqCst);
98		for (getters) \|t\| t.wait();
	97	for (getters) \|t\|
	98	t.wait();
99	99
100	100	std.debug.assert(context.put_sum == context.get_sum);
101	101	std.debug.assert(context.get_count == puts_per_thread * put_thread_count);

std/base64.zig+47-71

...	...	@@ -41,12 +41,10 @@ pub const Base64Encoder = struct {
41	41	dest[out_index] = encoder.alphabet_chars[(source[i] >> 2) & 0x3f];
42	42	out_index += 1;
43	43
44		dest[out_index] = encoder.alphabet_chars[((source[i] & 0x3) << 4) \|
45		((source[i + 1] & 0xf0) >> 4)];
	44	dest[out_index] = encoder.alphabet_chars[((source[i] & 0x3) << 4) \| ((source[i + 1] & 0xf0) >> 4)];
46	45	out_index += 1;
47	46
48		dest[out_index] = encoder.alphabet_chars[((source[i + 1] & 0xf) << 2) \|
49		((source[i + 2] & 0xc0) >> 6)];
	47	dest[out_index] = encoder.alphabet_chars[((source[i + 1] & 0xf) << 2) \| ((source[i + 2] & 0xc0) >> 6)];
50	48	out_index += 1;
51	49
52	50	dest[out_index] = encoder.alphabet_chars[source[i + 2] & 0x3f];
...	...	@@ -64,8 +62,7 @@ pub const Base64Encoder = struct {
64	62	dest[out_index] = encoder.pad_char;
65	63	out_index += 1;
66	64	} else {
67		dest[out_index] = encoder.alphabet_chars[((source[i] & 0x3) << 4) \|
68		((source[i + 1] & 0xf0) >> 4)];
	65	dest[out_index] = encoder.alphabet_chars[((source[i] & 0x3) << 4) \| ((source[i + 1] & 0xf0) >> 4)];
69	66	out_index += 1;
70	67
71	68	dest[out_index] = encoder.alphabet_chars[(source[i + 1] & 0xf) << 2];
...	...	@@ -84,6 +81,7 @@ pub const Base64Decoder = struct {
84	81	/// e.g. 'A' => 0.
85	82	/// undefined for any value not in the 64 alphabet chars.
86	83	char_to_index: [256]u8,
	84
87	85	/// true only for the 64 chars in the alphabet, not the pad char.
88	86	char_in_alphabet: [256]bool,
89	87	pad_char: u8,
...	...	@@ -131,26 +129,20 @@ pub const Base64Decoder = struct {
131	129	// common case
132	130	if (!decoder.char_in_alphabet[source[src_cursor + 2]]) return error.InvalidCharacter;
133	131	if (!decoder.char_in_alphabet[source[src_cursor + 3]]) return error.InvalidCharacter;
134		dest[dest_cursor + 0] = decoder.char_to_index[source[src_cursor + 0]] << 2 \|
135		decoder.char_to_index[source[src_cursor + 1]] >> 4;
136		dest[dest_cursor + 1] = decoder.char_to_index[source[src_cursor + 1]] << 4 \|
137		decoder.char_to_index[source[src_cursor + 2]] >> 2;
138		dest[dest_cursor + 2] = decoder.char_to_index[source[src_cursor + 2]] << 6 \|
139		decoder.char_to_index[source[src_cursor + 3]];
	132	dest[dest_cursor + 0] = decoder.char_to_index[source[src_cursor + 0]] << 2 \| decoder.char_to_index[source[src_cursor + 1]] >> 4;
	133	dest[dest_cursor + 1] = decoder.char_to_index[source[src_cursor + 1]] << 4 \| decoder.char_to_index[source[src_cursor + 2]] >> 2;
	134	dest[dest_cursor + 2] = decoder.char_to_index[source[src_cursor + 2]] << 6 \| decoder.char_to_index[source[src_cursor + 3]];
140	135	dest_cursor += 3;
141	136	} else if (source[src_cursor + 2] != decoder.pad_char) {
142	137	// one pad char
143	138	if (!decoder.char_in_alphabet[source[src_cursor + 2]]) return error.InvalidCharacter;
144		dest[dest_cursor + 0] = decoder.char_to_index[source[src_cursor + 0]] << 2 \|
145		decoder.char_to_index[source[src_cursor + 1]] >> 4;
146		dest[dest_cursor + 1] = decoder.char_to_index[source[src_cursor + 1]] << 4 \|
147		decoder.char_to_index[source[src_cursor + 2]] >> 2;
	139	dest[dest_cursor + 0] = decoder.char_to_index[source[src_cursor + 0]] << 2 \| decoder.char_to_index[source[src_cursor + 1]] >> 4;
	140	dest[dest_cursor + 1] = decoder.char_to_index[source[src_cursor + 1]] << 4 \| decoder.char_to_index[source[src_cursor + 2]] >> 2;
148	141	if (decoder.char_to_index[source[src_cursor + 2]] << 6 != 0) return error.InvalidPadding;
149	142	dest_cursor += 2;
150	143	} else {
151	144	// two pad chars
152		dest[dest_cursor + 0] = decoder.char_to_index[source[src_cursor + 0]] << 2 \|
153		decoder.char_to_index[source[src_cursor + 1]] >> 4;
	145	dest[dest_cursor + 0] = decoder.char_to_index[source[src_cursor + 0]] << 2 \| decoder.char_to_index[source[src_cursor + 1]] >> 4;
154	146	if (decoder.char_to_index[source[src_cursor + 1]] << 4 != 0) return error.InvalidPadding;
155	147	dest_cursor += 1;
156	148	}
...	...	@@ -165,7 +157,7 @@ pub const Base64DecoderWithIgnore = struct {
165	157	decoder: Base64Decoder,
166	158	char_is_ignored: [256]bool,
167	159	pub fn init(alphabet_chars: []const u8, pad_char: u8, ignore_chars: []const u8) Base64DecoderWithIgnore {
168		var result = Base64DecoderWithIgnore {
	160	var result = Base64DecoderWithIgnore{
169	161	.decoder = Base64Decoder.init(alphabet_chars, pad_char),
170	162	.char_is_ignored = []bool{false} ** 256,
171	163	};
...	...	@@ -223,10 +215,12 @@ pub const Base64DecoderWithIgnore = struct {
223	215	} else if (decoder_with_ignore.char_is_ignored[c]) {
224	216	// we can even ignore chars during the padding
225	217	continue;
226		} else return error.InvalidCharacter;
	218	} else
	219	return error.InvalidCharacter;
227	220	}
228	221	break;
229		} else return error.InvalidCharacter;
	222	} else
	223	return error.InvalidCharacter;
230	224	}
231	225
232	226	switch (available_chars) {
...	...	@@ -234,22 +228,17 @@ pub const Base64DecoderWithIgnore = struct {
234	228	// common case
235	229	if (dest_cursor + 3 > dest.len) return error.OutputTooSmall;
236	230	assert(pad_char_count == 0);
237		dest[dest_cursor + 0] = decoder.char_to_index[next_4_chars[0]] << 2 \|
238		decoder.char_to_index[next_4_chars[1]] >> 4;
239		dest[dest_cursor + 1] = decoder.char_to_index[next_4_chars[1]] << 4 \|
240		decoder.char_to_index[next_4_chars[2]] >> 2;
241		dest[dest_cursor + 2] = decoder.char_to_index[next_4_chars[2]] << 6 \|
242		decoder.char_to_index[next_4_chars[3]];
	231	dest[dest_cursor + 0] = decoder.char_to_index[next_4_chars[0]] << 2 \| decoder.char_to_index[next_4_chars[1]] >> 4;
	232	dest[dest_cursor + 1] = decoder.char_to_index[next_4_chars[1]] << 4 \| decoder.char_to_index[next_4_chars[2]] >> 2;
	233	dest[dest_cursor + 2] = decoder.char_to_index[next_4_chars[2]] << 6 \| decoder.char_to_index[next_4_chars[3]];
243	234	dest_cursor += 3;
244	235	continue;
245	236	},
246	237	3 => {
247	238	if (dest_cursor + 2 > dest.len) return error.OutputTooSmall;
248	239	if (pad_char_count != 1) return error.InvalidPadding;
249		dest[dest_cursor + 0] = decoder.char_to_index[next_4_chars[0]] << 2 \|
250		decoder.char_to_index[next_4_chars[1]] >> 4;
251		dest[dest_cursor + 1] = decoder.char_to_index[next_4_chars[1]] << 4 \|
252		decoder.char_to_index[next_4_chars[2]] >> 2;
	240	dest[dest_cursor + 0] = decoder.char_to_index[next_4_chars[0]] << 2 \| decoder.char_to_index[next_4_chars[1]] >> 4;
	241	dest[dest_cursor + 1] = decoder.char_to_index[next_4_chars[1]] << 4 \| decoder.char_to_index[next_4_chars[2]] >> 2;
253	242	if (decoder.char_to_index[next_4_chars[2]] << 6 != 0) return error.InvalidPadding;
254	243	dest_cursor += 2;
255	244	break;
...	...	@@ -257,8 +246,7 @@ pub const Base64DecoderWithIgnore = struct {
257	246	2 => {
258	247	if (dest_cursor + 1 > dest.len) return error.OutputTooSmall;
259	248	if (pad_char_count != 2) return error.InvalidPadding;
260		dest[dest_cursor + 0] = decoder.char_to_index[next_4_chars[0]] << 2 \|
261		decoder.char_to_index[next_4_chars[1]] >> 4;
	249	dest[dest_cursor + 0] = decoder.char_to_index[next_4_chars[0]] << 2 \| decoder.char_to_index[next_4_chars[1]] >> 4;
262	250	if (decoder.char_to_index[next_4_chars[1]] << 4 != 0) return error.InvalidPadding;
263	251	dest_cursor += 1;
264	252	break;
...	...	@@ -280,7 +268,6 @@ pub const Base64DecoderWithIgnore = struct {
280	268	}
281	269	};
282	270
283
284	271	pub const standard_decoder_unsafe = Base64DecoderUnsafe.init(standard_alphabet_chars, standard_pad_char);
285	272
286	273	pub const Base64DecoderUnsafe = struct {
...	...	@@ -291,7 +278,7 @@ pub const Base64DecoderUnsafe = struct {
291	278
292	279	pub fn init(alphabet_chars: []const u8, pad_char: u8) Base64DecoderUnsafe {
293	280	assert(alphabet_chars.len == 64);
294		var result = Base64DecoderUnsafe {
	281	var result = Base64DecoderUnsafe{
295	282	.char_to_index = undefined,
296	283	.pad_char = pad_char,
297	284	};
...	...	@@ -321,16 +308,13 @@ pub const Base64DecoderUnsafe = struct {
321	308	}
322	309
323	310	while (in_buf_len > 4) {
324		dest[dest_index] = decoder.char_to_index[source[src_index + 0]] << 2 \|
325		decoder.char_to_index[source[src_index + 1]] >> 4;
	311	dest[dest_index] = decoder.char_to_index[source[src_index + 0]] << 2 \| decoder.char_to_index[source[src_index + 1]] >> 4;
326	312	dest_index += 1;
327	313
328		dest[dest_index] = decoder.char_to_index[source[src_index + 1]] << 4 \|
329		decoder.char_to_index[source[src_index + 2]] >> 2;
	314	dest[dest_index] = decoder.char_to_index[source[src_index + 1]] << 4 \| decoder.char_to_index[source[src_index + 2]] >> 2;
330	315	dest_index += 1;
331	316
332		dest[dest_index] = decoder.char_to_index[source[src_index + 2]] << 6 \|
333		decoder.char_to_index[source[src_index + 3]];
	317	dest[dest_index] = decoder.char_to_index[source[src_index + 2]] << 6 \| decoder.char_to_index[source[src_index + 3]];
334	318	dest_index += 1;
335	319
336	320	src_index += 4;
...	...	@@ -338,18 +322,15 @@ pub const Base64DecoderUnsafe = struct {
338	322	}
339	323
340	324	if (in_buf_len > 1) {
341		dest[dest_index] = decoder.char_to_index[source[src_index + 0]] << 2 \|
342		decoder.char_to_index[source[src_index + 1]] >> 4;
	325	dest[dest_index] = decoder.char_to_index[source[src_index + 0]] << 2 \| decoder.char_to_index[source[src_index + 1]] >> 4;
343	326	dest_index += 1;
344	327	}
345	328	if (in_buf_len > 2) {
346		dest[dest_index] = decoder.char_to_index[source[src_index + 1]] << 4 \|
347		decoder.char_to_index[source[src_index + 2]] >> 2;
	329	dest[dest_index] = decoder.char_to_index[source[src_index + 1]] << 4 \| decoder.char_to_index[source[src_index + 2]] >> 2;
348	330	dest_index += 1;
349	331	}
350	332	if (in_buf_len > 3) {
351		dest[dest_index] = decoder.char_to_index[source[src_index + 2]] << 6 \|
352		decoder.char_to_index[source[src_index + 3]];
	333	dest[dest_index] = decoder.char_to_index[source[src_index + 2]] << 6 \| decoder.char_to_index[source[src_index + 3]];
353	334	dest_index += 1;
354	335	}
355	336	}
...	...	@@ -367,7 +348,6 @@ fn calcDecodedSizeExactUnsafe(source: []const u8, pad_char: u8) usize {
367	348	return result;
368	349	}
369	350
370
371	351	test "base64" {
372	352	@setEvalBranchQuota(8000);
373	353	testBase64() catch unreachable;
...	...	@@ -375,26 +355,26 @@ test "base64" {
375	355	}
376	356
377	357	fn testBase64() !void {
378		try testAllApis("", "");
379		try testAllApis("f", "Zg==");
380		try testAllApis("fo", "Zm8=");
381		try testAllApis("foo", "Zm9v");
382		try testAllApis("foob", "Zm9vYg==");
383		try testAllApis("fooba", "Zm9vYmE=");
	358	try testAllApis("", "");
	359	try testAllApis("f", "Zg==");
	360	try testAllApis("fo", "Zm8=");
	361	try testAllApis("foo", "Zm9v");
	362	try testAllApis("foob", "Zm9vYg==");
	363	try testAllApis("fooba", "Zm9vYmE=");
384	364	try testAllApis("foobar", "Zm9vYmFy");
385	365
386		try testDecodeIgnoreSpace("", " ");
387		try testDecodeIgnoreSpace("f", "Z g= =");
388		try testDecodeIgnoreSpace("fo", " Zm8=");
389		try testDecodeIgnoreSpace("foo", "Zm9v ");
390		try testDecodeIgnoreSpace("foob", "Zm9vYg = = ");
391		try testDecodeIgnoreSpace("fooba", "Zm9v YmE=");
	366	try testDecodeIgnoreSpace("", " ");
	367	try testDecodeIgnoreSpace("f", "Z g= =");
	368	try testDecodeIgnoreSpace("fo", " Zm8=");
	369	try testDecodeIgnoreSpace("foo", "Zm9v ");
	370	try testDecodeIgnoreSpace("foob", "Zm9vYg = = ");
	371	try testDecodeIgnoreSpace("fooba", "Zm9v YmE=");
392	372	try testDecodeIgnoreSpace("foobar", " Z m 9 v Y m F y ");
393	373
394	374	// test getting some api errors
395		try testError("A", error.InvalidPadding);
396		try testError("AA", error.InvalidPadding);
397		try testError("AAA", error.InvalidPadding);
	375	try testError("A", error.InvalidPadding);
	376	try testError("AA", error.InvalidPadding);
	377	try testError("AAA", error.InvalidPadding);
398	378	try testError("A..A", error.InvalidCharacter);
399	379	try testError("AA=A", error.InvalidCharacter);
400	380	try testError("AA/=", error.InvalidPadding);
...	...	@@ -427,8 +407,7 @@ fn testAllApis(expected_decoded: []const u8, expected_encoded: []const u8) !void
427	407
428	408	// Base64DecoderWithIgnore
429	409	{
430		const standard_decoder_ignore_nothing = Base64DecoderWithIgnore.init(
431		standard_alphabet_chars, standard_pad_char, "");
	410	const standard_decoder_ignore_nothing = Base64DecoderWithIgnore.init(standard_alphabet_chars, standard_pad_char, "");
432	411	var buffer: [0x100]u8 = undefined;
433	412	var decoded = buffer[0..Base64DecoderWithIgnore.calcSizeUpperBound(expected_encoded.len)];
434	413	var written = try standard_decoder_ignore_nothing.decode(decoded, expected_encoded);
...	...	@@ -446,8 +425,7 @@ fn testAllApis(expected_decoded: []const u8, expected_encoded: []const u8) !void
446	425	}
447	426
448	427	fn testDecodeIgnoreSpace(expected_decoded: []const u8, encoded: []const u8) !void {
449		const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(
450		standard_alphabet_chars, standard_pad_char, " ");
	428	const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(standard_alphabet_chars, standard_pad_char, " ");
451	429	var buffer: [0x100]u8 = undefined;
452	430	var decoded = buffer[0..Base64DecoderWithIgnore.calcSizeUpperBound(encoded.len)];
453	431	var written = try standard_decoder_ignore_space.decode(decoded, encoded);
...	...	@@ -455,8 +433,7 @@ fn testDecodeIgnoreSpace(expected_decoded: []const u8, encoded: []const u8) !voi
455	433	}
456	434
457	435	fn testError(encoded: []const u8, expected_err: error) !void {
458		const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(
459		standard_alphabet_chars, standard_pad_char, " ");
	436	const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(standard_alphabet_chars, standard_pad_char, " ");
460	437	var buffer: [0x100]u8 = undefined;
461	438	if (standard_decoder.calcSize(encoded)) \|decoded_size\| {
462	439	var decoded = buffer[0..decoded_size];
...	...	@@ -471,8 +448,7 @@ fn testError(encoded: []const u8, expected_err: error) !void {
471	448	}
472	449
473	450	fn testOutputTooSmallError(encoded: []const u8) !void {
474		const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(
475		standard_alphabet_chars, standard_pad_char, " ");
	451	const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(standard_alphabet_chars, standard_pad_char, " ");
476	452	var buffer: [0x100]u8 = undefined;
477	453	var decoded = buffer[0..calcDecodedSizeExactUnsafe(encoded, standard_pad_char) - 1];
478	454	if (standard_decoder_ignore_space.decode(decoded, encoded)) \|_\| {

std/buf_map.zig+1-3

...	...	@@ -12,9 +12,7 @@ pub const BufMap = struct {
12	12	const BufMapHashMap = HashMap([]const u8, []const u8, mem.hash_slice_u8, mem.eql_slice_u8);
13	13
14	14	pub fn init(allocator: &Allocator) BufMap {
15		var self = BufMap {
16		.hash_map = BufMapHashMap.init(allocator),
17		};
	15	var self = BufMap{ .hash_map = BufMapHashMap.init(allocator) };
18	16	return self;
19	17	}
20	18

std/buf_set.zig+1-3

...	...	@@ -10,9 +10,7 @@ pub const BufSet = struct {
10	10	const BufSetHashMap = HashMap([]const u8, void, mem.hash_slice_u8, mem.eql_slice_u8);
11	11
12	12	pub fn init(a: &Allocator) BufSet {
13		var self = BufSet {
14		.hash_map = BufSetHashMap.init(a),
15		};
	13	var self = BufSet{ .hash_map = BufSetHashMap.init(a) };
16	14	return self;
17	15	}
18	16

std/buffer.zig+3-8

...	...	@@ -31,9 +31,7 @@ pub const Buffer = struct {
31	31	/// * ::replaceContentsBuffer
32	32	/// * ::resize
33	33	pub fn initNull(allocator: &Allocator) Buffer {
34		return Buffer {
35		.list = ArrayList(u8).init(allocator),
36		};
	34	return Buffer{ .list = ArrayList(u8).init(allocator) };
37	35	}
38	36
39	37	/// Must deinitialize with deinit.
...	...	@@ -45,9 +43,7 @@ pub const Buffer = struct {
45	43	/// allocated with `allocator`.
46	44	/// Must deinitialize with deinit.
47	45	pub fn fromOwnedSlice(allocator: &Allocator, slice: []u8) Buffer {
48		var self = Buffer {
49		.list = ArrayList(u8).fromOwnedSlice(allocator, slice),
50		};
	46	var self = Buffer{ .list = ArrayList(u8).fromOwnedSlice(allocator, slice) };
51	47	self.list.append(0);
52	48	return self;
53	49	}
...	...	@@ -57,11 +53,10 @@ pub const Buffer = struct {
57	53	pub fn toOwnedSlice(self: &Buffer) []u8 {
58	54	const allocator = self.list.allocator;
59	55	const result = allocator.shrink(u8, self.list.items, self.len());
60		*self = initNull(allocator);
	56	self.* = initNull(allocator);
61	57	return result;
62	58	}
63	59
64
65	60	pub fn deinit(self: &Buffer) void {
66	61	self.list.deinit();
67	62	}

std/build.zig+78-130

...	...	@@ -82,10 +82,8 @@ pub const Builder = struct {
82	82	description: []const u8,
83	83	};
84	84
85		pub fn init(allocator: &Allocator, zig_exe: []const u8, build_root: []const u8,
86		cache_root: []const u8) Builder
87		{
88		var self = Builder {
	85	pub fn init(allocator: &Allocator, zig_exe: []const u8, build_root: []const u8, cache_root: []const u8) Builder {
	86	var self = Builder{
89	87	.zig_exe = zig_exe,
90	88	.build_root = build_root,
91	89	.cache_root = os.path.relative(allocator, build_root, cache_root) catch unreachable,
...	...	@@ -112,12 +110,12 @@ pub const Builder = struct {
112	110	.lib_dir = undefined,
113	111	.exe_dir = undefined,
114	112	.installed_files = ArrayList([]const u8).init(allocator),
115		.uninstall_tls = TopLevelStep {
	113	.uninstall_tls = TopLevelStep{
116	114	.step = Step.init("uninstall", allocator, makeUninstall),
117	115	.description = "Remove build artifacts from prefix path",
118	116	},
119	117	.have_uninstall_step = false,
120		.install_tls = TopLevelStep {
	118	.install_tls = TopLevelStep{
121	119	.step = Step.initNoOp("install", allocator),
122	120	.description = "Copy build artifacts to prefix path",
123	121	},
...	...	@@ -151,9 +149,7 @@ pub const Builder = struct {
151	149	return LibExeObjStep.createObject(self, name, root_src);
152	150	}
153	151
154		pub fn addSharedLibrary(self: &Builder, name: []const u8, root_src: ?[]const u8,
155		ver: &const Version) &LibExeObjStep
156		{
	152	pub fn addSharedLibrary(self: &Builder, name: []const u8, root_src: ?[]const u8, ver: &const Version) &LibExeObjStep {
157	153	return LibExeObjStep.createSharedLibrary(self, name, root_src, ver);
158	154	}
159	155
...	...	@@ -163,7 +159,7 @@ pub const Builder = struct {
163	159
164	160	pub fn addTest(self: &Builder, root_src: []const u8) &TestStep {
165	161	const test_step = self.allocator.create(TestStep) catch unreachable;
166		*test_step = TestStep.init(self, root_src);
	162	test_step.* = TestStep.init(self, root_src);
167	163	return test_step;
168	164	}
169	165
...	...	@@ -190,33 +186,31 @@ pub const Builder = struct {
190	186	}
191	187
192	188	/// ::argv is copied.
193		pub fn addCommand(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap,
194		argv: []const []const u8) &CommandStep
195		{
	189	pub fn addCommand(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap, argv: []const []const u8) &CommandStep {
196	190	return CommandStep.create(self, cwd, env_map, argv);
197	191	}
198	192
199	193	pub fn addWriteFile(self: &Builder, file_path: []const u8, data: []const u8) &WriteFileStep {
200	194	const write_file_step = self.allocator.create(WriteFileStep) catch unreachable;
201		*write_file_step = WriteFileStep.init(self, file_path, data);
	195	write_file_step.* = WriteFileStep.init(self, file_path, data);
202	196	return write_file_step;
203	197	}
204	198
205	199	pub fn addLog(self: &Builder, comptime format: []const u8, args: ...) &LogStep {
206	200	const data = self.fmt(format, args);
207	201	const log_step = self.allocator.create(LogStep) catch unreachable;
208		*log_step = LogStep.init(self, data);
	202	log_step.* = LogStep.init(self, data);
209	203	return log_step;
210	204	}
211	205
212	206	pub fn addRemoveDirTree(self: &Builder, dir_path: []const u8) &RemoveDirStep {
213	207	const remove_dir_step = self.allocator.create(RemoveDirStep) catch unreachable;
214		*remove_dir_step = RemoveDirStep.init(self, dir_path);
	208	remove_dir_step.* = RemoveDirStep.init(self, dir_path);
215	209	return remove_dir_step;
216	210	}
217	211
218	212	pub fn version(self: &const Builder, major: u32, minor: u32, patch: u32) Version {
219		return Version {
	213	return Version{
220	214	.major = major,
221	215	.minor = minor,
222	216	.patch = patch,
...	...	@@ -254,8 +248,7 @@ pub const Builder = struct {
254	248	}
255	249
256	250	pub fn getInstallStep(self: &Builder) &Step {
257		if (self.have_install_step)
258		return &self.install_tls.step;
	251	if (self.have_install_step) return &self.install_tls.step;
259	252
260	253	self.top_level_steps.append(&self.install_tls) catch unreachable;
261	254	self.have_install_step = true;
...	...	@@ -263,8 +256,7 @@ pub const Builder = struct {
263	256	}
264	257
265	258	pub fn getUninstallStep(self: &Builder) &Step {
266		if (self.have_uninstall_step)
267		return &self.uninstall_tls.step;
	259	if (self.have_uninstall_step) return &self.uninstall_tls.step;
268	260
269	261	self.top_level_steps.append(&self.uninstall_tls) catch unreachable;
270	262	self.have_uninstall_step = true;
...	...	@@ -360,7 +352,7 @@ pub const Builder = struct {
360	352
361	353	pub fn option(self: &Builder, comptime T: type, name: []const u8, description: []const u8) ?T {
362	354	const type_id = comptime typeToEnum(T);
363		const available_option = AvailableOption {
	355	const available_option = AvailableOption{
364	356	.name = name,
365	357	.type_id = type_id,
366	358	.description = description,
...	...	@@ -413,7 +405,7 @@ pub const Builder = struct {
413	405
414	406	pub fn step(self: &Builder, name: []const u8, description: []const u8) &Step {
415	407	const step_info = self.allocator.create(TopLevelStep) catch unreachable;
416		*step_info = TopLevelStep {
	408	step_info.* = TopLevelStep{
417	409	.step = Step.initNoOp(name, self.allocator),
418	410	.description = description,
419	411	};
...	...	@@ -428,15 +420,7 @@ pub const Builder = struct {
428	420	const release_fast = self.option(bool, "release-fast", "optimizations on and safety off") ?? false;
429	421	const release_small = self.option(bool, "release-small", "size optimizations on and safety off") ?? false;
430	422
431		const mode = if (release_safe and !release_fast and !release_small)
432		builtin.Mode.ReleaseSafe
433		else if (release_fast and !release_safe and !release_small)
434		builtin.Mode.ReleaseFast
435		else if (release_small and !release_fast and !release_safe)
436		builtin.Mode.ReleaseSmall
437		else if (!release_fast and !release_safe and !release_small)
438		builtin.Mode.Debug
439		else x: {
	423	const mode = if (release_safe and !release_fast and !release_small) builtin.Mode.ReleaseSafe else if (release_fast and !release_safe and !release_small) builtin.Mode.ReleaseFast else if (release_small and !release_fast and !release_safe) builtin.Mode.ReleaseSmall else if (!release_fast and !release_safe and !release_small) builtin.Mode.Debug else x: {
440	424	warn("Multiple release modes (of -Drelease-safe, -Drelease-fast and -Drelease-small)");
441	425	self.markInvalidUserInput();
442	426	break :x builtin.Mode.Debug;
...	...	@@ -446,9 +430,9 @@ pub const Builder = struct {
446	430	}
447	431
448	432	pub fn addUserInputOption(self: &Builder, name: []const u8, value: []const u8) bool {
449		if (self.user_input_options.put(name, UserInputOption {
	433	if (self.user_input_options.put(name, UserInputOption{
450	434	.name = name,
451		.value = UserValue { .Scalar = value },
	435	.value = UserValue{ .Scalar = value },
452	436	.used = false,
453	437	}) catch unreachable) \|*prev_value\| {
454	438	// option already exists
...	...	@@ -458,18 +442,18 @@ pub const Builder = struct {
458	442	var list = ArrayList([]const u8).init(self.allocator);
459	443	list.append(s) catch unreachable;
460	444	list.append(value) catch unreachable;
461		_ = self.user_input_options.put(name, UserInputOption {
	445	_ = self.user_input_options.put(name, UserInputOption{
462	446	.name = name,
463		.value = UserValue { .List = list },
	447	.value = UserValue{ .List = list },
464	448	.used = false,
465	449	}) catch unreachable;
466	450	},
467	451	UserValue.List => \|*list\| {
468	452	// append to the list
469	453	list.append(value) catch unreachable;
470		_ = self.user_input_options.put(name, UserInputOption {
	454	_ = self.user_input_options.put(name, UserInputOption{
471	455	.name = name,
472		.value = UserValue { .List = *list },
	456	.value = UserValue{ .List = list.* },
473	457	.used = false,
474	458	}) catch unreachable;
475	459	},
...	...	@@ -483,9 +467,9 @@ pub const Builder = struct {
483	467	}
484	468
485	469	pub fn addUserInputFlag(self: &Builder, name: []const u8) bool {
486		if (self.user_input_options.put(name, UserInputOption {
	470	if (self.user_input_options.put(name, UserInputOption{
487	471	.name = name,
488		.value = UserValue {.Flag = {} },
	472	.value = UserValue{ .Flag = {} },
489	473	.used = false,
490	474	}) catch unreachable) \|*prev_value\| {
491	475	switch (prev_value.value) {
...	...	@@ -556,9 +540,7 @@ pub const Builder = struct {
556	540	warn("\n");
557	541	}
558	542
559		fn spawnChildEnvMap(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap,
560		argv: []const []const u8) !void
561		{
	543	fn spawnChildEnvMap(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap, argv: []const []const u8) !void {
562	544	if (self.verbose) {
563	545	printCmd(cwd, argv);
564	546	}
...	...	@@ -617,7 +599,7 @@ pub const Builder = struct {
617	599	self.pushInstalledFile(full_dest_path);
618	600
619	601	const install_step = self.allocator.create(InstallFileStep) catch unreachable;
620		*install_step = InstallFileStep.init(self, src_path, full_dest_path);
	602	install_step.* = InstallFileStep.init(self, src_path, full_dest_path);
621	603	return install_step;
622	604	}
623	605
...	...	@@ -659,25 +641,19 @@ pub const Builder = struct {
659	641	if (builtin.environ == builtin.Environ.msvc) {
660	642	return "cl.exe";
661	643	} else {
662		return os.getEnvVarOwned(self.allocator, "CC") catch \|err\|
663		if (err == error.EnvironmentVariableNotFound)
664		([]const u8)("cc")
665		else
666		debug.panic("Unable to get environment variable: {}", err)
667		;
	644	return os.getEnvVarOwned(self.allocator, "CC") catch \|err\| if (err == error.EnvironmentVariableNotFound) ([]const u8)("cc") else debug.panic("Unable to get environment variable: {}", err);
668	645	}
669	646	}
670	647
671	648	pub fn findProgram(self: &Builder, names: []const []const u8, paths: []const []const u8) ![]const u8 {
672	649	// TODO report error for ambiguous situations
673		const exe_extension = (Target { .Native = {}}).exeFileExt();
	650	const exe_extension = (Target{ .Native = {} }).exeFileExt();
674	651	for (self.search_prefixes.toSliceConst()) \|search_prefix\| {
675	652	for (names) \|name\| {
676	653	if (os.path.isAbsolute(name)) {
677	654	return name;
678	655	}
679		const full_path = try os.path.join(self.allocator, search_prefix, "bin",
680		self.fmt("{}{}", name, exe_extension));
	656	const full_path = try os.path.join(self.allocator, search_prefix, "bin", self.fmt("{}{}", name, exe_extension));
681	657	if (os.path.real(self.allocator, full_path)) \|real_path\| {
682	658	return real_path;
683	659	} else \|_\| {
...	...	@@ -761,7 +737,7 @@ pub const Target = union(enum) {
761	737	Cross: CrossTarget,
762	738
763	739	pub fn oFileExt(self: &const Target) []const u8 {
764		const environ = switch (*self) {
	740	const environ = switch (self.*) {
765	741	Target.Native => builtin.environ,
766	742	Target.Cross => \|t\| t.environ,
767	743	};
...	...	@@ -786,7 +762,7 @@ pub const Target = union(enum) {
786	762	}
787	763
788	764	pub fn getOs(self: &const Target) builtin.Os {
789		return switch (*self) {
	765	return switch (self.*) {
790	766	Target.Native => builtin.os,
791	767	Target.Cross => \|t\| t.os,
792	768	};
...	...	@@ -860,61 +836,57 @@ pub const LibExeObjStep = struct {
860	836	Obj,
861	837	};
862	838
863		pub fn createSharedLibrary(builder: &Builder, name: []const u8, root_src: ?[]const u8,
864		ver: &const Version) &LibExeObjStep
865		{
	839	pub fn createSharedLibrary(builder: &Builder, name: []const u8, root_src: ?[]const u8, ver: &const Version) &LibExeObjStep {
866	840	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
867		*self = initExtraArgs(builder, name, root_src, Kind.Lib, false, ver);
	841	self.* = initExtraArgs(builder, name, root_src, Kind.Lib, false, ver);
868	842	return self;
869	843	}
870	844
871	845	pub fn createCSharedLibrary(builder: &Builder, name: []const u8, version: &const Version) &LibExeObjStep {
872	846	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
873		*self = initC(builder, name, Kind.Lib, version, false);
	847	self.* = initC(builder, name, Kind.Lib, version, false);
874	848	return self;
875	849	}
876	850
877	851	pub fn createStaticLibrary(builder: &Builder, name: []const u8, root_src: ?[]const u8) &LibExeObjStep {
878	852	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
879		*self = initExtraArgs(builder, name, root_src, Kind.Lib, true, builder.version(0, 0, 0));
	853	self.* = initExtraArgs(builder, name, root_src, Kind.Lib, true, builder.version(0, 0, 0));
880	854	return self;
881	855	}
882	856
883	857	pub fn createCStaticLibrary(builder: &Builder, name: []const u8) &LibExeObjStep {
884	858	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
885		*self = initC(builder, name, Kind.Lib, builder.version(0, 0, 0), true);
	859	self.* = initC(builder, name, Kind.Lib, builder.version(0, 0, 0), true);
886	860	return self;
887	861	}
888	862
889	863	pub fn createObject(builder: &Builder, name: []const u8, root_src: []const u8) &LibExeObjStep {
890	864	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
891		*self = initExtraArgs(builder, name, root_src, Kind.Obj, false, builder.version(0, 0, 0));
	865	self.* = initExtraArgs(builder, name, root_src, Kind.Obj, false, builder.version(0, 0, 0));
892	866	return self;
893	867	}
894	868
895	869	pub fn createCObject(builder: &Builder, name: []const u8, src: []const u8) &LibExeObjStep {
896	870	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
897		*self = initC(builder, name, Kind.Obj, builder.version(0, 0, 0), false);
	871	self.* = initC(builder, name, Kind.Obj, builder.version(0, 0, 0), false);
898	872	self.object_src = src;
899	873	return self;
900	874	}
901	875
902	876	pub fn createExecutable(builder: &Builder, name: []const u8, root_src: ?[]const u8) &LibExeObjStep {
903	877	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
904		*self = initExtraArgs(builder, name, root_src, Kind.Exe, false, builder.version(0, 0, 0));
	878	self.* = initExtraArgs(builder, name, root_src, Kind.Exe, false, builder.version(0, 0, 0));
905	879	return self;
906	880	}
907	881
908	882	pub fn createCExecutable(builder: &Builder, name: []const u8) &LibExeObjStep {
909	883	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
910		*self = initC(builder, name, Kind.Exe, builder.version(0, 0, 0), false);
	884	self.* = initC(builder, name, Kind.Exe, builder.version(0, 0, 0), false);
911	885	return self;
912	886	}
913	887
914		fn initExtraArgs(builder: &Builder, name: []const u8, root_src: ?[]const u8, kind: Kind,
915		static: bool, ver: &const Version) LibExeObjStep
916		{
917		var self = LibExeObjStep {
	888	fn initExtraArgs(builder: &Builder, name: []const u8, root_src: ?[]const u8, kind: Kind, static: bool, ver: &const Version) LibExeObjStep {
	889	var self = LibExeObjStep{
918	890	.strip = false,
919	891	.builder = builder,
920	892	.verbose_link = false,
...	...	@@ -930,7 +902,7 @@ pub const LibExeObjStep = struct {
930	902	.step = Step.init(name, builder.allocator, make),
931	903	.output_path = null,
932	904	.output_h_path = null,
933		.version = *ver,
	905	.version = ver.*,
934	906	.out_filename = undefined,
935	907	.out_h_filename = builder.fmt("{}.h", name),
936	908	.major_only_filename = undefined,
...	...	@@ -953,11 +925,11 @@ pub const LibExeObjStep = struct {
953	925	}
954	926
955	927	fn initC(builder: &Builder, name: []const u8, kind: Kind, version: &const Version, static: bool) LibExeObjStep {
956		var self = LibExeObjStep {
	928	var self = LibExeObjStep{
957	929	.builder = builder,
958	930	.name = name,
959	931	.kind = kind,
960		.version = *version,
	932	.version = version.*,
961	933	.static = static,
962	934	.target = Target.Native,
963	935	.cflags = ArrayList([]const u8).init(builder.allocator),
...	...	@@ -1006,8 +978,7 @@ pub const LibExeObjStep = struct {
1006	978	} else {
1007	979	switch (self.target.getOs()) {
1008	980	builtin.Os.ios, builtin.Os.macosx => {
1009		self.out_filename = self.builder.fmt("lib{}.{d}.{d}.{d}.dylib",
1010		self.name, self.version.major, self.version.minor, self.version.patch);
	981	self.out_filename = self.builder.fmt("lib{}.{d}.{d}.{d}.dylib", self.name, self.version.major, self.version.minor, self.version.patch);
1011	982	self.major_only_filename = self.builder.fmt("lib{}.{d}.dylib", self.name, self.version.major);
1012	983	self.name_only_filename = self.builder.fmt("lib{}.dylib", self.name);
1013	984	},
...	...	@@ -1015,8 +986,7 @@ pub const LibExeObjStep = struct {
1015	986	self.out_filename = self.builder.fmt("{}.dll", self.name);
1016	987	},
1017	988	else => {
1018		self.out_filename = self.builder.fmt("lib{}.so.{d}.{d}.{d}",
1019		self.name, self.version.major, self.version.minor, self.version.patch);
	989	self.out_filename = self.builder.fmt("lib{}.so.{d}.{d}.{d}", self.name, self.version.major, self.version.minor, self.version.patch);
1020	990	self.major_only_filename = self.builder.fmt("lib{}.so.{d}", self.name, self.version.major);
1021	991	self.name_only_filename = self.builder.fmt("lib{}.so", self.name);
1022	992	},
...	...	@@ -1026,15 +996,13 @@ pub const LibExeObjStep = struct {
1026	996	}
1027	997	}
1028	998
1029		pub fn setTarget(self: &LibExeObjStep, target_arch: builtin.Arch, target_os: builtin.Os,
1030		target_environ: builtin.Environ) void
1031		{
1032		self.target = Target {
1033		.Cross = CrossTarget {
	999	pub fn setTarget(self: &LibExeObjStep, target_arch: builtin.Arch, target_os: builtin.Os, target_environ: builtin.Environ) void {
	1000	self.target = Target{
	1001	.Cross = CrossTarget{
1034	1002	.arch = target_arch,
1035	1003	.os = target_os,
1036	1004	.environ = target_environ,
1037		}
	1005	},
1038	1006	};
1039	1007	self.computeOutFileNames();
1040	1008	}
...	...	@@ -1099,10 +1067,7 @@ pub const LibExeObjStep = struct {
1099	1067	}
1100	1068
1101	1069	pub fn getOutputPath(self: &LibExeObjStep) []const u8 {
1102		return if (self.output_path) \|output_path\|
1103		output_path
1104		else
1105		os.path.join(self.builder.allocator, self.builder.cache_root, self.out_filename) catch unreachable;
	1070	return if (self.output_path) \|output_path\| output_path else os.path.join(self.builder.allocator, self.builder.cache_root, self.out_filename) catch unreachable;
1106	1071	}
1107	1072
1108	1073	pub fn setOutputHPath(self: &LibExeObjStep, file_path: []const u8) void {
...	...	@@ -1115,10 +1080,7 @@ pub const LibExeObjStep = struct {
1115	1080	}
1116	1081
1117	1082	pub fn getOutputHPath(self: &LibExeObjStep) []const u8 {
1118		return if (self.output_h_path) \|output_h_path\|
1119		output_h_path
1120		else
1121		os.path.join(self.builder.allocator, self.builder.cache_root, self.out_h_filename) catch unreachable;
	1083	return if (self.output_h_path) \|output_h_path\| output_h_path else os.path.join(self.builder.allocator, self.builder.cache_root, self.out_h_filename) catch unreachable;
1122	1084	}
1123	1085
1124	1086	pub fn addAssemblyFile(self: &LibExeObjStep, path: []const u8) void {
...	...	@@ -1159,7 +1121,7 @@ pub const LibExeObjStep = struct {
1159	1121	pub fn addPackagePath(self: &LibExeObjStep, name: []const u8, pkg_index_path: []const u8) void {
1160	1122	assert(self.is_zig);
1161	1123
1162		self.packages.append(Pkg {
	1124	self.packages.append(Pkg{
1163	1125	.name = name,
1164	1126	.path = pkg_index_path,
1165	1127	}) catch unreachable;
...	...	@@ -1343,8 +1305,7 @@ pub const LibExeObjStep = struct {
1343	1305	try builder.spawnChild(zig_args.toSliceConst());
1344	1306
1345	1307	if (self.kind == Kind.Lib and !self.static and self.target.wantSharedLibSymLinks()) {
1346		try doAtomicSymLinks(builder.allocator, output_path, self.major_only_filename,
1347		self.name_only_filename);
	1308	try doAtomicSymLinks(builder.allocator, output_path, self.major_only_filename, self.name_only_filename);
1348	1309	}
1349	1310	}
1350	1311
...	...	@@ -1505,8 +1466,7 @@ pub const LibExeObjStep = struct {
1505	1466	}
1506	1467
1507	1468	if (!is_darwin) {
1508		const rpath_arg = builder.fmt("-Wl,-rpath,{}",
1509		os.path.real(builder.allocator, builder.pathFromRoot(builder.cache_root)) catch unreachable);
	1469	const rpath_arg = builder.fmt("-Wl,-rpath,{}", os.path.real(builder.allocator, builder.pathFromRoot(builder.cache_root)) catch unreachable);
1510	1470	defer builder.allocator.free(rpath_arg);
1511	1471	cc_args.append(rpath_arg) catch unreachable;
1512	1472
...	...	@@ -1535,8 +1495,7 @@ pub const LibExeObjStep = struct {
1535	1495	try builder.spawnChild(cc_args.toSliceConst());
1536	1496
1537	1497	if (self.target.wantSharedLibSymLinks()) {
1538		try doAtomicSymLinks(builder.allocator, output_path, self.major_only_filename,
1539		self.name_only_filename);
	1498	try doAtomicSymLinks(builder.allocator, output_path, self.major_only_filename, self.name_only_filename);
1540	1499	}
1541	1500	}
1542	1501	},
...	...	@@ -1581,8 +1540,7 @@ pub const LibExeObjStep = struct {
1581	1540	cc_args.append("-o") catch unreachable;
1582	1541	cc_args.append(output_path) catch unreachable;
1583	1542
1584		const rpath_arg = builder.fmt("-Wl,-rpath,{}",
1585		os.path.real(builder.allocator, builder.pathFromRoot(builder.cache_root)) catch unreachable);
	1543	const rpath_arg = builder.fmt("-Wl,-rpath,{}", os.path.real(builder.allocator, builder.pathFromRoot(builder.cache_root)) catch unreachable);
1586	1544	defer builder.allocator.free(rpath_arg);
1587	1545	cc_args.append(rpath_arg) catch unreachable;
1588	1546
...	...	@@ -1635,7 +1593,7 @@ pub const TestStep = struct {
1635	1593
1636	1594	pub fn init(builder: &Builder, root_src: []const u8) TestStep {
1637	1595	const step_name = builder.fmt("test {}", root_src);
1638		return TestStep {
	1596	return TestStep{
1639	1597	.step = Step.init(step_name, builder.allocator, make),
1640	1598	.builder = builder,
1641	1599	.root_src = root_src,
...	...	@@ -1644,7 +1602,7 @@ pub const TestStep = struct {
1644	1602	.name_prefix = "",
1645	1603	.filter = null,
1646	1604	.link_libs = BufSet.init(builder.allocator),
1647		.target = Target { .Native = {} },
	1605	.target = Target{ .Native = {} },
1648	1606	.exec_cmd_args = null,
1649	1607	.include_dirs = ArrayList([]const u8).init(builder.allocator),
1650	1608	};
...	...	@@ -1674,15 +1632,13 @@ pub const TestStep = struct {
1674	1632	self.filter = text;
1675	1633	}
1676	1634
1677		pub fn setTarget(self: &TestStep, target_arch: builtin.Arch, target_os: builtin.Os,
1678		target_environ: builtin.Environ) void
1679		{
1680		self.target = Target {
1681		.Cross = CrossTarget {
	1635	pub fn setTarget(self: &TestStep, target_arch: builtin.Arch, target_os: builtin.Os, target_environ: builtin.Environ) void {
	1636	self.target = Target{
	1637	.Cross = CrossTarget{
1682	1638	.arch = target_arch,
1683	1639	.os = target_os,
1684	1640	.environ = target_environ,
1685		}
	1641	},
1686	1642	};
1687	1643	}
1688	1644
...	...	@@ -1789,11 +1745,9 @@ pub const CommandStep = struct {
1789	1745	env_map: &const BufMap,
1790	1746
1791	1747	/// ::argv is copied.
1792		pub fn create(builder: &Builder, cwd: ?[]const u8, env_map: &const BufMap,
1793		argv: []const []const u8) &CommandStep
1794		{
	1748	pub fn create(builder: &Builder, cwd: ?[]const u8, env_map: &const BufMap, argv: []const []const u8) &CommandStep {
1795	1749	const self = builder.allocator.create(CommandStep) catch unreachable;
1796		*self = CommandStep {
	1750	self.* = CommandStep{
1797	1751	.builder = builder,
1798	1752	.step = Step.init(argv[0], builder.allocator, make),
1799	1753	.argv = builder.allocator.alloc([]u8, argv.len) catch unreachable,
...	...	@@ -1828,7 +1782,7 @@ const InstallArtifactStep = struct {
1828	1782	LibExeObjStep.Kind.Exe => builder.exe_dir,
1829	1783	LibExeObjStep.Kind.Lib => builder.lib_dir,
1830	1784	};
1831		*self = Self {
	1785	self.* = Self{
1832	1786	.builder = builder,
1833	1787	.step = Step.init(builder.fmt("install {}", artifact.step.name), builder.allocator, make),
1834	1788	.artifact = artifact,
...	...	@@ -1837,10 +1791,8 @@ const InstallArtifactStep = struct {
1837	1791	self.step.dependOn(&artifact.step);
1838	1792	builder.pushInstalledFile(self.dest_file);
1839	1793	if (self.artifact.kind == LibExeObjStep.Kind.Lib and !self.artifact.static) {
1840		builder.pushInstalledFile(os.path.join(builder.allocator, builder.lib_dir,
1841		artifact.major_only_filename) catch unreachable);
1842		builder.pushInstalledFile(os.path.join(builder.allocator, builder.lib_dir,
1843		artifact.name_only_filename) catch unreachable);
	1794	builder.pushInstalledFile(os.path.join(builder.allocator, builder.lib_dir, artifact.major_only_filename) catch unreachable);
	1795	builder.pushInstalledFile(os.path.join(builder.allocator, builder.lib_dir, artifact.name_only_filename) catch unreachable);
1844	1796	}
1845	1797	return self;
1846	1798	}
...	...	@@ -1859,8 +1811,7 @@ const InstallArtifactStep = struct {
1859	1811	};
1860	1812	try builder.copyFileMode(self.artifact.getOutputPath(), self.dest_file, mode);
1861	1813	if (self.artifact.kind == LibExeObjStep.Kind.Lib and !self.artifact.static) {
1862		try doAtomicSymLinks(builder.allocator, self.dest_file,
1863		self.artifact.major_only_filename, self.artifact.name_only_filename);
	1814	try doAtomicSymLinks(builder.allocator, self.dest_file, self.artifact.major_only_filename, self.artifact.name_only_filename);
1864	1815	}
1865	1816	}
1866	1817	};
...	...	@@ -1872,7 +1823,7 @@ pub const InstallFileStep = struct {
1872	1823	dest_path: []const u8,
1873	1824
1874	1825	pub fn init(builder: &Builder, src_path: []const u8, dest_path: []const u8) InstallFileStep {
1875		return InstallFileStep {
	1826	return InstallFileStep{
1876	1827	.builder = builder,
1877	1828	.step = Step.init(builder.fmt("install {}", src_path), builder.allocator, make),
1878	1829	.src_path = src_path,
...	...	@@ -1893,7 +1844,7 @@ pub const WriteFileStep = struct {
1893	1844	data: []const u8,
1894	1845
1895	1846	pub fn init(builder: &Builder, file_path: []const u8, data: []const u8) WriteFileStep {
1896		return WriteFileStep {
	1847	return WriteFileStep{
1897	1848	.builder = builder,
1898	1849	.step = Step.init(builder.fmt("writefile {}", file_path), builder.allocator, make),
1899	1850	.file_path = file_path,
...	...	@@ -1922,7 +1873,7 @@ pub const LogStep = struct {
1922	1873	data: []const u8,
1923	1874
1924	1875	pub fn init(builder: &Builder, data: []const u8) LogStep {
1925		return LogStep {
	1876	return LogStep{
1926	1877	.builder = builder,
1927	1878	.step = Step.init(builder.fmt("log {}", data), builder.allocator, make),
1928	1879	.data = data,
...	...	@@ -1941,7 +1892,7 @@ pub const RemoveDirStep = struct {
1941	1892	dir_path: []const u8,
1942	1893
1943	1894	pub fn init(builder: &Builder, dir_path: []const u8) RemoveDirStep {
1944		return RemoveDirStep {
	1895	return RemoveDirStep{
1945	1896	.builder = builder,
1946	1897	.step = Step.init(builder.fmt("RemoveDir {}", dir_path), builder.allocator, make),
1947	1898	.dir_path = dir_path,
...	...	@@ -1966,8 +1917,8 @@ pub const Step = struct {
1966	1917	loop_flag: bool,
1967	1918	done_flag: bool,
1968	1919
1969		pub fn init(name: []const u8, allocator: &Allocator, makeFn: fn (&Step)error!void) Step {
1970		return Step {
	1920	pub fn init(name: []const u8, allocator: &Allocator, makeFn: fn(&Step) error!void) Step {
	1921	return Step{
1971	1922	.name = name,
1972	1923	.makeFn = makeFn,
1973	1924	.dependencies = ArrayList(&Step).init(allocator),
...	...	@@ -1980,8 +1931,7 @@ pub const Step = struct {
1980	1931	}
1981	1932
1982	1933	pub fn make(self: &Step) !void {
1983		if (self.done_flag)
1984		return;
	1934	if (self.done_flag) return;
1985	1935
1986	1936	try self.makeFn(self);
1987	1937	self.done_flag = true;
...	...	@@ -1994,9 +1944,7 @@ pub const Step = struct {
1994	1944	fn makeNoOp(self: &Step) error!void {}
1995	1945	};
1996	1946
1997		fn doAtomicSymLinks(allocator: &Allocator, output_path: []const u8, filename_major_only: []const u8,
1998		filename_name_only: []const u8) !void
1999		{
	1947	fn doAtomicSymLinks(allocator: &Allocator, output_path: []const u8, filename_major_only: []const u8, filename_name_only: []const u8) !void {
2000	1948	const out_dir = os.path.dirname(output_path);
2001	1949	const out_basename = os.path.basename(output_path);
2002	1950	// sym link for libfoo.so.1 to libfoo.so.1.2.3

std/c/darwin.zig+1-1

...	...	@@ -60,7 +60,7 @@ pub const sigset_t = u32;
60	60
61	61	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with function name.
62	62	pub const Sigaction = extern struct {
63		handler: extern fn(c_int)void,
	63	handler: extern fn(c_int) void,
64	64	sa_mask: sigset_t,
65	65	sa_flags: c_int,
66	66	};

std/c/index.zig+4-8

...	...	@@ -1,7 +1,7 @@
1	1	const builtin = @import("builtin");
2	2	const Os = builtin.Os;
3	3
4		pub use switch(builtin.os) {
	4	pub use switch (builtin.os) {
5	5	Os.linux => @import("linux.zig"),
6	6	Os.windows => @import("windows.zig"),
7	7	Os.macosx, Os.ios => @import("darwin.zig"),
...	...	@@ -21,8 +21,7 @@ pub extern "c" fn raise(sig: c_int) c_int;
21	21	pub extern "c" fn read(fd: c_int, buf: &c_void, nbyte: usize) isize;
22	22	pub extern "c" fn stat(noalias path: &const u8, noalias buf: &Stat) c_int;
23	23	pub extern "c" fn write(fd: c_int, buf: &const c_void, nbyte: usize) isize;
24		pub extern "c" fn mmap(addr: ?&c_void, len: usize, prot: c_int, flags: c_int,
25		fd: c_int, offset: isize) ?&c_void;
	24	pub extern "c" fn mmap(addr: ?&c_void, len: usize, prot: c_int, flags: c_int, fd: c_int, offset: isize) ?&c_void;
26	25	pub extern "c" fn munmap(addr: &c_void, len: usize) c_int;
27	26	pub extern "c" fn unlink(path: &const u8) c_int;
28	27	pub extern "c" fn getcwd(buf: &u8, size: usize) ?&u8;
...	...	@@ -34,8 +33,7 @@ pub extern "c" fn mkdir(path: &const u8, mode: c_uint) c_int;
34	33	pub extern "c" fn symlink(existing: &const u8, new: &const u8) c_int;
35	34	pub extern "c" fn rename(old: &const u8, new: &const u8) c_int;
36	35	pub extern "c" fn chdir(path: &const u8) c_int;
37		pub extern "c" fn execve(path: &const u8, argv: &const ?&const u8,
38		envp: &const ?&const u8) c_int;
	36	pub extern "c" fn execve(path: &const u8, argv: &const ?&const u8, envp: &const ?&const u8) c_int;
39	37	pub extern "c" fn dup(fd: c_int) c_int;
40	38	pub extern "c" fn dup2(old_fd: c_int, new_fd: c_int) c_int;
41	39	pub extern "c" fn readlink(noalias path: &const u8, noalias buf: &u8, bufsize: usize) isize;
...	...	@@ -54,9 +52,7 @@ pub extern "c" fn realloc(&c_void, usize) ?&c_void;
54	52	pub extern "c" fn free(&c_void) void;
55	53	pub extern "c" fn posix_memalign(memptr: &&c_void, alignment: usize, size: usize) c_int;
56	54
57		pub extern "pthread" fn pthread_create(noalias newthread: &pthread_t,
58		noalias attr: ?&const pthread_attr_t, start_routine: extern fn(?&c_void) ?&c_void,
59		noalias arg: ?&c_void) c_int;
	55	pub extern "pthread" fn pthread_create(noalias newthread: &pthread_t, noalias attr: ?&const pthread_attr_t, start_routine: extern fn(?&c_void) ?&c_void, noalias arg: ?&c_void) c_int;
60	56	pub extern "pthread" fn pthread_attr_init(attr: &pthread_attr_t) c_int;
61	57	pub extern "pthread" fn pthread_attr_setstack(attr: &pthread_attr_t, stackaddr: &c_void, stacksize: usize) c_int;
62	58	pub extern "pthread" fn pthread_attr_destroy(attr: &pthread_attr_t) c_int;

std/crypto/blake2.zig+266-241

...	...	@@ -6,11 +6,23 @@ const builtin = @import("builtin");
6	6	const htest = @import("test.zig");
7	7
8	8	const RoundParam = struct {
9		a: usize, b: usize, c: usize, d: usize, x: usize, y: usize,
	9	a: usize,
	10	b: usize,
	11	c: usize,
	12	d: usize,
	13	x: usize,
	14	y: usize,
10	15	};
11	16
12	17	fn Rp(a: usize, b: usize, c: usize, d: usize, x: usize, y: usize) RoundParam {
13		return RoundParam { .a = a, .b = b, .c = c, .d = d, .x = x, .y = y, };
	18	return RoundParam{
	19	.a = a,
	20	.b = b,
	21	.c = c,
	22	.d = d,
	23	.x = x,
	24	.y = y,
	25	};
14	26	}
15	27
16	28	/////////////////////
...	...	@@ -19,145 +31,153 @@ fn Rp(a: usize, b: usize, c: usize, d: usize, x: usize, y: usize) RoundParam {
19	31	pub const Blake2s224 = Blake2s(224);
20	32	pub const Blake2s256 = Blake2s(256);
21	33
22		fn Blake2s(comptime out_len: usize) type { return struct {
23		const Self = this;
24		const block_size = 64;
25		const digest_size = out_len / 8;
	34	fn Blake2s(comptime out_len: usize) type {
	35	return struct {
	36	const Self = this;
	37	const block_size = 64;
	38	const digest_size = out_len / 8;
	39
	40	const iv = [8]u32{
	41	0x6A09E667,
	42	0xBB67AE85,
	43	0x3C6EF372,
	44	0xA54FF53A,
	45	0x510E527F,
	46	0x9B05688C,
	47	0x1F83D9AB,
	48	0x5BE0CD19,
	49	};
26	50
27		const iv = [8]u32 {
28		0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
29		0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19,
30		};
	51	const sigma = [10][16]u8{
	52	[]const u8{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
	53	[]const u8{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
	54	[]const u8{ 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
	55	[]const u8{ 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
	56	[]const u8{ 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
	57	[]const u8{ 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
	58	[]const u8{ 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
	59	[]const u8{ 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
	60	[]const u8{ 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
	61	[]const u8{ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
	62	};
31	63
32		const sigma = [10][16]u8 {
33		[]const u8 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
34		[]const u8 { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
35		[]const u8 { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
36		[]const u8 { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
37		[]const u8 { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
38		[]const u8 { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
39		[]const u8 { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
40		[]const u8 { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
41		[]const u8 { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
42		[]const u8 { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
43		};
	64	h: [8]u32,
	65	t: u64,
	66	// Streaming cache
	67	buf: [64]u8,
	68	buf_len: u8,
44	69
45		h: [8]u32,
46		t: u64,
47		// Streaming cache
48		buf: [64]u8,
49		buf_len: u8,
50
51		pub fn init() Self {
52		debug.assert(8 <= out_len and out_len <= 512);
53
54		var s: Self = undefined;
55		s.reset();
56		return s;
57		}
58
59		pub fn reset(d: &Self) void {
60		mem.copy(u32, d.h[0..], iv[0..]);
61
62		// No key plus default parameters
63		d.h[0] ^= 0x01010000 ^ u32(out_len >> 3);
64		d.t = 0;
65		d.buf_len = 0;
66		}
67
68		pub fn hash(b: []const u8, out: []u8) void {
69		var d = Self.init();
70		d.update(b);
71		d.final(out);
72		}
73
74		pub fn update(d: &Self, b: []const u8) void {
75		var off: usize = 0;
76
77		// Partial buffer exists from previous update. Copy into buffer then hash.
78		if (d.buf_len != 0 and d.buf_len + b.len > 64) {
79		off += 64 - d.buf_len;
80		mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
81		d.t += 64;
82		d.round(d.buf[0..], false);
83		d.buf_len = 0;
	70	pub fn init() Self {
	71	debug.assert(8 <= out_len and out_len <= 512);
	72
	73	var s: Self = undefined;
	74	s.reset();
	75	return s;
84	76	}
85	77
86		// Full middle blocks.
87		while (off + 64 <= b.len) : (off += 64) {
88		d.t += 64;
89		d.round(b[off..off + 64], false);
	78	pub fn reset(d: &Self) void {
	79	mem.copy(u32, d.h[0..], iv[0..]);
	80
	81	// No key plus default parameters
	82	d.h[0] ^= 0x01010000 ^ u32(out_len >> 3);
	83	d.t = 0;
	84	d.buf_len = 0;
90	85	}
91	86
92		// Copy any remainder for next pass.
93		mem.copy(u8, d.buf[d.buf_len..], b[off..]);
94		d.buf_len += u8(b[off..].len);
95		}
	87	pub fn hash(b: []const u8, out: []u8) void {
	88	var d = Self.init();
	89	d.update(b);
	90	d.final(out);
	91	}
96	92
97		pub fn final(d: &Self, out: []u8) void {
98		debug.assert(out.len >= out_len / 8);
	93	pub fn update(d: &Self, b: []const u8) void {
	94	var off: usize = 0;
99	95
100		mem.set(u8, d.buf[d.buf_len..], 0);
101		d.t += d.buf_len;
102		d.round(d.buf[0..], true);
	96	// Partial buffer exists from previous update. Copy into buffer then hash.
	97	if (d.buf_len != 0 and d.buf_len + b.len > 64) {
	98	off += 64 - d.buf_len;
	99	mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
	100	d.t += 64;
	101	d.round(d.buf[0..], false);
	102	d.buf_len = 0;
	103	}
103	104
104		const rr = d.h[0 .. out_len / 32];
	105	// Full middle blocks.
	106	while (off + 64 <= b.len) : (off += 64) {
	107	d.t += 64;
	108	d.round(b[off..off + 64], false);
	109	}
105	110
106		for (rr) \|s, j\| {
107		mem.writeInt(out[4j .. 4j + 4], s, builtin.Endian.Little);
	111	// Copy any remainder for next pass.
	112	mem.copy(u8, d.buf[d.buf_len..], b[off..]);
	113	d.buf_len += u8(b[off..].len);
108	114	}
109		}
110	115
111		fn round(d: &Self, b: []const u8, last: bool) void {
112		debug.assert(b.len == 64);
	116	pub fn final(d: &Self, out: []u8) void {
	117	debug.assert(out.len >= out_len / 8);
113	118
114		var m: [16]u32 = undefined;
115		var v: [16]u32 = undefined;
	119	mem.set(u8, d.buf[d.buf_len..], 0);
	120	d.t += d.buf_len;
	121	d.round(d.buf[0..], true);
116	122
117		for (m) \|*r, i\| {
118		r = mem.readIntLE(u32, b[4i .. 4*i + 4]);
119		}
	123	const rr = d.h[0..out_len / 32];
120	124
121		var k: usize = 0;
122		while (k < 8) : (k += 1) {
123		v[k] = d.h[k];
124		v[k+8] = iv[k];
	125	for (rr) \|s, j\| {
	126	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Little);
	127	}
125	128	}
126	129
127		v[12] ^= @truncate(u32, d.t);
128		v[13] ^= u32(d.t >> 32);
129		if (last) v[14] = ~v[14];
130
131		const rounds = comptime []RoundParam {
132		Rp(0, 4, 8, 12, 0, 1),
133		Rp(1, 5, 9, 13, 2, 3),
134		Rp(2, 6, 10, 14, 4, 5),
135		Rp(3, 7, 11, 15, 6, 7),
136		Rp(0, 5, 10, 15, 8, 9),
137		Rp(1, 6, 11, 12, 10, 11),
138		Rp(2, 7, 8, 13, 12, 13),
139		Rp(3, 4, 9, 14, 14, 15),
140		};
	130	fn round(d: &Self, b: []const u8, last: bool) void {
	131	debug.assert(b.len == 64);
141	132
142		comptime var j: usize = 0;
143		inline while (j < 10) : (j += 1) {
144		inline for (rounds) \|r\| {
145		v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.x]];
146		v[r.d] = math.rotr(u32, v[r.d] ^ v[r.a], usize(16));
147		v[r.c] = v[r.c] +% v[r.d];
148		v[r.b] = math.rotr(u32, v[r.b] ^ v[r.c], usize(12));
149		v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.y]];
150		v[r.d] = math.rotr(u32, v[r.d] ^ v[r.a], usize(8));
151		v[r.c] = v[r.c] +% v[r.d];
152		v[r.b] = math.rotr(u32, v[r.b] ^ v[r.c], usize(7));
	133	var m: [16]u32 = undefined;
	134	var v: [16]u32 = undefined;
	135
	136	for (m) \|*r, i\| {
	137	r.* = mem.readIntLE(u32, b[4 * i..4 * i + 4]);
153	138	}
154		}
155	139
156		for (d.h) \|*r, i\| {
157		*r ^= v[i] ^ v[i + 8];
	140	var k: usize = 0;
	141	while (k < 8) : (k += 1) {
	142	v[k] = d.h[k];
	143	v[k + 8] = iv[k];
	144	}
	145
	146	v[12] ^= @truncate(u32, d.t);
	147	v[13] ^= u32(d.t >> 32);
	148	if (last) v[14] = ~v[14];
	149
	150	const rounds = comptime []RoundParam{
	151	Rp(0, 4, 8, 12, 0, 1),
	152	Rp(1, 5, 9, 13, 2, 3),
	153	Rp(2, 6, 10, 14, 4, 5),
	154	Rp(3, 7, 11, 15, 6, 7),
	155	Rp(0, 5, 10, 15, 8, 9),
	156	Rp(1, 6, 11, 12, 10, 11),
	157	Rp(2, 7, 8, 13, 12, 13),
	158	Rp(3, 4, 9, 14, 14, 15),
	159	};
	160
	161	comptime var j: usize = 0;
	162	inline while (j < 10) : (j += 1) {
	163	inline for (rounds) \|r\| {
	164	v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.x]];
	165	v[r.d] = math.rotr(u32, v[r.d] ^ v[r.a], usize(16));
	166	v[r.c] = v[r.c] +% v[r.d];
	167	v[r.b] = math.rotr(u32, v[r.b] ^ v[r.c], usize(12));
	168	v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.y]];
	169	v[r.d] = math.rotr(u32, v[r.d] ^ v[r.a], usize(8));
	170	v[r.c] = v[r.c] +% v[r.d];
	171	v[r.b] = math.rotr(u32, v[r.b] ^ v[r.c], usize(7));
	172	}
	173	}
	174
	175	for (d.h) \|*r, i\| {
	176	r.* ^= v[i] ^ v[i + 8];
	177	}
158	178	}
159		}
160		};}
	179	};
	180	}
161	181
162	182	test "blake2s224 single" {
163	183	const h1 = "1fa1291e65248b37b3433475b2a0dd63d54a11ecc4e3e034e7bc1ef4";
...	...	@@ -230,7 +250,7 @@ test "blake2s256 streaming" {
230	250	}
231	251
232	252	test "blake2s256 aligned final" {
233		var block = []u8 {0} ** Blake2s256.block_size;
	253	var block = []u8{0} ** Blake2s256.block_size;
234	254	var out: [Blake2s256.digest_size]u8 = undefined;
235	255
236	256	var h = Blake2s256.init();
...	...	@@ -238,154 +258,159 @@ test "blake2s256 aligned final" {
238	258	h.final(out[0..]);
239	259	}
240	260
241
242	261	/////////////////////
243	262	// Blake2b
244	263
245	264	pub const Blake2b384 = Blake2b(384);
246	265	pub const Blake2b512 = Blake2b(512);
247	266
248		fn Blake2b(comptime out_len: usize) type { return struct {
249		const Self = this;
250		const block_size = 128;
251		const digest_size = out_len / 8;
	267	fn Blake2b(comptime out_len: usize) type {
	268	return struct {
	269	const Self = this;
	270	const block_size = 128;
	271	const digest_size = out_len / 8;
	272
	273	const iv = [8]u64{
	274	0x6a09e667f3bcc908,
	275	0xbb67ae8584caa73b,
	276	0x3c6ef372fe94f82b,
	277	0xa54ff53a5f1d36f1,
	278	0x510e527fade682d1,
	279	0x9b05688c2b3e6c1f,
	280	0x1f83d9abfb41bd6b,
	281	0x5be0cd19137e2179,
	282	};
252	283
253		const iv = [8]u64 {
254		0x6a09e667f3bcc908, 0xbb67ae8584caa73b,
255		0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1,
256		0x510e527fade682d1, 0x9b05688c2b3e6c1f,
257		0x1f83d9abfb41bd6b, 0x5be0cd19137e2179,
258		};
	284	const sigma = [12][16]u8{
	285	[]const u8{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
	286	[]const u8{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
	287	[]const u8{ 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
	288	[]const u8{ 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
	289	[]const u8{ 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
	290	[]const u8{ 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
	291	[]const u8{ 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
	292	[]const u8{ 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
	293	[]const u8{ 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
	294	[]const u8{ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
	295	[]const u8{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
	296	[]const u8{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
	297	};
259	298
260		const sigma = [12][16]u8 {
261		[]const u8 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
262		[]const u8 { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
263		[]const u8 { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
264		[]const u8 { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
265		[]const u8 { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
266		[]const u8 { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
267		[]const u8 { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
268		[]const u8 { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
269		[]const u8 { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
270		[]const u8 { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13 , 0 },
271		[]const u8 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
272		[]const u8 { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
273		};
	299	h: [8]u64,
	300	t: u128,
	301	// Streaming cache
	302	buf: [128]u8,
	303	buf_len: u8,
274	304
275		h: [8]u64,
276		t: u128,
277		// Streaming cache
278		buf: [128]u8,
279		buf_len: u8,
280
281		pub fn init() Self {
282		debug.assert(8 <= out_len and out_len <= 512);
283
284		var s: Self = undefined;
285		s.reset();
286		return s;
287		}
288
289		pub fn reset(d: &Self) void {
290		mem.copy(u64, d.h[0..], iv[0..]);
291
292		// No key plus default parameters
293		d.h[0] ^= 0x01010000 ^ (out_len >> 3);
294		d.t = 0;
295		d.buf_len = 0;
296		}
297
298		pub fn hash(b: []const u8, out: []u8) void {
299		var d = Self.init();
300		d.update(b);
301		d.final(out);
302		}
303
304		pub fn update(d: &Self, b: []const u8) void {
305		var off: usize = 0;
306
307		// Partial buffer exists from previous update. Copy into buffer then hash.
308		if (d.buf_len != 0 and d.buf_len + b.len > 128) {
309		off += 128 - d.buf_len;
310		mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
311		d.t += 128;
312		d.round(d.buf[0..], false);
	305	pub fn init() Self {
	306	debug.assert(8 <= out_len and out_len <= 512);
	307
	308	var s: Self = undefined;
	309	s.reset();
	310	return s;
	311	}
	312
	313	pub fn reset(d: &Self) void {
	314	mem.copy(u64, d.h[0..], iv[0..]);
	315
	316	// No key plus default parameters
	317	d.h[0] ^= 0x01010000 ^ (out_len >> 3);
	318	d.t = 0;
313	319	d.buf_len = 0;
314	320	}
315	321
316		// Full middle blocks.
317		while (off + 128 <= b.len) : (off += 128) {
318		d.t += 128;
319		d.round(b[off..off + 128], false);
	322	pub fn hash(b: []const u8, out: []u8) void {
	323	var d = Self.init();
	324	d.update(b);
	325	d.final(out);
320	326	}
321	327
322		// Copy any remainder for next pass.
323		mem.copy(u8, d.buf[d.buf_len..], b[off..]);
324		d.buf_len += u8(b[off..].len);
325		}
	328	pub fn update(d: &Self, b: []const u8) void {
	329	var off: usize = 0;
326	330
327		pub fn final(d: &Self, out: []u8) void {
328		mem.set(u8, d.buf[d.buf_len..], 0);
329		d.t += d.buf_len;
330		d.round(d.buf[0..], true);
	331	// Partial buffer exists from previous update. Copy into buffer then hash.
	332	if (d.buf_len != 0 and d.buf_len + b.len > 128) {
	333	off += 128 - d.buf_len;
	334	mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
	335	d.t += 128;
	336	d.round(d.buf[0..], false);
	337	d.buf_len = 0;
	338	}
331	339
332		const rr = d.h[0 .. out_len / 64];
	340	// Full middle blocks.
	341	while (off + 128 <= b.len) : (off += 128) {
	342	d.t += 128;
	343	d.round(b[off..off + 128], false);
	344	}
333	345
334		for (rr) \|s, j\| {
335		mem.writeInt(out[8j .. 8j + 8], s, builtin.Endian.Little);
	346	// Copy any remainder for next pass.
	347	mem.copy(u8, d.buf[d.buf_len..], b[off..]);
	348	d.buf_len += u8(b[off..].len);
336	349	}
337		}
338	350
339		fn round(d: &Self, b: []const u8, last: bool) void {
340		debug.assert(b.len == 128);
	351	pub fn final(d: &Self, out: []u8) void {
	352	mem.set(u8, d.buf[d.buf_len..], 0);
	353	d.t += d.buf_len;
	354	d.round(d.buf[0..], true);
341	355
342		var m: [16]u64 = undefined;
343		var v: [16]u64 = undefined;
	356	const rr = d.h[0..out_len / 64];
344	357
345		for (m) \|*r, i\| {
346		r = mem.readIntLE(u64, b[8i .. 8*i + 8]);
	358	for (rr) \|s, j\| {
	359	mem.writeInt(out[8 * j..8 * j + 8], s, builtin.Endian.Little);
	360	}
347	361	}
348	362
349		var k: usize = 0;
350		while (k < 8) : (k += 1) {
351		v[k] = d.h[k];
352		v[k+8] = iv[k];
353		}
	363	fn round(d: &Self, b: []const u8, last: bool) void {
	364	debug.assert(b.len == 128);
354	365
355		v[12] ^= @truncate(u64, d.t);
356		v[13] ^= u64(d.t >> 64);
357		if (last) v[14] = ~v[14];
358
359		const rounds = comptime []RoundParam {
360		Rp(0, 4, 8, 12, 0, 1),
361		Rp(1, 5, 9, 13, 2, 3),
362		Rp(2, 6, 10, 14, 4, 5),
363		Rp(3, 7, 11, 15, 6, 7),
364		Rp(0, 5, 10, 15, 8, 9),
365		Rp(1, 6, 11, 12, 10, 11),
366		Rp(2, 7, 8, 13, 12, 13),
367		Rp(3, 4, 9, 14, 14, 15),
368		};
	366	var m: [16]u64 = undefined;
	367	var v: [16]u64 = undefined;
369	368
370		comptime var j: usize = 0;
371		inline while (j < 12) : (j += 1) {
372		inline for (rounds) \|r\| {
373		v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.x]];
374		v[r.d] = math.rotr(u64, v[r.d] ^ v[r.a], usize(32));
375		v[r.c] = v[r.c] +% v[r.d];
376		v[r.b] = math.rotr(u64, v[r.b] ^ v[r.c], usize(24));
377		v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.y]];
378		v[r.d] = math.rotr(u64, v[r.d] ^ v[r.a], usize(16));
379		v[r.c] = v[r.c] +% v[r.d];
380		v[r.b] = math.rotr(u64, v[r.b] ^ v[r.c], usize(63));
	369	for (m) \|*r, i\| {
	370	r.* = mem.readIntLE(u64, b[8 * i..8 * i + 8]);
	371	}
	372
	373	var k: usize = 0;
	374	while (k < 8) : (k += 1) {
	375	v[k] = d.h[k];
	376	v[k + 8] = iv[k];
381	377	}
382		}
383	378
384		for (d.h) \|*r, i\| {
385		*r ^= v[i] ^ v[i + 8];
	379	v[12] ^= @truncate(u64, d.t);
	380	v[13] ^= u64(d.t >> 64);
	381	if (last) v[14] = ~v[14];
	382
	383	const rounds = comptime []RoundParam{
	384	Rp(0, 4, 8, 12, 0, 1),
	385	Rp(1, 5, 9, 13, 2, 3),
	386	Rp(2, 6, 10, 14, 4, 5),
	387	Rp(3, 7, 11, 15, 6, 7),
	388	Rp(0, 5, 10, 15, 8, 9),
	389	Rp(1, 6, 11, 12, 10, 11),
	390	Rp(2, 7, 8, 13, 12, 13),
	391	Rp(3, 4, 9, 14, 14, 15),
	392	};
	393
	394	comptime var j: usize = 0;
	395	inline while (j < 12) : (j += 1) {
	396	inline for (rounds) \|r\| {
	397	v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.x]];
	398	v[r.d] = math.rotr(u64, v[r.d] ^ v[r.a], usize(32));
	399	v[r.c] = v[r.c] +% v[r.d];
	400	v[r.b] = math.rotr(u64, v[r.b] ^ v[r.c], usize(24));
	401	v[r.a] = v[r.a] +% v[r.b] +% m[sigma[j][r.y]];
	402	v[r.d] = math.rotr(u64, v[r.d] ^ v[r.a], usize(16));
	403	v[r.c] = v[r.c] +% v[r.d];
	404	v[r.b] = math.rotr(u64, v[r.b] ^ v[r.c], usize(63));
	405	}
	406	}
	407
	408	for (d.h) \|*r, i\| {
	409	r.* ^= v[i] ^ v[i + 8];
	410	}
386	411	}
387		}
388		};}
	412	};
	413	}
389	414
390	415	test "blake2b384 single" {
391	416	const h1 = "b32811423377f52d7862286ee1a72ee540524380fda1724a6f25d7978c6fd3244a6caf0498812673c5e05ef583825100";
...	...	@@ -458,7 +483,7 @@ test "blake2b512 streaming" {
458	483	}
459	484
460	485	test "blake2b512 aligned final" {
461		var block = []u8 {0} ** Blake2b512.block_size;
	486	var block = []u8{0} ** Blake2b512.block_size;
462	487	var out: [Blake2b512.digest_size]u8 = undefined;
463	488
464	489	var h = Blake2b512.init();

std/crypto/hmac.zig+2-2

...	...	@@ -29,12 +29,12 @@ pub fn Hmac(comptime H: type) type {
29	29
30	30	var o_key_pad: [H.block_size]u8 = undefined;
31	31	for (o_key_pad) \|*b, i\| {
32		*b = scratch[i] ^ 0x5c;
	32	b.* = scratch[i] ^ 0x5c;
33	33	}
34	34
35	35	var i_key_pad: [H.block_size]u8 = undefined;
36	36	for (i_key_pad) \|*b, i\| {
37		*b = scratch[i] ^ 0x36;
	37	b.* = scratch[i] ^ 0x36;
38	38	}
39	39
40	40	// HMAC(k, m) = H(o_key_pad \| H(i_key_pad \| message)) where \| is concatenation

std/crypto/md5.zig+77-61

...	...	@@ -6,12 +6,25 @@ const debug = @import("../debug/index.zig");
6	6	const fmt = @import("../fmt/index.zig");
7	7
8	8	const RoundParam = struct {
9		a: usize, b: usize, c: usize, d: usize,
10		k: usize, s: u32, t: u32
	9	a: usize,
	10	b: usize,
	11	c: usize,
	12	d: usize,
	13	k: usize,
	14	s: u32,
	15	t: u32,
11	16	};
12	17
13	18	fn Rp(a: usize, b: usize, c: usize, d: usize, k: usize, s: u32, t: u32) RoundParam {
14		return RoundParam { .a = a, .b = b, .c = c, .d = d, .k = k, .s = s, .t = t };
	19	return RoundParam{
	20	.a = a,
	21	.b = b,
	22	.c = c,
	23	.d = d,
	24	.k = k,
	25	.s = s,
	26	.t = t,
	27	};
15	28	}
16	29
17	30	pub const Md5 = struct {
...	...	@@ -99,7 +112,7 @@ pub const Md5 = struct {
99	112	d.round(d.buf[0..]);
100	113
101	114	for (d.s) \|s, j\| {
102		mem.writeInt(out[4j .. 4j + 4], s, builtin.Endian.Little);
	115	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Little);
103	116	}
104	117	}
105	118
...	...	@@ -112,30 +125,33 @@ pub const Md5 = struct {
112	125	while (i < 16) : (i += 1) {
113	126	// NOTE: Performing or's separately improves perf by ~10%
114	127	s[i] = 0;
115		s[i] \|= u32(b[i*4+0]);
116		s[i] \|= u32(b[i*4+1]) << 8;
117		s[i] \|= u32(b[i*4+2]) << 16;
118		s[i] \|= u32(b[i*4+3]) << 24;
	128	s[i] \|= u32(b[i * 4 + 0]);
	129	s[i] \|= u32(b[i * 4 + 1]) << 8;
	130	s[i] \|= u32(b[i * 4 + 2]) << 16;
	131	s[i] \|= u32(b[i * 4 + 3]) << 24;
119	132	}
120	133
121		var v: [4]u32 = []u32 {
122		d.s[0], d.s[1], d.s[2], d.s[3],
	134	var v: [4]u32 = []u32{
	135	d.s[0],
	136	d.s[1],
	137	d.s[2],
	138	d.s[3],
123	139	};
124	140
125		const round0 = comptime []RoundParam {
126		Rp(0, 1, 2, 3, 0, 7, 0xD76AA478),
127		Rp(3, 0, 1, 2, 1, 12, 0xE8C7B756),
128		Rp(2, 3, 0, 1, 2, 17, 0x242070DB),
129		Rp(1, 2, 3, 0, 3, 22, 0xC1BDCEEE),
130		Rp(0, 1, 2, 3, 4, 7, 0xF57C0FAF),
131		Rp(3, 0, 1, 2, 5, 12, 0x4787C62A),
132		Rp(2, 3, 0, 1, 6, 17, 0xA8304613),
133		Rp(1, 2, 3, 0, 7, 22, 0xFD469501),
134		Rp(0, 1, 2, 3, 8, 7, 0x698098D8),
135		Rp(3, 0, 1, 2, 9, 12, 0x8B44F7AF),
	141	const round0 = comptime []RoundParam{
	142	Rp(0, 1, 2, 3, 0, 7, 0xD76AA478),
	143	Rp(3, 0, 1, 2, 1, 12, 0xE8C7B756),
	144	Rp(2, 3, 0, 1, 2, 17, 0x242070DB),
	145	Rp(1, 2, 3, 0, 3, 22, 0xC1BDCEEE),
	146	Rp(0, 1, 2, 3, 4, 7, 0xF57C0FAF),
	147	Rp(3, 0, 1, 2, 5, 12, 0x4787C62A),
	148	Rp(2, 3, 0, 1, 6, 17, 0xA8304613),
	149	Rp(1, 2, 3, 0, 7, 22, 0xFD469501),
	150	Rp(0, 1, 2, 3, 8, 7, 0x698098D8),
	151	Rp(3, 0, 1, 2, 9, 12, 0x8B44F7AF),
136	152	Rp(2, 3, 0, 1, 10, 17, 0xFFFF5BB1),
137	153	Rp(1, 2, 3, 0, 11, 22, 0x895CD7BE),
138		Rp(0, 1, 2, 3, 12, 7, 0x6B901122),
	154	Rp(0, 1, 2, 3, 12, 7, 0x6B901122),
139	155	Rp(3, 0, 1, 2, 13, 12, 0xFD987193),
140	156	Rp(2, 3, 0, 1, 14, 17, 0xA679438E),
141	157	Rp(1, 2, 3, 0, 15, 22, 0x49B40821),
...	...	@@ -145,22 +161,22 @@ pub const Md5 = struct {
145	161	v[r.a] = v[r.b] +% math.rotl(u32, v[r.a], r.s);
146	162	}
147	163
148		const round1 = comptime []RoundParam {
149		Rp(0, 1, 2, 3, 1, 5, 0xF61E2562),
150		Rp(3, 0, 1, 2, 6, 9, 0xC040B340),
	164	const round1 = comptime []RoundParam{
	165	Rp(0, 1, 2, 3, 1, 5, 0xF61E2562),
	166	Rp(3, 0, 1, 2, 6, 9, 0xC040B340),
151	167	Rp(2, 3, 0, 1, 11, 14, 0x265E5A51),
152		Rp(1, 2, 3, 0, 0, 20, 0xE9B6C7AA),
153		Rp(0, 1, 2, 3, 5, 5, 0xD62F105D),
154		Rp(3, 0, 1, 2, 10, 9, 0x02441453),
	168	Rp(1, 2, 3, 0, 0, 20, 0xE9B6C7AA),
	169	Rp(0, 1, 2, 3, 5, 5, 0xD62F105D),
	170	Rp(3, 0, 1, 2, 10, 9, 0x02441453),
155	171	Rp(2, 3, 0, 1, 15, 14, 0xD8A1E681),
156		Rp(1, 2, 3, 0, 4, 20, 0xE7D3FBC8),
157		Rp(0, 1, 2, 3, 9, 5, 0x21E1CDE6),
158		Rp(3, 0, 1, 2, 14, 9, 0xC33707D6),
159		Rp(2, 3, 0, 1, 3, 14, 0xF4D50D87),
160		Rp(1, 2, 3, 0, 8, 20, 0x455A14ED),
161		Rp(0, 1, 2, 3, 13, 5, 0xA9E3E905),
162		Rp(3, 0, 1, 2, 2, 9, 0xFCEFA3F8),
163		Rp(2, 3, 0, 1, 7, 14, 0x676F02D9),
	172	Rp(1, 2, 3, 0, 4, 20, 0xE7D3FBC8),
	173	Rp(0, 1, 2, 3, 9, 5, 0x21E1CDE6),
	174	Rp(3, 0, 1, 2, 14, 9, 0xC33707D6),
	175	Rp(2, 3, 0, 1, 3, 14, 0xF4D50D87),
	176	Rp(1, 2, 3, 0, 8, 20, 0x455A14ED),
	177	Rp(0, 1, 2, 3, 13, 5, 0xA9E3E905),
	178	Rp(3, 0, 1, 2, 2, 9, 0xFCEFA3F8),
	179	Rp(2, 3, 0, 1, 7, 14, 0x676F02D9),
164	180	Rp(1, 2, 3, 0, 12, 20, 0x8D2A4C8A),
165	181	};
166	182	inline for (round1) \|r\| {
...	...	@@ -168,46 +184,46 @@ pub const Md5 = struct {
168	184	v[r.a] = v[r.b] +% math.rotl(u32, v[r.a], r.s);
169	185	}
170	186
171		const round2 = comptime []RoundParam {
172		Rp(0, 1, 2, 3, 5, 4, 0xFFFA3942),
173		Rp(3, 0, 1, 2, 8, 11, 0x8771F681),
	187	const round2 = comptime []RoundParam{
	188	Rp(0, 1, 2, 3, 5, 4, 0xFFFA3942),
	189	Rp(3, 0, 1, 2, 8, 11, 0x8771F681),
174	190	Rp(2, 3, 0, 1, 11, 16, 0x6D9D6122),
175	191	Rp(1, 2, 3, 0, 14, 23, 0xFDE5380C),
176		Rp(0, 1, 2, 3, 1, 4, 0xA4BEEA44),
177		Rp(3, 0, 1, 2, 4, 11, 0x4BDECFA9),
178		Rp(2, 3, 0, 1, 7, 16, 0xF6BB4B60),
	192	Rp(0, 1, 2, 3, 1, 4, 0xA4BEEA44),
	193	Rp(3, 0, 1, 2, 4, 11, 0x4BDECFA9),
	194	Rp(2, 3, 0, 1, 7, 16, 0xF6BB4B60),
179	195	Rp(1, 2, 3, 0, 10, 23, 0xBEBFBC70),
180		Rp(0, 1, 2, 3, 13, 4, 0x289B7EC6),
181		Rp(3, 0, 1, 2, 0, 11, 0xEAA127FA),
182		Rp(2, 3, 0, 1, 3, 16, 0xD4EF3085),
183		Rp(1, 2, 3, 0, 6, 23, 0x04881D05),
184		Rp(0, 1, 2, 3, 9, 4, 0xD9D4D039),
	196	Rp(0, 1, 2, 3, 13, 4, 0x289B7EC6),
	197	Rp(3, 0, 1, 2, 0, 11, 0xEAA127FA),
	198	Rp(2, 3, 0, 1, 3, 16, 0xD4EF3085),
	199	Rp(1, 2, 3, 0, 6, 23, 0x04881D05),
	200	Rp(0, 1, 2, 3, 9, 4, 0xD9D4D039),
185	201	Rp(3, 0, 1, 2, 12, 11, 0xE6DB99E5),
186	202	Rp(2, 3, 0, 1, 15, 16, 0x1FA27CF8),
187		Rp(1, 2, 3, 0, 2, 23, 0xC4AC5665),
	203	Rp(1, 2, 3, 0, 2, 23, 0xC4AC5665),
188	204	};
189	205	inline for (round2) \|r\| {
190	206	v[r.a] = v[r.a] +% (v[r.b] ^ v[r.c] ^ v[r.d]) +% r.t +% s[r.k];
191	207	v[r.a] = v[r.b] +% math.rotl(u32, v[r.a], r.s);
192	208	}
193	209
194		const round3 = comptime []RoundParam {
195		Rp(0, 1, 2, 3, 0, 6, 0xF4292244),
196		Rp(3, 0, 1, 2, 7, 10, 0x432AFF97),
	210	const round3 = comptime []RoundParam{
	211	Rp(0, 1, 2, 3, 0, 6, 0xF4292244),
	212	Rp(3, 0, 1, 2, 7, 10, 0x432AFF97),
197	213	Rp(2, 3, 0, 1, 14, 15, 0xAB9423A7),
198		Rp(1, 2, 3, 0, 5, 21, 0xFC93A039),
199		Rp(0, 1, 2, 3, 12, 6, 0x655B59C3),
200		Rp(3, 0, 1, 2, 3, 10, 0x8F0CCC92),
	214	Rp(1, 2, 3, 0, 5, 21, 0xFC93A039),
	215	Rp(0, 1, 2, 3, 12, 6, 0x655B59C3),
	216	Rp(3, 0, 1, 2, 3, 10, 0x8F0CCC92),
201	217	Rp(2, 3, 0, 1, 10, 15, 0xFFEFF47D),
202		Rp(1, 2, 3, 0, 1, 21, 0x85845DD1),
203		Rp(0, 1, 2, 3, 8, 6, 0x6FA87E4F),
	218	Rp(1, 2, 3, 0, 1, 21, 0x85845DD1),
	219	Rp(0, 1, 2, 3, 8, 6, 0x6FA87E4F),
204	220	Rp(3, 0, 1, 2, 15, 10, 0xFE2CE6E0),
205		Rp(2, 3, 0, 1, 6, 15, 0xA3014314),
	221	Rp(2, 3, 0, 1, 6, 15, 0xA3014314),
206	222	Rp(1, 2, 3, 0, 13, 21, 0x4E0811A1),
207		Rp(0, 1, 2, 3, 4, 6, 0xF7537E82),
	223	Rp(0, 1, 2, 3, 4, 6, 0xF7537E82),
208	224	Rp(3, 0, 1, 2, 11, 10, 0xBD3AF235),
209		Rp(2, 3, 0, 1, 2, 15, 0x2AD7D2BB),
210		Rp(1, 2, 3, 0, 9, 21, 0xEB86D391),
	225	Rp(2, 3, 0, 1, 2, 15, 0x2AD7D2BB),
	226	Rp(1, 2, 3, 0, 9, 21, 0xEB86D391),
211	227	};
212	228	inline for (round3) \|r\| {
213	229	v[r.a] = v[r.a] +% (v[r.c] ^ (v[r.b] \| ~v[r.d])) +% r.t +% s[r.k];
...	...	@@ -255,7 +271,7 @@ test "md5 streaming" {
255	271	}
256	272
257	273	test "md5 aligned final" {
258		var block = []u8 {0} ** Md5.block_size;
	274	var block = []u8{0} ** Md5.block_size;
259	275	var out: [Md5.digest_size]u8 = undefined;
260	276
261	277	var h = Md5.init();

std/crypto/sha1.zig+47-39

...	...	@@ -7,11 +7,23 @@ const builtin = @import("builtin");
7	7	pub const u160 = @IntType(false, 160);
8	8
9	9	const RoundParam = struct {
10		a: usize, b: usize, c: usize, d: usize, e: usize, i: u32,
	10	a: usize,
	11	b: usize,
	12	c: usize,
	13	d: usize,
	14	e: usize,
	15	i: u32,
11	16	};
12	17
13	18	fn Rp(a: usize, b: usize, c: usize, d: usize, e: usize, i: u32) RoundParam {
14		return RoundParam { .a = a, .b = b, .c = c, .d = d, .e = e, .i = i };
	19	return RoundParam{
	20	.a = a,
	21	.b = b,
	22	.c = c,
	23	.d = d,
	24	.e = e,
	25	.i = i,
	26	};
15	27	}
16	28
17	29	pub const Sha1 = struct {
...	...	@@ -99,7 +111,7 @@ pub const Sha1 = struct {
99	111	d.round(d.buf[0..]);
100	112
101	113	for (d.s) \|s, j\| {
102		mem.writeInt(out[4j .. 4j + 4], s, builtin.Endian.Big);
	114	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Big);
103	115	}
104	116	}
105	117
...	...	@@ -108,21 +120,25 @@ pub const Sha1 = struct {
108	120
109	121	var s: [16]u32 = undefined;
110	122
111		var v: [5]u32 = []u32 {
112		d.s[0], d.s[1], d.s[2], d.s[3], d.s[4],
	123	var v: [5]u32 = []u32{
	124	d.s[0],
	125	d.s[1],
	126	d.s[2],
	127	d.s[3],
	128	d.s[4],
113	129	};
114	130
115		const round0a = comptime []RoundParam {
116		Rp(0, 1, 2, 3, 4, 0),
117		Rp(4, 0, 1, 2, 3, 1),
118		Rp(3, 4, 0, 1, 2, 2),
119		Rp(2, 3, 4, 0, 1, 3),
120		Rp(1, 2, 3, 4, 0, 4),
121		Rp(0, 1, 2, 3, 4, 5),
122		Rp(4, 0, 1, 2, 3, 6),
123		Rp(3, 4, 0, 1, 2, 7),
124		Rp(2, 3, 4, 0, 1, 8),
125		Rp(1, 2, 3, 4, 0, 9),
	131	const round0a = comptime []RoundParam{
	132	Rp(0, 1, 2, 3, 4, 0),
	133	Rp(4, 0, 1, 2, 3, 1),
	134	Rp(3, 4, 0, 1, 2, 2),
	135	Rp(2, 3, 4, 0, 1, 3),
	136	Rp(1, 2, 3, 4, 0, 4),
	137	Rp(0, 1, 2, 3, 4, 5),
	138	Rp(4, 0, 1, 2, 3, 6),
	139	Rp(3, 4, 0, 1, 2, 7),
	140	Rp(2, 3, 4, 0, 1, 8),
	141	Rp(1, 2, 3, 4, 0, 9),
126	142	Rp(0, 1, 2, 3, 4, 10),
127	143	Rp(4, 0, 1, 2, 3, 11),
128	144	Rp(3, 4, 0, 1, 2, 12),
...	...	@@ -131,32 +147,27 @@ pub const Sha1 = struct {
131	147	Rp(0, 1, 2, 3, 4, 15),
132	148	};
133	149	inline for (round0a) \|r\| {
134		s[r.i] = (u32(b[r.i * 4 + 0]) << 24) \|
135		(u32(b[r.i * 4 + 1]) << 16) \|
136		(u32(b[r.i * 4 + 2]) << 8) \|
137		(u32(b[r.i * 4 + 3]) << 0);
	150	s[r.i] = (u32(b[r.i * 4 + 0]) << 24) \| (u32(b[r.i * 4 + 1]) << 16) \| (u32(b[r.i * 4 + 2]) << 8) \| (u32(b[r.i * 4 + 3]) << 0);
138	151
139		v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x5A827999 +% s[r.i & 0xf]
140		+% ((v[r.b] & v[r.c]) \| (~v[r.b] & v[r.d]));
	152	v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x5A827999 +% s[r.i & 0xf] +% ((v[r.b] & v[r.c]) \| (~v[r.b] & v[r.d]));
141	153	v[r.b] = math.rotl(u32, v[r.b], u32(30));
142	154	}
143	155
144		const round0b = comptime []RoundParam {
	156	const round0b = comptime []RoundParam{
145	157	Rp(4, 0, 1, 2, 3, 16),
146	158	Rp(3, 4, 0, 1, 2, 17),
147	159	Rp(2, 3, 4, 0, 1, 18),
148	160	Rp(1, 2, 3, 4, 0, 19),
149	161	};
150	162	inline for (round0b) \|r\| {
151		const t = s[(r.i-3) & 0xf] ^ s[(r.i-8) & 0xf] ^ s[(r.i-14) & 0xf] ^ s[(r.i-16) & 0xf];
	163	const t = s[(r.i - 3) & 0xf] ^ s[(r.i - 8) & 0xf] ^ s[(r.i - 14) & 0xf] ^ s[(r.i - 16) & 0xf];
152	164	s[r.i & 0xf] = math.rotl(u32, t, u32(1));
153	165
154		v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x5A827999 +% s[r.i & 0xf]
155		+% ((v[r.b] & v[r.c]) \| (~v[r.b] & v[r.d]));
	166	v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x5A827999 +% s[r.i & 0xf] +% ((v[r.b] & v[r.c]) \| (~v[r.b] & v[r.d]));
156	167	v[r.b] = math.rotl(u32, v[r.b], u32(30));
157	168	}
158	169
159		const round1 = comptime []RoundParam {
	170	const round1 = comptime []RoundParam{
160	171	Rp(0, 1, 2, 3, 4, 20),
161	172	Rp(4, 0, 1, 2, 3, 21),
162	173	Rp(3, 4, 0, 1, 2, 22),
...	...	@@ -179,15 +190,14 @@ pub const Sha1 = struct {
179	190	Rp(1, 2, 3, 4, 0, 39),
180	191	};
181	192	inline for (round1) \|r\| {
182		const t = s[(r.i-3) & 0xf] ^ s[(r.i-8) & 0xf] ^ s[(r.i-14) & 0xf] ^ s[(r.i-16) & 0xf];
	193	const t = s[(r.i - 3) & 0xf] ^ s[(r.i - 8) & 0xf] ^ s[(r.i - 14) & 0xf] ^ s[(r.i - 16) & 0xf];
183	194	s[r.i & 0xf] = math.rotl(u32, t, u32(1));
184	195
185		v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x6ED9EBA1 +% s[r.i & 0xf]
186		+% (v[r.b] ^ v[r.c] ^ v[r.d]);
	196	v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x6ED9EBA1 +% s[r.i & 0xf] +% (v[r.b] ^ v[r.c] ^ v[r.d]);
187	197	v[r.b] = math.rotl(u32, v[r.b], u32(30));
188	198	}
189	199
190		const round2 = comptime []RoundParam {
	200	const round2 = comptime []RoundParam{
191	201	Rp(0, 1, 2, 3, 4, 40),
192	202	Rp(4, 0, 1, 2, 3, 41),
193	203	Rp(3, 4, 0, 1, 2, 42),
...	...	@@ -210,15 +220,14 @@ pub const Sha1 = struct {
210	220	Rp(1, 2, 3, 4, 0, 59),
211	221	};
212	222	inline for (round2) \|r\| {
213		const t = s[(r.i-3) & 0xf] ^ s[(r.i-8) & 0xf] ^ s[(r.i-14) & 0xf] ^ s[(r.i-16) & 0xf];
	223	const t = s[(r.i - 3) & 0xf] ^ s[(r.i - 8) & 0xf] ^ s[(r.i - 14) & 0xf] ^ s[(r.i - 16) & 0xf];
214	224	s[r.i & 0xf] = math.rotl(u32, t, u32(1));
215	225
216		v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x8F1BBCDC +% s[r.i & 0xf]
217		+% ((v[r.b] & v[r.c]) ^ (v[r.b] & v[r.d]) ^ (v[r.c] & v[r.d]));
	226	v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0x8F1BBCDC +% s[r.i & 0xf] +% ((v[r.b] & v[r.c]) ^ (v[r.b] & v[r.d]) ^ (v[r.c] & v[r.d]));
218	227	v[r.b] = math.rotl(u32, v[r.b], u32(30));
219	228	}
220	229
221		const round3 = comptime []RoundParam {
	230	const round3 = comptime []RoundParam{
222	231	Rp(0, 1, 2, 3, 4, 60),
223	232	Rp(4, 0, 1, 2, 3, 61),
224	233	Rp(3, 4, 0, 1, 2, 62),
...	...	@@ -241,11 +250,10 @@ pub const Sha1 = struct {
241	250	Rp(1, 2, 3, 4, 0, 79),
242	251	};
243	252	inline for (round3) \|r\| {
244		const t = s[(r.i-3) & 0xf] ^ s[(r.i-8) & 0xf] ^ s[(r.i-14) & 0xf] ^ s[(r.i-16) & 0xf];
	253	const t = s[(r.i - 3) & 0xf] ^ s[(r.i - 8) & 0xf] ^ s[(r.i - 14) & 0xf] ^ s[(r.i - 16) & 0xf];
245	254	s[r.i & 0xf] = math.rotl(u32, t, u32(1));
246	255
247		v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0xCA62C1D6 +% s[r.i & 0xf]
248		+% (v[r.b] ^ v[r.c] ^ v[r.d]);
	256	v[r.e] = v[r.e] +% math.rotl(u32, v[r.a], u32(5)) +% 0xCA62C1D6 +% s[r.i & 0xf] +% (v[r.b] ^ v[r.c] ^ v[r.d]);
249	257	v[r.b] = math.rotl(u32, v[r.b], u32(30));
250	258	}
251	259
...	...	@@ -286,7 +294,7 @@ test "sha1 streaming" {
286	294	}
287	295
288	296	test "sha1 aligned final" {
289		var block = []u8 {0} ** Sha1.block_size;
	297	var block = []u8{0} ** Sha1.block_size;
290	298	var out: [Sha1.digest_size]u8 = undefined;
291	299
292	300	var h = Sha1.init();

std/crypto/sha2.zig+448-413

...	...	@@ -9,12 +9,31 @@ const htest = @import("test.zig");
9	9	// Sha224 + Sha256
10	10
11	11	const RoundParam256 = struct {
12		a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize,
13		i: usize, k: u32,
	12	a: usize,
	13	b: usize,
	14	c: usize,
	15	d: usize,
	16	e: usize,
	17	f: usize,
	18	g: usize,
	19	h: usize,
	20	i: usize,
	21	k: u32,
14	22	};
15	23
16	24	fn Rp256(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize, i: usize, k: u32) RoundParam256 {
17		return RoundParam256 { .a = a, .b = b, .c = c, .d = d, .e = e, .f = f, .g = g, .h = h, .i = i, .k = k };
	25	return RoundParam256{
	26	.a = a,
	27	.b = b,
	28	.c = c,
	29	.d = d,
	30	.e = e,
	31	.f = f,
	32	.g = g,
	33	.h = h,
	34	.i = i,
	35	.k = k,
	36	};
18	37	}
19	38
20	39	const Sha2Params32 = struct {
...	...	@@ -29,7 +48,7 @@ const Sha2Params32 = struct {
29	48	out_len: usize,
30	49	};
31	50
32		const Sha224Params = Sha2Params32 {
	51	const Sha224Params = Sha2Params32{
33	52	.iv0 = 0xC1059ED8,
34	53	.iv1 = 0x367CD507,
35	54	.iv2 = 0x3070DD17,
...	...	@@ -41,7 +60,7 @@ const Sha224Params = Sha2Params32 {
41	60	.out_len = 224,
42	61	};
43	62
44		const Sha256Params = Sha2Params32 {
	63	const Sha256Params = Sha2Params32{
45	64	.iv0 = 0x6A09E667,
46	65	.iv1 = 0xBB67AE85,
47	66	.iv2 = 0x3C6EF372,
...	...	@@ -56,216 +75,215 @@ const Sha256Params = Sha2Params32 {
56	75	pub const Sha224 = Sha2_32(Sha224Params);
57	76	pub const Sha256 = Sha2_32(Sha256Params);
58	77
59		fn Sha2_32(comptime params: Sha2Params32) type { return struct {
60		const Self = this;
61		const block_size = 64;
62		const digest_size = params.out_len / 8;
63
64		s: [8]u32,
65		// Streaming Cache
66		buf: [64]u8,
67		buf_len: u8,
68		total_len: u64,
69
70		pub fn init() Self {
71		var d: Self = undefined;
72		d.reset();
73		return d;
74		}
75
76		pub fn reset(d: &Self) void {
77		d.s[0] = params.iv0;
78		d.s[1] = params.iv1;
79		d.s[2] = params.iv2;
80		d.s[3] = params.iv3;
81		d.s[4] = params.iv4;
82		d.s[5] = params.iv5;
83		d.s[6] = params.iv6;
84		d.s[7] = params.iv7;
85		d.buf_len = 0;
86		d.total_len = 0;
87		}
88
89		pub fn hash(b: []const u8, out: []u8) void {
90		var d = Self.init();
91		d.update(b);
92		d.final(out);
93		}
94
95		pub fn update(d: &Self, b: []const u8) void {
96		var off: usize = 0;
97
98		// Partial buffer exists from previous update. Copy into buffer then hash.
99		if (d.buf_len != 0 and d.buf_len + b.len > 64) {
100		off += 64 - d.buf_len;
101		mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
	78	fn Sha2_32(comptime params: Sha2Params32) type {
	79	return struct {
	80	const Self = this;
	81	const block_size = 64;
	82	const digest_size = params.out_len / 8;
	83
	84	s: [8]u32,
	85	// Streaming Cache
	86	buf: [64]u8,
	87	buf_len: u8,
	88	total_len: u64,
	89
	90	pub fn init() Self {
	91	var d: Self = undefined;
	92	d.reset();
	93	return d;
	94	}
102	95
103		d.round(d.buf[0..]);
	96	pub fn reset(d: &Self) void {
	97	d.s[0] = params.iv0;
	98	d.s[1] = params.iv1;
	99	d.s[2] = params.iv2;
	100	d.s[3] = params.iv3;
	101	d.s[4] = params.iv4;
	102	d.s[5] = params.iv5;
	103	d.s[6] = params.iv6;
	104	d.s[7] = params.iv7;
104	105	d.buf_len = 0;
	106	d.total_len = 0;
105	107	}
106	108
107		// Full middle blocks.
108		while (off + 64 <= b.len) : (off += 64) {
109		d.round(b[off..off + 64]);
	109	pub fn hash(b: []const u8, out: []u8) void {
	110	var d = Self.init();
	111	d.update(b);
	112	d.final(out);
110	113	}
111	114
112		// Copy any remainder for next pass.
113		mem.copy(u8, d.buf[d.buf_len..], b[off..]);
114		d.buf_len += u8(b[off..].len);
	115	pub fn update(d: &Self, b: []const u8) void {
	116	var off: usize = 0;
115	117
116		d.total_len += b.len;
117		}
	118	// Partial buffer exists from previous update. Copy into buffer then hash.
	119	if (d.buf_len != 0 and d.buf_len + b.len > 64) {
	120	off += 64 - d.buf_len;
	121	mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
118	122
119		pub fn final(d: &Self, out: []u8) void {
120		debug.assert(out.len >= params.out_len / 8);
	123	d.round(d.buf[0..]);
	124	d.buf_len = 0;
	125	}
121	126
122		// The buffer here will never be completely full.
123		mem.set(u8, d.buf[d.buf_len..], 0);
	127	// Full middle blocks.
	128	while (off + 64 <= b.len) : (off += 64) {
	129	d.round(b[off..off + 64]);
	130	}
124	131
125		// Append padding bits.
126		d.buf[d.buf_len] = 0x80;
127		d.buf_len += 1;
	132	// Copy any remainder for next pass.
	133	mem.copy(u8, d.buf[d.buf_len..], b[off..]);
	134	d.buf_len += u8(b[off..].len);
128	135
129		// > 448 mod 512 so need to add an extra round to wrap around.
130		if (64 - d.buf_len < 8) {
131		d.round(d.buf[0..]);
132		mem.set(u8, d.buf[0..], 0);
	136	d.total_len += b.len;
133	137	}
134	138
135		// Append message length.
136		var i: usize = 1;
137		var len = d.total_len >> 5;
138		d.buf[63] = u8(d.total_len & 0x1f) << 3;
139		while (i < 8) : (i += 1) {
140		d.buf[63 - i] = u8(len & 0xff);
141		len >>= 8;
142		}
	139	pub fn final(d: &Self, out: []u8) void {
	140	debug.assert(out.len >= params.out_len / 8);
143	141
144		d.round(d.buf[0..]);
	142	// The buffer here will never be completely full.
	143	mem.set(u8, d.buf[d.buf_len..], 0);
145	144
146		// May truncate for possible 224 output
147		const rr = d.s[0 .. params.out_len / 32];
	145	// Append padding bits.
	146	d.buf[d.buf_len] = 0x80;
	147	d.buf_len += 1;
148	148
149		for (rr) \|s, j\| {
150		mem.writeInt(out[4j .. 4j + 4], s, builtin.Endian.Big);
151		}
152		}
	149	// > 448 mod 512 so need to add an extra round to wrap around.
	150	if (64 - d.buf_len < 8) {
	151	d.round(d.buf[0..]);
	152	mem.set(u8, d.buf[0..], 0);
	153	}
	154
	155	// Append message length.
	156	var i: usize = 1;
	157	var len = d.total_len >> 5;
	158	d.buf[63] = u8(d.total_len & 0x1f) << 3;
	159	while (i < 8) : (i += 1) {
	160	d.buf[63 - i] = u8(len & 0xff);
	161	len >>= 8;
	162	}
153	163
154		fn round(d: &Self, b: []const u8) void {
155		debug.assert(b.len == 64);
	164	d.round(d.buf[0..]);
156	165
157		var s: [64]u32 = undefined;
	166	// May truncate for possible 224 output
	167	const rr = d.s[0..params.out_len / 32];
158	168
159		var i: usize = 0;
160		while (i < 16) : (i += 1) {
161		s[i] = 0;
162		s[i] \|= u32(b[i*4+0]) << 24;
163		s[i] \|= u32(b[i*4+1]) << 16;
164		s[i] \|= u32(b[i*4+2]) << 8;
165		s[i] \|= u32(b[i*4+3]) << 0;
166		}
167		while (i < 64) : (i += 1) {
168		s[i] =
169		s[i-16] +% s[i-7] +%
170		(math.rotr(u32, s[i-15], u32(7)) ^ math.rotr(u32, s[i-15], u32(18)) ^ (s[i-15] >> 3)) +%
171		(math.rotr(u32, s[i-2], u32(17)) ^ math.rotr(u32, s[i-2], u32(19)) ^ (s[i-2] >> 10));
	169	for (rr) \|s, j\| {
	170	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Big);
	171	}
172	172	}
173	173
174		var v: [8]u32 = []u32 {
175		d.s[0], d.s[1], d.s[2], d.s[3], d.s[4], d.s[5], d.s[6], d.s[7],
176		};
177
178		const round0 = comptime []RoundParam256 {
179		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 0, 0x428A2F98),
180		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 1, 0x71374491),
181		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 2, 0xB5C0FBCF),
182		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 3, 0xE9B5DBA5),
183		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 4, 0x3956C25B),
184		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 5, 0x59F111F1),
185		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 6, 0x923F82A4),
186		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 7, 0xAB1C5ED5),
187		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 8, 0xD807AA98),
188		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 9, 0x12835B01),
189		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE),
190		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3),
191		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74),
192		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE),
193		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A7),
194		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174),
195		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C1),
196		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786),
197		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC6),
198		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC),
199		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F),
200		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA),
201		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DC),
202		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA),
203		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152),
204		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D),
205		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C8),
206		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7),
207		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF3),
208		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147),
209		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351),
210		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x14292967),
211		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A85),
212		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B2138),
213		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC),
214		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D13),
215		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A7354),
216		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB),
217		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E),
218		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C85),
219		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A1),
220		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664B),
221		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70),
222		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A3),
223		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819),
224		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD6990624),
225		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E3585),
226		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA070),
227		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116),
228		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C08),
229		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774C),
230		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5),
231		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3),
232		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4A),
233		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F),
234		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3),
235		Rp256(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE),
236		Rp256(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F),
237		Rp256(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814),
238		Rp256(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC70208),
239		Rp256(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA),
240		Rp256(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEB),
241		Rp256(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7),
242		Rp256(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2),
243		};
244		inline for (round0) \|r\| {
245		v[r.h] =
246		v[r.h] +%
247		(math.rotr(u32, v[r.e], u32(6)) ^ math.rotr(u32, v[r.e], u32(11)) ^ math.rotr(u32, v[r.e], u32(25))) +%
248		(v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +%
249		r.k +% s[r.i];
250
251		v[r.d] = v[r.d] +% v[r.h];
252
253		v[r.h] =
254		v[r.h] +%
255		(math.rotr(u32, v[r.a], u32(2)) ^ math.rotr(u32, v[r.a], u32(13)) ^ math.rotr(u32, v[r.a], u32(22))) +%
256		((v[r.a] & (v[r.b] \| v[r.c])) \| (v[r.b] & v[r.c]));
	174	fn round(d: &Self, b: []const u8) void {
	175	debug.assert(b.len == 64);
	176
	177	var s: [64]u32 = undefined;
	178
	179	var i: usize = 0;
	180	while (i < 16) : (i += 1) {
	181	s[i] = 0;
	182	s[i] \|= u32(b[i * 4 + 0]) << 24;
	183	s[i] \|= u32(b[i * 4 + 1]) << 16;
	184	s[i] \|= u32(b[i * 4 + 2]) << 8;
	185	s[i] \|= u32(b[i * 4 + 3]) << 0;
	186	}
	187	while (i < 64) : (i += 1) {
	188	s[i] = s[i - 16] +% s[i - 7] +% (math.rotr(u32, s[i - 15], u32(7)) ^ math.rotr(u32, s[i - 15], u32(18)) ^ (s[i - 15] >> 3)) +% (math.rotr(u32, s[i - 2], u32(17)) ^ math.rotr(u32, s[i - 2], u32(19)) ^ (s[i - 2] >> 10));
	189	}
	190
	191	var v: [8]u32 = []u32{
	192	d.s[0],
	193	d.s[1],
	194	d.s[2],
	195	d.s[3],
	196	d.s[4],
	197	d.s[5],
	198	d.s[6],
	199	d.s[7],
	200	};
	201
	202	const round0 = comptime []RoundParam256{
	203	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 0, 0x428A2F98),
	204	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 1, 0x71374491),
	205	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 2, 0xB5C0FBCF),
	206	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 3, 0xE9B5DBA5),
	207	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 4, 0x3956C25B),
	208	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 5, 0x59F111F1),
	209	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 6, 0x923F82A4),
	210	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 7, 0xAB1C5ED5),
	211	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 8, 0xD807AA98),
	212	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 9, 0x12835B01),
	213	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE),
	214	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3),
	215	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74),
	216	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE),
	217	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A7),
	218	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174),
	219	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C1),
	220	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786),
	221	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC6),
	222	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC),
	223	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F),
	224	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA),
	225	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DC),
	226	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA),
	227	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152),
	228	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D),
	229	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C8),
	230	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7),
	231	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF3),
	232	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147),
	233	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351),
	234	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x14292967),
	235	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A85),
	236	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B2138),
	237	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC),
	238	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D13),
	239	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A7354),
	240	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB),
	241	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E),
	242	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C85),
	243	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A1),
	244	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664B),
	245	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70),
	246	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A3),
	247	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819),
	248	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD6990624),
	249	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E3585),
	250	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA070),
	251	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116),
	252	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C08),
	253	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774C),
	254	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5),
	255	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3),
	256	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4A),
	257	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F),
	258	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3),
	259	Rp256(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE),
	260	Rp256(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F),
	261	Rp256(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814),
	262	Rp256(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC70208),
	263	Rp256(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA),
	264	Rp256(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEB),
	265	Rp256(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7),
	266	Rp256(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2),
	267	};
	268	inline for (round0) \|r\| {
	269	v[r.h] = v[r.h] +% (math.rotr(u32, v[r.e], u32(6)) ^ math.rotr(u32, v[r.e], u32(11)) ^ math.rotr(u32, v[r.e], u32(25))) +% (v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +% r.k +% s[r.i];
	270
	271	v[r.d] = v[r.d] +% v[r.h];
	272
	273	v[r.h] = v[r.h] +% (math.rotr(u32, v[r.a], u32(2)) ^ math.rotr(u32, v[r.a], u32(13)) ^ math.rotr(u32, v[r.a], u32(22))) +% ((v[r.a] & (v[r.b] \| v[r.c])) \| (v[r.b] & v[r.c]));
	274	}
	275
	276	d.s[0] +%= v[0];
	277	d.s[1] +%= v[1];
	278	d.s[2] +%= v[2];
	279	d.s[3] +%= v[3];
	280	d.s[4] +%= v[4];
	281	d.s[5] +%= v[5];
	282	d.s[6] +%= v[6];
	283	d.s[7] +%= v[7];
257	284	}
258
259		d.s[0] +%= v[0];
260		d.s[1] +%= v[1];
261		d.s[2] +%= v[2];
262		d.s[3] +%= v[3];
263		d.s[4] +%= v[4];
264		d.s[5] +%= v[5];
265		d.s[6] +%= v[6];
266		d.s[7] +%= v[7];
267		}
268		};}
	285	};
	286	}
269	287
270	288	test "sha224 single" {
271	289	htest.assertEqualHash(Sha224, "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f", "");
...	...	@@ -320,7 +338,7 @@ test "sha256 streaming" {
320	338	}
321	339
322	340	test "sha256 aligned final" {
323		var block = []u8 {0} ** Sha256.block_size;
	341	var block = []u8{0} ** Sha256.block_size;
324	342	var out: [Sha256.digest_size]u8 = undefined;
325	343
326	344	var h = Sha256.init();
...	...	@@ -328,17 +346,35 @@ test "sha256 aligned final" {
328	346	h.final(out[0..]);
329	347	}
330	348
331
332	349	/////////////////////
333	350	// Sha384 + Sha512
334	351
335	352	const RoundParam512 = struct {
336		a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize,
337		i: usize, k: u64,
	353	a: usize,
	354	b: usize,
	355	c: usize,
	356	d: usize,
	357	e: usize,
	358	f: usize,
	359	g: usize,
	360	h: usize,
	361	i: usize,
	362	k: u64,
338	363	};
339	364
340	365	fn Rp512(a: usize, b: usize, c: usize, d: usize, e: usize, f: usize, g: usize, h: usize, i: usize, k: u64) RoundParam512 {
341		return RoundParam512 { .a = a, .b = b, .c = c, .d = d, .e = e, .f = f, .g = g, .h = h, .i = i, .k = k };
	366	return RoundParam512{
	367	.a = a,
	368	.b = b,
	369	.c = c,
	370	.d = d,
	371	.e = e,
	372	.f = f,
	373	.g = g,
	374	.h = h,
	375	.i = i,
	376	.k = k,
	377	};
342	378	}
343	379
344	380	const Sha2Params64 = struct {
...	...	@@ -353,7 +389,7 @@ const Sha2Params64 = struct {
353	389	out_len: usize,
354	390	};
355	391
356		const Sha384Params = Sha2Params64 {
	392	const Sha384Params = Sha2Params64{
357	393	.iv0 = 0xCBBB9D5DC1059ED8,
358	394	.iv1 = 0x629A292A367CD507,
359	395	.iv2 = 0x9159015A3070DD17,
...	...	@@ -365,7 +401,7 @@ const Sha384Params = Sha2Params64 {
365	401	.out_len = 384,
366	402	};
367	403
368		const Sha512Params = Sha2Params64 {
	404	const Sha512Params = Sha2Params64{
369	405	.iv0 = 0x6A09E667F3BCC908,
370	406	.iv1 = 0xBB67AE8584CAA73B,
371	407	.iv2 = 0x3C6EF372FE94F82B,
...	...	@@ -374,242 +410,241 @@ const Sha512Params = Sha2Params64 {
374	410	.iv5 = 0x9B05688C2B3E6C1F,
375	411	.iv6 = 0x1F83D9ABFB41BD6B,
376	412	.iv7 = 0x5BE0CD19137E2179,
377		.out_len = 512
	413	.out_len = 512,
378	414	};
379	415
380	416	pub const Sha384 = Sha2_64(Sha384Params);
381	417	pub const Sha512 = Sha2_64(Sha512Params);
382	418
383		fn Sha2_64(comptime params: Sha2Params64) type { return struct {
384		const Self = this;
385		const block_size = 128;
386		const digest_size = params.out_len / 8;
387
388		s: [8]u64,
389		// Streaming Cache
390		buf: [128]u8,
391		buf_len: u8,
392		total_len: u128,
393
394		pub fn init() Self {
395		var d: Self = undefined;
396		d.reset();
397		return d;
398		}
399
400		pub fn reset(d: &Self) void {
401		d.s[0] = params.iv0;
402		d.s[1] = params.iv1;
403		d.s[2] = params.iv2;
404		d.s[3] = params.iv3;
405		d.s[4] = params.iv4;
406		d.s[5] = params.iv5;
407		d.s[6] = params.iv6;
408		d.s[7] = params.iv7;
409		d.buf_len = 0;
410		d.total_len = 0;
411		}
412
413		pub fn hash(b: []const u8, out: []u8) void {
414		var d = Self.init();
415		d.update(b);
416		d.final(out);
417		}
418
419		pub fn update(d: &Self, b: []const u8) void {
420		var off: usize = 0;
421
422		// Partial buffer exists from previous update. Copy into buffer then hash.
423		if (d.buf_len != 0 and d.buf_len + b.len > 128) {
424		off += 128 - d.buf_len;
425		mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
	419	fn Sha2_64(comptime params: Sha2Params64) type {
	420	return struct {
	421	const Self = this;
	422	const block_size = 128;
	423	const digest_size = params.out_len / 8;
	424
	425	s: [8]u64,
	426	// Streaming Cache
	427	buf: [128]u8,
	428	buf_len: u8,
	429	total_len: u128,
	430
	431	pub fn init() Self {
	432	var d: Self = undefined;
	433	d.reset();
	434	return d;
	435	}
426	436
427		d.round(d.buf[0..]);
	437	pub fn reset(d: &Self) void {
	438	d.s[0] = params.iv0;
	439	d.s[1] = params.iv1;
	440	d.s[2] = params.iv2;
	441	d.s[3] = params.iv3;
	442	d.s[4] = params.iv4;
	443	d.s[5] = params.iv5;
	444	d.s[6] = params.iv6;
	445	d.s[7] = params.iv7;
428	446	d.buf_len = 0;
	447	d.total_len = 0;
429	448	}
430	449
431		// Full middle blocks.
432		while (off + 128 <= b.len) : (off += 128) {
433		d.round(b[off..off + 128]);
	450	pub fn hash(b: []const u8, out: []u8) void {
	451	var d = Self.init();
	452	d.update(b);
	453	d.final(out);
434	454	}
435	455
436		// Copy any remainder for next pass.
437		mem.copy(u8, d.buf[d.buf_len..], b[off..]);
438		d.buf_len += u8(b[off..].len);
	456	pub fn update(d: &Self, b: []const u8) void {
	457	var off: usize = 0;
439	458
440		d.total_len += b.len;
441		}
	459	// Partial buffer exists from previous update. Copy into buffer then hash.
	460	if (d.buf_len != 0 and d.buf_len + b.len > 128) {
	461	off += 128 - d.buf_len;
	462	mem.copy(u8, d.buf[d.buf_len..], b[0..off]);
442	463
443		pub fn final(d: &Self, out: []u8) void {
444		debug.assert(out.len >= params.out_len / 8);
	464	d.round(d.buf[0..]);
	465	d.buf_len = 0;
	466	}
445	467
446		// The buffer here will never be completely full.
447		mem.set(u8, d.buf[d.buf_len..], 0);
	468	// Full middle blocks.
	469	while (off + 128 <= b.len) : (off += 128) {
	470	d.round(b[off..off + 128]);
	471	}
448	472
449		// Append padding bits.
450		d.buf[d.buf_len] = 0x80;
451		d.buf_len += 1;
	473	// Copy any remainder for next pass.
	474	mem.copy(u8, d.buf[d.buf_len..], b[off..]);
	475	d.buf_len += u8(b[off..].len);
452	476
453		// > 896 mod 1024 so need to add an extra round to wrap around.
454		if (128 - d.buf_len < 16) {
455		d.round(d.buf[0..]);
456		mem.set(u8, d.buf[0..], 0);
	477	d.total_len += b.len;
457	478	}
458	479
459		// Append message length.
460		var i: usize = 1;
461		var len = d.total_len >> 5;
462		d.buf[127] = u8(d.total_len & 0x1f) << 3;
463		while (i < 16) : (i += 1) {
464		d.buf[127 - i] = u8(len & 0xff);
465		len >>= 8;
466		}
	480	pub fn final(d: &Self, out: []u8) void {
	481	debug.assert(out.len >= params.out_len / 8);
467	482
468		d.round(d.buf[0..]);
	483	// The buffer here will never be completely full.
	484	mem.set(u8, d.buf[d.buf_len..], 0);
469	485
470		// May truncate for possible 384 output
471		const rr = d.s[0 .. params.out_len / 64];
	486	// Append padding bits.
	487	d.buf[d.buf_len] = 0x80;
	488	d.buf_len += 1;
472	489
473		for (rr) \|s, j\| {
474		mem.writeInt(out[8j .. 8j + 8], s, builtin.Endian.Big);
475		}
476		}
477
478		fn round(d: &Self, b: []const u8) void {
479		debug.assert(b.len == 128);
480
481		var s: [80]u64 = undefined;
482
483		var i: usize = 0;
484		while (i < 16) : (i += 1) {
485		s[i] = 0;
486		s[i] \|= u64(b[i*8+0]) << 56;
487		s[i] \|= u64(b[i*8+1]) << 48;
488		s[i] \|= u64(b[i*8+2]) << 40;
489		s[i] \|= u64(b[i*8+3]) << 32;
490		s[i] \|= u64(b[i*8+4]) << 24;
491		s[i] \|= u64(b[i*8+5]) << 16;
492		s[i] \|= u64(b[i*8+6]) << 8;
493		s[i] \|= u64(b[i*8+7]) << 0;
494		}
495		while (i < 80) : (i += 1) {
496		s[i] =
497		s[i-16] +% s[i-7] +%
498		(math.rotr(u64, s[i-15], u64(1)) ^ math.rotr(u64, s[i-15], u64(8)) ^ (s[i-15] >> 7)) +%
499		(math.rotr(u64, s[i-2], u64(19)) ^ math.rotr(u64, s[i-2], u64(61)) ^ (s[i-2] >> 6));
500		}
	490	// > 896 mod 1024 so need to add an extra round to wrap around.
	491	if (128 - d.buf_len < 16) {
	492	d.round(d.buf[0..]);
	493	mem.set(u8, d.buf[0..], 0);
	494	}
501	495
502		var v: [8]u64 = []u64 {
503		d.s[0], d.s[1], d.s[2], d.s[3], d.s[4], d.s[5], d.s[6], d.s[7],
504		};
505
506		const round0 = comptime []RoundParam512 {
507		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 0, 0x428A2F98D728AE22),
508		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 1, 0x7137449123EF65CD),
509		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 2, 0xB5C0FBCFEC4D3B2F),
510		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 3, 0xE9B5DBA58189DBBC),
511		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 4, 0x3956C25BF348B538),
512		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 5, 0x59F111F1B605D019),
513		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 6, 0x923F82A4AF194F9B),
514		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 7, 0xAB1C5ED5DA6D8118),
515		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 8, 0xD807AA98A3030242),
516		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 9, 0x12835B0145706FBE),
517		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE4EE4B28C),
518		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3D5FFB4E2),
519		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74F27B896F),
520		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE3B1696B1),
521		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A725C71235),
522		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174CF692694),
523		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C19EF14AD2),
524		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786384F25E3),
525		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC68B8CD5B5),
526		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC77AC9C65),
527		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F592B0275),
528		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA6EA6E483),
529		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DCBD41FBD4),
530		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA831153B5),
531		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152EE66DFAB),
532		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D2DB43210),
533		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C898FB213F),
534		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7BEEF0EE4),
535		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF33DA88FC2),
536		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147930AA725),
537		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351E003826F),
538		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x142929670A0E6E70),
539		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A8546D22FFC),
540		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B21385C26C926),
541		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC5AC42AED),
542		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D139D95B3DF),
543		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A73548BAF63DE),
544		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB3C77B2A8),
545		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E47EDAEE6),
546		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C851482353B),
547		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A14CF10364),
548		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664BBC423001),
549		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70D0F89791),
550		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A30654BE30),
551		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819D6EF5218),
552		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD69906245565A910),
553		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E35855771202A),
554		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA07032BBD1B8),
555		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116B8D2D0C8),
556		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C085141AB53),
557		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774CDF8EEB99),
558		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5E19B48A8),
559		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3C5C95A63),
560		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4AE3418ACB),
561		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F7763E373),
562		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3D6B2B8A3),
563		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE5DEFB2FC),
564		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F43172F60),
565		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814A1F0AB72),
566		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC702081A6439EC),
567		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA23631E28),
568		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEBDE82BDE9),
569		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7B2C67915),
570		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2E372532B),
571		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 64, 0xCA273ECEEA26619C),
572		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 65, 0xD186B8C721C0C207),
573		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 66, 0xEADA7DD6CDE0EB1E),
574		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 67, 0xF57D4F7FEE6ED178),
575		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 68, 0x06F067AA72176FBA),
576		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 69, 0x0A637DC5A2C898A6),
577		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 70, 0x113F9804BEF90DAE),
578		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 71, 0x1B710B35131C471B),
579		Rp512(0, 1, 2, 3, 4, 5, 6, 7, 72, 0x28DB77F523047D84),
580		Rp512(7, 0, 1, 2, 3, 4, 5, 6, 73, 0x32CAAB7B40C72493),
581		Rp512(6, 7, 0, 1, 2, 3, 4, 5, 74, 0x3C9EBE0A15C9BEBC),
582		Rp512(5, 6, 7, 0, 1, 2, 3, 4, 75, 0x431D67C49C100D4C),
583		Rp512(4, 5, 6, 7, 0, 1, 2, 3, 76, 0x4CC5D4BECB3E42B6),
584		Rp512(3, 4, 5, 6, 7, 0, 1, 2, 77, 0x597F299CFC657E2A),
585		Rp512(2, 3, 4, 5, 6, 7, 0, 1, 78, 0x5FCB6FAB3AD6FAEC),
586		Rp512(1, 2, 3, 4, 5, 6, 7, 0, 79, 0x6C44198C4A475817),
587		};
588		inline for (round0) \|r\| {
589		v[r.h] =
590		v[r.h] +%
591		(math.rotr(u64, v[r.e], u64(14)) ^ math.rotr(u64, v[r.e], u64(18)) ^ math.rotr(u64, v[r.e], u64(41))) +%
592		(v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +%
593		r.k +% s[r.i];
594
595		v[r.d] = v[r.d] +% v[r.h];
596
597		v[r.h] =
598		v[r.h] +%
599		(math.rotr(u64, v[r.a], u64(28)) ^ math.rotr(u64, v[r.a], u64(34)) ^ math.rotr(u64, v[r.a], u64(39))) +%
600		((v[r.a] & (v[r.b] \| v[r.c])) \| (v[r.b] & v[r.c]));
	496	// Append message length.
	497	var i: usize = 1;
	498	var len = d.total_len >> 5;
	499	d.buf[127] = u8(d.total_len & 0x1f) << 3;
	500	while (i < 16) : (i += 1) {
	501	d.buf[127 - i] = u8(len & 0xff);
	502	len >>= 8;
	503	}
	504
	505	d.round(d.buf[0..]);
	506
	507	// May truncate for possible 384 output
	508	const rr = d.s[0..params.out_len / 64];
	509
	510	for (rr) \|s, j\| {
	511	mem.writeInt(out[8 * j..8 * j + 8], s, builtin.Endian.Big);
	512	}
601	513	}
602	514
603		d.s[0] +%= v[0];
604		d.s[1] +%= v[1];
605		d.s[2] +%= v[2];
606		d.s[3] +%= v[3];
607		d.s[4] +%= v[4];
608		d.s[5] +%= v[5];
609		d.s[6] +%= v[6];
610		d.s[7] +%= v[7];
611		}
612		};}
	515	fn round(d: &Self, b: []const u8) void {
	516	debug.assert(b.len == 128);
	517
	518	var s: [80]u64 = undefined;
	519
	520	var i: usize = 0;
	521	while (i < 16) : (i += 1) {
	522	s[i] = 0;
	523	s[i] \|= u64(b[i * 8 + 0]) << 56;
	524	s[i] \|= u64(b[i * 8 + 1]) << 48;
	525	s[i] \|= u64(b[i * 8 + 2]) << 40;
	526	s[i] \|= u64(b[i * 8 + 3]) << 32;
	527	s[i] \|= u64(b[i * 8 + 4]) << 24;
	528	s[i] \|= u64(b[i * 8 + 5]) << 16;
	529	s[i] \|= u64(b[i * 8 + 6]) << 8;
	530	s[i] \|= u64(b[i * 8 + 7]) << 0;
	531	}
	532	while (i < 80) : (i += 1) {
	533	s[i] = s[i - 16] +% s[i - 7] +% (math.rotr(u64, s[i - 15], u64(1)) ^ math.rotr(u64, s[i - 15], u64(8)) ^ (s[i - 15] >> 7)) +% (math.rotr(u64, s[i - 2], u64(19)) ^ math.rotr(u64, s[i - 2], u64(61)) ^ (s[i - 2] >> 6));
	534	}
	535
	536	var v: [8]u64 = []u64{
	537	d.s[0],
	538	d.s[1],
	539	d.s[2],
	540	d.s[3],
	541	d.s[4],
	542	d.s[5],
	543	d.s[6],
	544	d.s[7],
	545	};
	546
	547	const round0 = comptime []RoundParam512{
	548	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 0, 0x428A2F98D728AE22),
	549	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 1, 0x7137449123EF65CD),
	550	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 2, 0xB5C0FBCFEC4D3B2F),
	551	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 3, 0xE9B5DBA58189DBBC),
	552	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 4, 0x3956C25BF348B538),
	553	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 5, 0x59F111F1B605D019),
	554	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 6, 0x923F82A4AF194F9B),
	555	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 7, 0xAB1C5ED5DA6D8118),
	556	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 8, 0xD807AA98A3030242),
	557	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 9, 0x12835B0145706FBE),
	558	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 10, 0x243185BE4EE4B28C),
	559	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 11, 0x550C7DC3D5FFB4E2),
	560	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 12, 0x72BE5D74F27B896F),
	561	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 13, 0x80DEB1FE3B1696B1),
	562	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 14, 0x9BDC06A725C71235),
	563	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 15, 0xC19BF174CF692694),
	564	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 16, 0xE49B69C19EF14AD2),
	565	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 17, 0xEFBE4786384F25E3),
	566	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 18, 0x0FC19DC68B8CD5B5),
	567	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 19, 0x240CA1CC77AC9C65),
	568	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 20, 0x2DE92C6F592B0275),
	569	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 21, 0x4A7484AA6EA6E483),
	570	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 22, 0x5CB0A9DCBD41FBD4),
	571	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 23, 0x76F988DA831153B5),
	572	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 24, 0x983E5152EE66DFAB),
	573	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 25, 0xA831C66D2DB43210),
	574	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 26, 0xB00327C898FB213F),
	575	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 27, 0xBF597FC7BEEF0EE4),
	576	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 28, 0xC6E00BF33DA88FC2),
	577	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 29, 0xD5A79147930AA725),
	578	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 30, 0x06CA6351E003826F),
	579	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 31, 0x142929670A0E6E70),
	580	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 32, 0x27B70A8546D22FFC),
	581	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 33, 0x2E1B21385C26C926),
	582	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 34, 0x4D2C6DFC5AC42AED),
	583	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 35, 0x53380D139D95B3DF),
	584	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 36, 0x650A73548BAF63DE),
	585	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 37, 0x766A0ABB3C77B2A8),
	586	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 38, 0x81C2C92E47EDAEE6),
	587	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 39, 0x92722C851482353B),
	588	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 40, 0xA2BFE8A14CF10364),
	589	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 41, 0xA81A664BBC423001),
	590	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 42, 0xC24B8B70D0F89791),
	591	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 43, 0xC76C51A30654BE30),
	592	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 44, 0xD192E819D6EF5218),
	593	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 45, 0xD69906245565A910),
	594	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 46, 0xF40E35855771202A),
	595	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 47, 0x106AA07032BBD1B8),
	596	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 48, 0x19A4C116B8D2D0C8),
	597	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 49, 0x1E376C085141AB53),
	598	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 50, 0x2748774CDF8EEB99),
	599	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 51, 0x34B0BCB5E19B48A8),
	600	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 52, 0x391C0CB3C5C95A63),
	601	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 53, 0x4ED8AA4AE3418ACB),
	602	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 54, 0x5B9CCA4F7763E373),
	603	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 55, 0x682E6FF3D6B2B8A3),
	604	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 56, 0x748F82EE5DEFB2FC),
	605	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 57, 0x78A5636F43172F60),
	606	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 58, 0x84C87814A1F0AB72),
	607	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 59, 0x8CC702081A6439EC),
	608	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 60, 0x90BEFFFA23631E28),
	609	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 61, 0xA4506CEBDE82BDE9),
	610	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 62, 0xBEF9A3F7B2C67915),
	611	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 63, 0xC67178F2E372532B),
	612	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 64, 0xCA273ECEEA26619C),
	613	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 65, 0xD186B8C721C0C207),
	614	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 66, 0xEADA7DD6CDE0EB1E),
	615	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 67, 0xF57D4F7FEE6ED178),
	616	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 68, 0x06F067AA72176FBA),
	617	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 69, 0x0A637DC5A2C898A6),
	618	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 70, 0x113F9804BEF90DAE),
	619	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 71, 0x1B710B35131C471B),
	620	Rp512(0, 1, 2, 3, 4, 5, 6, 7, 72, 0x28DB77F523047D84),
	621	Rp512(7, 0, 1, 2, 3, 4, 5, 6, 73, 0x32CAAB7B40C72493),
	622	Rp512(6, 7, 0, 1, 2, 3, 4, 5, 74, 0x3C9EBE0A15C9BEBC),
	623	Rp512(5, 6, 7, 0, 1, 2, 3, 4, 75, 0x431D67C49C100D4C),
	624	Rp512(4, 5, 6, 7, 0, 1, 2, 3, 76, 0x4CC5D4BECB3E42B6),
	625	Rp512(3, 4, 5, 6, 7, 0, 1, 2, 77, 0x597F299CFC657E2A),
	626	Rp512(2, 3, 4, 5, 6, 7, 0, 1, 78, 0x5FCB6FAB3AD6FAEC),
	627	Rp512(1, 2, 3, 4, 5, 6, 7, 0, 79, 0x6C44198C4A475817),
	628	};
	629	inline for (round0) \|r\| {
	630	v[r.h] = v[r.h] +% (math.rotr(u64, v[r.e], u64(14)) ^ math.rotr(u64, v[r.e], u64(18)) ^ math.rotr(u64, v[r.e], u64(41))) +% (v[r.g] ^ (v[r.e] & (v[r.f] ^ v[r.g]))) +% r.k +% s[r.i];
	631
	632	v[r.d] = v[r.d] +% v[r.h];
	633
	634	v[r.h] = v[r.h] +% (math.rotr(u64, v[r.a], u64(28)) ^ math.rotr(u64, v[r.a], u64(34)) ^ math.rotr(u64, v[r.a], u64(39))) +% ((v[r.a] & (v[r.b] \| v[r.c])) \| (v[r.b] & v[r.c]));
	635	}
	636
	637	d.s[0] +%= v[0];
	638	d.s[1] +%= v[1];
	639	d.s[2] +%= v[2];
	640	d.s[3] +%= v[3];
	641	d.s[4] +%= v[4];
	642	d.s[5] +%= v[5];
	643	d.s[6] +%= v[6];
	644	d.s[7] +%= v[7];
	645	}
	646	};
	647	}
613	648
614	649	test "sha384 single" {
615	650	const h1 = "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b";
...	...	@@ -680,7 +715,7 @@ test "sha512 streaming" {
680	715	}
681	716
682	717	test "sha512 aligned final" {
683		var block = []u8 {0} ** Sha512.block_size;
	718	var block = []u8{0} ** Sha512.block_size;
684	719	var out: [Sha512.digest_size]u8 = undefined;
685	720
686	721	var h = Sha512.init();

std/crypto/sha3.zig+180-101

...	...	@@ -10,148 +10,228 @@ pub const Sha3_256 = Keccak(256, 0x06);
10	10	pub const Sha3_384 = Keccak(384, 0x06);
11	11	pub const Sha3_512 = Keccak(512, 0x06);
12	12
13		fn Keccak(comptime bits: usize, comptime delim: u8) type { return struct {
14		const Self = this;
15		const block_size = 200;
16		const digest_size = bits / 8;
17
18		s: [200]u8,
19		offset: usize,
20		rate: usize,
21
22		pub fn init() Self {
23		var d: Self = undefined;
24		d.reset();
25		return d;
26		}
	13	fn Keccak(comptime bits: usize, comptime delim: u8) type {
	14	return struct {
	15	const Self = this;
	16	const block_size = 200;
	17	const digest_size = bits / 8;
	18
	19	s: [200]u8,
	20	offset: usize,
	21	rate: usize,
	22
	23	pub fn init() Self {
	24	var d: Self = undefined;
	25	d.reset();
	26	return d;
	27	}
27	28
28		pub fn reset(d: &Self) void {
29		mem.set(u8, d.s[0..], 0);
30		d.offset = 0;
31		d.rate = 200 - (bits / 4);
32		}
	29	pub fn reset(d: &Self) void {
	30	mem.set(u8, d.s[0..], 0);
	31	d.offset = 0;
	32	d.rate = 200 - (bits / 4);
	33	}
33	34
34		pub fn hash(b: []const u8, out: []u8) void {
35		var d = Self.init();
36		d.update(b);
37		d.final(out);
38		}
	35	pub fn hash(b: []const u8, out: []u8) void {
	36	var d = Self.init();
	37	d.update(b);
	38	d.final(out);
	39	}
39	40
40		pub fn update(d: &Self, b: []const u8) void {
41		var ip: usize = 0;
42		var len = b.len;
43		var rate = d.rate - d.offset;
44		var offset = d.offset;
	41	pub fn update(d: &Self, b: []const u8) void {
	42	var ip: usize = 0;
	43	var len = b.len;
	44	var rate = d.rate - d.offset;
	45	var offset = d.offset;
45	46
46		// absorb
47		while (len >= rate) {
48		for (d.s[offset .. offset + rate]) \|*r, i\|
49		*r ^= b[ip..][i];
	47	// absorb
	48	while (len >= rate) {
	49	for (d.s[offset..offset + rate]) \|*r, i\|
	50	r.* ^= b[ip..][i];
50	51
51		keccak_f(1600, d.s[0..]);
	52	keccak_f(1600, d.s[0..]);
52	53
53		ip += rate;
54		len -= rate;
55		rate = d.rate;
56		offset = 0;
57		}
	54	ip += rate;
	55	len -= rate;
	56	rate = d.rate;
	57	offset = 0;
	58	}
58	59
59		for (d.s[offset .. offset + len]) \|*r, i\|
60		*r ^= b[ip..][i];
	60	for (d.s[offset..offset + len]) \|*r, i\|
	61	r.* ^= b[ip..][i];
61	62
62		d.offset = offset + len;
63		}
	63	d.offset = offset + len;
	64	}
64	65
65		pub fn final(d: &Self, out: []u8) void {
66		// padding
67		d.s[d.offset] ^= delim;
68		d.s[d.rate - 1] ^= 0x80;
	66	pub fn final(d: &Self, out: []u8) void {
	67	// padding
	68	d.s[d.offset] ^= delim;
	69	d.s[d.rate - 1] ^= 0x80;
69	70
70		keccak_f(1600, d.s[0..]);
	71	keccak_f(1600, d.s[0..]);
71	72
72		// squeeze
73		var op: usize = 0;
74		var len: usize = bits / 8;
	73	// squeeze
	74	var op: usize = 0;
	75	var len: usize = bits / 8;
75	76
76		while (len >= d.rate) {
77		mem.copy(u8, out[op..], d.s[0..d.rate]);
78		keccak_f(1600, d.s[0..]);
79		op += d.rate;
80		len -= d.rate;
	77	while (len >= d.rate) {
	78	mem.copy(u8, out[op..], d.s[0..d.rate]);
	79	keccak_f(1600, d.s[0..]);
	80	op += d.rate;
	81	len -= d.rate;
	82	}
	83
	84	mem.copy(u8, out[op..], d.s[0..len]);
81	85	}
	86	};
	87	}
82	88
83		mem.copy(u8, out[op..], d.s[0..len]);
84		}
85		};}
86
87		const RC = []const u64 {
88		0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000,
89		0x000000000000808b, 0x0000000080000001, 0x8000000080008081, 0x8000000000008009,
90		0x000000000000008a, 0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
91		0x000000008000808b, 0x800000000000008b, 0x8000000000008089, 0x8000000000008003,
92		0x8000000000008002, 0x8000000000000080, 0x000000000000800a, 0x800000008000000a,
93		0x8000000080008081, 0x8000000000008080, 0x0000000080000001, 0x8000000080008008,
	89	const RC = []const u64{
	90	0x0000000000000001,
	91	0x0000000000008082,
	92	0x800000000000808a,
	93	0x8000000080008000,
	94	0x000000000000808b,
	95	0x0000000080000001,
	96	0x8000000080008081,
	97	0x8000000000008009,
	98	0x000000000000008a,
	99	0x0000000000000088,
	100	0x0000000080008009,
	101	0x000000008000000a,
	102	0x000000008000808b,
	103	0x800000000000008b,
	104	0x8000000000008089,
	105	0x8000000000008003,
	106	0x8000000000008002,
	107	0x8000000000000080,
	108	0x000000000000800a,
	109	0x800000008000000a,
	110	0x8000000080008081,
	111	0x8000000000008080,
	112	0x0000000080000001,
	113	0x8000000080008008,
94	114	};
95	115
96		const ROTC = []const usize {
97		1, 3, 6, 10, 15, 21, 28, 36,
98		45, 55, 2, 14, 27, 41, 56, 8,
99		25, 43, 62, 18, 39, 61, 20, 44
	116	const ROTC = []const usize{
	117	1,
	118	3,
	119	6,
	120	10,
	121	15,
	122	21,
	123	28,
	124	36,
	125	45,
	126	55,
	127	2,
	128	14,
	129	27,
	130	41,
	131	56,
	132	8,
	133	25,
	134	43,
	135	62,
	136	18,
	137	39,
	138	61,
	139	20,
	140	44,
100	141	};
101	142
102		const PIL = []const usize {
103		10, 7, 11, 17, 18, 3, 5, 16,
104		8, 21, 24, 4, 15, 23, 19, 13,
105		12, 2, 20, 14, 22, 9, 6, 1
	143	const PIL = []const usize{
	144	10,
	145	7,
	146	11,
	147	17,
	148	18,
	149	3,
	150	5,
	151	16,
	152	8,
	153	21,
	154	24,
	155	4,
	156	15,
	157	23,
	158	19,
	159	13,
	160	12,
	161	2,
	162	20,
	163	14,
	164	22,
	165	9,
	166	6,
	167	1,
106	168	};
107	169
108		const M5 = []const usize {
109		0, 1, 2, 3, 4, 0, 1, 2, 3, 4
	170	const M5 = []const usize{
	171	0,
	172	1,
	173	2,
	174	3,
	175	4,
	176	0,
	177	1,
	178	2,
	179	3,
	180	4,
110	181	};
111	182
112	183	fn keccak_f(comptime F: usize, d: []u8) void {
113	184	debug.assert(d.len == F / 8);
114	185
115	186	const B = F / 25;
116		const no_rounds = comptime x: { break :x 12 + 2 * math.log2(B); };
	187	const no_rounds = comptime x: {
	188	break :x 12 + 2 * math.log2(B);
	189	};
117	190
118		var s = []const u64 {0} ** 25;
119		var t = []const u64 {0} ** 1;
120		var c = []const u64 {0} ** 5;
	191	var s = []const u64{0} ** 25;
	192	var t = []const u64{0} ** 1;
	193	var c = []const u64{0} ** 5;
121	194
122	195	for (s) \|*r, i\| {
123		r = mem.readIntLE(u64, d[8i .. 8*i + 8]);
	196	r.* = mem.readIntLE(u64, d[8 * i..8 * i + 8]);
124	197	}
125	198
126	199	comptime var x: usize = 0;
127	200	comptime var y: usize = 0;
128	201	for (RC[0..no_rounds]) \|round\| {
129	202	// theta
130		x = 0; inline while (x < 5) : (x += 1) {
131		c[x] = s[x] ^ s[x+5] ^ s[x+10] ^ s[x+15] ^ s[x+20];
	203	x = 0;
	204	inline while (x < 5) : (x += 1) {
	205	c[x] = s[x] ^ s[x + 5] ^ s[x + 10] ^ s[x + 15] ^ s[x + 20];
132	206	}
133		x = 0; inline while (x < 5) : (x += 1) {
134		t[0] = c[M5[x+4]] ^ math.rotl(u64, c[M5[x+1]], usize(1));
135		y = 0; inline while (y < 5) : (y += 1) {
136		s[x + y*5] ^= t[0];
	207	x = 0;
	208	inline while (x < 5) : (x += 1) {
	209	t[0] = c[M5[x + 4]] ^ math.rotl(u64, c[M5[x + 1]], usize(1));
	210	y = 0;
	211	inline while (y < 5) : (y += 1) {
	212	s[x + y * 5] ^= t[0];
137	213	}
138	214	}
139	215
140	216	// rho+pi
141	217	t[0] = s[1];
142		x = 0; inline while (x < 24) : (x += 1) {
	218	x = 0;
	219	inline while (x < 24) : (x += 1) {
143	220	c[0] = s[PIL[x]];
144	221	s[PIL[x]] = math.rotl(u64, t[0], ROTC[x]);
145	222	t[0] = c[0];
146	223	}
147	224
148	225	// chi
149		y = 0; inline while (y < 5) : (y += 1) {
150		x = 0; inline while (x < 5) : (x += 1) {
151		c[x] = s[x + y*5];
	226	y = 0;
	227	inline while (y < 5) : (y += 1) {
	228	x = 0;
	229	inline while (x < 5) : (x += 1) {
	230	c[x] = s[x + y * 5];
152	231	}
153		x = 0; inline while (x < 5) : (x += 1) {
154		s[x + y*5] = c[x] ^ (~c[M5[x+1]] & c[M5[x+2]]);
	232	x = 0;
	233	inline while (x < 5) : (x += 1) {
	234	s[x + y * 5] = c[x] ^ (~c[M5[x + 1]] & c[M5[x + 2]]);
155	235	}
156	236	}
157	237
...	...	@@ -160,11 +240,10 @@ fn keccak_f(comptime F: usize, d: []u8) void {
160	240	}
161	241
162	242	for (s) \|r, i\| {
163		mem.writeInt(d[8i .. 8i + 8], r, builtin.Endian.Little);
	243	mem.writeInt(d[8 * i..8 * i + 8], r, builtin.Endian.Little);
164	244	}
165	245	}
166	246
167
168	247	test "sha3-224 single" {
169	248	htest.assertEqualHash(Sha3_224, "6b4e03423667dbb73b6e15454f0eb1abd4597f9a1b078e3f5b5a6bc7", "");
170	249	htest.assertEqualHash(Sha3_224, "e642824c3f8cf24ad09234ee7d3c766fc9a3a5168d0c94ad73b46fdf", "abc");
...	...	@@ -192,7 +271,7 @@ test "sha3-224 streaming" {
192	271	}
193	272
194	273	test "sha3-256 single" {
195		htest.assertEqualHash(Sha3_256, "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a" , "");
	274	htest.assertEqualHash(Sha3_256, "a7ffc6f8bf1ed76651c14756a061d662f580ff4de43b49fa82d80a4b80f8434a", "");
196	275	htest.assertEqualHash(Sha3_256, "3a985da74fe225b2045c172d6bd390bd855f086e3e9d525b46bfe24511431532", "abc");
197	276	htest.assertEqualHash(Sha3_256, "916f6061fe879741ca6469b43971dfdb28b1a32dc36cb3254e812be27aad1d18", "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
198	277	}
...	...	@@ -218,7 +297,7 @@ test "sha3-256 streaming" {
218	297	}
219	298
220	299	test "sha3-256 aligned final" {
221		var block = []u8 {0} ** Sha3_256.block_size;
	300	var block = []u8{0} ** Sha3_256.block_size;
222	301	var out: [Sha3_256.digest_size]u8 = undefined;
223	302
224	303	var h = Sha3_256.init();
...	...	@@ -228,7 +307,7 @@ test "sha3-256 aligned final" {
228	307
229	308	test "sha3-384 single" {
230	309	const h1 = "0c63a75b845e4f7d01107d852e4c2485c51a50aaaa94fc61995e71bbee983a2ac3713831264adb47fb6bd1e058d5f004";
231		htest.assertEqualHash(Sha3_384, h1 , "");
	310	htest.assertEqualHash(Sha3_384, h1, "");
232	311	const h2 = "ec01498288516fc926459f58e2c6ad8df9b473cb0fc08c2596da7cf0e49be4b298d88cea927ac7f539f1edf228376d25";
233	312	htest.assertEqualHash(Sha3_384, h2, "abc");
234	313	const h3 = "79407d3b5916b59c3e30b09822974791c313fb9ecc849e406f23592d04f625dc8c709b98b43b3852b337216179aa7fc7";
...	...	@@ -259,7 +338,7 @@ test "sha3-384 streaming" {
259	338
260	339	test "sha3-512 single" {
261	340	const h1 = "a69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26";
262		htest.assertEqualHash(Sha3_512, h1 , "");
	341	htest.assertEqualHash(Sha3_512, h1, "");
263	342	const h2 = "b751850b1a57168a5693cd924b6b096e08f621827444f70d884f5d0240d2712e10e116e9192af3c91a7ec57647e3934057340b4cf408d5a56592f8274eec53f0";
264	343	htest.assertEqualHash(Sha3_512, h2, "abc");
265	344	const h3 = "afebb2ef542e6579c50cad06d2e578f9f8dd6881d7dc824d26360feebf18a4fa73e3261122948efcfd492e74e82e2189ed0fb440d187f382270cb455f21dd185";
...	...	@@ -289,7 +368,7 @@ test "sha3-512 streaming" {
289	368	}
290	369
291	370	test "sha3-512 aligned final" {
292		var block = []u8 {0} ** Sha3_512.block_size;
	371	var block = []u8{0} ** Sha3_512.block_size;
293	372	var out: [Sha3_512.digest_size]u8 = undefined;
294	373
295	374	var h = Sha3_512.init();

std/crypto/test.zig+1-2

...	...	@@ -14,9 +14,8 @@ pub fn assertEqualHash(comptime Hasher: var, comptime expected: []const u8, inpu
14	14	pub fn assertEqual(comptime expected: []const u8, input: []const u8) void {
15	15	var expected_bytes: [expected.len / 2]u8 = undefined;
16	16	for (expected_bytes) \|*r, i\| {
17		r = fmt.parseInt(u8, expected[2i .. 2*i+2], 16) catch unreachable;
	17	r.* = fmt.parseInt(u8, expected[2 * i..2 * i + 2], 16) catch unreachable;
18	18	}
19	19
20	20	debug.assert(mem.eql(u8, expected_bytes, input));
21	21	}
22

std/crypto/throughput_test.zig+1-1

...	...	@@ -11,7 +11,7 @@ const Timer = time.Timer;
11	11	const HashFunction = @import("md5.zig").Md5;
12	12
13	13	const MiB = 1024 * 1024;
14		const BytesToHash = 1024 * MiB;
	14	const BytesToHash = 1024 * MiB;
15	15
16	16	pub fn main() !void {
17	17	var stdout_file = try std.io.getStdOut();

std/cstr.zig+1-3

...	...	@@ -9,7 +9,6 @@ pub const line_sep = switch (builtin.os) {
9	9	else => "\n",
10	10	};
11	11
12
13	12	pub fn len(ptr: &const u8) usize {
14	13	var count: usize = 0;
15	14	while (ptr[count] != 0) : (count += 1) {}
...	...	@@ -95,7 +94,7 @@ pub const NullTerminated2DArray = struct {
95	94	}
96	95	index_buf[i] = null;
97	96
98		return NullTerminated2DArray {
	97	return NullTerminated2DArray{
99	98	.allocator = allocator,
100	99	.byte_count = byte_count,
101	100	.ptr = @ptrCast(?&?&u8, buf.ptr),
...	...	@@ -107,4 +106,3 @@ pub const NullTerminated2DArray = struct {
107	106	self.allocator.free(buf[0..self.byte_count]);
108	107	}
109	108	};
110

std/debug/failing_allocator.zig+2-2

...	...	@@ -13,14 +13,14 @@ pub const FailingAllocator = struct {
13	13	deallocations: usize,
14	14
15	15	pub fn init(allocator: &mem.Allocator, fail_index: usize) FailingAllocator {
16		return FailingAllocator {
	16	return FailingAllocator{
17	17	.internal_allocator = allocator,
18	18	.fail_index = fail_index,
19	19	.index = 0,
20	20	.allocated_bytes = 0,
21	21	.freed_bytes = 0,
22	22	.deallocations = 0,
23		.allocator = mem.Allocator {
	23	.allocator = mem.Allocator{
24	24	.allocFn = alloc,
25	25	.reallocFn = realloc,
26	26	.freeFn = free,

std/debug/index.zig+99-136

...	...	@@ -104,9 +104,7 @@ pub fn panic(comptime format: []const u8, args: ...) noreturn {
104	104
105	105	var panicking: u8 = 0; // TODO make this a bool
106	106
107		pub fn panicExtra(trace: ?&const builtin.StackTrace, first_trace_addr: ?usize,
108		comptime format: []const u8, args: ...) noreturn
109		{
	107	pub fn panicExtra(trace: ?&const builtin.StackTrace, first_trace_addr: ?usize, comptime format: []const u8, args: ...) noreturn {
110	108	@setCold(true);
111	109
112	110	if (@atomicRmw(u8, &panicking, builtin.AtomicRmwOp.Xchg, 1, builtin.AtomicOrder.SeqCst) == 1) {
...	...	@@ -132,9 +130,7 @@ const WHITE = "\x1b[37;1m";
132	130	const DIM = "\x1b[2m";
133	131	const RESET = "\x1b[0m";
134	132
135		pub fn writeStackTrace(stack_trace: &const builtin.StackTrace, out_stream: var, allocator: &mem.Allocator,
136		debug_info: &ElfStackTrace, tty_color: bool) !void
137		{
	133	pub fn writeStackTrace(stack_trace: &const builtin.StackTrace, out_stream: var, allocator: &mem.Allocator, debug_info: &ElfStackTrace, tty_color: bool) !void {
138	134	var frame_index: usize = undefined;
139	135	var frames_left: usize = undefined;
140	136	if (stack_trace.index < stack_trace.instruction_addresses.len) {
...	...	@@ -154,9 +150,7 @@ pub fn writeStackTrace(stack_trace: &const builtin.StackTrace, out_stream: var,
154	150	}
155	151	}
156	152
157		pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator,
158		debug_info: &ElfStackTrace, tty_color: bool, start_addr: ?usize) !void
159		{
	153	pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator, debug_info: &ElfStackTrace, tty_color: bool, start_addr: ?usize) !void {
160	154	const AddressState = union(enum) {
161	155	NotLookingForStartAddress,
162	156	LookingForStartAddress: usize,
...	...	@@ -166,14 +160,14 @@ pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator,
166	160	// else AddressState.NotLookingForStartAddress;
167	161	var addr_state: AddressState = undefined;
168	162	if (start_addr) \|addr\| {
169		addr_state = AddressState { .LookingForStartAddress = addr };
	163	addr_state = AddressState{ .LookingForStartAddress = addr };
170	164	} else {
171	165	addr_state = AddressState.NotLookingForStartAddress;
172	166	}
173	167
174	168	var fp = @ptrToInt(@frameAddress());
175		while (fp != 0) : (fp = *@intToPtr(&const usize, fp)) {
176		const return_address = *@intToPtr(&const usize, fp + @sizeOf(usize));
	169	while (fp != 0) : (fp = @intToPtr(&const usize, fp).*) {
	170	const return_address = @intToPtr(&const usize, fp + @sizeOf(usize)).*;
177	171
178	172	switch (addr_state) {
179	173	AddressState.NotLookingForStartAddress => {},
...	...	@@ -200,32 +194,32 @@ fn printSourceAtAddress(debug_info: &ElfStackTrace, out_stream: var, address: us
200	194	// in practice because the compiler dumps everything in a single
201	195	// object file. Future improvement: use external dSYM data when
202	196	// available.
203		const unknown = macho.Symbol { .name = "???", .address = address };
	197	const unknown = macho.Symbol{
	198	.name = "???",
	199	.address = address,
	200	};
204	201	const symbol = debug_info.symbol_table.search(address) ?? &unknown;
205		try out_stream.print(WHITE ++ "{}" ++ RESET ++ ": " ++
206		DIM ++ ptr_hex ++ " in ??? (???)" ++ RESET ++ "\n",
207		symbol.name, address);
	202	try out_stream.print(WHITE ++ "{}" ++ RESET ++ ": " ++ DIM ++ ptr_hex ++ " in ??? (???)" ++ RESET ++ "\n", symbol.name, address);
208	203	},
209	204	else => {
210	205	const compile_unit = findCompileUnit(debug_info, address) catch {
211		try out_stream.print("???:?:?: " ++ DIM ++ ptr_hex ++ " in ??? (???)" ++ RESET ++ "\n ???\n\n",
212		address);
	206	try out_stream.print("???:?:?: " ++ DIM ++ ptr_hex ++ " in ??? (???)" ++ RESET ++ "\n ???\n\n", address);
213	207	return;
214	208	};
215	209	const compile_unit_name = try compile_unit.die.getAttrString(debug_info, DW.AT_name);
216	210	if (getLineNumberInfo(debug_info, compile_unit, address - 1)) \|line_info\| {
217	211	defer line_info.deinit();
218		try out_stream.print(WHITE ++ "{}:{}:{}" ++ RESET ++ ": " ++
219		DIM ++ ptr_hex ++ " in ??? ({})" ++ RESET ++ "\n",
220		line_info.file_name, line_info.line, line_info.column,
221		address, compile_unit_name);
	212	try out_stream.print(WHITE ++ "{}:{}:{}" ++ RESET ++ ": " ++ DIM ++ ptr_hex ++ " in ??? ({})" ++ RESET ++ "\n", line_info.file_name, line_info.line, line_info.column, address, compile_unit_name);
222	213	if (printLineFromFile(debug_info.allocator(), out_stream, line_info)) {
223	214	if (line_info.column == 0) {
224	215	try out_stream.write("\n");
225	216	} else {
226		{var col_i: usize = 1; while (col_i < line_info.column) : (col_i += 1) {
227		try out_stream.writeByte(' ');
228		}}
	217	{
	218	var col_i: usize = 1;
	219	while (col_i < line_info.column) : (col_i += 1) {
	220	try out_stream.writeByte(' ');
	221	}
	222	}
229	223	try out_stream.write(GREEN ++ "^" ++ RESET ++ "\n");
230	224	}
231	225	} else \|err\| switch (err) {
...	...	@@ -247,7 +241,7 @@ pub fn openSelfDebugInfo(allocator: &mem.Allocator) !&ElfStackTrace {
247	241	builtin.ObjectFormat.elf => {
248	242	const st = try allocator.create(ElfStackTrace);
249	243	errdefer allocator.destroy(st);
250		*st = ElfStackTrace {
	244	st.* = ElfStackTrace{
251	245	.self_exe_file = undefined,
252	246	.elf = undefined,
253	247	.debug_info = undefined,
...	...	@@ -279,9 +273,7 @@ pub fn openSelfDebugInfo(allocator: &mem.Allocator) !&ElfStackTrace {
279	273	const st = try allocator.create(ElfStackTrace);
280	274	errdefer allocator.destroy(st);
281	275
282		*st = ElfStackTrace {
283		.symbol_table = try macho.loadSymbols(allocator, &io.FileInStream.init(&exe_file)),
284		};
	276	st.* = ElfStackTrace{ .symbol_table = try macho.loadSymbols(allocator, &io.FileInStream.init(&exe_file)) };
285	277
286	278	return st;
287	279	},
...	...	@@ -325,8 +317,7 @@ fn printLineFromFile(allocator: &mem.Allocator, out_stream: var, line_info: &con
325	317	}
326	318	}
327	319
328		if (amt_read < buf.len)
329		return error.EndOfFile;
	320	if (amt_read < buf.len) return error.EndOfFile;
330	321	}
331	322	}
332	323
...	...	@@ -418,10 +409,8 @@ const Constant = struct {
418	409	signed: bool,
419	410
420	411	fn asUnsignedLe(self: &const Constant) !u64 {
421		if (self.payload.len > @sizeOf(u64))
422		return error.InvalidDebugInfo;
423		if (self.signed)
424		return error.InvalidDebugInfo;
	412	if (self.payload.len > @sizeOf(u64)) return error.InvalidDebugInfo;
	413	if (self.signed) return error.InvalidDebugInfo;
425	414	return mem.readInt(self.payload, u64, builtin.Endian.Little);
426	415	}
427	416	};
...	...	@@ -438,15 +427,14 @@ const Die = struct {
438	427
439	428	fn getAttr(self: &const Die, id: u64) ?&const FormValue {
440	429	for (self.attrs.toSliceConst()) \|*attr\| {
441		if (attr.id == id)
442		return &attr.value;
	430	if (attr.id == id) return &attr.value;
443	431	}
444	432	return null;
445	433	}
446	434
447	435	fn getAttrAddr(self: &const Die, id: u64) !u64 {
448	436	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
449		return switch (*form_value) {
	437	return switch (form_value.*) {
450	438	FormValue.Address => \|value\| value,
451	439	else => error.InvalidDebugInfo,
452	440	};
...	...	@@ -454,7 +442,7 @@ const Die = struct {
454	442
455	443	fn getAttrSecOffset(self: &const Die, id: u64) !u64 {
456	444	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
457		return switch (*form_value) {
	445	return switch (form_value.*) {
458	446	FormValue.Const => \|value\| value.asUnsignedLe(),
459	447	FormValue.SecOffset => \|value\| value,
460	448	else => error.InvalidDebugInfo,
...	...	@@ -463,7 +451,7 @@ const Die = struct {
463	451
464	452	fn getAttrUnsignedLe(self: &const Die, id: u64) !u64 {
465	453	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
466		return switch (*form_value) {
	454	return switch (form_value.*) {
467	455	FormValue.Const => \|value\| value.asUnsignedLe(),
468	456	else => error.InvalidDebugInfo,
469	457	};
...	...	@@ -471,7 +459,7 @@ const Die = struct {
471	459
472	460	fn getAttrString(self: &const Die, st: &ElfStackTrace, id: u64) ![]u8 {
473	461	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
474		return switch (*form_value) {
	462	return switch (form_value.*) {
475	463	FormValue.String => \|value\| value,
476	464	FormValue.StrPtr => \|offset\| getString(st, offset),
477	465	else => error.InvalidDebugInfo,
...	...	@@ -518,10 +506,8 @@ const LineNumberProgram = struct {
518	506	prev_basic_block: bool,
519	507	prev_end_sequence: bool,
520	508
521		pub fn init(is_stmt: bool, include_dirs: []const []const u8,
522		file_entries: &ArrayList(FileEntry), target_address: usize) LineNumberProgram
523		{
524		return LineNumberProgram {
	509	pub fn init(is_stmt: bool, include_dirs: []const []const u8, file_entries: &ArrayList(FileEntry), target_address: usize) LineNumberProgram {
	510	return LineNumberProgram{
525	511	.address = 0,
526	512	.file = 1,
527	513	.line = 1,
...	...	@@ -548,14 +534,16 @@ const LineNumberProgram = struct {
548	534	return error.MissingDebugInfo;
549	535	} else if (self.prev_file - 1 >= self.file_entries.len) {
550	536	return error.InvalidDebugInfo;
551		} else &self.file_entries.items[self.prev_file - 1];
	537	} else
	538	&self.file_entries.items[self.prev_file - 1];
552	539
553	540	const dir_name = if (file_entry.dir_index >= self.include_dirs.len) {
554	541	return error.InvalidDebugInfo;
555		} else self.include_dirs[file_entry.dir_index];
	542	} else
	543	self.include_dirs[file_entry.dir_index];
556	544	const file_name = try os.path.join(self.file_entries.allocator, dir_name, file_entry.file_name);
557	545	errdefer self.file_entries.allocator.free(file_name);
558		return LineInfo {
	546	return LineInfo{
559	547	.line = if (self.prev_line >= 0) usize(self.prev_line) else 0,
560	548	.column = self.prev_column,
561	549	.file_name = file_name,
...	...	@@ -578,8 +566,7 @@ fn readStringRaw(allocator: &mem.Allocator, in_stream: var) ![]u8 {
578	566	var buf = ArrayList(u8).init(allocator);
579	567	while (true) {
580	568	const byte = try in_stream.readByte();
581		if (byte == 0)
582		break;
	569	if (byte == 0) break;
583	570	try buf.append(byte);
584	571	}
585	572	return buf.toSlice();
...	...	@@ -600,7 +587,7 @@ fn readAllocBytes(allocator: &mem.Allocator, in_stream: var, size: usize) ![]u8
600	587
601	588	fn parseFormValueBlockLen(allocator: &mem.Allocator, in_stream: var, size: usize) !FormValue {
602	589	const buf = try readAllocBytes(allocator, in_stream, size);
603		return FormValue { .Block = buf };
	590	return FormValue{ .Block = buf };
604	591	}
605	592
606	593	fn parseFormValueBlock(allocator: &mem.Allocator, in_stream: var, size: usize) !FormValue {
...	...	@@ -609,26 +596,25 @@ fn parseFormValueBlock(allocator: &mem.Allocator, in_stream: var, size: usize) !
609	596	}
610	597
611	598	fn parseFormValueConstant(allocator: &mem.Allocator, in_stream: var, signed: bool, size: usize) !FormValue {
612		return FormValue { .Const = Constant {
613		.signed = signed,
614		.payload = try readAllocBytes(allocator, in_stream, size),
615		}};
	599	return FormValue{
	600	.Const = Constant{
	601	.signed = signed,
	602	.payload = try readAllocBytes(allocator, in_stream, size),
	603	},
	604	};
616	605	}
617	606
618	607	fn parseFormValueDwarfOffsetSize(in_stream: var, is_64: bool) !u64 {
619		return if (is_64) try in_stream.readIntLe(u64)
620		else u64(try in_stream.readIntLe(u32)) ;
	608	return if (is_64) try in_stream.readIntLe(u64) else u64(try in_stream.readIntLe(u32));
621	609	}
622	610
623	611	fn parseFormValueTargetAddrSize(in_stream: var) !u64 {
624		return if (@sizeOf(usize) == 4) u64(try in_stream.readIntLe(u32))
625		else if (@sizeOf(usize) == 8) try in_stream.readIntLe(u64)
626		else unreachable;
	612	return if (@sizeOf(usize) == 4) u64(try in_stream.readIntLe(u32)) else if (@sizeOf(usize) == 8) try in_stream.readIntLe(u64) else unreachable;
627	613	}
628	614
629	615	fn parseFormValueRefLen(allocator: &mem.Allocator, in_stream: var, size: usize) !FormValue {
630	616	const buf = try readAllocBytes(allocator, in_stream, size);
631		return FormValue { .Ref = buf };
	617	return FormValue{ .Ref = buf };
632	618	}
633	619
634	620	fn parseFormValueRef(allocator: &mem.Allocator, in_stream: var, comptime T: type) !FormValue {
...	...	@@ -636,7 +622,7 @@ fn parseFormValueRef(allocator: &mem.Allocator, in_stream: var, comptime T: type
636	622	return parseFormValueRefLen(allocator, in_stream, block_len);
637	623	}
638	624
639		const ParseFormValueError = error {
	625	const ParseFormValueError = error{
640	626	EndOfStream,
641	627	Io,
642	628	BadFd,
...	...	@@ -646,11 +632,9 @@ const ParseFormValueError = error {
646	632	OutOfMemory,
647	633	};
648	634
649		fn parseFormValue(allocator: &mem.Allocator, in_stream: var, form_id: u64, is_64: bool)
650		ParseFormValueError!FormValue
651		{
	635	fn parseFormValue(allocator: &mem.Allocator, in_stream: var, form_id: u64, is_64: bool) ParseFormValueError!FormValue {
652	636	return switch (form_id) {
653		DW.FORM_addr => FormValue { .Address = try parseFormValueTargetAddrSize(in_stream) },
	637	DW.FORM_addr => FormValue{ .Address = try parseFormValueTargetAddrSize(in_stream) },
654	638	DW.FORM_block1 => parseFormValueBlock(allocator, in_stream, 1),
655	639	DW.FORM_block2 => parseFormValueBlock(allocator, in_stream, 2),
656	640	DW.FORM_block4 => parseFormValueBlock(allocator, in_stream, 4),
...	...	@@ -670,11 +654,11 @@ fn parseFormValue(allocator: &mem.Allocator, in_stream: var, form_id: u64, is_64
670	654	DW.FORM_exprloc => {
671	655	const size = try readULeb128(in_stream);
672	656	const buf = try readAllocBytes(allocator, in_stream, size);
673		return FormValue { .ExprLoc = buf };
	657	return FormValue{ .ExprLoc = buf };
674	658	},
675		DW.FORM_flag => FormValue { .Flag = (try in_stream.readByte()) != 0 },
676		DW.FORM_flag_present => FormValue { .Flag = true },
677		DW.FORM_sec_offset => FormValue { .SecOffset = try parseFormValueDwarfOffsetSize(in_stream, is_64) },
	659	DW.FORM_flag => FormValue{ .Flag = (try in_stream.readByte()) != 0 },
	660	DW.FORM_flag_present => FormValue{ .Flag = true },
	661	DW.FORM_sec_offset => FormValue{ .SecOffset = try parseFormValueDwarfOffsetSize(in_stream, is_64) },
678	662
679	663	DW.FORM_ref1 => parseFormValueRef(allocator, in_stream, u8),
680	664	DW.FORM_ref2 => parseFormValueRef(allocator, in_stream, u16),
...	...	@@ -685,11 +669,11 @@ fn parseFormValue(allocator: &mem.Allocator, in_stream: var, form_id: u64, is_64
685	669	return parseFormValueRefLen(allocator, in_stream, ref_len);
686	670	},
687	671
688		DW.FORM_ref_addr => FormValue { .RefAddr = try parseFormValueDwarfOffsetSize(in_stream, is_64) },
689		DW.FORM_ref_sig8 => FormValue { .RefSig8 = try in_stream.readIntLe(u64) },
	672	DW.FORM_ref_addr => FormValue{ .RefAddr = try parseFormValueDwarfOffsetSize(in_stream, is_64) },
	673	DW.FORM_ref_sig8 => FormValue{ .RefSig8 = try in_stream.readIntLe(u64) },
690	674
691		DW.FORM_string => FormValue { .String = try readStringRaw(allocator, in_stream) },
692		DW.FORM_strp => FormValue { .StrPtr = try parseFormValueDwarfOffsetSize(in_stream, is_64) },
	675	DW.FORM_string => FormValue{ .String = try readStringRaw(allocator, in_stream) },
	676	DW.FORM_strp => FormValue{ .StrPtr = try parseFormValueDwarfOffsetSize(in_stream, is_64) },
693	677	DW.FORM_indirect => {
694	678	const child_form_id = try readULeb128(in_stream);
695	679	return parseFormValue(allocator, in_stream, child_form_id, is_64);
...	...	@@ -705,9 +689,8 @@ fn parseAbbrevTable(st: &ElfStackTrace) !AbbrevTable {
705	689	var result = AbbrevTable.init(st.allocator());
706	690	while (true) {
707	691	const abbrev_code = try readULeb128(in_stream);
708		if (abbrev_code == 0)
709		return result;
710		try result.append(AbbrevTableEntry {
	692	if (abbrev_code == 0) return result;
	693	try result.append(AbbrevTableEntry{
711	694	.abbrev_code = abbrev_code,
712	695	.tag_id = try readULeb128(in_stream),
713	696	.has_children = (try in_stream.readByte()) == DW.CHILDREN_yes,
...	...	@@ -718,9 +701,8 @@ fn parseAbbrevTable(st: &ElfStackTrace) !AbbrevTable {
718	701	while (true) {
719	702	const attr_id = try readULeb128(in_stream);
720	703	const form_id = try readULeb128(in_stream);
721		if (attr_id == 0 and form_id == 0)
722		break;
723		try attrs.append(AbbrevAttr {
	704	if (attr_id == 0 and form_id == 0) break;
	705	try attrs.append(AbbrevAttr{
724	706	.attr_id = attr_id,
725	707	.form_id = form_id,
726	708	});
...	...	@@ -737,7 +719,7 @@ fn getAbbrevTable(st: &ElfStackTrace, abbrev_offset: u64) !&const AbbrevTable {
737	719	}
738	720	}
739	721	try st.self_exe_file.seekTo(st.debug_abbrev.offset + abbrev_offset);
740		try st.abbrev_table_list.append(AbbrevTableHeader {
	722	try st.abbrev_table_list.append(AbbrevTableHeader{
741	723	.offset = abbrev_offset,
742	724	.table = try parseAbbrevTable(st),
743	725	});
...	...	@@ -746,8 +728,7 @@ fn getAbbrevTable(st: &ElfStackTrace, abbrev_offset: u64) !&const AbbrevTable {
746	728
747	729	fn getAbbrevTableEntry(abbrev_table: &const AbbrevTable, abbrev_code: u64) ?&const AbbrevTableEntry {
748	730	for (abbrev_table.toSliceConst()) \|*table_entry\| {
749		if (table_entry.abbrev_code == abbrev_code)
750		return table_entry;
	731	if (table_entry.abbrev_code == abbrev_code) return table_entry;
751	732	}
752	733	return null;
753	734	}
...	...	@@ -759,14 +740,14 @@ fn parseDie(st: &ElfStackTrace, abbrev_table: &const AbbrevTable, is_64: bool) !
759	740	const abbrev_code = try readULeb128(in_stream);
760	741	const table_entry = getAbbrevTableEntry(abbrev_table, abbrev_code) ?? return error.InvalidDebugInfo;
761	742
762		var result = Die {
	743	var result = Die{
763	744	.tag_id = table_entry.tag_id,
764	745	.has_children = table_entry.has_children,
765	746	.attrs = ArrayList(Die.Attr).init(st.allocator()),
766	747	};
767	748	try result.attrs.resize(table_entry.attrs.len);
768	749	for (table_entry.attrs.toSliceConst()) \|attr, i\| {
769		result.attrs.items[i] = Die.Attr {
	750	result.attrs.items[i] = Die.Attr{
770	751	.id = attr.attr_id,
771	752	.value = try parseFormValue(st.allocator(), in_stream, attr.form_id, is_64),
772	753	};
...	...	@@ -790,8 +771,7 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
790	771
791	772	var is_64: bool = undefined;
792	773	const unit_length = try readInitialLength(@typeOf(in_stream.readFn).ReturnType.ErrorSet, in_stream, &is_64);
793		if (unit_length == 0)
794		return error.MissingDebugInfo;
	774	if (unit_length == 0) return error.MissingDebugInfo;
795	775	const next_offset = unit_length + (if (is_64) usize(12) else usize(4));
796	776
797	777	if (compile_unit.index != this_index) {
...	...	@@ -803,8 +783,7 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
803	783	// TODO support 3 and 5
804	784	if (version != 2 and version != 4) return error.InvalidDebugInfo;
805	785
806		const prologue_length = if (is_64) try in_stream.readInt(st.elf.endian, u64)
807		else try in_stream.readInt(st.elf.endian, u32);
	786	const prologue_length = if (is_64) try in_stream.readInt(st.elf.endian, u64) else try in_stream.readInt(st.elf.endian, u32);
808	787	const prog_start_offset = (try in_file.getPos()) + prologue_length;
809	788
810	789	const minimum_instruction_length = try in_stream.readByte();
...	...	@@ -819,38 +798,37 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
819	798	const line_base = try in_stream.readByteSigned();
820	799
821	800	const line_range = try in_stream.readByte();
822		if (line_range == 0)
823		return error.InvalidDebugInfo;
	801	if (line_range == 0) return error.InvalidDebugInfo;
824	802
825	803	const opcode_base = try in_stream.readByte();
826	804
827	805	const standard_opcode_lengths = try st.allocator().alloc(u8, opcode_base - 1);
828	806
829		{var i: usize = 0; while (i < opcode_base - 1) : (i += 1) {
830		standard_opcode_lengths[i] = try in_stream.readByte();
831		}}
	807	{
	808	var i: usize = 0;
	809	while (i < opcode_base - 1) : (i += 1) {
	810	standard_opcode_lengths[i] = try in_stream.readByte();
	811	}
	812	}
832	813
833	814	var include_directories = ArrayList([]u8).init(st.allocator());
834	815	try include_directories.append(compile_unit_cwd);
835	816	while (true) {
836	817	const dir = try st.readString();
837		if (dir.len == 0)
838		break;
	818	if (dir.len == 0) break;
839	819	try include_directories.append(dir);
840	820	}
841	821
842	822	var file_entries = ArrayList(FileEntry).init(st.allocator());
843		var prog = LineNumberProgram.init(default_is_stmt, include_directories.toSliceConst(),
844		&file_entries, target_address);
	823	var prog = LineNumberProgram.init(default_is_stmt, include_directories.toSliceConst(), &file_entries, target_address);
845	824
846	825	while (true) {
847	826	const file_name = try st.readString();
848		if (file_name.len == 0)
849		break;
	827	if (file_name.len == 0) break;
850	828	const dir_index = try readULeb128(in_stream);
851	829	const mtime = try readULeb128(in_stream);
852	830	const len_bytes = try readULeb128(in_stream);
853		try file_entries.append(FileEntry {
	831	try file_entries.append(FileEntry{
854	832	.file_name = file_name,
855	833	.dir_index = dir_index,
856	834	.mtime = mtime,
...	...	@@ -866,8 +844,7 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
866	844	var sub_op: u8 = undefined; // TODO move this to the correct scope and fix the compiler crash
867	845	if (opcode == DW.LNS_extended_op) {
868	846	const op_size = try readULeb128(in_stream);
869		if (op_size < 1)
870		return error.InvalidDebugInfo;
	847	if (op_size < 1) return error.InvalidDebugInfo;
871	848	sub_op = try in_stream.readByte();
872	849	switch (sub_op) {
873	850	DW.LNE_end_sequence => {
...	...	@@ -884,7 +861,7 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
884	861	const dir_index = try readULeb128(in_stream);
885	862	const mtime = try readULeb128(in_stream);
886	863	const len_bytes = try readULeb128(in_stream);
887		try file_entries.append(FileEntry {
	864	try file_entries.append(FileEntry{
888	865	.file_name = file_name,
889	866	.dir_index = dir_index,
890	867	.mtime = mtime,
...	...	@@ -941,11 +918,9 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
941	918	const arg = try in_stream.readInt(st.elf.endian, u16);
942	919	prog.address += arg;
943	920	},
944		DW.LNS_set_prologue_end => {
945		},
	921	DW.LNS_set_prologue_end => {},
946	922	else => {
947		if (opcode - 1 >= standard_opcode_lengths.len)
948		return error.InvalidDebugInfo;
	923	if (opcode - 1 >= standard_opcode_lengths.len) return error.InvalidDebugInfo;
949	924	const len_bytes = standard_opcode_lengths[opcode - 1];
950	925	try in_file.seekForward(len_bytes);
951	926	},
...	...	@@ -972,16 +947,13 @@ fn scanAllCompileUnits(st: &ElfStackTrace) !void {
972	947
973	948	var is_64: bool = undefined;
974	949	const unit_length = try readInitialLength(@typeOf(in_stream.readFn).ReturnType.ErrorSet, in_stream, &is_64);
975		if (unit_length == 0)
976		return;
	950	if (unit_length == 0) return;
977	951	const next_offset = unit_length + (if (is_64) usize(12) else usize(4));
978	952
979	953	const version = try in_stream.readInt(st.elf.endian, u16);
980	954	if (version < 2 or version > 5) return error.InvalidDebugInfo;
981	955
982		const debug_abbrev_offset =
983		if (is_64) try in_stream.readInt(st.elf.endian, u64)
984		else try in_stream.readInt(st.elf.endian, u32);
	956	const debug_abbrev_offset = if (is_64) try in_stream.readInt(st.elf.endian, u64) else try in_stream.readInt(st.elf.endian, u32);
985	957
986	958	const address_size = try in_stream.readByte();
987	959	if (address_size != @sizeOf(usize)) return error.InvalidDebugInfo;
...	...	@@ -992,15 +964,14 @@ fn scanAllCompileUnits(st: &ElfStackTrace) !void {
992	964	try st.self_exe_file.seekTo(compile_unit_pos);
993	965
994	966	const compile_unit_die = try st.allocator().create(Die);
995		*compile_unit_die = try parseDie(st, abbrev_table, is_64);
	967	compile_unit_die.* = try parseDie(st, abbrev_table, is_64);
996	968
997		if (compile_unit_die.tag_id != DW.TAG_compile_unit)
998		return error.InvalidDebugInfo;
	969	if (compile_unit_die.tag_id != DW.TAG_compile_unit) return error.InvalidDebugInfo;
999	970
1000	971	const pc_range = x: {
1001	972	if (compile_unit_die.getAttrAddr(DW.AT_low_pc)) \|low_pc\| {
1002	973	if (compile_unit_die.getAttr(DW.AT_high_pc)) \|high_pc_value\| {
1003		const pc_end = switch (*high_pc_value) {
	974	const pc_end = switch (high_pc_value.*) {
1004	975	FormValue.Address => \|value\| value,
1005	976	FormValue.Const => \|value\| b: {
1006	977	const offset = try value.asUnsignedLe();
...	...	@@ -1008,7 +979,7 @@ fn scanAllCompileUnits(st: &ElfStackTrace) !void {
1008	979	},
1009	980	else => return error.InvalidDebugInfo,
1010	981	};
1011		break :x PcRange {
	982	break :x PcRange{
1012	983	.start = low_pc,
1013	984	.end = pc_end,
1014	985	};
...	...	@@ -1016,13 +987,12 @@ fn scanAllCompileUnits(st: &ElfStackTrace) !void {
1016	987	break :x null;
1017	988	}
1018	989	} else \|err\| {
1019		if (err != error.MissingDebugInfo)
1020		return err;
	990	if (err != error.MissingDebugInfo) return err;
1021	991	break :x null;
1022	992	}
1023	993	};
1024	994
1025		try st.compile_unit_list.append(CompileUnit {
	995	try st.compile_unit_list.append(CompileUnit{
1026	996	.version = version,
1027	997	.is_64 = is_64,
1028	998	.pc_range = pc_range,
...	...	@@ -1040,8 +1010,7 @@ fn findCompileUnit(st: &ElfStackTrace, target_address: u64) !&const CompileUnit
1040	1010	const in_stream = &in_file_stream.stream;
1041	1011	for (st.compile_unit_list.toSlice()) \|*compile_unit\| {
1042	1012	if (compile_unit.pc_range) \|range\| {
1043		if (target_address >= range.start and target_address < range.end)
1044		return compile_unit;
	1013	if (target_address >= range.start and target_address < range.end) return compile_unit;
1045	1014	}
1046	1015	if (compile_unit.die.getAttrSecOffset(DW.AT_ranges)) \|ranges_offset\| {
1047	1016	var base_address: usize = 0;
...	...	@@ -1063,8 +1032,7 @@ fn findCompileUnit(st: &ElfStackTrace, target_address: u64) !&const CompileUnit
1063	1032	}
1064	1033	}
1065	1034	} else \|err\| {
1066		if (err != error.MissingDebugInfo)
1067		return err;
	1035	if (err != error.MissingDebugInfo) return err;
1068	1036	continue;
1069	1037	}
1070	1038	}
...	...	@@ -1073,8 +1041,8 @@ fn findCompileUnit(st: &ElfStackTrace, target_address: u64) !&const CompileUnit
1073	1041
1074	1042	fn readInitialLength(comptime E: type, in_stream: &io.InStream(E), is_64: &bool) !u64 {
1075	1043	const first_32_bits = try in_stream.readIntLe(u32);
1076		*is_64 = (first_32_bits == 0xffffffff);
1077		if (*is_64) {
	1044	is_64.* = (first_32_bits == 0xffffffff);
	1045	if (is_64.*) {
1078	1046	return in_stream.readIntLe(u64);
1079	1047	} else {
1080	1048	if (first_32_bits >= 0xfffffff0) return error.InvalidDebugInfo;
...	...	@@ -1091,13 +1059,11 @@ fn readULeb128(in_stream: var) !u64 {
1091	1059
1092	1060	var operand: u64 = undefined;
1093	1061
1094		if (@shlWithOverflow(u64, byte & 0b01111111, u6(shift), &operand))
1095		return error.InvalidDebugInfo;
	1062	if (@shlWithOverflow(u64, byte & 0b01111111, u6(shift), &operand)) return error.InvalidDebugInfo;
1096	1063
1097	1064	result \|= operand;
1098	1065
1099		if ((byte & 0b10000000) == 0)
1100		return result;
	1066	if ((byte & 0b10000000) == 0) return result;
1101	1067
1102	1068	shift += 7;
1103	1069	}
...	...	@@ -1112,15 +1078,13 @@ fn readILeb128(in_stream: var) !i64 {
1112	1078
1113	1079	var operand: i64 = undefined;
1114	1080
1115		if (@shlWithOverflow(i64, byte & 0b01111111, u6(shift), &operand))
1116		return error.InvalidDebugInfo;
	1081	if (@shlWithOverflow(i64, byte & 0b01111111, u6(shift), &operand)) return error.InvalidDebugInfo;
1117	1082
1118	1083	result \|= operand;
1119	1084	shift += 7;
1120	1085
1121	1086	if ((byte & 0b10000000) == 0) {
1122		if (shift < @sizeOf(i64) * 8 and (byte & 0b01000000) != 0)
1123		result \|= -(i64(1) << u6(shift));
	1087	if (shift < @sizeOf(i64) * 8 and (byte & 0b01000000) != 0) result \|= -(i64(1) << u6(shift));
1124	1088	return result;
1125	1089	}
1126	1090	}
...	...	@@ -1131,7 +1095,6 @@ pub const global_allocator = &global_fixed_allocator.allocator;
1131	1095	var global_fixed_allocator = std.heap.FixedBufferAllocator.init(global_allocator_mem[0..]);
1132	1096	var global_allocator_mem: [100 * 1024]u8 = undefined;
1133	1097
1134
1135	1098	// TODO make thread safe
1136	1099	var debug_info_allocator: ?&mem.Allocator = null;
1137	1100	var debug_info_direct_allocator: std.heap.DirectAllocator = undefined;

std/dwarf.zig-2

...	...	@@ -337,7 +337,6 @@ pub const AT_PGI_lbase = 0x3a00;
337	337	pub const AT_PGI_soffset = 0x3a01;
338	338	pub const AT_PGI_lstride = 0x3a02;
339	339
340
341	340	pub const OP_addr = 0x03;
342	341	pub const OP_deref = 0x06;
343	342	pub const OP_const1u = 0x08;
...	...	@@ -577,7 +576,6 @@ pub const ATE_HP_unsigned_fixed = 0x8e; // Cobol.
577	576	pub const ATE_HP_VAX_complex_float = 0x8f; // F or G floating complex.
578	577	pub const ATE_HP_VAX_complex_float_d = 0x90; // D floating complex.
579	578
580
581	579	pub const CFA_advance_loc = 0x40;
582	580	pub const CFA_offset = 0x80;
583	581	pub const CFA_restore = 0xc0;

std/elf.zig+17-25

...	...	@@ -123,13 +123,11 @@ pub const DT_SYMINFO = 0x6ffffeff;
123	123	pub const DT_ADDRRNGHI = 0x6ffffeff;
124	124	pub const DT_ADDRNUM = 11;
125	125
126
127	126	pub const DT_VERSYM = 0x6ffffff0;
128	127
129	128	pub const DT_RELACOUNT = 0x6ffffff9;
130	129	pub const DT_RELCOUNT = 0x6ffffffa;
131	130
132
133	131	pub const DT_FLAGS_1 = 0x6ffffffb;
134	132	pub const DT_VERDEF = 0x6ffffffc;
135	133
...	...	@@ -139,13 +137,10 @@ pub const DT_VERNEED = 0x6ffffffe;
139	137	pub const DT_VERNEEDNUM = 0x6fffffff;
140	138	pub const DT_VERSIONTAGNUM = 16;
141	139
142
143
144	140	pub const DT_AUXILIARY = 0x7ffffffd;
145	141	pub const DT_FILTER = 0x7fffffff;
146	142	pub const DT_EXTRANUM = 3;
147	143
148
149	144	pub const DT_SPARC_REGISTER = 0x70000001;
150	145	pub const DT_SPARC_NUM = 2;
151	146
...	...	@@ -434,9 +429,7 @@ pub const Elf = struct {
434	429	try elf.in_file.seekForward(4);
435	430
436	431	const header_size = try in.readInt(elf.endian, u16);
437		if ((elf.is_64 and header_size != 64) or
438		(!elf.is_64 and header_size != 52))
439		{
	432	if ((elf.is_64 and header_size != 64) or (!elf.is_64 and header_size != 52)) {
440	433	return error.InvalidFormat;
441	434	}
442	435
...	...	@@ -467,16 +460,16 @@ pub const Elf = struct {
467	460	if (sh_entry_size != 64) return error.InvalidFormat;
468	461
469	462	for (elf.section_headers) \|*elf_section\| {
470		elf_section.name = try in.readInt(elf.endian, u32);
471		elf_section.sh_type = try in.readInt(elf.endian, u32);
472		elf_section.flags = try in.readInt(elf.endian, u64);
473		elf_section.addr = try in.readInt(elf.endian, u64);
474		elf_section.offset = try in.readInt(elf.endian, u64);
475		elf_section.size = try in.readInt(elf.endian, u64);
476		elf_section.link = try in.readInt(elf.endian, u32);
477		elf_section.info = try in.readInt(elf.endian, u32);
478		elf_section.addr_align = try in.readInt(elf.endian, u64);
479		elf_section.ent_size = try in.readInt(elf.endian, u64);
	463	elf_section.name = try in.readInt(elf.endian, u32);
	464	elf_section.sh_type = try in.readInt(elf.endian, u32);
	465	elf_section.flags = try in.readInt(elf.endian, u64);
	466	elf_section.addr = try in.readInt(elf.endian, u64);
	467	elf_section.offset = try in.readInt(elf.endian, u64);
	468	elf_section.size = try in.readInt(elf.endian, u64);
	469	elf_section.link = try in.readInt(elf.endian, u32);
	470	elf_section.info = try in.readInt(elf.endian, u32);
	471	elf_section.addr_align = try in.readInt(elf.endian, u64);
	472	elf_section.ent_size = try in.readInt(elf.endian, u64);
480	473	}
481	474	} else {
482	475	if (sh_entry_size != 40) return error.InvalidFormat;
...	...	@@ -513,8 +506,7 @@ pub const Elf = struct {
513	506	pub fn close(elf: &Elf) void {
514	507	elf.allocator.free(elf.section_headers);
515	508
516		if (elf.auto_close_stream)
517		elf.in_file.close();
	509	if (elf.auto_close_stream) elf.in_file.close();
518	510	}
519	511
520	512	pub fn findSection(elf: &Elf, name: []const u8) !?&SectionHeader {
...	...	@@ -852,27 +844,27 @@ pub const Elf_MIPS_ABIFlags_v0 = extern struct {
852	844	flags2: Elf32_Word,
853	845	};
854	846
855		pub const Ehdr = switch(@sizeOf(usize)) {
	847	pub const Ehdr = switch (@sizeOf(usize)) {
856	848	4 => Elf32_Ehdr,
857	849	8 => Elf64_Ehdr,
858	850	else => @compileError("expected pointer size of 32 or 64"),
859	851	};
860		pub const Phdr = switch(@sizeOf(usize)) {
	852	pub const Phdr = switch (@sizeOf(usize)) {
861	853	4 => Elf32_Phdr,
862	854	8 => Elf64_Phdr,
863	855	else => @compileError("expected pointer size of 32 or 64"),
864	856	};
865		pub const Sym = switch(@sizeOf(usize)) {
	857	pub const Sym = switch (@sizeOf(usize)) {
866	858	4 => Elf32_Sym,
867	859	8 => Elf64_Sym,
868	860	else => @compileError("expected pointer size of 32 or 64"),
869	861	};
870		pub const Verdef = switch(@sizeOf(usize)) {
	862	pub const Verdef = switch (@sizeOf(usize)) {
871	863	4 => Elf32_Verdef,
872	864	8 => Elf64_Verdef,
873	865	else => @compileError("expected pointer size of 32 or 64"),
874	866	};
875		pub const Verdaux = switch(@sizeOf(usize)) {
	867	pub const Verdaux = switch (@sizeOf(usize)) {
876	868	4 => Elf32_Verdaux,
877	869	8 => Elf64_Verdaux,
878	870	else => @compileError("expected pointer size of 32 or 64"),

std/event.zig+22-44

...	...	@@ -6,7 +6,7 @@ const mem = std.mem;
6	6	const posix = std.os.posix;
7	7
8	8	pub const TcpServer = struct {
9		handleRequestFn: async<&mem.Allocator> fn (&TcpServer, &const std.net.Address, &const std.os.File) void,
	9	handleRequestFn: async<&mem.Allocator> fn(&TcpServer, &const std.net.Address, &const std.os.File) void,
10	10
11	11	loop: &Loop,
12	12	sockfd: i32,
...	...	@@ -18,13 +18,11 @@ pub const TcpServer = struct {
18	18	const PromiseNode = std.LinkedList(promise).Node;
19	19
20	20	pub fn init(loop: &Loop) !TcpServer {
21		const sockfd = try std.os.posixSocket(posix.AF_INET,
22		posix.SOCK_STREAM\|posix.SOCK_CLOEXEC\|posix.SOCK_NONBLOCK,
23		posix.PROTO_tcp);
	21	const sockfd = try std.os.posixSocket(posix.AF_INET, posix.SOCK_STREAM \| posix.SOCK_CLOEXEC \| posix.SOCK_NONBLOCK, posix.PROTO_tcp);
24	22	errdefer std.os.close(sockfd);
25	23
26	24	// TODO can't initialize handler coroutine here because we need well defined copy elision
27		return TcpServer {
	25	return TcpServer{
28	26	.loop = loop,
29	27	.sockfd = sockfd,
30	28	.accept_coro = null,
...	...	@@ -34,9 +32,7 @@ pub const TcpServer = struct {
34	32	};
35	33	}
36	34
37		pub fn listen(self: &TcpServer, address: &const std.net.Address,
38		handleRequestFn: async<&mem.Allocator> fn (&TcpServer, &const std.net.Address, &const std.os.File)void) !void
39		{
	35	pub fn listen(self: &TcpServer, address: &const std.net.Address, handleRequestFn: async<&mem.Allocator> fn(&TcpServer, &const std.net.Address, &const std.os.File) void) !void {
40	36	self.handleRequestFn = handleRequestFn;
41	37
42	38	try std.os.posixBind(self.sockfd, &address.os_addr);
...	...	@@ -48,7 +44,6 @@ pub const TcpServer = struct {
48	44
49	45	try self.loop.addFd(self.sockfd, ??self.accept_coro);
50	46	errdefer self.loop.removeFd(self.sockfd);
51
52	47	}
53	48
54	49	pub fn deinit(self: &TcpServer) void {
...	...	@@ -60,9 +55,7 @@ pub const TcpServer = struct {
60	55	pub async fn handler(self: &TcpServer) void {
61	56	while (true) {
62	57	var accepted_addr: std.net.Address = undefined;
63		if (std.os.posixAccept(self.sockfd, &accepted_addr.os_addr,
64		posix.SOCK_NONBLOCK \| posix.SOCK_CLOEXEC)) \|accepted_fd\|
65		{
	58	if (std.os.posixAccept(self.sockfd, &accepted_addr.os_addr, posix.SOCK_NONBLOCK \| posix.SOCK_CLOEXEC)) \|accepted_fd\| {
66	59	var socket = std.os.File.openHandle(accepted_fd);
67	60	_ = async<self.loop.allocator> self.handleRequestFn(self, accepted_addr, socket) catch \|err\| switch (err) {
68	61	error.OutOfMemory => {
...	...	@@ -83,19 +76,14 @@ pub const TcpServer = struct {
83	76	}
84	77	continue;
85	78	},
86		error.ConnectionAborted,
87		error.FileDescriptorClosed => continue,
	79	error.ConnectionAborted, error.FileDescriptorClosed => continue,
88	80
89	81	error.PageFault => unreachable,
90	82	error.InvalidSyscall => unreachable,
91	83	error.FileDescriptorNotASocket => unreachable,
92	84	error.OperationNotSupported => unreachable,
93	85
94		error.SystemFdQuotaExceeded,
95		error.SystemResources,
96		error.ProtocolFailure,
97		error.BlockedByFirewall,
98		error.Unexpected => {
	86	error.SystemFdQuotaExceeded, error.SystemResources, error.ProtocolFailure, error.BlockedByFirewall, error.Unexpected => {
99	87	@panic("TODO handle this error");
100	88	},
101	89	}
...	...	@@ -110,7 +98,7 @@ pub const Loop = struct {
110	98
111	99	fn init(allocator: &mem.Allocator) !Loop {
112	100	const epollfd = try std.os.linuxEpollCreate(std.os.linux.EPOLL_CLOEXEC);
113		return Loop {
	101	return Loop{
114	102	.keep_running = true,
115	103	.allocator = allocator,
116	104	.epollfd = epollfd,
...	...	@@ -118,11 +106,9 @@ pub const Loop = struct {
118	106	}
119	107
120	108	pub fn addFd(self: &Loop, fd: i32, prom: promise) !void {
121		var ev = std.os.linux.epoll_event {
122		.events = std.os.linux.EPOLLIN\|std.os.linux.EPOLLOUT\|std.os.linux.EPOLLET,
123		.data = std.os.linux.epoll_data {
124		.ptr = @ptrToInt(prom),
125		},
	109	var ev = std.os.linux.epoll_event{
	110	.events = std.os.linux.EPOLLIN \| std.os.linux.EPOLLOUT \| std.os.linux.EPOLLET,
	111	.data = std.os.linux.epoll_data{ .ptr = @ptrToInt(prom) },
126	112	};
127	113	try std.os.linuxEpollCtl(self.epollfd, std.os.linux.EPOLL_CTL_ADD, fd, &ev);
128	114	}
...	...	@@ -130,7 +116,6 @@ pub const Loop = struct {
130	116	pub fn removeFd(self: &Loop, fd: i32) void {
131	117	std.os.linuxEpollCtl(self.epollfd, std.os.linux.EPOLL_CTL_DEL, fd, undefined) catch {};
132	118	}
133
134	119	async fn waitFd(self: &Loop, fd: i32) !void {
135	120	defer self.removeFd(fd);
136	121	suspend \|p\| {
...	...	@@ -157,9 +142,9 @@ pub const Loop = struct {
157	142	};
158	143
159	144	pub async fn connect(loop: &Loop, _address: &const std.net.Address) !std.os.File {
160		var address = *_address; // TODO https://github.com/zig-lang/zig/issues/733
	145	var address = _address.*; // TODO https://github.com/ziglang/zig/issues/733
161	146
162		const sockfd = try std.os.posixSocket(posix.AF_INET, posix.SOCK_STREAM\|posix.SOCK_CLOEXEC\|posix.SOCK_NONBLOCK, posix.PROTO_tcp);
	147	const sockfd = try std.os.posixSocket(posix.AF_INET, posix.SOCK_STREAM \| posix.SOCK_CLOEXEC \| posix.SOCK_NONBLOCK, posix.PROTO_tcp);
163	148	errdefer std.os.close(sockfd);
164	149
165	150	try std.os.posixConnectAsync(sockfd, &address.os_addr);
...	...	@@ -178,12 +163,9 @@ test "listen on a port, send bytes, receive bytes" {
178	163	tcp_server: TcpServer,
179	164
180	165	const Self = this;
181
182		async<&mem.Allocator> fn handler(tcp_server: &TcpServer, _addr: &const std.net.Address,
183		_socket: &const std.os.File) void
184		{
	166	async<&mem.Allocator> fn handler(tcp_server: &TcpServer, _addr: &const std.net.Address, _socket: &const std.os.File) void {
185	167	const self = @fieldParentPtr(Self, "tcp_server", tcp_server);
186		var socket = *_socket; // TODO https://github.com/zig-lang/zig/issues/733
	168	var socket = _socket.*; // TODO https://github.com/ziglang/zig/issues/733
187	169	defer socket.close();
188	170	const next_handler = async errorableHandler(self, _addr, socket) catch \|err\| switch (err) {
189	171	error.OutOfMemory => @panic("unable to handle connection: out of memory"),
...	...	@@ -191,14 +173,13 @@ test "listen on a port, send bytes, receive bytes" {
191	173	(await next_handler) catch \|err\| {
192	174	std.debug.panic("unable to handle connection: {}\n", err);
193	175	};
194		suspend \|p\| { cancel p; }
	176	suspend \|p\| {
	177	cancel p;
	178	}
195	179	}
196
197		async fn errorableHandler(self: &Self, _addr: &const std.net.Address,
198		_socket: &const std.os.File) !void
199		{
200		const addr = *_addr; // TODO https://github.com/zig-lang/zig/issues/733
201		var socket = *_socket; // TODO https://github.com/zig-lang/zig/issues/733
	180	async fn errorableHandler(self: &Self, _addr: &const std.net.Address, _socket: &const std.os.File) !void {
	181	const addr = _addr.*; // TODO https://github.com/ziglang/zig/issues/733
	182	var socket = _socket.*; // TODO https://github.com/ziglang/zig/issues/733
202	183
203	184	var adapter = std.io.FileOutStream.init(&socket);
204	185	var stream = &adapter.stream;
...	...	@@ -210,9 +191,7 @@ test "listen on a port, send bytes, receive bytes" {
210	191	const addr = std.net.Address.initIp4(ip4addr, 0);
211	192
212	193	var loop = try Loop.init(std.debug.global_allocator);
213		var server = MyServer {
214		.tcp_server = try TcpServer.init(&loop),
215		};
	194	var server = MyServer{ .tcp_server = try TcpServer.init(&loop) };
216	195	defer server.tcp_server.deinit();
217	196	try server.tcp_server.listen(addr, MyServer.handler);
218	197
...	...	@@ -220,7 +199,6 @@ test "listen on a port, send bytes, receive bytes" {
220	199	defer cancel p;
221	200	loop.run();
222	201	}
223
224	202	async fn doAsyncTest(loop: &Loop, address: &const std.net.Address) void {
225	203	errdefer @panic("test failure");
226	204

std/fmt/errol/enum3.zig+3-4

...	...	@@ -1,4 +1,4 @@
1		pub const enum3 = []u64 {
	1	pub const enum3 = []u64{
2	2	0x4e2e2785c3a2a20b,
3	3	0x240a28877a09a4e1,
4	4	0x728fca36c06cf106,
...	...	@@ -439,13 +439,13 @@ const Slab = struct {
439	439	};
440	440
441	441	fn slab(str: []const u8, exp: i32) Slab {
442		return Slab {
	442	return Slab{
443	443	.str = str,
444	444	.exp = exp,
445	445	};
446	446	}
447	447
448		pub const enum3_data = []Slab {
	448	pub const enum3_data = []Slab{
449	449	slab("40648030339495312", 69),
450	450	slab("4498645355592131", -134),
451	451	slab("678321594594593", 244),
...	...	@@ -879,4 +879,3 @@ pub const enum3_data = []Slab {
879	879	slab("32216657306260762", 218),
880	880	slab("30423431424080128", 219),
881	881	};
882

std/fmt/errol/index.zig+23-34

...	...	@@ -86,7 +86,7 @@ pub fn errol3(value: f64, buffer: []u8) FloatDecimal {
86	86	const data = enum3_data[i];
87	87	const digits = buffer[1..data.str.len + 1];
88	88	mem.copy(u8, digits, data.str);
89		return FloatDecimal {
	89	return FloatDecimal{
90	90	.digits = digits,
91	91	.exp = data.exp,
92	92	};
...	...	@@ -98,14 +98,12 @@ pub fn errol3(value: f64, buffer: []u8) FloatDecimal {
98	98	/// Uncorrected Errol3 double to ASCII conversion.
99	99	fn errol3u(val: f64, buffer: []u8) FloatDecimal {
100	100	// check if in integer or fixed range
101
102	101	if (val > 9.007199254740992e15 and val < 3.40282366920938e+38) {
103	102	return errolInt(val, buffer);
104	103	} else if (val >= 16.0 and val < 9.007199254740992e15) {
105	104	return errolFixed(val, buffer);
106	105	}
107	106
108
109	107	// normalize the midpoint
110	108
111	109	const e = math.frexp(val).exponent;
...	...	@@ -137,11 +135,11 @@ fn errol3u(val: f64, buffer: []u8) FloatDecimal {
137	135	}
138	136
139	137	// compute boundaries
140		var high = HP {
	138	var high = HP{
141	139	.val = mid.val,
142	140	.off = mid.off + (fpnext(val) - val) * lten * ten / 2.0,
143	141	};
144		var low = HP {
	142	var low = HP{
145	143	.val = mid.val,
146	144	.off = mid.off + (fpprev(val) - val) * lten * ten / 2.0,
147	145	};
...	...	@@ -171,15 +169,12 @@ fn errol3u(val: f64, buffer: []u8) FloatDecimal {
171	169	var buf_index: usize = 1;
172	170	while (true) {
173	171	var hdig = u8(math.floor(high.val));
174		if ((high.val == f64(hdig)) and (high.off < 0))
175		hdig -= 1;
	172	if ((high.val == f64(hdig)) and (high.off < 0)) hdig -= 1;
176	173
177	174	var ldig = u8(math.floor(low.val));
178		if ((low.val == f64(ldig)) and (low.off < 0))
179		ldig -= 1;
	175	if ((low.val == f64(ldig)) and (low.off < 0)) ldig -= 1;
180	176
181		if (ldig != hdig)
182		break;
	177	if (ldig != hdig) break;
183	178
184	179	buffer[buf_index] = hdig + '0';
185	180	buf_index += 1;
...	...	@@ -191,13 +186,12 @@ fn errol3u(val: f64, buffer: []u8) FloatDecimal {
191	186
192	187	const tmp = (high.val + low.val) / 2.0;
193	188	var mdig = u8(math.floor(tmp + 0.5));
194		if ((f64(mdig) - tmp) == 0.5 and (mdig & 0x1) != 0)
195		mdig -= 1;
	189	if ((f64(mdig) - tmp) == 0.5 and (mdig & 0x1) != 0) mdig -= 1;
196	190
197	191	buffer[buf_index] = mdig + '0';
198	192	buf_index += 1;
199	193
200		return FloatDecimal {
	194	return FloatDecimal{
201	195	.digits = buffer[1..buf_index],
202	196	.exp = exp,
203	197	};
...	...	@@ -235,7 +229,7 @@ fn hpProd(in: &const HP, val: f64) HP {
235	229	const p = in.val * val;
236	230	const e = ((hi * hi2 - p) + lo * hi2 + hi * lo2) + lo * lo2;
237	231
238		return HP {
	232	return HP{
239	233	.val = p,
240	234	.off = in.off * val + e,
241	235	};
...	...	@@ -246,8 +240,8 @@ fn hpProd(in: &const HP, val: f64) HP {
246	240	/// @hi: The high bits.
247	241	/// @lo: The low bits.
248	242	fn split(val: f64, hi: &f64, lo: &f64) void {
249		*hi = gethi(val);
250		lo = val - hi;
	243	hi.* = gethi(val);
	244	lo.* = val - hi.*;
251	245	}
252	246
253	247	fn gethi(in: f64) f64 {
...	...	@@ -301,7 +295,6 @@ fn hpMul10(hp: &HP) void {
301	295	hpNormalize(hp);
302	296	}
303	297
304
305	298	/// Integer conversion algorithm, guaranteed correct, optimal, and best.
306	299	/// @val: The val.
307	300	/// @buf: The output buffer.
...	...	@@ -343,8 +336,7 @@ fn errolInt(val: f64, buffer: []u8) FloatDecimal {
343	336	}
344	337	const m64 = @truncate(u64, @divTrunc(mid, x));
345	338
346		if (lf != hf)
347		mi += 19;
	339	if (lf != hf) mi += 19;
348	340
349	341	var buf_index = u64toa(m64, buffer) - 1;
350	342
...	...	@@ -354,7 +346,7 @@ fn errolInt(val: f64, buffer: []u8) FloatDecimal {
354	346	buf_index += 1;
355	347	}
356	348
357		return FloatDecimal {
	349	return FloatDecimal{
358	350	.digits = buffer[0..buf_index],
359	351	.exp = i32(buf_index) + mi,
360	352	};
...	...	@@ -396,25 +388,24 @@ fn errolFixed(val: f64, buffer: []u8) FloatDecimal {
396	388	buffer[j] = u8(mdig + '0');
397	389	j += 1;
398	390
399		if(hdig != ldig or j > 50)
400		break;
	391	if (hdig != ldig or j > 50) break;
401	392	}
402	393
403	394	if (mid > 0.5) {
404		buffer[j-1] += 1;
405		} else if ((mid == 0.5) and (buffer[j-1] & 0x1) != 0) {
406		buffer[j-1] += 1;
	395	buffer[j - 1] += 1;
	396	} else if ((mid == 0.5) and (buffer[j - 1] & 0x1) != 0) {
	397	buffer[j - 1] += 1;
407	398	}
408	399	} else {
409		while (buffer[j-1] == '0') {
410		buffer[j-1] = 0;
	400	while (buffer[j - 1] == '0') {
	401	buffer[j - 1] = 0;
411	402	j -= 1;
412	403	}
413	404	}
414	405
415	406	buffer[j] = 0;
416	407
417		return FloatDecimal {
	408	return FloatDecimal{
418	409	.digits = buffer[0..j],
419	410	.exp = exp,
420	411	};
...	...	@@ -428,7 +419,7 @@ fn fpprev(val: f64) f64 {
428	419	return @bitCast(f64, @bitCast(u64, val) -% 1);
429	420	}
430	421
431		pub const c_digits_lut = []u8 {
	422	pub const c_digits_lut = []u8{
432	423	'0', '0', '0', '1', '0', '2', '0', '3', '0', '4', '0', '5', '0', '6',
433	424	'0', '7', '0', '8', '0', '9', '1', '0', '1', '1', '1', '2', '1', '3',
434	425	'1', '4', '1', '5', '1', '6', '1', '7', '1', '8', '1', '9', '2', '0',
...	...	@@ -587,7 +578,7 @@ fn u64toa(value_param: u64, buffer: []u8) usize {
587	578	buffer[buf_index] = c_digits_lut[d8 + 1];
588	579	buf_index += 1;
589	580	} else {
590		const a = u32(value / kTen16); // 1 to 1844
	581	const a = u32(value / kTen16); // 1 to 1844
591	582	value %= kTen16;
592	583
593	584	if (a < 10) {
...	...	@@ -686,7 +677,6 @@ fn fpeint(from: f64) u128 {
686	677	return u128(1) << @truncate(u7, (bits >> 52) -% 1023);
687	678	}
688	679
689
690	680	/// Given two different integers with the same length in terms of the number
691	681	/// of decimal digits, index the digits from the right-most position starting
692	682	/// from zero, find the first index where the digits in the two integers
...	...	@@ -713,7 +703,6 @@ fn mismatch10(a: u64, b: u64) i32 {
713	703	a_copy /= 10;
714	704	b_copy /= 10;
715	705
716		if (a_copy == b_copy)
717		return i;
	706	if (a_copy == b_copy) return i;
718	707	}
719	708	}

std/fmt/errol/lookup.zig+600-600

...	...	@@ -3,604 +3,604 @@ pub const HP = struct {
3	3	off: f64,
4	4	};
5	5	pub const lookup_table = []HP{
6		HP{.val=1.000000e+308, .off= -1.097906362944045488e+291 },
7		HP{.val=1.000000e+307, .off= 1.396894023974354241e+290 },
8		HP{.val=1.000000e+306, .off= -1.721606459673645508e+289 },
9		HP{.val=1.000000e+305, .off= 6.074644749446353973e+288 },
10		HP{.val=1.000000e+304, .off= 6.074644749446353567e+287 },
11		HP{.val=1.000000e+303, .off= -1.617650767864564452e+284 },
12		HP{.val=1.000000e+302, .off= -7.629703079084895055e+285 },
13		HP{.val=1.000000e+301, .off= -5.250476025520442286e+284 },
14		HP{.val=1.000000e+300, .off= -5.250476025520441956e+283 },
15		HP{.val=1.000000e+299, .off= -5.250476025520441750e+282 },
16		HP{.val=1.000000e+298, .off= 4.043379652465702264e+281 },
17		HP{.val=1.000000e+297, .off= -1.765280146275637946e+280 },
18		HP{.val=1.000000e+296, .off= 1.865132227937699609e+279 },
19		HP{.val=1.000000e+295, .off= 1.865132227937699609e+278 },
20		HP{.val=1.000000e+294, .off= -6.643646774124810287e+277 },
21		HP{.val=1.000000e+293, .off= 7.537651562646039934e+276 },
22		HP{.val=1.000000e+292, .off= -1.325659897835741608e+275 },
23		HP{.val=1.000000e+291, .off= 4.213909764965371606e+274 },
24		HP{.val=1.000000e+290, .off= -6.172783352786715670e+273 },
25		HP{.val=1.000000e+289, .off= -6.172783352786715670e+272 },
26		HP{.val=1.000000e+288, .off= -7.630473539575035471e+270 },
27		HP{.val=1.000000e+287, .off= -7.525217352494018700e+270 },
28		HP{.val=1.000000e+286, .off= -3.298861103408696612e+269 },
29		HP{.val=1.000000e+285, .off= 1.984084207947955778e+268 },
30		HP{.val=1.000000e+284, .off= -7.921438250845767591e+267 },
31		HP{.val=1.000000e+283, .off= 4.460464822646386735e+266 },
32		HP{.val=1.000000e+282, .off= -3.278224598286209647e+265 },
33		HP{.val=1.000000e+281, .off= -3.278224598286209737e+264 },
34		HP{.val=1.000000e+280, .off= -3.278224598286209961e+263 },
35		HP{.val=1.000000e+279, .off= -5.797329227496039232e+262 },
36		HP{.val=1.000000e+278, .off= 3.649313132040821498e+261 },
37		HP{.val=1.000000e+277, .off= -2.867878510995372374e+259 },
38		HP{.val=1.000000e+276, .off= -5.206914080024985409e+259 },
39		HP{.val=1.000000e+275, .off= 4.018322599210230404e+258 },
40		HP{.val=1.000000e+274, .off= 7.862171215558236495e+257 },
41		HP{.val=1.000000e+273, .off= 5.459765830340732821e+256 },
42		HP{.val=1.000000e+272, .off= -6.552261095746788047e+255 },
43		HP{.val=1.000000e+271, .off= 4.709014147460262298e+254 },
44		HP{.val=1.000000e+270, .off= -4.675381888545612729e+253 },
45		HP{.val=1.000000e+269, .off= -4.675381888545612892e+252 },
46		HP{.val=1.000000e+268, .off= 2.656177514583977380e+251 },
47		HP{.val=1.000000e+267, .off= 2.656177514583977190e+250 },
48		HP{.val=1.000000e+266, .off= -3.071603269111014892e+249 },
49		HP{.val=1.000000e+265, .off= -6.651466258920385440e+248 },
50		HP{.val=1.000000e+264, .off= -4.414051890289528972e+247 },
51		HP{.val=1.000000e+263, .off= -1.617283929500958387e+246 },
52		HP{.val=1.000000e+262, .off= -1.617283929500958241e+245 },
53		HP{.val=1.000000e+261, .off= 7.122615947963323868e+244 },
54		HP{.val=1.000000e+260, .off= -6.533477610574617382e+243 },
55		HP{.val=1.000000e+259, .off= 7.122615947963323982e+242 },
56		HP{.val=1.000000e+258, .off= -5.679971763165996225e+241 },
57		HP{.val=1.000000e+257, .off= -3.012765990014054219e+240 },
58		HP{.val=1.000000e+256, .off= -3.012765990014054219e+239 },
59		HP{.val=1.000000e+255, .off= 1.154743030535854616e+238 },
60		HP{.val=1.000000e+254, .off= 6.364129306223240767e+237 },
61		HP{.val=1.000000e+253, .off= 6.364129306223241129e+236 },
62		HP{.val=1.000000e+252, .off= -9.915202805299840595e+235 },
63		HP{.val=1.000000e+251, .off= -4.827911520448877980e+234 },
64		HP{.val=1.000000e+250, .off= 7.890316691678530146e+233 },
65		HP{.val=1.000000e+249, .off= 7.890316691678529484e+232 },
66		HP{.val=1.000000e+248, .off= -4.529828046727141859e+231 },
67		HP{.val=1.000000e+247, .off= 4.785280507077111924e+230 },
68		HP{.val=1.000000e+246, .off= -6.858605185178205305e+229 },
69		HP{.val=1.000000e+245, .off= -4.432795665958347728e+228 },
70		HP{.val=1.000000e+244, .off= -7.465057564983169531e+227 },
71		HP{.val=1.000000e+243, .off= -7.465057564983169741e+226 },
72		HP{.val=1.000000e+242, .off= -5.096102956370027445e+225 },
73		HP{.val=1.000000e+241, .off= -5.096102956370026952e+224 },
74		HP{.val=1.000000e+240, .off= -1.394611380411992474e+223 },
75		HP{.val=1.000000e+239, .off= 9.188208545617793960e+221 },
76		HP{.val=1.000000e+238, .off= -4.864759732872650359e+221 },
77		HP{.val=1.000000e+237, .off= 5.979453868566904629e+220 },
78		HP{.val=1.000000e+236, .off= -5.316601966265964857e+219 },
79		HP{.val=1.000000e+235, .off= -5.316601966265964701e+218 },
80		HP{.val=1.000000e+234, .off= -1.786584517880693123e+217 },
81		HP{.val=1.000000e+233, .off= 2.625937292600896716e+216 },
82		HP{.val=1.000000e+232, .off= -5.647541102052084079e+215 },
83		HP{.val=1.000000e+231, .off= -5.647541102052083888e+214 },
84		HP{.val=1.000000e+230, .off= -9.956644432600511943e+213 },
85		HP{.val=1.000000e+229, .off= 8.161138937705571862e+211 },
86		HP{.val=1.000000e+228, .off= 7.549087847752475275e+211 },
87		HP{.val=1.000000e+227, .off= -9.283347037202319948e+210 },
88		HP{.val=1.000000e+226, .off= 3.866992716668613820e+209 },
89		HP{.val=1.000000e+225, .off= 7.154577655136347262e+208 },
90		HP{.val=1.000000e+224, .off= 3.045096482051680688e+207 },
91		HP{.val=1.000000e+223, .off= -4.660180717482069567e+206 },
92		HP{.val=1.000000e+222, .off= -4.660180717482070101e+205 },
93		HP{.val=1.000000e+221, .off= -4.660180717482069544e+204 },
94		HP{.val=1.000000e+220, .off= 3.562757926310489022e+202 },
95		HP{.val=1.000000e+219, .off= 3.491561111451748149e+202 },
96		HP{.val=1.000000e+218, .off= -8.265758834125874135e+201 },
97		HP{.val=1.000000e+217, .off= 3.981449442517482365e+200 },
98		HP{.val=1.000000e+216, .off= -2.142154695804195936e+199 },
99		HP{.val=1.000000e+215, .off= 9.339603063548950188e+198 },
100		HP{.val=1.000000e+214, .off= 4.555537330485139746e+197 },
101		HP{.val=1.000000e+213, .off= 1.565496247320257804e+196 },
102		HP{.val=1.000000e+212, .off= 9.040598955232462036e+195 },
103		HP{.val=1.000000e+211, .off= 4.368659762787334780e+194 },
104		HP{.val=1.000000e+210, .off= 7.288621758065539072e+193 },
105		HP{.val=1.000000e+209, .off= -7.311188218325485628e+192 },
106		HP{.val=1.000000e+208, .off= 1.813693016918905189e+191 },
107		HP{.val=1.000000e+207, .off= -3.889357755108838992e+190 },
108		HP{.val=1.000000e+206, .off= -3.889357755108838992e+189 },
109		HP{.val=1.000000e+205, .off= -1.661603547285501360e+188 },
110		HP{.val=1.000000e+204, .off= 1.123089212493670643e+187 },
111		HP{.val=1.000000e+203, .off= 1.123089212493670643e+186 },
112		HP{.val=1.000000e+202, .off= 9.825254086803583029e+185 },
113		HP{.val=1.000000e+201, .off= -3.771878529305654999e+184 },
114		HP{.val=1.000000e+200, .off= 3.026687778748963675e+183 },
115		HP{.val=1.000000e+199, .off= -9.720624048853446693e+182 },
116		HP{.val=1.000000e+198, .off= -1.753554156601940139e+181 },
117		HP{.val=1.000000e+197, .off= 4.885670753607648963e+180 },
118		HP{.val=1.000000e+196, .off= 4.885670753607648963e+179 },
119		HP{.val=1.000000e+195, .off= 2.292223523057028076e+178 },
120		HP{.val=1.000000e+194, .off= 5.534032561245303825e+177 },
121		HP{.val=1.000000e+193, .off= -6.622751331960730683e+176 },
122		HP{.val=1.000000e+192, .off= -4.090088020876139692e+175 },
123		HP{.val=1.000000e+191, .off= -7.255917159731877552e+174 },
124		HP{.val=1.000000e+190, .off= -7.255917159731877992e+173 },
125		HP{.val=1.000000e+189, .off= -2.309309130269787104e+172 },
126		HP{.val=1.000000e+188, .off= -2.309309130269787019e+171 },
127		HP{.val=1.000000e+187, .off= 9.284303438781988230e+170 },
128		HP{.val=1.000000e+186, .off= 2.038295583124628364e+169 },
129		HP{.val=1.000000e+185, .off= 2.038295583124628532e+168 },
130		HP{.val=1.000000e+184, .off= -1.735666841696912925e+167 },
131		HP{.val=1.000000e+183, .off= 5.340512704843477241e+166 },
132		HP{.val=1.000000e+182, .off= -6.453119872723839321e+165 },
133		HP{.val=1.000000e+181, .off= 8.288920849235306587e+164 },
134		HP{.val=1.000000e+180, .off= -9.248546019891598293e+162 },
135		HP{.val=1.000000e+179, .off= 1.954450226518486016e+162 },
136		HP{.val=1.000000e+178, .off= -5.243811844750628197e+161 },
137		HP{.val=1.000000e+177, .off= -7.448980502074320639e+159 },
138		HP{.val=1.000000e+176, .off= -7.448980502074319858e+158 },
139		HP{.val=1.000000e+175, .off= 6.284654753766312753e+158 },
140		HP{.val=1.000000e+174, .off= -6.895756753684458388e+157 },
141		HP{.val=1.000000e+173, .off= -1.403918625579970616e+156 },
142		HP{.val=1.000000e+172, .off= -8.268716285710580522e+155 },
143		HP{.val=1.000000e+171, .off= 4.602779327034313170e+154 },
144		HP{.val=1.000000e+170, .off= -3.441905430931244940e+153 },
145		HP{.val=1.000000e+169, .off= 6.613950516525702884e+152 },
146		HP{.val=1.000000e+168, .off= 6.613950516525702652e+151 },
147		HP{.val=1.000000e+167, .off= -3.860899428741951187e+150 },
148		HP{.val=1.000000e+166, .off= 5.959272394946474605e+149 },
149		HP{.val=1.000000e+165, .off= 1.005101065481665103e+149 },
150		HP{.val=1.000000e+164, .off= -1.783349948587918355e+146 },
151		HP{.val=1.000000e+163, .off= 6.215006036188360099e+146 },
152		HP{.val=1.000000e+162, .off= 6.215006036188360099e+145 },
153		HP{.val=1.000000e+161, .off= -3.774589324822814903e+144 },
154		HP{.val=1.000000e+160, .off= -6.528407745068226929e+142 },
155		HP{.val=1.000000e+159, .off= 7.151530601283157561e+142 },
156		HP{.val=1.000000e+158, .off= 4.712664546348788765e+141 },
157		HP{.val=1.000000e+157, .off= 1.664081977680827856e+140 },
158		HP{.val=1.000000e+156, .off= 1.664081977680827750e+139 },
159		HP{.val=1.000000e+155, .off= -7.176231540910168265e+137 },
160		HP{.val=1.000000e+154, .off= -3.694754568805822650e+137 },
161		HP{.val=1.000000e+153, .off= 2.665969958768462622e+134 },
162		HP{.val=1.000000e+152, .off= -4.625108135904199522e+135 },
163		HP{.val=1.000000e+151, .off= -1.717753238721771919e+134 },
164		HP{.val=1.000000e+150, .off= 1.916440382756262433e+133 },
165		HP{.val=1.000000e+149, .off= -4.897672657515052040e+132 },
166		HP{.val=1.000000e+148, .off= -4.897672657515052198e+131 },
167		HP{.val=1.000000e+147, .off= 2.200361759434233991e+130 },
168		HP{.val=1.000000e+146, .off= 6.636633270027537273e+129 },
169		HP{.val=1.000000e+145, .off= 1.091293881785907977e+128 },
170		HP{.val=1.000000e+144, .off= -2.374543235865110597e+127 },
171		HP{.val=1.000000e+143, .off= -2.374543235865110537e+126 },
172		HP{.val=1.000000e+142, .off= -5.082228484029969099e+125 },
173		HP{.val=1.000000e+141, .off= -1.697621923823895943e+124 },
174		HP{.val=1.000000e+140, .off= -5.928380124081487212e+123 },
175		HP{.val=1.000000e+139, .off= -3.284156248920492522e+122 },
176		HP{.val=1.000000e+138, .off= -3.284156248920492706e+121 },
177		HP{.val=1.000000e+137, .off= -3.284156248920492476e+120 },
178		HP{.val=1.000000e+136, .off= -5.866406127007401066e+119 },
179		HP{.val=1.000000e+135, .off= 3.817030915818506056e+118 },
180		HP{.val=1.000000e+134, .off= 7.851796350329300951e+117 },
181		HP{.val=1.000000e+133, .off= -2.235117235947686077e+116 },
182		HP{.val=1.000000e+132, .off= 9.170432597638723691e+114 },
183		HP{.val=1.000000e+131, .off= 8.797444499042767883e+114 },
184		HP{.val=1.000000e+130, .off= -5.978307824605161274e+113 },
185		HP{.val=1.000000e+129, .off= 1.782556435814758516e+111 },
186		HP{.val=1.000000e+128, .off= -7.517448691651820362e+111 },
187		HP{.val=1.000000e+127, .off= 4.507089332150205498e+110 },
188		HP{.val=1.000000e+126, .off= 7.513223838100711695e+109 },
189		HP{.val=1.000000e+125, .off= 7.513223838100712113e+108 },
190		HP{.val=1.000000e+124, .off= 5.164681255326878494e+107 },
191		HP{.val=1.000000e+123, .off= 2.229003026859587122e+106 },
192		HP{.val=1.000000e+122, .off= -1.440594758724527399e+105 },
193		HP{.val=1.000000e+121, .off= -3.734093374714598783e+104 },
194		HP{.val=1.000000e+120, .off= 1.999653165260579757e+103 },
195		HP{.val=1.000000e+119, .off= 5.583244752745066693e+102 },
196		HP{.val=1.000000e+118, .off= 3.343500010567262234e+101 },
197		HP{.val=1.000000e+117, .off= -5.055542772599503556e+100 },
198		HP{.val=1.000000e+116, .off= -1.555941612946684331e+99 },
199		HP{.val=1.000000e+115, .off= -1.555941612946684331e+98 },
200		HP{.val=1.000000e+114, .off= -1.555941612946684293e+97 },
201		HP{.val=1.000000e+113, .off= -1.555941612946684246e+96 },
202		HP{.val=1.000000e+112, .off= 6.988006530736955847e+95 },
203		HP{.val=1.000000e+111, .off= 4.318022735835818244e+94 },
204		HP{.val=1.000000e+110, .off= -2.356936751417025578e+93 },
205		HP{.val=1.000000e+109, .off= 1.814912928116001926e+92 },
206		HP{.val=1.000000e+108, .off= -3.399899171300282744e+91 },
207		HP{.val=1.000000e+107, .off= 3.118615952970072913e+90 },
208		HP{.val=1.000000e+106, .off= -9.103599905036843605e+89 },
209		HP{.val=1.000000e+105, .off= 6.174169917471802325e+88 },
210		HP{.val=1.000000e+104, .off= -1.915675085734668657e+86 },
211		HP{.val=1.000000e+103, .off= -1.915675085734668864e+85 },
212		HP{.val=1.000000e+102, .off= 2.295048673475466221e+85 },
213		HP{.val=1.000000e+101, .off= 2.295048673475466135e+84 },
214		HP{.val=1.000000e+100, .off= -1.590289110975991792e+83 },
215		HP{.val=1.000000e+99, .off= 3.266383119588331155e+82 },
216		HP{.val=1.000000e+98, .off= 2.309629754856292029e+80 },
217		HP{.val=1.000000e+97, .off= -7.357587384771124533e+80 },
218		HP{.val=1.000000e+96, .off= -4.986165397190889509e+79 },
219		HP{.val=1.000000e+95, .off= -2.021887912715594741e+78 },
220		HP{.val=1.000000e+94, .off= -2.021887912715594638e+77 },
221		HP{.val=1.000000e+93, .off= -4.337729697461918675e+76 },
222		HP{.val=1.000000e+92, .off= -4.337729697461918997e+75 },
223		HP{.val=1.000000e+91, .off= -7.956232486128049702e+74 },
224		HP{.val=1.000000e+90, .off= 3.351588728453609882e+73 },
225		HP{.val=1.000000e+89, .off= 5.246334248081951113e+71 },
226		HP{.val=1.000000e+88, .off= 4.058327554364963672e+71 },
227		HP{.val=1.000000e+87, .off= 4.058327554364963918e+70 },
228		HP{.val=1.000000e+86, .off= -1.463069523067487266e+69 },
229		HP{.val=1.000000e+85, .off= -1.463069523067487314e+68 },
230		HP{.val=1.000000e+84, .off= -5.776660989811589441e+67 },
231		HP{.val=1.000000e+83, .off= -3.080666323096525761e+66 },
232		HP{.val=1.000000e+82, .off= 3.659320343691134468e+65 },
233		HP{.val=1.000000e+81, .off= 7.871812010433421235e+64 },
234		HP{.val=1.000000e+80, .off= -2.660986470836727449e+61 },
235		HP{.val=1.000000e+79, .off= 3.264399249934044627e+62 },
236		HP{.val=1.000000e+78, .off= -8.493621433689703070e+60 },
237		HP{.val=1.000000e+77, .off= 1.721738727445414063e+60 },
238		HP{.val=1.000000e+76, .off= -4.706013449590547218e+59 },
239		HP{.val=1.000000e+75, .off= 7.346021882351880518e+58 },
240		HP{.val=1.000000e+74, .off= 4.835181188197207515e+57 },
241		HP{.val=1.000000e+73, .off= 1.696630320503867482e+56 },
242		HP{.val=1.000000e+72, .off= 5.619818905120542959e+55 },
243		HP{.val=1.000000e+71, .off= -4.188152556421145598e+54 },
244		HP{.val=1.000000e+70, .off= -7.253143638152923145e+53 },
245		HP{.val=1.000000e+69, .off= -7.253143638152923145e+52 },
246		HP{.val=1.000000e+68, .off= 4.719477774861832896e+51 },
247		HP{.val=1.000000e+67, .off= 1.726322421608144052e+50 },
248		HP{.val=1.000000e+66, .off= 5.467766613175255107e+49 },
249		HP{.val=1.000000e+65, .off= 7.909613737163661911e+47 },
250		HP{.val=1.000000e+64, .off= -2.132041900945439564e+47 },
251		HP{.val=1.000000e+63, .off= -5.785795994272697265e+46 },
252		HP{.val=1.000000e+62, .off= -3.502199685943161329e+45 },
253		HP{.val=1.000000e+61, .off= 5.061286470292598274e+44 },
254		HP{.val=1.000000e+60, .off= 5.061286470292598472e+43 },
255		HP{.val=1.000000e+59, .off= 2.831211950439536034e+42 },
256		HP{.val=1.000000e+58, .off= 5.618805100255863927e+41 },
257		HP{.val=1.000000e+57, .off= -4.834669211555366251e+40 },
258		HP{.val=1.000000e+56, .off= -9.190283508143378583e+39 },
259		HP{.val=1.000000e+55, .off= -1.023506702040855158e+38 },
260		HP{.val=1.000000e+54, .off= -7.829154040459624616e+37 },
261		HP{.val=1.000000e+53, .off= 6.779051325638372659e+35 },
262		HP{.val=1.000000e+52, .off= 6.779051325638372290e+34 },
263		HP{.val=1.000000e+51, .off= 6.779051325638371598e+33 },
264		HP{.val=1.000000e+50, .off= -7.629769841091887392e+33 },
265		HP{.val=1.000000e+49, .off= 5.350972305245182400e+32 },
266		HP{.val=1.000000e+48, .off= -4.384584304507619764e+31 },
267		HP{.val=1.000000e+47, .off= -4.384584304507619876e+30 },
268		HP{.val=1.000000e+46, .off= 6.860180964052978705e+28 },
269		HP{.val=1.000000e+45, .off= 7.024271097546444878e+28 },
270		HP{.val=1.000000e+44, .off= -8.821361405306422641e+27 },
271		HP{.val=1.000000e+43, .off= -1.393721169594140991e+26 },
272		HP{.val=1.000000e+42, .off= -4.488571267807591679e+25 },
273		HP{.val=1.000000e+41, .off= -6.200086450407783195e+23 },
274		HP{.val=1.000000e+40, .off= -3.037860284270036669e+23 },
275		HP{.val=1.000000e+39, .off= 6.029083362839682141e+22 },
276		HP{.val=1.000000e+38, .off= 2.251190176543965970e+21 },
277		HP{.val=1.000000e+37, .off= 4.612373417978788577e+20 },
278		HP{.val=1.000000e+36, .off= -4.242063737401796198e+19 },
279		HP{.val=1.000000e+35, .off= 3.136633892082024448e+18 },
280		HP{.val=1.000000e+34, .off= 5.442476901295718400e+17 },
281		HP{.val=1.000000e+33, .off= 5.442476901295718400e+16 },
282		HP{.val=1.000000e+32, .off= -5.366162204393472000e+15 },
283		HP{.val=1.000000e+31, .off= 3.641037050347520000e+14 },
284		HP{.val=1.000000e+30, .off= -1.988462483865600000e+13 },
285		HP{.val=1.000000e+29, .off= 8.566849142784000000e+12 },
286		HP{.val=1.000000e+28, .off= 4.168802631680000000e+11 },
287		HP{.val=1.000000e+27, .off= -1.328755507200000000e+10 },
288		HP{.val=1.000000e+26, .off= -4.764729344000000000e+09 },
289		HP{.val=1.000000e+25, .off= -9.059696640000000000e+08 },
290		HP{.val=1.000000e+24, .off= 1.677721600000000000e+07 },
291		HP{.val=1.000000e+23, .off= 8.388608000000000000e+06 },
292		HP{.val=1.000000e+22, .off= 0.000000000000000000e+00 },
293		HP{.val=1.000000e+21, .off= 0.000000000000000000e+00 },
294		HP{.val=1.000000e+20, .off= 0.000000000000000000e+00 },
295		HP{.val=1.000000e+19, .off= 0.000000000000000000e+00 },
296		HP{.val=1.000000e+18, .off= 0.000000000000000000e+00 },
297		HP{.val=1.000000e+17, .off= 0.000000000000000000e+00 },
298		HP{.val=1.000000e+16, .off= 0.000000000000000000e+00 },
299		HP{.val=1.000000e+15, .off= 0.000000000000000000e+00 },
300		HP{.val=1.000000e+14, .off= 0.000000000000000000e+00 },
301		HP{.val=1.000000e+13, .off= 0.000000000000000000e+00 },
302		HP{.val=1.000000e+12, .off= 0.000000000000000000e+00 },
303		HP{.val=1.000000e+11, .off= 0.000000000000000000e+00 },
304		HP{.val=1.000000e+10, .off= 0.000000000000000000e+00 },
305		HP{.val=1.000000e+09, .off= 0.000000000000000000e+00 },
306		HP{.val=1.000000e+08, .off= 0.000000000000000000e+00 },
307		HP{.val=1.000000e+07, .off= 0.000000000000000000e+00 },
308		HP{.val=1.000000e+06, .off= 0.000000000000000000e+00 },
309		HP{.val=1.000000e+05, .off= 0.000000000000000000e+00 },
310		HP{.val=1.000000e+04, .off= 0.000000000000000000e+00 },
311		HP{.val=1.000000e+03, .off= 0.000000000000000000e+00 },
312		HP{.val=1.000000e+02, .off= 0.000000000000000000e+00 },
313		HP{.val=1.000000e+01, .off= 0.000000000000000000e+00 },
314		HP{.val=1.000000e+00, .off= 0.000000000000000000e+00 },
315		HP{.val=1.000000e-01, .off= -5.551115123125783010e-18 },
316		HP{.val=1.000000e-02, .off= -2.081668171172168436e-19 },
317		HP{.val=1.000000e-03, .off= -2.081668171172168557e-20 },
318		HP{.val=1.000000e-04, .off= -4.792173602385929943e-21 },
319		HP{.val=1.000000e-05, .off= -8.180305391403130547e-22 },
320		HP{.val=1.000000e-06, .off= 4.525188817411374069e-23 },
321		HP{.val=1.000000e-07, .off= 4.525188817411373922e-24 },
322		HP{.val=1.000000e-08, .off= -2.092256083012847109e-25 },
323		HP{.val=1.000000e-09, .off= -6.228159145777985254e-26 },
324		HP{.val=1.000000e-10, .off= -3.643219731549774344e-27 },
325		HP{.val=1.000000e-11, .off= 6.050303071806019080e-28 },
326		HP{.val=1.000000e-12, .off= 2.011335237074438524e-29 },
327		HP{.val=1.000000e-13, .off= -3.037374556340037101e-30 },
328		HP{.val=1.000000e-14, .off= 1.180690645440101289e-32 },
329		HP{.val=1.000000e-15, .off= -7.770539987666107583e-32 },
330		HP{.val=1.000000e-16, .off= 2.090221327596539779e-33 },
331		HP{.val=1.000000e-17, .off= -7.154242405462192144e-34 },
332		HP{.val=1.000000e-18, .off= -7.154242405462192572e-35 },
333		HP{.val=1.000000e-19, .off= 2.475407316473986894e-36 },
334		HP{.val=1.000000e-20, .off= 5.484672854579042914e-37 },
335		HP{.val=1.000000e-21, .off= 9.246254777210362522e-38 },
336		HP{.val=1.000000e-22, .off= -4.859677432657087182e-39 },
337		HP{.val=1.000000e-23, .off= 3.956530198510069291e-40 },
338		HP{.val=1.000000e-24, .off= 7.629950044829717753e-41 },
339		HP{.val=1.000000e-25, .off= -3.849486974919183692e-42 },
340		HP{.val=1.000000e-26, .off= -3.849486974919184170e-43 },
341		HP{.val=1.000000e-27, .off= -3.849486974919184070e-44 },
342		HP{.val=1.000000e-28, .off= 2.876745653839937870e-45 },
343		HP{.val=1.000000e-29, .off= 5.679342582489572168e-46 },
344		HP{.val=1.000000e-30, .off= -8.333642060758598930e-47 },
345		HP{.val=1.000000e-31, .off= -8.333642060758597958e-48 },
346		HP{.val=1.000000e-32, .off= -5.596730997624190224e-49 },
347		HP{.val=1.000000e-33, .off= -5.596730997624190604e-50 },
348		HP{.val=1.000000e-34, .off= 7.232539610818348498e-51 },
349		HP{.val=1.000000e-35, .off= -7.857545194582380514e-53 },
350		HP{.val=1.000000e-36, .off= 5.896157255772251528e-53 },
351		HP{.val=1.000000e-37, .off= -6.632427322784915796e-54 },
352		HP{.val=1.000000e-38, .off= 3.808059826012723592e-55 },
353		HP{.val=1.000000e-39, .off= 7.070712060011985131e-56 },
354		HP{.val=1.000000e-40, .off= 7.070712060011985584e-57 },
355		HP{.val=1.000000e-41, .off= -5.761291134237854167e-59 },
356		HP{.val=1.000000e-42, .off= -3.762312935688689794e-59 },
357		HP{.val=1.000000e-43, .off= -7.745042713519821150e-60 },
358		HP{.val=1.000000e-44, .off= 4.700987842202462817e-61 },
359		HP{.val=1.000000e-45, .off= 1.589480203271891964e-62 },
360		HP{.val=1.000000e-46, .off= -2.299904345391321765e-63 },
361		HP{.val=1.000000e-47, .off= 2.561826340437695261e-64 },
362		HP{.val=1.000000e-48, .off= 2.561826340437695345e-65 },
363		HP{.val=1.000000e-49, .off= 6.360053438741614633e-66 },
364		HP{.val=1.000000e-50, .off= -7.616223705782342295e-68 },
365		HP{.val=1.000000e-51, .off= -7.616223705782343324e-69 },
366		HP{.val=1.000000e-52, .off= -7.616223705782342295e-70 },
367		HP{.val=1.000000e-53, .off= -3.079876214757872338e-70 },
368		HP{.val=1.000000e-54, .off= -3.079876214757872821e-71 },
369		HP{.val=1.000000e-55, .off= 5.423954167728123147e-73 },
370		HP{.val=1.000000e-56, .off= -3.985444122640543680e-73 },
371		HP{.val=1.000000e-57, .off= 4.504255013759498850e-74 },
372		HP{.val=1.000000e-58, .off= -2.570494266573869991e-75 },
373		HP{.val=1.000000e-59, .off= -2.570494266573869930e-76 },
374		HP{.val=1.000000e-60, .off= 2.956653608686574324e-77 },
375		HP{.val=1.000000e-61, .off= -3.952281235388981376e-78 },
376		HP{.val=1.000000e-62, .off= -3.952281235388981376e-79 },
377		HP{.val=1.000000e-63, .off= -6.651083908855995172e-80 },
378		HP{.val=1.000000e-64, .off= 3.469426116645307030e-81 },
379		HP{.val=1.000000e-65, .off= 7.686305293937516319e-82 },
380		HP{.val=1.000000e-66, .off= 2.415206322322254927e-83 },
381		HP{.val=1.000000e-67, .off= 5.709643179581793251e-84 },
382		HP{.val=1.000000e-68, .off= -6.644495035141475923e-85 },
383		HP{.val=1.000000e-69, .off= 3.650620143794581913e-86 },
384		HP{.val=1.000000e-70, .off= 4.333966503770636492e-88 },
385		HP{.val=1.000000e-71, .off= 8.476455383920859113e-88 },
386		HP{.val=1.000000e-72, .off= 3.449543675455986564e-89 },
387		HP{.val=1.000000e-73, .off= 3.077238576654418974e-91 },
388		HP{.val=1.000000e-74, .off= 4.234998629903623140e-91 },
389		HP{.val=1.000000e-75, .off= 4.234998629903623412e-92 },
390		HP{.val=1.000000e-76, .off= 7.303182045714702338e-93 },
391		HP{.val=1.000000e-77, .off= 7.303182045714701699e-94 },
392		HP{.val=1.000000e-78, .off= 1.121271649074855759e-96 },
393		HP{.val=1.000000e-79, .off= 1.121271649074855863e-97 },
394		HP{.val=1.000000e-80, .off= 3.857468248661243988e-97 },
395		HP{.val=1.000000e-81, .off= 3.857468248661244248e-98 },
396		HP{.val=1.000000e-82, .off= 3.857468248661244410e-99 },
397		HP{.val=1.000000e-83, .off= -3.457651055545315679e-100 },
398		HP{.val=1.000000e-84, .off= -3.457651055545315933e-101 },
399		HP{.val=1.000000e-85, .off= 2.257285900866059216e-102 },
400		HP{.val=1.000000e-86, .off= -8.458220892405268345e-103 },
401		HP{.val=1.000000e-87, .off= -1.761029146610688867e-104 },
402		HP{.val=1.000000e-88, .off= 6.610460535632536565e-105 },
403		HP{.val=1.000000e-89, .off= -3.853901567171494935e-106 },
404		HP{.val=1.000000e-90, .off= 5.062493089968513723e-108 },
405		HP{.val=1.000000e-91, .off= -2.218844988608365240e-108 },
406		HP{.val=1.000000e-92, .off= 1.187522883398155383e-109 },
407		HP{.val=1.000000e-93, .off= 9.703442563414457296e-110 },
408		HP{.val=1.000000e-94, .off= 4.380992763404268896e-111 },
409		HP{.val=1.000000e-95, .off= 1.054461638397900823e-112 },
410		HP{.val=1.000000e-96, .off= 9.370789450913819736e-113 },
411		HP{.val=1.000000e-97, .off= -3.623472756142303998e-114 },
412		HP{.val=1.000000e-98, .off= 6.122223899149788839e-115 },
413		HP{.val=1.000000e-99, .off= -1.999189980260288281e-116 },
414		HP{.val=1.000000e-100, .off= -1.999189980260288281e-117 },
415		HP{.val=1.000000e-101, .off= -5.171617276904849634e-118 },
416		HP{.val=1.000000e-102, .off= 6.724985085512256320e-119 },
417		HP{.val=1.000000e-103, .off= 4.246526260008692213e-120 },
418		HP{.val=1.000000e-104, .off= 7.344599791888147003e-121 },
419		HP{.val=1.000000e-105, .off= 3.472007877038828407e-122 },
420		HP{.val=1.000000e-106, .off= 5.892377823819652194e-123 },
421		HP{.val=1.000000e-107, .off= -1.585470431324073925e-125 },
422		HP{.val=1.000000e-108, .off= -3.940375084977444795e-125 },
423		HP{.val=1.000000e-109, .off= 7.869099673288519908e-127 },
424		HP{.val=1.000000e-110, .off= -5.122196348054018581e-127 },
425		HP{.val=1.000000e-111, .off= -8.815387795168313713e-128 },
426		HP{.val=1.000000e-112, .off= 5.034080131510290214e-129 },
427		HP{.val=1.000000e-113, .off= 2.148774313452247863e-130 },
428		HP{.val=1.000000e-114, .off= -5.064490231692858416e-131 },
429		HP{.val=1.000000e-115, .off= -5.064490231692858166e-132 },
430		HP{.val=1.000000e-116, .off= 5.708726942017560559e-134 },
431		HP{.val=1.000000e-117, .off= -2.951229134482377772e-134 },
432		HP{.val=1.000000e-118, .off= 1.451398151372789513e-135 },
433		HP{.val=1.000000e-119, .off= -1.300243902286690040e-136 },
434		HP{.val=1.000000e-120, .off= 2.139308664787659449e-137 },
435		HP{.val=1.000000e-121, .off= 2.139308664787659329e-138 },
436		HP{.val=1.000000e-122, .off= -5.922142664292847471e-139 },
437		HP{.val=1.000000e-123, .off= -5.922142664292846912e-140 },
438		HP{.val=1.000000e-124, .off= 6.673875037395443799e-141 },
439		HP{.val=1.000000e-125, .off= -1.198636026159737932e-142 },
440		HP{.val=1.000000e-126, .off= 5.361789860136246995e-143 },
441		HP{.val=1.000000e-127, .off= -2.838742497733733936e-144 },
442		HP{.val=1.000000e-128, .off= -5.401408859568103261e-145 },
443		HP{.val=1.000000e-129, .off= 7.411922949603743011e-146 },
444		HP{.val=1.000000e-130, .off= -8.604741811861064385e-147 },
445		HP{.val=1.000000e-131, .off= 1.405673664054439890e-148 },
446		HP{.val=1.000000e-132, .off= 1.405673664054439933e-149 },
447		HP{.val=1.000000e-133, .off= -6.414963426504548053e-150 },
448		HP{.val=1.000000e-134, .off= -3.971014335704864578e-151 },
449		HP{.val=1.000000e-135, .off= -3.971014335704864748e-152 },
450		HP{.val=1.000000e-136, .off= -1.523438813303585576e-154 },
451		HP{.val=1.000000e-137, .off= 2.234325152653707766e-154 },
452		HP{.val=1.000000e-138, .off= -6.715683724786540160e-155 },
453		HP{.val=1.000000e-139, .off= -2.986513359186437306e-156 },
454		HP{.val=1.000000e-140, .off= 1.674949597813692102e-157 },
455		HP{.val=1.000000e-141, .off= -4.151879098436469092e-158 },
456		HP{.val=1.000000e-142, .off= -4.151879098436469295e-159 },
457		HP{.val=1.000000e-143, .off= 4.952540739454407825e-160 },
458		HP{.val=1.000000e-144, .off= 4.952540739454407667e-161 },
459		HP{.val=1.000000e-145, .off= 8.508954738630531443e-162 },
460		HP{.val=1.000000e-146, .off= -2.604839008794855481e-163 },
461		HP{.val=1.000000e-147, .off= 2.952057864917838382e-164 },
462		HP{.val=1.000000e-148, .off= 6.425118410988271757e-165 },
463		HP{.val=1.000000e-149, .off= 2.083792728400229858e-166 },
464		HP{.val=1.000000e-150, .off= -6.295358232172964237e-168 },
465		HP{.val=1.000000e-151, .off= 6.153785555826519421e-168 },
466		HP{.val=1.000000e-152, .off= -6.564942029880634994e-169 },
467		HP{.val=1.000000e-153, .off= -3.915207116191644540e-170 },
468		HP{.val=1.000000e-154, .off= 2.709130168030831503e-171 },
469		HP{.val=1.000000e-155, .off= -1.431080634608215966e-172 },
470		HP{.val=1.000000e-156, .off= -4.018712386257620994e-173 },
471		HP{.val=1.000000e-157, .off= 5.684906682427646782e-174 },
472		HP{.val=1.000000e-158, .off= -6.444617153428937489e-175 },
473		HP{.val=1.000000e-159, .off= 1.136335243981427681e-176 },
474		HP{.val=1.000000e-160, .off= 1.136335243981427725e-177 },
475		HP{.val=1.000000e-161, .off= -2.812077463003137395e-178 },
476		HP{.val=1.000000e-162, .off= 4.591196362592922204e-179 },
477		HP{.val=1.000000e-163, .off= 7.675893789924613703e-180 },
478		HP{.val=1.000000e-164, .off= 3.820022005759999543e-181 },
479		HP{.val=1.000000e-165, .off= -9.998177244457686588e-183 },
480		HP{.val=1.000000e-166, .off= -4.012217555824373639e-183 },
481		HP{.val=1.000000e-167, .off= -2.467177666011174334e-185 },
482		HP{.val=1.000000e-168, .off= -4.953592503130188139e-185 },
483		HP{.val=1.000000e-169, .off= -2.011795792799518887e-186 },
484		HP{.val=1.000000e-170, .off= 1.665450095113817423e-187 },
485		HP{.val=1.000000e-171, .off= 1.665450095113817487e-188 },
486		HP{.val=1.000000e-172, .off= -4.080246604750770577e-189 },
487		HP{.val=1.000000e-173, .off= -4.080246604750770677e-190 },
488		HP{.val=1.000000e-174, .off= 4.085789420184387951e-192 },
489		HP{.val=1.000000e-175, .off= 4.085789420184388146e-193 },
490		HP{.val=1.000000e-176, .off= 4.085789420184388146e-194 },
491		HP{.val=1.000000e-177, .off= 4.792197640035244894e-194 },
492		HP{.val=1.000000e-178, .off= 4.792197640035244742e-195 },
493		HP{.val=1.000000e-179, .off= -2.057206575616014662e-196 },
494		HP{.val=1.000000e-180, .off= -2.057206575616014662e-197 },
495		HP{.val=1.000000e-181, .off= -4.732755097354788053e-198 },
496		HP{.val=1.000000e-182, .off= -4.732755097354787867e-199 },
497		HP{.val=1.000000e-183, .off= -5.522105321379546765e-201 },
498		HP{.val=1.000000e-184, .off= -5.777891238658996019e-201 },
499		HP{.val=1.000000e-185, .off= 7.542096444923057046e-203 },
500		HP{.val=1.000000e-186, .off= 8.919335748431433483e-203 },
501		HP{.val=1.000000e-187, .off= -1.287071881492476028e-204 },
502		HP{.val=1.000000e-188, .off= 5.091932887209967018e-205 },
503		HP{.val=1.000000e-189, .off= -6.868701054107114024e-206 },
504		HP{.val=1.000000e-190, .off= -1.885103578558330118e-207 },
505		HP{.val=1.000000e-191, .off= -1.885103578558330205e-208 },
506		HP{.val=1.000000e-192, .off= -9.671974634103305058e-209 },
507		HP{.val=1.000000e-193, .off= -4.805180224387695640e-210 },
508		HP{.val=1.000000e-194, .off= -1.763433718315439838e-211 },
509		HP{.val=1.000000e-195, .off= -9.367799983496079132e-212 },
510		HP{.val=1.000000e-196, .off= -4.615071067758179837e-213 },
511		HP{.val=1.000000e-197, .off= 1.325840076914194777e-214 },
512		HP{.val=1.000000e-198, .off= 8.751979007754662425e-215 },
513		HP{.val=1.000000e-199, .off= 1.789973760091724198e-216 },
514		HP{.val=1.000000e-200, .off= 1.789973760091724077e-217 },
515		HP{.val=1.000000e-201, .off= 5.416018159916171171e-218 },
516		HP{.val=1.000000e-202, .off= -3.649092839644947067e-219 },
517		HP{.val=1.000000e-203, .off= -3.649092839644947067e-220 },
518		HP{.val=1.000000e-204, .off= -1.080338554413850956e-222 },
519		HP{.val=1.000000e-205, .off= -1.080338554413850841e-223 },
520		HP{.val=1.000000e-206, .off= -2.874486186850417807e-223 },
521		HP{.val=1.000000e-207, .off= 7.499710055933455072e-224 },
522		HP{.val=1.000000e-208, .off= -9.790617015372999087e-225 },
523		HP{.val=1.000000e-209, .off= -4.387389805589732612e-226 },
524		HP{.val=1.000000e-210, .off= -4.387389805589732612e-227 },
525		HP{.val=1.000000e-211, .off= -8.608661063232909897e-228 },
526		HP{.val=1.000000e-212, .off= 4.582811616902018972e-229 },
527		HP{.val=1.000000e-213, .off= 4.582811616902019155e-230 },
528		HP{.val=1.000000e-214, .off= 8.705146829444184930e-231 },
529		HP{.val=1.000000e-215, .off= -4.177150709750081830e-232 },
530		HP{.val=1.000000e-216, .off= -4.177150709750082366e-233 },
531		HP{.val=1.000000e-217, .off= -8.202868690748290237e-234 },
532		HP{.val=1.000000e-218, .off= -3.170721214500530119e-235 },
533		HP{.val=1.000000e-219, .off= -3.170721214500529857e-236 },
534		HP{.val=1.000000e-220, .off= 7.606440013180328441e-238 },
535		HP{.val=1.000000e-221, .off= -1.696459258568569049e-238 },
536		HP{.val=1.000000e-222, .off= -4.767838333426821244e-239 },
537		HP{.val=1.000000e-223, .off= 2.910609353718809138e-240 },
538		HP{.val=1.000000e-224, .off= -1.888420450747209784e-241 },
539		HP{.val=1.000000e-225, .off= 4.110366804835314035e-242 },
540		HP{.val=1.000000e-226, .off= 7.859608839574391006e-243 },
541		HP{.val=1.000000e-227, .off= 5.516332567862468419e-244 },
542		HP{.val=1.000000e-228, .off= -3.270953451057244613e-245 },
543		HP{.val=1.000000e-229, .off= -6.932322625607124670e-246 },
544		HP{.val=1.000000e-230, .off= -4.643966891513449762e-247 },
545		HP{.val=1.000000e-231, .off= 1.076922443720738305e-248 },
546		HP{.val=1.000000e-232, .off= -2.498633390800628939e-249 },
547		HP{.val=1.000000e-233, .off= 4.205533798926934891e-250 },
548		HP{.val=1.000000e-234, .off= 4.205533798926934891e-251 },
549		HP{.val=1.000000e-235, .off= 4.205533798926934697e-252 },
550		HP{.val=1.000000e-236, .off= -4.523850562697497656e-253 },
551		HP{.val=1.000000e-237, .off= 9.320146633177728298e-255 },
552		HP{.val=1.000000e-238, .off= 9.320146633177728062e-256 },
553		HP{.val=1.000000e-239, .off= -7.592774752331086440e-256 },
554		HP{.val=1.000000e-240, .off= 3.063212017229987840e-257 },
555		HP{.val=1.000000e-241, .off= 3.063212017229987562e-258 },
556		HP{.val=1.000000e-242, .off= 3.063212017229987562e-259 },
557		HP{.val=1.000000e-243, .off= 4.616527473176159842e-261 },
558		HP{.val=1.000000e-244, .off= 6.965550922098544975e-261 },
559		HP{.val=1.000000e-245, .off= 6.965550922098544749e-262 },
560		HP{.val=1.000000e-246, .off= 4.424965697574744679e-263 },
561		HP{.val=1.000000e-247, .off= -1.926497363734756420e-264 },
562		HP{.val=1.000000e-248, .off= 2.043167049583681740e-265 },
563		HP{.val=1.000000e-249, .off= -5.399953725388390154e-266 },
564		HP{.val=1.000000e-250, .off= -5.399953725388389982e-267 },
565		HP{.val=1.000000e-251, .off= -1.523328321757102663e-268 },
566		HP{.val=1.000000e-252, .off= 5.745344310051561161e-269 },
567		HP{.val=1.000000e-253, .off= -6.369110076296211879e-270 },
568		HP{.val=1.000000e-254, .off= 8.773957906638504842e-271 },
569		HP{.val=1.000000e-255, .off= -6.904595826956931908e-273 },
570		HP{.val=1.000000e-256, .off= 2.267170882721243669e-273 },
571		HP{.val=1.000000e-257, .off= 2.267170882721243669e-274 },
572		HP{.val=1.000000e-258, .off= 4.577819683828225398e-275 },
573		HP{.val=1.000000e-259, .off= -6.975424321706684210e-276 },
574		HP{.val=1.000000e-260, .off= 3.855741933482293648e-277 },
575		HP{.val=1.000000e-261, .off= 1.599248963651256552e-278 },
576		HP{.val=1.000000e-262, .off= -1.221367248637539543e-279 },
577		HP{.val=1.000000e-263, .off= -1.221367248637539494e-280 },
578		HP{.val=1.000000e-264, .off= -1.221367248637539647e-281 },
579		HP{.val=1.000000e-265, .off= 1.533140771175737943e-282 },
580		HP{.val=1.000000e-266, .off= 1.533140771175737895e-283 },
581		HP{.val=1.000000e-267, .off= 1.533140771175738074e-284 },
582		HP{.val=1.000000e-268, .off= 4.223090009274641634e-285 },
583		HP{.val=1.000000e-269, .off= 4.223090009274641634e-286 },
584		HP{.val=1.000000e-270, .off= -4.183001359784432924e-287 },
585		HP{.val=1.000000e-271, .off= 3.697709298708449474e-288 },
586		HP{.val=1.000000e-272, .off= 6.981338739747150474e-289 },
587		HP{.val=1.000000e-273, .off= -9.436808465446354751e-290 },
588		HP{.val=1.000000e-274, .off= 3.389869038611071740e-291 },
589		HP{.val=1.000000e-275, .off= 6.596538414625427829e-292 },
590		HP{.val=1.000000e-276, .off= -9.436808465446354618e-293 },
591		HP{.val=1.000000e-277, .off= 3.089243784609725523e-294 },
592		HP{.val=1.000000e-278, .off= 6.220756847123745836e-295 },
593		HP{.val=1.000000e-279, .off= -5.522417137303829470e-296 },
594		HP{.val=1.000000e-280, .off= 4.263561183052483059e-297 },
595		HP{.val=1.000000e-281, .off= -1.852675267170212272e-298 },
596		HP{.val=1.000000e-282, .off= -1.852675267170212378e-299 },
597		HP{.val=1.000000e-283, .off= 5.314789322934508480e-300 },
598		HP{.val=1.000000e-284, .off= -3.644541414696392675e-301 },
599		HP{.val=1.000000e-285, .off= -7.377595888709267777e-302 },
600		HP{.val=1.000000e-286, .off= -5.044436842451220838e-303 },
601		HP{.val=1.000000e-287, .off= -2.127988034628661760e-304 },
602		HP{.val=1.000000e-288, .off= -5.773549044406860911e-305 },
603		HP{.val=1.000000e-289, .off= -1.216597782184112068e-306 },
604		HP{.val=1.000000e-290, .off= -6.912786859962547924e-307 },
605		HP{.val=1.000000e-291, .off= 3.767567660872018813e-308 },
	6	HP{ .val = 1.000000e+308, .off = -1.097906362944045488e+291 },
	7	HP{ .val = 1.000000e+307, .off = 1.396894023974354241e+290 },
	8	HP{ .val = 1.000000e+306, .off = -1.721606459673645508e+289 },
	9	HP{ .val = 1.000000e+305, .off = 6.074644749446353973e+288 },
	10	HP{ .val = 1.000000e+304, .off = 6.074644749446353567e+287 },
	11	HP{ .val = 1.000000e+303, .off = -1.617650767864564452e+284 },
	12	HP{ .val = 1.000000e+302, .off = -7.629703079084895055e+285 },
	13	HP{ .val = 1.000000e+301, .off = -5.250476025520442286e+284 },
	14	HP{ .val = 1.000000e+300, .off = -5.250476025520441956e+283 },
	15	HP{ .val = 1.000000e+299, .off = -5.250476025520441750e+282 },
	16	HP{ .val = 1.000000e+298, .off = 4.043379652465702264e+281 },
	17	HP{ .val = 1.000000e+297, .off = -1.765280146275637946e+280 },
	18	HP{ .val = 1.000000e+296, .off = 1.865132227937699609e+279 },
	19	HP{ .val = 1.000000e+295, .off = 1.865132227937699609e+278 },
	20	HP{ .val = 1.000000e+294, .off = -6.643646774124810287e+277 },
	21	HP{ .val = 1.000000e+293, .off = 7.537651562646039934e+276 },
	22	HP{ .val = 1.000000e+292, .off = -1.325659897835741608e+275 },
	23	HP{ .val = 1.000000e+291, .off = 4.213909764965371606e+274 },
	24	HP{ .val = 1.000000e+290, .off = -6.172783352786715670e+273 },
	25	HP{ .val = 1.000000e+289, .off = -6.172783352786715670e+272 },
	26	HP{ .val = 1.000000e+288, .off = -7.630473539575035471e+270 },
	27	HP{ .val = 1.000000e+287, .off = -7.525217352494018700e+270 },
	28	HP{ .val = 1.000000e+286, .off = -3.298861103408696612e+269 },
	29	HP{ .val = 1.000000e+285, .off = 1.984084207947955778e+268 },
	30	HP{ .val = 1.000000e+284, .off = -7.921438250845767591e+267 },
	31	HP{ .val = 1.000000e+283, .off = 4.460464822646386735e+266 },
	32	HP{ .val = 1.000000e+282, .off = -3.278224598286209647e+265 },
	33	HP{ .val = 1.000000e+281, .off = -3.278224598286209737e+264 },
	34	HP{ .val = 1.000000e+280, .off = -3.278224598286209961e+263 },
	35	HP{ .val = 1.000000e+279, .off = -5.797329227496039232e+262 },
	36	HP{ .val = 1.000000e+278, .off = 3.649313132040821498e+261 },
	37	HP{ .val = 1.000000e+277, .off = -2.867878510995372374e+259 },
	38	HP{ .val = 1.000000e+276, .off = -5.206914080024985409e+259 },
	39	HP{ .val = 1.000000e+275, .off = 4.018322599210230404e+258 },
	40	HP{ .val = 1.000000e+274, .off = 7.862171215558236495e+257 },
	41	HP{ .val = 1.000000e+273, .off = 5.459765830340732821e+256 },
	42	HP{ .val = 1.000000e+272, .off = -6.552261095746788047e+255 },
	43	HP{ .val = 1.000000e+271, .off = 4.709014147460262298e+254 },
	44	HP{ .val = 1.000000e+270, .off = -4.675381888545612729e+253 },
	45	HP{ .val = 1.000000e+269, .off = -4.675381888545612892e+252 },
	46	HP{ .val = 1.000000e+268, .off = 2.656177514583977380e+251 },
	47	HP{ .val = 1.000000e+267, .off = 2.656177514583977190e+250 },
	48	HP{ .val = 1.000000e+266, .off = -3.071603269111014892e+249 },
	49	HP{ .val = 1.000000e+265, .off = -6.651466258920385440e+248 },
	50	HP{ .val = 1.000000e+264, .off = -4.414051890289528972e+247 },
	51	HP{ .val = 1.000000e+263, .off = -1.617283929500958387e+246 },
	52	HP{ .val = 1.000000e+262, .off = -1.617283929500958241e+245 },
	53	HP{ .val = 1.000000e+261, .off = 7.122615947963323868e+244 },
	54	HP{ .val = 1.000000e+260, .off = -6.533477610574617382e+243 },
	55	HP{ .val = 1.000000e+259, .off = 7.122615947963323982e+242 },
	56	HP{ .val = 1.000000e+258, .off = -5.679971763165996225e+241 },
	57	HP{ .val = 1.000000e+257, .off = -3.012765990014054219e+240 },
	58	HP{ .val = 1.000000e+256, .off = -3.012765990014054219e+239 },
	59	HP{ .val = 1.000000e+255, .off = 1.154743030535854616e+238 },
	60	HP{ .val = 1.000000e+254, .off = 6.364129306223240767e+237 },
	61	HP{ .val = 1.000000e+253, .off = 6.364129306223241129e+236 },
	62	HP{ .val = 1.000000e+252, .off = -9.915202805299840595e+235 },
	63	HP{ .val = 1.000000e+251, .off = -4.827911520448877980e+234 },
	64	HP{ .val = 1.000000e+250, .off = 7.890316691678530146e+233 },
	65	HP{ .val = 1.000000e+249, .off = 7.890316691678529484e+232 },
	66	HP{ .val = 1.000000e+248, .off = -4.529828046727141859e+231 },
	67	HP{ .val = 1.000000e+247, .off = 4.785280507077111924e+230 },
	68	HP{ .val = 1.000000e+246, .off = -6.858605185178205305e+229 },
	69	HP{ .val = 1.000000e+245, .off = -4.432795665958347728e+228 },
	70	HP{ .val = 1.000000e+244, .off = -7.465057564983169531e+227 },
	71	HP{ .val = 1.000000e+243, .off = -7.465057564983169741e+226 },
	72	HP{ .val = 1.000000e+242, .off = -5.096102956370027445e+225 },
	73	HP{ .val = 1.000000e+241, .off = -5.096102956370026952e+224 },
	74	HP{ .val = 1.000000e+240, .off = -1.394611380411992474e+223 },
	75	HP{ .val = 1.000000e+239, .off = 9.188208545617793960e+221 },
	76	HP{ .val = 1.000000e+238, .off = -4.864759732872650359e+221 },
	77	HP{ .val = 1.000000e+237, .off = 5.979453868566904629e+220 },
	78	HP{ .val = 1.000000e+236, .off = -5.316601966265964857e+219 },
	79	HP{ .val = 1.000000e+235, .off = -5.316601966265964701e+218 },
	80	HP{ .val = 1.000000e+234, .off = -1.786584517880693123e+217 },
	81	HP{ .val = 1.000000e+233, .off = 2.625937292600896716e+216 },
	82	HP{ .val = 1.000000e+232, .off = -5.647541102052084079e+215 },
	83	HP{ .val = 1.000000e+231, .off = -5.647541102052083888e+214 },
	84	HP{ .val = 1.000000e+230, .off = -9.956644432600511943e+213 },
	85	HP{ .val = 1.000000e+229, .off = 8.161138937705571862e+211 },
	86	HP{ .val = 1.000000e+228, .off = 7.549087847752475275e+211 },
	87	HP{ .val = 1.000000e+227, .off = -9.283347037202319948e+210 },
	88	HP{ .val = 1.000000e+226, .off = 3.866992716668613820e+209 },
	89	HP{ .val = 1.000000e+225, .off = 7.154577655136347262e+208 },
	90	HP{ .val = 1.000000e+224, .off = 3.045096482051680688e+207 },
	91	HP{ .val = 1.000000e+223, .off = -4.660180717482069567e+206 },
	92	HP{ .val = 1.000000e+222, .off = -4.660180717482070101e+205 },
	93	HP{ .val = 1.000000e+221, .off = -4.660180717482069544e+204 },
	94	HP{ .val = 1.000000e+220, .off = 3.562757926310489022e+202 },
	95	HP{ .val = 1.000000e+219, .off = 3.491561111451748149e+202 },
	96	HP{ .val = 1.000000e+218, .off = -8.265758834125874135e+201 },
	97	HP{ .val = 1.000000e+217, .off = 3.981449442517482365e+200 },
	98	HP{ .val = 1.000000e+216, .off = -2.142154695804195936e+199 },
	99	HP{ .val = 1.000000e+215, .off = 9.339603063548950188e+198 },
	100	HP{ .val = 1.000000e+214, .off = 4.555537330485139746e+197 },
	101	HP{ .val = 1.000000e+213, .off = 1.565496247320257804e+196 },
	102	HP{ .val = 1.000000e+212, .off = 9.040598955232462036e+195 },
	103	HP{ .val = 1.000000e+211, .off = 4.368659762787334780e+194 },
	104	HP{ .val = 1.000000e+210, .off = 7.288621758065539072e+193 },
	105	HP{ .val = 1.000000e+209, .off = -7.311188218325485628e+192 },
	106	HP{ .val = 1.000000e+208, .off = 1.813693016918905189e+191 },
	107	HP{ .val = 1.000000e+207, .off = -3.889357755108838992e+190 },
	108	HP{ .val = 1.000000e+206, .off = -3.889357755108838992e+189 },
	109	HP{ .val = 1.000000e+205, .off = -1.661603547285501360e+188 },
	110	HP{ .val = 1.000000e+204, .off = 1.123089212493670643e+187 },
	111	HP{ .val = 1.000000e+203, .off = 1.123089212493670643e+186 },
	112	HP{ .val = 1.000000e+202, .off = 9.825254086803583029e+185 },
	113	HP{ .val = 1.000000e+201, .off = -3.771878529305654999e+184 },
	114	HP{ .val = 1.000000e+200, .off = 3.026687778748963675e+183 },
	115	HP{ .val = 1.000000e+199, .off = -9.720624048853446693e+182 },
	116	HP{ .val = 1.000000e+198, .off = -1.753554156601940139e+181 },
	117	HP{ .val = 1.000000e+197, .off = 4.885670753607648963e+180 },
	118	HP{ .val = 1.000000e+196, .off = 4.885670753607648963e+179 },
	119	HP{ .val = 1.000000e+195, .off = 2.292223523057028076e+178 },
	120	HP{ .val = 1.000000e+194, .off = 5.534032561245303825e+177 },
	121	HP{ .val = 1.000000e+193, .off = -6.622751331960730683e+176 },
	122	HP{ .val = 1.000000e+192, .off = -4.090088020876139692e+175 },
	123	HP{ .val = 1.000000e+191, .off = -7.255917159731877552e+174 },
	124	HP{ .val = 1.000000e+190, .off = -7.255917159731877992e+173 },
	125	HP{ .val = 1.000000e+189, .off = -2.309309130269787104e+172 },
	126	HP{ .val = 1.000000e+188, .off = -2.309309130269787019e+171 },
	127	HP{ .val = 1.000000e+187, .off = 9.284303438781988230e+170 },
	128	HP{ .val = 1.000000e+186, .off = 2.038295583124628364e+169 },
	129	HP{ .val = 1.000000e+185, .off = 2.038295583124628532e+168 },
	130	HP{ .val = 1.000000e+184, .off = -1.735666841696912925e+167 },
	131	HP{ .val = 1.000000e+183, .off = 5.340512704843477241e+166 },
	132	HP{ .val = 1.000000e+182, .off = -6.453119872723839321e+165 },
	133	HP{ .val = 1.000000e+181, .off = 8.288920849235306587e+164 },
	134	HP{ .val = 1.000000e+180, .off = -9.248546019891598293e+162 },
	135	HP{ .val = 1.000000e+179, .off = 1.954450226518486016e+162 },
	136	HP{ .val = 1.000000e+178, .off = -5.243811844750628197e+161 },
	137	HP{ .val = 1.000000e+177, .off = -7.448980502074320639e+159 },
	138	HP{ .val = 1.000000e+176, .off = -7.448980502074319858e+158 },
	139	HP{ .val = 1.000000e+175, .off = 6.284654753766312753e+158 },
	140	HP{ .val = 1.000000e+174, .off = -6.895756753684458388e+157 },
	141	HP{ .val = 1.000000e+173, .off = -1.403918625579970616e+156 },
	142	HP{ .val = 1.000000e+172, .off = -8.268716285710580522e+155 },
	143	HP{ .val = 1.000000e+171, .off = 4.602779327034313170e+154 },
	144	HP{ .val = 1.000000e+170, .off = -3.441905430931244940e+153 },
	145	HP{ .val = 1.000000e+169, .off = 6.613950516525702884e+152 },
	146	HP{ .val = 1.000000e+168, .off = 6.613950516525702652e+151 },
	147	HP{ .val = 1.000000e+167, .off = -3.860899428741951187e+150 },
	148	HP{ .val = 1.000000e+166, .off = 5.959272394946474605e+149 },
	149	HP{ .val = 1.000000e+165, .off = 1.005101065481665103e+149 },
	150	HP{ .val = 1.000000e+164, .off = -1.783349948587918355e+146 },
	151	HP{ .val = 1.000000e+163, .off = 6.215006036188360099e+146 },
	152	HP{ .val = 1.000000e+162, .off = 6.215006036188360099e+145 },
	153	HP{ .val = 1.000000e+161, .off = -3.774589324822814903e+144 },
	154	HP{ .val = 1.000000e+160, .off = -6.528407745068226929e+142 },
	155	HP{ .val = 1.000000e+159, .off = 7.151530601283157561e+142 },
	156	HP{ .val = 1.000000e+158, .off = 4.712664546348788765e+141 },
	157	HP{ .val = 1.000000e+157, .off = 1.664081977680827856e+140 },
	158	HP{ .val = 1.000000e+156, .off = 1.664081977680827750e+139 },
	159	HP{ .val = 1.000000e+155, .off = -7.176231540910168265e+137 },
	160	HP{ .val = 1.000000e+154, .off = -3.694754568805822650e+137 },
	161	HP{ .val = 1.000000e+153, .off = 2.665969958768462622e+134 },
	162	HP{ .val = 1.000000e+152, .off = -4.625108135904199522e+135 },
	163	HP{ .val = 1.000000e+151, .off = -1.717753238721771919e+134 },
	164	HP{ .val = 1.000000e+150, .off = 1.916440382756262433e+133 },
	165	HP{ .val = 1.000000e+149, .off = -4.897672657515052040e+132 },
	166	HP{ .val = 1.000000e+148, .off = -4.897672657515052198e+131 },
	167	HP{ .val = 1.000000e+147, .off = 2.200361759434233991e+130 },
	168	HP{ .val = 1.000000e+146, .off = 6.636633270027537273e+129 },
	169	HP{ .val = 1.000000e+145, .off = 1.091293881785907977e+128 },
	170	HP{ .val = 1.000000e+144, .off = -2.374543235865110597e+127 },
	171	HP{ .val = 1.000000e+143, .off = -2.374543235865110537e+126 },
	172	HP{ .val = 1.000000e+142, .off = -5.082228484029969099e+125 },
	173	HP{ .val = 1.000000e+141, .off = -1.697621923823895943e+124 },
	174	HP{ .val = 1.000000e+140, .off = -5.928380124081487212e+123 },
	175	HP{ .val = 1.000000e+139, .off = -3.284156248920492522e+122 },
	176	HP{ .val = 1.000000e+138, .off = -3.284156248920492706e+121 },
	177	HP{ .val = 1.000000e+137, .off = -3.284156248920492476e+120 },
	178	HP{ .val = 1.000000e+136, .off = -5.866406127007401066e+119 },
	179	HP{ .val = 1.000000e+135, .off = 3.817030915818506056e+118 },
	180	HP{ .val = 1.000000e+134, .off = 7.851796350329300951e+117 },
	181	HP{ .val = 1.000000e+133, .off = -2.235117235947686077e+116 },
	182	HP{ .val = 1.000000e+132, .off = 9.170432597638723691e+114 },
	183	HP{ .val = 1.000000e+131, .off = 8.797444499042767883e+114 },
	184	HP{ .val = 1.000000e+130, .off = -5.978307824605161274e+113 },
	185	HP{ .val = 1.000000e+129, .off = 1.782556435814758516e+111 },
	186	HP{ .val = 1.000000e+128, .off = -7.517448691651820362e+111 },
	187	HP{ .val = 1.000000e+127, .off = 4.507089332150205498e+110 },
	188	HP{ .val = 1.000000e+126, .off = 7.513223838100711695e+109 },
	189	HP{ .val = 1.000000e+125, .off = 7.513223838100712113e+108 },
	190	HP{ .val = 1.000000e+124, .off = 5.164681255326878494e+107 },
	191	HP{ .val = 1.000000e+123, .off = 2.229003026859587122e+106 },
	192	HP{ .val = 1.000000e+122, .off = -1.440594758724527399e+105 },
	193	HP{ .val = 1.000000e+121, .off = -3.734093374714598783e+104 },
	194	HP{ .val = 1.000000e+120, .off = 1.999653165260579757e+103 },
	195	HP{ .val = 1.000000e+119, .off = 5.583244752745066693e+102 },
	196	HP{ .val = 1.000000e+118, .off = 3.343500010567262234e+101 },
	197	HP{ .val = 1.000000e+117, .off = -5.055542772599503556e+100 },
	198	HP{ .val = 1.000000e+116, .off = -1.555941612946684331e+99 },
	199	HP{ .val = 1.000000e+115, .off = -1.555941612946684331e+98 },
	200	HP{ .val = 1.000000e+114, .off = -1.555941612946684293e+97 },
	201	HP{ .val = 1.000000e+113, .off = -1.555941612946684246e+96 },
	202	HP{ .val = 1.000000e+112, .off = 6.988006530736955847e+95 },
	203	HP{ .val = 1.000000e+111, .off = 4.318022735835818244e+94 },
	204	HP{ .val = 1.000000e+110, .off = -2.356936751417025578e+93 },
	205	HP{ .val = 1.000000e+109, .off = 1.814912928116001926e+92 },
	206	HP{ .val = 1.000000e+108, .off = -3.399899171300282744e+91 },
	207	HP{ .val = 1.000000e+107, .off = 3.118615952970072913e+90 },
	208	HP{ .val = 1.000000e+106, .off = -9.103599905036843605e+89 },
	209	HP{ .val = 1.000000e+105, .off = 6.174169917471802325e+88 },
	210	HP{ .val = 1.000000e+104, .off = -1.915675085734668657e+86 },
	211	HP{ .val = 1.000000e+103, .off = -1.915675085734668864e+85 },
	212	HP{ .val = 1.000000e+102, .off = 2.295048673475466221e+85 },
	213	HP{ .val = 1.000000e+101, .off = 2.295048673475466135e+84 },
	214	HP{ .val = 1.000000e+100, .off = -1.590289110975991792e+83 },
	215	HP{ .val = 1.000000e+99, .off = 3.266383119588331155e+82 },
	216	HP{ .val = 1.000000e+98, .off = 2.309629754856292029e+80 },
	217	HP{ .val = 1.000000e+97, .off = -7.357587384771124533e+80 },
	218	HP{ .val = 1.000000e+96, .off = -4.986165397190889509e+79 },
	219	HP{ .val = 1.000000e+95, .off = -2.021887912715594741e+78 },
	220	HP{ .val = 1.000000e+94, .off = -2.021887912715594638e+77 },
	221	HP{ .val = 1.000000e+93, .off = -4.337729697461918675e+76 },
	222	HP{ .val = 1.000000e+92, .off = -4.337729697461918997e+75 },
	223	HP{ .val = 1.000000e+91, .off = -7.956232486128049702e+74 },
	224	HP{ .val = 1.000000e+90, .off = 3.351588728453609882e+73 },
	225	HP{ .val = 1.000000e+89, .off = 5.246334248081951113e+71 },
	226	HP{ .val = 1.000000e+88, .off = 4.058327554364963672e+71 },
	227	HP{ .val = 1.000000e+87, .off = 4.058327554364963918e+70 },
	228	HP{ .val = 1.000000e+86, .off = -1.463069523067487266e+69 },
	229	HP{ .val = 1.000000e+85, .off = -1.463069523067487314e+68 },
	230	HP{ .val = 1.000000e+84, .off = -5.776660989811589441e+67 },
	231	HP{ .val = 1.000000e+83, .off = -3.080666323096525761e+66 },
	232	HP{ .val = 1.000000e+82, .off = 3.659320343691134468e+65 },
	233	HP{ .val = 1.000000e+81, .off = 7.871812010433421235e+64 },
	234	HP{ .val = 1.000000e+80, .off = -2.660986470836727449e+61 },
	235	HP{ .val = 1.000000e+79, .off = 3.264399249934044627e+62 },
	236	HP{ .val = 1.000000e+78, .off = -8.493621433689703070e+60 },
	237	HP{ .val = 1.000000e+77, .off = 1.721738727445414063e+60 },
	238	HP{ .val = 1.000000e+76, .off = -4.706013449590547218e+59 },
	239	HP{ .val = 1.000000e+75, .off = 7.346021882351880518e+58 },
	240	HP{ .val = 1.000000e+74, .off = 4.835181188197207515e+57 },
	241	HP{ .val = 1.000000e+73, .off = 1.696630320503867482e+56 },
	242	HP{ .val = 1.000000e+72, .off = 5.619818905120542959e+55 },
	243	HP{ .val = 1.000000e+71, .off = -4.188152556421145598e+54 },
	244	HP{ .val = 1.000000e+70, .off = -7.253143638152923145e+53 },
	245	HP{ .val = 1.000000e+69, .off = -7.253143638152923145e+52 },
	246	HP{ .val = 1.000000e+68, .off = 4.719477774861832896e+51 },
	247	HP{ .val = 1.000000e+67, .off = 1.726322421608144052e+50 },
	248	HP{ .val = 1.000000e+66, .off = 5.467766613175255107e+49 },
	249	HP{ .val = 1.000000e+65, .off = 7.909613737163661911e+47 },
	250	HP{ .val = 1.000000e+64, .off = -2.132041900945439564e+47 },
	251	HP{ .val = 1.000000e+63, .off = -5.785795994272697265e+46 },
	252	HP{ .val = 1.000000e+62, .off = -3.502199685943161329e+45 },
	253	HP{ .val = 1.000000e+61, .off = 5.061286470292598274e+44 },
	254	HP{ .val = 1.000000e+60, .off = 5.061286470292598472e+43 },
	255	HP{ .val = 1.000000e+59, .off = 2.831211950439536034e+42 },
	256	HP{ .val = 1.000000e+58, .off = 5.618805100255863927e+41 },
	257	HP{ .val = 1.000000e+57, .off = -4.834669211555366251e+40 },
	258	HP{ .val = 1.000000e+56, .off = -9.190283508143378583e+39 },
	259	HP{ .val = 1.000000e+55, .off = -1.023506702040855158e+38 },
	260	HP{ .val = 1.000000e+54, .off = -7.829154040459624616e+37 },
	261	HP{ .val = 1.000000e+53, .off = 6.779051325638372659e+35 },
	262	HP{ .val = 1.000000e+52, .off = 6.779051325638372290e+34 },
	263	HP{ .val = 1.000000e+51, .off = 6.779051325638371598e+33 },
	264	HP{ .val = 1.000000e+50, .off = -7.629769841091887392e+33 },
	265	HP{ .val = 1.000000e+49, .off = 5.350972305245182400e+32 },
	266	HP{ .val = 1.000000e+48, .off = -4.384584304507619764e+31 },
	267	HP{ .val = 1.000000e+47, .off = -4.384584304507619876e+30 },
	268	HP{ .val = 1.000000e+46, .off = 6.860180964052978705e+28 },
	269	HP{ .val = 1.000000e+45, .off = 7.024271097546444878e+28 },
	270	HP{ .val = 1.000000e+44, .off = -8.821361405306422641e+27 },
	271	HP{ .val = 1.000000e+43, .off = -1.393721169594140991e+26 },
	272	HP{ .val = 1.000000e+42, .off = -4.488571267807591679e+25 },
	273	HP{ .val = 1.000000e+41, .off = -6.200086450407783195e+23 },
	274	HP{ .val = 1.000000e+40, .off = -3.037860284270036669e+23 },
	275	HP{ .val = 1.000000e+39, .off = 6.029083362839682141e+22 },
	276	HP{ .val = 1.000000e+38, .off = 2.251190176543965970e+21 },
	277	HP{ .val = 1.000000e+37, .off = 4.612373417978788577e+20 },
	278	HP{ .val = 1.000000e+36, .off = -4.242063737401796198e+19 },
	279	HP{ .val = 1.000000e+35, .off = 3.136633892082024448e+18 },
	280	HP{ .val = 1.000000e+34, .off = 5.442476901295718400e+17 },
	281	HP{ .val = 1.000000e+33, .off = 5.442476901295718400e+16 },
	282	HP{ .val = 1.000000e+32, .off = -5.366162204393472000e+15 },
	283	HP{ .val = 1.000000e+31, .off = 3.641037050347520000e+14 },
	284	HP{ .val = 1.000000e+30, .off = -1.988462483865600000e+13 },
	285	HP{ .val = 1.000000e+29, .off = 8.566849142784000000e+12 },
	286	HP{ .val = 1.000000e+28, .off = 4.168802631680000000e+11 },
	287	HP{ .val = 1.000000e+27, .off = -1.328755507200000000e+10 },
	288	HP{ .val = 1.000000e+26, .off = -4.764729344000000000e+09 },
	289	HP{ .val = 1.000000e+25, .off = -9.059696640000000000e+08 },
	290	HP{ .val = 1.000000e+24, .off = 1.677721600000000000e+07 },
	291	HP{ .val = 1.000000e+23, .off = 8.388608000000000000e+06 },
	292	HP{ .val = 1.000000e+22, .off = 0.000000000000000000e+00 },
	293	HP{ .val = 1.000000e+21, .off = 0.000000000000000000e+00 },
	294	HP{ .val = 1.000000e+20, .off = 0.000000000000000000e+00 },
	295	HP{ .val = 1.000000e+19, .off = 0.000000000000000000e+00 },
	296	HP{ .val = 1.000000e+18, .off = 0.000000000000000000e+00 },
	297	HP{ .val = 1.000000e+17, .off = 0.000000000000000000e+00 },
	298	HP{ .val = 1.000000e+16, .off = 0.000000000000000000e+00 },
	299	HP{ .val = 1.000000e+15, .off = 0.000000000000000000e+00 },
	300	HP{ .val = 1.000000e+14, .off = 0.000000000000000000e+00 },
	301	HP{ .val = 1.000000e+13, .off = 0.000000000000000000e+00 },
	302	HP{ .val = 1.000000e+12, .off = 0.000000000000000000e+00 },
	303	HP{ .val = 1.000000e+11, .off = 0.000000000000000000e+00 },
	304	HP{ .val = 1.000000e+10, .off = 0.000000000000000000e+00 },
	305	HP{ .val = 1.000000e+09, .off = 0.000000000000000000e+00 },
	306	HP{ .val = 1.000000e+08, .off = 0.000000000000000000e+00 },
	307	HP{ .val = 1.000000e+07, .off = 0.000000000000000000e+00 },
	308	HP{ .val = 1.000000e+06, .off = 0.000000000000000000e+00 },
	309	HP{ .val = 1.000000e+05, .off = 0.000000000000000000e+00 },
	310	HP{ .val = 1.000000e+04, .off = 0.000000000000000000e+00 },
	311	HP{ .val = 1.000000e+03, .off = 0.000000000000000000e+00 },
	312	HP{ .val = 1.000000e+02, .off = 0.000000000000000000e+00 },
	313	HP{ .val = 1.000000e+01, .off = 0.000000000000000000e+00 },
	314	HP{ .val = 1.000000e+00, .off = 0.000000000000000000e+00 },
	315	HP{ .val = 1.000000e-01, .off = -5.551115123125783010e-18 },
	316	HP{ .val = 1.000000e-02, .off = -2.081668171172168436e-19 },
	317	HP{ .val = 1.000000e-03, .off = -2.081668171172168557e-20 },
	318	HP{ .val = 1.000000e-04, .off = -4.792173602385929943e-21 },
	319	HP{ .val = 1.000000e-05, .off = -8.180305391403130547e-22 },
	320	HP{ .val = 1.000000e-06, .off = 4.525188817411374069e-23 },
	321	HP{ .val = 1.000000e-07, .off = 4.525188817411373922e-24 },
	322	HP{ .val = 1.000000e-08, .off = -2.092256083012847109e-25 },
	323	HP{ .val = 1.000000e-09, .off = -6.228159145777985254e-26 },
	324	HP{ .val = 1.000000e-10, .off = -3.643219731549774344e-27 },
	325	HP{ .val = 1.000000e-11, .off = 6.050303071806019080e-28 },
	326	HP{ .val = 1.000000e-12, .off = 2.011335237074438524e-29 },
	327	HP{ .val = 1.000000e-13, .off = -3.037374556340037101e-30 },
	328	HP{ .val = 1.000000e-14, .off = 1.180690645440101289e-32 },
	329	HP{ .val = 1.000000e-15, .off = -7.770539987666107583e-32 },
	330	HP{ .val = 1.000000e-16, .off = 2.090221327596539779e-33 },
	331	HP{ .val = 1.000000e-17, .off = -7.154242405462192144e-34 },
	332	HP{ .val = 1.000000e-18, .off = -7.154242405462192572e-35 },
	333	HP{ .val = 1.000000e-19, .off = 2.475407316473986894e-36 },
	334	HP{ .val = 1.000000e-20, .off = 5.484672854579042914e-37 },
	335	HP{ .val = 1.000000e-21, .off = 9.246254777210362522e-38 },
	336	HP{ .val = 1.000000e-22, .off = -4.859677432657087182e-39 },
	337	HP{ .val = 1.000000e-23, .off = 3.956530198510069291e-40 },
	338	HP{ .val = 1.000000e-24, .off = 7.629950044829717753e-41 },
	339	HP{ .val = 1.000000e-25, .off = -3.849486974919183692e-42 },
	340	HP{ .val = 1.000000e-26, .off = -3.849486974919184170e-43 },
	341	HP{ .val = 1.000000e-27, .off = -3.849486974919184070e-44 },
	342	HP{ .val = 1.000000e-28, .off = 2.876745653839937870e-45 },
	343	HP{ .val = 1.000000e-29, .off = 5.679342582489572168e-46 },
	344	HP{ .val = 1.000000e-30, .off = -8.333642060758598930e-47 },
	345	HP{ .val = 1.000000e-31, .off = -8.333642060758597958e-48 },
	346	HP{ .val = 1.000000e-32, .off = -5.596730997624190224e-49 },
	347	HP{ .val = 1.000000e-33, .off = -5.596730997624190604e-50 },
	348	HP{ .val = 1.000000e-34, .off = 7.232539610818348498e-51 },
	349	HP{ .val = 1.000000e-35, .off = -7.857545194582380514e-53 },
	350	HP{ .val = 1.000000e-36, .off = 5.896157255772251528e-53 },
	351	HP{ .val = 1.000000e-37, .off = -6.632427322784915796e-54 },
	352	HP{ .val = 1.000000e-38, .off = 3.808059826012723592e-55 },
	353	HP{ .val = 1.000000e-39, .off = 7.070712060011985131e-56 },
	354	HP{ .val = 1.000000e-40, .off = 7.070712060011985584e-57 },
	355	HP{ .val = 1.000000e-41, .off = -5.761291134237854167e-59 },
	356	HP{ .val = 1.000000e-42, .off = -3.762312935688689794e-59 },
	357	HP{ .val = 1.000000e-43, .off = -7.745042713519821150e-60 },
	358	HP{ .val = 1.000000e-44, .off = 4.700987842202462817e-61 },
	359	HP{ .val = 1.000000e-45, .off = 1.589480203271891964e-62 },
	360	HP{ .val = 1.000000e-46, .off = -2.299904345391321765e-63 },
	361	HP{ .val = 1.000000e-47, .off = 2.561826340437695261e-64 },
	362	HP{ .val = 1.000000e-48, .off = 2.561826340437695345e-65 },
	363	HP{ .val = 1.000000e-49, .off = 6.360053438741614633e-66 },
	364	HP{ .val = 1.000000e-50, .off = -7.616223705782342295e-68 },
	365	HP{ .val = 1.000000e-51, .off = -7.616223705782343324e-69 },
	366	HP{ .val = 1.000000e-52, .off = -7.616223705782342295e-70 },
	367	HP{ .val = 1.000000e-53, .off = -3.079876214757872338e-70 },
	368	HP{ .val = 1.000000e-54, .off = -3.079876214757872821e-71 },
	369	HP{ .val = 1.000000e-55, .off = 5.423954167728123147e-73 },
	370	HP{ .val = 1.000000e-56, .off = -3.985444122640543680e-73 },
	371	HP{ .val = 1.000000e-57, .off = 4.504255013759498850e-74 },
	372	HP{ .val = 1.000000e-58, .off = -2.570494266573869991e-75 },
	373	HP{ .val = 1.000000e-59, .off = -2.570494266573869930e-76 },
	374	HP{ .val = 1.000000e-60, .off = 2.956653608686574324e-77 },
	375	HP{ .val = 1.000000e-61, .off = -3.952281235388981376e-78 },
	376	HP{ .val = 1.000000e-62, .off = -3.952281235388981376e-79 },
	377	HP{ .val = 1.000000e-63, .off = -6.651083908855995172e-80 },
	378	HP{ .val = 1.000000e-64, .off = 3.469426116645307030e-81 },
	379	HP{ .val = 1.000000e-65, .off = 7.686305293937516319e-82 },
	380	HP{ .val = 1.000000e-66, .off = 2.415206322322254927e-83 },
	381	HP{ .val = 1.000000e-67, .off = 5.709643179581793251e-84 },
	382	HP{ .val = 1.000000e-68, .off = -6.644495035141475923e-85 },
	383	HP{ .val = 1.000000e-69, .off = 3.650620143794581913e-86 },
	384	HP{ .val = 1.000000e-70, .off = 4.333966503770636492e-88 },
	385	HP{ .val = 1.000000e-71, .off = 8.476455383920859113e-88 },
	386	HP{ .val = 1.000000e-72, .off = 3.449543675455986564e-89 },
	387	HP{ .val = 1.000000e-73, .off = 3.077238576654418974e-91 },
	388	HP{ .val = 1.000000e-74, .off = 4.234998629903623140e-91 },
	389	HP{ .val = 1.000000e-75, .off = 4.234998629903623412e-92 },
	390	HP{ .val = 1.000000e-76, .off = 7.303182045714702338e-93 },
	391	HP{ .val = 1.000000e-77, .off = 7.303182045714701699e-94 },
	392	HP{ .val = 1.000000e-78, .off = 1.121271649074855759e-96 },
	393	HP{ .val = 1.000000e-79, .off = 1.121271649074855863e-97 },
	394	HP{ .val = 1.000000e-80, .off = 3.857468248661243988e-97 },
	395	HP{ .val = 1.000000e-81, .off = 3.857468248661244248e-98 },
	396	HP{ .val = 1.000000e-82, .off = 3.857468248661244410e-99 },
	397	HP{ .val = 1.000000e-83, .off = -3.457651055545315679e-100 },
	398	HP{ .val = 1.000000e-84, .off = -3.457651055545315933e-101 },
	399	HP{ .val = 1.000000e-85, .off = 2.257285900866059216e-102 },
	400	HP{ .val = 1.000000e-86, .off = -8.458220892405268345e-103 },
	401	HP{ .val = 1.000000e-87, .off = -1.761029146610688867e-104 },
	402	HP{ .val = 1.000000e-88, .off = 6.610460535632536565e-105 },
	403	HP{ .val = 1.000000e-89, .off = -3.853901567171494935e-106 },
	404	HP{ .val = 1.000000e-90, .off = 5.062493089968513723e-108 },
	405	HP{ .val = 1.000000e-91, .off = -2.218844988608365240e-108 },
	406	HP{ .val = 1.000000e-92, .off = 1.187522883398155383e-109 },
	407	HP{ .val = 1.000000e-93, .off = 9.703442563414457296e-110 },
	408	HP{ .val = 1.000000e-94, .off = 4.380992763404268896e-111 },
	409	HP{ .val = 1.000000e-95, .off = 1.054461638397900823e-112 },
	410	HP{ .val = 1.000000e-96, .off = 9.370789450913819736e-113 },
	411	HP{ .val = 1.000000e-97, .off = -3.623472756142303998e-114 },
	412	HP{ .val = 1.000000e-98, .off = 6.122223899149788839e-115 },
	413	HP{ .val = 1.000000e-99, .off = -1.999189980260288281e-116 },
	414	HP{ .val = 1.000000e-100, .off = -1.999189980260288281e-117 },
	415	HP{ .val = 1.000000e-101, .off = -5.171617276904849634e-118 },
	416	HP{ .val = 1.000000e-102, .off = 6.724985085512256320e-119 },
	417	HP{ .val = 1.000000e-103, .off = 4.246526260008692213e-120 },
	418	HP{ .val = 1.000000e-104, .off = 7.344599791888147003e-121 },
	419	HP{ .val = 1.000000e-105, .off = 3.472007877038828407e-122 },
	420	HP{ .val = 1.000000e-106, .off = 5.892377823819652194e-123 },
	421	HP{ .val = 1.000000e-107, .off = -1.585470431324073925e-125 },
	422	HP{ .val = 1.000000e-108, .off = -3.940375084977444795e-125 },
	423	HP{ .val = 1.000000e-109, .off = 7.869099673288519908e-127 },
	424	HP{ .val = 1.000000e-110, .off = -5.122196348054018581e-127 },
	425	HP{ .val = 1.000000e-111, .off = -8.815387795168313713e-128 },
	426	HP{ .val = 1.000000e-112, .off = 5.034080131510290214e-129 },
	427	HP{ .val = 1.000000e-113, .off = 2.148774313452247863e-130 },
	428	HP{ .val = 1.000000e-114, .off = -5.064490231692858416e-131 },
	429	HP{ .val = 1.000000e-115, .off = -5.064490231692858166e-132 },
	430	HP{ .val = 1.000000e-116, .off = 5.708726942017560559e-134 },
	431	HP{ .val = 1.000000e-117, .off = -2.951229134482377772e-134 },
	432	HP{ .val = 1.000000e-118, .off = 1.451398151372789513e-135 },
	433	HP{ .val = 1.000000e-119, .off = -1.300243902286690040e-136 },
	434	HP{ .val = 1.000000e-120, .off = 2.139308664787659449e-137 },
	435	HP{ .val = 1.000000e-121, .off = 2.139308664787659329e-138 },
	436	HP{ .val = 1.000000e-122, .off = -5.922142664292847471e-139 },
	437	HP{ .val = 1.000000e-123, .off = -5.922142664292846912e-140 },
	438	HP{ .val = 1.000000e-124, .off = 6.673875037395443799e-141 },
	439	HP{ .val = 1.000000e-125, .off = -1.198636026159737932e-142 },
	440	HP{ .val = 1.000000e-126, .off = 5.361789860136246995e-143 },
	441	HP{ .val = 1.000000e-127, .off = -2.838742497733733936e-144 },
	442	HP{ .val = 1.000000e-128, .off = -5.401408859568103261e-145 },
	443	HP{ .val = 1.000000e-129, .off = 7.411922949603743011e-146 },
	444	HP{ .val = 1.000000e-130, .off = -8.604741811861064385e-147 },
	445	HP{ .val = 1.000000e-131, .off = 1.405673664054439890e-148 },
	446	HP{ .val = 1.000000e-132, .off = 1.405673664054439933e-149 },
	447	HP{ .val = 1.000000e-133, .off = -6.414963426504548053e-150 },
	448	HP{ .val = 1.000000e-134, .off = -3.971014335704864578e-151 },
	449	HP{ .val = 1.000000e-135, .off = -3.971014335704864748e-152 },
	450	HP{ .val = 1.000000e-136, .off = -1.523438813303585576e-154 },
	451	HP{ .val = 1.000000e-137, .off = 2.234325152653707766e-154 },
	452	HP{ .val = 1.000000e-138, .off = -6.715683724786540160e-155 },
	453	HP{ .val = 1.000000e-139, .off = -2.986513359186437306e-156 },
	454	HP{ .val = 1.000000e-140, .off = 1.674949597813692102e-157 },
	455	HP{ .val = 1.000000e-141, .off = -4.151879098436469092e-158 },
	456	HP{ .val = 1.000000e-142, .off = -4.151879098436469295e-159 },
	457	HP{ .val = 1.000000e-143, .off = 4.952540739454407825e-160 },
	458	HP{ .val = 1.000000e-144, .off = 4.952540739454407667e-161 },
	459	HP{ .val = 1.000000e-145, .off = 8.508954738630531443e-162 },
	460	HP{ .val = 1.000000e-146, .off = -2.604839008794855481e-163 },
	461	HP{ .val = 1.000000e-147, .off = 2.952057864917838382e-164 },
	462	HP{ .val = 1.000000e-148, .off = 6.425118410988271757e-165 },
	463	HP{ .val = 1.000000e-149, .off = 2.083792728400229858e-166 },
	464	HP{ .val = 1.000000e-150, .off = -6.295358232172964237e-168 },
	465	HP{ .val = 1.000000e-151, .off = 6.153785555826519421e-168 },
	466	HP{ .val = 1.000000e-152, .off = -6.564942029880634994e-169 },
	467	HP{ .val = 1.000000e-153, .off = -3.915207116191644540e-170 },
	468	HP{ .val = 1.000000e-154, .off = 2.709130168030831503e-171 },
	469	HP{ .val = 1.000000e-155, .off = -1.431080634608215966e-172 },
	470	HP{ .val = 1.000000e-156, .off = -4.018712386257620994e-173 },
	471	HP{ .val = 1.000000e-157, .off = 5.684906682427646782e-174 },
	472	HP{ .val = 1.000000e-158, .off = -6.444617153428937489e-175 },
	473	HP{ .val = 1.000000e-159, .off = 1.136335243981427681e-176 },
	474	HP{ .val = 1.000000e-160, .off = 1.136335243981427725e-177 },
	475	HP{ .val = 1.000000e-161, .off = -2.812077463003137395e-178 },
	476	HP{ .val = 1.000000e-162, .off = 4.591196362592922204e-179 },
	477	HP{ .val = 1.000000e-163, .off = 7.675893789924613703e-180 },
	478	HP{ .val = 1.000000e-164, .off = 3.820022005759999543e-181 },
	479	HP{ .val = 1.000000e-165, .off = -9.998177244457686588e-183 },
	480	HP{ .val = 1.000000e-166, .off = -4.012217555824373639e-183 },
	481	HP{ .val = 1.000000e-167, .off = -2.467177666011174334e-185 },
	482	HP{ .val = 1.000000e-168, .off = -4.953592503130188139e-185 },
	483	HP{ .val = 1.000000e-169, .off = -2.011795792799518887e-186 },
	484	HP{ .val = 1.000000e-170, .off = 1.665450095113817423e-187 },
	485	HP{ .val = 1.000000e-171, .off = 1.665450095113817487e-188 },
	486	HP{ .val = 1.000000e-172, .off = -4.080246604750770577e-189 },
	487	HP{ .val = 1.000000e-173, .off = -4.080246604750770677e-190 },
	488	HP{ .val = 1.000000e-174, .off = 4.085789420184387951e-192 },
	489	HP{ .val = 1.000000e-175, .off = 4.085789420184388146e-193 },
	490	HP{ .val = 1.000000e-176, .off = 4.085789420184388146e-194 },
	491	HP{ .val = 1.000000e-177, .off = 4.792197640035244894e-194 },
	492	HP{ .val = 1.000000e-178, .off = 4.792197640035244742e-195 },
	493	HP{ .val = 1.000000e-179, .off = -2.057206575616014662e-196 },
	494	HP{ .val = 1.000000e-180, .off = -2.057206575616014662e-197 },
	495	HP{ .val = 1.000000e-181, .off = -4.732755097354788053e-198 },
	496	HP{ .val = 1.000000e-182, .off = -4.732755097354787867e-199 },
	497	HP{ .val = 1.000000e-183, .off = -5.522105321379546765e-201 },
	498	HP{ .val = 1.000000e-184, .off = -5.777891238658996019e-201 },
	499	HP{ .val = 1.000000e-185, .off = 7.542096444923057046e-203 },
	500	HP{ .val = 1.000000e-186, .off = 8.919335748431433483e-203 },
	501	HP{ .val = 1.000000e-187, .off = -1.287071881492476028e-204 },
	502	HP{ .val = 1.000000e-188, .off = 5.091932887209967018e-205 },
	503	HP{ .val = 1.000000e-189, .off = -6.868701054107114024e-206 },
	504	HP{ .val = 1.000000e-190, .off = -1.885103578558330118e-207 },
	505	HP{ .val = 1.000000e-191, .off = -1.885103578558330205e-208 },
	506	HP{ .val = 1.000000e-192, .off = -9.671974634103305058e-209 },
	507	HP{ .val = 1.000000e-193, .off = -4.805180224387695640e-210 },
	508	HP{ .val = 1.000000e-194, .off = -1.763433718315439838e-211 },
	509	HP{ .val = 1.000000e-195, .off = -9.367799983496079132e-212 },
	510	HP{ .val = 1.000000e-196, .off = -4.615071067758179837e-213 },
	511	HP{ .val = 1.000000e-197, .off = 1.325840076914194777e-214 },
	512	HP{ .val = 1.000000e-198, .off = 8.751979007754662425e-215 },
	513	HP{ .val = 1.000000e-199, .off = 1.789973760091724198e-216 },
	514	HP{ .val = 1.000000e-200, .off = 1.789973760091724077e-217 },
	515	HP{ .val = 1.000000e-201, .off = 5.416018159916171171e-218 },
	516	HP{ .val = 1.000000e-202, .off = -3.649092839644947067e-219 },
	517	HP{ .val = 1.000000e-203, .off = -3.649092839644947067e-220 },
	518	HP{ .val = 1.000000e-204, .off = -1.080338554413850956e-222 },
	519	HP{ .val = 1.000000e-205, .off = -1.080338554413850841e-223 },
	520	HP{ .val = 1.000000e-206, .off = -2.874486186850417807e-223 },
	521	HP{ .val = 1.000000e-207, .off = 7.499710055933455072e-224 },
	522	HP{ .val = 1.000000e-208, .off = -9.790617015372999087e-225 },
	523	HP{ .val = 1.000000e-209, .off = -4.387389805589732612e-226 },
	524	HP{ .val = 1.000000e-210, .off = -4.387389805589732612e-227 },
	525	HP{ .val = 1.000000e-211, .off = -8.608661063232909897e-228 },
	526	HP{ .val = 1.000000e-212, .off = 4.582811616902018972e-229 },
	527	HP{ .val = 1.000000e-213, .off = 4.582811616902019155e-230 },
	528	HP{ .val = 1.000000e-214, .off = 8.705146829444184930e-231 },
	529	HP{ .val = 1.000000e-215, .off = -4.177150709750081830e-232 },
	530	HP{ .val = 1.000000e-216, .off = -4.177150709750082366e-233 },
	531	HP{ .val = 1.000000e-217, .off = -8.202868690748290237e-234 },
	532	HP{ .val = 1.000000e-218, .off = -3.170721214500530119e-235 },
	533	HP{ .val = 1.000000e-219, .off = -3.170721214500529857e-236 },
	534	HP{ .val = 1.000000e-220, .off = 7.606440013180328441e-238 },
	535	HP{ .val = 1.000000e-221, .off = -1.696459258568569049e-238 },
	536	HP{ .val = 1.000000e-222, .off = -4.767838333426821244e-239 },
	537	HP{ .val = 1.000000e-223, .off = 2.910609353718809138e-240 },
	538	HP{ .val = 1.000000e-224, .off = -1.888420450747209784e-241 },
	539	HP{ .val = 1.000000e-225, .off = 4.110366804835314035e-242 },
	540	HP{ .val = 1.000000e-226, .off = 7.859608839574391006e-243 },
	541	HP{ .val = 1.000000e-227, .off = 5.516332567862468419e-244 },
	542	HP{ .val = 1.000000e-228, .off = -3.270953451057244613e-245 },
	543	HP{ .val = 1.000000e-229, .off = -6.932322625607124670e-246 },
	544	HP{ .val = 1.000000e-230, .off = -4.643966891513449762e-247 },
	545	HP{ .val = 1.000000e-231, .off = 1.076922443720738305e-248 },
	546	HP{ .val = 1.000000e-232, .off = -2.498633390800628939e-249 },
	547	HP{ .val = 1.000000e-233, .off = 4.205533798926934891e-250 },
	548	HP{ .val = 1.000000e-234, .off = 4.205533798926934891e-251 },
	549	HP{ .val = 1.000000e-235, .off = 4.205533798926934697e-252 },
	550	HP{ .val = 1.000000e-236, .off = -4.523850562697497656e-253 },
	551	HP{ .val = 1.000000e-237, .off = 9.320146633177728298e-255 },
	552	HP{ .val = 1.000000e-238, .off = 9.320146633177728062e-256 },
	553	HP{ .val = 1.000000e-239, .off = -7.592774752331086440e-256 },
	554	HP{ .val = 1.000000e-240, .off = 3.063212017229987840e-257 },
	555	HP{ .val = 1.000000e-241, .off = 3.063212017229987562e-258 },
	556	HP{ .val = 1.000000e-242, .off = 3.063212017229987562e-259 },
	557	HP{ .val = 1.000000e-243, .off = 4.616527473176159842e-261 },
	558	HP{ .val = 1.000000e-244, .off = 6.965550922098544975e-261 },
	559	HP{ .val = 1.000000e-245, .off = 6.965550922098544749e-262 },
	560	HP{ .val = 1.000000e-246, .off = 4.424965697574744679e-263 },
	561	HP{ .val = 1.000000e-247, .off = -1.926497363734756420e-264 },
	562	HP{ .val = 1.000000e-248, .off = 2.043167049583681740e-265 },
	563	HP{ .val = 1.000000e-249, .off = -5.399953725388390154e-266 },
	564	HP{ .val = 1.000000e-250, .off = -5.399953725388389982e-267 },
	565	HP{ .val = 1.000000e-251, .off = -1.523328321757102663e-268 },
	566	HP{ .val = 1.000000e-252, .off = 5.745344310051561161e-269 },
	567	HP{ .val = 1.000000e-253, .off = -6.369110076296211879e-270 },
	568	HP{ .val = 1.000000e-254, .off = 8.773957906638504842e-271 },
	569	HP{ .val = 1.000000e-255, .off = -6.904595826956931908e-273 },
	570	HP{ .val = 1.000000e-256, .off = 2.267170882721243669e-273 },
	571	HP{ .val = 1.000000e-257, .off = 2.267170882721243669e-274 },
	572	HP{ .val = 1.000000e-258, .off = 4.577819683828225398e-275 },
	573	HP{ .val = 1.000000e-259, .off = -6.975424321706684210e-276 },
	574	HP{ .val = 1.000000e-260, .off = 3.855741933482293648e-277 },
	575	HP{ .val = 1.000000e-261, .off = 1.599248963651256552e-278 },
	576	HP{ .val = 1.000000e-262, .off = -1.221367248637539543e-279 },
	577	HP{ .val = 1.000000e-263, .off = -1.221367248637539494e-280 },
	578	HP{ .val = 1.000000e-264, .off = -1.221367248637539647e-281 },
	579	HP{ .val = 1.000000e-265, .off = 1.533140771175737943e-282 },
	580	HP{ .val = 1.000000e-266, .off = 1.533140771175737895e-283 },
	581	HP{ .val = 1.000000e-267, .off = 1.533140771175738074e-284 },
	582	HP{ .val = 1.000000e-268, .off = 4.223090009274641634e-285 },
	583	HP{ .val = 1.000000e-269, .off = 4.223090009274641634e-286 },
	584	HP{ .val = 1.000000e-270, .off = -4.183001359784432924e-287 },
	585	HP{ .val = 1.000000e-271, .off = 3.697709298708449474e-288 },
	586	HP{ .val = 1.000000e-272, .off = 6.981338739747150474e-289 },
	587	HP{ .val = 1.000000e-273, .off = -9.436808465446354751e-290 },
	588	HP{ .val = 1.000000e-274, .off = 3.389869038611071740e-291 },
	589	HP{ .val = 1.000000e-275, .off = 6.596538414625427829e-292 },
	590	HP{ .val = 1.000000e-276, .off = -9.436808465446354618e-293 },
	591	HP{ .val = 1.000000e-277, .off = 3.089243784609725523e-294 },
	592	HP{ .val = 1.000000e-278, .off = 6.220756847123745836e-295 },
	593	HP{ .val = 1.000000e-279, .off = -5.522417137303829470e-296 },
	594	HP{ .val = 1.000000e-280, .off = 4.263561183052483059e-297 },
	595	HP{ .val = 1.000000e-281, .off = -1.852675267170212272e-298 },
	596	HP{ .val = 1.000000e-282, .off = -1.852675267170212378e-299 },
	597	HP{ .val = 1.000000e-283, .off = 5.314789322934508480e-300 },
	598	HP{ .val = 1.000000e-284, .off = -3.644541414696392675e-301 },
	599	HP{ .val = 1.000000e-285, .off = -7.377595888709267777e-302 },
	600	HP{ .val = 1.000000e-286, .off = -5.044436842451220838e-303 },
	601	HP{ .val = 1.000000e-287, .off = -2.127988034628661760e-304 },
	602	HP{ .val = 1.000000e-288, .off = -5.773549044406860911e-305 },
	603	HP{ .val = 1.000000e-289, .off = -1.216597782184112068e-306 },
	604	HP{ .val = 1.000000e-290, .off = -6.912786859962547924e-307 },
	605	HP{ .val = 1.000000e-291, .off = 3.767567660872018813e-308 },
606	606	};

std/fmt/index.zig+157-81

...	...	@@ -11,9 +11,7 @@ const max_int_digits = 65;
11	11	/// Renders fmt string with args, calling output with slices of bytes.
12	12	/// If `output` returns an error, the error is returned from `format` and
13	13	/// `output` is not called again.
14		pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void,
15		comptime fmt: []const u8, args: ...) Errors!void
16		{
	14	pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void, comptime fmt: []const u8, args: ...) Errors!void {
17	15	const State = enum {
18	16	Start,
19	17	OpenBrace,
...	...	@@ -27,6 +25,9 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
27	25	Character,
28	26	Buf,
29	27	BufWidth,
	28	Bytes,
	29	BytesBase,
	30	BytesWidth,
30	31	};
31	32
32	33	comptime var start_index = 0;
...	...	@@ -95,13 +96,18 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
95	96	'.' => {
96	97	state = State.Float;
97	98	},
	99	'B' => {
	100	width = 0;
	101	radix = 1000;
	102	state = State.Bytes;
	103	},
98	104	else => @compileError("Unknown format character: " ++ []u8{c}),
99	105	},
100	106	State.Buf => switch (c) {
101	107	'}' => {
102	108	return output(context, args[next_arg]);
103	109	},
104		'0' ... '9' => {
	110	'0'...'9' => {
105	111	width_start = i;
106	112	state = State.BufWidth;
107	113	},
...	...	@@ -121,7 +127,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
121	127	state = State.Start;
122	128	start_index = i + 1;
123	129	},
124		'0' ... '9' => {
	130	'0'...'9' => {
125	131	width_start = i;
126	132	state = State.IntegerWidth;
127	133	},
...	...	@@ -135,7 +141,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
135	141	state = State.Start;
136	142	start_index = i + 1;
137	143	},
138		'0' ... '9' => {},
	144	'0'...'9' => {},
139	145	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
140	146	},
141	147	State.FloatScientific => switch (c) {
...	...	@@ -145,7 +151,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
145	151	state = State.Start;
146	152	start_index = i + 1;
147	153	},
148		'0' ... '9' => {
	154	'0'...'9' => {
149	155	width_start = i;
150	156	state = State.FloatScientificWidth;
151	157	},
...	...	@@ -159,7 +165,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
159	165	state = State.Start;
160	166	start_index = i + 1;
161	167	},
162		'0' ... '9' => {},
	168	'0'...'9' => {},
163	169	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
164	170	},
165	171	State.Float => switch (c) {
...	...	@@ -169,7 +175,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
169	175	state = State.Start;
170	176	start_index = i + 1;
171	177	},
172		'0' ... '9' => {
	178	'0'...'9' => {
173	179	width_start = i;
174	180	state = State.FloatWidth;
175	181	},
...	...	@@ -183,7 +189,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
183	189	state = State.Start;
184	190	start_index = i + 1;
185	191	},
186		'0' ... '9' => {},
	192	'0'...'9' => {},
187	193	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
188	194	},
189	195	State.BufWidth => switch (c) {
...	...	@@ -194,7 +200,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
194	200	state = State.Start;
195	201	start_index = i + 1;
196	202	},
197		'0' ... '9' => {},
	203	'0'...'9' => {},
198	204	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
199	205	},
200	206	State.Character => switch (c) {
...	...	@@ -206,6 +212,47 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
206	212	},
207	213	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
208	214	},
	215	State.Bytes => switch (c) {
	216	'}' => {
	217	try formatBytes(args[next_arg], 0, radix, context, Errors, output);
	218	next_arg += 1;
	219	state = State.Start;
	220	start_index = i + 1;
	221	},
	222	'i' => {
	223	radix = 1024;
	224	state = State.BytesBase;
	225	},
	226	'0'...'9' => {
	227	width_start = i;
	228	state = State.BytesWidth;
	229	},
	230	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
	231	},
	232	State.BytesBase => switch (c) {
	233	'}' => {
	234	try formatBytes(args[next_arg], 0, radix, context, Errors, output);
	235	next_arg += 1;
	236	state = State.Start;
	237	start_index = i + 1;
	238	},
	239	'0'...'9' => {
	240	width_start = i;
	241	state = State.BytesWidth;
	242	},
	243	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
	244	},
	245	State.BytesWidth => switch (c) {
	246	'}' => {
	247	width = comptime (parseUnsigned(usize, fmt[width_start..i], 10) catch unreachable);
	248	try formatBytes(args[next_arg], width, radix, context, Errors, output);
	249	next_arg += 1;
	250	state = State.Start;
	251	start_index = i + 1;
	252	},
	253	'0'...'9' => {},
	254	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
	255	},
209	256	}
210	257	}
211	258	comptime {
...	...	@@ -221,7 +268,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
221	268	}
222	269	}
223	270
224		pub fn formatValue(value: var, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void {
	271	pub fn formatValue(value: var, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {
225	272	const T = @typeOf(value);
226	273	switch (@typeId(T)) {
227	274	builtin.TypeId.Int => {
...	...	@@ -256,7 +303,7 @@ pub fn formatValue(value: var, context: var, comptime Errors: type, output: fn(@
256	303	},
257	304	builtin.TypeId.Pointer => {
258	305	if (@typeId(T.Child) == builtin.TypeId.Array and T.Child.Child == u8) {
259		return output(context, (*value)[0..]);
	306	return output(context, (value.*)[0..]);
260	307	} else {
261	308	return format(context, Errors, output, "{}@{x}", @typeName(T.Child), @ptrToInt(value));
262	309	}
...	...	@@ -270,13 +317,11 @@ pub fn formatValue(value: var, context: var, comptime Errors: type, output: fn(@
270	317	}
271	318	}
272	319
273		pub fn formatAsciiChar(c: u8, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void {
	320	pub fn formatAsciiChar(c: u8, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {
274	321	return output(context, (&c)[0..1]);
275	322	}
276	323
277		pub fn formatBuf(buf: []const u8, width: usize,
278		context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void
279		{
	324	pub fn formatBuf(buf: []const u8, width: usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {
280	325	try output(context, buf);
281	326
282	327	var leftover_padding = if (width > buf.len) (width - buf.len) else return;
...	...	@@ -289,7 +334,7 @@ pub fn formatBuf(buf: []const u8, width: usize,
289	334	// Print a float in scientific notation to the specified precision. Null uses full precision.
290	335	// It should be the case that every full precision, printed value can be re-parsed back to the
291	336	// same type unambiguously.
292		pub fn formatFloatScientific(value: var, maybe_precision: ?usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void {
	337	pub fn formatFloatScientific(value: var, maybe_precision: ?usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {
293	338	var x = f64(value);
294	339
295	340	// Errol doesn't handle these special cases.
...	...	@@ -338,7 +383,7 @@ pub fn formatFloatScientific(value: var, maybe_precision: ?usize, context: var,
338	383	var printed: usize = 0;
339	384	if (float_decimal.digits.len > 1) {
340	385	const num_digits = math.min(float_decimal.digits.len, precision + 1);
341		try output(context, float_decimal.digits[1 .. num_digits]);
	386	try output(context, float_decimal.digits[1..num_digits]);
342	387	printed += num_digits - 1;
343	388	}
344	389
...	...	@@ -350,12 +395,9 @@ pub fn formatFloatScientific(value: var, maybe_precision: ?usize, context: var,
350	395	try output(context, float_decimal.digits[0..1]);
351	396	try output(context, ".");
352	397	if (float_decimal.digits.len > 1) {
353		const num_digits = if (@typeOf(value) == f32)
354		math.min(usize(9), float_decimal.digits.len)
355		else
356		float_decimal.digits.len;
	398	const num_digits = if (@typeOf(value) == f32) math.min(usize(9), float_decimal.digits.len) else float_decimal.digits.len;
357	399
358		try output(context, float_decimal.digits[1 .. num_digits]);
	400	try output(context, float_decimal.digits[1..num_digits]);
359	401	} else {
360	402	try output(context, "0");
361	403	}
...	...	@@ -381,7 +423,7 @@ pub fn formatFloatScientific(value: var, maybe_precision: ?usize, context: var,
381	423
382	424	// Print a float of the format x.yyyyy where the number of y is specified by the precision argument.
383	425	// By default floats are printed at full precision (no rounding).
384		pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void {
	426	pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {
385	427	var x = f64(value);
386	428
387	429	// Errol doesn't handle these special cases.
...	...	@@ -431,14 +473,14 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com
431	473
432	474	if (num_digits_whole > 0) {
433	475	// We may have to zero pad, for instance 1e4 requires zero padding.
434		try output(context, float_decimal.digits[0 .. num_digits_whole_no_pad]);
	476	try output(context, float_decimal.digits[0..num_digits_whole_no_pad]);
435	477
436	478	var i = num_digits_whole_no_pad;
437	479	while (i < num_digits_whole) : (i += 1) {
438	480	try output(context, "0");
439	481	}
440	482	} else {
441		try output(context , "0");
	483	try output(context, "0");
442	484	}
443	485
444	486	// {.0} special case doesn't want a trailing '.'
...	...	@@ -470,10 +512,10 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com
470	512	// Remaining fractional portion, zero-padding if insufficient.
471	513	debug.assert(precision >= printed);
472	514	if (num_digits_whole_no_pad + precision - printed < float_decimal.digits.len) {
473		try output(context, float_decimal.digits[num_digits_whole_no_pad .. num_digits_whole_no_pad + precision - printed]);
	515	try output(context, float_decimal.digits[num_digits_whole_no_pad..num_digits_whole_no_pad + precision - printed]);
474	516	return;
475	517	} else {
476		try output(context, float_decimal.digits[num_digits_whole_no_pad ..]);
	518	try output(context, float_decimal.digits[num_digits_whole_no_pad..]);
477	519	printed += float_decimal.digits.len - num_digits_whole_no_pad;
478	520
479	521	while (printed < precision) : (printed += 1) {
...	...	@@ -489,14 +531,14 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com
489	531
490	532	if (num_digits_whole > 0) {
491	533	// We may have to zero pad, for instance 1e4 requires zero padding.
492		try output(context, float_decimal.digits[0 .. num_digits_whole_no_pad]);
	534	try output(context, float_decimal.digits[0..num_digits_whole_no_pad]);
493	535
494	536	var i = num_digits_whole_no_pad;
495	537	while (i < num_digits_whole) : (i += 1) {
496	538	try output(context, "0");
497	539	}
498	540	} else {
499		try output(context , "0");
	541	try output(context, "0");
500	542	}
501	543
502	544	// Omit `.` if no fractional portion
...	...	@@ -516,14 +558,54 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com
516	558	}
517	559	}
518	560
519		try output(context, float_decimal.digits[num_digits_whole_no_pad ..]);
	561	try output(context, float_decimal.digits[num_digits_whole_no_pad..]);
520	562	}
521	563	}
522	564
	565	pub fn formatBytes(
	566	value: var,
	567	width: ?usize,
	568	comptime radix: usize,
	569	context: var,
	570	comptime Errors: type,
	571	output: fn(@typeOf(context), []const u8) Errors!void,
	572	) Errors!void {
	573	if (value == 0) {
	574	return output(context, "0B");
	575	}
	576
	577	const mags = " KMGTPEZY";
	578	const magnitude = switch (radix) {
	579	1000 => math.min(math.log2(value) / comptime math.log2(1000), mags.len - 1),
	580	1024 => math.min(math.log2(value) / 10, mags.len - 1),
	581	else => unreachable,
	582	};
	583	const new_value = f64(value) / math.pow(f64, f64(radix), f64(magnitude));
	584	const suffix = mags[magnitude];
	585
	586	try formatFloatDecimal(new_value, width, context, Errors, output);
	587
	588	if (suffix == ' ') {
	589	return output(context, "B");
	590	}
	591
	592	const buf = switch (radix) {
	593	1000 => []u8{ suffix, 'B' },
	594	1024 => []u8{ suffix, 'i', 'B' },
	595	else => unreachable,
	596	};
	597	return output(context, buf);
	598	}
523	599
524		pub fn formatInt(value: var, base: u8, uppercase: bool, width: usize,
525		context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void
526		{
	600	pub fn formatInt(
	601	value: var,
	602	base: u8,
	603	uppercase: bool,
	604	width: usize,
	605	context: var,
	606	comptime Errors: type,
	607	output: fn(@typeOf(context), []const u8) Errors!void,
	608	) Errors!void {
527	609	if (@typeOf(value).is_signed) {
528	610	return formatIntSigned(value, base, uppercase, width, context, Errors, output);
529	611	} else {
...	...	@@ -531,9 +613,7 @@ pub fn formatInt(value: var, base: u8, uppercase: bool, width: usize,
531	613	}
532	614	}
533	615
534		fn formatIntSigned(value: var, base: u8, uppercase: bool, width: usize,
535		context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void
536		{
	616	fn formatIntSigned(value: var, base: u8, uppercase: bool, width: usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {
537	617	const uint = @IntType(false, @typeOf(value).bit_count);
538	618	if (value < 0) {
539	619	const minus_sign: u8 = '-';
...	...	@@ -552,9 +632,7 @@ fn formatIntSigned(value: var, base: u8, uppercase: bool, width: usize,
552	632	}
553	633	}
554	634
555		fn formatIntUnsigned(value: var, base: u8, uppercase: bool, width: usize,
556		context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void
557		{
	635	fn formatIntUnsigned(value: var, base: u8, uppercase: bool, width: usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {
558	636	// max_int_digits accounts for the minus sign. when printing an unsigned
559	637	// number we don't need to do that.
560	638	var buf: [max_int_digits - 1]u8 = undefined;
...	...	@@ -566,8 +644,7 @@ fn formatIntUnsigned(value: var, base: u8, uppercase: bool, width: usize,
566	644	index -= 1;
567	645	buf[index] = digitToChar(u8(digit), uppercase);
568	646	a /= base;
569		if (a == 0)
570		break;
	647	if (a == 0) break;
571	648	}
572	649
573	650	const digits_buf = buf[index..];
...	...	@@ -579,8 +656,7 @@ fn formatIntUnsigned(value: var, base: u8, uppercase: bool, width: usize,
579	656	while (true) {
580	657	try output(context, (&zero_byte)[0..1]);
581	658	leftover_padding -= 1;
582		if (leftover_padding == 0)
583		break;
	659	if (leftover_padding == 0) break;
584	660	}
585	661	mem.set(u8, buf[0..index], '0');
586	662	return output(context, buf);
...	...	@@ -592,7 +668,7 @@ fn formatIntUnsigned(value: var, base: u8, uppercase: bool, width: usize,
592	668	}
593	669
594	670	pub fn formatIntBuf(out_buf: []u8, value: var, base: u8, uppercase: bool, width: usize) usize {
595		var context = FormatIntBuf {
	671	var context = FormatIntBuf{
596	672	.out_buf = out_buf,
597	673	.index = 0,
598	674	};
...	...	@@ -609,10 +685,8 @@ fn formatIntCallback(context: &FormatIntBuf, bytes: []const u8) (error{}!void) {
609	685	}
610	686
611	687	pub fn parseInt(comptime T: type, buf: []const u8, radix: u8) !T {
612		if (!T.is_signed)
613		return parseUnsigned(T, buf, radix);
614		if (buf.len == 0)
615		return T(0);
	688	if (!T.is_signed) return parseUnsigned(T, buf, radix);
	689	if (buf.len == 0) return T(0);
616	690	if (buf[0] == '-') {
617	691	return math.negate(try parseUnsigned(T, buf[1..], radix));
618	692	} else if (buf[0] == '+') {
...	...	@@ -632,9 +706,10 @@ test "fmt.parseInt" {
632	706	assert(if (parseInt(u8, "256", 10)) \|_\| false else \|err\| err == error.Overflow);
633	707	}
634	708
635		const ParseUnsignedError = error {
	709	const ParseUnsignedError = error{
636	710	/// The result cannot fit in the type specified
637	711	Overflow,
	712
638	713	/// The input had a byte that was not a digit
639	714	InvalidCharacter,
640	715	};
...	...	@@ -653,22 +728,21 @@ pub fn parseUnsigned(comptime T: type, buf: []const u8, radix: u8) ParseUnsigned
653	728
654	729	pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {
655	730	const value = switch (c) {
656		'0' ... '9' => c - '0',
657		'A' ... 'Z' => c - 'A' + 10,
658		'a' ... 'z' => c - 'a' + 10,
	731	'0'...'9' => c - '0',
	732	'A'...'Z' => c - 'A' + 10,
	733	'a'...'z' => c - 'a' + 10,
659	734	else => return error.InvalidCharacter,
660	735	};
661	736
662		if (value >= radix)
663		return error.InvalidCharacter;
	737	if (value >= radix) return error.InvalidCharacter;
664	738
665	739	return value;
666	740	}
667	741
668	742	fn digitToChar(digit: u8, uppercase: bool) u8 {
669	743	return switch (digit) {
670		0 ... 9 => digit + '0',
671		10 ... 35 => digit + ((if (uppercase) u8('A') else u8('a')) - 10),
	744	0...9 => digit + '0',
	745	10...35 => digit + ((if (uppercase) u8('A') else u8('a')) - 10),
672	746	else => unreachable,
673	747	};
674	748	}
...	...	@@ -684,7 +758,7 @@ fn bufPrintWrite(context: &BufPrintContext, bytes: []const u8) !void {
684	758	}
685	759
686	760	pub fn bufPrint(buf: []u8, comptime fmt: []const u8, args: ...) ![]u8 {
687		var context = BufPrintContext { .remaining = buf, };
	761	var context = BufPrintContext{ .remaining = buf };
688	762	try format(&context, error{BufferTooSmall}, bufPrintWrite, fmt, args);
689	763	return buf[0..buf.len - context.remaining.len];
690	764	}
...	...	@@ -697,7 +771,7 @@ pub fn allocPrint(allocator: &mem.Allocator, comptime fmt: []const u8, args: ...
697	771	}
698	772
699	773	fn countSize(size: &usize, bytes: []const u8) (error{}!void) {
700		*size += bytes.len;
	774	size.* += bytes.len;
701	775	}
702	776
703	777	test "buf print int" {
...	...	@@ -738,44 +812,34 @@ test "parse unsigned comptime" {
738	812
739	813	test "fmt.format" {
740	814	{
741		var buf1: [32]u8 = undefined;
742	815	const value: ?i32 = 1234;
743		const result = try bufPrint(buf1[0..], "nullable: {}\n", value);
744		assert(mem.eql(u8, result, "nullable: 1234\n"));
	816	try testFmt("nullable: 1234\n", "nullable: {}\n", value);
745	817	}
746	818	{
747		var buf1: [32]u8 = undefined;
748	819	const value: ?i32 = null;
749		const result = try bufPrint(buf1[0..], "nullable: {}\n", value);
750		assert(mem.eql(u8, result, "nullable: null\n"));
	820	try testFmt("nullable: null\n", "nullable: {}\n", value);
751	821	}
752	822	{
753		var buf1: [32]u8 = undefined;
754	823	const value: error!i32 = 1234;
755		const result = try bufPrint(buf1[0..], "error union: {}\n", value);
756		assert(mem.eql(u8, result, "error union: 1234\n"));
	824	try testFmt("error union: 1234\n", "error union: {}\n", value);
757	825	}
758	826	{
759		var buf1: [32]u8 = undefined;
760	827	const value: error!i32 = error.InvalidChar;
761		const result = try bufPrint(buf1[0..], "error union: {}\n", value);
762		assert(mem.eql(u8, result, "error union: error.InvalidChar\n"));
	828	try testFmt("error union: error.InvalidChar\n", "error union: {}\n", value);
763	829	}
764	830	{
765		var buf1: [32]u8 = undefined;
766	831	const value: u3 = 0b101;
767		const result = try bufPrint(buf1[0..], "u3: {}\n", value);
768		assert(mem.eql(u8, result, "u3: 5\n"));
	832	try testFmt("u3: 5\n", "u3: {}\n", value);
769	833	}
	834	try testFmt("file size: 63MiB\n", "file size: {Bi}\n", usize(63 * 1024 * 1024));
	835	try testFmt("file size: 66.06MB\n", "file size: {B2}\n", usize(63 * 1024 * 1024));
770	836	{
771		// Dummy field because of https://github.com/zig-lang/zig/issues/557.
	837	// Dummy field because of https://github.com/ziglang/zig/issues/557.
772	838	const Struct = struct {
773	839	unused: u8,
774	840	};
775	841	var buf1: [32]u8 = undefined;
776		const value = Struct {
777		.unused = 42,
778		};
	842	const value = Struct{ .unused = 42 };
779	843	const result = try bufPrint(buf1[0..], "pointer: {}\n", &value);
780	844	assert(mem.startsWith(u8, result, "pointer: Struct@"));
781	845	}
...	...	@@ -986,9 +1050,22 @@ test "fmt.format" {
986	1050	}
987	1051	}
988	1052
	1053	fn testFmt(expected: []const u8, comptime template: []const u8, args: ...) !void {
	1054	var buf: [100]u8 = undefined;
	1055	const result = try bufPrint(buf[0..], template, args);
	1056	if (mem.eql(u8, result, expected)) return;
	1057
	1058	std.debug.warn("\n====== expected this output: =========\n");
	1059	std.debug.warn("{}", expected);
	1060	std.debug.warn("\n======== instead found this: =========\n");
	1061	std.debug.warn("{}", result);
	1062	std.debug.warn("\n======================================\n");
	1063	return error.TestFailed;
	1064	}
	1065
989	1066	pub fn trim(buf: []const u8) []const u8 {
990	1067	var start: usize = 0;
991		while (start < buf.len and isWhiteSpace(buf[start])) : (start += 1) { }
	1068	while (start < buf.len and isWhiteSpace(buf[start])) : (start += 1) {}
992	1069
993	1070	var end: usize = buf.len;
994	1071	while (true) {
...	...	@@ -1000,7 +1077,6 @@ pub fn trim(buf: []const u8) []const u8 {
1000	1077	}
1001	1078	}
1002	1079	break;
1003
1004	1080	}
1005	1081	return buf[start..end];
1006	1082	}

std/hash/adler.zig+6-11

...	...	@@ -13,9 +13,7 @@ pub const Adler32 = struct {
13	13	adler: u32,
14	14
15	15	pub fn init() Adler32 {
16		return Adler32 {
17		.adler = 1,
18		};
	16	return Adler32{ .adler = 1 };
19	17	}
20	18
21	19	// This fast variant is taken from zlib. It reduces the required modulos and unrolls longer
...	...	@@ -33,8 +31,7 @@ pub const Adler32 = struct {
33	31	if (s2 >= base) {
34	32	s2 -= base;
35	33	}
36		}
37		else if (input.len < 16) {
	34	} else if (input.len < 16) {
38	35	for (input) \|b\| {
39	36	s1 +%= b;
40	37	s2 +%= s1;
...	...	@@ -44,8 +41,7 @@ pub const Adler32 = struct {
44	41	}
45	42
46	43	s2 %= base;
47		}
48		else {
	44	} else {
49	45	var i: usize = 0;
50	46	while (i + nmax <= input.len) : (i += nmax) {
51	47	const n = nmax / 16; // note: 16 \| nmax
...	...	@@ -98,15 +94,14 @@ test "adler32 sanity" {
98	94	}
99	95
100	96	test "adler32 long" {
101		const long1 = []u8 {1} ** 1024;
	97	const long1 = []u8{1} ** 1024;
102	98	debug.assert(Adler32.hash(long1[0..]) == 0x06780401);
103	99
104		const long2 = []u8 {1} ** 1025;
	100	const long2 = []u8{1} ** 1025;
105	101	debug.assert(Adler32.hash(long2[0..]) == 0x0a7a0402);
106	102	}
107	103
108	104	test "adler32 very long" {
109		const long = []u8 {1} ** 5553;
	105	const long = []u8{1} ** 5553;
110	106	debug.assert(Adler32.hash(long[0..]) == 0x707f15b2);
111	107	}
112

std/hash/crc.zig+17-18

...	...	@@ -9,9 +9,9 @@ const std = @import("../index.zig");
9	9	const debug = std.debug;
10	10
11	11	pub const Polynomial = struct {
12		const IEEE = 0xedb88320;
	12	const IEEE = 0xedb88320;
13	13	const Castagnoli = 0x82f63b78;
14		const Koopman = 0xeb31d82e;
	14	const Koopman = 0xeb31d82e;
15	15	};
16	16
17	17	// IEEE is by far the most common CRC and so is aliased by default.
...	...	@@ -27,20 +27,22 @@ pub fn Crc32WithPoly(comptime poly: u32) type {
27	27
28	28	for (tables[0]) \|*e, i\| {
29	29	var crc = u32(i);
30		var j: usize = 0; while (j < 8) : (j += 1) {
	30	var j: usize = 0;
	31	while (j < 8) : (j += 1) {
31	32	if (crc & 1 == 1) {
32	33	crc = (crc >> 1) ^ poly;
33	34	} else {
34	35	crc = (crc >> 1);
35	36	}
36	37	}
37		*e = crc;
	38	e.* = crc;
38	39	}
39	40
40	41	var i: usize = 0;
41	42	while (i < 256) : (i += 1) {
42	43	var crc = tables[0][i];
43		var j: usize = 1; while (j < 8) : (j += 1) {
	44	var j: usize = 1;
	45	while (j < 8) : (j += 1) {
44	46	const index = @truncate(u8, crc);
45	47	crc = tables[0][index] ^ (crc >> 8);
46	48	tables[j][i] = crc;
...	...	@@ -53,19 +55,17 @@ pub fn Crc32WithPoly(comptime poly: u32) type {
53	55	crc: u32,
54	56
55	57	pub fn init() Self {
56		return Self {
57		.crc = 0xffffffff,
58		};
	58	return Self{ .crc = 0xffffffff };
59	59	}
60	60
61	61	pub fn update(self: &Self, input: []const u8) void {
62	62	var i: usize = 0;
63	63	while (i + 8 <= input.len) : (i += 8) {
64		const p = input[i..i+8];
	64	const p = input[i..i + 8];
65	65
66	66	// Unrolling this way gives ~50Mb/s increase
67		self.crc ^= (u32(p[0]) << 0);
68		self.crc ^= (u32(p[1]) << 8);
	67	self.crc ^= (u32(p[0]) << 0);
	68	self.crc ^= (u32(p[1]) << 8);
69	69	self.crc ^= (u32(p[2]) << 16);
70	70	self.crc ^= (u32(p[3]) << 24);
71	71
...	...	@@ -76,8 +76,8 @@ pub fn Crc32WithPoly(comptime poly: u32) type {
76	76	lookup_tables[3][p[4]] ^
77	77	lookup_tables[4][@truncate(u8, self.crc >> 24)] ^
78	78	lookup_tables[5][@truncate(u8, self.crc >> 16)] ^
79		lookup_tables[6][@truncate(u8, self.crc >> 8)] ^
80		lookup_tables[7][@truncate(u8, self.crc >> 0)];
	79	lookup_tables[6][@truncate(u8, self.crc >> 8)] ^
	80	lookup_tables[7][@truncate(u8, self.crc >> 0)];
81	81	}
82	82
83	83	while (i < input.len) : (i += 1) {
...	...	@@ -123,14 +123,15 @@ pub fn Crc32SmallWithPoly(comptime poly: u32) type {
123	123
124	124	for (table) \|*e, i\| {
125	125	var crc = u32(i * 16);
126		var j: usize = 0; while (j < 8) : (j += 1) {
	126	var j: usize = 0;
	127	while (j < 8) : (j += 1) {
127	128	if (crc & 1 == 1) {
128	129	crc = (crc >> 1) ^ poly;
129	130	} else {
130	131	crc = (crc >> 1);
131	132	}
132	133	}
133		*e = crc;
	134	e.* = crc;
134	135	}
135	136
136	137	break :block table;
...	...	@@ -139,9 +140,7 @@ pub fn Crc32SmallWithPoly(comptime poly: u32) type {
139	140	crc: u32,
140	141
141	142	pub fn init() Self {
142		return Self {
143		.crc = 0xffffffff,
144		};
	143	return Self{ .crc = 0xffffffff };
145	144	}
146	145
147	146	pub fn update(self: &Self, input: []const u8) void {

std/hash/fnv.zig+2-4

...	...	@@ -7,7 +7,7 @@
7	7	const std = @import("../index.zig");
8	8	const debug = std.debug;
9	9
10		pub const Fnv1a_32 = Fnv1a(u32, 0x01000193 , 0x811c9dc5);
	10	pub const Fnv1a_32 = Fnv1a(u32, 0x01000193, 0x811c9dc5);
11	11	pub const Fnv1a_64 = Fnv1a(u64, 0x100000001b3, 0xcbf29ce484222325);
12	12	pub const Fnv1a_128 = Fnv1a(u128, 0x1000000000000000000013b, 0x6c62272e07bb014262b821756295c58d);
13	13
...	...	@@ -18,9 +18,7 @@ fn Fnv1a(comptime T: type, comptime prime: T, comptime offset: T) type {
18	18	value: T,
19	19
20	20	pub fn init() Self {
21		return Self {
22		.value = offset,
23		};
	21	return Self{ .value = offset };
24	22	}
25	23
26	24	pub fn update(self: &Self, input: []const u8) void {

std/hash/siphash.zig+3-3

...	...	@@ -45,7 +45,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
45	45	const k0 = mem.readInt(key[0..8], u64, Endian.Little);
46	46	const k1 = mem.readInt(key[8..16], u64, Endian.Little);
47	47
48		var d = Self {
	48	var d = Self{
49	49	.v0 = k0 ^ 0x736f6d6570736575,
50	50	.v1 = k1 ^ 0x646f72616e646f6d,
51	51	.v2 = k0 ^ 0x6c7967656e657261,
...	...	@@ -162,7 +162,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
162	162	const test_key = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f";
163	163
164	164	test "siphash64-2-4 sanity" {
165		const vectors = [][]const u8 {
	165	const vectors = [][]const u8{
166	166	"\x31\x0e\x0e\xdd\x47\xdb\x6f\x72", // ""
167	167	"\xfd\x67\xdc\x93\xc5\x39\xf8\x74", // "\x00"
168	168	"\x5a\x4f\xa9\xd9\x09\x80\x6c\x0d", // "\x00\x01" ... etc
...	...	@@ -241,7 +241,7 @@ test "siphash64-2-4 sanity" {
241	241	}
242	242
243	243	test "siphash128-2-4 sanity" {
244		const vectors = [][]const u8 {
	244	const vectors = [][]const u8{
245	245	"\xa3\x81\x7f\x04\xba\x25\xa8\xe6\x6d\xf6\x72\x14\xc7\x55\x02\x93",
246	246	"\xda\x87\xc1\xd8\x6b\x99\xaf\x44\x34\x76\x59\x11\x9b\x22\xfc\x45",
247	247	"\x81\x77\x22\x8d\xa4\xa4\x5d\xc7\xfc\xa3\x8b\xde\xf6\x0a\xff\xe4",

std/hash_map.zig+57-45

...	...	@@ -9,10 +9,7 @@ const builtin = @import("builtin");
9	9	const want_modification_safety = builtin.mode != builtin.Mode.ReleaseFast;
10	10	const debug_u32 = if (want_modification_safety) u32 else void;
11	11
12		pub fn HashMap(comptime K: type, comptime V: type,
13		comptime hash: fn(key: K)u32,
14		comptime eql: fn(a: K, b: K)bool) type
15		{
	12	pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32, comptime eql: fn(a: K, b: K) bool) type {
16	13	return struct {
17	14	entries: []Entry,
18	15	size: usize,
...	...	@@ -65,7 +62,7 @@ pub fn HashMap(comptime K: type, comptime V: type,
65	62	};
66	63
67	64	pub fn init(allocator: &Allocator) Self {
68		return Self {
	65	return Self{
69	66	.entries = []Entry{},
70	67	.allocator = allocator,
71	68	.size = 0,
...	...	@@ -129,34 +126,36 @@ pub fn HashMap(comptime K: type, comptime V: type,
129	126	if (hm.entries.len == 0) return null;
130	127	hm.incrementModificationCount();
131	128	const start_index = hm.keyToIndex(key);
132		{var roll_over: usize = 0; while (roll_over <= hm.max_distance_from_start_index) : (roll_over += 1) {
133		const index = (start_index + roll_over) % hm.entries.len;
134		var entry = &hm.entries[index];
135
136		if (!entry.used)
137		return null;
138
139		if (!eql(entry.key, key)) continue;
140
141		while (roll_over < hm.entries.len) : (roll_over += 1) {
142		const next_index = (start_index + roll_over + 1) % hm.entries.len;
143		const next_entry = &hm.entries[next_index];
144		if (!next_entry.used or next_entry.distance_from_start_index == 0) {
145		entry.used = false;
146		hm.size -= 1;
147		return entry;
	129	{
	130	var roll_over: usize = 0;
	131	while (roll_over <= hm.max_distance_from_start_index) : (roll_over += 1) {
	132	const index = (start_index + roll_over) % hm.entries.len;
	133	var entry = &hm.entries[index];
	134
	135	if (!entry.used) return null;
	136
	137	if (!eql(entry.key, key)) continue;
	138
	139	while (roll_over < hm.entries.len) : (roll_over += 1) {
	140	const next_index = (start_index + roll_over + 1) % hm.entries.len;
	141	const next_entry = &hm.entries[next_index];
	142	if (!next_entry.used or next_entry.distance_from_start_index == 0) {
	143	entry.used = false;
	144	hm.size -= 1;
	145	return entry;
	146	}
	147	entry.* = next_entry.*;
	148	entry.distance_from_start_index -= 1;
	149	entry = next_entry;
148	150	}
149		entry = next_entry;
150		entry.distance_from_start_index -= 1;
151		entry = next_entry;
	151	unreachable; // shifting everything in the table
152	152	}
153		unreachable; // shifting everything in the table
154		}}
	153	}
155	154	return null;
156	155	}
157	156
158	157	pub fn iterator(hm: &const Self) Iterator {
159		return Iterator {
	158	return Iterator{
160	159	.hm = hm,
161	160	.count = 0,
162	161	.index = 0,
...	...	@@ -182,21 +181,23 @@ pub fn HashMap(comptime K: type, comptime V: type,
182	181	/// Returns the value that was already there.
183	182	fn internalPut(hm: &Self, orig_key: K, orig_value: &const V) ?V {
184	183	var key = orig_key;
185		var value = *orig_value;
	184	var value = orig_value.*;
186	185	const start_index = hm.keyToIndex(key);
187	186	var roll_over: usize = 0;
188	187	var distance_from_start_index: usize = 0;
189		while (roll_over < hm.entries.len) : ({roll_over += 1; distance_from_start_index += 1;}) {
	188	while (roll_over < hm.entries.len) : ({
	189	roll_over += 1;
	190	distance_from_start_index += 1;
	191	}) {
190	192	const index = (start_index + roll_over) % hm.entries.len;
191	193	const entry = &hm.entries[index];
192	194
193	195	if (entry.used and !eql(entry.key, key)) {
194	196	if (entry.distance_from_start_index < distance_from_start_index) {
195	197	// robin hood to the rescue
196		const tmp = *entry;
197		hm.max_distance_from_start_index = math.max(hm.max_distance_from_start_index,
198		distance_from_start_index);
199		*entry = Entry {
	198	const tmp = entry.*;
	199	hm.max_distance_from_start_index = math.max(hm.max_distance_from_start_index, distance_from_start_index);
	200	entry.* = Entry{
200	201	.used = true,
201	202	.distance_from_start_index = distance_from_start_index,
202	203	.key = key,
...	...	@@ -219,7 +220,7 @@ pub fn HashMap(comptime K: type, comptime V: type,
219	220	}
220	221
221	222	hm.max_distance_from_start_index = math.max(distance_from_start_index, hm.max_distance_from_start_index);
222		*entry = Entry {
	223	entry.* = Entry{
223	224	.used = true,
224	225	.distance_from_start_index = distance_from_start_index,
225	226	.key = key,
...	...	@@ -232,13 +233,16 @@ pub fn HashMap(comptime K: type, comptime V: type,
232	233
233	234	fn internalGet(hm: &const Self, key: K) ?&Entry {
234	235	const start_index = hm.keyToIndex(key);
235		{var roll_over: usize = 0; while (roll_over <= hm.max_distance_from_start_index) : (roll_over += 1) {
236		const index = (start_index + roll_over) % hm.entries.len;
237		const entry = &hm.entries[index];
238
239		if (!entry.used) return null;
240		if (eql(entry.key, key)) return entry;
241		}}
	236	{
	237	var roll_over: usize = 0;
	238	while (roll_over <= hm.max_distance_from_start_index) : (roll_over += 1) {
	239	const index = (start_index + roll_over) % hm.entries.len;
	240	const entry = &hm.entries[index];
	241
	242	if (!entry.used) return null;
	243	if (eql(entry.key, key)) return entry;
	244	}
	245	}
242	246	return null;
243	247	}
244	248
...	...	@@ -282,11 +286,19 @@ test "iterator hash map" {
282	286	assert((reset_map.put(2, 22) catch unreachable) == null);
283	287	assert((reset_map.put(3, 33) catch unreachable) == null);
284	288
285		var keys = []i32 { 1, 2, 3 };
286		var values = []i32 { 11, 22, 33 };
	289	var keys = []i32{
	290	1,
	291	2,
	292	3,
	293	};
	294	var values = []i32{
	295	11,
	296	22,
	297	33,
	298	};
287	299
288	300	var it = reset_map.iterator();
289		var count : usize = 0;
	301	var count: usize = 0;
290	302	while (it.next()) \|next\| {
291	303	assert(next.key == keys[count]);
292	304	assert(next.value == values[count]);
...	...	@@ -305,7 +317,7 @@ test "iterator hash map" {
305	317	}
306	318
307	319	it.reset();
308		var entry = ?? it.next();
	320	var entry = ??it.next();
309	321	assert(entry.key == keys[0]);
310	322	assert(entry.value == values[0]);
311	323	}

std/heap.zig+44-52

...	...	@@ -10,7 +10,7 @@ const c = std.c;
10	10	const Allocator = mem.Allocator;
11	11
12	12	pub const c_allocator = &c_allocator_state;
13		var c_allocator_state = Allocator {
	13	var c_allocator_state = Allocator{
14	14	.allocFn = cAlloc,
15	15	.reallocFn = cRealloc,
16	16	.freeFn = cFree,
...	...	@@ -18,10 +18,7 @@ var c_allocator_state = Allocator {
18	18
19	19	fn cAlloc(self: &Allocator, n: usize, alignment: u29) ![]u8 {
20	20	assert(alignment <= @alignOf(c_longdouble));
21		return if (c.malloc(n)) \|buf\|
22		@ptrCast(&u8, buf)[0..n]
23		else
24		error.OutOfMemory;
	21	return if (c.malloc(n)) \|buf\| @ptrCast(&u8, buf)[0..n] else error.OutOfMemory;
25	22	}
26	23
27	24	fn cRealloc(self: &Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
...	...	@@ -48,8 +45,8 @@ pub const DirectAllocator = struct {
48	45	const HeapHandle = if (builtin.os == Os.windows) os.windows.HANDLE else void;
49	46
50	47	pub fn init() DirectAllocator {
51		return DirectAllocator {
52		.allocator = Allocator {
	48	return DirectAllocator{
	49	.allocator = Allocator{
53	50	.allocFn = alloc,
54	51	.reallocFn = realloc,
55	52	.freeFn = free,
...	...	@@ -73,37 +70,35 @@ pub const DirectAllocator = struct {
73	70	switch (builtin.os) {
74	71	Os.linux, Os.macosx, Os.ios => {
75	72	const p = os.posix;
76		const alloc_size = if(alignment <= os.page_size) n else n + alignment;
77		const addr = p.mmap(null, alloc_size, p.PROT_READ\|p.PROT_WRITE,
78		p.MAP_PRIVATE\|p.MAP_ANONYMOUS, -1, 0);
79		if(addr == p.MAP_FAILED) return error.OutOfMemory;
80
81		if(alloc_size == n) return @intToPtr(&u8, addr)[0..n];
82
	73	const alloc_size = if (alignment <= os.page_size) n else n + alignment;
	74	const addr = p.mmap(null, alloc_size, p.PROT_READ \| p.PROT_WRITE, p.MAP_PRIVATE \| p.MAP_ANONYMOUS, -1, 0);
	75	if (addr == p.MAP_FAILED) return error.OutOfMemory;
	76
	77	if (alloc_size == n) return @intToPtr(&u8, addr)[0..n];
	78
83	79	var aligned_addr = addr & ~usize(alignment - 1);
84	80	aligned_addr += alignment;
85
	81
86	82	//We can unmap the unused portions of our mmap, but we must only
87	83	// pass munmap bytes that exist outside our allocated pages or it
88	84	// will happily eat us too
89
	85
90	86	//Since alignment > page_size, we are by definition on a page boundry
91	87	const unused_start = addr;
92	88	const unused_len = aligned_addr - 1 - unused_start;
93	89
94	90	var err = p.munmap(unused_start, unused_len);
95	91	debug.assert(p.getErrno(err) == 0);
96
	92
97	93	//It is impossible that there is an unoccupied page at the top of our
98	94	// mmap.
99
	95
100	96	return @intToPtr(&u8, aligned_addr)[0..n];
101	97	},
102	98	Os.windows => {
103	99	const amt = n + alignment + @sizeOf(usize);
104	100	const heap_handle = self.heap_handle ?? blk: {
105		const hh = os.windows.HeapCreate(os.windows.HEAP_NO_SERIALIZE, amt, 0)
106		?? return error.OutOfMemory;
	101	const hh = os.windows.HeapCreate(os.windows.HEAP_NO_SERIALIZE, amt, 0) ?? return error.OutOfMemory;
107	102	self.heap_handle = hh;
108	103	break :blk hh;
109	104	};
...	...	@@ -113,7 +108,7 @@ pub const DirectAllocator = struct {
113	108	const march_forward_bytes = if (rem == 0) 0 else (alignment - rem);
114	109	const adjusted_addr = root_addr + march_forward_bytes;
115	110	const record_addr = adjusted_addr + n;
116		*@intToPtr(&align(1) usize, record_addr) = root_addr;
	111	@intToPtr(&align(1) usize, record_addr).* = root_addr;
117	112	return @intToPtr(&u8, adjusted_addr)[0..n];
118	113	},
119	114	else => @compileError("Unsupported OS"),
...	...	@@ -144,13 +139,13 @@ pub const DirectAllocator = struct {
144	139	Os.windows => {
145	140	const old_adjusted_addr = @ptrToInt(old_mem.ptr);
146	141	const old_record_addr = old_adjusted_addr + old_mem.len;
147		const root_addr = *@intToPtr(&align(1) usize, old_record_addr);
	142	const root_addr = @intToPtr(&align(1) usize, old_record_addr).*;
148	143	const old_ptr = @intToPtr(os.windows.LPVOID, root_addr);
149	144	const amt = new_size + alignment + @sizeOf(usize);
150	145	const new_ptr = os.windows.HeapReAlloc(??self.heap_handle, 0, old_ptr, amt) ?? blk: {
151	146	if (new_size > old_mem.len) return error.OutOfMemory;
152	147	const new_record_addr = old_record_addr - new_size + old_mem.len;
153		*@intToPtr(&align(1) usize, new_record_addr) = root_addr;
	148	@intToPtr(&align(1) usize, new_record_addr).* = root_addr;
154	149	return old_mem[0..new_size];
155	150	};
156	151	const offset = old_adjusted_addr - root_addr;
...	...	@@ -158,7 +153,7 @@ pub const DirectAllocator = struct {
158	153	const new_adjusted_addr = new_root_addr + offset;
159	154	assert(new_adjusted_addr % alignment == 0);
160	155	const new_record_addr = new_adjusted_addr + new_size;
161		*@intToPtr(&align(1) usize, new_record_addr) = new_root_addr;
	156	@intToPtr(&align(1) usize, new_record_addr).* = new_root_addr;
162	157	return @intToPtr(&u8, new_adjusted_addr)[0..new_size];
163	158	},
164	159	else => @compileError("Unsupported OS"),
...	...	@@ -174,7 +169,7 @@ pub const DirectAllocator = struct {
174	169	},
175	170	Os.windows => {
176	171	const record_addr = @ptrToInt(bytes.ptr) + bytes.len;
177		const root_addr = *@intToPtr(&align(1) usize, record_addr);
	172	const root_addr = @intToPtr(&align(1) usize, record_addr).*;
178	173	const ptr = @intToPtr(os.windows.LPVOID, root_addr);
179	174	_ = os.windows.HeapFree(??self.heap_handle, 0, ptr);
180	175	},
...	...	@@ -195,8 +190,8 @@ pub const ArenaAllocator = struct {
195	190	const BufNode = std.LinkedList([]u8).Node;
196	191
197	192	pub fn init(child_allocator: &Allocator) ArenaAllocator {
198		return ArenaAllocator {
199		.allocator = Allocator {
	193	return ArenaAllocator{
	194	.allocator = Allocator{
200	195	.allocFn = alloc,
201	196	.reallocFn = realloc,
202	197	.freeFn = free,
...	...	@@ -228,7 +223,7 @@ pub const ArenaAllocator = struct {
228	223	const buf = try self.child_allocator.alignedAlloc(u8, @alignOf(BufNode), len);
229	224	const buf_node_slice = ([]BufNode)(buf[0..@sizeOf(BufNode)]);
230	225	const buf_node = &buf_node_slice[0];
231		*buf_node = BufNode {
	226	buf_node.* = BufNode{
232	227	.data = buf,
233	228	.prev = null,
234	229	.next = null,
...	...	@@ -253,7 +248,7 @@ pub const ArenaAllocator = struct {
253	248	cur_node = try self.createNode(cur_buf.len, n + alignment);
254	249	continue;
255	250	}
256		const result = cur_buf[adjusted_index .. new_end_index];
	251	const result = cur_buf[adjusted_index..new_end_index];
257	252	self.end_index = new_end_index;
258	253	return result;
259	254	}
...	...	@@ -269,7 +264,7 @@ pub const ArenaAllocator = struct {
269	264	}
270	265	}
271	266
272		fn free(allocator: &Allocator, bytes: []u8) void { }
	267	fn free(allocator: &Allocator, bytes: []u8) void {}
273	268	};
274	269
275	270	pub const FixedBufferAllocator = struct {
...	...	@@ -278,8 +273,8 @@ pub const FixedBufferAllocator = struct {
278	273	buffer: []u8,
279	274
280	275	pub fn init(buffer: []u8) FixedBufferAllocator {
281		return FixedBufferAllocator {
282		.allocator = Allocator {
	276	return FixedBufferAllocator{
	277	.allocator = Allocator{
283	278	.allocFn = alloc,
284	279	.reallocFn = realloc,
285	280	.freeFn = free,
...	...	@@ -299,7 +294,7 @@ pub const FixedBufferAllocator = struct {
299	294	if (new_end_index > self.buffer.len) {
300	295	return error.OutOfMemory;
301	296	}
302		const result = self.buffer[adjusted_index .. new_end_index];
	297	const result = self.buffer[adjusted_index..new_end_index];
303	298	self.end_index = new_end_index;
304	299
305	300	return result;
...	...	@@ -315,7 +310,7 @@ pub const FixedBufferAllocator = struct {
315	310	}
316	311	}
317	312
318		fn free(allocator: &Allocator, bytes: []u8) void { }
	313	fn free(allocator: &Allocator, bytes: []u8) void {}
319	314	};
320	315
321	316	/// lock free
...	...	@@ -325,8 +320,8 @@ pub const ThreadSafeFixedBufferAllocator = struct {
325	320	buffer: []u8,
326	321
327	322	pub fn init(buffer: []u8) ThreadSafeFixedBufferAllocator {
328		return ThreadSafeFixedBufferAllocator {
329		.allocator = Allocator {
	323	return ThreadSafeFixedBufferAllocator{
	324	.allocator = Allocator{
330	325	.allocFn = alloc,
331	326	.reallocFn = realloc,
332	327	.freeFn = free,
...	...	@@ -348,8 +343,7 @@ pub const ThreadSafeFixedBufferAllocator = struct {
348	343	if (new_end_index > self.buffer.len) {
349	344	return error.OutOfMemory;
350	345	}
351		end_index = @cmpxchgWeak(usize, &self.end_index, end_index, new_end_index,
352		builtin.AtomicOrder.SeqCst, builtin.AtomicOrder.SeqCst) ?? return self.buffer[adjusted_index .. new_end_index];
	346	end_index = @cmpxchgWeak(usize, &self.end_index, end_index, new_end_index, builtin.AtomicOrder.SeqCst, builtin.AtomicOrder.SeqCst) ?? return self.buffer[adjusted_index..new_end_index];
353	347	}
354	348	}
355	349
...	...	@@ -363,11 +357,9 @@ pub const ThreadSafeFixedBufferAllocator = struct {
363	357	}
364	358	}
365	359
366		fn free(allocator: &Allocator, bytes: []u8) void { }
	360	fn free(allocator: &Allocator, bytes: []u8) void {}
367	361	};
368	362
369
370
371	363	test "c_allocator" {
372	364	if (builtin.link_libc) {
373	365	var slice = c_allocator.alloc(u8, 50) catch return;
...	...	@@ -415,8 +407,8 @@ fn testAllocator(allocator: &mem.Allocator) !void {
415	407	var slice = try allocator.alloc(&i32, 100);
416	408
417	409	for (slice) \|*item, i\| {
418		*item = try allocator.create(i32);
419		**item = i32(i);
	410	item.* = try allocator.create(i32);
	411	item.. = i32(i);
420	412	}
421	413
422	414	for (slice) \|item, i\| {
...	...	@@ -432,28 +424,28 @@ fn testAllocator(allocator: &mem.Allocator) !void {
432	424	}
433	425
434	426	fn testAllocatorLargeAlignment(allocator: &mem.Allocator) mem.Allocator.Error!void {
435		//Maybe a platform's page_size is actually the same as or
	427	//Maybe a platform's page_size is actually the same as or
436	428	// very near usize?
437		if(os.page_size << 2 > @maxValue(usize)) return;
438
	429	if (os.page_size << 2 > @maxValue(usize)) return;
	430
439	431	const USizeShift = @IntType(false, std.math.log2(usize.bit_count));
440	432	const large_align = u29(os.page_size << 2);
441
	433
442	434	var align_mask: usize = undefined;
443	435	_ = @shlWithOverflow(usize, ~usize(0), USizeShift(@ctz(large_align)), &align_mask);
444
	436
445	437	var slice = try allocator.allocFn(allocator, 500, large_align);
446	438	debug.assert(@ptrToInt(slice.ptr) & align_mask == @ptrToInt(slice.ptr));
447
	439
448	440	slice = try allocator.reallocFn(allocator, slice, 100, large_align);
449	441	debug.assert(@ptrToInt(slice.ptr) & align_mask == @ptrToInt(slice.ptr));
450
	442
451	443	slice = try allocator.reallocFn(allocator, slice, 5000, large_align);
452	444	debug.assert(@ptrToInt(slice.ptr) & align_mask == @ptrToInt(slice.ptr));
453
	445
454	446	slice = try allocator.reallocFn(allocator, slice, 10, large_align);
455	447	debug.assert(@ptrToInt(slice.ptr) & align_mask == @ptrToInt(slice.ptr));
456
	448
457	449	slice = try allocator.reallocFn(allocator, slice, 20000, large_align);
458	450	debug.assert(@ptrToInt(slice.ptr) & align_mask == @ptrToInt(slice.ptr));
459	451

std/io.zig+18-47

...	...	@@ -18,32 +18,17 @@ const is_windows = builtin.os == builtin.Os.windows;
18	18	const GetStdIoErrs = os.WindowsGetStdHandleErrs;
19	19
20	20	pub fn getStdErr() GetStdIoErrs!File {
21		const handle = if (is_windows)
22		try os.windowsGetStdHandle(os.windows.STD_ERROR_HANDLE)
23		else if (is_posix)
24		os.posix.STDERR_FILENO
25		else
26		unreachable;
	21	const handle = if (is_windows) try os.windowsGetStdHandle(os.windows.STD_ERROR_HANDLE) else if (is_posix) os.posix.STDERR_FILENO else unreachable;
27	22	return File.openHandle(handle);
28	23	}
29	24
30	25	pub fn getStdOut() GetStdIoErrs!File {
31		const handle = if (is_windows)
32		try os.windowsGetStdHandle(os.windows.STD_OUTPUT_HANDLE)
33		else if (is_posix)
34		os.posix.STDOUT_FILENO
35		else
36		unreachable;
	26	const handle = if (is_windows) try os.windowsGetStdHandle(os.windows.STD_OUTPUT_HANDLE) else if (is_posix) os.posix.STDOUT_FILENO else unreachable;
37	27	return File.openHandle(handle);
38	28	}
39	29
40	30	pub fn getStdIn() GetStdIoErrs!File {
41		const handle = if (is_windows)
42		try os.windowsGetStdHandle(os.windows.STD_INPUT_HANDLE)
43		else if (is_posix)
44		os.posix.STDIN_FILENO
45		else
46		unreachable;
	31	const handle = if (is_windows) try os.windowsGetStdHandle(os.windows.STD_INPUT_HANDLE) else if (is_posix) os.posix.STDIN_FILENO else unreachable;
47	32	return File.openHandle(handle);
48	33	}
49	34
...	...	@@ -56,11 +41,9 @@ pub const FileInStream = struct {
56	41	pub const Stream = InStream(Error);
57	42
58	43	pub fn init(file: &File) FileInStream {
59		return FileInStream {
	44	return FileInStream{
60	45	.file = file,
61		.stream = Stream {
62		.readFn = readFn,
63		},
	46	.stream = Stream{ .readFn = readFn },
64	47	};
65	48	}
66	49
...	...	@@ -79,11 +62,9 @@ pub const FileOutStream = struct {
79	62	pub const Stream = OutStream(Error);
80	63
81	64	pub fn init(file: &File) FileOutStream {
82		return FileOutStream {
	65	return FileOutStream{
83	66	.file = file,
84		.stream = Stream {
85		.writeFn = writeFn,
86		},
	67	.stream = Stream{ .writeFn = writeFn },
87	68	};
88	69	}
89	70
...	...	@@ -121,8 +102,7 @@ pub fn InStream(comptime ReadError: type) type {
121	102	}
122	103
123	104	const new_buf_size = math.min(max_size, actual_buf_len + os.page_size);
124		if (new_buf_size == actual_buf_len)
125		return error.StreamTooLong;
	105	if (new_buf_size == actual_buf_len) return error.StreamTooLong;
126	106	try buffer.resize(new_buf_size);
127	107	}
128	108	}
...	...	@@ -165,9 +145,7 @@ pub fn InStream(comptime ReadError: type) type {
165	145	/// memory would be greater than `max_size`, returns `error.StreamTooLong`.
166	146	/// Caller owns returned memory.
167	147	/// If this function returns an error, the contents from the stream read so far are lost.
168		pub fn readUntilDelimiterAlloc(self: &Self, allocator: &mem.Allocator,
169		delimiter: u8, max_size: usize) ![]u8
170		{
	148	pub fn readUntilDelimiterAlloc(self: &Self, allocator: &mem.Allocator, delimiter: u8, max_size: usize) ![]u8 {
171	149	var buf = Buffer.initNull(allocator);
172	150	defer buf.deinit();
173	151
...	...	@@ -283,7 +261,7 @@ pub fn BufferedInStream(comptime Error: type) type {
283	261	pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type) type {
284	262	return struct {
285	263	const Self = this;
286		const Stream = InStream(Error);
	264	const Stream = InStream(Error);
287	265
288	266	pub stream: Stream,
289	267
...	...	@@ -294,7 +272,7 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)
294	272	end_index: usize,
295	273
296	274	pub fn init(unbuffered_in_stream: &Stream) Self {
297		return Self {
	275	return Self{
298	276	.unbuffered_in_stream = unbuffered_in_stream,
299	277	.buffer = undefined,
300	278
...	...	@@ -305,9 +283,7 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)
305	283	.start_index = buffer_size,
306	284	.end_index = buffer_size,
307	285
308		.stream = Stream {
309		.readFn = readFn,
310		},
	286	.stream = Stream{ .readFn = readFn },
311	287	};
312	288	}
313	289
...	...	@@ -368,13 +344,11 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr
368	344	index: usize,
369	345
370	346	pub fn init(unbuffered_out_stream: &Stream) Self {
371		return Self {
	347	return Self{
372	348	.unbuffered_out_stream = unbuffered_out_stream,
373	349	.buffer = undefined,
374	350	.index = 0,
375		.stream = Stream {
376		.writeFn = writeFn,
377		},
	351	.stream = Stream{ .writeFn = writeFn },
378	352	};
379	353	}
380	354
...	...	@@ -416,11 +390,9 @@ pub const BufferOutStream = struct {
416	390	pub const Stream = OutStream(Error);
417	391
418	392	pub fn init(buffer: &Buffer) BufferOutStream {
419		return BufferOutStream {
	393	return BufferOutStream{
420	394	.buffer = buffer,
421		.stream = Stream {
422		.writeFn = writeFn,
423		},
	395	.stream = Stream{ .writeFn = writeFn },
424	396	};
425	397	}
426	398
...	...	@@ -430,7 +402,6 @@ pub const BufferOutStream = struct {
430	402	}
431	403	};
432	404
433
434	405	pub const BufferedAtomicFile = struct {
435	406	atomic_file: os.AtomicFile,
436	407	file_stream: FileOutStream,
...	...	@@ -441,7 +412,7 @@ pub const BufferedAtomicFile = struct {
441	412	var self = try allocator.create(BufferedAtomicFile);
442	413	errdefer allocator.destroy(self);
443	414
444		*self = BufferedAtomicFile {
	415	self.* = BufferedAtomicFile{
445	416	.atomic_file = undefined,
446	417	.file_stream = undefined,
447	418	.buffered_stream = undefined,
...	...	@@ -489,7 +460,7 @@ pub fn readLine(buf: []u8) !usize {
489	460	'\r' => {
490	461	// trash the following \n
491	462	_ = stream.readByte() catch return error.EndOfFile;
492		return index;
	463	return index;
493	464	},
494	465	'\n' => return index,
495	466	else => {

std/io_test.zig+1-1

...	...	@@ -42,7 +42,7 @@ test "write a file, read it, then delete it" {
42	42
43	43	assert(mem.eql(u8, contents[0.."begin".len], "begin"));
44	44	assert(mem.eql(u8, contents["begin".len..contents.len - "end".len], data));
45		assert(mem.eql(u8, contents[contents.len - "end".len ..], "end"));
	45	assert(mem.eql(u8, contents[contents.len - "end".len..], "end"));
46	46	}
47	47	try os.deleteFile(allocator, tmp_file_name);
48	48	}

std/json.zig+86-87

...	...	@@ -35,7 +35,7 @@ pub const Token = struct {
35	35	};
36	36
37	37	pub fn init(id: Id, count: usize, offset: u1) Token {
38		return Token {
	38	return Token{
39	39	.id = id,
40	40	.offset = offset,
41	41	.string_has_escape = false,
...	...	@@ -45,7 +45,7 @@ pub const Token = struct {
45	45	}
46	46
47	47	pub fn initString(count: usize, has_unicode_escape: bool) Token {
48		return Token {
	48	return Token{
49	49	.id = Id.String,
50	50	.offset = 0,
51	51	.string_has_escape = has_unicode_escape,
...	...	@@ -55,7 +55,7 @@ pub const Token = struct {
55	55	}
56	56
57	57	pub fn initNumber(count: usize, number_is_integer: bool) Token {
58		return Token {
	58	return Token{
59	59	.id = Id.Number,
60	60	.offset = 0,
61	61	.string_has_escape = false,
...	...	@@ -66,7 +66,7 @@ pub const Token = struct {
66	66
67	67	// A marker token is a zero-length
68	68	pub fn initMarker(id: Id) Token {
69		return Token {
	69	return Token{
70	70	.id = id,
71	71	.offset = 0,
72	72	.string_has_escape = false,
...	...	@@ -77,7 +77,7 @@ pub const Token = struct {
77	77
78	78	// Slice into the underlying input string.
79	79	pub fn slice(self: &const Token, input: []const u8, i: usize) []const u8 {
80		return input[i + self.offset - self.count .. i + self.offset];
	80	return input[i + self.offset - self.count..i + self.offset];
81	81	}
82	82	};
83	83
...	...	@@ -86,7 +86,7 @@ pub const Token = struct {
86	86	// parsing state requires ~40-50 bytes of stack space.
87	87	//
88	88	// Conforms strictly to RFC8529.
89		const StreamingJsonParser = struct {
	89	pub const StreamingJsonParser = struct {
90	90	// Current state
91	91	state: State,
92	92	// How many bytes we have counted for the current token
...	...	@@ -105,8 +105,8 @@ const StreamingJsonParser = struct {
105	105	stack: u256,
106	106	stack_used: u8,
107	107
108		const object_bit = 0;
109		const array_bit = 1;
	108	const object_bit = 0;
	109	const array_bit = 1;
110	110	const max_stack_size = @maxValue(u8);
111	111
112	112	pub fn init() StreamingJsonParser {
...	...	@@ -120,7 +120,7 @@ const StreamingJsonParser = struct {
120	120	p.count = 0;
121	121	// Set before ever read in main transition function
122	122	p.after_string_state = undefined;
123		p.after_value_state = State.ValueEnd; // handle end of values normally
	123	p.after_value_state = State.ValueEnd; // handle end of values normally
124	124	p.stack = 0;
125	125	p.stack_used = 0;
126	126	p.complete = false;
...	...	@@ -181,7 +181,7 @@ const StreamingJsonParser = struct {
181	181	}
182	182	};
183	183
184		pub const Error = error {
	184	pub const Error = error{
185	185	InvalidTopLevel,
186	186	TooManyNestedItems,
187	187	TooManyClosingItems,
...	...	@@ -206,8 +206,8 @@ const StreamingJsonParser = struct {
206	206	//
207	207	// There is currently no error recovery on a bad stream.
208	208	pub fn feed(p: &StreamingJsonParser, c: u8, token1: &?Token, token2: &?Token) Error!void {
209		*token1 = null;
210		*token2 = null;
	209	token1.* = null;
	210	token2.* = null;
211	211	p.count += 1;
212	212
213	213	// unlikely
...	...	@@ -228,7 +228,7 @@ const StreamingJsonParser = struct {
228	228	p.state = State.ValueBegin;
229	229	p.after_string_state = State.ObjectSeparator;
230	230
231		*token = Token.initMarker(Token.Id.ObjectBegin);
	231	token.* = Token.initMarker(Token.Id.ObjectBegin);
232	232	},
233	233	'[' => {
234	234	p.stack <<= 1;
...	...	@@ -238,7 +238,7 @@ const StreamingJsonParser = struct {
238	238	p.state = State.ValueBegin;
239	239	p.after_string_state = State.ValueEnd;
240	240
241		*token = Token.initMarker(Token.Id.ArrayBegin);
	241	token.* = Token.initMarker(Token.Id.ArrayBegin);
242	242	},
243	243	'-' => {
244	244	p.number_is_integer = true;
...	...	@@ -252,7 +252,7 @@ const StreamingJsonParser = struct {
252	252	p.after_value_state = State.TopLevelEnd;
253	253	p.count = 0;
254	254	},
255		'1' ... '9' => {
	255	'1'...'9' => {
256	256	p.number_is_integer = true;
257	257	p.state = State.NumberMaybeDigitOrDotOrExponent;
258	258	p.after_value_state = State.TopLevelEnd;
...	...	@@ -324,7 +324,7 @@ const StreamingJsonParser = struct {
324	324	else => {},
325	325	}
326	326
327		*token = Token.initMarker(Token.Id.ObjectEnd);
	327	token.* = Token.initMarker(Token.Id.ObjectEnd);
328	328	},
329	329	']' => {
330	330	if (p.stack & 1 != array_bit) {
...	...	@@ -348,7 +348,7 @@ const StreamingJsonParser = struct {
348	348	else => {},
349	349	}
350	350
351		*token = Token.initMarker(Token.Id.ArrayEnd);
	351	token.* = Token.initMarker(Token.Id.ArrayEnd);
352	352	},
353	353	'{' => {
354	354	if (p.stack_used == max_stack_size) {
...	...	@@ -362,7 +362,7 @@ const StreamingJsonParser = struct {
362	362	p.state = State.ValueBegin;
363	363	p.after_string_state = State.ObjectSeparator;
364	364
365		*token = Token.initMarker(Token.Id.ObjectBegin);
	365	token.* = Token.initMarker(Token.Id.ObjectBegin);
366	366	},
367	367	'[' => {
368	368	if (p.stack_used == max_stack_size) {
...	...	@@ -376,7 +376,7 @@ const StreamingJsonParser = struct {
376	376	p.state = State.ValueBegin;
377	377	p.after_string_state = State.ValueEnd;
378	378
379		*token = Token.initMarker(Token.Id.ArrayBegin);
	379	token.* = Token.initMarker(Token.Id.ArrayBegin);
380	380	},
381	381	'-' => {
382	382	p.state = State.Number;
...	...	@@ -386,7 +386,7 @@ const StreamingJsonParser = struct {
386	386	p.state = State.NumberMaybeDotOrExponent;
387	387	p.count = 0;
388	388	},
389		'1' ... '9' => {
	389	'1'...'9' => {
390	390	p.state = State.NumberMaybeDigitOrDotOrExponent;
391	391	p.count = 0;
392	392	},
...	...	@@ -428,7 +428,7 @@ const StreamingJsonParser = struct {
428	428	p.state = State.ValueBegin;
429	429	p.after_string_state = State.ObjectSeparator;
430	430
431		*token = Token.initMarker(Token.Id.ObjectBegin);
	431	token.* = Token.initMarker(Token.Id.ObjectBegin);
432	432	},
433	433	'[' => {
434	434	if (p.stack_used == max_stack_size) {
...	...	@@ -442,7 +442,7 @@ const StreamingJsonParser = struct {
442	442	p.state = State.ValueBegin;
443	443	p.after_string_state = State.ValueEnd;
444	444
445		*token = Token.initMarker(Token.Id.ArrayBegin);
	445	token.* = Token.initMarker(Token.Id.ArrayBegin);
446	446	},
447	447	'-' => {
448	448	p.state = State.Number;
...	...	@@ -452,7 +452,7 @@ const StreamingJsonParser = struct {
452	452	p.state = State.NumberMaybeDotOrExponent;
453	453	p.count = 0;
454	454	},
455		'1' ... '9' => {
	455	'1'...'9' => {
456	456	p.state = State.NumberMaybeDigitOrDotOrExponent;
457	457	p.count = 0;
458	458	},
...	...	@@ -501,7 +501,7 @@ const StreamingJsonParser = struct {
501	501	p.state = State.TopLevelEnd;
502	502	}
503	503
504		*token = Token.initMarker(Token.Id.ArrayEnd);
	504	token.* = Token.initMarker(Token.Id.ArrayEnd);
505	505	},
506	506	'}' => {
507	507	if (p.stack_used == 0) {
...	...	@@ -519,7 +519,7 @@ const StreamingJsonParser = struct {
519	519	p.state = State.TopLevelEnd;
520	520	}
521	521
522		*token = Token.initMarker(Token.Id.ObjectEnd);
	522	token.* = Token.initMarker(Token.Id.ObjectEnd);
523	523	},
524	524	0x09, 0x0A, 0x0D, 0x20 => {
525	525	// whitespace
...	...	@@ -543,7 +543,7 @@ const StreamingJsonParser = struct {
543	543	},
544	544
545	545	State.String => switch (c) {
546		0x00 ... 0x1F => {
	546	0x00...0x1F => {
547	547	return error.InvalidControlCharacter;
548	548	},
549	549	'"' => {
...	...	@@ -553,21 +553,21 @@ const StreamingJsonParser = struct {
553	553	p.complete = true;
554	554	}
555	555
556		*token = Token.initString(p.count - 1, p.string_has_escape);
	556	token.* = Token.initString(p.count - 1, p.string_has_escape);
557	557	},
558	558	'\\' => {
559	559	p.state = State.StringEscapeCharacter;
560	560	},
561		0x20, 0x21, 0x23 ... 0x5B, 0x5D ... 0x7F => {
	561	0x20, 0x21, 0x23...0x5B, 0x5D...0x7F => {
562	562	// non-control ascii
563	563	},
564		0xC0 ... 0xDF => {
	564	0xC0...0xDF => {
565	565	p.state = State.StringUtf8Byte1;
566	566	},
567		0xE0 ... 0xEF => {
	567	0xE0...0xEF => {
568	568	p.state = State.StringUtf8Byte2;
569	569	},
570		0xF0 ... 0xFF => {
	570	0xF0...0xFF => {
571	571	p.state = State.StringUtf8Byte3;
572	572	},
573	573	else => {
...	...	@@ -613,28 +613,28 @@ const StreamingJsonParser = struct {
613	613	},
614	614
615	615	State.StringEscapeHexUnicode4 => switch (c) {
616		'0' ... '9', 'A' ... 'F', 'a' ... 'f' => {
	616	'0'...'9', 'A'...'F', 'a'...'f' => {
617	617	p.state = State.StringEscapeHexUnicode3;
618	618	},
619	619	else => return error.InvalidUnicodeHexSymbol,
620	620	},
621	621
622	622	State.StringEscapeHexUnicode3 => switch (c) {
623		'0' ... '9', 'A' ... 'F', 'a' ... 'f' => {
	623	'0'...'9', 'A'...'F', 'a'...'f' => {
624	624	p.state = State.StringEscapeHexUnicode2;
625	625	},
626	626	else => return error.InvalidUnicodeHexSymbol,
627	627	},
628	628
629	629	State.StringEscapeHexUnicode2 => switch (c) {
630		'0' ... '9', 'A' ... 'F', 'a' ... 'f' => {
	630	'0'...'9', 'A'...'F', 'a'...'f' => {
631	631	p.state = State.StringEscapeHexUnicode1;
632	632	},
633	633	else => return error.InvalidUnicodeHexSymbol,
634	634	},
635	635
636	636	State.StringEscapeHexUnicode1 => switch (c) {
637		'0' ... '9', 'A' ... 'F', 'a' ... 'f' => {
	637	'0'...'9', 'A'...'F', 'a'...'f' => {
638	638	p.state = State.String;
639	639	},
640	640	else => return error.InvalidUnicodeHexSymbol,
...	...	@@ -646,7 +646,7 @@ const StreamingJsonParser = struct {
646	646	'0' => {
647	647	p.state = State.NumberMaybeDotOrExponent;
648	648	},
649		'1' ... '9' => {
	649	'1'...'9' => {
650	650	p.state = State.NumberMaybeDigitOrDotOrExponent;
651	651	},
652	652	else => {
...	...	@@ -668,7 +668,7 @@ const StreamingJsonParser = struct {
668	668	},
669	669	else => {
670	670	p.state = p.after_value_state;
671		*token = Token.initNumber(p.count, p.number_is_integer);
	671	token.* = Token.initNumber(p.count, p.number_is_integer);
672	672	return true;
673	673	},
674	674	}
...	...	@@ -685,12 +685,12 @@ const StreamingJsonParser = struct {
685	685	p.number_is_integer = false;
686	686	p.state = State.NumberExponent;
687	687	},
688		'0' ... '9' => {
	688	'0'...'9' => {
689	689	// another digit
690	690	},
691	691	else => {
692	692	p.state = p.after_value_state;
693		*token = Token.initNumber(p.count, p.number_is_integer);
	693	token.* = Token.initNumber(p.count, p.number_is_integer);
694	694	return true;
695	695	},
696	696	}
...	...	@@ -699,7 +699,7 @@ const StreamingJsonParser = struct {
699	699	State.NumberFractionalRequired => {
700	700	p.complete = p.after_value_state == State.TopLevelEnd;
701	701	switch (c) {
702		'0' ... '9' => {
	702	'0'...'9' => {
703	703	p.state = State.NumberFractional;
704	704	},
705	705	else => {
...	...	@@ -711,7 +711,7 @@ const StreamingJsonParser = struct {
711	711	State.NumberFractional => {
712	712	p.complete = p.after_value_state == State.TopLevelEnd;
713	713	switch (c) {
714		'0' ... '9' => {
	714	'0'...'9' => {
715	715	// another digit
716	716	},
717	717	'e', 'E' => {
...	...	@@ -720,7 +720,7 @@ const StreamingJsonParser = struct {
720	720	},
721	721	else => {
722	722	p.state = p.after_value_state;
723		*token = Token.initNumber(p.count, p.number_is_integer);
	723	token.* = Token.initNumber(p.count, p.number_is_integer);
724	724	return true;
725	725	},
726	726	}
...	...	@@ -735,18 +735,18 @@ const StreamingJsonParser = struct {
735	735	},
736	736	else => {
737	737	p.state = p.after_value_state;
738		*token = Token.initNumber(p.count, p.number_is_integer);
	738	token.* = Token.initNumber(p.count, p.number_is_integer);
739	739	return true;
740	740	},
741	741	}
742	742	},
743	743
744	744	State.NumberExponent => switch (c) {
745		'-', '+', => {
	745	'-', '+' => {
746	746	p.complete = false;
747	747	p.state = State.NumberExponentDigitsRequired;
748	748	},
749		'0' ... '9' => {
	749	'0'...'9' => {
750	750	p.complete = p.after_value_state == State.TopLevelEnd;
751	751	p.state = State.NumberExponentDigits;
752	752	},
...	...	@@ -756,7 +756,7 @@ const StreamingJsonParser = struct {
756	756	},
757	757
758	758	State.NumberExponentDigitsRequired => switch (c) {
759		'0' ... '9' => {
	759	'0'...'9' => {
760	760	p.complete = p.after_value_state == State.TopLevelEnd;
761	761	p.state = State.NumberExponentDigits;
762	762	},
...	...	@@ -768,12 +768,12 @@ const StreamingJsonParser = struct {
768	768	State.NumberExponentDigits => {
769	769	p.complete = p.after_value_state == State.TopLevelEnd;
770	770	switch (c) {
771		'0' ... '9' => {
	771	'0'...'9' => {
772	772	// another digit
773	773	},
774	774	else => {
775	775	p.state = p.after_value_state;
776		*token = Token.initNumber(p.count, p.number_is_integer);
	776	token.* = Token.initNumber(p.count, p.number_is_integer);
777	777	return true;
778	778	},
779	779	}
...	...	@@ -793,7 +793,7 @@ const StreamingJsonParser = struct {
793	793	'e' => {
794	794	p.state = p.after_value_state;
795	795	p.complete = p.state == State.TopLevelEnd;
796		*token = Token.init(Token.Id.True, p.count + 1, 1);
	796	token.* = Token.init(Token.Id.True, p.count + 1, 1);
797	797	},
798	798	else => {
799	799	return error.InvalidLiteral;
...	...	@@ -819,7 +819,7 @@ const StreamingJsonParser = struct {
819	819	'e' => {
820	820	p.state = p.after_value_state;
821	821	p.complete = p.state == State.TopLevelEnd;
822		*token = Token.init(Token.Id.False, p.count + 1, 1);
	822	token.* = Token.init(Token.Id.False, p.count + 1, 1);
823	823	},
824	824	else => {
825	825	return error.InvalidLiteral;
...	...	@@ -840,7 +840,7 @@ const StreamingJsonParser = struct {
840	840	'l' => {
841	841	p.state = p.after_value_state;
842	842	p.complete = p.state == State.TopLevelEnd;
843		*token = Token.init(Token.Id.Null, p.count + 1, 1);
	843	token.* = Token.init(Token.Id.Null, p.count + 1, 1);
844	844	},
845	845	else => {
846	846	return error.InvalidLiteral;
...	...	@@ -895,7 +895,7 @@ pub const Value = union(enum) {
895	895	Object: ObjectMap,
896	896
897	897	pub fn dump(self: &const Value) void {
898		switch (*self) {
	898	switch (self.*) {
899	899	Value.Null => {
900	900	std.debug.warn("null");
901	901	},
...	...	@@ -950,7 +950,7 @@ pub const Value = union(enum) {
950	950	}
951	951
952	952	fn dumpIndentLevel(self: &const Value, indent: usize, level: usize) void {
953		switch (*self) {
	953	switch (self.*) {
954	954	Value.Null => {
955	955	std.debug.warn("null");
956	956	},
...	...	@@ -1012,7 +1012,7 @@ pub const Value = union(enum) {
1012	1012	};
1013	1013
1014	1014	// A non-stream JSON parser which constructs a tree of Value's.
1015		const JsonParser = struct {
	1015	pub const JsonParser = struct {
1016	1016	allocator: &Allocator,
1017	1017	state: State,
1018	1018	copy_strings: bool,
...	...	@@ -1027,7 +1027,7 @@ const JsonParser = struct {
1027	1027	};
1028	1028
1029	1029	pub fn init(allocator: &Allocator, copy_strings: bool) JsonParser {
1030		return JsonParser {
	1030	return JsonParser{
1031	1031	.allocator = allocator,
1032	1032	.state = State.Simple,
1033	1033	.copy_strings = copy_strings,
...	...	@@ -1082,7 +1082,7 @@ const JsonParser = struct {
1082	1082
1083	1083	std.debug.assert(p.stack.len == 1);
1084	1084
1085		return ValueTree {
	1085	return ValueTree{
1086	1086	.arena = arena,
1087	1087	.root = p.stack.at(0),
1088	1088	};
...	...	@@ -1115,11 +1115,11 @@ const JsonParser = struct {
1115	1115
1116	1116	switch (token.id) {
1117	1117	Token.Id.ObjectBegin => {
1118		try p.stack.append(Value { .Object = ObjectMap.init(allocator) });
	1118	try p.stack.append(Value{ .Object = ObjectMap.init(allocator) });
1119	1119	p.state = State.ObjectKey;
1120	1120	},
1121	1121	Token.Id.ArrayBegin => {
1122		try p.stack.append(Value { .Array = ArrayList(Value).init(allocator) });
	1122	try p.stack.append(Value{ .Array = ArrayList(Value).init(allocator) });
1123	1123	p.state = State.ArrayValue;
1124	1124	},
1125	1125	Token.Id.String => {
...	...	@@ -1133,12 +1133,12 @@ const JsonParser = struct {
1133	1133	p.state = State.ObjectKey;
1134	1134	},
1135	1135	Token.Id.True => {
1136		_ = try object.put(key, Value { .Bool = true });
	1136	_ = try object.put(key, Value{ .Bool = true });
1137	1137	_ = p.stack.pop();
1138	1138	p.state = State.ObjectKey;
1139	1139	},
1140	1140	Token.Id.False => {
1141		_ = try object.put(key, Value { .Bool = false });
	1141	_ = try object.put(key, Value{ .Bool = false });
1142	1142	_ = p.stack.pop();
1143	1143	p.state = State.ObjectKey;
1144	1144	},
...	...	@@ -1165,11 +1165,11 @@ const JsonParser = struct {
1165	1165	try p.pushToParent(value);
1166	1166	},
1167	1167	Token.Id.ObjectBegin => {
1168		try p.stack.append(Value { .Object = ObjectMap.init(allocator) });
	1168	try p.stack.append(Value{ .Object = ObjectMap.init(allocator) });
1169	1169	p.state = State.ObjectKey;
1170	1170	},
1171	1171	Token.Id.ArrayBegin => {
1172		try p.stack.append(Value { .Array = ArrayList(Value).init(allocator) });
	1172	try p.stack.append(Value{ .Array = ArrayList(Value).init(allocator) });
1173	1173	p.state = State.ArrayValue;
1174	1174	},
1175	1175	Token.Id.String => {
...	...	@@ -1179,10 +1179,10 @@ const JsonParser = struct {
1179	1179	try array.append(try p.parseNumber(token, input, i));
1180	1180	},
1181	1181	Token.Id.True => {
1182		try array.append(Value { .Bool = true });
	1182	try array.append(Value{ .Bool = true });
1183	1183	},
1184	1184	Token.Id.False => {
1185		try array.append(Value { .Bool = false });
	1185	try array.append(Value{ .Bool = false });
1186	1186	},
1187	1187	Token.Id.Null => {
1188	1188	try array.append(Value.Null);
...	...	@@ -1194,11 +1194,11 @@ const JsonParser = struct {
1194	1194	},
1195	1195	State.Simple => switch (token.id) {
1196	1196	Token.Id.ObjectBegin => {
1197		try p.stack.append(Value { .Object = ObjectMap.init(allocator) });
	1197	try p.stack.append(Value{ .Object = ObjectMap.init(allocator) });
1198	1198	p.state = State.ObjectKey;
1199	1199	},
1200	1200	Token.Id.ArrayBegin => {
1201		try p.stack.append(Value { .Array = ArrayList(Value).init(allocator) });
	1201	try p.stack.append(Value{ .Array = ArrayList(Value).init(allocator) });
1202	1202	p.state = State.ArrayValue;
1203	1203	},
1204	1204	Token.Id.String => {
...	...	@@ -1208,10 +1208,10 @@ const JsonParser = struct {
1208	1208	try p.stack.append(try p.parseNumber(token, input, i));
1209	1209	},
1210	1210	Token.Id.True => {
1211		try p.stack.append(Value { .Bool = true });
	1211	try p.stack.append(Value{ .Bool = true });
1212	1212	},
1213	1213	Token.Id.False => {
1214		try p.stack.append(Value { .Bool = false });
	1214	try p.stack.append(Value{ .Bool = false });
1215	1215	},
1216	1216	Token.Id.Null => {
1217	1217	try p.stack.append(Value.Null);
...	...	@@ -1248,15 +1248,14 @@ const JsonParser = struct {
1248	1248	// TODO: We don't strictly have to copy values which do not contain any escape
1249	1249	// characters if flagged with the option.
1250	1250	const slice = token.slice(input, i);
1251		return Value { .String = try mem.dupe(p.allocator, u8, slice) };
	1251	return Value{ .String = try mem.dupe(p.allocator, u8, slice) };
1252	1252	}
1253	1253
1254	1254	fn parseNumber(p: &JsonParser, token: &const Token, input: []const u8, i: usize) !Value {
1255	1255	return if (token.number_is_integer)
1256		Value { .Integer = try std.fmt.parseInt(i64, token.slice(input, i), 10) }
	1256	Value{ .Integer = try std.fmt.parseInt(i64, token.slice(input, i), 10) }
1257	1257	else
1258		@panic("TODO: fmt.parseFloat not yet implemented")
1259		;
	1258	@panic("TODO: fmt.parseFloat not yet implemented");
1260	1259	}
1261	1260	};
1262	1261
...	...	@@ -1267,21 +1266,21 @@ test "json parser dynamic" {
1267	1266	defer p.deinit();
1268	1267
1269	1268	const s =
1270		\\{
1271		\\ "Image": {
1272		\\ "Width": 800,
1273		\\ "Height": 600,
1274		\\ "Title": "View from 15th Floor",
1275		\\ "Thumbnail": {
1276		\\ "Url": "http://www.example.com/image/481989943",
1277		\\ "Height": 125,
1278		\\ "Width": 100
1279		\\ },
1280		\\ "Animated" : false,
1281		\\ "IDs": [116, 943, 234, 38793]
1282		\\ }
1283		\\}
1284		;
	1269	\\{
	1270	\\ "Image": {
	1271	\\ "Width": 800,
	1272	\\ "Height": 600,
	1273	\\ "Title": "View from 15th Floor",
	1274	\\ "Thumbnail": {
	1275	\\ "Url": "http://www.example.com/image/481989943",
	1276	\\ "Height": 125,
	1277	\\ "Width": 100
	1278	\\ },
	1279	\\ "Animated" : false,
	1280	\\ "IDs": [116, 943, 234, 38793]
	1281	\\ }
	1282	\\}
	1283	;
1285	1284
1286	1285	var tree = try p.parse(s);
1287	1286	defer tree.deinit();

std/json_test.zig+24-72

...	...	@@ -81,9 +81,7 @@ test "y_array_with_several_null" {
81	81	}
82	82
83	83	test "y_array_with_trailing_space" {
84		ok(
85		"[2] "
86		);
	84	ok("[2] ");
87	85	}
88	86
89	87	test "y_number_0e+1" {
...	...	@@ -431,15 +429,11 @@ test "y_string_two-byte-utf-8" {
431	429	}
432	430
433	431	test "y_string_u+2028_line_sep" {
434		ok(
435		\\[" "]
436		);
	432	ok("[\"\xe2\x80\xa8\"]");
437	433	}
438	434
439	435	test "y_string_u+2029_par_sep" {
440		ok(
441		\\[" "]
442		);
	436	ok("[\"\xe2\x80\xa9\"]");
443	437	}
444	438
445	439	test "y_string_uescaped_newline" {
...	...	@@ -455,9 +449,7 @@ test "y_string_uEscape" {
455	449	}
456	450
457	451	test "y_string_unescaped_char_delete" {
458		ok(
459		\\[""]
460		);
	452	ok("[\"\x7f\"]");
461	453	}
462	454
463	455	test "y_string_unicode_2" {
...	...	@@ -527,9 +519,7 @@ test "y_string_utf8" {
527	519	}
528	520
529	521	test "y_string_with_del_character" {
530		ok(
531		\\["aa"]
532		);
	522	ok("[\"a\x7fa\"]");
533	523	}
534	524
535	525	test "y_structure_lonely_false" {
...	...	@@ -587,9 +577,7 @@ test "y_structure_true_in_array" {
587	577	}
588	578
589	579	test "y_structure_whitespace_array" {
590		ok(
591		" [] "
592		);
	580	ok(" [] ");
593	581	}
594	582
595	583	////////////////////////////////////////////////////////////////////////////////////////////////////
...	...	@@ -704,7 +692,6 @@ test "n_array_newlines_unclosed" {
704	692	);
705	693	}
706	694
707
708	695	test "n_array_number_and_comma" {
709	696	err(
710	697	\\[1,]
...	...	@@ -718,9 +705,7 @@ test "n_array_number_and_several_commas" {
718	705	}
719	706
720	707	test "n_array_spaces_vertical_tab_formfeed" {
721		err(
722		\\["a"\f]
723		);
	708	err("[\"\x0aa\"\\f]");
724	709	}
725	710
726	711	test "n_array_star_inside" {
...	...	@@ -774,9 +759,7 @@ test "n_incomplete_true" {
774	759	}
775	760
776	761	test "n_multidigit_number_then_00" {
777		err(
778		\\123
779		);
	762	err("123\x00");
780	763	}
781	764
782	765	test "n_number_0.1.2" {
...	...	@@ -983,7 +966,6 @@ test "n_number_invalid-utf-8-in-int" {
983	966	);
984	967	}
985	968
986
987	969	test "n_number_++" {
988	970	err(
989	971	\\[++1234]
...	...	@@ -1240,7 +1222,7 @@ test "n_object_unterminated-value" {
1240	1222	err(
1241	1223	\\{"a":"a
1242	1224	);
1243		}
	1225	}
1244	1226
1245	1227	test "n_object_with_single_string" {
1246	1228	err(
...	...	@@ -1255,9 +1237,7 @@ test "n_object_with_trailing_garbage" {
1255	1237	}
1256	1238
1257	1239	test "n_single_space" {
1258		err(
1259		" "
1260		);
	1240	err(" ");
1261	1241	}
1262	1242
1263	1243	test "n_string_1_surrogate_then_escape" {
...	...	@@ -1291,9 +1271,7 @@ test "n_string_accentuated_char_no_quotes" {
1291	1271	}
1292	1272
1293	1273	test "n_string_backslash_00" {
1294		err(
1295		\\["\"]
1296		);
	1274	err("[\"\x00\"]");
1297	1275	}
1298	1276
1299	1277	test "n_string_escaped_backslash_bad" {
...	...	@@ -1303,15 +1281,11 @@ test "n_string_escaped_backslash_bad" {
1303	1281	}
1304	1282
1305	1283	test "n_string_escaped_ctrl_char_tab" {
1306		err(
1307		\\["\ "]
1308		);
	1284	err("\x5b\x22\x5c\x09\x22\x5d");
1309	1285	}
1310	1286
1311	1287	test "n_string_escaped_emoji" {
1312		err(
1313		\\["\ð"]
1314		);
	1288	err("[\"\x5c\xc3\xb0\xc2\x9f\xc2\x8c\xc2\x80\"]");
1315	1289	}
1316	1290
1317	1291	test "n_string_escape_x" {
...	...	@@ -1357,9 +1331,7 @@ test "n_string_invalid_unicode_escape" {
1357	1331	}
1358	1332
1359	1333	test "n_string_invalid_utf8_after_escape" {
1360		err(
1361		\\["\å"]
1362		);
	1334	err("[\"\\\x75\xc3\xa5\"]");
1363	1335	}
1364	1336
1365	1337	test "n_string_invalid-utf-8-in-escape" {
...	...	@@ -1405,9 +1377,7 @@ test "n_string_start_escape_unclosed" {
1405	1377	}
1406	1378
1407	1379	test "n_string_unescaped_crtl_char" {
1408		err(
1409		\\["aa"]
1410		);
	1380	err("[\"a\x00a\"]");
1411	1381	}
1412	1382
1413	1383	test "n_string_unescaped_newline" {
...	...	@@ -1418,9 +1388,7 @@ test "n_string_unescaped_newline" {
1418	1388	}
1419	1389
1420	1390	test "n_string_unescaped_tab" {
1421		err(
1422		\\[" "]
1423		);
	1391	err("[\"\t\"]");
1424	1392	}
1425	1393
1426	1394	test "n_string_unicode_CapitalU" {
...	...	@@ -1436,9 +1404,7 @@ test "n_string_with_trailing_garbage" {
1436	1404	}
1437	1405
1438	1406	test "n_structure_100000_opening_arrays" {
1439		err(
1440		"[" ** 100000
1441		);
	1407	err("[" ** 100000);
1442	1408	}
1443	1409
1444	1410	test "n_structure_angle_bracket_." {
...	...	@@ -1532,9 +1498,7 @@ test "n_structure_no_data" {
1532	1498	}
1533	1499
1534	1500	test "n_structure_null-byte-outside-string" {
1535		err(
1536		\\[]
1537		);
	1501	err("[\x00]");
1538	1502	}
1539	1503
1540	1504	test "n_structure_number_with_trailing_garbage" {
...	...	@@ -1580,9 +1544,7 @@ test "n_structure_open_array_comma" {
1580	1544	}
1581	1545
1582	1546	test "n_structure_open_array_object" {
1583		err(
1584		"[{\"\":" ** 50000
1585		);
	1547	err("[{\"\":" ** 50000);
1586	1548	}
1587	1549
1588	1550	test "n_structure_open_array_open_object" {
...	...	@@ -1718,9 +1680,7 @@ test "n_structure_UTF8_BOM_no_data" {
1718	1680	}
1719	1681
1720	1682	test "n_structure_whitespace_formfeed" {
1721		err(
1722		\\[]
1723		);
	1683	err("[\x0c]");
1724	1684	}
1725	1685
1726	1686	test "n_structure_whitespace_U+2060_word_joiner" {
...	...	@@ -1900,21 +1860,15 @@ test "i_string_truncated-utf-8" {
1900	1860	}
1901	1861
1902	1862	test "i_string_utf16BE_no_BOM" {
1903		any(
1904		\\["é"]
1905		);
	1863	any("\x00\x5b\x00\x22\x00\xc3\xa9\x00\x22\x00\x5d");
1906	1864	}
1907	1865
1908	1866	test "i_string_utf16LE_no_BOM" {
1909		any(
1910		\\["é"]
1911		);
	1867	any("\x5b\x00\x22\x00\xc3\xa9\x00\x22\x00\x5d\x00");
1912	1868	}
1913	1869
1914	1870	test "i_string_UTF-16LE_with_BOM" {
1915		any(
1916		\\ÿþ["é"]
1917		);
	1871	any("\xc3\xbf\xc3\xbe\x5b\x00\x22\x00\xc3\xa9\x00\x22\x00\x5d\x00");
1918	1872	}
1919	1873
1920	1874	test "i_string_UTF-8_invalid_sequence" {
...	...	@@ -1930,9 +1884,7 @@ test "i_string_UTF8_surrogate_U+D800" {
1930	1884	}
1931	1885
1932	1886	test "i_structure_500_nested_arrays" {
1933		any(
1934		("[" 500) ++ ("]" 500)
1935		);
	1887	any(("[" 500) ++ ("]" 500));
1936	1888	}
1937	1889
1938	1890	test "i_structure_UTF-8_BOM_empty_object" {

std/linked_list.zig+55-40

...	...	@@ -26,10 +26,10 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
26	26	data: T,
27	27
28	28	pub fn init(value: &const T) Node {
29		return Node {
	29	return Node{
30	30	.prev = null,
31	31	.next = null,
32		.data = *value,
	32	.data = value.*,
33	33	};
34	34	}
35	35
...	...	@@ -45,18 +45,18 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
45	45	};
46	46
47	47	first: ?&Node,
48		last: ?&Node,
49		len: usize,
	48	last: ?&Node,
	49	len: usize,
50	50
51	51	/// Initialize a linked list.
52	52	///
53	53	/// Returns:
54	54	/// An empty linked list.
55	55	pub fn init() Self {
56		return Self {
	56	return Self{
57	57	.first = null,
58		.last = null,
59		.len = 0,
	58	.last = null,
	59	.len = 0,
60	60	};
61	61	}
62	62
...	...	@@ -131,7 +131,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
131	131	} else {
132	132	// Empty list.
133	133	list.first = new_node;
134		list.last = new_node;
	134	list.last = new_node;
135	135	new_node.prev = null;
136	136	new_node.next = null;
137	137
...	...	@@ -217,7 +217,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
217	217	pub fn createNode(list: &Self, data: &const T, allocator: &Allocator) !&Node {
218	218	comptime assert(!isIntrusive());
219	219	var node = try list.allocateNode(allocator);
220		*node = Node.init(data);
	220	node.* = Node.init(data);
221	221	return node;
222	222	}
223	223	};
...	...	@@ -227,11 +227,11 @@ test "basic linked list test" {
227	227	const allocator = debug.global_allocator;
228	228	var list = LinkedList(u32).init();
229	229
230		var one = try list.createNode(1, allocator);
231		var two = try list.createNode(2, allocator);
	230	var one = try list.createNode(1, allocator);
	231	var two = try list.createNode(2, allocator);
232	232	var three = try list.createNode(3, allocator);
233		var four = try list.createNode(4, allocator);
234		var five = try list.createNode(5, allocator);
	233	var four = try list.createNode(4, allocator);
	234	var five = try list.createNode(5, allocator);
235	235	defer {
236	236	list.destroyNode(one, allocator);
237	237	list.destroyNode(two, allocator);
...	...	@@ -240,11 +240,11 @@ test "basic linked list test" {
240	240	list.destroyNode(five, allocator);
241	241	}
242	242
243		list.append(two); // {2}
244		list.append(five); // {2, 5}
245		list.prepend(one); // {1, 2, 5}
246		list.insertBefore(five, four); // {1, 2, 4, 5}
247		list.insertAfter(two, three); // {1, 2, 3, 4, 5}
	243	list.append(two); // {2}
	244	list.append(five); // {2, 5}
	245	list.prepend(one); // {1, 2, 5}
	246	list.insertBefore(five, four); // {1, 2, 4, 5}
	247	list.insertAfter(two, three); // {1, 2, 3, 4, 5}
248	248
249	249	// Traverse forwards.
250	250	{
...	...	@@ -266,13 +266,13 @@ test "basic linked list test" {
266	266	}
267	267	}
268	268
269		var first = list.popFirst(); // {2, 3, 4, 5}
270		var last = list.pop(); // {2, 3, 4}
271		list.remove(three); // {2, 4}
	269	var first = list.popFirst(); // {2, 3, 4, 5}
	270	var last = list.pop(); // {2, 3, 4}
	271	list.remove(three); // {2, 4}
272	272
273		assert ((??list.first).data == 2);
274		assert ((??list.last ).data == 4);
275		assert (list.len == 2);
	273	assert((??list.first).data == 2);
	274	assert((??list.last).data == 4);
	275	assert(list.len == 2);
276	276	}
277	277
278	278	const ElementList = IntrusiveLinkedList(Element, "link");
...	...	@@ -285,17 +285,32 @@ test "basic intrusive linked list test" {
285	285	const allocator = debug.global_allocator;
286	286	var list = ElementList.init();
287	287
288		var one = Element { .value = 1, .link = ElementList.Node.initIntrusive() };
289		var two = Element { .value = 2, .link = ElementList.Node.initIntrusive() };
290		var three = Element { .value = 3, .link = ElementList.Node.initIntrusive() };
291		var four = Element { .value = 4, .link = ElementList.Node.initIntrusive() };
292		var five = Element { .value = 5, .link = ElementList.Node.initIntrusive() };
	288	var one = Element{
	289	.value = 1,
	290	.link = ElementList.Node.initIntrusive(),
	291	};
	292	var two = Element{
	293	.value = 2,
	294	.link = ElementList.Node.initIntrusive(),
	295	};
	296	var three = Element{
	297	.value = 3,
	298	.link = ElementList.Node.initIntrusive(),
	299	};
	300	var four = Element{
	301	.value = 4,
	302	.link = ElementList.Node.initIntrusive(),
	303	};
	304	var five = Element{
	305	.value = 5,
	306	.link = ElementList.Node.initIntrusive(),
	307	};
293	308
294		list.append(&two.link); // {2}
295		list.append(&five.link); // {2, 5}
296		list.prepend(&one.link); // {1, 2, 5}
297		list.insertBefore(&five.link, &four.link); // {1, 2, 4, 5}
298		list.insertAfter(&two.link, &three.link); // {1, 2, 3, 4, 5}
	309	list.append(&two.link); // {2}
	310	list.append(&five.link); // {2, 5}
	311	list.prepend(&one.link); // {1, 2, 5}
	312	list.insertBefore(&five.link, &four.link); // {1, 2, 4, 5}
	313	list.insertAfter(&two.link, &three.link); // {1, 2, 3, 4, 5}
299	314
300	315	// Traverse forwards.
301	316	{
...	...	@@ -317,11 +332,11 @@ test "basic intrusive linked list test" {
317	332	}
318	333	}
319	334
320		var first = list.popFirst(); // {2, 3, 4, 5}
321		var last = list.pop(); // {2, 3, 4}
322		list.remove(&three.link); // {2, 4}
	335	var first = list.popFirst(); // {2, 3, 4, 5}
	336	var last = list.pop(); // {2, 3, 4}
	337	list.remove(&three.link); // {2, 4}
323	338
324		assert ((??list.first).toData().value == 2);
325		assert ((??list.last ).toData().value == 4);
326		assert (list.len == 2);
	339	assert((??list.first).toData().value == 2);
	340	assert((??list.last).toData().value == 4);
	341	assert(list.len == 2);
327	342	}

std/macho.zig+11-9

...	...	@@ -58,15 +58,15 @@ pub const SymbolTable = struct {
58	58	// code, its displacement is different.
59	59	pub fn deinit(self: &SymbolTable) void {
60	60	self.allocator.free(self.symbols);
61		self.symbols = []const Symbol {};
	61	self.symbols = []const Symbol{};
62	62
63	63	self.allocator.free(self.strings);
64		self.strings = []const u8 {};
	64	self.strings = []const u8{};
65	65	}
66	66
67	67	pub fn search(self: &const SymbolTable, address: usize) ?&const Symbol {
68	68	var min: usize = 0;
69		var max: usize = self.symbols.len - 1; // Exclude sentinel.
	69	var max: usize = self.symbols.len - 1; // Exclude sentinel.
70	70	while (min < max) {
71	71	const mid = min + (max - min) / 2;
72	72	const curr = &self.symbols[mid];
...	...	@@ -118,10 +118,11 @@ pub fn loadSymbols(allocator: &mem.Allocator, in: &io.FileInStream) !SymbolTable
118	118	try in.stream.readNoEof(strings);
119	119
120	120	var nsyms: usize = 0;
121		for (syms) \|sym\| if (isSymbol(sym)) nsyms += 1;
	121	for (syms) \|sym\|
	122	if (isSymbol(sym)) nsyms += 1;
122	123	if (nsyms == 0) return error.MissingDebugInfo;
123	124
124		var symbols = try allocator.alloc(Symbol, nsyms + 1); // Room for sentinel.
	125	var symbols = try allocator.alloc(Symbol, nsyms + 1); // Room for sentinel.
125	126	errdefer allocator.free(symbols);
126	127
127	128	var pie_slide: usize = 0;
...	...	@@ -132,7 +133,7 @@ pub fn loadSymbols(allocator: &mem.Allocator, in: &io.FileInStream) !SymbolTable
132	133	const end = ??mem.indexOfScalarPos(u8, strings, start, 0);
133	134	const name = strings[start..end];
134	135	const address = sym.n_value;
135		symbols[nsym] = Symbol { .name = name, .address = address };
	136	symbols[nsym] = Symbol{ .name = name, .address = address };
136	137	nsym += 1;
137	138	if (is_pie and mem.eql(u8, name, "_SymbolTable_deinit")) {
138	139	pie_slide = @ptrToInt(SymbolTable.deinit) - address;
...	...	@@ -145,13 +146,14 @@ pub fn loadSymbols(allocator: &mem.Allocator, in: &io.FileInStream) !SymbolTable
145	146	// Insert the sentinel. Since we don't know where the last function ends,
146	147	// we arbitrarily limit it to the start address + 4 KB.
147	148	const top = symbols[nsyms - 1].address + 4096;
148		symbols[nsyms] = Symbol { .name = "", .address = top };
	149	symbols[nsyms] = Symbol{ .name = "", .address = top };
149	150
150	151	if (pie_slide != 0) {
151		for (symbols) \|*symbol\| symbol.address += pie_slide;
	152	for (symbols) \|*symbol\|
	153	symbol.address += pie_slide;
152	154	}
153	155
154		return SymbolTable {
	156	return SymbolTable{
155	157	.allocator = allocator,
156	158	.symbols = symbols,
157	159	.strings = strings,

std/math/acos.zig+7-7

...	...	@@ -16,7 +16,7 @@ pub fn acos(x: var) @typeOf(x) {
16	16	}
17	17
18	18	fn r32(z: f32) f32 {
19		const pS0 = 1.6666586697e-01;
	19	const pS0 = 1.6666586697e-01;
20	20	const pS1 = -4.2743422091e-02;
21	21	const pS2 = -8.6563630030e-03;
22	22	const qS1 = -7.0662963390e-01;
...	...	@@ -74,16 +74,16 @@ fn acos32(x: f32) f32 {
74	74	}
75	75
76	76	fn r64(z: f64) f64 {
77		const pS0: f64 = 1.66666666666666657415e-01;
	77	const pS0: f64 = 1.66666666666666657415e-01;
78	78	const pS1: f64 = -3.25565818622400915405e-01;
79		const pS2: f64 = 2.01212532134862925881e-01;
	79	const pS2: f64 = 2.01212532134862925881e-01;
80	80	const pS3: f64 = -4.00555345006794114027e-02;
81		const pS4: f64 = 7.91534994289814532176e-04;
82		const pS5: f64 = 3.47933107596021167570e-05;
	81	const pS4: f64 = 7.91534994289814532176e-04;
	82	const pS5: f64 = 3.47933107596021167570e-05;
83	83	const qS1: f64 = -2.40339491173441421878e+00;
84		const qS2: f64 = 2.02094576023350569471e+00;
	84	const qS2: f64 = 2.02094576023350569471e+00;
85	85	const qS3: f64 = -6.88283971605453293030e-01;
86		const qS4: f64 = 7.70381505559019352791e-02;
	86	const qS4: f64 = 7.70381505559019352791e-02;
87	87
88	88	const p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5)))));
89	89	const q = 1.0 + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4)));

std/math/asin.zig+9-9

...	...	@@ -17,7 +17,7 @@ pub fn asin(x: var) @typeOf(x) {
17	17	}
18	18
19	19	fn r32(z: f32) f32 {
20		const pS0 = 1.6666586697e-01;
	20	const pS0 = 1.6666586697e-01;
21	21	const pS1 = -4.2743422091e-02;
22	22	const pS2 = -8.6563630030e-03;
23	23	const qS1 = -7.0662963390e-01;
...	...	@@ -37,9 +37,9 @@ fn asin32(x: f32) f32 {
37	37	if (ix >= 0x3F800000) {
38	38	// \|x\| >= 1
39	39	if (ix == 0x3F800000) {
40		return x * pio2 + 0x1.0p-120; // asin(+-1) = +-pi/2 with inexact
	40	return x * pio2 + 0x1.0p-120; // asin(+-1) = +-pi/2 with inexact
41	41	} else {
42		return math.nan(f32); // asin(\|x\| > 1) is nan
	42	return math.nan(f32); // asin(\|x\| > 1) is nan
43	43	}
44	44	}
45	45
...	...	@@ -66,16 +66,16 @@ fn asin32(x: f32) f32 {
66	66	}
67	67
68	68	fn r64(z: f64) f64 {
69		const pS0: f64 = 1.66666666666666657415e-01;
	69	const pS0: f64 = 1.66666666666666657415e-01;
70	70	const pS1: f64 = -3.25565818622400915405e-01;
71		const pS2: f64 = 2.01212532134862925881e-01;
	71	const pS2: f64 = 2.01212532134862925881e-01;
72	72	const pS3: f64 = -4.00555345006794114027e-02;
73		const pS4: f64 = 7.91534994289814532176e-04;
74		const pS5: f64 = 3.47933107596021167570e-05;
	73	const pS4: f64 = 7.91534994289814532176e-04;
	74	const pS5: f64 = 3.47933107596021167570e-05;
75	75	const qS1: f64 = -2.40339491173441421878e+00;
76		const qS2: f64 = 2.02094576023350569471e+00;
	76	const qS2: f64 = 2.02094576023350569471e+00;
77	77	const qS3: f64 = -6.88283971605453293030e-01;
78		const qS4: f64 = 7.70381505559019352791e-02;
	78	const qS4: f64 = 7.70381505559019352791e-02;
79	79
80	80	const p = z * (pS0 + z * (pS1 + z * (pS2 + z * (pS3 + z * (pS4 + z * pS5)))));
81	81	const q = 1.0 + z * (qS1 + z * (qS2 + z * (qS3 + z * qS4)));

std/math/atan.zig+15-17

...	...	@@ -17,25 +17,25 @@ pub fn atan(x: var) @typeOf(x) {
17	17	}
18	18
19	19	fn atan32(x_: f32) f32 {
20		const atanhi = []const f32 {
	20	const atanhi = []const f32{
21	21	4.6364760399e-01, // atan(0.5)hi
22	22	7.8539812565e-01, // atan(1.0)hi
23	23	9.8279368877e-01, // atan(1.5)hi
24	24	1.5707962513e+00, // atan(inf)hi
25	25	};
26	26
27		const atanlo = []const f32 {
	27	const atanlo = []const f32{
28	28	5.0121582440e-09, // atan(0.5)lo
29	29	3.7748947079e-08, // atan(1.0)lo
30	30	3.4473217170e-08, // atan(1.5)lo
31	31	7.5497894159e-08, // atan(inf)lo
32	32	};
33	33
34		const aT = []const f32 {
	34	const aT = []const f32{
35	35	3.3333328366e-01,
36		-1.9999158382e-01,
	36	-1.9999158382e-01,
37	37	1.4253635705e-01,
38		-1.0648017377e-01,
	38	-1.0648017377e-01,
39	39	6.1687607318e-02,
40	40	};
41	41
...	...	@@ -80,8 +80,7 @@ fn atan32(x_: f32) f32 {
80	80	id = 1;
81	81	x = (x - 1.0) / (x + 1.0);
82	82	}
83		}
84		else {
	83	} else {
85	84	// \|x\| < 2.4375
86	85	if (ix < 0x401C0000) {
87	86	id = 2;
...	...	@@ -109,31 +108,31 @@ fn atan32(x_: f32) f32 {
109	108	}
110	109
111	110	fn atan64(x_: f64) f64 {
112		const atanhi = []const f64 {
	111	const atanhi = []const f64{
113	112	4.63647609000806093515e-01, // atan(0.5)hi
114	113	7.85398163397448278999e-01, // atan(1.0)hi
115	114	9.82793723247329054082e-01, // atan(1.5)hi
116	115	1.57079632679489655800e+00, // atan(inf)hi
117	116	};
118	117
119		const atanlo = []const f64 {
	118	const atanlo = []const f64{
120	119	2.26987774529616870924e-17, // atan(0.5)lo
121	120	3.06161699786838301793e-17, // atan(1.0)lo
122	121	1.39033110312309984516e-17, // atan(1.5)lo
123	122	6.12323399573676603587e-17, // atan(inf)lo
124	123	};
125	124
126		const aT = []const f64 {
	125	const aT = []const f64{
127	126	3.33333333333329318027e-01,
128		-1.99999999998764832476e-01,
	127	-1.99999999998764832476e-01,
129	128	1.42857142725034663711e-01,
130		-1.11111104054623557880e-01,
	129	-1.11111104054623557880e-01,
131	130	9.09088713343650656196e-02,
132		-7.69187620504482999495e-02,
	131	-7.69187620504482999495e-02,
133	132	6.66107313738753120669e-02,
134		-5.83357013379057348645e-02,
	133	-5.83357013379057348645e-02,
135	134	4.97687799461593236017e-02,
136		-3.65315727442169155270e-02,
	135	-3.65315727442169155270e-02,
137	136	1.62858201153657823623e-02,
138	137	};
139	138
...	...	@@ -179,8 +178,7 @@ fn atan64(x_: f64) f64 {
179	178	id = 1;
180	179	x = (x - 1.0) / (x + 1.0);
181	180	}
182		}
183		else {
	181	} else {
184	182	// \|x\| < 2.4375
185	183	if (ix < 0x40038000) {
186	184	id = 2;

std/math/atan2.zig+32-32

...	...	@@ -31,7 +31,7 @@ pub fn atan2(comptime T: type, x: T, y: T) T {
31	31	}
32	32
33	33	fn atan2_32(y: f32, x: f32) f32 {
34		const pi: f32 = 3.1415927410e+00;
	34	const pi: f32 = 3.1415927410e+00;
35	35	const pi_lo: f32 = -8.7422776573e-08;
36	36
37	37	if (math.isNan(x) or math.isNan(y)) {
...	...	@@ -53,9 +53,9 @@ fn atan2_32(y: f32, x: f32) f32 {
53	53
54	54	if (iy == 0) {
55	55	switch (m) {
56		0, 1 => return y, // atan(+-0, +...)
57		2 => return pi, // atan(+0, -...)
58		3 => return -pi, // atan(-0, -...)
	56	0, 1 => return y, // atan(+-0, +...)
	57	2 => return pi, // atan(+0, -...)
	58	3 => return -pi, // atan(-0, -...)
59	59	else => unreachable,
60	60	}
61	61	}
...	...	@@ -71,18 +71,18 @@ fn atan2_32(y: f32, x: f32) f32 {
71	71	if (ix == 0x7F800000) {
72	72	if (iy == 0x7F800000) {
73	73	switch (m) {
74		0 => return pi / 4, // atan(+inf, +inf)
75		1 => return -pi / 4, // atan(-inf, +inf)
76		2 => return 3*pi / 4, // atan(+inf, -inf)
77		3 => return -3*pi / 4, // atan(-inf, -inf)
	74	0 => return pi / 4, // atan(+inf, +inf)
	75	1 => return -pi / 4, // atan(-inf, +inf)
	76	2 => return 3 * pi / 4, // atan(+inf, -inf)
	77	3 => return -3 * pi / 4, // atan(-inf, -inf)
78	78	else => unreachable,
79	79	}
80	80	} else {
81	81	switch (m) {
82		0 => return 0.0, // atan(+..., +inf)
83		1 => return -0.0, // atan(-..., +inf)
84		2 => return pi, // atan(+..., -inf)
85		3 => return -pi, // atan(-...f, -inf)
	82	0 => return 0.0, // atan(+..., +inf)
	83	1 => return -0.0, // atan(-..., +inf)
	84	2 => return pi, // atan(+..., -inf)
	85	3 => return -pi, // atan(-...f, -inf)
86	86	else => unreachable,
87	87	}
88	88	}
...	...	@@ -107,16 +107,16 @@ fn atan2_32(y: f32, x: f32) f32 {
107	107	};
108	108
109	109	switch (m) {
110		0 => return z, // atan(+, +)
111		1 => return -z, // atan(-, +)
112		2 => return pi - (z - pi_lo), // atan(+, -)
113		3 => return (z - pi_lo) - pi, // atan(-, -)
	110	0 => return z, // atan(+, +)
	111	1 => return -z, // atan(-, +)
	112	2 => return pi - (z - pi_lo), // atan(+, -)
	113	3 => return (z - pi_lo) - pi, // atan(-, -)
114	114	else => unreachable,
115	115	}
116	116	}
117	117
118	118	fn atan2_64(y: f64, x: f64) f64 {
119		const pi: f64 = 3.1415926535897931160E+00;
	119	const pi: f64 = 3.1415926535897931160E+00;
120	120	const pi_lo: f64 = 1.2246467991473531772E-16;
121	121
122	122	if (math.isNan(x) or math.isNan(y)) {
...	...	@@ -143,9 +143,9 @@ fn atan2_64(y: f64, x: f64) f64 {
143	143
144	144	if (iy \| ly == 0) {
145	145	switch (m) {
146		0, 1 => return y, // atan(+-0, +...)
147		2 => return pi, // atan(+0, -...)
148		3 => return -pi, // atan(-0, -...)
	146	0, 1 => return y, // atan(+-0, +...)
	147	2 => return pi, // atan(+0, -...)
	148	3 => return -pi, // atan(-0, -...)
149	149	else => unreachable,
150	150	}
151	151	}
...	...	@@ -161,18 +161,18 @@ fn atan2_64(y: f64, x: f64) f64 {
161	161	if (ix == 0x7FF00000) {
162	162	if (iy == 0x7FF00000) {
163	163	switch (m) {
164		0 => return pi / 4, // atan(+inf, +inf)
165		1 => return -pi / 4, // atan(-inf, +inf)
166		2 => return 3*pi / 4, // atan(+inf, -inf)
167		3 => return -3*pi / 4, // atan(-inf, -inf)
	164	0 => return pi / 4, // atan(+inf, +inf)
	165	1 => return -pi / 4, // atan(-inf, +inf)
	166	2 => return 3 * pi / 4, // atan(+inf, -inf)
	167	3 => return -3 * pi / 4, // atan(-inf, -inf)
168	168	else => unreachable,
169	169	}
170	170	} else {
171	171	switch (m) {
172		0 => return 0.0, // atan(+..., +inf)
173		1 => return -0.0, // atan(-..., +inf)
174		2 => return pi, // atan(+..., -inf)
175		3 => return -pi, // atan(-...f, -inf)
	172	0 => return 0.0, // atan(+..., +inf)
	173	1 => return -0.0, // atan(-..., +inf)
	174	2 => return pi, // atan(+..., -inf)
	175	3 => return -pi, // atan(-...f, -inf)
176	176	else => unreachable,
177	177	}
178	178	}
...	...	@@ -197,10 +197,10 @@ fn atan2_64(y: f64, x: f64) f64 {
197	197	};
198	198
199	199	switch (m) {
200		0 => return z, // atan(+, +)
201		1 => return -z, // atan(-, +)
202		2 => return pi - (z - pi_lo), // atan(+, -)
203		3 => return (z - pi_lo) - pi, // atan(-, -)
	200	0 => return z, // atan(+, +)
	201	1 => return -z, // atan(-, +)
	202	2 => return pi - (z - pi_lo), // atan(+, -)
	203	3 => return (z - pi_lo) - pi, // atan(-, -)
204	204	else => unreachable,
205	205	}
206	206	}

std/math/cbrt.zig+5-5

...	...	@@ -58,15 +58,15 @@ fn cbrt32(x: f32) f32 {
58	58	}
59	59
60	60	fn cbrt64(x: f64) f64 {
61		const B1: u32 = 715094163; // (1023 - 1023 / 3 - 0.03306235651 * 2^20
62		const B2: u32 = 696219795; // (1023 - 1023 / 3 - 54 / 3 - 0.03306235651 * 2^20
	61	const B1: u32 = 715094163; // (1023 - 1023 / 3 - 0.03306235651 * 2^20
	62	const B2: u32 = 696219795; // (1023 - 1023 / 3 - 54 / 3 - 0.03306235651 * 2^20
63	63
64	64	// \|1 / cbrt(x) - p(x)\| < 2^(23.5)
65		const P0: f64 = 1.87595182427177009643;
	65	const P0: f64 = 1.87595182427177009643;
66	66	const P1: f64 = -1.88497979543377169875;
67		const P2: f64 = 1.621429720105354466140;
	67	const P2: f64 = 1.621429720105354466140;
68	68	const P3: f64 = -0.758397934778766047437;
69		const P4: f64 = 0.145996192886612446982;
	69	const P4: f64 = 0.145996192886612446982;
70	70
71	71	var u = @bitCast(u64, x);
72	72	var hx = u32(u >> 32) & 0x7FFFFFFF;

std/math/ceil.zig+2-2

...	...	@@ -56,7 +56,7 @@ fn ceil64(x: f64) f64 {
56	56	const e = (u >> 52) & 0x7FF;
57	57	var y: f64 = undefined;
58	58
59		if (e >= 0x3FF+52 or x == 0) {
	59	if (e >= 0x3FF + 52 or x == 0) {
60	60	return x;
61	61	}
62	62
...	...	@@ -68,7 +68,7 @@ fn ceil64(x: f64) f64 {
68	68	y = x + math.f64_toint - math.f64_toint - x;
69	69	}
70	70
71		if (e <= 0x3FF-1) {
	71	if (e <= 0x3FF - 1) {
72	72	math.forceEval(y);
73	73	if (u >> 63 != 0) {
74	74	return -0.0;

std/math/complex/exp.zig+11-17

...	...	@@ -19,8 +19,8 @@ pub fn exp(z: var) Complex(@typeOf(z.re)) {
19	19	fn exp32(z: &const Complex(f32)) Complex(f32) {
20	20	@setFloatMode(this, @import("builtin").FloatMode.Strict);
21	21
22		const exp_overflow = 0x42b17218; // max_exp * ln2 ~= 88.72283955
23		const cexp_overflow = 0x43400074; // (max_exp - min_denom_exp) * ln2
	22	const exp_overflow = 0x42b17218; // max_exp * ln2 ~= 88.72283955
	23	const cexp_overflow = 0x43400074; // (max_exp - min_denom_exp) * ln2
24	24
25	25	const x = z.re;
26	26	const y = z.im;
...	...	@@ -41,12 +41,10 @@ fn exp32(z: &const Complex(f32)) Complex(f32) {
41	41	// cexp(finite\|nan +- i inf\|nan) = nan + i nan
42	42	if ((hx & 0x7fffffff) != 0x7f800000) {
43	43	return Complex(f32).new(y - y, y - y);
44		}
45		// cexp(-inf +- i inf\|nan) = 0 + i0
	44	} // cexp(-inf +- i inf\|nan) = 0 + i0
46	45	else if (hx & 0x80000000 != 0) {
47	46	return Complex(f32).new(0, 0);
48		}
49		// cexp(+inf +- i inf\|nan) = inf + i nan
	47	} // cexp(+inf +- i inf\|nan) = inf + i nan
50	48	else {
51	49	return Complex(f32).new(x, y - y);
52	50	}
...	...	@@ -55,8 +53,7 @@ fn exp32(z: &const Complex(f32)) Complex(f32) {
55	53	// 88.7 <= x <= 192 so must scale
56	54	if (hx >= exp_overflow and hx <= cexp_overflow) {
57	55	return ldexp_cexp(z, 0);
58		}
59		// - x < exp_overflow => exp(x) won't overflow (common)
	56	} // - x < exp_overflow => exp(x) won't overflow (common)
60	57	// - x > cexp_overflow, so exp(x) * s overflows for s > 0
61	58	// - x = +-inf
62	59	// - x = nan
...	...	@@ -67,8 +64,8 @@ fn exp32(z: &const Complex(f32)) Complex(f32) {
67	64	}
68	65
69	66	fn exp64(z: &const Complex(f64)) Complex(f64) {
70		const exp_overflow = 0x40862e42; // high bits of max_exp * ln2 ~= 710
71		const cexp_overflow = 0x4096b8e4; // (max_exp - min_denorm_exp) * ln2
	67	const exp_overflow = 0x40862e42; // high bits of max_exp * ln2 ~= 710
	68	const cexp_overflow = 0x4096b8e4; // (max_exp - min_denorm_exp) * ln2
72	69
73	70	const x = z.re;
74	71	const y = z.im;
...	...	@@ -95,12 +92,10 @@ fn exp64(z: &const Complex(f64)) Complex(f64) {
95	92	// cexp(finite\|nan +- i inf\|nan) = nan + i nan
96	93	if (lx != 0 or (hx & 0x7fffffff) != 0x7ff00000) {
97	94	return Complex(f64).new(y - y, y - y);
98		}
99		// cexp(-inf +- i inf\|nan) = 0 + i0
	95	} // cexp(-inf +- i inf\|nan) = 0 + i0
100	96	else if (hx & 0x80000000 != 0) {
101	97	return Complex(f64).new(0, 0);
102		}
103		// cexp(+inf +- i inf\|nan) = inf + i nan
	98	} // cexp(+inf +- i inf\|nan) = inf + i nan
104	99	else {
105	100	return Complex(f64).new(x, y - y);
106	101	}
...	...	@@ -109,9 +104,8 @@ fn exp64(z: &const Complex(f64)) Complex(f64) {
109	104	// 709.7 <= x <= 1454.3 so must scale
110	105	if (hx >= exp_overflow and hx <= cexp_overflow) {
111	106	const r = ldexp_cexp(z, 0);
112		return *r;
113		}
114		// - x < exp_overflow => exp(x) won't overflow (common)
	107	return r.*;
	108	} // - x < exp_overflow => exp(x) won't overflow (common)
115	109	// - x > cexp_overflow, so exp(x) * s overflows for s > 0
116	110	// - x = +-inf
117	111	// - x = nan

std/math/complex/index.zig+11-11

...	...	@@ -31,28 +31,28 @@ pub fn Complex(comptime T: type) type {
31	31	im: T,
32	32
33	33	pub fn new(re: T, im: T) Self {
34		return Self {
	34	return Self{
35	35	.re = re,
36	36	.im = im,
37	37	};
38	38	}
39	39
40	40	pub fn add(self: &const Self, other: &const Self) Self {
41		return Self {
	41	return Self{
42	42	.re = self.re + other.re,
43	43	.im = self.im + other.im,
44	44	};
45	45	}
46	46
47	47	pub fn sub(self: &const Self, other: &const Self) Self {
48		return Self {
	48	return Self{
49	49	.re = self.re - other.re,
50	50	.im = self.im - other.im,
51	51	};
52	52	}
53	53
54	54	pub fn mul(self: &const Self, other: &const Self) Self {
55		return Self {
	55	return Self{
56	56	.re = self.re * other.re - self.im * other.im,
57	57	.im = self.im * other.re + self.re * other.im,
58	58	};
...	...	@@ -63,14 +63,14 @@ pub fn Complex(comptime T: type) type {
63	63	const im_num = self.im * other.re - self.re * other.im;
64	64	const den = other.re * other.re + other.im * other.im;
65	65
66		return Self {
	66	return Self{
67	67	.re = re_num / den,
68	68	.im = im_num / den,
69	69	};
70	70	}
71	71
72	72	pub fn conjugate(self: &const Self) Self {
73		return Self {
	73	return Self{
74	74	.re = self.re,
75	75	.im = -self.im,
76	76	};
...	...	@@ -78,7 +78,7 @@ pub fn Complex(comptime T: type) type {
78	78
79	79	pub fn reciprocal(self: &const Self) Self {
80	80	const m = self.re * self.re + self.im * self.im;
81		return Self {
	81	return Self{
82	82	.re = self.re / m,
83	83	.im = -self.im / m,
84	84	};
...	...	@@ -121,8 +121,8 @@ test "complex.div" {
121	121	const b = Complex(f32).new(2, 7);
122	122	const c = a.div(b);
123	123
124		debug.assert(math.approxEq(f32, c.re, f32(31)/53, epsilon) and
125		math.approxEq(f32, c.im, f32(-29)/53, epsilon));
	124	debug.assert(math.approxEq(f32, c.re, f32(31) / 53, epsilon) and
	125	math.approxEq(f32, c.im, f32(-29) / 53, epsilon));
126	126	}
127	127
128	128	test "complex.conjugate" {
...	...	@@ -136,8 +136,8 @@ test "complex.reciprocal" {
136	136	const a = Complex(f32).new(5, 3);
137	137	const c = a.reciprocal();
138	138
139		debug.assert(math.approxEq(f32, c.re, f32(5)/34, epsilon) and
140		math.approxEq(f32, c.im, f32(-3)/34, epsilon));
	139	debug.assert(math.approxEq(f32, c.re, f32(5) / 34, epsilon) and
	140	math.approxEq(f32, c.im, f32(-3) / 34, epsilon));
141	141	}
142	142
143	143	test "complex.magnitude" {

std/math/complex/ldexp.zig+7-10

...	...	@@ -15,12 +15,12 @@ pub fn ldexp_cexp(z: var, expt: i32) Complex(@typeOf(z.re)) {
15	15	}
16	16
17	17	fn frexp_exp32(x: f32, expt: &i32) f32 {
18		const k = 235; // reduction constant
19		const kln2 = 162.88958740; // k * ln2
	18	const k = 235; // reduction constant
	19	const kln2 = 162.88958740; // k * ln2
20	20
21	21	const exp_x = math.exp(x - kln2);
22	22	const hx = @bitCast(u32, exp_x);
23		*expt = i32(hx >> 23) - (0x7f + 127) + k;
	23	expt.* = i32(hx >> 23) - (0x7f + 127) + k;
24	24	return @bitCast(f32, (hx & 0x7fffff) \| ((0x7f + 127) << 23));
25	25	}
26	26
...	...	@@ -35,15 +35,12 @@ fn ldexp_cexp32(z: &const Complex(f32), expt: i32) Complex(f32) {
35	35	const half_expt2 = exptf - half_expt1;
36	36	const scale2 = @bitCast(f32, (0x7f + half_expt2) << 23);
37	37
38		return Complex(f32).new(
39		math.cos(z.im) * exp_x * scale1 * scale2,
40		math.sin(z.im) * exp_x * scale1 * scale2,
41		);
	38	return Complex(f32).new(math.cos(z.im) * exp_x * scale1 * scale2, math.sin(z.im) * exp_x * scale1 * scale2);
42	39	}
43	40
44	41	fn frexp_exp64(x: f64, expt: &i32) f64 {
45		const k = 1799; // reduction constant
46		const kln2 = 1246.97177782734161156; // k * ln2
	42	const k = 1799; // reduction constant
	43	const kln2 = 1246.97177782734161156; // k * ln2
47	44
48	45	const exp_x = math.exp(x - kln2);
49	46
...	...	@@ -51,7 +48,7 @@ fn frexp_exp64(x: f64, expt: &i32) f64 {
51	48	const hx = u32(fx >> 32);
52	49	const lx = @truncate(u32, fx);
53	50
54		*expt = i32(hx >> 20) - (0x3ff + 1023) + k;
	51	expt.* = i32(hx >> 20) - (0x3ff + 1023) + k;
55	52
56	53	const high_word = (hx & 0xfffff) \| ((0x3ff + 1023) << 20);
57	54	return @bitCast(f64, (u64(high_word) << 32) \| lx);

std/math/complex/tanh.zig+2-2

...	...	@@ -98,7 +98,7 @@ test "complex.ctanh32" {
98	98	const a = Complex(f32).new(5, 3);
99	99	const c = tanh(a);
100	100
101		debug.assert(math.approxEq(f32, c.re, 0.999913, epsilon));
	101	debug.assert(math.approxEq(f32, c.re, 0.999913, epsilon));
102	102	debug.assert(math.approxEq(f32, c.im, -0.000025, epsilon));
103	103	}
104	104
...	...	@@ -106,6 +106,6 @@ test "complex.ctanh64" {
106	106	const a = Complex(f64).new(5, 3);
107	107	const c = tanh(a);
108	108
109		debug.assert(math.approxEq(f64, c.re, 0.999913, epsilon));
	109	debug.assert(math.approxEq(f64, c.re, 0.999913, epsilon));
110	110	debug.assert(math.approxEq(f64, c.im, -0.000025, epsilon));
111	111	}

std/math/cos.zig+6-6

...	...	@@ -18,20 +18,20 @@ pub fn cos(x: var) @typeOf(x) {
18	18	}
19	19
20	20	// sin polynomial coefficients
21		const S0 = 1.58962301576546568060E-10;
	21	const S0 = 1.58962301576546568060E-10;
22	22	const S1 = -2.50507477628578072866E-8;
23		const S2 = 2.75573136213857245213E-6;
	23	const S2 = 2.75573136213857245213E-6;
24	24	const S3 = -1.98412698295895385996E-4;
25		const S4 = 8.33333333332211858878E-3;
	25	const S4 = 8.33333333332211858878E-3;
26	26	const S5 = -1.66666666666666307295E-1;
27	27
28	28	// cos polynomial coeffiecients
29	29	const C0 = -1.13585365213876817300E-11;
30		const C1 = 2.08757008419747316778E-9;
	30	const C1 = 2.08757008419747316778E-9;
31	31	const C2 = -2.75573141792967388112E-7;
32		const C3 = 2.48015872888517045348E-5;
	32	const C3 = 2.48015872888517045348E-5;
33	33	const C4 = -1.38888888888730564116E-3;
34		const C5 = 4.16666666666665929218E-2;
	34	const C5 = 4.16666666666665929218E-2;
35	35
36	36	// NOTE: This is taken from the go stdlib. The musl implementation is much more complex.
37	37	//

std/math/exp.zig+13-17

...	...	@@ -20,10 +20,10 @@ pub fn exp(x: var) @typeOf(x) {
20	20	fn exp32(x_: f32) f32 {
21	21	@setFloatMode(this, builtin.FloatMode.Strict);
22	22
23		const half = []f32 { 0.5, -0.5 };
	23	const half = []f32{ 0.5, -0.5 };
24	24	const ln2hi = 6.9314575195e-1;
25	25	const ln2lo = 1.4286067653e-6;
26		const invln2 = 1.4426950216e+0;
	26	const invln2 = 1.4426950216e+0;
27	27	const P1 = 1.6666625440e-1;
28	28	const P2 = -2.7667332906e-3;
29	29
...	...	@@ -47,7 +47,7 @@ fn exp32(x_: f32) f32 {
47	47	return x * 0x1.0p127;
48	48	}
49	49	if (sign != 0) {
50		math.forceEval(-0x1.0p-149 / x); // overflow
	50	math.forceEval(-0x1.0p-149 / x); // overflow
51	51	// x <= -103.972084
52	52	if (hx >= 0x42CFF1B5) {
53	53	return 0;
...	...	@@ -64,8 +64,7 @@ fn exp32(x_: f32) f32 {
64	64	// \|x\| > 1.5 * ln2
65	65	if (hx > 0x3F851592) {
66	66	k = i32(invln2 * x + half[usize(sign)]);
67		}
68		else {
	67	} else {
69	68	k = 1 - sign - sign;
70	69	}
71	70
...	...	@@ -79,8 +78,7 @@ fn exp32(x_: f32) f32 {
79	78	k = 0;
80	79	hi = x;
81	80	lo = 0;
82		}
83		else {
	81	} else {
84	82	math.forceEval(0x1.0p127 + x); // inexact
85	83	return 1 + x;
86	84	}
...	...	@@ -99,15 +97,15 @@ fn exp32(x_: f32) f32 {
99	97	fn exp64(x_: f64) f64 {
100	98	@setFloatMode(this, builtin.FloatMode.Strict);
101	99
102		const half = []const f64 { 0.5, -0.5 };
	100	const half = []const f64{ 0.5, -0.5 };
103	101	const ln2hi: f64 = 6.93147180369123816490e-01;
104	102	const ln2lo: f64 = 1.90821492927058770002e-10;
105	103	const invln2: f64 = 1.44269504088896338700e+00;
106		const P1: f64 = 1.66666666666666019037e-01;
107		const P2: f64 = -2.77777777770155933842e-03;
108		const P3: f64 = 6.61375632143793436117e-05;
109		const P4: f64 = -1.65339022054652515390e-06;
110		const P5: f64 = 4.13813679705723846039e-08;
	104	const P1: f64 = 1.66666666666666019037e-01;
	105	const P2: f64 = -2.77777777770155933842e-03;
	106	const P3: f64 = 6.61375632143793436117e-05;
	107	const P4: f64 = -1.65339022054652515390e-06;
	108	const P5: f64 = 4.13813679705723846039e-08;
111	109
112	110	var x = x_;
113	111	var ux = @bitCast(u64, x);
...	...	@@ -151,8 +149,7 @@ fn exp64(x_: f64) f64 {
151	149	// \|x\| >= 1.5 * ln2
152	150	if (hx > 0x3FF0A2B2) {
153	151	k = i32(invln2 * x + half[usize(sign)]);
154		}
155		else {
	152	} else {
156	153	k = 1 - sign - sign;
157	154	}
158	155
...	...	@@ -166,8 +163,7 @@ fn exp64(x_: f64) f64 {
166	163	k = 0;
167	164	hi = x;
168	165	lo = 0;
169		}
170		else {
	166	} else {
171	167	// inexact if x != 0
172	168	// math.forceEval(0x1.0p1023 + x);
173	169	return 1 + x;

std/math/exp2.zig+140-140

...	...	@@ -16,7 +16,7 @@ pub fn exp2(x: var) @typeOf(x) {
16	16	};
17	17	}
18	18
19		const exp2ft = []const f64 {
	19	const exp2ft = []const f64{
20	20	0x1.6a09e667f3bcdp-1,
21	21	0x1.7a11473eb0187p-1,
22	22	0x1.8ace5422aa0dbp-1,
...	...	@@ -92,195 +92,195 @@ fn exp2_32(x: f32) f32 {
92	92	return f32(r * uk);
93	93	}
94	94
95		const exp2dt = []f64 {
	95	const exp2dt = []f64{
96	96	// exp2(z + eps) eps
97		0x1.6a09e667f3d5dp-1, 0x1.9880p-44,
98		0x1.6b052fa751744p-1, 0x1.8000p-50,
	97	0x1.6a09e667f3d5dp-1, 0x1.9880p-44,
	98	0x1.6b052fa751744p-1, 0x1.8000p-50,
99	99	0x1.6c012750bd9fep-1, -0x1.8780p-45,
100		0x1.6cfdcddd476bfp-1, 0x1.ec00p-46,
	100	0x1.6cfdcddd476bfp-1, 0x1.ec00p-46,
101	101	0x1.6dfb23c651a29p-1, -0x1.8000p-50,
102	102	0x1.6ef9298593ae3p-1, -0x1.c000p-52,
103	103	0x1.6ff7df9519386p-1, -0x1.fd80p-45,
104	104	0x1.70f7466f42da3p-1, -0x1.c880p-45,
105		0x1.71f75e8ec5fc3p-1, 0x1.3c00p-46,
	105	0x1.71f75e8ec5fc3p-1, 0x1.3c00p-46,
106	106	0x1.72f8286eacf05p-1, -0x1.8300p-44,
107	107	0x1.73f9a48a58152p-1, -0x1.0c00p-47,
108		0x1.74fbd35d7ccfcp-1, 0x1.f880p-45,
109		0x1.75feb564267f1p-1, 0x1.3e00p-47,
	108	0x1.74fbd35d7ccfcp-1, 0x1.f880p-45,
	109	0x1.75feb564267f1p-1, 0x1.3e00p-47,
110	110	0x1.77024b1ab6d48p-1, -0x1.7d00p-45,
111	111	0x1.780694fde5d38p-1, -0x1.d000p-50,
112		0x1.790b938ac1d00p-1, 0x1.3000p-49,
	112	0x1.790b938ac1d00p-1, 0x1.3000p-49,
113	113	0x1.7a11473eb0178p-1, -0x1.d000p-49,
114		0x1.7b17b0976d060p-1, 0x1.0400p-45,
115		0x1.7c1ed0130c133p-1, 0x1.0000p-53,
	114	0x1.7b17b0976d060p-1, 0x1.0400p-45,
	115	0x1.7c1ed0130c133p-1, 0x1.0000p-53,
116	116	0x1.7d26a62ff8636p-1, -0x1.6900p-45,
117	117	0x1.7e2f336cf4e3bp-1, -0x1.2e00p-47,
118	118	0x1.7f3878491c3e8p-1, -0x1.4580p-45,
119		0x1.80427543e1b4ep-1, 0x1.3000p-44,
120		0x1.814d2add1071ap-1, 0x1.f000p-47,
	119	0x1.80427543e1b4ep-1, 0x1.3000p-44,
	120	0x1.814d2add1071ap-1, 0x1.f000p-47,
121	121	0x1.82589994ccd7ep-1, -0x1.1c00p-45,
122		0x1.8364c1eb942d0p-1, 0x1.9d00p-45,
123		0x1.8471a4623cab5p-1, 0x1.7100p-43,
124		0x1.857f4179f5bbcp-1, 0x1.2600p-45,
	122	0x1.8364c1eb942d0p-1, 0x1.9d00p-45,
	123	0x1.8471a4623cab5p-1, 0x1.7100p-43,
	124	0x1.857f4179f5bbcp-1, 0x1.2600p-45,
125	125	0x1.868d99b4491afp-1, -0x1.2c40p-44,
126	126	0x1.879cad931a395p-1, -0x1.3000p-45,
127	127	0x1.88ac7d98a65b8p-1, -0x1.a800p-45,
128	128	0x1.89bd0a4785800p-1, -0x1.d000p-49,
129		0x1.8ace5422aa223p-1, 0x1.3280p-44,
130		0x1.8be05bad619fap-1, 0x1.2b40p-43,
	129	0x1.8ace5422aa223p-1, 0x1.3280p-44,
	130	0x1.8be05bad619fap-1, 0x1.2b40p-43,
131	131	0x1.8cf3216b54383p-1, -0x1.ed00p-45,
132	132	0x1.8e06a5e08664cp-1, -0x1.0500p-45,
133		0x1.8f1ae99157807p-1, 0x1.8280p-45,
	133	0x1.8f1ae99157807p-1, 0x1.8280p-45,
134	134	0x1.902fed0282c0ep-1, -0x1.cb00p-46,
135	135	0x1.9145b0b91ff96p-1, -0x1.5e00p-47,
136		0x1.925c353aa2ff9p-1, 0x1.5400p-48,
137		0x1.93737b0cdc64ap-1, 0x1.7200p-46,
	136	0x1.925c353aa2ff9p-1, 0x1.5400p-48,
	137	0x1.93737b0cdc64ap-1, 0x1.7200p-46,
138	138	0x1.948b82b5f98aep-1, -0x1.9000p-47,
139		0x1.95a44cbc852cbp-1, 0x1.5680p-45,
	139	0x1.95a44cbc852cbp-1, 0x1.5680p-45,
140	140	0x1.96bdd9a766f21p-1, -0x1.6d00p-44,
141	141	0x1.97d829fde4e2ap-1, -0x1.1000p-47,
142		0x1.98f33e47a23a3p-1, 0x1.d000p-45,
	142	0x1.98f33e47a23a3p-1, 0x1.d000p-45,
143	143	0x1.9a0f170ca0604p-1, -0x1.8a40p-44,
144		0x1.9b2bb4d53ff89p-1, 0x1.55c0p-44,
145		0x1.9c49182a3f15bp-1, 0x1.6b80p-45,
	144	0x1.9b2bb4d53ff89p-1, 0x1.55c0p-44,
	145	0x1.9c49182a3f15bp-1, 0x1.6b80p-45,
146	146	0x1.9d674194bb8c5p-1, -0x1.c000p-49,
147		0x1.9e86319e3238ep-1, 0x1.7d00p-46,
148		0x1.9fa5e8d07f302p-1, 0x1.6400p-46,
	147	0x1.9e86319e3238ep-1, 0x1.7d00p-46,
	148	0x1.9fa5e8d07f302p-1, 0x1.6400p-46,
149	149	0x1.a0c667b5de54dp-1, -0x1.5000p-48,
150		0x1.a1e7aed8eb8f6p-1, 0x1.9e00p-47,
151		0x1.a309bec4a2e27p-1, 0x1.ad80p-45,
	150	0x1.a1e7aed8eb8f6p-1, 0x1.9e00p-47,
	151	0x1.a309bec4a2e27p-1, 0x1.ad80p-45,
152	152	0x1.a42c980460a5dp-1, -0x1.af00p-46,
153		0x1.a5503b23e259bp-1, 0x1.b600p-47,
154		0x1.a674a8af46213p-1, 0x1.8880p-44,
155		0x1.a799e1330b3a7p-1, 0x1.1200p-46,
156		0x1.a8bfe53c12e8dp-1, 0x1.6c00p-47,
	153	0x1.a5503b23e259bp-1, 0x1.b600p-47,
	154	0x1.a674a8af46213p-1, 0x1.8880p-44,
	155	0x1.a799e1330b3a7p-1, 0x1.1200p-46,
	156	0x1.a8bfe53c12e8dp-1, 0x1.6c00p-47,
157	157	0x1.a9e6b5579fcd2p-1, -0x1.9b80p-45,
158		0x1.ab0e521356fb8p-1, 0x1.b700p-45,
159		0x1.ac36bbfd3f381p-1, 0x1.9000p-50,
160		0x1.ad5ff3a3c2780p-1, 0x1.4000p-49,
	158	0x1.ab0e521356fb8p-1, 0x1.b700p-45,
	159	0x1.ac36bbfd3f381p-1, 0x1.9000p-50,
	160	0x1.ad5ff3a3c2780p-1, 0x1.4000p-49,
161	161	0x1.ae89f995ad2a3p-1, -0x1.c900p-45,
162		0x1.afb4ce622f367p-1, 0x1.6500p-46,
163		0x1.b0e07298db790p-1, 0x1.fd40p-45,
164		0x1.b20ce6c9a89a9p-1, 0x1.2700p-46,
165		0x1.b33a2b84f1a4bp-1, 0x1.d470p-43,
	162	0x1.afb4ce622f367p-1, 0x1.6500p-46,
	163	0x1.b0e07298db790p-1, 0x1.fd40p-45,
	164	0x1.b20ce6c9a89a9p-1, 0x1.2700p-46,
	165	0x1.b33a2b84f1a4bp-1, 0x1.d470p-43,
166	166	0x1.b468415b747e7p-1, -0x1.8380p-44,
167		0x1.b59728de5593ap-1, 0x1.8000p-54,
168		0x1.b6c6e29f1c56ap-1, 0x1.ad00p-47,
169		0x1.b7f76f2fb5e50p-1, 0x1.e800p-50,
	167	0x1.b59728de5593ap-1, 0x1.8000p-54,
	168	0x1.b6c6e29f1c56ap-1, 0x1.ad00p-47,
	169	0x1.b7f76f2fb5e50p-1, 0x1.e800p-50,
170	170	0x1.b928cf22749b2p-1, -0x1.4c00p-47,
171	171	0x1.ba5b030a10603p-1, -0x1.d700p-47,
172		0x1.bb8e0b79a6f66p-1, 0x1.d900p-47,
173		0x1.bcc1e904bc1ffp-1, 0x1.2a00p-47,
	172	0x1.bb8e0b79a6f66p-1, 0x1.d900p-47,
	173	0x1.bcc1e904bc1ffp-1, 0x1.2a00p-47,
174	174	0x1.bdf69c3f3a16fp-1, -0x1.f780p-46,
175	175	0x1.bf2c25bd71db8p-1, -0x1.0a00p-46,
176	176	0x1.c06286141b2e9p-1, -0x1.1400p-46,
177		0x1.c199bdd8552e0p-1, 0x1.be00p-47,
	177	0x1.c199bdd8552e0p-1, 0x1.be00p-47,
178	178	0x1.c2d1cd9fa64eep-1, -0x1.9400p-47,
179	179	0x1.c40ab5fffd02fp-1, -0x1.ed00p-47,
180		0x1.c544778fafd15p-1, 0x1.9660p-44,
	180	0x1.c544778fafd15p-1, 0x1.9660p-44,
181	181	0x1.c67f12e57d0cbp-1, -0x1.a100p-46,
182	182	0x1.c7ba88988c1b6p-1, -0x1.8458p-42,
183	183	0x1.c8f6d9406e733p-1, -0x1.a480p-46,
184		0x1.ca3405751c4dfp-1, 0x1.b000p-51,
185		0x1.cb720dcef9094p-1, 0x1.1400p-47,
186		0x1.ccb0f2e6d1689p-1, 0x1.0200p-48,
187		0x1.cdf0b555dc412p-1, 0x1.3600p-48,
	184	0x1.ca3405751c4dfp-1, 0x1.b000p-51,
	185	0x1.cb720dcef9094p-1, 0x1.1400p-47,
	186	0x1.ccb0f2e6d1689p-1, 0x1.0200p-48,
	187	0x1.cdf0b555dc412p-1, 0x1.3600p-48,
188	188	0x1.cf3155b5bab3bp-1, -0x1.6900p-47,
189		0x1.d072d4a0789bcp-1, 0x1.9a00p-47,
	189	0x1.d072d4a0789bcp-1, 0x1.9a00p-47,
190	190	0x1.d1b532b08c8fap-1, -0x1.5e00p-46,
191		0x1.d2f87080d8a85p-1, 0x1.d280p-46,
192		0x1.d43c8eacaa203p-1, 0x1.1a00p-47,
193		0x1.d5818dcfba491p-1, 0x1.f000p-50,
	191	0x1.d2f87080d8a85p-1, 0x1.d280p-46,
	192	0x1.d43c8eacaa203p-1, 0x1.1a00p-47,
	193	0x1.d5818dcfba491p-1, 0x1.f000p-50,
194	194	0x1.d6c76e862e6a1p-1, -0x1.3a00p-47,
195	195	0x1.d80e316c9834ep-1, -0x1.cd80p-47,
196		0x1.d955d71ff6090p-1, 0x1.4c00p-48,
197		0x1.da9e603db32aep-1, 0x1.f900p-48,
198		0x1.dbe7cd63a8325p-1, 0x1.9800p-49,
	196	0x1.d955d71ff6090p-1, 0x1.4c00p-48,
	197	0x1.da9e603db32aep-1, 0x1.f900p-48,
	198	0x1.dbe7cd63a8325p-1, 0x1.9800p-49,
199	199	0x1.dd321f301b445p-1, -0x1.5200p-48,
200	200	0x1.de7d5641c05bfp-1, -0x1.d700p-46,
201	201	0x1.dfc97337b9aecp-1, -0x1.6140p-46,
202		0x1.e11676b197d5ep-1, 0x1.b480p-47,
203		0x1.e264614f5a3e7p-1, 0x1.0ce0p-43,
204		0x1.e3b333b16ee5cp-1, 0x1.c680p-47,
	202	0x1.e11676b197d5ep-1, 0x1.b480p-47,
	203	0x1.e264614f5a3e7p-1, 0x1.0ce0p-43,
	204	0x1.e3b333b16ee5cp-1, 0x1.c680p-47,
205	205	0x1.e502ee78b3fb4p-1, -0x1.9300p-47,
206	206	0x1.e653924676d68p-1, -0x1.5000p-49,
207	207	0x1.e7a51fbc74c44p-1, -0x1.7f80p-47,
208	208	0x1.e8f7977cdb726p-1, -0x1.3700p-48,
209		0x1.ea4afa2a490e8p-1, 0x1.5d00p-49,
210		0x1.eb9f4867ccae4p-1, 0x1.61a0p-46,
211		0x1.ecf482d8e680dp-1, 0x1.5500p-48,
212		0x1.ee4aaa2188514p-1, 0x1.6400p-51,
	209	0x1.ea4afa2a490e8p-1, 0x1.5d00p-49,
	210	0x1.eb9f4867ccae4p-1, 0x1.61a0p-46,
	211	0x1.ecf482d8e680dp-1, 0x1.5500p-48,
	212	0x1.ee4aaa2188514p-1, 0x1.6400p-51,
213	213	0x1.efa1bee615a13p-1, -0x1.e800p-49,
214	214	0x1.f0f9c1cb64106p-1, -0x1.a880p-48,
215	215	0x1.f252b376bb963p-1, -0x1.c900p-45,
216		0x1.f3ac948dd7275p-1, 0x1.a000p-53,
	216	0x1.f3ac948dd7275p-1, 0x1.a000p-53,
217	217	0x1.f50765b6e4524p-1, -0x1.4f00p-48,
218		0x1.f6632798844fdp-1, 0x1.a800p-51,
219		0x1.f7bfdad9cbe38p-1, 0x1.abc0p-48,
	218	0x1.f6632798844fdp-1, 0x1.a800p-51,
	219	0x1.f7bfdad9cbe38p-1, 0x1.abc0p-48,
220	220	0x1.f91d802243c82p-1, -0x1.4600p-50,
221	221	0x1.fa7c1819e908ep-1, -0x1.b0c0p-47,
222	222	0x1.fbdba3692d511p-1, -0x1.0e00p-51,
223	223	0x1.fd3c22b8f7194p-1, -0x1.0de8p-46,
224		0x1.fe9d96b2a23eep-1, 0x1.e430p-49,
225		0x1.0000000000000p+0, 0x0.0000p+0,
	224	0x1.fe9d96b2a23eep-1, 0x1.e430p-49,
	225	0x1.0000000000000p+0, 0x0.0000p+0,
226	226	0x1.00b1afa5abcbep+0, -0x1.3400p-52,
227	227	0x1.0163da9fb3303p+0, -0x1.2170p-46,
228		0x1.02168143b0282p+0, 0x1.a400p-52,
229		0x1.02c9a3e77806cp+0, 0x1.f980p-49,
	228	0x1.02168143b0282p+0, 0x1.a400p-52,
	229	0x1.02c9a3e77806cp+0, 0x1.f980p-49,
230	230	0x1.037d42e11bbcap+0, -0x1.7400p-51,
231		0x1.04315e86e7f89p+0, 0x1.8300p-50,
	231	0x1.04315e86e7f89p+0, 0x1.8300p-50,
232	232	0x1.04e5f72f65467p+0, -0x1.a3f0p-46,
233	233	0x1.059b0d315855ap+0, -0x1.2840p-47,
234		0x1.0650a0e3c1f95p+0, 0x1.1600p-48,
235		0x1.0706b29ddf71ap+0, 0x1.5240p-46,
	234	0x1.0650a0e3c1f95p+0, 0x1.1600p-48,
	235	0x1.0706b29ddf71ap+0, 0x1.5240p-46,
236	236	0x1.07bd42b72a82dp+0, -0x1.9a00p-49,
237		0x1.0874518759bd0p+0, 0x1.6400p-49,
	237	0x1.0874518759bd0p+0, 0x1.6400p-49,
238	238	0x1.092bdf66607c8p+0, -0x1.0780p-47,
239	239	0x1.09e3ecac6f383p+0, -0x1.8000p-54,
240		0x1.0a9c79b1f3930p+0, 0x1.fa00p-48,
	240	0x1.0a9c79b1f3930p+0, 0x1.fa00p-48,
241	241	0x1.0b5586cf988fcp+0, -0x1.ac80p-48,
242		0x1.0c0f145e46c8ap+0, 0x1.9c00p-50,
243		0x1.0cc922b724816p+0, 0x1.5200p-47,
	242	0x1.0c0f145e46c8ap+0, 0x1.9c00p-50,
	243	0x1.0cc922b724816p+0, 0x1.5200p-47,
244	244	0x1.0d83b23395dd8p+0, -0x1.ad00p-48,
245		0x1.0e3ec32d3d1f3p+0, 0x1.bac0p-46,
	245	0x1.0e3ec32d3d1f3p+0, 0x1.bac0p-46,
246	246	0x1.0efa55fdfa9a6p+0, -0x1.4e80p-47,
247	247	0x1.0fb66affed2f0p+0, -0x1.d300p-47,
248		0x1.1073028d7234bp+0, 0x1.1500p-48,
249		0x1.11301d0125b5bp+0, 0x1.c000p-49,
250		0x1.11edbab5e2af9p+0, 0x1.6bc0p-46,
251		0x1.12abdc06c31d5p+0, 0x1.8400p-49,
	248	0x1.1073028d7234bp+0, 0x1.1500p-48,
	249	0x1.11301d0125b5bp+0, 0x1.c000p-49,
	250	0x1.11edbab5e2af9p+0, 0x1.6bc0p-46,
	251	0x1.12abdc06c31d5p+0, 0x1.8400p-49,
252	252	0x1.136a814f2047dp+0, -0x1.ed00p-47,
253		0x1.1429aaea92de9p+0, 0x1.8e00p-49,
254		0x1.14e95934f3138p+0, 0x1.b400p-49,
255		0x1.15a98c8a58e71p+0, 0x1.5300p-47,
256		0x1.166a45471c3dfp+0, 0x1.3380p-47,
257		0x1.172b83c7d5211p+0, 0x1.8d40p-45,
	253	0x1.1429aaea92de9p+0, 0x1.8e00p-49,
	254	0x1.14e95934f3138p+0, 0x1.b400p-49,
	255	0x1.15a98c8a58e71p+0, 0x1.5300p-47,
	256	0x1.166a45471c3dfp+0, 0x1.3380p-47,
	257	0x1.172b83c7d5211p+0, 0x1.8d40p-45,
258	258	0x1.17ed48695bb9fp+0, -0x1.5d00p-47,
259	259	0x1.18af9388c8d93p+0, -0x1.c880p-46,
260		0x1.1972658375d66p+0, 0x1.1f00p-46,
261		0x1.1a35beb6fcba7p+0, 0x1.0480p-46,
	260	0x1.1972658375d66p+0, 0x1.1f00p-46,
	261	0x1.1a35beb6fcba7p+0, 0x1.0480p-46,
262	262	0x1.1af99f81387e3p+0, -0x1.7390p-43,
263		0x1.1bbe084045d54p+0, 0x1.4e40p-45,
	263	0x1.1bbe084045d54p+0, 0x1.4e40p-45,
264	264	0x1.1c82f95281c43p+0, -0x1.a200p-47,
265		0x1.1d4873168b9b2p+0, 0x1.3800p-49,
266		0x1.1e0e75eb44031p+0, 0x1.ac00p-49,
267		0x1.1ed5022fcd938p+0, 0x1.1900p-47,
	265	0x1.1d4873168b9b2p+0, 0x1.3800p-49,
	266	0x1.1e0e75eb44031p+0, 0x1.ac00p-49,
	267	0x1.1ed5022fcd938p+0, 0x1.1900p-47,
268	268	0x1.1f9c18438cdf7p+0, -0x1.b780p-46,
269		0x1.2063b88628d8fp+0, 0x1.d940p-45,
270		0x1.212be3578a81ep+0, 0x1.8000p-50,
271		0x1.21f49917ddd41p+0, 0x1.b340p-45,
272		0x1.22bdda2791323p+0, 0x1.9f80p-46,
	269	0x1.2063b88628d8fp+0, 0x1.d940p-45,
	270	0x1.212be3578a81ep+0, 0x1.8000p-50,
	271	0x1.21f49917ddd41p+0, 0x1.b340p-45,
	272	0x1.22bdda2791323p+0, 0x1.9f80p-46,
273	273	0x1.2387a6e7561e7p+0, -0x1.9c80p-46,
274		0x1.2451ffb821427p+0, 0x1.2300p-47,
	274	0x1.2451ffb821427p+0, 0x1.2300p-47,
275	275	0x1.251ce4fb2a602p+0, -0x1.3480p-46,
276		0x1.25e85711eceb0p+0, 0x1.2700p-46,
277		0x1.26b4565e27d16p+0, 0x1.1d00p-46,
278		0x1.2780e341de00fp+0, 0x1.1ee0p-44,
	276	0x1.25e85711eceb0p+0, 0x1.2700p-46,
	277	0x1.26b4565e27d16p+0, 0x1.1d00p-46,
	278	0x1.2780e341de00fp+0, 0x1.1ee0p-44,
279	279	0x1.284dfe1f5633ep+0, -0x1.4c00p-46,
280	280	0x1.291ba7591bb30p+0, -0x1.3d80p-46,
281		0x1.29e9df51fdf09p+0, 0x1.8b00p-47,
	281	0x1.29e9df51fdf09p+0, 0x1.8b00p-47,
282	282	0x1.2ab8a66d10e9bp+0, -0x1.27c0p-45,
283		0x1.2b87fd0dada3ap+0, 0x1.a340p-45,
	283	0x1.2b87fd0dada3ap+0, 0x1.a340p-45,
284	284	0x1.2c57e39771af9p+0, -0x1.0800p-46,
285	285	0x1.2d285a6e402d9p+0, -0x1.ed00p-47,
286	286	0x1.2df961f641579p+0, -0x1.4200p-48,
...	...	@@ -290,78 +290,78 @@ const exp2dt = []f64 {
290	290	0x1.31432edeea50bp+0, -0x1.0df8p-40,
291	291	0x1.32170fc4cd7b8p+0, -0x1.2480p-45,
292	292	0x1.32eb83ba8e9a2p+0, -0x1.5980p-45,
293		0x1.33c08b2641766p+0, 0x1.ed00p-46,
	293	0x1.33c08b2641766p+0, 0x1.ed00p-46,
294	294	0x1.3496266e3fa27p+0, -0x1.c000p-50,
295	295	0x1.356c55f929f0fp+0, -0x1.0d80p-44,
296		0x1.36431a2de88b9p+0, 0x1.2c80p-45,
297		0x1.371a7373aaa39p+0, 0x1.0600p-45,
	296	0x1.36431a2de88b9p+0, 0x1.2c80p-45,
	297	0x1.371a7373aaa39p+0, 0x1.0600p-45,
298	298	0x1.37f26231e74fep+0, -0x1.6600p-46,
299	299	0x1.38cae6d05d838p+0, -0x1.ae00p-47,
300	300	0x1.39a401b713ec3p+0, -0x1.4720p-43,
301		0x1.3a7db34e5a020p+0, 0x1.8200p-47,
302		0x1.3b57fbfec6e95p+0, 0x1.e800p-44,
303		0x1.3c32dc313a8f2p+0, 0x1.f800p-49,
	301	0x1.3a7db34e5a020p+0, 0x1.8200p-47,
	302	0x1.3b57fbfec6e95p+0, 0x1.e800p-44,
	303	0x1.3c32dc313a8f2p+0, 0x1.f800p-49,
304	304	0x1.3d0e544ede122p+0, -0x1.7a00p-46,
305		0x1.3dea64c1234bbp+0, 0x1.6300p-45,
	305	0x1.3dea64c1234bbp+0, 0x1.6300p-45,
306	306	0x1.3ec70df1c4eccp+0, -0x1.8a60p-43,
307	307	0x1.3fa4504ac7e8cp+0, -0x1.cdc0p-44,
308		0x1.40822c367a0bbp+0, 0x1.5b80p-45,
309		0x1.4160a21f72e95p+0, 0x1.ec00p-46,
	308	0x1.40822c367a0bbp+0, 0x1.5b80p-45,
	309	0x1.4160a21f72e95p+0, 0x1.ec00p-46,
310	310	0x1.423fb27094646p+0, -0x1.3600p-46,
311		0x1.431f5d950a920p+0, 0x1.3980p-45,
312		0x1.43ffa3f84b9ebp+0, 0x1.a000p-48,
	311	0x1.431f5d950a920p+0, 0x1.3980p-45,
	312	0x1.43ffa3f84b9ebp+0, 0x1.a000p-48,
313	313	0x1.44e0860618919p+0, -0x1.6c00p-48,
314	314	0x1.45c2042a7d201p+0, -0x1.bc00p-47,
315	315	0x1.46a41ed1d0016p+0, -0x1.2800p-46,
316		0x1.4786d668b3326p+0, 0x1.0e00p-44,
	316	0x1.4786d668b3326p+0, 0x1.0e00p-44,
317	317	0x1.486a2b5c13c00p+0, -0x1.d400p-45,
318		0x1.494e1e192af04p+0, 0x1.c200p-47,
	318	0x1.494e1e192af04p+0, 0x1.c200p-47,
319	319	0x1.4a32af0d7d372p+0, -0x1.e500p-46,
320		0x1.4b17dea6db801p+0, 0x1.7800p-47,
	320	0x1.4b17dea6db801p+0, 0x1.7800p-47,
321	321	0x1.4bfdad53629e1p+0, -0x1.3800p-46,
322		0x1.4ce41b817c132p+0, 0x1.0800p-47,
323		0x1.4dcb299fddddbp+0, 0x1.c700p-45,
	322	0x1.4ce41b817c132p+0, 0x1.0800p-47,
	323	0x1.4dcb299fddddbp+0, 0x1.c700p-45,
324	324	0x1.4eb2d81d8ab96p+0, -0x1.ce00p-46,
325		0x1.4f9b2769d2d02p+0, 0x1.9200p-46,
	325	0x1.4f9b2769d2d02p+0, 0x1.9200p-46,
326	326	0x1.508417f4531c1p+0, -0x1.8c00p-47,
327	327	0x1.516daa2cf662ap+0, -0x1.a000p-48,
328		0x1.5257de83f51eap+0, 0x1.a080p-43,
	328	0x1.5257de83f51eap+0, 0x1.a080p-43,
329	329	0x1.5342b569d4edap+0, -0x1.6d80p-45,
330	330	0x1.542e2f4f6ac1ap+0, -0x1.2440p-44,
331		0x1.551a4ca5d94dbp+0, 0x1.83c0p-43,
332		0x1.56070dde9116bp+0, 0x1.4b00p-45,
333		0x1.56f4736b529dep+0, 0x1.15a0p-43,
	331	0x1.551a4ca5d94dbp+0, 0x1.83c0p-43,
	332	0x1.56070dde9116bp+0, 0x1.4b00p-45,
	333	0x1.56f4736b529dep+0, 0x1.15a0p-43,
334	334	0x1.57e27dbe2c40ep+0, -0x1.9e00p-45,
335	335	0x1.58d12d497c76fp+0, -0x1.3080p-45,
336		0x1.59c0827ff0b4cp+0, 0x1.dec0p-43,
	336	0x1.59c0827ff0b4cp+0, 0x1.dec0p-43,
337	337	0x1.5ab07dd485427p+0, -0x1.4000p-51,
338		0x1.5ba11fba87af4p+0, 0x1.0080p-44,
	338	0x1.5ba11fba87af4p+0, 0x1.0080p-44,
339	339	0x1.5c9268a59460bp+0, -0x1.6c80p-45,
340		0x1.5d84590998e3fp+0, 0x1.69a0p-43,
	340	0x1.5d84590998e3fp+0, 0x1.69a0p-43,
341	341	0x1.5e76f15ad20e1p+0, -0x1.b400p-46,
342		0x1.5f6a320dcebcap+0, 0x1.7700p-46,
343		0x1.605e1b976dcb8p+0, 0x1.6f80p-45,
344		0x1.6152ae6cdf715p+0, 0x1.1000p-47,
	342	0x1.5f6a320dcebcap+0, 0x1.7700p-46,
	343	0x1.605e1b976dcb8p+0, 0x1.6f80p-45,
	344	0x1.6152ae6cdf715p+0, 0x1.1000p-47,
345	345	0x1.6247eb03a5531p+0, -0x1.5d00p-46,
346	346	0x1.633dd1d1929b5p+0, -0x1.2d00p-46,
347	347	0x1.6434634ccc313p+0, -0x1.a800p-49,
348	348	0x1.652b9febc8efap+0, -0x1.8600p-45,
349		0x1.6623882553397p+0, 0x1.1fe0p-40,
	349	0x1.6623882553397p+0, 0x1.1fe0p-40,
350	350	0x1.671c1c708328ep+0, -0x1.7200p-44,
351		0x1.68155d44ca97ep+0, 0x1.6800p-49,
	351	0x1.68155d44ca97ep+0, 0x1.6800p-49,
352	352	0x1.690f4b19e9471p+0, -0x1.9780p-45,
353	353	};
354	354
355	355	fn exp2_64(x: f64) f64 {
356	356	@setFloatMode(this, @import("builtin").FloatMode.Strict);
357	357
358		const tblsiz = u32(exp2dt.len / 2);
	358	const tblsiz = u32(exp2dt.len / 2);
359	359	const redux: f64 = 0x1.8p52 / f64(tblsiz);
360		const P1: f64 = 0x1.62e42fefa39efp-1;
361		const P2: f64 = 0x1.ebfbdff82c575p-3;
362		const P3: f64 = 0x1.c6b08d704a0a6p-5;
363		const P4: f64 = 0x1.3b2ab88f70400p-7;
364		const P5: f64 = 0x1.5d88003875c74p-10;
	360	const P1: f64 = 0x1.62e42fefa39efp-1;
	361	const P2: f64 = 0x1.ebfbdff82c575p-3;
	362	const P3: f64 = 0x1.c6b08d704a0a6p-5;
	363	const P4: f64 = 0x1.3b2ab88f70400p-7;
	364	const P5: f64 = 0x1.5d88003875c74p-10;
365	365
366	366	const ux = @bitCast(u64, x);
367	367	const ix = u32(ux >> 32) & 0x7FFFFFFF;

std/math/expm1.zig+11-13

...	...	@@ -21,11 +21,11 @@ pub fn expm1(x: var) @typeOf(x) {
21	21	fn expm1_32(x_: f32) f32 {
22	22	@setFloatMode(this, builtin.FloatMode.Strict);
23	23	const o_threshold: f32 = 8.8721679688e+01;
24		const ln2_hi: f32 = 6.9313812256e-01;
25		const ln2_lo: f32 = 9.0580006145e-06;
26		const invln2: f32 = 1.4426950216e+00;
	24	const ln2_hi: f32 = 6.9313812256e-01;
	25	const ln2_lo: f32 = 9.0580006145e-06;
	26	const invln2: f32 = 1.4426950216e+00;
27	27	const Q1: f32 = -3.3333212137e-2;
28		const Q2: f32 = 1.5807170421e-3;
	28	const Q2: f32 = 1.5807170421e-3;
29	29
30	30	var x = x_;
31	31	const ux = @bitCast(u32, x);
...	...	@@ -93,8 +93,7 @@ fn expm1_32(x_: f32) f32 {
93	93	math.forceEval(x * x);
94	94	}
95	95	return x;
96		}
97		else {
	96	} else {
98	97	k = 0;
99	98	}
100	99
...	...	@@ -148,13 +147,13 @@ fn expm1_32(x_: f32) f32 {
148	147	fn expm1_64(x_: f64) f64 {
149	148	@setFloatMode(this, builtin.FloatMode.Strict);
150	149	const o_threshold: f64 = 7.09782712893383973096e+02;
151		const ln2_hi: f64 = 6.93147180369123816490e-01;
152		const ln2_lo: f64 = 1.90821492927058770002e-10;
153		const invln2: f64 = 1.44269504088896338700e+00;
	150	const ln2_hi: f64 = 6.93147180369123816490e-01;
	151	const ln2_lo: f64 = 1.90821492927058770002e-10;
	152	const invln2: f64 = 1.44269504088896338700e+00;
154	153	const Q1: f64 = -3.33333333333331316428e-02;
155		const Q2: f64 = 1.58730158725481460165e-03;
	154	const Q2: f64 = 1.58730158725481460165e-03;
156	155	const Q3: f64 = -7.93650757867487942473e-05;
157		const Q4: f64 = 4.00821782732936239552e-06;
	156	const Q4: f64 = 4.00821782732936239552e-06;
158	157	const Q5: f64 = -2.01099218183624371326e-07;
159	158
160	159	var x = x_;
...	...	@@ -223,8 +222,7 @@ fn expm1_64(x_: f64) f64 {
223	222	math.forceEval(f32(x));
224	223	}
225	224	return x;
226		}
227		else {
	225	} else {
228	226	k = 0;
229	227	}
230	228

std/math/floor.zig+2-2

...	...	@@ -57,7 +57,7 @@ fn floor64(x: f64) f64 {
57	57	const e = (u >> 52) & 0x7FF;
58	58	var y: f64 = undefined;
59	59
60		if (e >= 0x3FF+52 or x == 0) {
	60	if (e >= 0x3FF + 52 or x == 0) {
61	61	return x;
62	62	}
63	63
...	...	@@ -69,7 +69,7 @@ fn floor64(x: f64) f64 {
69	69	y = x + math.f64_toint - math.f64_toint - x;
70	70	}
71	71
72		if (e <= 0x3FF-1) {
	72	if (e <= 0x3FF - 1) {
73	73	math.forceEval(y);
74	74	if (u >> 63 != 0) {
75	75	return -1.0;

std/math/fma.zig+5-2

...	...	@@ -5,7 +5,7 @@ const assert = std.debug.assert;
5	5	pub fn fma(comptime T: type, x: T, y: T, z: T) T {
6	6	return switch (T) {
7	7	f32 => fma32(x, y, z),
8		f64 => fma64(x, y ,z),
	8	f64 => fma64(x, y, z),
9	9	else => @compileError("fma not implemented for " ++ @typeName(T)),
10	10	};
11	11	}
...	...	@@ -71,7 +71,10 @@ fn fma64(x: f64, y: f64, z: f64) f64 {
71	71	}
72	72	}
73	73
74		const dd = struct { hi: f64, lo: f64, };
	74	const dd = struct {
	75	hi: f64,
	76	lo: f64,
	77	};
75	78
76	79	fn dd_add(a: f64, b: f64) dd {
77	80	var ret: dd = undefined;

std/math/hypot.zig+4-4

...	...	@@ -39,11 +39,11 @@ fn hypot32(x: f32, y: f32) f32 {
39	39	}
40	40
41	41	var z: f32 = 1.0;
42		if (ux >= (0x7F+60) << 23) {
	42	if (ux >= (0x7F + 60) << 23) {
43	43	z = 0x1.0p90;
44	44	xx *= 0x1.0p-90;
45	45	yy *= 0x1.0p-90;
46		} else if (uy < (0x7F-60) << 23) {
	46	} else if (uy < (0x7F - 60) << 23) {
47	47	z = 0x1.0p-90;
48	48	xx *= 0x1.0p-90;
49	49	yy *= 0x1.0p-90;
...	...	@@ -57,8 +57,8 @@ fn sq(hi: &f64, lo: &f64, x: f64) void {
57	57	const xc = x * split;
58	58	const xh = x - xc + xc;
59	59	const xl = x - xh;
60		hi = x x;
61		lo = xh xh - hi + 2 xh * xl + xl * xl;
	60	hi.* = x * x;
	61	lo.* = xh * xh - hi.* + 2 * xh * xl + xl * xl;
62	62	}
63	63
64	64	fn hypot64(x: f64, y: f64) f64 {

std/math/index.zig+30-47

...	...	@@ -47,12 +47,12 @@ pub fn forceEval(value: var) void {
47	47	f32 => {
48	48	var x: f32 = undefined;
49	49	const p = @ptrCast(&volatile f32, &x);
50		*p = x;
	50	p.* = x;
51	51	},
52	52	f64 => {
53	53	var x: f64 = undefined;
54	54	const p = @ptrCast(&volatile f64, &x);
55		*p = x;
	55	p.* = x;
56	56	},
57	57	else => {
58	58	@compileError("forceEval not implemented for " ++ @typeName(T));
...	...	@@ -179,7 +179,6 @@ test "math" {
179	179	_ = @import("complex/index.zig");
180	180	}
181	181
182
183	182	pub fn min(x: var, y: var) @typeOf(x + y) {
184	183	return if (x < y) x else y;
185	184	}
...	...	@@ -280,10 +279,10 @@ pub fn rotr(comptime T: type, x: T, r: var) T {
280	279	}
281	280
282	281	test "math.rotr" {
283		assert(rotr(u8, 0b00000001, usize(0)) == 0b00000001);
284		assert(rotr(u8, 0b00000001, usize(9)) == 0b10000000);
285		assert(rotr(u8, 0b00000001, usize(8)) == 0b00000001);
286		assert(rotr(u8, 0b00000001, usize(4)) == 0b00010000);
	282	assert(rotr(u8, 0b00000001, usize(0)) == 0b00000001);
	283	assert(rotr(u8, 0b00000001, usize(9)) == 0b10000000);
	284	assert(rotr(u8, 0b00000001, usize(8)) == 0b00000001);
	285	assert(rotr(u8, 0b00000001, usize(4)) == 0b00010000);
287	286	assert(rotr(u8, 0b00000001, isize(-1)) == 0b00000010);
288	287	}
289	288
...	...	@@ -299,14 +298,13 @@ pub fn rotl(comptime T: type, x: T, r: var) T {
299	298	}
300	299
301	300	test "math.rotl" {
302		assert(rotl(u8, 0b00000001, usize(0)) == 0b00000001);
303		assert(rotl(u8, 0b00000001, usize(9)) == 0b00000010);
304		assert(rotl(u8, 0b00000001, usize(8)) == 0b00000001);
305		assert(rotl(u8, 0b00000001, usize(4)) == 0b00010000);
	301	assert(rotl(u8, 0b00000001, usize(0)) == 0b00000001);
	302	assert(rotl(u8, 0b00000001, usize(9)) == 0b00000010);
	303	assert(rotl(u8, 0b00000001, usize(8)) == 0b00000001);
	304	assert(rotl(u8, 0b00000001, usize(4)) == 0b00010000);
306	305	assert(rotl(u8, 0b00000001, isize(-1)) == 0b10000000);
307	306	}
308	307
309
310	308	pub fn Log2Int(comptime T: type) type {
311	309	return @IntType(false, log2(T.bit_count));
312	310	}
...	...	@@ -323,14 +321,14 @@ fn testOverflow() void {
323	321	assert((shlExact(i32, 0b11, 4) catch unreachable) == 0b110000);
324	322	}
325	323
326
327	324	pub fn absInt(x: var) !@typeOf(x) {
328	325	const T = @typeOf(x);
329	326	comptime assert(@typeId(T) == builtin.TypeId.Int); // must pass an integer to absInt
330	327	comptime assert(T.is_signed); // must pass a signed integer to absInt
331		if (x == @minValue(@typeOf(x)))
	328
	329	if (x == @minValue(@typeOf(x))) {
332	330	return error.Overflow;
333		{
	331	} else {
334	332	@setRuntimeSafety(false);
335	333	return if (x < 0) -x else x;
336	334	}
...	...	@@ -349,10 +347,8 @@ pub const absFloat = @import("fabs.zig").fabs;
349	347
350	348	pub fn divTrunc(comptime T: type, numerator: T, denominator: T) !T {
351	349	@setRuntimeSafety(false);
352		if (denominator == 0)
353		return error.DivisionByZero;
354		if (@typeId(T) == builtin.TypeId.Int and T.is_signed and numerator == @minValue(T) and denominator == -1)
355		return error.Overflow;
	350	if (denominator == 0) return error.DivisionByZero;
	351	if (@typeId(T) == builtin.TypeId.Int and T.is_signed and numerator == @minValue(T) and denominator == -1) return error.Overflow;
356	352	return @divTrunc(numerator, denominator);
357	353	}
358	354
...	...	@@ -372,10 +368,8 @@ fn testDivTrunc() void {
372	368
373	369	pub fn divFloor(comptime T: type, numerator: T, denominator: T) !T {
374	370	@setRuntimeSafety(false);
375		if (denominator == 0)
376		return error.DivisionByZero;
377		if (@typeId(T) == builtin.TypeId.Int and T.is_signed and numerator == @minValue(T) and denominator == -1)
378		return error.Overflow;
	371	if (denominator == 0) return error.DivisionByZero;
	372	if (@typeId(T) == builtin.TypeId.Int and T.is_signed and numerator == @minValue(T) and denominator == -1) return error.Overflow;
379	373	return @divFloor(numerator, denominator);
380	374	}
381	375
...	...	@@ -395,13 +389,10 @@ fn testDivFloor() void {
395	389
396	390	pub fn divExact(comptime T: type, numerator: T, denominator: T) !T {
397	391	@setRuntimeSafety(false);
398		if (denominator == 0)
399		return error.DivisionByZero;
400		if (@typeId(T) == builtin.TypeId.Int and T.is_signed and numerator == @minValue(T) and denominator == -1)
401		return error.Overflow;
	392	if (denominator == 0) return error.DivisionByZero;
	393	if (@typeId(T) == builtin.TypeId.Int and T.is_signed and numerator == @minValue(T) and denominator == -1) return error.Overflow;
402	394	const result = @divTrunc(numerator, denominator);
403		if (result * denominator != numerator)
404		return error.UnexpectedRemainder;
	395	if (result * denominator != numerator) return error.UnexpectedRemainder;
405	396	return result;
406	397	}
407	398
...	...	@@ -423,10 +414,8 @@ fn testDivExact() void {
423	414
424	415	pub fn mod(comptime T: type, numerator: T, denominator: T) !T {
425	416	@setRuntimeSafety(false);
426		if (denominator == 0)
427		return error.DivisionByZero;
428		if (denominator < 0)
429		return error.NegativeDenominator;
	417	if (denominator == 0) return error.DivisionByZero;
	418	if (denominator < 0) return error.NegativeDenominator;
430	419	return @mod(numerator, denominator);
431	420	}
432	421
...	...	@@ -448,10 +437,8 @@ fn testMod() void {
448	437
449	438	pub fn rem(comptime T: type, numerator: T, denominator: T) !T {
450	439	@setRuntimeSafety(false);
451		if (denominator == 0)
452		return error.DivisionByZero;
453		if (denominator < 0)
454		return error.NegativeDenominator;
	440	if (denominator == 0) return error.DivisionByZero;
	441	if (denominator < 0) return error.NegativeDenominator;
455	442	return @rem(numerator, denominator);
456	443	}
457	444
...	...	@@ -475,8 +462,7 @@ fn testRem() void {
475	462	/// Result is an unsigned integer.
476	463	pub fn absCast(x: var) @IntType(false, @typeOf(x).bit_count) {
477	464	const uint = @IntType(false, @typeOf(x).bit_count);
478		if (x >= 0)
479		return uint(x);
	465	if (x >= 0) return uint(x);
480	466
481	467	return uint(-(x + 1)) + 1;
482	468	}
...	...	@@ -495,15 +481,12 @@ test "math.absCast" {
495	481	/// Returns the negation of the integer parameter.
496	482	/// Result is a signed integer.
497	483	pub fn negateCast(x: var) !@IntType(true, @typeOf(x).bit_count) {
498		if (@typeOf(x).is_signed)
499		return negate(x);
	484	if (@typeOf(x).is_signed) return negate(x);
500	485
501	486	const int = @IntType(true, @typeOf(x).bit_count);
502		if (x > -@minValue(int))
503		return error.Overflow;
	487	if (x > -@minValue(int)) return error.Overflow;
504	488
505		if (x == -@minValue(int))
506		return @minValue(int);
	489	if (x == -@minValue(int)) return @minValue(int);
507	490
508	491	return -int(x);
509	492	}
...	...	@@ -518,7 +501,7 @@ test "math.negateCast" {
518	501	if (negateCast(u32(@maxValue(i32) + 10))) \|_\| unreachable else \|err\| assert(err == error.Overflow);
519	502	}
520	503
521		/// Cast an integer to a different integer type. If the value doesn't fit,
	504	/// Cast an integer to a different integer type. If the value doesn't fit,
522	505	/// return an error.
523	506	pub fn cast(comptime T: type, x: var) (error{Overflow}!T) {
524	507	comptime assert(@typeId(T) == builtin.TypeId.Int); // must pass an integer
...	...	@@ -546,7 +529,7 @@ pub fn floorPowerOfTwo(comptime T: type, value: T) T {
546	529	var x = value;
547	530
548	531	comptime var i = 1;
549		inline while(T.bit_count > i) : (i *= 2) {
	532	inline while (T.bit_count > i) : (i *= 2) {
550	533	x \|= (x >> i);
551	534	}
552	535

std/math/ln.zig+2-4

...	...	@@ -120,11 +120,9 @@ pub fn ln_64(x_: f64) f64 {
120	120	k -= 54;
121	121	x *= 0x1.0p54;
122	122	hx = u32(@bitCast(u64, ix) >> 32);
123		}
124		else if (hx >= 0x7FF00000) {
	123	} else if (hx >= 0x7FF00000) {
125	124	return x;
126		}
127		else if (hx == 0x3FF00000 and ix << 32 == 0) {
	125	} else if (hx == 0x3FF00000 and ix << 32 == 0) {
128	126	return 0;
129	127	}
130	128

std/math/log10.zig+8-10

...	...	@@ -35,10 +35,10 @@ pub fn log10(x: var) @typeOf(x) {
35	35	}
36	36
37	37	pub fn log10_32(x_: f32) f32 {
38		const ivln10hi: f32 = 4.3432617188e-01;
39		const ivln10lo: f32 = -3.1689971365e-05;
40		const log10_2hi: f32 = 3.0102920532e-01;
41		const log10_2lo: f32 = 7.9034151668e-07;
	38	const ivln10hi: f32 = 4.3432617188e-01;
	39	const ivln10lo: f32 = -3.1689971365e-05;
	40	const log10_2hi: f32 = 3.0102920532e-01;
	41	const log10_2lo: f32 = 7.9034151668e-07;
42	42	const Lg1: f32 = 0xaaaaaa.0p-24;
43	43	const Lg2: f32 = 0xccce13.0p-25;
44	44	const Lg3: f32 = 0x91e9ee.0p-25;
...	...	@@ -95,8 +95,8 @@ pub fn log10_32(x_: f32) f32 {
95	95	}
96	96
97	97	pub fn log10_64(x_: f64) f64 {
98		const ivln10hi: f64 = 4.34294481878168880939e-01;
99		const ivln10lo: f64 = 2.50829467116452752298e-11;
	98	const ivln10hi: f64 = 4.34294481878168880939e-01;
	99	const ivln10lo: f64 = 2.50829467116452752298e-11;
100	100	const log10_2hi: f64 = 3.01029995663611771306e-01;
101	101	const log10_2lo: f64 = 3.69423907715893078616e-13;
102	102	const Lg1: f64 = 6.666666666666735130e-01;
...	...	@@ -126,11 +126,9 @@ pub fn log10_64(x_: f64) f64 {
126	126	k -= 54;
127	127	x *= 0x1.0p54;
128	128	hx = u32(@bitCast(u64, x) >> 32);
129		}
130		else if (hx >= 0x7FF00000) {
	129	} else if (hx >= 0x7FF00000) {
131	130	return x;
132		}
133		else if (hx == 0x3FF00000 and ix << 32 == 0) {
	131	} else if (hx == 0x3FF00000 and ix << 32 == 0) {
134	132	return 0;
135	133	}
136	134

std/math/log1p.zig+1-2

...	...	@@ -138,8 +138,7 @@ fn log1p_64(x: f64) f64 {
138	138	c = 0;
139	139	f = x;
140	140	}
141		}
142		else if (hx >= 0x7FF00000) {
	141	} else if (hx >= 0x7FF00000) {
143	142	return x;
144	143	}
145	144

std/math/log2.zig+5-2

...	...	@@ -27,7 +27,10 @@ pub fn log2(x: var) @typeOf(x) {
27	27	TypeId.IntLiteral => comptime {
28	28	var result = 0;
29	29	var x_shifted = x;
30		while (b: {x_shifted >>= 1; break :b x_shifted != 0;}) : (result += 1) {}
	30	while (b: {
	31	x_shifted >>= 1;
	32	break :b x_shifted != 0;
	33	}) : (result += 1) {}
31	34	return result;
32	35	},
33	36	TypeId.Int => {
...	...	@@ -38,7 +41,7 @@ pub fn log2(x: var) @typeOf(x) {
38	41	}
39	42
40	43	pub fn log2_32(x_: f32) f32 {
41		const ivln2hi: f32 = 1.4428710938e+00;
	44	const ivln2hi: f32 = 1.4428710938e+00;
42	45	const ivln2lo: f32 = -1.7605285393e-04;
43	46	const Lg1: f32 = 0xaaaaaa.0p-24;
44	47	const Lg2: f32 = 0xccce13.0p-25;

std/math/pow.zig-1

...	...	@@ -28,7 +28,6 @@ const assert = std.debug.assert;
28	28
29	29	// This implementation is taken from the go stlib, musl is a bit more complex.
30	30	pub fn pow(comptime T: type, x: T, y: T) T {
31
32	31	@setFloatMode(this, @import("builtin").FloatMode.Strict);
33	32
34	33	if (T != f32 and T != f64) {

std/math/round.zig+4-4

...	...	@@ -24,13 +24,13 @@ fn round32(x_: f32) f32 {
24	24	const e = (u >> 23) & 0xFF;
25	25	var y: f32 = undefined;
26	26
27		if (e >= 0x7F+23) {
	27	if (e >= 0x7F + 23) {
28	28	return x;
29	29	}
30	30	if (u >> 31 != 0) {
31	31	x = -x;
32	32	}
33		if (e < 0x7F-1) {
	33	if (e < 0x7F - 1) {
34	34	math.forceEval(x + math.f32_toint);
35	35	return 0 * @bitCast(f32, u);
36	36	}
...	...	@@ -61,13 +61,13 @@ fn round64(x_: f64) f64 {
61	61	const e = (u >> 52) & 0x7FF;
62	62	var y: f64 = undefined;
63	63
64		if (e >= 0x3FF+52) {
	64	if (e >= 0x3FF + 52) {
65	65	return x;
66	66	}
67	67	if (u >> 63 != 0) {
68	68	x = -x;
69	69	}
70		if (e < 0x3ff-1) {
	70	if (e < 0x3ff - 1) {
71	71	math.forceEval(x + math.f64_toint);
72	72	return 0 * @bitCast(f64, u);
73	73	}

std/math/sin.zig+6-6

...	...	@@ -19,20 +19,20 @@ pub fn sin(x: var) @typeOf(x) {
19	19	}
20	20
21	21	// sin polynomial coefficients
22		const S0 = 1.58962301576546568060E-10;
	22	const S0 = 1.58962301576546568060E-10;
23	23	const S1 = -2.50507477628578072866E-8;
24		const S2 = 2.75573136213857245213E-6;
	24	const S2 = 2.75573136213857245213E-6;
25	25	const S3 = -1.98412698295895385996E-4;
26		const S4 = 8.33333333332211858878E-3;
	26	const S4 = 8.33333333332211858878E-3;
27	27	const S5 = -1.66666666666666307295E-1;
28	28
29	29	// cos polynomial coeffiecients
30	30	const C0 = -1.13585365213876817300E-11;
31		const C1 = 2.08757008419747316778E-9;
	31	const C1 = 2.08757008419747316778E-9;
32	32	const C2 = -2.75573141792967388112E-7;
33		const C3 = 2.48015872888517045348E-5;
	33	const C3 = 2.48015872888517045348E-5;
34	34	const C4 = -1.38888888888730564116E-3;
35		const C5 = 4.16666666666665929218E-2;
	35	const C5 = 4.16666666666665929218E-2;
36	36
37	37	// NOTE: This is taken from the go stdlib. The musl implementation is much more complex.
38	38	//

std/math/tan.zig+3-3

...	...	@@ -19,12 +19,12 @@ pub fn tan(x: var) @typeOf(x) {
19	19	}
20	20
21	21	const Tp0 = -1.30936939181383777646E4;
22		const Tp1 = 1.15351664838587416140E6;
	22	const Tp1 = 1.15351664838587416140E6;
23	23	const Tp2 = -1.79565251976484877988E7;
24	24
25		const Tq1 = 1.36812963470692954678E4;
	25	const Tq1 = 1.36812963470692954678E4;
26	26	const Tq2 = -1.32089234440210967447E6;
27		const Tq3 = 2.50083801823357915839E7;
	27	const Tq3 = 2.50083801823357915839E7;
28	28	const Tq4 = -5.38695755929454629881E7;
29	29
30	30	// NOTE: This is taken from the go stdlib. The musl implementation is much more complex.

std/mem.zig+133-74

...	...	@@ -6,14 +6,14 @@ const builtin = @import("builtin");
6	6	const mem = this;
7	7
8	8	pub const Allocator = struct {
9		const Error = error {OutOfMemory};
	9	const Error = error{OutOfMemory};
10	10
11	11	/// Allocate byte_count bytes and return them in a slice, with the
12	12	/// slice's pointer aligned at least to alignment bytes.
13	13	/// The returned newly allocated memory is undefined.
14	14	/// `alignment` is guaranteed to be >= 1
15	15	/// `alignment` is guaranteed to be a power of 2
16		allocFn: fn (self: &Allocator, byte_count: usize, alignment: u29) Error![]u8,
	16	allocFn: fn(self: &Allocator, byte_count: usize, alignment: u29) Error![]u8,
17	17
18	18	/// If `new_byte_count > old_mem.len`:
19	19	/// * `old_mem.len` is the same as what was returned from allocFn or reallocFn.
...	...	@@ -26,10 +26,10 @@ pub const Allocator = struct {
26	26	/// The returned newly allocated memory is undefined.
27	27	/// `alignment` is guaranteed to be >= 1
28	28	/// `alignment` is guaranteed to be a power of 2
29		reallocFn: fn (self: &Allocator, old_mem: []u8, new_byte_count: usize, alignment: u29) Error![]u8,
	29	reallocFn: fn(self: &Allocator, old_mem: []u8, new_byte_count: usize, alignment: u29) Error![]u8,
30	30
31	31	/// Guaranteed: `old_mem.len` is the same as what was returned from `allocFn` or `reallocFn`
32		freeFn: fn (self: &Allocator, old_mem: []u8) void,
	32	freeFn: fn(self: &Allocator, old_mem: []u8) void,
33	33
34	34	fn create(self: &Allocator, comptime T: type) !&T {
35	35	if (@sizeOf(T) == 0) return &{};
...	...	@@ -47,7 +47,7 @@ pub const Allocator = struct {
47	47	if (@sizeOf(T) == 0) return &{};
48	48	const slice = try self.alloc(T, 1);
49	49	const ptr = &slice[0];
50		ptr = init;
	50	ptr.* = init.*;
51	51	return ptr;
52	52	}
53	53
...	...	@@ -59,9 +59,7 @@ pub const Allocator = struct {
59	59	return self.alignedAlloc(T, @alignOf(T), n);
60	60	}
61	61
62		fn alignedAlloc(self: &Allocator, comptime T: type, comptime alignment: u29,
63		n: usize) ![]align(alignment) T
64		{
	62	fn alignedAlloc(self: &Allocator, comptime T: type, comptime alignment: u29, n: usize) ![]align(alignment) T {
65	63	if (n == 0) {
66	64	return (&align(alignment) T)(undefined)[0..0];
67	65	}
...	...	@@ -70,7 +68,7 @@ pub const Allocator = struct {
70	68	assert(byte_slice.len == byte_count);
71	69	// This loop gets optimized out in ReleaseFast mode
72	70	for (byte_slice) \|*byte\| {
73		*byte = undefined;
	71	byte.* = undefined;
74	72	}
75	73	return ([]align(alignment) T)(@alignCast(alignment, byte_slice));
76	74	}
...	...	@@ -79,9 +77,7 @@ pub const Allocator = struct {
79	77	return self.alignedRealloc(T, @alignOf(T), @alignCast(@alignOf(T), old_mem), n);
80	78	}
81	79
82		fn alignedRealloc(self: &Allocator, comptime T: type, comptime alignment: u29,
83		old_mem: []align(alignment) T, n: usize) ![]align(alignment) T
84		{
	80	fn alignedRealloc(self: &Allocator, comptime T: type, comptime alignment: u29, old_mem: []align(alignment) T, n: usize) ![]align(alignment) T {
85	81	if (old_mem.len == 0) {
86	82	return self.alloc(T, n);
87	83	}
...	...	@@ -97,7 +93,7 @@ pub const Allocator = struct {
97	93	if (n > old_mem.len) {
98	94	// This loop gets optimized out in ReleaseFast mode
99	95	for (byte_slice[old_byte_slice.len..]) \|*byte\| {
100		*byte = undefined;
	96	byte.* = undefined;
101	97	}
102	98	}
103	99	return ([]T)(@alignCast(alignment, byte_slice));
...	...	@@ -110,9 +106,7 @@ pub const Allocator = struct {
110	106	return self.alignedShrink(T, @alignOf(T), @alignCast(@alignOf(T), old_mem), n);
111	107	}
112	108
113		fn alignedShrink(self: &Allocator, comptime T: type, comptime alignment: u29,
114		old_mem: []align(alignment) T, n: usize) []align(alignment) T
115		{
	109	fn alignedShrink(self: &Allocator, comptime T: type, comptime alignment: u29, old_mem: []align(alignment) T, n: usize) []align(alignment) T {
116	110	if (n == 0) {
117	111	self.free(old_mem);
118	112	return old_mem[0..0];
...	...	@@ -131,8 +125,7 @@ pub const Allocator = struct {
131	125
132	126	fn free(self: &Allocator, memory: var) void {
133	127	const bytes = ([]const u8)(memory);
134		if (bytes.len == 0)
135		return;
	128	if (bytes.len == 0) return;
136	129	const non_const_ptr = @intToPtr(&u8, @ptrToInt(bytes.ptr));
137	130	self.freeFn(self, non_const_ptr[0..bytes.len]);
138	131	}
...	...	@@ -146,11 +139,13 @@ pub fn copy(comptime T: type, dest: []T, source: []const T) void {
146	139	// this and automatically omit safety checks for loops
147	140	@setRuntimeSafety(false);
148	141	assert(dest.len >= source.len);
149		for (source) \|s, i\| dest[i] = s;
	142	for (source) \|s, i\|
	143	dest[i] = s;
150	144	}
151	145
152	146	pub fn set(comptime T: type, dest: []T, value: T) void {
153		for (dest) \|d\| d = value;
	147	for (dest) \|*d\|
	148	d.* = value;
154	149	}
155	150
156	151	/// Returns true if lhs < rhs, false otherwise
...	...	@@ -182,6 +177,14 @@ pub fn eql(comptime T: type, a: []const T, b: []const T) bool {
182	177	return true;
183	178	}
184	179
	180	/// Returns true if all elements in a slice are equal to the scalar value provided
	181	pub fn allEqual(comptime T: type, slice: []const T, scalar: T) bool {
	182	for (slice) \|item\| {
	183	if (item != scalar) return false;
	184	}
	185	return true;
	186	}
	187
185	188	/// Copies ::m to newly allocated memory. Caller is responsible to free it.
186	189	pub fn dupe(allocator: &Allocator, comptime T: type, m: []const T) ![]T {
187	190	const new_buf = try allocator.alloc(T, m.len);
...	...	@@ -229,8 +232,7 @@ pub fn lastIndexOfScalar(comptime T: type, slice: []const T, value: T) ?usize {
229	232	var i: usize = slice.len;
230	233	while (i != 0) {
231	234	i -= 1;
232		if (slice[i] == value)
233		return i;
	235	if (slice[i] == value) return i;
234	236	}
235	237	return null;
236	238	}
...	...	@@ -238,8 +240,7 @@ pub fn lastIndexOfScalar(comptime T: type, slice: []const T, value: T) ?usize {
238	240	pub fn indexOfScalarPos(comptime T: type, slice: []const T, start_index: usize, value: T) ?usize {
239	241	var i: usize = start_index;
240	242	while (i < slice.len) : (i += 1) {
241		if (slice[i] == value)
242		return i;
	243	if (slice[i] == value) return i;
243	244	}
244	245	return null;
245	246	}
...	...	@@ -253,8 +254,7 @@ pub fn lastIndexOfAny(comptime T: type, slice: []const T, values: []const T) ?us
253	254	while (i != 0) {
254	255	i -= 1;
255	256	for (values) \|value\| {
256		if (slice[i] == value)
257		return i;
	257	if (slice[i] == value) return i;
258	258	}
259	259	}
260	260	return null;
...	...	@@ -264,8 +264,7 @@ pub fn indexOfAnyPos(comptime T: type, slice: []const T, start_index: usize, val
264	264	var i: usize = start_index;
265	265	while (i < slice.len) : (i += 1) {
266	266	for (values) \|value\| {
267		if (slice[i] == value)
268		return i;
	267	if (slice[i] == value) return i;
269	268	}
270	269	}
271	270	return null;
...	...	@@ -279,28 +278,23 @@ pub fn indexOf(comptime T: type, haystack: []const T, needle: []const T) ?usize
279	278	/// To start looking at a different index, slice the haystack first.
280	279	/// TODO is there even a better algorithm for this?
281	280	pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?usize {
282		if (needle.len > haystack.len)
283		return null;
	281	if (needle.len > haystack.len) return null;
284	282
285	283	var i: usize = haystack.len - needle.len;
286	284	while (true) : (i -= 1) {
287		if (mem.eql(T, haystack[i..i+needle.len], needle))
288		return i;
289		if (i == 0)
290		return null;
	285	if (mem.eql(T, haystack[i..i + needle.len], needle)) return i;
	286	if (i == 0) return null;
291	287	}
292	288	}
293	289
294	290	// TODO boyer-moore algorithm
295	291	pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, needle: []const T) ?usize {
296		if (needle.len > haystack.len)
297		return null;
	292	if (needle.len > haystack.len) return null;
298	293
299	294	var i: usize = start_index;
300	295	const end = haystack.len - needle.len;
301	296	while (i <= end) : (i += 1) {
302		if (eql(T, haystack[i .. i + needle.len], needle))
303		return i;
	297	if (eql(T, haystack[i..i + needle.len], needle)) return i;
304	298	}
305	299	return null;
306	300	}
...	...	@@ -355,9 +349,12 @@ pub fn readIntBE(comptime T: type, bytes: []const u8) T {
355	349	}
356	350	assert(bytes.len == @sizeOf(T));
357	351	var result: T = 0;
358		{comptime var i = 0; inline while (i < @sizeOf(T)) : (i += 1) {
359		result = (result << 8) \| T(bytes[i]);
360		}}
	352	{
	353	comptime var i = 0;
	354	inline while (i < @sizeOf(T)) : (i += 1) {
	355	result = (result << 8) \| T(bytes[i]);
	356	}
	357	}
361	358	return result;
362	359	}
363	360
...	...	@@ -369,9 +366,12 @@ pub fn readIntLE(comptime T: type, bytes: []const u8) T {
369	366	}
370	367	assert(bytes.len == @sizeOf(T));
371	368	var result: T = 0;
372		{comptime var i = 0; inline while (i < @sizeOf(T)) : (i += 1) {
373		result \|= T(bytes[i]) << i * 8;
374		}}
	369	{
	370	comptime var i = 0;
	371	inline while (i < @sizeOf(T)) : (i += 1) {
	372	result \|= T(bytes[i]) << i * 8;
	373	}
	374	}
375	375	return result;
376	376	}
377	377
...	...	@@ -393,7 +393,7 @@ pub fn writeInt(buf: []u8, value: var, endian: builtin.Endian) void {
393	393	},
394	394	builtin.Endian.Little => {
395	395	for (buf) \|*b\| {
396		*b = @truncate(u8, bits);
	396	b.* = @truncate(u8, bits);
397	397	bits >>= 8;
398	398	}
399	399	},
...	...	@@ -401,7 +401,6 @@ pub fn writeInt(buf: []u8, value: var, endian: builtin.Endian) void {
401	401	assert(bits == 0);
402	402	}
403	403
404
405	404	pub fn hash_slice_u8(k: []const u8) u32 {
406	405	// FNV 32-bit hash
407	406	var h: u32 = 2166136261;
...	...	@@ -420,7 +419,7 @@ pub fn eql_slice_u8(a: []const u8, b: []const u8) bool {
420	419	/// split(" abc def ghi ", " ")
421	420	/// Will return slices for "abc", "def", "ghi", null, in that order.
422	421	pub fn split(buffer: []const u8, split_bytes: []const u8) SplitIterator {
423		return SplitIterator {
	422	return SplitIterator{
424	423	.index = 0,
425	424	.buffer = buffer,
426	425	.split_bytes = split_bytes,
...	...	@@ -436,7 +435,7 @@ test "mem.split" {
436	435	}
437	436
438	437	pub fn startsWith(comptime T: type, haystack: []const T, needle: []const T) bool {
439		return if (needle.len > haystack.len) false else eql(T, haystack[0 .. needle.len], needle);
	438	return if (needle.len > haystack.len) false else eql(T, haystack[0..needle.len], needle);
440	439	}
441	440
442	441	test "mem.startsWith" {
...	...	@@ -445,10 +444,9 @@ test "mem.startsWith" {
445	444	}
446	445
447	446	pub fn endsWith(comptime T: type, haystack: []const T, needle: []const T) bool {
448		return if (needle.len > haystack.len) false else eql(T, haystack[haystack.len - needle.len ..], needle);
	447	return if (needle.len > haystack.len) false else eql(T, haystack[haystack.len - needle.len..], needle);
449	448	}
450	449
451
452	450	test "mem.endsWith" {
453	451	assert(endsWith(u8, "Needle in haystack", "haystack"));
454	452	assert(!endsWith(u8, "Bob", "Bo"));
...	...	@@ -542,29 +540,47 @@ test "testReadInt" {
542	540	}
543	541	fn testReadIntImpl() void {
544	542	{
545		const bytes = []u8{ 0x12, 0x34, 0x56, 0x78 };
546		assert(readInt(bytes, u32, builtin.Endian.Big) == 0x12345678);
547		assert(readIntBE(u32, bytes) == 0x12345678);
548		assert(readIntBE(i32, bytes) == 0x12345678);
	543	const bytes = []u8{
	544	0x12,
	545	0x34,
	546	0x56,
	547	0x78,
	548	};
	549	assert(readInt(bytes, u32, builtin.Endian.Big) == 0x12345678);
	550	assert(readIntBE(u32, bytes) == 0x12345678);
	551	assert(readIntBE(i32, bytes) == 0x12345678);
549	552	assert(readInt(bytes, u32, builtin.Endian.Little) == 0x78563412);
550		assert(readIntLE(u32, bytes) == 0x78563412);
551		assert(readIntLE(i32, bytes) == 0x78563412);
	553	assert(readIntLE(u32, bytes) == 0x78563412);
	554	assert(readIntLE(i32, bytes) == 0x78563412);
552	555	}
553	556	{
554		const buf = []u8{0x00, 0x00, 0x12, 0x34};
	557	const buf = []u8{
	558	0x00,
	559	0x00,
	560	0x12,
	561	0x34,
	562	};
555	563	const answer = readInt(buf, u64, builtin.Endian.Big);
556	564	assert(answer == 0x00001234);
557	565	}
558	566	{
559		const buf = []u8{0x12, 0x34, 0x00, 0x00};
	567	const buf = []u8{
	568	0x12,
	569	0x34,
	570	0x00,
	571	0x00,
	572	};
560	573	const answer = readInt(buf, u64, builtin.Endian.Little);
561	574	assert(answer == 0x00003412);
562	575	}
563	576	{
564		const bytes = []u8{0xff, 0xfe};
565		assert(readIntBE(u16, bytes) == 0xfffe);
	577	const bytes = []u8{
	578	0xff,
	579	0xfe,
	580	};
	581	assert(readIntBE(u16, bytes) == 0xfffe);
566	582	assert(readIntBE(i16, bytes) == -0x0002);
567		assert(readIntLE(u16, bytes) == 0xfeff);
	583	assert(readIntLE(u16, bytes) == 0xfeff);
568	584	assert(readIntLE(i16, bytes) == -0x0101);
569	585	}
570	586	}
...	...	@@ -577,19 +593,38 @@ fn testWriteIntImpl() void {
577	593	var bytes: [4]u8 = undefined;
578	594
579	595	writeInt(bytes[0..], u32(0x12345678), builtin.Endian.Big);
580		assert(eql(u8, bytes, []u8{ 0x12, 0x34, 0x56, 0x78 }));
	596	assert(eql(u8, bytes, []u8{
	597	0x12,
	598	0x34,
	599	0x56,
	600	0x78,
	601	}));
581	602
582	603	writeInt(bytes[0..], u32(0x78563412), builtin.Endian.Little);
583		assert(eql(u8, bytes, []u8{ 0x12, 0x34, 0x56, 0x78 }));
	604	assert(eql(u8, bytes, []u8{
	605	0x12,
	606	0x34,
	607	0x56,
	608	0x78,
	609	}));
584	610
585	611	writeInt(bytes[0..], u16(0x1234), builtin.Endian.Big);
586		assert(eql(u8, bytes, []u8{ 0x00, 0x00, 0x12, 0x34 }));
	612	assert(eql(u8, bytes, []u8{
	613	0x00,
	614	0x00,
	615	0x12,
	616	0x34,
	617	}));
587	618
588	619	writeInt(bytes[0..], u16(0x1234), builtin.Endian.Little);
589		assert(eql(u8, bytes, []u8{ 0x34, 0x12, 0x00, 0x00 }));
	620	assert(eql(u8, bytes, []u8{
	621	0x34,
	622	0x12,
	623	0x00,
	624	0x00,
	625	}));
590	626	}
591	627
592
593	628	pub fn min(comptime T: type, slice: []const T) T {
594	629	var best = slice[0];
595	630	for (slice[1..]) \|item\| {
...	...	@@ -615,9 +650,9 @@ test "mem.max" {
615	650	}
616	651
617	652	pub fn swap(comptime T: type, a: &T, b: &T) void {
618		const tmp = *a;
619		a = b;
620		*b = tmp;
	653	const tmp = a.*;
	654	a.* = b.*;
	655	b.* = tmp;
621	656	}
622	657
623	658	/// In-place order reversal of a slice
...	...	@@ -630,10 +665,22 @@ pub fn reverse(comptime T: type, items: []T) void {
630	665	}
631	666
632	667	test "std.mem.reverse" {
633		var arr = []i32{ 5, 3, 1, 2, 4 };
	668	var arr = []i32{
	669	5,
	670	3,
	671	1,
	672	2,
	673	4,
	674	};
634	675	reverse(i32, arr[0..]);
635	676
636		assert(eql(i32, arr, []i32{ 4, 2, 1, 3, 5 }));
	677	assert(eql(i32, arr, []i32{
	678	4,
	679	2,
	680	1,
	681	3,
	682	5,
	683	}));
637	684	}
638	685
639	686	/// In-place rotation of the values in an array ([0 1 2 3] becomes [1 2 3 0] if we rotate by 1)
...	...	@@ -645,13 +692,25 @@ pub fn rotate(comptime T: type, items: []T, amount: usize) void {
645	692	}
646	693
647	694	test "std.mem.rotate" {
648		var arr = []i32{ 5, 3, 1, 2, 4 };
	695	var arr = []i32{
	696	5,
	697	3,
	698	1,
	699	2,
	700	4,
	701	};
649	702	rotate(i32, arr[0..], 2);
650	703
651		assert(eql(i32, arr, []i32{ 1, 2, 4, 5, 3 }));
	704	assert(eql(i32, arr, []i32{
	705	1,
	706	2,
	707	4,
	708	5,
	709	3,
	710	}));
652	711	}
653	712
654		// TODO: When https://github.com/zig-lang/zig/issues/649 is solved these can be done by
	713	// TODO: When https://github.com/ziglang/zig/issues/649 is solved these can be done by
655	714	// endian-casting the pointer and then dereferencing
656	715
657	716	pub fn endianSwapIfLe(comptime T: type, x: T) T {

std/net.zig+8-10

...	...	@@ -19,9 +19,9 @@ pub const Address = struct {
19	19	os_addr: OsAddress,
20	20
21	21	pub fn initIp4(ip4: u32, port: u16) Address {
22		return Address {
23		.os_addr = posix.sockaddr {
24		.in = posix.sockaddr_in {
	22	return Address{
	23	.os_addr = posix.sockaddr{
	24	.in = posix.sockaddr_in{
25	25	.family = posix.AF_INET,
26	26	.port = std.mem.endianSwapIfLe(u16, port),
27	27	.addr = ip4,
...	...	@@ -32,10 +32,10 @@ pub const Address = struct {
32	32	}
33	33
34	34	pub fn initIp6(ip6: &const Ip6Addr, port: u16) Address {
35		return Address {
	35	return Address{
36	36	.family = posix.AF_INET6,
37		.os_addr = posix.sockaddr {
38		.in6 = posix.sockaddr_in6 {
	37	.os_addr = posix.sockaddr{
	38	.in6 = posix.sockaddr_in6{
39	39	.family = posix.AF_INET6,
40	40	.port = std.mem.endianSwapIfLe(u16, port),
41	41	.flowinfo = 0,
...	...	@@ -47,9 +47,7 @@ pub const Address = struct {
47	47	}
48	48
49	49	pub fn initPosix(addr: &const posix.sockaddr) Address {
50		return Address {
51		.os_addr = *addr,
52		};
	50	return Address{ .os_addr = addr.* };
53	51	}
54	52
55	53	pub fn format(self: &const Address, out_stream: var) !void {
...	...	@@ -98,7 +96,7 @@ pub fn parseIp4(buf: []const u8) !u32 {
98	96	}
99	97	} else {
100	98	return error.InvalidCharacter;
101		}
	99	}
102	100	}
103	101	if (index == 3 and saw_any_digits) {
104	102	out_ptr[index] = x;

std/os/child_process.zig+99-92

...	...	@@ -49,7 +49,7 @@ pub const ChildProcess = struct {
49	49	err_pipe: if (is_windows) void else [2]i32,
50	50	llnode: if (is_windows) void else LinkedList(&ChildProcess).Node,
51	51
52		pub const SpawnError = error {
	52	pub const SpawnError = error{
53	53	ProcessFdQuotaExceeded,
54	54	Unexpected,
55	55	NotDir,
...	...	@@ -88,7 +88,7 @@ pub const ChildProcess = struct {
88	88	const child = try allocator.create(ChildProcess);
89	89	errdefer allocator.destroy(child);
90	90
91		*child = ChildProcess {
	91	child.* = ChildProcess{
92	92	.allocator = allocator,
93	93	.argv = argv,
94	94	.pid = undefined,
...	...	@@ -99,8 +99,10 @@ pub const ChildProcess = struct {
99	99	.term = null,
100	100	.env_map = null,
101	101	.cwd = null,
102		.uid = if (is_windows) {} else null,
103		.gid = if (is_windows) {} else null,
	102	.uid = if (is_windows) {} else
	103	null,
	104	.gid = if (is_windows) {} else
	105	null,
104	106	.stdin = null,
105	107	.stdout = null,
106	108	.stderr = null,
...	...	@@ -193,9 +195,7 @@ pub const ChildProcess = struct {
193	195
194	196	/// Spawns a child process, waits for it, collecting stdout and stderr, and then returns.
195	197	/// If it succeeds, the caller owns result.stdout and result.stderr memory.
196		pub fn exec(allocator: &mem.Allocator, argv: []const []const u8, cwd: ?[]const u8,
197		env_map: ?&const BufMap, max_output_size: usize) !ExecResult
198		{
	198	pub fn exec(allocator: &mem.Allocator, argv: []const []const u8, cwd: ?[]const u8, env_map: ?&const BufMap, max_output_size: usize) !ExecResult {
199	199	const child = try ChildProcess.init(argv, allocator);
200	200	defer child.deinit();
201	201
...	...	@@ -218,7 +218,7 @@ pub const ChildProcess = struct {
218	218	try stdout_file_in_stream.stream.readAllBuffer(&stdout, max_output_size);
219	219	try stderr_file_in_stream.stream.readAllBuffer(&stderr, max_output_size);
220	220
221		return ExecResult {
	221	return ExecResult{
222	222	.term = try child.wait(),
223	223	.stdout = stdout.toOwnedSlice(),
224	224	.stderr = stderr.toOwnedSlice(),
...	...	@@ -255,9 +255,9 @@ pub const ChildProcess = struct {
255	255	self.term = (SpawnError!Term)(x: {
256	256	var exit_code: windows.DWORD = undefined;
257	257	if (windows.GetExitCodeProcess(self.handle, &exit_code) == 0) {
258		break :x Term { .Unknown = 0 };
	258	break :x Term{ .Unknown = 0 };
259	259	} else {
260		break :x Term { .Exited = @bitCast(i32, exit_code)};
	260	break :x Term{ .Exited = @bitCast(i32, exit_code) };
261	261	}
262	262	});
263	263
...	...	@@ -288,9 +288,18 @@ pub const ChildProcess = struct {
288	288	}
289	289
290	290	fn cleanupStreams(self: &ChildProcess) void {
291		if (self.stdin) \|*stdin\| { stdin.close(); self.stdin = null; }
292		if (self.stdout) \|*stdout\| { stdout.close(); self.stdout = null; }
293		if (self.stderr) \|*stderr\| { stderr.close(); self.stderr = null; }
	291	if (self.stdin) \|*stdin\| {
	292	stdin.close();
	293	self.stdin = null;
	294	}
	295	if (self.stdout) \|*stdout\| {
	296	stdout.close();
	297	self.stdout = null;
	298	}
	299	if (self.stderr) \|*stderr\| {
	300	stderr.close();
	301	self.stderr = null;
	302	}
294	303	}
295	304
296	305	fn cleanupAfterWait(self: &ChildProcess, status: i32) !Term {
...	...	@@ -317,25 +326,30 @@ pub const ChildProcess = struct {
317	326
318	327	fn statusToTerm(status: i32) Term {
319	328	return if (posix.WIFEXITED(status))
320		Term { .Exited = posix.WEXITSTATUS(status) }
	329	Term{ .Exited = posix.WEXITSTATUS(status) }
321	330	else if (posix.WIFSIGNALED(status))
322		Term { .Signal = posix.WTERMSIG(status) }
	331	Term{ .Signal = posix.WTERMSIG(status) }
323	332	else if (posix.WIFSTOPPED(status))
324		Term { .Stopped = posix.WSTOPSIG(status) }
	333	Term{ .Stopped = posix.WSTOPSIG(status) }
325	334	else
326		Term { .Unknown = status }
327		;
	335	Term{ .Unknown = status };
328	336	}
329	337
330	338	fn spawnPosix(self: &ChildProcess) !void {
331	339	const stdin_pipe = if (self.stdin_behavior == StdIo.Pipe) try makePipe() else undefined;
332		errdefer if (self.stdin_behavior == StdIo.Pipe) { destroyPipe(stdin_pipe); };
	340	errdefer if (self.stdin_behavior == StdIo.Pipe) {
	341	destroyPipe(stdin_pipe);
	342	};
333	343
334	344	const stdout_pipe = if (self.stdout_behavior == StdIo.Pipe) try makePipe() else undefined;
335		errdefer if (self.stdout_behavior == StdIo.Pipe) { destroyPipe(stdout_pipe); };
	345	errdefer if (self.stdout_behavior == StdIo.Pipe) {
	346	destroyPipe(stdout_pipe);
	347	};
336	348
337	349	const stderr_pipe = if (self.stderr_behavior == StdIo.Pipe) try makePipe() else undefined;
338		errdefer if (self.stderr_behavior == StdIo.Pipe) { destroyPipe(stderr_pipe); };
	350	errdefer if (self.stderr_behavior == StdIo.Pipe) {
	351	destroyPipe(stderr_pipe);
	352	};
339	353
340	354	const any_ignore = (self.stdin_behavior == StdIo.Ignore or self.stdout_behavior == StdIo.Ignore or self.stderr_behavior == StdIo.Ignore);
341	355	const dev_null_fd = if (any_ignore) blk: {
...	...	@@ -346,7 +360,9 @@ pub const ChildProcess = struct {
346	360	} else blk: {
347	361	break :blk undefined;
348	362	};
349		defer { if (any_ignore) os.close(dev_null_fd); }
	363	defer {
	364	if (any_ignore) os.close(dev_null_fd);
	365	}
350	366
351	367	var env_map_owned: BufMap = undefined;
352	368	var we_own_env_map: bool = undefined;
...	...	@@ -358,7 +374,9 @@ pub const ChildProcess = struct {
358	374	env_map_owned = try os.getEnvMap(self.allocator);
359	375	break :x &env_map_owned;
360	376	};
361		defer { if (we_own_env_map) env_map_owned.deinit(); }
	377	defer {
	378	if (we_own_env_map) env_map_owned.deinit();
	379	}
362	380
363	381	// This pipe is used to communicate errors between the time of fork
364	382	// and execve from the child process to the parent process.
...	...	@@ -375,17 +393,12 @@ pub const ChildProcess = struct {
375	393	}
376	394	if (pid_result == 0) {
377	395	// we are the child
378
379		setUpChildIo(self.stdin_behavior, stdin_pipe[0], posix.STDIN_FILENO, dev_null_fd) catch
380		\|err\| forkChildErrReport(err_pipe[1], err);
381		setUpChildIo(self.stdout_behavior, stdout_pipe[1], posix.STDOUT_FILENO, dev_null_fd) catch
382		\|err\| forkChildErrReport(err_pipe[1], err);
383		setUpChildIo(self.stderr_behavior, stderr_pipe[1], posix.STDERR_FILENO, dev_null_fd) catch
384		\|err\| forkChildErrReport(err_pipe[1], err);
	396	setUpChildIo(self.stdin_behavior, stdin_pipe[0], posix.STDIN_FILENO, dev_null_fd) catch \|err\| forkChildErrReport(err_pipe[1], err);
	397	setUpChildIo(self.stdout_behavior, stdout_pipe[1], posix.STDOUT_FILENO, dev_null_fd) catch \|err\| forkChildErrReport(err_pipe[1], err);
	398	setUpChildIo(self.stderr_behavior, stderr_pipe[1], posix.STDERR_FILENO, dev_null_fd) catch \|err\| forkChildErrReport(err_pipe[1], err);
385	399
386	400	if (self.cwd) \|cwd\| {
387		os.changeCurDir(self.allocator, cwd) catch
388		\|err\| forkChildErrReport(err_pipe[1], err);
	401	os.changeCurDir(self.allocator, cwd) catch \|err\| forkChildErrReport(err_pipe[1], err);
389	402	}
390	403
391	404	if (self.gid) \|gid\| {
...	...	@@ -396,8 +409,7 @@ pub const ChildProcess = struct {
396	409	os.posix_setreuid(uid, uid) catch \|err\| forkChildErrReport(err_pipe[1], err);
397	410	}
398	411
399		os.posixExecve(self.argv, env_map, self.allocator) catch
400		\|err\| forkChildErrReport(err_pipe[1], err);
	412	os.posixExecve(self.argv, env_map, self.allocator) catch \|err\| forkChildErrReport(err_pipe[1], err);
401	413	}
402	414
403	415	// we are the parent
...	...	@@ -423,37 +435,41 @@ pub const ChildProcess = struct {
423	435	self.llnode = LinkedList(&ChildProcess).Node.init(self);
424	436	self.term = null;
425	437
426		if (self.stdin_behavior == StdIo.Pipe) { os.close(stdin_pipe[0]); }
427		if (self.stdout_behavior == StdIo.Pipe) { os.close(stdout_pipe[1]); }
428		if (self.stderr_behavior == StdIo.Pipe) { os.close(stderr_pipe[1]); }
	438	if (self.stdin_behavior == StdIo.Pipe) {
	439	os.close(stdin_pipe[0]);
	440	}
	441	if (self.stdout_behavior == StdIo.Pipe) {
	442	os.close(stdout_pipe[1]);
	443	}
	444	if (self.stderr_behavior == StdIo.Pipe) {
	445	os.close(stderr_pipe[1]);
	446	}
429	447	}
430	448
431	449	fn spawnWindows(self: &ChildProcess) !void {
432		const saAttr = windows.SECURITY_ATTRIBUTES {
	450	const saAttr = windows.SECURITY_ATTRIBUTES{
433	451	.nLength = @sizeOf(windows.SECURITY_ATTRIBUTES),
434	452	.bInheritHandle = windows.TRUE,
435	453	.lpSecurityDescriptor = null,
436	454	};
437	455
438		const any_ignore = (self.stdin_behavior == StdIo.Ignore or
439		self.stdout_behavior == StdIo.Ignore or
440		self.stderr_behavior == StdIo.Ignore);
	456	const any_ignore = (self.stdin_behavior == StdIo.Ignore or self.stdout_behavior == StdIo.Ignore or self.stderr_behavior == StdIo.Ignore);
441	457
442	458	const nul_handle = if (any_ignore) blk: {
443	459	const nul_file_path = "NUL";
444	460	var fixed_buffer_mem: [nul_file_path.len + 1]u8 = undefined;
445	461	var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
446		break :blk try os.windowsOpen(&fixed_allocator.allocator, "NUL", windows.GENERIC_READ, windows.FILE_SHARE_READ,
447		windows.OPEN_EXISTING, windows.FILE_ATTRIBUTE_NORMAL);
	462	break :blk try os.windowsOpen(&fixed_allocator.allocator, "NUL", windows.GENERIC_READ, windows.FILE_SHARE_READ, windows.OPEN_EXISTING, windows.FILE_ATTRIBUTE_NORMAL);
448	463	} else blk: {
449	464	break :blk undefined;
450	465	};
451		defer { if (any_ignore) os.close(nul_handle); }
	466	defer {
	467	if (any_ignore) os.close(nul_handle);
	468	}
452	469	if (any_ignore) {
453	470	try windowsSetHandleInfo(nul_handle, windows.HANDLE_FLAG_INHERIT, 0);
454	471	}
455	472
456
457	473	var g_hChildStd_IN_Rd: ?windows.HANDLE = null;
458	474	var g_hChildStd_IN_Wr: ?windows.HANDLE = null;
459	475	switch (self.stdin_behavior) {
...	...	@@ -470,7 +486,9 @@ pub const ChildProcess = struct {
470	486	g_hChildStd_IN_Rd = null;
471	487	},
472	488	}
473		errdefer if (self.stdin_behavior == StdIo.Pipe) { windowsDestroyPipe(g_hChildStd_IN_Rd, g_hChildStd_IN_Wr); };
	489	errdefer if (self.stdin_behavior == StdIo.Pipe) {
	490	windowsDestroyPipe(g_hChildStd_IN_Rd, g_hChildStd_IN_Wr);
	491	};
474	492
475	493	var g_hChildStd_OUT_Rd: ?windows.HANDLE = null;
476	494	var g_hChildStd_OUT_Wr: ?windows.HANDLE = null;
...	...	@@ -488,7 +506,9 @@ pub const ChildProcess = struct {
488	506	g_hChildStd_OUT_Wr = null;
489	507	},
490	508	}
491		errdefer if (self.stdin_behavior == StdIo.Pipe) { windowsDestroyPipe(g_hChildStd_OUT_Rd, g_hChildStd_OUT_Wr); };
	509	errdefer if (self.stdin_behavior == StdIo.Pipe) {
	510	windowsDestroyPipe(g_hChildStd_OUT_Rd, g_hChildStd_OUT_Wr);
	511	};
492	512
493	513	var g_hChildStd_ERR_Rd: ?windows.HANDLE = null;
494	514	var g_hChildStd_ERR_Wr: ?windows.HANDLE = null;
...	...	@@ -506,12 +526,14 @@ pub const ChildProcess = struct {
506	526	g_hChildStd_ERR_Wr = null;
507	527	},
508	528	}
509		errdefer if (self.stdin_behavior == StdIo.Pipe) { windowsDestroyPipe(g_hChildStd_ERR_Rd, g_hChildStd_ERR_Wr); };
	529	errdefer if (self.stdin_behavior == StdIo.Pipe) {
	530	windowsDestroyPipe(g_hChildStd_ERR_Rd, g_hChildStd_ERR_Wr);
	531	};
510	532
511	533	const cmd_line = try windowsCreateCommandLine(self.allocator, self.argv);
512	534	defer self.allocator.free(cmd_line);
513	535
514		var siStartInfo = windows.STARTUPINFOA {
	536	var siStartInfo = windows.STARTUPINFOA{
515	537	.cb = @sizeOf(windows.STARTUPINFOA),
516	538	.hStdError = g_hChildStd_ERR_Wr,
517	539	.hStdOutput = g_hChildStd_OUT_Wr,
...	...	@@ -534,19 +556,11 @@ pub const ChildProcess = struct {
534	556	};
535	557	var piProcInfo: windows.PROCESS_INFORMATION = undefined;
536	558
537		const cwd_slice = if (self.cwd) \|cwd\|
538		try cstr.addNullByte(self.allocator, cwd)
539		else
540		null
541		;
	559	const cwd_slice = if (self.cwd) \|cwd\| try cstr.addNullByte(self.allocator, cwd) else null;
542	560	defer if (cwd_slice) \|cwd\| self.allocator.free(cwd);
543	561	const cwd_ptr = if (cwd_slice) \|cwd\| cwd.ptr else null;
544	562
545		const maybe_envp_buf = if (self.env_map) \|env_map\|
546		try os.createWindowsEnvBlock(self.allocator, env_map)
547		else
548		null
549		;
	563	const maybe_envp_buf = if (self.env_map) \|env_map\| try os.createWindowsEnvBlock(self.allocator, env_map) else null;
550	564	defer if (maybe_envp_buf) \|envp_buf\| self.allocator.free(envp_buf);
551	565	const envp_ptr = if (maybe_envp_buf) \|envp_buf\| envp_buf.ptr else null;
552	566
...	...	@@ -563,11 +577,8 @@ pub const ChildProcess = struct {
563	577	};
564	578	defer self.allocator.free(app_name);
565	579
566		windowsCreateProcess(app_name.ptr, cmd_line.ptr, envp_ptr, cwd_ptr,
567		&siStartInfo, &piProcInfo) catch \|no_path_err\|
568		{
569		if (no_path_err != error.FileNotFound)
570		return no_path_err;
	580	windowsCreateProcess(app_name.ptr, cmd_line.ptr, envp_ptr, cwd_ptr, &siStartInfo, &piProcInfo) catch \|no_path_err\| {
	581	if (no_path_err != error.FileNotFound) return no_path_err;
571	582
572	583	const PATH = try os.getEnvVarOwned(self.allocator, "PATH");
573	584	defer self.allocator.free(PATH);
...	...	@@ -577,9 +588,7 @@ pub const ChildProcess = struct {
577	588	const joined_path = try os.path.join(self.allocator, search_path, app_name);
578	589	defer self.allocator.free(joined_path);
579	590
580		if (windowsCreateProcess(joined_path.ptr, cmd_line.ptr, envp_ptr, cwd_ptr,
581		&siStartInfo, &piProcInfo)) \|_\|
582		{
	591	if (windowsCreateProcess(joined_path.ptr, cmd_line.ptr, envp_ptr, cwd_ptr, &siStartInfo, &piProcInfo)) \|_\| {
583	592	break;
584	593	} else \|err\| if (err == error.FileNotFound) {
585	594	continue;
...	...	@@ -609,9 +618,15 @@ pub const ChildProcess = struct {
609	618	self.thread_handle = piProcInfo.hThread;
610	619	self.term = null;
611	620
612		if (self.stdin_behavior == StdIo.Pipe) { os.close(??g_hChildStd_IN_Rd); }
613		if (self.stderr_behavior == StdIo.Pipe) { os.close(??g_hChildStd_ERR_Wr); }
614		if (self.stdout_behavior == StdIo.Pipe) { os.close(??g_hChildStd_OUT_Wr); }
	621	if (self.stdin_behavior == StdIo.Pipe) {
	622	os.close(??g_hChildStd_IN_Rd);
	623	}
	624	if (self.stderr_behavior == StdIo.Pipe) {
	625	os.close(??g_hChildStd_ERR_Wr);
	626	}
	627	if (self.stdout_behavior == StdIo.Pipe) {
	628	os.close(??g_hChildStd_OUT_Wr);
	629	}
615	630	}
616	631
617	632	fn setUpChildIo(stdio: StdIo, pipe_fd: i32, std_fileno: i32, dev_null_fd: i32) !void {
...	...	@@ -622,15 +637,10 @@ pub const ChildProcess = struct {
622	637	StdIo.Ignore => try os.posixDup2(dev_null_fd, std_fileno),
623	638	}
624	639	}
625
626	640	};
627	641
628		fn windowsCreateProcess(app_name: &u8, cmd_line: &u8, envp_ptr: ?&u8, cwd_ptr: ?&u8,
629		lpStartupInfo: &windows.STARTUPINFOA, lpProcessInformation: &windows.PROCESS_INFORMATION) !void
630		{
631		if (windows.CreateProcessA(app_name, cmd_line, null, null, windows.TRUE, 0,
632		@ptrCast(?&c_void, envp_ptr), cwd_ptr, lpStartupInfo, lpProcessInformation) == 0)
633		{
	642	fn windowsCreateProcess(app_name: &u8, cmd_line: &u8, envp_ptr: ?&u8, cwd_ptr: ?&u8, lpStartupInfo: &windows.STARTUPINFOA, lpProcessInformation: &windows.PROCESS_INFORMATION) !void {
	643	if (windows.CreateProcessA(app_name, cmd_line, null, null, windows.TRUE, 0, @ptrCast(?&c_void, envp_ptr), cwd_ptr, lpStartupInfo, lpProcessInformation) == 0) {
634	644	const err = windows.GetLastError();
635	645	return switch (err) {
636	646	windows.ERROR.FILE_NOT_FOUND, windows.ERROR.PATH_NOT_FOUND => error.FileNotFound,
...	...	@@ -641,18 +651,16 @@ fn windowsCreateProcess(app_name: &u8, cmd_line: &u8, envp_ptr: ?&u8, cwd_ptr: ?
641	651	}
642	652	}
643	653
644
645
646
647	654	/// Caller must dealloc.
648	655	/// Guarantees a null byte at result[result.len].
649	656	fn windowsCreateCommandLine(allocator: &mem.Allocator, argv: []const []const u8) ![]u8 {
650	657	var buf = try Buffer.initSize(allocator, 0);
651	658	defer buf.deinit();
652	659
	660	var buf_stream = &io.BufferOutStream.init(&buf).stream;
	661
653	662	for (argv) \|arg, arg_i\| {
654		if (arg_i != 0)
655		try buf.appendByte(' ');
	663	if (arg_i != 0) try buf.appendByte(' ');
656	664	if (mem.indexOfAny(u8, arg, " \t\n\"") == null) {
657	665	try buf.append(arg);
658	666	continue;
...	...	@@ -663,18 +671,18 @@ fn windowsCreateCommandLine(allocator: &mem.Allocator, argv: []const []const u8)
663	671	switch (byte) {
664	672	'\\' => backslash_count += 1,
665	673	'"' => {
666		try buf.appendByteNTimes('\\', backslash_count * 2 + 1);
	674	try buf_stream.writeByteNTimes('\\', backslash_count * 2 + 1);
667	675	try buf.appendByte('"');
668	676	backslash_count = 0;
669	677	},
670	678	else => {
671		try buf.appendByteNTimes('\\', backslash_count);
	679	try buf_stream.writeByteNTimes('\\', backslash_count);
672	680	try buf.appendByte(byte);
673	681	backslash_count = 0;
674	682	},
675	683	}
676	684	}
677		try buf.appendByteNTimes('\\', backslash_count * 2);
	685	try buf_stream.writeByteNTimes('\\', backslash_count * 2);
678	686	try buf.appendByte('"');
679	687	}
680	688
...	...	@@ -686,7 +694,6 @@ fn windowsDestroyPipe(rd: ?windows.HANDLE, wr: ?windows.HANDLE) void {
686	694	if (wr) \|h\| os.close(h);
687	695	}
688	696
689
690	697	// TODO: workaround for bug where the `const` from `&const` is dropped when the type is
691	698	// a namespace field lookup
692	699	const SECURITY_ATTRIBUTES = windows.SECURITY_ATTRIBUTES;
...	...	@@ -715,8 +722,8 @@ fn windowsMakePipeIn(rd: &?windows.HANDLE, wr: &?windows.HANDLE, sattr: &const S
715	722	try windowsMakePipe(&rd_h, &wr_h, sattr);
716	723	errdefer windowsDestroyPipe(rd_h, wr_h);
717	724	try windowsSetHandleInfo(wr_h, windows.HANDLE_FLAG_INHERIT, 0);
718		*rd = rd_h;
719		*wr = wr_h;
	725	rd.* = rd_h;
	726	wr.* = wr_h;
720	727	}
721	728
722	729	fn windowsMakePipeOut(rd: &?windows.HANDLE, wr: &?windows.HANDLE, sattr: &const SECURITY_ATTRIBUTES) !void {
...	...	@@ -725,8 +732,8 @@ fn windowsMakePipeOut(rd: &?windows.HANDLE, wr: &?windows.HANDLE, sattr: &const
725	732	try windowsMakePipe(&rd_h, &wr_h, sattr);
726	733	errdefer windowsDestroyPipe(rd_h, wr_h);
727	734	try windowsSetHandleInfo(rd_h, windows.HANDLE_FLAG_INHERIT, 0);
728		*rd = rd_h;
729		*wr = wr_h;
	735	rd.* = rd_h;
	736	wr.* = wr_h;
730	737	}
731	738
732	739	fn makePipe() ![2]i32 {
...	...	@@ -742,8 +749,8 @@ fn makePipe() ![2]i32 {
742	749	}
743	750
744	751	fn destroyPipe(pipe: &const [2]i32) void {
745		os.close((*pipe)[0]);
746		os.close((*pipe)[1]);
	752	os.close((pipe.*)[0]);
	753	os.close((pipe.*)[1]);
747	754	}
748	755
749	756	// Child of fork calls this to report an error to the fork parent.

std/os/darwin.zig+247-99

...	...	@@ -10,33 +10,75 @@ pub const STDIN_FILENO = 0;
10	10	pub const STDOUT_FILENO = 1;
11	11	pub const STDERR_FILENO = 2;
12	12
13		pub const PROT_NONE = 0x00; /// [MC2] no permissions
14		pub const PROT_READ = 0x01; /// [MC2] pages can be read
15		pub const PROT_WRITE = 0x02; /// [MC2] pages can be written
16		pub const PROT_EXEC = 0x04; /// [MC2] pages can be executed
17
18		pub const MAP_ANONYMOUS = 0x1000; /// allocated from memory, swap space
19		pub const MAP_FILE = 0x0000; /// map from file (default)
20		pub const MAP_FIXED = 0x0010; /// interpret addr exactly
21		pub const MAP_HASSEMAPHORE = 0x0200; /// region may contain semaphores
22		pub const MAP_PRIVATE = 0x0002; /// changes are private
23		pub const MAP_SHARED = 0x0001; /// share changes
24		pub const MAP_NOCACHE = 0x0400; /// don't cache pages for this mapping
25		pub const MAP_NORESERVE = 0x0040; /// don't reserve needed swap area
	13	/// [MC2] no permissions
	14	pub const PROT_NONE = 0x00;
	15
	16	/// [MC2] pages can be read
	17	pub const PROT_READ = 0x01;
	18
	19	/// [MC2] pages can be written
	20	pub const PROT_WRITE = 0x02;
	21
	22	/// [MC2] pages can be executed
	23	pub const PROT_EXEC = 0x04;
	24
	25	/// allocated from memory, swap space
	26	pub const MAP_ANONYMOUS = 0x1000;
	27
	28	/// map from file (default)
	29	pub const MAP_FILE = 0x0000;
	30
	31	/// interpret addr exactly
	32	pub const MAP_FIXED = 0x0010;
	33
	34	/// region may contain semaphores
	35	pub const MAP_HASSEMAPHORE = 0x0200;
	36
	37	/// changes are private
	38	pub const MAP_PRIVATE = 0x0002;
	39
	40	/// share changes
	41	pub const MAP_SHARED = 0x0001;
	42
	43	/// don't cache pages for this mapping
	44	pub const MAP_NOCACHE = 0x0400;
	45
	46	/// don't reserve needed swap area
	47	pub const MAP_NORESERVE = 0x0040;
26	48	pub const MAP_FAILED = @maxValue(usize);
27	49
28		pub const WNOHANG = 0x00000001; /// [XSI] no hang in wait/no child to reap
29		pub const WUNTRACED = 0x00000002; /// [XSI] notify on stop, untraced child
	50	/// [XSI] no hang in wait/no child to reap
	51	pub const WNOHANG = 0x00000001;
	52
	53	/// [XSI] notify on stop, untraced child
	54	pub const WUNTRACED = 0x00000002;
	55
	56	/// take signal on signal stack
	57	pub const SA_ONSTACK = 0x0001;
	58
	59	/// restart system on signal return
	60	pub const SA_RESTART = 0x0002;
	61
	62	/// reset to SIG_DFL when taking signal
	63	pub const SA_RESETHAND = 0x0004;
	64
	65	/// do not generate SIGCHLD on child stop
	66	pub const SA_NOCLDSTOP = 0x0008;
	67
	68	/// don't mask the signal we're delivering
	69	pub const SA_NODEFER = 0x0010;
	70
	71	/// don't keep zombies around
	72	pub const SA_NOCLDWAIT = 0x0020;
	73
	74	/// signal handler with SA_SIGINFO args
	75	pub const SA_SIGINFO = 0x0040;
	76
	77	/// do not bounce off kernel's sigtramp
	78	pub const SA_USERTRAMP = 0x0100;
30	79
31		pub const SA_ONSTACK = 0x0001; /// take signal on signal stack
32		pub const SA_RESTART = 0x0002; /// restart system on signal return
33		pub const SA_RESETHAND = 0x0004; /// reset to SIG_DFL when taking signal
34		pub const SA_NOCLDSTOP = 0x0008; /// do not generate SIGCHLD on child stop
35		pub const SA_NODEFER = 0x0010; /// don't mask the signal we're delivering
36		pub const SA_NOCLDWAIT = 0x0020; /// don't keep zombies around
37		pub const SA_SIGINFO = 0x0040; /// signal handler with SA_SIGINFO args
38		pub const SA_USERTRAMP = 0x0100; /// do not bounce off kernel's sigtramp
39		pub const SA_64REGSET = 0x0200; /// signal handler with SA_SIGINFO args with 64bit regs information
	80	/// signal handler with SA_SIGINFO args with 64bit regs information
	81	pub const SA_64REGSET = 0x0200;
40	82
41	83	pub const O_LARGEFILE = 0x0000;
42	84	pub const O_PATH = 0x0000;
...	...	@@ -46,20 +88,47 @@ pub const X_OK = 1;
46	88	pub const W_OK = 2;
47	89	pub const R_OK = 4;
48	90
49		pub const O_RDONLY = 0x0000; /// open for reading only
50		pub const O_WRONLY = 0x0001; /// open for writing only
51		pub const O_RDWR = 0x0002; /// open for reading and writing
52		pub const O_NONBLOCK = 0x0004; /// do not block on open or for data to become available
53		pub const O_APPEND = 0x0008; /// append on each write
54		pub const O_CREAT = 0x0200; /// create file if it does not exist
55		pub const O_TRUNC = 0x0400; /// truncate size to 0
56		pub const O_EXCL = 0x0800; /// error if O_CREAT and the file exists
57		pub const O_SHLOCK = 0x0010; /// atomically obtain a shared lock
58		pub const O_EXLOCK = 0x0020; /// atomically obtain an exclusive lock
59		pub const O_NOFOLLOW = 0x0100; /// do not follow symlinks
60		pub const O_SYMLINK = 0x200000; /// allow open of symlinks
61		pub const O_EVTONLY = 0x8000; /// descriptor requested for event notifications only
62		pub const O_CLOEXEC = 0x1000000; /// mark as close-on-exec
	91	/// open for reading only
	92	pub const O_RDONLY = 0x0000;
	93
	94	/// open for writing only
	95	pub const O_WRONLY = 0x0001;
	96
	97	/// open for reading and writing
	98	pub const O_RDWR = 0x0002;
	99
	100	/// do not block on open or for data to become available
	101	pub const O_NONBLOCK = 0x0004;
	102
	103	/// append on each write
	104	pub const O_APPEND = 0x0008;
	105
	106	/// create file if it does not exist
	107	pub const O_CREAT = 0x0200;
	108
	109	/// truncate size to 0
	110	pub const O_TRUNC = 0x0400;
	111
	112	/// error if O_CREAT and the file exists
	113	pub const O_EXCL = 0x0800;
	114
	115	/// atomically obtain a shared lock
	116	pub const O_SHLOCK = 0x0010;
	117
	118	/// atomically obtain an exclusive lock
	119	pub const O_EXLOCK = 0x0020;
	120
	121	/// do not follow symlinks
	122	pub const O_NOFOLLOW = 0x0100;
	123
	124	/// allow open of symlinks
	125	pub const O_SYMLINK = 0x200000;
	126
	127	/// descriptor requested for event notifications only
	128	pub const O_EVTONLY = 0x8000;
	129
	130	/// mark as close-on-exec
	131	pub const O_CLOEXEC = 0x1000000;
63	132
64	133	pub const O_ACCMODE = 3;
65	134	pub const O_ALERT = 536870912;
...	...	@@ -87,52 +156,136 @@ pub const DT_LNK = 10;
87	156	pub const DT_SOCK = 12;
88	157	pub const DT_WHT = 14;
89	158
90		pub const SIG_BLOCK = 1; /// block specified signal set
91		pub const SIG_UNBLOCK = 2; /// unblock specified signal set
92		pub const SIG_SETMASK = 3; /// set specified signal set
93
94		pub const SIGHUP = 1; /// hangup
95		pub const SIGINT = 2; /// interrupt
96		pub const SIGQUIT = 3; /// quit
97		pub const SIGILL = 4; /// illegal instruction (not reset when caught)
98		pub const SIGTRAP = 5; /// trace trap (not reset when caught)
99		pub const SIGABRT = 6; /// abort()
100		pub const SIGPOLL = 7; /// pollable event ([XSR] generated, not supported)
101		pub const SIGIOT = SIGABRT; /// compatibility
102		pub const SIGEMT = 7; /// EMT instruction
103		pub const SIGFPE = 8; /// floating point exception
104		pub const SIGKILL = 9; /// kill (cannot be caught or ignored)
105		pub const SIGBUS = 10; /// bus error
106		pub const SIGSEGV = 11; /// segmentation violation
107		pub const SIGSYS = 12; /// bad argument to system call
108		pub const SIGPIPE = 13; /// write on a pipe with no one to read it
109		pub const SIGALRM = 14; /// alarm clock
110		pub const SIGTERM = 15; /// software termination signal from kill
111		pub const SIGURG = 16; /// urgent condition on IO channel
112		pub const SIGSTOP = 17; /// sendable stop signal not from tty
113		pub const SIGTSTP = 18; /// stop signal from tty
114		pub const SIGCONT = 19; /// continue a stopped process
115		pub const SIGCHLD = 20; /// to parent on child stop or exit
116		pub const SIGTTIN = 21; /// to readers pgrp upon background tty read
117		pub const SIGTTOU = 22; /// like TTIN for output if (tp->t_local&LTOSTOP)
118		pub const SIGIO = 23; /// input/output possible signal
119		pub const SIGXCPU = 24; /// exceeded CPU time limit
120		pub const SIGXFSZ = 25; /// exceeded file size limit
121		pub const SIGVTALRM = 26; /// virtual time alarm
122		pub const SIGPROF = 27; /// profiling time alarm
123		pub const SIGWINCH = 28; /// window size changes
124		pub const SIGINFO = 29; /// information request
125		pub const SIGUSR1 = 30; /// user defined signal 1
126		pub const SIGUSR2 = 31; /// user defined signal 2
127
128		fn wstatus(x: i32) i32 { return x & 0o177; }
	159	/// block specified signal set
	160	pub const SIG_BLOCK = 1;
	161
	162	/// unblock specified signal set
	163	pub const SIG_UNBLOCK = 2;
	164
	165	/// set specified signal set
	166	pub const SIG_SETMASK = 3;
	167
	168	/// hangup
	169	pub const SIGHUP = 1;
	170
	171	/// interrupt
	172	pub const SIGINT = 2;
	173
	174	/// quit
	175	pub const SIGQUIT = 3;
	176
	177	/// illegal instruction (not reset when caught)
	178	pub const SIGILL = 4;
	179
	180	/// trace trap (not reset when caught)
	181	pub const SIGTRAP = 5;
	182
	183	/// abort()
	184	pub const SIGABRT = 6;
	185
	186	/// pollable event ([XSR] generated, not supported)
	187	pub const SIGPOLL = 7;
	188
	189	/// compatibility
	190	pub const SIGIOT = SIGABRT;
	191
	192	/// EMT instruction
	193	pub const SIGEMT = 7;
	194
	195	/// floating point exception
	196	pub const SIGFPE = 8;
	197
	198	/// kill (cannot be caught or ignored)
	199	pub const SIGKILL = 9;
	200
	201	/// bus error
	202	pub const SIGBUS = 10;
	203
	204	/// segmentation violation
	205	pub const SIGSEGV = 11;
	206
	207	/// bad argument to system call
	208	pub const SIGSYS = 12;
	209
	210	/// write on a pipe with no one to read it
	211	pub const SIGPIPE = 13;
	212
	213	/// alarm clock
	214	pub const SIGALRM = 14;
	215
	216	/// software termination signal from kill
	217	pub const SIGTERM = 15;
	218
	219	/// urgent condition on IO channel
	220	pub const SIGURG = 16;
	221
	222	/// sendable stop signal not from tty
	223	pub const SIGSTOP = 17;
	224
	225	/// stop signal from tty
	226	pub const SIGTSTP = 18;
	227
	228	/// continue a stopped process
	229	pub const SIGCONT = 19;
	230
	231	/// to parent on child stop or exit
	232	pub const SIGCHLD = 20;
	233
	234	/// to readers pgrp upon background tty read
	235	pub const SIGTTIN = 21;
	236
	237	/// like TTIN for output if (tp->t_local&LTOSTOP)
	238	pub const SIGTTOU = 22;
	239
	240	/// input/output possible signal
	241	pub const SIGIO = 23;
	242
	243	/// exceeded CPU time limit
	244	pub const SIGXCPU = 24;
	245
	246	/// exceeded file size limit
	247	pub const SIGXFSZ = 25;
	248
	249	/// virtual time alarm
	250	pub const SIGVTALRM = 26;
	251
	252	/// profiling time alarm
	253	pub const SIGPROF = 27;
	254
	255	/// window size changes
	256	pub const SIGWINCH = 28;
	257
	258	/// information request
	259	pub const SIGINFO = 29;
	260
	261	/// user defined signal 1
	262	pub const SIGUSR1 = 30;
	263
	264	/// user defined signal 2
	265	pub const SIGUSR2 = 31;
	266
	267	fn wstatus(x: i32) i32 {
	268	return x & 0o177;
	269	}
129	270	const wstopped = 0o177;
130		pub fn WEXITSTATUS(x: i32) i32 { return x >> 8; }
131		pub fn WTERMSIG(x: i32) i32 { return wstatus(x); }
132		pub fn WSTOPSIG(x: i32) i32 { return x >> 8; }
133		pub fn WIFEXITED(x: i32) bool { return wstatus(x) == 0; }
134		pub fn WIFSTOPPED(x: i32) bool { return wstatus(x) == wstopped and WSTOPSIG(x) != 0x13; }
135		pub fn WIFSIGNALED(x: i32) bool { return wstatus(x) != wstopped and wstatus(x) != 0; }
	271	pub fn WEXITSTATUS(x: i32) i32 {
	272	return x >> 8;
	273	}
	274	pub fn WTERMSIG(x: i32) i32 {
	275	return wstatus(x);
	276	}
	277	pub fn WSTOPSIG(x: i32) i32 {
	278	return x >> 8;
	279	}
	280	pub fn WIFEXITED(x: i32) bool {
	281	return wstatus(x) == 0;
	282	}
	283	pub fn WIFSTOPPED(x: i32) bool {
	284	return wstatus(x) == wstopped and WSTOPSIG(x) != 0x13;
	285	}
	286	pub fn WIFSIGNALED(x: i32) bool {
	287	return wstatus(x) != wstopped and wstatus(x) != 0;
	288	}
136	289
137	290	/// Get the errno from a syscall return value, or 0 for no error.
138	291	pub fn getErrno(r: usize) usize {
...	...	@@ -184,11 +337,8 @@ pub fn write(fd: i32, buf: &const u8, nbyte: usize) usize {
184	337	return errnoWrap(c.write(fd, @ptrCast(&const c_void, buf), nbyte));
185	338	}
186	339
187		pub fn mmap(address: ?&u8, length: usize, prot: usize, flags: u32, fd: i32,
188		offset: isize) usize
189		{
190		const ptr_result = c.mmap(@ptrCast(&c_void, address), length,
191		@bitCast(c_int, c_uint(prot)), @bitCast(c_int, c_uint(flags)), fd, offset);
	340	pub fn mmap(address: ?&u8, length: usize, prot: usize, flags: u32, fd: i32, offset: isize) usize {
	341	const ptr_result = c.mmap(@ptrCast(&c_void, address), length, @bitCast(c_int, c_uint(prot)), @bitCast(c_int, c_uint(flags)), fd, offset);
192	342	const isize_result = @bitCast(isize, @ptrToInt(ptr_result));
193	343	return errnoWrap(isize_result);
194	344	}
...	...	@@ -202,7 +352,7 @@ pub fn unlink(path: &const u8) usize {
202	352	}
203	353
204	354	pub fn getcwd(buf: &u8, size: usize) usize {
205		return if (c.getcwd(buf, size) == null) @bitCast(usize, -isize(*c._errno())) else 0;
	355	return if (c.getcwd(buf, size) == null) @bitCast(usize, -isize(c._errno().*)) else 0;
206	356	}
207	357
208	358	pub fn waitpid(pid: i32, status: &i32, options: u32) usize {
...	...	@@ -223,7 +373,6 @@ pub fn pipe(fds: &[2]i32) usize {
223	373	return errnoWrap(c.pipe(@ptrCast(&c_int, fds)));
224	374	}
225	375
226
227	376	pub fn getdirentries64(fd: i32, buf_ptr: &u8, buf_len: usize, basep: &i64) usize {
228	377	return errnoWrap(@bitCast(isize, c.__getdirentries64(fd, buf_ptr, buf_len, basep)));
229	378	}
...	...	@@ -269,7 +418,7 @@ pub fn nanosleep(req: &const timespec, rem: ?&timespec) usize {
269	418	}
270	419
271	420	pub fn realpath(noalias filename: &const u8, noalias resolved_name: &u8) usize {
272		return if (c.realpath(filename, resolved_name) == null) @bitCast(usize, -isize(*c._errno())) else 0;
	421	return if (c.realpath(filename, resolved_name) == null) @bitCast(usize, -isize(c._errno().*)) else 0;
273	422	}
274	423
275	424	pub fn setreuid(ruid: u32, euid: u32) usize {
...	...	@@ -287,8 +436,8 @@ pub fn sigprocmask(flags: u32, noalias set: &const sigset_t, noalias oldset: ?&s
287	436	pub fn sigaction(sig: u5, noalias act: &const Sigaction, noalias oact: ?&Sigaction) usize {
288	437	assert(sig != SIGKILL);
289	438	assert(sig != SIGSTOP);
290		var cact = c.Sigaction {
291		.handler = @ptrCast(extern fn(c_int)void, act.handler),
	439	var cact = c.Sigaction{
	440	.handler = @ptrCast(extern fn(c_int) void, act.handler),
292	441	.sa_flags = @bitCast(c_int, act.flags),
293	442	.sa_mask = act.mask,
294	443	};
...	...	@@ -298,8 +447,8 @@ pub fn sigaction(sig: u5, noalias act: &const Sigaction, noalias oact: ?&Sigacti
298	447	return result;
299	448	}
300	449	if (oact) \|old\| {
301		*old = Sigaction {
302		.handler = @ptrCast(extern fn(i32)void, coact.handler),
	450	old.* = Sigaction{
	451	.handler = @ptrCast(extern fn(i32) void, coact.handler),
303	452	.flags = @bitCast(u32, coact.sa_flags),
304	453	.mask = coact.sa_mask,
305	454	};
...	...	@@ -319,23 +468,22 @@ pub const sockaddr = c.sockaddr;
319	468
320	469	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
321	470	pub const Sigaction = struct {
322		handler: extern fn(i32)void,
	471	handler: extern fn(i32) void,
323	472	mask: sigset_t,
324	473	flags: u32,
325	474	};
326	475
327	476	pub fn sigaddset(set: &sigset_t, signo: u5) void {
328		*set \|= u32(1) << (signo - 1);
	477	set.* \|= u32(1) << (signo - 1);
329	478	}
330	479
331	480	/// Takes the return value from a syscall and formats it back in the way
332	481	/// that the kernel represents it to libc. Errno was a mistake, let's make
333	482	/// it go away forever.
334	483	fn errnoWrap(value: isize) usize {
335		return @bitCast(usize, if (value == -1) -isize(*c._errno()) else value);
	484	return @bitCast(usize, if (value == -1) -isize(c._errno().*) else value);
336	485	}
337	486
338
339	487	pub const timezone = c.timezone;
340	488	pub const timeval = c.timeval;
341	489	pub const mach_timebase_info_data = c.mach_timebase_info_data;

std/os/darwin_errno.zig+294-108

...	...	@@ -1,142 +1,328 @@
	1	/// Operation not permitted
	2	pub const EPERM = 1;
1	3
2		pub const EPERM = 1; /// Operation not permitted
3		pub const ENOENT = 2; /// No such file or directory
4		pub const ESRCH = 3; /// No such process
5		pub const EINTR = 4; /// Interrupted system call
6		pub const EIO = 5; /// Input/output error
7		pub const ENXIO = 6; /// Device not configured
8		pub const E2BIG = 7; /// Argument list too long
9		pub const ENOEXEC = 8; /// Exec format error
10		pub const EBADF = 9; /// Bad file descriptor
11		pub const ECHILD = 10; /// No child processes
12		pub const EDEADLK = 11; /// Resource deadlock avoided
13
14		pub const ENOMEM = 12; /// Cannot allocate memory
15		pub const EACCES = 13; /// Permission denied
16		pub const EFAULT = 14; /// Bad address
17		pub const ENOTBLK = 15; /// Block device required
18		pub const EBUSY = 16; /// Device / Resource busy
19		pub const EEXIST = 17; /// File exists
20		pub const EXDEV = 18; /// Cross-device link
21		pub const ENODEV = 19; /// Operation not supported by device
22		pub const ENOTDIR = 20; /// Not a directory
23		pub const EISDIR = 21; /// Is a directory
24		pub const EINVAL = 22; /// Invalid argument
25		pub const ENFILE = 23; /// Too many open files in system
26		pub const EMFILE = 24; /// Too many open files
27		pub const ENOTTY = 25; /// Inappropriate ioctl for device
28		pub const ETXTBSY = 26; /// Text file busy
29		pub const EFBIG = 27; /// File too large
30		pub const ENOSPC = 28; /// No space left on device
31		pub const ESPIPE = 29; /// Illegal seek
32		pub const EROFS = 30; /// Read-only file system
33		pub const EMLINK = 31; /// Too many links
34		pub const EPIPE = 32; /// Broken pipe
	4	/// No such file or directory
	5	pub const ENOENT = 2;
	6
	7	/// No such process
	8	pub const ESRCH = 3;
	9
	10	/// Interrupted system call
	11	pub const EINTR = 4;
	12
	13	/// Input/output error
	14	pub const EIO = 5;
	15
	16	/// Device not configured
	17	pub const ENXIO = 6;
	18
	19	/// Argument list too long
	20	pub const E2BIG = 7;
	21
	22	/// Exec format error
	23	pub const ENOEXEC = 8;
	24
	25	/// Bad file descriptor
	26	pub const EBADF = 9;
	27
	28	/// No child processes
	29	pub const ECHILD = 10;
	30
	31	/// Resource deadlock avoided
	32	pub const EDEADLK = 11;
	33
	34	/// Cannot allocate memory
	35	pub const ENOMEM = 12;
	36
	37	/// Permission denied
	38	pub const EACCES = 13;
	39
	40	/// Bad address
	41	pub const EFAULT = 14;
	42
	43	/// Block device required
	44	pub const ENOTBLK = 15;
	45
	46	/// Device / Resource busy
	47	pub const EBUSY = 16;
	48
	49	/// File exists
	50	pub const EEXIST = 17;
	51
	52	/// Cross-device link
	53	pub const EXDEV = 18;
	54
	55	/// Operation not supported by device
	56	pub const ENODEV = 19;
	57
	58	/// Not a directory
	59	pub const ENOTDIR = 20;
	60
	61	/// Is a directory
	62	pub const EISDIR = 21;
	63
	64	/// Invalid argument
	65	pub const EINVAL = 22;
	66
	67	/// Too many open files in system
	68	pub const ENFILE = 23;
	69
	70	/// Too many open files
	71	pub const EMFILE = 24;
	72
	73	/// Inappropriate ioctl for device
	74	pub const ENOTTY = 25;
	75
	76	/// Text file busy
	77	pub const ETXTBSY = 26;
	78
	79	/// File too large
	80	pub const EFBIG = 27;
	81
	82	/// No space left on device
	83	pub const ENOSPC = 28;
	84
	85	/// Illegal seek
	86	pub const ESPIPE = 29;
	87
	88	/// Read-only file system
	89	pub const EROFS = 30;
	90
	91	/// Too many links
	92	pub const EMLINK = 31;
	93	/// Broken pipe
35	94
36	95	// math software
37		pub const EDOM = 33; /// Numerical argument out of domain
38		pub const ERANGE = 34; /// Result too large
	96	pub const EPIPE = 32;
	97
	98	/// Numerical argument out of domain
	99	pub const EDOM = 33;
	100	/// Result too large
39	101
40	102	// non-blocking and interrupt i/o
41		pub const EAGAIN = 35; /// Resource temporarily unavailable
42		pub const EWOULDBLOCK = EAGAIN; /// Operation would block
43		pub const EINPROGRESS = 36; /// Operation now in progress
44		pub const EALREADY = 37; /// Operation already in progress
	103	pub const ERANGE = 34;
	104
	105	/// Resource temporarily unavailable
	106	pub const EAGAIN = 35;
	107
	108	/// Operation would block
	109	pub const EWOULDBLOCK = EAGAIN;
	110
	111	/// Operation now in progress
	112	pub const EINPROGRESS = 36;
	113	/// Operation already in progress
45	114
46	115	// ipc/network software -- argument errors
47		pub const ENOTSOCK = 38; /// Socket operation on non-socket
48		pub const EDESTADDRREQ = 39; /// Destination address required
49		pub const EMSGSIZE = 40; /// Message too long
50		pub const EPROTOTYPE = 41; /// Protocol wrong type for socket
51		pub const ENOPROTOOPT = 42; /// Protocol not available
52		pub const EPROTONOSUPPORT = 43; /// Protocol not supported
	116	pub const EALREADY = 37;
	117
	118	/// Socket operation on non-socket
	119	pub const ENOTSOCK = 38;
	120
	121	/// Destination address required
	122	pub const EDESTADDRREQ = 39;
	123
	124	/// Message too long
	125	pub const EMSGSIZE = 40;
	126
	127	/// Protocol wrong type for socket
	128	pub const EPROTOTYPE = 41;
	129
	130	/// Protocol not available
	131	pub const ENOPROTOOPT = 42;
	132
	133	/// Protocol not supported
	134	pub const EPROTONOSUPPORT = 43;
	135
	136	/// Socket type not supported
	137	pub const ESOCKTNOSUPPORT = 44;
53	138
54		pub const ESOCKTNOSUPPORT = 44; /// Socket type not supported
	139	/// Operation not supported
	140	pub const ENOTSUP = 45;
55	141
56		pub const ENOTSUP = 45; /// Operation not supported
	142	/// Protocol family not supported
	143	pub const EPFNOSUPPORT = 46;
57	144
58		pub const EPFNOSUPPORT = 46; /// Protocol family not supported
59		pub const EAFNOSUPPORT = 47; /// Address family not supported by protocol family
60		pub const EADDRINUSE = 48; /// Address already in use
61		pub const EADDRNOTAVAIL = 49; /// Can't assign requested address
	145	/// Address family not supported by protocol family
	146	pub const EAFNOSUPPORT = 47;
	147
	148	/// Address already in use
	149	pub const EADDRINUSE = 48;
	150	/// Can't assign requested address
62	151
63	152	// ipc/network software -- operational errors
64		pub const ENETDOWN = 50; /// Network is down
65		pub const ENETUNREACH = 51; /// Network is unreachable
66		pub const ENETRESET = 52; /// Network dropped connection on reset
67		pub const ECONNABORTED = 53; /// Software caused connection abort
68		pub const ECONNRESET = 54; /// Connection reset by peer
69		pub const ENOBUFS = 55; /// No buffer space available
70		pub const EISCONN = 56; /// Socket is already connected
71		pub const ENOTCONN = 57; /// Socket is not connected
	153	pub const EADDRNOTAVAIL = 49;
	154
	155	/// Network is down
	156	pub const ENETDOWN = 50;
	157
	158	/// Network is unreachable
	159	pub const ENETUNREACH = 51;
	160
	161	/// Network dropped connection on reset
	162	pub const ENETRESET = 52;
	163
	164	/// Software caused connection abort
	165	pub const ECONNABORTED = 53;
	166
	167	/// Connection reset by peer
	168	pub const ECONNRESET = 54;
	169
	170	/// No buffer space available
	171	pub const ENOBUFS = 55;
	172
	173	/// Socket is already connected
	174	pub const EISCONN = 56;
	175
	176	/// Socket is not connected
	177	pub const ENOTCONN = 57;
	178
	179	/// Can't send after socket shutdown
	180	pub const ESHUTDOWN = 58;
72	181
73		pub const ESHUTDOWN = 58; /// Can't send after socket shutdown
74		pub const ETOOMANYREFS = 59; /// Too many references: can't splice
	182	/// Too many references: can't splice
	183	pub const ETOOMANYREFS = 59;
75	184
76		pub const ETIMEDOUT = 60; /// Operation timed out
77		pub const ECONNREFUSED = 61; /// Connection refused
	185	/// Operation timed out
	186	pub const ETIMEDOUT = 60;
78	187
79		pub const ELOOP = 62; /// Too many levels of symbolic links
80		pub const ENAMETOOLONG = 63; /// File name too long
	188	/// Connection refused
	189	pub const ECONNREFUSED = 61;
81	190
82		pub const EHOSTDOWN = 64; /// Host is down
83		pub const EHOSTUNREACH = 65; /// No route to host
84		pub const ENOTEMPTY = 66; /// Directory not empty
	191	/// Too many levels of symbolic links
	192	pub const ELOOP = 62;
	193
	194	/// File name too long
	195	pub const ENAMETOOLONG = 63;
	196
	197	/// Host is down
	198	pub const EHOSTDOWN = 64;
	199
	200	/// No route to host
	201	pub const EHOSTUNREACH = 65;
	202	/// Directory not empty
85	203
86	204	// quotas & mush
87		pub const EPROCLIM = 67; /// Too many processes
88		pub const EUSERS = 68; /// Too many users
89		pub const EDQUOT = 69; /// Disc quota exceeded
	205	pub const ENOTEMPTY = 66;
	206
	207	/// Too many processes
	208	pub const EPROCLIM = 67;
	209
	210	/// Too many users
	211	pub const EUSERS = 68;
	212	/// Disc quota exceeded
90	213
91	214	// Network File System
92		pub const ESTALE = 70; /// Stale NFS file handle
93		pub const EREMOTE = 71; /// Too many levels of remote in path
94		pub const EBADRPC = 72; /// RPC struct is bad
95		pub const ERPCMISMATCH = 73; /// RPC version wrong
96		pub const EPROGUNAVAIL = 74; /// RPC prog. not avail
97		pub const EPROGMISMATCH = 75; /// Program version wrong
98		pub const EPROCUNAVAIL = 76; /// Bad procedure for program
	215	pub const EDQUOT = 69;
	216
	217	/// Stale NFS file handle
	218	pub const ESTALE = 70;
	219
	220	/// Too many levels of remote in path
	221	pub const EREMOTE = 71;
	222
	223	/// RPC struct is bad
	224	pub const EBADRPC = 72;
	225
	226	/// RPC version wrong
	227	pub const ERPCMISMATCH = 73;
	228
	229	/// RPC prog. not avail
	230	pub const EPROGUNAVAIL = 74;
99	231
100		pub const ENOLCK = 77; /// No locks available
101		pub const ENOSYS = 78; /// Function not implemented
	232	/// Program version wrong
	233	pub const EPROGMISMATCH = 75;
102	234
103		pub const EFTYPE = 79; /// Inappropriate file type or format
104		pub const EAUTH = 80; /// Authentication error
105		pub const ENEEDAUTH = 81; /// Need authenticator
	235	/// Bad procedure for program
	236	pub const EPROCUNAVAIL = 76;
	237
	238	/// No locks available
	239	pub const ENOLCK = 77;
	240
	241	/// Function not implemented
	242	pub const ENOSYS = 78;
	243
	244	/// Inappropriate file type or format
	245	pub const EFTYPE = 79;
	246
	247	/// Authentication error
	248	pub const EAUTH = 80;
	249	/// Need authenticator
106	250
107	251	// Intelligent device errors
108		pub const EPWROFF = 82; /// Device power is off
109		pub const EDEVERR = 83; /// Device error, e.g. paper out
	252	pub const ENEEDAUTH = 81;
	253
	254	/// Device power is off
	255	pub const EPWROFF = 82;
110	256
111		pub const EOVERFLOW = 84; /// Value too large to be stored in data type
	257	/// Device error, e.g. paper out
	258	pub const EDEVERR = 83;
	259	/// Value too large to be stored in data type
112	260
113	261	// Program loading errors
114		pub const EBADEXEC = 85; /// Bad executable
115		pub const EBADARCH = 86; /// Bad CPU type in executable
116		pub const ESHLIBVERS = 87; /// Shared library version mismatch
117		pub const EBADMACHO = 88; /// Malformed Macho file
	262	pub const EOVERFLOW = 84;
	263
	264	/// Bad executable
	265	pub const EBADEXEC = 85;
	266
	267	/// Bad CPU type in executable
	268	pub const EBADARCH = 86;
	269
	270	/// Shared library version mismatch
	271	pub const ESHLIBVERS = 87;
	272
	273	/// Malformed Macho file
	274	pub const EBADMACHO = 88;
	275
	276	/// Operation canceled
	277	pub const ECANCELED = 89;
	278
	279	/// Identifier removed
	280	pub const EIDRM = 90;
	281
	282	/// No message of desired type
	283	pub const ENOMSG = 91;
	284
	285	/// Illegal byte sequence
	286	pub const EILSEQ = 92;
	287
	288	/// Attribute not found
	289	pub const ENOATTR = 93;
	290
	291	/// Bad message
	292	pub const EBADMSG = 94;
	293
	294	/// Reserved
	295	pub const EMULTIHOP = 95;
	296
	297	/// No message available on STREAM
	298	pub const ENODATA = 96;
	299
	300	/// Reserved
	301	pub const ENOLINK = 97;
	302
	303	/// No STREAM resources
	304	pub const ENOSR = 98;
	305
	306	/// Not a STREAM
	307	pub const ENOSTR = 99;
118	308
119		pub const ECANCELED = 89; /// Operation canceled
	309	/// Protocol error
	310	pub const EPROTO = 100;
120	311
121		pub const EIDRM = 90; /// Identifier removed
122		pub const ENOMSG = 91; /// No message of desired type
123		pub const EILSEQ = 92; /// Illegal byte sequence
124		pub const ENOATTR = 93; /// Attribute not found
	312	/// STREAM ioctl timeout
	313	pub const ETIME = 101;
125	314
126		pub const EBADMSG = 94; /// Bad message
127		pub const EMULTIHOP = 95; /// Reserved
128		pub const ENODATA = 96; /// No message available on STREAM
129		pub const ENOLINK = 97; /// Reserved
130		pub const ENOSR = 98; /// No STREAM resources
131		pub const ENOSTR = 99; /// Not a STREAM
132		pub const EPROTO = 100; /// Protocol error
133		pub const ETIME = 101; /// STREAM ioctl timeout
	315	/// No such policy registered
	316	pub const ENOPOLICY = 103;
134	317
135		pub const ENOPOLICY = 103; /// No such policy registered
	318	/// State not recoverable
	319	pub const ENOTRECOVERABLE = 104;
136	320
137		pub const ENOTRECOVERABLE = 104; /// State not recoverable
138		pub const EOWNERDEAD = 105; /// Previous owner died
	321	/// Previous owner died
	322	pub const EOWNERDEAD = 105;
139	323
140		pub const EQFULL = 106; /// Interface output queue is full
141		pub const ELAST = 106; /// Must be equal largest errno
	324	/// Interface output queue is full
	325	pub const EQFULL = 106;
142	326
	327	/// Must be equal largest errno
	328	pub const ELAST = 106;

std/os/epoch.zig+23-23

...	...	@@ -1,26 +1,26 @@
1	1	/// Epoch reference times in terms of their difference from
2	2	/// posix epoch in seconds.
3		pub const posix = 0; //Jan 01, 1970 AD
4		pub const dos = 315532800; //Jan 01, 1980 AD
5		pub const ios = 978307200; //Jan 01, 2001 AD
6		pub const openvms = -3506716800; //Nov 17, 1858 AD
7		pub const zos = -2208988800; //Jan 01, 1900 AD
8		pub const windows = -11644473600; //Jan 01, 1601 AD
9		pub const amiga = 252460800; //Jan 01, 1978 AD
10		pub const pickos = -63244800; //Dec 31, 1967 AD
11		pub const gps = 315964800; //Jan 06, 1980 AD
12		pub const clr = -62135769600; //Jan 01, 0001 AD
	3	pub const posix = 0; //Jan 01, 1970 AD
	4	pub const dos = 315532800; //Jan 01, 1980 AD
	5	pub const ios = 978307200; //Jan 01, 2001 AD
	6	pub const openvms = -3506716800; //Nov 17, 1858 AD
	7	pub const zos = -2208988800; //Jan 01, 1900 AD
	8	pub const windows = -11644473600; //Jan 01, 1601 AD
	9	pub const amiga = 252460800; //Jan 01, 1978 AD
	10	pub const pickos = -63244800; //Dec 31, 1967 AD
	11	pub const gps = 315964800; //Jan 06, 1980 AD
	12	pub const clr = -62135769600; //Jan 01, 0001 AD
13	13
14		pub const unix = posix;
15		pub const android = posix;
16		pub const os2 = dos;
17		pub const bios = dos;
18		pub const vfat = dos;
19		pub const ntfs = windows;
20		pub const ntp = zos;
21		pub const jbase = pickos;
22		pub const aros = amiga;
23		pub const morphos = amiga;
24		pub const brew = gps;
25		pub const atsc = gps;
26		pub const go = clr;
		\ No newline at end of file
	14	pub const unix = posix;
	15	pub const android = posix;
	16	pub const os2 = dos;
	17	pub const bios = dos;
	18	pub const vfat = dos;
	19	pub const ntfs = windows;
	20	pub const ntp = zos;
	21	pub const jbase = pickos;
	22	pub const aros = amiga;
	23	pub const morphos = amiga;
	24	pub const brew = gps;
	25	pub const atsc = gps;
	26	pub const go = clr;

std/os/file.zig+35-24

...	...	@@ -21,12 +21,18 @@ pub const File = struct {
21	21	/// Call close to clean up.
22	22	pub fn openRead(allocator: &mem.Allocator, path: []const u8) OpenError!File {
23	23	if (is_posix) {
24		const flags = posix.O_LARGEFILE\|posix.O_RDONLY;
	24	const flags = posix.O_LARGEFILE \| posix.O_RDONLY;
25	25	const fd = try os.posixOpen(allocator, path, flags, 0);
26	26	return openHandle(fd);
27	27	} else if (is_windows) {
28		const handle = try os.windowsOpen(allocator, path, windows.GENERIC_READ, windows.FILE_SHARE_READ,
29		windows.OPEN_EXISTING, windows.FILE_ATTRIBUTE_NORMAL);
	28	const handle = try os.windowsOpen(
	29	allocator,
	30	path,
	31	windows.GENERIC_READ,
	32	windows.FILE_SHARE_READ,
	33	windows.OPEN_EXISTING,
	34	windows.FILE_ATTRIBUTE_NORMAL,
	35	);
30	36	return openHandle(handle);
31	37	} else {
32	38	@compileError("TODO implement openRead for this OS");
...	...	@@ -36,7 +42,6 @@ pub const File = struct {
36	42	/// Calls `openWriteMode` with os.default_file_mode for the mode.
37	43	pub fn openWrite(allocator: &mem.Allocator, path: []const u8) OpenError!File {
38	44	return openWriteMode(allocator, path, os.default_file_mode);
39
40	45	}
41	46
42	47	/// If the path does not exist it will be created.
...	...	@@ -45,18 +50,22 @@ pub const File = struct {
45	50	/// Call close to clean up.
46	51	pub fn openWriteMode(allocator: &mem.Allocator, path: []const u8, file_mode: os.FileMode) OpenError!File {
47	52	if (is_posix) {
48		const flags = posix.O_LARGEFILE\|posix.O_WRONLY\|posix.O_CREAT\|posix.O_CLOEXEC\|posix.O_TRUNC;
	53	const flags = posix.O_LARGEFILE \| posix.O_WRONLY \| posix.O_CREAT \| posix.O_CLOEXEC \| posix.O_TRUNC;
49	54	const fd = try os.posixOpen(allocator, path, flags, file_mode);
50	55	return openHandle(fd);
51	56	} else if (is_windows) {
52		const handle = try os.windowsOpen(allocator, path, windows.GENERIC_WRITE,
53		windows.FILE_SHARE_WRITE\|windows.FILE_SHARE_READ\|windows.FILE_SHARE_DELETE,
54		windows.CREATE_ALWAYS, windows.FILE_ATTRIBUTE_NORMAL);
	57	const handle = try os.windowsOpen(
	58	allocator,
	59	path,
	60	windows.GENERIC_WRITE,
	61	windows.FILE_SHARE_WRITE \| windows.FILE_SHARE_READ \| windows.FILE_SHARE_DELETE,
	62	windows.CREATE_ALWAYS,
	63	windows.FILE_ATTRIBUTE_NORMAL,
	64	);
55	65	return openHandle(handle);
56	66	} else {
57	67	@compileError("TODO implement openWriteMode for this OS");
58	68	}
59
60	69	}
61	70
62	71	/// If the path does not exist it will be created.
...	...	@@ -65,24 +74,26 @@ pub const File = struct {
65	74	/// Call close to clean up.
66	75	pub fn openWriteNoClobber(allocator: &mem.Allocator, path: []const u8, file_mode: os.FileMode) OpenError!File {
67	76	if (is_posix) {
68		const flags = posix.O_LARGEFILE\|posix.O_WRONLY\|posix.O_CREAT\|posix.O_CLOEXEC\|posix.O_EXCL;
	77	const flags = posix.O_LARGEFILE \| posix.O_WRONLY \| posix.O_CREAT \| posix.O_CLOEXEC \| posix.O_EXCL;
69	78	const fd = try os.posixOpen(allocator, path, flags, file_mode);
70	79	return openHandle(fd);
71	80	} else if (is_windows) {
72		const handle = try os.windowsOpen(allocator, path, windows.GENERIC_WRITE,
73		windows.FILE_SHARE_WRITE\|windows.FILE_SHARE_READ\|windows.FILE_SHARE_DELETE,
74		windows.CREATE_NEW, windows.FILE_ATTRIBUTE_NORMAL);
	81	const handle = try os.windowsOpen(
	82	allocator,
	83	path,
	84	windows.GENERIC_WRITE,
	85	windows.FILE_SHARE_WRITE \| windows.FILE_SHARE_READ \| windows.FILE_SHARE_DELETE,
	86	windows.CREATE_NEW,
	87	windows.FILE_ATTRIBUTE_NORMAL,
	88	);
75	89	return openHandle(handle);
76	90	} else {
77	91	@compileError("TODO implement openWriteMode for this OS");
78	92	}
79
80	93	}
81	94
82	95	pub fn openHandle(handle: os.FileHandle) File {
83		return File {
84		.handle = handle,
85		};
	96	return File{ .handle = handle };
86	97	}
87	98
88	99	pub fn access(allocator: &mem.Allocator, path: []const u8, file_mode: os.FileMode) !bool {
...	...	@@ -217,7 +228,7 @@ pub const File = struct {
217	228	return result;
218	229	},
219	230	Os.windows => {
220		var pos : windows.LARGE_INTEGER = undefined;
	231	var pos: windows.LARGE_INTEGER = undefined;
221	232	if (windows.SetFilePointerEx(self.handle, 0, &pos, windows.FILE_CURRENT) == 0) {
222	233	const err = windows.GetLastError();
223	234	return switch (err) {
...	...	@@ -268,7 +279,7 @@ pub const File = struct {
268	279	}
269	280	}
270	281
271		pub const ModeError = error {
	282	pub const ModeError = error{
272	283	BadFd,
273	284	SystemResources,
274	285	Unexpected,
...	...	@@ -296,7 +307,7 @@ pub const File = struct {
296	307	}
297	308	}
298	309
299		pub const ReadError = error {};
	310	pub const ReadError = error{};
300	311
301	312	pub fn read(self: &File, buffer: []u8) !usize {
302	313	if (is_posix) {
...	...	@@ -306,12 +317,12 @@ pub const File = struct {
306	317	const read_err = posix.getErrno(amt_read);
307	318	if (read_err > 0) {
308	319	switch (read_err) {
309		posix.EINTR => continue,
	320	posix.EINTR => continue,
310	321	posix.EINVAL => unreachable,
311	322	posix.EFAULT => unreachable,
312		posix.EBADF => return error.BadFd,
313		posix.EIO => return error.Io,
314		else => return os.unexpectedErrorPosix(read_err),
	323	posix.EBADF => return error.BadFd,
	324	posix.EIO => return error.Io,
	325	else => return os.unexpectedErrorPosix(read_err),
315	326	}
316	327	}
317	328	if (amt_read == 0) return index;

std/os/get_user_id.zig+3-3

...	...	@@ -74,7 +74,7 @@ pub fn posixGetUserInfo(name: []const u8) !UserInfo {
74	74	'\n' => return error.CorruptPasswordFile,
75	75	else => {
76	76	const digit = switch (byte) {
77		'0' ... '9' => byte - '0',
	77	'0'...'9' => byte - '0',
78	78	else => return error.CorruptPasswordFile,
79	79	};
80	80	if (@mulWithOverflow(u32, uid, 10, &uid)) return error.CorruptPasswordFile;
...	...	@@ -83,14 +83,14 @@ pub fn posixGetUserInfo(name: []const u8) !UserInfo {
83	83	},
84	84	State.ReadGroupId => switch (byte) {
85	85	'\n', ':' => {
86		return UserInfo {
	86	return UserInfo{
87	87	.uid = uid,
88	88	.gid = gid,
89	89	};
90	90	},
91	91	else => {
92	92	const digit = switch (byte) {
93		'0' ... '9' => byte - '0',
	93	'0'...'9' => byte - '0',
94	94	else => return error.CorruptPasswordFile,
95	95	};
96	96	if (@mulWithOverflow(u32, gid, 10, &gid)) return error.CorruptPasswordFile;

std/os/index.zig+113-155

...	...	@@ -3,8 +3,7 @@ const builtin = @import("builtin");
3	3	const Os = builtin.Os;
4	4	const is_windows = builtin.os == Os.windows;
5	5	const is_posix = switch (builtin.os) {
6		builtin.Os.linux,
7		builtin.Os.macosx => true,
	6	builtin.Os.linux, builtin.Os.macosx => true,
8	7	else => false,
9	8	};
10	9	const os = this;
...	...	@@ -27,8 +26,7 @@ pub const linux = @import("linux/index.zig");
27	26	pub const zen = @import("zen.zig");
28	27	pub const posix = switch (builtin.os) {
29	28	Os.linux => linux,
30		Os.macosx,
31		Os.ios => darwin,
	29	Os.macosx, Os.ios => darwin,
32	30	Os.zen => zen,
33	31	else => @compileError("Unsupported OS"),
34	32	};
...	...	@@ -112,8 +110,7 @@ pub fn getRandomBytes(buf: []u8) !void {
112	110	}
113	111	return;
114	112	},
115		Os.macosx,
116		Os.ios => {
	113	Os.macosx, Os.ios => {
117	114	const fd = try posixOpenC(c"/dev/urandom", posix.O_RDONLY \| posix.O_CLOEXEC, 0);
118	115	defer close(fd);
119	116
...	...	@@ -137,7 +134,7 @@ pub fn getRandomBytes(buf: []u8) !void {
137	134	}
138	135	},
139	136	Os.zen => {
140		const randomness = []u8 {
	137	const randomness = []u8{
141	138	42,
142	139	1,
143	140	7,
...	...	@@ -175,9 +172,7 @@ pub fn abort() noreturn {
175	172	c.abort();
176	173	}
177	174	switch (builtin.os) {
178		Os.linux,
179		Os.macosx,
180		Os.ios => {
	175	Os.linux, Os.macosx, Os.ios => {
181	176	_ = posix.raise(posix.SIGABRT);
182	177	_ = posix.raise(posix.SIGKILL);
183	178	while (true) {}
...	...	@@ -199,9 +194,7 @@ pub fn exit(status: u8) noreturn {
199	194	c.exit(status);
200	195	}
201	196	switch (builtin.os) {
202		Os.linux,
203		Os.macosx,
204		Os.ios => {
	197	Os.linux, Os.macosx, Os.ios => {
205	198	posix.exit(status);
206	199	},
207	200	Os.windows => {
...	...	@@ -239,7 +232,7 @@ pub fn close(handle: FileHandle) void {
239	232	/// Calls POSIX read, and keeps trying if it gets interrupted.
240	233	pub fn posixRead(fd: i32, buf: []u8) !void {
241	234	// Linux can return EINVAL when read amount is > 0x7ffff000
242		// See https://github.com/zig-lang/zig/pull/743#issuecomment-363158274
	235	// See https://github.com/ziglang/zig/pull/743#issuecomment-363158274
243	236	const max_buf_len = 0x7ffff000;
244	237
245	238	var index: usize = 0;
...	...	@@ -250,14 +243,12 @@ pub fn posixRead(fd: i32, buf: []u8) !void {
250	243	if (err > 0) {
251	244	return switch (err) {
252	245	posix.EINTR => continue,
253		posix.EINVAL,
254		posix.EFAULT => unreachable,
	246	posix.EINVAL, posix.EFAULT => unreachable,
255	247	posix.EAGAIN => error.WouldBlock,
256	248	posix.EBADF => error.FileClosed,
257	249	posix.EIO => error.InputOutput,
258	250	posix.EISDIR => error.IsDir,
259		posix.ENOBUFS,
260		posix.ENOMEM => error.SystemResources,
	251	posix.ENOBUFS, posix.ENOMEM => error.SystemResources,
261	252	else => unexpectedErrorPosix(err),
262	253	};
263	254	}
...	...	@@ -265,7 +256,7 @@ pub fn posixRead(fd: i32, buf: []u8) !void {
265	256	}
266	257	}
267	258
268		pub const PosixWriteError = error {
	259	pub const PosixWriteError = error{
269	260	WouldBlock,
270	261	FileClosed,
271	262	DestinationAddressRequired,
...	...	@@ -281,7 +272,7 @@ pub const PosixWriteError = error {
281	272	/// Calls POSIX write, and keeps trying if it gets interrupted.
282	273	pub fn posixWrite(fd: i32, bytes: []const u8) !void {
283	274	// Linux can return EINVAL when write amount is > 0x7ffff000
284		// See https://github.com/zig-lang/zig/pull/743#issuecomment-363165856
	275	// See https://github.com/ziglang/zig/pull/743#issuecomment-363165856
285	276	const max_bytes_len = 0x7ffff000;
286	277
287	278	var index: usize = 0;
...	...	@@ -292,8 +283,7 @@ pub fn posixWrite(fd: i32, bytes: []const u8) !void {
292	283	if (write_err > 0) {
293	284	return switch (write_err) {
294	285	posix.EINTR => continue,
295		posix.EINVAL,
296		posix.EFAULT => unreachable,
	286	posix.EINVAL, posix.EFAULT => unreachable,
297	287	posix.EAGAIN => PosixWriteError.WouldBlock,
298	288	posix.EBADF => PosixWriteError.FileClosed,
299	289	posix.EDESTADDRREQ => PosixWriteError.DestinationAddressRequired,
...	...	@@ -310,7 +300,7 @@ pub fn posixWrite(fd: i32, bytes: []const u8) !void {
310	300	}
311	301	}
312	302
313		pub const PosixOpenError = error {
	303	pub const PosixOpenError = error{
314	304	OutOfMemory,
315	305	AccessDenied,
316	306	FileTooBig,
...	...	@@ -349,8 +339,7 @@ pub fn posixOpenC(file_path: &const u8, flags: u32, perm: usize) !i32 {
349	339	posix.EFAULT => unreachable,
350	340	posix.EINVAL => unreachable,
351	341	posix.EACCES => return PosixOpenError.AccessDenied,
352		posix.EFBIG,
353		posix.EOVERFLOW => return PosixOpenError.FileTooBig,
	342	posix.EFBIG, posix.EOVERFLOW => return PosixOpenError.FileTooBig,
354	343	posix.EISDIR => return PosixOpenError.IsDir,
355	344	posix.ELOOP => return PosixOpenError.SymLinkLoop,
356	345	posix.EMFILE => return PosixOpenError.ProcessFdQuotaExceeded,
...	...	@@ -375,8 +364,7 @@ pub fn posixDup2(old_fd: i32, new_fd: i32) !void {
375	364	const err = posix.getErrno(posix.dup2(old_fd, new_fd));
376	365	if (err > 0) {
377	366	return switch (err) {
378		posix.EBUSY,
379		posix.EINTR => continue,
	367	posix.EBUSY, posix.EINTR => continue,
380	368	posix.EMFILE => error.ProcessFdQuotaExceeded,
381	369	posix.EINVAL => unreachable,
382	370	else => unexpectedErrorPosix(err),
...	...	@@ -477,7 +465,7 @@ pub fn posixExecve(argv: []const []const u8, env_map: &const BufMap, allocator:
477	465	return posixExecveErrnoToErr(err);
478	466	}
479	467
480		pub const PosixExecveError = error {
	468	pub const PosixExecveError = error{
481	469	SystemResources,
482	470	AccessDenied,
483	471	InvalidExe,
...	...	@@ -493,17 +481,10 @@ fn posixExecveErrnoToErr(err: usize) PosixExecveError {
493	481	assert(err > 0);
494	482	return switch (err) {
495	483	posix.EFAULT => unreachable,
496		posix.E2BIG,
497		posix.EMFILE,
498		posix.ENAMETOOLONG,
499		posix.ENFILE,
500		posix.ENOMEM => error.SystemResources,
501		posix.EACCES,
502		posix.EPERM => error.AccessDenied,
503		posix.EINVAL,
504		posix.ENOEXEC => error.InvalidExe,
505		posix.EIO,
506		posix.ELOOP => error.FileSystem,
	484	posix.E2BIG, posix.EMFILE, posix.ENAMETOOLONG, posix.ENFILE, posix.ENOMEM => error.SystemResources,
	485	posix.EACCES, posix.EPERM => error.AccessDenied,
	486	posix.EINVAL, posix.ENOEXEC => error.InvalidExe,
	487	posix.EIO, posix.ELOOP => error.FileSystem,
507	488	posix.EISDIR => error.IsDir,
508	489	posix.ENOENT => error.FileNotFound,
509	490	posix.ENOTDIR => error.NotDir,
...	...	@@ -512,7 +493,7 @@ fn posixExecveErrnoToErr(err: usize) PosixExecveError {
512	493	};
513	494	}
514	495
515		pub var linux_aux_raw = []usize {0} ** 38;
	496	pub var linux_aux_raw = []usize{0} ** 38;
516	497	pub var posix_environ_raw: []&u8 = undefined;
517	498
518	499	/// Caller must free result when done.
...	...	@@ -667,7 +648,7 @@ pub fn symLink(allocator: &Allocator, existing_path: []const u8, new_path: []con
667	648	}
668	649	}
669	650
670		pub const WindowsSymLinkError = error {
	651	pub const WindowsSymLinkError = error{
671	652	OutOfMemory,
672	653	Unexpected,
673	654	};
...	...	@@ -686,7 +667,7 @@ pub fn symLinkWindows(allocator: &Allocator, existing_path: []const u8, new_path
686	667	}
687	668	}
688	669
689		pub const PosixSymLinkError = error {
	670	pub const PosixSymLinkError = error{
690	671	OutOfMemory,
691	672	AccessDenied,
692	673	DiskQuota,
...	...	@@ -717,10 +698,8 @@ pub fn symLinkPosix(allocator: &Allocator, existing_path: []const u8, new_path:
717	698	const err = posix.getErrno(posix.symlink(existing_buf.ptr, new_buf.ptr));
718	699	if (err > 0) {
719	700	return switch (err) {
720		posix.EFAULT,
721		posix.EINVAL => unreachable,
722		posix.EACCES,
723		posix.EPERM => error.AccessDenied,
	701	posix.EFAULT, posix.EINVAL => unreachable,
	702	posix.EACCES, posix.EPERM => error.AccessDenied,
724	703	posix.EDQUOT => error.DiskQuota,
725	704	posix.EEXIST => error.PathAlreadyExists,
726	705	posix.EIO => error.FileSystem,
...	...	@@ -787,8 +766,7 @@ pub fn deleteFileWindows(allocator: &Allocator, file_path: []const u8) !void {
787	766	return switch (err) {
788	767	windows.ERROR.FILE_NOT_FOUND => error.FileNotFound,
789	768	windows.ERROR.ACCESS_DENIED => error.AccessDenied,
790		windows.ERROR.FILENAME_EXCED_RANGE,
791		windows.ERROR.INVALID_PARAMETER => error.NameTooLong,
	769	windows.ERROR.FILENAME_EXCED_RANGE, windows.ERROR.INVALID_PARAMETER => error.NameTooLong,
792	770	else => unexpectedErrorWindows(err),
793	771	};
794	772	}
...	...	@@ -804,11 +782,9 @@ pub fn deleteFilePosix(allocator: &Allocator, file_path: []const u8) !void {
804	782	const err = posix.getErrno(posix.unlink(buf.ptr));
805	783	if (err > 0) {
806	784	return switch (err) {
807		posix.EACCES,
808		posix.EPERM => error.AccessDenied,
	785	posix.EACCES, posix.EPERM => error.AccessDenied,
809	786	posix.EBUSY => error.FileBusy,
810		posix.EFAULT,
811		posix.EINVAL => unreachable,
	787	posix.EFAULT, posix.EINVAL => unreachable,
812	788	posix.EIO => error.FileSystem,
813	789	posix.EISDIR => error.IsDir,
814	790	posix.ELOOP => error.SymLinkLoop,
...	...	@@ -879,14 +855,20 @@ pub const AtomicFile = struct {
879	855	const dirname = os.path.dirname(dest_path);
880	856
881	857	var rand_buf: [12]u8 = undefined;
882		const tmp_path = try allocator.alloc(u8, dirname.len + 1 + base64.Base64Encoder.calcSize(rand_buf.len));
	858
	859	const dirname_component_len = if (dirname.len == 0) 0 else dirname.len + 1;
	860	const tmp_path = try allocator.alloc(u8, dirname_component_len +
	861	base64.Base64Encoder.calcSize(rand_buf.len));
883	862	errdefer allocator.free(tmp_path);
884		mem.copy(u8, tmp_path[0..], dirname);
885		tmp_path[dirname.len] = os.path.sep;
	863
	864	if (dirname.len != 0) {
	865	mem.copy(u8, tmp_path[0..], dirname);
	866	tmp_path[dirname.len] = os.path.sep;
	867	}
886	868
887	869	while (true) {
888	870	try getRandomBytes(rand_buf[0..]);
889		b64_fs_encoder.encode(tmp_path[dirname.len + 1..], rand_buf);
	871	b64_fs_encoder.encode(tmp_path[dirname_component_len..], rand_buf);
890	872
891	873	const file = os.File.openWriteNoClobber(allocator, tmp_path, mode) catch \|err\| switch (err) {
892	874	error.PathAlreadyExists => continue,
...	...	@@ -895,7 +877,7 @@ pub const AtomicFile = struct {
895	877	else => return err,
896	878	};
897	879
898		return AtomicFile {
	880	return AtomicFile{
899	881	.allocator = allocator,
900	882	.file = file,
901	883	.tmp_path = tmp_path,
...	...	@@ -948,12 +930,10 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)
948	930	const err = posix.getErrno(posix.rename(old_buf.ptr, new_buf.ptr));
949	931	if (err > 0) {
950	932	return switch (err) {
951		posix.EACCES,
952		posix.EPERM => error.AccessDenied,
	933	posix.EACCES, posix.EPERM => error.AccessDenied,
953	934	posix.EBUSY => error.FileBusy,
954	935	posix.EDQUOT => error.DiskQuota,
955		posix.EFAULT,
956		posix.EINVAL => unreachable,
	936	posix.EFAULT, posix.EINVAL => unreachable,
957	937	posix.EISDIR => error.IsDir,
958	938	posix.ELOOP => error.SymLinkLoop,
959	939	posix.EMLINK => error.LinkQuotaExceeded,
...	...	@@ -962,8 +942,7 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)
962	942	posix.ENOTDIR => error.NotDir,
963	943	posix.ENOMEM => error.SystemResources,
964	944	posix.ENOSPC => error.NoSpaceLeft,
965		posix.EEXIST,
966		posix.ENOTEMPTY => error.PathAlreadyExists,
	945	posix.EEXIST, posix.ENOTEMPTY => error.PathAlreadyExists,
967	946	posix.EROFS => error.ReadOnlyFileSystem,
968	947	posix.EXDEV => error.RenameAcrossMountPoints,
969	948	else => unexpectedErrorPosix(err),
...	...	@@ -1001,8 +980,7 @@ pub fn makeDirPosix(allocator: &Allocator, dir_path: []const u8) !void {
1001	980	const err = posix.getErrno(posix.mkdir(path_buf.ptr, 0o755));
1002	981	if (err > 0) {
1003	982	return switch (err) {
1004		posix.EACCES,
1005		posix.EPERM => error.AccessDenied,
	983	posix.EACCES, posix.EPERM => error.AccessDenied,
1006	984	posix.EDQUOT => error.DiskQuota,
1007	985	posix.EEXIST => error.PathAlreadyExists,
1008	986	posix.EFAULT => unreachable,
...	...	@@ -1065,18 +1043,15 @@ pub fn deleteDir(allocator: &Allocator, dir_path: []const u8) !void {
1065	1043	const err = posix.getErrno(posix.rmdir(path_buf.ptr));
1066	1044	if (err > 0) {
1067	1045	return switch (err) {
1068		posix.EACCES,
1069		posix.EPERM => error.AccessDenied,
	1046	posix.EACCES, posix.EPERM => error.AccessDenied,
1070	1047	posix.EBUSY => error.FileBusy,
1071		posix.EFAULT,
1072		posix.EINVAL => unreachable,
	1048	posix.EFAULT, posix.EINVAL => unreachable,
1073	1049	posix.ELOOP => error.SymLinkLoop,
1074	1050	posix.ENAMETOOLONG => error.NameTooLong,
1075	1051	posix.ENOENT => error.FileNotFound,
1076	1052	posix.ENOMEM => error.SystemResources,
1077	1053	posix.ENOTDIR => error.NotDir,
1078		posix.EEXIST,
1079		posix.ENOTEMPTY => error.DirNotEmpty,
	1054	posix.EEXIST, posix.ENOTEMPTY => error.DirNotEmpty,
1080	1055	posix.EROFS => error.ReadOnlyFileSystem,
1081	1056	else => unexpectedErrorPosix(err),
1082	1057	};
...	...	@@ -1087,7 +1062,7 @@ pub fn deleteDir(allocator: &Allocator, dir_path: []const u8) !void {
1087	1062	/// removes it. If it cannot be removed because it is a non-empty directory,
1088	1063	/// this function recursively removes its entries and then tries again.
1089	1064	/// TODO non-recursive implementation
1090		const DeleteTreeError = error {
	1065	const DeleteTreeError = error{
1091	1066	OutOfMemory,
1092	1067	AccessDenied,
1093	1068	FileTooBig,
...	...	@@ -1128,7 +1103,8 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!
1128	1103	error.NotDir,
1129	1104	error.FileSystem,
1130	1105	error.FileBusy,
1131		error.Unexpected => return err,
	1106	error.Unexpected,
	1107	=> return err,
1132	1108	}
1133	1109	{
1134	1110	var dir = Dir.open(allocator, full_path) catch \|err\| switch (err) {
...	...	@@ -1152,7 +1128,8 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!
1152	1128	error.SystemResources,
1153	1129	error.NoSpaceLeft,
1154	1130	error.PathAlreadyExists,
1155		error.Unexpected => return err,
	1131	error.Unexpected,
	1132	=> return err,
1156	1133	};
1157	1134	defer dir.close();
1158	1135
...	...	@@ -1182,8 +1159,7 @@ pub const Dir = struct {
1182	1159	end_index: usize,
1183	1160
1184	1161	const darwin_seek_t = switch (builtin.os) {
1185		Os.macosx,
1186		Os.ios => i64,
	1162	Os.macosx, Os.ios => i64,
1187	1163	else => void,
1188	1164	};
1189	1165
...	...	@@ -1208,16 +1184,19 @@ pub const Dir = struct {
1208	1184	const fd = switch (builtin.os) {
1209	1185	Os.windows => @compileError("TODO support Dir.open for windows"),
1210	1186	Os.linux => try posixOpen(allocator, dir_path, posix.O_RDONLY \| posix.O_DIRECTORY \| posix.O_CLOEXEC, 0),
1211		Os.macosx,
1212		Os.ios => try posixOpen(allocator, dir_path, posix.O_RDONLY \| posix.O_NONBLOCK \| posix.O_DIRECTORY \| posix.O_CLOEXEC, 0),
	1187	Os.macosx, Os.ios => try posixOpen(
	1188	allocator,
	1189	dir_path,
	1190	posix.O_RDONLY \| posix.O_NONBLOCK \| posix.O_DIRECTORY \| posix.O_CLOEXEC,
	1191	0,
	1192	),
1213	1193	else => @compileError("Dir.open is not supported for this platform"),
1214	1194	};
1215	1195	const darwin_seek_init = switch (builtin.os) {
1216		Os.macosx,
1217		Os.ios => 0,
	1196	Os.macosx, Os.ios => 0,
1218	1197	else => {},
1219	1198	};
1220		return Dir {
	1199	return Dir{
1221	1200	.allocator = allocator,
1222	1201	.fd = fd,
1223	1202	.darwin_seek = darwin_seek_init,
...	...	@@ -1237,8 +1216,7 @@ pub const Dir = struct {
1237	1216	pub fn next(self: &Dir) !?Entry {
1238	1217	switch (builtin.os) {
1239	1218	Os.linux => return self.nextLinux(),
1240		Os.macosx,
1241		Os.ios => return self.nextDarwin(),
	1219	Os.macosx, Os.ios => return self.nextDarwin(),
1242	1220	Os.windows => return self.nextWindows(),
1243	1221	else => @compileError("Dir.next not supported on " ++ @tagName(builtin.os)),
1244	1222	}
...	...	@@ -1256,9 +1234,7 @@ pub const Dir = struct {
1256	1234	const err = posix.getErrno(result);
1257	1235	if (err > 0) {
1258	1236	switch (err) {
1259		posix.EBADF,
1260		posix.EFAULT,
1261		posix.ENOTDIR => unreachable,
	1237	posix.EBADF, posix.EFAULT, posix.ENOTDIR => unreachable,
1262	1238	posix.EINVAL => {
1263	1239	self.buf = try self.allocator.realloc(u8, self.buf, self.buf.len * 2);
1264	1240	continue;
...	...	@@ -1294,7 +1270,7 @@ pub const Dir = struct {
1294	1270	posix.DT_WHT => Entry.Kind.Whiteout,
1295	1271	else => Entry.Kind.Unknown,
1296	1272	};
1297		return Entry {
	1273	return Entry{
1298	1274	.name = name,
1299	1275	.kind = entry_kind,
1300	1276	};
...	...	@@ -1317,9 +1293,7 @@ pub const Dir = struct {
1317	1293	const err = posix.getErrno(result);
1318	1294	if (err > 0) {
1319	1295	switch (err) {
1320		posix.EBADF,
1321		posix.EFAULT,
1322		posix.ENOTDIR => unreachable,
	1296	posix.EBADF, posix.EFAULT, posix.ENOTDIR => unreachable,
1323	1297	posix.EINVAL => {
1324	1298	self.buf = try self.allocator.realloc(u8, self.buf, self.buf.len * 2);
1325	1299	continue;
...	...	@@ -1355,7 +1329,7 @@ pub const Dir = struct {
1355	1329	posix.DT_SOCK => Entry.Kind.UnixDomainSocket,
1356	1330	else => Entry.Kind.Unknown,
1357	1331	};
1358		return Entry {
	1332	return Entry{
1359	1333	.name = name,
1360	1334	.kind = entry_kind,
1361	1335	};
...	...	@@ -1402,8 +1376,7 @@ pub fn readLink(allocator: &Allocator, pathname: []const u8) ![]u8 {
1402	1376	if (err > 0) {
1403	1377	return switch (err) {
1404	1378	posix.EACCES => error.AccessDenied,
1405		posix.EFAULT,
1406		posix.EINVAL => unreachable,
	1379	posix.EFAULT, posix.EINVAL => unreachable,
1407	1380	posix.EIO => error.FileSystem,
1408	1381	posix.ELOOP => error.SymLinkLoop,
1409	1382	posix.ENAMETOOLONG => error.NameTooLong,
...	...	@@ -1465,7 +1438,7 @@ pub fn posix_setregid(rgid: u32, egid: u32) !void {
1465	1438	};
1466	1439	}
1467	1440
1468		pub const WindowsGetStdHandleErrs = error {
	1441	pub const WindowsGetStdHandleErrs = error{
1469	1442	NoStdHandles,
1470	1443	Unexpected,
1471	1444	};
...	...	@@ -1489,7 +1462,7 @@ pub const ArgIteratorPosix = struct {
1489	1462	count: usize,
1490	1463
1491	1464	pub fn init() ArgIteratorPosix {
1492		return ArgIteratorPosix {
	1465	return ArgIteratorPosix{
1493	1466	.index = 0,
1494	1467	.count = raw.len,
1495	1468	};
...	...	@@ -1522,16 +1495,14 @@ pub const ArgIteratorWindows = struct {
1522	1495	quote_count: usize,
1523	1496	seen_quote_count: usize,
1524	1497
1525		pub const NextError = error {
1526		OutOfMemory,
1527		};
	1498	pub const NextError = error{OutOfMemory};
1528	1499
1529	1500	pub fn init() ArgIteratorWindows {
1530	1501	return initWithCmdLine(windows.GetCommandLineA());
1531	1502	}
1532	1503
1533	1504	pub fn initWithCmdLine(cmd_line: &const u8) ArgIteratorWindows {
1534		return ArgIteratorWindows {
	1505	return ArgIteratorWindows{
1535	1506	.index = 0,
1536	1507	.cmd_line = cmd_line,
1537	1508	.in_quote = false,
...	...	@@ -1547,8 +1518,7 @@ pub const ArgIteratorWindows = struct {
1547	1518	const byte = self.cmd_line[self.index];
1548	1519	switch (byte) {
1549	1520	0 => return null,
1550		' ',
1551		'\t' => continue,
	1521	' ', '\t' => continue,
1552	1522	else => break,
1553	1523	}
1554	1524	}
...	...	@@ -1562,8 +1532,7 @@ pub const ArgIteratorWindows = struct {
1562	1532	const byte = self.cmd_line[self.index];
1563	1533	switch (byte) {
1564	1534	0 => return false,
1565		' ',
1566		'\t' => continue,
	1535	' ', '\t' => continue,
1567	1536	else => break,
1568	1537	}
1569	1538	}
...	...	@@ -1582,8 +1551,7 @@ pub const ArgIteratorWindows = struct {
1582	1551	'\\' => {
1583	1552	backslash_count += 1;
1584	1553	},
1585		' ',
1586		'\t' => {
	1554	' ', '\t' => {
1587	1555	if (self.seen_quote_count % 2 == 0 or self.seen_quote_count == self.quote_count) {
1588	1556	return true;
1589	1557	}
...	...	@@ -1623,8 +1591,7 @@ pub const ArgIteratorWindows = struct {
1623	1591	'\\' => {
1624	1592	backslash_count += 1;
1625	1593	},
1626		' ',
1627		'\t' => {
	1594	' ', '\t' => {
1628	1595	try self.emitBackslashes(&buf, backslash_count);
1629	1596	backslash_count = 0;
1630	1597	if (self.seen_quote_count % 2 == 1 and self.seen_quote_count != self.quote_count) {
...	...	@@ -1676,9 +1643,7 @@ pub const ArgIterator = struct {
1676	1643	inner: InnerType,
1677	1644
1678	1645	pub fn init() ArgIterator {
1679		return ArgIterator {
1680		.inner = InnerType.init(),
1681		};
	1646	return ArgIterator{ .inner = InnerType.init() };
1682	1647	}
1683	1648
1684	1649	pub const NextError = ArgIteratorWindows.NextError;
...	...	@@ -1757,33 +1722,33 @@ pub fn argsFree(allocator: &mem.Allocator, args_alloc: []const []u8) void {
1757	1722	}
1758	1723
1759	1724	test "windows arg parsing" {
1760		testWindowsCmdLine(c"a b\tc d", [][]const u8 {
	1725	testWindowsCmdLine(c"a b\tc d", [][]const u8{
1761	1726	"a",
1762	1727	"b",
1763	1728	"c",
1764	1729	"d",
1765	1730	});
1766		testWindowsCmdLine(c"\"abc\" d e", [][]const u8 {
	1731	testWindowsCmdLine(c"\"abc\" d e", [][]const u8{
1767	1732	"abc",
1768	1733	"d",
1769	1734	"e",
1770	1735	});
1771		testWindowsCmdLine(c"a\\\\\\b d\"e f\"g h", [][]const u8 {
	1736	testWindowsCmdLine(c"a\\\\\\b d\"e f\"g h", [][]const u8{
1772	1737	"a\\\\\\b",
1773	1738	"de fg",
1774	1739	"h",
1775	1740	});
1776		testWindowsCmdLine(c"a\\\\\\\"b c d", [][]const u8 {
	1741	testWindowsCmdLine(c"a\\\\\\\"b c d", [][]const u8{
1777	1742	"a\\\"b",
1778	1743	"c",
1779	1744	"d",
1780	1745	});
1781		testWindowsCmdLine(c"a\\\\\\\\\"b c\" d e", [][]const u8 {
	1746	testWindowsCmdLine(c"a\\\\\\\\\"b c\" d e", [][]const u8{
1782	1747	"a\\\\b c",
1783	1748	"d",
1784	1749	"e",
1785	1750	});
1786		testWindowsCmdLine(c"a b\tc \"d f", [][]const u8 {
	1751	testWindowsCmdLine(c"a b\tc \"d f", [][]const u8{
1787	1752	"a",
1788	1753	"b",
1789	1754	"c",
...	...	@@ -1791,7 +1756,7 @@ test "windows arg parsing" {
1791	1756	"f",
1792	1757	});
1793	1758
1794		testWindowsCmdLine(c"\".\\..\\zig-cache\\build\" \"bin\\zig.exe\" \".\\..\" \".\\..\\zig-cache\" \"--help\"", [][]const u8 {
	1759	testWindowsCmdLine(c"\".\\..\\zig-cache\\build\" \"bin\\zig.exe\" \".\\..\" \".\\..\\zig-cache\" \"--help\"", [][]const u8{
1795	1760	".\\..\\zig-cache\\build",
1796	1761	"bin\\zig.exe",
1797	1762	".\\..",
...	...	@@ -1811,7 +1776,7 @@ fn testWindowsCmdLine(input_cmd_line: &const u8, expected_args: []const []const
1811	1776
1812	1777	// TODO make this a build variable that you can set
1813	1778	const unexpected_error_tracing = false;
1814		const UnexpectedError = error {
	1779	const UnexpectedError = error{
1815	1780	/// The Operating System returned an undocumented error code.
1816	1781	Unexpected,
1817	1782	};
...	...	@@ -1844,8 +1809,7 @@ pub fn openSelfExe() !os.File {
1844	1809	var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
1845	1810	return os.File.openRead(&fixed_allocator.allocator, proc_file_path);
1846	1811	},
1847		Os.macosx,
1848		Os.ios => {
	1812	Os.macosx, Os.ios => {
1849	1813	var fixed_buffer_mem: [darwin.PATH_MAX * 2]u8 = undefined;
1850	1814	var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
1851	1815	const self_exe_path = try selfExePath(&fixed_allocator.allocator);
...	...	@@ -1857,9 +1821,7 @@ pub fn openSelfExe() !os.File {
1857	1821
1858	1822	test "openSelfExe" {
1859	1823	switch (builtin.os) {
1860		Os.linux,
1861		Os.macosx,
1862		Os.ios => (try openSelfExe()).close(),
	1824	Os.linux, Os.macosx, Os.ios => (try openSelfExe()).close(),
1863	1825	else => return, // Unsupported OS.
1864	1826	}
1865	1827	}
...	...	@@ -1897,8 +1859,7 @@ pub fn selfExePath(allocator: &mem.Allocator) ![]u8 {
1897	1859	try out_path.resize(new_len);
1898	1860	}
1899	1861	},
1900		Os.macosx,
1901		Os.ios => {
	1862	Os.macosx, Os.ios => {
1902	1863	var u32_len: u32 = 0;
1903	1864	const ret1 = c._NSGetExecutablePath(undefined, &u32_len);
1904	1865	assert(ret1 != 0);
...	...	@@ -1926,9 +1887,7 @@ pub fn selfExeDirPath(allocator: &mem.Allocator) ![]u8 {
1926	1887	const dir = path.dirname(full_exe_path);
1927	1888	return allocator.shrink(u8, full_exe_path, dir.len);
1928	1889	},
1929		Os.windows,
1930		Os.macosx,
1931		Os.ios => {
	1890	Os.windows, Os.macosx, Os.ios => {
1932	1891	const self_exe_path = try selfExePath(allocator);
1933	1892	errdefer allocator.free(self_exe_path);
1934	1893	const dirname = os.path.dirname(self_exe_path);
...	...	@@ -1950,7 +1909,7 @@ pub fn isTty(handle: FileHandle) bool {
1950	1909	}
1951	1910	}
1952	1911
1953		pub const PosixSocketError = error {
	1912	pub const PosixSocketError = error{
1954	1913	/// Permission to create a socket of the specified type and/or
1955	1914	/// pro‐tocol is denied.
1956	1915	PermissionDenied,
...	...	@@ -1985,16 +1944,15 @@ pub fn posixSocket(domain: u32, socket_type: u32, protocol: u32) !i32 {
1985	1944	posix.EINVAL => return PosixSocketError.ProtocolFamilyNotAvailable,
1986	1945	posix.EMFILE => return PosixSocketError.ProcessFdQuotaExceeded,
1987	1946	posix.ENFILE => return PosixSocketError.SystemFdQuotaExceeded,
1988		posix.ENOBUFS,
1989		posix.ENOMEM => return PosixSocketError.SystemResources,
	1947	posix.ENOBUFS, posix.ENOMEM => return PosixSocketError.SystemResources,
1990	1948	posix.EPROTONOSUPPORT => return PosixSocketError.ProtocolNotSupported,
1991	1949	else => return unexpectedErrorPosix(err),
1992	1950	}
1993	1951	}
1994	1952
1995		pub const PosixBindError = error {
	1953	pub const PosixBindError = error{
1996	1954	/// The address is protected, and the user is not the superuser.
1997		/// For UNIX domain sockets: Search permission is denied on a component
	1955	/// For UNIX domain sockets: Search permission is denied on a component
1998	1956	/// of the path prefix.
1999	1957	AccessDenied,
2000	1958
...	...	@@ -2065,7 +2023,7 @@ pub fn posixBind(fd: i32, addr: &const posix.sockaddr) PosixBindError!void {
2065	2023	}
2066	2024	}
2067	2025
2068		const PosixListenError = error {
	2026	const PosixListenError = error{
2069	2027	/// Another socket is already listening on the same port.
2070	2028	/// For Internet domain sockets, the socket referred to by sockfd had not previously
2071	2029	/// been bound to an address and, upon attempting to bind it to an ephemeral port, it
...	...	@@ -2098,7 +2056,7 @@ pub fn posixListen(sockfd: i32, backlog: u32) PosixListenError!void {
2098	2056	}
2099	2057	}
2100	2058
2101		pub const PosixAcceptError = error {
	2059	pub const PosixAcceptError = error{
2102	2060	/// The socket is marked nonblocking and no connections are present to be accepted.
2103	2061	WouldBlock,
2104	2062
...	...	@@ -2155,8 +2113,7 @@ pub fn posixAccept(fd: i32, addr: &posix.sockaddr, flags: u32) PosixAcceptError!
2155	2113	posix.EINVAL => return PosixAcceptError.InvalidSyscall,
2156	2114	posix.EMFILE => return PosixAcceptError.ProcessFdQuotaExceeded,
2157	2115	posix.ENFILE => return PosixAcceptError.SystemFdQuotaExceeded,
2158		posix.ENOBUFS,
2159		posix.ENOMEM => return PosixAcceptError.SystemResources,
	2116	posix.ENOBUFS, posix.ENOMEM => return PosixAcceptError.SystemResources,
2160	2117	posix.ENOTSOCK => return PosixAcceptError.FileDescriptorNotASocket,
2161	2118	posix.EOPNOTSUPP => return PosixAcceptError.OperationNotSupported,
2162	2119	posix.EPROTO => return PosixAcceptError.ProtocolFailure,
...	...	@@ -2165,7 +2122,7 @@ pub fn posixAccept(fd: i32, addr: &posix.sockaddr, flags: u32) PosixAcceptError!
2165	2122	}
2166	2123	}
2167	2124
2168		pub const LinuxEpollCreateError = error {
	2125	pub const LinuxEpollCreateError = error{
2169	2126	/// Invalid value specified in flags.
2170	2127	InvalidSyscall,
2171	2128
...	...	@@ -2198,7 +2155,7 @@ pub fn linuxEpollCreate(flags: u32) LinuxEpollCreateError!i32 {
2198	2155	}
2199	2156	}
2200	2157
2201		pub const LinuxEpollCtlError = error {
	2158	pub const LinuxEpollCtlError = error{
2202	2159	/// epfd or fd is not a valid file descriptor.
2203	2160	InvalidFileDescriptor,
2204	2161
...	...	@@ -2271,7 +2228,7 @@ pub fn linuxEpollWait(epfd: i32, events: []linux.epoll_event, timeout: i32) usiz
2271	2228	}
2272	2229	}
2273	2230
2274		pub const PosixGetSockNameError = error {
	2231	pub const PosixGetSockNameError = error{
2275	2232	/// Insufficient resources were available in the system to perform the operation.
2276	2233	SystemResources,
2277	2234
...	...	@@ -2295,7 +2252,7 @@ pub fn posixGetSockName(sockfd: i32) PosixGetSockNameError!posix.sockaddr {
2295	2252	}
2296	2253	}
2297	2254
2298		pub const PosixConnectError = error {
	2255	pub const PosixConnectError = error{
2299	2256	/// For UNIX domain sockets, which are identified by pathname: Write permission is denied on the socket
2300	2257	/// file, or search permission is denied for one of the directories in the path prefix.
2301	2258	/// or
...	...	@@ -2367,8 +2324,7 @@ pub fn posixConnectAsync(sockfd: i32, sockaddr: &const posix.sockaddr) PosixConn
2367	2324	const rc = posix.connect(sockfd, sockaddr, @sizeOf(posix.sockaddr));
2368	2325	const err = posix.getErrno(rc);
2369	2326	switch (err) {
2370		0,
2371		posix.EINPROGRESS => return,
	2327	0, posix.EINPROGRESS => return,
2372	2328	else => return unexpectedErrorPosix(err),
2373	2329
2374	2330	posix.EACCES => return PosixConnectError.PermissionDenied,
...	...	@@ -2420,7 +2376,7 @@ pub fn posixGetSockOptConnectError(sockfd: i32) PosixConnectError!void {
2420	2376	},
2421	2377	else => return unexpectedErrorPosix(err),
2422	2378	posix.EBADF => unreachable, // The argument sockfd is not a valid file descriptor.
2423		posix.EFAULT => unreachable, // The address pointed to by optval or optlen is not in a valid part of the process address space.
	2379	posix.EFAULT => unreachable, // The address pointed to by optval or optlen is not in a valid part of the process address space.
2424	2380	posix.EINVAL => unreachable,
2425	2381	posix.ENOPROTOOPT => unreachable, // The option is unknown at the level indicated.
2426	2382	posix.ENOTSOCK => unreachable, // The file descriptor sockfd does not refer to a socket.
...	...	@@ -2431,11 +2387,13 @@ pub const Thread = struct {
2431	2387	data: Data,
2432	2388
2433	2389	pub const use_pthreads = is_posix and builtin.link_libc;
2434		const Data = if (use_pthreads) struct {
2435		handle: c.pthread_t,
2436		stack_addr: usize,
2437		stack_len: usize,
2438		} else switch (builtin.os) {
	2390	const Data = if (use_pthreads)
	2391	struct {
	2392	handle: c.pthread_t,
	2393	stack_addr: usize,
	2394	stack_len: usize,
	2395	}
	2396	else switch (builtin.os) {
2439	2397	builtin.Os.linux => struct {
2440	2398	pid: i32,
2441	2399	stack_addr: usize,
...	...	@@ -2485,7 +2443,7 @@ pub const Thread = struct {
2485	2443	}
2486	2444	};
2487	2445
2488		pub const SpawnThreadError = error {
	2446	pub const SpawnThreadError = error{
2489	2447	/// A system-imposed limit on the number of threads was encountered.
2490	2448	/// There are a number of limits that may trigger this error:
2491	2449	/// * the RLIMIT_NPROC soft resource limit (set via setrlimit(2)),
...	...	@@ -2517,7 +2475,7 @@ pub const SpawnThreadError = error {
2517	2475	/// caller must call wait on the returned thread
2518	2476	pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread {
2519	2477	// TODO compile-time call graph analysis to determine stack upper bound
2520		// https://github.com/zig-lang/zig/issues/157
	2478	// https://github.com/ziglang/zig/issues/157
2521	2479	const default_stack_size = 8 * 1024 * 1024;
2522	2480
2523	2481	const Context = @typeOf(context);
...	...	@@ -2533,7 +2491,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2533	2491	if (@sizeOf(Context) == 0) {
2534	2492	return startFn({});
2535	2493	} else {
2536		return startFn(*@ptrCast(&Context, @alignCast(@alignOf(Context), arg)));
	2494	return startFn(@ptrCast(&Context, @alignCast(@alignOf(Context), arg)).*);
2537	2495	}
2538	2496	}
2539	2497	};
...	...	@@ -2563,7 +2521,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2563	2521	if (@sizeOf(Context) == 0) {
2564	2522	return startFn({});
2565	2523	} else {
2566		return startFn(*@intToPtr(&const Context, ctx_addr));
	2524	return startFn(@intToPtr(&const Context, ctx_addr).*);
2567	2525	}
2568	2526	}
2569	2527	extern fn posixThreadMain(ctx: ?&c_void) ?&c_void {
...	...	@@ -2571,7 +2529,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2571	2529	_ = startFn({});
2572	2530	return null;
2573	2531	} else {
2574		_ = startFn(*@ptrCast(&const Context, @alignCast(@alignOf(Context), ctx)));
	2532	_ = startFn(@ptrCast(&const Context, @alignCast(@alignOf(Context), ctx)).*);
2575	2533	return null;
2576	2534	}
2577	2535	}
...	...	@@ -2591,7 +2549,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2591	2549	stack_end -= stack_end % @alignOf(Context);
2592	2550	assert(stack_end >= stack_addr);
2593	2551	const context_ptr = @alignCast(@alignOf(Context), @intToPtr(&Context, stack_end));
2594		*context_ptr = context;
	2552	context_ptr.* = context;
2595	2553	arg = stack_end;
2596	2554	}
2597	2555

std/os/linux/errno.zig+425-144

...	...	@@ -1,146 +1,427 @@
1		pub const EPERM = 1; /// Operation not permitted
2		pub const ENOENT = 2; /// No such file or directory
3		pub const ESRCH = 3; /// No such process
4		pub const EINTR = 4; /// Interrupted system call
5		pub const EIO = 5; /// I/O error
6		pub const ENXIO = 6; /// No such device or address
7		pub const E2BIG = 7; /// Arg list too long
8		pub const ENOEXEC = 8; /// Exec format error
9		pub const EBADF = 9; /// Bad file number
10		pub const ECHILD = 10; /// No child processes
11		pub const EAGAIN = 11; /// Try again
12		pub const ENOMEM = 12; /// Out of memory
13		pub const EACCES = 13; /// Permission denied
14		pub const EFAULT = 14; /// Bad address
15		pub const ENOTBLK = 15; /// Block device required
16		pub const EBUSY = 16; /// Device or resource busy
17		pub const EEXIST = 17; /// File exists
18		pub const EXDEV = 18; /// Cross-device link
19		pub const ENODEV = 19; /// No such device
20		pub const ENOTDIR = 20; /// Not a directory
21		pub const EISDIR = 21; /// Is a directory
22		pub const EINVAL = 22; /// Invalid argument
23		pub const ENFILE = 23; /// File table overflow
24		pub const EMFILE = 24; /// Too many open files
25		pub const ENOTTY = 25; /// Not a typewriter
26		pub const ETXTBSY = 26; /// Text file busy
27		pub const EFBIG = 27; /// File too large
28		pub const ENOSPC = 28; /// No space left on device
29		pub const ESPIPE = 29; /// Illegal seek
30		pub const EROFS = 30; /// Read-only file system
31		pub const EMLINK = 31; /// Too many links
32		pub const EPIPE = 32; /// Broken pipe
33		pub const EDOM = 33; /// Math argument out of domain of func
34		pub const ERANGE = 34; /// Math result not representable
35		pub const EDEADLK = 35; /// Resource deadlock would occur
36		pub const ENAMETOOLONG = 36; /// File name too long
37		pub const ENOLCK = 37; /// No record locks available
38		pub const ENOSYS = 38; /// Function not implemented
39		pub const ENOTEMPTY = 39; /// Directory not empty
40		pub const ELOOP = 40; /// Too many symbolic links encountered
41		pub const EWOULDBLOCK = EAGAIN; /// Operation would block
42		pub const ENOMSG = 42; /// No message of desired type
43		pub const EIDRM = 43; /// Identifier removed
44		pub const ECHRNG = 44; /// Channel number out of range
45		pub const EL2NSYNC = 45; /// Level 2 not synchronized
46		pub const EL3HLT = 46; /// Level 3 halted
47		pub const EL3RST = 47; /// Level 3 reset
48		pub const ELNRNG = 48; /// Link number out of range
49		pub const EUNATCH = 49; /// Protocol driver not attached
50		pub const ENOCSI = 50; /// No CSI structure available
51		pub const EL2HLT = 51; /// Level 2 halted
52		pub const EBADE = 52; /// Invalid exchange
53		pub const EBADR = 53; /// Invalid request descriptor
54		pub const EXFULL = 54; /// Exchange full
55		pub const ENOANO = 55; /// No anode
56		pub const EBADRQC = 56; /// Invalid request code
57		pub const EBADSLT = 57; /// Invalid slot
58
59		pub const EBFONT = 59; /// Bad font file format
60		pub const ENOSTR = 60; /// Device not a stream
61		pub const ENODATA = 61; /// No data available
62		pub const ETIME = 62; /// Timer expired
63		pub const ENOSR = 63; /// Out of streams resources
64		pub const ENONET = 64; /// Machine is not on the network
65		pub const ENOPKG = 65; /// Package not installed
66		pub const EREMOTE = 66; /// Object is remote
67		pub const ENOLINK = 67; /// Link has been severed
68		pub const EADV = 68; /// Advertise error
69		pub const ESRMNT = 69; /// Srmount error
70		pub const ECOMM = 70; /// Communication error on send
71		pub const EPROTO = 71; /// Protocol error
72		pub const EMULTIHOP = 72; /// Multihop attempted
73		pub const EDOTDOT = 73; /// RFS specific error
74		pub const EBADMSG = 74; /// Not a data message
75		pub const EOVERFLOW = 75; /// Value too large for defined data type
76		pub const ENOTUNIQ = 76; /// Name not unique on network
77		pub const EBADFD = 77; /// File descriptor in bad state
78		pub const EREMCHG = 78; /// Remote address changed
79		pub const ELIBACC = 79; /// Can not access a needed shared library
80		pub const ELIBBAD = 80; /// Accessing a corrupted shared library
81		pub const ELIBSCN = 81; /// .lib section in a.out corrupted
82		pub const ELIBMAX = 82; /// Attempting to link in too many shared libraries
83		pub const ELIBEXEC = 83; /// Cannot exec a shared library directly
84		pub const EILSEQ = 84; /// Illegal byte sequence
85		pub const ERESTART = 85; /// Interrupted system call should be restarted
86		pub const ESTRPIPE = 86; /// Streams pipe error
87		pub const EUSERS = 87; /// Too many users
88		pub const ENOTSOCK = 88; /// Socket operation on non-socket
89		pub const EDESTADDRREQ = 89; /// Destination address required
90		pub const EMSGSIZE = 90; /// Message too long
91		pub const EPROTOTYPE = 91; /// Protocol wrong type for socket
92		pub const ENOPROTOOPT = 92; /// Protocol not available
93		pub const EPROTONOSUPPORT = 93; /// Protocol not supported
94		pub const ESOCKTNOSUPPORT = 94; /// Socket type not supported
95		pub const EOPNOTSUPP = 95; /// Operation not supported on transport endpoint
96		pub const EPFNOSUPPORT = 96; /// Protocol family not supported
97		pub const EAFNOSUPPORT = 97; /// Address family not supported by protocol
98		pub const EADDRINUSE = 98; /// Address already in use
99		pub const EADDRNOTAVAIL = 99; /// Cannot assign requested address
100		pub const ENETDOWN = 100; /// Network is down
101		pub const ENETUNREACH = 101; /// Network is unreachable
102		pub const ENETRESET = 102; /// Network dropped connection because of reset
103		pub const ECONNABORTED = 103; /// Software caused connection abort
104		pub const ECONNRESET = 104; /// Connection reset by peer
105		pub const ENOBUFS = 105; /// No buffer space available
106		pub const EISCONN = 106; /// Transport endpoint is already connected
107		pub const ENOTCONN = 107; /// Transport endpoint is not connected
108		pub const ESHUTDOWN = 108; /// Cannot send after transport endpoint shutdown
109		pub const ETOOMANYREFS = 109; /// Too many references: cannot splice
110		pub const ETIMEDOUT = 110; /// Connection timed out
111		pub const ECONNREFUSED = 111; /// Connection refused
112		pub const EHOSTDOWN = 112; /// Host is down
113		pub const EHOSTUNREACH = 113; /// No route to host
114		pub const EALREADY = 114; /// Operation already in progress
115		pub const EINPROGRESS = 115; /// Operation now in progress
116		pub const ESTALE = 116; /// Stale NFS file handle
117		pub const EUCLEAN = 117; /// Structure needs cleaning
118		pub const ENOTNAM = 118; /// Not a XENIX named type file
119		pub const ENAVAIL = 119; /// No XENIX semaphores available
120		pub const EISNAM = 120; /// Is a named type file
121		pub const EREMOTEIO = 121; /// Remote I/O error
122		pub const EDQUOT = 122; /// Quota exceeded
123
124		pub const ENOMEDIUM = 123; /// No medium found
125		pub const EMEDIUMTYPE = 124; /// Wrong medium type
	1	/// Operation not permitted
	2	pub const EPERM = 1;
	3
	4	/// No such file or directory
	5	pub const ENOENT = 2;
	6
	7	/// No such process
	8	pub const ESRCH = 3;
	9
	10	/// Interrupted system call
	11	pub const EINTR = 4;
	12
	13	/// I/O error
	14	pub const EIO = 5;
	15
	16	/// No such device or address
	17	pub const ENXIO = 6;
	18
	19	/// Arg list too long
	20	pub const E2BIG = 7;
	21
	22	/// Exec format error
	23	pub const ENOEXEC = 8;
	24
	25	/// Bad file number
	26	pub const EBADF = 9;
	27
	28	/// No child processes
	29	pub const ECHILD = 10;
	30
	31	/// Try again
	32	pub const EAGAIN = 11;
	33
	34	/// Out of memory
	35	pub const ENOMEM = 12;
	36
	37	/// Permission denied
	38	pub const EACCES = 13;
	39
	40	/// Bad address
	41	pub const EFAULT = 14;
	42
	43	/// Block device required
	44	pub const ENOTBLK = 15;
	45
	46	/// Device or resource busy
	47	pub const EBUSY = 16;
	48
	49	/// File exists
	50	pub const EEXIST = 17;
	51
	52	/// Cross-device link
	53	pub const EXDEV = 18;
	54
	55	/// No such device
	56	pub const ENODEV = 19;
	57
	58	/// Not a directory
	59	pub const ENOTDIR = 20;
	60
	61	/// Is a directory
	62	pub const EISDIR = 21;
	63
	64	/// Invalid argument
	65	pub const EINVAL = 22;
	66
	67	/// File table overflow
	68	pub const ENFILE = 23;
	69
	70	/// Too many open files
	71	pub const EMFILE = 24;
	72
	73	/// Not a typewriter
	74	pub const ENOTTY = 25;
	75
	76	/// Text file busy
	77	pub const ETXTBSY = 26;
	78
	79	/// File too large
	80	pub const EFBIG = 27;
	81
	82	/// No space left on device
	83	pub const ENOSPC = 28;
	84
	85	/// Illegal seek
	86	pub const ESPIPE = 29;
	87
	88	/// Read-only file system
	89	pub const EROFS = 30;
	90
	91	/// Too many links
	92	pub const EMLINK = 31;
	93
	94	/// Broken pipe
	95	pub const EPIPE = 32;
	96
	97	/// Math argument out of domain of func
	98	pub const EDOM = 33;
	99
	100	/// Math result not representable
	101	pub const ERANGE = 34;
	102
	103	/// Resource deadlock would occur
	104	pub const EDEADLK = 35;
	105
	106	/// File name too long
	107	pub const ENAMETOOLONG = 36;
	108
	109	/// No record locks available
	110	pub const ENOLCK = 37;
	111
	112	/// Function not implemented
	113	pub const ENOSYS = 38;
	114
	115	/// Directory not empty
	116	pub const ENOTEMPTY = 39;
	117
	118	/// Too many symbolic links encountered
	119	pub const ELOOP = 40;
	120
	121	/// Operation would block
	122	pub const EWOULDBLOCK = EAGAIN;
	123
	124	/// No message of desired type
	125	pub const ENOMSG = 42;
	126
	127	/// Identifier removed
	128	pub const EIDRM = 43;
	129
	130	/// Channel number out of range
	131	pub const ECHRNG = 44;
	132
	133	/// Level 2 not synchronized
	134	pub const EL2NSYNC = 45;
	135
	136	/// Level 3 halted
	137	pub const EL3HLT = 46;
	138
	139	/// Level 3 reset
	140	pub const EL3RST = 47;
	141
	142	/// Link number out of range
	143	pub const ELNRNG = 48;
	144
	145	/// Protocol driver not attached
	146	pub const EUNATCH = 49;
	147
	148	/// No CSI structure available
	149	pub const ENOCSI = 50;
	150
	151	/// Level 2 halted
	152	pub const EL2HLT = 51;
	153
	154	/// Invalid exchange
	155	pub const EBADE = 52;
	156
	157	/// Invalid request descriptor
	158	pub const EBADR = 53;
	159
	160	/// Exchange full
	161	pub const EXFULL = 54;
	162
	163	/// No anode
	164	pub const ENOANO = 55;
	165
	166	/// Invalid request code
	167	pub const EBADRQC = 56;
	168
	169	/// Invalid slot
	170	pub const EBADSLT = 57;
	171
	172	/// Bad font file format
	173	pub const EBFONT = 59;
	174
	175	/// Device not a stream
	176	pub const ENOSTR = 60;
	177
	178	/// No data available
	179	pub const ENODATA = 61;
	180
	181	/// Timer expired
	182	pub const ETIME = 62;
	183
	184	/// Out of streams resources
	185	pub const ENOSR = 63;
	186
	187	/// Machine is not on the network
	188	pub const ENONET = 64;
	189
	190	/// Package not installed
	191	pub const ENOPKG = 65;
	192
	193	/// Object is remote
	194	pub const EREMOTE = 66;
	195
	196	/// Link has been severed
	197	pub const ENOLINK = 67;
	198
	199	/// Advertise error
	200	pub const EADV = 68;
	201
	202	/// Srmount error
	203	pub const ESRMNT = 69;
	204
	205	/// Communication error on send
	206	pub const ECOMM = 70;
	207
	208	/// Protocol error
	209	pub const EPROTO = 71;
	210
	211	/// Multihop attempted
	212	pub const EMULTIHOP = 72;
	213
	214	/// RFS specific error
	215	pub const EDOTDOT = 73;
	216
	217	/// Not a data message
	218	pub const EBADMSG = 74;
	219
	220	/// Value too large for defined data type
	221	pub const EOVERFLOW = 75;
	222
	223	/// Name not unique on network
	224	pub const ENOTUNIQ = 76;
	225
	226	/// File descriptor in bad state
	227	pub const EBADFD = 77;
	228
	229	/// Remote address changed
	230	pub const EREMCHG = 78;
	231
	232	/// Can not access a needed shared library
	233	pub const ELIBACC = 79;
	234
	235	/// Accessing a corrupted shared library
	236	pub const ELIBBAD = 80;
	237
	238	/// .lib section in a.out corrupted
	239	pub const ELIBSCN = 81;
	240
	241	/// Attempting to link in too many shared libraries
	242	pub const ELIBMAX = 82;
	243
	244	/// Cannot exec a shared library directly
	245	pub const ELIBEXEC = 83;
	246
	247	/// Illegal byte sequence
	248	pub const EILSEQ = 84;
	249
	250	/// Interrupted system call should be restarted
	251	pub const ERESTART = 85;
	252
	253	/// Streams pipe error
	254	pub const ESTRPIPE = 86;
	255
	256	/// Too many users
	257	pub const EUSERS = 87;
	258
	259	/// Socket operation on non-socket
	260	pub const ENOTSOCK = 88;
	261
	262	/// Destination address required
	263	pub const EDESTADDRREQ = 89;
	264
	265	/// Message too long
	266	pub const EMSGSIZE = 90;
	267
	268	/// Protocol wrong type for socket
	269	pub const EPROTOTYPE = 91;
	270
	271	/// Protocol not available
	272	pub const ENOPROTOOPT = 92;
	273
	274	/// Protocol not supported
	275	pub const EPROTONOSUPPORT = 93;
	276
	277	/// Socket type not supported
	278	pub const ESOCKTNOSUPPORT = 94;
	279
	280	/// Operation not supported on transport endpoint
	281	pub const EOPNOTSUPP = 95;
	282
	283	/// Protocol family not supported
	284	pub const EPFNOSUPPORT = 96;
	285
	286	/// Address family not supported by protocol
	287	pub const EAFNOSUPPORT = 97;
	288
	289	/// Address already in use
	290	pub const EADDRINUSE = 98;
	291
	292	/// Cannot assign requested address
	293	pub const EADDRNOTAVAIL = 99;
	294
	295	/// Network is down
	296	pub const ENETDOWN = 100;
	297
	298	/// Network is unreachable
	299	pub const ENETUNREACH = 101;
	300
	301	/// Network dropped connection because of reset
	302	pub const ENETRESET = 102;
	303
	304	/// Software caused connection abort
	305	pub const ECONNABORTED = 103;
	306
	307	/// Connection reset by peer
	308	pub const ECONNRESET = 104;
	309
	310	/// No buffer space available
	311	pub const ENOBUFS = 105;
	312
	313	/// Transport endpoint is already connected
	314	pub const EISCONN = 106;
	315
	316	/// Transport endpoint is not connected
	317	pub const ENOTCONN = 107;
	318
	319	/// Cannot send after transport endpoint shutdown
	320	pub const ESHUTDOWN = 108;
	321
	322	/// Too many references: cannot splice
	323	pub const ETOOMANYREFS = 109;
	324
	325	/// Connection timed out
	326	pub const ETIMEDOUT = 110;
	327
	328	/// Connection refused
	329	pub const ECONNREFUSED = 111;
	330
	331	/// Host is down
	332	pub const EHOSTDOWN = 112;
	333
	334	/// No route to host
	335	pub const EHOSTUNREACH = 113;
	336
	337	/// Operation already in progress
	338	pub const EALREADY = 114;
	339
	340	/// Operation now in progress
	341	pub const EINPROGRESS = 115;
	342
	343	/// Stale NFS file handle
	344	pub const ESTALE = 116;
	345
	346	/// Structure needs cleaning
	347	pub const EUCLEAN = 117;
	348
	349	/// Not a XENIX named type file
	350	pub const ENOTNAM = 118;
	351
	352	/// No XENIX semaphores available
	353	pub const ENAVAIL = 119;
	354
	355	/// Is a named type file
	356	pub const EISNAM = 120;
	357
	358	/// Remote I/O error
	359	pub const EREMOTEIO = 121;
	360
	361	/// Quota exceeded
	362	pub const EDQUOT = 122;
	363
	364	/// No medium found
	365	pub const ENOMEDIUM = 123;
	366
	367	/// Wrong medium type
	368	pub const EMEDIUMTYPE = 124;
126	369
127	370	// nameserver query return codes
128		pub const ENSROK = 0; /// DNS server returned answer with no data
129		pub const ENSRNODATA = 160; /// DNS server returned answer with no data
130		pub const ENSRFORMERR = 161; /// DNS server claims query was misformatted
131		pub const ENSRSERVFAIL = 162; /// DNS server returned general failure
132		pub const ENSRNOTFOUND = 163; /// Domain name not found
133		pub const ENSRNOTIMP = 164; /// DNS server does not implement requested operation
134		pub const ENSRREFUSED = 165; /// DNS server refused query
135		pub const ENSRBADQUERY = 166; /// Misformatted DNS query
136		pub const ENSRBADNAME = 167; /// Misformatted domain name
137		pub const ENSRBADFAMILY = 168; /// Unsupported address family
138		pub const ENSRBADRESP = 169; /// Misformatted DNS reply
139		pub const ENSRCONNREFUSED = 170; /// Could not contact DNS servers
140		pub const ENSRTIMEOUT = 171; /// Timeout while contacting DNS servers
141		pub const ENSROF = 172; /// End of file
142		pub const ENSRFILE = 173; /// Error reading file
143		pub const ENSRNOMEM = 174; /// Out of memory
144		pub const ENSRDESTRUCTION = 175; /// Application terminated lookup
145		pub const ENSRQUERYDOMAINTOOLONG = 176; /// Domain name is too long
146		pub const ENSRCNAMELOOP = 177; /// Domain name is too long
	371
	372	/// DNS server returned answer with no data
	373	pub const ENSROK = 0;
	374
	375	/// DNS server returned answer with no data
	376	pub const ENSRNODATA = 160;
	377
	378	/// DNS server claims query was misformatted
	379	pub const ENSRFORMERR = 161;
	380
	381	/// DNS server returned general failure
	382	pub const ENSRSERVFAIL = 162;
	383
	384	/// Domain name not found
	385	pub const ENSRNOTFOUND = 163;
	386
	387	/// DNS server does not implement requested operation
	388	pub const ENSRNOTIMP = 164;
	389
	390	/// DNS server refused query
	391	pub const ENSRREFUSED = 165;
	392
	393	/// Misformatted DNS query
	394	pub const ENSRBADQUERY = 166;
	395
	396	/// Misformatted domain name
	397	pub const ENSRBADNAME = 167;
	398
	399	/// Unsupported address family
	400	pub const ENSRBADFAMILY = 168;
	401
	402	/// Misformatted DNS reply
	403	pub const ENSRBADRESP = 169;
	404
	405	/// Could not contact DNS servers
	406	pub const ENSRCONNREFUSED = 170;
	407
	408	/// Timeout while contacting DNS servers
	409	pub const ENSRTIMEOUT = 171;
	410
	411	/// End of file
	412	pub const ENSROF = 172;
	413
	414	/// Error reading file
	415	pub const ENSRFILE = 173;
	416
	417	/// Out of memory
	418	pub const ENSRNOMEM = 174;
	419
	420	/// Application terminated lookup
	421	pub const ENSRDESTRUCTION = 175;
	422
	423	/// Domain name is too long
	424	pub const ENSRQUERYDOMAINTOOLONG = 176;
	425
	426	/// Domain name is too long
	427	pub const ENSRCNAMELOOP = 177;

std/os/linux/index.zig+187-189

...	...	@@ -30,96 +30,95 @@ pub const FUTEX_PRIVATE_FLAG = 128;
30	30
31	31	pub const FUTEX_CLOCK_REALTIME = 256;
32	32
33
34		pub const PROT_NONE = 0;
35		pub const PROT_READ = 1;
36		pub const PROT_WRITE = 2;
37		pub const PROT_EXEC = 4;
	33	pub const PROT_NONE = 0;
	34	pub const PROT_READ = 1;
	35	pub const PROT_WRITE = 2;
	36	pub const PROT_EXEC = 4;
38	37	pub const PROT_GROWSDOWN = 0x01000000;
39		pub const PROT_GROWSUP = 0x02000000;
40
41		pub const MAP_FAILED = @maxValue(usize);
42		pub const MAP_SHARED = 0x01;
43		pub const MAP_PRIVATE = 0x02;
44		pub const MAP_TYPE = 0x0f;
45		pub const MAP_FIXED = 0x10;
46		pub const MAP_ANONYMOUS = 0x20;
47		pub const MAP_NORESERVE = 0x4000;
48		pub const MAP_GROWSDOWN = 0x0100;
49		pub const MAP_DENYWRITE = 0x0800;
	38	pub const PROT_GROWSUP = 0x02000000;
	39
	40	pub const MAP_FAILED = @maxValue(usize);
	41	pub const MAP_SHARED = 0x01;
	42	pub const MAP_PRIVATE = 0x02;
	43	pub const MAP_TYPE = 0x0f;
	44	pub const MAP_FIXED = 0x10;
	45	pub const MAP_ANONYMOUS = 0x20;
	46	pub const MAP_NORESERVE = 0x4000;
	47	pub const MAP_GROWSDOWN = 0x0100;
	48	pub const MAP_DENYWRITE = 0x0800;
50	49	pub const MAP_EXECUTABLE = 0x1000;
51		pub const MAP_LOCKED = 0x2000;
52		pub const MAP_POPULATE = 0x8000;
53		pub const MAP_NONBLOCK = 0x10000;
54		pub const MAP_STACK = 0x20000;
55		pub const MAP_HUGETLB = 0x40000;
56		pub const MAP_FILE = 0;
	50	pub const MAP_LOCKED = 0x2000;
	51	pub const MAP_POPULATE = 0x8000;
	52	pub const MAP_NONBLOCK = 0x10000;
	53	pub const MAP_STACK = 0x20000;
	54	pub const MAP_HUGETLB = 0x40000;
	55	pub const MAP_FILE = 0;
57	56
58	57	pub const F_OK = 0;
59	58	pub const X_OK = 1;
60	59	pub const W_OK = 2;
61	60	pub const R_OK = 4;
62	61
63		pub const WNOHANG = 1;
64		pub const WUNTRACED = 2;
65		pub const WSTOPPED = 2;
66		pub const WEXITED = 4;
	62	pub const WNOHANG = 1;
	63	pub const WUNTRACED = 2;
	64	pub const WSTOPPED = 2;
	65	pub const WEXITED = 4;
67	66	pub const WCONTINUED = 8;
68		pub const WNOWAIT = 0x1000000;
69
70		pub const SA_NOCLDSTOP = 1;
71		pub const SA_NOCLDWAIT = 2;
72		pub const SA_SIGINFO = 4;
73		pub const SA_ONSTACK = 0x08000000;
74		pub const SA_RESTART = 0x10000000;
75		pub const SA_NODEFER = 0x40000000;
76		pub const SA_RESETHAND = 0x80000000;
77		pub const SA_RESTORER = 0x04000000;
78
79		pub const SIGHUP = 1;
80		pub const SIGINT = 2;
81		pub const SIGQUIT = 3;
82		pub const SIGILL = 4;
83		pub const SIGTRAP = 5;
84		pub const SIGABRT = 6;
85		pub const SIGIOT = SIGABRT;
86		pub const SIGBUS = 7;
87		pub const SIGFPE = 8;
88		pub const SIGKILL = 9;
89		pub const SIGUSR1 = 10;
90		pub const SIGSEGV = 11;
91		pub const SIGUSR2 = 12;
92		pub const SIGPIPE = 13;
93		pub const SIGALRM = 14;
94		pub const SIGTERM = 15;
	67	pub const WNOWAIT = 0x1000000;
	68
	69	pub const SA_NOCLDSTOP = 1;
	70	pub const SA_NOCLDWAIT = 2;
	71	pub const SA_SIGINFO = 4;
	72	pub const SA_ONSTACK = 0x08000000;
	73	pub const SA_RESTART = 0x10000000;
	74	pub const SA_NODEFER = 0x40000000;
	75	pub const SA_RESETHAND = 0x80000000;
	76	pub const SA_RESTORER = 0x04000000;
	77
	78	pub const SIGHUP = 1;
	79	pub const SIGINT = 2;
	80	pub const SIGQUIT = 3;
	81	pub const SIGILL = 4;
	82	pub const SIGTRAP = 5;
	83	pub const SIGABRT = 6;
	84	pub const SIGIOT = SIGABRT;
	85	pub const SIGBUS = 7;
	86	pub const SIGFPE = 8;
	87	pub const SIGKILL = 9;
	88	pub const SIGUSR1 = 10;
	89	pub const SIGSEGV = 11;
	90	pub const SIGUSR2 = 12;
	91	pub const SIGPIPE = 13;
	92	pub const SIGALRM = 14;
	93	pub const SIGTERM = 15;
95	94	pub const SIGSTKFLT = 16;
96		pub const SIGCHLD = 17;
97		pub const SIGCONT = 18;
98		pub const SIGSTOP = 19;
99		pub const SIGTSTP = 20;
100		pub const SIGTTIN = 21;
101		pub const SIGTTOU = 22;
102		pub const SIGURG = 23;
103		pub const SIGXCPU = 24;
104		pub const SIGXFSZ = 25;
	95	pub const SIGCHLD = 17;
	96	pub const SIGCONT = 18;
	97	pub const SIGSTOP = 19;
	98	pub const SIGTSTP = 20;
	99	pub const SIGTTIN = 21;
	100	pub const SIGTTOU = 22;
	101	pub const SIGURG = 23;
	102	pub const SIGXCPU = 24;
	103	pub const SIGXFSZ = 25;
105	104	pub const SIGVTALRM = 26;
106		pub const SIGPROF = 27;
107		pub const SIGWINCH = 28;
108		pub const SIGIO = 29;
109		pub const SIGPOLL = 29;
110		pub const SIGPWR = 30;
111		pub const SIGSYS = 31;
	105	pub const SIGPROF = 27;
	106	pub const SIGWINCH = 28;
	107	pub const SIGIO = 29;
	108	pub const SIGPOLL = 29;
	109	pub const SIGPWR = 30;
	110	pub const SIGSYS = 31;
112	111	pub const SIGUNUSED = SIGSYS;
113	112
114	113	pub const O_RDONLY = 0o0;
115	114	pub const O_WRONLY = 0o1;
116		pub const O_RDWR = 0o2;
	115	pub const O_RDWR = 0o2;
117	116
118	117	pub const SEEK_SET = 0;
119	118	pub const SEEK_CUR = 1;
120	119	pub const SEEK_END = 2;
121	120
122		pub const SIG_BLOCK = 0;
	121	pub const SIG_BLOCK = 0;
123	122	pub const SIG_UNBLOCK = 1;
124	123	pub const SIG_SETMASK = 2;
125	124
...	...	@@ -408,7 +407,6 @@ pub const DT_LNK = 10;
408	407	pub const DT_SOCK = 12;
409	408	pub const DT_WHT = 14;
410	409
411
412	410	pub const TCGETS = 0x5401;
413	411	pub const TCSETS = 0x5402;
414	412	pub const TCSETSW = 0x5403;
...	...	@@ -539,23 +537,23 @@ pub const MS_BIND = 4096;
539	537	pub const MS_MOVE = 8192;
540	538	pub const MS_REC = 16384;
541	539	pub const MS_SILENT = 32768;
542		pub const MS_POSIXACL = (1<<16);
543		pub const MS_UNBINDABLE = (1<<17);
544		pub const MS_PRIVATE = (1<<18);
545		pub const MS_SLAVE = (1<<19);
546		pub const MS_SHARED = (1<<20);
547		pub const MS_RELATIME = (1<<21);
548		pub const MS_KERNMOUNT = (1<<22);
549		pub const MS_I_VERSION = (1<<23);
550		pub const MS_STRICTATIME = (1<<24);
551		pub const MS_LAZYTIME = (1<<25);
552		pub const MS_NOREMOTELOCK = (1<<27);
553		pub const MS_NOSEC = (1<<28);
554		pub const MS_BORN = (1<<29);
555		pub const MS_ACTIVE = (1<<30);
556		pub const MS_NOUSER = (1<<31);
557
558		pub const MS_RMT_MASK = (MS_RDONLY\|MS_SYNCHRONOUS\|MS_MANDLOCK\|MS_I_VERSION\|MS_LAZYTIME);
	540	pub const MS_POSIXACL = (1 << 16);
	541	pub const MS_UNBINDABLE = (1 << 17);
	542	pub const MS_PRIVATE = (1 << 18);
	543	pub const MS_SLAVE = (1 << 19);
	544	pub const MS_SHARED = (1 << 20);
	545	pub const MS_RELATIME = (1 << 21);
	546	pub const MS_KERNMOUNT = (1 << 22);
	547	pub const MS_I_VERSION = (1 << 23);
	548	pub const MS_STRICTATIME = (1 << 24);
	549	pub const MS_LAZYTIME = (1 << 25);
	550	pub const MS_NOREMOTELOCK = (1 << 27);
	551	pub const MS_NOSEC = (1 << 28);
	552	pub const MS_BORN = (1 << 29);
	553	pub const MS_ACTIVE = (1 << 30);
	554	pub const MS_NOUSER = (1 << 31);
	555
	556	pub const MS_RMT_MASK = (MS_RDONLY \| MS_SYNCHRONOUS \| MS_MANDLOCK \| MS_I_VERSION \| MS_LAZYTIME);
559	557
560	558	pub const MS_MGC_VAL = 0xc0ed0000;
561	559	pub const MS_MGC_MSK = 0xffff0000;
...	...	@@ -565,7 +563,6 @@ pub const MNT_DETACH = 2;
565	563	pub const MNT_EXPIRE = 4;
566	564	pub const UMOUNT_NOFOLLOW = 8;
567	565
568
569	566	pub const S_IFMT = 0o170000;
570	567
571	568	pub const S_IFDIR = 0o040000;
...	...	@@ -626,15 +623,30 @@ pub const TFD_CLOEXEC = O_CLOEXEC;
626	623	pub const TFD_TIMER_ABSTIME = 1;
627	624	pub const TFD_TIMER_CANCEL_ON_SET = (1 << 1);
628	625
629		fn unsigned(s: i32) u32 { return @bitCast(u32, s); }
630		fn signed(s: u32) i32 { return @bitCast(i32, s); }
631		pub fn WEXITSTATUS(s: i32) i32 { return signed((unsigned(s) & 0xff00) >> 8); }
632		pub fn WTERMSIG(s: i32) i32 { return signed(unsigned(s) & 0x7f); }
633		pub fn WSTOPSIG(s: i32) i32 { return WEXITSTATUS(s); }
634		pub fn WIFEXITED(s: i32) bool { return WTERMSIG(s) == 0; }
635		pub fn WIFSTOPPED(s: i32) bool { return (u16)(((unsigned(s)&0xffff)*%0x10001)>>8) > 0x7f00; }
636		pub fn WIFSIGNALED(s: i32) bool { return (unsigned(s)&0xffff)-%1 < 0xff; }
637
	626	fn unsigned(s: i32) u32 {
	627	return @bitCast(u32, s);
	628	}
	629	fn signed(s: u32) i32 {
	630	return @bitCast(i32, s);
	631	}
	632	pub fn WEXITSTATUS(s: i32) i32 {
	633	return signed((unsigned(s) & 0xff00) >> 8);
	634	}
	635	pub fn WTERMSIG(s: i32) i32 {
	636	return signed(unsigned(s) & 0x7f);
	637	}
	638	pub fn WSTOPSIG(s: i32) i32 {
	639	return WEXITSTATUS(s);
	640	}
	641	pub fn WIFEXITED(s: i32) bool {
	642	return WTERMSIG(s) == 0;
	643	}
	644	pub fn WIFSTOPPED(s: i32) bool {
	645	return (u16)(((unsigned(s) & 0xffff) *% 0x10001) >> 8) > 0x7f00;
	646	}
	647	pub fn WIFSIGNALED(s: i32) bool {
	648	return (unsigned(s) & 0xffff) -% 1 < 0xff;
	649	}
638	650
639	651	pub const winsize = extern struct {
640	652	ws_row: u16,
...	...	@@ -707,8 +719,7 @@ pub fn umount2(special: &const u8, flags: u32) usize {
707	719	}
708	720
709	721	pub fn mmap(address: ?&u8, length: usize, prot: usize, flags: u32, fd: i32, offset: isize) usize {
710		return syscall6(SYS_mmap, @ptrToInt(address), length, prot, flags, usize(fd),
711		@bitCast(usize, offset));
	722	return syscall6(SYS_mmap, @ptrToInt(address), length, prot, flags, usize(fd), @bitCast(usize, offset));
712	723	}
713	724
714	725	pub fn munmap(address: usize, length: usize) usize {
...	...	@@ -823,8 +834,7 @@ var vdso_clock_gettime = init_vdso_clock_gettime;
823	834	extern fn init_vdso_clock_gettime(clk: i32, ts: &timespec) usize {
824	835	const addr = vdso.lookup(VDSO_CGT_VER, VDSO_CGT_SYM);
825	836	var f = @intToPtr(@typeOf(init_vdso_clock_gettime), addr);
826		_ = @cmpxchgStrong(@typeOf(init_vdso_clock_gettime), &vdso_clock_gettime, init_vdso_clock_gettime, f,
827		builtin.AtomicOrder.Monotonic, builtin.AtomicOrder.Monotonic);
	837	_ = @cmpxchgStrong(@typeOf(init_vdso_clock_gettime), &vdso_clock_gettime, init_vdso_clock_gettime, f, builtin.AtomicOrder.Monotonic, builtin.AtomicOrder.Monotonic);
828	838	if (@ptrToInt(f) == 0) return @bitCast(usize, isize(-ENOSYS));
829	839	return f(clk, ts);
830	840	}
...	...	@@ -918,18 +928,18 @@ pub fn getpid() i32 {
918	928	}
919	929
920	930	pub fn sigprocmask(flags: u32, noalias set: &const sigset_t, noalias oldset: ?&sigset_t) usize {
921		return syscall4(SYS_rt_sigprocmask, flags, @ptrToInt(set), @ptrToInt(oldset), NSIG/8);
	931	return syscall4(SYS_rt_sigprocmask, flags, @ptrToInt(set), @ptrToInt(oldset), NSIG / 8);
922	932	}
923	933
924	934	pub fn sigaction(sig: u6, noalias act: &const Sigaction, noalias oact: ?&Sigaction) usize {
925	935	assert(sig >= 1);
926	936	assert(sig != SIGKILL);
927	937	assert(sig != SIGSTOP);
928		var ksa = k_sigaction {
	938	var ksa = k_sigaction{
929	939	.handler = act.handler,
930	940	.flags = act.flags \| SA_RESTORER,
931	941	.mask = undefined,
932		.restorer = @ptrCast(extern fn()void, restore_rt),
	942	.restorer = @ptrCast(extern fn() void, restore_rt),
933	943	};
934	944	var ksa_old: k_sigaction = undefined;
935	945	@memcpy(@ptrCast(&u8, &ksa.mask), @ptrCast(&const u8, &act.mask), 8);
...	...	@@ -952,22 +962,22 @@ const all_mask = []usize{@maxValue(usize)};
952	962	const app_mask = []usize{0xfffffffc7fffffff};
953	963
954	964	const k_sigaction = extern struct {
955		handler: extern fn(i32)void,
	965	handler: extern fn(i32) void,
956	966	flags: usize,
957		restorer: extern fn()void,
	967	restorer: extern fn() void,
958	968	mask: [2]u32,
959	969	};
960	970
961	971	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
962	972	pub const Sigaction = struct {
963		handler: extern fn(i32)void,
	973	handler: extern fn(i32) void,
964	974	mask: sigset_t,
965	975	flags: u32,
966	976	};
967	977
968		pub const SIG_ERR = @intToPtr(extern fn(i32)void, @maxValue(usize));
969		pub const SIG_DFL = @intToPtr(extern fn(i32)void, 0);
970		pub const SIG_IGN = @intToPtr(extern fn(i32)void, 1);
	978	pub const SIG_ERR = @intToPtr(extern fn(i32) void, @maxValue(usize));
	979	pub const SIG_DFL = @intToPtr(extern fn(i32) void, 0);
	980	pub const SIG_IGN = @intToPtr(extern fn(i32) void, 1);
971	981	pub const empty_sigset = []usize{0} ** sigset_t.len;
972	982
973	983	pub fn raise(sig: i32) usize {
...	...	@@ -980,25 +990,25 @@ pub fn raise(sig: i32) usize {
980	990	}
981	991
982	992	fn blockAllSignals(set: &sigset_t) void {
983		_ = syscall4(SYS_rt_sigprocmask, SIG_BLOCK, @ptrToInt(&all_mask), @ptrToInt(set), NSIG/8);
	993	_ = syscall4(SYS_rt_sigprocmask, SIG_BLOCK, @ptrToInt(&all_mask), @ptrToInt(set), NSIG / 8);
984	994	}
985	995
986	996	fn blockAppSignals(set: &sigset_t) void {
987		_ = syscall4(SYS_rt_sigprocmask, SIG_BLOCK, @ptrToInt(&app_mask), @ptrToInt(set), NSIG/8);
	997	_ = syscall4(SYS_rt_sigprocmask, SIG_BLOCK, @ptrToInt(&app_mask), @ptrToInt(set), NSIG / 8);
988	998	}
989	999
990	1000	fn restoreSignals(set: &sigset_t) void {
991		_ = syscall4(SYS_rt_sigprocmask, SIG_SETMASK, @ptrToInt(set), 0, NSIG/8);
	1001	_ = syscall4(SYS_rt_sigprocmask, SIG_SETMASK, @ptrToInt(set), 0, NSIG / 8);
992	1002	}
993	1003
994	1004	pub fn sigaddset(set: &sigset_t, sig: u6) void {
995	1005	const s = sig - 1;
996		(*set)[usize(s) / usize.bit_count] \|= usize(1) << (s & (usize.bit_count - 1));
	1006	(set.*)[usize(s) / usize.bit_count] \|= usize(1) << (s & (usize.bit_count - 1));
997	1007	}
998	1008
999	1009	pub fn sigismember(set: &const sigset_t, sig: u6) bool {
1000	1010	const s = sig - 1;
1001		return ((*set)[usize(s) / usize.bit_count] & (usize(1) << (s & (usize.bit_count - 1)))) != 0;
	1011	return ((set.*)[usize(s) / usize.bit_count] & (usize(1) << (s & (usize.bit_count - 1)))) != 0;
1002	1012	}
1003	1013
1004	1014	pub const in_port_t = u16;
...	...	@@ -1062,9 +1072,7 @@ pub fn recvmsg(fd: i32, msg: &msghdr, flags: u32) usize {
1062	1072	return syscall3(SYS_recvmsg, usize(fd), @ptrToInt(msg), flags);
1063	1073	}
1064	1074
1065		pub fn recvfrom(fd: i32, noalias buf: &u8, len: usize, flags: u32,
1066		noalias addr: ?&sockaddr, noalias alen: ?&socklen_t) usize
1067		{
	1075	pub fn recvfrom(fd: i32, noalias buf: &u8, len: usize, flags: u32, noalias addr: ?&sockaddr, noalias alen: ?&socklen_t) usize {
1068	1076	return syscall6(SYS_recvfrom, usize(fd), @ptrToInt(buf), len, flags, @ptrToInt(addr), @ptrToInt(alen));
1069	1077	}
1070	1078
...	...	@@ -1132,25 +1140,16 @@ pub fn fgetxattr(fd: usize, name: &const u8, value: &void, size: usize) usize {
1132	1140	return syscall4(SYS_lgetxattr, fd, @ptrToInt(name), @ptrToInt(value), size);
1133	1141	}
1134	1142
1135		pub fn setxattr(path: &const u8, name: &const u8, value: &const void,
1136		size: usize, flags: usize) usize {
1137
1138		return syscall5(SYS_setxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value),
1139		size, flags);
	1143	pub fn setxattr(path: &const u8, name: &const u8, value: &const void, size: usize, flags: usize) usize {
	1144	return syscall5(SYS_setxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
1140	1145	}
1141	1146
1142		pub fn lsetxattr(path: &const u8, name: &const u8, value: &const void,
1143		size: usize, flags: usize) usize {
1144
1145		return syscall5(SYS_lsetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value),
1146		size, flags);
	1147	pub fn lsetxattr(path: &const u8, name: &const u8, value: &const void, size: usize, flags: usize) usize {
	1148	return syscall5(SYS_lsetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
1147	1149	}
1148	1150
1149		pub fn fsetxattr(fd: usize, name: &const u8, value: &const void,
1150		size: usize, flags: usize) usize {
1151
1152		return syscall5(SYS_fsetxattr, fd, @ptrToInt(name), @ptrToInt(value),
1153		size, flags);
	1151	pub fn fsetxattr(fd: usize, name: &const u8, value: &const void, size: usize, flags: usize) usize {
	1152	return syscall5(SYS_fsetxattr, fd, @ptrToInt(name), @ptrToInt(value), size, flags);
1154	1153	}
1155	1154
1156	1155	pub fn removexattr(path: &const u8, name: &const u8) usize {
...	...	@@ -1199,7 +1198,7 @@ pub fn timerfd_create(clockid: i32, flags: u32) usize {
1199	1198
1200	1199	pub const itimerspec = extern struct {
1201	1200	it_interval: timespec,
1202		it_value: timespec
	1201	it_value: timespec,
1203	1202	};
1204	1203
1205	1204	pub fn timerfd_gettime(fd: i32, curr_value: &itimerspec) usize {
...	...	@@ -1211,30 +1210,30 @@ pub fn timerfd_settime(fd: i32, flags: u32, new_value: &const itimerspec, old_va
1211	1210	}
1212	1211
1213	1212	pub const _LINUX_CAPABILITY_VERSION_1 = 0x19980330;
1214		pub const _LINUX_CAPABILITY_U32S_1 = 1;
	1213	pub const _LINUX_CAPABILITY_U32S_1 = 1;
1215	1214
1216	1215	pub const _LINUX_CAPABILITY_VERSION_2 = 0x20071026;
1217		pub const _LINUX_CAPABILITY_U32S_2 = 2;
	1216	pub const _LINUX_CAPABILITY_U32S_2 = 2;
1218	1217
1219	1218	pub const _LINUX_CAPABILITY_VERSION_3 = 0x20080522;
1220		pub const _LINUX_CAPABILITY_U32S_3 = 2;
	1219	pub const _LINUX_CAPABILITY_U32S_3 = 2;
1221	1220
1222		pub const VFS_CAP_REVISION_MASK = 0xFF000000;
1223		pub const VFS_CAP_REVISION_SHIFT = 24;
1224		pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
	1221	pub const VFS_CAP_REVISION_MASK = 0xFF000000;
	1222	pub const VFS_CAP_REVISION_SHIFT = 24;
	1223	pub const VFS_CAP_FLAGS_MASK = ~VFS_CAP_REVISION_MASK;
1225	1224	pub const VFS_CAP_FLAGS_EFFECTIVE = 0x000001;
1226	1225
1227	1226	pub const VFS_CAP_REVISION_1 = 0x01000000;
1228		pub const VFS_CAP_U32_1 = 1;
1229		pub const XATTR_CAPS_SZ_1 = @sizeOf(u32)(1 + 2VFS_CAP_U32_1);
	1227	pub const VFS_CAP_U32_1 = 1;
	1228	pub const XATTR_CAPS_SZ_1 = @sizeOf(u32) * (1 + 2 * VFS_CAP_U32_1);
1230	1229
1231	1230	pub const VFS_CAP_REVISION_2 = 0x02000000;
1232		pub const VFS_CAP_U32_2 = 2;
1233		pub const XATTR_CAPS_SZ_2 = @sizeOf(u32)(1 + 2VFS_CAP_U32_2);
	1231	pub const VFS_CAP_U32_2 = 2;
	1232	pub const XATTR_CAPS_SZ_2 = @sizeOf(u32) * (1 + 2 * VFS_CAP_U32_2);
1234	1233
1235		pub const XATTR_CAPS_SZ = XATTR_CAPS_SZ_2;
1236		pub const VFS_CAP_U32 = VFS_CAP_U32_2;
1237		pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
	1234	pub const XATTR_CAPS_SZ = XATTR_CAPS_SZ_2;
	1235	pub const VFS_CAP_U32 = VFS_CAP_U32_2;
	1236	pub const VFS_CAP_REVISION = VFS_CAP_REVISION_2;
1238	1237
1239	1238	pub const vfs_cap_data = extern struct {
1240	1239	//all of these are mandated as little endian
...	...	@@ -1245,49 +1244,48 @@ pub const vfs_cap_data = extern struct {
1245	1244	};
1246	1245
1247	1246	magic_etc: u32,
1248		data: [VFS_CAP_U32]Data,
	1247	data: [VFS_CAP_U32]Data,
1249	1248	};
1250	1249
1251
1252		pub const CAP_CHOWN = 0;
1253		pub const CAP_DAC_OVERRIDE = 1;
1254		pub const CAP_DAC_READ_SEARCH = 2;
1255		pub const CAP_FOWNER = 3;
1256		pub const CAP_FSETID = 4;
1257		pub const CAP_KILL = 5;
1258		pub const CAP_SETGID = 6;
1259		pub const CAP_SETUID = 7;
1260		pub const CAP_SETPCAP = 8;
1261		pub const CAP_LINUX_IMMUTABLE = 9;
1262		pub const CAP_NET_BIND_SERVICE = 10;
1263		pub const CAP_NET_BROADCAST = 11;
1264		pub const CAP_NET_ADMIN = 12;
1265		pub const CAP_NET_RAW = 13;
1266		pub const CAP_IPC_LOCK = 14;
1267		pub const CAP_IPC_OWNER = 15;
1268		pub const CAP_SYS_MODULE = 16;
1269		pub const CAP_SYS_RAWIO = 17;
1270		pub const CAP_SYS_CHROOT = 18;
1271		pub const CAP_SYS_PTRACE = 19;
1272		pub const CAP_SYS_PACCT = 20;
1273		pub const CAP_SYS_ADMIN = 21;
1274		pub const CAP_SYS_BOOT = 22;
1275		pub const CAP_SYS_NICE = 23;
1276		pub const CAP_SYS_RESOURCE = 24;
1277		pub const CAP_SYS_TIME = 25;
1278		pub const CAP_SYS_TTY_CONFIG = 26;
1279		pub const CAP_MKNOD = 27;
1280		pub const CAP_LEASE = 28;
1281		pub const CAP_AUDIT_WRITE = 29;
1282		pub const CAP_AUDIT_CONTROL = 30;
1283		pub const CAP_SETFCAP = 31;
1284		pub const CAP_MAC_OVERRIDE = 32;
1285		pub const CAP_MAC_ADMIN = 33;
1286		pub const CAP_SYSLOG = 34;
1287		pub const CAP_WAKE_ALARM = 35;
1288		pub const CAP_BLOCK_SUSPEND = 36;
1289		pub const CAP_AUDIT_READ = 37;
1290		pub const CAP_LAST_CAP = CAP_AUDIT_READ;
	1250	pub const CAP_CHOWN = 0;
	1251	pub const CAP_DAC_OVERRIDE = 1;
	1252	pub const CAP_DAC_READ_SEARCH = 2;
	1253	pub const CAP_FOWNER = 3;
	1254	pub const CAP_FSETID = 4;
	1255	pub const CAP_KILL = 5;
	1256	pub const CAP_SETGID = 6;
	1257	pub const CAP_SETUID = 7;
	1258	pub const CAP_SETPCAP = 8;
	1259	pub const CAP_LINUX_IMMUTABLE = 9;
	1260	pub const CAP_NET_BIND_SERVICE = 10;
	1261	pub const CAP_NET_BROADCAST = 11;
	1262	pub const CAP_NET_ADMIN = 12;
	1263	pub const CAP_NET_RAW = 13;
	1264	pub const CAP_IPC_LOCK = 14;
	1265	pub const CAP_IPC_OWNER = 15;
	1266	pub const CAP_SYS_MODULE = 16;
	1267	pub const CAP_SYS_RAWIO = 17;
	1268	pub const CAP_SYS_CHROOT = 18;
	1269	pub const CAP_SYS_PTRACE = 19;
	1270	pub const CAP_SYS_PACCT = 20;
	1271	pub const CAP_SYS_ADMIN = 21;
	1272	pub const CAP_SYS_BOOT = 22;
	1273	pub const CAP_SYS_NICE = 23;
	1274	pub const CAP_SYS_RESOURCE = 24;
	1275	pub const CAP_SYS_TIME = 25;
	1276	pub const CAP_SYS_TTY_CONFIG = 26;
	1277	pub const CAP_MKNOD = 27;
	1278	pub const CAP_LEASE = 28;
	1279	pub const CAP_AUDIT_WRITE = 29;
	1280	pub const CAP_AUDIT_CONTROL = 30;
	1281	pub const CAP_SETFCAP = 31;
	1282	pub const CAP_MAC_OVERRIDE = 32;
	1283	pub const CAP_MAC_ADMIN = 33;
	1284	pub const CAP_SYSLOG = 34;
	1285	pub const CAP_WAKE_ALARM = 35;
	1286	pub const CAP_BLOCK_SUSPEND = 36;
	1287	pub const CAP_AUDIT_READ = 37;
	1288	pub const CAP_LAST_CAP = CAP_AUDIT_READ;
1291	1289
1292	1290	pub fn cap_valid(u8: x) bool {
1293	1291	return x >= 0 and x <= CAP_LAST_CAP;

std/os/linux/test.zig+6-6

...	...	@@ -11,22 +11,22 @@ test "timer" {
11	11	const timer_fd = linux.timerfd_create(linux.CLOCK_MONOTONIC, 0);
12	12	assert(linux.getErrno(timer_fd) == 0);
13	13
14		const time_interval = linux.timespec {
	14	const time_interval = linux.timespec{
15	15	.tv_sec = 0,
16		.tv_nsec = 2000000
	16	.tv_nsec = 2000000,
17	17	};
18	18
19		const new_time = linux.itimerspec {
	19	const new_time = linux.itimerspec{
20	20	.it_interval = time_interval,
21		.it_value = time_interval
	21	.it_value = time_interval,
22	22	};
23	23
24	24	err = linux.timerfd_settime(i32(timer_fd), 0, &new_time, null);
25	25	assert(err == 0);
26	26
27		var event = linux.epoll_event {
	27	var event = linux.epoll_event{
28	28	.events = linux.EPOLLIN \| linux.EPOLLOUT \| linux.EPOLLET,
29		.data = linux.epoll_data { .ptr = 0 },
	29	.data = linux.epoll_data{ .ptr = 0 },
30	30	};
31	31
32	32	err = linux.epoll_ctl(i32(epoll_fd), linux.EPOLL_CTL_ADD, i32(timer_fd), &event);

std/os/linux/vdso.zig+11-9

...	...	@@ -16,7 +16,10 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
16	16	var base: usize = @maxValue(usize);
17	17	{
18	18	var i: usize = 0;
19		while (i < eh.e_phnum) : ({i += 1; ph_addr += eh.e_phentsize;}) {
	19	while (i < eh.e_phnum) : ({
	20	i += 1;
	21	ph_addr += eh.e_phentsize;
	22	}) {
20	23	const this_ph = @intToPtr(&elf.Phdr, ph_addr);
21	24	switch (this_ph.p_type) {
22	25	elf.PT_LOAD => base = vdso_addr + this_ph.p_offset - this_ph.p_vaddr,
...	...	@@ -54,15 +57,14 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
54	57	const hashtab = maybe_hashtab ?? return 0;
55	58	if (maybe_verdef == null) maybe_versym = null;
56	59
57
58		const OK_TYPES = (1<<elf.STT_NOTYPE \| 1<<elf.STT_OBJECT \| 1<<elf.STT_FUNC \| 1<<elf.STT_COMMON);
59		const OK_BINDS = (1<<elf.STB_GLOBAL \| 1<<elf.STB_WEAK \| 1<<elf.STB_GNU_UNIQUE);
	60	const OK_TYPES = (1 << elf.STT_NOTYPE \| 1 << elf.STT_OBJECT \| 1 << elf.STT_FUNC \| 1 << elf.STT_COMMON);
	61	const OK_BINDS = (1 << elf.STB_GLOBAL \| 1 << elf.STB_WEAK \| 1 << elf.STB_GNU_UNIQUE);
60	62
61	63	var i: usize = 0;
62	64	while (i < hashtab[1]) : (i += 1) {
63		if (0==(u32(1)<<u5(syms[i].st_info&0xf) & OK_TYPES)) continue;
64		if (0==(u32(1)<<u5(syms[i].st_info>>4) & OK_BINDS)) continue;
65		if (0==syms[i].st_shndx) continue;
	65	if (0 == (u32(1) << u5(syms[i].st_info & 0xf) & OK_TYPES)) continue;
	66	if (0 == (u32(1) << u5(syms[i].st_info >> 4) & OK_BINDS)) continue;
	67	if (0 == syms[i].st_shndx) continue;
66	68	if (!mem.eql(u8, name, cstr.toSliceConst(&strings[syms[i].st_name]))) continue;
67	69	if (maybe_versym) \|versym\| {
68	70	if (!checkver(??maybe_verdef, versym[i], vername, strings))
...	...	@@ -78,12 +80,12 @@ fn checkver(def_arg: &elf.Verdef, vsym_arg: i32, vername: []const u8, strings: &
78	80	var def = def_arg;
79	81	const vsym = @bitCast(u32, vsym_arg) & 0x7fff;
80	82	while (true) {
81		if (0==(def.vd_flags & elf.VER_FLG_BASE) and (def.vd_ndx & 0x7fff) == vsym)
	83	if (0 == (def.vd_flags & elf.VER_FLG_BASE) and (def.vd_ndx & 0x7fff) == vsym)
82	84	break;
83	85	if (def.vd_next == 0)
84	86	return false;
85	87	def = @intToPtr(&elf.Verdef, @ptrToInt(def) + def.vd_next);
86	88	}
87		const aux = @intToPtr(&elf.Verdaux, @ptrToInt(def ) + def.vd_aux);
	89	const aux = @intToPtr(&elf.Verdaux, @ptrToInt(def) + def.vd_aux);
88	90	return mem.eql(u8, vername, cstr.toSliceConst(&strings[aux.vda_name]));
89	91	}

std/os/linux/x86_64.zig+63-51

...	...	@@ -330,26 +330,26 @@ pub const SYS_userfaultfd = 323;
330	330	pub const SYS_membarrier = 324;
331	331	pub const SYS_mlock2 = 325;
332	332
333		pub const O_CREAT = 0o100;
334		pub const O_EXCL = 0o200;
335		pub const O_NOCTTY = 0o400;
336		pub const O_TRUNC = 0o1000;
337		pub const O_APPEND = 0o2000;
338		pub const O_NONBLOCK = 0o4000;
339		pub const O_DSYNC = 0o10000;
340		pub const O_SYNC = 0o4010000;
341		pub const O_RSYNC = 0o4010000;
	333	pub const O_CREAT = 0o100;
	334	pub const O_EXCL = 0o200;
	335	pub const O_NOCTTY = 0o400;
	336	pub const O_TRUNC = 0o1000;
	337	pub const O_APPEND = 0o2000;
	338	pub const O_NONBLOCK = 0o4000;
	339	pub const O_DSYNC = 0o10000;
	340	pub const O_SYNC = 0o4010000;
	341	pub const O_RSYNC = 0o4010000;
342	342	pub const O_DIRECTORY = 0o200000;
343		pub const O_NOFOLLOW = 0o400000;
344		pub const O_CLOEXEC = 0o2000000;
	343	pub const O_NOFOLLOW = 0o400000;
	344	pub const O_CLOEXEC = 0o2000000;
345	345
346		pub const O_ASYNC = 0o20000;
347		pub const O_DIRECT = 0o40000;
348		pub const O_LARGEFILE = 0;
349		pub const O_NOATIME = 0o1000000;
350		pub const O_PATH = 0o10000000;
	346	pub const O_ASYNC = 0o20000;
	347	pub const O_DIRECT = 0o40000;
	348	pub const O_LARGEFILE = 0;
	349	pub const O_NOATIME = 0o1000000;
	350	pub const O_PATH = 0o10000000;
351	351	pub const O_TMPFILE = 0o20200000;
352		pub const O_NDELAY = O_NONBLOCK;
	352	pub const O_NDELAY = O_NONBLOCK;
353	353
354	354	pub const F_DUPFD = 0;
355	355	pub const F_GETFD = 1;
...	...	@@ -371,7 +371,6 @@ pub const F_GETOWN_EX = 16;
371	371
372	372	pub const F_GETOWNER_UIDS = 17;
373	373
374
375	374	pub const VDSO_USEFUL = true;
376	375	pub const VDSO_CGT_SYM = "__vdso_clock_gettime";
377	376	pub const VDSO_CGT_VER = "LINUX_2.6";
...	...	@@ -382,72 +381,85 @@ pub fn syscall0(number: usize) usize {
382	381	return asm volatile ("syscall"
383	382	: [ret] "={rax}" (-> usize)
384	383	: [number] "{rax}" (number)
385		: "rcx", "r11");
	384	: "rcx", "r11"
	385	);
386	386	}
387	387
388	388	pub fn syscall1(number: usize, arg1: usize) usize {
389	389	return asm volatile ("syscall"
390	390	: [ret] "={rax}" (-> usize)
391	391	: [number] "{rax}" (number),
392		[arg1] "{rdi}" (arg1)
393		: "rcx", "r11");
	392	[arg1] "{rdi}" (arg1)
	393	: "rcx", "r11"
	394	);
394	395	}
395	396
396	397	pub fn syscall2(number: usize, arg1: usize, arg2: usize) usize {
397	398	return asm volatile ("syscall"
398	399	: [ret] "={rax}" (-> usize)
399	400	: [number] "{rax}" (number),
400		[arg1] "{rdi}" (arg1),
401		[arg2] "{rsi}" (arg2)
402		: "rcx", "r11");
	401	[arg1] "{rdi}" (arg1),
	402	[arg2] "{rsi}" (arg2)
	403	: "rcx", "r11"
	404	);
403	405	}
404	406
405	407	pub fn syscall3(number: usize, arg1: usize, arg2: usize, arg3: usize) usize {
406	408	return asm volatile ("syscall"
407	409	: [ret] "={rax}" (-> usize)
408	410	: [number] "{rax}" (number),
409		[arg1] "{rdi}" (arg1),
410		[arg2] "{rsi}" (arg2),
411		[arg3] "{rdx}" (arg3)
412		: "rcx", "r11");
	411	[arg1] "{rdi}" (arg1),
	412	[arg2] "{rsi}" (arg2),
	413	[arg3] "{rdx}" (arg3)
	414	: "rcx", "r11"
	415	);
413	416	}
414	417
415	418	pub fn syscall4(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
416	419	return asm volatile ("syscall"
417	420	: [ret] "={rax}" (-> usize)
418	421	: [number] "{rax}" (number),
419		[arg1] "{rdi}" (arg1),
420		[arg2] "{rsi}" (arg2),
421		[arg3] "{rdx}" (arg3),
422		[arg4] "{r10}" (arg4)
423		: "rcx", "r11");
	422	[arg1] "{rdi}" (arg1),
	423	[arg2] "{rsi}" (arg2),
	424	[arg3] "{rdx}" (arg3),
	425	[arg4] "{r10}" (arg4)
	426	: "rcx", "r11"
	427	);
424	428	}
425	429
426	430	pub fn syscall5(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
427	431	return asm volatile ("syscall"
428	432	: [ret] "={rax}" (-> usize)
429	433	: [number] "{rax}" (number),
430		[arg1] "{rdi}" (arg1),
431		[arg2] "{rsi}" (arg2),
432		[arg3] "{rdx}" (arg3),
433		[arg4] "{r10}" (arg4),
434		[arg5] "{r8}" (arg5)
435		: "rcx", "r11");
	434	[arg1] "{rdi}" (arg1),
	435	[arg2] "{rsi}" (arg2),
	436	[arg3] "{rdx}" (arg3),
	437	[arg4] "{r10}" (arg4),
	438	[arg5] "{r8}" (arg5)
	439	: "rcx", "r11"
	440	);
436	441	}
437	442
438		pub fn syscall6(number: usize, arg1: usize, arg2: usize, arg3: usize, arg4: usize,
439		arg5: usize, arg6: usize) usize
440		{
	443	pub fn syscall6(
	444	number: usize,
	445	arg1: usize,
	446	arg2: usize,
	447	arg3: usize,
	448	arg4: usize,
	449	arg5: usize,
	450	arg6: usize,
	451	) usize {
441	452	return asm volatile ("syscall"
442	453	: [ret] "={rax}" (-> usize)
443	454	: [number] "{rax}" (number),
444		[arg1] "{rdi}" (arg1),
445		[arg2] "{rsi}" (arg2),
446		[arg3] "{rdx}" (arg3),
447		[arg4] "{r10}" (arg4),
448		[arg5] "{r8}" (arg5),
449		[arg6] "{r9}" (arg6)
450		: "rcx", "r11");
	455	[arg1] "{rdi}" (arg1),
	456	[arg2] "{rsi}" (arg2),
	457	[arg3] "{rdx}" (arg3),
	458	[arg4] "{r10}" (arg4),
	459	[arg5] "{r8}" (arg5),
	460	[arg6] "{r9}" (arg6)
	461	: "rcx", "r11"
	462	);
451	463	}
452	464
453	465	/// This matches the libc clone function.
...	...	@@ -457,10 +469,10 @@ pub nakedcc fn restore_rt() void {
457	469	return asm volatile ("syscall"
458	470	:
459	471	: [number] "{rax}" (usize(SYS_rt_sigreturn))
460		: "rcx", "r11");
	472	: "rcx", "r11"
	473	);
461	474	}
462	475
463
464	476	pub const msghdr = extern struct {
465	477	msg_name: &u8,
466	478	msg_namelen: socklen_t,

std/os/path.zig+43-52

...	...	@@ -55,9 +55,7 @@ test "os.path.join" {
55	55	assert(mem.eql(u8, try joinWindows(debug.global_allocator, "c:\\", "a", "b\\", "c"), "c:\\a\\b\\c"));
56	56	assert(mem.eql(u8, try joinWindows(debug.global_allocator, "c:\\a\\", "b\\", "c"), "c:\\a\\b\\c"));
57	57
58		assert(mem.eql(u8, try joinWindows(debug.global_allocator,
59		"c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std", "io.zig"),
60		"c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std\\io.zig"));
	58	assert(mem.eql(u8, try joinWindows(debug.global_allocator, "c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std", "io.zig"), "c:\\home\\andy\\dev\\zig\\build\\lib\\zig\\std\\io.zig"));
61	59
62	60	assert(mem.eql(u8, try joinPosix(debug.global_allocator, "/a/b", "c"), "/a/b/c"));
63	61	assert(mem.eql(u8, try joinPosix(debug.global_allocator, "/a/b/", "c"), "/a/b/c"));
...	...	@@ -65,8 +63,7 @@ test "os.path.join" {
65	63	assert(mem.eql(u8, try joinPosix(debug.global_allocator, "/", "a", "b/", "c"), "/a/b/c"));
66	64	assert(mem.eql(u8, try joinPosix(debug.global_allocator, "/a/", "b/", "c"), "/a/b/c"));
67	65
68		assert(mem.eql(u8, try joinPosix(debug.global_allocator, "/home/andy/dev/zig/build/lib/zig/std", "io.zig"),
69		"/home/andy/dev/zig/build/lib/zig/std/io.zig"));
	66	assert(mem.eql(u8, try joinPosix(debug.global_allocator, "/home/andy/dev/zig/build/lib/zig/std", "io.zig"), "/home/andy/dev/zig/build/lib/zig/std/io.zig"));
70	67	}
71	68
72	69	pub fn isAbsolute(path: []const u8) bool {
...	...	@@ -151,22 +148,22 @@ pub const WindowsPath = struct {
151	148
152	149	pub fn windowsParsePath(path: []const u8) WindowsPath {
153	150	if (path.len >= 2 and path[1] == ':') {
154		return WindowsPath {
	151	return WindowsPath{
155	152	.is_abs = isAbsoluteWindows(path),
156	153	.kind = WindowsPath.Kind.Drive,
157	154	.disk_designator = path[0..2],
158	155	};
159	156	}
160	157	if (path.len >= 1 and (path[0] == '/' or path[0] == '\\') and
161		(path.len == 1 or (path[1] != '/' and path[1] != '\\')))
	158	(path.len == 1 or (path[1] != '/' and path[1] != '\\')))
162	159	{
163		return WindowsPath {
	160	return WindowsPath{
164	161	.is_abs = true,
165	162	.kind = WindowsPath.Kind.None,
166	163	.disk_designator = path[0..0],
167	164	};
168	165	}
169		const relative_path = WindowsPath {
	166	const relative_path = WindowsPath{
170	167	.kind = WindowsPath.Kind.None,
171	168	.disk_designator = []u8{},
172	169	.is_abs = false,
...	...	@@ -178,7 +175,7 @@ pub fn windowsParsePath(path: []const u8) WindowsPath {
178	175	// TODO when I combined these together with `inline for` the compiler crashed
179	176	{
180	177	const this_sep = '/';
181		const two_sep = []u8{this_sep, this_sep};
	178	const two_sep = []u8{ this_sep, this_sep };
182	179	if (mem.startsWith(u8, path, two_sep)) {
183	180	if (path[2] == this_sep) {
184	181	return relative_path;
...	...	@@ -187,7 +184,7 @@ pub fn windowsParsePath(path: []const u8) WindowsPath {
187	184	var it = mem.split(path, []u8{this_sep});
188	185	_ = (it.next() ?? return relative_path);
189	186	_ = (it.next() ?? return relative_path);
190		return WindowsPath {
	187	return WindowsPath{
191	188	.is_abs = isAbsoluteWindows(path),
192	189	.kind = WindowsPath.Kind.NetworkShare,
193	190	.disk_designator = path[0..it.index],
...	...	@@ -196,7 +193,7 @@ pub fn windowsParsePath(path: []const u8) WindowsPath {
196	193	}
197	194	{
198	195	const this_sep = '\\';
199		const two_sep = []u8{this_sep, this_sep};
	196	const two_sep = []u8{ this_sep, this_sep };
200	197	if (mem.startsWith(u8, path, two_sep)) {
201	198	if (path[2] == this_sep) {
202	199	return relative_path;
...	...	@@ -205,7 +202,7 @@ pub fn windowsParsePath(path: []const u8) WindowsPath {
205	202	var it = mem.split(path, []u8{this_sep});
206	203	_ = (it.next() ?? return relative_path);
207	204	_ = (it.next() ?? return relative_path);
208		return WindowsPath {
	205	return WindowsPath{
209	206	.is_abs = isAbsoluteWindows(path),
210	207	.kind = WindowsPath.Kind.NetworkShare,
211	208	.disk_designator = path[0..it.index],
...	...	@@ -296,7 +293,7 @@ fn compareDiskDesignators(kind: WindowsPath.Kind, p1: []const u8, p2: []const u8
296	293
297	294	fn asciiUpper(byte: u8) u8 {
298	295	return switch (byte) {
299		'a' ... 'z' => 'A' + (byte - 'a'),
	296	'a'...'z' => 'A' + (byte - 'a'),
300	297	else => byte,
301	298	};
302	299	}
...	...	@@ -372,7 +369,6 @@ pub fn resolveWindows(allocator: &Allocator, paths: []const []const u8) ![]u8 {
372	369	max_size += p.len + 1;
373	370	}
374	371
375
376	372	// if we will result with a disk designator, loop again to determine
377	373	// which is the last time the disk designator is absolutely specified, if any
378	374	// and count up the max bytes for paths related to this disk designator
...	...	@@ -386,8 +382,7 @@ pub fn resolveWindows(allocator: &Allocator, paths: []const []const u8) ![]u8 {
386	382	const parsed = windowsParsePath(p);
387	383	if (parsed.kind != WindowsPath.Kind.None) {
388	384	if (parsed.kind == have_drive_kind) {
389		correct_disk_designator = compareDiskDesignators(have_drive_kind,
390		result_disk_designator, parsed.disk_designator);
	385	correct_disk_designator = compareDiskDesignators(have_drive_kind, result_disk_designator, parsed.disk_designator);
391	386	} else {
392	387	continue;
393	388	}
...	...	@@ -404,7 +399,6 @@ pub fn resolveWindows(allocator: &Allocator, paths: []const []const u8) ![]u8 {
404	399	}
405	400	}
406	401
407
408	402	// Allocate result and fill in the disk designator, calling getCwd if we have to.
409	403	var result: []u8 = undefined;
410	404	var result_index: usize = 0;
...	...	@@ -433,7 +427,7 @@ pub fn resolveWindows(allocator: &Allocator, paths: []const []const u8) ![]u8 {
433	427	result_index += 1;
434	428	mem.copy(u8, result[result_index..], other_name);
435	429	result_index += other_name.len;
436
	430
437	431	result_disk_designator = result[0..result_index];
438	432	},
439	433	WindowsPath.Kind.None => {
...	...	@@ -478,8 +472,7 @@ pub fn resolveWindows(allocator: &Allocator, paths: []const []const u8) ![]u8 {
478	472
479	473	if (parsed.kind != WindowsPath.Kind.None) {
480	474	if (parsed.kind == have_drive_kind) {
481		correct_disk_designator = compareDiskDesignators(have_drive_kind,
482		result_disk_designator, parsed.disk_designator);
	475	correct_disk_designator = compareDiskDesignators(have_drive_kind, result_disk_designator, parsed.disk_designator);
483	476	} else {
484	477	continue;
485	478	}
...	...	@@ -591,7 +584,7 @@ test "os.path.resolve" {
591	584	}
592	585	assert(mem.eql(u8, testResolveWindows([][]const u8{"."}), cwd));
593	586	} else {
594		assert(mem.eql(u8, testResolvePosix([][]const u8{"a/b/c/", "../../.."}), cwd));
	587	assert(mem.eql(u8, testResolvePosix([][]const u8{ "a/b/c/", "../../.." }), cwd));
595	588	assert(mem.eql(u8, testResolvePosix([][]const u8{"."}), cwd));
596	589	}
597	590	}
...	...	@@ -601,16 +594,15 @@ test "os.path.resolveWindows" {
601	594	const cwd = try os.getCwd(debug.global_allocator);
602	595	const parsed_cwd = windowsParsePath(cwd);
603	596	{
604		const result = testResolveWindows([][]const u8{"/usr/local", "lib\\zig\\std\\array_list.zig"});
605		const expected = try join(debug.global_allocator,
606		parsed_cwd.disk_designator, "usr\\local\\lib\\zig\\std\\array_list.zig");
	597	const result = testResolveWindows([][]const u8{ "/usr/local", "lib\\zig\\std\\array_list.zig" });
	598	const expected = try join(debug.global_allocator, parsed_cwd.disk_designator, "usr\\local\\lib\\zig\\std\\array_list.zig");
607	599	if (parsed_cwd.kind == WindowsPath.Kind.Drive) {
608	600	expected[0] = asciiUpper(parsed_cwd.disk_designator[0]);
609	601	}
610	602	assert(mem.eql(u8, result, expected));
611	603	}
612	604	{
613		const result = testResolveWindows([][]const u8{"usr/local", "lib\\zig"});
	605	const result = testResolveWindows([][]const u8{ "usr/local", "lib\\zig" });
614	606	const expected = try join(debug.global_allocator, cwd, "usr\\local\\lib\\zig");
615	607	if (parsed_cwd.kind == WindowsPath.Kind.Drive) {
616	608	expected[0] = asciiUpper(parsed_cwd.disk_designator[0]);
...	...	@@ -619,33 +611,32 @@ test "os.path.resolveWindows" {
619	611	}
620	612	}
621	613
622		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:\\a\\b\\c", "/hi", "ok"}), "C:\\hi\\ok"));
623		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/blah\\blah", "d:/games", "c:../a"}), "C:\\blah\\a"));
624		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/blah\\blah", "d:/games", "C:../a"}), "C:\\blah\\a"));
625		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/ignore", "d:\\a/b\\c/d", "\\e.exe"}), "D:\\e.exe"));
626		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/ignore", "c:/some/file"}), "C:\\some\\file"));
627		assert(mem.eql(u8, testResolveWindows([][]const u8{"d:/ignore", "d:some/dir//"}), "D:\\ignore\\some\\dir"));
628		assert(mem.eql(u8, testResolveWindows([][]const u8{"//server/share", "..", "relative\\"}), "\\\\server\\share\\relative"));
629		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/", "//"}), "C:\\"));
630		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/", "//dir"}), "C:\\dir"));
631		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/", "//server/share"}), "\\\\server\\share\\"));
632		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/", "//server//share"}), "\\\\server\\share\\"));
633		assert(mem.eql(u8, testResolveWindows([][]const u8{"c:/", "///some//dir"}), "C:\\some\\dir"));
634		assert(mem.eql(u8, testResolveWindows([][]const u8{"C:\\foo\\tmp.3\\", "..\\tmp.3\\cycles\\root.js"}),
635		"C:\\foo\\tmp.3\\cycles\\root.js"));
	614	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:\\a\\b\\c", "/hi", "ok" }), "C:\\hi\\ok"));
	615	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/blah\\blah", "d:/games", "c:../a" }), "C:\\blah\\a"));
	616	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/blah\\blah", "d:/games", "C:../a" }), "C:\\blah\\a"));
	617	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/ignore", "d:\\a/b\\c/d", "\\e.exe" }), "D:\\e.exe"));
	618	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/ignore", "c:/some/file" }), "C:\\some\\file"));
	619	assert(mem.eql(u8, testResolveWindows([][]const u8{ "d:/ignore", "d:some/dir//" }), "D:\\ignore\\some\\dir"));
	620	assert(mem.eql(u8, testResolveWindows([][]const u8{ "//server/share", "..", "relative\\" }), "\\\\server\\share\\relative"));
	621	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/", "//" }), "C:\\"));
	622	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/", "//dir" }), "C:\\dir"));
	623	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/", "//server/share" }), "\\\\server\\share\\"));
	624	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/", "//server//share" }), "\\\\server\\share\\"));
	625	assert(mem.eql(u8, testResolveWindows([][]const u8{ "c:/", "///some//dir" }), "C:\\some\\dir"));
	626	assert(mem.eql(u8, testResolveWindows([][]const u8{ "C:\\foo\\tmp.3\\", "..\\tmp.3\\cycles\\root.js" }), "C:\\foo\\tmp.3\\cycles\\root.js"));
636	627	}
637	628
638	629	test "os.path.resolvePosix" {
639		assert(mem.eql(u8, testResolvePosix([][]const u8{"/a/b", "c"}), "/a/b/c"));
640		assert(mem.eql(u8, testResolvePosix([][]const u8{"/a/b", "c", "//d", "e///"}), "/d/e"));
641		assert(mem.eql(u8, testResolvePosix([][]const u8{"/a/b/c", "..", "../"}), "/a"));
642		assert(mem.eql(u8, testResolvePosix([][]const u8{"/", "..", ".."}), "/"));
	630	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/a/b", "c" }), "/a/b/c"));
	631	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/a/b", "c", "//d", "e///" }), "/d/e"));
	632	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/a/b/c", "..", "../" }), "/a"));
	633	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/", "..", ".." }), "/"));
643	634	assert(mem.eql(u8, testResolvePosix([][]const u8{"/a/b/c/"}), "/a/b/c"));
644	635
645		assert(mem.eql(u8, testResolvePosix([][]const u8{"/var/lib", "../", "file/"}), "/var/file"));
646		assert(mem.eql(u8, testResolvePosix([][]const u8{"/var/lib", "/../", "file/"}), "/file"));
647		assert(mem.eql(u8, testResolvePosix([][]const u8{"/some/dir", ".", "/absolute/"}), "/absolute"));
648		assert(mem.eql(u8, testResolvePosix([][]const u8{"/foo/tmp.3/", "../tmp.3/cycles/root.js"}), "/foo/tmp.3/cycles/root.js"));
	636	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/var/lib", "../", "file/" }), "/var/file"));
	637	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/var/lib", "/../", "file/" }), "/file"));
	638	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/some/dir", ".", "/absolute/" }), "/absolute"));
	639	assert(mem.eql(u8, testResolvePosix([][]const u8{ "/foo/tmp.3/", "../tmp.3/cycles/root.js" }), "/foo/tmp.3/cycles/root.js"));
649	640	}
650	641
651	642	fn testResolveWindows(paths: []const []const u8) []u8 {
...	...	@@ -656,6 +647,8 @@ fn testResolvePosix(paths: []const []const u8) []u8 {
656	647	return resolvePosix(debug.global_allocator, paths) catch unreachable;
657	648	}
658	649
	650	/// If the path is a file in the current directory (no directory component)
	651	/// then the returned slice has .len = 0.
659	652	pub fn dirname(path: []const u8) []const u8 {
660	653	if (is_windows) {
661	654	return dirnameWindows(path);
...	...	@@ -1079,9 +1072,7 @@ pub fn real(allocator: &Allocator, pathname: []const u8) ![]u8 {
1079	1072	mem.copy(u8, pathname_buf, pathname);
1080	1073	pathname_buf[pathname.len] = 0;
1081	1074
1082		const h_file = windows.CreateFileA(pathname_buf.ptr,
1083		windows.GENERIC_READ, windows.FILE_SHARE_READ, null, windows.OPEN_EXISTING,
1084		windows.FILE_ATTRIBUTE_NORMAL, null);
	1075	const h_file = windows.CreateFileA(pathname_buf.ptr, windows.GENERIC_READ, windows.FILE_SHARE_READ, null, windows.OPEN_EXISTING, windows.FILE_ATTRIBUTE_NORMAL, null);
1085	1076	if (h_file == windows.INVALID_HANDLE_VALUE) {
1086	1077	const err = windows.GetLastError();
1087	1078	return switch (err) {
...	...	@@ -1161,7 +1152,7 @@ pub fn real(allocator: &Allocator, pathname: []const u8) ![]u8 {
1161	1152	return allocator.shrink(u8, result_buf, cstr.len(result_buf.ptr));
1162	1153	},
1163	1154	Os.linux => {
1164		const fd = try os.posixOpen(allocator, pathname, posix.O_PATH\|posix.O_NONBLOCK\|posix.O_CLOEXEC, 0);
	1155	const fd = try os.posixOpen(allocator, pathname, posix.O_PATH \| posix.O_NONBLOCK \| posix.O_CLOEXEC, 0);
1165	1156	defer os.close(fd);
1166	1157
1167	1158	var buf: ["/proc/self/fd/-2147483648".len]u8 = undefined;

std/os/test.zig+1-1

...	...	@@ -12,7 +12,7 @@ const AtomicOrder = builtin.AtomicOrder;
12	12	test "makePath, put some files in it, deleteTree" {
13	13	if (builtin.os == builtin.Os.windows) {
14	14	// TODO implement os.Dir for windows
15		// https://github.com/zig-lang/zig/issues/709
	15	// https://github.com/ziglang/zig/issues/709
16	16	return;
17	17	}
18	18	try os.makePath(a, "os_test_tmp/b/c");

std/os/time.zig+32-39

...	...	@@ -27,7 +27,7 @@ pub fn sleep(seconds: usize, nanoseconds: usize) void {
27	27
28	28	const u63 = @IntType(false, 63);
29	29	pub fn posixSleep(seconds: u63, nanoseconds: u63) void {
30		var req = posix.timespec {
	30	var req = posix.timespec{
31	31	.tv_sec = seconds,
32	32	.tv_nsec = nanoseconds,
33	33	};
...	...	@@ -71,7 +71,7 @@ fn milliTimestampWindows() u64 {
71	71	var ft: i64 = undefined;
72	72	windows.GetSystemTimeAsFileTime(&ft);
73	73	const hns_per_ms = (ns_per_s / 100) / ms_per_s;
74		const epoch_adj = epoch.windows * ms_per_s;
	74	const epoch_adj = epoch.windows * ms_per_s;
75	75	return u64(@divFloor(ft, hns_per_ms) + epoch_adj);
76	76	}
77	77
...	...	@@ -83,7 +83,7 @@ fn milliTimestampDarwin() u64 {
83	83	debug.assert(err == 0);
84	84	const sec_ms = u64(tv.tv_sec) * ms_per_s;
85	85	const usec_ms = @divFloor(u64(tv.tv_usec), us_per_s / ms_per_s);
86		return u64(sec_ms) + u64(usec_ms);
	86	return u64(sec_ms) + u64(usec_ms);
87	87	}
88	88
89	89	fn milliTimestampPosix() u64 {
...	...	@@ -110,17 +110,16 @@ pub const s_per_hour = s_per_min * 60;
110	110	pub const s_per_day = s_per_hour * 24;
111	111	pub const s_per_week = s_per_day * 7;
112	112
113
114	113	/// A monotonic high-performance timer.
115	114	/// Timer.start() must be called to initialize the struct, which captures
116	115	/// the counter frequency on windows and darwin, records the resolution,
117	116	/// and gives the user an oportunity to check for the existnece of
118	117	/// monotonic clocks without forcing them to check for error on each read.
119		/// .resolution is in nanoseconds on all platforms but .start_time's meaning
120		/// depends on the OS. On Windows and Darwin it is a hardware counter
	118	/// .resolution is in nanoseconds on all platforms but .start_time's meaning
	119	/// depends on the OS. On Windows and Darwin it is a hardware counter
121	120	/// value that requires calculation to convert to a meaninful unit.
122	121	pub const Timer = struct {
123
	122
124	123	//if we used resolution's value when performing the
125	124	// performance counter calc on windows/darwin, it would
126	125	// be less precise
...	...	@@ -131,31 +130,31 @@ pub const Timer = struct {
131	130	},
132	131	resolution: u64,
133	132	start_time: u64,
134
135
	133
136	134	//At some point we may change our minds on RAW, but for now we're
137		// sticking with posix standard MONOTONIC. For more information, see:
138		// https://github.com/zig-lang/zig/pull/933
	135	// sticking with posix standard MONOTONIC. For more information, see:
	136	// https://github.com/ziglang/zig/pull/933
139	137	//
140	138	//const monotonic_clock_id = switch(builtin.os) {
141	139	// Os.linux => linux.CLOCK_MONOTONIC_RAW,
142	140	// else => posix.CLOCK_MONOTONIC,
143	141	//};
144	142	const monotonic_clock_id = posix.CLOCK_MONOTONIC;
145
146
147	143	/// Initialize the timer structure.
148	144	//This gives us an oportunity to grab the counter frequency in windows.
149	145	//On Windows: QueryPerformanceCounter will succeed on anything >= XP/2000.
150		//On Posix: CLOCK_MONOTONIC will only fail if the monotonic counter is not
151		// supported, or if the timespec pointer is out of bounds, which should be
	146	//On Posix: CLOCK_MONOTONIC will only fail if the monotonic counter is not
	147	// supported, or if the timespec pointer is out of bounds, which should be
152	148	// impossible here barring cosmic rays or other such occurances of
153	149	// incredibly bad luck.
154	150	//On Darwin: This cannot fail, as far as I am able to tell.
155		const TimerError = error{TimerUnsupported, Unexpected};
	151	const TimerError = error{
	152	TimerUnsupported,
	153	Unexpected,
	154	};
156	155	pub fn start() TimerError!Timer {
157	156	var self: Timer = undefined;
158
	157
159	158	switch (builtin.os) {
160	159	Os.windows => {
161	160	var freq: i64 = undefined;
...	...	@@ -163,7 +162,7 @@ pub const Timer = struct {
163	162	if (err == windows.FALSE) return error.TimerUnsupported;
164	163	self.frequency = u64(freq);
165	164	self.resolution = @divFloor(ns_per_s, self.frequency);
166
	165
167	166	var start_time: i64 = undefined;
168	167	err = windows.QueryPerformanceCounter(&start_time);
169	168	debug.assert(err != windows.FALSE);
...	...	@@ -171,9 +170,9 @@ pub const Timer = struct {
171	170	},
172	171	Os.linux => {
173	172	//On Linux, seccomp can do arbitrary things to our ability to call
174		// syscalls, including return any errno value it wants and
	173	// syscalls, including return any errno value it wants and
175	174	// inconsistently throwing errors. Since we can't account for
176		// abuses of seccomp in a reasonable way, we'll assume that if
	175	// abuses of seccomp in a reasonable way, we'll assume that if
177	176	// seccomp is going to block us it will at least do so consistently
178	177	var ts: posix.timespec = undefined;
179	178	var result = posix.clock_getres(monotonic_clock_id, &ts);
...	...	@@ -184,7 +183,7 @@ pub const Timer = struct {
184	183	else => return std.os.unexpectedErrorPosix(errno),
185	184	}
186	185	self.resolution = u64(ts.tv_sec) * u64(ns_per_s) + u64(ts.tv_nsec);
187
	186
188	187	result = posix.clock_gettime(monotonic_clock_id, &ts);
189	188	errno = posix.getErrno(result);
190	189	if (errno != 0) return std.os.unexpectedErrorPosix(errno);
...	...	@@ -199,7 +198,7 @@ pub const Timer = struct {
199	198	}
200	199	return self;
201	200	}
202
	201
203	202	/// Reads the timer value since start or the last reset in nanoseconds
204	203	pub fn read(self: &Timer) u64 {
205	204	var clock = clockNative() - self.start_time;
...	...	@@ -210,13 +209,12 @@ pub const Timer = struct {
210	209	else => @compileError("Unsupported OS"),
211	210	};
212	211	}
213
	212
214	213	/// Resets the timer value to 0/now.
215		pub fn reset(self: &Timer) void
216		{
	214	pub fn reset(self: &Timer) void {
217	215	self.start_time = clockNative();
218	216	}
219
	217
220	218	/// Returns the current value of the timer in nanoseconds, then resets it
221	219	pub fn lap(self: &Timer) u64 {
222	220	var now = clockNative();
...	...	@@ -224,26 +222,25 @@ pub const Timer = struct {
224	222	self.start_time = now;
225	223	return lap_time;
226	224	}
227
228
	225
229	226	const clockNative = switch (builtin.os) {
230	227	Os.windows => clockWindows,
231	228	Os.linux => clockLinux,
232	229	Os.macosx, Os.ios => clockDarwin,
233	230	else => @compileError("Unsupported OS"),
234	231	};
235
	232
236	233	fn clockWindows() u64 {
237	234	var result: i64 = undefined;
238	235	var err = windows.QueryPerformanceCounter(&result);
239	236	debug.assert(err != windows.FALSE);
240	237	return u64(result);
241	238	}
242
	239
243	240	fn clockDarwin() u64 {
244	241	return darwin.mach_absolute_time();
245	242	}
246
	243
247	244	fn clockLinux() u64 {
248	245	var ts: posix.timespec = undefined;
249	246	var result = posix.clock_gettime(monotonic_clock_id, &ts);
...	...	@@ -252,10 +249,6 @@ pub const Timer = struct {
252	249	}
253	250	};
254	251
255
256
257
258
259	252	test "os.time.sleep" {
260	253	sleep(0, 1);
261	254	}
...	...	@@ -263,7 +256,7 @@ test "os.time.sleep" {
263	256	test "os.time.timestamp" {
264	257	const ns_per_ms = (ns_per_s / ms_per_s);
265	258	const margin = 50;
266
	259
267	260	const time_0 = milliTimestamp();
268	261	sleep(0, ns_per_ms);
269	262	const time_1 = milliTimestamp();
...	...	@@ -274,15 +267,15 @@ test "os.time.timestamp" {
274	267	test "os.time.Timer" {
275	268	const ns_per_ms = (ns_per_s / ms_per_s);
276	269	const margin = ns_per_ms * 50;
277
	270
278	271	var timer = try Timer.start();
279	272	sleep(0, 10 * ns_per_ms);
280	273	const time_0 = timer.read();
281	274	debug.assert(time_0 > 0 and time_0 < margin);
282
	275
283	276	const time_1 = timer.lap();
284	277	debug.assert(time_1 >= time_0);
285
	278
286	279	timer.reset();
287	280	debug.assert(timer.read() < time_1);
288	281	}

std/os/windows/error.zig+1188

...	...	@@ -1,2379 +1,3567 @@
1	1	/// The operation completed successfully.
2	2	pub const SUCCESS = 0;
	3
3	4	/// Incorrect function.
4	5	pub const INVALID_FUNCTION = 1;
	6
5	7	/// The system cannot find the file specified.
6	8	pub const FILE_NOT_FOUND = 2;
	9
7	10	/// The system cannot find the path specified.
8	11	pub const PATH_NOT_FOUND = 3;
	12
9	13	/// The system cannot open the file.
10	14	pub const TOO_MANY_OPEN_FILES = 4;
	15
11	16	/// Access is denied.
12	17	pub const ACCESS_DENIED = 5;
	18
13	19	/// The handle is invalid.
14	20	pub const INVALID_HANDLE = 6;
	21
15	22	/// The storage control blocks were destroyed.
16	23	pub const ARENA_TRASHED = 7;
	24
17	25	/// Not enough storage is available to process this command.
18	26	pub const NOT_ENOUGH_MEMORY = 8;
	27
19	28	/// The storage control block address is invalid.
20	29	pub const INVALID_BLOCK = 9;
	30
21	31	/// The environment is incorrect.
22	32	pub const BAD_ENVIRONMENT = 10;
	33
23	34	/// An attempt was made to load a program with an incorrect format.
24	35	pub const BAD_FORMAT = 11;
	36
25	37	/// The access code is invalid.
26	38	pub const INVALID_ACCESS = 12;
	39
27	40	/// The data is invalid.
28	41	pub const INVALID_DATA = 13;
	42
29	43	/// Not enough storage is available to complete this operation.
30	44	pub const OUTOFMEMORY = 14;
	45
31	46	/// The system cannot find the drive specified.
32	47	pub const INVALID_DRIVE = 15;
	48
33	49	/// The directory cannot be removed.
34	50	pub const CURRENT_DIRECTORY = 16;
	51
35	52	/// The system cannot move the file to a different disk drive.
36	53	pub const NOT_SAME_DEVICE = 17;
	54
37	55	/// There are no more files.
38	56	pub const NO_MORE_FILES = 18;
	57
39	58	/// The media is write protected.
40	59	pub const WRITE_PROTECT = 19;
	60
41	61	/// The system cannot find the device specified.
42	62	pub const BAD_UNIT = 20;
	63
43	64	/// The device is not ready.
44	65	pub const NOT_READY = 21;
	66
45	67	/// The device does not recognize the command.
46	68	pub const BAD_COMMAND = 22;
	69
47	70	/// Data error (cyclic redundancy check).
48	71	pub const CRC = 23;
	72
49	73	/// The program issued a command but the command length is incorrect.
50	74	pub const BAD_LENGTH = 24;
	75
51	76	/// The drive cannot locate a specific area or track on the disk.
52	77	pub const SEEK = 25;
	78
53	79	/// The specified disk or diskette cannot be accessed.
54	80	pub const NOT_DOS_DISK = 26;
	81
55	82	/// The drive cannot find the sector requested.
56	83	pub const SECTOR_NOT_FOUND = 27;
	84
57	85	/// The printer is out of paper.
58	86	pub const OUT_OF_PAPER = 28;
	87
59	88	/// The system cannot write to the specified device.
60	89	pub const WRITE_FAULT = 29;
	90
61	91	/// The system cannot read from the specified device.
62	92	pub const READ_FAULT = 30;
	93
63	94	/// A device attached to the system is not functioning.
64	95	pub const GEN_FAILURE = 31;
	96
65	97	/// The process cannot access the file because it is being used by another process.
66	98	pub const SHARING_VIOLATION = 32;
	99
67	100	/// The process cannot access the file because another process has locked a portion of the file.
68	101	pub const LOCK_VIOLATION = 33;
	102
69	103	/// The wrong diskette is in the drive. Insert %2 (Volume Serial Number: %3) into drive %1.
70	104	pub const WRONG_DISK = 34;
	105
71	106	/// Too many files opened for sharing.
72	107	pub const SHARING_BUFFER_EXCEEDED = 36;
	108
73	109	/// Reached the end of the file.
74	110	pub const HANDLE_EOF = 38;
	111
75	112	/// The disk is full.
76	113	pub const HANDLE_DISK_FULL = 39;
	114
77	115	/// The request is not supported.
78	116	pub const NOT_SUPPORTED = 50;
	117
79	118	/// Windows cannot find the network path. Verify that the network path is correct and the destination computer is not busy or turned off. If Windows still cannot find the network path, contact your network administrator.
80	119	pub const REM_NOT_LIST = 51;
	120
81	121	/// You were not connected because a duplicate name exists on the network. If joining a domain, go to System in Control Panel to change the computer name and try again. If joining a workgroup, choose another workgroup name.
82	122	pub const DUP_NAME = 52;
	123
83	124	/// The network path was not found.
84	125	pub const BAD_NETPATH = 53;
	126
85	127	/// The network is busy.
86	128	pub const NETWORK_BUSY = 54;
	129
87	130	/// The specified network resource or device is no longer available.
88	131	pub const DEV_NOT_EXIST = 55;
	132
89	133	/// The network BIOS command limit has been reached.
90	134	pub const TOO_MANY_CMDS = 56;
	135
91	136	/// A network adapter hardware error occurred.
92	137	pub const ADAP_HDW_ERR = 57;
	138
93	139	/// The specified server cannot perform the requested operation.
94	140	pub const BAD_NET_RESP = 58;
	141
95	142	/// An unexpected network error occurred.
96	143	pub const UNEXP_NET_ERR = 59;
	144
97	145	/// The remote adapter is not compatible.
98	146	pub const BAD_REM_ADAP = 60;
	147
99	148	/// The printer queue is full.
100	149	pub const PRINTQ_FULL = 61;
	150
101	151	/// Space to store the file waiting to be printed is not available on the server.
102	152	pub const NO_SPOOL_SPACE = 62;
	153
103	154	/// Your file waiting to be printed was deleted.
104	155	pub const PRINT_CANCELLED = 63;
	156
105	157	/// The specified network name is no longer available.
106	158	pub const NETNAME_DELETED = 64;
	159
107	160	/// Network access is denied.
108	161	pub const NETWORK_ACCESS_DENIED = 65;
	162
109	163	/// The network resource type is not correct.
110	164	pub const BAD_DEV_TYPE = 66;
	165
111	166	/// The network name cannot be found.
112	167	pub const BAD_NET_NAME = 67;
	168
113	169	/// The name limit for the local computer network adapter card was exceeded.
114	170	pub const TOO_MANY_NAMES = 68;
	171
115	172	/// The network BIOS session limit was exceeded.
116	173	pub const TOO_MANY_SESS = 69;
	174
117	175	/// The remote server has been paused or is in the process of being started.
118	176	pub const SHARING_PAUSED = 70;
	177
119	178	/// No more connections can be made to this remote computer at this time because there are already as many connections as the computer can accept.
120	179	pub const REQ_NOT_ACCEP = 71;
	180
121	181	/// The specified printer or disk device has been paused.
122	182	pub const REDIR_PAUSED = 72;
	183
123	184	/// The file exists.
124	185	pub const FILE_EXISTS = 80;
	186
125	187	/// The directory or file cannot be created.
126	188	pub const CANNOT_MAKE = 82;
	189
127	190	/// Fail on INT 24.
128	191	pub const FAIL_I24 = 83;
	192
129	193	/// Storage to process this request is not available.
130	194	pub const OUT_OF_STRUCTURES = 84;
	195
131	196	/// The local device name is already in use.
132	197	pub const ALREADY_ASSIGNED = 85;
	198
133	199	/// The specified network password is not correct.
134	200	pub const INVALID_PASSWORD = 86;
	201
135	202	/// The parameter is incorrect.
136	203	pub const INVALID_PARAMETER = 87;
	204
137	205	/// A write fault occurred on the network.
138	206	pub const NET_WRITE_FAULT = 88;
	207
139	208	/// The system cannot start another process at this time.
140	209	pub const NO_PROC_SLOTS = 89;
	210
141	211	/// Cannot create another system semaphore.
142	212	pub const TOO_MANY_SEMAPHORES = 100;
	213
143	214	/// The exclusive semaphore is owned by another process.
144	215	pub const EXCL_SEM_ALREADY_OWNED = 101;
	216
145	217	/// The semaphore is set and cannot be closed.
146	218	pub const SEM_IS_SET = 102;
	219
147	220	/// The semaphore cannot be set again.
148	221	pub const TOO_MANY_SEM_REQUESTS = 103;
	222
149	223	/// Cannot request exclusive semaphores at interrupt time.
150	224	pub const INVALID_AT_INTERRUPT_TIME = 104;
	225
151	226	/// The previous ownership of this semaphore has ended.
152	227	pub const SEM_OWNER_DIED = 105;
	228
153	229	/// Insert the diskette for drive %1.
154	230	pub const SEM_USER_LIMIT = 106;
	231
155	232	/// The program stopped because an alternate diskette was not inserted.
156	233	pub const DISK_CHANGE = 107;
	234
157	235	/// The disk is in use or locked by another process.
158	236	pub const DRIVE_LOCKED = 108;
	237
159	238	/// The pipe has been ended.
160	239	pub const BROKEN_PIPE = 109;
	240
161	241	/// The system cannot open the device or file specified.
162	242	pub const OPEN_FAILED = 110;
	243
163	244	/// The file name is too long.
164	245	pub const BUFFER_OVERFLOW = 111;
	246
165	247	/// There is not enough space on the disk.
166	248	pub const DISK_FULL = 112;
	249
167	250	/// No more internal file identifiers available.
168	251	pub const NO_MORE_SEARCH_HANDLES = 113;
	252
169	253	/// The target internal file identifier is incorrect.
170	254	pub const INVALID_TARGET_HANDLE = 114;
	255
171	256	/// The IOCTL call made by the application program is not correct.
172	257	pub const INVALID_CATEGORY = 117;
	258
173	259	/// The verify-on-write switch parameter value is not correct.
174	260	pub const INVALID_VERIFY_SWITCH = 118;
	261
175	262	/// The system does not support the command requested.
176	263	pub const BAD_DRIVER_LEVEL = 119;
	264
177	265	/// This function is not supported on this system.
178	266	pub const CALL_NOT_IMPLEMENTED = 120;
	267
179	268	/// The semaphore timeout period has expired.
180	269	pub const SEM_TIMEOUT = 121;
	270
181	271	/// The data area passed to a system call is too small.
182	272	pub const INSUFFICIENT_BUFFER = 122;
	273
183	274	/// The filename, directory name, or volume label syntax is incorrect.
184	275	pub const INVALID_NAME = 123;
	276
185	277	/// The system call level is not correct.
186	278	pub const INVALID_LEVEL = 124;
	279
187	280	/// The disk has no volume label.
188	281	pub const NO_VOLUME_LABEL = 125;
	282
189	283	/// The specified module could not be found.
190	284	pub const MOD_NOT_FOUND = 126;
	285
191	286	/// The specified procedure could not be found.
192	287	pub const PROC_NOT_FOUND = 127;
	288
193	289	/// There are no child processes to wait for.
194	290	pub const WAIT_NO_CHILDREN = 128;
	291
195	292	/// The %1 application cannot be run in Win32 mode.
196	293	pub const CHILD_NOT_COMPLETE = 129;
	294
197	295	/// Attempt to use a file handle to an open disk partition for an operation other than raw disk I/O.
198	296	pub const DIRECT_ACCESS_HANDLE = 130;
	297
199	298	/// An attempt was made to move the file pointer before the beginning of the file.
200	299	pub const NEGATIVE_SEEK = 131;
	300
201	301	/// The file pointer cannot be set on the specified device or file.
202	302	pub const SEEK_ON_DEVICE = 132;
	303
203	304	/// A JOIN or SUBST command cannot be used for a drive that contains previously joined drives.
204	305	pub const IS_JOIN_TARGET = 133;
	306
205	307	/// An attempt was made to use a JOIN or SUBST command on a drive that has already been joined.
206	308	pub const IS_JOINED = 134;
	309
207	310	/// An attempt was made to use a JOIN or SUBST command on a drive that has already been substituted.
208	311	pub const IS_SUBSTED = 135;
	312
209	313	/// The system tried to delete the JOIN of a drive that is not joined.
210	314	pub const NOT_JOINED = 136;
	315
211	316	/// The system tried to delete the substitution of a drive that is not substituted.
212	317	pub const NOT_SUBSTED = 137;
	318
213	319	/// The system tried to join a drive to a directory on a joined drive.
214	320	pub const JOIN_TO_JOIN = 138;
	321
215	322	/// The system tried to substitute a drive to a directory on a substituted drive.
216	323	pub const SUBST_TO_SUBST = 139;
	324
217	325	/// The system tried to join a drive to a directory on a substituted drive.
218	326	pub const JOIN_TO_SUBST = 140;
	327
219	328	/// The system tried to SUBST a drive to a directory on a joined drive.
220	329	pub const SUBST_TO_JOIN = 141;
	330
221	331	/// The system cannot perform a JOIN or SUBST at this time.
222	332	pub const BUSY_DRIVE = 142;
	333
223	334	/// The system cannot join or substitute a drive to or for a directory on the same drive.
224	335	pub const SAME_DRIVE = 143;
	336
225	337	/// The directory is not a subdirectory of the root directory.
226	338	pub const DIR_NOT_ROOT = 144;
	339
227	340	/// The directory is not empty.
228	341	pub const DIR_NOT_EMPTY = 145;
	342
229	343	/// The path specified is being used in a substitute.
230	344	pub const IS_SUBST_PATH = 146;
	345
231	346	/// Not enough resources are available to process this command.
232	347	pub const IS_JOIN_PATH = 147;
	348
233	349	/// The path specified cannot be used at this time.
234	350	pub const PATH_BUSY = 148;
	351
235	352	/// An attempt was made to join or substitute a drive for which a directory on the drive is the target of a previous substitute.
236	353	pub const IS_SUBST_TARGET = 149;
	354
237	355	/// System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
238	356	pub const SYSTEM_TRACE = 150;
	357
239	358	/// The number of specified semaphore events for DosMuxSemWait is not correct.
240	359	pub const INVALID_EVENT_COUNT = 151;
	360
241	361	/// DosMuxSemWait did not execute; too many semaphores are already set.
242	362	pub const TOO_MANY_MUXWAITERS = 152;
	363
243	364	/// The DosMuxSemWait list is not correct.
244	365	pub const INVALID_LIST_FORMAT = 153;
	366
245	367	/// The volume label you entered exceeds the label character limit of the target file system.
246	368	pub const LABEL_TOO_LONG = 154;
	369
247	370	/// Cannot create another thread.
248	371	pub const TOO_MANY_TCBS = 155;
	372
249	373	/// The recipient process has refused the signal.
250	374	pub const SIGNAL_REFUSED = 156;
	375
251	376	/// The segment is already discarded and cannot be locked.
252	377	pub const DISCARDED = 157;
	378
253	379	/// The segment is already unlocked.
254	380	pub const NOT_LOCKED = 158;
	381
255	382	/// The address for the thread ID is not correct.
256	383	pub const BAD_THREADID_ADDR = 159;
	384
257	385	/// One or more arguments are not correct.
258	386	pub const BAD_ARGUMENTS = 160;
	387
259	388	/// The specified path is invalid.
260	389	pub const BAD_PATHNAME = 161;
	390
261	391	/// A signal is already pending.
262	392	pub const SIGNAL_PENDING = 162;
	393
263	394	/// No more threads can be created in the system.
264	395	pub const MAX_THRDS_REACHED = 164;
	396
265	397	/// Unable to lock a region of a file.
266	398	pub const LOCK_FAILED = 167;
	399
267	400	/// The requested resource is in use.
268	401	pub const BUSY = 170;
	402
269	403	/// Device's command support detection is in progress.
270	404	pub const DEVICE_SUPPORT_IN_PROGRESS = 171;
	405
271	406	/// A lock request was not outstanding for the supplied cancel region.
272	407	pub const CANCEL_VIOLATION = 173;
	408
273	409	/// The file system does not support atomic changes to the lock type.
274	410	pub const ATOMIC_LOCKS_NOT_SUPPORTED = 174;
	411
275	412	/// The system detected a segment number that was not correct.
276	413	pub const INVALID_SEGMENT_NUMBER = 180;
	414
277	415	/// The operating system cannot run %1.
278	416	pub const INVALID_ORDINAL = 182;
	417
279	418	/// Cannot create a file when that file already exists.
280	419	pub const ALREADY_EXISTS = 183;
	420
281	421	/// The flag passed is not correct.
282	422	pub const INVALID_FLAG_NUMBER = 186;
	423
283	424	/// The specified system semaphore name was not found.
284	425	pub const SEM_NOT_FOUND = 187;
	426
285	427	/// The operating system cannot run %1.
286	428	pub const INVALID_STARTING_CODESEG = 188;
	429
287	430	/// The operating system cannot run %1.
288	431	pub const INVALID_STACKSEG = 189;
	432
289	433	/// The operating system cannot run %1.
290	434	pub const INVALID_MODULETYPE = 190;
	435
291	436	/// Cannot run %1 in Win32 mode.
292	437	pub const INVALID_EXE_SIGNATURE = 191;
	438
293	439	/// The operating system cannot run %1.
294	440	pub const EXE_MARKED_INVALID = 192;
	441
295	442	/// %1 is not a valid Win32 application.
296	443	pub const BAD_EXE_FORMAT = 193;
	444
297	445	/// The operating system cannot run %1.
298	446	pub const ITERATED_DATA_EXCEEDS_64k = 194;
	447
299	448	/// The operating system cannot run %1.
300	449	pub const INVALID_MINALLOCSIZE = 195;
	450
301	451	/// The operating system cannot run this application program.
302	452	pub const DYNLINK_FROM_INVALID_RING = 196;
	453
303	454	/// The operating system is not presently configured to run this application.
304	455	pub const IOPL_NOT_ENABLED = 197;
	456
305	457	/// The operating system cannot run %1.
306	458	pub const INVALID_SEGDPL = 198;
	459
307	460	/// The operating system cannot run this application program.
308	461	pub const AUTODATASEG_EXCEEDS_64k = 199;
	462
309	463	/// The code segment cannot be greater than or equal to 64K.
310	464	pub const RING2SEG_MUST_BE_MOVABLE = 200;
	465
311	466	/// The operating system cannot run %1.
312	467	pub const RELOC_CHAIN_XEEDS_SEGLIM = 201;
	468
313	469	/// The operating system cannot run %1.
314	470	pub const INFLOOP_IN_RELOC_CHAIN = 202;
	471
315	472	/// The system could not find the environment option that was entered.
316	473	pub const ENVVAR_NOT_FOUND = 203;
	474
317	475	/// No process in the command subtree has a signal handler.
318	476	pub const NO_SIGNAL_SENT = 205;
	477
319	478	/// The filename or extension is too long.
320	479	pub const FILENAME_EXCED_RANGE = 206;
	480
321	481	/// The ring 2 stack is in use.
322	482	pub const RING2_STACK_IN_USE = 207;
	483
323	484	/// The global filename characters, * or ?, are entered incorrectly or too many global filename characters are specified.
324	485	pub const META_EXPANSION_TOO_LONG = 208;
	486
325	487	/// The signal being posted is not correct.
326	488	pub const INVALID_SIGNAL_NUMBER = 209;
	489
327	490	/// The signal handler cannot be set.
328	491	pub const THREAD_1_INACTIVE = 210;
	492
329	493	/// The segment is locked and cannot be reallocated.
330	494	pub const LOCKED = 212;
	495
331	496	/// Too many dynamic-link modules are attached to this program or dynamic-link module.
332	497	pub const TOO_MANY_MODULES = 214;
	498
333	499	/// Cannot nest calls to LoadModule.
334	500	pub const NESTING_NOT_ALLOWED = 215;
	501
335	502	/// This version of %1 is not compatible with the version of Windows you're running. Check your computer's system information and then contact the software publisher.
336	503	pub const EXE_MACHINE_TYPE_MISMATCH = 216;
	504
337	505	/// The image file %1 is signed, unable to modify.
338	506	pub const EXE_CANNOT_MODIFY_SIGNED_BINARY = 217;
	507
339	508	/// The image file %1 is strong signed, unable to modify.
340	509	pub const EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY = 218;
	510
341	511	/// This file is checked out or locked for editing by another user.
342	512	pub const FILE_CHECKED_OUT = 220;
	513
343	514	/// The file must be checked out before saving changes.
344	515	pub const CHECKOUT_REQUIRED = 221;
	516
345	517	/// The file type being saved or retrieved has been blocked.
346	518	pub const BAD_FILE_TYPE = 222;
	519
347	520	/// The file size exceeds the limit allowed and cannot be saved.
348	521	pub const FILE_TOO_LARGE = 223;
	522
349	523	/// Access Denied. Before opening files in this location, you must first add the web site to your trusted sites list, browse to the web site, and select the option to login automatically.
350	524	pub const FORMS_AUTH_REQUIRED = 224;
	525
351	526	/// Operation did not complete successfully because the file contains a virus or potentially unwanted software.
352	527	pub const VIRUS_INFECTED = 225;
	528
353	529	/// This file contains a virus or potentially unwanted software and cannot be opened. Due to the nature of this virus or potentially unwanted software, the file has been removed from this location.
354	530	pub const VIRUS_DELETED = 226;
	531
355	532	/// The pipe is local.
356	533	pub const PIPE_LOCAL = 229;
	534
357	535	/// The pipe state is invalid.
358	536	pub const BAD_PIPE = 230;
	537
359	538	/// All pipe instances are busy.
360	539	pub const PIPE_BUSY = 231;
	540
361	541	/// The pipe is being closed.
362	542	pub const NO_DATA = 232;
	543
363	544	/// No process is on the other end of the pipe.
364	545	pub const PIPE_NOT_CONNECTED = 233;
	546
365	547	/// More data is available.
366	548	pub const MORE_DATA = 234;
	549
367	550	/// The session was canceled.
368	551	pub const VC_DISCONNECTED = 240;
	552
369	553	/// The specified extended attribute name was invalid.
370	554	pub const INVALID_EA_NAME = 254;
	555
371	556	/// The extended attributes are inconsistent.
372	557	pub const EA_LIST_INCONSISTENT = 255;
	558
373	559	/// The wait operation timed out.
374	560	pub const IMEOUT = 258;
	561
375	562	/// No more data is available.
376	563	pub const NO_MORE_ITEMS = 259;
	564
377	565	/// The copy functions cannot be used.
378	566	pub const CANNOT_COPY = 266;
	567
379	568	/// The directory name is invalid.
380	569	pub const DIRECTORY = 267;
	570
381	571	/// The extended attributes did not fit in the buffer.
382	572	pub const EAS_DIDNT_FIT = 275;
	573
383	574	/// The extended attribute file on the mounted file system is corrupt.
384	575	pub const EA_FILE_CORRUPT = 276;
	576
385	577	/// The extended attribute table file is full.
386	578	pub const EA_TABLE_FULL = 277;
	579
387	580	/// The specified extended attribute handle is invalid.
388	581	pub const INVALID_EA_HANDLE = 278;
	582
389	583	/// The mounted file system does not support extended attributes.
390	584	pub const EAS_NOT_SUPPORTED = 282;
	585
391	586	/// Attempt to release mutex not owned by caller.
392	587	pub const NOT_OWNER = 288;
	588
393	589	/// Too many posts were made to a semaphore.
394	590	pub const TOO_MANY_POSTS = 298;
	591
395	592	/// Only part of a ReadProcessMemory or WriteProcessMemory request was completed.
396	593	pub const PARTIAL_COPY = 299;
	594
397	595	/// The oplock request is denied.
398	596	pub const OPLOCK_NOT_GRANTED = 300;
	597
399	598	/// An invalid oplock acknowledgment was received by the system.
400	599	pub const INVALID_OPLOCK_PROTOCOL = 301;
	600
401	601	/// The volume is too fragmented to complete this operation.
402	602	pub const DISK_TOO_FRAGMENTED = 302;
	603
403	604	/// The file cannot be opened because it is in the process of being deleted.
404	605	pub const DELETE_PENDING = 303;
	606
405	607	/// Short name settings may not be changed on this volume due to the global registry setting.
406	608	pub const INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING = 304;
	609
407	610	/// Short names are not enabled on this volume.
408	611	pub const SHORT_NAMES_NOT_ENABLED_ON_VOLUME = 305;
	612
409	613	/// The security stream for the given volume is in an inconsistent state. Please run CHKDSK on the volume.
410	614	pub const SECURITY_STREAM_IS_INCONSISTENT = 306;
	615
411	616	/// A requested file lock operation cannot be processed due to an invalid byte range.
412	617	pub const INVALID_LOCK_RANGE = 307;
	618
413	619	/// The subsystem needed to support the image type is not present.
414	620	pub const IMAGE_SUBSYSTEM_NOT_PRESENT = 308;
	621
415	622	/// The specified file already has a notification GUID associated with it.
416	623	pub const NOTIFICATION_GUID_ALREADY_DEFINED = 309;
	624
417	625	/// An invalid exception handler routine has been detected.
418	626	pub const INVALID_EXCEPTION_HANDLER = 310;
	627
419	628	/// Duplicate privileges were specified for the token.
420	629	pub const DUPLICATE_PRIVILEGES = 311;
	630
421	631	/// No ranges for the specified operation were able to be processed.
422	632	pub const NO_RANGES_PROCESSED = 312;
	633
423	634	/// Operation is not allowed on a file system internal file.
424	635	pub const NOT_ALLOWED_ON_SYSTEM_FILE = 313;
	636
425	637	/// The physical resources of this disk have been exhausted.
426	638	pub const DISK_RESOURCES_EXHAUSTED = 314;
	639
427	640	/// The token representing the data is invalid.
428	641	pub const INVALID_TOKEN = 315;
	642
429	643	/// The device does not support the command feature.
430	644	pub const DEVICE_FEATURE_NOT_SUPPORTED = 316;
	645
431	646	/// The system cannot find message text for message number 0x%1 in the message file for %2.
432	647	pub const MR_MID_NOT_FOUND = 317;
	648
433	649	/// The scope specified was not found.
434	650	pub const SCOPE_NOT_FOUND = 318;
	651
435	652	/// The Central Access Policy specified is not defined on the target machine.
436	653	pub const UNDEFINED_SCOPE = 319;
	654
437	655	/// The Central Access Policy obtained from Active Directory is invalid.
438	656	pub const INVALID_CAP = 320;
	657
439	658	/// The device is unreachable.
440	659	pub const DEVICE_UNREACHABLE = 321;
	660
441	661	/// The target device has insufficient resources to complete the operation.
442	662	pub const DEVICE_NO_RESOURCES = 322;
	663
443	664	/// A data integrity checksum error occurred. Data in the file stream is corrupt.
444	665	pub const DATA_CHECKSUM_ERROR = 323;
	666
445	667	/// An attempt was made to modify both a KERNEL and normal Extended Attribute (EA) in the same operation.
446	668	pub const INTERMIXED_KERNEL_EA_OPERATION = 324;
	669
447	670	/// Device does not support file-level TRIM.
448	671	pub const FILE_LEVEL_TRIM_NOT_SUPPORTED = 326;
	672
449	673	/// The command specified a data offset that does not align to the device's granularity/alignment.
450	674	pub const OFFSET_ALIGNMENT_VIOLATION = 327;
	675
451	676	/// The command specified an invalid field in its parameter list.
452	677	pub const INVALID_FIELD_IN_PARAMETER_LIST = 328;
	678
453	679	/// An operation is currently in progress with the device.
454	680	pub const OPERATION_IN_PROGRESS = 329;
	681
455	682	/// An attempt was made to send down the command via an invalid path to the target device.
456	683	pub const BAD_DEVICE_PATH = 330;
	684
457	685	/// The command specified a number of descriptors that exceeded the maximum supported by the device.
458	686	pub const TOO_MANY_DESCRIPTORS = 331;
	687
459	688	/// Scrub is disabled on the specified file.
460	689	pub const SCRUB_DATA_DISABLED = 332;
	690
461	691	/// The storage device does not provide redundancy.
462	692	pub const NOT_REDUNDANT_STORAGE = 333;
	693
463	694	/// An operation is not supported on a resident file.
464	695	pub const RESIDENT_FILE_NOT_SUPPORTED = 334;
	696
465	697	/// An operation is not supported on a compressed file.
466	698	pub const COMPRESSED_FILE_NOT_SUPPORTED = 335;
	699
467	700	/// An operation is not supported on a directory.
468	701	pub const DIRECTORY_NOT_SUPPORTED = 336;
	702
469	703	/// The specified copy of the requested data could not be read.
470	704	pub const NOT_READ_FROM_COPY = 337;
	705
471	706	/// No action was taken as a system reboot is required.
472	707	pub const FAIL_NOACTION_REBOOT = 350;
	708
473	709	/// The shutdown operation failed.
474	710	pub const FAIL_SHUTDOWN = 351;
	711
475	712	/// The restart operation failed.
476	713	pub const FAIL_RESTART = 352;
	714
477	715	/// The maximum number of sessions has been reached.
478	716	pub const MAX_SESSIONS_REACHED = 353;
	717
479	718	/// The thread is already in background processing mode.
480	719	pub const THREAD_MODE_ALREADY_BACKGROUND = 400;
	720
481	721	/// The thread is not in background processing mode.
482	722	pub const THREAD_MODE_NOT_BACKGROUND = 401;
	723
483	724	/// The process is already in background processing mode.
484	725	pub const PROCESS_MODE_ALREADY_BACKGROUND = 402;
	726
485	727	/// The process is not in background processing mode.
486	728	pub const PROCESS_MODE_NOT_BACKGROUND = 403;
	729
487	730	/// Attempt to access invalid address.
488	731	pub const INVALID_ADDRESS = 487;
	732
489	733	/// User profile cannot be loaded.
490	734	pub const USER_PROFILE_LOAD = 500;
	735
491	736	/// Arithmetic result exceeded 32 bits.
492	737	pub const ARITHMETIC_OVERFLOW = 534;
	738
493	739	/// There is a process on other end of the pipe.
494	740	pub const PIPE_CONNECTED = 535;
	741
495	742	/// Waiting for a process to open the other end of the pipe.
496	743	pub const PIPE_LISTENING = 536;
	744
497	745	/// Application verifier has found an error in the current process.
498	746	pub const VERIFIER_STOP = 537;
	747
499	748	/// An error occurred in the ABIOS subsystem.
500	749	pub const ABIOS_ERROR = 538;
	750
501	751	/// A warning occurred in the WX86 subsystem.
502	752	pub const WX86_WARNING = 539;
	753
503	754	/// An error occurred in the WX86 subsystem.
504	755	pub const WX86_ERROR = 540;
	756
505	757	/// An attempt was made to cancel or set a timer that has an associated APC and the subject thread is not the thread that originally set the timer with an associated APC routine.
506	758	pub const TIMER_NOT_CANCELED = 541;
	759
507	760	/// Unwind exception code.
508	761	pub const UNWIND = 542;
	762
509	763	/// An invalid or unaligned stack was encountered during an unwind operation.
510	764	pub const BAD_STACK = 543;
	765
511	766	/// An invalid unwind target was encountered during an unwind operation.
512	767	pub const INVALID_UNWIND_TARGET = 544;
	768
513	769	/// Invalid Object Attributes specified to NtCreatePort or invalid Port Attributes specified to NtConnectPort
514	770	pub const INVALID_PORT_ATTRIBUTES = 545;
	771
515	772	/// Length of message passed to NtRequestPort or NtRequestWaitReplyPort was longer than the maximum message allowed by the port.
516	773	pub const PORT_MESSAGE_TOO_LONG = 546;
	774
517	775	/// An attempt was made to lower a quota limit below the current usage.
518	776	pub const INVALID_QUOTA_LOWER = 547;
	777
519	778	/// An attempt was made to attach to a device that was already attached to another device.
520	779	pub const DEVICE_ALREADY_ATTACHED = 548;
	780
521	781	/// An attempt was made to execute an instruction at an unaligned address and the host system does not support unaligned instruction references.
522	782	pub const INSTRUCTION_MISALIGNMENT = 549;
	783
523	784	/// Profiling not started.
524	785	pub const PROFILING_NOT_STARTED = 550;
	786
525	787	/// Profiling not stopped.
526	788	pub const PROFILING_NOT_STOPPED = 551;
	789
527	790	/// The passed ACL did not contain the minimum required information.
528	791	pub const COULD_NOT_INTERPRET = 552;
	792
529	793	/// The number of active profiling objects is at the maximum and no more may be started.
530	794	pub const PROFILING_AT_LIMIT = 553;
	795
531	796	/// Used to indicate that an operation cannot continue without blocking for I/O.
532	797	pub const CANT_WAIT = 554;
	798
533	799	/// Indicates that a thread attempted to terminate itself by default (called NtTerminateThread with NULL) and it was the last thread in the current process.
534	800	pub const CANT_TERMINATE_SELF = 555;
	801
535	802	/// If an MM error is returned which is not defined in the standard FsRtl filter, it is converted to one of the following errors which is guaranteed to be in the filter. In this case information is lost, however, the filter correctly handles the exception.
536	803	pub const UNEXPECTED_MM_CREATE_ERR = 556;
	804
537	805	/// If an MM error is returned which is not defined in the standard FsRtl filter, it is converted to one of the following errors which is guaranteed to be in the filter. In this case information is lost, however, the filter correctly handles the exception.
538	806	pub const UNEXPECTED_MM_MAP_ERROR = 557;
	807
539	808	/// If an MM error is returned which is not defined in the standard FsRtl filter, it is converted to one of the following errors which is guaranteed to be in the filter. In this case information is lost, however, the filter correctly handles the exception.
540	809	pub const UNEXPECTED_MM_EXTEND_ERR = 558;
	810
541	811	/// A malformed function table was encountered during an unwind operation.
542	812	pub const BAD_FUNCTION_TABLE = 559;
	813
543	814	/// Indicates that an attempt was made to assign protection to a file system file or directory and one of the SIDs in the security descriptor could not be translated into a GUID that could be stored by the file system. This causes the protection attempt to fail, which may cause a file creation attempt to fail.
544	815	pub const NO_GUID_TRANSLATION = 560;
	816
545	817	/// Indicates that an attempt was made to grow an LDT by setting its size, or that the size was not an even number of selectors.
546	818	pub const INVALID_LDT_SIZE = 561;
	819
547	820	/// Indicates that the starting value for the LDT information was not an integral multiple of the selector size.
548	821	pub const INVALID_LDT_OFFSET = 563;
	822
549	823	/// Indicates that the user supplied an invalid descriptor when trying to set up Ldt descriptors.
550	824	pub const INVALID_LDT_DESCRIPTOR = 564;
	825
551	826	/// Indicates a process has too many threads to perform the requested action. For example, assignment of a primary token may only be performed when a process has zero or one threads.
552	827	pub const TOO_MANY_THREADS = 565;
	828
553	829	/// An attempt was made to operate on a thread within a specific process, but the thread specified is not in the process specified.
554	830	pub const THREAD_NOT_IN_PROCESS = 566;
	831
555	832	/// Page file quota was exceeded.
556	833	pub const PAGEFILE_QUOTA_EXCEEDED = 567;
	834
557	835	/// The Netlogon service cannot start because another Netlogon service running in the domain conflicts with the specified role.
558	836	pub const LOGON_SERVER_CONFLICT = 568;
	837
559	838	/// The SAM database on a Windows Server is significantly out of synchronization with the copy on the Domain Controller. A complete synchronization is required.
560	839	pub const SYNCHRONIZATION_REQUIRED = 569;
	840
561	841	/// The NtCreateFile API failed. This error should never be returned to an application, it is a place holder for the Windows Lan Manager Redirector to use in its internal error mapping routines.
562	842	pub const NET_OPEN_FAILED = 570;
	843
563	844	/// {Privilege Failed} The I/O permissions for the process could not be changed.
564	845	pub const IO_PRIVILEGE_FAILED = 571;
	846
565	847	/// {Application Exit by CTRL+C} The application terminated as a result of a CTRL+C.
566	848	pub const CONTROL_C_EXIT = 572;
	849
567	850	/// {Missing System File} The required system file %hs is bad or missing.
568	851	pub const MISSING_SYSTEMFILE = 573;
	852
569	853	/// {Application Error} The exception %s (0x%08lx) occurred in the application at location 0x%08lx.
570	854	pub const UNHANDLED_EXCEPTION = 574;
	855
571	856	/// {Application Error} The application was unable to start correctly (0x%lx). Click OK to close the application.
572	857	pub const APP_INIT_FAILURE = 575;
	858
573	859	/// {Unable to Create Paging File} The creation of the paging file %hs failed (%lx). The requested size was %ld.
574	860	pub const PAGEFILE_CREATE_FAILED = 576;
	861
575	862	/// Windows cannot verify the digital signature for this file. A recent hardware or software change might have installed a file that is signed incorrectly or damaged, or that might be malicious software from an unknown source.
576	863	pub const INVALID_IMAGE_HASH = 577;
	864
577	865	/// {No Paging File Specified} No paging file was specified in the system configuration.
578	866	pub const NO_PAGEFILE = 578;
	867
579	868	/// {EXCEPTION} A real-mode application issued a floating-point instruction and floating-point hardware is not present.
580	869	pub const ILLEGAL_FLOAT_CONTEXT = 579;
	870
581	871	/// An event pair synchronization operation was performed using the thread specific client/server event pair object, but no event pair object was associated with the thread.
582	872	pub const NO_EVENT_PAIR = 580;
	873
583	874	/// A Windows Server has an incorrect configuration.
584	875	pub const DOMAIN_CTRLR_CONFIG_ERROR = 581;
	876
585	877	/// An illegal character was encountered. For a multi-byte character set this includes a lead byte without a succeeding trail byte. For the Unicode character set this includes the characters 0xFFFF and 0xFFFE.
586	878	pub const ILLEGAL_CHARACTER = 582;
	879
587	880	/// The Unicode character is not defined in the Unicode character set installed on the system.
588	881	pub const UNDEFINED_CHARACTER = 583;
	882
589	883	/// The paging file cannot be created on a floppy diskette.
590	884	pub const FLOPPY_VOLUME = 584;
	885
591	886	/// The system BIOS failed to connect a system interrupt to the device or bus for which the device is connected.
592	887	pub const BIOS_FAILED_TO_CONNECT_INTERRUPT = 585;
	888
593	889	/// This operation is only allowed for the Primary Domain Controller of the domain.
594	890	pub const BACKUP_CONTROLLER = 586;
	891
595	892	/// An attempt was made to acquire a mutant such that its maximum count would have been exceeded.
596	893	pub const MUTANT_LIMIT_EXCEEDED = 587;
	894
597	895	/// A volume has been accessed for which a file system driver is required that has not yet been loaded.
598	896	pub const FS_DRIVER_REQUIRED = 588;
	897
599	898	/// {Registry File Failure} The registry cannot load the hive (file): %hs or its log or alternate. It is corrupt, absent, or not writable.
600	899	pub const CANNOT_LOAD_REGISTRY_FILE = 589;
	900
601	901	/// {Unexpected Failure in DebugActiveProcess} An unexpected failure occurred while processing a DebugActiveProcess API request. You may choose OK to terminate the process, or Cancel to ignore the error.
602	902	pub const DEBUG_ATTACH_FAILED = 590;
	903
603	904	/// {Fatal System Error} The %hs system process terminated unexpectedly with a status of 0x%08x (0x%08x 0x%08x). The system has been shut down.
604	905	pub const SYSTEM_PROCESS_TERMINATED = 591;
	906
605	907	/// {Data Not Accepted} The TDI client could not handle the data received during an indication.
606	908	pub const DATA_NOT_ACCEPTED = 592;
	909
607	910	/// NTVDM encountered a hard error.
608	911	pub const VDM_HARD_ERROR = 593;
	912
609	913	/// {Cancel Timeout} The driver %hs failed to complete a cancelled I/O request in the allotted time.
610	914	pub const DRIVER_CANCEL_TIMEOUT = 594;
	915
611	916	/// {Reply Message Mismatch} An attempt was made to reply to an LPC message, but the thread specified by the client ID in the message was not waiting on that message.
612	917	pub const REPLY_MESSAGE_MISMATCH = 595;
	918
613	919	/// {Delayed Write Failed} Windows was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Please try to save this file elsewhere.
614	920	pub const LOST_WRITEBEHIND_DATA = 596;
	921
615	922	/// The parameter(s) passed to the server in the client/server shared memory window were invalid. Too much data may have been put in the shared memory window.
616	923	pub const CLIENT_SERVER_PARAMETERS_INVALID = 597;
	924
617	925	/// The stream is not a tiny stream.
618	926	pub const NOT_TINY_STREAM = 598;
	927
619	928	/// The request must be handled by the stack overflow code.
620	929	pub const STACK_OVERFLOW_READ = 599;
	930
621	931	/// Internal OFS status codes indicating how an allocation operation is handled. Either it is retried after the containing onode is moved or the extent stream is converted to a large stream.
622	932	pub const CONVERT_TO_LARGE = 600;
	933
623	934	/// The attempt to find the object found an object matching by ID on the volume but it is out of the scope of the handle used for the operation.
624	935	pub const FOUND_OUT_OF_SCOPE = 601;
	936
625	937	/// The bucket array must be grown. Retry transaction after doing so.
626	938	pub const ALLOCATE_BUCKET = 602;
	939
627	940	/// The user/kernel marshalling buffer has overflowed.
628	941	pub const MARSHALL_OVERFLOW = 603;
	942
629	943	/// The supplied variant structure contains invalid data.
630	944	pub const INVALID_VARIANT = 604;
	945
631	946	/// The specified buffer contains ill-formed data.
632	947	pub const BAD_COMPRESSION_BUFFER = 605;
	948
633	949	/// {Audit Failed} An attempt to generate a security audit failed.
634	950	pub const AUDIT_FAILED = 606;
	951
635	952	/// The timer resolution was not previously set by the current process.
636	953	pub const TIMER_RESOLUTION_NOT_SET = 607;
	954
637	955	/// There is insufficient account information to log you on.
638	956	pub const INSUFFICIENT_LOGON_INFO = 608;
	957
639	958	/// {Invalid DLL Entrypoint} The dynamic link library %hs is not written correctly. The stack pointer has been left in an inconsistent state. The entrypoint should be declared as WINAPI or STDCALL. Select YES to fail the DLL load. Select NO to continue execution. Selecting NO may cause the application to operate incorrectly.
640	959	pub const BAD_DLL_ENTRYPOINT = 609;
	960
641	961	/// {Invalid Service Callback Entrypoint} The %hs service is not written correctly. The stack pointer has been left in an inconsistent state. The callback entrypoint should be declared as WINAPI or STDCALL. Selecting OK will cause the service to continue operation. However, the service process may operate incorrectly.
642	962	pub const BAD_SERVICE_ENTRYPOINT = 610;
	963
643	964	/// There is an IP address conflict with another system on the network.
644	965	pub const IP_ADDRESS_CONFLICT1 = 611;
	966
645	967	/// There is an IP address conflict with another system on the network.
646	968	pub const IP_ADDRESS_CONFLICT2 = 612;
	969
647	970	/// {Low On Registry Space} The system has reached the maximum size allowed for the system part of the registry. Additional storage requests will be ignored.
648	971	pub const REGISTRY_QUOTA_LIMIT = 613;
	972
649	973	/// A callback return system service cannot be executed when no callback is active.
650	974	pub const NO_CALLBACK_ACTIVE = 614;
	975
651	976	/// The password provided is too short to meet the policy of your user account. Please choose a longer password.
652	977	pub const PWD_TOO_SHORT = 615;
	978
653	979	/// The policy of your user account does not allow you to change passwords too frequently. This is done to prevent users from changing back to a familiar, but potentially discovered, password. If you feel your password has been compromised then please contact your administrator immediately to have a new one assigned.
654	980	pub const PWD_TOO_RECENT = 616;
	981
655	982	/// You have attempted to change your password to one that you have used in the past. The policy of your user account does not allow this. Please select a password that you have not previously used.
656	983	pub const PWD_HISTORY_CONFLICT = 617;
	984
657	985	/// The specified compression format is unsupported.
658	986	pub const UNSUPPORTED_COMPRESSION = 618;
	987
659	988	/// The specified hardware profile configuration is invalid.
660	989	pub const INVALID_HW_PROFILE = 619;
	990
661	991	/// The specified Plug and Play registry device path is invalid.
662	992	pub const INVALID_PLUGPLAY_DEVICE_PATH = 620;
	993
663	994	/// The specified quota list is internally inconsistent with its descriptor.
664	995	pub const QUOTA_LIST_INCONSISTENT = 621;
	996
665	997	/// {Windows Evaluation Notification} The evaluation period for this installation of Windows has expired. This system will shutdown in 1 hour. To restore access to this installation of Windows, please upgrade this installation using a licensed distribution of this product.
666	998	pub const EVALUATION_EXPIRATION = 622;
	999
667	1000	/// {Illegal System DLL Relocation} The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range reserved for Windows system DLLs. The vendor supplying the DLL should be contacted for a new DLL.
668	1001	pub const ILLEGAL_DLL_RELOCATION = 623;
	1002
669	1003	/// {DLL Initialization Failed} The application failed to initialize because the window station is shutting down.
670	1004	pub const DLL_INIT_FAILED_LOGOFF = 624;
	1005
671	1006	/// The validation process needs to continue on to the next step.
672	1007	pub const VALIDATE_CONTINUE = 625;
	1008
673	1009	/// There are no more matches for the current index enumeration.
674	1010	pub const NO_MORE_MATCHES = 626;
	1011
675	1012	/// The range could not be added to the range list because of a conflict.
676	1013	pub const RANGE_LIST_CONFLICT = 627;
	1014
677	1015	/// The server process is running under a SID different than that required by client.
678	1016	pub const SERVER_SID_MISMATCH = 628;
	1017
679	1018	/// A group marked use for deny only cannot be enabled.
680	1019	pub const CANT_ENABLE_DENY_ONLY = 629;
	1020
681	1021	/// {EXCEPTION} Multiple floating point faults.
682	1022	pub const FLOAT_MULTIPLE_FAULTS = 630;
	1023
683	1024	/// {EXCEPTION} Multiple floating point traps.
684	1025	pub const FLOAT_MULTIPLE_TRAPS = 631;
	1026
685	1027	/// The requested interface is not supported.
686	1028	pub const NOINTERFACE = 632;
	1029
687	1030	/// {System Standby Failed} The driver %hs does not support standby mode. Updating this driver may allow the system to go to standby mode.
688	1031	pub const DRIVER_FAILED_SLEEP = 633;
	1032
689	1033	/// The system file %1 has become corrupt and has been replaced.
690	1034	pub const CORRUPT_SYSTEM_FILE = 634;
	1035
691	1036	/// {Virtual Memory Minimum Too Low} Your system is low on virtual memory. Windows is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help.
692	1037	pub const COMMITMENT_MINIMUM = 635;
	1038
693	1039	/// A device was removed so enumeration must be restarted.
694	1040	pub const PNP_RESTART_ENUMERATION = 636;
	1041
695	1042	/// {Fatal System Error} The system image %s is not properly signed. The file has been replaced with the signed file. The system has been shut down.
696	1043	pub const SYSTEM_IMAGE_BAD_SIGNATURE = 637;
	1044
697	1045	/// Device will not start without a reboot.
698	1046	pub const PNP_REBOOT_REQUIRED = 638;
	1047
699	1048	/// There is not enough power to complete the requested operation.
700	1049	pub const INSUFFICIENT_POWER = 639;
	1050
701	1051	/// ERROR_MULTIPLE_FAULT_VIOLATION
702	1052	pub const MULTIPLE_FAULT_VIOLATION = 640;
	1053
703	1054	/// The system is in the process of shutting down.
704	1055	pub const SYSTEM_SHUTDOWN = 641;
	1056
705	1057	/// An attempt to remove a processes DebugPort was made, but a port was not already associated with the process.
706	1058	pub const PORT_NOT_SET = 642;
	1059
707	1060	/// This version of Windows is not compatible with the behavior version of directory forest, domain or domain controller.
708	1061	pub const DS_VERSION_CHECK_FAILURE = 643;
	1062
709	1063	/// The specified range could not be found in the range list.
710	1064	pub const RANGE_NOT_FOUND = 644;
	1065
711	1066	/// The driver was not loaded because the system is booting into safe mode.
712	1067	pub const NOT_SAFE_MODE_DRIVER = 646;
	1068
713	1069	/// The driver was not loaded because it failed its initialization call.
714	1070	pub const FAILED_DRIVER_ENTRY = 647;
	1071
715	1072	/// The "%hs" encountered an error while applying power or reading the device configuration. This may be caused by a failure of your hardware or by a poor connection.
716	1073	pub const DEVICE_ENUMERATION_ERROR = 648;
	1074
717	1075	/// The create operation failed because the name contained at least one mount point which resolves to a volume to which the specified device object is not attached.
718	1076	pub const MOUNT_POINT_NOT_RESOLVED = 649;
	1077
719	1078	/// The device object parameter is either not a valid device object or is not attached to the volume specified by the file name.
720	1079	pub const INVALID_DEVICE_OBJECT_PARAMETER = 650;
	1080
721	1081	/// A Machine Check Error has occurred. Please check the system eventlog for additional information.
722	1082	pub const MCA_OCCURED = 651;
	1083
723	1084	/// There was error [%2] processing the driver database.
724	1085	pub const DRIVER_DATABASE_ERROR = 652;
	1086
725	1087	/// System hive size has exceeded its limit.
726	1088	pub const SYSTEM_HIVE_TOO_LARGE = 653;
	1089
727	1090	/// The driver could not be loaded because a previous version of the driver is still in memory.
728	1091	pub const DRIVER_FAILED_PRIOR_UNLOAD = 654;
	1092
729	1093	/// {Volume Shadow Copy Service} Please wait while the Volume Shadow Copy Service prepares volume %hs for hibernation.
730	1094	pub const VOLSNAP_PREPARE_HIBERNATE = 655;
	1095
731	1096	/// The system has failed to hibernate (The error code is %hs). Hibernation will be disabled until the system is restarted.
732	1097	pub const HIBERNATION_FAILURE = 656;
	1098
733	1099	/// The password provided is too long to meet the policy of your user account. Please choose a shorter password.
734	1100	pub const PWD_TOO_LONG = 657;
	1101
735	1102	/// The requested operation could not be completed due to a file system limitation.
736	1103	pub const FILE_SYSTEM_LIMITATION = 665;
	1104
737	1105	/// An assertion failure has occurred.
738	1106	pub const ASSERTION_FAILURE = 668;
	1107
739	1108	/// An error occurred in the ACPI subsystem.
740	1109	pub const ACPI_ERROR = 669;
	1110
741	1111	/// WOW Assertion Error.
742	1112	pub const WOW_ASSERTION = 670;
	1113
743	1114	/// A device is missing in the system BIOS MPS table. This device will not be used. Please contact your system vendor for system BIOS update.
744	1115	pub const PNP_BAD_MPS_TABLE = 671;
	1116
745	1117	/// A translator failed to translate resources.
746	1118	pub const PNP_TRANSLATION_FAILED = 672;
	1119
747	1120	/// A IRQ translator failed to translate resources.
748	1121	pub const PNP_IRQ_TRANSLATION_FAILED = 673;
	1122
749	1123	/// Driver %2 returned invalid ID for a child device (%3).
750	1124	pub const PNP_INVALID_ID = 674;
	1125
751	1126	/// {Kernel Debugger Awakened} the system debugger was awakened by an interrupt.
752	1127	pub const WAKE_SYSTEM_DEBUGGER = 675;
	1128
753	1129	/// {Handles Closed} Handles to objects have been automatically closed as a result of the requested operation.
754	1130	pub const HANDLES_CLOSED = 676;
	1131
755	1132	/// {Too Much Information} The specified access control list (ACL) contained more information than was expected.
756	1133	pub const EXTRANEOUS_INFORMATION = 677;
	1134
757	1135	/// This warning level status indicates that the transaction state already exists for the registry sub-tree, but that a transaction commit was previously aborted. The commit has NOT been completed, but has not been rolled back either (so it may still be committed if desired).
758	1136	pub const RXACT_COMMIT_NECESSARY = 678;
	1137
759	1138	/// {Media Changed} The media may have changed.
760	1139	pub const MEDIA_CHECK = 679;
	1140
761	1141	/// {GUID Substitution} During the translation of a global identifier (GUID) to a Windows security ID (SID), no administratively-defined GUID prefix was found. A substitute prefix was used, which will not compromise system security. However, this may provide a more restrictive access than intended.
762	1142	pub const GUID_SUBSTITUTION_MADE = 680;
	1143
763	1144	/// The create operation stopped after reaching a symbolic link.
764	1145	pub const STOPPED_ON_SYMLINK = 681;
	1146
765	1147	/// A long jump has been executed.
766	1148	pub const LONGJUMP = 682;
	1149
767	1150	/// The Plug and Play query operation was not successful.
768	1151	pub const PLUGPLAY_QUERY_VETOED = 683;
	1152
769	1153	/// A frame consolidation has been executed.
770	1154	pub const UNWIND_CONSOLIDATE = 684;
	1155
771	1156	/// {Registry Hive Recovered} Registry hive (file): %hs was corrupted and it has been recovered. Some data might have been lost.
772	1157	pub const REGISTRY_HIVE_RECOVERED = 685;
	1158
773	1159	/// The application is attempting to run executable code from the module %hs. This may be insecure. An alternative, %hs, is available. Should the application use the secure module %hs?
774	1160	pub const DLL_MIGHT_BE_INSECURE = 686;
	1161
775	1162	/// The application is loading executable code from the module %hs. This is secure, but may be incompatible with previous releases of the operating system. An alternative, %hs, is available. Should the application use the secure module %hs?
776	1163	pub const DLL_MIGHT_BE_INCOMPATIBLE = 687;
	1164
777	1165	/// Debugger did not handle the exception.
778	1166	pub const DBG_EXCEPTION_NOT_HANDLED = 688;
	1167
779	1168	/// Debugger will reply later.
780	1169	pub const DBG_REPLY_LATER = 689;
	1170
781	1171	/// Debugger cannot provide handle.
782	1172	pub const DBG_UNABLE_TO_PROVIDE_HANDLE = 690;
	1173
783	1174	/// Debugger terminated thread.
784	1175	pub const DBG_TERMINATE_THREAD = 691;
	1176
785	1177	/// Debugger terminated process.
786	1178	pub const DBG_TERMINATE_PROCESS = 692;
	1179
787	1180	/// Debugger got control C.
788	1181	pub const DBG_CONTROL_C = 693;
	1182
789	1183	/// Debugger printed exception on control C.
790	1184	pub const DBG_PRINTEXCEPTION_C = 694;
	1185
791	1186	/// Debugger received RIP exception.
792	1187	pub const DBG_RIPEXCEPTION = 695;
	1188
793	1189	/// Debugger received control break.
794	1190	pub const DBG_CONTROL_BREAK = 696;
	1191
795	1192	/// Debugger command communication exception.
796	1193	pub const DBG_COMMAND_EXCEPTION = 697;
	1194
797	1195	/// {Object Exists} An attempt was made to create an object and the object name already existed.
798	1196	pub const OBJECT_NAME_EXISTS = 698;
	1197
799	1198	/// {Thread Suspended} A thread termination occurred while the thread was suspended. The thread was resumed, and termination proceeded.
800	1199	pub const THREAD_WAS_SUSPENDED = 699;
	1200
801	1201	/// {Image Relocated} An image file could not be mapped at the address specified in the image file. Local fixups must be performed on this image.
802	1202	pub const IMAGE_NOT_AT_BASE = 700;
	1203
803	1204	/// This informational level status indicates that a specified registry sub-tree transaction state did not yet exist and had to be created.
804	1205	pub const RXACT_STATE_CREATED = 701;
	1206
805	1207	/// {Segment Load} A virtual DOS machine (VDM) is loading, unloading, or moving an MS-DOS or Win16 program segment image. An exception is raised so a debugger can load, unload or track symbols and breakpoints within these 16-bit segments.
806	1208	pub const SEGMENT_NOTIFICATION = 702;
	1209
807	1210	/// {Invalid Current Directory} The process cannot switch to the startup current directory %hs. Select OK to set current directory to %hs, or select CANCEL to exit.
808	1211	pub const BAD_CURRENT_DIRECTORY = 703;
	1212
809	1213	/// {Redundant Read} To satisfy a read request, the NT fault-tolerant file system successfully read the requested data from a redundant copy. This was done because the file system encountered a failure on a member of the fault-tolerant volume, but was unable to reassign the failing area of the device.
810	1214	pub const FT_READ_RECOVERY_FROM_BACKUP = 704;
	1215
811	1216	/// {Redundant Write} To satisfy a write request, the NT fault-tolerant file system successfully wrote a redundant copy of the information. This was done because the file system encountered a failure on a member of the fault-tolerant volume, but was not able to reassign the failing area of the device.
812	1217	pub const FT_WRITE_RECOVERY = 705;
	1218
813	1219	/// {Machine Type Mismatch} The image file %hs is valid, but is for a machine type other than the current machine. Select OK to continue, or CANCEL to fail the DLL load.
814	1220	pub const IMAGE_MACHINE_TYPE_MISMATCH = 706;
	1221
815	1222	/// {Partial Data Received} The network transport returned partial data to its client. The remaining data will be sent later.
816	1223	pub const RECEIVE_PARTIAL = 707;
	1224
817	1225	/// {Expedited Data Received} The network transport returned data to its client that was marked as expedited by the remote system.
818	1226	pub const RECEIVE_EXPEDITED = 708;
	1227
819	1228	/// {Partial Expedited Data Received} The network transport returned partial data to its client and this data was marked as expedited by the remote system. The remaining data will be sent later.
820	1229	pub const RECEIVE_PARTIAL_EXPEDITED = 709;
	1230
821	1231	/// {TDI Event Done} The TDI indication has completed successfully.
822	1232	pub const EVENT_DONE = 710;
	1233
823	1234	/// {TDI Event Pending} The TDI indication has entered the pending state.
824	1235	pub const EVENT_PENDING = 711;
	1236
825	1237	/// Checking file system on %wZ.
826	1238	pub const CHECKING_FILE_SYSTEM = 712;
	1239
827	1240	/// {Fatal Application Exit} %hs.
828	1241	pub const FATAL_APP_EXIT = 713;
	1242
829	1243	/// The specified registry key is referenced by a predefined handle.
830	1244	pub const PREDEFINED_HANDLE = 714;
	1245
831	1246	/// {Page Unlocked} The page protection of a locked page was changed to 'No Access' and the page was unlocked from memory and from the process.
832	1247	pub const WAS_UNLOCKED = 715;
	1248
833	1249	/// %hs
834	1250	pub const SERVICE_NOTIFICATION = 716;
	1251
835	1252	/// {Page Locked} One of the pages to lock was already locked.
836	1253	pub const WAS_LOCKED = 717;
	1254
837	1255	/// Application popup: %1 : %2
838	1256	pub const LOG_HARD_ERROR = 718;
	1257
839	1258	/// ERROR_ALREADY_WIN32
840	1259	pub const ALREADY_WIN32 = 719;
	1260
841	1261	/// {Machine Type Mismatch} The image file %hs is valid, but is for a machine type other than the current machine.
842	1262	pub const IMAGE_MACHINE_TYPE_MISMATCH_EXE = 720;
	1263
843	1264	/// A yield execution was performed and no thread was available to run.
844	1265	pub const NO_YIELD_PERFORMED = 721;
	1266
845	1267	/// The resumable flag to a timer API was ignored.
846	1268	pub const TIMER_RESUME_IGNORED = 722;
	1269
847	1270	/// The arbiter has deferred arbitration of these resources to its parent.
848	1271	pub const ARBITRATION_UNHANDLED = 723;
	1272
849	1273	/// The inserted CardBus device cannot be started because of a configuration error on "%hs".
850	1274	pub const CARDBUS_NOT_SUPPORTED = 724;
	1275
851	1276	/// The CPUs in this multiprocessor system are not all the same revision level. To use all processors the operating system restricts itself to the features of the least capable processor in the system. Should problems occur with this system, contact the CPU manufacturer to see if this mix of processors is supported.
852	1277	pub const MP_PROCESSOR_MISMATCH = 725;
	1278
853	1279	/// The system was put into hibernation.
854	1280	pub const HIBERNATED = 726;
	1281
855	1282	/// The system was resumed from hibernation.
856	1283	pub const RESUME_HIBERNATION = 727;
	1284
857	1285	/// Windows has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3].
858	1286	pub const FIRMWARE_UPDATED = 728;
	1287
859	1288	/// A device driver is leaking locked I/O pages causing system degradation. The system has automatically enabled tracking code in order to try and catch the culprit.
860	1289	pub const DRIVERS_LEAKING_LOCKED_PAGES = 729;
	1290
861	1291	/// The system has awoken.
862	1292	pub const WAKE_SYSTEM = 730;
	1293
863	1294	/// ERROR_WAIT_1
864	1295	pub const WAIT_1 = 731;
	1296
865	1297	/// ERROR_WAIT_2
866	1298	pub const WAIT_2 = 732;
	1299
867	1300	/// ERROR_WAIT_3
868	1301	pub const WAIT_3 = 733;
	1302
869	1303	/// ERROR_WAIT_63
870	1304	pub const WAIT_63 = 734;
	1305
871	1306	/// ERROR_ABANDONED_WAIT_0
872	1307	pub const ABANDONED_WAIT_0 = 735;
	1308
873	1309	/// ERROR_ABANDONED_WAIT_63
874	1310	pub const ABANDONED_WAIT_63 = 736;
	1311
875	1312	/// ERROR_USER_APC
876	1313	pub const USER_APC = 737;
	1314
877	1315	/// ERROR_KERNEL_APC
878	1316	pub const KERNEL_APC = 738;
	1317
879	1318	/// ERROR_ALERTED
880	1319	pub const ALERTED = 739;
	1320
881	1321	/// The requested operation requires elevation.
882	1322	pub const ELEVATION_REQUIRED = 740;
	1323
883	1324	/// A reparse should be performed by the Object Manager since the name of the file resulted in a symbolic link.
884	1325	pub const REPARSE = 741;
	1326
885	1327	/// An open/create operation completed while an oplock break is underway.
886	1328	pub const OPLOCK_BREAK_IN_PROGRESS = 742;
	1329
887	1330	/// A new volume has been mounted by a file system.
888	1331	pub const VOLUME_MOUNTED = 743;
	1332
889	1333	/// This success level status indicates that the transaction state already exists for the registry sub-tree, but that a transaction commit was previously aborted. The commit has now been completed.
890	1334	pub const RXACT_COMMITTED = 744;
	1335
891	1336	/// This indicates that a notify change request has been completed due to closing the handle which made the notify change request.
892	1337	pub const NOTIFY_CLEANUP = 745;
	1338
893	1339	/// {Connect Failure on Primary Transport} An attempt was made to connect to the remote server %hs on the primary transport, but the connection failed. The computer WAS able to connect on a secondary transport.
894	1340	pub const PRIMARY_TRANSPORT_CONNECT_FAILED = 746;
	1341
895	1342	/// Page fault was a transition fault.
896	1343	pub const PAGE_FAULT_TRANSITION = 747;
	1344
897	1345	/// Page fault was a demand zero fault.
898	1346	pub const PAGE_FAULT_DEMAND_ZERO = 748;
	1347
899	1348	/// Page fault was a demand zero fault.
900	1349	pub const PAGE_FAULT_COPY_ON_WRITE = 749;
	1350
901	1351	/// Page fault was a demand zero fault.
902	1352	pub const PAGE_FAULT_GUARD_PAGE = 750;
	1353
903	1354	/// Page fault was satisfied by reading from a secondary storage device.
904	1355	pub const PAGE_FAULT_PAGING_FILE = 751;
	1356
905	1357	/// Cached page was locked during operation.
906	1358	pub const CACHE_PAGE_LOCKED = 752;
	1359
907	1360	/// Crash dump exists in paging file.
908	1361	pub const CRASH_DUMP = 753;
	1362
909	1363	/// Specified buffer contains all zeros.
910	1364	pub const BUFFER_ALL_ZEROS = 754;
	1365
911	1366	/// A reparse should be performed by the Object Manager since the name of the file resulted in a symbolic link.
912	1367	pub const REPARSE_OBJECT = 755;
	1368
913	1369	/// The device has succeeded a query-stop and its resource requirements have changed.
914	1370	pub const RESOURCE_REQUIREMENTS_CHANGED = 756;
	1371
915	1372	/// The translator has translated these resources into the global space and no further translations should be performed.
916	1373	pub const TRANSLATION_COMPLETE = 757;
	1374
917	1375	/// A process being terminated has no threads to terminate.
918	1376	pub const NOTHING_TO_TERMINATE = 758;
	1377
919	1378	/// The specified process is not part of a job.
920	1379	pub const PROCESS_NOT_IN_JOB = 759;
	1380
921	1381	/// The specified process is part of a job.
922	1382	pub const PROCESS_IN_JOB = 760;
	1383
923	1384	/// {Volume Shadow Copy Service} The system is now ready for hibernation.
924	1385	pub const VOLSNAP_HIBERNATE_READY = 761;
	1386
925	1387	/// A file system or file system filter driver has successfully completed an FsFilter operation.
926	1388	pub const FSFILTER_OP_COMPLETED_SUCCESSFULLY = 762;
	1389
927	1390	/// The specified interrupt vector was already connected.
928	1391	pub const INTERRUPT_VECTOR_ALREADY_CONNECTED = 763;
	1392
929	1393	/// The specified interrupt vector is still connected.
930	1394	pub const INTERRUPT_STILL_CONNECTED = 764;
	1395
931	1396	/// An operation is blocked waiting for an oplock.
932	1397	pub const WAIT_FOR_OPLOCK = 765;
	1398
933	1399	/// Debugger handled exception.
934	1400	pub const DBG_EXCEPTION_HANDLED = 766;
	1401
935	1402	/// Debugger continued.
936	1403	pub const DBG_CONTINUE = 767;
	1404
937	1405	/// An exception occurred in a user mode callback and the kernel callback frame should be removed.
938	1406	pub const CALLBACK_POP_STACK = 768;
	1407
939	1408	/// Compression is disabled for this volume.
940	1409	pub const COMPRESSION_DISABLED = 769;
	1410
941	1411	/// The data provider cannot fetch backwards through a result set.
942	1412	pub const CANTFETCHBACKWARDS = 770;
	1413
943	1414	/// The data provider cannot scroll backwards through a result set.
944	1415	pub const CANTSCROLLBACKWARDS = 771;
	1416
945	1417	/// The data provider requires that previously fetched data is released before asking for more data.
946	1418	pub const ROWSNOTRELEASED = 772;
	1419
947	1420	/// The data provider was not able to interpret the flags set for a column binding in an accessor.
948	1421	pub const BAD_ACCESSOR_FLAGS = 773;
	1422
949	1423	/// One or more errors occurred while processing the request.
950	1424	pub const ERRORS_ENCOUNTERED = 774;
	1425
951	1426	/// The implementation is not capable of performing the request.
952	1427	pub const NOT_CAPABLE = 775;
	1428
953	1429	/// The client of a component requested an operation which is not valid given the state of the component instance.
954	1430	pub const REQUEST_OUT_OF_SEQUENCE = 776;
	1431
955	1432	/// A version number could not be parsed.
956	1433	pub const VERSION_PARSE_ERROR = 777;
	1434
957	1435	/// The iterator's start position is invalid.
958	1436	pub const BADSTARTPOSITION = 778;
	1437
959	1438	/// The hardware has reported an uncorrectable memory error.
960	1439	pub const MEMORY_HARDWARE = 779;
	1440
961	1441	/// The attempted operation required self healing to be enabled.
962	1442	pub const DISK_REPAIR_DISABLED = 780;
	1443
963	1444	/// The Desktop heap encountered an error while allocating session memory. There is more information in the system event log.
964	1445	pub const INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE = 781;
	1446
965	1447	/// The system power state is transitioning from %2 to %3.
966	1448	pub const SYSTEM_POWERSTATE_TRANSITION = 782;
	1449
967	1450	/// The system power state is transitioning from %2 to %3 but could enter %4.
968	1451	pub const SYSTEM_POWERSTATE_COMPLEX_TRANSITION = 783;
	1452
969	1453	/// A thread is getting dispatched with MCA EXCEPTION because of MCA.
970	1454	pub const MCA_EXCEPTION = 784;
	1455
971	1456	/// Access to %1 is monitored by policy rule %2.
972	1457	pub const ACCESS_AUDIT_BY_POLICY = 785;
	1458
973	1459	/// Access to %1 has been restricted by your Administrator by policy rule %2.
974	1460	pub const ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY = 786;
	1461
975	1462	/// A valid hibernation file has been invalidated and should be abandoned.
976	1463	pub const ABANDON_HIBERFILE = 787;
	1464
977	1465	/// {Delayed Write Failed} Windows was unable to save all the data for the file %hs; the data has been lost. This error may be caused by network connectivity issues. Please try to save this file elsewhere.
978	1466	pub const LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED = 788;
	1467
979	1468	/// {Delayed Write Failed} Windows was unable to save all the data for the file %hs; the data has been lost. This error was returned by the server on which the file exists. Please try to save this file elsewhere.
980	1469	pub const LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR = 789;
	1470
981	1471	/// {Delayed Write Failed} Windows was unable to save all the data for the file %hs; the data has been lost. This error may be caused if the device has been removed or the media is write-protected.
982	1472	pub const LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR = 790;
	1473
983	1474	/// The resources required for this device conflict with the MCFG table.
984	1475	pub const BAD_MCFG_TABLE = 791;
	1476
985	1477	/// The volume repair could not be performed while it is online. Please schedule to take the volume offline so that it can be repaired.
986	1478	pub const DISK_REPAIR_REDIRECTED = 792;
	1479
987	1480	/// The volume repair was not successful.
988	1481	pub const DISK_REPAIR_UNSUCCESSFUL = 793;
	1482
989	1483	/// One of the volume corruption logs is full. Further corruptions that may be detected won't be logged.
990	1484	pub const CORRUPT_LOG_OVERFULL = 794;
	1485
991	1486	/// One of the volume corruption logs is internally corrupted and needs to be recreated. The volume may contain undetected corruptions and must be scanned.
992	1487	pub const CORRUPT_LOG_CORRUPTED = 795;
	1488
993	1489	/// One of the volume corruption logs is unavailable for being operated on.
994	1490	pub const CORRUPT_LOG_UNAVAILABLE = 796;
	1491
995	1492	/// One of the volume corruption logs was deleted while still having corruption records in them. The volume contains detected corruptions and must be scanned.
996	1493	pub const CORRUPT_LOG_DELETED_FULL = 797;
	1494
997	1495	/// One of the volume corruption logs was cleared by chkdsk and no longer contains real corruptions.
998	1496	pub const CORRUPT_LOG_CLEARED = 798;
	1497
999	1498	/// Orphaned files exist on the volume but could not be recovered because no more new names could be created in the recovery directory. Files must be moved from the recovery directory.
1000	1499	pub const ORPHAN_NAME_EXHAUSTED = 799;
	1500
1001	1501	/// The oplock that was associated with this handle is now associated with a different handle.
1002	1502	pub const OPLOCK_SWITCHED_TO_NEW_HANDLE = 800;
	1503
1003	1504	/// An oplock of the requested level cannot be granted. An oplock of a lower level may be available.
1004	1505	pub const CANNOT_GRANT_REQUESTED_OPLOCK = 801;
	1506
1005	1507	/// The operation did not complete successfully because it would cause an oplock to be broken. The caller has requested that existing oplocks not be broken.
1006	1508	pub const CANNOT_BREAK_OPLOCK = 802;
	1509
1007	1510	/// The handle with which this oplock was associated has been closed. The oplock is now broken.
1008	1511	pub const OPLOCK_HANDLE_CLOSED = 803;
	1512
1009	1513	/// The specified access control entry (ACE) does not contain a condition.
1010	1514	pub const NO_ACE_CONDITION = 804;
	1515
1011	1516	/// The specified access control entry (ACE) contains an invalid condition.
1012	1517	pub const INVALID_ACE_CONDITION = 805;
	1518
1013	1519	/// Access to the specified file handle has been revoked.
1014	1520	pub const FILE_HANDLE_REVOKED = 806;
	1521
1015	1522	/// An image file was mapped at a different address from the one specified in the image file but fixups will still be automatically performed on the image.
1016	1523	pub const IMAGE_AT_DIFFERENT_BASE = 807;
	1524
1017	1525	/// Access to the extended attribute was denied.
1018	1526	pub const EA_ACCESS_DENIED = 994;
	1527
1019	1528	/// The I/O operation has been aborted because of either a thread exit or an application request.
1020	1529	pub const OPERATION_ABORTED = 995;
	1530
1021	1531	/// Overlapped I/O event is not in a signaled state.
1022	1532	pub const IO_INCOMPLETE = 996;
	1533
1023	1534	/// Overlapped I/O operation is in progress.
1024	1535	pub const IO_PENDING = 997;
	1536
1025	1537	/// Invalid access to memory location.
1026	1538	pub const NOACCESS = 998;
	1539
1027	1540	/// Error performing inpage operation.
1028	1541	pub const SWAPERROR = 999;
	1542
1029	1543	/// Recursion too deep; the stack overflowed.
1030	1544	pub const STACK_OVERFLOW = 1001;
	1545
1031	1546	/// The window cannot act on the sent message.
1032	1547	pub const INVALID_MESSAGE = 1002;
	1548
1033	1549	/// Cannot complete this function.
1034	1550	pub const CAN_NOT_COMPLETE = 1003;
	1551
1035	1552	/// Invalid flags.
1036	1553	pub const INVALID_FLAGS = 1004;
	1554
1037	1555	/// The volume does not contain a recognized file system. Please make sure that all required file system drivers are loaded and that the volume is not corrupted.
1038	1556	pub const UNRECOGNIZED_VOLUME = 1005;
	1557
1039	1558	/// The volume for a file has been externally altered so that the opened file is no longer valid.
1040	1559	pub const FILE_INVALID = 1006;
	1560
1041	1561	/// The requested operation cannot be performed in full-screen mode.
1042	1562	pub const FULLSCREEN_MODE = 1007;
	1563
1043	1564	/// An attempt was made to reference a token that does not exist.
1044	1565	pub const NO_TOKEN = 1008;
	1566
1045	1567	/// The configuration registry database is corrupt.
1046	1568	pub const BADDB = 1009;
	1569
1047	1570	/// The configuration registry key is invalid.
1048	1571	pub const BADKEY = 1010;
	1572
1049	1573	/// The configuration registry key could not be opened.
1050	1574	pub const CANTOPEN = 1011;
	1575
1051	1576	/// The configuration registry key could not be read.
1052	1577	pub const CANTREAD = 1012;
	1578
1053	1579	/// The configuration registry key could not be written.
1054	1580	pub const CANTWRITE = 1013;
	1581
1055	1582	/// One of the files in the registry database had to be recovered by use of a log or alternate copy. The recovery was successful.
1056	1583	pub const REGISTRY_RECOVERED = 1014;
	1584
1057	1585	/// The registry is corrupted. The structure of one of the files containing registry data is corrupted, or the system's memory image of the file is corrupted, or the file could not be recovered because the alternate copy or log was absent or corrupted.
1058	1586	pub const REGISTRY_CORRUPT = 1015;
	1587
1059	1588	/// An I/O operation initiated by the registry failed unrecoverably. The registry could not read in, or write out, or flush, one of the files that contain the system's image of the registry.
1060	1589	pub const REGISTRY_IO_FAILED = 1016;
	1590
1061	1591	/// The system has attempted to load or restore a file into the registry, but the specified file is not in a registry file format.
1062	1592	pub const NOT_REGISTRY_FILE = 1017;
	1593
1063	1594	/// Illegal operation attempted on a registry key that has been marked for deletion.
1064	1595	pub const KEY_DELETED = 1018;
	1596
1065	1597	/// System could not allocate the required space in a registry log.
1066	1598	pub const NO_LOG_SPACE = 1019;
	1599
1067	1600	/// Cannot create a symbolic link in a registry key that already has subkeys or values.
1068	1601	pub const KEY_HAS_CHILDREN = 1020;
	1602
1069	1603	/// Cannot create a stable subkey under a volatile parent key.
1070	1604	pub const CHILD_MUST_BE_VOLATILE = 1021;
	1605
1071	1606	/// A notify change request is being completed and the information is not being returned in the caller's buffer. The caller now needs to enumerate the files to find the changes.
1072	1607	pub const NOTIFY_ENUM_DIR = 1022;
	1608
1073	1609	/// A stop control has been sent to a service that other running services are dependent on.
1074	1610	pub const DEPENDENT_SERVICES_RUNNING = 1051;
	1611
1075	1612	/// The requested control is not valid for this service.
1076	1613	pub const INVALID_SERVICE_CONTROL = 1052;
	1614
1077	1615	/// The service did not respond to the start or control request in a timely fashion.
1078	1616	pub const SERVICE_REQUEST_TIMEOUT = 1053;
	1617
1079	1618	/// A thread could not be created for the service.
1080	1619	pub const SERVICE_NO_THREAD = 1054;
	1620
1081	1621	/// The service database is locked.
1082	1622	pub const SERVICE_DATABASE_LOCKED = 1055;
	1623
1083	1624	/// An instance of the service is already running.
1084	1625	pub const SERVICE_ALREADY_RUNNING = 1056;
	1626
1085	1627	/// The account name is invalid or does not exist, or the password is invalid for the account name specified.
1086	1628	pub const INVALID_SERVICE_ACCOUNT = 1057;
	1629
1087	1630	/// The service cannot be started, either because it is disabled or because it has no enabled devices associated with it.
1088	1631	pub const SERVICE_DISABLED = 1058;
	1632
1089	1633	/// Circular service dependency was specified.
1090	1634	pub const CIRCULAR_DEPENDENCY = 1059;
	1635
1091	1636	/// The specified service does not exist as an installed service.
1092	1637	pub const SERVICE_DOES_NOT_EXIST = 1060;
	1638
1093	1639	/// The service cannot accept control messages at this time.
1094	1640	pub const SERVICE_CANNOT_ACCEPT_CTRL = 1061;
	1641
1095	1642	/// The service has not been started.
1096	1643	pub const SERVICE_NOT_ACTIVE = 1062;
	1644
1097	1645	/// The service process could not connect to the service controller.
1098	1646	pub const FAILED_SERVICE_CONTROLLER_CONNECT = 1063;
	1647
1099	1648	/// An exception occurred in the service when handling the control request.
1100	1649	pub const EXCEPTION_IN_SERVICE = 1064;
	1650
1101	1651	/// The database specified does not exist.
1102	1652	pub const DATABASE_DOES_NOT_EXIST = 1065;
	1653
1103	1654	/// The service has returned a service-specific error code.
1104	1655	pub const SERVICE_SPECIFIC_ERROR = 1066;
	1656
1105	1657	/// The process terminated unexpectedly.
1106	1658	pub const PROCESS_ABORTED = 1067;
	1659
1107	1660	/// The dependency service or group failed to start.
1108	1661	pub const SERVICE_DEPENDENCY_FAIL = 1068;
	1662
1109	1663	/// The service did not start due to a logon failure.
1110	1664	pub const SERVICE_LOGON_FAILED = 1069;
	1665
1111	1666	/// After starting, the service hung in a start-pending state.
1112	1667	pub const SERVICE_START_HANG = 1070;
	1668
1113	1669	/// The specified service database lock is invalid.
1114	1670	pub const INVALID_SERVICE_LOCK = 1071;
	1671
1115	1672	/// The specified service has been marked for deletion.
1116	1673	pub const SERVICE_MARKED_FOR_DELETE = 1072;
	1674
1117	1675	/// The specified service already exists.
1118	1676	pub const SERVICE_EXISTS = 1073;
	1677
1119	1678	/// The system is currently running with the last-known-good configuration.
1120	1679	pub const ALREADY_RUNNING_LKG = 1074;
	1680
1121	1681	/// The dependency service does not exist or has been marked for deletion.
1122	1682	pub const SERVICE_DEPENDENCY_DELETED = 1075;
	1683
1123	1684	/// The current boot has already been accepted for use as the last-known-good control set.
1124	1685	pub const BOOT_ALREADY_ACCEPTED = 1076;
	1686
1125	1687	/// No attempts to start the service have been made since the last boot.
1126	1688	pub const SERVICE_NEVER_STARTED = 1077;
	1689
1127	1690	/// The name is already in use as either a service name or a service display name.
1128	1691	pub const DUPLICATE_SERVICE_NAME = 1078;
	1692
1129	1693	/// The account specified for this service is different from the account specified for other services running in the same process.
1130	1694	pub const DIFFERENT_SERVICE_ACCOUNT = 1079;
	1695
1131	1696	/// Failure actions can only be set for Win32 services, not for drivers.
1132	1697	pub const CANNOT_DETECT_DRIVER_FAILURE = 1080;
	1698
1133	1699	/// This service runs in the same process as the service control manager. Therefore, the service control manager cannot take action if this service's process terminates unexpectedly.
1134	1700	pub const CANNOT_DETECT_PROCESS_ABORT = 1081;
	1701
1135	1702	/// No recovery program has been configured for this service.
1136	1703	pub const NO_RECOVERY_PROGRAM = 1082;
	1704
1137	1705	/// The executable program that this service is configured to run in does not implement the service.
1138	1706	pub const SERVICE_NOT_IN_EXE = 1083;
	1707
1139	1708	/// This service cannot be started in Safe Mode.
1140	1709	pub const NOT_SAFEBOOT_SERVICE = 1084;
	1710
1141	1711	/// The physical end of the tape has been reached.
1142	1712	pub const END_OF_MEDIA = 1100;
	1713
1143	1714	/// A tape access reached a filemark.
1144	1715	pub const FILEMARK_DETECTED = 1101;
	1716
1145	1717	/// The beginning of the tape or a partition was encountered.
1146	1718	pub const BEGINNING_OF_MEDIA = 1102;
	1719
1147	1720	/// A tape access reached the end of a set of files.
1148	1721	pub const SETMARK_DETECTED = 1103;
	1722
1149	1723	/// No more data is on the tape.
1150	1724	pub const NO_DATA_DETECTED = 1104;
	1725
1151	1726	/// Tape could not be partitioned.
1152	1727	pub const PARTITION_FAILURE = 1105;
	1728
1153	1729	/// When accessing a new tape of a multivolume partition, the current block size is incorrect.
1154	1730	pub const INVALID_BLOCK_LENGTH = 1106;
	1731
1155	1732	/// Tape partition information could not be found when loading a tape.
1156	1733	pub const DEVICE_NOT_PARTITIONED = 1107;
	1734
1157	1735	/// Unable to lock the media eject mechanism.
1158	1736	pub const UNABLE_TO_LOCK_MEDIA = 1108;
	1737
1159	1738	/// Unable to unload the media.
1160	1739	pub const UNABLE_TO_UNLOAD_MEDIA = 1109;
	1740
1161	1741	/// The media in the drive may have changed.
1162	1742	pub const MEDIA_CHANGED = 1110;
	1743
1163	1744	/// The I/O bus was reset.
1164	1745	pub const BUS_RESET = 1111;
	1746
1165	1747	/// No media in drive.
1166	1748	pub const NO_MEDIA_IN_DRIVE = 1112;
	1749
1167	1750	/// No mapping for the Unicode character exists in the target multi-byte code page.
1168	1751	pub const NO_UNICODE_TRANSLATION = 1113;
	1752
1169	1753	/// A dynamic link library (DLL) initialization routine failed.
1170	1754	pub const DLL_INIT_FAILED = 1114;
	1755
1171	1756	/// A system shutdown is in progress.
1172	1757	pub const SHUTDOWN_IN_PROGRESS = 1115;
	1758
1173	1759	/// Unable to abort the system shutdown because no shutdown was in progress.
1174	1760	pub const NO_SHUTDOWN_IN_PROGRESS = 1116;
	1761
1175	1762	/// The request could not be performed because of an I/O device error.
1176	1763	pub const IO_DEVICE = 1117;
	1764
1177	1765	/// No serial device was successfully initialized. The serial driver will unload.
1178	1766	pub const SERIAL_NO_DEVICE = 1118;
	1767
1179	1768	/// Unable to open a device that was sharing an interrupt request (IRQ) with other devices. At least one other device that uses that IRQ was already opened.
1180	1769	pub const IRQ_BUSY = 1119;
	1770
1181	1771	/// A serial I/O operation was completed by another write to the serial port. The IOCTL_SERIAL_XOFF_COUNTER reached zero.)
1182	1772	pub const MORE_WRITES = 1120;
	1773
1183	1774	/// A serial I/O operation completed because the timeout period expired. The IOCTL_SERIAL_XOFF_COUNTER did not reach zero.)
1184	1775	pub const COUNTER_TIMEOUT = 1121;
	1776
1185	1777	/// No ID address mark was found on the floppy disk.
1186	1778	pub const FLOPPY_ID_MARK_NOT_FOUND = 1122;
	1779
1187	1780	/// Mismatch between the floppy disk sector ID field and the floppy disk controller track address.
1188	1781	pub const FLOPPY_WRONG_CYLINDER = 1123;
	1782
1189	1783	/// The floppy disk controller reported an error that is not recognized by the floppy disk driver.
1190	1784	pub const FLOPPY_UNKNOWN_ERROR = 1124;
	1785
1191	1786	/// The floppy disk controller returned inconsistent results in its registers.
1192	1787	pub const FLOPPY_BAD_REGISTERS = 1125;
	1788
1193	1789	/// While accessing the hard disk, a recalibrate operation failed, even after retries.
1194	1790	pub const DISK_RECALIBRATE_FAILED = 1126;
	1791
1195	1792	/// While accessing the hard disk, a disk operation failed even after retries.
1196	1793	pub const DISK_OPERATION_FAILED = 1127;
	1794
1197	1795	/// While accessing the hard disk, a disk controller reset was needed, but even that failed.
1198	1796	pub const DISK_RESET_FAILED = 1128;
	1797
1199	1798	/// Physical end of tape encountered.
1200	1799	pub const EOM_OVERFLOW = 1129;
	1800
1201	1801	/// Not enough server storage is available to process this command.
1202	1802	pub const NOT_ENOUGH_SERVER_MEMORY = 1130;
	1803
1203	1804	/// A potential deadlock condition has been detected.
1204	1805	pub const POSSIBLE_DEADLOCK = 1131;
	1806
1205	1807	/// The base address or the file offset specified does not have the proper alignment.
1206	1808	pub const MAPPED_ALIGNMENT = 1132;
	1809
1207	1810	/// An attempt to change the system power state was vetoed by another application or driver.
1208	1811	pub const SET_POWER_STATE_VETOED = 1140;
	1812
1209	1813	/// The system BIOS failed an attempt to change the system power state.
1210	1814	pub const SET_POWER_STATE_FAILED = 1141;
	1815
1211	1816	/// An attempt was made to create more links on a file than the file system supports.
1212	1817	pub const TOO_MANY_LINKS = 1142;
	1818
1213	1819	/// The specified program requires a newer version of Windows.
1214	1820	pub const OLD_WIN_VERSION = 1150;
	1821
1215	1822	/// The specified program is not a Windows or MS-DOS program.
1216	1823	pub const APP_WRONG_OS = 1151;
	1824
1217	1825	/// Cannot start more than one instance of the specified program.
1218	1826	pub const SINGLE_INSTANCE_APP = 1152;
	1827
1219	1828	/// The specified program was written for an earlier version of Windows.
1220	1829	pub const RMODE_APP = 1153;
	1830
1221	1831	/// One of the library files needed to run this application is damaged.
1222	1832	pub const INVALID_DLL = 1154;
	1833
1223	1834	/// No application is associated with the specified file for this operation.
1224	1835	pub const NO_ASSOCIATION = 1155;
	1836
1225	1837	/// An error occurred in sending the command to the application.
1226	1838	pub const DDE_FAIL = 1156;
	1839
1227	1840	/// One of the library files needed to run this application cannot be found.
1228	1841	pub const DLL_NOT_FOUND = 1157;
	1842
1229	1843	/// The current process has used all of its system allowance of handles for Window Manager objects.
1230	1844	pub const NO_MORE_USER_HANDLES = 1158;
	1845
1231	1846	/// The message can be used only with synchronous operations.
1232	1847	pub const MESSAGE_SYNC_ONLY = 1159;
	1848
1233	1849	/// The indicated source element has no media.
1234	1850	pub const SOURCE_ELEMENT_EMPTY = 1160;
	1851
1235	1852	/// The indicated destination element already contains media.
1236	1853	pub const DESTINATION_ELEMENT_FULL = 1161;
	1854
1237	1855	/// The indicated element does not exist.
1238	1856	pub const ILLEGAL_ELEMENT_ADDRESS = 1162;
	1857
1239	1858	/// The indicated element is part of a magazine that is not present.
1240	1859	pub const MAGAZINE_NOT_PRESENT = 1163;
	1860
1241	1861	/// The indicated device requires reinitialization due to hardware errors.
1242	1862	pub const DEVICE_REINITIALIZATION_NEEDED = 1164;
	1863
1243	1864	/// The device has indicated that cleaning is required before further operations are attempted.
1244	1865	pub const DEVICE_REQUIRES_CLEANING = 1165;
	1866
1245	1867	/// The device has indicated that its door is open.
1246	1868	pub const DEVICE_DOOR_OPEN = 1166;
	1869
1247	1870	/// The device is not connected.
1248	1871	pub const DEVICE_NOT_CONNECTED = 1167;
	1872
1249	1873	/// Element not found.
1250	1874	pub const NOT_FOUND = 1168;
	1875
1251	1876	/// There was no match for the specified key in the index.
1252	1877	pub const NO_MATCH = 1169;
	1878
1253	1879	/// The property set specified does not exist on the object.
1254	1880	pub const SET_NOT_FOUND = 1170;
	1881
1255	1882	/// The point passed to GetMouseMovePoints is not in the buffer.
1256	1883	pub const POINT_NOT_FOUND = 1171;
	1884
1257	1885	/// The tracking (workstation) service is not running.
1258	1886	pub const NO_TRACKING_SERVICE = 1172;
	1887
1259	1888	/// The Volume ID could not be found.
1260	1889	pub const NO_VOLUME_ID = 1173;
	1890
1261	1891	/// Unable to remove the file to be replaced.
1262	1892	pub const UNABLE_TO_REMOVE_REPLACED = 1175;
	1893
1263	1894	/// Unable to move the replacement file to the file to be replaced. The file to be replaced has retained its original name.
1264	1895	pub const UNABLE_TO_MOVE_REPLACEMENT = 1176;
	1896
1265	1897	/// Unable to move the replacement file to the file to be replaced. The file to be replaced has been renamed using the backup name.
1266	1898	pub const UNABLE_TO_MOVE_REPLACEMENT_2 = 1177;
	1899
1267	1900	/// The volume change journal is being deleted.
1268	1901	pub const JOURNAL_DELETE_IN_PROGRESS = 1178;
	1902
1269	1903	/// The volume change journal is not active.
1270	1904	pub const JOURNAL_NOT_ACTIVE = 1179;
	1905
1271	1906	/// A file was found, but it may not be the correct file.
1272	1907	pub const POTENTIAL_FILE_FOUND = 1180;
	1908
1273	1909	/// The journal entry has been deleted from the journal.
1274	1910	pub const JOURNAL_ENTRY_DELETED = 1181;
	1911
1275	1912	/// A system shutdown has already been scheduled.
1276	1913	pub const SHUTDOWN_IS_SCHEDULED = 1190;
	1914
1277	1915	/// The system shutdown cannot be initiated because there are other users logged on to the computer.
1278	1916	pub const SHUTDOWN_USERS_LOGGED_ON = 1191;
	1917
1279	1918	/// The specified device name is invalid.
1280	1919	pub const BAD_DEVICE = 1200;
	1920
1281	1921	/// The device is not currently connected but it is a remembered connection.
1282	1922	pub const CONNECTION_UNAVAIL = 1201;
	1923
1283	1924	/// The local device name has a remembered connection to another network resource.
1284	1925	pub const DEVICE_ALREADY_REMEMBERED = 1202;
	1926
1285	1927	/// The network path was either typed incorrectly, does not exist, or the network provider is not currently available. Please try retyping the path or contact your network administrator.
1286	1928	pub const NO_NET_OR_BAD_PATH = 1203;
	1929
1287	1930	/// The specified network provider name is invalid.
1288	1931	pub const BAD_PROVIDER = 1204;
	1932
1289	1933	/// Unable to open the network connection profile.
1290	1934	pub const CANNOT_OPEN_PROFILE = 1205;
	1935
1291	1936	/// The network connection profile is corrupted.
1292	1937	pub const BAD_PROFILE = 1206;
	1938
1293	1939	/// Cannot enumerate a noncontainer.
1294	1940	pub const NOT_CONTAINER = 1207;
	1941
1295	1942	/// An extended error has occurred.
1296	1943	pub const EXTENDED_ERROR = 1208;
	1944
1297	1945	/// The format of the specified group name is invalid.
1298	1946	pub const INVALID_GROUPNAME = 1209;
	1947
1299	1948	/// The format of the specified computer name is invalid.
1300	1949	pub const INVALID_COMPUTERNAME = 1210;
	1950
1301	1951	/// The format of the specified event name is invalid.
1302	1952	pub const INVALID_EVENTNAME = 1211;
	1953
1303	1954	/// The format of the specified domain name is invalid.
1304	1955	pub const INVALID_DOMAINNAME = 1212;
	1956
1305	1957	/// The format of the specified service name is invalid.
1306	1958	pub const INVALID_SERVICENAME = 1213;
	1959
1307	1960	/// The format of the specified network name is invalid.
1308	1961	pub const INVALID_NETNAME = 1214;
	1962
1309	1963	/// The format of the specified share name is invalid.
1310	1964	pub const INVALID_SHARENAME = 1215;
	1965
1311	1966	/// The format of the specified password is invalid.
1312	1967	pub const INVALID_PASSWORDNAME = 1216;
	1968
1313	1969	/// The format of the specified message name is invalid.
1314	1970	pub const INVALID_MESSAGENAME = 1217;
	1971
1315	1972	/// The format of the specified message destination is invalid.
1316	1973	pub const INVALID_MESSAGEDEST = 1218;
	1974
1317	1975	/// Multiple connections to a server or shared resource by the same user, using more than one user name, are not allowed. Disconnect all previous connections to the server or shared resource and try again.
1318	1976	pub const SESSION_CREDENTIAL_CONFLICT = 1219;
	1977
1319	1978	/// An attempt was made to establish a session to a network server, but there are already too many sessions established to that server.
1320	1979	pub const REMOTE_SESSION_LIMIT_EXCEEDED = 1220;
	1980
1321	1981	/// The workgroup or domain name is already in use by another computer on the network.
1322	1982	pub const DUP_DOMAINNAME = 1221;
	1983
1323	1984	/// The network is not present or not started.
1324	1985	pub const NO_NETWORK = 1222;
	1986
1325	1987	/// The operation was canceled by the user.
1326	1988	pub const CANCELLED = 1223;
	1989
1327	1990	/// The requested operation cannot be performed on a file with a user-mapped section open.
1328	1991	pub const USER_MAPPED_FILE = 1224;
	1992
1329	1993	/// The remote computer refused the network connection.
1330	1994	pub const CONNECTION_REFUSED = 1225;
	1995
1331	1996	/// The network connection was gracefully closed.
1332	1997	pub const GRACEFUL_DISCONNECT = 1226;
	1998
1333	1999	/// The network transport endpoint already has an address associated with it.
1334	2000	pub const ADDRESS_ALREADY_ASSOCIATED = 1227;
	2001
1335	2002	/// An address has not yet been associated with the network endpoint.
1336	2003	pub const ADDRESS_NOT_ASSOCIATED = 1228;
	2004
1337	2005	/// An operation was attempted on a nonexistent network connection.
1338	2006	pub const CONNECTION_INVALID = 1229;
	2007
1339	2008	/// An invalid operation was attempted on an active network connection.
1340	2009	pub const CONNECTION_ACTIVE = 1230;
	2010
1341	2011	/// The network location cannot be reached. For information about network troubleshooting, see Windows Help.
1342	2012	pub const NETWORK_UNREACHABLE = 1231;
	2013
1343	2014	/// The network location cannot be reached. For information about network troubleshooting, see Windows Help.
1344	2015	pub const HOST_UNREACHABLE = 1232;
	2016
1345	2017	/// The network location cannot be reached. For information about network troubleshooting, see Windows Help.
1346	2018	pub const PROTOCOL_UNREACHABLE = 1233;
	2019
1347	2020	/// No service is operating at the destination network endpoint on the remote system.
1348	2021	pub const PORT_UNREACHABLE = 1234;
	2022
1349	2023	/// The request was aborted.
1350	2024	pub const REQUEST_ABORTED = 1235;
	2025
1351	2026	/// The network connection was aborted by the local system.
1352	2027	pub const CONNECTION_ABORTED = 1236;
	2028
1353	2029	/// The operation could not be completed. A retry should be performed.
1354	2030	pub const RETRY = 1237;
	2031
1355	2032	/// A connection to the server could not be made because the limit on the number of concurrent connections for this account has been reached.
1356	2033	pub const CONNECTION_COUNT_LIMIT = 1238;
	2034
1357	2035	/// Attempting to log in during an unauthorized time of day for this account.
1358	2036	pub const LOGIN_TIME_RESTRICTION = 1239;
	2037
1359	2038	/// The account is not authorized to log in from this station.
1360	2039	pub const LOGIN_WKSTA_RESTRICTION = 1240;
	2040
1361	2041	/// The network address could not be used for the operation requested.
1362	2042	pub const INCORRECT_ADDRESS = 1241;
	2043
1363	2044	/// The service is already registered.
1364	2045	pub const ALREADY_REGISTERED = 1242;
	2046
1365	2047	/// The specified service does not exist.
1366	2048	pub const SERVICE_NOT_FOUND = 1243;
	2049
1367	2050	/// The operation being requested was not performed because the user has not been authenticated.
1368	2051	pub const NOT_AUTHENTICATED = 1244;
	2052
1369	2053	/// The operation being requested was not performed because the user has not logged on to the network. The specified service does not exist.
1370	2054	pub const NOT_LOGGED_ON = 1245;
	2055
1371	2056	/// Continue with work in progress.
1372	2057	pub const CONTINUE = 1246;
	2058
1373	2059	/// An attempt was made to perform an initialization operation when initialization has already been completed.
1374	2060	pub const ALREADY_INITIALIZED = 1247;
	2061
1375	2062	/// No more local devices.
1376	2063	pub const NO_MORE_DEVICES = 1248;
	2064
1377	2065	/// The specified site does not exist.
1378	2066	pub const NO_SUCH_SITE = 1249;
	2067
1379	2068	/// A domain controller with the specified name already exists.
1380	2069	pub const DOMAIN_CONTROLLER_EXISTS = 1250;
	2070
1381	2071	/// This operation is supported only when you are connected to the server.
1382	2072	pub const ONLY_IF_CONNECTED = 1251;
	2073
1383	2074	/// The group policy framework should call the extension even if there are no changes.
1384	2075	pub const OVERRIDE_NOCHANGES = 1252;
	2076
1385	2077	/// The specified user does not have a valid profile.
1386	2078	pub const BAD_USER_PROFILE = 1253;
	2079
1387	2080	/// This operation is not supported on a computer running Windows Server 2003 for Small Business Server.
1388	2081	pub const NOT_SUPPORTED_ON_SBS = 1254;
	2082
1389	2083	/// The server machine is shutting down.
1390	2084	pub const SERVER_SHUTDOWN_IN_PROGRESS = 1255;
	2085
1391	2086	/// The remote system is not available. For information about network troubleshooting, see Windows Help.
1392	2087	pub const HOST_DOWN = 1256;
	2088
1393	2089	/// The security identifier provided is not from an account domain.
1394	2090	pub const NON_ACCOUNT_SID = 1257;
	2091
1395	2092	/// The security identifier provided does not have a domain component.
1396	2093	pub const NON_DOMAIN_SID = 1258;
	2094
1397	2095	/// AppHelp dialog canceled thus preventing the application from starting.
1398	2096	pub const APPHELP_BLOCK = 1259;
	2097
1399	2098	/// This program is blocked by group policy. For more information, contact your system administrator.
1400	2099	pub const ACCESS_DISABLED_BY_POLICY = 1260;
	2100
1401	2101	/// A program attempt to use an invalid register value. Normally caused by an uninitialized register. This error is Itanium specific.
1402	2102	pub const REG_NAT_CONSUMPTION = 1261;
	2103
1403	2104	/// The share is currently offline or does not exist.
1404	2105	pub const CSCSHARE_OFFLINE = 1262;
	2106
1405	2107	/// The Kerberos protocol encountered an error while validating the KDC certificate during smartcard logon. There is more information in the system event log.
1406	2108	pub const PKINIT_FAILURE = 1263;
	2109
1407	2110	/// The Kerberos protocol encountered an error while attempting to utilize the smartcard subsystem.
1408	2111	pub const SMARTCARD_SUBSYSTEM_FAILURE = 1264;
	2112
1409	2113	/// The system cannot contact a domain controller to service the authentication request. Please try again later.
1410	2114	pub const DOWNGRADE_DETECTED = 1265;
	2115
1411	2116	/// The machine is locked and cannot be shut down without the force option.
1412	2117	pub const MACHINE_LOCKED = 1271;
	2118
1413	2119	/// An application-defined callback gave invalid data when called.
1414	2120	pub const CALLBACK_SUPPLIED_INVALID_DATA = 1273;
	2121
1415	2122	/// The group policy framework should call the extension in the synchronous foreground policy refresh.
1416	2123	pub const SYNC_FOREGROUND_REFRESH_REQUIRED = 1274;
	2124
1417	2125	/// This driver has been blocked from loading.
1418	2126	pub const DRIVER_BLOCKED = 1275;
	2127
1419	2128	/// A dynamic link library (DLL) referenced a module that was neither a DLL nor the process's executable image.
1420	2129	pub const INVALID_IMPORT_OF_NON_DLL = 1276;
	2130
1421	2131	/// Windows cannot open this program since it has been disabled.
1422	2132	pub const ACCESS_DISABLED_WEBBLADE = 1277;
	2133
1423	2134	/// Windows cannot open this program because the license enforcement system has been tampered with or become corrupted.
1424	2135	pub const ACCESS_DISABLED_WEBBLADE_TAMPER = 1278;
	2136
1425	2137	/// A transaction recover failed.
1426	2138	pub const RECOVERY_FAILURE = 1279;
	2139
1427	2140	/// The current thread has already been converted to a fiber.
1428	2141	pub const ALREADY_FIBER = 1280;
	2142
1429	2143	/// The current thread has already been converted from a fiber.
1430	2144	pub const ALREADY_THREAD = 1281;
	2145
1431	2146	/// The system detected an overrun of a stack-based buffer in this application. This overrun could potentially allow a malicious user to gain control of this application.
1432	2147	pub const STACK_BUFFER_OVERRUN = 1282;
	2148
1433	2149	/// Data present in one of the parameters is more than the function can operate on.
1434	2150	pub const PARAMETER_QUOTA_EXCEEDED = 1283;
	2151
1435	2152	/// An attempt to do an operation on a debug object failed because the object is in the process of being deleted.
1436	2153	pub const DEBUGGER_INACTIVE = 1284;
	2154
1437	2155	/// An attempt to delay-load a .dll or get a function address in a delay-loaded .dll failed.
1438	2156	pub const DELAY_LOAD_FAILED = 1285;
	2157
1439	2158	/// %1 is a 16-bit application. You do not have permissions to execute 16-bit applications. Check your permissions with your system administrator.
1440	2159	pub const VDM_DISALLOWED = 1286;
	2160
1441	2161	/// Insufficient information exists to identify the cause of failure.
1442	2162	pub const UNIDENTIFIED_ERROR = 1287;
	2163
1443	2164	/// The parameter passed to a C runtime function is incorrect.
1444	2165	pub const INVALID_CRUNTIME_PARAMETER = 1288;
	2166
1445	2167	/// The operation occurred beyond the valid data length of the file.
1446	2168	pub const BEYOND_VDL = 1289;
	2169
1447	2170	/// The service start failed since one or more services in the same process have an incompatible service SID type setting. A service with restricted service SID type can only coexist in the same process with other services with a restricted SID type. If the service SID type for this service was just configured, the hosting process must be restarted in order to start this service.
1448	2171	/// On Windows Server 2003 and Windows XP, an unrestricted service cannot coexist in the same process with other services. The service with the unrestricted service SID type must be moved to an owned process in order to start this service.
1449	2172	pub const INCOMPATIBLE_SERVICE_SID_TYPE = 1290;
	2173
1450	2174	/// The process hosting the driver for this device has been terminated.
1451	2175	pub const DRIVER_PROCESS_TERMINATED = 1291;
	2176
1452	2177	/// An operation attempted to exceed an implementation-defined limit.
1453	2178	pub const IMPLEMENTATION_LIMIT = 1292;
	2179
1454	2180	/// Either the target process, or the target thread's containing process, is a protected process.
1455	2181	pub const PROCESS_IS_PROTECTED = 1293;
	2182
1456	2183	/// The service notification client is lagging too far behind the current state of services in the machine.
1457	2184	pub const SERVICE_NOTIFY_CLIENT_LAGGING = 1294;
	2185
1458	2186	/// The requested file operation failed because the storage quota was exceeded. To free up disk space, move files to a different location or delete unnecessary files. For more information, contact your system administrator.
1459	2187	pub const DISK_QUOTA_EXCEEDED = 1295;
	2188
1460	2189	/// The requested file operation failed because the storage policy blocks that type of file. For more information, contact your system administrator.
1461	2190	pub const CONTENT_BLOCKED = 1296;
	2191
1462	2192	/// A privilege that the service requires to function properly does not exist in the service account configuration. You may use the Services Microsoft Management Console (MMC) snap-in (services.msc) and the Local Security Settings MMC snap-in (secpol.msc) to view the service configuration and the account configuration.
1463	2193	pub const INCOMPATIBLE_SERVICE_PRIVILEGE = 1297;
	2194
1464	2195	/// A thread involved in this operation appears to be unresponsive.
1465	2196	pub const APP_HANG = 1298;
	2197
1466	2198	/// Indicates a particular Security ID may not be assigned as the label of an object.
1467	2199	pub const INVALID_LABEL = 1299;
	2200
1468	2201	/// Not all privileges or groups referenced are assigned to the caller.
1469	2202	pub const NOT_ALL_ASSIGNED = 1300;
	2203
1470	2204	/// Some mapping between account names and security IDs was not done.
1471	2205	pub const SOME_NOT_MAPPED = 1301;
	2206
1472	2207	/// No system quota limits are specifically set for this account.
1473	2208	pub const NO_QUOTAS_FOR_ACCOUNT = 1302;
	2209
1474	2210	/// No encryption key is available. A well-known encryption key was returned.
1475	2211	pub const LOCAL_USER_SESSION_KEY = 1303;
	2212
1476	2213	/// The password is too complex to be converted to a LAN Manager password. The LAN Manager password returned is a NULL string.
1477	2214	pub const NULL_LM_PASSWORD = 1304;
	2215
1478	2216	/// The revision level is unknown.
1479	2217	pub const UNKNOWN_REVISION = 1305;
	2218
1480	2219	/// Indicates two revision levels are incompatible.
1481	2220	pub const REVISION_MISMATCH = 1306;
	2221
1482	2222	/// This security ID may not be assigned as the owner of this object.
1483	2223	pub const INVALID_OWNER = 1307;
	2224
1484	2225	/// This security ID may not be assigned as the primary group of an object.
1485	2226	pub const INVALID_PRIMARY_GROUP = 1308;
	2227
1486	2228	/// An attempt has been made to operate on an impersonation token by a thread that is not currently impersonating a client.
1487	2229	pub const NO_IMPERSONATION_TOKEN = 1309;
	2230
1488	2231	/// The group may not be disabled.
1489	2232	pub const CANT_DISABLE_MANDATORY = 1310;
	2233
1490	2234	/// There are currently no logon servers available to service the logon request.
1491	2235	pub const NO_LOGON_SERVERS = 1311;
	2236
1492	2237	/// A specified logon session does not exist. It may already have been terminated.
1493	2238	pub const NO_SUCH_LOGON_SESSION = 1312;
	2239
1494	2240	/// A specified privilege does not exist.
1495	2241	pub const NO_SUCH_PRIVILEGE = 1313;
	2242
1496	2243	/// A required privilege is not held by the client.
1497	2244	pub const PRIVILEGE_NOT_HELD = 1314;
	2245
1498	2246	/// The name provided is not a properly formed account name.
1499	2247	pub const INVALID_ACCOUNT_NAME = 1315;
	2248
1500	2249	/// The specified account already exists.
1501	2250	pub const USER_EXISTS = 1316;
	2251
1502	2252	/// The specified account does not exist.
1503	2253	pub const NO_SUCH_USER = 1317;
	2254
1504	2255	/// The specified group already exists.
1505	2256	pub const GROUP_EXISTS = 1318;
	2257
1506	2258	/// The specified group does not exist.
1507	2259	pub const NO_SUCH_GROUP = 1319;
	2260
1508	2261	/// Either the specified user account is already a member of the specified group, or the specified group cannot be deleted because it contains a member.
1509	2262	pub const MEMBER_IN_GROUP = 1320;
	2263
1510	2264	/// The specified user account is not a member of the specified group account.
1511	2265	pub const MEMBER_NOT_IN_GROUP = 1321;
	2266
1512	2267	/// This operation is disallowed as it could result in an administration account being disabled, deleted or unable to log on.
1513	2268	pub const LAST_ADMIN = 1322;
	2269
1514	2270	/// Unable to update the password. The value provided as the current password is incorrect.
1515	2271	pub const WRONG_PASSWORD = 1323;
	2272
1516	2273	/// Unable to update the password. The value provided for the new password contains values that are not allowed in passwords.
1517	2274	pub const ILL_FORMED_PASSWORD = 1324;
	2275
1518	2276	/// Unable to update the password. The value provided for the new password does not meet the length, complexity, or history requirements of the domain.
1519	2277	pub const PASSWORD_RESTRICTION = 1325;
	2278
1520	2279	/// The user name or password is incorrect.
1521	2280	pub const LOGON_FAILURE = 1326;
	2281
1522	2282	/// Account restrictions are preventing this user from signing in. For example: blank passwords aren't allowed, sign-in times are limited, or a policy restriction has been enforced.
1523	2283	pub const ACCOUNT_RESTRICTION = 1327;
	2284
1524	2285	/// Your account has time restrictions that keep you from signing in right now.
1525	2286	pub const INVALID_LOGON_HOURS = 1328;
	2287
1526	2288	/// This user isn't allowed to sign in to this computer.
1527	2289	pub const INVALID_WORKSTATION = 1329;
	2290
1528	2291	/// The password for this account has expired.
1529	2292	pub const PASSWORD_EXPIRED = 1330;
	2293
1530	2294	/// This user can't sign in because this account is currently disabled.
1531	2295	pub const ACCOUNT_DISABLED = 1331;
	2296
1532	2297	/// No mapping between account names and security IDs was done.
1533	2298	pub const NONE_MAPPED = 1332;
	2299
1534	2300	/// Too many local user identifiers (LUIDs) were requested at one time.
1535	2301	pub const TOO_MANY_LUIDS_REQUESTED = 1333;
	2302
1536	2303	/// No more local user identifiers (LUIDs) are available.
1537	2304	pub const LUIDS_EXHAUSTED = 1334;
	2305
1538	2306	/// The subauthority part of a security ID is invalid for this particular use.
1539	2307	pub const INVALID_SUB_AUTHORITY = 1335;
	2308
1540	2309	/// The access control list (ACL) structure is invalid.
1541	2310	pub const INVALID_ACL = 1336;
	2311
1542	2312	/// The security ID structure is invalid.
1543	2313	pub const INVALID_SID = 1337;
	2314
1544	2315	/// The security descriptor structure is invalid.
1545	2316	pub const INVALID_SECURITY_DESCR = 1338;
	2317
1546	2318	/// The inherited access control list (ACL) or access control entry (ACE) could not be built.
1547	2319	pub const BAD_INHERITANCE_ACL = 1340;
	2320
1548	2321	/// The server is currently disabled.
1549	2322	pub const SERVER_DISABLED = 1341;
	2323
1550	2324	/// The server is currently enabled.
1551	2325	pub const SERVER_NOT_DISABLED = 1342;
	2326
1552	2327	/// The value provided was an invalid value for an identifier authority.
1553	2328	pub const INVALID_ID_AUTHORITY = 1343;
	2329
1554	2330	/// No more memory is available for security information updates.
1555	2331	pub const ALLOTTED_SPACE_EXCEEDED = 1344;
	2332
1556	2333	/// The specified attributes are invalid, or incompatible with the attributes for the group as a whole.
1557	2334	pub const INVALID_GROUP_ATTRIBUTES = 1345;
	2335
1558	2336	/// Either a required impersonation level was not provided, or the provided impersonation level is invalid.
1559	2337	pub const BAD_IMPERSONATION_LEVEL = 1346;
	2338
1560	2339	/// Cannot open an anonymous level security token.
1561	2340	pub const CANT_OPEN_ANONYMOUS = 1347;
	2341
1562	2342	/// The validation information class requested was invalid.
1563	2343	pub const BAD_VALIDATION_CLASS = 1348;
	2344
1564	2345	/// The type of the token is inappropriate for its attempted use.
1565	2346	pub const BAD_TOKEN_TYPE = 1349;
	2347
1566	2348	/// Unable to perform a security operation on an object that has no associated security.
1567	2349	pub const NO_SECURITY_ON_OBJECT = 1350;
	2350
1568	2351	/// Configuration information could not be read from the domain controller, either because the machine is unavailable, or access has been denied.
1569	2352	pub const CANT_ACCESS_DOMAIN_INFO = 1351;
	2353
1570	2354	/// The security account manager (SAM) or local security authority (LSA) server was in the wrong state to perform the security operation.
1571	2355	pub const INVALID_SERVER_STATE = 1352;
	2356
1572	2357	/// The domain was in the wrong state to perform the security operation.
1573	2358	pub const INVALID_DOMAIN_STATE = 1353;
	2359
1574	2360	/// This operation is only allowed for the Primary Domain Controller of the domain.
1575	2361	pub const INVALID_DOMAIN_ROLE = 1354;
	2362
1576	2363	/// The specified domain either does not exist or could not be contacted.
1577	2364	pub const NO_SUCH_DOMAIN = 1355;
	2365
1578	2366	/// The specified domain already exists.
1579	2367	pub const DOMAIN_EXISTS = 1356;
	2368
1580	2369	/// An attempt was made to exceed the limit on the number of domains per server.
1581	2370	pub const DOMAIN_LIMIT_EXCEEDED = 1357;
	2371
1582	2372	/// Unable to complete the requested operation because of either a catastrophic media failure or a data structure corruption on the disk.
1583	2373	pub const INTERNAL_DB_CORRUPTION = 1358;
	2374
1584	2375	/// An internal error occurred.
1585	2376	pub const INTERNAL_ERROR = 1359;
	2377
1586	2378	/// Generic access types were contained in an access mask which should already be mapped to nongeneric types.
1587	2379	pub const GENERIC_NOT_MAPPED = 1360;
	2380
1588	2381	/// A security descriptor is not in the right format (absolute or self-relative).
1589	2382	pub const BAD_DESCRIPTOR_FORMAT = 1361;
	2383
1590	2384	/// The requested action is restricted for use by logon processes only. The calling process has not registered as a logon process.
1591	2385	pub const NOT_LOGON_PROCESS = 1362;
	2386
1592	2387	/// Cannot start a new logon session with an ID that is already in use.
1593	2388	pub const LOGON_SESSION_EXISTS = 1363;
	2389
1594	2390	/// A specified authentication package is unknown.
1595	2391	pub const NO_SUCH_PACKAGE = 1364;
	2392
1596	2393	/// The logon session is not in a state that is consistent with the requested operation.
1597	2394	pub const BAD_LOGON_SESSION_STATE = 1365;
	2395
1598	2396	/// The logon session ID is already in use.
1599	2397	pub const LOGON_SESSION_COLLISION = 1366;
	2398
1600	2399	/// A logon request contained an invalid logon type value.
1601	2400	pub const INVALID_LOGON_TYPE = 1367;
	2401
1602	2402	/// Unable to impersonate using a named pipe until data has been read from that pipe.
1603	2403	pub const CANNOT_IMPERSONATE = 1368;
	2404
1604	2405	/// The transaction state of a registry subtree is incompatible with the requested operation.
1605	2406	pub const RXACT_INVALID_STATE = 1369;
	2407
1606	2408	/// An internal security database corruption has been encountered.
1607	2409	pub const RXACT_COMMIT_FAILURE = 1370;
	2410
1608	2411	/// Cannot perform this operation on built-in accounts.
1609	2412	pub const SPECIAL_ACCOUNT = 1371;
	2413
1610	2414	/// Cannot perform this operation on this built-in special group.
1611	2415	pub const SPECIAL_GROUP = 1372;
	2416
1612	2417	/// Cannot perform this operation on this built-in special user.
1613	2418	pub const SPECIAL_USER = 1373;
	2419
1614	2420	/// The user cannot be removed from a group because the group is currently the user's primary group.
1615	2421	pub const MEMBERS_PRIMARY_GROUP = 1374;
	2422
1616	2423	/// The token is already in use as a primary token.
1617	2424	pub const TOKEN_ALREADY_IN_USE = 1375;
	2425
1618	2426	/// The specified local group does not exist.
1619	2427	pub const NO_SUCH_ALIAS = 1376;
	2428
1620	2429	/// The specified account name is not a member of the group.
1621	2430	pub const MEMBER_NOT_IN_ALIAS = 1377;
	2431
1622	2432	/// The specified account name is already a member of the group.
1623	2433	pub const MEMBER_IN_ALIAS = 1378;
	2434
1624	2435	/// The specified local group already exists.
1625	2436	pub const ALIAS_EXISTS = 1379;
	2437
1626	2438	/// Logon failure: the user has not been granted the requested logon type at this computer.
1627	2439	pub const LOGON_NOT_GRANTED = 1380;
	2440
1628	2441	/// The maximum number of secrets that may be stored in a single system has been exceeded.
1629	2442	pub const TOO_MANY_SECRETS = 1381;
	2443
1630	2444	/// The length of a secret exceeds the maximum length allowed.
1631	2445	pub const SECRET_TOO_LONG = 1382;
	2446
1632	2447	/// The local security authority database contains an internal inconsistency.
1633	2448	pub const INTERNAL_DB_ERROR = 1383;
	2449
1634	2450	/// During a logon attempt, the user's security context accumulated too many security IDs.
1635	2451	pub const TOO_MANY_CONTEXT_IDS = 1384;
	2452
1636	2453	/// Logon failure: the user has not been granted the requested logon type at this computer.
1637	2454	pub const LOGON_TYPE_NOT_GRANTED = 1385;
	2455
1638	2456	/// A cross-encrypted password is necessary to change a user password.
1639	2457	pub const NT_CROSS_ENCRYPTION_REQUIRED = 1386;
	2458
1640	2459	/// A member could not be added to or removed from the local group because the member does not exist.
1641	2460	pub const NO_SUCH_MEMBER = 1387;
	2461
1642	2462	/// A new member could not be added to a local group because the member has the wrong account type.
1643	2463	pub const INVALID_MEMBER = 1388;
	2464
1644	2465	/// Too many security IDs have been specified.
1645	2466	pub const TOO_MANY_SIDS = 1389;
	2467
1646	2468	/// A cross-encrypted password is necessary to change this user password.
1647	2469	pub const LM_CROSS_ENCRYPTION_REQUIRED = 1390;
	2470
1648	2471	/// Indicates an ACL contains no inheritable components.
1649	2472	pub const NO_INHERITANCE = 1391;
	2473
1650	2474	/// The file or directory is corrupted and unreadable.
1651	2475	pub const FILE_CORRUPT = 1392;
	2476
1652	2477	/// The disk structure is corrupted and unreadable.
1653	2478	pub const DISK_CORRUPT = 1393;
	2479
1654	2480	/// There is no user session key for the specified logon session.
1655	2481	pub const NO_USER_SESSION_KEY = 1394;
	2482
1656	2483	/// The service being accessed is licensed for a particular number of connections. No more connections can be made to the service at this time because there are already as many connections as the service can accept.
1657	2484	pub const LICENSE_QUOTA_EXCEEDED = 1395;
	2485
1658	2486	/// The target account name is incorrect.
1659	2487	pub const WRONG_TARGET_NAME = 1396;
	2488
1660	2489	/// Mutual Authentication failed. The server's password is out of date at the domain controller.
1661	2490	pub const MUTUAL_AUTH_FAILED = 1397;
	2491
1662	2492	/// There is a time and/or date difference between the client and server.
1663	2493	pub const TIME_SKEW = 1398;
	2494
1664	2495	/// This operation cannot be performed on the current domain.
1665	2496	pub const CURRENT_DOMAIN_NOT_ALLOWED = 1399;
	2497
1666	2498	/// Invalid window handle.
1667	2499	pub const INVALID_WINDOW_HANDLE = 1400;
	2500
1668	2501	/// Invalid menu handle.
1669	2502	pub const INVALID_MENU_HANDLE = 1401;
	2503
1670	2504	/// Invalid cursor handle.
1671	2505	pub const INVALID_CURSOR_HANDLE = 1402;
	2506
1672	2507	/// Invalid accelerator table handle.
1673	2508	pub const INVALID_ACCEL_HANDLE = 1403;
	2509
1674	2510	/// Invalid hook handle.
1675	2511	pub const INVALID_HOOK_HANDLE = 1404;
	2512
1676	2513	/// Invalid handle to a multiple-window position structure.
1677	2514	pub const INVALID_DWP_HANDLE = 1405;
	2515
1678	2516	/// Cannot create a top-level child window.
1679	2517	pub const TLW_WITH_WSCHILD = 1406;
	2518
1680	2519	/// Cannot find window class.
1681	2520	pub const CANNOT_FIND_WND_CLASS = 1407;
	2521
1682	2522	/// Invalid window; it belongs to other thread.
1683	2523	pub const WINDOW_OF_OTHER_THREAD = 1408;
	2524
1684	2525	/// Hot key is already registered.
1685	2526	pub const HOTKEY_ALREADY_REGISTERED = 1409;
	2527
1686	2528	/// Class already exists.
1687	2529	pub const CLASS_ALREADY_EXISTS = 1410;
	2530
1688	2531	/// Class does not exist.
1689	2532	pub const CLASS_DOES_NOT_EXIST = 1411;
	2533
1690	2534	/// Class still has open windows.
1691	2535	pub const CLASS_HAS_WINDOWS = 1412;
	2536
1692	2537	/// Invalid index.
1693	2538	pub const INVALID_INDEX = 1413;
	2539
1694	2540	/// Invalid icon handle.
1695	2541	pub const INVALID_ICON_HANDLE = 1414;
	2542
1696	2543	/// Using private DIALOG window words.
1697	2544	pub const PRIVATE_DIALOG_INDEX = 1415;
	2545
1698	2546	/// The list box identifier was not found.
1699	2547	pub const LISTBOX_ID_NOT_FOUND = 1416;
	2548
1700	2549	/// No wildcards were found.
1701	2550	pub const NO_WILDCARD_CHARACTERS = 1417;
	2551
1702	2552	/// Thread does not have a clipboard open.
1703	2553	pub const CLIPBOARD_NOT_OPEN = 1418;
	2554
1704	2555	/// Hot key is not registered.
1705	2556	pub const HOTKEY_NOT_REGISTERED = 1419;
	2557
1706	2558	/// The window is not a valid dialog window.
1707	2559	pub const WINDOW_NOT_DIALOG = 1420;
	2560
1708	2561	/// Control ID not found.
1709	2562	pub const CONTROL_ID_NOT_FOUND = 1421;
	2563
1710	2564	/// Invalid message for a combo box because it does not have an edit control.
1711	2565	pub const INVALID_COMBOBOX_MESSAGE = 1422;
	2566
1712	2567	/// The window is not a combo box.
1713	2568	pub const WINDOW_NOT_COMBOBOX = 1423;
	2569
1714	2570	/// Height must be less than 256.
1715	2571	pub const INVALID_EDIT_HEIGHT = 1424;
	2572
1716	2573	/// Invalid device context (DC) handle.
1717	2574	pub const DC_NOT_FOUND = 1425;
	2575
1718	2576	/// Invalid hook procedure type.
1719	2577	pub const INVALID_HOOK_FILTER = 1426;
	2578
1720	2579	/// Invalid hook procedure.
1721	2580	pub const INVALID_FILTER_PROC = 1427;
	2581
1722	2582	/// Cannot set nonlocal hook without a module handle.
1723	2583	pub const HOOK_NEEDS_HMOD = 1428;
	2584
1724	2585	/// This hook procedure can only be set globally.
1725	2586	pub const GLOBAL_ONLY_HOOK = 1429;
	2587
1726	2588	/// The journal hook procedure is already installed.
1727	2589	pub const JOURNAL_HOOK_SET = 1430;
	2590
1728	2591	/// The hook procedure is not installed.
1729	2592	pub const HOOK_NOT_INSTALLED = 1431;
	2593
1730	2594	/// Invalid message for single-selection list box.
1731	2595	pub const INVALID_LB_MESSAGE = 1432;
	2596
1732	2597	/// LB_SETCOUNT sent to non-lazy list box.
1733	2598	pub const SETCOUNT_ON_BAD_LB = 1433;
	2599
1734	2600	/// This list box does not support tab stops.
1735	2601	pub const LB_WITHOUT_TABSTOPS = 1434;
	2602
1736	2603	/// Cannot destroy object created by another thread.
1737	2604	pub const DESTROY_OBJECT_OF_OTHER_THREAD = 1435;
	2605
1738	2606	/// Child windows cannot have menus.
1739	2607	pub const CHILD_WINDOW_MENU = 1436;
	2608
1740	2609	/// The window does not have a system menu.
1741	2610	pub const NO_SYSTEM_MENU = 1437;
	2611
1742	2612	/// Invalid message box style.
1743	2613	pub const INVALID_MSGBOX_STYLE = 1438;
	2614
1744	2615	/// Invalid system-wide (SPI_*) parameter.
1745	2616	pub const INVALID_SPI_VALUE = 1439;
	2617
1746	2618	/// Screen already locked.
1747	2619	pub const SCREEN_ALREADY_LOCKED = 1440;
	2620
1748	2621	/// All handles to windows in a multiple-window position structure must have the same parent.
1749	2622	pub const HWNDS_HAVE_DIFF_PARENT = 1441;
	2623
1750	2624	/// The window is not a child window.
1751	2625	pub const NOT_CHILD_WINDOW = 1442;
	2626
1752	2627	/// Invalid GW_* command.
1753	2628	pub const INVALID_GW_COMMAND = 1443;
	2629
1754	2630	/// Invalid thread identifier.
1755	2631	pub const INVALID_THREAD_ID = 1444;
	2632
1756	2633	/// Cannot process a message from a window that is not a multiple document interface (MDI) window.
1757	2634	pub const NON_MDICHILD_WINDOW = 1445;
	2635
1758	2636	/// Popup menu already active.
1759	2637	pub const POPUP_ALREADY_ACTIVE = 1446;
	2638
1760	2639	/// The window does not have scroll bars.
1761	2640	pub const NO_SCROLLBARS = 1447;
	2641
1762	2642	/// Scroll bar range cannot be greater than MAXLONG.
1763	2643	pub const INVALID_SCROLLBAR_RANGE = 1448;
	2644
1764	2645	/// Cannot show or remove the window in the way specified.
1765	2646	pub const INVALID_SHOWWIN_COMMAND = 1449;
	2647
1766	2648	/// Insufficient system resources exist to complete the requested service.
1767	2649	pub const NO_SYSTEM_RESOURCES = 1450;
	2650
1768	2651	/// Insufficient system resources exist to complete the requested service.
1769	2652	pub const NONPAGED_SYSTEM_RESOURCES = 1451;
	2653
1770	2654	/// Insufficient system resources exist to complete the requested service.
1771	2655	pub const PAGED_SYSTEM_RESOURCES = 1452;
	2656
1772	2657	/// Insufficient quota to complete the requested service.
1773	2658	pub const WORKING_SET_QUOTA = 1453;
	2659
1774	2660	/// Insufficient quota to complete the requested service.
1775	2661	pub const PAGEFILE_QUOTA = 1454;
	2662
1776	2663	/// The paging file is too small for this operation to complete.
1777	2664	pub const COMMITMENT_LIMIT = 1455;
	2665
1778	2666	/// A menu item was not found.
1779	2667	pub const MENU_ITEM_NOT_FOUND = 1456;
	2668
1780	2669	/// Invalid keyboard layout handle.
1781	2670	pub const INVALID_KEYBOARD_HANDLE = 1457;
	2671
1782	2672	/// Hook type not allowed.
1783	2673	pub const HOOK_TYPE_NOT_ALLOWED = 1458;
	2674
1784	2675	/// This operation requires an interactive window station.
1785	2676	pub const REQUIRES_INTERACTIVE_WINDOWSTATION = 1459;
	2677
1786	2678	/// This operation returned because the timeout period expired.
1787	2679	pub const TIMEOUT = 1460;
	2680
1788	2681	/// Invalid monitor handle.
1789	2682	pub const INVALID_MONITOR_HANDLE = 1461;
	2683
1790	2684	/// Incorrect size argument.
1791	2685	pub const INCORRECT_SIZE = 1462;
	2686
1792	2687	/// The symbolic link cannot be followed because its type is disabled.
1793	2688	pub const SYMLINK_CLASS_DISABLED = 1463;
	2689
1794	2690	/// This application does not support the current operation on symbolic links.
1795	2691	pub const SYMLINK_NOT_SUPPORTED = 1464;
	2692
1796	2693	/// Windows was unable to parse the requested XML data.
1797	2694	pub const XML_PARSE_ERROR = 1465;
	2695
1798	2696	/// An error was encountered while processing an XML digital signature.
1799	2697	pub const XMLDSIG_ERROR = 1466;
	2698
1800	2699	/// This application must be restarted.
1801	2700	pub const RESTART_APPLICATION = 1467;
	2701
1802	2702	/// The caller made the connection request in the wrong routing compartment.
1803	2703	pub const WRONG_COMPARTMENT = 1468;
	2704
1804	2705	/// There was an AuthIP failure when attempting to connect to the remote host.
1805	2706	pub const AUTHIP_FAILURE = 1469;
	2707
1806	2708	/// Insufficient NVRAM resources exist to complete the requested service. A reboot might be required.
1807	2709	pub const NO_NVRAM_RESOURCES = 1470;
	2710
1808	2711	/// Unable to finish the requested operation because the specified process is not a GUI process.
1809	2712	pub const NOT_GUI_PROCESS = 1471;
	2713
1810	2714	/// The event log file is corrupted.
1811	2715	pub const EVENTLOG_FILE_CORRUPT = 1500;
	2716
1812	2717	/// No event log file could be opened, so the event logging service did not start.
1813	2718	pub const EVENTLOG_CANT_START = 1501;
	2719
1814	2720	/// The event log file is full.
1815	2721	pub const LOG_FILE_FULL = 1502;
	2722
1816	2723	/// The event log file has changed between read operations.
1817	2724	pub const EVENTLOG_FILE_CHANGED = 1503;
	2725
1818	2726	/// The specified task name is invalid.
1819	2727	pub const INVALID_TASK_NAME = 1550;
	2728
1820	2729	/// The specified task index is invalid.
1821	2730	pub const INVALID_TASK_INDEX = 1551;
	2731
1822	2732	/// The specified thread is already joining a task.
1823	2733	pub const THREAD_ALREADY_IN_TASK = 1552;
	2734
1824	2735	/// The Windows Installer Service could not be accessed. This can occur if the Windows Installer is not correctly installed. Contact your support personnel for assistance.
1825	2736	pub const INSTALL_SERVICE_FAILURE = 1601;
	2737
1826	2738	/// User cancelled installation.
1827	2739	pub const INSTALL_USEREXIT = 1602;
	2740
1828	2741	/// Fatal error during installation.
1829	2742	pub const INSTALL_FAILURE = 1603;
	2743
1830	2744	/// Installation suspended, incomplete.
1831	2745	pub const INSTALL_SUSPEND = 1604;
	2746
1832	2747	/// This action is only valid for products that are currently installed.
1833	2748	pub const UNKNOWN_PRODUCT = 1605;
	2749
1834	2750	/// Feature ID not registered.
1835	2751	pub const UNKNOWN_FEATURE = 1606;
	2752
1836	2753	/// Component ID not registered.
1837	2754	pub const UNKNOWN_COMPONENT = 1607;
	2755
1838	2756	/// Unknown property.
1839	2757	pub const UNKNOWN_PROPERTY = 1608;
	2758
1840	2759	/// Handle is in an invalid state.
1841	2760	pub const INVALID_HANDLE_STATE = 1609;
	2761
1842	2762	/// The configuration data for this product is corrupt. Contact your support personnel.
1843	2763	pub const BAD_CONFIGURATION = 1610;
	2764
1844	2765	/// Component qualifier not present.
1845	2766	pub const INDEX_ABSENT = 1611;
	2767
1846	2768	/// The installation source for this product is not available. Verify that the source exists and that you can access it.
1847	2769	pub const INSTALL_SOURCE_ABSENT = 1612;
	2770
1848	2771	/// This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.
1849	2772	pub const INSTALL_PACKAGE_VERSION = 1613;
	2773
1850	2774	/// Product is uninstalled.
1851	2775	pub const PRODUCT_UNINSTALLED = 1614;
	2776
1852	2777	/// SQL query syntax invalid or unsupported.
1853	2778	pub const BAD_QUERY_SYNTAX = 1615;
	2779
1854	2780	/// Record field does not exist.
1855	2781	pub const INVALID_FIELD = 1616;
	2782
1856	2783	/// The device has been removed.
1857	2784	pub const DEVICE_REMOVED = 1617;
	2785
1858	2786	/// Another installation is already in progress. Complete that installation before proceeding with this install.
1859	2787	pub const INSTALL_ALREADY_RUNNING = 1618;
	2788
1860	2789	/// This installation package could not be opened. Verify that the package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer package.
1861	2790	pub const INSTALL_PACKAGE_OPEN_FAILED = 1619;
	2791
1862	2792	/// This installation package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer package.
1863	2793	pub const INSTALL_PACKAGE_INVALID = 1620;
	2794
1864	2795	/// There was an error starting the Windows Installer service user interface. Contact your support personnel.
1865	2796	pub const INSTALL_UI_FAILURE = 1621;
	2797
1866	2798	/// Error opening installation log file. Verify that the specified log file location exists and that you can write to it.
1867	2799	pub const INSTALL_LOG_FAILURE = 1622;
	2800
1868	2801	/// The language of this installation package is not supported by your system.
1869	2802	pub const INSTALL_LANGUAGE_UNSUPPORTED = 1623;
	2803
1870	2804	/// Error applying transforms. Verify that the specified transform paths are valid.
1871	2805	pub const INSTALL_TRANSFORM_FAILURE = 1624;
	2806
1872	2807	/// This installation is forbidden by system policy. Contact your system administrator.
1873	2808	pub const INSTALL_PACKAGE_REJECTED = 1625;
	2809
1874	2810	/// Function could not be executed.
1875	2811	pub const FUNCTION_NOT_CALLED = 1626;
	2812
1876	2813	/// Function failed during execution.
1877	2814	pub const FUNCTION_FAILED = 1627;
	2815
1878	2816	/// Invalid or unknown table specified.
1879	2817	pub const INVALID_TABLE = 1628;
	2818
1880	2819	/// Data supplied is of wrong type.
1881	2820	pub const DATATYPE_MISMATCH = 1629;
	2821
1882	2822	/// Data of this type is not supported.
1883	2823	pub const UNSUPPORTED_TYPE = 1630;
	2824
1884	2825	/// The Windows Installer service failed to start. Contact your support personnel.
1885	2826	pub const CREATE_FAILED = 1631;
	2827
1886	2828	/// The Temp folder is on a drive that is full or is inaccessible. Free up space on the drive or verify that you have write permission on the Temp folder.
1887	2829	pub const INSTALL_TEMP_UNWRITABLE = 1632;
	2830
1888	2831	/// This installation package is not supported by this processor type. Contact your product vendor.
1889	2832	pub const INSTALL_PLATFORM_UNSUPPORTED = 1633;
	2833
1890	2834	/// Component not used on this computer.
1891	2835	pub const INSTALL_NOTUSED = 1634;
	2836
1892	2837	/// This update package could not be opened. Verify that the update package exists and that you can access it, or contact the application vendor to verify that this is a valid Windows Installer update package.
1893	2838	pub const PATCH_PACKAGE_OPEN_FAILED = 1635;
	2839
1894	2840	/// This update package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer update package.
1895	2841	pub const PATCH_PACKAGE_INVALID = 1636;
	2842
1896	2843	/// This update package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service.
1897	2844	pub const PATCH_PACKAGE_UNSUPPORTED = 1637;
	2845
1898	2846	/// Another version of this product is already installed. Installation of this version cannot continue. To configure or remove the existing version of this product, use Add/Remove Programs on the Control Panel.
1899	2847	pub const PRODUCT_VERSION = 1638;
	2848
1900	2849	/// Invalid command line argument. Consult the Windows Installer SDK for detailed command line help.
1901	2850	pub const INVALID_COMMAND_LINE = 1639;
	2851
1902	2852	/// Only administrators have permission to add, remove, or configure server software during a Terminal services remote session. If you want to install or configure software on the server, contact your network administrator.
1903	2853	pub const INSTALL_REMOTE_DISALLOWED = 1640;
	2854
1904	2855	/// The requested operation completed successfully. The system will be restarted so the changes can take effect.
1905	2856	pub const SUCCESS_REBOOT_INITIATED = 1641;
	2857
1906	2858	/// The upgrade cannot be installed by the Windows Installer service because the program to be upgraded may be missing, or the upgrade may update a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade.
1907	2859	pub const PATCH_TARGET_NOT_FOUND = 1642;
	2860
1908	2861	/// The update package is not permitted by software restriction policy.
1909	2862	pub const PATCH_PACKAGE_REJECTED = 1643;
	2863
1910	2864	/// One or more customizations are not permitted by software restriction policy.
1911	2865	pub const INSTALL_TRANSFORM_REJECTED = 1644;
	2866
1912	2867	/// The Windows Installer does not permit installation from a Remote Desktop Connection.
1913	2868	pub const INSTALL_REMOTE_PROHIBITED = 1645;
	2869
1914	2870	/// Uninstallation of the update package is not supported.
1915	2871	pub const PATCH_REMOVAL_UNSUPPORTED = 1646;
	2872
1916	2873	/// The update is not applied to this product.
1917	2874	pub const UNKNOWN_PATCH = 1647;
	2875
1918	2876	/// No valid sequence could be found for the set of updates.
1919	2877	pub const PATCH_NO_SEQUENCE = 1648;
	2878
1920	2879	/// Update removal was disallowed by policy.
1921	2880	pub const PATCH_REMOVAL_DISALLOWED = 1649;
	2881
1922	2882	/// The XML update data is invalid.
1923	2883	pub const INVALID_PATCH_XML = 1650;
	2884
1924	2885	/// Windows Installer does not permit updating of managed advertised products. At least one feature of the product must be installed before applying the update.
1925	2886	pub const PATCH_MANAGED_ADVERTISED_PRODUCT = 1651;
	2887
1926	2888	/// The Windows Installer service is not accessible in Safe Mode. Please try again when your computer is not in Safe Mode or you can use System Restore to return your machine to a previous good state.
1927	2889	pub const INSTALL_SERVICE_SAFEBOOT = 1652;
	2890
1928	2891	/// A fail fast exception occurred. Exception handlers will not be invoked and the process will be terminated immediately.
1929	2892	pub const FAIL_FAST_EXCEPTION = 1653;
	2893
1930	2894	/// The app that you are trying to run is not supported on this version of Windows.
1931	2895	pub const INSTALL_REJECTED = 1654;
	2896
1932	2897	/// The string binding is invalid.
1933	2898	pub const RPC_S_INVALID_STRING_BINDING = 1700;
	2899
1934	2900	/// The binding handle is not the correct type.
1935	2901	pub const RPC_S_WRONG_KIND_OF_BINDING = 1701;
	2902
1936	2903	/// The binding handle is invalid.
1937	2904	pub const RPC_S_INVALID_BINDING = 1702;
	2905
1938	2906	/// The RPC protocol sequence is not supported.
1939	2907	pub const RPC_S_PROTSEQ_NOT_SUPPORTED = 1703;
	2908
1940	2909	/// The RPC protocol sequence is invalid.
1941	2910	pub const RPC_S_INVALID_RPC_PROTSEQ = 1704;
	2911
1942	2912	/// The string universal unique identifier (UUID) is invalid.
1943	2913	pub const RPC_S_INVALID_STRING_UUID = 1705;
	2914
1944	2915	/// The endpoint format is invalid.
1945	2916	pub const RPC_S_INVALID_ENDPOINT_FORMAT = 1706;
	2917
1946	2918	/// The network address is invalid.
1947	2919	pub const RPC_S_INVALID_NET_ADDR = 1707;
	2920
1948	2921	/// No endpoint was found.
1949	2922	pub const RPC_S_NO_ENDPOINT_FOUND = 1708;
	2923
1950	2924	/// The timeout value is invalid.
1951	2925	pub const RPC_S_INVALID_TIMEOUT = 1709;
	2926
1952	2927	/// The object universal unique identifier (UUID) was not found.
1953	2928	pub const RPC_S_OBJECT_NOT_FOUND = 1710;
	2929
1954	2930	/// The object universal unique identifier (UUID) has already been registered.
1955	2931	pub const RPC_S_ALREADY_REGISTERED = 1711;
	2932
1956	2933	/// The type universal unique identifier (UUID) has already been registered.
1957	2934	pub const RPC_S_TYPE_ALREADY_REGISTERED = 1712;
	2935
1958	2936	/// The RPC server is already listening.
1959	2937	pub const RPC_S_ALREADY_LISTENING = 1713;
	2938
1960	2939	/// No protocol sequences have been registered.
1961	2940	pub const RPC_S_NO_PROTSEQS_REGISTERED = 1714;
	2941
1962	2942	/// The RPC server is not listening.
1963	2943	pub const RPC_S_NOT_LISTENING = 1715;
	2944
1964	2945	/// The manager type is unknown.
1965	2946	pub const RPC_S_UNKNOWN_MGR_TYPE = 1716;
	2947
1966	2948	/// The interface is unknown.
1967	2949	pub const RPC_S_UNKNOWN_IF = 1717;
	2950
1968	2951	/// There are no bindings.
1969	2952	pub const RPC_S_NO_BINDINGS = 1718;
	2953
1970	2954	/// There are no protocol sequences.
1971	2955	pub const RPC_S_NO_PROTSEQS = 1719;
	2956
1972	2957	/// The endpoint cannot be created.
1973	2958	pub const RPC_S_CANT_CREATE_ENDPOINT = 1720;
	2959
1974	2960	/// Not enough resources are available to complete this operation.
1975	2961	pub const RPC_S_OUT_OF_RESOURCES = 1721;
	2962
1976	2963	/// The RPC server is unavailable.
1977	2964	pub const RPC_S_SERVER_UNAVAILABLE = 1722;
	2965
1978	2966	/// The RPC server is too busy to complete this operation.
1979	2967	pub const RPC_S_SERVER_TOO_BUSY = 1723;
	2968
1980	2969	/// The network options are invalid.
1981	2970	pub const RPC_S_INVALID_NETWORK_OPTIONS = 1724;
	2971
1982	2972	/// There are no remote procedure calls active on this thread.
1983	2973	pub const RPC_S_NO_CALL_ACTIVE = 1725;
	2974
1984	2975	/// The remote procedure call failed.
1985	2976	pub const RPC_S_CALL_FAILED = 1726;
	2977
1986	2978	/// The remote procedure call failed and did not execute.
1987	2979	pub const RPC_S_CALL_FAILED_DNE = 1727;
	2980
1988	2981	/// A remote procedure call (RPC) protocol error occurred.
1989	2982	pub const RPC_S_PROTOCOL_ERROR = 1728;
	2983
1990	2984	/// Access to the HTTP proxy is denied.
1991	2985	pub const RPC_S_PROXY_ACCESS_DENIED = 1729;
	2986
1992	2987	/// The transfer syntax is not supported by the RPC server.
1993	2988	pub const RPC_S_UNSUPPORTED_TRANS_SYN = 1730;
	2989
1994	2990	/// The universal unique identifier (UUID) type is not supported.
1995	2991	pub const RPC_S_UNSUPPORTED_TYPE = 1732;
	2992
1996	2993	/// The tag is invalid.
1997	2994	pub const RPC_S_INVALID_TAG = 1733;
	2995
1998	2996	/// The array bounds are invalid.
1999	2997	pub const RPC_S_INVALID_BOUND = 1734;
	2998
2000	2999	/// The binding does not contain an entry name.
2001	3000	pub const RPC_S_NO_ENTRY_NAME = 1735;
	3001
2002	3002	/// The name syntax is invalid.
2003	3003	pub const RPC_S_INVALID_NAME_SYNTAX = 1736;
	3004
2004	3005	/// The name syntax is not supported.
2005	3006	pub const RPC_S_UNSUPPORTED_NAME_SYNTAX = 1737;
	3007
2006	3008	/// No network address is available to use to construct a universal unique identifier (UUID).
2007	3009	pub const RPC_S_UUID_NO_ADDRESS = 1739;
	3010
2008	3011	/// The endpoint is a duplicate.
2009	3012	pub const RPC_S_DUPLICATE_ENDPOINT = 1740;
	3013
2010	3014	/// The authentication type is unknown.
2011	3015	pub const RPC_S_UNKNOWN_AUTHN_TYPE = 1741;
	3016
2012	3017	/// The maximum number of calls is too small.
2013	3018	pub const RPC_S_MAX_CALLS_TOO_SMALL = 1742;
	3019
2014	3020	/// The string is too long.
2015	3021	pub const RPC_S_STRING_TOO_LONG = 1743;
	3022
2016	3023	/// The RPC protocol sequence was not found.
2017	3024	pub const RPC_S_PROTSEQ_NOT_FOUND = 1744;
	3025
2018	3026	/// The procedure number is out of range.
2019	3027	pub const RPC_S_PROCNUM_OUT_OF_RANGE = 1745;
	3028
2020	3029	/// The binding does not contain any authentication information.
2021	3030	pub const RPC_S_BINDING_HAS_NO_AUTH = 1746;
	3031
2022	3032	/// The authentication service is unknown.
2023	3033	pub const RPC_S_UNKNOWN_AUTHN_SERVICE = 1747;
	3034
2024	3035	/// The authentication level is unknown.
2025	3036	pub const RPC_S_UNKNOWN_AUTHN_LEVEL = 1748;
	3037
2026	3038	/// The security context is invalid.
2027	3039	pub const RPC_S_INVALID_AUTH_IDENTITY = 1749;
	3040
2028	3041	/// The authorization service is unknown.
2029	3042	pub const RPC_S_UNKNOWN_AUTHZ_SERVICE = 1750;
	3043
2030	3044	/// The entry is invalid.
2031	3045	pub const EPT_S_INVALID_ENTRY = 1751;
	3046
2032	3047	/// The server endpoint cannot perform the operation.
2033	3048	pub const EPT_S_CANT_PERFORM_OP = 1752;
	3049
2034	3050	/// There are no more endpoints available from the endpoint mapper.
2035	3051	pub const EPT_S_NOT_REGISTERED = 1753;
	3052
2036	3053	/// No interfaces have been exported.
2037	3054	pub const RPC_S_NOTHING_TO_EXPORT = 1754;
	3055
2038	3056	/// The entry name is incomplete.
2039	3057	pub const RPC_S_INCOMPLETE_NAME = 1755;
	3058
2040	3059	/// The version option is invalid.
2041	3060	pub const RPC_S_INVALID_VERS_OPTION = 1756;
	3061
2042	3062	/// There are no more members.
2043	3063	pub const RPC_S_NO_MORE_MEMBERS = 1757;
	3064
2044	3065	/// There is nothing to unexport.
2045	3066	pub const RPC_S_NOT_ALL_OBJS_UNEXPORTED = 1758;
	3067
2046	3068	/// The interface was not found.
2047	3069	pub const RPC_S_INTERFACE_NOT_FOUND = 1759;
	3070
2048	3071	/// The entry already exists.
2049	3072	pub const RPC_S_ENTRY_ALREADY_EXISTS = 1760;
	3073
2050	3074	/// The entry is not found.
2051	3075	pub const RPC_S_ENTRY_NOT_FOUND = 1761;
	3076
2052	3077	/// The name service is unavailable.
2053	3078	pub const RPC_S_NAME_SERVICE_UNAVAILABLE = 1762;
	3079
2054	3080	/// The network address family is invalid.
2055	3081	pub const RPC_S_INVALID_NAF_ID = 1763;
	3082
2056	3083	/// The requested operation is not supported.
2057	3084	pub const RPC_S_CANNOT_SUPPORT = 1764;
	3085
2058	3086	/// No security context is available to allow impersonation.
2059	3087	pub const RPC_S_NO_CONTEXT_AVAILABLE = 1765;
	3088
2060	3089	/// An internal error occurred in a remote procedure call (RPC).
2061	3090	pub const RPC_S_INTERNAL_ERROR = 1766;
	3091
2062	3092	/// The RPC server attempted an integer division by zero.
2063	3093	pub const RPC_S_ZERO_DIVIDE = 1767;
	3094
2064	3095	/// An addressing error occurred in the RPC server.
2065	3096	pub const RPC_S_ADDRESS_ERROR = 1768;
	3097
2066	3098	/// A floating-point operation at the RPC server caused a division by zero.
2067	3099	pub const RPC_S_FP_DIV_ZERO = 1769;
	3100
2068	3101	/// A floating-point underflow occurred at the RPC server.
2069	3102	pub const RPC_S_FP_UNDERFLOW = 1770;
	3103
2070	3104	/// A floating-point overflow occurred at the RPC server.
2071	3105	pub const RPC_S_FP_OVERFLOW = 1771;
	3106
2072	3107	/// The list of RPC servers available for the binding of auto handles has been exhausted.
2073	3108	pub const RPC_X_NO_MORE_ENTRIES = 1772;
	3109
2074	3110	/// Unable to open the character translation table file.
2075	3111	pub const RPC_X_SS_CHAR_TRANS_OPEN_FAIL = 1773;
	3112
2076	3113	/// The file containing the character translation table has fewer than 512 bytes.
2077	3114	pub const RPC_X_SS_CHAR_TRANS_SHORT_FILE = 1774;
	3115
2078	3116	/// A null context handle was passed from the client to the host during a remote procedure call.
2079	3117	pub const RPC_X_SS_IN_NULL_CONTEXT = 1775;
	3118
2080	3119	/// The context handle changed during a remote procedure call.
2081	3120	pub const RPC_X_SS_CONTEXT_DAMAGED = 1777;
	3121
2082	3122	/// The binding handles passed to a remote procedure call do not match.
2083	3123	pub const RPC_X_SS_HANDLES_MISMATCH = 1778;
	3124
2084	3125	/// The stub is unable to get the remote procedure call handle.
2085	3126	pub const RPC_X_SS_CANNOT_GET_CALL_HANDLE = 1779;
	3127
2086	3128	/// A null reference pointer was passed to the stub.
2087	3129	pub const RPC_X_NULL_REF_POINTER = 1780;
	3130
2088	3131	/// The enumeration value is out of range.
2089	3132	pub const RPC_X_ENUM_VALUE_OUT_OF_RANGE = 1781;
	3133
2090	3134	/// The byte count is too small.
2091	3135	pub const RPC_X_BYTE_COUNT_TOO_SMALL = 1782;
	3136
2092	3137	/// The stub received bad data.
2093	3138	pub const RPC_X_BAD_STUB_DATA = 1783;
	3139
2094	3140	/// The supplied user buffer is not valid for the requested operation.
2095	3141	pub const INVALID_USER_BUFFER = 1784;
	3142
2096	3143	/// The disk media is not recognized. It may not be formatted.
2097	3144	pub const UNRECOGNIZED_MEDIA = 1785;
	3145
2098	3146	/// The workstation does not have a trust secret.
2099	3147	pub const NO_TRUST_LSA_SECRET = 1786;
	3148
2100	3149	/// The security database on the server does not have a computer account for this workstation trust relationship.
2101	3150	pub const NO_TRUST_SAM_ACCOUNT = 1787;
	3151
2102	3152	/// The trust relationship between the primary domain and the trusted domain failed.
2103	3153	pub const TRUSTED_DOMAIN_FAILURE = 1788;
	3154
2104	3155	/// The trust relationship between this workstation and the primary domain failed.
2105	3156	pub const TRUSTED_RELATIONSHIP_FAILURE = 1789;
	3157
2106	3158	/// The network logon failed.
2107	3159	pub const TRUST_FAILURE = 1790;
	3160
2108	3161	/// A remote procedure call is already in progress for this thread.
2109	3162	pub const RPC_S_CALL_IN_PROGRESS = 1791;
	3163
2110	3164	/// An attempt was made to logon, but the network logon service was not started.
2111	3165	pub const NETLOGON_NOT_STARTED = 1792;
	3166
2112	3167	/// The user's account has expired.
2113	3168	pub const ACCOUNT_EXPIRED = 1793;
	3169
2114	3170	/// The redirector is in use and cannot be unloaded.
2115	3171	pub const REDIRECTOR_HAS_OPEN_HANDLES = 1794;
	3172
2116	3173	/// The specified printer driver is already installed.
2117	3174	pub const PRINTER_DRIVER_ALREADY_INSTALLED = 1795;
	3175
2118	3176	/// The specified port is unknown.
2119	3177	pub const UNKNOWN_PORT = 1796;
	3178
2120	3179	/// The printer driver is unknown.
2121	3180	pub const UNKNOWN_PRINTER_DRIVER = 1797;
	3181
2122	3182	/// The print processor is unknown.
2123	3183	pub const UNKNOWN_PRINTPROCESSOR = 1798;
	3184
2124	3185	/// The specified separator file is invalid.
2125	3186	pub const INVALID_SEPARATOR_FILE = 1799;
	3187
2126	3188	/// The specified priority is invalid.
2127	3189	pub const INVALID_PRIORITY = 1800;
	3190
2128	3191	/// The printer name is invalid.
2129	3192	pub const INVALID_PRINTER_NAME = 1801;
	3193
2130	3194	/// The printer already exists.
2131	3195	pub const PRINTER_ALREADY_EXISTS = 1802;
	3196
2132	3197	/// The printer command is invalid.
2133	3198	pub const INVALID_PRINTER_COMMAND = 1803;
	3199
2134	3200	/// The specified datatype is invalid.
2135	3201	pub const INVALID_DATATYPE = 1804;
	3202
2136	3203	/// The environment specified is invalid.
2137	3204	pub const INVALID_ENVIRONMENT = 1805;
	3205
2138	3206	/// There are no more bindings.
2139	3207	pub const RPC_S_NO_MORE_BINDINGS = 1806;
	3208
2140	3209	/// The account used is an interdomain trust account. Use your global user account or local user account to access this server.
2141	3210	pub const NOLOGON_INTERDOMAIN_TRUST_ACCOUNT = 1807;
	3211
2142	3212	/// The account used is a computer account. Use your global user account or local user account to access this server.
2143	3213	pub const NOLOGON_WORKSTATION_TRUST_ACCOUNT = 1808;
	3214
2144	3215	/// The account used is a server trust account. Use your global user account or local user account to access this server.
2145	3216	pub const NOLOGON_SERVER_TRUST_ACCOUNT = 1809;
	3217
2146	3218	/// The name or security ID (SID) of the domain specified is inconsistent with the trust information for that domain.
2147	3219	pub const DOMAIN_TRUST_INCONSISTENT = 1810;
	3220
2148	3221	/// The server is in use and cannot be unloaded.
2149	3222	pub const SERVER_HAS_OPEN_HANDLES = 1811;
	3223
2150	3224	/// The specified image file did not contain a resource section.
2151	3225	pub const RESOURCE_DATA_NOT_FOUND = 1812;
	3226
2152	3227	/// The specified resource type cannot be found in the image file.
2153	3228	pub const RESOURCE_TYPE_NOT_FOUND = 1813;
	3229
2154	3230	/// The specified resource name cannot be found in the image file.
2155	3231	pub const RESOURCE_NAME_NOT_FOUND = 1814;
	3232
2156	3233	/// The specified resource language ID cannot be found in the image file.
2157	3234	pub const RESOURCE_LANG_NOT_FOUND = 1815;
	3235
2158	3236	/// Not enough quota is available to process this command.
2159	3237	pub const NOT_ENOUGH_QUOTA = 1816;
	3238
2160	3239	/// No interfaces have been registered.
2161	3240	pub const RPC_S_NO_INTERFACES = 1817;
	3241
2162	3242	/// The remote procedure call was cancelled.
2163	3243	pub const RPC_S_CALL_CANCELLED = 1818;
	3244
2164	3245	/// The binding handle does not contain all required information.
2165	3246	pub const RPC_S_BINDING_INCOMPLETE = 1819;
	3247
2166	3248	/// A communications failure occurred during a remote procedure call.
2167	3249	pub const RPC_S_COMM_FAILURE = 1820;
	3250
2168	3251	/// The requested authentication level is not supported.
2169	3252	pub const RPC_S_UNSUPPORTED_AUTHN_LEVEL = 1821;
	3253
2170	3254	/// No principal name registered.
2171	3255	pub const RPC_S_NO_PRINC_NAME = 1822;
	3256
2172	3257	/// The error specified is not a valid Windows RPC error code.
2173	3258	pub const RPC_S_NOT_RPC_ERROR = 1823;
	3259
2174	3260	/// A UUID that is valid only on this computer has been allocated.
2175	3261	pub const RPC_S_UUID_LOCAL_ONLY = 1824;
	3262
2176	3263	/// A security package specific error occurred.
2177	3264	pub const RPC_S_SEC_PKG_ERROR = 1825;
	3265
2178	3266	/// Thread is not canceled.
2179	3267	pub const RPC_S_NOT_CANCELLED = 1826;
	3268
2180	3269	/// Invalid operation on the encoding/decoding handle.
2181	3270	pub const RPC_X_INVALID_ES_ACTION = 1827;
	3271
2182	3272	/// Incompatible version of the serializing package.
2183	3273	pub const RPC_X_WRONG_ES_VERSION = 1828;
	3274
2184	3275	/// Incompatible version of the RPC stub.
2185	3276	pub const RPC_X_WRONG_STUB_VERSION = 1829;
	3277
2186	3278	/// The RPC pipe object is invalid or corrupted.
2187	3279	pub const RPC_X_INVALID_PIPE_OBJECT = 1830;
	3280
2188	3281	/// An invalid operation was attempted on an RPC pipe object.
2189	3282	pub const RPC_X_WRONG_PIPE_ORDER = 1831;
	3283
2190	3284	/// Unsupported RPC pipe version.
2191	3285	pub const RPC_X_WRONG_PIPE_VERSION = 1832;
	3286
2192	3287	/// HTTP proxy server rejected the connection because the cookie authentication failed.
2193	3288	pub const RPC_S_COOKIE_AUTH_FAILED = 1833;
	3289
2194	3290	/// The group member was not found.
2195	3291	pub const RPC_S_GROUP_MEMBER_NOT_FOUND = 1898;
	3292
2196	3293	/// The endpoint mapper database entry could not be created.
2197	3294	pub const EPT_S_CANT_CREATE = 1899;
	3295
2198	3296	/// The object universal unique identifier (UUID) is the nil UUID.
2199	3297	pub const RPC_S_INVALID_OBJECT = 1900;
	3298
2200	3299	/// The specified time is invalid.
2201	3300	pub const INVALID_TIME = 1901;
	3301
2202	3302	/// The specified form name is invalid.
2203	3303	pub const INVALID_FORM_NAME = 1902;
	3304
2204	3305	/// The specified form size is invalid.
2205	3306	pub const INVALID_FORM_SIZE = 1903;
	3307
2206	3308	/// The specified printer handle is already being waited on.
2207	3309	pub const ALREADY_WAITING = 1904;
	3310
2208	3311	/// The specified printer has been deleted.
2209	3312	pub const PRINTER_DELETED = 1905;
	3313
2210	3314	/// The state of the printer is invalid.
2211	3315	pub const INVALID_PRINTER_STATE = 1906;
	3316
2212	3317	/// The user's password must be changed before signing in.
2213	3318	pub const PASSWORD_MUST_CHANGE = 1907;
	3319
2214	3320	/// Could not find the domain controller for this domain.
2215	3321	pub const DOMAIN_CONTROLLER_NOT_FOUND = 1908;
	3322
2216	3323	/// The referenced account is currently locked out and may not be logged on to.
2217	3324	pub const ACCOUNT_LOCKED_OUT = 1909;
	3325
2218	3326	/// The object exporter specified was not found.
2219	3327	pub const OR_INVALID_OXID = 1910;
	3328
2220	3329	/// The object specified was not found.
2221	3330	pub const OR_INVALID_OID = 1911;
	3331
2222	3332	/// The object resolver set specified was not found.
2223	3333	pub const OR_INVALID_SET = 1912;
	3334
2224	3335	/// Some data remains to be sent in the request buffer.
2225	3336	pub const RPC_S_SEND_INCOMPLETE = 1913;
	3337
2226	3338	/// Invalid asynchronous remote procedure call handle.
2227	3339	pub const RPC_S_INVALID_ASYNC_HANDLE = 1914;
	3340
2228	3341	/// Invalid asynchronous RPC call handle for this operation.
2229	3342	pub const RPC_S_INVALID_ASYNC_CALL = 1915;
	3343
2230	3344	/// The RPC pipe object has already been closed.
2231	3345	pub const RPC_X_PIPE_CLOSED = 1916;
	3346
2232	3347	/// The RPC call completed before all pipes were processed.
2233	3348	pub const RPC_X_PIPE_DISCIPLINE_ERROR = 1917;
	3349
2234	3350	/// No more data is available from the RPC pipe.
2235	3351	pub const RPC_X_PIPE_EMPTY = 1918;
	3352
2236	3353	/// No site name is available for this machine.
2237	3354	pub const NO_SITENAME = 1919;
	3355
2238	3356	/// The file cannot be accessed by the system.
2239	3357	pub const CANT_ACCESS_FILE = 1920;
	3358
2240	3359	/// The name of the file cannot be resolved by the system.
2241	3360	pub const CANT_RESOLVE_FILENAME = 1921;
	3361
2242	3362	/// The entry is not of the expected type.
2243	3363	pub const RPC_S_ENTRY_TYPE_MISMATCH = 1922;
	3364
2244	3365	/// Not all object UUIDs could be exported to the specified entry.
2245	3366	pub const RPC_S_NOT_ALL_OBJS_EXPORTED = 1923;
	3367
2246	3368	/// Interface could not be exported to the specified entry.
2247	3369	pub const RPC_S_INTERFACE_NOT_EXPORTED = 1924;
	3370
2248	3371	/// The specified profile entry could not be added.
2249	3372	pub const RPC_S_PROFILE_NOT_ADDED = 1925;
	3373
2250	3374	/// The specified profile element could not be added.
2251	3375	pub const RPC_S_PRF_ELT_NOT_ADDED = 1926;
	3376
2252	3377	/// The specified profile element could not be removed.
2253	3378	pub const RPC_S_PRF_ELT_NOT_REMOVED = 1927;
	3379
2254	3380	/// The group element could not be added.
2255	3381	pub const RPC_S_GRP_ELT_NOT_ADDED = 1928;
	3382
2256	3383	/// The group element could not be removed.
2257	3384	pub const RPC_S_GRP_ELT_NOT_REMOVED = 1929;
	3385
2258	3386	/// The printer driver is not compatible with a policy enabled on your computer that blocks NT 4.0 drivers.
2259	3387	pub const KM_DRIVER_BLOCKED = 1930;
	3388
2260	3389	/// The context has expired and can no longer be used.
2261	3390	pub const CONTEXT_EXPIRED = 1931;
	3391
2262	3392	/// The current user's delegated trust creation quota has been exceeded.
2263	3393	pub const PER_USER_TRUST_QUOTA_EXCEEDED = 1932;
	3394
2264	3395	/// The total delegated trust creation quota has been exceeded.
2265	3396	pub const ALL_USER_TRUST_QUOTA_EXCEEDED = 1933;
	3397
2266	3398	/// The current user's delegated trust deletion quota has been exceeded.
2267	3399	pub const USER_DELETE_TRUST_QUOTA_EXCEEDED = 1934;
	3400
2268	3401	/// The computer you are signing into is protected by an authentication firewall. The specified account is not allowed to authenticate to the computer.
2269	3402	pub const AUTHENTICATION_FIREWALL_FAILED = 1935;
	3403
2270	3404	/// Remote connections to the Print Spooler are blocked by a policy set on your machine.
2271	3405	pub const REMOTE_PRINT_CONNECTIONS_BLOCKED = 1936;
	3406
2272	3407	/// Authentication failed because NTLM authentication has been disabled.
2273	3408	pub const NTLM_BLOCKED = 1937;
	3409
2274	3410	/// Logon Failure: EAS policy requires that the user change their password before this operation can be performed.
2275	3411	pub const PASSWORD_CHANGE_REQUIRED = 1938;
	3412
2276	3413	/// The pixel format is invalid.
2277	3414	pub const INVALID_PIXEL_FORMAT = 2000;
	3415
2278	3416	/// The specified driver is invalid.
2279	3417	pub const BAD_DRIVER = 2001;
	3418
2280	3419	/// The window style or class attribute is invalid for this operation.
2281	3420	pub const INVALID_WINDOW_STYLE = 2002;
	3421
2282	3422	/// The requested metafile operation is not supported.
2283	3423	pub const METAFILE_NOT_SUPPORTED = 2003;
	3424
2284	3425	/// The requested transformation operation is not supported.
2285	3426	pub const TRANSFORM_NOT_SUPPORTED = 2004;
	3427
2286	3428	/// The requested clipping operation is not supported.
2287	3429	pub const CLIPPING_NOT_SUPPORTED = 2005;
	3430
2288	3431	/// The specified color management module is invalid.
2289	3432	pub const INVALID_CMM = 2010;
	3433
2290	3434	/// The specified color profile is invalid.
2291	3435	pub const INVALID_PROFILE = 2011;
	3436
2292	3437	/// The specified tag was not found.
2293	3438	pub const TAG_NOT_FOUND = 2012;
	3439
2294	3440	/// A required tag is not present.
2295	3441	pub const TAG_NOT_PRESENT = 2013;
	3442
2296	3443	/// The specified tag is already present.
2297	3444	pub const DUPLICATE_TAG = 2014;
	3445
2298	3446	/// The specified color profile is not associated with the specified device.
2299	3447	pub const PROFILE_NOT_ASSOCIATED_WITH_DEVICE = 2015;
	3448
2300	3449	/// The specified color profile was not found.
2301	3450	pub const PROFILE_NOT_FOUND = 2016;
	3451
2302	3452	/// The specified color space is invalid.
2303	3453	pub const INVALID_COLORSPACE = 2017;
	3454
2304	3455	/// Image Color Management is not enabled.
2305	3456	pub const ICM_NOT_ENABLED = 2018;
	3457
2306	3458	/// There was an error while deleting the color transform.
2307	3459	pub const DELETING_ICM_XFORM = 2019;
	3460
2308	3461	/// The specified color transform is invalid.
2309	3462	pub const INVALID_TRANSFORM = 2020;
	3463
2310	3464	/// The specified transform does not match the bitmap's color space.
2311	3465	pub const COLORSPACE_MISMATCH = 2021;
	3466
2312	3467	/// The specified named color index is not present in the profile.
2313	3468	pub const INVALID_COLORINDEX = 2022;
	3469
2314	3470	/// The specified profile is intended for a device of a different type than the specified device.
2315	3471	pub const PROFILE_DOES_NOT_MATCH_DEVICE = 2023;
	3472
2316	3473	/// The network connection was made successfully, but the user had to be prompted for a password other than the one originally specified.
2317	3474	pub const CONNECTED_OTHER_PASSWORD = 2108;
	3475
2318	3476	/// The network connection was made successfully using default credentials.
2319	3477	pub const CONNECTED_OTHER_PASSWORD_DEFAULT = 2109;
	3478
2320	3479	/// The specified username is invalid.
2321	3480	pub const BAD_USERNAME = 2202;
	3481
2322	3482	/// This network connection does not exist.
2323	3483	pub const NOT_CONNECTED = 2250;
	3484
2324	3485	/// This network connection has files open or requests pending.
2325	3486	pub const OPEN_FILES = 2401;
	3487
2326	3488	/// Active connections still exist.
2327	3489	pub const ACTIVE_CONNECTIONS = 2402;
	3490
2328	3491	/// The device is in use by an active process and cannot be disconnected.
2329	3492	pub const DEVICE_IN_USE = 2404;
	3493
2330	3494	/// The specified print monitor is unknown.
2331	3495	pub const UNKNOWN_PRINT_MONITOR = 3000;
	3496
2332	3497	/// The specified printer driver is currently in use.
2333	3498	pub const PRINTER_DRIVER_IN_USE = 3001;
	3499
2334	3500	/// The spool file was not found.
2335	3501	pub const SPOOL_FILE_NOT_FOUND = 3002;
	3502
2336	3503	/// A StartDocPrinter call was not issued.
2337	3504	pub const SPL_NO_STARTDOC = 3003;
	3505
2338	3506	/// An AddJob call was not issued.
2339	3507	pub const SPL_NO_ADDJOB = 3004;
	3508
2340	3509	/// The specified print processor has already been installed.
2341	3510	pub const PRINT_PROCESSOR_ALREADY_INSTALLED = 3005;
	3511
2342	3512	/// The specified print monitor has already been installed.
2343	3513	pub const PRINT_MONITOR_ALREADY_INSTALLED = 3006;
	3514
2344	3515	/// The specified print monitor does not have the required functions.
2345	3516	pub const INVALID_PRINT_MONITOR = 3007;
	3517
2346	3518	/// The specified print monitor is currently in use.
2347	3519	pub const PRINT_MONITOR_IN_USE = 3008;
	3520
2348	3521	/// The requested operation is not allowed when there are jobs queued to the printer.
2349	3522	pub const PRINTER_HAS_JOBS_QUEUED = 3009;
	3523
2350	3524	/// The requested operation is successful. Changes will not be effective until the system is rebooted.
2351	3525	pub const SUCCESS_REBOOT_REQUIRED = 3010;
	3526
2352	3527	/// The requested operation is successful. Changes will not be effective until the service is restarted.
2353	3528	pub const SUCCESS_RESTART_REQUIRED = 3011;
	3529
2354	3530	/// No printers were found.
2355	3531	pub const PRINTER_NOT_FOUND = 3012;
	3532
2356	3533	/// The printer driver is known to be unreliable.
2357	3534	pub const PRINTER_DRIVER_WARNED = 3013;
	3535
2358	3536	/// The printer driver is known to harm the system.
2359	3537	pub const PRINTER_DRIVER_BLOCKED = 3014;
	3538
2360	3539	/// The specified printer driver package is currently in use.
2361	3540	pub const PRINTER_DRIVER_PACKAGE_IN_USE = 3015;
	3541
2362	3542	/// Unable to find a core driver package that is required by the printer driver package.
2363	3543	pub const CORE_DRIVER_PACKAGE_NOT_FOUND = 3016;
	3544
2364	3545	/// The requested operation failed. A system reboot is required to roll back changes made.
2365	3546	pub const FAIL_REBOOT_REQUIRED = 3017;
	3547
2366	3548	/// The requested operation failed. A system reboot has been initiated to roll back changes made.
2367	3549	pub const FAIL_REBOOT_INITIATED = 3018;
	3550
2368	3551	/// The specified printer driver was not found on the system and needs to be downloaded.
2369	3552	pub const PRINTER_DRIVER_DOWNLOAD_NEEDED = 3019;
	3553
2370	3554	/// The requested print job has failed to print. A print system update requires the job to be resubmitted.
2371	3555	pub const PRINT_JOB_RESTART_REQUIRED = 3020;
	3556
2372	3557	/// The printer driver does not contain a valid manifest, or contains too many manifests.
2373	3558	pub const INVALID_PRINTER_DRIVER_MANIFEST = 3021;
	3559
2374	3560	/// The specified printer cannot be shared.
2375	3561	pub const PRINTER_NOT_SHAREABLE = 3022;
	3562
2376	3563	/// The operation was paused.
2377	3564	pub const REQUEST_PAUSED = 3050;
	3565
2378	3566	/// Reissue the given operation as a cached IO operation.
2379	3567	pub const IO_REISSUE_AS_CACHED = 3950;

std/os/windows/index.zig+113-65

...	...	@@ -1,33 +1,59 @@
1	1	pub const ERROR = @import("error.zig");
2	2
3		pub extern "advapi32" stdcallcc fn CryptAcquireContextA(phProv: &HCRYPTPROV, pszContainer: ?LPCSTR,
4		pszProvider: ?LPCSTR, dwProvType: DWORD, dwFlags: DWORD) BOOL;
	3	pub extern "advapi32" stdcallcc fn CryptAcquireContextA(
	4	phProv: &HCRYPTPROV,
	5	pszContainer: ?LPCSTR,
	6	pszProvider: ?LPCSTR,
	7	dwProvType: DWORD,
	8	dwFlags: DWORD,
	9	) BOOL;
5	10
6	11	pub extern "advapi32" stdcallcc fn CryptReleaseContext(hProv: HCRYPTPROV, dwFlags: DWORD) BOOL;
7	12
8	13	pub extern "advapi32" stdcallcc fn CryptGenRandom(hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: &BYTE) BOOL;
9	14
10
11	15	pub extern "kernel32" stdcallcc fn CloseHandle(hObject: HANDLE) BOOL;
12	16
13		pub extern "kernel32" stdcallcc fn CreateDirectoryA(lpPathName: LPCSTR,
14		lpSecurityAttributes: ?&SECURITY_ATTRIBUTES) BOOL;
15
16		pub extern "kernel32" stdcallcc fn CreateFileA(lpFileName: LPCSTR, dwDesiredAccess: DWORD,
17		dwShareMode: DWORD, lpSecurityAttributes: ?LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
18		dwFlagsAndAttributes: DWORD, hTemplateFile: ?HANDLE) HANDLE;
19
20		pub extern "kernel32" stdcallcc fn CreatePipe(hReadPipe: &HANDLE, hWritePipe: &HANDLE,
21		lpPipeAttributes: &const SECURITY_ATTRIBUTES, nSize: DWORD) BOOL;
22
23		pub extern "kernel32" stdcallcc fn CreateProcessA(lpApplicationName: ?LPCSTR, lpCommandLine: LPSTR,
24		lpProcessAttributes: ?&SECURITY_ATTRIBUTES, lpThreadAttributes: ?&SECURITY_ATTRIBUTES, bInheritHandles: BOOL,
25		dwCreationFlags: DWORD, lpEnvironment: ?&c_void, lpCurrentDirectory: ?LPCSTR, lpStartupInfo: &STARTUPINFOA,
26		lpProcessInformation: &PROCESS_INFORMATION) BOOL;
27
28		pub extern "kernel32" stdcallcc fn CreateSymbolicLinkA(lpSymlinkFileName: LPCSTR, lpTargetFileName: LPCSTR,
29		dwFlags: DWORD) BOOLEAN;
30
	17	pub extern "kernel32" stdcallcc fn CreateDirectoryA(
	18	lpPathName: LPCSTR,
	19	lpSecurityAttributes: ?&SECURITY_ATTRIBUTES,
	20	) BOOL;
	21
	22	pub extern "kernel32" stdcallcc fn CreateFileA(
	23	lpFileName: LPCSTR,
	24	dwDesiredAccess: DWORD,
	25	dwShareMode: DWORD,
	26	lpSecurityAttributes: ?LPSECURITY_ATTRIBUTES,
	27	dwCreationDisposition: DWORD,
	28	dwFlagsAndAttributes: DWORD,
	29	hTemplateFile: ?HANDLE,
	30	) HANDLE;
	31
	32	pub extern "kernel32" stdcallcc fn CreatePipe(
	33	hReadPipe: &HANDLE,
	34	hWritePipe: &HANDLE,
	35	lpPipeAttributes: &const SECURITY_ATTRIBUTES,
	36	nSize: DWORD,
	37	) BOOL;
	38
	39	pub extern "kernel32" stdcallcc fn CreateProcessA(
	40	lpApplicationName: ?LPCSTR,
	41	lpCommandLine: LPSTR,
	42	lpProcessAttributes: ?&SECURITY_ATTRIBUTES,
	43	lpThreadAttributes: ?&SECURITY_ATTRIBUTES,
	44	bInheritHandles: BOOL,
	45	dwCreationFlags: DWORD,
	46	lpEnvironment: ?&c_void,
	47	lpCurrentDirectory: ?LPCSTR,
	48	lpStartupInfo: &STARTUPINFOA,
	49	lpProcessInformation: &PROCESS_INFORMATION,
	50	) BOOL;
	51
	52	pub extern "kernel32" stdcallcc fn CreateSymbolicLinkA(
	53	lpSymlinkFileName: LPCSTR,
	54	lpTargetFileName: LPCSTR,
	55	dwFlags: DWORD,
	56	) BOOLEAN;
31	57
32	58	pub extern "kernel32" stdcallcc fn CreateThread(lpThreadAttributes: ?LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T, lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: ?LPVOID, dwCreationFlags: DWORD, lpThreadId: ?LPDWORD) ?HANDLE;
33	59
...	...	@@ -55,12 +81,19 @@ pub extern "kernel32" stdcallcc fn GetModuleFileNameA(hModule: ?HMODULE, lpFilen
55	81
56	82	pub extern "kernel32" stdcallcc fn GetLastError() DWORD;
57	83
58		pub extern "kernel32" stdcallcc fn GetFileInformationByHandleEx(in_hFile: HANDLE,
59		in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, out_lpFileInformation: &c_void,
60		in_dwBufferSize: DWORD) BOOL;
61
62		pub extern "kernel32" stdcallcc fn GetFinalPathNameByHandleA(hFile: HANDLE, lpszFilePath: LPSTR,
63		cchFilePath: DWORD, dwFlags: DWORD) DWORD;
	84	pub extern "kernel32" stdcallcc fn GetFileInformationByHandleEx(
	85	in_hFile: HANDLE,
	86	in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS,
	87	out_lpFileInformation: &c_void,
	88	in_dwBufferSize: DWORD,
	89	) BOOL;
	90
	91	pub extern "kernel32" stdcallcc fn GetFinalPathNameByHandleA(
	92	hFile: HANDLE,
	93	lpszFilePath: LPSTR,
	94	cchFilePath: DWORD,
	95	dwFlags: DWORD,
	96	) DWORD;
64	97
65	98	pub extern "kernel32" stdcallcc fn GetProcessHeap() ?HANDLE;
66	99
...	...	@@ -80,21 +113,32 @@ pub extern "kernel32" stdcallcc fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBy
80	113
81	114	pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: &c_void) BOOL;
82	115
83		pub extern "kernel32" stdcallcc fn MoveFileExA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR,
84		dwFlags: DWORD) BOOL;
85
	116	pub extern "kernel32" stdcallcc fn MoveFileExA(
	117	lpExistingFileName: LPCSTR,
	118	lpNewFileName: LPCSTR,
	119	dwFlags: DWORD,
	120	) BOOL;
	121
86	122	pub extern "kernel32" stdcallcc fn QueryPerformanceCounter(lpPerformanceCount: &LARGE_INTEGER) BOOL;
87	123
88	124	pub extern "kernel32" stdcallcc fn QueryPerformanceFrequency(lpFrequency: &LARGE_INTEGER) BOOL;
89	125
90	126	pub extern "kernel32" stdcallcc fn PathFileExists(pszPath: ?LPCTSTR) BOOL;
91	127
92		pub extern "kernel32" stdcallcc fn ReadFile(in_hFile: HANDLE, out_lpBuffer: &c_void,
93		in_nNumberOfBytesToRead: DWORD, out_lpNumberOfBytesRead: &DWORD,
94		in_out_lpOverlapped: ?&OVERLAPPED) BOOL;
95
96		pub extern "kernel32" stdcallcc fn SetFilePointerEx(in_fFile: HANDLE, in_liDistanceToMove: LARGE_INTEGER,
97		out_opt_ldNewFilePointer: ?&LARGE_INTEGER, in_dwMoveMethod: DWORD) BOOL;
	128	pub extern "kernel32" stdcallcc fn ReadFile(
	129	in_hFile: HANDLE,
	130	out_lpBuffer: &c_void,
	131	in_nNumberOfBytesToRead: DWORD,
	132	out_lpNumberOfBytesRead: &DWORD,
	133	in_out_lpOverlapped: ?&OVERLAPPED,
	134	) BOOL;
	135
	136	pub extern "kernel32" stdcallcc fn SetFilePointerEx(
	137	in_fFile: HANDLE,
	138	in_liDistanceToMove: LARGE_INTEGER,
	139	out_opt_ldNewFilePointer: ?&LARGE_INTEGER,
	140	in_dwMoveMethod: DWORD,
	141	) BOOL;
98	142
99	143	pub extern "kernel32" stdcallcc fn SetHandleInformation(hObject: HANDLE, dwMask: DWORD, dwFlags: DWORD) BOOL;
100	144
...	...	@@ -104,14 +148,18 @@ pub extern "kernel32" stdcallcc fn TerminateProcess(hProcess: HANDLE, uExitCode:
104	148
105	149	pub extern "kernel32" stdcallcc fn WaitForSingleObject(hHandle: HANDLE, dwMilliseconds: DWORD) DWORD;
106	150
107		pub extern "kernel32" stdcallcc fn WriteFile(in_hFile: HANDLE, in_lpBuffer: &const c_void,
108		in_nNumberOfBytesToWrite: DWORD, out_lpNumberOfBytesWritten: ?&DWORD,
109		in_out_lpOverlapped: ?&OVERLAPPED) BOOL;
	151	pub extern "kernel32" stdcallcc fn WriteFile(
	152	in_hFile: HANDLE,
	153	in_lpBuffer: &const c_void,
	154	in_nNumberOfBytesToWrite: DWORD,
	155	out_lpNumberOfBytesWritten: ?&DWORD,
	156	in_out_lpOverlapped: ?&OVERLAPPED,
	157	) BOOL;
110	158
111	159	//TODO: call unicode versions instead of relying on ANSI code page
112	160	pub extern "kernel32" stdcallcc fn LoadLibraryA(lpLibFileName: LPCSTR) ?HMODULE;
113	161
114		pub extern "kernel32" stdcallcc fn FreeLibrary(hModule: HMODULE) BOOL;
	162	pub extern "kernel32" stdcallcc fn FreeLibrary(hModule: HMODULE) BOOL;
115	163
116	164	pub extern "user32" stdcallcc fn MessageBoxA(hWnd: ?HANDLE, lpText: ?LPCTSTR, lpCaption: ?LPCTSTR, uType: UINT) c_int;
117	165
...	...	@@ -176,49 +224,51 @@ pub const MAX_PATH = 260;
176	224
177	225	// TODO issue #305
178	226	pub const FILE_INFO_BY_HANDLE_CLASS = u32;
179		pub const FileBasicInfo = 0;
180		pub const FileStandardInfo = 1;
181		pub const FileNameInfo = 2;
182		pub const FileRenameInfo = 3;
183		pub const FileDispositionInfo = 4;
184		pub const FileAllocationInfo = 5;
185		pub const FileEndOfFileInfo = 6;
186		pub const FileStreamInfo = 7;
187		pub const FileCompressionInfo = 8;
188		pub const FileAttributeTagInfo = 9;
189		pub const FileIdBothDirectoryInfo = 10;
190		pub const FileIdBothDirectoryRestartInfo = 11;
191		pub const FileIoPriorityHintInfo = 12;
192		pub const FileRemoteProtocolInfo = 13;
193		pub const FileFullDirectoryInfo = 14;
194		pub const FileFullDirectoryRestartInfo = 15;
195		pub const FileStorageInfo = 16;
196		pub const FileAlignmentInfo = 17;
197		pub const FileIdInfo = 18;
198		pub const FileIdExtdDirectoryInfo = 19;
199		pub const FileIdExtdDirectoryRestartInfo = 20;
	227	pub const FileBasicInfo = 0;
	228	pub const FileStandardInfo = 1;
	229	pub const FileNameInfo = 2;
	230	pub const FileRenameInfo = 3;
	231	pub const FileDispositionInfo = 4;
	232	pub const FileAllocationInfo = 5;
	233	pub const FileEndOfFileInfo = 6;
	234	pub const FileStreamInfo = 7;
	235	pub const FileCompressionInfo = 8;
	236	pub const FileAttributeTagInfo = 9;
	237	pub const FileIdBothDirectoryInfo = 10;
	238	pub const FileIdBothDirectoryRestartInfo = 11;
	239	pub const FileIoPriorityHintInfo = 12;
	240	pub const FileRemoteProtocolInfo = 13;
	241	pub const FileFullDirectoryInfo = 14;
	242	pub const FileFullDirectoryRestartInfo = 15;
	243	pub const FileStorageInfo = 16;
	244	pub const FileAlignmentInfo = 17;
	245	pub const FileIdInfo = 18;
	246	pub const FileIdExtdDirectoryInfo = 19;
	247	pub const FileIdExtdDirectoryRestartInfo = 20;
200	248
201	249	pub const FILE_NAME_INFO = extern struct {
202	250	FileNameLength: DWORD,
203	251	FileName: [1]WCHAR,
204	252	};
205	253
206
207	254	/// Return the normalized drive name. This is the default.
208	255	pub const FILE_NAME_NORMALIZED = 0x0;
	256
209	257	/// Return the opened file name (not normalized).
210	258	pub const FILE_NAME_OPENED = 0x8;
211	259
212	260	/// Return the path with the drive letter. This is the default.
213	261	pub const VOLUME_NAME_DOS = 0x0;
	262
214	263	/// Return the path with a volume GUID path instead of the drive name.
215	264	pub const VOLUME_NAME_GUID = 0x1;
	265
216	266	/// Return the path with no drive information.
217	267	pub const VOLUME_NAME_NONE = 0x4;
	268
218	269	/// Return the path with the volume device path.
219	270	pub const VOLUME_NAME_NT = 0x2;
220	271
221
222	272	pub const SECURITY_ATTRIBUTES = extern struct {
223	273	nLength: DWORD,
224	274	lpSecurityDescriptor: ?&c_void,
...	...	@@ -227,7 +277,6 @@ pub const SECURITY_ATTRIBUTES = extern struct {
227	277	pub const PSECURITY_ATTRIBUTES = &SECURITY_ATTRIBUTES;
228	278	pub const LPSECURITY_ATTRIBUTES = &SECURITY_ATTRIBUTES;
229	279
230
231	280	pub const GENERIC_READ = 0x80000000;
232	281	pub const GENERIC_WRITE = 0x40000000;
233	282	pub const GENERIC_EXECUTE = 0x20000000;
...	...	@@ -243,7 +292,6 @@ pub const OPEN_ALWAYS = 4;
243	292	pub const OPEN_EXISTING = 3;
244	293	pub const TRUNCATE_EXISTING = 5;
245	294
246
247	295	pub const FILE_ATTRIBUTE_ARCHIVE = 0x20;
248	296	pub const FILE_ATTRIBUTE_ENCRYPTED = 0x4000;
249	297	pub const FILE_ATTRIBUTE_HIDDEN = 0x2;

std/os/windows/util.zig+18-19

...	...	@@ -7,7 +7,7 @@ const mem = std.mem;
7	7	const BufMap = std.BufMap;
8	8	const cstr = std.cstr;
9	9
10		pub const WaitError = error {
	10	pub const WaitError = error{
11	11	WaitAbandoned,
12	12	WaitTimeOut,
13	13	Unexpected,
...	...	@@ -33,7 +33,7 @@ pub fn windowsClose(handle: windows.HANDLE) void {
33	33	assert(windows.CloseHandle(handle) != 0);
34	34	}
35	35
36		pub const WriteError = error {
	36	pub const WriteError = error{
37	37	SystemResources,
38	38	OperationAborted,
39	39	IoPending,
...	...	@@ -68,20 +68,18 @@ pub fn windowsIsCygwinPty(handle: windows.HANDLE) bool {
68	68	const size = @sizeOf(windows.FILE_NAME_INFO);
69	69	var name_info_bytes align(@alignOf(windows.FILE_NAME_INFO)) = []u8{0} ** (size + windows.MAX_PATH);
70	70
71		if (windows.GetFileInformationByHandleEx(handle, windows.FileNameInfo,
72		@ptrCast(&c_void, &name_info_bytes[0]), u32(name_info_bytes.len)) == 0)
73		{
	71	if (windows.GetFileInformationByHandleEx(handle, windows.FileNameInfo, @ptrCast(&c_void, &name_info_bytes[0]), u32(name_info_bytes.len)) == 0) {
74	72	return true;
75	73	}
76	74
77	75	const name_info = @ptrCast(&const windows.FILE_NAME_INFO, &name_info_bytes[0]);
78	76	const name_bytes = name_info_bytes[size..size + usize(name_info.FileNameLength)];
79		const name_wide = ([]u16)(name_bytes);
80		return mem.indexOf(u16, name_wide, []u16{'m','s','y','s','-'}) != null or
81		mem.indexOf(u16, name_wide, []u16{'-','p','t','y'}) != null;
	77	const name_wide = ([]u16)(name_bytes);
	78	return mem.indexOf(u16, name_wide, []u16{ 'm', 's', 'y', 's', '-' }) != null or
	79	mem.indexOf(u16, name_wide, []u16{ '-', 'p', 't', 'y' }) != null;
82	80	}
83	81
84		pub const OpenError = error {
	82	pub const OpenError = error{
85	83	SharingViolation,
86	84	PathAlreadyExists,
87	85	FileNotFound,
...	...	@@ -92,15 +90,18 @@ pub const OpenError = error {
92	90	};
93	91
94	92	/// `file_path` needs to be copied in memory to add a null terminating byte, hence the allocator.
95		pub fn windowsOpen(allocator: &mem.Allocator, file_path: []const u8, desired_access: windows.DWORD, share_mode: windows.DWORD,
96		creation_disposition: windows.DWORD, flags_and_attrs: windows.DWORD)
97		OpenError!windows.HANDLE
98		{
	93	pub fn windowsOpen(
	94	allocator: &mem.Allocator,
	95	file_path: []const u8,
	96	desired_access: windows.DWORD,
	97	share_mode: windows.DWORD,
	98	creation_disposition: windows.DWORD,
	99	flags_and_attrs: windows.DWORD,
	100	) OpenError!windows.HANDLE {
99	101	const path_with_null = try cstr.addNullByte(allocator, file_path);
100	102	defer allocator.free(path_with_null);
101	103
102		const result = windows.CreateFileA(path_with_null.ptr, desired_access, share_mode, null, creation_disposition,
103		flags_and_attrs, null);
	104	const result = windows.CreateFileA(path_with_null.ptr, desired_access, share_mode, null, creation_disposition, flags_and_attrs, null);
104	105
105	106	if (result == windows.INVALID_HANDLE_VALUE) {
106	107	const err = windows.GetLastError();
...	...	@@ -156,18 +157,16 @@ pub fn windowsLoadDll(allocator: &mem.Allocator, dll_path: []const u8) !windows.
156	157	}
157	158
158	159	pub fn windowsUnloadDll(hModule: windows.HMODULE) void {
159		assert(windows.FreeLibrary(hModule)!= 0);
	160	assert(windows.FreeLibrary(hModule) != 0);
160	161	}
161	162
162
163	163	test "InvalidDll" {
164	164	if (builtin.os != builtin.Os.windows) return;
165	165
166	166	const DllName = "asdf.dll";
167	167	const allocator = std.debug.global_allocator;
168		const handle = os.windowsLoadDll(allocator, DllName) catch \|err\| {
	168	const handle = os.windowsLoadDll(allocator, DllName) catch \|err\| {
169	169	assert(err == error.DllNotFound);
170	170	return;
171	171	};
172	172	}
173

std/os/zen.zig+76-62

...	...	@@ -3,35 +3,35 @@
3	3	//////////////////////////
4	4
5	5	pub const Message = struct {
6		sender: MailboxId,
	6	sender: MailboxId,
7	7	receiver: MailboxId,
8		type: usize,
9		payload: usize,
	8	type: usize,
	9	payload: usize,
10	10
11	11	pub fn from(mailbox_id: &const MailboxId) Message {
12		return Message {
13		.sender = MailboxId.Undefined,
	12	return Message{
	13	.sender = MailboxId.Undefined,
14	14	.receiver = *mailbox_id,
15		.type = 0,
16		.payload = 0,
	15	.type = 0,
	16	.payload = 0,
17	17	};
18	18	}
19	19
20	20	pub fn to(mailbox_id: &const MailboxId, msg_type: usize) Message {
21		return Message {
22		.sender = MailboxId.This,
	21	return Message{
	22	.sender = MailboxId.This,
23	23	.receiver = *mailbox_id,
24		.type = msg_type,
25		.payload = 0,
	24	.type = msg_type,
	25	.payload = 0,
26	26	};
27	27	}
28	28
29	29	pub fn withData(mailbox_id: &const MailboxId, msg_type: usize, payload: usize) Message {
30		return Message {
31		.sender = MailboxId.This,
	30	return Message{
	31	.sender = MailboxId.This,
32	32	.receiver = *mailbox_id,
33		.type = msg_type,
34		.payload = payload,
	33	.type = msg_type,
	34	.payload = payload,
35	35	};
36	36	}
37	37	};
...	...	@@ -40,27 +40,25 @@ pub const MailboxId = union(enum) {
40	40	Undefined,
41	41	This,
42	42	Kernel,
43		Port: u16,
	43	Port: u16,
44	44	Thread: u16,
45	45	};
46	46
47
48	47	//////////////////////////////////////
49	48	//// Ports reserved for servers ////
50	49	//////////////////////////////////////
51	50
52	51	pub const Server = struct {
53		pub const Keyboard = MailboxId { .Port = 0 };
54		pub const Terminal = MailboxId { .Port = 1 };
	52	pub const Keyboard = MailboxId{ .Port = 0 };
	53	pub const Terminal = MailboxId{ .Port = 1 };
55	54	};
56	55
57
58	56	////////////////////////
59	57	//// POSIX things ////
60	58	////////////////////////
61	59
62	60	// Standard streams.
63		pub const STDIN_FILENO = 0;
	61	pub const STDIN_FILENO = 0;
64	62	pub const STDOUT_FILENO = 1;
65	63	pub const STDERR_FILENO = 2;
66	64
...	...	@@ -101,26 +99,24 @@ pub fn write(fd: i32, buf: &const u8, count: usize) usize {
101	99	return count;
102	100	}
103	101
104
105	102	///////////////////////////
106	103	//// Syscall numbers ////
107	104	///////////////////////////
108	105
109	106	pub const Syscall = enum(usize) {
110		exit = 0,
111		createPort = 1,
112		send = 2,
113		receive = 3,
114		subscribeIRQ = 4,
115		inb = 5,
116		map = 6,
117		createThread = 7,
	107	exit = 0,
	108	createPort = 1,
	109	send = 2,
	110	receive = 3,
	111	subscribeIRQ = 4,
	112	inb = 5,
	113	map = 6,
	114	createThread = 7,
118	115	createProcess = 8,
119		wait = 9,
120		portReady = 10,
	116	wait = 9,
	117	portReady = 10,
121	118	};
122	119
123
124	120	////////////////////
125	121	//// Syscalls ////
126	122	////////////////////
...	...	@@ -157,7 +153,7 @@ pub fn map(v_addr: usize, p_addr: usize, size: usize, writable: bool) bool {
157	153	return syscall4(Syscall.map, v_addr, p_addr, size, usize(writable)) != 0;
158	154	}
159	155
160		pub fn createThread(function: fn()void) u16 {
	156	pub fn createThread(function: fn() void) u16 {
161	157	return u16(syscall1(Syscall.createThread, @ptrToInt(function)));
162	158	}
163	159
...	...	@@ -180,66 +176,84 @@ pub fn portReady(port: u16) bool {
180	176	inline fn syscall0(number: Syscall) usize {
181	177	return asm volatile ("int $0x80"
182	178	: [ret] "={eax}" (-> usize)
183		: [number] "{eax}" (number));
	179	: [number] "{eax}" (number)
	180	);
184	181	}
185	182
186	183	inline fn syscall1(number: Syscall, arg1: usize) usize {
187	184	return asm volatile ("int $0x80"
188	185	: [ret] "={eax}" (-> usize)
189	186	: [number] "{eax}" (number),
190		[arg1] "{ecx}" (arg1));
	187	[arg1] "{ecx}" (arg1)
	188	);
191	189	}
192	190
193	191	inline fn syscall2(number: Syscall, arg1: usize, arg2: usize) usize {
194	192	return asm volatile ("int $0x80"
195	193	: [ret] "={eax}" (-> usize)
196	194	: [number] "{eax}" (number),
197		[arg1] "{ecx}" (arg1),
198		[arg2] "{edx}" (arg2));
	195	[arg1] "{ecx}" (arg1),
	196	[arg2] "{edx}" (arg2)
	197	);
199	198	}
200	199
201	200	inline fn syscall3(number: Syscall, arg1: usize, arg2: usize, arg3: usize) usize {
202	201	return asm volatile ("int $0x80"
203	202	: [ret] "={eax}" (-> usize)
204	203	: [number] "{eax}" (number),
205		[arg1] "{ecx}" (arg1),
206		[arg2] "{edx}" (arg2),
207		[arg3] "{ebx}" (arg3));
	204	[arg1] "{ecx}" (arg1),
	205	[arg2] "{edx}" (arg2),
	206	[arg3] "{ebx}" (arg3)
	207	);
208	208	}
209	209
210	210	inline fn syscall4(number: Syscall, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
211	211	return asm volatile ("int $0x80"
212	212	: [ret] "={eax}" (-> usize)
213	213	: [number] "{eax}" (number),
214		[arg1] "{ecx}" (arg1),
215		[arg2] "{edx}" (arg2),
216		[arg3] "{ebx}" (arg3),
217		[arg4] "{esi}" (arg4));
	214	[arg1] "{ecx}" (arg1),
	215	[arg2] "{edx}" (arg2),
	216	[arg3] "{ebx}" (arg3),
	217	[arg4] "{esi}" (arg4)
	218	);
218	219	}
219	220
220		inline fn syscall5(number: Syscall, arg1: usize, arg2: usize, arg3: usize,
221		arg4: usize, arg5: usize) usize
222		{
	221	inline fn syscall5(
	222	number: Syscall,
	223	arg1: usize,
	224	arg2: usize,
	225	arg3: usize,
	226	arg4: usize,
	227	arg5: usize,
	228	) usize {
223	229	return asm volatile ("int $0x80"
224	230	: [ret] "={eax}" (-> usize)
225	231	: [number] "{eax}" (number),
226		[arg1] "{ecx}" (arg1),
227		[arg2] "{edx}" (arg2),
228		[arg3] "{ebx}" (arg3),
229		[arg4] "{esi}" (arg4),
230		[arg5] "{edi}" (arg5));
	232	[arg1] "{ecx}" (arg1),
	233	[arg2] "{edx}" (arg2),
	234	[arg3] "{ebx}" (arg3),
	235	[arg4] "{esi}" (arg4),
	236	[arg5] "{edi}" (arg5)
	237	);
231	238	}
232	239
233		inline fn syscall6(number: Syscall, arg1: usize, arg2: usize, arg3: usize,
234		arg4: usize, arg5: usize, arg6: usize) usize
235		{
	240	inline fn syscall6(
	241	number: Syscall,
	242	arg1: usize,
	243	arg2: usize,
	244	arg3: usize,
	245	arg4: usize,
	246	arg5: usize,
	247	arg6: usize,
	248	) usize {
236	249	return asm volatile ("int $0x80"
237	250	: [ret] "={eax}" (-> usize)
238	251	: [number] "{eax}" (number),
239		[arg1] "{ecx}" (arg1),
240		[arg2] "{edx}" (arg2),
241		[arg3] "{ebx}" (arg3),
242		[arg4] "{esi}" (arg4),
243		[arg5] "{edi}" (arg5),
244		[arg6] "{ebp}" (arg6));
	252	[arg1] "{ecx}" (arg1),
	253	[arg2] "{edx}" (arg2),
	254	[arg3] "{ebx}" (arg3),
	255	[arg4] "{esi}" (arg4),
	256	[arg5] "{edi}" (arg5),
	257	[arg6] "{ebp}" (arg6)
	258	);
245	259	}

std/rand/index.zig+54-38

...	...	@@ -69,7 +69,7 @@ pub const Random = struct {
69	69	break :x start;
70	70	} else x: {
71	71	// Can't overflow because the range is over signed ints
72		break :x math.negateCast(value - end_uint) catch unreachable;
	72	break :x math.negateCast(value - end_uint) catch unreachable;
73	73	};
74	74	return result;
75	75	} else {
...	...	@@ -156,7 +156,7 @@ const SplitMix64 = struct {
156	156	s: u64,
157	157
158	158	pub fn init(seed: u64) SplitMix64 {
159		return SplitMix64 { .s = seed };
	159	return SplitMix64{ .s = seed };
160	160	}
161	161
162	162	pub fn next(self: &SplitMix64) u64 {
...	...	@@ -172,7 +172,7 @@ const SplitMix64 = struct {
172	172	test "splitmix64 sequence" {
173	173	var r = SplitMix64.init(0xaeecf86f7878dd75);
174	174
175		const seq = []const u64 {
	175	const seq = []const u64{
176	176	0x5dbd39db0178eb44,
177	177	0xa9900fb66b397da3,
178	178	0x5c1a28b1aeebcf5c,
...	...	@@ -198,8 +198,8 @@ pub const Pcg = struct {
198	198	i: u64,
199	199
200	200	pub fn init(init_s: u64) Pcg {
201		var pcg = Pcg {
202		.random = Random { .fillFn = fill },
	201	var pcg = Pcg{
	202	.random = Random{ .fillFn = fill },
203	203	.s = undefined,
204	204	.i = undefined,
205	205	};
...	...	@@ -265,7 +265,7 @@ test "pcg sequence" {
265	265	const s1: u64 = 0x84e9c579ef59bbf7;
266	266	r.seedTwo(s0, s1);
267	267
268		const seq = []const u32 {
	268	const seq = []const u32{
269	269	2881561918,
270	270	3063928540,
271	271	1199791034,
...	...	@@ -288,8 +288,8 @@ pub const Xoroshiro128 = struct {
288	288	s: [2]u64,
289	289
290	290	pub fn init(init_s: u64) Xoroshiro128 {
291		var x = Xoroshiro128 {
292		.random = Random { .fillFn = fill },
	291	var x = Xoroshiro128{
	292	.random = Random{ .fillFn = fill },
293	293	.s = undefined,
294	294	};
295	295
...	...	@@ -314,9 +314,9 @@ pub const Xoroshiro128 = struct {
314	314	var s0: u64 = 0;
315	315	var s1: u64 = 0;
316	316
317		const table = []const u64 {
	317	const table = []const u64{
318	318	0xbeac0467eba5facb,
319		0xd86b048b86aa9922
	319	0xd86b048b86aa9922,
320	320	};
321	321
322	322	inline for (table) \|entry\| {
...	...	@@ -374,7 +374,7 @@ test "xoroshiro sequence" {
374	374	r.s[0] = 0xaeecf86f7878dd75;
375	375	r.s[1] = 0x01cd153642e72622;
376	376
377		const seq1 = []const u64 {
	377	const seq1 = []const u64{
378	378	0xb0ba0da5bb600397,
379	379	0x18a08afde614dccc,
380	380	0xa2635b956a31b929,
...	...	@@ -387,10 +387,9 @@ test "xoroshiro sequence" {
387	387	std.debug.assert(s == r.next());
388	388	}
389	389
390
391	390	r.jump();
392	391
393		const seq2 = []const u64 {
	392	const seq2 = []const u64{
394	393	0x95344a13556d3e22,
395	394	0xb4fb32dafa4d00df,
396	395	0xb2011d9ccdcfe2dd,
...	...	@@ -421,8 +420,8 @@ pub const Isaac64 = struct {
421	420	i: usize,
422	421
423	422	pub fn init(init_s: u64) Isaac64 {
424		var isaac = Isaac64 {
425		.random = Random { .fillFn = fill },
	423	var isaac = Isaac64{
	424	.random = Random{ .fillFn = fill },
426	425	.r = undefined,
427	426	.m = undefined,
428	427	.a = undefined,
...	...	@@ -456,20 +455,20 @@ pub const Isaac64 = struct {
456	455	{
457	456	var i: usize = 0;
458	457	while (i < midpoint) : (i += 4) {
459		self.step( ~(self.a ^ (self.a << 21)), i + 0, 0, midpoint);
460		self.step( self.a ^ (self.a >> 5) , i + 1, 0, midpoint);
461		self.step( self.a ^ (self.a << 12) , i + 2, 0, midpoint);
462		self.step( self.a ^ (self.a >> 33) , i + 3, 0, midpoint);
	458	self.step(~(self.a ^ (self.a << 21)), i + 0, 0, midpoint);
	459	self.step(self.a ^ (self.a >> 5), i + 1, 0, midpoint);
	460	self.step(self.a ^ (self.a << 12), i + 2, 0, midpoint);
	461	self.step(self.a ^ (self.a >> 33), i + 3, 0, midpoint);
463	462	}
464	463	}
465	464
466	465	{
467	466	var i: usize = 0;
468	467	while (i < midpoint) : (i += 4) {
469		self.step( ~(self.a ^ (self.a << 21)), i + 0, midpoint, 0);
470		self.step( self.a ^ (self.a >> 5) , i + 1, midpoint, 0);
471		self.step( self.a ^ (self.a << 12) , i + 2, midpoint, 0);
472		self.step( self.a ^ (self.a >> 33) , i + 3, midpoint, 0);
	468	self.step(~(self.a ^ (self.a << 21)), i + 0, midpoint, 0);
	469	self.step(self.a ^ (self.a >> 5), i + 1, midpoint, 0);
	470	self.step(self.a ^ (self.a << 12), i + 2, midpoint, 0);
	471	self.step(self.a ^ (self.a >> 33), i + 3, midpoint, 0);
473	472	}
474	473	}
475	474
...	...	@@ -493,7 +492,7 @@ pub const Isaac64 = struct {
493	492	self.m[0] = init_s;
494	493
495	494	// prescrambled golden ratio constants
496		var a = []const u64 {
	495	var a = []const u64{
497	496	0x647c4677a2884b7c,
498	497	0xb9f8b322c73ac862,
499	498	0x8c0ea5053d4712a0,
...	...	@@ -513,14 +512,30 @@ pub const Isaac64 = struct {
513	512	a[x1] +%= self.m[j + x1];
514	513	}
515	514
516		a[0] -%= a[4]; a[5] ^= a[7] >> 9; a[7] +%= a[0];
517		a[1] -%= a[5]; a[6] ^= a[0] << 9; a[0] +%= a[1];
518		a[2] -%= a[6]; a[7] ^= a[1] >> 23; a[1] +%= a[2];
519		a[3] -%= a[7]; a[0] ^= a[2] << 15; a[2] +%= a[3];
520		a[4] -%= a[0]; a[1] ^= a[3] >> 14; a[3] +%= a[4];
521		a[5] -%= a[1]; a[2] ^= a[4] << 20; a[4] +%= a[5];
522		a[6] -%= a[2]; a[3] ^= a[5] >> 17; a[5] +%= a[6];
523		a[7] -%= a[3]; a[4] ^= a[6] << 14; a[6] +%= a[7];
	515	a[0] -%= a[4];
	516	a[5] ^= a[7] >> 9;
	517	a[7] +%= a[0];
	518	a[1] -%= a[5];
	519	a[6] ^= a[0] << 9;
	520	a[0] +%= a[1];
	521	a[2] -%= a[6];
	522	a[7] ^= a[1] >> 23;
	523	a[1] +%= a[2];
	524	a[3] -%= a[7];
	525	a[0] ^= a[2] << 15;
	526	a[2] +%= a[3];
	527	a[4] -%= a[0];
	528	a[1] ^= a[3] >> 14;
	529	a[3] +%= a[4];
	530	a[5] -%= a[1];
	531	a[2] ^= a[4] << 20;
	532	a[4] +%= a[5];
	533	a[6] -%= a[2];
	534	a[3] ^= a[5] >> 17;
	535	a[5] +%= a[6];
	536	a[7] -%= a[3];
	537	a[4] ^= a[6] << 14;
	538	a[6] +%= a[7];
524	539
525	540	comptime var x2: usize = 0;
526	541	inline while (x2 < 8) : (x2 += 1) {
...	...	@@ -533,7 +548,7 @@ pub const Isaac64 = struct {
533	548	self.a = 0;
534	549	self.b = 0;
535	550	self.c = 0;
536		self.i = self.r.len; // trigger refill on first value
	551	self.i = self.r.len; // trigger refill on first value
537	552	}
538	553
539	554	fn fill(r: &Random, buf: []u8) void {
...	...	@@ -567,7 +582,7 @@ test "isaac64 sequence" {
567	582	var r = Isaac64.init(0);
568	583
569	584	// from reference implementation
570		const seq = []const u64 {
	585	const seq = []const u64{
571	586	0xf67dfba498e4937c,
572	587	0x84a5066a9204f380,
573	588	0xfee34bd5f5514dbb,
...	...	@@ -609,7 +624,7 @@ test "Random float" {
609	624
610	625	test "Random scalar" {
611	626	var prng = DefaultPrng.init(0);
612		const s = prng .random.scalar(u64);
	627	const s = prng.random.scalar(u64);
613	628	}
614	629
615	630	test "Random bytes" {
...	...	@@ -621,8 +636,8 @@ test "Random bytes" {
621	636	test "Random shuffle" {
622	637	var prng = DefaultPrng.init(0);
623	638
624		var seq = []const u8 { 0, 1, 2, 3, 4 };
625		var seen = []bool {false} ** 5;
	639	var seq = []const u8{ 0, 1, 2, 3, 4 };
	640	var seen = []bool{false} ** 5;
626	641
627	642	var i: usize = 0;
628	643	while (i < 1000) : (i += 1) {
...	...	@@ -639,7 +654,8 @@ test "Random shuffle" {
639	654
640	655	fn sumArray(s: []const u8) u32 {
641	656	var r: u32 = 0;
642		for (s) \|e\| r += e;
	657	for (s) \|e\|
	658	r += e;
643	659	return r;
644	660	}
645	661

std/rand/ziggurat.zig+23-7

...	...	@@ -64,8 +64,14 @@ pub const ZigTable = struct {
64	64	};
65	65
66	66	// zigNorInit
67		fn ZigTableGen(comptime is_symmetric: bool, comptime r: f64, comptime v: f64, comptime f: fn(f64) f64,
68		comptime f_inv: fn(f64) f64, comptime zero_case: fn(&Random, f64) f64) ZigTable {
	67	fn ZigTableGen(
	68	comptime is_symmetric: bool,
	69	comptime r: f64,
	70	comptime v: f64,
	71	comptime f: fn(f64) f64,
	72	comptime f_inv: fn(f64) f64,
	73	comptime zero_case: fn(&Random, f64) f64,
	74	) ZigTable {
69	75	var tables: ZigTable = undefined;
70	76
71	77	tables.is_symmetric = is_symmetric;
...	...	@@ -98,8 +104,12 @@ pub const NormDist = blk: {
98	104	const norm_r = 3.6541528853610088;
99	105	const norm_v = 0.00492867323399;
100	106
101		fn norm_f(x: f64) f64 { return math.exp(-x * x / 2.0); }
102		fn norm_f_inv(y: f64) f64 { return math.sqrt(-2.0 * math.ln(y)); }
	107	fn norm_f(x: f64) f64 {
	108	return math.exp(-x * x / 2.0);
	109	}
	110	fn norm_f_inv(y: f64) f64 {
	111	return math.sqrt(-2.0 * math.ln(y));
	112	}
103	113	fn norm_zero_case(random: &Random, u: f64) f64 {
104	114	var x: f64 = 1;
105	115	var y: f64 = 0;
...	...	@@ -133,9 +143,15 @@ pub const ExpDist = blk: {
133	143	const exp_r = 7.69711747013104972;
134	144	const exp_v = 0.0039496598225815571993;
135	145
136		fn exp_f(x: f64) f64 { return math.exp(-x); }
137		fn exp_f_inv(y: f64) f64 { return -math.ln(y); }
138		fn exp_zero_case(random: &Random, _: f64) f64 { return exp_r - math.ln(random.float(f64)); }
	146	fn exp_f(x: f64) f64 {
	147	return math.exp(-x);
	148	}
	149	fn exp_f_inv(y: f64) f64 {
	150	return -math.ln(y);
	151	}
	152	fn exp_zero_case(random: &Random, _: f64) f64 {
	153	return exp_r - math.ln(random.float(f64));
	154	}
139	155
140	156	test "ziggurant exp dist sanity" {
141	157	var prng = std.rand.DefaultPrng.init(0);

std/segmented_list.zig+43-33

...	...	@@ -5,7 +5,7 @@ const Allocator = std.mem.Allocator;
5	5	// Imagine that `fn at(self: &Self, index: usize) &T` is a customer asking for a box
6	6	// from a warehouse, based on a flat array, boxes ordered from 0 to N - 1.
7	7	// But the warehouse actually stores boxes in shelves of increasing powers of 2 sizes.
8		// So when the customer requests a box index, we have to translate it to shelf index
	8	// So when the customer requests a box index, we have to translate it to shelf index
9	9	// and box index within that shelf. Illustration:
10	10	//
11	11	// customer indexes:
...	...	@@ -37,14 +37,14 @@ const Allocator = std.mem.Allocator;
37	37	// Now we complicate it a little bit further by adding a preallocated shelf, which must be
38	38	// a power of 2:
39	39	// prealloc=4
40		//
	40	//
41	41	// customer indexes:
42	42	// prealloc: 0 1 2 3
43	43	// shelf 0: 4 5 6 7 8 9 10 11
44	44	// shelf 1: 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
45	45	// shelf 2: 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
46	46	// ...
47		//
	47	//
48	48	// warehouse indexes:
49	49	// prealloc: 0 1 2 3
50	50	// shelf 0: 0 1 2 3 4 5 6 7
...	...	@@ -95,7 +95,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
95	95
96	96	/// Deinitialize with `deinit`
97	97	pub fn init(allocator: &Allocator) Self {
98		return Self {
	98	return Self{
99	99	.allocator = allocator,
100	100	.len = 0,
101	101	.prealloc_segment = undefined,
...	...	@@ -106,7 +106,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
106	106	pub fn deinit(self: &Self) void {
107	107	self.freeShelves(ShelfIndex(self.dynamic_segments.len), 0);
108	108	self.allocator.free(self.dynamic_segments);
109		*self = undefined;
	109	self.* = undefined;
110	110	}
111	111
112	112	pub fn at(self: &Self, i: usize) &T {
...	...	@@ -120,7 +120,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
120	120
121	121	pub fn push(self: &Self, item: &const T) !void {
122	122	const new_item_ptr = try self.addOne();
123		new_item_ptr = item;
	123	new_item_ptr.* = item.*;
124	124	}
125	125
126	126	pub fn pushMany(self: &Self, items: []const T) !void {
...	...	@@ -130,11 +130,10 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
130	130	}
131	131
132	132	pub fn pop(self: &Self) ?T {
133		if (self.len == 0)
134		return null;
	133	if (self.len == 0) return null;
135	134
136	135	const index = self.len - 1;
137		const result = *self.uncheckedAt(index);
	136	const result = self.uncheckedAt(index).*;
138	137	self.len = index;
139	138	return result;
140	139	}
...	...	@@ -247,8 +246,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
247	246	shelf_size: usize,
248	247
249	248	pub fn next(it: &Iterator) ?&T {
250		if (it.index >= it.list.len)
251		return null;
	249	if (it.index >= it.list.len) return null;
252	250	if (it.index < prealloc_item_count) {
253	251	const ptr = &it.list.prealloc_segment[it.index];
254	252	it.index += 1;
...	...	@@ -272,12 +270,10 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
272	270	}
273	271
274	272	pub fn prev(it: &Iterator) ?&T {
275		if (it.index == 0)
276		return null;
	273	if (it.index == 0) return null;
277	274
278	275	it.index -= 1;
279		if (it.index < prealloc_item_count)
280		return &it.list.prealloc_segment[it.index];
	276	if (it.index < prealloc_item_count) return &it.list.prealloc_segment[it.index];
281	277
282	278	if (it.box_index == 0) {
283	279	it.shelf_index -= 1;
...	...	@@ -298,21 +294,25 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
298	294
299	295	return &it.list.dynamic_segments[it.shelf_index][it.box_index];
300	296	}
	297
	298	pub fn set(it: &Iterator, index: usize) void {
	299	it.index = index;
	300	if (index < prealloc_item_count) return;
	301	it.shelf_index = shelfIndex(index);
	302	it.box_index = boxIndex(index, it.shelf_index);
	303	it.shelf_size = shelfSize(it.shelf_index);
	304	}
301	305	};
302	306
303	307	pub fn iterator(self: &Self, start_index: usize) Iterator {
304		var it = Iterator {
	308	var it = Iterator{
305	309	.list = self,
306		.index = start_index,
	310	.index = undefined,
307	311	.shelf_index = undefined,
308	312	.box_index = undefined,
309	313	.shelf_size = undefined,
310	314	};
311		if (start_index >= prealloc_item_count) {
312		it.shelf_index = shelfIndex(start_index);
313		it.box_index = boxIndex(start_index, it.shelf_index);
314		it.shelf_size = shelfSize(it.shelf_index);
315		}
	315	it.set(start_index);
316	316	return it;
317	317	}
318	318	};
...	...	@@ -335,25 +335,31 @@ fn testSegmentedList(comptime prealloc: usize, allocator: &Allocator) !void {
335	335	var list = SegmentedList(i32, prealloc).init(allocator);
336	336	defer list.deinit();
337	337
338		{var i: usize = 0; while (i < 100) : (i += 1) {
339		try list.push(i32(i + 1));
340		assert(list.len == i + 1);
341		}}
	338	{
	339	var i: usize = 0;
	340	while (i < 100) : (i += 1) {
	341	try list.push(i32(i + 1));
	342	assert(list.len == i + 1);
	343	}
	344	}
342	345
343		{var i: usize = 0; while (i < 100) : (i += 1) {
344		assert(*list.at(i) == i32(i + 1));
345		}}
	346	{
	347	var i: usize = 0;
	348	while (i < 100) : (i += 1) {
	349	assert(list.at(i).* == i32(i + 1));
	350	}
	351	}
346	352
347	353	{
348	354	var it = list.iterator(0);
349	355	var x: i32 = 0;
350	356	while (it.next()) \|item\| {
351	357	x += 1;
352		assert(*item == x);
	358	assert(item.* == x);
353	359	}
354	360	assert(x == 100);
355	361	while (it.prev()) \|item\| : (x -= 1) {
356		assert(*item == x);
	362	assert(item.* == x);
357	363	}
358	364	assert(x == 0);
359	365	}
...	...	@@ -361,14 +367,18 @@ fn testSegmentedList(comptime prealloc: usize, allocator: &Allocator) !void {
361	367	assert(??list.pop() == 100);
362	368	assert(list.len == 99);
363	369
364		try list.pushMany([]i32 { 1, 2, 3 });
	370	try list.pushMany([]i32{
	371	1,
	372	2,
	373	3,
	374	});
365	375	assert(list.len == 102);
366	376	assert(??list.pop() == 3);
367	377	assert(??list.pop() == 2);
368	378	assert(??list.pop() == 1);
369	379	assert(list.len == 99);
370	380
371		try list.pushMany([]const i32 {});
	381	try list.pushMany([]const i32{});
372	382	assert(list.len == 99);
373	383
374	384	var i: i32 = 99;

std/sort.zig+398-165

...	...	@@ -5,15 +5,18 @@ const math = std.math;
5	5	const builtin = @import("builtin");
6	6
7	7	/// Stable in-place sort. O(n) best case, O(pow(n, 2)) worst case. O(1) memory (no allocator required).
8		pub fn insertionSort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T)bool) void {
9		{var i: usize = 1; while (i < items.len) : (i += 1) {
10		const x = items[i];
11		var j: usize = i;
12		while (j > 0 and lessThan(x, items[j - 1])) : (j -= 1) {
13		items[j] = items[j - 1];
	8	pub fn insertionSort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T) bool) void {
	9	{
	10	var i: usize = 1;
	11	while (i < items.len) : (i += 1) {
	12	const x = items[i];
	13	var j: usize = i;
	14	while (j > 0 and lessThan(x, items[j - 1])) : (j -= 1) {
	15	items[j] = items[j - 1];
	16	}
	17	items[j] = x;
14	18	}
15		items[j] = x;
16		}}
	19	}
17	20	}
18	21
19	22	const Range = struct {
...	...	@@ -21,7 +24,10 @@ const Range = struct {
21	24	end: usize,
22	25
23	26	fn init(start: usize, end: usize) Range {
24		return Range { .start = start, .end = end };
	27	return Range{
	28	.start = start,
	29	.end = end,
	30	};
25	31	}
26	32
27	33	fn length(self: &const Range) usize {
...	...	@@ -29,7 +35,6 @@ const Range = struct {
29	35	}
30	36	};
31	37
32
33	38	const Iterator = struct {
34	39	size: usize,
35	40	power_of_two: usize,
...	...	@@ -42,7 +47,7 @@ const Iterator = struct {
42	47	fn init(size2: usize, min_level: usize) Iterator {
43	48	const power_of_two = math.floorPowerOfTwo(usize, size2);
44	49	const denominator = power_of_two / min_level;
45		return Iterator {
	50	return Iterator{
46	51	.numerator = 0,
47	52	.decimal = 0,
48	53	.size = size2,
...	...	@@ -68,7 +73,10 @@ const Iterator = struct {
68	73	self.decimal += 1;
69	74	}
70	75
71		return Range {.start = start, .end = self.decimal};
	76	return Range{
	77	.start = start,
	78	.end = self.decimal,
	79	};
72	80	}
73	81
74	82	fn finished(self: &Iterator) bool {
...	...	@@ -100,7 +108,7 @@ const Pull = struct {
100	108
101	109	/// Stable in-place sort. O(n) best case, O(n*log(n)) worst case and average case. O(1) memory (no allocator required).
102	110	/// Currently implemented as block sort.
103		pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T)bool) void {
	111	pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T) bool) void {
104	112	// Implementation ported from https://github.com/BonzaiThePenguin/WikiSort/blob/master/WikiSort.c
105	113	var cache: [512]T = undefined;
106	114
...	...	@@ -123,7 +131,16 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
123	131	// http://pages.ripco.net/~jgamble/nw.html
124	132	var iterator = Iterator.init(items.len, 4);
125	133	while (!iterator.finished()) {
126		var order = []u8{0, 1, 2, 3, 4, 5, 6, 7};
	134	var order = []u8{
	135	0,
	136	1,
	137	2,
	138	3,
	139	4,
	140	5,
	141	6,
	142	7,
	143	};
127	144	const range = iterator.nextRange();
128	145
129	146	const sliced_items = items[range.start..];
...	...	@@ -149,56 +166,56 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
149	166	swap(T, sliced_items, lessThan, &order, 3, 5);
150	167	swap(T, sliced_items, lessThan, &order, 3, 4);
151	168	},
152		7 => {
153		swap(T, sliced_items, lessThan, &order, 1, 2);
154		swap(T, sliced_items, lessThan, &order, 3, 4);
155		swap(T, sliced_items, lessThan, &order, 5, 6);
156		swap(T, sliced_items, lessThan, &order, 0, 2);
157		swap(T, sliced_items, lessThan, &order, 3, 5);
158		swap(T, sliced_items, lessThan, &order, 4, 6);
159		swap(T, sliced_items, lessThan, &order, 0, 1);
160		swap(T, sliced_items, lessThan, &order, 4, 5);
161		swap(T, sliced_items, lessThan, &order, 2, 6);
162		swap(T, sliced_items, lessThan, &order, 0, 4);
163		swap(T, sliced_items, lessThan, &order, 1, 5);
164		swap(T, sliced_items, lessThan, &order, 0, 3);
165		swap(T, sliced_items, lessThan, &order, 2, 5);
166		swap(T, sliced_items, lessThan, &order, 1, 3);
167		swap(T, sliced_items, lessThan, &order, 2, 4);
168		swap(T, sliced_items, lessThan, &order, 2, 3);
169		},
170		6 => {
171		swap(T, sliced_items, lessThan, &order, 1, 2);
172		swap(T, sliced_items, lessThan, &order, 4, 5);
173		swap(T, sliced_items, lessThan, &order, 0, 2);
174		swap(T, sliced_items, lessThan, &order, 3, 5);
175		swap(T, sliced_items, lessThan, &order, 0, 1);
176		swap(T, sliced_items, lessThan, &order, 3, 4);
177		swap(T, sliced_items, lessThan, &order, 2, 5);
178		swap(T, sliced_items, lessThan, &order, 0, 3);
179		swap(T, sliced_items, lessThan, &order, 1, 4);
180		swap(T, sliced_items, lessThan, &order, 2, 4);
181		swap(T, sliced_items, lessThan, &order, 1, 3);
182		swap(T, sliced_items, lessThan, &order, 2, 3);
183		},
184		5 => {
185		swap(T, sliced_items, lessThan, &order, 0, 1);
186		swap(T, sliced_items, lessThan, &order, 3, 4);
187		swap(T, sliced_items, lessThan, &order, 2, 4);
188		swap(T, sliced_items, lessThan, &order, 2, 3);
189		swap(T, sliced_items, lessThan, &order, 1, 4);
190		swap(T, sliced_items, lessThan, &order, 0, 3);
191		swap(T, sliced_items, lessThan, &order, 0, 2);
192		swap(T, sliced_items, lessThan, &order, 1, 3);
193		swap(T, sliced_items, lessThan, &order, 1, 2);
194		},
195		4 => {
196		swap(T, sliced_items, lessThan, &order, 0, 1);
197		swap(T, sliced_items, lessThan, &order, 2, 3);
198		swap(T, sliced_items, lessThan, &order, 0, 2);
199		swap(T, sliced_items, lessThan, &order, 1, 3);
200		swap(T, sliced_items, lessThan, &order, 1, 2);
201		},
	169	7 => {
	170	swap(T, sliced_items, lessThan, &order, 1, 2);
	171	swap(T, sliced_items, lessThan, &order, 3, 4);
	172	swap(T, sliced_items, lessThan, &order, 5, 6);
	173	swap(T, sliced_items, lessThan, &order, 0, 2);
	174	swap(T, sliced_items, lessThan, &order, 3, 5);
	175	swap(T, sliced_items, lessThan, &order, 4, 6);
	176	swap(T, sliced_items, lessThan, &order, 0, 1);
	177	swap(T, sliced_items, lessThan, &order, 4, 5);
	178	swap(T, sliced_items, lessThan, &order, 2, 6);
	179	swap(T, sliced_items, lessThan, &order, 0, 4);
	180	swap(T, sliced_items, lessThan, &order, 1, 5);
	181	swap(T, sliced_items, lessThan, &order, 0, 3);
	182	swap(T, sliced_items, lessThan, &order, 2, 5);
	183	swap(T, sliced_items, lessThan, &order, 1, 3);
	184	swap(T, sliced_items, lessThan, &order, 2, 4);
	185	swap(T, sliced_items, lessThan, &order, 2, 3);
	186	},
	187	6 => {
	188	swap(T, sliced_items, lessThan, &order, 1, 2);
	189	swap(T, sliced_items, lessThan, &order, 4, 5);
	190	swap(T, sliced_items, lessThan, &order, 0, 2);
	191	swap(T, sliced_items, lessThan, &order, 3, 5);
	192	swap(T, sliced_items, lessThan, &order, 0, 1);
	193	swap(T, sliced_items, lessThan, &order, 3, 4);
	194	swap(T, sliced_items, lessThan, &order, 2, 5);
	195	swap(T, sliced_items, lessThan, &order, 0, 3);
	196	swap(T, sliced_items, lessThan, &order, 1, 4);
	197	swap(T, sliced_items, lessThan, &order, 2, 4);
	198	swap(T, sliced_items, lessThan, &order, 1, 3);
	199	swap(T, sliced_items, lessThan, &order, 2, 3);
	200	},
	201	5 => {
	202	swap(T, sliced_items, lessThan, &order, 0, 1);
	203	swap(T, sliced_items, lessThan, &order, 3, 4);
	204	swap(T, sliced_items, lessThan, &order, 2, 4);
	205	swap(T, sliced_items, lessThan, &order, 2, 3);
	206	swap(T, sliced_items, lessThan, &order, 1, 4);
	207	swap(T, sliced_items, lessThan, &order, 0, 3);
	208	swap(T, sliced_items, lessThan, &order, 0, 2);
	209	swap(T, sliced_items, lessThan, &order, 1, 3);
	210	swap(T, sliced_items, lessThan, &order, 1, 2);
	211	},
	212	4 => {
	213	swap(T, sliced_items, lessThan, &order, 0, 1);
	214	swap(T, sliced_items, lessThan, &order, 2, 3);
	215	swap(T, sliced_items, lessThan, &order, 0, 2);
	216	swap(T, sliced_items, lessThan, &order, 1, 3);
	217	swap(T, sliced_items, lessThan, &order, 1, 2);
	218	},
202	219	else => {},
203	220	}
204	221	}
...	...	@@ -273,7 +290,6 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
273	290	// we merged two levels at the same time, so we're done with this level already
274	291	// (iterator.nextLevel() is called again at the bottom of this outer merge loop)
275	292	_ = iterator.nextLevel();
276
277	293	} else {
278	294	iterator.begin();
279	295	while (!iterator.finished()) {
...	...	@@ -301,9 +317,8 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
301	317	// 6. merge each A block with any B values that follow, using the cache or the second internal buffer
302	318	// 7. sort the second internal buffer if it exists
303	319	// 8. redistribute the two internal buffers back into the items
304
305	320	var block_size: usize = math.sqrt(iterator.length());
306		var buffer_size = iterator.length()/block_size + 1;
	321	var buffer_size = iterator.length() / block_size + 1;
307	322
308	323	// as an optimization, we really only need to pull out the internal buffers once for each level of merges
309	324	// after that we can reuse the same buffers over and over, then redistribute it when we're finished with this level
...	...	@@ -316,8 +331,18 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
316	331	var start: usize = 0;
317	332	var pull_index: usize = 0;
318	333	var pull = []Pull{
319		Pull {.from = 0, .to = 0, .count = 0, .range = Range.init(0, 0),},
320		Pull {.from = 0, .to = 0, .count = 0, .range = Range.init(0, 0),},
	334	Pull{
	335	.from = 0,
	336	.to = 0,
	337	.count = 0,
	338	.range = Range.init(0, 0),
	339	},
	340	Pull{
	341	.from = 0,
	342	.to = 0,
	343	.count = 0,
	344	.range = Range.init(0, 0),
	345	},
321	346	};
322	347
323	348	var buffer1 = Range.init(0, 0);
...	...	@@ -355,7 +380,10 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
355	380	// these values will be pulled out to the start of A
356	381	last = A.start;
357	382	count = 1;
358		while (count < find) : ({last = index; count += 1;}) {
	383	while (count < find) : ({
	384	last = index;
	385	count += 1;
	386	}) {
359	387	index = findLastForward(T, items, items[last], Range.init(last + 1, A.end), lessThan, find - count);
360	388	if (index == A.end) break;
361	389	}
...	...	@@ -363,7 +391,7 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
363	391
364	392	if (count >= buffer_size) {
365	393	// keep track of the range within the items where we'll need to "pull out" these values to create the internal buffer
366		pull[pull_index] = Pull {
	394	pull[pull_index] = Pull{
367	395	.range = Range.init(A.start, B.end),
368	396	.count = count,
369	397	.from = index,
...	...	@@ -398,7 +426,7 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
398	426	} else if (pull_index == 0 and count > buffer1.length()) {
399	427	// keep track of the largest buffer we were able to find
400	428	buffer1 = Range.init(A.start, A.start + count);
401		pull[pull_index] = Pull {
	429	pull[pull_index] = Pull{
402	430	.range = Range.init(A.start, B.end),
403	431	.count = count,
404	432	.from = index,
...	...	@@ -410,7 +438,10 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
410	438	// these values will be pulled out to the end of B
411	439	last = B.end - 1;
412	440	count = 1;
413		while (count < find) : ({last = index - 1; count += 1;}) {
	441	while (count < find) : ({
	442	last = index - 1;
	443	count += 1;
	444	}) {
414	445	index = findFirstBackward(T, items, items[last], Range.init(B.start, last), lessThan, find - count);
415	446	if (index == B.start) break;
416	447	}
...	...	@@ -418,7 +449,7 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
418	449
419	450	if (count >= buffer_size) {
420	451	// keep track of the range within the items where we'll need to "pull out" these values to create the internal buffe
421		pull[pull_index] = Pull {
	452	pull[pull_index] = Pull{
422	453	.range = Range.init(A.start, B.end),
423	454	.count = count,
424	455	.from = index,
...	...	@@ -457,7 +488,7 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
457	488	} else if (pull_index == 0 and count > buffer1.length()) {
458	489	// keep track of the largest buffer we were able to find
459	490	buffer1 = Range.init(B.end - count, B.end);
460		pull[pull_index] = Pull {
	491	pull[pull_index] = Pull{
461	492	.range = Range.init(A.start, B.end),
462	493	.count = count,
463	494	.from = index,
...	...	@@ -496,7 +527,7 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
496	527
497	528	// adjust block_size and buffer_size based on the values we were able to pull out
498	529	buffer_size = buffer1.length();
499		block_size = iterator.length()/buffer_size + 1;
	530	block_size = iterator.length() / buffer_size + 1;
500	531
501	532	// the first buffer NEEDS to be large enough to tag each of the evenly sized A blocks,
502	533	// so this was originally here to test the math for adjusting block_size above
...	...	@@ -547,7 +578,10 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
547	578	// swap the first value of each A block with the value in buffer1
548	579	var indexA = buffer1.start;
549	580	index = firstA.end;
550		while (index < blockA.end) : ({indexA += 1; index += block_size;}) {
	581	while (index < blockA.end) : ({
	582	indexA += 1;
	583	index += block_size;
	584	}) {
551	585	mem.swap(T, &items[indexA], &items[index]);
552	586	}
553	587
...	...	@@ -626,9 +660,7 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
626	660
627	661	// if there are no more A blocks remaining, this step is finished!
628	662	blockA.start += block_size;
629		if (blockA.length() == 0)
630		break;
631
	663	if (blockA.length() == 0) break;
632	664	} else if (blockB.length() < block_size) {
633	665	// move the last B block, which is unevenly sized, to before the remaining A blocks, by using a rotation
634	666	// the cache is disabled here since it might contain the contents of the previous A block
...	...	@@ -709,7 +741,7 @@ pub fn sort(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &cons
709	741	}
710	742
711	743	// merge operation without a buffer
712		fn mergeInPlace(comptime T: type, items: []T, A_arg: &const Range, B_arg: &const Range, lessThan: fn(&const T,&const T)bool) void {
	744	fn mergeInPlace(comptime T: type, items: []T, A_arg: &const Range, B_arg: &const Range, lessThan: fn(&const T, &const T) bool) void {
713	745	if (A_arg.length() == 0 or B_arg.length() == 0) return;
714	746
715	747	// this just repeatedly binary searches into B and rotates A into position.
...	...	@@ -730,8 +762,8 @@ fn mergeInPlace(comptime T: type, items: []T, A_arg: &const Range, B_arg: &const
730	762	// again, this is NOT a general-purpose solution – it only works well in this case!
731	763	// kind of like how the O(n^2) insertion sort is used in some places
732	764
733		var A = *A_arg;
734		var B = *B_arg;
	765	var A = A_arg.*;
	766	var B = B_arg.*;
735	767
736	768	while (true) {
737	769	// find the first place in B where the first item in A needs to be inserted
...	...	@@ -751,7 +783,7 @@ fn mergeInPlace(comptime T: type, items: []T, A_arg: &const Range, B_arg: &const
751	783	}
752	784
753	785	// merge operation using an internal buffer
754		fn mergeInternal(comptime T: type, items: []T, A: &const Range, B: &const Range, lessThan: fn(&const T,&const T)bool, buffer: &const Range) void {
	786	fn mergeInternal(comptime T: type, items: []T, A: &const Range, B: &const Range, lessThan: fn(&const T, &const T) bool, buffer: &const Range) void {
755	787	// whenever we find a value to add to the final array, swap it with the value that's already in that spot
756	788	// when this algorithm is finished, 'buffer' will contain its original contents, but in a different order
757	789	var A_count: usize = 0;
...	...	@@ -787,9 +819,9 @@ fn blockSwap(comptime T: type, items: []T, start1: usize, start2: usize, block_s
787	819
788	820	// combine a linear search with a binary search to reduce the number of comparisons in situations
789	821	// where have some idea as to how many unique values there are and where the next value might be
790		fn findFirstForward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T,&const T)bool, unique: usize) usize {
	822	fn findFirstForward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T, &const T) bool, unique: usize) usize {
791	823	if (range.length() == 0) return range.start;
792		const skip = math.max(range.length()/unique, usize(1));
	824	const skip = math.max(range.length() / unique, usize(1));
793	825
794	826	var index = range.start + skip;
795	827	while (lessThan(items[index - 1], value)) : (index += skip) {
...	...	@@ -801,9 +833,9 @@ fn findFirstForward(comptime T: type, items: []T, value: &const T, range: &const
801	833	return binaryFirst(T, items, value, Range.init(index - skip, index), lessThan);
802	834	}
803	835
804		fn findFirstBackward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T,&const T)bool, unique: usize) usize {
	836	fn findFirstBackward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T, &const T) bool, unique: usize) usize {
805	837	if (range.length() == 0) return range.start;
806		const skip = math.max(range.length()/unique, usize(1));
	838	const skip = math.max(range.length() / unique, usize(1));
807	839
808	840	var index = range.end - skip;
809	841	while (index > range.start and !lessThan(items[index - 1], value)) : (index -= skip) {
...	...	@@ -815,9 +847,9 @@ fn findFirstBackward(comptime T: type, items: []T, value: &const T, range: &cons
815	847	return binaryFirst(T, items, value, Range.init(index, index + skip), lessThan);
816	848	}
817	849
818		fn findLastForward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T,&const T)bool, unique: usize) usize {
	850	fn findLastForward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T, &const T) bool, unique: usize) usize {
819	851	if (range.length() == 0) return range.start;
820		const skip = math.max(range.length()/unique, usize(1));
	852	const skip = math.max(range.length() / unique, usize(1));
821	853
822	854	var index = range.start + skip;
823	855	while (!lessThan(value, items[index - 1])) : (index += skip) {
...	...	@@ -829,9 +861,9 @@ fn findLastForward(comptime T: type, items: []T, value: &const T, range: &const
829	861	return binaryLast(T, items, value, Range.init(index - skip, index), lessThan);
830	862	}
831	863
832		fn findLastBackward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T,&const T)bool, unique: usize) usize {
	864	fn findLastBackward(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T, &const T) bool, unique: usize) usize {
833	865	if (range.length() == 0) return range.start;
834		const skip = math.max(range.length()/unique, usize(1));
	866	const skip = math.max(range.length() / unique, usize(1));
835	867
836	868	var index = range.end - skip;
837	869	while (index > range.start and lessThan(value, items[index - 1])) : (index -= skip) {
...	...	@@ -843,12 +875,12 @@ fn findLastBackward(comptime T: type, items: []T, value: &const T, range: &const
843	875	return binaryLast(T, items, value, Range.init(index, index + skip), lessThan);
844	876	}
845	877
846		fn binaryFirst(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T,&const T)bool) usize {
	878	fn binaryFirst(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T, &const T) bool) usize {
847	879	var start = range.start;
848	880	var end = range.end - 1;
849	881	if (range.start >= range.end) return range.end;
850	882	while (start < end) {
851		const mid = start + (end - start)/2;
	883	const mid = start + (end - start) / 2;
852	884	if (lessThan(items[mid], value)) {
853	885	start = mid + 1;
854	886	} else {
...	...	@@ -861,12 +893,12 @@ fn binaryFirst(comptime T: type, items: []T, value: &const T, range: &const Rang
861	893	return start;
862	894	}
863	895
864		fn binaryLast(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T,&const T)bool) usize {
	896	fn binaryLast(comptime T: type, items: []T, value: &const T, range: &const Range, lessThan: fn(&const T, &const T) bool) usize {
865	897	var start = range.start;
866	898	var end = range.end - 1;
867	899	if (range.start >= range.end) return range.end;
868	900	while (start < end) {
869		const mid = start + (end - start)/2;
	901	const mid = start + (end - start) / 2;
870	902	if (!lessThan(value, items[mid])) {
871	903	start = mid + 1;
872	904	} else {
...	...	@@ -879,7 +911,7 @@ fn binaryLast(comptime T: type, items: []T, value: &const T, range: &const Range
879	911	return start;
880	912	}
881	913
882		fn mergeInto(comptime T: type, from: []T, A: &const Range, B: &const Range, lessThan: fn(&const T,&const T)bool, into: []T) void {
	914	fn mergeInto(comptime T: type, from: []T, A: &const Range, B: &const Range, lessThan: fn(&const T, &const T) bool, into: []T) void {
883	915	var A_index: usize = A.start;
884	916	var B_index: usize = B.start;
885	917	const A_last = A.end;
...	...	@@ -909,7 +941,7 @@ fn mergeInto(comptime T: type, from: []T, A: &const Range, B: &const Range, less
909	941	}
910	942	}
911	943
912		fn mergeExternal(comptime T: type, items: []T, A: &const Range, B: &const Range, lessThan: fn(&const T,&const T)bool, cache: []T) void {
	944	fn mergeExternal(comptime T: type, items: []T, A: &const Range, B: &const Range, lessThan: fn(&const T, &const T) bool, cache: []T) void {
913	945	// A fits into the cache, so use that instead of the internal buffer
914	946	var A_index: usize = 0;
915	947	var B_index: usize = B.start;
...	...	@@ -937,29 +969,27 @@ fn mergeExternal(comptime T: type, items: []T, A: &const Range, B: &const Range,
937	969	mem.copy(T, items[insert_index..], cache[A_index..A_last]);
938	970	}
939	971
940		fn swap(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T)bool, order: &[8]u8, x: usize, y: usize) void {
941		if (lessThan(items[y], items[x]) or
942		((order)[x] > (order)[y] and !lessThan(items[x], items[y])))
943		{
	972	fn swap(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T) bool, order: &[8]u8, x: usize, y: usize) void {
	973	if (lessThan(items[y], items[x]) or ((order.)[x] > (order.)[y] and !lessThan(items[x], items[y]))) {
944	974	mem.swap(T, &items[x], &items[y]);
945		mem.swap(u8, &(order)[x], &(order)[y]);
	975	mem.swap(u8, &(order.)[x], &(order.)[y]);
946	976	}
947	977	}
948	978
949	979	fn i32asc(lhs: &const i32, rhs: &const i32) bool {
950		return lhs < rhs;
	980	return lhs.* < rhs.*;
951	981	}
952	982
953	983	fn i32desc(lhs: &const i32, rhs: &const i32) bool {
954		return rhs < lhs;
	984	return rhs.* < lhs.*;
955	985	}
956	986
957	987	fn u8asc(lhs: &const u8, rhs: &const u8) bool {
958		return lhs < rhs;
	988	return lhs.* < rhs.*;
959	989	}
960	990
961	991	fn u8desc(lhs: &const u8, rhs: &const u8) bool {
962		return rhs < lhs;
	992	return rhs.* < lhs.*;
963	993	}
964	994
965	995	test "stable sort" {
...	...	@@ -967,44 +997,125 @@ test "stable sort" {
967	997	comptime testStableSort();
968	998	}
969	999	fn testStableSort() void {
970		var expected = []IdAndValue {
971		IdAndValue{.id = 0, .value = 0},
972		IdAndValue{.id = 1, .value = 0},
973		IdAndValue{.id = 2, .value = 0},
974		IdAndValue{.id = 0, .value = 1},
975		IdAndValue{.id = 1, .value = 1},
976		IdAndValue{.id = 2, .value = 1},
977		IdAndValue{.id = 0, .value = 2},
978		IdAndValue{.id = 1, .value = 2},
979		IdAndValue{.id = 2, .value = 2},
	1000	var expected = []IdAndValue{
	1001	IdAndValue{
	1002	.id = 0,
	1003	.value = 0,
	1004	},
	1005	IdAndValue{
	1006	.id = 1,
	1007	.value = 0,
	1008	},
	1009	IdAndValue{
	1010	.id = 2,
	1011	.value = 0,
	1012	},
	1013	IdAndValue{
	1014	.id = 0,
	1015	.value = 1,
	1016	},
	1017	IdAndValue{
	1018	.id = 1,
	1019	.value = 1,
	1020	},
	1021	IdAndValue{
	1022	.id = 2,
	1023	.value = 1,
	1024	},
	1025	IdAndValue{
	1026	.id = 0,
	1027	.value = 2,
	1028	},
	1029	IdAndValue{
	1030	.id = 1,
	1031	.value = 2,
	1032	},
	1033	IdAndValue{
	1034	.id = 2,
	1035	.value = 2,
	1036	},
980	1037	};
981		var cases = [][9]IdAndValue {
982		[]IdAndValue {
983		IdAndValue{.id = 0, .value = 0},
984		IdAndValue{.id = 0, .value = 1},
985		IdAndValue{.id = 0, .value = 2},
986		IdAndValue{.id = 1, .value = 0},
987		IdAndValue{.id = 1, .value = 1},
988		IdAndValue{.id = 1, .value = 2},
989		IdAndValue{.id = 2, .value = 0},
990		IdAndValue{.id = 2, .value = 1},
991		IdAndValue{.id = 2, .value = 2},
	1038	var cases = [][9]IdAndValue{
	1039	[]IdAndValue{
	1040	IdAndValue{
	1041	.id = 0,
	1042	.value = 0,
	1043	},
	1044	IdAndValue{
	1045	.id = 0,
	1046	.value = 1,
	1047	},
	1048	IdAndValue{
	1049	.id = 0,
	1050	.value = 2,
	1051	},
	1052	IdAndValue{
	1053	.id = 1,
	1054	.value = 0,
	1055	},
	1056	IdAndValue{
	1057	.id = 1,
	1058	.value = 1,
	1059	},
	1060	IdAndValue{
	1061	.id = 1,
	1062	.value = 2,
	1063	},
	1064	IdAndValue{
	1065	.id = 2,
	1066	.value = 0,
	1067	},
	1068	IdAndValue{
	1069	.id = 2,
	1070	.value = 1,
	1071	},
	1072	IdAndValue{
	1073	.id = 2,
	1074	.value = 2,
	1075	},
992	1076	},
993		[]IdAndValue {
994		IdAndValue{.id = 0, .value = 2},
995		IdAndValue{.id = 0, .value = 1},
996		IdAndValue{.id = 0, .value = 0},
997		IdAndValue{.id = 1, .value = 2},
998		IdAndValue{.id = 1, .value = 1},
999		IdAndValue{.id = 1, .value = 0},
1000		IdAndValue{.id = 2, .value = 2},
1001		IdAndValue{.id = 2, .value = 1},
1002		IdAndValue{.id = 2, .value = 0},
	1077	[]IdAndValue{
	1078	IdAndValue{
	1079	.id = 0,
	1080	.value = 2,
	1081	},
	1082	IdAndValue{
	1083	.id = 0,
	1084	.value = 1,
	1085	},
	1086	IdAndValue{
	1087	.id = 0,
	1088	.value = 0,
	1089	},
	1090	IdAndValue{
	1091	.id = 1,
	1092	.value = 2,
	1093	},
	1094	IdAndValue{
	1095	.id = 1,
	1096	.value = 1,
	1097	},
	1098	IdAndValue{
	1099	.id = 1,
	1100	.value = 0,
	1101	},
	1102	IdAndValue{
	1103	.id = 2,
	1104	.value = 2,
	1105	},
	1106	IdAndValue{
	1107	.id = 2,
	1108	.value = 1,
	1109	},
	1110	IdAndValue{
	1111	.id = 2,
	1112	.value = 0,
	1113	},
1003	1114	},
1004	1115	};
1005	1116	for (cases) \|*case\| {
1006		insertionSort(IdAndValue, (*case)[0..], cmpByValue);
1007		for (*case) \|item, i\| {
	1117	insertionSort(IdAndValue, (case.*)[0..], cmpByValue);
	1118	for (case.*) \|item, i\| {
1008	1119	assert(item.id == expected[i].id);
1009	1120	assert(item.value == expected[i].value);
1010	1121	}
...	...	@@ -1019,13 +1130,31 @@ fn cmpByValue(a: &const IdAndValue, b: &const IdAndValue) bool {
1019	1130	}
1020	1131
1021	1132	test "std.sort" {
1022		const u8cases = [][]const []const u8 {
1023		[][]const u8{"", ""},
1024		[][]const u8{"a", "a"},
1025		[][]const u8{"az", "az"},
1026		[][]const u8{"za", "az"},
1027		[][]const u8{"asdf", "adfs"},
1028		[][]const u8{"one", "eno"},
	1133	const u8cases = [][]const []const u8{
	1134	[][]const u8{
	1135	"",
	1136	"",
	1137	},
	1138	[][]const u8{
	1139	"a",
	1140	"a",
	1141	},
	1142	[][]const u8{
	1143	"az",
	1144	"az",
	1145	},
	1146	[][]const u8{
	1147	"za",
	1148	"az",
	1149	},
	1150	[][]const u8{
	1151	"asdf",
	1152	"adfs",
	1153	},
	1154	[][]const u8{
	1155	"one",
	1156	"eno",
	1157	},
1029	1158	};
1030	1159
1031	1160	for (u8cases) \|case\| {
...	...	@@ -1036,13 +1165,59 @@ test "std.sort" {
1036	1165	assert(mem.eql(u8, slice, case[1]));
1037	1166	}
1038	1167
1039		const i32cases = [][]const []const i32 {
1040		[][]const i32{[]i32{}, []i32{}},
1041		[][]const i32{[]i32{1}, []i32{1}},
1042		[][]const i32{[]i32{0, 1}, []i32{0, 1}},
1043		[][]const i32{[]i32{1, 0}, []i32{0, 1}},
1044		[][]const i32{[]i32{1, -1, 0}, []i32{-1, 0, 1}},
1045		[][]const i32{[]i32{2, 1, 3}, []i32{1, 2, 3}},
	1168	const i32cases = [][]const []const i32{
	1169	[][]const i32{
	1170	[]i32{},
	1171	[]i32{},
	1172	},
	1173	[][]const i32{
	1174	[]i32{1},
	1175	[]i32{1},
	1176	},
	1177	[][]const i32{
	1178	[]i32{
	1179	0,
	1180	1,
	1181	},
	1182	[]i32{
	1183	0,
	1184	1,
	1185	},
	1186	},
	1187	[][]const i32{
	1188	[]i32{
	1189	1,
	1190	0,
	1191	},
	1192	[]i32{
	1193	0,
	1194	1,
	1195	},
	1196	},
	1197	[][]const i32{
	1198	[]i32{
	1199	1,
	1200	-1,
	1201	0,
	1202	},
	1203	[]i32{
	1204	-1,
	1205	0,
	1206	1,
	1207	},
	1208	},
	1209	[][]const i32{
	1210	[]i32{
	1211	2,
	1212	1,
	1213	3,
	1214	},
	1215	[]i32{
	1216	1,
	1217	2,
	1218	3,
	1219	},
	1220	},
1046	1221	};
1047	1222
1048	1223	for (i32cases) \|case\| {
...	...	@@ -1055,13 +1230,59 @@ test "std.sort" {
1055	1230	}
1056	1231
1057	1232	test "std.sort descending" {
1058		const rev_cases = [][]const []const i32 {
1059		[][]const i32{[]i32{}, []i32{}},
1060		[][]const i32{[]i32{1}, []i32{1}},
1061		[][]const i32{[]i32{0, 1}, []i32{1, 0}},
1062		[][]const i32{[]i32{1, 0}, []i32{1, 0}},
1063		[][]const i32{[]i32{1, -1, 0}, []i32{1, 0, -1}},
1064		[][]const i32{[]i32{2, 1, 3}, []i32{3, 2, 1}},
	1233	const rev_cases = [][]const []const i32{
	1234	[][]const i32{
	1235	[]i32{},
	1236	[]i32{},
	1237	},
	1238	[][]const i32{
	1239	[]i32{1},
	1240	[]i32{1},
	1241	},
	1242	[][]const i32{
	1243	[]i32{
	1244	0,
	1245	1,
	1246	},
	1247	[]i32{
	1248	1,
	1249	0,
	1250	},
	1251	},
	1252	[][]const i32{
	1253	[]i32{
	1254	1,
	1255	0,
	1256	},
	1257	[]i32{
	1258	1,
	1259	0,
	1260	},
	1261	},
	1262	[][]const i32{
	1263	[]i32{
	1264	1,
	1265	-1,
	1266	0,
	1267	},
	1268	[]i32{
	1269	1,
	1270	0,
	1271	-1,
	1272	},
	1273	},
	1274	[][]const i32{
	1275	[]i32{
	1276	2,
	1277	1,
	1278	3,
	1279	},
	1280	[]i32{
	1281	3,
	1282	2,
	1283	1,
	1284	},
	1285	},
1065	1286	};
1066	1287
1067	1288	for (rev_cases) \|case\| {
...	...	@@ -1074,10 +1295,22 @@ test "std.sort descending" {
1074	1295	}
1075	1296
1076	1297	test "another sort case" {
1077		var arr = []i32{ 5, 3, 1, 2, 4 };
	1298	var arr = []i32{
	1299	5,
	1300	3,
	1301	1,
	1302	2,
	1303	4,
	1304	};
1078	1305	sort(i32, arr[0..], i32asc);
1079	1306
1080		assert(mem.eql(i32, arr, []i32{ 1, 2, 3, 4, 5 }));
	1307	assert(mem.eql(i32, arr, []i32{
	1308	1,
	1309	2,
	1310	3,
	1311	4,
	1312	5,
	1313	}));
1081	1314	}
1082	1315
1083	1316	test "sort fuzz testing" {
...	...	@@ -1112,7 +1345,7 @@ fn fuzzTest(rng: &std.rand.Random) void {
1112	1345	}
1113	1346	}
1114	1347
1115		pub fn min(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T)bool) T {
	1348	pub fn min(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T) bool) T {
1116	1349	var i: usize = 0;
1117	1350	var smallest = items[0];
1118	1351	for (items[1..]) \|item\| {
...	...	@@ -1123,7 +1356,7 @@ pub fn min(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const
1123	1356	return smallest;
1124	1357	}
1125	1358
1126		pub fn max(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T)bool) T {
	1359	pub fn max(comptime T: type, items: []T, lessThan: fn(lhs: &const T, rhs: &const T) bool) T {
1127	1360	var i: usize = 0;
1128	1361	var biggest = items[0];
1129	1362	for (items[1..]) \|item\| {

std/special/bootstrap.zig+8-4

...	...	@@ -27,10 +27,14 @@ extern fn zen_start() noreturn {
27	27	nakedcc fn _start() noreturn {
28	28	switch (builtin.arch) {
29	29	builtin.Arch.x86_64 => {
30		argc_ptr = asm("lea (%%rsp), %[argc]": [argc] "=r" (-> &usize));
	30	argc_ptr = asm ("lea (%%rsp), %[argc]"
	31	: [argc] "=r" (-> &usize)
	32	);
31	33	},
32	34	builtin.Arch.i386 => {
33		argc_ptr = asm("lea (%%esp), %[argc]": [argc] "=r" (-> &usize));
	35	argc_ptr = asm ("lea (%%esp), %[argc]"
	36	: [argc] "=r" (-> &usize)
	37	);
34	38	},
35	39	else => @compileError("unsupported arch"),
36	40	}
...	...	@@ -46,7 +50,7 @@ extern fn WinMainCRTStartup() noreturn {
46	50	}
47	51
48	52	fn posixCallMainAndExit() noreturn {
49		const argc = *argc_ptr;
	53	const argc = argc_ptr.*;
50	54	const argv = @ptrCast(&&u8, &argc_ptr[1]);
51	55	const envp_nullable = @ptrCast(&?&u8, &argv[argc + 1]);
52	56	var envp_count: usize = 0;
...	...	@@ -56,7 +60,7 @@ fn posixCallMainAndExit() noreturn {
56	60	const auxv = &@ptrCast(&usize, envp.ptr)[envp_count + 1];
57	61	var i: usize = 0;
58	62	while (auxv[i] != 0) : (i += 2) {
59		if (auxv[i] < std.os.linux_aux_raw.len) std.os.linux_aux_raw[auxv[i]] = auxv[i+1];
	63	if (auxv[i] < std.os.linux_aux_raw.len) std.os.linux_aux_raw[auxv[i]] = auxv[i + 1];
60	64	}
61	65	std.debug.assert(std.os.linux_aux_raw[std.elf.AT_PAGESZ] == std.os.page_size);
62	66	}

std/special/bootstrap_lib.zig+5-3

...	...	@@ -7,8 +7,10 @@ comptime {
7	7	@export("_DllMainCRTStartup", _DllMainCRTStartup, builtin.GlobalLinkage.Strong);
8	8	}
9	9
10		stdcallcc fn _DllMainCRTStartup(hinstDLL: std.os.windows.HINSTANCE, fdwReason: std.os.windows.DWORD,
11		lpReserved: std.os.windows.LPVOID) std.os.windows.BOOL
12		{
	10	stdcallcc fn _DllMainCRTStartup(
	11	hinstDLL: std.os.windows.HINSTANCE,
	12	fdwReason: std.os.windows.DWORD,
	13	lpReserved: std.os.windows.LPVOID,
	14	) std.os.windows.BOOL {
13	15	return std.os.windows.TRUE;
14	16	}

std/special/build_runner.zig+2-4

...	...	@@ -24,7 +24,6 @@ pub fn main() !void {
24	24
25	25	const allocator = &arena.allocator;
26	26
27
28	27	// skip my own exe name
29	28	_ = arg_it.skip();
30	29
...	...	@@ -175,8 +174,7 @@ fn usage(builder: &Builder, already_ran_build: bool, out_stream: var) !void {
175	174	try out_stream.print(" (none)\n");
176	175	} else {
177	176	for (builder.available_options_list.toSliceConst()) \|option\| {
178		const name = try fmt.allocPrint(allocator,
179		" -D{}=[{}]", option.name, Builder.typeIdName(option.type_id));
	177	const name = try fmt.allocPrint(allocator, " -D{}=[{}]", option.name, Builder.typeIdName(option.type_id));
180	178	defer allocator.free(name);
181	179	try out_stream.print("{s24} {}\n", name, option.description);
182	180	}
...	...	@@ -202,7 +200,7 @@ fn usageAndErr(builder: &Builder, already_ran_build: bool, out_stream: var) erro
202	200	return error.InvalidArgs;
203	201	}
204	202
205		const UnwrapArgError = error {OutOfMemory};
	203	const UnwrapArgError = error{OutOfMemory};
206	204
207	205	fn unwrapArg(arg: UnwrapArgError![]u8) UnwrapArgError![]u8 {
208	206	return arg catch \|err\| {

std/special/builtin.zig+41-19

...	...	@@ -56,7 +56,8 @@ export fn memmove(dest: ?&u8, src: ?&const u8, n: usize) ?&u8 {
56	56	comptime {
57	57	if (builtin.mode != builtin.Mode.ReleaseFast and
58	58	builtin.mode != builtin.Mode.ReleaseSmall and
59		builtin.os != builtin.Os.windows) {
	59	builtin.os != builtin.Os.windows)
	60	{
60	61	@export("__stack_chk_fail", __stack_chk_fail, builtin.GlobalLinkage.Strong);
61	62	}
62	63	if (builtin.os == builtin.Os.linux and builtin.arch == builtin.Arch.x86_64) {
...	...	@@ -101,15 +102,27 @@ nakedcc fn clone() void {
101	102
102	103	const math = @import("../math/index.zig");
103	104
104		export fn fmodf(x: f32, y: f32) f32 { return generic_fmod(f32, x, y); }
105		export fn fmod(x: f64, y: f64) f64 { return generic_fmod(f64, x, y); }
	105	export fn fmodf(x: f32, y: f32) f32 {
	106	return generic_fmod(f32, x, y);
	107	}
	108	export fn fmod(x: f64, y: f64) f64 {
	109	return generic_fmod(f64, x, y);
	110	}
106	111
107	112	// TODO add intrinsics for these (and probably the double version too)
108	113	// and have the math stuff use the intrinsic. same as @mod and @rem
109		export fn floorf(x: f32) f32 { return math.floor(x); }
110		export fn ceilf(x: f32) f32 { return math.ceil(x); }
111		export fn floor(x: f64) f64 { return math.floor(x); }
112		export fn ceil(x: f64) f64 { return math.ceil(x); }
	114	export fn floorf(x: f32) f32 {
	115	return math.floor(x);
	116	}
	117	export fn ceilf(x: f32) f32 {
	118	return math.ceil(x);
	119	}
	120	export fn floor(x: f64) f64 {
	121	return math.floor(x);
	122	}
	123	export fn ceil(x: f64) f64 {
	124	return math.ceil(x);
	125	}
113	126
114	127	fn generic_fmod(comptime T: type, x: T, y: T) T {
115	128	@setRuntimeSafety(false);
...	...	@@ -139,7 +152,10 @@ fn generic_fmod(comptime T: type, x: T, y: T) T {
139	152	// normalize x and y
140	153	if (ex == 0) {
141	154	i = ux << exp_bits;
142		while (i >> bits_minus_1 == 0) : (b: {ex -= 1; break :b i <<= 1;}) {}
	155	while (i >> bits_minus_1 == 0) : (b: {
	156	ex -= 1;
	157	i <<= 1;
	158	}) {}
143	159	ux <<= log2uint(@bitCast(u32, -ex + 1));
144	160	} else {
145	161	ux &= @maxValue(uint) >> exp_bits;
...	...	@@ -147,7 +163,10 @@ fn generic_fmod(comptime T: type, x: T, y: T) T {
147	163	}
148	164	if (ey == 0) {
149	165	i = uy << exp_bits;
150		while (i >> bits_minus_1 == 0) : (b: {ey -= 1; break :b i <<= 1;}) {}
	166	while (i >> bits_minus_1 == 0) : (b: {
	167	ey -= 1;
	168	i <<= 1;
	169	}) {}
151	170	uy <<= log2uint(@bitCast(u32, -ey + 1));
152	171	} else {
153	172	uy &= @maxValue(uint) >> exp_bits;
...	...	@@ -170,7 +189,10 @@ fn generic_fmod(comptime T: type, x: T, y: T) T {
170	189	return 0 * x;
171	190	ux = i;
172	191	}
173		while (ux >> digits == 0) : (b: {ux <<= 1; break :b ex -= 1;}) {}
	192	while (ux >> digits == 0) : (b: {
	193	ux <<= 1;
	194	ex -= 1;
	195	}) {}
174	196
175	197	// scale result up
176	198	if (ex > 0) {
...	...	@@ -298,7 +320,7 @@ export fn sqrt(x: f64) f64 {
298	320
299	321	// rounding direction
300	322	if (ix0 \| ix1 != 0) {
301		var z = 1.0 - tiny; // raise inexact
	323	var z = 1.0 - tiny; // raise inexact
302	324	if (z >= 1.0) {
303	325	z = 1.0 + tiny;
304	326	if (q1 == 0xFFFFFFFF) {
...	...	@@ -336,13 +358,13 @@ export fn sqrtf(x: f32) f32 {
336	358	var ix: i32 = @bitCast(i32, x);
337	359
338	360	if ((ix & 0x7F800000) == 0x7F800000) {
339		return x * x + x; // sqrt(nan) = nan, sqrt(+inf) = +inf, sqrt(-inf) = snan
	361	return x * x + x; // sqrt(nan) = nan, sqrt(+inf) = +inf, sqrt(-inf) = snan
340	362	}
341	363
342	364	// zero
343	365	if (ix <= 0) {
344	366	if (ix & ~sign == 0) {
345		return x; // sqrt (+-0) = +-0
	367	return x; // sqrt (+-0) = +-0
346	368	}
347	369	if (ix < 0) {
348	370	return math.snan(f32);
...	...	@@ -360,20 +382,20 @@ export fn sqrtf(x: f32) f32 {
360	382	m -= i - 1;
361	383	}
362	384
363		m -= 127; // unbias exponent
	385	m -= 127; // unbias exponent
364	386	ix = (ix & 0x007FFFFF) \| 0x00800000;
365	387
366		if (m & 1 != 0) { // odd m, double x to even
	388	if (m & 1 != 0) { // odd m, double x to even
367	389	ix += ix;
368	390	}
369	391
370		m >>= 1; // m = [m / 2]
	392	m >>= 1; // m = [m / 2]
371	393
372	394	// sqrt(x) bit by bit
373	395	ix += ix;
374		var q: i32 = 0; // q = sqrt(x)
	396	var q: i32 = 0; // q = sqrt(x)
375	397	var s: i32 = 0;
376		var r: i32 = 0x01000000; // r = moving bit right -> left
	398	var r: i32 = 0x01000000; // r = moving bit right -> left
377	399
378	400	while (r != 0) {
379	401	const t = s + r;
...	...	@@ -388,7 +410,7 @@ export fn sqrtf(x: f32) f32 {
388	410
389	411	// floating add to find rounding direction
390	412	if (ix != 0) {
391		var z = 1.0 - tiny; // inexact
	413	var z = 1.0 - tiny; // inexact
392	414	if (z >= 1.0) {
393	415	z = 1.0 + tiny;
394	416	if (z > 1.0) {

std/special/compiler_rt/comparetf2.zig+27-34

...	...	@@ -1,4 +1,4 @@
1		// TODO https://github.com/zig-lang/zig/issues/305
	1	// TODO https://github.com/ziglang/zig/issues/305
2	2	// and then make the return types of some of these functions the enum instead of c_int
3	3	const LE_LESS = c_int(-1);
4	4	const LE_EQUAL = c_int(0);
...	...	@@ -38,28 +38,25 @@ pub extern fn __letf2(a: f128, b: f128) c_int {
38	38
39	39	// If at least one of a and b is positive, we get the same result comparing
40	40	// a and b as signed integers as we would with a floating-point compare.
41		return if ((aInt & bInt) >= 0)
42		if (aInt < bInt)
43		LE_LESS
44		else if (aInt == bInt)
45		LE_EQUAL
46		else
47		LE_GREATER
	41	return if ((aInt & bInt) >= 0) if (aInt < bInt)
	42	LE_LESS
	43	else if (aInt == bInt)
	44	LE_EQUAL
48	45	else
49		// Otherwise, both are negative, so we need to flip the sense of the
50		// comparison to get the correct result. (This assumes a twos- or ones-
51		// complement integer representation; if integers are represented in a
52		// sign-magnitude representation, then this flip is incorrect).
53		if (aInt > bInt)
54		LE_LESS
55		else if (aInt == bInt)
56		LE_EQUAL
57		else
58		LE_GREATER
59		;
	46	LE_GREATER else
	47	// Otherwise, both are negative, so we need to flip the sense of the
	48	// comparison to get the correct result. (This assumes a twos- or ones-
	49	// complement integer representation; if integers are represented in a
	50	// sign-magnitude representation, then this flip is incorrect).
	51	if (aInt > bInt)
	52	LE_LESS
	53	else if (aInt == bInt)
	54	LE_EQUAL
	55	else
	56	LE_GREATER;
60	57	}
61	58
62		// TODO https://github.com/zig-lang/zig/issues/305
	59	// TODO https://github.com/ziglang/zig/issues/305
63	60	// and then make the return types of some of these functions the enum instead of c_int
64	61	const GE_LESS = c_int(-1);
65	62	const GE_EQUAL = c_int(0);
...	...	@@ -76,21 +73,17 @@ pub extern fn __getf2(a: f128, b: f128) c_int {
76	73
77	74	if (aAbs > infRep or bAbs > infRep) return GE_UNORDERED;
78	75	if ((aAbs \| bAbs) == 0) return GE_EQUAL;
79		return if ((aInt & bInt) >= 0)
80		if (aInt < bInt)
81		GE_LESS
82		else if (aInt == bInt)
83		GE_EQUAL
84		else
85		GE_GREATER
	76	return if ((aInt & bInt) >= 0) if (aInt < bInt)
	77	GE_LESS
	78	else if (aInt == bInt)
	79	GE_EQUAL
	80	else
	81	GE_GREATER else if (aInt > bInt)
	82	GE_LESS
	83	else if (aInt == bInt)
	84	GE_EQUAL
86	85	else
87		if (aInt > bInt)
88		GE_LESS
89		else if (aInt == bInt)
90		GE_EQUAL
91		else
92		GE_GREATER
93		;
	86	GE_GREATER;
94	87	}
95	88
96	89	pub extern fn __unordtf2(a: f128, b: f128) c_int {

std/special/compiler_rt/fixuint.zig+2-4

...	...	@@ -36,12 +36,10 @@ pub fn fixuint(comptime fp_t: type, comptime fixuint_t: type, a: fp_t) fixuint_t
36	36	const significand: rep_t = (aAbs & significandMask) \| implicitBit;
37	37
38	38	// If either the value or the exponent is negative, the result is zero.
39		if (sign == -1 or exponent < 0)
40		return 0;
	39	if (sign == -1 or exponent < 0) return 0;
41	40
42	41	// If the value is too large for the integer type, saturate.
43		if (c_uint(exponent) >= fixuint_t.bit_count)
44		return ~fixuint_t(0);
	42	if (c_uint(exponent) >= fixuint_t.bit_count) return ~fixuint_t(0);
45	43
46	44	// If 0 <= exponent < significandBits, right shift to get the result.
47	45	// Otherwise, shift left.

std/special/compiler_rt/fixunsdfdi.zig-1

...	...	@@ -9,4 +9,3 @@ pub extern fn __fixunsdfdi(a: f64) u64 {
9	9	test "import fixunsdfdi" {
10	10	_ = @import("fixunsdfdi_test.zig");
11	11	}
12

std/special/compiler_rt/fixunsdfsi.zig-1

...	...	@@ -9,4 +9,3 @@ pub extern fn __fixunsdfsi(a: f64) u32 {
9	9	test "import fixunsdfsi" {
10	10	_ = @import("fixunsdfsi_test.zig");
11	11	}
12

std/special/compiler_rt/fixunsdfti_test.zig-1

...	...	@@ -44,4 +44,3 @@ test "fixunsdfti" {
44	44	test__fixunsdfti(-0x1.FFFFFFFFFFFFFp+62, 0);
45	45	test__fixunsdfti(-0x1.FFFFFFFFFFFFEp+62, 0);
46	46	}
47

std/special/compiler_rt/fixunssfti.zig-1

...	...	@@ -9,4 +9,3 @@ pub extern fn __fixunssfti(a: f32) u128 {
9	9	test "import fixunssfti" {
10	10	_ = @import("fixunssfti_test.zig");
11	11	}
12

std/special/compiler_rt/fixunstfti.zig-1

...	...	@@ -9,4 +9,3 @@ pub extern fn __fixunstfti(a: f128) u128 {
9	9	test "import fixunstfti" {
10	10	_ = @import("fixunstfti_test.zig");
11	11	}
12

std/special/compiler_rt/index.zig+680-146

...	...	@@ -92,9 +92,10 @@ pub fn setXmm0(comptime T: type, value: T) void {
92	92	const aligned_value: T align(16) = value;
93	93	asm volatile (
94	94	\\movaps (%[ptr]), %%xmm0
95		:
96		: [ptr] "r" (&aligned_value)
97		: "xmm0");
	95	:
	96	: [ptr] "r" (&aligned_value)
	97	: "xmm0"
	98	);
98	99	}
99	100
100	101	extern fn __udivdi3(a: u64, b: u64) u64 {
...	...	@@ -158,7 +159,8 @@ fn isArmArch() bool {
158	159	builtin.Arch.armebv6t2,
159	160	builtin.Arch.armebv5,
160	161	builtin.Arch.armebv5te,
161		builtin.Arch.armebv4t => true,
	162	builtin.Arch.armebv4t,
	163	=> true,
162	164	else => false,
163	165	};
164	166	}
...	...	@@ -173,7 +175,10 @@ nakedcc fn __aeabi_uidivmod() void {
173	175	\\ ldr r1, [sp]
174	176	\\ add sp, sp, #4
175	177	\\ pop { pc }
176		::: "r2", "r1");
	178	:
	179	:
	180	: "r2", "r1"
	181	);
177	182	}
178	183
179	184	// _chkstk (_alloca) routine - probe stack between %esp and (%esp-%eax) in 4k increments,
...	...	@@ -283,26 +288,27 @@ extern fn __udivmodsi4(a: u32, b: u32, rem: &u32) u32 {
283	288	@setRuntimeSafety(is_test);
284	289
285	290	const d = __udivsi3(a, b);
286		rem = u32(i32(a) -% (i32(d) i32(b)));
	291	rem.* = u32(i32(a) -% (i32(d) * i32(b)));
287	292	return d;
288	293	}
289	294
290
291	295	extern fn __udivsi3(n: u32, d: u32) u32 {
292	296	@setRuntimeSafety(is_test);
293	297
294	298	const n_uword_bits: c_uint = u32.bit_count;
295	299	// special cases
296		if (d == 0)
297		return 0; // ?!
298		if (n == 0)
299		return 0;
	300	if (d == 0) return 0; // ?!
	301	if (n == 0) return 0;
300	302	var sr = @bitCast(c_uint, c_int(@clz(d)) - c_int(@clz(n)));
301	303	// 0 <= sr <= n_uword_bits - 1 or sr large
302		if (sr > n_uword_bits - 1) // d > r
	304	if (sr > n_uword_bits - 1) {
	305	// d > r
303	306	return 0;
304		if (sr == n_uword_bits - 1) // d == 1
	307	}
	308	if (sr == n_uword_bits - 1) {
	309	// d == 1
305	310	return n;
	311	}
306	312	sr += 1;
307	313	// 1 <= sr <= n_uword_bits - 1
308	314	// Not a special case
...	...	@@ -341,139 +347,667 @@ fn test_one_umoddi3(a: u64, b: u64, expected_r: u64) void {
341	347	}
342	348
343	349	test "test_udivsi3" {
344		const cases = [][3]u32 {
345		[]u32{0x00000000, 0x00000001, 0x00000000},
346		[]u32{0x00000000, 0x00000002, 0x00000000},
347		[]u32{0x00000000, 0x00000003, 0x00000000},
348		[]u32{0x00000000, 0x00000010, 0x00000000},
349		[]u32{0x00000000, 0x078644FA, 0x00000000},
350		[]u32{0x00000000, 0x0747AE14, 0x00000000},
351		[]u32{0x00000000, 0x7FFFFFFF, 0x00000000},
352		[]u32{0x00000000, 0x80000000, 0x00000000},
353		[]u32{0x00000000, 0xFFFFFFFD, 0x00000000},
354		[]u32{0x00000000, 0xFFFFFFFE, 0x00000000},
355		[]u32{0x00000000, 0xFFFFFFFF, 0x00000000},
356		[]u32{0x00000001, 0x00000001, 0x00000001},
357		[]u32{0x00000001, 0x00000002, 0x00000000},
358		[]u32{0x00000001, 0x00000003, 0x00000000},
359		[]u32{0x00000001, 0x00000010, 0x00000000},
360		[]u32{0x00000001, 0x078644FA, 0x00000000},
361		[]u32{0x00000001, 0x0747AE14, 0x00000000},
362		[]u32{0x00000001, 0x7FFFFFFF, 0x00000000},
363		[]u32{0x00000001, 0x80000000, 0x00000000},
364		[]u32{0x00000001, 0xFFFFFFFD, 0x00000000},
365		[]u32{0x00000001, 0xFFFFFFFE, 0x00000000},
366		[]u32{0x00000001, 0xFFFFFFFF, 0x00000000},
367		[]u32{0x00000002, 0x00000001, 0x00000002},
368		[]u32{0x00000002, 0x00000002, 0x00000001},
369		[]u32{0x00000002, 0x00000003, 0x00000000},
370		[]u32{0x00000002, 0x00000010, 0x00000000},
371		[]u32{0x00000002, 0x078644FA, 0x00000000},
372		[]u32{0x00000002, 0x0747AE14, 0x00000000},
373		[]u32{0x00000002, 0x7FFFFFFF, 0x00000000},
374		[]u32{0x00000002, 0x80000000, 0x00000000},
375		[]u32{0x00000002, 0xFFFFFFFD, 0x00000000},
376		[]u32{0x00000002, 0xFFFFFFFE, 0x00000000},
377		[]u32{0x00000002, 0xFFFFFFFF, 0x00000000},
378		[]u32{0x00000003, 0x00000001, 0x00000003},
379		[]u32{0x00000003, 0x00000002, 0x00000001},
380		[]u32{0x00000003, 0x00000003, 0x00000001},
381		[]u32{0x00000003, 0x00000010, 0x00000000},
382		[]u32{0x00000003, 0x078644FA, 0x00000000},
383		[]u32{0x00000003, 0x0747AE14, 0x00000000},
384		[]u32{0x00000003, 0x7FFFFFFF, 0x00000000},
385		[]u32{0x00000003, 0x80000000, 0x00000000},
386		[]u32{0x00000003, 0xFFFFFFFD, 0x00000000},
387		[]u32{0x00000003, 0xFFFFFFFE, 0x00000000},
388		[]u32{0x00000003, 0xFFFFFFFF, 0x00000000},
389		[]u32{0x00000010, 0x00000001, 0x00000010},
390		[]u32{0x00000010, 0x00000002, 0x00000008},
391		[]u32{0x00000010, 0x00000003, 0x00000005},
392		[]u32{0x00000010, 0x00000010, 0x00000001},
393		[]u32{0x00000010, 0x078644FA, 0x00000000},
394		[]u32{0x00000010, 0x0747AE14, 0x00000000},
395		[]u32{0x00000010, 0x7FFFFFFF, 0x00000000},
396		[]u32{0x00000010, 0x80000000, 0x00000000},
397		[]u32{0x00000010, 0xFFFFFFFD, 0x00000000},
398		[]u32{0x00000010, 0xFFFFFFFE, 0x00000000},
399		[]u32{0x00000010, 0xFFFFFFFF, 0x00000000},
400		[]u32{0x078644FA, 0x00000001, 0x078644FA},
401		[]u32{0x078644FA, 0x00000002, 0x03C3227D},
402		[]u32{0x078644FA, 0x00000003, 0x028216FE},
403		[]u32{0x078644FA, 0x00000010, 0x0078644F},
404		[]u32{0x078644FA, 0x078644FA, 0x00000001},
405		[]u32{0x078644FA, 0x0747AE14, 0x00000001},
406		[]u32{0x078644FA, 0x7FFFFFFF, 0x00000000},
407		[]u32{0x078644FA, 0x80000000, 0x00000000},
408		[]u32{0x078644FA, 0xFFFFFFFD, 0x00000000},
409		[]u32{0x078644FA, 0xFFFFFFFE, 0x00000000},
410		[]u32{0x078644FA, 0xFFFFFFFF, 0x00000000},
411		[]u32{0x0747AE14, 0x00000001, 0x0747AE14},
412		[]u32{0x0747AE14, 0x00000002, 0x03A3D70A},
413		[]u32{0x0747AE14, 0x00000003, 0x026D3A06},
414		[]u32{0x0747AE14, 0x00000010, 0x00747AE1},
415		[]u32{0x0747AE14, 0x078644FA, 0x00000000},
416		[]u32{0x0747AE14, 0x0747AE14, 0x00000001},
417		[]u32{0x0747AE14, 0x7FFFFFFF, 0x00000000},
418		[]u32{0x0747AE14, 0x80000000, 0x00000000},
419		[]u32{0x0747AE14, 0xFFFFFFFD, 0x00000000},
420		[]u32{0x0747AE14, 0xFFFFFFFE, 0x00000000},
421		[]u32{0x0747AE14, 0xFFFFFFFF, 0x00000000},
422		[]u32{0x7FFFFFFF, 0x00000001, 0x7FFFFFFF},
423		[]u32{0x7FFFFFFF, 0x00000002, 0x3FFFFFFF},
424		[]u32{0x7FFFFFFF, 0x00000003, 0x2AAAAAAA},
425		[]u32{0x7FFFFFFF, 0x00000010, 0x07FFFFFF},
426		[]u32{0x7FFFFFFF, 0x078644FA, 0x00000011},
427		[]u32{0x7FFFFFFF, 0x0747AE14, 0x00000011},
428		[]u32{0x7FFFFFFF, 0x7FFFFFFF, 0x00000001},
429		[]u32{0x7FFFFFFF, 0x80000000, 0x00000000},
430		[]u32{0x7FFFFFFF, 0xFFFFFFFD, 0x00000000},
431		[]u32{0x7FFFFFFF, 0xFFFFFFFE, 0x00000000},
432		[]u32{0x7FFFFFFF, 0xFFFFFFFF, 0x00000000},
433		[]u32{0x80000000, 0x00000001, 0x80000000},
434		[]u32{0x80000000, 0x00000002, 0x40000000},
435		[]u32{0x80000000, 0x00000003, 0x2AAAAAAA},
436		[]u32{0x80000000, 0x00000010, 0x08000000},
437		[]u32{0x80000000, 0x078644FA, 0x00000011},
438		[]u32{0x80000000, 0x0747AE14, 0x00000011},
439		[]u32{0x80000000, 0x7FFFFFFF, 0x00000001},
440		[]u32{0x80000000, 0x80000000, 0x00000001},
441		[]u32{0x80000000, 0xFFFFFFFD, 0x00000000},
442		[]u32{0x80000000, 0xFFFFFFFE, 0x00000000},
443		[]u32{0x80000000, 0xFFFFFFFF, 0x00000000},
444		[]u32{0xFFFFFFFD, 0x00000001, 0xFFFFFFFD},
445		[]u32{0xFFFFFFFD, 0x00000002, 0x7FFFFFFE},
446		[]u32{0xFFFFFFFD, 0x00000003, 0x55555554},
447		[]u32{0xFFFFFFFD, 0x00000010, 0x0FFFFFFF},
448		[]u32{0xFFFFFFFD, 0x078644FA, 0x00000022},
449		[]u32{0xFFFFFFFD, 0x0747AE14, 0x00000023},
450		[]u32{0xFFFFFFFD, 0x7FFFFFFF, 0x00000001},
451		[]u32{0xFFFFFFFD, 0x80000000, 0x00000001},
452		[]u32{0xFFFFFFFD, 0xFFFFFFFD, 0x00000001},
453		[]u32{0xFFFFFFFD, 0xFFFFFFFE, 0x00000000},
454		[]u32{0xFFFFFFFD, 0xFFFFFFFF, 0x00000000},
455		[]u32{0xFFFFFFFE, 0x00000001, 0xFFFFFFFE},
456		[]u32{0xFFFFFFFE, 0x00000002, 0x7FFFFFFF},
457		[]u32{0xFFFFFFFE, 0x00000003, 0x55555554},
458		[]u32{0xFFFFFFFE, 0x00000010, 0x0FFFFFFF},
459		[]u32{0xFFFFFFFE, 0x078644FA, 0x00000022},
460		[]u32{0xFFFFFFFE, 0x0747AE14, 0x00000023},
461		[]u32{0xFFFFFFFE, 0x7FFFFFFF, 0x00000002},
462		[]u32{0xFFFFFFFE, 0x80000000, 0x00000001},
463		[]u32{0xFFFFFFFE, 0xFFFFFFFD, 0x00000001},
464		[]u32{0xFFFFFFFE, 0xFFFFFFFE, 0x00000001},
465		[]u32{0xFFFFFFFE, 0xFFFFFFFF, 0x00000000},
466		[]u32{0xFFFFFFFF, 0x00000001, 0xFFFFFFFF},
467		[]u32{0xFFFFFFFF, 0x00000002, 0x7FFFFFFF},
468		[]u32{0xFFFFFFFF, 0x00000003, 0x55555555},
469		[]u32{0xFFFFFFFF, 0x00000010, 0x0FFFFFFF},
470		[]u32{0xFFFFFFFF, 0x078644FA, 0x00000022},
471		[]u32{0xFFFFFFFF, 0x0747AE14, 0x00000023},
472		[]u32{0xFFFFFFFF, 0x7FFFFFFF, 0x00000002},
473		[]u32{0xFFFFFFFF, 0x80000000, 0x00000001},
474		[]u32{0xFFFFFFFF, 0xFFFFFFFD, 0x00000001},
475		[]u32{0xFFFFFFFF, 0xFFFFFFFE, 0x00000001},
476		[]u32{0xFFFFFFFF, 0xFFFFFFFF, 0x00000001},
	350	const cases = [][3]u32{
	351	[]u32{
	352	0x00000000,
	353	0x00000001,
	354	0x00000000,
	355	},
	356	[]u32{
	357	0x00000000,
	358	0x00000002,
	359	0x00000000,
	360	},
	361	[]u32{
	362	0x00000000,
	363	0x00000003,
	364	0x00000000,
	365	},
	366	[]u32{
	367	0x00000000,
	368	0x00000010,
	369	0x00000000,
	370	},
	371	[]u32{
	372	0x00000000,
	373	0x078644FA,
	374	0x00000000,
	375	},
	376	[]u32{
	377	0x00000000,
	378	0x0747AE14,
	379	0x00000000,
	380	},
	381	[]u32{
	382	0x00000000,
	383	0x7FFFFFFF,
	384	0x00000000,
	385	},
	386	[]u32{
	387	0x00000000,
	388	0x80000000,
	389	0x00000000,
	390	},
	391	[]u32{
	392	0x00000000,
	393	0xFFFFFFFD,
	394	0x00000000,
	395	},
	396	[]u32{
	397	0x00000000,
	398	0xFFFFFFFE,
	399	0x00000000,
	400	},
	401	[]u32{
	402	0x00000000,
	403	0xFFFFFFFF,
	404	0x00000000,
	405	},
	406	[]u32{
	407	0x00000001,
	408	0x00000001,
	409	0x00000001,
	410	},
	411	[]u32{
	412	0x00000001,
	413	0x00000002,
	414	0x00000000,
	415	},
	416	[]u32{
	417	0x00000001,
	418	0x00000003,
	419	0x00000000,
	420	},
	421	[]u32{
	422	0x00000001,
	423	0x00000010,
	424	0x00000000,
	425	},
	426	[]u32{
	427	0x00000001,
	428	0x078644FA,
	429	0x00000000,
	430	},
	431	[]u32{
	432	0x00000001,
	433	0x0747AE14,
	434	0x00000000,
	435	},
	436	[]u32{
	437	0x00000001,
	438	0x7FFFFFFF,
	439	0x00000000,
	440	},
	441	[]u32{
	442	0x00000001,
	443	0x80000000,
	444	0x00000000,
	445	},
	446	[]u32{
	447	0x00000001,
	448	0xFFFFFFFD,
	449	0x00000000,
	450	},
	451	[]u32{
	452	0x00000001,
	453	0xFFFFFFFE,
	454	0x00000000,
	455	},
	456	[]u32{
	457	0x00000001,
	458	0xFFFFFFFF,
	459	0x00000000,
	460	},
	461	[]u32{
	462	0x00000002,
	463	0x00000001,
	464	0x00000002,
	465	},
	466	[]u32{
	467	0x00000002,
	468	0x00000002,
	469	0x00000001,
	470	},
	471	[]u32{
	472	0x00000002,
	473	0x00000003,
	474	0x00000000,
	475	},
	476	[]u32{
	477	0x00000002,
	478	0x00000010,
	479	0x00000000,
	480	},
	481	[]u32{
	482	0x00000002,
	483	0x078644FA,
	484	0x00000000,
	485	},
	486	[]u32{
	487	0x00000002,
	488	0x0747AE14,
	489	0x00000000,
	490	},
	491	[]u32{
	492	0x00000002,
	493	0x7FFFFFFF,
	494	0x00000000,
	495	},
	496	[]u32{
	497	0x00000002,
	498	0x80000000,
	499	0x00000000,
	500	},
	501	[]u32{
	502	0x00000002,
	503	0xFFFFFFFD,
	504	0x00000000,
	505	},
	506	[]u32{
	507	0x00000002,
	508	0xFFFFFFFE,
	509	0x00000000,
	510	},
	511	[]u32{
	512	0x00000002,
	513	0xFFFFFFFF,
	514	0x00000000,
	515	},
	516	[]u32{
	517	0x00000003,
	518	0x00000001,
	519	0x00000003,
	520	},
	521	[]u32{
	522	0x00000003,
	523	0x00000002,
	524	0x00000001,
	525	},
	526	[]u32{
	527	0x00000003,
	528	0x00000003,
	529	0x00000001,
	530	},
	531	[]u32{
	532	0x00000003,
	533	0x00000010,
	534	0x00000000,
	535	},
	536	[]u32{
	537	0x00000003,
	538	0x078644FA,
	539	0x00000000,
	540	},
	541	[]u32{
	542	0x00000003,
	543	0x0747AE14,
	544	0x00000000,
	545	},
	546	[]u32{
	547	0x00000003,
	548	0x7FFFFFFF,
	549	0x00000000,
	550	},
	551	[]u32{
	552	0x00000003,
	553	0x80000000,
	554	0x00000000,
	555	},
	556	[]u32{
	557	0x00000003,
	558	0xFFFFFFFD,
	559	0x00000000,
	560	},
	561	[]u32{
	562	0x00000003,
	563	0xFFFFFFFE,
	564	0x00000000,
	565	},
	566	[]u32{
	567	0x00000003,
	568	0xFFFFFFFF,
	569	0x00000000,
	570	},
	571	[]u32{
	572	0x00000010,
	573	0x00000001,
	574	0x00000010,
	575	},
	576	[]u32{
	577	0x00000010,
	578	0x00000002,
	579	0x00000008,
	580	},
	581	[]u32{
	582	0x00000010,
	583	0x00000003,
	584	0x00000005,
	585	},
	586	[]u32{
	587	0x00000010,
	588	0x00000010,
	589	0x00000001,
	590	},
	591	[]u32{
	592	0x00000010,
	593	0x078644FA,
	594	0x00000000,
	595	},
	596	[]u32{
	597	0x00000010,
	598	0x0747AE14,
	599	0x00000000,
	600	},
	601	[]u32{
	602	0x00000010,
	603	0x7FFFFFFF,
	604	0x00000000,
	605	},
	606	[]u32{
	607	0x00000010,
	608	0x80000000,
	609	0x00000000,
	610	},
	611	[]u32{
	612	0x00000010,
	613	0xFFFFFFFD,
	614	0x00000000,
	615	},
	616	[]u32{
	617	0x00000010,
	618	0xFFFFFFFE,
	619	0x00000000,
	620	},
	621	[]u32{
	622	0x00000010,
	623	0xFFFFFFFF,
	624	0x00000000,
	625	},
	626	[]u32{
	627	0x078644FA,
	628	0x00000001,
	629	0x078644FA,
	630	},
	631	[]u32{
	632	0x078644FA,
	633	0x00000002,
	634	0x03C3227D,
	635	},
	636	[]u32{
	637	0x078644FA,
	638	0x00000003,
	639	0x028216FE,
	640	},
	641	[]u32{
	642	0x078644FA,
	643	0x00000010,
	644	0x0078644F,
	645	},
	646	[]u32{
	647	0x078644FA,
	648	0x078644FA,
	649	0x00000001,
	650	},
	651	[]u32{
	652	0x078644FA,
	653	0x0747AE14,
	654	0x00000001,
	655	},
	656	[]u32{
	657	0x078644FA,
	658	0x7FFFFFFF,
	659	0x00000000,
	660	},
	661	[]u32{
	662	0x078644FA,
	663	0x80000000,
	664	0x00000000,
	665	},
	666	[]u32{
	667	0x078644FA,
	668	0xFFFFFFFD,
	669	0x00000000,
	670	},
	671	[]u32{
	672	0x078644FA,
	673	0xFFFFFFFE,
	674	0x00000000,
	675	},
	676	[]u32{
	677	0x078644FA,
	678	0xFFFFFFFF,
	679	0x00000000,
	680	},
	681	[]u32{
	682	0x0747AE14,
	683	0x00000001,
	684	0x0747AE14,
	685	},
	686	[]u32{
	687	0x0747AE14,
	688	0x00000002,
	689	0x03A3D70A,
	690	},
	691	[]u32{
	692	0x0747AE14,
	693	0x00000003,
	694	0x026D3A06,
	695	},
	696	[]u32{
	697	0x0747AE14,
	698	0x00000010,
	699	0x00747AE1,
	700	},
	701	[]u32{
	702	0x0747AE14,
	703	0x078644FA,
	704	0x00000000,
	705	},
	706	[]u32{
	707	0x0747AE14,
	708	0x0747AE14,
	709	0x00000001,
	710	},
	711	[]u32{
	712	0x0747AE14,
	713	0x7FFFFFFF,
	714	0x00000000,
	715	},
	716	[]u32{
	717	0x0747AE14,
	718	0x80000000,
	719	0x00000000,
	720	},
	721	[]u32{
	722	0x0747AE14,
	723	0xFFFFFFFD,
	724	0x00000000,
	725	},
	726	[]u32{
	727	0x0747AE14,
	728	0xFFFFFFFE,
	729	0x00000000,
	730	},
	731	[]u32{
	732	0x0747AE14,
	733	0xFFFFFFFF,
	734	0x00000000,
	735	},
	736	[]u32{
	737	0x7FFFFFFF,
	738	0x00000001,
	739	0x7FFFFFFF,
	740	},
	741	[]u32{
	742	0x7FFFFFFF,
	743	0x00000002,
	744	0x3FFFFFFF,
	745	},
	746	[]u32{
	747	0x7FFFFFFF,
	748	0x00000003,
	749	0x2AAAAAAA,
	750	},
	751	[]u32{
	752	0x7FFFFFFF,
	753	0x00000010,
	754	0x07FFFFFF,
	755	},
	756	[]u32{
	757	0x7FFFFFFF,
	758	0x078644FA,
	759	0x00000011,
	760	},
	761	[]u32{
	762	0x7FFFFFFF,
	763	0x0747AE14,
	764	0x00000011,
	765	},
	766	[]u32{
	767	0x7FFFFFFF,
	768	0x7FFFFFFF,
	769	0x00000001,
	770	},
	771	[]u32{
	772	0x7FFFFFFF,
	773	0x80000000,
	774	0x00000000,
	775	},
	776	[]u32{
	777	0x7FFFFFFF,
	778	0xFFFFFFFD,
	779	0x00000000,
	780	},
	781	[]u32{
	782	0x7FFFFFFF,
	783	0xFFFFFFFE,
	784	0x00000000,
	785	},
	786	[]u32{
	787	0x7FFFFFFF,
	788	0xFFFFFFFF,
	789	0x00000000,
	790	},
	791	[]u32{
	792	0x80000000,
	793	0x00000001,
	794	0x80000000,
	795	},
	796	[]u32{
	797	0x80000000,
	798	0x00000002,
	799	0x40000000,
	800	},
	801	[]u32{
	802	0x80000000,
	803	0x00000003,
	804	0x2AAAAAAA,
	805	},
	806	[]u32{
	807	0x80000000,
	808	0x00000010,
	809	0x08000000,
	810	},
	811	[]u32{
	812	0x80000000,
	813	0x078644FA,
	814	0x00000011,
	815	},
	816	[]u32{
	817	0x80000000,
	818	0x0747AE14,
	819	0x00000011,
	820	},
	821	[]u32{
	822	0x80000000,
	823	0x7FFFFFFF,
	824	0x00000001,
	825	},
	826	[]u32{
	827	0x80000000,
	828	0x80000000,
	829	0x00000001,
	830	},
	831	[]u32{
	832	0x80000000,
	833	0xFFFFFFFD,
	834	0x00000000,
	835	},
	836	[]u32{
	837	0x80000000,
	838	0xFFFFFFFE,
	839	0x00000000,
	840	},
	841	[]u32{
	842	0x80000000,
	843	0xFFFFFFFF,
	844	0x00000000,
	845	},
	846	[]u32{
	847	0xFFFFFFFD,
	848	0x00000001,
	849	0xFFFFFFFD,
	850	},
	851	[]u32{
	852	0xFFFFFFFD,
	853	0x00000002,
	854	0x7FFFFFFE,
	855	},
	856	[]u32{
	857	0xFFFFFFFD,
	858	0x00000003,
	859	0x55555554,
	860	},
	861	[]u32{
	862	0xFFFFFFFD,
	863	0x00000010,
	864	0x0FFFFFFF,
	865	},
	866	[]u32{
	867	0xFFFFFFFD,
	868	0x078644FA,
	869	0x00000022,
	870	},
	871	[]u32{
	872	0xFFFFFFFD,
	873	0x0747AE14,
	874	0x00000023,
	875	},
	876	[]u32{
	877	0xFFFFFFFD,
	878	0x7FFFFFFF,
	879	0x00000001,
	880	},
	881	[]u32{
	882	0xFFFFFFFD,
	883	0x80000000,
	884	0x00000001,
	885	},
	886	[]u32{
	887	0xFFFFFFFD,
	888	0xFFFFFFFD,
	889	0x00000001,
	890	},
	891	[]u32{
	892	0xFFFFFFFD,
	893	0xFFFFFFFE,
	894	0x00000000,
	895	},
	896	[]u32{
	897	0xFFFFFFFD,
	898	0xFFFFFFFF,
	899	0x00000000,
	900	},
	901	[]u32{
	902	0xFFFFFFFE,
	903	0x00000001,
	904	0xFFFFFFFE,
	905	},
	906	[]u32{
	907	0xFFFFFFFE,
	908	0x00000002,
	909	0x7FFFFFFF,
	910	},
	911	[]u32{
	912	0xFFFFFFFE,
	913	0x00000003,
	914	0x55555554,
	915	},
	916	[]u32{
	917	0xFFFFFFFE,
	918	0x00000010,
	919	0x0FFFFFFF,
	920	},
	921	[]u32{
	922	0xFFFFFFFE,
	923	0x078644FA,
	924	0x00000022,
	925	},
	926	[]u32{
	927	0xFFFFFFFE,
	928	0x0747AE14,
	929	0x00000023,
	930	},
	931	[]u32{
	932	0xFFFFFFFE,
	933	0x7FFFFFFF,
	934	0x00000002,
	935	},
	936	[]u32{
	937	0xFFFFFFFE,
	938	0x80000000,
	939	0x00000001,
	940	},
	941	[]u32{
	942	0xFFFFFFFE,
	943	0xFFFFFFFD,
	944	0x00000001,
	945	},
	946	[]u32{
	947	0xFFFFFFFE,
	948	0xFFFFFFFE,
	949	0x00000001,
	950	},
	951	[]u32{
	952	0xFFFFFFFE,
	953	0xFFFFFFFF,
	954	0x00000000,
	955	},
	956	[]u32{
	957	0xFFFFFFFF,
	958	0x00000001,
	959	0xFFFFFFFF,
	960	},
	961	[]u32{
	962	0xFFFFFFFF,
	963	0x00000002,
	964	0x7FFFFFFF,
	965	},
	966	[]u32{
	967	0xFFFFFFFF,
	968	0x00000003,
	969	0x55555555,
	970	},
	971	[]u32{
	972	0xFFFFFFFF,
	973	0x00000010,
	974	0x0FFFFFFF,
	975	},
	976	[]u32{
	977	0xFFFFFFFF,
	978	0x078644FA,
	979	0x00000022,
	980	},
	981	[]u32{
	982	0xFFFFFFFF,
	983	0x0747AE14,
	984	0x00000023,
	985	},
	986	[]u32{
	987	0xFFFFFFFF,
	988	0x7FFFFFFF,
	989	0x00000002,
	990	},
	991	[]u32{
	992	0xFFFFFFFF,
	993	0x80000000,
	994	0x00000001,
	995	},
	996	[]u32{
	997	0xFFFFFFFF,
	998	0xFFFFFFFD,
	999	0x00000001,
	1000	},
	1001	[]u32{
	1002	0xFFFFFFFF,
	1003	0xFFFFFFFE,
	1004	0x00000001,
	1005	},
	1006	[]u32{
	1007	0xFFFFFFFF,
	1008	0xFFFFFFFF,
	1009	0x00000001,
	1010	},
477	1011	};
478	1012
479	1013	for (cases) \|case\| {

std/special/compiler_rt/udivmod.zig+23-20

...	...	@@ -1,7 +1,10 @@
1	1	const builtin = @import("builtin");
2	2	const is_test = builtin.is_test;
3	3
4		const low = switch (builtin.endian) { builtin.Endian.Big => 1, builtin.Endian.Little => 0 };
	4	const low = switch (builtin.endian) {
	5	builtin.Endian.Big => 1,
	6	builtin.Endian.Little => 0,
	7	};
5	8	const high = 1 - low;
6	9
7	10	pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem: ?&DoubleInt) DoubleInt {
...	...	@@ -11,8 +14,8 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
11	14	const SignedDoubleInt = @IntType(true, DoubleInt.bit_count);
12	15	const Log2SingleInt = @import("std").math.Log2Int(SingleInt);
13	16
14		const n = *@ptrCast(&const [2]SingleInt, &a); // TODO issue #421
15		const d = *@ptrCast(&const [2]SingleInt, &b); // TODO issue #421
	17	const n = @ptrCast(&const [2]SingleInt, &a).*; // TODO issue #421
	18	const d = @ptrCast(&const [2]SingleInt, &b).*; // TODO issue #421
16	19	var q: [2]SingleInt = undefined;
17	20	var r: [2]SingleInt = undefined;
18	21	var sr: c_uint = undefined;
...	...	@@ -23,7 +26,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
23	26	// ---
24	27	// 0 X
25	28	if (maybe_rem) \|rem\| {
26		*rem = n[low] % d[low];
	29	rem.* = n[low] % d[low];
27	30	}
28	31	return n[low] / d[low];
29	32	}
...	...	@@ -31,7 +34,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
31	34	// ---
32	35	// K X
33	36	if (maybe_rem) \|rem\| {
34		*rem = n[low];
	37	rem.* = n[low];
35	38	}
36	39	return 0;
37	40	}
...	...	@@ -42,7 +45,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
42	45	// ---
43	46	// 0 0
44	47	if (maybe_rem) \|rem\| {
45		*rem = n[high] % d[low];
	48	rem.* = n[high] % d[low];
46	49	}
47	50	return n[high] / d[low];
48	51	}
...	...	@@ -54,7 +57,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
54	57	if (maybe_rem) \|rem\| {
55	58	r[high] = n[high] % d[high];
56	59	r[low] = 0;
57		rem = @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]); // TODO issue #421
	60	rem.* = @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]).*; // TODO issue #421
58	61	}
59	62	return n[high] / d[high];
60	63	}
...	...	@@ -66,7 +69,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
66	69	if (maybe_rem) \|rem\| {
67	70	r[low] = n[low];
68	71	r[high] = n[high] & (d[high] - 1);
69		rem = @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]); // TODO issue #421
	72	rem.* = @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]).*; // TODO issue #421
70	73	}
71	74	return n[high] >> Log2SingleInt(@ctz(d[high]));
72	75	}
...	...	@@ -77,7 +80,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
77	80	// 0 <= sr <= SingleInt.bit_count - 2 or sr large
78	81	if (sr > SingleInt.bit_count - 2) {
79	82	if (maybe_rem) \|rem\| {
80		*rem = a;
	83	rem.* = a;
81	84	}
82	85	return 0;
83	86	}
...	...	@@ -98,7 +101,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
98	101	if ((d[low] & (d[low] - 1)) == 0) {
99	102	// d is a power of 2
100	103	if (maybe_rem) \|rem\| {
101		*rem = n[low] & (d[low] - 1);
	104	rem.* = n[low] & (d[low] - 1);
102	105	}
103	106	if (d[low] == 1) {
104	107	return a;
...	...	@@ -106,7 +109,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
106	109	sr = @ctz(d[low]);
107	110	q[high] = n[high] >> Log2SingleInt(sr);
108	111	q[low] = (n[high] << Log2SingleInt(SingleInt.bit_count - sr)) \| (n[low] >> Log2SingleInt(sr));
109		return *@ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &q[0]); // TODO issue #421
	112	return @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &q[0]).*; // TODO issue #421
110	113	}
111	114	// K X
112	115	// ---
...	...	@@ -141,7 +144,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
141	144	// 0 <= sr <= SingleInt.bit_count - 1 or sr large
142	145	if (sr > SingleInt.bit_count - 1) {
143	146	if (maybe_rem) \|rem\| {
144		*rem = a;
	147	rem.* = a;
145	148	}
146	149	return 0;
147	150	}
...	...	@@ -170,25 +173,25 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
170	173	var r_all: DoubleInt = undefined;
171	174	while (sr > 0) : (sr -= 1) {
172	175	// r:q = ((r:q) << 1) \| carry
173		r[high] = (r[high] << 1) \| (r[low] >> (SingleInt.bit_count - 1));
174		r[low] = (r[low] << 1) \| (q[high] >> (SingleInt.bit_count - 1));
175		q[high] = (q[high] << 1) \| (q[low] >> (SingleInt.bit_count - 1));
176		q[low] = (q[low] << 1) \| carry;
	176	r[high] = (r[high] << 1) \| (r[low] >> (SingleInt.bit_count - 1));
	177	r[low] = (r[low] << 1) \| (q[high] >> (SingleInt.bit_count - 1));
	178	q[high] = (q[high] << 1) \| (q[low] >> (SingleInt.bit_count - 1));
	179	q[low] = (q[low] << 1) \| carry;
177	180	// carry = 0;
178	181	// if (r.all >= b)
179	182	// {
180	183	// r.all -= b;
181	184	// carry = 1;
182	185	// }
183		r_all = *@ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]); // TODO issue #421
	186	r_all = @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]).*; // TODO issue #421
184	187	const s: SignedDoubleInt = SignedDoubleInt(b -% r_all -% 1) >> (DoubleInt.bit_count - 1);
185	188	carry = u32(s & 1);
186	189	r_all -= b & @bitCast(DoubleInt, s);
187		r = *@ptrCast(&[2]SingleInt, &r_all); // TODO issue #421
	190	r = @ptrCast(&[2]SingleInt, &r_all).*; // TODO issue #421
188	191	}
189		const q_all = ((*@ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &q[0])) << 1) \| carry; // TODO issue #421
	192	const q_all = ((@ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &q[0]).*) << 1) \| carry; // TODO issue #421
190	193	if (maybe_rem) \|rem\| {
191		*rem = r_all;
	194	rem.* = r_all;
192	195	}
193	196	return q_all;
194	197	}

std/special/compiler_rt/udivmodti4.zig+1-1

...	...	@@ -9,7 +9,7 @@ pub extern fn __udivmodti4(a: u128, b: u128, maybe_rem: ?&u128) u128 {
9	9
10	10	pub extern fn __udivmodti4_windows_x86_64(a: &const u128, b: &const u128, maybe_rem: ?&u128) void {
11	11	@setRuntimeSafety(builtin.is_test);
12		compiler_rt.setXmm0(u128, udivmod(u128, a, b, maybe_rem));
	12	compiler_rt.setXmm0(u128, udivmod(u128, a., b., maybe_rem));
13	13	}
14	14
15	15	test "import udivmodti4" {

std/special/compiler_rt/umodti3.zig+1-1

...	...	@@ -11,5 +11,5 @@ pub extern fn __umodti3(a: u128, b: u128) u128 {
11	11
12	12	pub extern fn __umodti3_windows_x86_64(a: &const u128, b: &const u128) void {
13	13	@setRuntimeSafety(builtin.is_test);
14		compiler_rt.setXmm0(u128, __umodti3(a, b));
	14	compiler_rt.setXmm0(u128, __umodti3(a., b.));
15	15	}

std/unicode.zig+13-9

...	...	@@ -58,6 +58,7 @@ pub fn utf8Encode(c: u32, out: []u8) !u3 {
58	58	}
59	59
60	60	const Utf8DecodeError = Utf8Decode2Error \|\| Utf8Decode3Error \|\| Utf8Decode4Error;
	61
61	62	/// Decodes the UTF-8 codepoint encoded in the given slice of bytes.
62	63	/// bytes.len must be equal to utf8ByteSequenceLength(bytes[0]) catch unreachable.
63	64	/// If you already know the length at comptime, you can call one of
...	...	@@ -150,7 +151,9 @@ pub fn utf8ValidateSlice(s: []const u8) bool {
150	151	return false;
151	152	}
152	153
153		if (utf8Decode(s[i..i+cp_len])) \|_\| {} else \|_\| { return false; }
	154	if (utf8Decode(s[i..i + cp_len])) \|_\| {} else \|_\| {
	155	return false;
	156	}
154	157	i += cp_len;
155	158	} else \|err\| {
156	159	return false;
...	...	@@ -179,9 +182,7 @@ pub const Utf8View = struct {
179	182	}
180	183
181	184	pub fn initUnchecked(s: []const u8) Utf8View {
182		return Utf8View {
183		.bytes = s,
184		};
	185	return Utf8View{ .bytes = s };
185	186	}
186	187
187	188	pub fn initComptime(comptime s: []const u8) Utf8View {
...	...	@@ -191,12 +192,12 @@ pub const Utf8View = struct {
191	192	error.InvalidUtf8 => {
192	193	@compileError("invalid utf8");
193	194	unreachable;
194		}
	195	},
195	196	}
196	197	}
197	198
198	199	pub fn iterator(s: &const Utf8View) Utf8Iterator {
199		return Utf8Iterator {
	200	return Utf8Iterator{
200	201	.bytes = s.bytes,
201	202	.i = 0,
202	203	};
...	...	@@ -215,7 +216,7 @@ const Utf8Iterator = struct {
215	216	const cp_len = utf8ByteSequenceLength(it.bytes[it.i]) catch unreachable;
216	217
217	218	it.i += cp_len;
218		return it.bytes[it.i-cp_len..it.i];
	219	return it.bytes[it.i - cp_len..it.i];
219	220	}
220	221
221	222	pub fn nextCodepoint(it: &Utf8Iterator) ?u32 {
...	...	@@ -304,9 +305,12 @@ test "utf8 view bad" {
304	305	fn testUtf8ViewBad() void {
305	306	// Compile-time error.
306	307	// const s3 = Utf8View.initComptime("\xfe\xf2");
307
308	308	const s = Utf8View.init("hel\xadlo");
309		if (s) \|_\| { unreachable; } else \|err\| { debug.assert(err == error.InvalidUtf8); }
	309	if (s) \|_\| {
	310	unreachable;
	311	} else \|err\| {
	312	debug.assert(err == error.InvalidUtf8);
	313	}
310	314	}
311	315
312	316	test "utf8 view ok" {

std/zig/ast.zig+147-116

...	...	@@ -40,7 +40,7 @@ pub const Tree = struct {
40	40	};
41	41
42	42	pub fn tokenLocationPtr(self: &Tree, start_index: usize, token: &const Token) Location {
43		var loc = Location {
	43	var loc = Location{
44	44	.line = 0,
45	45	.column = 0,
46	46	.line_start = start_index,
...	...	@@ -67,6 +67,36 @@ pub const Tree = struct {
67	67	pub fn tokenLocation(self: &Tree, start_index: usize, token_index: TokenIndex) Location {
68	68	return self.tokenLocationPtr(start_index, self.tokens.at(token_index));
69	69	}
	70
	71	pub fn tokensOnSameLine(self: &Tree, token1_index: TokenIndex, token2_index: TokenIndex) bool {
	72	return self.tokensOnSameLinePtr(self.tokens.at(token1_index), self.tokens.at(token2_index));
	73	}
	74
	75	pub fn tokensOnSameLinePtr(self: &Tree, token1: &const Token, token2: &const Token) bool {
	76	return mem.indexOfScalar(u8, self.source[token1.end..token2.start], '\n') == null;
	77	}
	78
	79	pub fn dump(self: &Tree) void {
	80	self.root_node.base.dump(0);
	81	}
	82
	83	/// Skips over comments
	84	pub fn prevToken(self: &Tree, token_index: TokenIndex) TokenIndex {
	85	var index = token_index - 1;
	86	while (self.tokens.at(index).id == Token.Id.LineComment) {
	87	index -= 1;
	88	}
	89	return index;
	90	}
	91
	92	/// Skips over comments
	93	pub fn nextToken(self: &Tree, token_index: TokenIndex) TokenIndex {
	94	var index = token_index + 1;
	95	while (self.tokens.at(index).id == Token.Id.LineComment) {
	96	index += 1;
	97	}
	98	return index;
	99	}
70	100	};
71	101
72	102	pub const Error = union(enum) {
...	...	@@ -76,6 +106,7 @@ pub const Error = union(enum) {
76	106	UnattachedDocComment: UnattachedDocComment,
77	107	ExpectedEqOrSemi: ExpectedEqOrSemi,
78	108	ExpectedSemiOrLBrace: ExpectedSemiOrLBrace,
	109	ExpectedColonOrRParen: ExpectedColonOrRParen,
79	110	ExpectedLabelable: ExpectedLabelable,
80	111	ExpectedInlinable: ExpectedInlinable,
81	112	ExpectedAsmOutputReturnOrType: ExpectedAsmOutputReturnOrType,
...	...	@@ -90,14 +121,15 @@ pub const Error = union(enum) {
90	121	ExpectedCommaOrEnd: ExpectedCommaOrEnd,
91	122
92	123	pub fn render(self: &Error, tokens: &Tree.TokenList, stream: var) !void {
93		switch (*self) {
94		// TODO https://github.com/zig-lang/zig/issues/683
	124	switch (self.*) {
	125	// TODO https://github.com/ziglang/zig/issues/683
95	126	@TagType(Error).InvalidToken => \|*x\| return x.render(tokens, stream),
96	127	@TagType(Error).ExpectedVarDeclOrFn => \|*x\| return x.render(tokens, stream),
97	128	@TagType(Error).ExpectedAggregateKw => \|*x\| return x.render(tokens, stream),
98	129	@TagType(Error).UnattachedDocComment => \|*x\| return x.render(tokens, stream),
99	130	@TagType(Error).ExpectedEqOrSemi => \|*x\| return x.render(tokens, stream),
100	131	@TagType(Error).ExpectedSemiOrLBrace => \|*x\| return x.render(tokens, stream),
	132	@TagType(Error).ExpectedColonOrRParen => \|*x\| return x.render(tokens, stream),
101	133	@TagType(Error).ExpectedLabelable => \|*x\| return x.render(tokens, stream),
102	134	@TagType(Error).ExpectedInlinable => \|*x\| return x.render(tokens, stream),
103	135	@TagType(Error).ExpectedAsmOutputReturnOrType => \|*x\| return x.render(tokens, stream),
...	...	@@ -114,14 +146,15 @@ pub const Error = union(enum) {
114	146	}
115	147
116	148	pub fn loc(self: &Error) TokenIndex {
117		switch (*self) {
118		// TODO https://github.com/zig-lang/zig/issues/683
	149	switch (self.*) {
	150	// TODO https://github.com/ziglang/zig/issues/683
119	151	@TagType(Error).InvalidToken => \|x\| return x.token,
120	152	@TagType(Error).ExpectedVarDeclOrFn => \|x\| return x.token,
121	153	@TagType(Error).ExpectedAggregateKw => \|x\| return x.token,
122	154	@TagType(Error).UnattachedDocComment => \|x\| return x.token,
123	155	@TagType(Error).ExpectedEqOrSemi => \|x\| return x.token,
124	156	@TagType(Error).ExpectedSemiOrLBrace => \|x\| return x.token,
	157	@TagType(Error).ExpectedColonOrRParen => \|x\| return x.token,
125	158	@TagType(Error).ExpectedLabelable => \|x\| return x.token,
126	159	@TagType(Error).ExpectedInlinable => \|x\| return x.token,
127	160	@TagType(Error).ExpectedAsmOutputReturnOrType => \|x\| return x.token,
...	...	@@ -139,15 +172,13 @@ pub const Error = union(enum) {
139	172
140	173	pub const InvalidToken = SingleTokenError("Invalid token {}");
141	174	pub const ExpectedVarDeclOrFn = SingleTokenError("Expected variable declaration or function, found {}");
142		pub const ExpectedAggregateKw = SingleTokenError("Expected " ++
143		@tagName(Token.Id.Keyword_struct) ++ ", " ++ @tagName(Token.Id.Keyword_union) ++ ", or " ++
144		@tagName(Token.Id.Keyword_enum) ++ ", found {}");
	175	pub const ExpectedAggregateKw = SingleTokenError("Expected " ++ @tagName(Token.Id.Keyword_struct) ++ ", " ++ @tagName(Token.Id.Keyword_union) ++ ", or " ++ @tagName(Token.Id.Keyword_enum) ++ ", found {}");
145	176	pub const ExpectedEqOrSemi = SingleTokenError("Expected '=' or ';', found {}");
146	177	pub const ExpectedSemiOrLBrace = SingleTokenError("Expected ';' or '{{', found {}");
	178	pub const ExpectedColonOrRParen = SingleTokenError("Expected ':' or ')', found {}");
147	179	pub const ExpectedLabelable = SingleTokenError("Expected 'while', 'for', 'inline', 'suspend', or '{{', found {}");
148	180	pub const ExpectedInlinable = SingleTokenError("Expected 'while' or 'for', found {}");
149		pub const ExpectedAsmOutputReturnOrType = SingleTokenError("Expected '->' or " ++
150		@tagName(Token.Id.Identifier) ++ ", found {}");
	181	pub const ExpectedAsmOutputReturnOrType = SingleTokenError("Expected '->' or " ++ @tagName(Token.Id.Identifier) ++ ", found {}");
151	182	pub const ExpectedSliceOrRBracket = SingleTokenError("Expected ']' or '..', found {}");
152	183	pub const ExpectedPrimaryExpr = SingleTokenError("Expected primary expression, found {}");
153	184
...	...	@@ -160,8 +191,7 @@ pub const Error = union(enum) {
160	191	node: &Node,
161	192
162	193	pub fn render(self: &ExpectedCall, tokens: &Tree.TokenList, stream: var) !void {
163		return stream.print("expected " ++ @tagName(@TagType(Node.SuffixOp.Op).Call) ++ ", found {}",
164		@tagName(self.node.id));
	194	return stream.print("expected " ++ @tagName(@TagType(Node.SuffixOp.Op).Call) ++ ", found {}", @tagName(self.node.id));
165	195	}
166	196	};
167	197
...	...	@@ -169,8 +199,7 @@ pub const Error = union(enum) {
169	199	node: &Node,
170	200
171	201	pub fn render(self: &ExpectedCallOrFnProto, tokens: &Tree.TokenList, stream: var) !void {
172		return stream.print("expected " ++ @tagName(@TagType(Node.SuffixOp.Op).Call) ++ " or " ++
173		@tagName(Node.Id.FnProto) ++ ", found {}", @tagName(self.node.id));
	202	return stream.print("expected " ++ @tagName(@TagType(Node.SuffixOp.Op).Call) ++ " or " ++ @tagName(Node.Id.FnProto) ++ ", found {}", @tagName(self.node.id));
174	203	}
175	204	};
176	205
...	...	@@ -273,7 +302,6 @@ pub const Node = struct {
273	302	Block,
274	303
275	304	// Misc
276		LineComment,
277	305	DocComment,
278	306	SwitchCase,
279	307	SwitchElse,
...	...	@@ -360,8 +388,8 @@ pub const Node = struct {
360	388	Id.SwitchElse,
361	389	Id.FieldInitializer,
362	390	Id.DocComment,
363		Id.LineComment,
364		Id.TestDecl => return false,
	391	Id.TestDecl,
	392	=> return false,
365	393	Id.While => {
366	394	const while_node = @fieldParentPtr(While, "base", n);
367	395	if (while_node.@"else") \|@"else"\| {
...	...	@@ -415,6 +443,20 @@ pub const Node = struct {
415	443	}
416	444	}
417	445
	446	pub fn dump(self: &Node, indent: usize) void {
	447	{
	448	var i: usize = 0;
	449	while (i < indent) : (i += 1) {
	450	std.debug.warn(" ");
	451	}
	452	}
	453	std.debug.warn("{}\n", @tagName(self.id));
	454
	455	var child_i: usize = 0;
	456	while (self.iterate(child_i)) \|child\| : (child_i += 1) {
	457	child.dump(indent + 2);
	458	}
	459	}
418	460
419	461	pub const Root = struct {
420	462	base: Node,
...	...	@@ -426,17 +468,17 @@ pub const Node = struct {
426	468
427	469	pub fn iterate(self: &Root, index: usize) ?&Node {
428	470	if (index < self.decls.len) {
429		return self.decls.items[self.decls.len - index - 1];
	471	return self.decls.at(index).*;
430	472	}
431	473	return null;
432	474	}
433	475
434	476	pub fn firstToken(self: &Root) TokenIndex {
435		return if (self.decls.len == 0) self.eof_token else (*self.decls.at(0)).firstToken();
	477	return if (self.decls.len == 0) self.eof_token else (self.decls.at(0).*).firstToken();
436	478	}
437	479
438	480	pub fn lastToken(self: &Root) TokenIndex {
439		return if (self.decls.len == 0) self.eof_token else (*self.decls.at(self.decls.len - 1)).lastToken();
	481	return if (self.decls.len == 0) self.eof_token else (self.decls.at(self.decls.len - 1).*).lastToken();
440	482	}
441	483	};
442	484
...	...	@@ -493,6 +535,7 @@ pub const Node = struct {
493	535	base: Node,
494	536	doc_comments: ?&DocComment,
495	537	visib_token: ?TokenIndex,
	538	use_token: TokenIndex,
496	539	expr: &Node,
497	540	semicolon_token: TokenIndex,
498	541
...	...	@@ -507,7 +550,7 @@ pub const Node = struct {
507	550
508	551	pub fn firstToken(self: &Use) TokenIndex {
509	552	if (self.visib_token) \|visib_token\| return visib_token;
510		return self.expr.firstToken();
	553	return self.use_token;
511	554	}
512	555
513	556	pub fn lastToken(self: &Use) TokenIndex {
...	...	@@ -526,7 +569,7 @@ pub const Node = struct {
526	569	pub fn iterate(self: &ErrorSetDecl, index: usize) ?&Node {
527	570	var i = index;
528	571
529		if (i < self.decls.len) return *self.decls.at(i);
	572	if (i < self.decls.len) return self.decls.at(i).*;
530	573	i -= self.decls.len;
531	574
532	575	return null;
...	...	@@ -543,27 +586,15 @@ pub const Node = struct {
543	586
544	587	pub const ContainerDecl = struct {
545	588	base: Node,
546		ltoken: TokenIndex,
547		layout: Layout,
548		kind: Kind,
	589	layout_token: ?TokenIndex,
	590	kind_token: TokenIndex,
549	591	init_arg_expr: InitArg,
550	592	fields_and_decls: DeclList,
	593	lbrace_token: TokenIndex,
551	594	rbrace_token: TokenIndex,
552	595
553	596	pub const DeclList = Root.DeclList;
554	597
555		const Layout = enum {
556		Auto,
557		Extern,
558		Packed,
559		};
560
561		const Kind = enum {
562		Struct,
563		Enum,
564		Union,
565		};
566
567	598	const InitArg = union(enum) {
568	599	None,
569	600	Enum: ?&Node,
...	...	@@ -578,18 +609,20 @@ pub const Node = struct {
578	609	if (i < 1) return t;
579	610	i -= 1;
580	611	},
581		InitArg.None,
582		InitArg.Enum => { }
	612	InitArg.None, InitArg.Enum => {},
583	613	}
584	614
585		if (i < self.fields_and_decls.len) return *self.fields_and_decls.at(i);
	615	if (i < self.fields_and_decls.len) return self.fields_and_decls.at(i).*;
586	616	i -= self.fields_and_decls.len;
587	617
588	618	return null;
589	619	}
590	620
591	621	pub fn firstToken(self: &ContainerDecl) TokenIndex {
592		return self.ltoken;
	622	if (self.layout_token) \|layout_token\| {
	623	return layout_token;
	624	}
	625	return self.kind_token;
593	626	}
594	627
595	628	pub fn lastToken(self: &ContainerDecl) TokenIndex {
...	...	@@ -790,8 +823,16 @@ pub const Node = struct {
790	823	pub fn iterate(self: &FnProto, index: usize) ?&Node {
791	824	var i = index;
792	825
793		if (self.body_node) \|body_node\| {
794		if (i < 1) return body_node;
	826	if (self.lib_name) \|lib_name\| {
	827	if (i < 1) return lib_name;
	828	i -= 1;
	829	}
	830
	831	if (i < self.params.len) return self.params.at(self.params.len - i - 1).*;
	832	i -= self.params.len;
	833
	834	if (self.align_expr) \|align_expr\| {
	835	if (i < 1) return align_expr;
795	836	i -= 1;
796	837	}
797	838
...	...	@@ -807,16 +848,8 @@ pub const Node = struct {
807	848	},
808	849	}
809	850
810		if (self.align_expr) \|align_expr\| {
811		if (i < 1) return align_expr;
812		i -= 1;
813		}
814
815		if (i < self.params.len) return self.params.items[self.params.len - i - 1];
816		i -= self.params.len;
817
818		if (self.lib_name) \|lib_name\| {
819		if (i < 1) return lib_name;
	851	if (self.body_node) \|body_node\| {
	852	if (i < 1) return body_node;
820	853	i -= 1;
821	854	}
822	855
...	...	@@ -914,7 +947,7 @@ pub const Node = struct {
914	947	pub fn iterate(self: &Block, index: usize) ?&Node {
915	948	var i = index;
916	949
917		if (i < self.statements.len) return self.statements.items[i];
	950	if (i < self.statements.len) return self.statements.at(i).*;
918	951	i -= self.statements.len;
919	952
920	953	return null;
...	...	@@ -1099,7 +1132,8 @@ pub const Node = struct {
1099	1132	base: Node,
1100	1133	switch_token: TokenIndex,
1101	1134	expr: &Node,
1102		/// these can be SwitchCase nodes or LineComment nodes
	1135
	1136	/// these must be SwitchCase nodes
1103	1137	cases: CaseList,
1104	1138	rbrace: TokenIndex,
1105	1139
...	...	@@ -1111,7 +1145,7 @@ pub const Node = struct {
1111	1145	if (i < 1) return self.expr;
1112	1146	i -= 1;
1113	1147
1114		if (i < self.cases.len) return *self.cases.at(i);
	1148	if (i < self.cases.len) return self.cases.at(i).*;
1115	1149	i -= self.cases.len;
1116	1150
1117	1151	return null;
...	...	@@ -1129,6 +1163,7 @@ pub const Node = struct {
1129	1163	pub const SwitchCase = struct {
1130	1164	base: Node,
1131	1165	items: ItemList,
	1166	arrow_token: TokenIndex,
1132	1167	payload: ?&Node,
1133	1168	expr: &Node,
1134	1169
...	...	@@ -1137,7 +1172,7 @@ pub const Node = struct {
1137	1172	pub fn iterate(self: &SwitchCase, index: usize) ?&Node {
1138	1173	var i = index;
1139	1174
1140		if (i < self.items.len) return *self.items.at(i);
	1175	if (i < self.items.len) return self.items.at(i).*;
1141	1176	i -= self.items.len;
1142	1177
1143	1178	if (self.payload) \|payload\| {
...	...	@@ -1152,7 +1187,7 @@ pub const Node = struct {
1152	1187	}
1153	1188
1154	1189	pub fn firstToken(self: &SwitchCase) TokenIndex {
1155		return (*self.items.at(0)).firstToken();
	1190	return (self.items.at(0).*).firstToken();
1156	1191	}
1157	1192
1158	1193	pub fn lastToken(self: &SwitchCase) TokenIndex {
...	...	@@ -1440,7 +1475,8 @@ pub const Node = struct {
1440	1475	Op.Range,
1441	1476	Op.Sub,
1442	1477	Op.SubWrap,
1443		Op.UnwrapMaybe => {},
	1478	Op.UnwrapMaybe,
	1479	=> {},
1444	1480	}
1445	1481
1446	1482	if (i < 1) return self.rhs;
...	...	@@ -1464,14 +1500,14 @@ pub const Node = struct {
1464	1500	op: Op,
1465	1501	rhs: &Node,
1466	1502
1467		const Op = union(enum) {
	1503	pub const Op = union(enum) {
1468	1504	AddrOf: AddrOfInfo,
1469	1505	ArrayType: &Node,
1470	1506	Await,
1471	1507	BitNot,
1472	1508	BoolNot,
1473	1509	Cancel,
1474		Deref,
	1510	PointerType,
1475	1511	MaybeType,
1476	1512	Negation,
1477	1513	NegationWrap,
...	...	@@ -1481,12 +1517,20 @@ pub const Node = struct {
1481	1517	UnwrapMaybe,
1482	1518	};
1483	1519
1484		const AddrOfInfo = struct {
1485		align_expr: ?&Node,
1486		bit_offset_start_token: ?TokenIndex,
1487		bit_offset_end_token: ?TokenIndex,
	1520	pub const AddrOfInfo = struct {
	1521	align_info: ?Align,
1488	1522	const_token: ?TokenIndex,
1489	1523	volatile_token: ?TokenIndex,
	1524
	1525	pub const Align = struct {
	1526	node: &Node,
	1527	bit_range: ?BitRange,
	1528
	1529	pub const BitRange = struct {
	1530	start: &Node,
	1531	end: &Node,
	1532	};
	1533	};
1490	1534	};
1491	1535
1492	1536	pub fn iterate(self: &PrefixOp, index: usize) ?&Node {
...	...	@@ -1494,14 +1538,14 @@ pub const Node = struct {
1494	1538
1495	1539	switch (self.op) {
1496	1540	Op.SliceType => \|addr_of_info\| {
1497		if (addr_of_info.align_expr) \|align_expr\| {
1498		if (i < 1) return align_expr;
	1541	if (addr_of_info.align_info) \|align_info\| {
	1542	if (i < 1) return align_info.node;
1499	1543	i -= 1;
1500	1544	}
1501	1545	},
1502	1546	Op.AddrOf => \|addr_of_info\| {
1503		if (addr_of_info.align_expr) \|align_expr\| {
1504		if (i < 1) return align_expr;
	1547	if (addr_of_info.align_info) \|align_info\| {
	1548	if (i < 1) return align_info.node;
1505	1549	i -= 1;
1506	1550	}
1507	1551	},
...	...	@@ -1513,13 +1557,14 @@ pub const Node = struct {
1513	1557	Op.BitNot,
1514	1558	Op.BoolNot,
1515	1559	Op.Cancel,
1516		Op.Deref,
1517	1560	Op.MaybeType,
1518	1561	Op.Negation,
1519	1562	Op.NegationWrap,
1520	1563	Op.Try,
1521	1564	Op.Resume,
1522		Op.UnwrapMaybe => {},
	1565	Op.UnwrapMaybe,
	1566	Op.PointerType,
	1567	=> {},
1523	1568	}
1524	1569
1525	1570	if (i < 1) return self.rhs;
...	...	@@ -1573,6 +1618,7 @@ pub const Node = struct {
1573	1618	Slice: Slice,
1574	1619	ArrayInitializer: InitList,
1575	1620	StructInitializer: InitList,
	1621	Deref,
1576	1622
1577	1623	pub const InitList = SegmentedList(&Node, 2);
1578	1624
...	...	@@ -1596,15 +1642,15 @@ pub const Node = struct {
1596	1642	i -= 1;
1597	1643
1598	1644	switch (self.op) {
1599		Op.Call => \|call_info\| {
1600		if (i < call_info.params.len) return *call_info.params.at(i);
	1645	@TagType(Op).Call => \|*call_info\| {
	1646	if (i < call_info.params.len) return call_info.params.at(i).*;
1601	1647	i -= call_info.params.len;
1602	1648	},
1603	1649	Op.ArrayAccess => \|index_expr\| {
1604	1650	if (i < 1) return index_expr;
1605	1651	i -= 1;
1606	1652	},
1607		Op.Slice => \|range\| {
	1653	@TagType(Op).Slice => \|range\| {
1608	1654	if (i < 1) return range.start;
1609	1655	i -= 1;
1610	1656
...	...	@@ -1613,20 +1659,25 @@ pub const Node = struct {
1613	1659	i -= 1;
1614	1660	}
1615	1661	},
1616		Op.ArrayInitializer => \|exprs\| {
1617		if (i < exprs.len) return *exprs.at(i);
	1662	Op.ArrayInitializer => \|*exprs\| {
	1663	if (i < exprs.len) return exprs.at(i).*;
1618	1664	i -= exprs.len;
1619	1665	},
1620		Op.StructInitializer => \|fields\| {
1621		if (i < fields.len) return *fields.at(i);
	1666	Op.StructInitializer => \|*fields\| {
	1667	if (i < fields.len) return fields.at(i).*;
1622	1668	i -= fields.len;
1623	1669	},
	1670	Op.Deref => {},
1624	1671	}
1625	1672
1626	1673	return null;
1627	1674	}
1628	1675
1629	1676	pub fn firstToken(self: &SuffixOp) TokenIndex {
	1677	switch (self.op) {
	1678	@TagType(Op).Call => \|*call_info\| if (call_info.async_attr) \|async_attr\| return async_attr.firstToken(),
	1679	else => {},
	1680	}
1630	1681	return self.lhs.firstToken();
1631	1682	}
1632	1683
...	...	@@ -1811,7 +1862,7 @@ pub const Node = struct {
1811	1862	pub fn iterate(self: &BuiltinCall, index: usize) ?&Node {
1812	1863	var i = index;
1813	1864
1814		if (i < self.params.len) return *self.params.at(i);
	1865	if (i < self.params.len) return self.params.at(i).*;
1815	1866	i -= self.params.len;
1816	1867
1817	1868	return null;
...	...	@@ -1854,11 +1905,11 @@ pub const Node = struct {
1854	1905	}
1855	1906
1856	1907	pub fn firstToken(self: &MultilineStringLiteral) TokenIndex {
1857		return *self.lines.at(0);
	1908	return self.lines.at(0).*;
1858	1909	}
1859	1910
1860	1911	pub fn lastToken(self: &MultilineStringLiteral) TokenIndex {
1861		return *self.lines.at(self.lines.len - 1);
	1912	return self.lines.at(self.lines.len - 1).*;
1862	1913	}
1863	1914	};
1864	1915
...	...	@@ -1949,13 +2000,15 @@ pub const Node = struct {
1949	2000
1950	2001	pub const AsmOutput = struct {
1951	2002	base: Node,
	2003	lbracket: TokenIndex,
1952	2004	symbolic_name: &Node,
1953	2005	constraint: &Node,
1954	2006	kind: Kind,
	2007	rparen: TokenIndex,
1955	2008
1956	2009	const Kind = union(enum) {
1957	2010	Variable: &Identifier,
1958		Return: &Node
	2011	Return: &Node,
1959	2012	};
1960	2013
1961	2014	pub fn iterate(self: &AsmOutput, index: usize) ?&Node {
...	...	@@ -1975,29 +2028,28 @@ pub const Node = struct {
1975	2028	Kind.Return => \|return_type\| {
1976	2029	if (i < 1) return return_type;
1977	2030	i -= 1;
1978		}
	2031	},
1979	2032	}
1980	2033
1981	2034	return null;
1982	2035	}
1983	2036
1984	2037	pub fn firstToken(self: &AsmOutput) TokenIndex {
1985		return self.symbolic_name.firstToken();
	2038	return self.lbracket;
1986	2039	}
1987	2040
1988	2041	pub fn lastToken(self: &AsmOutput) TokenIndex {
1989		return switch (self.kind) {
1990		Kind.Variable => \|variable_name\| variable_name.lastToken(),
1991		Kind.Return => \|return_type\| return_type.lastToken(),
1992		};
	2042	return self.rparen;
1993	2043	}
1994	2044	};
1995	2045
1996	2046	pub const AsmInput = struct {
1997	2047	base: Node,
	2048	lbracket: TokenIndex,
1998	2049	symbolic_name: &Node,
1999	2050	constraint: &Node,
2000	2051	expr: &Node,
	2052	rparen: TokenIndex,
2001	2053
2002	2054	pub fn iterate(self: &AsmInput, index: usize) ?&Node {
2003	2055	var i = index;
...	...	@@ -2015,11 +2067,11 @@ pub const Node = struct {
2015	2067	}
2016	2068
2017	2069	pub fn firstToken(self: &AsmInput) TokenIndex {
2018		return self.symbolic_name.firstToken();
	2070	return self.lbracket;
2019	2071	}
2020	2072
2021	2073	pub fn lastToken(self: &AsmInput) TokenIndex {
2022		return self.expr.lastToken();
	2074	return self.rparen;
2023	2075	}
2024	2076	};
2025	2077
...	...	@@ -2035,20 +2087,17 @@ pub const Node = struct {
2035	2087
2036	2088	const OutputList = SegmentedList(&AsmOutput, 2);
2037	2089	const InputList = SegmentedList(&AsmInput, 2);
2038		const ClobberList = SegmentedList(&Node, 2);
	2090	const ClobberList = SegmentedList(TokenIndex, 2);
2039	2091
2040	2092	pub fn iterate(self: &Asm, index: usize) ?&Node {
2041	2093	var i = index;
2042	2094
2043		if (i < self.outputs.len) return &(*self.outputs.at(index)).base;
	2095	if (i < self.outputs.len) return &(self.outputs.at(index).*).base;
2044	2096	i -= self.outputs.len;
2045	2097
2046		if (i < self.inputs.len) return &(*self.inputs.at(index)).base;
	2098	if (i < self.inputs.len) return &(self.inputs.at(index).*).base;
2047	2099	i -= self.inputs.len;
2048	2100
2049		if (i < self.clobbers.len) return *self.clobbers.at(index);
2050		i -= self.clobbers.len;
2051
2052	2101	return null;
2053	2102	}
2054	2103
...	...	@@ -2112,23 +2161,6 @@ pub const Node = struct {
2112	2161	}
2113	2162	};
2114	2163
2115		pub const LineComment = struct {
2116		base: Node,
2117		token: TokenIndex,
2118
2119		pub fn iterate(self: &LineComment, index: usize) ?&Node {
2120		return null;
2121		}
2122
2123		pub fn firstToken(self: &LineComment) TokenIndex {
2124		return self.token;
2125		}
2126
2127		pub fn lastToken(self: &LineComment) TokenIndex {
2128		return self.token;
2129		}
2130		};
2131
2132	2164	pub const DocComment = struct {
2133	2165	base: Node,
2134	2166	lines: LineList,
...	...	@@ -2140,11 +2172,11 @@ pub const Node = struct {
2140	2172	}
2141	2173
2142	2174	pub fn firstToken(self: &DocComment) TokenIndex {
2143		return *self.lines.at(0);
	2175	return self.lines.at(0).*;
2144	2176	}
2145	2177
2146	2178	pub fn lastToken(self: &DocComment) TokenIndex {
2147		return *self.lines.at(self.lines.len - 1);
	2179	return self.lines.at(self.lines.len - 1).*;
2148	2180	}
2149	2181	};
2150	2182
...	...	@@ -2173,4 +2205,3 @@ pub const Node = struct {
2173	2205	}
2174	2206	};
2175	2207	};
2176

std/zig/parse.zig+1192-1337

...	...	@@ -7,9 +7,8 @@ const Token = std.zig.Token;
7	7	const TokenIndex = ast.TokenIndex;
8	8	const Error = ast.Error;
9	9
10		/// Returns an AST tree, allocated with the parser's allocator.
11	10	/// Result should be freed with tree.deinit() when there are
12		/// no more references to any AST nodes of the tree.
	11	/// no more references to any of the tokens or nodes.
13	12	pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
14	13	var tree_arena = std.heap.ArenaAllocator.init(allocator);
15	14	errdefer tree_arena.deinit();
...	...	@@ -18,17 +17,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
18	17	defer stack.deinit();
19	18
20	19	const arena = &tree_arena.allocator;
21		const root_node = try createNode(arena, ast.Node.Root,
22		ast.Node.Root {
23		.base = undefined,
24		.decls = ast.Node.Root.DeclList.init(arena),
25		.doc_comments = null,
26		// initialized when we get the eof token
27		.eof_token = undefined,
28		}
29		);
	20	const root_node = try arena.construct(ast.Node.Root{
	21	.base = ast.Node{ .id = ast.Node.Id.Root },
	22	.decls = ast.Node.Root.DeclList.init(arena),
	23	.doc_comments = null,
	24	// initialized when we get the eof token
	25	.eof_token = undefined,
	26	});
30	27
31		var tree = ast.Tree {
	28	var tree = ast.Tree{
32	29	.source = source,
33	30	.root_node = root_node,
34	31	.arena_allocator = tree_arena,
...	...	@@ -39,12 +36,18 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
39	36	var tokenizer = Tokenizer.init(tree.source);
40	37	while (true) {
41	38	const token_ptr = try tree.tokens.addOne();
42		*token_ptr = tokenizer.next();
43		if (token_ptr.id == Token.Id.Eof)
44		break;
	39	token_ptr.* = tokenizer.next();
	40	if (token_ptr.id == Token.Id.Eof) break;
45	41	}
46	42	var tok_it = tree.tokens.iterator(0);
47	43
	44	// skip over line comments at the top of the file
	45	while (true) {
	46	const next_tok = tok_it.peek() ?? break;
	47	if (next_tok.id != Token.Id.LineComment) break;
	48	_ = tok_it.next();
	49	}
	50
48	51	try stack.append(State.TopLevel);
49	52
50	53	while (true) {
...	...	@@ -53,10 +56,6 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
53	56
54	57	switch (state) {
55	58	State.TopLevel => {
56		while (try eatLineComment(arena, &tok_it, &tree)) \|line_comment\| {
57		try root_node.decls.push(&line_comment.base);
58		}
59
60	59	const comments = try eatDocComments(arena, &tok_it, &tree);
61	60
62	61	const token = nextToken(&tok_it, &tree);
...	...	@@ -66,33 +65,29 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
66	65	Token.Id.Keyword_test => {
67	66	stack.append(State.TopLevel) catch unreachable;
68	67
69		const block = try arena.construct(ast.Node.Block {
70		.base = ast.Node {
71		.id = ast.Node.Id.Block,
72		},
	68	const block = try arena.construct(ast.Node.Block{
	69	.base = ast.Node{ .id = ast.Node.Id.Block },
73	70	.label = null,
74	71	.lbrace = undefined,
75	72	.statements = ast.Node.Block.StatementList.init(arena),
76	73	.rbrace = undefined,
77	74	});
78		const test_node = try arena.construct(ast.Node.TestDecl {
79		.base = ast.Node {
80		.id = ast.Node.Id.TestDecl,
81		},
	75	const test_node = try arena.construct(ast.Node.TestDecl{
	76	.base = ast.Node{ .id = ast.Node.Id.TestDecl },
82	77	.doc_comments = comments,
83	78	.test_token = token_index,
84	79	.name = undefined,
85	80	.body_node = &block.base,
86	81	});
87	82	try root_node.decls.push(&test_node.base);
88		try stack.append(State { .Block = block });
89		try stack.append(State {
90		.ExpectTokenSave = ExpectTokenSave {
	83	try stack.append(State{ .Block = block });
	84	try stack.append(State{
	85	.ExpectTokenSave = ExpectTokenSave{
91	86	.id = Token.Id.LBrace,
92		.ptr = &block.rbrace,
93		}
	87	.ptr = &block.lbrace,
	88	},
94	89	});
95		try stack.append(State { .StringLiteral = OptionalCtx { .Required = &test_node.name } });
	90	try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &test_node.name } });
96	91	continue;
97	92	},
98	93	Token.Id.Eof => {
...	...	@@ -102,31 +97,27 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
102	97	},
103	98	Token.Id.Keyword_pub => {
104	99	stack.append(State.TopLevel) catch unreachable;
105		try stack.append(State {
106		.TopLevelExtern = TopLevelDeclCtx {
	100	try stack.append(State{
	101	.TopLevelExtern = TopLevelDeclCtx{
107	102	.decls = &root_node.decls,
108	103	.visib_token = token_index,
109	104	.extern_export_inline_token = null,
110	105	.lib_name = null,
111	106	.comments = comments,
112		}
	107	},
113	108	});
114	109	continue;
115	110	},
116	111	Token.Id.Keyword_comptime => {
117		const block = try createNode(arena, ast.Node.Block,
118		ast.Node.Block {
119		.base = undefined,
120		.label = null,
121		.lbrace = undefined,
122		.statements = ast.Node.Block.StatementList.init(arena),
123		.rbrace = undefined,
124		}
125		);
126		const node = try arena.construct(ast.Node.Comptime {
127		.base = ast.Node {
128		.id = ast.Node.Id.Comptime,
129		},
	112	const block = try arena.construct(ast.Node.Block{
	113	.base = ast.Node{ .id = ast.Node.Id.Block },
	114	.label = null,
	115	.lbrace = undefined,
	116	.statements = ast.Node.Block.StatementList.init(arena),
	117	.rbrace = undefined,
	118	});
	119	const node = try arena.construct(ast.Node.Comptime{
	120	.base = ast.Node{ .id = ast.Node.Id.Comptime },
130	121	.comptime_token = token_index,
131	122	.expr = &block.base,
132	123	.doc_comments = comments,
...	...	@@ -134,26 +125,26 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
134	125	try root_node.decls.push(&node.base);
135	126
136	127	stack.append(State.TopLevel) catch unreachable;
137		try stack.append(State { .Block = block });
138		try stack.append(State {
139		.ExpectTokenSave = ExpectTokenSave {
	128	try stack.append(State{ .Block = block });
	129	try stack.append(State{
	130	.ExpectTokenSave = ExpectTokenSave{
140	131	.id = Token.Id.LBrace,
141		.ptr = &block.rbrace,
142		}
	132	.ptr = &block.lbrace,
	133	},
143	134	});
144	135	continue;
145	136	},
146	137	else => {
147		putBackToken(&tok_it, &tree);
	138	prevToken(&tok_it, &tree);
148	139	stack.append(State.TopLevel) catch unreachable;
149		try stack.append(State {
150		.TopLevelExtern = TopLevelDeclCtx {
	140	try stack.append(State{
	141	.TopLevelExtern = TopLevelDeclCtx{
151	142	.decls = &root_node.decls,
152	143	.visib_token = null,
153	144	.extern_export_inline_token = null,
154	145	.lib_name = null,
155	146	.comments = comments,
156		}
	147	},
157	148	});
158	149	continue;
159	150	},
...	...	@@ -165,11 +156,11 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
165	156	const token_ptr = token.ptr;
166	157	switch (token_ptr.id) {
167	158	Token.Id.Keyword_export, Token.Id.Keyword_inline => {
168		stack.append(State {
169		.TopLevelDecl = TopLevelDeclCtx {
	159	stack.append(State{
	160	.TopLevelDecl = TopLevelDeclCtx{
170	161	.decls = ctx.decls,
171	162	.visib_token = ctx.visib_token,
172		.extern_export_inline_token = AnnotatedToken {
	163	.extern_export_inline_token = AnnotatedToken{
173	164	.index = token_index,
174	165	.ptr = token_ptr,
175	166	},
...	...	@@ -180,11 +171,11 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
180	171	continue;
181	172	},
182	173	Token.Id.Keyword_extern => {
183		stack.append(State {
184		.TopLevelLibname = TopLevelDeclCtx {
	174	stack.append(State{
	175	.TopLevelLibname = TopLevelDeclCtx{
185	176	.decls = ctx.decls,
186	177	.visib_token = ctx.visib_token,
187		.extern_export_inline_token = AnnotatedToken {
	178	.extern_export_inline_token = AnnotatedToken{
188	179	.index = token_index,
189	180	.ptr = token_ptr,
190	181	},
...	...	@@ -195,10 +186,10 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
195	186	continue;
196	187	},
197	188	else => {
198		putBackToken(&tok_it, &tree);
199		stack.append(State { .TopLevelDecl = ctx }) catch unreachable;
	189	prevToken(&tok_it, &tree);
	190	stack.append(State{ .TopLevelDecl = ctx }) catch unreachable;
200	191	continue;
201		}
	192	},
202	193	}
203	194	},
204	195	State.TopLevelLibname => \|ctx\| {
...	...	@@ -207,13 +198,13 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
207	198	const lib_name_token_index = lib_name_token.index;
208	199	const lib_name_token_ptr = lib_name_token.ptr;
209	200	break :blk (try parseStringLiteral(arena, &tok_it, lib_name_token_ptr, lib_name_token_index, &tree)) ?? {
210		putBackToken(&tok_it, &tree);
	201	prevToken(&tok_it, &tree);
211	202	break :blk null;
212	203	};
213	204	};
214	205
215		stack.append(State {
216		.TopLevelDecl = TopLevelDeclCtx {
	206	stack.append(State{
	207	.TopLevelDecl = TopLevelDeclCtx{
217	208	.decls = ctx.decls,
218	209	.visib_token = ctx.visib_token,
219	210	.extern_export_inline_token = ctx.extern_export_inline_token,
...	...	@@ -230,14 +221,13 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
230	221	switch (token_ptr.id) {
231	222	Token.Id.Keyword_use => {
232	223	if (ctx.extern_export_inline_token) \|annotated_token\| {
233		*(try tree.errors.addOne()) = Error {
234		.InvalidToken = Error.InvalidToken { .token = annotated_token.index },
235		};
	224	((try tree.errors.addOne())).* = Error{ .InvalidToken = Error.InvalidToken{ .token = annotated_token.index } };
236	225	return tree;
237	226	}
238	227
239		const node = try arena.construct(ast.Node.Use {
240		.base = ast.Node {.id = ast.Node.Id.Use },
	228	const node = try arena.construct(ast.Node.Use{
	229	.base = ast.Node{ .id = ast.Node.Id.Use },
	230	.use_token = token_index,
241	231	.visib_token = ctx.visib_token,
242	232	.expr = undefined,
243	233	.semicolon_token = undefined,
...	...	@@ -245,44 +235,39 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
245	235	});
246	236	try ctx.decls.push(&node.base);
247	237
248		stack.append(State {
249		.ExpectTokenSave = ExpectTokenSave {
	238	stack.append(State{
	239	.ExpectTokenSave = ExpectTokenSave{
250	240	.id = Token.Id.Semicolon,
251	241	.ptr = &node.semicolon_token,
252		}
	242	},
253	243	}) catch unreachable;
254		try stack.append(State { .Expression = OptionalCtx { .Required = &node.expr } });
	244	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
255	245	continue;
256	246	},
257	247	Token.Id.Keyword_var, Token.Id.Keyword_const => {
258	248	if (ctx.extern_export_inline_token) \|annotated_token\| {
259	249	if (annotated_token.ptr.id == Token.Id.Keyword_inline) {
260		*(try tree.errors.addOne()) = Error {
261		.InvalidToken = Error.InvalidToken { .token = annotated_token.index },
262		};
	250	((try tree.errors.addOne())).* = Error{ .InvalidToken = Error.InvalidToken{ .token = annotated_token.index } };
263	251	return tree;
264	252	}
265	253	}
266	254
267		try stack.append(State {
268		.VarDecl = VarDeclCtx {
	255	try stack.append(State{
	256	.VarDecl = VarDeclCtx{
269	257	.comments = ctx.comments,
270	258	.visib_token = ctx.visib_token,
271	259	.lib_name = ctx.lib_name,
272	260	.comptime_token = null,
273	261	.extern_export_token = if (ctx.extern_export_inline_token) \|at\| at.index else null,
274	262	.mut_token = token_index,
275		.list = ctx.decls
276		}
	263	.list = ctx.decls,
	264	},
277	265	});
278	266	continue;
279	267	},
280		Token.Id.Keyword_fn, Token.Id.Keyword_nakedcc,
281		Token.Id.Keyword_stdcallcc, Token.Id.Keyword_async => {
282		const fn_proto = try arena.construct(ast.Node.FnProto {
283		.base = ast.Node {
284		.id = ast.Node.Id.FnProto,
285		},
	268	Token.Id.Keyword_fn, Token.Id.Keyword_nakedcc, Token.Id.Keyword_stdcallcc, Token.Id.Keyword_async => {
	269	const fn_proto = try arena.construct(ast.Node.FnProto{
	270	.base = ast.Node{ .id = ast.Node.Id.FnProto },
286	271	.doc_comments = ctx.comments,
287	272	.visib_token = ctx.visib_token,
288	273	.name_token = null,
...	...	@@ -298,38 +283,36 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
298	283	.align_expr = null,
299	284	});
300	285	try ctx.decls.push(&fn_proto.base);
301		stack.append(State { .FnDef = fn_proto }) catch unreachable;
302		try stack.append(State { .FnProto = fn_proto });
	286	stack.append(State{ .FnDef = fn_proto }) catch unreachable;
	287	try stack.append(State{ .FnProto = fn_proto });
303	288
304	289	switch (token_ptr.id) {
305	290	Token.Id.Keyword_nakedcc, Token.Id.Keyword_stdcallcc => {
306	291	fn_proto.cc_token = token_index;
307		try stack.append(State {
308		.ExpectTokenSave = ExpectTokenSave {
	292	try stack.append(State{
	293	.ExpectTokenSave = ExpectTokenSave{
309	294	.id = Token.Id.Keyword_fn,
310	295	.ptr = &fn_proto.fn_token,
311		}
	296	},
312	297	});
313	298	continue;
314	299	},
315	300	Token.Id.Keyword_async => {
316		const async_node = try createNode(arena, ast.Node.AsyncAttribute,
317		ast.Node.AsyncAttribute {
318		.base = undefined,
319		.async_token = token_index,
320		.allocator_type = null,
321		.rangle_bracket = null,
322		}
323		);
	301	const async_node = try arena.construct(ast.Node.AsyncAttribute{
	302	.base = ast.Node{ .id = ast.Node.Id.AsyncAttribute },
	303	.async_token = token_index,
	304	.allocator_type = null,
	305	.rangle_bracket = null,
	306	});
324	307	fn_proto.async_attr = async_node;
325	308
326		try stack.append(State {
327		.ExpectTokenSave = ExpectTokenSave {
	309	try stack.append(State{
	310	.ExpectTokenSave = ExpectTokenSave{
328	311	.id = Token.Id.Keyword_fn,
329	312	.ptr = &fn_proto.fn_token,
330		}
	313	},
331	314	});
332		try stack.append(State { .AsyncAllocator = async_node });
	315	try stack.append(State{ .AsyncAllocator = async_node });
333	316	continue;
334	317	},
335	318	Token.Id.Keyword_fn => {
...	...	@@ -340,43 +323,38 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
340	323	}
341	324	},
342	325	else => {
343		*(try tree.errors.addOne()) = Error {
344		.ExpectedVarDeclOrFn = Error.ExpectedVarDeclOrFn { .token = token_index },
345		};
	326	((try tree.errors.addOne())).* = Error{ .ExpectedVarDeclOrFn = Error.ExpectedVarDeclOrFn{ .token = token_index } };
346	327	return tree;
347	328	},
348	329	}
349	330	},
350	331	State.TopLevelExternOrField => \|ctx\| {
351	332	if (eatToken(&tok_it, &tree, Token.Id.Identifier)) \|identifier\| {
352		std.debug.assert(ctx.container_decl.kind == ast.Node.ContainerDecl.Kind.Struct);
353		const node = try arena.construct(ast.Node.StructField {
354		.base = ast.Node {
355		.id = ast.Node.Id.StructField,
356		},
	333	const node = try arena.construct(ast.Node.StructField{
	334	.base = ast.Node{ .id = ast.Node.Id.StructField },
357	335	.doc_comments = ctx.comments,
358	336	.visib_token = ctx.visib_token,
359	337	.name_token = identifier,
360	338	.type_expr = undefined,
361	339	});
362	340	const node_ptr = try ctx.container_decl.fields_and_decls.addOne();
363		*node_ptr = &node.base;
	341	node_ptr.* = &node.base;
364	342
365		stack.append(State { .FieldListCommaOrEnd = ctx.container_decl }) catch unreachable;
366		try stack.append(State { .Expression = OptionalCtx { .Required = &node.type_expr } });
367		try stack.append(State { .ExpectToken = Token.Id.Colon });
	343	stack.append(State{ .FieldListCommaOrEnd = ctx.container_decl }) catch unreachable;
	344	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.type_expr } });
	345	try stack.append(State{ .ExpectToken = Token.Id.Colon });
368	346	continue;
369	347	}
370	348
371	349	stack.append(State{ .ContainerDecl = ctx.container_decl }) catch unreachable;
372		try stack.append(State {
373		.TopLevelExtern = TopLevelDeclCtx {
	350	try stack.append(State{
	351	.TopLevelExtern = TopLevelDeclCtx{
374	352	.decls = &ctx.container_decl.fields_and_decls,
375	353	.visib_token = ctx.visib_token,
376	354	.extern_export_inline_token = null,
377	355	.lib_name = null,
378	356	.comments = ctx.comments,
379		}
	357	},
380	358	});
381	359	continue;
382	360	},
...	...	@@ -386,10 +364,10 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
386	364	const eq_tok_index = eq_tok.index;
387	365	const eq_tok_ptr = eq_tok.ptr;
388	366	if (eq_tok_ptr.id != Token.Id.Equal) {
389		putBackToken(&tok_it, &tree);
	367	prevToken(&tok_it, &tree);
390	368	continue;
391	369	}
392		stack.append(State { .Expression = ctx }) catch unreachable;
	370	stack.append(State{ .Expression = ctx }) catch unreachable;
393	371	continue;
394	372	},
395	373
...	...	@@ -397,31 +375,31 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
397	375	const token = nextToken(&tok_it, &tree);
398	376	const token_index = token.index;
399	377	const token_ptr = token.ptr;
400		const node = try createToCtxNode(arena, ctx.opt_ctx, ast.Node.ContainerDecl,
401		ast.Node.ContainerDecl {
402		.base = undefined,
403		.ltoken = ctx.ltoken,
404		.layout = ctx.layout,
405		.kind = switch (token_ptr.id) {
406		Token.Id.Keyword_struct => ast.Node.ContainerDecl.Kind.Struct,
407		Token.Id.Keyword_union => ast.Node.ContainerDecl.Kind.Union,
408		Token.Id.Keyword_enum => ast.Node.ContainerDecl.Kind.Enum,
409		else => {
410		*(try tree.errors.addOne()) = Error {
411		.ExpectedAggregateKw = Error.ExpectedAggregateKw { .token = token_index },
412		};
413		return tree;
414		},
	378	const node = try arena.construct(ast.Node.ContainerDecl{
	379	.base = ast.Node{ .id = ast.Node.Id.ContainerDecl },
	380	.layout_token = ctx.layout_token,
	381	.kind_token = switch (token_ptr.id) {
	382	Token.Id.Keyword_struct, Token.Id.Keyword_union, Token.Id.Keyword_enum => token_index,
	383	else => {
	384	((try tree.errors.addOne())).* = Error{ .ExpectedAggregateKw = Error.ExpectedAggregateKw{ .token = token_index } };
	385	return tree;
415	386	},
416		.init_arg_expr = ast.Node.ContainerDecl.InitArg.None,
417		.fields_and_decls = ast.Node.ContainerDecl.DeclList.init(arena),
418		.rbrace_token = undefined,
419		}
420		);
	387	},
	388	.init_arg_expr = ast.Node.ContainerDecl.InitArg.None,
	389	.fields_and_decls = ast.Node.ContainerDecl.DeclList.init(arena),
	390	.lbrace_token = undefined,
	391	.rbrace_token = undefined,
	392	});
	393	ctx.opt_ctx.store(&node.base);
421	394
422		stack.append(State { .ContainerDecl = node }) catch unreachable;
423		try stack.append(State { .ExpectToken = Token.Id.LBrace });
424		try stack.append(State { .ContainerInitArgStart = node });
	395	stack.append(State{ .ContainerDecl = node }) catch unreachable;
	396	try stack.append(State{
	397	.ExpectTokenSave = ExpectTokenSave{
	398	.id = Token.Id.LBrace,
	399	.ptr = &node.lbrace_token,
	400	},
	401	});
	402	try stack.append(State{ .ContainerInitArgStart = node });
425	403	continue;
426	404	},
427	405
...	...	@@ -430,8 +408,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
430	408	continue;
431	409	}
432	410
433		stack.append(State { .ExpectToken = Token.Id.RParen }) catch unreachable;
434		try stack.append(State { .ContainerInitArg = container_decl });
	411	stack.append(State{ .ExpectToken = Token.Id.RParen }) catch unreachable;
	412	try stack.append(State{ .ContainerInitArg = container_decl });
435	413	continue;
436	414	},
437	415
...	...	@@ -441,61 +419,53 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
441	419	const init_arg_token_ptr = init_arg_token.ptr;
442	420	switch (init_arg_token_ptr.id) {
443	421	Token.Id.Keyword_enum => {
444		container_decl.init_arg_expr = ast.Node.ContainerDecl.InitArg {.Enum = null};
	422	container_decl.init_arg_expr = ast.Node.ContainerDecl.InitArg{ .Enum = null };
445	423	const lparen_tok = nextToken(&tok_it, &tree);
446	424	const lparen_tok_index = lparen_tok.index;
447	425	const lparen_tok_ptr = lparen_tok.ptr;
448	426	if (lparen_tok_ptr.id == Token.Id.LParen) {
449		try stack.append(State { .ExpectToken = Token.Id.RParen } );
450		try stack.append(State { .Expression = OptionalCtx {
451		.RequiredNull = &container_decl.init_arg_expr.Enum,
452		} });
	427	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	428	try stack.append(State{ .Expression = OptionalCtx{ .RequiredNull = &container_decl.init_arg_expr.Enum } });
453	429	} else {
454		putBackToken(&tok_it, &tree);
	430	prevToken(&tok_it, &tree);
455	431	}
456	432	},
457	433	else => {
458		putBackToken(&tok_it, &tree);
459		container_decl.init_arg_expr = ast.Node.ContainerDecl.InitArg { .Type = undefined };
460		stack.append(State { .Expression = OptionalCtx { .Required = &container_decl.init_arg_expr.Type } }) catch unreachable;
	434	prevToken(&tok_it, &tree);
	435	container_decl.init_arg_expr = ast.Node.ContainerDecl.InitArg{ .Type = undefined };
	436	stack.append(State{ .Expression = OptionalCtx{ .Required = &container_decl.init_arg_expr.Type } }) catch unreachable;
461	437	},
462	438	}
463	439	continue;
464	440	},
465	441
466	442	State.ContainerDecl => \|container_decl\| {
467		while (try eatLineComment(arena, &tok_it, &tree)) \|line_comment\| {
468		try container_decl.fields_and_decls.push(&line_comment.base);
469		}
470
471	443	const comments = try eatDocComments(arena, &tok_it, &tree);
472	444	const token = nextToken(&tok_it, &tree);
473	445	const token_index = token.index;
474	446	const token_ptr = token.ptr;
475	447	switch (token_ptr.id) {
476	448	Token.Id.Identifier => {
477		switch (container_decl.kind) {
478		ast.Node.ContainerDecl.Kind.Struct => {
479		const node = try arena.construct(ast.Node.StructField {
480		.base = ast.Node {
481		.id = ast.Node.Id.StructField,
482		},
	449	switch (tree.tokens.at(container_decl.kind_token).id) {
	450	Token.Id.Keyword_struct => {
	451	const node = try arena.construct(ast.Node.StructField{
	452	.base = ast.Node{ .id = ast.Node.Id.StructField },
483	453	.doc_comments = comments,
484	454	.visib_token = null,
485	455	.name_token = token_index,
486	456	.type_expr = undefined,
487	457	});
488	458	const node_ptr = try container_decl.fields_and_decls.addOne();
489		*node_ptr = &node.base;
	459	node_ptr.* = &node.base;
490	460
491		try stack.append(State { .FieldListCommaOrEnd = container_decl });
492		try stack.append(State { .TypeExprBegin = OptionalCtx { .Required = &node.type_expr } });
493		try stack.append(State { .ExpectToken = Token.Id.Colon });
	461	try stack.append(State{ .FieldListCommaOrEnd = container_decl });
	462	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &node.type_expr } });
	463	try stack.append(State{ .ExpectToken = Token.Id.Colon });
494	464	continue;
495	465	},
496		ast.Node.ContainerDecl.Kind.Union => {
497		const node = try arena.construct(ast.Node.UnionTag {
498		.base = ast.Node {.id = ast.Node.Id.UnionTag },
	466	Token.Id.Keyword_union => {
	467	const node = try arena.construct(ast.Node.UnionTag{
	468	.base = ast.Node{ .id = ast.Node.Id.UnionTag },
499	469	.name_token = token_index,
500	470	.type_expr = null,
501	471	.value_expr = null,
...	...	@@ -503,101 +473,97 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
503	473	});
504	474	try container_decl.fields_and_decls.push(&node.base);
505	475
506		stack.append(State { .FieldListCommaOrEnd = container_decl }) catch unreachable;
507		try stack.append(State { .FieldInitValue = OptionalCtx { .RequiredNull = &node.value_expr } });
508		try stack.append(State { .TypeExprBegin = OptionalCtx { .RequiredNull = &node.type_expr } });
509		try stack.append(State { .IfToken = Token.Id.Colon });
	476	stack.append(State{ .FieldListCommaOrEnd = container_decl }) catch unreachable;
	477	try stack.append(State{ .FieldInitValue = OptionalCtx{ .RequiredNull = &node.value_expr } });
	478	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .RequiredNull = &node.type_expr } });
	479	try stack.append(State{ .IfToken = Token.Id.Colon });
510	480	continue;
511	481	},
512		ast.Node.ContainerDecl.Kind.Enum => {
513		const node = try arena.construct(ast.Node.EnumTag {
514		.base = ast.Node { .id = ast.Node.Id.EnumTag },
	482	Token.Id.Keyword_enum => {
	483	const node = try arena.construct(ast.Node.EnumTag{
	484	.base = ast.Node{ .id = ast.Node.Id.EnumTag },
515	485	.name_token = token_index,
516	486	.value = null,
517	487	.doc_comments = comments,
518	488	});
519	489	try container_decl.fields_and_decls.push(&node.base);
520	490
521		stack.append(State { .FieldListCommaOrEnd = container_decl }) catch unreachable;
522		try stack.append(State { .Expression = OptionalCtx { .RequiredNull = &node.value } });
523		try stack.append(State { .IfToken = Token.Id.Equal });
	491	stack.append(State{ .FieldListCommaOrEnd = container_decl }) catch unreachable;
	492	try stack.append(State{ .Expression = OptionalCtx{ .RequiredNull = &node.value } });
	493	try stack.append(State{ .IfToken = Token.Id.Equal });
524	494	continue;
525	495	},
	496	else => unreachable,
526	497	}
527	498	},
528	499	Token.Id.Keyword_pub => {
529		switch (container_decl.kind) {
530		ast.Node.ContainerDecl.Kind.Struct => {
531		try stack.append(State {
532		.TopLevelExternOrField = TopLevelExternOrFieldCtx {
	500	switch (tree.tokens.at(container_decl.kind_token).id) {
	501	Token.Id.Keyword_struct => {
	502	try stack.append(State{
	503	.TopLevelExternOrField = TopLevelExternOrFieldCtx{
533	504	.visib_token = token_index,
534	505	.container_decl = container_decl,
535	506	.comments = comments,
536		}
	507	},
537	508	});
538	509	continue;
539	510	},
540	511	else => {
541	512	stack.append(State{ .ContainerDecl = container_decl }) catch unreachable;
542		try stack.append(State {
543		.TopLevelExtern = TopLevelDeclCtx {
	513	try stack.append(State{
	514	.TopLevelExtern = TopLevelDeclCtx{
544	515	.decls = &container_decl.fields_and_decls,
545	516	.visib_token = token_index,
546	517	.extern_export_inline_token = null,
547	518	.lib_name = null,
548	519	.comments = comments,
549		}
	520	},
550	521	});
551	522	continue;
552		}
	523	},
553	524	}
554	525	},
555	526	Token.Id.Keyword_export => {
556	527	stack.append(State{ .ContainerDecl = container_decl }) catch unreachable;
557		try stack.append(State {
558		.TopLevelExtern = TopLevelDeclCtx {
	528	try stack.append(State{
	529	.TopLevelExtern = TopLevelDeclCtx{
559	530	.decls = &container_decl.fields_and_decls,
560	531	.visib_token = token_index,
561	532	.extern_export_inline_token = null,
562	533	.lib_name = null,
563	534	.comments = comments,
564		}
	535	},
565	536	});
566	537	continue;
567	538	},
568	539	Token.Id.RBrace => {
569	540	if (comments != null) {
570		*(try tree.errors.addOne()) = Error {
571		.UnattachedDocComment = Error.UnattachedDocComment { .token = token_index },
572		};
	541	((try tree.errors.addOne())).* = Error{ .UnattachedDocComment = Error.UnattachedDocComment{ .token = token_index } };
573	542	return tree;
574	543	}
575	544	container_decl.rbrace_token = token_index;
576	545	continue;
577	546	},
578	547	else => {
579		putBackToken(&tok_it, &tree);
	548	prevToken(&tok_it, &tree);
580	549	stack.append(State{ .ContainerDecl = container_decl }) catch unreachable;
581		try stack.append(State {
582		.TopLevelExtern = TopLevelDeclCtx {
	550	try stack.append(State{
	551	.TopLevelExtern = TopLevelDeclCtx{
583	552	.decls = &container_decl.fields_and_decls,
584	553	.visib_token = null,
585	554	.extern_export_inline_token = null,
586	555	.lib_name = null,
587	556	.comments = comments,
588		}
	557	},
589	558	});
590	559	continue;
591		}
	560	},
592	561	}
593	562	},
594	563
595
596	564	State.VarDecl => \|ctx\| {
597		const var_decl = try arena.construct(ast.Node.VarDecl {
598		.base = ast.Node {
599		.id = ast.Node.Id.VarDecl,
600		},
	565	const var_decl = try arena.construct(ast.Node.VarDecl{
	566	.base = ast.Node{ .id = ast.Node.Id.VarDecl },
601	567	.doc_comments = ctx.comments,
602	568	.visib_token = ctx.visib_token,
603	569	.mut_token = ctx.mut_token,
...	...	@@ -614,31 +580,31 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
614	580	});
615	581	try ctx.list.push(&var_decl.base);
616	582
617		try stack.append(State { .VarDeclAlign = var_decl });
618		try stack.append(State { .TypeExprBegin = OptionalCtx { .RequiredNull = &var_decl.type_node} });
619		try stack.append(State { .IfToken = Token.Id.Colon });
620		try stack.append(State {
621		.ExpectTokenSave = ExpectTokenSave {
	583	try stack.append(State{ .VarDeclAlign = var_decl });
	584	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .RequiredNull = &var_decl.type_node } });
	585	try stack.append(State{ .IfToken = Token.Id.Colon });
	586	try stack.append(State{
	587	.ExpectTokenSave = ExpectTokenSave{
622	588	.id = Token.Id.Identifier,
623	589	.ptr = &var_decl.name_token,
624		}
	590	},
625	591	});
626	592	continue;
627	593	},
628	594	State.VarDeclAlign => \|var_decl\| {
629		try stack.append(State { .VarDeclEq = var_decl });
	595	try stack.append(State{ .VarDeclEq = var_decl });
630	596
631	597	const next_token = nextToken(&tok_it, &tree);
632	598	const next_token_index = next_token.index;
633	599	const next_token_ptr = next_token.ptr;
634	600	if (next_token_ptr.id == Token.Id.Keyword_align) {
635		try stack.append(State { .ExpectToken = Token.Id.RParen });
636		try stack.append(State { .Expression = OptionalCtx { .RequiredNull = &var_decl.align_node} });
637		try stack.append(State { .ExpectToken = Token.Id.LParen });
	601	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	602	try stack.append(State{ .Expression = OptionalCtx{ .RequiredNull = &var_decl.align_node } });
	603	try stack.append(State{ .ExpectToken = Token.Id.LParen });
638	604	continue;
639	605	}
640	606
641		putBackToken(&tok_it, &tree);
	607	prevToken(&tok_it, &tree);
642	608	continue;
643	609	},
644	610	State.VarDeclEq => \|var_decl\| {
...	...	@@ -648,13 +614,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
648	614	switch (token_ptr.id) {
649	615	Token.Id.Equal => {
650	616	var_decl.eq_token = token_index;
651		stack.append(State {
652		.ExpectTokenSave = ExpectTokenSave {
653		.id = Token.Id.Semicolon,
654		.ptr = &var_decl.semicolon_token,
655		},
656		}) catch unreachable;
657		try stack.append(State { .Expression = OptionalCtx { .RequiredNull = &var_decl.init_node } });
	617	stack.append(State{ .VarDeclSemiColon = var_decl }) catch unreachable;
	618	try stack.append(State{ .Expression = OptionalCtx{ .RequiredNull = &var_decl.init_node } });
658	619	continue;
659	620	},
660	621	Token.Id.Semicolon => {
...	...	@@ -662,45 +623,65 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
662	623	continue;
663	624	},
664	625	else => {
665		*(try tree.errors.addOne()) = Error {
666		.ExpectedEqOrSemi = Error.ExpectedEqOrSemi { .token = token_index },
667		};
	626	((try tree.errors.addOne())).* = Error{ .ExpectedEqOrSemi = Error.ExpectedEqOrSemi{ .token = token_index } };
668	627	return tree;
669		}
	628	},
670	629	}
671	630	},
672	631
	632	State.VarDeclSemiColon => \|var_decl\| {
	633	const semicolon_token = nextToken(&tok_it, &tree);
	634
	635	if (semicolon_token.ptr.id != Token.Id.Semicolon) {
	636	((try tree.errors.addOne())).* = Error{
	637	.ExpectedToken = Error.ExpectedToken{
	638	.token = semicolon_token.index,
	639	.expected_id = Token.Id.Semicolon,
	640	},
	641	};
	642	return tree;
	643	}
	644
	645	var_decl.semicolon_token = semicolon_token.index;
	646
	647	if (eatToken(&tok_it, &tree, Token.Id.DocComment)) \|doc_comment_token\| {
	648	const loc = tree.tokenLocation(semicolon_token.ptr.end, doc_comment_token);
	649	if (loc.line == 0) {
	650	try pushDocComment(arena, doc_comment_token, &var_decl.doc_comments);
	651	} else {
	652	prevToken(&tok_it, &tree);
	653	}
	654	}
	655	},
673	656
674	657	State.FnDef => \|fn_proto\| {
675	658	const token = nextToken(&tok_it, &tree);
676	659	const token_index = token.index;
677	660	const token_ptr = token.ptr;
678		switch(token_ptr.id) {
	661	switch (token_ptr.id) {
679	662	Token.Id.LBrace => {
680		const block = try arena.construct(ast.Node.Block {
681		.base = ast.Node { .id = ast.Node.Id.Block },
	663	const block = try arena.construct(ast.Node.Block{
	664	.base = ast.Node{ .id = ast.Node.Id.Block },
682	665	.label = null,
683	666	.lbrace = token_index,
684	667	.statements = ast.Node.Block.StatementList.init(arena),
685	668	.rbrace = undefined,
686	669	});
687	670	fn_proto.body_node = &block.base;
688		stack.append(State { .Block = block }) catch unreachable;
	671	stack.append(State{ .Block = block }) catch unreachable;
689	672	continue;
690	673	},
691	674	Token.Id.Semicolon => continue,
692	675	else => {
693		*(try tree.errors.addOne()) = Error {
694		.ExpectedSemiOrLBrace = Error.ExpectedSemiOrLBrace { .token = token_index },
695		};
	676	((try tree.errors.addOne())).* = Error{ .ExpectedSemiOrLBrace = Error.ExpectedSemiOrLBrace{ .token = token_index } };
696	677	return tree;
697	678	},
698	679	}
699	680	},
700	681	State.FnProto => \|fn_proto\| {
701		stack.append(State { .FnProtoAlign = fn_proto }) catch unreachable;
702		try stack.append(State { .ParamDecl = fn_proto });
703		try stack.append(State { .ExpectToken = Token.Id.LParen });
	682	stack.append(State{ .FnProtoAlign = fn_proto }) catch unreachable;
	683	try stack.append(State{ .ParamDecl = fn_proto });
	684	try stack.append(State{ .ExpectToken = Token.Id.LParen });
704	685
705	686	if (eatToken(&tok_it, &tree, Token.Id.Identifier)) \|name_token\| {
706	687	fn_proto.name_token = name_token;
...	...	@@ -708,12 +689,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
708	689	continue;
709	690	},
710	691	State.FnProtoAlign => \|fn_proto\| {
711		stack.append(State { .FnProtoReturnType = fn_proto }) catch unreachable;
	692	stack.append(State{ .FnProtoReturnType = fn_proto }) catch unreachable;
712	693
713	694	if (eatToken(&tok_it, &tree, Token.Id.Keyword_align)) \|align_token\| {
714		try stack.append(State { .ExpectToken = Token.Id.RParen });
715		try stack.append(State { .Expression = OptionalCtx { .RequiredNull = &fn_proto.align_expr } });
716		try stack.append(State { .ExpectToken = Token.Id.LParen });
	695	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	696	try stack.append(State{ .Expression = OptionalCtx{ .RequiredNull = &fn_proto.align_expr } });
	697	try stack.append(State{ .ExpectToken = Token.Id.LParen });
717	698	}
718	699	continue;
719	700	},
...	...	@@ -723,42 +704,37 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
723	704	const token_ptr = token.ptr;
724	705	switch (token_ptr.id) {
725	706	Token.Id.Bang => {
726		fn_proto.return_type = ast.Node.FnProto.ReturnType { .InferErrorSet = undefined };
727		stack.append(State {
728		.TypeExprBegin = OptionalCtx { .Required = &fn_proto.return_type.InferErrorSet },
729		}) catch unreachable;
	707	fn_proto.return_type = ast.Node.FnProto.ReturnType{ .InferErrorSet = undefined };
	708	stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &fn_proto.return_type.InferErrorSet } }) catch unreachable;
730	709	continue;
731	710	},
732	711	else => {
733	712	// TODO: this is a special case. Remove this when #760 is fixed
734	713	if (token_ptr.id == Token.Id.Keyword_error) {
735	714	if ((??tok_it.peek()).id == Token.Id.LBrace) {
736		const error_type_node = try arena.construct(ast.Node.ErrorType {
737		.base = ast.Node { .id = ast.Node.Id.ErrorType },
	715	const error_type_node = try arena.construct(ast.Node.ErrorType{
	716	.base = ast.Node{ .id = ast.Node.Id.ErrorType },
738	717	.token = token_index,
739	718	});
740		fn_proto.return_type = ast.Node.FnProto.ReturnType {
741		.Explicit = &error_type_node.base,
742		};
	719	fn_proto.return_type = ast.Node.FnProto.ReturnType{ .Explicit = &error_type_node.base };
743	720	continue;
744	721	}
745	722	}
746	723
747		putBackToken(&tok_it, &tree);
748		fn_proto.return_type = ast.Node.FnProto.ReturnType { .Explicit = undefined };
749		stack.append(State { .TypeExprBegin = OptionalCtx { .Required = &fn_proto.return_type.Explicit }, }) catch unreachable;
	724	prevToken(&tok_it, &tree);
	725	fn_proto.return_type = ast.Node.FnProto.ReturnType{ .Explicit = undefined };
	726	stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &fn_proto.return_type.Explicit } }) catch unreachable;
750	727	continue;
751	728	},
752	729	}
753	730	},
754	731
755
756	732	State.ParamDecl => \|fn_proto\| {
757	733	if (eatToken(&tok_it, &tree, Token.Id.RParen)) \|_\| {
758	734	continue;
759	735	}
760		const param_decl = try arena.construct(ast.Node.ParamDecl {
761		.base = ast.Node {.id = ast.Node.Id.ParamDecl },
	736	const param_decl = try arena.construct(ast.Node.ParamDecl{
	737	.base = ast.Node{ .id = ast.Node.Id.ParamDecl },
762	738	.comptime_token = null,
763	739	.noalias_token = null,
764	740	.name_token = null,
...	...	@@ -767,14 +743,14 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
767	743	});
768	744	try fn_proto.params.push(&param_decl.base);
769	745
770		stack.append(State {
771		.ParamDeclEnd = ParamDeclEndCtx {
	746	stack.append(State{
	747	.ParamDeclEnd = ParamDeclEndCtx{
772	748	.param_decl = param_decl,
773	749	.fn_proto = fn_proto,
774		}
	750	},
775	751	}) catch unreachable;
776		try stack.append(State { .ParamDeclName = param_decl });
777		try stack.append(State { .ParamDeclAliasOrComptime = param_decl });
	752	try stack.append(State{ .ParamDeclName = param_decl });
	753	try stack.append(State{ .ParamDeclAliasOrComptime = param_decl });
778	754	continue;
779	755	},
780	756	State.ParamDeclAliasOrComptime => \|param_decl\| {
...	...	@@ -792,7 +768,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
792	768	if (eatToken(&tok_it, &tree, Token.Id.Colon)) \|_\| {
793	769	param_decl.name_token = ident_token;
794	770	} else {
795		putBackToken(&tok_it, &tree);
	771	prevToken(&tok_it, &tree);
796	772	}
797	773	}
798	774	continue;
...	...	@@ -800,21 +776,19 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
800	776	State.ParamDeclEnd => \|ctx\| {
801	777	if (eatToken(&tok_it, &tree, Token.Id.Ellipsis3)) \|ellipsis3\| {
802	778	ctx.param_decl.var_args_token = ellipsis3;
803		stack.append(State { .ExpectToken = Token.Id.RParen }) catch unreachable;
	779	stack.append(State{ .ExpectToken = Token.Id.RParen }) catch unreachable;
804	780	continue;
805	781	}
806	782
807		try stack.append(State { .ParamDeclComma = ctx.fn_proto });
808		try stack.append(State {
809		.TypeExprBegin = OptionalCtx { .Required = &ctx.param_decl.type_node }
810		});
	783	try stack.append(State{ .ParamDeclComma = ctx.fn_proto });
	784	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &ctx.param_decl.type_node } });
811	785	continue;
812	786	},
813	787	State.ParamDeclComma => \|fn_proto\| {
814	788	switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.RParen)) {
815	789	ExpectCommaOrEndResult.end_token => \|t\| {
816	790	if (t == null) {
817		stack.append(State { .ParamDecl = fn_proto }) catch unreachable;
	791	stack.append(State{ .ParamDecl = fn_proto }) catch unreachable;
818	792	}
819	793	continue;
820	794	},
...	...	@@ -827,11 +801,11 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
827	801
828	802	State.MaybeLabeledExpression => \|ctx\| {
829	803	if (eatToken(&tok_it, &tree, Token.Id.Colon)) \|_\| {
830		stack.append(State {
831		.LabeledExpression = LabelCtx {
	804	stack.append(State{
	805	.LabeledExpression = LabelCtx{
832	806	.label = ctx.label,
833	807	.opt_ctx = ctx.opt_ctx,
834		}
	808	},
835	809	}) catch unreachable;
836	810	continue;
837	811	}
...	...	@@ -845,74 +819,69 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
845	819	const token_ptr = token.ptr;
846	820	switch (token_ptr.id) {
847	821	Token.Id.LBrace => {
848		const block = try createToCtxNode(arena, ctx.opt_ctx, ast.Node.Block,
849		ast.Node.Block {
850		.base = undefined,
851		.label = ctx.label,
852		.lbrace = token_index,
853		.statements = ast.Node.Block.StatementList.init(arena),
854		.rbrace = undefined,
855		}
856		);
857		stack.append(State { .Block = block }) catch unreachable;
	822	const block = try arena.construct(ast.Node.Block{
	823	.base = ast.Node{ .id = ast.Node.Id.Block },
	824	.label = ctx.label,
	825	.lbrace = token_index,
	826	.statements = ast.Node.Block.StatementList.init(arena),
	827	.rbrace = undefined,
	828	});
	829	ctx.opt_ctx.store(&block.base);
	830	stack.append(State{ .Block = block }) catch unreachable;
858	831	continue;
859	832	},
860	833	Token.Id.Keyword_while => {
861		stack.append(State {
862		.While = LoopCtx {
	834	stack.append(State{
	835	.While = LoopCtx{
863	836	.label = ctx.label,
864	837	.inline_token = null,
865	838	.loop_token = token_index,
866	839	.opt_ctx = ctx.opt_ctx.toRequired(),
867		}
	840	},
868	841	}) catch unreachable;
869	842	continue;
870	843	},
871	844	Token.Id.Keyword_for => {
872		stack.append(State {
873		.For = LoopCtx {
	845	stack.append(State{
	846	.For = LoopCtx{
874	847	.label = ctx.label,
875	848	.inline_token = null,
876	849	.loop_token = token_index,
877	850	.opt_ctx = ctx.opt_ctx.toRequired(),
878		}
	851	},
879	852	}) catch unreachable;
880	853	continue;
881	854	},
882	855	Token.Id.Keyword_suspend => {
883		const node = try arena.construct(ast.Node.Suspend {
884		.base = ast.Node {
885		.id = ast.Node.Id.Suspend,
886		},
	856	const node = try arena.construct(ast.Node.Suspend{
	857	.base = ast.Node{ .id = ast.Node.Id.Suspend },
887	858	.label = ctx.label,
888	859	.suspend_token = token_index,
889	860	.payload = null,
890	861	.body = null,
891	862	});
892	863	ctx.opt_ctx.store(&node.base);
893		stack.append(State { .SuspendBody = node }) catch unreachable;
894		try stack.append(State { .Payload = OptionalCtx { .Optional = &node.payload } });
	864	stack.append(State{ .SuspendBody = node }) catch unreachable;
	865	try stack.append(State{ .Payload = OptionalCtx{ .Optional = &node.payload } });
895	866	continue;
896	867	},
897	868	Token.Id.Keyword_inline => {
898		stack.append(State {
899		.Inline = InlineCtx {
	869	stack.append(State{
	870	.Inline = InlineCtx{
900	871	.label = ctx.label,
901	872	.inline_token = token_index,
902	873	.opt_ctx = ctx.opt_ctx.toRequired(),
903		}
	874	},
904	875	}) catch unreachable;
905	876	continue;
906	877	},
907	878	else => {
908	879	if (ctx.opt_ctx != OptionalCtx.Optional) {
909		*(try tree.errors.addOne()) = Error {
910		.ExpectedLabelable = Error.ExpectedLabelable { .token = token_index },
911		};
	880	((try tree.errors.addOne())).* = Error{ .ExpectedLabelable = Error.ExpectedLabelable{ .token = token_index } };
912	881	return tree;
913	882	}
914	883
915		putBackToken(&tok_it, &tree);
	884	prevToken(&tok_it, &tree);
916	885	continue;
917	886	},
918	887	}
...	...	@@ -923,112 +892,105 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
923	892	const token_ptr = token.ptr;
924	893	switch (token_ptr.id) {
925	894	Token.Id.Keyword_while => {
926		stack.append(State {
927		.While = LoopCtx {
	895	stack.append(State{
	896	.While = LoopCtx{
928	897	.inline_token = ctx.inline_token,
929	898	.label = ctx.label,
930	899	.loop_token = token_index,
931	900	.opt_ctx = ctx.opt_ctx.toRequired(),
932		}
	901	},
933	902	}) catch unreachable;
934	903	continue;
935	904	},
936	905	Token.Id.Keyword_for => {
937		stack.append(State {
938		.For = LoopCtx {
	906	stack.append(State{
	907	.For = LoopCtx{
939	908	.inline_token = ctx.inline_token,
940	909	.label = ctx.label,
941	910	.loop_token = token_index,
942	911	.opt_ctx = ctx.opt_ctx.toRequired(),
943		}
	912	},
944	913	}) catch unreachable;
945	914	continue;
946	915	},
947	916	else => {
948	917	if (ctx.opt_ctx != OptionalCtx.Optional) {
949		*(try tree.errors.addOne()) = Error {
950		.ExpectedInlinable = Error.ExpectedInlinable { .token = token_index },
951		};
	918	((try tree.errors.addOne())).* = Error{ .ExpectedInlinable = Error.ExpectedInlinable{ .token = token_index } };
952	919	return tree;
953	920	}
954	921
955		putBackToken(&tok_it, &tree);
	922	prevToken(&tok_it, &tree);
956	923	continue;
957	924	},
958	925	}
959	926	},
960	927	State.While => \|ctx\| {
961		const node = try createToCtxNode(arena, ctx.opt_ctx, ast.Node.While,
962		ast.Node.While {
963		.base = undefined,
964		.label = ctx.label,
965		.inline_token = ctx.inline_token,
966		.while_token = ctx.loop_token,
967		.condition = undefined,
968		.payload = null,
969		.continue_expr = null,
970		.body = undefined,
971		.@"else" = null,
972		}
973		);
974		stack.append(State { .Else = &node.@"else" }) catch unreachable;
975		try stack.append(State { .Expression = OptionalCtx { .Required = &node.body } });
976		try stack.append(State { .WhileContinueExpr = &node.continue_expr });
977		try stack.append(State { .IfToken = Token.Id.Colon });
978		try stack.append(State { .PointerPayload = OptionalCtx { .Optional = &node.payload } });
979		try stack.append(State { .ExpectToken = Token.Id.RParen });
980		try stack.append(State { .Expression = OptionalCtx { .Required = &node.condition } });
981		try stack.append(State { .ExpectToken = Token.Id.LParen });
	928	const node = try arena.construct(ast.Node.While{
	929	.base = ast.Node{ .id = ast.Node.Id.While },
	930	.label = ctx.label,
	931	.inline_token = ctx.inline_token,
	932	.while_token = ctx.loop_token,
	933	.condition = undefined,
	934	.payload = null,
	935	.continue_expr = null,
	936	.body = undefined,
	937	.@"else" = null,
	938	});
	939	ctx.opt_ctx.store(&node.base);
	940	stack.append(State{ .Else = &node.@"else" }) catch unreachable;
	941	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.body } });
	942	try stack.append(State{ .WhileContinueExpr = &node.continue_expr });
	943	try stack.append(State{ .IfToken = Token.Id.Colon });
	944	try stack.append(State{ .PointerPayload = OptionalCtx{ .Optional = &node.payload } });
	945	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	946	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.condition } });
	947	try stack.append(State{ .ExpectToken = Token.Id.LParen });
982	948	continue;
983	949	},
984	950	State.WhileContinueExpr => \|dest\| {
985		stack.append(State { .ExpectToken = Token.Id.RParen }) catch unreachable;
986		try stack.append(State { .AssignmentExpressionBegin = OptionalCtx { .RequiredNull = dest } });
987		try stack.append(State { .ExpectToken = Token.Id.LParen });
	951	stack.append(State{ .ExpectToken = Token.Id.RParen }) catch unreachable;
	952	try stack.append(State{ .AssignmentExpressionBegin = OptionalCtx{ .RequiredNull = dest } });
	953	try stack.append(State{ .ExpectToken = Token.Id.LParen });
988	954	continue;
989	955	},
990	956	State.For => \|ctx\| {
991		const node = try createToCtxNode(arena, ctx.opt_ctx, ast.Node.For,
992		ast.Node.For {
993		.base = undefined,
994		.label = ctx.label,
995		.inline_token = ctx.inline_token,
996		.for_token = ctx.loop_token,
997		.array_expr = undefined,
998		.payload = null,
999		.body = undefined,
1000		.@"else" = null,
1001		}
1002		);
1003		stack.append(State { .Else = &node.@"else" }) catch unreachable;
1004		try stack.append(State { .Expression = OptionalCtx { .Required = &node.body } });
1005		try stack.append(State { .PointerIndexPayload = OptionalCtx { .Optional = &node.payload } });
1006		try stack.append(State { .ExpectToken = Token.Id.RParen });
1007		try stack.append(State { .Expression = OptionalCtx { .Required = &node.array_expr } });
1008		try stack.append(State { .ExpectToken = Token.Id.LParen });
	957	const node = try arena.construct(ast.Node.For{
	958	.base = ast.Node{ .id = ast.Node.Id.For },
	959	.label = ctx.label,
	960	.inline_token = ctx.inline_token,
	961	.for_token = ctx.loop_token,
	962	.array_expr = undefined,
	963	.payload = null,
	964	.body = undefined,
	965	.@"else" = null,
	966	});
	967	ctx.opt_ctx.store(&node.base);
	968	stack.append(State{ .Else = &node.@"else" }) catch unreachable;
	969	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.body } });
	970	try stack.append(State{ .PointerIndexPayload = OptionalCtx{ .Optional = &node.payload } });
	971	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	972	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.array_expr } });
	973	try stack.append(State{ .ExpectToken = Token.Id.LParen });
1009	974	continue;
1010	975	},
1011	976	State.Else => \|dest\| {
1012	977	if (eatToken(&tok_it, &tree, Token.Id.Keyword_else)) \|else_token\| {
1013		const node = try createNode(arena, ast.Node.Else,
1014		ast.Node.Else {
1015		.base = undefined,
1016		.else_token = else_token,
1017		.payload = null,
1018		.body = undefined,
1019		}
1020		);
1021		*dest = node;
	978	const node = try arena.construct(ast.Node.Else{
	979	.base = ast.Node{ .id = ast.Node.Id.Else },
	980	.else_token = else_token,
	981	.payload = null,
	982	.body = undefined,
	983	});
	984	dest.* = node;
1022	985
1023		stack.append(State { .Expression = OptionalCtx { .Required = &node.body } }) catch unreachable;
1024		try stack.append(State { .Payload = OptionalCtx { .Optional = &node.payload } });
	986	stack.append(State{ .Expression = OptionalCtx{ .Required = &node.body } }) catch unreachable;
	987	try stack.append(State{ .Payload = OptionalCtx{ .Optional = &node.payload } });
1025	988	continue;
1026	989	} else {
1027	990	continue;
1028	991	}
1029	992	},
1030	993
1031
1032	994	State.Block => \|block\| {
1033	995	const token = nextToken(&tok_it, &tree);
1034	996	const token_index = token.index;
...	...	@@ -1039,17 +1001,10 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1039	1001	continue;
1040	1002	},
1041	1003	else => {
1042		putBackToken(&tok_it, &tree);
1043		stack.append(State { .Block = block }) catch unreachable;
1044
1045		var any_comments = false;
1046		while (try eatLineComment(arena, &tok_it, &tree)) \|line_comment\| {
1047		try block.statements.push(&line_comment.base);
1048		any_comments = true;
1049		}
1050		if (any_comments) continue;
	1004	prevToken(&tok_it, &tree);
	1005	stack.append(State{ .Block = block }) catch unreachable;
1051	1006
1052		try stack.append(State { .Statement = block });
	1007	try stack.append(State{ .Statement = block });
1053	1008	continue;
1054	1009	},
1055	1010	}
...	...	@@ -1060,17 +1015,17 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1060	1015	const token_ptr = token.ptr;
1061	1016	switch (token_ptr.id) {
1062	1017	Token.Id.Keyword_comptime => {
1063		stack.append(State {
1064		.ComptimeStatement = ComptimeStatementCtx {
	1018	stack.append(State{
	1019	.ComptimeStatement = ComptimeStatementCtx{
1065	1020	.comptime_token = token_index,
1066	1021	.block = block,
1067		}
	1022	},
1068	1023	}) catch unreachable;
1069	1024	continue;
1070	1025	},
1071	1026	Token.Id.Keyword_var, Token.Id.Keyword_const => {
1072		stack.append(State {
1073		.VarDecl = VarDeclCtx {
	1027	stack.append(State{
	1028	.VarDecl = VarDeclCtx{
1074	1029	.comments = null,
1075	1030	.visib_token = null,
1076	1031	.comptime_token = null,
...	...	@@ -1078,15 +1033,13 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1078	1033	.lib_name = null,
1079	1034	.mut_token = token_index,
1080	1035	.list = &block.statements,
1081		}
	1036	},
1082	1037	}) catch unreachable;
1083	1038	continue;
1084	1039	},
1085	1040	Token.Id.Keyword_defer, Token.Id.Keyword_errdefer => {
1086		const node = try arena.construct(ast.Node.Defer {
1087		.base = ast.Node {
1088		.id = ast.Node.Id.Defer,
1089		},
	1041	const node = try arena.construct(ast.Node.Defer{
	1042	.base = ast.Node{ .id = ast.Node.Id.Defer },
1090	1043	.defer_token = token_index,
1091	1044	.kind = switch (token_ptr.id) {
1092	1045	Token.Id.Keyword_defer => ast.Node.Defer.Kind.Unconditional,
...	...	@@ -1096,15 +1049,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1096	1049	.expr = undefined,
1097	1050	});
1098	1051	const node_ptr = try block.statements.addOne();
1099		*node_ptr = &node.base;
	1052	node_ptr.* = &node.base;
1100	1053
1101		stack.append(State { .Semicolon = node_ptr }) catch unreachable;
1102		try stack.append(State { .AssignmentExpressionBegin = OptionalCtx{ .Required = &node.expr } });
	1054	stack.append(State{ .Semicolon = node_ptr }) catch unreachable;
	1055	try stack.append(State{ .AssignmentExpressionBegin = OptionalCtx{ .Required = &node.expr } });
1103	1056	continue;
1104	1057	},
1105	1058	Token.Id.LBrace => {
1106		const inner_block = try arena.construct(ast.Node.Block {
1107		.base = ast.Node { .id = ast.Node.Id.Block },
	1059	const inner_block = try arena.construct(ast.Node.Block{
	1060	.base = ast.Node{ .id = ast.Node.Id.Block },
1108	1061	.label = null,
1109	1062	.lbrace = token_index,
1110	1063	.statements = ast.Node.Block.StatementList.init(arena),
...	...	@@ -1112,16 +1065,16 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1112	1065	});
1113	1066	try block.statements.push(&inner_block.base);
1114	1067
1115		stack.append(State { .Block = inner_block }) catch unreachable;
	1068	stack.append(State{ .Block = inner_block }) catch unreachable;
1116	1069	continue;
1117	1070	},
1118	1071	else => {
1119		putBackToken(&tok_it, &tree);
	1072	prevToken(&tok_it, &tree);
1120	1073	const statement = try block.statements.addOne();
1121		try stack.append(State { .Semicolon = statement });
1122		try stack.append(State { .AssignmentExpressionBegin = OptionalCtx{ .Required = statement } });
	1074	try stack.append(State{ .Semicolon = statement });
	1075	try stack.append(State{ .AssignmentExpressionBegin = OptionalCtx{ .Required = statement } });
1123	1076	continue;
1124		}
	1077	},
1125	1078	}
1126	1079	},
1127	1080	State.ComptimeStatement => \|ctx\| {
...	...	@@ -1130,8 +1083,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1130	1083	const token_ptr = token.ptr;
1131	1084	switch (token_ptr.id) {
1132	1085	Token.Id.Keyword_var, Token.Id.Keyword_const => {
1133		stack.append(State {
1134		.VarDecl = VarDeclCtx {
	1086	stack.append(State{
	1087	.VarDecl = VarDeclCtx{
1135	1088	.comments = null,
1136	1089	.visib_token = null,
1137	1090	.comptime_token = ctx.comptime_token,
...	...	@@ -1139,24 +1092,24 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1139	1092	.lib_name = null,
1140	1093	.mut_token = token_index,
1141	1094	.list = &ctx.block.statements,
1142		}
	1095	},
1143	1096	}) catch unreachable;
1144	1097	continue;
1145	1098	},
1146	1099	else => {
1147		putBackToken(&tok_it, &tree);
1148		putBackToken(&tok_it, &tree);
	1100	prevToken(&tok_it, &tree);
	1101	prevToken(&tok_it, &tree);
1149	1102	const statement = try ctx.block.statements.addOne();
1150		try stack.append(State { .Semicolon = statement });
1151		try stack.append(State { .Expression = OptionalCtx { .Required = statement } });
	1103	try stack.append(State{ .Semicolon = statement });
	1104	try stack.append(State{ .Expression = OptionalCtx{ .Required = statement } });
1152	1105	continue;
1153		}
	1106	},
1154	1107	}
1155	1108	},
1156	1109	State.Semicolon => \|node_ptr\| {
1157		const node = *node_ptr;
	1110	const node = node_ptr.*;
1158	1111	if (node.requireSemiColon()) {
1159		stack.append(State { .ExpectToken = Token.Id.Semicolon }) catch unreachable;
	1112	stack.append(State{ .ExpectToken = Token.Id.Semicolon }) catch unreachable;
1160	1113	continue;
1161	1114	}
1162	1115	continue;
...	...	@@ -1167,28 +1120,33 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1167	1120	const lbracket_index = lbracket.index;
1168	1121	const lbracket_ptr = lbracket.ptr;
1169	1122	if (lbracket_ptr.id != Token.Id.LBracket) {
1170		putBackToken(&tok_it, &tree);
	1123	prevToken(&tok_it, &tree);
1171	1124	continue;
1172	1125	}
1173	1126
1174		const node = try createNode(arena, ast.Node.AsmOutput,
1175		ast.Node.AsmOutput {
1176		.base = undefined,
1177		.symbolic_name = undefined,
1178		.constraint = undefined,
1179		.kind = undefined,
1180		}
1181		);
	1127	const node = try arena.construct(ast.Node.AsmOutput{
	1128	.base = ast.Node{ .id = ast.Node.Id.AsmOutput },
	1129	.lbracket = lbracket_index,
	1130	.symbolic_name = undefined,
	1131	.constraint = undefined,
	1132	.kind = undefined,
	1133	.rparen = undefined,
	1134	});
1182	1135	try items.push(node);
1183	1136
1184		stack.append(State { .AsmOutputItems = items }) catch unreachable;
1185		try stack.append(State { .IfToken = Token.Id.Comma });
1186		try stack.append(State { .ExpectToken = Token.Id.RParen });
1187		try stack.append(State { .AsmOutputReturnOrType = node });
1188		try stack.append(State { .ExpectToken = Token.Id.LParen });
1189		try stack.append(State { .StringLiteral = OptionalCtx { .Required = &node.constraint } });
1190		try stack.append(State { .ExpectToken = Token.Id.RBracket });
1191		try stack.append(State { .Identifier = OptionalCtx { .Required = &node.symbolic_name } });
	1137	stack.append(State{ .AsmOutputItems = items }) catch unreachable;
	1138	try stack.append(State{ .IfToken = Token.Id.Comma });
	1139	try stack.append(State{
	1140	.ExpectTokenSave = ExpectTokenSave{
	1141	.id = Token.Id.RParen,
	1142	.ptr = &node.rparen,
	1143	},
	1144	});
	1145	try stack.append(State{ .AsmOutputReturnOrType = node });
	1146	try stack.append(State{ .ExpectToken = Token.Id.LParen });
	1147	try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &node.constraint } });
	1148	try stack.append(State{ .ExpectToken = Token.Id.RBracket });
	1149	try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.symbolic_name } });
1192	1150	continue;
1193	1151	},
1194	1152	State.AsmOutputReturnOrType => \|node\| {
...	...	@@ -1197,20 +1155,16 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1197	1155	const token_ptr = token.ptr;
1198	1156	switch (token_ptr.id) {
1199	1157	Token.Id.Identifier => {
1200		node.kind = ast.Node.AsmOutput.Kind { .Variable = try createLiteral(arena, ast.Node.Identifier, token_index) };
	1158	node.kind = ast.Node.AsmOutput.Kind{ .Variable = try createLiteral(arena, ast.Node.Identifier, token_index) };
1201	1159	continue;
1202	1160	},
1203	1161	Token.Id.Arrow => {
1204		node.kind = ast.Node.AsmOutput.Kind { .Return = undefined };
1205		try stack.append(State { .TypeExprBegin = OptionalCtx { .Required = &node.kind.Return } });
	1162	node.kind = ast.Node.AsmOutput.Kind{ .Return = undefined };
	1163	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &node.kind.Return } });
1206	1164	continue;
1207	1165	},
1208	1166	else => {
1209		*(try tree.errors.addOne()) = Error {
1210		.ExpectedAsmOutputReturnOrType = Error.ExpectedAsmOutputReturnOrType {
1211		.token = token_index,
1212		},
1213		};
	1167	((try tree.errors.addOne())).* = Error{ .ExpectedAsmOutputReturnOrType = Error.ExpectedAsmOutputReturnOrType{ .token = token_index } };
1214	1168	return tree;
1215	1169	},
1216	1170	}
...	...	@@ -1220,55 +1174,61 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1220	1174	const lbracket_index = lbracket.index;
1221	1175	const lbracket_ptr = lbracket.ptr;
1222	1176	if (lbracket_ptr.id != Token.Id.LBracket) {
1223		putBackToken(&tok_it, &tree);
	1177	prevToken(&tok_it, &tree);
1224	1178	continue;
1225	1179	}
1226	1180
1227		const node = try createNode(arena, ast.Node.AsmInput,
1228		ast.Node.AsmInput {
1229		.base = undefined,
1230		.symbolic_name = undefined,
1231		.constraint = undefined,
1232		.expr = undefined,
1233		}
1234		);
	1181	const node = try arena.construct(ast.Node.AsmInput{
	1182	.base = ast.Node{ .id = ast.Node.Id.AsmInput },
	1183	.lbracket = lbracket_index,
	1184	.symbolic_name = undefined,
	1185	.constraint = undefined,
	1186	.expr = undefined,
	1187	.rparen = undefined,
	1188	});
1235	1189	try items.push(node);
1236	1190
1237		stack.append(State { .AsmInputItems = items }) catch unreachable;
1238		try stack.append(State { .IfToken = Token.Id.Comma });
1239		try stack.append(State { .ExpectToken = Token.Id.RParen });
1240		try stack.append(State { .Expression = OptionalCtx { .Required = &node.expr } });
1241		try stack.append(State { .ExpectToken = Token.Id.LParen });
1242		try stack.append(State { .StringLiteral = OptionalCtx { .Required = &node.constraint } });
1243		try stack.append(State { .ExpectToken = Token.Id.RBracket });
1244		try stack.append(State { .Identifier = OptionalCtx { .Required = &node.symbolic_name } });
	1191	stack.append(State{ .AsmInputItems = items }) catch unreachable;
	1192	try stack.append(State{ .IfToken = Token.Id.Comma });
	1193	try stack.append(State{
	1194	.ExpectTokenSave = ExpectTokenSave{
	1195	.id = Token.Id.RParen,
	1196	.ptr = &node.rparen,
	1197	},
	1198	});
	1199	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
	1200	try stack.append(State{ .ExpectToken = Token.Id.LParen });
	1201	try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &node.constraint } });
	1202	try stack.append(State{ .ExpectToken = Token.Id.RBracket });
	1203	try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.symbolic_name } });
1245	1204	continue;
1246	1205	},
1247	1206	State.AsmClobberItems => \|items\| {
1248		stack.append(State { .AsmClobberItems = items }) catch unreachable;
1249		try stack.append(State { .IfToken = Token.Id.Comma });
1250		try stack.append(State { .StringLiteral = OptionalCtx { .Required = try items.addOne() } });
	1207	while (eatToken(&tok_it, &tree, Token.Id.StringLiteral)) \|strlit\| {
	1208	try items.push(strlit);
	1209	if (eatToken(&tok_it, &tree, Token.Id.Comma) == null)
	1210	break;
	1211	}
1251	1212	continue;
1252	1213	},
1253	1214
1254
1255	1215	State.ExprListItemOrEnd => \|list_state\| {
1256	1216	if (eatToken(&tok_it, &tree, list_state.end)) \|token_index\| {
1257		*list_state.ptr = token_index;
	1217	(list_state.ptr).* = token_index;
1258	1218	continue;
1259	1219	}
1260	1220
1261		stack.append(State { .ExprListCommaOrEnd = list_state }) catch unreachable;
1262		try stack.append(State { .Expression = OptionalCtx { .Required = try list_state.list.addOne() } });
	1221	stack.append(State{ .ExprListCommaOrEnd = list_state }) catch unreachable;
	1222	try stack.append(State{ .Expression = OptionalCtx{ .Required = try list_state.list.addOne() } });
1263	1223	continue;
1264	1224	},
1265	1225	State.ExprListCommaOrEnd => \|list_state\| {
1266	1226	switch (expectCommaOrEnd(&tok_it, &tree, list_state.end)) {
1267	1227	ExpectCommaOrEndResult.end_token => \|maybe_end\| if (maybe_end) \|end\| {
1268		*list_state.ptr = end;
	1228	(list_state.ptr).* = end;
1269	1229	continue;
1270	1230	} else {
1271		stack.append(State { .ExprListItemOrEnd = list_state }) catch unreachable;
	1231	stack.append(State{ .ExprListItemOrEnd = list_state }) catch unreachable;
1272	1232	continue;
1273	1233	},
1274	1234	ExpectCommaOrEndResult.parse_error => \|e\| {
...	...	@@ -1278,49 +1238,43 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1278	1238	}
1279	1239	},
1280	1240	State.FieldInitListItemOrEnd => \|list_state\| {
1281		while (try eatLineComment(arena, &tok_it, &tree)) \|line_comment\| {
1282		try list_state.list.push(&line_comment.base);
1283		}
1284
1285	1241	if (eatToken(&tok_it, &tree, Token.Id.RBrace)) \|rbrace\| {
1286		*list_state.ptr = rbrace;
	1242	(list_state.ptr).* = rbrace;
1287	1243	continue;
1288	1244	}
1289	1245
1290		const node = try arena.construct(ast.Node.FieldInitializer {
1291		.base = ast.Node {
1292		.id = ast.Node.Id.FieldInitializer,
1293		},
	1246	const node = try arena.construct(ast.Node.FieldInitializer{
	1247	.base = ast.Node{ .id = ast.Node.Id.FieldInitializer },
1294	1248	.period_token = undefined,
1295	1249	.name_token = undefined,
1296	1250	.expr = undefined,
1297	1251	});
1298	1252	try list_state.list.push(&node.base);
1299	1253
1300		stack.append(State { .FieldInitListCommaOrEnd = list_state }) catch unreachable;
1301		try stack.append(State { .Expression = OptionalCtx{ .Required = &node.expr } });
1302		try stack.append(State { .ExpectToken = Token.Id.Equal });
1303		try stack.append(State {
1304		.ExpectTokenSave = ExpectTokenSave {
	1254	stack.append(State{ .FieldInitListCommaOrEnd = list_state }) catch unreachable;
	1255	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
	1256	try stack.append(State{ .ExpectToken = Token.Id.Equal });
	1257	try stack.append(State{
	1258	.ExpectTokenSave = ExpectTokenSave{
1305	1259	.id = Token.Id.Identifier,
1306	1260	.ptr = &node.name_token,
1307		}
	1261	},
1308	1262	});
1309		try stack.append(State {
1310		.ExpectTokenSave = ExpectTokenSave {
	1263	try stack.append(State{
	1264	.ExpectTokenSave = ExpectTokenSave{
1311	1265	.id = Token.Id.Period,
1312	1266	.ptr = &node.period_token,
1313		}
	1267	},
1314	1268	});
1315	1269	continue;
1316	1270	},
1317	1271	State.FieldInitListCommaOrEnd => \|list_state\| {
1318	1272	switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.RBrace)) {
1319	1273	ExpectCommaOrEndResult.end_token => \|maybe_end\| if (maybe_end) \|end\| {
1320		*list_state.ptr = end;
	1274	(list_state.ptr).* = end;
1321	1275	continue;
1322	1276	} else {
1323		stack.append(State { .FieldInitListItemOrEnd = list_state }) catch unreachable;
	1277	stack.append(State{ .FieldInitListItemOrEnd = list_state }) catch unreachable;
1324	1278	continue;
1325	1279	},
1326	1280	ExpectCommaOrEndResult.parse_error => \|e\| {
...	...	@@ -1335,7 +1289,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1335	1289	container_decl.rbrace_token = end;
1336	1290	continue;
1337	1291	} else {
1338		try stack.append(State { .ContainerDecl = container_decl });
	1292	try stack.append(State{ .ContainerDecl = container_decl });
1339	1293	continue;
1340	1294	},
1341	1295	ExpectCommaOrEndResult.parse_error => \|e\| {
...	...	@@ -1345,28 +1299,24 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1345	1299	}
1346	1300	},
1347	1301	State.ErrorTagListItemOrEnd => \|list_state\| {
1348		while (try eatLineComment(arena, &tok_it, &tree)) \|line_comment\| {
1349		try list_state.list.push(&line_comment.base);
1350		}
1351
1352	1302	if (eatToken(&tok_it, &tree, Token.Id.RBrace)) \|rbrace\| {
1353		*list_state.ptr = rbrace;
	1303	(list_state.ptr).* = rbrace;
1354	1304	continue;
1355	1305	}
1356	1306
1357	1307	const node_ptr = try list_state.list.addOne();
1358	1308
1359		try stack.append(State { .ErrorTagListCommaOrEnd = list_state });
1360		try stack.append(State { .ErrorTag = node_ptr });
	1309	try stack.append(State{ .ErrorTagListCommaOrEnd = list_state });
	1310	try stack.append(State{ .ErrorTag = node_ptr });
1361	1311	continue;
1362	1312	},
1363	1313	State.ErrorTagListCommaOrEnd => \|list_state\| {
1364	1314	switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.RBrace)) {
1365	1315	ExpectCommaOrEndResult.end_token => \|maybe_end\| if (maybe_end) \|end\| {
1366		*list_state.ptr = end;
	1316	(list_state.ptr).* = end;
1367	1317	continue;
1368	1318	} else {
1369		stack.append(State { .ErrorTagListItemOrEnd = list_state }) catch unreachable;
	1319	stack.append(State{ .ErrorTagListItemOrEnd = list_state }) catch unreachable;
1370	1320	continue;
1371	1321	},
1372	1322	ExpectCommaOrEndResult.parse_error => \|e\| {
...	...	@@ -1376,40 +1326,35 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1376	1326	}
1377	1327	},
1378	1328	State.SwitchCaseOrEnd => \|list_state\| {
1379		while (try eatLineComment(arena, &tok_it, &tree)) \|line_comment\| {
1380		try list_state.list.push(&line_comment.base);
1381		}
1382
1383	1329	if (eatToken(&tok_it, &tree, Token.Id.RBrace)) \|rbrace\| {
1384		*list_state.ptr = rbrace;
	1330	(list_state.ptr).* = rbrace;
1385	1331	continue;
1386	1332	}
1387	1333
1388	1334	const comments = try eatDocComments(arena, &tok_it, &tree);
1389		const node = try arena.construct(ast.Node.SwitchCase {
1390		.base = ast.Node {
1391		.id = ast.Node.Id.SwitchCase,
1392		},
	1335	const node = try arena.construct(ast.Node.SwitchCase{
	1336	.base = ast.Node{ .id = ast.Node.Id.SwitchCase },
1393	1337	.items = ast.Node.SwitchCase.ItemList.init(arena),
1394	1338	.payload = null,
1395	1339	.expr = undefined,
	1340	.arrow_token = undefined,
1396	1341	});
1397	1342	try list_state.list.push(&node.base);
1398		try stack.append(State { .SwitchCaseCommaOrEnd = list_state });
1399		try stack.append(State { .AssignmentExpressionBegin = OptionalCtx { .Required = &node.expr } });
1400		try stack.append(State { .PointerPayload = OptionalCtx { .Optional = &node.payload } });
1401		try stack.append(State { .SwitchCaseFirstItem = &node.items });
	1343	try stack.append(State{ .SwitchCaseCommaOrEnd = list_state });
	1344	try stack.append(State{ .AssignmentExpressionBegin = OptionalCtx{ .Required = &node.expr } });
	1345	try stack.append(State{ .PointerPayload = OptionalCtx{ .Optional = &node.payload } });
	1346	try stack.append(State{ .SwitchCaseFirstItem = node });
1402	1347
1403	1348	continue;
1404	1349	},
1405	1350
1406	1351	State.SwitchCaseCommaOrEnd => \|list_state\| {
1407		switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.RParen)) {
	1352	switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.RBrace)) {
1408	1353	ExpectCommaOrEndResult.end_token => \|maybe_end\| if (maybe_end) \|end\| {
1409		*list_state.ptr = end;
	1354	(list_state.ptr).* = end;
1410	1355	continue;
1411	1356	} else {
1412		try stack.append(State { .SwitchCaseOrEnd = list_state });
	1357	try stack.append(State{ .SwitchCaseOrEnd = list_state });
1413	1358	continue;
1414	1359	},
1415	1360	ExpectCommaOrEndResult.parse_error => \|e\| {
...	...	@@ -1419,34 +1364,50 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1419	1364	}
1420	1365	},
1421	1366
1422		State.SwitchCaseFirstItem => \|case_items\| {
	1367	State.SwitchCaseFirstItem => \|switch_case\| {
1423	1368	const token = nextToken(&tok_it, &tree);
1424	1369	const token_index = token.index;
1425	1370	const token_ptr = token.ptr;
1426	1371	if (token_ptr.id == Token.Id.Keyword_else) {
1427		const else_node = try arena.construct(ast.Node.SwitchElse {
1428		.base = ast.Node{ .id = ast.Node.Id.SwitchElse},
	1372	const else_node = try arena.construct(ast.Node.SwitchElse{
	1373	.base = ast.Node{ .id = ast.Node.Id.SwitchElse },
1429	1374	.token = token_index,
1430	1375	});
1431		try case_items.push(&else_node.base);
	1376	try switch_case.items.push(&else_node.base);
1432	1377
1433		try stack.append(State { .ExpectToken = Token.Id.EqualAngleBracketRight });
	1378	try stack.append(State{
	1379	.ExpectTokenSave = ExpectTokenSave{
	1380	.id = Token.Id.EqualAngleBracketRight,
	1381	.ptr = &switch_case.arrow_token,
	1382	},
	1383	});
1434	1384	continue;
1435	1385	} else {
1436		putBackToken(&tok_it, &tree);
1437		try stack.append(State { .SwitchCaseItem = case_items });
	1386	prevToken(&tok_it, &tree);
	1387	stack.append(State{ .SwitchCaseItemCommaOrEnd = switch_case }) catch unreachable;
	1388	try stack.append(State{ .RangeExpressionBegin = OptionalCtx{ .Required = try switch_case.items.addOne() } });
1438	1389	continue;
1439	1390	}
1440	1391	},
1441		State.SwitchCaseItem => \|case_items\| {
1442		stack.append(State { .SwitchCaseItemCommaOrEnd = case_items }) catch unreachable;
1443		try stack.append(State { .RangeExpressionBegin = OptionalCtx { .Required = try case_items.addOne() } });
	1392	State.SwitchCaseItemOrEnd => \|switch_case\| {
	1393	const token = nextToken(&tok_it, &tree);
	1394	if (token.ptr.id == Token.Id.EqualAngleBracketRight) {
	1395	switch_case.arrow_token = token.index;
	1396	continue;
	1397	} else {
	1398	prevToken(&tok_it, &tree);
	1399	stack.append(State{ .SwitchCaseItemCommaOrEnd = switch_case }) catch unreachable;
	1400	try stack.append(State{ .RangeExpressionBegin = OptionalCtx{ .Required = try switch_case.items.addOne() } });
	1401	continue;
	1402	}
1444	1403	},
1445		State.SwitchCaseItemCommaOrEnd => \|case_items\| {
	1404	State.SwitchCaseItemCommaOrEnd => \|switch_case\| {
1446	1405	switch (expectCommaOrEnd(&tok_it, &tree, Token.Id.EqualAngleBracketRight)) {
1447		ExpectCommaOrEndResult.end_token => \|t\| {
1448		if (t == null) {
1449		stack.append(State { .SwitchCaseItem = case_items }) catch unreachable;
	1406	ExpectCommaOrEndResult.end_token => \|end_token\| {
	1407	if (end_token) \|t\| {
	1408	switch_case.arrow_token = t;
	1409	} else {
	1410	stack.append(State{ .SwitchCaseItemOrEnd = switch_case }) catch unreachable;
1450	1411	}
1451	1412	continue;
1452	1413	},
...	...	@@ -1458,10 +1419,9 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1458	1419	continue;
1459	1420	},
1460	1421
1461
1462	1422	State.SuspendBody => \|suspend_node\| {
1463	1423	if (suspend_node.payload != null) {
1464		try stack.append(State { .AssignmentExpressionBegin = OptionalCtx { .RequiredNull = &suspend_node.body } });
	1424	try stack.append(State{ .AssignmentExpressionBegin = OptionalCtx{ .RequiredNull = &suspend_node.body } });
1465	1425	}
1466	1426	continue;
1467	1427	},
...	...	@@ -1471,13 +1431,13 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1471	1431	}
1472	1432
1473	1433	async_node.rangle_bracket = TokenIndex(0);
1474		try stack.append(State {
1475		.ExpectTokenSave = ExpectTokenSave {
	1434	try stack.append(State{
	1435	.ExpectTokenSave = ExpectTokenSave{
1476	1436	.id = Token.Id.AngleBracketRight,
1477	1437	.ptr = &??async_node.rangle_bracket,
1478		}
	1438	},
1479	1439	});
1480		try stack.append(State { .TypeExprBegin = OptionalCtx { .RequiredNull = &async_node.allocator_type } });
	1440	try stack.append(State{ .TypeExprBegin = OptionalCtx{ .RequiredNull = &async_node.allocator_type } });
1481	1441	continue;
1482	1442	},
1483	1443	State.AsyncEnd => \|ctx\| {
...	...	@@ -1496,27 +1456,20 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1496	1456	continue;
1497	1457	}
1498	1458
1499		*(try tree.errors.addOne()) = Error {
1500		.ExpectedCall = Error.ExpectedCall { .node = node },
1501		};
	1459	((try tree.errors.addOne())).* = Error{ .ExpectedCall = Error.ExpectedCall{ .node = node } };
1502	1460	return tree;
1503	1461	},
1504	1462	else => {
1505		*(try tree.errors.addOne()) = Error {
1506		.ExpectedCallOrFnProto = Error.ExpectedCallOrFnProto { .node = node },
1507		};
	1463	((try tree.errors.addOne())).* = Error{ .ExpectedCallOrFnProto = Error.ExpectedCallOrFnProto{ .node = node } };
1508	1464	return tree;
1509		}
	1465	},
1510	1466	}
1511	1467	},
1512	1468
1513
1514	1469	State.ExternType => \|ctx\| {
1515	1470	if (eatToken(&tok_it, &tree, Token.Id.Keyword_fn)) \|fn_token\| {
1516		const fn_proto = try arena.construct(ast.Node.FnProto {
1517		.base = ast.Node {
1518		.id = ast.Node.Id.FnProto,
1519		},
	1471	const fn_proto = try arena.construct(ast.Node.FnProto{
	1472	.base = ast.Node{ .id = ast.Node.Id.FnProto },
1520	1473	.doc_comments = ctx.comments,
1521	1474	.visib_token = null,
1522	1475	.name_token = null,
...	...	@@ -1532,15 +1485,14 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1532	1485	.align_expr = null,
1533	1486	});
1534	1487	ctx.opt_ctx.store(&fn_proto.base);
1535		stack.append(State { .FnProto = fn_proto }) catch unreachable;
	1488	stack.append(State{ .FnProto = fn_proto }) catch unreachable;
1536	1489	continue;
1537	1490	}
1538	1491
1539		stack.append(State {
1540		.ContainerKind = ContainerKindCtx {
	1492	stack.append(State{
	1493	.ContainerKind = ContainerKindCtx{
1541	1494	.opt_ctx = ctx.opt_ctx,
1542		.ltoken = ctx.extern_token,
1543		.layout = ast.Node.ContainerDecl.Layout.Extern,
	1495	.layout_token = ctx.extern_token,
1544	1496	},
1545	1497	}) catch unreachable;
1546	1498	continue;
...	...	@@ -1552,20 +1504,20 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1552	1504	switch (token_ptr.id) {
1553	1505	Token.Id.Ellipsis2 => {
1554	1506	const start = node.op.ArrayAccess;
1555		node.op = ast.Node.SuffixOp.Op {
1556		.Slice = ast.Node.SuffixOp.Op.Slice {
	1507	node.op = ast.Node.SuffixOp.Op{
	1508	.Slice = ast.Node.SuffixOp.Op.Slice{
1557	1509	.start = start,
1558	1510	.end = null,
1559		}
	1511	},
1560	1512	};
1561	1513
1562		stack.append(State {
1563		.ExpectTokenSave = ExpectTokenSave {
	1514	stack.append(State{
	1515	.ExpectTokenSave = ExpectTokenSave{
1564	1516	.id = Token.Id.RBracket,
1565	1517	.ptr = &node.rtoken,
1566		}
	1518	},
1567	1519	}) catch unreachable;
1568		try stack.append(State { .Expression = OptionalCtx { .Optional = &node.op.Slice.end } });
	1520	try stack.append(State{ .Expression = OptionalCtx{ .Optional = &node.op.Slice.end } });
1569	1521	continue;
1570	1522	},
1571	1523	Token.Id.RBracket => {
...	...	@@ -1573,35 +1525,32 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1573	1525	continue;
1574	1526	},
1575	1527	else => {
1576		*(try tree.errors.addOne()) = Error {
1577		.ExpectedSliceOrRBracket = Error.ExpectedSliceOrRBracket { .token = token_index },
1578		};
	1528	((try tree.errors.addOne())).* = Error{ .ExpectedSliceOrRBracket = Error.ExpectedSliceOrRBracket{ .token = token_index } };
1579	1529	return tree;
1580		}
	1530	},
1581	1531	}
1582	1532	},
1583	1533	State.SliceOrArrayType => \|node\| {
1584	1534	if (eatToken(&tok_it, &tree, Token.Id.RBracket)) \|_\| {
1585		node.op = ast.Node.PrefixOp.Op {
1586		.SliceType = ast.Node.PrefixOp.AddrOfInfo {
1587		.align_expr = null,
1588		.bit_offset_start_token = null,
1589		.bit_offset_end_token = null,
	1535	node.op = ast.Node.PrefixOp.Op{
	1536	.SliceType = ast.Node.PrefixOp.AddrOfInfo{
	1537	.align_info = null,
1590	1538	.const_token = null,
1591	1539	.volatile_token = null,
1592		}
	1540	},
1593	1541	};
1594		stack.append(State { .TypeExprBegin = OptionalCtx { .Required = &node.rhs } }) catch unreachable;
1595		try stack.append(State { .AddrOfModifiers = &node.op.SliceType });
	1542	stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &node.rhs } }) catch unreachable;
	1543	try stack.append(State{ .AddrOfModifiers = &node.op.SliceType });
1596	1544	continue;
1597	1545	}
1598	1546
1599		node.op = ast.Node.PrefixOp.Op { .ArrayType = undefined };
1600		stack.append(State { .TypeExprBegin = OptionalCtx { .Required = &node.rhs } }) catch unreachable;
1601		try stack.append(State { .ExpectToken = Token.Id.RBracket });
1602		try stack.append(State { .Expression = OptionalCtx { .Required = &node.op.ArrayType } });
	1547	node.op = ast.Node.PrefixOp.Op{ .ArrayType = undefined };
	1548	stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &node.rhs } }) catch unreachable;
	1549	try stack.append(State{ .ExpectToken = Token.Id.RBracket });
	1550	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.op.ArrayType } });
1603	1551	continue;
1604	1552	},
	1553
1605	1554	State.AddrOfModifiers => \|addr_of_info\| {
1606	1555	const token = nextToken(&tok_it, &tree);
1607	1556	const token_index = token.index;
...	...	@@ -1609,23 +1558,26 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1609	1558	switch (token_ptr.id) {
1610	1559	Token.Id.Keyword_align => {
1611	1560	stack.append(state) catch unreachable;
1612		if (addr_of_info.align_expr != null) {
1613		*(try tree.errors.addOne()) = Error {
1614		.ExtraAlignQualifier = Error.ExtraAlignQualifier { .token = token_index },
1615		};
	1561	if (addr_of_info.align_info != null) {
	1562	((try tree.errors.addOne())).* = Error{ .ExtraAlignQualifier = Error.ExtraAlignQualifier{ .token = token_index } };
1616	1563	return tree;
1617	1564	}
1618		try stack.append(State { .ExpectToken = Token.Id.RParen });
1619		try stack.append(State { .Expression = OptionalCtx { .RequiredNull = &addr_of_info.align_expr} });
1620		try stack.append(State { .ExpectToken = Token.Id.LParen });
	1565	addr_of_info.align_info = ast.Node.PrefixOp.AddrOfInfo.Align{
	1566	.node = undefined,
	1567	.bit_range = null,
	1568	};
	1569	// TODO https://github.com/ziglang/zig/issues/1022
	1570	const align_info = &??addr_of_info.align_info;
	1571
	1572	try stack.append(State{ .AlignBitRange = align_info });
	1573	try stack.append(State{ .Expression = OptionalCtx{ .Required = &align_info.node } });
	1574	try stack.append(State{ .ExpectToken = Token.Id.LParen });
1621	1575	continue;
1622	1576	},
1623	1577	Token.Id.Keyword_const => {
1624	1578	stack.append(state) catch unreachable;
1625	1579	if (addr_of_info.const_token != null) {
1626		*(try tree.errors.addOne()) = Error {
1627		.ExtraConstQualifier = Error.ExtraConstQualifier { .token = token_index },
1628		};
	1580	((try tree.errors.addOne())).* = Error{ .ExtraConstQualifier = Error.ExtraConstQualifier{ .token = token_index } };
1629	1581	return tree;
1630	1582	}
1631	1583	addr_of_info.const_token = token_index;
...	...	@@ -1634,21 +1586,41 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1634	1586	Token.Id.Keyword_volatile => {
1635	1587	stack.append(state) catch unreachable;
1636	1588	if (addr_of_info.volatile_token != null) {
1637		*(try tree.errors.addOne()) = Error {
1638		.ExtraVolatileQualifier = Error.ExtraVolatileQualifier { .token = token_index },
1639		};
	1589	((try tree.errors.addOne())).* = Error{ .ExtraVolatileQualifier = Error.ExtraVolatileQualifier{ .token = token_index } };
1640	1590	return tree;
1641	1591	}
1642	1592	addr_of_info.volatile_token = token_index;
1643	1593	continue;
1644	1594	},
1645	1595	else => {
1646		putBackToken(&tok_it, &tree);
	1596	prevToken(&tok_it, &tree);
1647	1597	continue;
1648	1598	},
1649	1599	}
1650	1600	},
1651	1601
	1602	State.AlignBitRange => \|align_info\| {
	1603	const token = nextToken(&tok_it, &tree);
	1604	switch (token.ptr.id) {
	1605	Token.Id.Colon => {
	1606	align_info.bit_range = ast.Node.PrefixOp.AddrOfInfo.Align.BitRange(undefined);
	1607	const bit_range = &??align_info.bit_range;
	1608
	1609	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	1610	try stack.append(State{ .Expression = OptionalCtx{ .Required = &bit_range.end } });
	1611	try stack.append(State{ .ExpectToken = Token.Id.Colon });
	1612	try stack.append(State{ .Expression = OptionalCtx{ .Required = &bit_range.start } });
	1613	continue;
	1614	},
	1615	Token.Id.RParen => continue,
	1616	else => {
	1617	(try tree.errors.addOne()).* = Error{
	1618	.ExpectedColonOrRParen = Error.ExpectedColonOrRParen{ .token = token.index },
	1619	};
	1620	return tree;
	1621	},
	1622	}
	1623	},
1652	1624
1653	1625	State.Payload => \|opt_ctx\| {
1654	1626	const token = nextToken(&tok_it, &tree);
...	...	@@ -1656,8 +1628,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1656	1628	const token_ptr = token.ptr;
1657	1629	if (token_ptr.id != Token.Id.Pipe) {
1658	1630	if (opt_ctx != OptionalCtx.Optional) {
1659		*(try tree.errors.addOne()) = Error {
1660		.ExpectedToken = Error.ExpectedToken {
	1631	((try tree.errors.addOne())).* = Error{
	1632	.ExpectedToken = Error.ExpectedToken{
1661	1633	.token = token_index,
1662	1634	.expected_id = Token.Id.Pipe,
1663	1635	},
...	...	@@ -1665,26 +1637,25 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1665	1637	return tree;
1666	1638	}
1667	1639
1668		putBackToken(&tok_it, &tree);
	1640	prevToken(&tok_it, &tree);
1669	1641	continue;
1670	1642	}
1671	1643
1672		const node = try createToCtxNode(arena, opt_ctx, ast.Node.Payload,
1673		ast.Node.Payload {
1674		.base = undefined,
1675		.lpipe = token_index,
1676		.error_symbol = undefined,
1677		.rpipe = undefined
1678		}
1679		);
	1644	const node = try arena.construct(ast.Node.Payload{
	1645	.base = ast.Node{ .id = ast.Node.Id.Payload },
	1646	.lpipe = token_index,
	1647	.error_symbol = undefined,
	1648	.rpipe = undefined,
	1649	});
	1650	opt_ctx.store(&node.base);
1680	1651
1681		stack.append(State {
1682		.ExpectTokenSave = ExpectTokenSave {
	1652	stack.append(State{
	1653	.ExpectTokenSave = ExpectTokenSave{
1683	1654	.id = Token.Id.Pipe,
1684	1655	.ptr = &node.rpipe,
1685		}
	1656	},
1686	1657	}) catch unreachable;
1687		try stack.append(State { .Identifier = OptionalCtx { .Required = &node.error_symbol } });
	1658	try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.error_symbol } });
1688	1659	continue;
1689	1660	},
1690	1661	State.PointerPayload => \|opt_ctx\| {
...	...	@@ -1693,8 +1664,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1693	1664	const token_ptr = token.ptr;
1694	1665	if (token_ptr.id != Token.Id.Pipe) {
1695	1666	if (opt_ctx != OptionalCtx.Optional) {
1696		*(try tree.errors.addOne()) = Error {
1697		.ExpectedToken = Error.ExpectedToken {
	1667	((try tree.errors.addOne())).* = Error{
	1668	.ExpectedToken = Error.ExpectedToken{
1698	1669	.token = token_index,
1699	1670	.expected_id = Token.Id.Pipe,
1700	1671	},
...	...	@@ -1702,32 +1673,31 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1702	1673	return tree;
1703	1674	}
1704	1675
1705		putBackToken(&tok_it, &tree);
	1676	prevToken(&tok_it, &tree);
1706	1677	continue;
1707	1678	}
1708	1679
1709		const node = try createToCtxNode(arena, opt_ctx, ast.Node.PointerPayload,
1710		ast.Node.PointerPayload {
1711		.base = undefined,
1712		.lpipe = token_index,
1713		.ptr_token = null,
1714		.value_symbol = undefined,
1715		.rpipe = undefined
1716		}
1717		);
	1680	const node = try arena.construct(ast.Node.PointerPayload{
	1681	.base = ast.Node{ .id = ast.Node.Id.PointerPayload },
	1682	.lpipe = token_index,
	1683	.ptr_token = null,
	1684	.value_symbol = undefined,
	1685	.rpipe = undefined,
	1686	});
	1687	opt_ctx.store(&node.base);
1718	1688
1719		try stack.append(State {
1720		.ExpectTokenSave = ExpectTokenSave {
	1689	try stack.append(State{
	1690	.ExpectTokenSave = ExpectTokenSave{
1721	1691	.id = Token.Id.Pipe,
1722	1692	.ptr = &node.rpipe,
1723		}
	1693	},
1724	1694	});
1725		try stack.append(State { .Identifier = OptionalCtx { .Required = &node.value_symbol } });
1726		try stack.append(State {
1727		.OptionalTokenSave = OptionalTokenSave {
	1695	try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.value_symbol } });
	1696	try stack.append(State{
	1697	.OptionalTokenSave = OptionalTokenSave{
1728	1698	.id = Token.Id.Asterisk,
1729	1699	.ptr = &node.ptr_token,
1730		}
	1700	},
1731	1701	});
1732	1702	continue;
1733	1703	},
...	...	@@ -1737,8 +1707,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1737	1707	const token_ptr = token.ptr;
1738	1708	if (token_ptr.id != Token.Id.Pipe) {
1739	1709	if (opt_ctx != OptionalCtx.Optional) {
1740		*(try tree.errors.addOne()) = Error {
1741		.ExpectedToken = Error.ExpectedToken {
	1710	((try tree.errors.addOne())).* = Error{
	1711	.ExpectedToken = Error.ExpectedToken{
1742	1712	.token = token_index,
1743	1713	.expected_id = Token.Id.Pipe,
1744	1714	},
...	...	@@ -1746,67 +1716,64 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1746	1716	return tree;
1747	1717	}
1748	1718
1749		putBackToken(&tok_it, &tree);
	1719	prevToken(&tok_it, &tree);
1750	1720	continue;
1751	1721	}
1752	1722
1753		const node = try createToCtxNode(arena, opt_ctx, ast.Node.PointerIndexPayload,
1754		ast.Node.PointerIndexPayload {
1755		.base = undefined,
1756		.lpipe = token_index,
1757		.ptr_token = null,
1758		.value_symbol = undefined,
1759		.index_symbol = null,
1760		.rpipe = undefined
1761		}
1762		);
	1723	const node = try arena.construct(ast.Node.PointerIndexPayload{
	1724	.base = ast.Node{ .id = ast.Node.Id.PointerIndexPayload },
	1725	.lpipe = token_index,
	1726	.ptr_token = null,
	1727	.value_symbol = undefined,
	1728	.index_symbol = null,
	1729	.rpipe = undefined,
	1730	});
	1731	opt_ctx.store(&node.base);
1763	1732
1764		stack.append(State {
1765		.ExpectTokenSave = ExpectTokenSave {
	1733	stack.append(State{
	1734	.ExpectTokenSave = ExpectTokenSave{
1766	1735	.id = Token.Id.Pipe,
1767	1736	.ptr = &node.rpipe,
1768		}
	1737	},
1769	1738	}) catch unreachable;
1770		try stack.append(State { .Identifier = OptionalCtx { .RequiredNull = &node.index_symbol } });
1771		try stack.append(State { .IfToken = Token.Id.Comma });
1772		try stack.append(State { .Identifier = OptionalCtx { .Required = &node.value_symbol } });
1773		try stack.append(State {
1774		.OptionalTokenSave = OptionalTokenSave {
	1739	try stack.append(State{ .Identifier = OptionalCtx{ .RequiredNull = &node.index_symbol } });
	1740	try stack.append(State{ .IfToken = Token.Id.Comma });
	1741	try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.value_symbol } });
	1742	try stack.append(State{
	1743	.OptionalTokenSave = OptionalTokenSave{
1775	1744	.id = Token.Id.Asterisk,
1776	1745	.ptr = &node.ptr_token,
1777		}
	1746	},
1778	1747	});
1779	1748	continue;
1780	1749	},
1781	1750
1782
1783	1751	State.Expression => \|opt_ctx\| {
1784	1752	const token = nextToken(&tok_it, &tree);
1785	1753	const token_index = token.index;
1786	1754	const token_ptr = token.ptr;
1787	1755	switch (token_ptr.id) {
1788	1756	Token.Id.Keyword_return, Token.Id.Keyword_break, Token.Id.Keyword_continue => {
1789		const node = try createToCtxNode(arena, opt_ctx, ast.Node.ControlFlowExpression,
1790		ast.Node.ControlFlowExpression {
1791		.base = undefined,
1792		.ltoken = token_index,
1793		.kind = undefined,
1794		.rhs = null,
1795		}
1796		);
	1757	const node = try arena.construct(ast.Node.ControlFlowExpression{
	1758	.base = ast.Node{ .id = ast.Node.Id.ControlFlowExpression },
	1759	.ltoken = token_index,
	1760	.kind = undefined,
	1761	.rhs = null,
	1762	});
	1763	opt_ctx.store(&node.base);
1797	1764
1798		stack.append(State { .Expression = OptionalCtx { .Optional = &node.rhs } }) catch unreachable;
	1765	stack.append(State{ .Expression = OptionalCtx{ .Optional = &node.rhs } }) catch unreachable;
1799	1766
1800	1767	switch (token_ptr.id) {
1801	1768	Token.Id.Keyword_break => {
1802		node.kind = ast.Node.ControlFlowExpression.Kind { .Break = null };
1803		try stack.append(State { .Identifier = OptionalCtx { .RequiredNull = &node.kind.Break } });
1804		try stack.append(State { .IfToken = Token.Id.Colon });
	1769	node.kind = ast.Node.ControlFlowExpression.Kind{ .Break = null };
	1770	try stack.append(State{ .Identifier = OptionalCtx{ .RequiredNull = &node.kind.Break } });
	1771	try stack.append(State{ .IfToken = Token.Id.Colon });
1805	1772	},
1806	1773	Token.Id.Keyword_continue => {
1807		node.kind = ast.Node.ControlFlowExpression.Kind { .Continue = null };
1808		try stack.append(State { .Identifier = OptionalCtx { .RequiredNull = &node.kind.Continue } });
1809		try stack.append(State { .IfToken = Token.Id.Colon });
	1774	node.kind = ast.Node.ControlFlowExpression.Kind{ .Continue = null };
	1775	try stack.append(State{ .Identifier = OptionalCtx{ .RequiredNull = &node.kind.Continue } });
	1776	try stack.append(State{ .IfToken = Token.Id.Colon });
1810	1777	},
1811	1778	Token.Id.Keyword_return => {
1812	1779	node.kind = ast.Node.ControlFlowExpression.Kind.Return;
...	...	@@ -1816,57 +1783,55 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1816	1783	continue;
1817	1784	},
1818	1785	Token.Id.Keyword_try, Token.Id.Keyword_cancel, Token.Id.Keyword_resume => {
1819		const node = try createToCtxNode(arena, opt_ctx, ast.Node.PrefixOp,
1820		ast.Node.PrefixOp {
1821		.base = undefined,
1822		.op_token = token_index,
1823		.op = switch (token_ptr.id) {
1824		Token.Id.Keyword_try => ast.Node.PrefixOp.Op { .Try = void{} },
1825		Token.Id.Keyword_cancel => ast.Node.PrefixOp.Op { .Cancel = void{} },
1826		Token.Id.Keyword_resume => ast.Node.PrefixOp.Op { .Resume = void{} },
1827		else => unreachable,
1828		},
1829		.rhs = undefined,
1830		}
1831		);
	1786	const node = try arena.construct(ast.Node.PrefixOp{
	1787	.base = ast.Node{ .id = ast.Node.Id.PrefixOp },
	1788	.op_token = token_index,
	1789	.op = switch (token_ptr.id) {
	1790	Token.Id.Keyword_try => ast.Node.PrefixOp.Op{ .Try = void{} },
	1791	Token.Id.Keyword_cancel => ast.Node.PrefixOp.Op{ .Cancel = void{} },
	1792	Token.Id.Keyword_resume => ast.Node.PrefixOp.Op{ .Resume = void{} },
	1793	else => unreachable,
	1794	},
	1795	.rhs = undefined,
	1796	});
	1797	opt_ctx.store(&node.base);
1832	1798
1833		stack.append(State { .Expression = OptionalCtx { .Required = &node.rhs } }) catch unreachable;
	1799	stack.append(State{ .Expression = OptionalCtx{ .Required = &node.rhs } }) catch unreachable;
1834	1800	continue;
1835	1801	},
1836	1802	else => {
1837	1803	if (!try parseBlockExpr(&stack, arena, opt_ctx, token_ptr, token_index)) {
1838		putBackToken(&tok_it, &tree);
1839		stack.append(State { .UnwrapExpressionBegin = opt_ctx }) catch unreachable;
	1804	prevToken(&tok_it, &tree);
	1805	stack.append(State{ .UnwrapExpressionBegin = opt_ctx }) catch unreachable;
1840	1806	}
1841	1807	continue;
1842		}
	1808	},
1843	1809	}
1844	1810	},
1845	1811	State.RangeExpressionBegin => \|opt_ctx\| {
1846		stack.append(State { .RangeExpressionEnd = opt_ctx }) catch unreachable;
1847		try stack.append(State { .Expression = opt_ctx });
	1812	stack.append(State{ .RangeExpressionEnd = opt_ctx }) catch unreachable;
	1813	try stack.append(State{ .Expression = opt_ctx });
1848	1814	continue;
1849	1815	},
1850	1816	State.RangeExpressionEnd => \|opt_ctx\| {
1851	1817	const lhs = opt_ctx.get() ?? continue;
1852	1818
1853	1819	if (eatToken(&tok_it, &tree, Token.Id.Ellipsis3)) \|ellipsis3\| {
1854		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
1855		ast.Node.InfixOp {
1856		.base = undefined,
1857		.lhs = lhs,
1858		.op_token = ellipsis3,
1859		.op = ast.Node.InfixOp.Op.Range,
1860		.rhs = undefined,
1861		}
1862		);
1863		stack.append(State { .Expression = OptionalCtx { .Required = &node.rhs } }) catch unreachable;
	1820	const node = try arena.construct(ast.Node.InfixOp{
	1821	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	1822	.lhs = lhs,
	1823	.op_token = ellipsis3,
	1824	.op = ast.Node.InfixOp.Op.Range,
	1825	.rhs = undefined,
	1826	});
	1827	opt_ctx.store(&node.base);
	1828	stack.append(State{ .Expression = OptionalCtx{ .Required = &node.rhs } }) catch unreachable;
1864	1829	continue;
1865	1830	}
1866	1831	},
1867	1832	State.AssignmentExpressionBegin => \|opt_ctx\| {
1868		stack.append(State { .AssignmentExpressionEnd = opt_ctx }) catch unreachable;
1869		try stack.append(State { .Expression = opt_ctx });
	1833	stack.append(State{ .AssignmentExpressionEnd = opt_ctx }) catch unreachable;
	1834	try stack.append(State{ .Expression = opt_ctx });
1870	1835	continue;
1871	1836	},
1872	1837
...	...	@@ -1877,27 +1842,26 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1877	1842	const token_index = token.index;
1878	1843	const token_ptr = token.ptr;
1879	1844	if (tokenIdToAssignment(token_ptr.id)) \|ass_id\| {
1880		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
1881		ast.Node.InfixOp {
1882		.base = undefined,
1883		.lhs = lhs,
1884		.op_token = token_index,
1885		.op = ass_id,
1886		.rhs = undefined,
1887		}
1888		);
1889		stack.append(State { .AssignmentExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
1890		try stack.append(State { .Expression = OptionalCtx { .Required = &node.rhs } });
	1845	const node = try arena.construct(ast.Node.InfixOp{
	1846	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	1847	.lhs = lhs,
	1848	.op_token = token_index,
	1849	.op = ass_id,
	1850	.rhs = undefined,
	1851	});
	1852	opt_ctx.store(&node.base);
	1853	stack.append(State{ .AssignmentExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	1854	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.rhs } });
1891	1855	continue;
1892	1856	} else {
1893		putBackToken(&tok_it, &tree);
	1857	prevToken(&tok_it, &tree);
1894	1858	continue;
1895	1859	}
1896	1860	},
1897	1861
1898	1862	State.UnwrapExpressionBegin => \|opt_ctx\| {
1899		stack.append(State { .UnwrapExpressionEnd = opt_ctx }) catch unreachable;
1900		try stack.append(State { .BoolOrExpressionBegin = opt_ctx });
	1863	stack.append(State{ .UnwrapExpressionEnd = opt_ctx }) catch unreachable;
	1864	try stack.append(State{ .BoolOrExpressionBegin = opt_ctx });
1901	1865	continue;
1902	1866	},
1903	1867
...	...	@@ -1908,32 +1872,31 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1908	1872	const token_index = token.index;
1909	1873	const token_ptr = token.ptr;
1910	1874	if (tokenIdToUnwrapExpr(token_ptr.id)) \|unwrap_id\| {
1911		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
1912		ast.Node.InfixOp {
1913		.base = undefined,
1914		.lhs = lhs,
1915		.op_token = token_index,
1916		.op = unwrap_id,
1917		.rhs = undefined,
1918		}
1919		);
	1875	const node = try arena.construct(ast.Node.InfixOp{
	1876	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	1877	.lhs = lhs,
	1878	.op_token = token_index,
	1879	.op = unwrap_id,
	1880	.rhs = undefined,
	1881	});
	1882	opt_ctx.store(&node.base);
1920	1883
1921		stack.append(State { .UnwrapExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
1922		try stack.append(State { .Expression = OptionalCtx { .Required = &node.rhs } });
	1884	stack.append(State{ .UnwrapExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	1885	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.rhs } });
1923	1886
1924	1887	if (node.op == ast.Node.InfixOp.Op.Catch) {
1925		try stack.append(State { .Payload = OptionalCtx { .Optional = &node.op.Catch } });
	1888	try stack.append(State{ .Payload = OptionalCtx{ .Optional = &node.op.Catch } });
1926	1889	}
1927	1890	continue;
1928	1891	} else {
1929		putBackToken(&tok_it, &tree);
	1892	prevToken(&tok_it, &tree);
1930	1893	continue;
1931	1894	}
1932	1895	},
1933	1896
1934	1897	State.BoolOrExpressionBegin => \|opt_ctx\| {
1935		stack.append(State { .BoolOrExpressionEnd = opt_ctx }) catch unreachable;
1936		try stack.append(State { .BoolAndExpressionBegin = opt_ctx });
	1898	stack.append(State{ .BoolOrExpressionEnd = opt_ctx }) catch unreachable;
	1899	try stack.append(State{ .BoolAndExpressionBegin = opt_ctx });
1937	1900	continue;
1938	1901	},
1939	1902
...	...	@@ -1941,24 +1904,23 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1941	1904	const lhs = opt_ctx.get() ?? continue;
1942	1905
1943	1906	if (eatToken(&tok_it, &tree, Token.Id.Keyword_or)) \|or_token\| {
1944		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
1945		ast.Node.InfixOp {
1946		.base = undefined,
1947		.lhs = lhs,
1948		.op_token = or_token,
1949		.op = ast.Node.InfixOp.Op.BoolOr,
1950		.rhs = undefined,
1951		}
1952		);
1953		stack.append(State { .BoolOrExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
1954		try stack.append(State { .BoolAndExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	1907	const node = try arena.construct(ast.Node.InfixOp{
	1908	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	1909	.lhs = lhs,
	1910	.op_token = or_token,
	1911	.op = ast.Node.InfixOp.Op.BoolOr,
	1912	.rhs = undefined,
	1913	});
	1914	opt_ctx.store(&node.base);
	1915	stack.append(State{ .BoolOrExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	1916	try stack.append(State{ .BoolAndExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
1955	1917	continue;
1956	1918	}
1957	1919	},
1958	1920
1959	1921	State.BoolAndExpressionBegin => \|opt_ctx\| {
1960		stack.append(State { .BoolAndExpressionEnd = opt_ctx }) catch unreachable;
1961		try stack.append(State { .ComparisonExpressionBegin = opt_ctx });
	1922	stack.append(State{ .BoolAndExpressionEnd = opt_ctx }) catch unreachable;
	1923	try stack.append(State{ .ComparisonExpressionBegin = opt_ctx });
1962	1924	continue;
1963	1925	},
1964	1926
...	...	@@ -1966,24 +1928,23 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1966	1928	const lhs = opt_ctx.get() ?? continue;
1967	1929
1968	1930	if (eatToken(&tok_it, &tree, Token.Id.Keyword_and)) \|and_token\| {
1969		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
1970		ast.Node.InfixOp {
1971		.base = undefined,
1972		.lhs = lhs,
1973		.op_token = and_token,
1974		.op = ast.Node.InfixOp.Op.BoolAnd,
1975		.rhs = undefined,
1976		}
1977		);
1978		stack.append(State { .BoolAndExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
1979		try stack.append(State { .ComparisonExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	1931	const node = try arena.construct(ast.Node.InfixOp{
	1932	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	1933	.lhs = lhs,
	1934	.op_token = and_token,
	1935	.op = ast.Node.InfixOp.Op.BoolAnd,
	1936	.rhs = undefined,
	1937	});
	1938	opt_ctx.store(&node.base);
	1939	stack.append(State{ .BoolAndExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	1940	try stack.append(State{ .ComparisonExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
1980	1941	continue;
1981	1942	}
1982	1943	},
1983	1944
1984	1945	State.ComparisonExpressionBegin => \|opt_ctx\| {
1985		stack.append(State { .ComparisonExpressionEnd = opt_ctx }) catch unreachable;
1986		try stack.append(State { .BinaryOrExpressionBegin = opt_ctx });
	1946	stack.append(State{ .ComparisonExpressionEnd = opt_ctx }) catch unreachable;
	1947	try stack.append(State{ .BinaryOrExpressionBegin = opt_ctx });
1987	1948	continue;
1988	1949	},
1989	1950
...	...	@@ -1994,27 +1955,26 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
1994	1955	const token_index = token.index;
1995	1956	const token_ptr = token.ptr;
1996	1957	if (tokenIdToComparison(token_ptr.id)) \|comp_id\| {
1997		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
1998		ast.Node.InfixOp {
1999		.base = undefined,
2000		.lhs = lhs,
2001		.op_token = token_index,
2002		.op = comp_id,
2003		.rhs = undefined,
2004		}
2005		);
2006		stack.append(State { .ComparisonExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2007		try stack.append(State { .BinaryOrExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	1958	const node = try arena.construct(ast.Node.InfixOp{
	1959	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	1960	.lhs = lhs,
	1961	.op_token = token_index,
	1962	.op = comp_id,
	1963	.rhs = undefined,
	1964	});
	1965	opt_ctx.store(&node.base);
	1966	stack.append(State{ .ComparisonExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	1967	try stack.append(State{ .BinaryOrExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
2008	1968	continue;
2009	1969	} else {
2010		putBackToken(&tok_it, &tree);
	1970	prevToken(&tok_it, &tree);
2011	1971	continue;
2012	1972	}
2013	1973	},
2014	1974
2015	1975	State.BinaryOrExpressionBegin => \|opt_ctx\| {
2016		stack.append(State { .BinaryOrExpressionEnd = opt_ctx }) catch unreachable;
2017		try stack.append(State { .BinaryXorExpressionBegin = opt_ctx });
	1976	stack.append(State{ .BinaryOrExpressionEnd = opt_ctx }) catch unreachable;
	1977	try stack.append(State{ .BinaryXorExpressionBegin = opt_ctx });
2018	1978	continue;
2019	1979	},
2020	1980
...	...	@@ -2022,24 +1982,23 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2022	1982	const lhs = opt_ctx.get() ?? continue;
2023	1983
2024	1984	if (eatToken(&tok_it, &tree, Token.Id.Pipe)) \|pipe\| {
2025		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2026		ast.Node.InfixOp {
2027		.base = undefined,
2028		.lhs = lhs,
2029		.op_token = pipe,
2030		.op = ast.Node.InfixOp.Op.BitOr,
2031		.rhs = undefined,
2032		}
2033		);
2034		stack.append(State { .BinaryOrExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2035		try stack.append(State { .BinaryXorExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	1985	const node = try arena.construct(ast.Node.InfixOp{
	1986	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	1987	.lhs = lhs,
	1988	.op_token = pipe,
	1989	.op = ast.Node.InfixOp.Op.BitOr,
	1990	.rhs = undefined,
	1991	});
	1992	opt_ctx.store(&node.base);
	1993	stack.append(State{ .BinaryOrExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	1994	try stack.append(State{ .BinaryXorExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
2036	1995	continue;
2037	1996	}
2038	1997	},
2039	1998
2040	1999	State.BinaryXorExpressionBegin => \|opt_ctx\| {
2041		stack.append(State { .BinaryXorExpressionEnd = opt_ctx }) catch unreachable;
2042		try stack.append(State { .BinaryAndExpressionBegin = opt_ctx });
	2000	stack.append(State{ .BinaryXorExpressionEnd = opt_ctx }) catch unreachable;
	2001	try stack.append(State{ .BinaryAndExpressionBegin = opt_ctx });
2043	2002	continue;
2044	2003	},
2045	2004
...	...	@@ -2047,24 +2006,23 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2047	2006	const lhs = opt_ctx.get() ?? continue;
2048	2007
2049	2008	if (eatToken(&tok_it, &tree, Token.Id.Caret)) \|caret\| {
2050		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2051		ast.Node.InfixOp {
2052		.base = undefined,
2053		.lhs = lhs,
2054		.op_token = caret,
2055		.op = ast.Node.InfixOp.Op.BitXor,
2056		.rhs = undefined,
2057		}
2058		);
2059		stack.append(State { .BinaryXorExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2060		try stack.append(State { .BinaryAndExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	2009	const node = try arena.construct(ast.Node.InfixOp{
	2010	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	2011	.lhs = lhs,
	2012	.op_token = caret,
	2013	.op = ast.Node.InfixOp.Op.BitXor,
	2014	.rhs = undefined,
	2015	});
	2016	opt_ctx.store(&node.base);
	2017	stack.append(State{ .BinaryXorExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2018	try stack.append(State{ .BinaryAndExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
2061	2019	continue;
2062	2020	}
2063	2021	},
2064	2022
2065	2023	State.BinaryAndExpressionBegin => \|opt_ctx\| {
2066		stack.append(State { .BinaryAndExpressionEnd = opt_ctx }) catch unreachable;
2067		try stack.append(State { .BitShiftExpressionBegin = opt_ctx });
	2024	stack.append(State{ .BinaryAndExpressionEnd = opt_ctx }) catch unreachable;
	2025	try stack.append(State{ .BitShiftExpressionBegin = opt_ctx });
2068	2026	continue;
2069	2027	},
2070	2028
...	...	@@ -2072,24 +2030,23 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2072	2030	const lhs = opt_ctx.get() ?? continue;
2073	2031
2074	2032	if (eatToken(&tok_it, &tree, Token.Id.Ampersand)) \|ampersand\| {
2075		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2076		ast.Node.InfixOp {
2077		.base = undefined,
2078		.lhs = lhs,
2079		.op_token = ampersand,
2080		.op = ast.Node.InfixOp.Op.BitAnd,
2081		.rhs = undefined,
2082		}
2083		);
2084		stack.append(State { .BinaryAndExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2085		try stack.append(State { .BitShiftExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	2033	const node = try arena.construct(ast.Node.InfixOp{
	2034	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	2035	.lhs = lhs,
	2036	.op_token = ampersand,
	2037	.op = ast.Node.InfixOp.Op.BitAnd,
	2038	.rhs = undefined,
	2039	});
	2040	opt_ctx.store(&node.base);
	2041	stack.append(State{ .BinaryAndExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2042	try stack.append(State{ .BitShiftExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
2086	2043	continue;
2087	2044	}
2088	2045	},
2089	2046
2090	2047	State.BitShiftExpressionBegin => \|opt_ctx\| {
2091		stack.append(State { .BitShiftExpressionEnd = opt_ctx }) catch unreachable;
2092		try stack.append(State { .AdditionExpressionBegin = opt_ctx });
	2048	stack.append(State{ .BitShiftExpressionEnd = opt_ctx }) catch unreachable;
	2049	try stack.append(State{ .AdditionExpressionBegin = opt_ctx });
2093	2050	continue;
2094	2051	},
2095	2052
...	...	@@ -2100,27 +2057,26 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2100	2057	const token_index = token.index;
2101	2058	const token_ptr = token.ptr;
2102	2059	if (tokenIdToBitShift(token_ptr.id)) \|bitshift_id\| {
2103		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2104		ast.Node.InfixOp {
2105		.base = undefined,
2106		.lhs = lhs,
2107		.op_token = token_index,
2108		.op = bitshift_id,
2109		.rhs = undefined,
2110		}
2111		);
2112		stack.append(State { .BitShiftExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2113		try stack.append(State { .AdditionExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	2060	const node = try arena.construct(ast.Node.InfixOp{
	2061	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	2062	.lhs = lhs,
	2063	.op_token = token_index,
	2064	.op = bitshift_id,
	2065	.rhs = undefined,
	2066	});
	2067	opt_ctx.store(&node.base);
	2068	stack.append(State{ .BitShiftExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2069	try stack.append(State{ .AdditionExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
2114	2070	continue;
2115	2071	} else {
2116		putBackToken(&tok_it, &tree);
	2072	prevToken(&tok_it, &tree);
2117	2073	continue;
2118	2074	}
2119	2075	},
2120	2076
2121	2077	State.AdditionExpressionBegin => \|opt_ctx\| {
2122		stack.append(State { .AdditionExpressionEnd = opt_ctx }) catch unreachable;
2123		try stack.append(State { .MultiplyExpressionBegin = opt_ctx });
	2078	stack.append(State{ .AdditionExpressionEnd = opt_ctx }) catch unreachable;
	2079	try stack.append(State{ .MultiplyExpressionBegin = opt_ctx });
2124	2080	continue;
2125	2081	},
2126	2082
...	...	@@ -2131,27 +2087,26 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2131	2087	const token_index = token.index;
2132	2088	const token_ptr = token.ptr;
2133	2089	if (tokenIdToAddition(token_ptr.id)) \|add_id\| {
2134		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2135		ast.Node.InfixOp {
2136		.base = undefined,
2137		.lhs = lhs,
2138		.op_token = token_index,
2139		.op = add_id,
2140		.rhs = undefined,
2141		}
2142		);
2143		stack.append(State { .AdditionExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2144		try stack.append(State { .MultiplyExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	2090	const node = try arena.construct(ast.Node.InfixOp{
	2091	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	2092	.lhs = lhs,
	2093	.op_token = token_index,
	2094	.op = add_id,
	2095	.rhs = undefined,
	2096	});
	2097	opt_ctx.store(&node.base);
	2098	stack.append(State{ .AdditionExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2099	try stack.append(State{ .MultiplyExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
2145	2100	continue;
2146	2101	} else {
2147		putBackToken(&tok_it, &tree);
	2102	prevToken(&tok_it, &tree);
2148	2103	continue;
2149	2104	}
2150	2105	},
2151	2106
2152	2107	State.MultiplyExpressionBegin => \|opt_ctx\| {
2153		stack.append(State { .MultiplyExpressionEnd = opt_ctx }) catch unreachable;
2154		try stack.append(State { .CurlySuffixExpressionBegin = opt_ctx });
	2108	stack.append(State{ .MultiplyExpressionEnd = opt_ctx }) catch unreachable;
	2109	try stack.append(State{ .CurlySuffixExpressionBegin = opt_ctx });
2155	2110	continue;
2156	2111	},
2157	2112
...	...	@@ -2162,28 +2117,27 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2162	2117	const token_index = token.index;
2163	2118	const token_ptr = token.ptr;
2164	2119	if (tokenIdToMultiply(token_ptr.id)) \|mult_id\| {
2165		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2166		ast.Node.InfixOp {
2167		.base = undefined,
2168		.lhs = lhs,
2169		.op_token = token_index,
2170		.op = mult_id,
2171		.rhs = undefined,
2172		}
2173		);
2174		stack.append(State { .MultiplyExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2175		try stack.append(State { .CurlySuffixExpressionBegin = OptionalCtx { .Required = &node.rhs } });
	2120	const node = try arena.construct(ast.Node.InfixOp{
	2121	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	2122	.lhs = lhs,
	2123	.op_token = token_index,
	2124	.op = mult_id,
	2125	.rhs = undefined,
	2126	});
	2127	opt_ctx.store(&node.base);
	2128	stack.append(State{ .MultiplyExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2129	try stack.append(State{ .CurlySuffixExpressionBegin = OptionalCtx{ .Required = &node.rhs } });
2176	2130	continue;
2177	2131	} else {
2178		putBackToken(&tok_it, &tree);
	2132	prevToken(&tok_it, &tree);
2179	2133	continue;
2180	2134	}
2181	2135	},
2182	2136
2183	2137	State.CurlySuffixExpressionBegin => \|opt_ctx\| {
2184		stack.append(State { .CurlySuffixExpressionEnd = opt_ctx }) catch unreachable;
2185		try stack.append(State { .IfToken = Token.Id.LBrace });
2186		try stack.append(State { .TypeExprBegin = opt_ctx });
	2138	stack.append(State{ .CurlySuffixExpressionEnd = opt_ctx }) catch unreachable;
	2139	try stack.append(State{ .IfToken = Token.Id.LBrace });
	2140	try stack.append(State{ .TypeExprBegin = opt_ctx });
2187	2141	continue;
2188	2142	},
2189	2143
...	...	@@ -2191,52 +2145,47 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2191	2145	const lhs = opt_ctx.get() ?? continue;
2192	2146
2193	2147	if ((??tok_it.peek()).id == Token.Id.Period) {
2194		const node = try arena.construct(ast.Node.SuffixOp {
2195		.base = ast.Node { .id = ast.Node.Id.SuffixOp },
	2148	const node = try arena.construct(ast.Node.SuffixOp{
	2149	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },
2196	2150	.lhs = lhs,
2197		.op = ast.Node.SuffixOp.Op {
2198		.StructInitializer = ast.Node.SuffixOp.Op.InitList.init(arena),
2199		},
	2151	.op = ast.Node.SuffixOp.Op{ .StructInitializer = ast.Node.SuffixOp.Op.InitList.init(arena) },
2200	2152	.rtoken = undefined,
2201	2153	});
2202	2154	opt_ctx.store(&node.base);
2203	2155
2204		stack.append(State { .CurlySuffixExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2205		try stack.append(State { .IfToken = Token.Id.LBrace });
2206		try stack.append(State {
2207		.FieldInitListItemOrEnd = ListSave(@typeOf(node.op.StructInitializer)) {
	2156	stack.append(State{ .CurlySuffixExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2157	try stack.append(State{ .IfToken = Token.Id.LBrace });
	2158	try stack.append(State{
	2159	.FieldInitListItemOrEnd = ListSave(@typeOf(node.op.StructInitializer)){
2208	2160	.list = &node.op.StructInitializer,
2209	2161	.ptr = &node.rtoken,
2210		}
	2162	},
2211	2163	});
2212	2164	continue;
2213	2165	}
2214	2166
2215		const node = try createToCtxNode(arena, opt_ctx, ast.Node.SuffixOp,
2216		ast.Node.SuffixOp {
2217		.base = undefined,
2218		.lhs = lhs,
2219		.op = ast.Node.SuffixOp.Op {
2220		.ArrayInitializer = ast.Node.SuffixOp.Op.InitList.init(arena),
2221		},
2222		.rtoken = undefined,
2223		}
2224		);
2225		stack.append(State { .CurlySuffixExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2226		try stack.append(State { .IfToken = Token.Id.LBrace });
2227		try stack.append(State {
2228		.ExprListItemOrEnd = ExprListCtx {
	2167	const node = try arena.construct(ast.Node.SuffixOp{
	2168	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },
	2169	.lhs = lhs,
	2170	.op = ast.Node.SuffixOp.Op{ .ArrayInitializer = ast.Node.SuffixOp.Op.InitList.init(arena) },
	2171	.rtoken = undefined,
	2172	});
	2173	opt_ctx.store(&node.base);
	2174	stack.append(State{ .CurlySuffixExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2175	try stack.append(State{ .IfToken = Token.Id.LBrace });
	2176	try stack.append(State{
	2177	.ExprListItemOrEnd = ExprListCtx{
2229	2178	.list = &node.op.ArrayInitializer,
2230	2179	.end = Token.Id.RBrace,
2231	2180	.ptr = &node.rtoken,
2232		}
	2181	},
2233	2182	});
2234	2183	continue;
2235	2184	},
2236	2185
2237	2186	State.TypeExprBegin => \|opt_ctx\| {
2238		stack.append(State { .TypeExprEnd = opt_ctx }) catch unreachable;
2239		try stack.append(State { .PrefixOpExpression = opt_ctx });
	2187	stack.append(State{ .TypeExprEnd = opt_ctx }) catch unreachable;
	2188	try stack.append(State{ .PrefixOpExpression = opt_ctx });
2240	2189	continue;
2241	2190	},
2242	2191
...	...	@@ -2244,17 +2193,16 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2244	2193	const lhs = opt_ctx.get() ?? continue;
2245	2194
2246	2195	if (eatToken(&tok_it, &tree, Token.Id.Bang)) \|bang\| {
2247		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2248		ast.Node.InfixOp {
2249		.base = undefined,
2250		.lhs = lhs,
2251		.op_token = bang,
2252		.op = ast.Node.InfixOp.Op.ErrorUnion,
2253		.rhs = undefined,
2254		}
2255		);
2256		stack.append(State { .TypeExprEnd = opt_ctx.toRequired() }) catch unreachable;
2257		try stack.append(State { .PrefixOpExpression = OptionalCtx { .Required = &node.rhs } });
	2196	const node = try arena.construct(ast.Node.InfixOp{
	2197	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	2198	.lhs = lhs,
	2199	.op_token = bang,
	2200	.op = ast.Node.InfixOp.Op.ErrorUnion,
	2201	.rhs = undefined,
	2202	});
	2203	opt_ctx.store(&node.base);
	2204	stack.append(State{ .TypeExprEnd = opt_ctx.toRequired() }) catch unreachable;
	2205	try stack.append(State{ .PrefixOpExpression = OptionalCtx{ .Required = &node.rhs } });
2258	2206	continue;
2259	2207	}
2260	2208	},
...	...	@@ -2264,65 +2212,60 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2264	2212	const token_index = token.index;
2265	2213	const token_ptr = token.ptr;
2266	2214	if (tokenIdToPrefixOp(token_ptr.id)) \|prefix_id\| {
2267		var node = try createToCtxNode(arena, opt_ctx, ast.Node.PrefixOp,
2268		ast.Node.PrefixOp {
2269		.base = undefined,
2270		.op_token = token_index,
2271		.op = prefix_id,
2272		.rhs = undefined,
2273		}
2274		);
	2215	var node = try arena.construct(ast.Node.PrefixOp{
	2216	.base = ast.Node{ .id = ast.Node.Id.PrefixOp },
	2217	.op_token = token_index,
	2218	.op = prefix_id,
	2219	.rhs = undefined,
	2220	});
	2221	opt_ctx.store(&node.base);
2275	2222
2276	2223	// Treat '**' token as two derefs
2277	2224	if (token_ptr.id == Token.Id.AsteriskAsterisk) {
2278		const child = try createNode(arena, ast.Node.PrefixOp,
2279		ast.Node.PrefixOp {
2280		.base = undefined,
2281		.op_token = token_index,
2282		.op = prefix_id,
2283		.rhs = undefined,
2284		}
2285		);
	2225	const child = try arena.construct(ast.Node.PrefixOp{
	2226	.base = ast.Node{ .id = ast.Node.Id.PrefixOp },
	2227	.op_token = token_index,
	2228	.op = prefix_id,
	2229	.rhs = undefined,
	2230	});
2286	2231	node.rhs = &child.base;
2287	2232	node = child;
2288	2233	}
2289	2234
2290		stack.append(State { .TypeExprBegin = OptionalCtx { .Required = &node.rhs } }) catch unreachable;
	2235	stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &node.rhs } }) catch unreachable;
2291	2236	if (node.op == ast.Node.PrefixOp.Op.AddrOf) {
2292		try stack.append(State { .AddrOfModifiers = &node.op.AddrOf });
	2237	try stack.append(State{ .AddrOfModifiers = &node.op.AddrOf });
2293	2238	}
2294	2239	continue;
2295	2240	} else {
2296		putBackToken(&tok_it, &tree);
2297		stack.append(State { .SuffixOpExpressionBegin = opt_ctx }) catch unreachable;
	2241	prevToken(&tok_it, &tree);
	2242	stack.append(State{ .SuffixOpExpressionBegin = opt_ctx }) catch unreachable;
2298	2243	continue;
2299	2244	}
2300	2245	},
2301	2246
2302	2247	State.SuffixOpExpressionBegin => \|opt_ctx\| {
2303	2248	if (eatToken(&tok_it, &tree, Token.Id.Keyword_async)) \|async_token\| {
2304		const async_node = try createNode(arena, ast.Node.AsyncAttribute,
2305		ast.Node.AsyncAttribute {
2306		.base = undefined,
2307		.async_token = async_token,
2308		.allocator_type = null,
2309		.rangle_bracket = null,
2310		}
2311		);
2312		stack.append(State {
2313		.AsyncEnd = AsyncEndCtx {
	2249	const async_node = try arena.construct(ast.Node.AsyncAttribute{
	2250	.base = ast.Node{ .id = ast.Node.Id.AsyncAttribute },
	2251	.async_token = async_token,
	2252	.allocator_type = null,
	2253	.rangle_bracket = null,
	2254	});
	2255	stack.append(State{
	2256	.AsyncEnd = AsyncEndCtx{
2314	2257	.ctx = opt_ctx,
2315	2258	.attribute = async_node,
2316		}
	2259	},
2317	2260	}) catch unreachable;
2318		try stack.append(State { .SuffixOpExpressionEnd = opt_ctx.toRequired() });
2319		try stack.append(State { .PrimaryExpression = opt_ctx.toRequired() });
2320		try stack.append(State { .AsyncAllocator = async_node });
	2261	try stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() });
	2262	try stack.append(State{ .PrimaryExpression = opt_ctx.toRequired() });
	2263	try stack.append(State{ .AsyncAllocator = async_node });
2321	2264	continue;
2322	2265	}
2323	2266
2324		stack.append(State { .SuffixOpExpressionEnd = opt_ctx }) catch unreachable;
2325		try stack.append(State { .PrimaryExpression = opt_ctx });
	2267	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx }) catch unreachable;
	2268	try stack.append(State{ .PrimaryExpression = opt_ctx });
2326	2269	continue;
2327	2270	},
2328	2271
...	...	@@ -2334,61 +2277,70 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2334	2277	const token_ptr = token.ptr;
2335	2278	switch (token_ptr.id) {
2336	2279	Token.Id.LParen => {
2337		const node = try createToCtxNode(arena, opt_ctx, ast.Node.SuffixOp,
2338		ast.Node.SuffixOp {
2339		.base = undefined,
2340		.lhs = lhs,
2341		.op = ast.Node.SuffixOp.Op {
2342		.Call = ast.Node.SuffixOp.Op.Call {
2343		.params = ast.Node.SuffixOp.Op.Call.ParamList.init(arena),
2344		.async_attr = null,
2345		}
	2280	const node = try arena.construct(ast.Node.SuffixOp{
	2281	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },
	2282	.lhs = lhs,
	2283	.op = ast.Node.SuffixOp.Op{
	2284	.Call = ast.Node.SuffixOp.Op.Call{
	2285	.params = ast.Node.SuffixOp.Op.Call.ParamList.init(arena),
	2286	.async_attr = null,
2346	2287	},
2347		.rtoken = undefined,
2348		}
2349		);
2350		stack.append(State { .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2351		try stack.append(State {
2352		.ExprListItemOrEnd = ExprListCtx {
	2288	},
	2289	.rtoken = undefined,
	2290	});
	2291	opt_ctx.store(&node.base);
	2292
	2293	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2294	try stack.append(State{
	2295	.ExprListItemOrEnd = ExprListCtx{
2353	2296	.list = &node.op.Call.params,
2354	2297	.end = Token.Id.RParen,
2355	2298	.ptr = &node.rtoken,
2356		}
	2299	},
2357	2300	});
2358	2301	continue;
2359	2302	},
2360	2303	Token.Id.LBracket => {
2361		const node = try createToCtxNode(arena, opt_ctx, ast.Node.SuffixOp,
2362		ast.Node.SuffixOp {
2363		.base = undefined,
2364		.lhs = lhs,
2365		.op = ast.Node.SuffixOp.Op {
2366		.ArrayAccess = undefined,
2367		},
2368		.rtoken = undefined
2369		}
2370		);
2371		stack.append(State { .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2372		try stack.append(State { .SliceOrArrayAccess = node });
2373		try stack.append(State { .Expression = OptionalCtx { .Required = &node.op.ArrayAccess }});
	2304	const node = try arena.construct(ast.Node.SuffixOp{
	2305	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },
	2306	.lhs = lhs,
	2307	.op = ast.Node.SuffixOp.Op{ .ArrayAccess = undefined },
	2308	.rtoken = undefined,
	2309	});
	2310	opt_ctx.store(&node.base);
	2311
	2312	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2313	try stack.append(State{ .SliceOrArrayAccess = node });
	2314	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.op.ArrayAccess } });
2374	2315	continue;
2375	2316	},
2376	2317	Token.Id.Period => {
2377		const node = try createToCtxNode(arena, opt_ctx, ast.Node.InfixOp,
2378		ast.Node.InfixOp {
2379		.base = undefined,
	2318	if (eatToken(&tok_it, &tree, Token.Id.Asterisk)) \|asterisk_token\| {
	2319	const node = try arena.construct(ast.Node.SuffixOp{
	2320	.base = ast.Node{ .id = ast.Node.Id.SuffixOp },
2380	2321	.lhs = lhs,
2381		.op_token = token_index,
2382		.op = ast.Node.InfixOp.Op.Period,
2383		.rhs = undefined,
2384		}
2385		);
2386		stack.append(State { .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
2387		try stack.append(State { .Identifier = OptionalCtx { .Required = &node.rhs } });
	2322	.op = ast.Node.SuffixOp.Op.Deref,
	2323	.rtoken = asterisk_token,
	2324	});
	2325	opt_ctx.store(&node.base);
	2326	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2327	continue;
	2328	}
	2329	const node = try arena.construct(ast.Node.InfixOp{
	2330	.base = ast.Node{ .id = ast.Node.Id.InfixOp },
	2331	.lhs = lhs,
	2332	.op_token = token_index,
	2333	.op = ast.Node.InfixOp.Op.Period,
	2334	.rhs = undefined,
	2335	});
	2336	opt_ctx.store(&node.base);
	2337
	2338	stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
	2339	try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.rhs } });
2388	2340	continue;
2389	2341	},
2390	2342	else => {
2391		putBackToken(&tok_it, &tree);
	2343	prevToken(&tok_it, &tree);
2392	2344	continue;
2393	2345	},
2394	2346	}
...	...	@@ -2434,10 +2386,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2434	2386	continue;
2435	2387	},
2436	2388	Token.Id.Keyword_promise => {
2437		const node = try arena.construct(ast.Node.PromiseType {
2438		.base = ast.Node {
2439		.id = ast.Node.Id.PromiseType,
2440		},
	2389	const node = try arena.construct(ast.Node.PromiseType{
	2390	.base = ast.Node{ .id = ast.Node.Id.PromiseType },
2441	2391	.promise_token = token.index,
2442	2392	.result = null,
2443	2393	});
...	...	@@ -2446,15 +2396,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2446	2396	const next_token_index = next_token.index;
2447	2397	const next_token_ptr = next_token.ptr;
2448	2398	if (next_token_ptr.id != Token.Id.Arrow) {
2449		putBackToken(&tok_it, &tree);
	2399	prevToken(&tok_it, &tree);
2450	2400	continue;
2451	2401	}
2452		node.result = ast.Node.PromiseType.Result {
	2402	node.result = ast.Node.PromiseType.Result{
2453	2403	.arrow_token = next_token_index,
2454	2404	.return_type = undefined,
2455	2405	};
2456	2406	const return_type_ptr = &((??node.result).return_type);
2457		try stack.append(State { .Expression = OptionalCtx { .Required = return_type_ptr, } });
	2407	try stack.append(State{ .Expression = OptionalCtx{ .Required = return_type_ptr } });
2458	2408	continue;
2459	2409	},
2460	2410	Token.Id.StringLiteral, Token.Id.MultilineStringLiteralLine => {
...	...	@@ -2462,76 +2412,75 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2462	2412	continue;
2463	2413	},
2464	2414	Token.Id.LParen => {
2465		const node = try createToCtxNode(arena, opt_ctx, ast.Node.GroupedExpression,
2466		ast.Node.GroupedExpression {
2467		.base = undefined,
2468		.lparen = token.index,
2469		.expr = undefined,
2470		.rparen = undefined,
2471		}
2472		);
2473		stack.append(State {
2474		.ExpectTokenSave = ExpectTokenSave {
	2415	const node = try arena.construct(ast.Node.GroupedExpression{
	2416	.base = ast.Node{ .id = ast.Node.Id.GroupedExpression },
	2417	.lparen = token.index,
	2418	.expr = undefined,
	2419	.rparen = undefined,
	2420	});
	2421	opt_ctx.store(&node.base);
	2422
	2423	stack.append(State{
	2424	.ExpectTokenSave = ExpectTokenSave{
2475	2425	.id = Token.Id.RParen,
2476	2426	.ptr = &node.rparen,
2477		}
	2427	},
2478	2428	}) catch unreachable;
2479		try stack.append(State { .Expression = OptionalCtx { .Required = &node.expr } });
	2429	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
2480	2430	continue;
2481	2431	},
2482	2432	Token.Id.Builtin => {
2483		const node = try createToCtxNode(arena, opt_ctx, ast.Node.BuiltinCall,
2484		ast.Node.BuiltinCall {
2485		.base = undefined,
2486		.builtin_token = token.index,
2487		.params = ast.Node.BuiltinCall.ParamList.init(arena),
2488		.rparen_token = undefined,
2489		}
2490		);
2491		stack.append(State {
2492		.ExprListItemOrEnd = ExprListCtx {
	2433	const node = try arena.construct(ast.Node.BuiltinCall{
	2434	.base = ast.Node{ .id = ast.Node.Id.BuiltinCall },
	2435	.builtin_token = token.index,
	2436	.params = ast.Node.BuiltinCall.ParamList.init(arena),
	2437	.rparen_token = undefined,
	2438	});
	2439	opt_ctx.store(&node.base);
	2440
	2441	stack.append(State{
	2442	.ExprListItemOrEnd = ExprListCtx{
2493	2443	.list = &node.params,
2494	2444	.end = Token.Id.RParen,
2495	2445	.ptr = &node.rparen_token,
2496		}
	2446	},
2497	2447	}) catch unreachable;
2498		try stack.append(State { .ExpectToken = Token.Id.LParen, });
	2448	try stack.append(State{ .ExpectToken = Token.Id.LParen });
2499	2449	continue;
2500	2450	},
2501	2451	Token.Id.LBracket => {
2502		const node = try createToCtxNode(arena, opt_ctx, ast.Node.PrefixOp,
2503		ast.Node.PrefixOp {
2504		.base = undefined,
2505		.op_token = token.index,
2506		.op = undefined,
2507		.rhs = undefined,
2508		}
2509		);
2510		stack.append(State { .SliceOrArrayType = node }) catch unreachable;
	2452	const node = try arena.construct(ast.Node.PrefixOp{
	2453	.base = ast.Node{ .id = ast.Node.Id.PrefixOp },
	2454	.op_token = token.index,
	2455	.op = undefined,
	2456	.rhs = undefined,
	2457	});
	2458	opt_ctx.store(&node.base);
	2459
	2460	stack.append(State{ .SliceOrArrayType = node }) catch unreachable;
2511	2461	continue;
2512	2462	},
2513	2463	Token.Id.Keyword_error => {
2514		stack.append(State {
2515		.ErrorTypeOrSetDecl = ErrorTypeOrSetDeclCtx {
	2464	stack.append(State{
	2465	.ErrorTypeOrSetDecl = ErrorTypeOrSetDeclCtx{
2516	2466	.error_token = token.index,
2517		.opt_ctx = opt_ctx
2518		}
	2467	.opt_ctx = opt_ctx,
	2468	},
2519	2469	}) catch unreachable;
2520	2470	continue;
2521	2471	},
2522	2472	Token.Id.Keyword_packed => {
2523		stack.append(State {
2524		.ContainerKind = ContainerKindCtx {
	2473	stack.append(State{
	2474	.ContainerKind = ContainerKindCtx{
2525	2475	.opt_ctx = opt_ctx,
2526		.ltoken = token.index,
2527		.layout = ast.Node.ContainerDecl.Layout.Packed,
	2476	.layout_token = token.index,
2528	2477	},
2529	2478	}) catch unreachable;
2530	2479	continue;
2531	2480	},
2532	2481	Token.Id.Keyword_extern => {
2533		stack.append(State {
2534		.ExternType = ExternTypeCtx {
	2482	stack.append(State{
	2483	.ExternType = ExternTypeCtx{
2535	2484	.opt_ctx = opt_ctx,
2536	2485	.extern_token = token.index,
2537	2486	.comments = null,
...	...	@@ -2540,30 +2489,27 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2540	2489	continue;
2541	2490	},
2542	2491	Token.Id.Keyword_struct, Token.Id.Keyword_union, Token.Id.Keyword_enum => {
2543		putBackToken(&tok_it, &tree);
2544		stack.append(State {
2545		.ContainerKind = ContainerKindCtx {
	2492	prevToken(&tok_it, &tree);
	2493	stack.append(State{
	2494	.ContainerKind = ContainerKindCtx{
2546	2495	.opt_ctx = opt_ctx,
2547		.ltoken = token.index,
2548		.layout = ast.Node.ContainerDecl.Layout.Auto,
	2496	.layout_token = null,
2549	2497	},
2550	2498	}) catch unreachable;
2551	2499	continue;
2552	2500	},
2553	2501	Token.Id.Identifier => {
2554		stack.append(State {
2555		.MaybeLabeledExpression = MaybeLabeledExpressionCtx {
	2502	stack.append(State{
	2503	.MaybeLabeledExpression = MaybeLabeledExpressionCtx{
2556	2504	.label = token.index,
2557		.opt_ctx = opt_ctx
2558		}
	2505	.opt_ctx = opt_ctx,
	2506	},
2559	2507	}) catch unreachable;
2560	2508	continue;
2561	2509	},
2562	2510	Token.Id.Keyword_fn => {
2563		const fn_proto = try arena.construct(ast.Node.FnProto {
2564		.base = ast.Node {
2565		.id = ast.Node.Id.FnProto,
2566		},
	2511	const fn_proto = try arena.construct(ast.Node.FnProto{
	2512	.base = ast.Node{ .id = ast.Node.Id.FnProto },
2567	2513	.doc_comments = null,
2568	2514	.visib_token = null,
2569	2515	.name_token = null,
...	...	@@ -2579,14 +2525,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2579	2525	.align_expr = null,
2580	2526	});
2581	2527	opt_ctx.store(&fn_proto.base);
2582		stack.append(State { .FnProto = fn_proto }) catch unreachable;
	2528	stack.append(State{ .FnProto = fn_proto }) catch unreachable;
2583	2529	continue;
2584	2530	},
2585	2531	Token.Id.Keyword_nakedcc, Token.Id.Keyword_stdcallcc => {
2586		const fn_proto = try arena.construct(ast.Node.FnProto {
2587		.base = ast.Node {
2588		.id = ast.Node.Id.FnProto,
2589		},
	2532	const fn_proto = try arena.construct(ast.Node.FnProto{
	2533	.base = ast.Node{ .id = ast.Node.Id.FnProto },
2590	2534	.doc_comments = null,
2591	2535	.visib_token = null,
2592	2536	.name_token = null,
...	...	@@ -2602,96 +2546,91 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2602	2546	.align_expr = null,
2603	2547	});
2604	2548	opt_ctx.store(&fn_proto.base);
2605		stack.append(State { .FnProto = fn_proto }) catch unreachable;
2606		try stack.append(State {
2607		.ExpectTokenSave = ExpectTokenSave {
	2549	stack.append(State{ .FnProto = fn_proto }) catch unreachable;
	2550	try stack.append(State{
	2551	.ExpectTokenSave = ExpectTokenSave{
2608	2552	.id = Token.Id.Keyword_fn,
2609		.ptr = &fn_proto.fn_token
2610		}
	2553	.ptr = &fn_proto.fn_token,
	2554	},
2611	2555	});
2612	2556	continue;
2613	2557	},
2614	2558	Token.Id.Keyword_asm => {
2615		const node = try createToCtxNode(arena, opt_ctx, ast.Node.Asm,
2616		ast.Node.Asm {
2617		.base = undefined,
2618		.asm_token = token.index,
2619		.volatile_token = null,
2620		.template = undefined,
2621		.outputs = ast.Node.Asm.OutputList.init(arena),
2622		.inputs = ast.Node.Asm.InputList.init(arena),
2623		.clobbers = ast.Node.Asm.ClobberList.init(arena),
2624		.rparen = undefined,
2625		}
2626		);
2627		stack.append(State {
2628		.ExpectTokenSave = ExpectTokenSave {
	2559	const node = try arena.construct(ast.Node.Asm{
	2560	.base = ast.Node{ .id = ast.Node.Id.Asm },
	2561	.asm_token = token.index,
	2562	.volatile_token = null,
	2563	.template = undefined,
	2564	.outputs = ast.Node.Asm.OutputList.init(arena),
	2565	.inputs = ast.Node.Asm.InputList.init(arena),
	2566	.clobbers = ast.Node.Asm.ClobberList.init(arena),
	2567	.rparen = undefined,
	2568	});
	2569	opt_ctx.store(&node.base);
	2570
	2571	stack.append(State{
	2572	.ExpectTokenSave = ExpectTokenSave{
2629	2573	.id = Token.Id.RParen,
2630	2574	.ptr = &node.rparen,
2631		}
	2575	},
2632	2576	}) catch unreachable;
2633		try stack.append(State { .AsmClobberItems = &node.clobbers });
2634		try stack.append(State { .IfToken = Token.Id.Colon });
2635		try stack.append(State { .AsmInputItems = &node.inputs });
2636		try stack.append(State { .IfToken = Token.Id.Colon });
2637		try stack.append(State { .AsmOutputItems = &node.outputs });
2638		try stack.append(State { .IfToken = Token.Id.Colon });
2639		try stack.append(State { .StringLiteral = OptionalCtx { .Required = &node.template } });
2640		try stack.append(State { .ExpectToken = Token.Id.LParen });
2641		try stack.append(State {
2642		.OptionalTokenSave = OptionalTokenSave {
	2577	try stack.append(State{ .AsmClobberItems = &node.clobbers });
	2578	try stack.append(State{ .IfToken = Token.Id.Colon });
	2579	try stack.append(State{ .AsmInputItems = &node.inputs });
	2580	try stack.append(State{ .IfToken = Token.Id.Colon });
	2581	try stack.append(State{ .AsmOutputItems = &node.outputs });
	2582	try stack.append(State{ .IfToken = Token.Id.Colon });
	2583	try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &node.template } });
	2584	try stack.append(State{ .ExpectToken = Token.Id.LParen });
	2585	try stack.append(State{
	2586	.OptionalTokenSave = OptionalTokenSave{
2643	2587	.id = Token.Id.Keyword_volatile,
2644	2588	.ptr = &node.volatile_token,
2645		}
	2589	},
2646	2590	});
2647	2591	},
2648	2592	Token.Id.Keyword_inline => {
2649		stack.append(State {
2650		.Inline = InlineCtx {
	2593	stack.append(State{
	2594	.Inline = InlineCtx{
2651	2595	.label = null,
2652	2596	.inline_token = token.index,
2653	2597	.opt_ctx = opt_ctx,
2654		}
	2598	},
2655	2599	}) catch unreachable;
2656	2600	continue;
2657	2601	},
2658	2602	else => {
2659	2603	if (!try parseBlockExpr(&stack, arena, opt_ctx, token.ptr, token.index)) {
2660		putBackToken(&tok_it, &tree);
	2604	prevToken(&tok_it, &tree);
2661	2605	if (opt_ctx != OptionalCtx.Optional) {
2662		*(try tree.errors.addOne()) = Error {
2663		.ExpectedPrimaryExpr = Error.ExpectedPrimaryExpr { .token = token.index },
2664		};
	2606	((try tree.errors.addOne())).* = Error{ .ExpectedPrimaryExpr = Error.ExpectedPrimaryExpr{ .token = token.index } };
2665	2607	return tree;
2666	2608	}
2667	2609	}
2668	2610	continue;
2669		}
	2611	},
2670	2612	}
2671	2613	},
2672	2614
2673
2674	2615	State.ErrorTypeOrSetDecl => \|ctx\| {
2675	2616	if (eatToken(&tok_it, &tree, Token.Id.LBrace) == null) {
2676	2617	_ = try createToCtxLiteral(arena, ctx.opt_ctx, ast.Node.ErrorType, ctx.error_token);
2677	2618	continue;
2678	2619	}
2679	2620
2680		const node = try arena.construct(ast.Node.ErrorSetDecl {
2681		.base = ast.Node {
2682		.id = ast.Node.Id.ErrorSetDecl,
2683		},
	2621	const node = try arena.construct(ast.Node.ErrorSetDecl{
	2622	.base = ast.Node{ .id = ast.Node.Id.ErrorSetDecl },
2684	2623	.error_token = ctx.error_token,
2685	2624	.decls = ast.Node.ErrorSetDecl.DeclList.init(arena),
2686	2625	.rbrace_token = undefined,
2687	2626	});
2688	2627	ctx.opt_ctx.store(&node.base);
2689	2628
2690		stack.append(State {
2691		.ErrorTagListItemOrEnd = ListSave(@typeOf(node.decls)) {
	2629	stack.append(State{
	2630	.ErrorTagListItemOrEnd = ListSave(@typeOf(node.decls)){
2692	2631	.list = &node.decls,
2693	2632	.ptr = &node.rbrace_token,
2694		}
	2633	},
2695	2634	}) catch unreachable;
2696	2635	continue;
2697	2636	},
...	...	@@ -2699,19 +2638,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2699	2638	const token = nextToken(&tok_it, &tree);
2700	2639	const token_index = token.index;
2701	2640	const token_ptr = token.ptr;
2702		opt_ctx.store(
2703		(try parseStringLiteral(arena, &tok_it, token_ptr, token_index, &tree)) ?? {
2704		putBackToken(&tok_it, &tree);
2705		if (opt_ctx != OptionalCtx.Optional) {
2706		*(try tree.errors.addOne()) = Error {
2707		.ExpectedPrimaryExpr = Error.ExpectedPrimaryExpr { .token = token_index },
2708		};
2709		return tree;
2710		}
2711
2712		continue;
	2641	opt_ctx.store((try parseStringLiteral(arena, &tok_it, token_ptr, token_index, &tree)) ?? {
	2642	prevToken(&tok_it, &tree);
	2643	if (opt_ctx != OptionalCtx.Optional) {
	2644	((try tree.errors.addOne())).* = Error{ .ExpectedPrimaryExpr = Error.ExpectedPrimaryExpr{ .token = token_index } };
	2645	return tree;
2713	2646	}
2714		);
	2647
	2648	continue;
	2649	});
2715	2650	},
2716	2651
2717	2652	State.Identifier => \|opt_ctx\| {
...	...	@@ -2724,8 +2659,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2724	2659	const token = nextToken(&tok_it, &tree);
2725	2660	const token_index = token.index;
2726	2661	const token_ptr = token.ptr;
2727		*(try tree.errors.addOne()) = Error {
2728		.ExpectedToken = Error.ExpectedToken {
	2662	((try tree.errors.addOne())).* = Error{
	2663	.ExpectedToken = Error.ExpectedToken{
2729	2664	.token = token_index,
2730	2665	.expected_id = Token.Id.Identifier,
2731	2666	},
...	...	@@ -2740,8 +2675,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2740	2675	const ident_token_index = ident_token.index;
2741	2676	const ident_token_ptr = ident_token.ptr;
2742	2677	if (ident_token_ptr.id != Token.Id.Identifier) {
2743		*(try tree.errors.addOne()) = Error {
2744		.ExpectedToken = Error.ExpectedToken {
	2678	((try tree.errors.addOne())).* = Error{
	2679	.ExpectedToken = Error.ExpectedToken{
2745	2680	.token = ident_token_index,
2746	2681	.expected_id = Token.Id.Identifier,
2747	2682	},
...	...	@@ -2749,14 +2684,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2749	2684	return tree;
2750	2685	}
2751	2686
2752		const node = try arena.construct(ast.Node.ErrorTag {
2753		.base = ast.Node {
2754		.id = ast.Node.Id.ErrorTag,
2755		},
	2687	const node = try arena.construct(ast.Node.ErrorTag{
	2688	.base = ast.Node{ .id = ast.Node.Id.ErrorTag },
2756	2689	.doc_comments = comments,
2757	2690	.name_token = ident_token_index,
2758	2691	});
2759		*node_ptr = &node.base;
	2692	node_ptr.* = &node.base;
2760	2693	continue;
2761	2694	},
2762	2695
...	...	@@ -2765,8 +2698,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2765	2698	const token_index = token.index;
2766	2699	const token_ptr = token.ptr;
2767	2700	if (token_ptr.id != token_id) {
2768		*(try tree.errors.addOne()) = Error {
2769		.ExpectedToken = Error.ExpectedToken {
	2701	((try tree.errors.addOne())).* = Error{
	2702	.ExpectedToken = Error.ExpectedToken{
2770	2703	.token = token_index,
2771	2704	.expected_id = token_id,
2772	2705	},
...	...	@@ -2780,15 +2713,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2780	2713	const token_index = token.index;
2781	2714	const token_ptr = token.ptr;
2782	2715	if (token_ptr.id != expect_token_save.id) {
2783		*(try tree.errors.addOne()) = Error {
2784		.ExpectedToken = Error.ExpectedToken {
	2716	((try tree.errors.addOne())).* = Error{
	2717	.ExpectedToken = Error.ExpectedToken{
2785	2718	.token = token_index,
2786	2719	.expected_id = expect_token_save.id,
2787	2720	},
2788	2721	};
2789	2722	return tree;
2790	2723	}
2791		*expect_token_save.ptr = token_index;
	2724	expect_token_save.ptr.* = token_index;
2792	2725	continue;
2793	2726	},
2794	2727	State.IfToken => \|token_id\| {
...	...	@@ -2801,7 +2734,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2801	2734	},
2802	2735	State.IfTokenSave => \|if_token_save\| {
2803	2736	if (eatToken(&tok_it, &tree, if_token_save.id)) \|token_index\| {
2804		*if_token_save.ptr = token_index;
	2737	(if_token_save.ptr).* = token_index;
2805	2738	continue;
2806	2739	}
2807	2740
...	...	@@ -2810,7 +2743,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
2810	2743	},
2811	2744	State.OptionalTokenSave => \|optional_token_save\| {
2812	2745	if (eatToken(&tok_it, &tree, optional_token_save.id)) \|token_index\| {
2813		*optional_token_save.ptr = token_index;
	2746	(optional_token_save.ptr).* = token_index;
2814	2747	continue;
2815	2748	}
2816	2749
...	...	@@ -2857,8 +2790,7 @@ const ExternTypeCtx = struct {
2857	2790
2858	2791	const ContainerKindCtx = struct {
2859	2792	opt_ctx: OptionalCtx,
2860		ltoken: TokenIndex,
2861		layout: ast.Node.ContainerDecl.Layout,
	2793	layout_token: ?TokenIndex,
2862	2794	};
2863	2795
2864	2796	const ExpectTokenSave = struct {
...	...	@@ -2933,28 +2865,28 @@ const OptionalCtx = union(enum) {
2933	2865	Required: &&ast.Node,
2934	2866
2935	2867	pub fn store(self: &const OptionalCtx, value: &ast.Node) void {
2936		switch (*self) {
2937		OptionalCtx.Optional => \|ptr\| *ptr = value,
2938		OptionalCtx.RequiredNull => \|ptr\| *ptr = value,
2939		OptionalCtx.Required => \|ptr\| *ptr = value,
	2868	switch (self.*) {
	2869	OptionalCtx.Optional => \|ptr\| ptr.* = value,
	2870	OptionalCtx.RequiredNull => \|ptr\| ptr.* = value,
	2871	OptionalCtx.Required => \|ptr\| ptr.* = value,
2940	2872	}
2941	2873	}
2942	2874
2943	2875	pub fn get(self: &const OptionalCtx) ?&ast.Node {
2944		switch (*self) {
2945		OptionalCtx.Optional => \|ptr\| return *ptr,
2946		OptionalCtx.RequiredNull => \|ptr\| return ??*ptr,
2947		OptionalCtx.Required => \|ptr\| return *ptr,
	2876	switch (self.*) {
	2877	OptionalCtx.Optional => \|ptr\| return ptr.*,
	2878	OptionalCtx.RequiredNull => \|ptr\| return ??ptr.*,
	2879	OptionalCtx.Required => \|ptr\| return ptr.*,
2948	2880	}
2949	2881	}
2950	2882
2951	2883	pub fn toRequired(self: &const OptionalCtx) OptionalCtx {
2952		switch (*self) {
	2884	switch (self.*) {
2953	2885	OptionalCtx.Optional => \|ptr\| {
2954		return OptionalCtx { .RequiredNull = ptr };
	2886	return OptionalCtx{ .RequiredNull = ptr };
2955	2887	},
2956		OptionalCtx.RequiredNull => \|ptr\| return *self,
2957		OptionalCtx.Required => \|ptr\| return *self,
	2888	OptionalCtx.RequiredNull => \|ptr\| return self.*,
	2889	OptionalCtx.Required => \|ptr\| return self.*,
2958	2890	}
2959	2891	}
2960	2892	};
...	...	@@ -2979,6 +2911,7 @@ const State = union(enum) {
2979	2911	VarDecl: VarDeclCtx,
2980	2912	VarDeclAlign: &ast.Node.VarDecl,
2981	2913	VarDeclEq: &ast.Node.VarDecl,
	2914	VarDeclSemiColon: &ast.Node.VarDecl,
2982	2915
2983	2916	FnDef: &ast.Node.FnProto,
2984	2917	FnProto: &ast.Node.FnProto,
...	...	@@ -3019,9 +2952,9 @@ const State = union(enum) {
3019	2952	ErrorTagListCommaOrEnd: ListSave(ast.Node.ErrorSetDecl.DeclList),
3020	2953	SwitchCaseOrEnd: ListSave(ast.Node.Switch.CaseList),
3021	2954	SwitchCaseCommaOrEnd: ListSave(ast.Node.Switch.CaseList),
3022		SwitchCaseFirstItem: &ast.Node.SwitchCase.ItemList,
3023		SwitchCaseItem: &ast.Node.SwitchCase.ItemList,
3024		SwitchCaseItemCommaOrEnd: &ast.Node.SwitchCase.ItemList,
	2955	SwitchCaseFirstItem: &ast.Node.SwitchCase,
	2956	SwitchCaseItemCommaOrEnd: &ast.Node.SwitchCase,
	2957	SwitchCaseItemOrEnd: &ast.Node.SwitchCase,
3025	2958
3026	2959	SuspendBody: &ast.Node.Suspend,
3027	2960	AsyncAllocator: &ast.Node.AsyncAttribute,
...	...	@@ -3031,6 +2964,7 @@ const State = union(enum) {
3031	2964	SliceOrArrayAccess: &ast.Node.SuffixOp,
3032	2965	SliceOrArrayType: &ast.Node.PrefixOp,
3033	2966	AddrOfModifiers: &ast.Node.PrefixOp.AddrOfInfo,
	2967	AlignBitRange: &ast.Node.PrefixOp.AddrOfInfo.Align,
3034	2968
3035	2969	Payload: OptionalCtx,
3036	2970	PointerPayload: OptionalCtx,
...	...	@@ -3075,7 +3009,6 @@ const State = union(enum) {
3075	3009	Identifier: OptionalCtx,
3076	3010	ErrorTag: &&ast.Node,
3077	3011
3078
3079	3012	IfToken: @TagType(Token.Id),
3080	3013	IfTokenSave: ExpectTokenSave,
3081	3014	ExpectToken: @TagType(Token.Id),
...	...	@@ -3083,25 +3016,27 @@ const State = union(enum) {
3083	3016	OptionalTokenSave: OptionalTokenSave,
3084	3017	};
3085	3018
	3019	fn pushDocComment(arena: &mem.Allocator, line_comment: TokenIndex, result: &?&ast.Node.DocComment) !void {
	3020	const node = blk: {
	3021	if (result.*) \|comment_node\| {
	3022	break :blk comment_node;
	3023	} else {
	3024	const comment_node = try arena.construct(ast.Node.DocComment{
	3025	.base = ast.Node{ .id = ast.Node.Id.DocComment },
	3026	.lines = ast.Node.DocComment.LineList.init(arena),
	3027	});
	3028	result.* = comment_node;
	3029	break :blk comment_node;
	3030	}
	3031	};
	3032	try node.lines.push(line_comment);
	3033	}
	3034
3086	3035	fn eatDocComments(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) !?&ast.Node.DocComment {
3087	3036	var result: ?&ast.Node.DocComment = null;
3088	3037	while (true) {
3089	3038	if (eatToken(tok_it, tree, Token.Id.DocComment)) \|line_comment\| {
3090		const node = blk: {
3091		if (result) \|comment_node\| {
3092		break :blk comment_node;
3093		} else {
3094		const comment_node = try arena.construct(ast.Node.DocComment {
3095		.base = ast.Node {
3096		.id = ast.Node.Id.DocComment,
3097		},
3098		.lines = ast.Node.DocComment.LineList.init(arena),
3099		});
3100		result = comment_node;
3101		break :blk comment_node;
3102		}
3103		};
3104		try node.lines.push(line_comment);
	3039	try pushDocComment(arena, line_comment, &result);
3105	3040	continue;
3106	3041	}
3107	3042	break;
...	...	@@ -3109,26 +3044,14 @@ fn eatDocComments(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator, t
3109	3044	return result;
3110	3045	}
3111	3046
3112		fn eatLineComment(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) !?&ast.Node.LineComment {
3113		const token = eatToken(tok_it, tree, Token.Id.LineComment) ?? return null;
3114		return try arena.construct(ast.Node.LineComment {
3115		.base = ast.Node {
3116		.id = ast.Node.Id.LineComment,
3117		},
3118		.token = token,
3119		});
3120		}
3121
3122		fn parseStringLiteral(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator,
3123		token_ptr: &const Token, token_index: TokenIndex, tree: &ast.Tree) !?&ast.Node
3124		{
	3047	fn parseStringLiteral(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator, token_ptr: &const Token, token_index: TokenIndex, tree: &ast.Tree) !?&ast.Node {
3125	3048	switch (token_ptr.id) {
3126	3049	Token.Id.StringLiteral => {
3127	3050	return &(try createLiteral(arena, ast.Node.StringLiteral, token_index)).base;
3128	3051	},
3129	3052	Token.Id.MultilineStringLiteralLine => {
3130		const node = try arena.construct(ast.Node.MultilineStringLiteral {
3131		.base = ast.Node { .id = ast.Node.Id.MultilineStringLiteral },
	3053	const node = try arena.construct(ast.Node.MultilineStringLiteral{
	3054	.base = ast.Node{ .id = ast.Node.Id.MultilineStringLiteral },
3132	3055	.lines = ast.Node.MultilineStringLiteral.LineList.init(arena),
3133	3056	});
3134	3057	try node.lines.push(token_index);
...	...	@@ -3137,7 +3060,7 @@ fn parseStringLiteral(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterato
3137	3060	const multiline_str_index = multiline_str.index;
3138	3061	const multiline_str_ptr = multiline_str.ptr;
3139	3062	if (multiline_str_ptr.id != Token.Id.MultilineStringLiteralLine) {
3140		putBackToken(tok_it, tree);
	3063	prevToken(tok_it, tree);
3141	3064	break;
3142	3065	}
3143	3066
...	...	@@ -3152,71 +3075,66 @@ fn parseStringLiteral(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterato
3152	3075	}
3153	3076	}
3154	3077
3155		fn parseBlockExpr(stack: &std.ArrayList(State), arena: &mem.Allocator, ctx: &const OptionalCtx,
3156		token_ptr: &const Token, token_index: TokenIndex) !bool {
	3078	fn parseBlockExpr(stack: &std.ArrayList(State), arena: &mem.Allocator, ctx: &const OptionalCtx, token_ptr: &const Token, token_index: TokenIndex) !bool {
3157	3079	switch (token_ptr.id) {
3158	3080	Token.Id.Keyword_suspend => {
3159		const node = try createToCtxNode(arena, ctx, ast.Node.Suspend,
3160		ast.Node.Suspend {
3161		.base = undefined,
3162		.label = null,
3163		.suspend_token = token_index,
3164		.payload = null,
3165		.body = null,
3166		}
3167		);
	3081	const node = try arena.construct(ast.Node.Suspend{
	3082	.base = ast.Node{ .id = ast.Node.Id.Suspend },
	3083	.label = null,
	3084	.suspend_token = token_index,
	3085	.payload = null,
	3086	.body = null,
	3087	});
	3088	ctx.store(&node.base);
3168	3089
3169		stack.append(State { .SuspendBody = node }) catch unreachable;
3170		try stack.append(State { .Payload = OptionalCtx { .Optional = &node.payload } });
	3090	stack.append(State{ .SuspendBody = node }) catch unreachable;
	3091	try stack.append(State{ .Payload = OptionalCtx{ .Optional = &node.payload } });
3171	3092	return true;
3172	3093	},
3173	3094	Token.Id.Keyword_if => {
3174		const node = try createToCtxNode(arena, ctx, ast.Node.If,
3175		ast.Node.If {
3176		.base = undefined,
3177		.if_token = token_index,
3178		.condition = undefined,
3179		.payload = null,
3180		.body = undefined,
3181		.@"else" = null,
3182		}
3183		);
	3095	const node = try arena.construct(ast.Node.If{
	3096	.base = ast.Node{ .id = ast.Node.Id.If },
	3097	.if_token = token_index,
	3098	.condition = undefined,
	3099	.payload = null,
	3100	.body = undefined,
	3101	.@"else" = null,
	3102	});
	3103	ctx.store(&node.base);
3184	3104
3185		stack.append(State { .Else = &node.@"else" }) catch unreachable;
3186		try stack.append(State { .Expression = OptionalCtx { .Required = &node.body } });
3187		try stack.append(State { .PointerPayload = OptionalCtx { .Optional = &node.payload } });
3188		try stack.append(State { .ExpectToken = Token.Id.RParen });
3189		try stack.append(State { .Expression = OptionalCtx { .Required = &node.condition } });
3190		try stack.append(State { .ExpectToken = Token.Id.LParen });
	3105	stack.append(State{ .Else = &node.@"else" }) catch unreachable;
	3106	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.body } });
	3107	try stack.append(State{ .PointerPayload = OptionalCtx{ .Optional = &node.payload } });
	3108	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	3109	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.condition } });
	3110	try stack.append(State{ .ExpectToken = Token.Id.LParen });
3191	3111	return true;
3192	3112	},
3193	3113	Token.Id.Keyword_while => {
3194		stack.append(State {
3195		.While = LoopCtx {
	3114	stack.append(State{
	3115	.While = LoopCtx{
3196	3116	.label = null,
3197	3117	.inline_token = null,
3198	3118	.loop_token = token_index,
3199		.opt_ctx = *ctx,
3200		}
	3119	.opt_ctx = ctx.*,
	3120	},
3201	3121	}) catch unreachable;
3202	3122	return true;
3203	3123	},
3204	3124	Token.Id.Keyword_for => {
3205		stack.append(State {
3206		.For = LoopCtx {
	3125	stack.append(State{
	3126	.For = LoopCtx{
3207	3127	.label = null,
3208	3128	.inline_token = null,
3209	3129	.loop_token = token_index,
3210		.opt_ctx = *ctx,
3211		}
	3130	.opt_ctx = ctx.*,
	3131	},
3212	3132	}) catch unreachable;
3213	3133	return true;
3214	3134	},
3215	3135	Token.Id.Keyword_switch => {
3216		const node = try arena.construct(ast.Node.Switch {
3217		.base = ast.Node {
3218		.id = ast.Node.Id.Switch,
3219		},
	3136	const node = try arena.construct(ast.Node.Switch{
	3137	.base = ast.Node{ .id = ast.Node.Id.Switch },
3220	3138	.switch_token = token_index,
3221	3139	.expr = undefined,
3222	3140	.cases = ast.Node.Switch.CaseList.init(arena),
...	...	@@ -3224,45 +3142,45 @@ fn parseBlockExpr(stack: &std.ArrayList(State), arena: &mem.Allocator, ctx: &con
3224	3142	});
3225	3143	ctx.store(&node.base);
3226	3144
3227		stack.append(State {
3228		.SwitchCaseOrEnd = ListSave(@typeOf(node.cases)) {
	3145	stack.append(State{
	3146	.SwitchCaseOrEnd = ListSave(@typeOf(node.cases)){
3229	3147	.list = &node.cases,
3230	3148	.ptr = &node.rbrace,
3231	3149	},
3232	3150	}) catch unreachable;
3233		try stack.append(State { .ExpectToken = Token.Id.LBrace });
3234		try stack.append(State { .ExpectToken = Token.Id.RParen });
3235		try stack.append(State { .Expression = OptionalCtx { .Required = &node.expr } });
3236		try stack.append(State { .ExpectToken = Token.Id.LParen });
	3151	try stack.append(State{ .ExpectToken = Token.Id.LBrace });
	3152	try stack.append(State{ .ExpectToken = Token.Id.RParen });
	3153	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
	3154	try stack.append(State{ .ExpectToken = Token.Id.LParen });
3237	3155	return true;
3238	3156	},
3239	3157	Token.Id.Keyword_comptime => {
3240		const node = try createToCtxNode(arena, ctx, ast.Node.Comptime,
3241		ast.Node.Comptime {
3242		.base = undefined,
3243		.comptime_token = token_index,
3244		.expr = undefined,
3245		.doc_comments = null,
3246		}
3247		);
3248		try stack.append(State { .Expression = OptionalCtx { .Required = &node.expr } });
	3158	const node = try arena.construct(ast.Node.Comptime{
	3159	.base = ast.Node{ .id = ast.Node.Id.Comptime },
	3160	.comptime_token = token_index,
	3161	.expr = undefined,
	3162	.doc_comments = null,
	3163	});
	3164	ctx.store(&node.base);
	3165
	3166	try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
3249	3167	return true;
3250	3168	},
3251	3169	Token.Id.LBrace => {
3252		const block = try arena.construct(ast.Node.Block {
3253		.base = ast.Node {.id = ast.Node.Id.Block },
	3170	const block = try arena.construct(ast.Node.Block{
	3171	.base = ast.Node{ .id = ast.Node.Id.Block },
3254	3172	.label = null,
3255	3173	.lbrace = token_index,
3256	3174	.statements = ast.Node.Block.StatementList.init(arena),
3257	3175	.rbrace = undefined,
3258	3176	});
3259	3177	ctx.store(&block.base);
3260		stack.append(State { .Block = block }) catch unreachable;
	3178	stack.append(State{ .Block = block }) catch unreachable;
3261	3179	return true;
3262	3180	},
3263	3181	else => {
3264	3182	return false;
3265		}
	3183	},
3266	3184	}
3267	3185	}
3268	3186
...	...	@@ -3276,15 +3194,15 @@ fn expectCommaOrEnd(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree, end:
3276	3194	const token_index = token.index;
3277	3195	const token_ptr = token.ptr;
3278	3196	switch (token_ptr.id) {
3279		Token.Id.Comma => return ExpectCommaOrEndResult { .end_token = null},
	3197	Token.Id.Comma => return ExpectCommaOrEndResult{ .end_token = null },
3280	3198	else => {
3281	3199	if (end == token_ptr.id) {
3282		return ExpectCommaOrEndResult { .end_token = token_index };
	3200	return ExpectCommaOrEndResult{ .end_token = token_index };
3283	3201	}
3284	3202
3285		return ExpectCommaOrEndResult {
3286		.parse_error = Error {
3287		.ExpectedCommaOrEnd = Error.ExpectedCommaOrEnd {
	3203	return ExpectCommaOrEndResult{
	3204	.parse_error = Error{
	3205	.ExpectedCommaOrEnd = Error.ExpectedCommaOrEnd{
3288	3206	.token = token_index,
3289	3207	.end_id = end,
3290	3208	},
...	...	@@ -3297,127 +3215,103 @@ fn expectCommaOrEnd(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree, end:
3297	3215	fn tokenIdToAssignment(id: &const Token.Id) ?ast.Node.InfixOp.Op {
3298	3216	// TODO: We have to cast all cases because of this:
3299	3217	// error: expected type '?InfixOp', found '?@TagType(InfixOp)'
3300		return switch (*id) {
3301		Token.Id.AmpersandEqual => ast.Node.InfixOp.Op { .AssignBitAnd = {} },
3302		Token.Id.AngleBracketAngleBracketLeftEqual => ast.Node.InfixOp.Op { .AssignBitShiftLeft = {} },
3303		Token.Id.AngleBracketAngleBracketRightEqual => ast.Node.InfixOp.Op { .AssignBitShiftRight = {} },
3304		Token.Id.AsteriskEqual => ast.Node.InfixOp.Op { .AssignTimes = {} },
3305		Token.Id.AsteriskPercentEqual => ast.Node.InfixOp.Op { .AssignTimesWarp = {} },
3306		Token.Id.CaretEqual => ast.Node.InfixOp.Op { .AssignBitXor = {} },
3307		Token.Id.Equal => ast.Node.InfixOp.Op { .Assign = {} },
3308		Token.Id.MinusEqual => ast.Node.InfixOp.Op { .AssignMinus = {} },
3309		Token.Id.MinusPercentEqual => ast.Node.InfixOp.Op { .AssignMinusWrap = {} },
3310		Token.Id.PercentEqual => ast.Node.InfixOp.Op { .AssignMod = {} },
3311		Token.Id.PipeEqual => ast.Node.InfixOp.Op { .AssignBitOr = {} },
3312		Token.Id.PlusEqual => ast.Node.InfixOp.Op { .AssignPlus = {} },
3313		Token.Id.PlusPercentEqual => ast.Node.InfixOp.Op { .AssignPlusWrap = {} },
3314		Token.Id.SlashEqual => ast.Node.InfixOp.Op { .AssignDiv = {} },
	3218	return switch (id.*) {
	3219	Token.Id.AmpersandEqual => ast.Node.InfixOp.Op{ .AssignBitAnd = {} },
	3220	Token.Id.AngleBracketAngleBracketLeftEqual => ast.Node.InfixOp.Op{ .AssignBitShiftLeft = {} },
	3221	Token.Id.AngleBracketAngleBracketRightEqual => ast.Node.InfixOp.Op{ .AssignBitShiftRight = {} },
	3222	Token.Id.AsteriskEqual => ast.Node.InfixOp.Op{ .AssignTimes = {} },
	3223	Token.Id.AsteriskPercentEqual => ast.Node.InfixOp.Op{ .AssignTimesWarp = {} },
	3224	Token.Id.CaretEqual => ast.Node.InfixOp.Op{ .AssignBitXor = {} },
	3225	Token.Id.Equal => ast.Node.InfixOp.Op{ .Assign = {} },
	3226	Token.Id.MinusEqual => ast.Node.InfixOp.Op{ .AssignMinus = {} },
	3227	Token.Id.MinusPercentEqual => ast.Node.InfixOp.Op{ .AssignMinusWrap = {} },
	3228	Token.Id.PercentEqual => ast.Node.InfixOp.Op{ .AssignMod = {} },
	3229	Token.Id.PipeEqual => ast.Node.InfixOp.Op{ .AssignBitOr = {} },
	3230	Token.Id.PlusEqual => ast.Node.InfixOp.Op{ .AssignPlus = {} },
	3231	Token.Id.PlusPercentEqual => ast.Node.InfixOp.Op{ .AssignPlusWrap = {} },
	3232	Token.Id.SlashEqual => ast.Node.InfixOp.Op{ .AssignDiv = {} },
3315	3233	else => null,
3316	3234	};
3317	3235	}
3318	3236
3319	3237	fn tokenIdToUnwrapExpr(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {
3320	3238	return switch (id) {
3321		Token.Id.Keyword_catch => ast.Node.InfixOp.Op { .Catch = null },
3322		Token.Id.QuestionMarkQuestionMark => ast.Node.InfixOp.Op { .UnwrapMaybe = void{} },
	3239	Token.Id.Keyword_catch => ast.Node.InfixOp.Op{ .Catch = null },
	3240	Token.Id.QuestionMarkQuestionMark => ast.Node.InfixOp.Op{ .UnwrapMaybe = void{} },
3323	3241	else => null,
3324	3242	};
3325	3243	}
3326	3244
3327	3245	fn tokenIdToComparison(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {
3328	3246	return switch (id) {
3329		Token.Id.BangEqual => ast.Node.InfixOp.Op { .BangEqual = void{} },
3330		Token.Id.EqualEqual => ast.Node.InfixOp.Op { .EqualEqual = void{} },
3331		Token.Id.AngleBracketLeft => ast.Node.InfixOp.Op { .LessThan = void{} },
3332		Token.Id.AngleBracketLeftEqual => ast.Node.InfixOp.Op { .LessOrEqual = void{} },
3333		Token.Id.AngleBracketRight => ast.Node.InfixOp.Op { .GreaterThan = void{} },
3334		Token.Id.AngleBracketRightEqual => ast.Node.InfixOp.Op { .GreaterOrEqual = void{} },
	3247	Token.Id.BangEqual => ast.Node.InfixOp.Op{ .BangEqual = void{} },
	3248	Token.Id.EqualEqual => ast.Node.InfixOp.Op{ .EqualEqual = void{} },
	3249	Token.Id.AngleBracketLeft => ast.Node.InfixOp.Op{ .LessThan = void{} },
	3250	Token.Id.AngleBracketLeftEqual => ast.Node.InfixOp.Op{ .LessOrEqual = void{} },
	3251	Token.Id.AngleBracketRight => ast.Node.InfixOp.Op{ .GreaterThan = void{} },
	3252	Token.Id.AngleBracketRightEqual => ast.Node.InfixOp.Op{ .GreaterOrEqual = void{} },
3335	3253	else => null,
3336	3254	};
3337	3255	}
3338	3256
3339	3257	fn tokenIdToBitShift(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {
3340	3258	return switch (id) {
3341		Token.Id.AngleBracketAngleBracketLeft => ast.Node.InfixOp.Op { .BitShiftLeft = void{} },
3342		Token.Id.AngleBracketAngleBracketRight => ast.Node.InfixOp.Op { .BitShiftRight = void{} },
	3259	Token.Id.AngleBracketAngleBracketLeft => ast.Node.InfixOp.Op{ .BitShiftLeft = void{} },
	3260	Token.Id.AngleBracketAngleBracketRight => ast.Node.InfixOp.Op{ .BitShiftRight = void{} },
3343	3261	else => null,
3344	3262	};
3345	3263	}
3346	3264
3347	3265	fn tokenIdToAddition(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {
3348	3266	return switch (id) {
3349		Token.Id.Minus => ast.Node.InfixOp.Op { .Sub = void{} },
3350		Token.Id.MinusPercent => ast.Node.InfixOp.Op { .SubWrap = void{} },
3351		Token.Id.Plus => ast.Node.InfixOp.Op { .Add = void{} },
3352		Token.Id.PlusPercent => ast.Node.InfixOp.Op { .AddWrap = void{} },
3353		Token.Id.PlusPlus => ast.Node.InfixOp.Op { .ArrayCat = void{} },
	3267	Token.Id.Minus => ast.Node.InfixOp.Op{ .Sub = void{} },
	3268	Token.Id.MinusPercent => ast.Node.InfixOp.Op{ .SubWrap = void{} },
	3269	Token.Id.Plus => ast.Node.InfixOp.Op{ .Add = void{} },
	3270	Token.Id.PlusPercent => ast.Node.InfixOp.Op{ .AddWrap = void{} },
	3271	Token.Id.PlusPlus => ast.Node.InfixOp.Op{ .ArrayCat = void{} },
3354	3272	else => null,
3355	3273	};
3356	3274	}
3357	3275
3358	3276	fn tokenIdToMultiply(id: @TagType(Token.Id)) ?ast.Node.InfixOp.Op {
3359	3277	return switch (id) {
3360		Token.Id.Slash => ast.Node.InfixOp.Op { .Div = void{} },
3361		Token.Id.Asterisk => ast.Node.InfixOp.Op { .Mult = void{} },
3362		Token.Id.AsteriskAsterisk => ast.Node.InfixOp.Op { .ArrayMult = void{} },
3363		Token.Id.AsteriskPercent => ast.Node.InfixOp.Op { .MultWrap = void{} },
3364		Token.Id.Percent => ast.Node.InfixOp.Op { .Mod = void{} },
3365		Token.Id.PipePipe => ast.Node.InfixOp.Op { .MergeErrorSets = void{} },
	3278	Token.Id.Slash => ast.Node.InfixOp.Op{ .Div = void{} },
	3279	Token.Id.Asterisk => ast.Node.InfixOp.Op{ .Mult = void{} },
	3280	Token.Id.AsteriskAsterisk => ast.Node.InfixOp.Op{ .ArrayMult = void{} },
	3281	Token.Id.AsteriskPercent => ast.Node.InfixOp.Op{ .MultWrap = void{} },
	3282	Token.Id.Percent => ast.Node.InfixOp.Op{ .Mod = void{} },
	3283	Token.Id.PipePipe => ast.Node.InfixOp.Op{ .MergeErrorSets = void{} },
3366	3284	else => null,
3367	3285	};
3368	3286	}
3369	3287
3370	3288	fn tokenIdToPrefixOp(id: @TagType(Token.Id)) ?ast.Node.PrefixOp.Op {
3371	3289	return switch (id) {
3372		Token.Id.Bang => ast.Node.PrefixOp.Op { .BoolNot = void{} },
3373		Token.Id.Tilde => ast.Node.PrefixOp.Op { .BitNot = void{} },
3374		Token.Id.Minus => ast.Node.PrefixOp.Op { .Negation = void{} },
3375		Token.Id.MinusPercent => ast.Node.PrefixOp.Op { .NegationWrap = void{} },
3376		Token.Id.Asterisk, Token.Id.AsteriskAsterisk => ast.Node.PrefixOp.Op { .Deref = void{} },
3377		Token.Id.Ampersand => ast.Node.PrefixOp.Op {
3378		.AddrOf = ast.Node.PrefixOp.AddrOfInfo {
3379		.align_expr = null,
3380		.bit_offset_start_token = null,
3381		.bit_offset_end_token = null,
	3290	Token.Id.Bang => ast.Node.PrefixOp.Op{ .BoolNot = void{} },
	3291	Token.Id.Tilde => ast.Node.PrefixOp.Op{ .BitNot = void{} },
	3292	Token.Id.Minus => ast.Node.PrefixOp.Op{ .Negation = void{} },
	3293	Token.Id.MinusPercent => ast.Node.PrefixOp.Op{ .NegationWrap = void{} },
	3294	Token.Id.Asterisk, Token.Id.AsteriskAsterisk => ast.Node.PrefixOp.Op{ .PointerType = void{} },
	3295	Token.Id.Ampersand => ast.Node.PrefixOp.Op{
	3296	.AddrOf = ast.Node.PrefixOp.AddrOfInfo{
	3297	.align_info = null,
3382	3298	.const_token = null,
3383	3299	.volatile_token = null,
3384	3300	},
3385	3301	},
3386		Token.Id.QuestionMark => ast.Node.PrefixOp.Op { .MaybeType = void{} },
3387		Token.Id.QuestionMarkQuestionMark => ast.Node.PrefixOp.Op { .UnwrapMaybe = void{} },
3388		Token.Id.Keyword_await => ast.Node.PrefixOp.Op { .Await = void{} },
3389		Token.Id.Keyword_try => ast.Node.PrefixOp.Op { .Try = void{ } },
	3302	Token.Id.QuestionMark => ast.Node.PrefixOp.Op{ .MaybeType = void{} },
	3303	Token.Id.QuestionMarkQuestionMark => ast.Node.PrefixOp.Op{ .UnwrapMaybe = void{} },
	3304	Token.Id.Keyword_await => ast.Node.PrefixOp.Op{ .Await = void{} },
	3305	Token.Id.Keyword_try => ast.Node.PrefixOp.Op{ .Try = void{} },
3390	3306	else => null,
3391	3307	};
3392	3308	}
3393	3309
3394		fn createNode(arena: &mem.Allocator, comptime T: type, init_to: &const T) !&T {
3395		const node = try arena.create(T);
3396		node = init_to;
3397		node.base = blk: {
3398		const id = ast.Node.typeToId(T);
3399		break :blk ast.Node {
3400		.id = id,
3401		};
3402		};
3403
3404		return node;
3405		}
3406
3407		fn createToCtxNode(arena: &mem.Allocator, opt_ctx: &const OptionalCtx, comptime T: type, init_to: &const T) !&T {
3408		const node = try createNode(arena, T, init_to);
3409		opt_ctx.store(&node.base);
3410
3411		return node;
3412		}
3413
3414	3310	fn createLiteral(arena: &mem.Allocator, comptime T: type, token_index: TokenIndex) !&T {
3415		return createNode(arena, T,
3416		T {
3417		.base = undefined,
3418		.token = token_index,
3419		}
3420		);
	3311	return arena.construct(T{
	3312	.base = ast.Node{ .id = ast.Node.typeToId(T) },
	3313	.token = token_index,
	3314	});
3421	3315	}
3422	3316
3423	3317	fn createToCtxLiteral(arena: &mem.Allocator, opt_ctx: &const OptionalCtx, comptime T: type, token_index: TokenIndex) !&T {
...	...	@@ -3428,73 +3322,34 @@ fn createToCtxLiteral(arena: &mem.Allocator, opt_ctx: &const OptionalCtx, compti
3428	3322	}
3429	3323
3430	3324	fn eatToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree, id: @TagType(Token.Id)) ?TokenIndex {
3431		const token = nextToken(tok_it, tree);
	3325	const token = ??tok_it.peek();
3432	3326
3433		if (token.ptr.id == id)
3434		return token.index;
	3327	if (token.id == id) {
	3328	return nextToken(tok_it, tree).index;
	3329	}
3435	3330
3436		putBackToken(tok_it, tree);
3437	3331	return null;
3438	3332	}
3439	3333
3440	3334	fn nextToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) AnnotatedToken {
3441		const result = AnnotatedToken {
	3335	const result = AnnotatedToken{
3442	3336	.index = tok_it.index,
3443	3337	.ptr = ??tok_it.next(),
3444	3338	};
3445		// possibly skip a following same line token
3446		const token = tok_it.next() ?? return result;
3447		if (token.id != Token.Id.LineComment) {
3448		putBackToken(tok_it, tree);
3449		return result;
3450		}
3451		const loc = tree.tokenLocationPtr(result.ptr.end, token);
3452		if (loc.line != 0) {
3453		putBackToken(tok_it, tree);
3454		}
3455		return result;
3456		}
	3339	assert(result.ptr.id != Token.Id.LineComment);
3457	3340
3458		fn putBackToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) void {
3459		const prev_tok = ??tok_it.prev();
3460		if (prev_tok.id == Token.Id.LineComment) {
3461		const minus2_tok = tok_it.prev() ?? return;
3462		const loc = tree.tokenLocationPtr(minus2_tok.end, prev_tok);
3463		if (loc.line != 0) {
3464		_ = tok_it.next();
3465		}
	3341	while (true) {
	3342	const next_tok = tok_it.peek() ?? return result;
	3343	if (next_tok.id != Token.Id.LineComment) return result;
	3344	_ = tok_it.next();
3466	3345	}
3467	3346	}
3468	3347
3469		const RenderAstFrame = struct {
3470		node: &ast.Node,
3471		indent: usize,
3472		};
3473
3474		pub fn renderAst(allocator: &mem.Allocator, tree: &const ast.Tree, stream: var) !void {
3475		var stack = std.ArrayList(State).init(allocator);
3476		defer stack.deinit();
3477
3478		try stack.append(RenderAstFrame {
3479		.node = &root_node.base,
3480		.indent = 0,
3481		});
3482
3483		while (stack.popOrNull()) \|frame\| {
3484		{
3485		var i: usize = 0;
3486		while (i < frame.indent) : (i += 1) {
3487		try stream.print(" ");
3488		}
3489		}
3490		try stream.print("{}\n", @tagName(frame.node.id));
3491		var child_i: usize = 0;
3492		while (frame.node.iterate(child_i)) \|child\| : (child_i += 1) {
3493		try stack.append(RenderAstFrame {
3494		.node = child,
3495		.indent = frame.indent + 2,
3496		});
3497		}
	3348	fn prevToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) void {
	3349	while (true) {
	3350	const prev_tok = tok_it.prev() ?? return;
	3351	if (prev_tok.id == Token.Id.LineComment) continue;
	3352	return;
3498	3353	}
3499	3354	}
3500	3355

std/zig/parser_test.zig+720-20

...	...	@@ -1,3 +1,701 @@
	1	test "zig fmt: async call in if condition" {
	2	try testCanonical(
	3	\\comptime {
	4	\\ if (async<a> b()) {
	5	\\ a();
	6	\\ }
	7	\\}
	8	\\
	9	);
	10	}
	11
	12	test "zig fmt: 2nd arg multiline string" {
	13	try testCanonical(
	14	\\comptime {
	15	\\ cases.addAsm("hello world linux x86_64",
	16	\\ \\.text
	17	\\ , "Hello, world!\n");
	18	\\}
	19	\\
	20	);
	21	}
	22
	23	test "zig fmt: if condition wraps" {
	24	try testTransform(
	25	\\comptime {
	26	\\ if (cond and
	27	\\ cond) {
	28	\\ return x;
	29	\\ }
	30	\\ while (cond and
	31	\\ cond) {
	32	\\ return x;
	33	\\ }
	34	\\ if (a == b and
	35	\\ c) {
	36	\\ a = b;
	37	\\ }
	38	\\ while (a == b and
	39	\\ c) {
	40	\\ a = b;
	41	\\ }
	42	\\ if ((cond and
	43	\\ cond)) {
	44	\\ return x;
	45	\\ }
	46	\\ while ((cond and
	47	\\ cond)) {
	48	\\ return x;
	49	\\ }
	50	\\ var a = if (a) \|*f\| x: {
	51	\\ break :x &a.b;
	52	\\ } else \|err\| err;
	53	\\}
	54	,
	55	\\comptime {
	56	\\ if (cond and
	57	\\ cond)
	58	\\ {
	59	\\ return x;
	60	\\ }
	61	\\ while (cond and
	62	\\ cond)
	63	\\ {
	64	\\ return x;
	65	\\ }
	66	\\ if (a == b and
	67	\\ c)
	68	\\ {
	69	\\ a = b;
	70	\\ }
	71	\\ while (a == b and
	72	\\ c)
	73	\\ {
	74	\\ a = b;
	75	\\ }
	76	\\ if ((cond and
	77	\\ cond))
	78	\\ {
	79	\\ return x;
	80	\\ }
	81	\\ while ((cond and
	82	\\ cond))
	83	\\ {
	84	\\ return x;
	85	\\ }
	86	\\ var a = if (a) \|*f\| x: {
	87	\\ break :x &a.b;
	88	\\ } else \|err\| err;
	89	\\}
	90	\\
	91	);
	92	}
	93
	94	test "zig fmt: if condition has line break but must not wrap" {
	95	try testCanonical(
	96	\\comptime {
	97	\\ if (self.user_input_options.put(name, UserInputOption{
	98	\\ .name = name,
	99	\\ .used = false,
	100	\\ }) catch unreachable) \|*prev_value\| {
	101	\\ foo();
	102	\\ bar();
	103	\\ }
	104	\\ if (put(
	105	\\ a,
	106	\\ b,
	107	\\ )) {
	108	\\ foo();
	109	\\ }
	110	\\}
	111	\\
	112	);
	113	}
	114
	115	test "zig fmt: same-line doc comment on variable declaration" {
	116	try testTransform(
	117	\\pub const MAP_ANONYMOUS = 0x1000; /// allocated from memory, swap space
	118	\\pub const MAP_FILE = 0x0000; /// map from file (default)
	119	\\
	120	\\pub const EMEDIUMTYPE = 124; /// Wrong medium type
	121	\\
	122	\\// nameserver query return codes
	123	\\pub const ENSROK = 0; /// DNS server returned answer with no data
	124	,
	125	\\/// allocated from memory, swap space
	126	\\pub const MAP_ANONYMOUS = 0x1000;
	127	\\/// map from file (default)
	128	\\pub const MAP_FILE = 0x0000;
	129	\\
	130	\\/// Wrong medium type
	131	\\pub const EMEDIUMTYPE = 124;
	132	\\
	133	\\// nameserver query return codes
	134	\\/// DNS server returned answer with no data
	135	\\pub const ENSROK = 0;
	136	\\
	137	);
	138	}
	139
	140	test "zig fmt: if-else with comment before else" {
	141	try testCanonical(
	142	\\comptime {
	143	\\ // cexp(finite\|nan +- i inf\|nan) = nan + i nan
	144	\\ if ((hx & 0x7fffffff) != 0x7f800000) {
	145	\\ return Complex(f32).new(y - y, y - y);
	146	\\ } // cexp(-inf +- i inf\|nan) = 0 + i0
	147	\\ else if (hx & 0x80000000 != 0) {
	148	\\ return Complex(f32).new(0, 0);
	149	\\ } // cexp(+inf +- i inf\|nan) = inf + i nan
	150	\\ else {
	151	\\ return Complex(f32).new(x, y - y);
	152	\\ }
	153	\\}
	154	\\
	155	);
	156	}
	157
	158	test "zig fmt: respect line breaks in if-else" {
	159	try testCanonical(
	160	\\comptime {
	161	\\ return if (cond) a else b;
	162	\\ return if (cond)
	163	\\ a
	164	\\ else
	165	\\ b;
	166	\\ return if (cond)
	167	\\ a
	168	\\ else if (cond)
	169	\\ b
	170	\\ else
	171	\\ c;
	172	\\}
	173	\\
	174	);
	175	}
	176
	177	test "zig fmt: respect line breaks after infix operators" {
	178	try testCanonical(
	179	\\comptime {
	180	\\ self.crc =
	181	\\ lookup_tables[0][p[7]] ^
	182	\\ lookup_tables[1][p[6]] ^
	183	\\ lookup_tables[2][p[5]] ^
	184	\\ lookup_tables[3][p[4]] ^
	185	\\ lookup_tables[4][@truncate(u8, self.crc >> 24)] ^
	186	\\ lookup_tables[5][@truncate(u8, self.crc >> 16)] ^
	187	\\ lookup_tables[6][@truncate(u8, self.crc >> 8)] ^
	188	\\ lookup_tables[7][@truncate(u8, self.crc >> 0)];
	189	\\}
	190	\\
	191	);
	192	}
	193
	194	test "zig fmt: fn decl with trailing comma" {
	195	try testTransform(
	196	\\fn foo(a: i32, b: i32,) void {}
	197	,
	198	\\fn foo(
	199	\\ a: i32,
	200	\\ b: i32,
	201	\\) void {}
	202	\\
	203	);
	204	}
	205
	206	test "zig fmt: enum decl with no trailing comma" {
	207	try testTransform(
	208	\\const StrLitKind = enum {Normal, C};
	209	,
	210	\\const StrLitKind = enum {
	211	\\ Normal,
	212	\\ C,
	213	\\};
	214	\\
	215	);
	216	}
	217
	218	test "zig fmt: switch comment before prong" {
	219	try testCanonical(
	220	\\comptime {
	221	\\ switch (a) {
	222	\\ // hi
	223	\\ 0 => {},
	224	\\ }
	225	\\}
	226	\\
	227	);
	228	}
	229
	230	test "zig fmt: struct literal no trailing comma" {
	231	try testTransform(
	232	\\const a = foo{ .x = 1, .y = 2 };
	233	\\const a = foo{ .x = 1,
	234	\\ .y = 2 };
	235	,
	236	\\const a = foo{ .x = 1, .y = 2 };
	237	\\const a = foo{
	238	\\ .x = 1,
	239	\\ .y = 2,
	240	\\};
	241	\\
	242	);
	243	}
	244
	245	test "zig fmt: array literal with hint" {
	246	try testTransform(
	247	\\const a = []u8{
	248	\\ 1, 2, //
	249	\\ 3,
	250	\\ 4,
	251	\\ 5,
	252	\\ 6,
	253	\\ 7 };
	254	\\const a = []u8{
	255	\\ 1, 2, //
	256	\\ 3,
	257	\\ 4,
	258	\\ 5,
	259	\\ 6,
	260	\\ 7, 8 };
	261	\\const a = []u8{
	262	\\ 1, 2, //
	263	\\ 3,
	264	\\ 4,
	265	\\ 5,
	266	\\ 6, // blah
	267	\\ 7, 8 };
	268	\\const a = []u8{
	269	\\ 1, 2, //
	270	\\ 3, //
	271	\\ 4,
	272	\\ 5,
	273	\\ 6,
	274	\\ 7 };
	275	\\const a = []u8{
	276	\\ 1,
	277	\\ 2,
	278	\\ 3, 4, //
	279	\\ 5, 6, //
	280	\\ 7, 8, //
	281	\\};
	282	,
	283	\\const a = []u8{
	284	\\ 1, 2,
	285	\\ 3, 4,
	286	\\ 5, 6,
	287	\\ 7,
	288	\\};
	289	\\const a = []u8{
	290	\\ 1, 2,
	291	\\ 3, 4,
	292	\\ 5, 6,
	293	\\ 7, 8,
	294	\\};
	295	\\const a = []u8{
	296	\\ 1, 2,
	297	\\ 3, 4,
	298	\\ 5, 6, // blah
	299	\\ 7, 8,
	300	\\};
	301	\\const a = []u8{
	302	\\ 1, 2,
	303	\\ 3, //
	304	\\ 4,
	305	\\ 5, 6,
	306	\\ 7,
	307	\\};
	308	\\const a = []u8{
	309	\\ 1,
	310	\\ 2,
	311	\\ 3,
	312	\\ 4,
	313	\\ 5,
	314	\\ 6,
	315	\\ 7,
	316	\\ 8,
	317	\\};
	318	\\
	319	);
	320	}
	321
	322	test "zig fmt: multiline string with backslash at end of line" {
	323	try testCanonical(
	324	\\comptime {
	325	\\ err(
	326	\\ \\\
	327	\\ );
	328	\\}
	329	\\
	330	);
	331	}
	332
	333	test "zig fmt: multiline string parameter in fn call with trailing comma" {
	334	try testCanonical(
	335	\\fn foo() void {
	336	\\ try stdout.print(
	337	\\ \\ZIG_CMAKE_BINARY_DIR {}
	338	\\ \\ZIG_C_HEADER_FILES {}
	339	\\ \\ZIG_DIA_GUIDS_LIB {}
	340	\\ \\
	341	\\ ,
	342	\\ std.cstr.toSliceConst(c.ZIG_CMAKE_BINARY_DIR),
	343	\\ std.cstr.toSliceConst(c.ZIG_CXX_COMPILER),
	344	\\ std.cstr.toSliceConst(c.ZIG_DIA_GUIDS_LIB),
	345	\\ );
	346	\\}
	347	\\
	348	);
	349	}
	350
	351	test "zig fmt: trailing comma on fn call" {
	352	try testCanonical(
	353	\\comptime {
	354	\\ var module = try Module.create(
	355	\\ allocator,
	356	\\ zig_lib_dir,
	357	\\ full_cache_dir,
	358	\\ );
	359	\\}
	360	\\
	361	);
	362	}
	363
	364	test "zig fmt: empty block with only comment" {
	365	try testCanonical(
	366	\\comptime {
	367	\\ {
	368	\\ // comment
	369	\\ }
	370	\\}
	371	\\
	372	);
	373	}
	374
	375	test "zig fmt: no trailing comma on struct decl" {
	376	try testTransform(
	377	\\const RoundParam = struct {
	378	\\ k: usize, s: u32, t: u32
	379	\\};
	380	,
	381	\\const RoundParam = struct {
	382	\\ k: usize,
	383	\\ s: u32,
	384	\\ t: u32,
	385	\\};
	386	\\
	387	);
	388	}
	389
	390	test "zig fmt: simple asm" {
	391	try testTransform(
	392	\\comptime {
	393	\\ asm volatile (
	394	\\ \\.globl aoeu;
	395	\\ \\.type aoeu, @function;
	396	\\ \\.set aoeu, derp;
	397	\\ );
	398	\\
	399	\\ asm ("not real assembly"
	400	\\ :[a] "x" (x),);
	401	\\ asm ("not real assembly"
	402	\\ :[a] "x" (->i32),:[a] "x" (1),);
	403	\\ asm ("still not real assembly"
	404	\\ :::"a","b",);
	405	\\}
	406	,
	407	\\comptime {
	408	\\ asm volatile (
	409	\\ \\.globl aoeu;
	410	\\ \\.type aoeu, @function;
	411	\\ \\.set aoeu, derp;
	412	\\ );
	413	\\
	414	\\ asm ("not real assembly"
	415	\\ : [a] "x" (x)
	416	\\ );
	417	\\ asm ("not real assembly"
	418	\\ : [a] "x" (-> i32)
	419	\\ : [a] "x" (1)
	420	\\ );
	421	\\ asm ("still not real assembly"
	422	\\ :
	423	\\ :
	424	\\ : "a", "b"
	425	\\ );
	426	\\}
	427	\\
	428	);
	429	}
	430
	431	test "zig fmt: nested struct literal with one item" {
	432	try testCanonical(
	433	\\const a = foo{
	434	\\ .item = bar{ .a = b },
	435	\\};
	436	\\
	437	);
	438	}
	439
	440	test "zig fmt: switch cases trailing comma" {
	441	try testTransform(
	442	\\fn switch_cases(x: i32) void {
	443	\\ switch (x) {
	444	\\ 1,2,3 => {},
	445	\\ 4,5, => {},
	446	\\ 6... 8, => {},
	447	\\ else => {},
	448	\\ }
	449	\\}
	450	,
	451	\\fn switch_cases(x: i32) void {
	452	\\ switch (x) {
	453	\\ 1, 2, 3 => {},
	454	\\ 4,
	455	\\ 5,
	456	\\ => {},
	457	\\ 6...8 => {},
	458	\\ else => {},
	459	\\ }
	460	\\}
	461	\\
	462	);
	463	}
	464
	465	test "zig fmt: slice align" {
	466	try testCanonical(
	467	\\const A = struct {
	468	\\ items: []align(A) T,
	469	\\};
	470	\\
	471	);
	472	}
	473
	474	test "zig fmt: add trailing comma to array literal" {
	475	try testTransform(
	476	\\comptime {
	477	\\ return []u16{'m', 's', 'y', 's', '-' // hi
	478	\\ };
	479	\\ return []u16{'m', 's', 'y', 's',
	480	\\ '-'};
	481	\\ return []u16{'m', 's', 'y', 's', '-'};
	482	\\}
	483	,
	484	\\comptime {
	485	\\ return []u16{
	486	\\ 'm', 's', 'y', 's', '-', // hi
	487	\\ };
	488	\\ return []u16{
	489	\\ 'm', 's', 'y', 's',
	490	\\ '-',
	491	\\ };
	492	\\ return []u16{ 'm', 's', 'y', 's', '-' };
	493	\\}
	494	\\
	495	);
	496	}
	497
	498	test "zig fmt: first thing in file is line comment" {
	499	try testCanonical(
	500	\\// Introspection and determination of system libraries needed by zig.
	501	\\
	502	\\// Introspection and determination of system libraries needed by zig.
	503	\\
	504	\\const std = @import("std");
	505	\\
	506	);
	507	}
	508
	509	test "zig fmt: line comment after doc comment" {
	510	try testCanonical(
	511	\\/// doc comment
	512	\\// line comment
	513	\\fn foo() void {}
	514	\\
	515	);
	516	}
	517
	518	test "zig fmt: float literal with exponent" {
	519	try testCanonical(
	520	\\test "bit field alignment" {
	521	\\ assert(@typeOf(&blah.b) == &align(1:3:6) const u3);
	522	\\}
	523	\\
	524	);
	525	}
	526
	527	test "zig fmt: float literal with exponent" {
	528	try testCanonical(
	529	\\test "aoeu" {
	530	\\ switch (state) {
	531	\\ TermState.Start => switch (c) {
	532	\\ '\x1b' => state = TermState.Escape,
	533	\\ else => try out.writeByte(c),
	534	\\ },
	535	\\ }
	536	\\}
	537	\\
	538	);
	539	}
	540	test "zig fmt: float literal with exponent" {
	541	try testCanonical(
	542	\\pub const f64_true_min = 4.94065645841246544177e-324;
	543	\\const threshold = 0x1.a827999fcef32p+1022;
	544	\\
	545	);
	546	}
	547
	548	test "zig fmt: if-else end of comptime" {
	549	try testCanonical(
	550	\\comptime {
	551	\\ if (a) {
	552	\\ b();
	553	\\ } else {
	554	\\ b();
	555	\\ }
	556	\\}
	557	\\
	558	);
	559	}
	560
	561	test "zig fmt: nested blocks" {
	562	try testCanonical(
	563	\\comptime {
	564	\\ {
	565	\\ {
	566	\\ {
	567	\\ a();
	568	\\ }
	569	\\ }
	570	\\ }
	571	\\}
	572	\\
	573	);
	574	}
	575
	576	test "zig fmt: block with same line comment after end brace" {
	577	try testCanonical(
	578	\\comptime {
	579	\\ {
	580	\\ b();
	581	\\ } // comment
	582	\\}
	583	\\
	584	);
	585	}
	586
	587	test "zig fmt: statements with comment between" {
	588	try testCanonical(
	589	\\comptime {
	590	\\ a = b;
	591	\\ // comment
	592	\\ a = b;
	593	\\}
	594	\\
	595	);
	596	}
	597
	598	test "zig fmt: statements with empty line between" {
	599	try testCanonical(
	600	\\comptime {
	601	\\ a = b;
	602	\\
	603	\\ a = b;
	604	\\}
	605	\\
	606	);
	607	}
	608
	609	test "zig fmt: ptr deref operator" {
	610	try testCanonical(
	611	\\const a = b.*;
	612	\\
	613	);
	614	}
	615
	616	test "zig fmt: comment after if before another if" {
	617	try testCanonical(
	618	\\test "aoeu" {
	619	\\ // comment
	620	\\ if (x) {
	621	\\ bar();
	622	\\ }
	623	\\}
	624	\\
	625	\\test "aoeu" {
	626	\\ if (x) {
	627	\\ foo();
	628	\\ }
	629	\\ // comment
	630	\\ if (x) {
	631	\\ bar();
	632	\\ }
	633	\\}
	634	\\
	635	);
	636	}
	637
	638	test "zig fmt: line comment between if block and else keyword" {
	639	try testCanonical(
	640	\\test "aoeu" {
	641	\\ // cexp(finite\|nan +- i inf\|nan) = nan + i nan
	642	\\ if ((hx & 0x7fffffff) != 0x7f800000) {
	643	\\ return Complex(f32).new(y - y, y - y);
	644	\\ }
	645	\\ // cexp(-inf +- i inf\|nan) = 0 + i0
	646	\\ else if (hx & 0x80000000 != 0) {
	647	\\ return Complex(f32).new(0, 0);
	648	\\ }
	649	\\ // cexp(+inf +- i inf\|nan) = inf + i nan
	650	\\ // another comment
	651	\\ else {
	652	\\ return Complex(f32).new(x, y - y);
	653	\\ }
	654	\\}
	655	\\
	656	);
	657	}
	658
	659	test "zig fmt: same line comments in expression" {
	660	try testCanonical(
	661	\\test "aoeu" {
	662	\\ const x = ( // a
	663	\\ 0 // b
	664	\\ ); // c
	665	\\}
	666	\\
	667	);
	668	}
	669
	670	test "zig fmt: add comma on last switch prong" {
	671	try testTransform(
	672	\\test "aoeu" {
	673	\\switch (self.init_arg_expr) {
	674	\\ InitArg.Type => \|t\| { },
	675	\\ InitArg.None,
	676	\\ InitArg.Enum => { }
	677	\\}
	678	\\ switch (self.init_arg_expr) {
	679	\\ InitArg.Type => \|t\| { },
	680	\\ InitArg.None,
	681	\\ InitArg.Enum => { }//line comment
	682	\\ }
	683	\\}
	684	,
	685	\\test "aoeu" {
	686	\\ switch (self.init_arg_expr) {
	687	\\ InitArg.Type => \|t\| {},
	688	\\ InitArg.None, InitArg.Enum => {},
	689	\\ }
	690	\\ switch (self.init_arg_expr) {
	691	\\ InitArg.Type => \|t\| {},
	692	\\ InitArg.None, InitArg.Enum => {}, //line comment
	693	\\ }
	694	\\}
	695	\\
	696	);
	697	}
	698
1	699	test "zig fmt: same-line comment after a statement" {
2	700	try testCanonical(
3	701	\\test "" {
...	...	@@ -71,13 +769,6 @@ test "zig fmt: switch with empty body" {
71	769	);
72	770	}
73	771
74		test "zig fmt: float literal with exponent" {
75		try testCanonical(
76		\\pub const f64_true_min = 4.94065645841246544177e-324;
77		\\
78		);
79		}
80
81	772	test "zig fmt: line comments in struct initializer" {
82	773	try testCanonical(
83	774	\\fn foo() void {
...	...	@@ -330,7 +1021,7 @@ test "zig fmt: extern declaration" {
330	1021	}
331	1022
332	1023	test "zig fmt: alignment" {
333		try testCanonical(
	1024	try testCanonical(
334	1025	\\var foo: c_int align(1);
335	1026	\\
336	1027	);
...	...	@@ -379,7 +1070,7 @@ test "zig fmt: slice attributes" {
379	1070	}
380	1071
381	1072	test "zig fmt: test declaration" {
382		try testCanonical(
	1073	try testCanonical(
383	1074	\\test "test name" {
384	1075	\\ const a = 1;
385	1076	\\ var b = 1;
...	...	@@ -539,6 +1230,11 @@ test "zig fmt: multiline string" {
539	1230	\\ c\\two)
540	1231	\\ c\\three
541	1232	\\ ;
	1233	\\ const s3 = // hi
	1234	\\ \\one
	1235	\\ \\two)
	1236	\\ \\three
	1237	\\ ;
542	1238	\\}
543	1239	\\
544	1240	);
...	...	@@ -616,7 +1312,7 @@ test "zig fmt: struct declaration" {
616	1312	}
617	1313
618	1314	test "zig fmt: enum declaration" {
619		try testCanonical(
	1315	try testCanonical(
620	1316	\\const E = enum {
621	1317	\\ Ok,
622	1318	\\ SomethingElse = 0,
...	...	@@ -644,7 +1340,7 @@ test "zig fmt: enum declaration" {
644	1340	}
645	1341
646	1342	test "zig fmt: union declaration" {
647		try testCanonical(
	1343	try testCanonical(
648	1344	\\const U = union {
649	1345	\\ Int: u8,
650	1346	\\ Float: f32,
...	...	@@ -759,9 +1455,8 @@ test "zig fmt: switch" {
759	1455	\\ switch (0) {
760	1456	\\ 0 => {},
761	1457	\\ 1 => unreachable,
762		\\ 2,
763		\\ 3 => {},
764		\\ 4 ... 7 => {},
	1458	\\ 2, 3 => {},
	1459	\\ 4...7 => {},
765	1460	\\ 1 + 4 * 3 + 22 => {},
766	1461	\\ else => {
767	1462	\\ const a = 1;
...	...	@@ -1021,7 +1716,8 @@ test "zig fmt: inline asm" {
1021	1716	\\ : [ret] "={rax}" (-> usize)
1022	1717	\\ : [number] "{rax}" (number),
1023	1718	\\ [arg1] "{rdi}" (arg1)
1024		\\ : "rcx", "r11");
	1719	\\ : "rcx", "r11"
	1720	\\ );
1025	1721	\\}
1026	1722	\\
1027	1723	);
...	...	@@ -1164,10 +1860,15 @@ fn testTransform(source: []const u8, expected_source: []const u8) !void {
1164	1860	} else \|err\| switch (err) {
1165	1861	error.OutOfMemory => {
1166	1862	if (failing_allocator.allocated_bytes != failing_allocator.freed_bytes) {
1167		warn("\nfail_index: {}/{}\nallocated bytes: {}\nfreed bytes: {}\nallocations: {}\ndeallocations: {}\n",
1168		fail_index, needed_alloc_count,
1169		failing_allocator.allocated_bytes, failing_allocator.freed_bytes,
1170		failing_allocator.index, failing_allocator.deallocations);
	1863	warn(
	1864	"\nfail_index: {}/{}\nallocated bytes: {}\nfreed bytes: {}\nallocations: {}\ndeallocations: {}\n",
	1865	fail_index,
	1866	needed_alloc_count,
	1867	failing_allocator.allocated_bytes,
	1868	failing_allocator.freed_bytes,
	1869	failing_allocator.index,
	1870	failing_allocator.deallocations,
	1871	);
1171	1872	return error.MemoryLeakDetected;
1172	1873	}
1173	1874	},
...	...	@@ -1180,4 +1881,3 @@ fn testTransform(source: []const u8, expected_source: []const u8) !void {
1180	1881	fn testCanonical(source: []const u8) !void {
1181	1882	return testTransform(source, source);
1182	1883	}
1183

std/zig/render.zig+1767-1132

...	...	@@ -1,1270 +1,1905 @@
1	1	const std = @import("../index.zig");
	2	const builtin = @import("builtin");
2	3	const assert = std.debug.assert;
3	4	const mem = std.mem;
4	5	const ast = std.zig.ast;
5	6	const Token = std.zig.Token;
6	7
7		const RenderState = union(enum) {
8		TopLevelDecl: &ast.Node,
9		ParamDecl: &ast.Node,
10		Text: []const u8,
11		Expression: &ast.Node,
12		VarDecl: &ast.Node.VarDecl,
13		Statement: &ast.Node,
14		PrintIndent,
15		Indent: usize,
16		MaybeSemiColon: &ast.Node,
17		Token: ast.TokenIndex,
18		NonBreakToken: ast.TokenIndex,
19		};
20
21	8	const indent_delta = 4;
22	9
23		pub fn render(allocator: &mem.Allocator, stream: var, tree: &ast.Tree) !void {
24		var stack = std.ArrayList(RenderState).init(allocator);
25		defer stack.deinit();
26
27		{
28		try stack.append(RenderState { .Text = "\n"});
29
30		var i = tree.root_node.decls.len;
31		while (i != 0) {
32		i -= 1;
33		const decl = *tree.root_node.decls.at(i);
34		try stack.append(RenderState {.TopLevelDecl = decl});
35		if (i != 0) {
36		try stack.append(RenderState {
37		.Text = blk: {
38		const prev_node = *tree.root_node.decls.at(i - 1);
39		const prev_node_last_token = tree.tokens.at(prev_node.lastToken());
40		const loc = tree.tokenLocation(prev_node_last_token.end, decl.firstToken());
41		if (loc.line >= 2) {
42		break :blk "\n\n";
43		}
44		break :blk "\n";
45		},
46		});
	10	pub const Error = error{
	11	/// Ran out of memory allocating call stack frames to complete rendering.
	12	OutOfMemory,
	13	};
	14
	15	pub fn render(allocator: &mem.Allocator, stream: var, tree: &ast.Tree) (@typeOf(stream).Child.Error \|\| Error)!void {
	16	comptime assert(@typeId(@typeOf(stream)) == builtin.TypeId.Pointer);
	17
	18	// render all the line comments at the beginning of the file
	19	var tok_it = tree.tokens.iterator(0);
	20	while (tok_it.next()) \|token\| {
	21	if (token.id != Token.Id.LineComment) break;
	22	try stream.print("{}\n", mem.trimRight(u8, tree.tokenSlicePtr(token), " "));
	23	if (tok_it.peek()) \|next_token\| {
	24	const loc = tree.tokenLocationPtr(token.end, next_token);
	25	if (loc.line >= 2) {
	26	try stream.writeByte('\n');
47	27	}
48	28	}
49	29	}
50	30
51		var indent: usize = 0;
52		while (stack.popOrNull()) \|state\| {
53		switch (state) {
54		RenderState.TopLevelDecl => \|decl\| {
55		switch (decl.id) {
56		ast.Node.Id.FnProto => {
57		const fn_proto = @fieldParentPtr(ast.Node.FnProto, "base", decl);
58		try renderComments(tree, stream, fn_proto, indent);
59
60		if (fn_proto.body_node) \|body_node\| {
61		stack.append(RenderState { .Expression = body_node}) catch unreachable;
62		try stack.append(RenderState { .Text = " "});
63		} else {
64		stack.append(RenderState { .Text = ";" }) catch unreachable;
65		}
	31	var start_col: usize = 0;
	32	var it = tree.root_node.decls.iterator(0);
	33	while (it.next()) \|decl\| {
	34	try renderTopLevelDecl(allocator, stream, tree, 0, &start_col, decl.*);
	35	if (it.peek()) \|next_decl\| {
	36	try renderExtraNewline(tree, stream, &start_col, next_decl.*);
	37	}
	38	}
	39	}
66	40
67		try stack.append(RenderState { .Expression = decl });
68		},
69		ast.Node.Id.Use => {
70		const use_decl = @fieldParentPtr(ast.Node.Use, "base", decl);
71		if (use_decl.visib_token) \|visib_token\| {
72		try stream.print("{} ", tree.tokenSlice(visib_token));
73		}
74		try stream.print("use ");
75		try stack.append(RenderState { .Text = ";" });
76		try stack.append(RenderState { .Expression = use_decl.expr });
77		},
78		ast.Node.Id.VarDecl => {
79		const var_decl = @fieldParentPtr(ast.Node.VarDecl, "base", decl);
80		try renderComments(tree, stream, var_decl, indent);
81		try stack.append(RenderState { .VarDecl = var_decl});
82		},
83		ast.Node.Id.TestDecl => {
84		const test_decl = @fieldParentPtr(ast.Node.TestDecl, "base", decl);
85		try renderComments(tree, stream, test_decl, indent);
86		try stream.print("test ");
87		try stack.append(RenderState { .Expression = test_decl.body_node });
88		try stack.append(RenderState { .Text = " " });
89		try stack.append(RenderState { .Expression = test_decl.name });
90		},
91		ast.Node.Id.StructField => {
92		const field = @fieldParentPtr(ast.Node.StructField, "base", decl);
93		try renderComments(tree, stream, field, indent);
94		if (field.visib_token) \|visib_token\| {
95		try stream.print("{} ", tree.tokenSlice(visib_token));
96		}
97		try stream.print("{}: ", tree.tokenSlice(field.name_token));
98		try stack.append(RenderState { .Token = field.lastToken() + 1 });
99		try stack.append(RenderState { .Expression = field.type_expr});
100		},
101		ast.Node.Id.UnionTag => {
102		const tag = @fieldParentPtr(ast.Node.UnionTag, "base", decl);
103		try renderComments(tree, stream, tag, indent);
104		try stream.print("{}", tree.tokenSlice(tag.name_token));
105
106		try stack.append(RenderState { .Text = "," });
107
108		if (tag.value_expr) \|value_expr\| {
109		try stack.append(RenderState { .Expression = value_expr });
110		try stack.append(RenderState { .Text = " = " });
111		}
	41	fn renderExtraNewline(tree: &ast.Tree, stream: var, start_col: &usize, node: &ast.Node) !void {
	42	const first_token = node.firstToken();
	43	var prev_token = first_token;
	44	while (tree.tokens.at(prev_token - 1).id == Token.Id.DocComment) {
	45	prev_token -= 1;
	46	}
	47	const prev_token_end = tree.tokens.at(prev_token - 1).end;
	48	const loc = tree.tokenLocation(prev_token_end, first_token);
	49	if (loc.line >= 2) {
	50	try stream.writeByte('\n');
	51	start_col.* = 0;
	52	}
	53	}
112	54
113		if (tag.type_expr) \|type_expr\| {
114		try stream.print(": ");
115		try stack.append(RenderState { .Expression = type_expr});
116		}
117		},
118		ast.Node.Id.EnumTag => {
119		const tag = @fieldParentPtr(ast.Node.EnumTag, "base", decl);
120		try renderComments(tree, stream, tag, indent);
121		try stream.print("{}", tree.tokenSlice(tag.name_token));
122
123		try stack.append(RenderState { .Text = "," });
124		if (tag.value) \|value\| {
125		try stream.print(" = ");
126		try stack.append(RenderState { .Expression = value});
127		}
128		},
129		ast.Node.Id.ErrorTag => {
130		const tag = @fieldParentPtr(ast.Node.ErrorTag, "base", decl);
131		try renderComments(tree, stream, tag, indent);
132		try stream.print("{}", tree.tokenSlice(tag.name_token));
133		},
134		ast.Node.Id.Comptime => {
135		try stack.append(RenderState { .MaybeSemiColon = decl });
136		try stack.append(RenderState { .Expression = decl });
137		},
138		ast.Node.Id.LineComment => {
139		const line_comment_node = @fieldParentPtr(ast.Node.LineComment, "base", decl);
140		try stream.write(tree.tokenSlice(line_comment_node.token));
141		},
142		else => unreachable,
143		}
144		},
	55	fn renderTopLevelDecl(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, indent: usize, start_col: &usize, decl: &ast.Node) (@typeOf(stream).Child.Error \|\| Error)!void {
	56	switch (decl.id) {
	57	ast.Node.Id.FnProto => {
	58	const fn_proto = @fieldParentPtr(ast.Node.FnProto, "base", decl);
145	59
146		RenderState.VarDecl => \|var_decl\| {
147		try stack.append(RenderState { .Token = var_decl.semicolon_token });
148		if (var_decl.init_node) \|init_node\| {
149		try stack.append(RenderState { .Expression = init_node });
150		const text = if (init_node.id == ast.Node.Id.MultilineStringLiteral) " =" else " = ";
151		try stack.append(RenderState { .Text = text });
152		}
153		if (var_decl.align_node) \|align_node\| {
154		try stack.append(RenderState { .Text = ")" });
155		try stack.append(RenderState { .Expression = align_node });
156		try stack.append(RenderState { .Text = " align(" });
157		}
158		if (var_decl.type_node) \|type_node\| {
159		try stack.append(RenderState { .Expression = type_node });
160		try stack.append(RenderState { .Text = ": " });
161		}
162		try stack.append(RenderState { .Text = tree.tokenSlice(var_decl.name_token) });
163		try stack.append(RenderState { .Text = " " });
164		try stack.append(RenderState { .Text = tree.tokenSlice(var_decl.mut_token) });
	60	try renderDocComments(tree, stream, fn_proto, indent, start_col);
165	61
166		if (var_decl.comptime_token) \|comptime_token\| {
167		try stack.append(RenderState { .Text = " " });
168		try stack.append(RenderState { .Text = tree.tokenSlice(comptime_token) });
169		}
	62	if (fn_proto.body_node) \|body_node\| {
	63	try renderExpression(allocator, stream, tree, indent, start_col, decl, Space.Space);
	64	try renderExpression(allocator, stream, tree, indent, start_col, body_node, Space.Newline);
	65	} else {
	66	try renderExpression(allocator, stream, tree, indent, start_col, decl, Space.None);
	67	try renderToken(tree, stream, tree.nextToken(decl.lastToken()), indent, start_col, Space.Newline);
	68	}
	69	},
170	70
171		if (var_decl.extern_export_token) \|extern_export_token\| {
172		if (var_decl.lib_name != null) {
173		try stack.append(RenderState { .Text = " " });
174		try stack.append(RenderState { .Expression = ??var_decl.lib_name });
175		}
176		try stack.append(RenderState { .Text = " " });
177		try stack.append(RenderState { .Text = tree.tokenSlice(extern_export_token) });
178		}
	71	ast.Node.Id.Use => {
	72	const use_decl = @fieldParentPtr(ast.Node.Use, "base", decl);
179	73
180		if (var_decl.visib_token) \|visib_token\| {
181		try stack.append(RenderState { .Text = " " });
182		try stack.append(RenderState { .Text = tree.tokenSlice(visib_token) });
183		}
184		},
	74	if (use_decl.visib_token) \|visib_token\| {
	75	try renderToken(tree, stream, visib_token, indent, start_col, Space.Space); // pub
	76	}
	77	try renderToken(tree, stream, use_decl.use_token, indent, start_col, Space.Space); // use
	78	try renderExpression(allocator, stream, tree, indent, start_col, use_decl.expr, Space.None);
	79	try renderToken(tree, stream, use_decl.semicolon_token, indent, start_col, Space.Newline); // ;
	80	},
185	81
186		RenderState.ParamDecl => \|base\| {
187		const param_decl = @fieldParentPtr(ast.Node.ParamDecl, "base", base);
188		if (param_decl.comptime_token) \|comptime_token\| {
189		try stream.print("{} ", tree.tokenSlice(comptime_token));
190		}
191		if (param_decl.noalias_token) \|noalias_token\| {
192		try stream.print("{} ", tree.tokenSlice(noalias_token));
193		}
194		if (param_decl.name_token) \|name_token\| {
195		try stream.print("{}: ", tree.tokenSlice(name_token));
196		}
197		if (param_decl.var_args_token) \|var_args_token\| {
198		try stream.print("{}", tree.tokenSlice(var_args_token));
	82	ast.Node.Id.VarDecl => {
	83	const var_decl = @fieldParentPtr(ast.Node.VarDecl, "base", decl);
	84
	85	try renderDocComments(tree, stream, var_decl, indent, start_col);
	86	try renderVarDecl(allocator, stream, tree, indent, start_col, var_decl);
	87	},
	88
	89	ast.Node.Id.TestDecl => {
	90	const test_decl = @fieldParentPtr(ast.Node.TestDecl, "base", decl);
	91
	92	try renderDocComments(tree, stream, test_decl, indent, start_col);
	93	try renderToken(tree, stream, test_decl.test_token, indent, start_col, Space.Space);
	94	try renderExpression(allocator, stream, tree, indent, start_col, test_decl.name, Space.Space);
	95	try renderExpression(allocator, stream, tree, indent, start_col, test_decl.body_node, Space.Newline);
	96	},
	97
	98	ast.Node.Id.StructField => {
	99	const field = @fieldParentPtr(ast.Node.StructField, "base", decl);
	100
	101	try renderDocComments(tree, stream, field, indent, start_col);
	102	if (field.visib_token) \|visib_token\| {
	103	try renderToken(tree, stream, visib_token, indent, start_col, Space.Space); // pub
	104	}
	105	try renderToken(tree, stream, field.name_token, indent, start_col, Space.None); // name
	106	try renderToken(tree, stream, tree.nextToken(field.name_token), indent, start_col, Space.Space); // :
	107	try renderExpression(allocator, stream, tree, indent, start_col, field.type_expr, Space.Comma); // type,
	108	},
	109
	110	ast.Node.Id.UnionTag => {
	111	const tag = @fieldParentPtr(ast.Node.UnionTag, "base", decl);
	112
	113	try renderDocComments(tree, stream, tag, indent, start_col);
	114
	115	if (tag.type_expr == null and tag.value_expr == null) {
	116	return renderToken(tree, stream, tag.name_token, indent, start_col, Space.Comma); // name,
	117	}
	118
	119	if (tag.type_expr == null) {
	120	try renderToken(tree, stream, tag.name_token, indent, start_col, Space.Space); // name
	121	} else {
	122	try renderToken(tree, stream, tag.name_token, indent, start_col, Space.None); // name
	123	}
	124
	125	if (tag.type_expr) \|type_expr\| {
	126	try renderToken(tree, stream, tree.nextToken(tag.name_token), indent, start_col, Space.Space); // :
	127
	128	if (tag.value_expr == null) {
	129	try renderExpression(allocator, stream, tree, indent, start_col, type_expr, Space.Comma); // type,
	130	return;
199	131	} else {
200		try stack.append(RenderState { .Expression = param_decl.type_node});
	132	try renderExpression(allocator, stream, tree, indent, start_col, type_expr, Space.Space); // type
201	133	}
202		},
203		RenderState.Text => \|bytes\| {
204		try stream.write(bytes);
205		},
206		RenderState.Expression => \|base\| switch (base.id) {
207		ast.Node.Id.Identifier => {
208		const identifier = @fieldParentPtr(ast.Node.Identifier, "base", base);
209		try stream.print("{}", tree.tokenSlice(identifier.token));
210		},
211		ast.Node.Id.Block => {
212		const block = @fieldParentPtr(ast.Node.Block, "base", base);
213		if (block.label) \|label\| {
214		try stream.print("{}: ", tree.tokenSlice(label));
215		}
	134	}
216	135
217		if (block.statements.len == 0) {
218		try stream.write("{}");
219		} else {
220		try stream.write("{");
221		try stack.append(RenderState { .Text = "}"});
222		try stack.append(RenderState.PrintIndent);
223		try stack.append(RenderState { .Indent = indent});
224		try stack.append(RenderState { .Text = "\n"});
225		var i = block.statements.len;
226		while (i != 0) {
227		i -= 1;
228		const statement_node = *block.statements.at(i);
229		try stack.append(RenderState { .Statement = statement_node});
230		try stack.append(RenderState.PrintIndent);
231		try stack.append(RenderState { .Indent = indent + indent_delta});
232		try stack.append(RenderState {
233		.Text = blk: {
234		if (i != 0) {
235		const prev_node = *block.statements.at(i - 1);
236		const prev_node_last_token_end = tree.tokens.at(prev_node.lastToken()).end;
237		const loc = tree.tokenLocation(prev_node_last_token_end, statement_node.firstToken());
238		if (loc.line >= 2) {
239		break :blk "\n\n";
240		}
241		}
242		break :blk "\n";
243		},
244		});
245		}
246		}
247		},
248		ast.Node.Id.Defer => {
249		const defer_node = @fieldParentPtr(ast.Node.Defer, "base", base);
250		try stream.print("{} ", tree.tokenSlice(defer_node.defer_token));
251		try stack.append(RenderState { .Expression = defer_node.expr });
252		},
253		ast.Node.Id.Comptime => {
254		const comptime_node = @fieldParentPtr(ast.Node.Comptime, "base", base);
255		try stream.print("{} ", tree.tokenSlice(comptime_node.comptime_token));
256		try stack.append(RenderState { .Expression = comptime_node.expr });
257		},
258		ast.Node.Id.AsyncAttribute => {
259		const async_attr = @fieldParentPtr(ast.Node.AsyncAttribute, "base", base);
260		try stream.print("{}", tree.tokenSlice(async_attr.async_token));
261
262		if (async_attr.allocator_type) \|allocator_type\| {
263		try stack.append(RenderState { .Text = ">" });
264		try stack.append(RenderState { .Expression = allocator_type });
265		try stack.append(RenderState { .Text = "<" });
266		}
267		},
268		ast.Node.Id.Suspend => {
269		const suspend_node = @fieldParentPtr(ast.Node.Suspend, "base", base);
270		if (suspend_node.label) \|label\| {
271		try stream.print("{}: ", tree.tokenSlice(label));
272		}
273		try stream.print("{}", tree.tokenSlice(suspend_node.suspend_token));
	136	const value_expr = ??tag.value_expr;
	137	try renderToken(tree, stream, tree.prevToken(value_expr.firstToken()), indent, start_col, Space.Space); // =
	138	try renderExpression(allocator, stream, tree, indent, start_col, value_expr, Space.Comma); // value,
	139	},
274	140
275		if (suspend_node.body) \|body\| {
276		try stack.append(RenderState { .Expression = body });
277		try stack.append(RenderState { .Text = " " });
278		}
	141	ast.Node.Id.EnumTag => {
	142	const tag = @fieldParentPtr(ast.Node.EnumTag, "base", decl);
279	143
280		if (suspend_node.payload) \|payload\| {
281		try stack.append(RenderState { .Expression = payload });
282		try stack.append(RenderState { .Text = " " });
283		}
284		},
285		ast.Node.Id.InfixOp => {
286		const prefix_op_node = @fieldParentPtr(ast.Node.InfixOp, "base", base);
287		try stack.append(RenderState { .Expression = prefix_op_node.rhs });
288
289		if (prefix_op_node.op == ast.Node.InfixOp.Op.Catch) {
290		if (prefix_op_node.op.Catch) \|payload\| {
291		try stack.append(RenderState { .Text = " " });
292		try stack.append(RenderState { .Expression = payload });
293		}
294		try stack.append(RenderState { .Text = " catch " });
295		} else {
296		const text = switch (prefix_op_node.op) {
297		ast.Node.InfixOp.Op.Add => " + ",
298		ast.Node.InfixOp.Op.AddWrap => " +% ",
299		ast.Node.InfixOp.Op.ArrayCat => " ++ ",
300		ast.Node.InfixOp.Op.ArrayMult => " ** ",
301		ast.Node.InfixOp.Op.Assign => " = ",
302		ast.Node.InfixOp.Op.AssignBitAnd => " &= ",
303		ast.Node.InfixOp.Op.AssignBitOr => " \|= ",
304		ast.Node.InfixOp.Op.AssignBitShiftLeft => " <<= ",
305		ast.Node.InfixOp.Op.AssignBitShiftRight => " >>= ",
306		ast.Node.InfixOp.Op.AssignBitXor => " ^= ",
307		ast.Node.InfixOp.Op.AssignDiv => " /= ",
308		ast.Node.InfixOp.Op.AssignMinus => " -= ",
309		ast.Node.InfixOp.Op.AssignMinusWrap => " -%= ",
310		ast.Node.InfixOp.Op.AssignMod => " %= ",
311		ast.Node.InfixOp.Op.AssignPlus => " += ",
312		ast.Node.InfixOp.Op.AssignPlusWrap => " +%= ",
313		ast.Node.InfixOp.Op.AssignTimes => " *= ",
314		ast.Node.InfixOp.Op.AssignTimesWarp => " *%= ",
315		ast.Node.InfixOp.Op.BangEqual => " != ",
316		ast.Node.InfixOp.Op.BitAnd => " & ",
317		ast.Node.InfixOp.Op.BitOr => " \| ",
318		ast.Node.InfixOp.Op.BitShiftLeft => " << ",
319		ast.Node.InfixOp.Op.BitShiftRight => " >> ",
320		ast.Node.InfixOp.Op.BitXor => " ^ ",
321		ast.Node.InfixOp.Op.BoolAnd => " and ",
322		ast.Node.InfixOp.Op.BoolOr => " or ",
323		ast.Node.InfixOp.Op.Div => " / ",
324		ast.Node.InfixOp.Op.EqualEqual => " == ",
325		ast.Node.InfixOp.Op.ErrorUnion => "!",
326		ast.Node.InfixOp.Op.GreaterOrEqual => " >= ",
327		ast.Node.InfixOp.Op.GreaterThan => " > ",
328		ast.Node.InfixOp.Op.LessOrEqual => " <= ",
329		ast.Node.InfixOp.Op.LessThan => " < ",
330		ast.Node.InfixOp.Op.MergeErrorSets => " \|\| ",
331		ast.Node.InfixOp.Op.Mod => " % ",
332		ast.Node.InfixOp.Op.Mult => " * ",
333		ast.Node.InfixOp.Op.MultWrap => " *% ",
334		ast.Node.InfixOp.Op.Period => ".",
335		ast.Node.InfixOp.Op.Sub => " - ",
336		ast.Node.InfixOp.Op.SubWrap => " -% ",
337		ast.Node.InfixOp.Op.UnwrapMaybe => " ?? ",
338		ast.Node.InfixOp.Op.Range => " ... ",
339		ast.Node.InfixOp.Op.Catch => unreachable,
340		};
	144	try renderDocComments(tree, stream, tag, indent, start_col);
341	145
342		try stack.append(RenderState { .Text = text });
343		}
344		try stack.append(RenderState { .Expression = prefix_op_node.lhs });
345		},
346		ast.Node.Id.PrefixOp => {
347		const prefix_op_node = @fieldParentPtr(ast.Node.PrefixOp, "base", base);
348		try stack.append(RenderState { .Expression = prefix_op_node.rhs });
349		switch (prefix_op_node.op) {
350		ast.Node.PrefixOp.Op.AddrOf => \|addr_of_info\| {
351		try stream.write("&");
352		if (addr_of_info.volatile_token != null) {
353		try stack.append(RenderState { .Text = "volatile "});
354		}
355		if (addr_of_info.const_token != null) {
356		try stack.append(RenderState { .Text = "const "});
357		}
358		if (addr_of_info.align_expr) \|align_expr\| {
359		try stream.print("align(");
360		try stack.append(RenderState { .Text = ") "});
361		try stack.append(RenderState { .Expression = align_expr});
362		}
363		},
364		ast.Node.PrefixOp.Op.SliceType => \|addr_of_info\| {
365		try stream.write("[]");
366		if (addr_of_info.volatile_token != null) {
367		try stack.append(RenderState { .Text = "volatile "});
368		}
369		if (addr_of_info.const_token != null) {
370		try stack.append(RenderState { .Text = "const "});
371		}
372		if (addr_of_info.align_expr) \|align_expr\| {
373		try stream.print("align(");
374		try stack.append(RenderState { .Text = ") "});
375		try stack.append(RenderState { .Expression = align_expr});
376		}
377		},
378		ast.Node.PrefixOp.Op.ArrayType => \|array_index\| {
379		try stack.append(RenderState { .Text = "]"});
380		try stack.append(RenderState { .Expression = array_index});
381		try stack.append(RenderState { .Text = "["});
382		},
383		ast.Node.PrefixOp.Op.BitNot => try stream.write("~"),
384		ast.Node.PrefixOp.Op.BoolNot => try stream.write("!"),
385		ast.Node.PrefixOp.Op.Deref => try stream.write("*"),
386		ast.Node.PrefixOp.Op.Negation => try stream.write("-"),
387		ast.Node.PrefixOp.Op.NegationWrap => try stream.write("-%"),
388		ast.Node.PrefixOp.Op.Try => try stream.write("try "),
389		ast.Node.PrefixOp.Op.UnwrapMaybe => try stream.write("??"),
390		ast.Node.PrefixOp.Op.MaybeType => try stream.write("?"),
391		ast.Node.PrefixOp.Op.Await => try stream.write("await "),
392		ast.Node.PrefixOp.Op.Cancel => try stream.write("cancel "),
393		ast.Node.PrefixOp.Op.Resume => try stream.write("resume "),
394		}
395		},
396		ast.Node.Id.SuffixOp => {
397		const suffix_op = @fieldParentPtr(ast.Node.SuffixOp, "base", base);
398
399		switch (suffix_op.op) {
400		@TagType(ast.Node.SuffixOp.Op).Call => \|*call_info\| {
401		try stack.append(RenderState { .Text = ")"});
402		var i = call_info.params.len;
403		while (i != 0) {
404		i -= 1;
405		const param_node = *call_info.params.at(i);
406		try stack.append(RenderState { .Expression = param_node});
407		if (i != 0) {
408		try stack.append(RenderState { .Text = ", " });
409		}
410		}
411		try stack.append(RenderState { .Text = "("});
412		try stack.append(RenderState { .Expression = suffix_op.lhs });
	146	if (tag.value) \|value\| {
	147	try renderToken(tree, stream, tag.name_token, indent, start_col, Space.Space); // name
413	148
414		if (call_info.async_attr) \|async_attr\| {
415		try stack.append(RenderState { .Text = " "});
416		try stack.append(RenderState { .Expression = &async_attr.base });
417		}
418		},
419		ast.Node.SuffixOp.Op.ArrayAccess => \|index_expr\| {
420		try stack.append(RenderState { .Text = "]"});
421		try stack.append(RenderState { .Expression = index_expr});
422		try stack.append(RenderState { .Text = "["});
423		try stack.append(RenderState { .Expression = suffix_op.lhs });
424		},
425		@TagType(ast.Node.SuffixOp.Op).Slice => \|range\| {
426		try stack.append(RenderState { .Text = "]"});
427		if (range.end) \|end\| {
428		try stack.append(RenderState { .Expression = end});
429		}
430		try stack.append(RenderState { .Text = ".."});
431		try stack.append(RenderState { .Expression = range.start});
432		try stack.append(RenderState { .Text = "["});
433		try stack.append(RenderState { .Expression = suffix_op.lhs });
434		},
435		ast.Node.SuffixOp.Op.StructInitializer => \|*field_inits\| {
436		if (field_inits.len == 0) {
437		try stack.append(RenderState { .Text = "{}" });
438		try stack.append(RenderState { .Expression = suffix_op.lhs });
439		continue;
440		}
441		if (field_inits.len == 1) {
442		const field_init = *field_inits.at(0);
443
444		try stack.append(RenderState { .Text = " }" });
445		try stack.append(RenderState { .Expression = field_init });
446		try stack.append(RenderState { .Text = "{ " });
447		try stack.append(RenderState { .Expression = suffix_op.lhs });
448		continue;
449		}
450		try stack.append(RenderState { .Text = "}"});
451		try stack.append(RenderState.PrintIndent);
452		try stack.append(RenderState { .Indent = indent });
453		try stack.append(RenderState { .Text = "\n" });
454		var i = field_inits.len;
455		while (i != 0) {
456		i -= 1;
457		const field_init = *field_inits.at(i);
458		if (field_init.id != ast.Node.Id.LineComment) {
459		try stack.append(RenderState { .Text = "," });
460		}
461		try stack.append(RenderState { .Expression = field_init });
462		try stack.append(RenderState.PrintIndent);
463		if (i != 0) {
464		try stack.append(RenderState { .Text = blk: {
465		const prev_node = *field_inits.at(i - 1);
466		const prev_node_last_token_end = tree.tokens.at(prev_node.lastToken()).end;
467		const loc = tree.tokenLocation(prev_node_last_token_end, field_init.firstToken());
468		if (loc.line >= 2) {
469		break :blk "\n\n";
470		}
471		break :blk "\n";
472		}});
473		}
474		}
475		try stack.append(RenderState { .Indent = indent + indent_delta });
476		try stack.append(RenderState { .Text = "{\n"});
477		try stack.append(RenderState { .Expression = suffix_op.lhs });
478		},
479		ast.Node.SuffixOp.Op.ArrayInitializer => \|*exprs\| {
480		if (exprs.len == 0) {
481		try stack.append(RenderState { .Text = "{}" });
482		try stack.append(RenderState { .Expression = suffix_op.lhs });
483		continue;
484		}
485		if (exprs.len == 1) {
486		const expr = *exprs.at(0);
487
488		try stack.append(RenderState { .Text = "}" });
489		try stack.append(RenderState { .Expression = expr });
490		try stack.append(RenderState { .Text = "{" });
491		try stack.append(RenderState { .Expression = suffix_op.lhs });
492		continue;
493		}
	149	try renderToken(tree, stream, tree.nextToken(tag.name_token), indent, start_col, Space.Space); // =
	150	try renderExpression(allocator, stream, tree, indent, start_col, value, Space.Comma);
	151	} else {
	152	try renderToken(tree, stream, tag.name_token, indent, start_col, Space.Comma); // name
	153	}
	154	},
494	155
495		try stack.append(RenderState { .Text = "}"});
496		try stack.append(RenderState.PrintIndent);
497		try stack.append(RenderState { .Indent = indent });
498		var i = exprs.len;
499		while (i != 0) {
500		i -= 1;
501		const expr = *exprs.at(i);
502		try stack.append(RenderState { .Text = ",\n" });
503		try stack.append(RenderState { .Expression = expr });
504		try stack.append(RenderState.PrintIndent);
505		}
506		try stack.append(RenderState { .Indent = indent + indent_delta });
507		try stack.append(RenderState { .Text = "{\n"});
508		try stack.append(RenderState { .Expression = suffix_op.lhs });
509		},
510		}
511		},
512		ast.Node.Id.ControlFlowExpression => {
513		const flow_expr = @fieldParentPtr(ast.Node.ControlFlowExpression, "base", base);
	156	ast.Node.Id.Comptime => {
	157	assert(!decl.requireSemiColon());
	158	try renderExpression(allocator, stream, tree, indent, start_col, decl, Space.Newline);
	159	},
	160	else => unreachable,
	161	}
	162	}
514	163
515		if (flow_expr.rhs) \|rhs\| {
516		try stack.append(RenderState { .Expression = rhs });
517		try stack.append(RenderState { .Text = " " });
518		}
	164	fn renderExpression(
	165	allocator: &mem.Allocator,
	166	stream: var,
	167	tree: &ast.Tree,
	168	indent: usize,
	169	start_col: &usize,
	170	base: &ast.Node,
	171	space: Space,
	172	) (@typeOf(stream).Child.Error \|\| Error)!void {
	173	switch (base.id) {
	174	ast.Node.Id.Identifier => {
	175	const identifier = @fieldParentPtr(ast.Node.Identifier, "base", base);
	176	return renderToken(tree, stream, identifier.token, indent, start_col, space);
	177	},
	178	ast.Node.Id.Block => {
	179	const block = @fieldParentPtr(ast.Node.Block, "base", base);
	180
	181	if (block.label) \|label\| {
	182	try renderToken(tree, stream, label, indent, start_col, Space.None);
	183	try renderToken(tree, stream, tree.nextToken(label), indent, start_col, Space.Space);
	184	}
519	185
520		switch (flow_expr.kind) {
521		ast.Node.ControlFlowExpression.Kind.Break => \|maybe_label\| {
522		try stream.print("break");
523		if (maybe_label) \|label\| {
524		try stream.print(" :");
525		try stack.append(RenderState { .Expression = label });
526		}
527		},
528		ast.Node.ControlFlowExpression.Kind.Continue => \|maybe_label\| {
529		try stream.print("continue");
530		if (maybe_label) \|label\| {
531		try stream.print(" :");
532		try stack.append(RenderState { .Expression = label });
533		}
534		},
535		ast.Node.ControlFlowExpression.Kind.Return => {
536		try stream.print("return");
537		},
	186	if (block.statements.len == 0) {
	187	try renderToken(tree, stream, block.lbrace, indent + indent_delta, start_col, Space.None);
	188	return renderToken(tree, stream, block.rbrace, indent, start_col, space);
	189	} else {
	190	const block_indent = indent + indent_delta;
	191	try renderToken(tree, stream, block.lbrace, block_indent, start_col, Space.Newline);
538	192
539		}
540		},
541		ast.Node.Id.Payload => {
542		const payload = @fieldParentPtr(ast.Node.Payload, "base", base);
543		try stack.append(RenderState { .Text = "\|"});
544		try stack.append(RenderState { .Expression = payload.error_symbol });
545		try stack.append(RenderState { .Text = "\|"});
546		},
547		ast.Node.Id.PointerPayload => {
548		const payload = @fieldParentPtr(ast.Node.PointerPayload, "base", base);
549		try stack.append(RenderState { .Text = "\|"});
550		try stack.append(RenderState { .Expression = payload.value_symbol });
	193	var it = block.statements.iterator(0);
	194	while (it.next()) \|statement\| {
	195	try stream.writeByteNTimes(' ', block_indent);
	196	try renderStatement(allocator, stream, tree, block_indent, start_col, statement.*);
551	197
552		if (payload.ptr_token) \|ptr_token\| {
553		try stack.append(RenderState { .Text = tree.tokenSlice(ptr_token) });
	198	if (it.peek()) \|next_statement\| {
	199	try renderExtraNewline(tree, stream, start_col, next_statement.*);
554	200	}
	201	}
555	202
556		try stack.append(RenderState { .Text = "\|"});
557		},
558		ast.Node.Id.PointerIndexPayload => {
559		const payload = @fieldParentPtr(ast.Node.PointerIndexPayload, "base", base);
560		try stack.append(RenderState { .Text = "\|"});
	203	try stream.writeByteNTimes(' ', indent);
	204	return renderToken(tree, stream, block.rbrace, indent, start_col, space);
	205	}
	206	},
	207	ast.Node.Id.Defer => {
	208	const defer_node = @fieldParentPtr(ast.Node.Defer, "base", base);
	209
	210	try renderToken(tree, stream, defer_node.defer_token, indent, start_col, Space.Space);
	211	return renderExpression(allocator, stream, tree, indent, start_col, defer_node.expr, space);
	212	},
	213	ast.Node.Id.Comptime => {
	214	const comptime_node = @fieldParentPtr(ast.Node.Comptime, "base", base);
	215
	216	try renderToken(tree, stream, comptime_node.comptime_token, indent, start_col, Space.Space);
	217	return renderExpression(allocator, stream, tree, indent, start_col, comptime_node.expr, space);
	218	},
	219
	220	ast.Node.Id.AsyncAttribute => {
	221	const async_attr = @fieldParentPtr(ast.Node.AsyncAttribute, "base", base);
	222
	223	if (async_attr.allocator_type) \|allocator_type\| {
	224	try renderToken(tree, stream, async_attr.async_token, indent, start_col, Space.None); // async
	225
	226	try renderToken(tree, stream, tree.nextToken(async_attr.async_token), indent, start_col, Space.None); // <
	227	try renderExpression(allocator, stream, tree, indent, start_col, allocator_type, Space.None); // allocator
	228	return renderToken(tree, stream, tree.nextToken(allocator_type.lastToken()), indent, start_col, space); // >
	229	} else {
	230	return renderToken(tree, stream, async_attr.async_token, indent, start_col, space); // async
	231	}
	232	},
561	233
562		if (payload.index_symbol) \|index_symbol\| {
563		try stack.append(RenderState { .Expression = index_symbol });
564		try stack.append(RenderState { .Text = ", "});
565		}
	234	ast.Node.Id.Suspend => {
	235	const suspend_node = @fieldParentPtr(ast.Node.Suspend, "base", base);
566	236
567		try stack.append(RenderState { .Expression = payload.value_symbol });
	237	if (suspend_node.label) \|label\| {
	238	try renderToken(tree, stream, label, indent, start_col, Space.None);
	239	try renderToken(tree, stream, tree.nextToken(label), indent, start_col, Space.Space);
	240	}
568	241
569		if (payload.ptr_token) \|ptr_token\| {
570		try stack.append(RenderState { .Text = tree.tokenSlice(ptr_token) });
571		}
	242	if (suspend_node.payload) \|payload\| {
	243	if (suspend_node.body) \|body\| {
	244	try renderToken(tree, stream, suspend_node.suspend_token, indent, start_col, Space.Space);
	245	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Space);
	246	return renderExpression(allocator, stream, tree, indent, start_col, body, space);
	247	} else {
	248	try renderToken(tree, stream, suspend_node.suspend_token, indent, start_col, Space.Space);
	249	return renderExpression(allocator, stream, tree, indent, start_col, payload, space);
	250	}
	251	} else if (suspend_node.body) \|body\| {
	252	try renderToken(tree, stream, suspend_node.suspend_token, indent, start_col, Space.Space);
	253	return renderExpression(allocator, stream, tree, indent, start_col, body, space);
	254	} else {
	255	return renderToken(tree, stream, suspend_node.suspend_token, indent, start_col, space);
	256	}
	257	},
572	258
573		try stack.append(RenderState { .Text = "\|"});
574		},
575		ast.Node.Id.GroupedExpression => {
576		const grouped_expr = @fieldParentPtr(ast.Node.GroupedExpression, "base", base);
577		try stack.append(RenderState { .Text = ")"});
578		try stack.append(RenderState { .Expression = grouped_expr.expr });
579		try stack.append(RenderState { .Text = "("});
580		},
581		ast.Node.Id.FieldInitializer => {
582		const field_init = @fieldParentPtr(ast.Node.FieldInitializer, "base", base);
583		try stream.print(".{} = ", tree.tokenSlice(field_init.name_token));
584		try stack.append(RenderState { .Expression = field_init.expr });
585		},
586		ast.Node.Id.IntegerLiteral => {
587		const integer_literal = @fieldParentPtr(ast.Node.IntegerLiteral, "base", base);
588		try stream.print("{}", tree.tokenSlice(integer_literal.token));
589		},
590		ast.Node.Id.FloatLiteral => {
591		const float_literal = @fieldParentPtr(ast.Node.FloatLiteral, "base", base);
592		try stream.print("{}", tree.tokenSlice(float_literal.token));
593		},
594		ast.Node.Id.StringLiteral => {
595		const string_literal = @fieldParentPtr(ast.Node.StringLiteral, "base", base);
596		try stream.print("{}", tree.tokenSlice(string_literal.token));
597		},
598		ast.Node.Id.CharLiteral => {
599		const char_literal = @fieldParentPtr(ast.Node.CharLiteral, "base", base);
600		try stream.print("{}", tree.tokenSlice(char_literal.token));
601		},
602		ast.Node.Id.BoolLiteral => {
603		const bool_literal = @fieldParentPtr(ast.Node.CharLiteral, "base", base);
604		try stream.print("{}", tree.tokenSlice(bool_literal.token));
605		},
606		ast.Node.Id.NullLiteral => {
607		const null_literal = @fieldParentPtr(ast.Node.NullLiteral, "base", base);
608		try stream.print("{}", tree.tokenSlice(null_literal.token));
609		},
610		ast.Node.Id.ThisLiteral => {
611		const this_literal = @fieldParentPtr(ast.Node.ThisLiteral, "base", base);
612		try stream.print("{}", tree.tokenSlice(this_literal.token));
613		},
614		ast.Node.Id.Unreachable => {
615		const unreachable_node = @fieldParentPtr(ast.Node.Unreachable, "base", base);
616		try stream.print("{}", tree.tokenSlice(unreachable_node.token));
617		},
618		ast.Node.Id.ErrorType => {
619		const error_type = @fieldParentPtr(ast.Node.ErrorType, "base", base);
620		try stream.print("{}", tree.tokenSlice(error_type.token));
621		},
622		ast.Node.Id.VarType => {
623		const var_type = @fieldParentPtr(ast.Node.VarType, "base", base);
624		try stream.print("{}", tree.tokenSlice(var_type.token));
625		},
626		ast.Node.Id.ContainerDecl => {
627		const container_decl = @fieldParentPtr(ast.Node.ContainerDecl, "base", base);
	259	ast.Node.Id.InfixOp => {
	260	const infix_op_node = @fieldParentPtr(ast.Node.InfixOp, "base", base);
628	261
629		switch (container_decl.layout) {
630		ast.Node.ContainerDecl.Layout.Packed => try stream.print("packed "),
631		ast.Node.ContainerDecl.Layout.Extern => try stream.print("extern "),
632		ast.Node.ContainerDecl.Layout.Auto => { },
633		}
	262	const op_token = tree.tokens.at(infix_op_node.op_token);
	263	const op_space = switch (infix_op_node.op) {
	264	ast.Node.InfixOp.Op.Period, ast.Node.InfixOp.Op.ErrorUnion, ast.Node.InfixOp.Op.Range => Space.None,
	265	else => Space.Space,
	266	};
	267	try renderExpression(allocator, stream, tree, indent, start_col, infix_op_node.lhs, op_space);
634	268
635		switch (container_decl.kind) {
636		ast.Node.ContainerDecl.Kind.Struct => try stream.print("struct"),
637		ast.Node.ContainerDecl.Kind.Enum => try stream.print("enum"),
638		ast.Node.ContainerDecl.Kind.Union => try stream.print("union"),
639		}
	269	const after_op_space = blk: {
	270	const loc = tree.tokenLocation(tree.tokens.at(infix_op_node.op_token).end, tree.nextToken(infix_op_node.op_token));
	271	break :blk if (loc.line == 0) op_space else Space.Newline;
	272	};
640	273
641		if (container_decl.fields_and_decls.len == 0) {
642		try stack.append(RenderState { .Text = "{}"});
643		} else {
644		try stack.append(RenderState { .Text = "}"});
645		try stack.append(RenderState.PrintIndent);
646		try stack.append(RenderState { .Indent = indent });
647		try stack.append(RenderState { .Text = "\n"});
648
649		var i = container_decl.fields_and_decls.len;
650		while (i != 0) {
651		i -= 1;
652		const node = *container_decl.fields_and_decls.at(i);
653		try stack.append(RenderState { .TopLevelDecl = node});
654		try stack.append(RenderState.PrintIndent);
655		try stack.append(RenderState {
656		.Text = blk: {
657		if (i != 0) {
658		const prev_node = *container_decl.fields_and_decls.at(i - 1);
659		const prev_node_last_token_end = tree.tokens.at(prev_node.lastToken()).end;
660		const loc = tree.tokenLocation(prev_node_last_token_end, node.firstToken());
661		if (loc.line >= 2) {
662		break :blk "\n\n";
663		}
664		}
665		break :blk "\n";
666		},
667		});
668		}
669		try stack.append(RenderState { .Indent = indent + indent_delta});
670		try stack.append(RenderState { .Text = "{"});
671		}
	274	try renderToken(tree, stream, infix_op_node.op_token, indent, start_col, after_op_space);
	275	if (after_op_space == Space.Newline) {
	276	try stream.writeByteNTimes(' ', indent + indent_delta);
	277	start_col.* = indent + indent_delta;
	278	}
672	279
673		switch (container_decl.init_arg_expr) {
674		ast.Node.ContainerDecl.InitArg.None => try stack.append(RenderState { .Text = " "}),
675		ast.Node.ContainerDecl.InitArg.Enum => \|enum_tag_type\| {
676		if (enum_tag_type) \|expr\| {
677		try stack.append(RenderState { .Text = ")) "});
678		try stack.append(RenderState { .Expression = expr});
679		try stack.append(RenderState { .Text = "(enum("});
680		} else {
681		try stack.append(RenderState { .Text = "(enum) "});
682		}
683		},
684		ast.Node.ContainerDecl.InitArg.Type => \|type_expr\| {
685		try stack.append(RenderState { .Text = ") "});
686		try stack.append(RenderState { .Expression = type_expr});
687		try stack.append(RenderState { .Text = "("});
688		},
689		}
	280	switch (infix_op_node.op) {
	281	ast.Node.InfixOp.Op.Catch => \|maybe_payload\| if (maybe_payload) \|payload\| {
	282	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Space);
690	283	},
691		ast.Node.Id.ErrorSetDecl => {
692		const err_set_decl = @fieldParentPtr(ast.Node.ErrorSetDecl, "base", base);
	284	else => {},
	285	}
693	286
694		if (err_set_decl.decls.len == 0) {
695		try stream.write("error{}");
696		continue;
697		}
	287	return renderExpression(allocator, stream, tree, indent, start_col, infix_op_node.rhs, space);
	288	},
698	289
699		if (err_set_decl.decls.len == 1) blk: {
700		const node = *err_set_decl.decls.at(0);
	290	ast.Node.Id.PrefixOp => {
	291	const prefix_op_node = @fieldParentPtr(ast.Node.PrefixOp, "base", base);
701	292
702		// if there are any doc comments or same line comments
703		// don't try to put it all on one line
704		if (node.cast(ast.Node.ErrorTag)) \|tag\| {
705		if (tag.doc_comments != null) break :blk;
706		} else {
707		break :blk;
708		}
	293	switch (prefix_op_node.op) {
	294	ast.Node.PrefixOp.Op.AddrOf => \|addr_of_info\| {
	295	try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None); // &
	296	if (addr_of_info.align_info) \|align_info\| {
	297	const lparen_token = tree.prevToken(align_info.node.firstToken());
	298	const align_token = tree.prevToken(lparen_token);
709	299
	300	try renderToken(tree, stream, align_token, indent, start_col, Space.None); // align
	301	try renderToken(tree, stream, lparen_token, indent, start_col, Space.None); // (
710	302
711		try stream.write("error{");
712		try stack.append(RenderState { .Text = "}" });
713		try stack.append(RenderState { .TopLevelDecl = node });
714		continue;
715		}
	303	try renderExpression(allocator, stream, tree, indent, start_col, align_info.node, Space.None);
716	304
717		try stream.write("error{");
	305	if (align_info.bit_range) \|bit_range\| {
	306	const colon1 = tree.prevToken(bit_range.start.firstToken());
	307	const colon2 = tree.prevToken(bit_range.end.firstToken());
718	308
719		try stack.append(RenderState { .Text = "}"});
720		try stack.append(RenderState.PrintIndent);
721		try stack.append(RenderState { .Indent = indent });
722		try stack.append(RenderState { .Text = "\n"});
	309	try renderToken(tree, stream, colon1, indent, start_col, Space.None); // :
	310	try renderExpression(allocator, stream, tree, indent, start_col, bit_range.start, Space.None);
	311	try renderToken(tree, stream, colon2, indent, start_col, Space.None); // :
	312	try renderExpression(allocator, stream, tree, indent, start_col, bit_range.end, Space.None);
723	313
724		var i = err_set_decl.decls.len;
725		while (i != 0) {
726		i -= 1;
727		const node = *err_set_decl.decls.at(i);
728		if (node.id != ast.Node.Id.LineComment) {
729		try stack.append(RenderState { .Text = "," });
	314	const rparen_token = tree.nextToken(bit_range.end.lastToken());
	315	try renderToken(tree, stream, rparen_token, indent, start_col, Space.Space); // )
	316	} else {
	317	const rparen_token = tree.nextToken(align_info.node.lastToken());
	318	try renderToken(tree, stream, rparen_token, indent, start_col, Space.Space); // )
730	319	}
731		try stack.append(RenderState { .TopLevelDecl = node });
732		try stack.append(RenderState.PrintIndent);
733		try stack.append(RenderState {
734		.Text = blk: {
735		if (i != 0) {
736		const prev_node = *err_set_decl.decls.at(i - 1);
737		const prev_node_last_token_end = tree.tokens.at(prev_node.lastToken()).end;
738		const loc = tree.tokenLocation(prev_node_last_token_end, node.firstToken());
739		if (loc.line >= 2) {
740		break :blk "\n\n";
741		}
742		}
743		break :blk "\n";
744		},
745		});
746	320	}
747		try stack.append(RenderState { .Indent = indent + indent_delta});
748		},
749		ast.Node.Id.MultilineStringLiteral => {
750		const multiline_str_literal = @fieldParentPtr(ast.Node.MultilineStringLiteral, "base", base);
751		try stream.print("\n");
752
753		var i : usize = 0;
754		while (i < multiline_str_literal.lines.len) : (i += 1) {
755		const t = *multiline_str_literal.lines.at(i);
756		try stream.writeByteNTimes(' ', indent + indent_delta);
757		try stream.print("{}", tree.tokenSlice(t));
	321	if (addr_of_info.const_token) \|const_token\| {
	322	try renderToken(tree, stream, const_token, indent, start_col, Space.Space); // const
758	323	}
759		try stream.writeByteNTimes(' ', indent);
760		},
761		ast.Node.Id.UndefinedLiteral => {
762		const undefined_literal = @fieldParentPtr(ast.Node.UndefinedLiteral, "base", base);
763		try stream.print("{}", tree.tokenSlice(undefined_literal.token));
764		},
765		ast.Node.Id.BuiltinCall => {
766		const builtin_call = @fieldParentPtr(ast.Node.BuiltinCall, "base", base);
767		try stream.print("{}(", tree.tokenSlice(builtin_call.builtin_token));
768		try stack.append(RenderState { .Text = ")"});
769		var i = builtin_call.params.len;
770		while (i != 0) {
771		i -= 1;
772		const param_node = *builtin_call.params.at(i);
773		try stack.append(RenderState { .Expression = param_node});
774		if (i != 0) {
775		try stack.append(RenderState { .Text = ", " });
776		}
	324	if (addr_of_info.volatile_token) \|volatile_token\| {
	325	try renderToken(tree, stream, volatile_token, indent, start_col, Space.Space); // volatile
777	326	}
778	327	},
779		ast.Node.Id.FnProto => {
780		const fn_proto = @fieldParentPtr(ast.Node.FnProto, "base", base);
781
782		switch (fn_proto.return_type) {
783		ast.Node.FnProto.ReturnType.Explicit => \|node\| {
784		try stack.append(RenderState { .Expression = node});
785		},
786		ast.Node.FnProto.ReturnType.InferErrorSet => \|node\| {
787		try stack.append(RenderState { .Expression = node});
788		try stack.append(RenderState { .Text = "!"});
789		},
790		}
791	328
792		if (fn_proto.align_expr) \|align_expr\| {
793		try stack.append(RenderState { .Text = ") " });
794		try stack.append(RenderState { .Expression = align_expr});
795		try stack.append(RenderState { .Text = "align(" });
796		}
	329	ast.Node.PrefixOp.Op.SliceType => \|addr_of_info\| {
	330	try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None); // [
	331	try renderToken(tree, stream, tree.nextToken(prefix_op_node.op_token), indent, start_col, Space.None); // ]
797	332
798		try stack.append(RenderState { .Text = ") " });
799		var i = fn_proto.params.len;
800		while (i != 0) {
801		i -= 1;
802		const param_decl_node = *fn_proto.params.at(i);
803		try stack.append(RenderState { .ParamDecl = param_decl_node});
804		if (i != 0) {
805		try stack.append(RenderState { .Text = ", " });
806		}
807		}
	333	if (addr_of_info.align_info) \|align_info\| {
	334	const lparen_token = tree.prevToken(align_info.node.firstToken());
	335	const align_token = tree.prevToken(lparen_token);
808	336
809		try stack.append(RenderState { .Text = "(" });
810		if (fn_proto.name_token) \|name_token\| {
811		try stack.append(RenderState { .Text = tree.tokenSlice(name_token) });
812		try stack.append(RenderState { .Text = " " });
813		}
	337	try renderToken(tree, stream, align_token, indent, start_col, Space.None); // align
	338	try renderToken(tree, stream, lparen_token, indent, start_col, Space.None); // (
814	339
815		try stack.append(RenderState { .Text = "fn" });
	340	try renderExpression(allocator, stream, tree, indent, start_col, align_info.node, Space.None);
816	341
817		if (fn_proto.async_attr) \|async_attr\| {
818		try stack.append(RenderState { .Text = " " });
819		try stack.append(RenderState { .Expression = &async_attr.base });
820		}
	342	if (align_info.bit_range) \|bit_range\| {
	343	const colon1 = tree.prevToken(bit_range.start.firstToken());
	344	const colon2 = tree.prevToken(bit_range.end.firstToken());
821	345
822		if (fn_proto.cc_token) \|cc_token\| {
823		try stack.append(RenderState { .Text = " " });
824		try stack.append(RenderState { .Text = tree.tokenSlice(cc_token) });
825		}
	346	try renderToken(tree, stream, colon1, indent, start_col, Space.None); // :
	347	try renderExpression(allocator, stream, tree, indent, start_col, bit_range.start, Space.None);
	348	try renderToken(tree, stream, colon2, indent, start_col, Space.None); // :
	349	try renderExpression(allocator, stream, tree, indent, start_col, bit_range.end, Space.None);
826	350
827		if (fn_proto.lib_name) \|lib_name\| {
828		try stack.append(RenderState { .Text = " " });
829		try stack.append(RenderState { .Expression = lib_name });
	351	const rparen_token = tree.nextToken(bit_range.end.lastToken());
	352	try renderToken(tree, stream, rparen_token, indent, start_col, Space.Space); // )
	353	} else {
	354	const rparen_token = tree.nextToken(align_info.node.lastToken());
	355	try renderToken(tree, stream, rparen_token, indent, start_col, Space.Space); // )
	356	}
830	357	}
831		if (fn_proto.extern_export_inline_token) \|extern_export_inline_token\| {
832		try stack.append(RenderState { .Text = " " });
833		try stack.append(RenderState { .Text = tree.tokenSlice(extern_export_inline_token) });
	358	if (addr_of_info.const_token) \|const_token\| {
	359	try renderToken(tree, stream, const_token, indent, start_col, Space.Space);
834	360	}
835
836		if (fn_proto.visib_token) \|visib_token_index\| {
837		const visib_token = tree.tokens.at(visib_token_index);
838		assert(visib_token.id == Token.Id.Keyword_pub or visib_token.id == Token.Id.Keyword_export);
839		try stack.append(RenderState { .Text = " " });
840		try stack.append(RenderState { .Text = tree.tokenSlice(visib_token_index) });
	361	if (addr_of_info.volatile_token) \|volatile_token\| {
	362	try renderToken(tree, stream, volatile_token, indent, start_col, Space.Space);
841	363	}
842	364	},
843		ast.Node.Id.PromiseType => {
844		const promise_type = @fieldParentPtr(ast.Node.PromiseType, "base", base);
845		try stream.write(tree.tokenSlice(promise_type.promise_token));
846		if (promise_type.result) \|result\| {
847		try stream.write(tree.tokenSlice(result.arrow_token));
848		try stack.append(RenderState { .Expression = result.return_type});
849		}
	365
	366	ast.Node.PrefixOp.Op.ArrayType => \|array_index\| {
	367	try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None); // [
	368	try renderExpression(allocator, stream, tree, indent, start_col, array_index, Space.None);
	369	try renderToken(tree, stream, tree.nextToken(array_index.lastToken()), indent, start_col, Space.None); // ]
	370	},
	371	ast.Node.PrefixOp.Op.BitNot,
	372	ast.Node.PrefixOp.Op.BoolNot,
	373	ast.Node.PrefixOp.Op.Negation,
	374	ast.Node.PrefixOp.Op.NegationWrap,
	375	ast.Node.PrefixOp.Op.UnwrapMaybe,
	376	ast.Node.PrefixOp.Op.MaybeType,
	377	ast.Node.PrefixOp.Op.PointerType,
	378	=> {
	379	try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None);
850	380	},
851		ast.Node.Id.LineComment => {
852		const line_comment_node = @fieldParentPtr(ast.Node.LineComment, "base", base);
853		try stream.write(tree.tokenSlice(line_comment_node.token));
	381
	382	ast.Node.PrefixOp.Op.Try,
	383	ast.Node.PrefixOp.Op.Await,
	384	ast.Node.PrefixOp.Op.Cancel,
	385	ast.Node.PrefixOp.Op.Resume,
	386	=> {
	387	try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.Space);
854	388	},
855		ast.Node.Id.DocComment => unreachable, // doc comments are attached to nodes
856		ast.Node.Id.Switch => {
857		const switch_node = @fieldParentPtr(ast.Node.Switch, "base", base);
	389	}
858	390
859		try stream.print("{} (", tree.tokenSlice(switch_node.switch_token));
	391	return renderExpression(allocator, stream, tree, indent, start_col, prefix_op_node.rhs, space);
	392	},
860	393
861		if (switch_node.cases.len == 0) {
862		try stack.append(RenderState { .Text = ") {}"});
863		try stack.append(RenderState { .Expression = switch_node.expr });
864		continue;
	394	ast.Node.Id.SuffixOp => {
	395	const suffix_op = @fieldParentPtr(ast.Node.SuffixOp, "base", base);
	396
	397	switch (suffix_op.op) {
	398	@TagType(ast.Node.SuffixOp.Op).Call => \|*call_info\| {
	399	if (call_info.async_attr) \|async_attr\| {
	400	try renderExpression(allocator, stream, tree, indent, start_col, &async_attr.base, Space.Space);
865	401	}
866	402
867		try stack.append(RenderState { .Text = "}"});
868		try stack.append(RenderState.PrintIndent);
869		try stack.append(RenderState { .Indent = indent });
870		try stack.append(RenderState { .Text = "\n"});
871
872		var i = switch_node.cases.len;
873		while (i != 0) {
874		i -= 1;
875		const node = *switch_node.cases.at(i);
876		try stack.append(RenderState { .Expression = node});
877		try stack.append(RenderState.PrintIndent);
878		try stack.append(RenderState {
879		.Text = blk: {
880		if (i != 0) {
881		const prev_node = *switch_node.cases.at(i - 1);
882		const prev_node_last_token_end = tree.tokens.at(prev_node.lastToken()).end;
883		const loc = tree.tokenLocation(prev_node_last_token_end, node.firstToken());
884		if (loc.line >= 2) {
885		break :blk "\n\n";
886		}
887		}
888		break :blk "\n";
889		},
890		});
	403	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	404
	405	const lparen = tree.nextToken(suffix_op.lhs.lastToken());
	406
	407	if (call_info.params.len == 0) {
	408	try renderToken(tree, stream, lparen, indent, start_col, Space.None);
	409	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
891	410	}
892		try stack.append(RenderState { .Indent = indent + indent_delta});
893		try stack.append(RenderState { .Text = ") {"});
894		try stack.append(RenderState { .Expression = switch_node.expr });
895		},
896		ast.Node.Id.SwitchCase => {
897		const switch_case = @fieldParentPtr(ast.Node.SwitchCase, "base", base);
898
899		try stack.append(RenderState { .Token = switch_case.lastToken() + 1 });
900		try stack.append(RenderState { .Expression = switch_case.expr });
901		if (switch_case.payload) \|payload\| {
902		try stack.append(RenderState { .Text = " " });
903		try stack.append(RenderState { .Expression = payload });
	411
	412	const src_has_trailing_comma = blk: {
	413	const maybe_comma = tree.prevToken(suffix_op.rtoken);
	414	break :blk tree.tokens.at(maybe_comma).id == Token.Id.Comma;
	415	};
	416
	417	if (src_has_trailing_comma) {
	418	const new_indent = indent + indent_delta;
	419	try renderToken(tree, stream, lparen, new_indent, start_col, Space.Newline);
	420
	421	var it = call_info.params.iterator(0);
	422	while (true) {
	423	const param_node = ??it.next();
	424
	425	const param_node_new_indent = if (param_node.*.id == ast.Node.Id.MultilineStringLiteral) blk: {
	426	break :blk indent;
	427	} else blk: {
	428	try stream.writeByteNTimes(' ', new_indent);
	429	break :blk new_indent;
	430	};
	431
	432	if (it.peek()) \|next_node\| {
	433	try renderExpression(allocator, stream, tree, param_node_new_indent, start_col, param_node.*, Space.None);
	434	const comma = tree.nextToken(param_node.*.lastToken());
	435	try renderToken(tree, stream, comma, new_indent, start_col, Space.Newline); // ,
	436	try renderExtraNewline(tree, stream, start_col, next_node.*);
	437	} else {
	438	try renderExpression(allocator, stream, tree, param_node_new_indent, start_col, param_node.*, Space.Comma);
	439	try stream.writeByteNTimes(' ', indent);
	440	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
	441	}
	442	}
904	443	}
905		try stack.append(RenderState { .Text = " => "});
906	444
907		var i = switch_case.items.len;
908		while (i != 0) {
909		i -= 1;
910		try stack.append(RenderState { .Expression = *switch_case.items.at(i) });
	445	try renderToken(tree, stream, lparen, indent, start_col, Space.None); // (
911	446
912		if (i != 0) {
913		try stack.append(RenderState.PrintIndent);
914		try stack.append(RenderState { .Text = ",\n" });
	447	var it = call_info.params.iterator(0);
	448	while (it.next()) \|param_node\| {
	449	try renderExpression(allocator, stream, tree, indent, start_col, param_node.*, Space.None);
	450
	451	if (it.peek() != null) {
	452	const comma = tree.nextToken(param_node.*.lastToken());
	453	try renderToken(tree, stream, comma, indent, start_col, Space.Space);
915	454	}
916	455	}
	456	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
	457	},
	458
	459	ast.Node.SuffixOp.Op.ArrayAccess => \|index_expr\| {
	460	const lbracket = tree.prevToken(index_expr.firstToken());
	461	const rbracket = tree.nextToken(index_expr.lastToken());
	462
	463	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	464	try renderToken(tree, stream, lbracket, indent, start_col, Space.None); // [
	465	try renderExpression(allocator, stream, tree, indent, start_col, index_expr, Space.None);
	466	return renderToken(tree, stream, rbracket, indent, start_col, space); // ]
917	467	},
918		ast.Node.Id.SwitchElse => {
919		const switch_else = @fieldParentPtr(ast.Node.SwitchElse, "base", base);
920		try stream.print("{}", tree.tokenSlice(switch_else.token));
	468
	469	ast.Node.SuffixOp.Op.Deref => {
	470	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	471	try renderToken(tree, stream, tree.prevToken(suffix_op.rtoken), indent, start_col, Space.None); // .
	472	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // *
921	473	},
922		ast.Node.Id.Else => {
923		const else_node = @fieldParentPtr(ast.Node.Else, "base", base);
924		try stream.print("{}", tree.tokenSlice(else_node.else_token));
925
926		switch (else_node.body.id) {
927		ast.Node.Id.Block, ast.Node.Id.If,
928		ast.Node.Id.For, ast.Node.Id.While,
929		ast.Node.Id.Switch => {
930		try stream.print(" ");
931		try stack.append(RenderState { .Expression = else_node.body });
932		},
933		else => {
934		try stack.append(RenderState { .Indent = indent });
935		try stack.append(RenderState { .Expression = else_node.body });
936		try stack.append(RenderState.PrintIndent);
937		try stack.append(RenderState { .Indent = indent + indent_delta });
938		try stack.append(RenderState { .Text = "\n" });
939		}
940		}
941	474
942		if (else_node.payload) \|payload\| {
943		try stack.append(RenderState { .Text = " " });
944		try stack.append(RenderState { .Expression = payload });
	475	@TagType(ast.Node.SuffixOp.Op).Slice => \|range\| {
	476	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	477
	478	const lbracket = tree.prevToken(range.start.firstToken());
	479	const dotdot = tree.nextToken(range.start.lastToken());
	480
	481	try renderToken(tree, stream, lbracket, indent, start_col, Space.None); // [
	482	try renderExpression(allocator, stream, tree, indent, start_col, range.start, Space.None);
	483	try renderToken(tree, stream, dotdot, indent, start_col, Space.None); // ..
	484	if (range.end) \|end\| {
	485	try renderExpression(allocator, stream, tree, indent, start_col, end, Space.None);
945	486	}
	487	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // ]
946	488	},
947		ast.Node.Id.While => {
948		const while_node = @fieldParentPtr(ast.Node.While, "base", base);
949		if (while_node.label) \|label\| {
950		try stream.print("{}: ", tree.tokenSlice(label));
951		}
952	489
953		if (while_node.inline_token) \|inline_token\| {
954		try stream.print("{} ", tree.tokenSlice(inline_token));
955		}
	490	ast.Node.SuffixOp.Op.StructInitializer => \|*field_inits\| {
	491	const lbrace = tree.nextToken(suffix_op.lhs.lastToken());
956	492
957		try stream.print("{} ", tree.tokenSlice(while_node.while_token));
	493	if (field_inits.len == 0) {
	494	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	495	try renderToken(tree, stream, lbrace, indent, start_col, Space.None);
	496	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
	497	}
958	498
959		if (while_node.@"else") \|@"else"\| {
960		try stack.append(RenderState { .Expression = &@"else".base });
	499	if (field_inits.len == 1) blk: {
	500	const field_init = ??field_inits.at(0).*.cast(ast.Node.FieldInitializer);
961	501
962		if (while_node.body.id == ast.Node.Id.Block) {
963		try stack.append(RenderState { .Text = " " });
964		} else {
965		try stack.append(RenderState.PrintIndent);
966		try stack.append(RenderState { .Text = "\n" });
	502	if (field_init.expr.cast(ast.Node.SuffixOp)) \|nested_suffix_op\| {
	503	if (nested_suffix_op.op == ast.Node.SuffixOp.Op.StructInitializer) {
	504	break :blk;
	505	}
967	506	}
968		}
969	507
970		if (while_node.body.id == ast.Node.Id.Block) {
971		try stack.append(RenderState { .Expression = while_node.body });
972		try stack.append(RenderState { .Text = " " });
973		} else {
974		try stack.append(RenderState { .Indent = indent });
975		try stack.append(RenderState { .Expression = while_node.body });
976		try stack.append(RenderState.PrintIndent);
977		try stack.append(RenderState { .Indent = indent + indent_delta });
978		try stack.append(RenderState { .Text = "\n" });
	508	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	509	try renderToken(tree, stream, lbrace, indent, start_col, Space.Space);
	510	try renderExpression(allocator, stream, tree, indent, start_col, &field_init.base, Space.Space);
	511	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
979	512	}
980	513
981		if (while_node.continue_expr) \|continue_expr\| {
982		try stack.append(RenderState { .Text = ")" });
983		try stack.append(RenderState { .Expression = continue_expr });
984		try stack.append(RenderState { .Text = ": (" });
985		try stack.append(RenderState { .Text = " " });
986		}
	514	const src_has_trailing_comma = blk: {
	515	const maybe_comma = tree.prevToken(suffix_op.rtoken);
	516	break :blk tree.tokens.at(maybe_comma).id == Token.Id.Comma;
	517	};
987	518
988		if (while_node.payload) \|payload\| {
989		try stack.append(RenderState { .Expression = payload });
990		try stack.append(RenderState { .Text = " " });
991		}
	519	const src_same_line = blk: {
	520	const loc = tree.tokenLocation(tree.tokens.at(lbrace).end, suffix_op.rtoken);
	521	break :blk loc.line == 0;
	522	};
992	523
993		try stack.append(RenderState { .Text = ")" });
994		try stack.append(RenderState { .Expression = while_node.condition });
995		try stack.append(RenderState { .Text = "(" });
996		},
997		ast.Node.Id.For => {
998		const for_node = @fieldParentPtr(ast.Node.For, "base", base);
999		if (for_node.label) \|label\| {
1000		try stream.print("{}: ", tree.tokenSlice(label));
1001		}
	524	if (!src_has_trailing_comma and src_same_line) {
	525	// render all on one line, no trailing comma
	526	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	527	try renderToken(tree, stream, lbrace, indent, start_col, Space.Space);
	528
	529	var it = field_inits.iterator(0);
	530	while (it.next()) \|field_init\| {
	531	if (it.peek() != null) {
	532	try renderExpression(allocator, stream, tree, indent, start_col, field_init.*, Space.None);
	533
	534	const comma = tree.nextToken(field_init.*.lastToken());
	535	try renderToken(tree, stream, comma, indent, start_col, Space.Space);
	536	} else {
	537	try renderExpression(allocator, stream, tree, indent, start_col, field_init.*, Space.Space);
	538	}
	539	}
1002	540
1003		if (for_node.inline_token) \|inline_token\| {
1004		try stream.print("{} ", tree.tokenSlice(inline_token));
	541	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
1005	542	}
1006	543
1007		try stream.print("{} ", tree.tokenSlice(for_node.for_token));
	544	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	545	try renderToken(tree, stream, lbrace, indent, start_col, Space.Newline);
	546
	547	const new_indent = indent + indent_delta;
1008	548
1009		if (for_node.@"else") \|@"else"\| {
1010		try stack.append(RenderState { .Expression = &@"else".base });
	549	var it = field_inits.iterator(0);
	550	while (it.next()) \|field_init\| {
	551	try stream.writeByteNTimes(' ', new_indent);
1011	552
1012		if (for_node.body.id == ast.Node.Id.Block) {
1013		try stack.append(RenderState { .Text = " " });
	553	if (it.peek()) \|next_field_init\| {
	554	try renderExpression(allocator, stream, tree, new_indent, start_col, field_init.*, Space.None);
	555
	556	const comma = tree.nextToken(field_init.*.lastToken());
	557	try renderToken(tree, stream, comma, new_indent, start_col, Space.Newline);
	558
	559	try renderExtraNewline(tree, stream, start_col, next_field_init.*);
1014	560	} else {
1015		try stack.append(RenderState.PrintIndent);
1016		try stack.append(RenderState { .Text = "\n" });
	561	try renderExpression(allocator, stream, tree, new_indent, start_col, field_init.*, Space.Comma);
1017	562	}
1018	563	}
1019	564
1020		if (for_node.body.id == ast.Node.Id.Block) {
1021		try stack.append(RenderState { .Expression = for_node.body });
1022		try stack.append(RenderState { .Text = " " });
1023		} else {
1024		try stack.append(RenderState { .Indent = indent });
1025		try stack.append(RenderState { .Expression = for_node.body });
1026		try stack.append(RenderState.PrintIndent);
1027		try stack.append(RenderState { .Indent = indent + indent_delta });
1028		try stack.append(RenderState { .Text = "\n" });
	565	try stream.writeByteNTimes(' ', indent);
	566	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
	567	},
	568
	569	ast.Node.SuffixOp.Op.ArrayInitializer => \|*exprs\| {
	570	const lbrace = tree.nextToken(suffix_op.lhs.lastToken());
	571
	572	if (exprs.len == 0) {
	573	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	574	try renderToken(tree, stream, lbrace, indent, start_col, Space.None);
	575	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
1029	576	}
	577	if (exprs.len == 1) {
	578	const expr = exprs.at(0).*;
1030	579
1031		if (for_node.payload) \|payload\| {
1032		try stack.append(RenderState { .Expression = payload });
1033		try stack.append(RenderState { .Text = " " });
	580	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	581	try renderToken(tree, stream, lbrace, indent, start_col, Space.None);
	582	try renderExpression(allocator, stream, tree, indent, start_col, expr, Space.None);
	583	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
1034	584	}
1035	585
1036		try stack.append(RenderState { .Text = ")" });
1037		try stack.append(RenderState { .Expression = for_node.array_expr });
1038		try stack.append(RenderState { .Text = "(" });
1039		},
1040		ast.Node.Id.If => {
1041		const if_node = @fieldParentPtr(ast.Node.If, "base", base);
1042		try stream.print("{} ", tree.tokenSlice(if_node.if_token));
1043
1044		switch (if_node.body.id) {
1045		ast.Node.Id.Block, ast.Node.Id.If,
1046		ast.Node.Id.For, ast.Node.Id.While,
1047		ast.Node.Id.Switch => {
1048		if (if_node.@"else") \|@"else"\| {
1049		try stack.append(RenderState { .Expression = &@"else".base });
1050
1051		if (if_node.body.id == ast.Node.Id.Block) {
1052		try stack.append(RenderState { .Text = " " });
1053		} else {
1054		try stack.append(RenderState.PrintIndent);
1055		try stack.append(RenderState { .Text = "\n" });
1056		}
1057		}
1058		},
1059		else => {
1060		if (if_node.@"else") \|@"else"\| {
1061		try stack.append(RenderState { .Expression = @"else".body });
1062
1063		if (@"else".payload) \|payload\| {
1064		try stack.append(RenderState { .Text = " " });
1065		try stack.append(RenderState { .Expression = payload });
	586	try renderExpression(allocator, stream, tree, indent, start_col, suffix_op.lhs, Space.None);
	587
	588	// scan to find row size
	589	const maybe_row_size: ?usize = blk: {
	590	var count: usize = 1;
	591	var it = exprs.iterator(0);
	592	while (true) {
	593	const expr = (??it.next()).*;
	594	if (it.peek()) \|next_expr\| {
	595	const expr_last_token = expr.*.lastToken() + 1;
	596	const loc = tree.tokenLocation(tree.tokens.at(expr_last_token).end, next_expr.*.firstToken());
	597	if (loc.line != 0) break :blk count;
	598	count += 1;
	599	} else {
	600	const expr_last_token = expr.*.lastToken();
	601	const loc = tree.tokenLocation(tree.tokens.at(expr_last_token).end, suffix_op.rtoken);
	602	if (loc.line == 0) {
	603	// all on one line
	604	const src_has_trailing_comma = trailblk: {
	605	const maybe_comma = tree.prevToken(suffix_op.rtoken);
	606	break :trailblk tree.tokens.at(maybe_comma).id == Token.Id.Comma;
	607	};
	608	if (src_has_trailing_comma) {
	609	break :blk 1; // force row size 1
	610	} else {
	611	break :blk null; // no newlines
	612	}
1066	613	}
1067
1068		try stack.append(RenderState { .Text = " " });
1069		try stack.append(RenderState { .Text = tree.tokenSlice(@"else".else_token) });
1070		try stack.append(RenderState { .Text = " " });
	614	break :blk count;
1071	615	}
1072	616	}
1073		}
	617	};
1074	618
1075		try stack.append(RenderState { .Expression = if_node.body });
	619	if (maybe_row_size) \|row_size\| {
	620	const new_indent = indent + indent_delta;
	621	try renderToken(tree, stream, lbrace, new_indent, start_col, Space.Newline);
	622	try stream.writeByteNTimes(' ', new_indent);
1076	623
1077		if (if_node.payload) \|payload\| {
1078		try stack.append(RenderState { .Text = " " });
1079		try stack.append(RenderState { .Expression = payload });
1080		}
	624	var it = exprs.iterator(0);
	625	var i: usize = 1;
	626	while (it.next()) \|expr\| {
	627	if (it.peek()) \|next_expr\| {
	628	try renderExpression(allocator, stream, tree, new_indent, start_col, expr.*, Space.None);
1081	629
1082		try stack.append(RenderState { .NonBreakToken = if_node.condition.lastToken() + 1 });
1083		try stack.append(RenderState { .Expression = if_node.condition });
1084		try stack.append(RenderState { .Text = "(" });
1085		},
1086		ast.Node.Id.Asm => {
1087		const asm_node = @fieldParentPtr(ast.Node.Asm, "base", base);
1088		try stream.print("{} ", tree.tokenSlice(asm_node.asm_token));
	630	const comma = tree.nextToken(expr.*.lastToken());
1089	631
1090		if (asm_node.volatile_token) \|volatile_token\| {
1091		try stream.print("{} ", tree.tokenSlice(volatile_token));
1092		}
	632	if (i != row_size) {
	633	try renderToken(tree, stream, comma, new_indent, start_col, Space.Space); // ,
	634	i += 1;
	635	continue;
	636	}
	637	i = 1;
1093	638
1094		try stack.append(RenderState { .Indent = indent });
1095		try stack.append(RenderState { .Text = ")" });
1096		{
1097		var i = asm_node.clobbers.len;
1098		while (i != 0) {
1099		i -= 1;
1100		try stack.append(RenderState { .Expression = *asm_node.clobbers.at(i) });
	639	try renderToken(tree, stream, comma, new_indent, start_col, Space.Newline); // ,
1101	640
1102		if (i != 0) {
1103		try stack.append(RenderState { .Text = ", " });
	641	try renderExtraNewline(tree, stream, start_col, next_expr.*);
	642	try stream.writeByteNTimes(' ', new_indent);
	643	} else {
	644	try renderExpression(allocator, stream, tree, new_indent, start_col, expr.*, Space.Comma); // ,
1104	645	}
1105	646	}
1106		}
1107		try stack.append(RenderState { .Text = ": " });
1108		try stack.append(RenderState.PrintIndent);
1109		try stack.append(RenderState { .Indent = indent + indent_delta });
1110		try stack.append(RenderState { .Text = "\n" });
1111		{
1112		var i = asm_node.inputs.len;
1113		while (i != 0) {
1114		i -= 1;
1115		const node = *asm_node.inputs.at(i);
1116		try stack.append(RenderState { .Expression = &node.base});
1117
1118		if (i != 0) {
1119		try stack.append(RenderState.PrintIndent);
1120		try stack.append(RenderState {
1121		.Text = blk: {
1122		const prev_node = *asm_node.inputs.at(i - 1);
1123		const prev_node_last_token_end = tree.tokens.at(prev_node.lastToken()).end;
1124		const loc = tree.tokenLocation(prev_node_last_token_end, node.firstToken());
1125		if (loc.line >= 2) {
1126		break :blk "\n\n";
1127		}
1128		break :blk "\n";
1129		},
1130		});
1131		try stack.append(RenderState { .Text = "," });
	647	try stream.writeByteNTimes(' ', indent);
	648	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
	649	} else {
	650	try renderToken(tree, stream, lbrace, indent, start_col, Space.Space);
	651	var it = exprs.iterator(0);
	652	while (it.next()) \|expr\| {
	653	if (it.peek()) \|next_expr\| {
	654	try renderExpression(allocator, stream, tree, indent, start_col, expr.*, Space.None);
	655	const comma = tree.nextToken(expr.*.lastToken());
	656	try renderToken(tree, stream, comma, indent, start_col, Space.Space); // ,
	657	} else {
	658	try renderExpression(allocator, stream, tree, indent, start_col, expr.*, Space.Space);
1132	659	}
1133	660	}
	661
	662	return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space);
1134	663	}
1135		try stack.append(RenderState { .Indent = indent + indent_delta + 2});
1136		try stack.append(RenderState { .Text = ": "});
1137		try stack.append(RenderState.PrintIndent);
1138		try stack.append(RenderState { .Indent = indent + indent_delta});
1139		try stack.append(RenderState { .Text = "\n" });
1140		{
1141		var i = asm_node.outputs.len;
1142		while (i != 0) {
1143		i -= 1;
1144		const node = *asm_node.outputs.at(i);
1145		try stack.append(RenderState { .Expression = &node.base});
1146
1147		if (i != 0) {
1148		try stack.append(RenderState.PrintIndent);
1149		try stack.append(RenderState {
1150		.Text = blk: {
1151		const prev_node = *asm_node.outputs.at(i - 1);
1152		const prev_node_last_token_end = tree.tokens.at(prev_node.lastToken()).end;
1153		const loc = tree.tokenLocation(prev_node_last_token_end, node.firstToken());
1154		if (loc.line >= 2) {
1155		break :blk "\n\n";
1156		}
1157		break :blk "\n";
1158		},
1159		});
1160		try stack.append(RenderState { .Text = "," });
1161		}
	664	},
	665	}
	666	},
	667
	668	ast.Node.Id.ControlFlowExpression => {
	669	const flow_expr = @fieldParentPtr(ast.Node.ControlFlowExpression, "base", base);
	670
	671	switch (flow_expr.kind) {
	672	ast.Node.ControlFlowExpression.Kind.Break => \|maybe_label\| {
	673	if (maybe_label == null and flow_expr.rhs == null) {
	674	return renderToken(tree, stream, flow_expr.ltoken, indent, start_col, space); // break
	675	}
	676
	677	try renderToken(tree, stream, flow_expr.ltoken, indent, start_col, Space.Space); // break
	678	if (maybe_label) \|label\| {
	679	const colon = tree.nextToken(flow_expr.ltoken);
	680	try renderToken(tree, stream, colon, indent, start_col, Space.None); // :
	681
	682	if (flow_expr.rhs == null) {
	683	return renderExpression(allocator, stream, tree, indent, start_col, label, space); // label
1162	684	}
	685	try renderExpression(allocator, stream, tree, indent, start_col, label, Space.Space); // label
1163	686	}
1164		try stack.append(RenderState { .Indent = indent + indent_delta + 2});
1165		try stack.append(RenderState { .Text = ": "});
1166		try stack.append(RenderState.PrintIndent);
1167		try stack.append(RenderState { .Indent = indent + indent_delta});
1168		try stack.append(RenderState { .Text = "\n" });
1169		try stack.append(RenderState { .Expression = asm_node.template });
1170		try stack.append(RenderState { .Text = "(" });
1171	687	},
1172		ast.Node.Id.AsmInput => {
1173		const asm_input = @fieldParentPtr(ast.Node.AsmInput, "base", base);
1174
1175		try stack.append(RenderState { .Text = ")"});
1176		try stack.append(RenderState { .Expression = asm_input.expr});
1177		try stack.append(RenderState { .Text = " ("});
1178		try stack.append(RenderState { .Expression = asm_input.constraint });
1179		try stack.append(RenderState { .Text = "] "});
1180		try stack.append(RenderState { .Expression = asm_input.symbolic_name });
1181		try stack.append(RenderState { .Text = "["});
	688	ast.Node.ControlFlowExpression.Kind.Continue => \|maybe_label\| {
	689	assert(flow_expr.rhs == null);
	690
	691	if (maybe_label == null and flow_expr.rhs == null) {
	692	return renderToken(tree, stream, flow_expr.ltoken, indent, start_col, space); // continue
	693	}
	694
	695	try renderToken(tree, stream, flow_expr.ltoken, indent, start_col, Space.Space); // continue
	696	if (maybe_label) \|label\| {
	697	const colon = tree.nextToken(flow_expr.ltoken);
	698	try renderToken(tree, stream, colon, indent, start_col, Space.None); // :
	699
	700	return renderExpression(allocator, stream, tree, indent, start_col, label, space);
	701	}
1182	702	},
1183		ast.Node.Id.AsmOutput => {
1184		const asm_output = @fieldParentPtr(ast.Node.AsmOutput, "base", base);
1185
1186		try stack.append(RenderState { .Text = ")"});
1187		switch (asm_output.kind) {
1188		ast.Node.AsmOutput.Kind.Variable => \|variable_name\| {
1189		try stack.append(RenderState { .Expression = &variable_name.base});
1190		},
1191		ast.Node.AsmOutput.Kind.Return => \|return_type\| {
1192		try stack.append(RenderState { .Expression = return_type});
1193		try stack.append(RenderState { .Text = "-> "});
1194		},
	703	ast.Node.ControlFlowExpression.Kind.Return => {
	704	if (flow_expr.rhs == null) {
	705	return renderToken(tree, stream, flow_expr.ltoken, indent, start_col, space);
1195	706	}
1196		try stack.append(RenderState { .Text = " ("});
1197		try stack.append(RenderState { .Expression = asm_output.constraint });
1198		try stack.append(RenderState { .Text = "] "});
1199		try stack.append(RenderState { .Expression = asm_output.symbolic_name });
1200		try stack.append(RenderState { .Text = "["});
	707	try renderToken(tree, stream, flow_expr.ltoken, indent, start_col, Space.Space);
1201	708	},
	709	}
1202	710
1203		ast.Node.Id.StructField,
1204		ast.Node.Id.UnionTag,
1205		ast.Node.Id.EnumTag,
1206		ast.Node.Id.ErrorTag,
1207		ast.Node.Id.Root,
1208		ast.Node.Id.VarDecl,
1209		ast.Node.Id.Use,
1210		ast.Node.Id.TestDecl,
1211		ast.Node.Id.ParamDecl => unreachable,
1212		},
1213		RenderState.Statement => \|base\| {
1214		switch (base.id) {
1215		ast.Node.Id.VarDecl => {
1216		const var_decl = @fieldParentPtr(ast.Node.VarDecl, "base", base);
1217		try stack.append(RenderState { .VarDecl = var_decl});
1218		},
1219		else => {
1220		try stack.append(RenderState { .MaybeSemiColon = base });
1221		try stack.append(RenderState { .Expression = base });
1222		},
1223		}
1224		},
1225		RenderState.Indent => \|new_indent\| indent = new_indent,
1226		RenderState.PrintIndent => try stream.writeByteNTimes(' ', indent),
1227		RenderState.Token => \|token_index\| try renderToken(tree, stream, token_index, indent, true),
1228		RenderState.NonBreakToken => \|token_index\| try renderToken(tree, stream, token_index, indent, false),
1229		RenderState.MaybeSemiColon => \|base\| {
1230		if (base.requireSemiColon()) {
1231		const semicolon_index = base.lastToken() + 1;
1232		assert(tree.tokens.at(semicolon_index).id == Token.Id.Semicolon);
1233		try renderToken(tree, stream, semicolon_index, indent, true);
1234		}
1235		},
1236		}
1237		}
1238		}
	711	return renderExpression(allocator, stream, tree, indent, start_col, ??flow_expr.rhs, space);
	712	},
1239	713
1240		fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent: usize, line_break: bool) !void {
1241		const token = tree.tokens.at(token_index);
1242		try stream.write(tree.tokenSlicePtr(token));
	714	ast.Node.Id.Payload => {
	715	const payload = @fieldParentPtr(ast.Node.Payload, "base", base);
1243	716
1244		const next_token = tree.tokens.at(token_index + 1);
1245		if (next_token.id == Token.Id.LineComment) {
1246		const loc = tree.tokenLocationPtr(token.end, next_token);
1247		if (loc.line == 0) {
1248		try stream.print(" {}", tree.tokenSlicePtr(next_token));
1249		if (!line_break) {
1250		try stream.write("\n");
1251		try stream.writeByteNTimes(' ', indent + indent_delta);
1252		return;
	717	try renderToken(tree, stream, payload.lpipe, indent, start_col, Space.None);
	718	try renderExpression(allocator, stream, tree, indent, start_col, payload.error_symbol, Space.None);
	719	return renderToken(tree, stream, payload.rpipe, indent, start_col, space);
	720	},
	721
	722	ast.Node.Id.PointerPayload => {
	723	const payload = @fieldParentPtr(ast.Node.PointerPayload, "base", base);
	724
	725	try renderToken(tree, stream, payload.lpipe, indent, start_col, Space.None);
	726	if (payload.ptr_token) \|ptr_token\| {
	727	try renderToken(tree, stream, ptr_token, indent, start_col, Space.None);
1253	728	}
1254		}
1255		}
	729	try renderExpression(allocator, stream, tree, indent, start_col, payload.value_symbol, Space.None);
	730	return renderToken(tree, stream, payload.rpipe, indent, start_col, space);
	731	},
1256	732
1257		if (!line_break) {
1258		try stream.writeByte(' ');
1259		}
1260		}
	733	ast.Node.Id.PointerIndexPayload => {
	734	const payload = @fieldParentPtr(ast.Node.PointerIndexPayload, "base", base);
1261	735
1262		fn renderComments(tree: &ast.Tree, stream: var, node: var, indent: usize) !void {
	736	try renderToken(tree, stream, payload.lpipe, indent, start_col, Space.None);
	737	if (payload.ptr_token) \|ptr_token\| {
	738	try renderToken(tree, stream, ptr_token, indent, start_col, Space.None);
	739	}
	740	try renderExpression(allocator, stream, tree, indent, start_col, payload.value_symbol, Space.None);
	741
	742	if (payload.index_symbol) \|index_symbol\| {
	743	const comma = tree.nextToken(payload.value_symbol.lastToken());
	744
	745	try renderToken(tree, stream, comma, indent, start_col, Space.Space);
	746	try renderExpression(allocator, stream, tree, indent, start_col, index_symbol, Space.None);
	747	}
	748
	749	return renderToken(tree, stream, payload.rpipe, indent, start_col, space);
	750	},
	751
	752	ast.Node.Id.GroupedExpression => {
	753	const grouped_expr = @fieldParentPtr(ast.Node.GroupedExpression, "base", base);
	754
	755	try renderToken(tree, stream, grouped_expr.lparen, indent, start_col, Space.None);
	756	try renderExpression(allocator, stream, tree, indent, start_col, grouped_expr.expr, Space.None);
	757	return renderToken(tree, stream, grouped_expr.rparen, indent, start_col, space);
	758	},
	759
	760	ast.Node.Id.FieldInitializer => {
	761	const field_init = @fieldParentPtr(ast.Node.FieldInitializer, "base", base);
	762
	763	try renderToken(tree, stream, field_init.period_token, indent, start_col, Space.None); // .
	764	try renderToken(tree, stream, field_init.name_token, indent, start_col, Space.Space); // name
	765	try renderToken(tree, stream, tree.nextToken(field_init.name_token), indent, start_col, Space.Space); // =
	766	return renderExpression(allocator, stream, tree, indent, start_col, field_init.expr, space);
	767	},
	768
	769	ast.Node.Id.IntegerLiteral => {
	770	const integer_literal = @fieldParentPtr(ast.Node.IntegerLiteral, "base", base);
	771	return renderToken(tree, stream, integer_literal.token, indent, start_col, space);
	772	},
	773	ast.Node.Id.FloatLiteral => {
	774	const float_literal = @fieldParentPtr(ast.Node.FloatLiteral, "base", base);
	775	return renderToken(tree, stream, float_literal.token, indent, start_col, space);
	776	},
	777	ast.Node.Id.StringLiteral => {
	778	const string_literal = @fieldParentPtr(ast.Node.StringLiteral, "base", base);
	779	return renderToken(tree, stream, string_literal.token, indent, start_col, space);
	780	},
	781	ast.Node.Id.CharLiteral => {
	782	const char_literal = @fieldParentPtr(ast.Node.CharLiteral, "base", base);
	783	return renderToken(tree, stream, char_literal.token, indent, start_col, space);
	784	},
	785	ast.Node.Id.BoolLiteral => {
	786	const bool_literal = @fieldParentPtr(ast.Node.CharLiteral, "base", base);
	787	return renderToken(tree, stream, bool_literal.token, indent, start_col, space);
	788	},
	789	ast.Node.Id.NullLiteral => {
	790	const null_literal = @fieldParentPtr(ast.Node.NullLiteral, "base", base);
	791	return renderToken(tree, stream, null_literal.token, indent, start_col, space);
	792	},
	793	ast.Node.Id.ThisLiteral => {
	794	const this_literal = @fieldParentPtr(ast.Node.ThisLiteral, "base", base);
	795	return renderToken(tree, stream, this_literal.token, indent, start_col, space);
	796	},
	797	ast.Node.Id.Unreachable => {
	798	const unreachable_node = @fieldParentPtr(ast.Node.Unreachable, "base", base);
	799	return renderToken(tree, stream, unreachable_node.token, indent, start_col, space);
	800	},
	801	ast.Node.Id.ErrorType => {
	802	const error_type = @fieldParentPtr(ast.Node.ErrorType, "base", base);
	803	return renderToken(tree, stream, error_type.token, indent, start_col, space);
	804	},
	805	ast.Node.Id.VarType => {
	806	const var_type = @fieldParentPtr(ast.Node.VarType, "base", base);
	807	return renderToken(tree, stream, var_type.token, indent, start_col, space);
	808	},
	809	ast.Node.Id.ContainerDecl => {
	810	const container_decl = @fieldParentPtr(ast.Node.ContainerDecl, "base", base);
	811
	812	if (container_decl.layout_token) \|layout_token\| {
	813	try renderToken(tree, stream, layout_token, indent, start_col, Space.Space);
	814	}
	815
	816	switch (container_decl.init_arg_expr) {
	817	ast.Node.ContainerDecl.InitArg.None => {
	818	try renderToken(tree, stream, container_decl.kind_token, indent, start_col, Space.Space); // union
	819	},
	820	ast.Node.ContainerDecl.InitArg.Enum => \|enum_tag_type\| {
	821	try renderToken(tree, stream, container_decl.kind_token, indent, start_col, Space.None); // union
	822
	823	const lparen = tree.nextToken(container_decl.kind_token);
	824	const enum_token = tree.nextToken(lparen);
	825
	826	try renderToken(tree, stream, lparen, indent, start_col, Space.None); // (
	827	try renderToken(tree, stream, enum_token, indent, start_col, Space.None); // enum
	828
	829	if (enum_tag_type) \|expr\| {
	830	try renderToken(tree, stream, tree.nextToken(enum_token), indent, start_col, Space.None); // (
	831	try renderExpression(allocator, stream, tree, indent, start_col, expr, Space.None);
	832
	833	const rparen = tree.nextToken(expr.lastToken());
	834	try renderToken(tree, stream, rparen, indent, start_col, Space.None); // )
	835	try renderToken(tree, stream, tree.nextToken(rparen), indent, start_col, Space.Space); // )
	836	} else {
	837	try renderToken(tree, stream, tree.nextToken(enum_token), indent, start_col, Space.Space); // )
	838	}
	839	},
	840	ast.Node.ContainerDecl.InitArg.Type => \|type_expr\| {
	841	try renderToken(tree, stream, container_decl.kind_token, indent, start_col, Space.None); // union
	842
	843	const lparen = tree.nextToken(container_decl.kind_token);
	844	const rparen = tree.nextToken(type_expr.lastToken());
	845
	846	try renderToken(tree, stream, lparen, indent, start_col, Space.None); // (
	847	try renderExpression(allocator, stream, tree, indent, start_col, type_expr, Space.None);
	848	try renderToken(tree, stream, rparen, indent, start_col, Space.Space); // )
	849	},
	850	}
	851
	852	if (container_decl.fields_and_decls.len == 0) {
	853	try renderToken(tree, stream, container_decl.lbrace_token, indent + indent_delta, start_col, Space.None); // {
	854	return renderToken(tree, stream, container_decl.rbrace_token, indent, start_col, space); // }
	855	} else {
	856	const new_indent = indent + indent_delta;
	857	try renderToken(tree, stream, container_decl.lbrace_token, new_indent, start_col, Space.Newline); // {
	858
	859	var it = container_decl.fields_and_decls.iterator(0);
	860	while (it.next()) \|decl\| {
	861	try stream.writeByteNTimes(' ', new_indent);
	862	try renderTopLevelDecl(allocator, stream, tree, new_indent, start_col, decl.*);
	863
	864	if (it.peek()) \|next_decl\| {
	865	try renderExtraNewline(tree, stream, start_col, next_decl.*);
	866	}
	867	}
	868
	869	try stream.writeByteNTimes(' ', indent);
	870	return renderToken(tree, stream, container_decl.rbrace_token, indent, start_col, space); // }
	871	}
	872	},
	873
	874	ast.Node.Id.ErrorSetDecl => {
	875	const err_set_decl = @fieldParentPtr(ast.Node.ErrorSetDecl, "base", base);
	876
	877	const lbrace = tree.nextToken(err_set_decl.error_token);
	878
	879	if (err_set_decl.decls.len == 0) {
	880	try renderToken(tree, stream, err_set_decl.error_token, indent, start_col, Space.None);
	881	try renderToken(tree, stream, lbrace, indent, start_col, Space.None);
	882	return renderToken(tree, stream, err_set_decl.rbrace_token, indent, start_col, space);
	883	}
	884
	885	if (err_set_decl.decls.len == 1) blk: {
	886	const node = err_set_decl.decls.at(0).*;
	887
	888	// if there are any doc comments or same line comments
	889	// don't try to put it all on one line
	890	if (node.cast(ast.Node.ErrorTag)) \|tag\| {
	891	if (tag.doc_comments != null) break :blk;
	892	} else {
	893	break :blk;
	894	}
	895
	896	try renderToken(tree, stream, err_set_decl.error_token, indent, start_col, Space.None); // error
	897	try renderToken(tree, stream, lbrace, indent, start_col, Space.None); // {
	898	try renderExpression(allocator, stream, tree, indent, start_col, node, Space.None);
	899	return renderToken(tree, stream, err_set_decl.rbrace_token, indent, start_col, space); // }
	900	}
	901
	902	try renderToken(tree, stream, err_set_decl.error_token, indent, start_col, Space.None); // error
	903	try renderToken(tree, stream, lbrace, indent, start_col, Space.Newline); // {
	904	const new_indent = indent + indent_delta;
	905
	906	var it = err_set_decl.decls.iterator(0);
	907	while (it.next()) \|node\| {
	908	try stream.writeByteNTimes(' ', new_indent);
	909
	910	if (it.peek()) \|next_node\| {
	911	try renderExpression(allocator, stream, tree, new_indent, start_col, node.*, Space.None);
	912	try renderToken(tree, stream, tree.nextToken(node.*.lastToken()), new_indent, start_col, Space.Newline); // ,
	913
	914	try renderExtraNewline(tree, stream, start_col, next_node.*);
	915	} else {
	916	try renderExpression(allocator, stream, tree, new_indent, start_col, node.*, Space.Comma);
	917	}
	918	}
	919
	920	try stream.writeByteNTimes(' ', indent);
	921	return renderToken(tree, stream, err_set_decl.rbrace_token, indent, start_col, space); // }
	922	},
	923
	924	ast.Node.Id.ErrorTag => {
	925	const tag = @fieldParentPtr(ast.Node.ErrorTag, "base", base);
	926
	927	try renderDocComments(tree, stream, tag, indent, start_col);
	928	return renderToken(tree, stream, tag.name_token, indent, start_col, space); // name
	929	},
	930
	931	ast.Node.Id.MultilineStringLiteral => {
	932	const multiline_str_literal = @fieldParentPtr(ast.Node.MultilineStringLiteral, "base", base);
	933
	934	var skip_first_indent = true;
	935	if (tree.tokens.at(multiline_str_literal.firstToken() - 1).id != Token.Id.LineComment) {
	936	try stream.print("\n");
	937	skip_first_indent = false;
	938	}
	939
	940	var i: usize = 0;
	941	while (i < multiline_str_literal.lines.len) : (i += 1) {
	942	const t = multiline_str_literal.lines.at(i).*;
	943	if (!skip_first_indent) {
	944	try stream.writeByteNTimes(' ', indent + indent_delta);
	945	}
	946	try renderToken(tree, stream, t, indent, start_col, Space.None);
	947	skip_first_indent = false;
	948	}
	949	try stream.writeByteNTimes(' ', indent);
	950	},
	951	ast.Node.Id.UndefinedLiteral => {
	952	const undefined_literal = @fieldParentPtr(ast.Node.UndefinedLiteral, "base", base);
	953	return renderToken(tree, stream, undefined_literal.token, indent, start_col, space);
	954	},
	955
	956	ast.Node.Id.BuiltinCall => {
	957	const builtin_call = @fieldParentPtr(ast.Node.BuiltinCall, "base", base);
	958
	959	try renderToken(tree, stream, builtin_call.builtin_token, indent, start_col, Space.None); // @name
	960	try renderToken(tree, stream, tree.nextToken(builtin_call.builtin_token), indent, start_col, Space.None); // (
	961
	962	var it = builtin_call.params.iterator(0);
	963	while (it.next()) \|param_node\| {
	964	try renderExpression(allocator, stream, tree, indent, start_col, param_node.*, Space.None);
	965
	966	if (it.peek() != null) {
	967	const comma_token = tree.nextToken(param_node.*.lastToken());
	968	try renderToken(tree, stream, comma_token, indent, start_col, Space.Space); // ,
	969	}
	970	}
	971	return renderToken(tree, stream, builtin_call.rparen_token, indent, start_col, space); // )
	972	},
	973
	974	ast.Node.Id.FnProto => {
	975	const fn_proto = @fieldParentPtr(ast.Node.FnProto, "base", base);
	976
	977	if (fn_proto.visib_token) \|visib_token_index\| {
	978	const visib_token = tree.tokens.at(visib_token_index);
	979	assert(visib_token.id == Token.Id.Keyword_pub or visib_token.id == Token.Id.Keyword_export);
	980
	981	try renderToken(tree, stream, visib_token_index, indent, start_col, Space.Space); // pub
	982	}
	983
	984	if (fn_proto.extern_export_inline_token) \|extern_export_inline_token\| {
	985	try renderToken(tree, stream, extern_export_inline_token, indent, start_col, Space.Space); // extern/export
	986	}
	987
	988	if (fn_proto.lib_name) \|lib_name\| {
	989	try renderExpression(allocator, stream, tree, indent, start_col, lib_name, Space.Space);
	990	}
	991
	992	if (fn_proto.cc_token) \|cc_token\| {
	993	try renderToken(tree, stream, cc_token, indent, start_col, Space.Space); // stdcallcc
	994	}
	995
	996	if (fn_proto.async_attr) \|async_attr\| {
	997	try renderExpression(allocator, stream, tree, indent, start_col, &async_attr.base, Space.Space);
	998	}
	999
	1000	const lparen = if (fn_proto.name_token) \|name_token\| blk: {
	1001	try renderToken(tree, stream, fn_proto.fn_token, indent, start_col, Space.Space); // fn
	1002	try renderToken(tree, stream, name_token, indent, start_col, Space.None); // name
	1003	break :blk tree.nextToken(name_token);
	1004	} else blk: {
	1005	try renderToken(tree, stream, fn_proto.fn_token, indent, start_col, Space.None); // fn
	1006	break :blk tree.nextToken(fn_proto.fn_token);
	1007	};
	1008
	1009	const rparen = tree.prevToken(switch (fn_proto.return_type) {
	1010	ast.Node.FnProto.ReturnType.Explicit => \|node\| node.firstToken(),
	1011	ast.Node.FnProto.ReturnType.InferErrorSet => \|node\| tree.prevToken(node.firstToken()),
	1012	});
	1013
	1014	const src_params_trailing_comma = blk: {
	1015	const maybe_comma = tree.prevToken(rparen);
	1016	break :blk tree.tokens.at(maybe_comma).id == Token.Id.Comma;
	1017	};
	1018	const src_params_same_line = blk: {
	1019	const loc = tree.tokenLocation(tree.tokens.at(lparen).end, rparen);
	1020	break :blk loc.line == 0;
	1021	};
	1022
	1023	if (!src_params_trailing_comma and src_params_same_line) {
	1024	try renderToken(tree, stream, lparen, indent, start_col, Space.None); // (
	1025
	1026	// render all on one line, no trailing comma
	1027	var it = fn_proto.params.iterator(0);
	1028	while (it.next()) \|param_decl_node\| {
	1029	try renderParamDecl(allocator, stream, tree, indent, start_col, param_decl_node.*, Space.None);
	1030
	1031	if (it.peek() != null) {
	1032	const comma = tree.nextToken(param_decl_node.*.lastToken());
	1033	try renderToken(tree, stream, comma, indent, start_col, Space.Space); // ,
	1034	}
	1035	}
	1036	} else {
	1037	// one param per line
	1038	const new_indent = indent + indent_delta;
	1039	try renderToken(tree, stream, lparen, new_indent, start_col, Space.Newline); // (
	1040
	1041	var it = fn_proto.params.iterator(0);
	1042	while (it.next()) \|param_decl_node\| {
	1043	try stream.writeByteNTimes(' ', new_indent);
	1044	try renderParamDecl(allocator, stream, tree, indent, start_col, param_decl_node.*, Space.Comma);
	1045	}
	1046	try stream.writeByteNTimes(' ', indent);
	1047	}
	1048
	1049	try renderToken(tree, stream, rparen, indent, start_col, Space.Space); // )
	1050
	1051	if (fn_proto.align_expr) \|align_expr\| {
	1052	const align_rparen = tree.nextToken(align_expr.lastToken());
	1053	const align_lparen = tree.prevToken(align_expr.firstToken());
	1054	const align_kw = tree.prevToken(align_lparen);
	1055
	1056	try renderToken(tree, stream, align_kw, indent, start_col, Space.None); // align
	1057	try renderToken(tree, stream, align_lparen, indent, start_col, Space.None); // (
	1058	try renderExpression(allocator, stream, tree, indent, start_col, align_expr, Space.None);
	1059	try renderToken(tree, stream, align_rparen, indent, start_col, Space.Space); // )
	1060	}
	1061
	1062	switch (fn_proto.return_type) {
	1063	ast.Node.FnProto.ReturnType.Explicit => \|node\| {
	1064	return renderExpression(allocator, stream, tree, indent, start_col, node, space);
	1065	},
	1066	ast.Node.FnProto.ReturnType.InferErrorSet => \|node\| {
	1067	try renderToken(tree, stream, tree.prevToken(node.firstToken()), indent, start_col, Space.None); // !
	1068	return renderExpression(allocator, stream, tree, indent, start_col, node, space);
	1069	},
	1070	}
	1071	},
	1072
	1073	ast.Node.Id.PromiseType => {
	1074	const promise_type = @fieldParentPtr(ast.Node.PromiseType, "base", base);
	1075
	1076	if (promise_type.result) \|result\| {
	1077	try renderToken(tree, stream, promise_type.promise_token, indent, start_col, Space.None); // promise
	1078	try renderToken(tree, stream, result.arrow_token, indent, start_col, Space.None); // ->
	1079	return renderExpression(allocator, stream, tree, indent, start_col, result.return_type, space);
	1080	} else {
	1081	return renderToken(tree, stream, promise_type.promise_token, indent, start_col, space); // promise
	1082	}
	1083	},
	1084
	1085	ast.Node.Id.DocComment => unreachable, // doc comments are attached to nodes
	1086
	1087	ast.Node.Id.Switch => {
	1088	const switch_node = @fieldParentPtr(ast.Node.Switch, "base", base);
	1089
	1090	try renderToken(tree, stream, switch_node.switch_token, indent, start_col, Space.Space); // switch
	1091	try renderToken(tree, stream, tree.nextToken(switch_node.switch_token), indent, start_col, Space.None); // (
	1092
	1093	const rparen = tree.nextToken(switch_node.expr.lastToken());
	1094	const lbrace = tree.nextToken(rparen);
	1095
	1096	if (switch_node.cases.len == 0) {
	1097	try renderExpression(allocator, stream, tree, indent, start_col, switch_node.expr, Space.None);
	1098	try renderToken(tree, stream, rparen, indent, start_col, Space.Space); // )
	1099	try renderToken(tree, stream, lbrace, indent, start_col, Space.None); // {
	1100	return renderToken(tree, stream, switch_node.rbrace, indent, start_col, space); // }
	1101	}
	1102
	1103	try renderExpression(allocator, stream, tree, indent, start_col, switch_node.expr, Space.None);
	1104
	1105	const new_indent = indent + indent_delta;
	1106
	1107	try renderToken(tree, stream, rparen, indent, start_col, Space.Space); // )
	1108	try renderToken(tree, stream, lbrace, new_indent, start_col, Space.Newline); // {
	1109
	1110	var it = switch_node.cases.iterator(0);
	1111	while (it.next()) \|node\| {
	1112	try stream.writeByteNTimes(' ', new_indent);
	1113	try renderExpression(allocator, stream, tree, new_indent, start_col, node.*, Space.Comma);
	1114
	1115	if (it.peek()) \|next_node\| {
	1116	try renderExtraNewline(tree, stream, start_col, next_node.*);
	1117	}
	1118	}
	1119
	1120	try stream.writeByteNTimes(' ', indent);
	1121	return renderToken(tree, stream, switch_node.rbrace, indent, start_col, space); // }
	1122	},
	1123
	1124	ast.Node.Id.SwitchCase => {
	1125	const switch_case = @fieldParentPtr(ast.Node.SwitchCase, "base", base);
	1126
	1127	assert(switch_case.items.len != 0);
	1128	const src_has_trailing_comma = blk: {
	1129	const last_node = switch_case.items.at(switch_case.items.len - 1).*;
	1130	const maybe_comma = tree.nextToken(last_node.lastToken());
	1131	break :blk tree.tokens.at(maybe_comma).id == Token.Id.Comma;
	1132	};
	1133
	1134	if (switch_case.items.len == 1 or !src_has_trailing_comma) {
	1135	var it = switch_case.items.iterator(0);
	1136	while (it.next()) \|node\| {
	1137	if (it.peek()) \|next_node\| {
	1138	try renderExpression(allocator, stream, tree, indent, start_col, node.*, Space.None);
	1139
	1140	const comma_token = tree.nextToken(node.*.lastToken());
	1141	try renderToken(tree, stream, comma_token, indent, start_col, Space.Space); // ,
	1142	try renderExtraNewline(tree, stream, start_col, next_node.*);
	1143	} else {
	1144	try renderExpression(allocator, stream, tree, indent, start_col, node.*, Space.Space);
	1145	}
	1146	}
	1147	} else {
	1148	var it = switch_case.items.iterator(0);
	1149	while (true) {
	1150	const node = ??it.next();
	1151	if (it.peek()) \|next_node\| {
	1152	try renderExpression(allocator, stream, tree, indent, start_col, node.*, Space.None);
	1153
	1154	const comma_token = tree.nextToken(node.*.lastToken());
	1155	try renderToken(tree, stream, comma_token, indent, start_col, Space.Newline); // ,
	1156	try renderExtraNewline(tree, stream, start_col, next_node.*);
	1157	try stream.writeByteNTimes(' ', indent);
	1158	} else {
	1159	try renderExpression(allocator, stream, tree, indent, start_col, node.*, Space.Comma);
	1160	try stream.writeByteNTimes(' ', indent);
	1161	break;
	1162	}
	1163	}
	1164	}
	1165
	1166	try renderToken(tree, stream, switch_case.arrow_token, indent, start_col, Space.Space); // =>
	1167
	1168	if (switch_case.payload) \|payload\| {
	1169	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Space);
	1170	}
	1171
	1172	return renderExpression(allocator, stream, tree, indent, start_col, switch_case.expr, space);
	1173	},
	1174	ast.Node.Id.SwitchElse => {
	1175	const switch_else = @fieldParentPtr(ast.Node.SwitchElse, "base", base);
	1176	return renderToken(tree, stream, switch_else.token, indent, start_col, space);
	1177	},
	1178	ast.Node.Id.Else => {
	1179	const else_node = @fieldParentPtr(ast.Node.Else, "base", base);
	1180
	1181	const body_is_block = nodeIsBlock(else_node.body);
	1182	const same_line = body_is_block or tree.tokensOnSameLine(else_node.else_token, else_node.body.lastToken());
	1183
	1184	const after_else_space = if (same_line or else_node.payload != null) Space.Space else Space.Newline;
	1185	try renderToken(tree, stream, else_node.else_token, indent, start_col, after_else_space);
	1186
	1187	if (else_node.payload) \|payload\| {
	1188	const payload_space = if (same_line) Space.Space else Space.Newline;
	1189	try renderExpression(allocator, stream, tree, indent, start_col, payload, payload_space);
	1190	}
	1191
	1192	if (same_line) {
	1193	return renderExpression(allocator, stream, tree, indent, start_col, else_node.body, space);
	1194	}
	1195
	1196	try stream.writeByteNTimes(' ', indent + indent_delta);
	1197	start_col.* = indent + indent_delta;
	1198	return renderExpression(allocator, stream, tree, indent, start_col, else_node.body, space);
	1199	},
	1200
	1201	ast.Node.Id.While => {
	1202	const while_node = @fieldParentPtr(ast.Node.While, "base", base);
	1203
	1204	if (while_node.label) \|label\| {
	1205	try renderToken(tree, stream, label, indent, start_col, Space.None); // label
	1206	try renderToken(tree, stream, tree.nextToken(label), indent, start_col, Space.Space); // :
	1207	}
	1208
	1209	if (while_node.inline_token) \|inline_token\| {
	1210	try renderToken(tree, stream, inline_token, indent, start_col, Space.Space); // inline
	1211	}
	1212
	1213	try renderToken(tree, stream, while_node.while_token, indent, start_col, Space.Space); // while
	1214	try renderToken(tree, stream, tree.nextToken(while_node.while_token), indent, start_col, Space.None); // (
	1215	try renderExpression(allocator, stream, tree, indent, start_col, while_node.condition, Space.None);
	1216
	1217	const cond_rparen = tree.nextToken(while_node.condition.lastToken());
	1218
	1219	const body_is_block = nodeIsBlock(while_node.body);
	1220
	1221	var block_start_space: Space = undefined;
	1222	var after_body_space: Space = undefined;
	1223
	1224	if (body_is_block) {
	1225	block_start_space = Space.BlockStart;
	1226	after_body_space = if (while_node.@"else" == null) space else Space.SpaceOrOutdent;
	1227	} else if (tree.tokensOnSameLine(cond_rparen, while_node.body.lastToken())) {
	1228	block_start_space = Space.Space;
	1229	after_body_space = if (while_node.@"else" == null) space else Space.Space;
	1230	} else {
	1231	block_start_space = Space.Newline;
	1232	after_body_space = if (while_node.@"else" == null) space else Space.Newline;
	1233	}
	1234
	1235	{
	1236	const rparen_space = if (while_node.payload != null or while_node.continue_expr != null) Space.Space else block_start_space;
	1237	try renderToken(tree, stream, cond_rparen, indent, start_col, rparen_space); // )
	1238	}
	1239
	1240	if (while_node.payload) \|payload\| {
	1241	const payload_space = if (while_node.continue_expr != null) Space.Space else block_start_space;
	1242	try renderExpression(allocator, stream, tree, indent, start_col, payload, payload_space);
	1243	}
	1244
	1245	if (while_node.continue_expr) \|continue_expr\| {
	1246	const rparen = tree.nextToken(continue_expr.lastToken());
	1247	const lparen = tree.prevToken(continue_expr.firstToken());
	1248	const colon = tree.prevToken(lparen);
	1249
	1250	try renderToken(tree, stream, colon, indent, start_col, Space.Space); // :
	1251	try renderToken(tree, stream, lparen, indent, start_col, Space.None); // (
	1252
	1253	try renderExpression(allocator, stream, tree, indent, start_col, continue_expr, Space.None);
	1254
	1255	try renderToken(tree, stream, rparen, indent, start_col, block_start_space); // )
	1256	}
	1257
	1258	var new_indent = indent;
	1259	if (block_start_space == Space.Newline) {
	1260	new_indent += indent_delta;
	1261	try stream.writeByteNTimes(' ', new_indent);
	1262	start_col.* = new_indent;
	1263	}
	1264
	1265	try renderExpression(allocator, stream, tree, indent, start_col, while_node.body, after_body_space);
	1266
	1267	if (while_node.@"else") \|@"else"\| {
	1268	if (after_body_space == Space.Newline) {
	1269	try stream.writeByteNTimes(' ', indent);
	1270	start_col.* = indent;
	1271	}
	1272	return renderExpression(allocator, stream, tree, indent, start_col, &@"else".base, space);
	1273	}
	1274	},
	1275
	1276	ast.Node.Id.For => {
	1277	const for_node = @fieldParentPtr(ast.Node.For, "base", base);
	1278
	1279	if (for_node.label) \|label\| {
	1280	try renderToken(tree, stream, label, indent, start_col, Space.None); // label
	1281	try renderToken(tree, stream, tree.nextToken(label), indent, start_col, Space.Space); // :
	1282	}
	1283
	1284	if (for_node.inline_token) \|inline_token\| {
	1285	try renderToken(tree, stream, inline_token, indent, start_col, Space.Space); // inline
	1286	}
	1287
	1288	try renderToken(tree, stream, for_node.for_token, indent, start_col, Space.Space); // for
	1289	try renderToken(tree, stream, tree.nextToken(for_node.for_token), indent, start_col, Space.None); // (
	1290	try renderExpression(allocator, stream, tree, indent, start_col, for_node.array_expr, Space.None);
	1291
	1292	const rparen = tree.nextToken(for_node.array_expr.lastToken());
	1293	const rparen_space = if (for_node.payload != null or
	1294	for_node.body.id == ast.Node.Id.Block) Space.Space else Space.Newline;
	1295	try renderToken(tree, stream, rparen, indent, start_col, rparen_space); // )
	1296
	1297	if (for_node.payload) \|payload\| {
	1298	const payload_space = if (for_node.body.id == ast.Node.Id.Block) Space.Space else Space.Newline;
	1299	try renderExpression(allocator, stream, tree, indent, start_col, payload, payload_space);
	1300	}
	1301
	1302	const body_space = blk: {
	1303	if (for_node.@"else" != null) {
	1304	if (for_node.body.id == ast.Node.Id.Block) {
	1305	break :blk Space.Space;
	1306	} else {
	1307	break :blk Space.Newline;
	1308	}
	1309	} else {
	1310	break :blk space;
	1311	}
	1312	};
	1313	if (for_node.body.id == ast.Node.Id.Block) {
	1314	try renderExpression(allocator, stream, tree, indent, start_col, for_node.body, body_space);
	1315	} else {
	1316	try stream.writeByteNTimes(' ', indent + indent_delta);
	1317	try renderExpression(allocator, stream, tree, indent, start_col, for_node.body, body_space);
	1318	}
	1319
	1320	if (for_node.@"else") \|@"else"\| {
	1321	if (for_node.body.id != ast.Node.Id.Block) {
	1322	try stream.writeByteNTimes(' ', indent);
	1323	}
	1324
	1325	return renderExpression(allocator, stream, tree, indent, start_col, &@"else".base, space);
	1326	}
	1327	},
	1328
	1329	ast.Node.Id.If => {
	1330	const if_node = @fieldParentPtr(ast.Node.If, "base", base);
	1331
	1332	const lparen = tree.prevToken(if_node.condition.firstToken());
	1333	const rparen = tree.nextToken(if_node.condition.lastToken());
	1334
	1335	try renderToken(tree, stream, if_node.if_token, indent, start_col, Space.Space); // if
	1336	try renderToken(tree, stream, lparen, indent, start_col, Space.None); // (
	1337
	1338	try renderExpression(allocator, stream, tree, indent, start_col, if_node.condition, Space.None); // condition
	1339
	1340	const body_is_block = nodeIsBlock(if_node.body);
	1341
	1342	if (body_is_block) {
	1343	const after_rparen_space = if (if_node.payload == null) Space.BlockStart else Space.Space;
	1344	try renderToken(tree, stream, rparen, indent, start_col, after_rparen_space); // )
	1345
	1346	if (if_node.payload) \|payload\| {
	1347	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.BlockStart); // \|x\|
	1348	}
	1349
	1350	if (if_node.@"else") \|@"else"\| {
	1351	try renderExpression(allocator, stream, tree, indent, start_col, if_node.body, Space.SpaceOrOutdent);
	1352	return renderExpression(allocator, stream, tree, indent, start_col, &@"else".base, space);
	1353	} else {
	1354	return renderExpression(allocator, stream, tree, indent, start_col, if_node.body, space);
	1355	}
	1356	}
	1357
	1358	const src_has_newline = !tree.tokensOnSameLine(rparen, if_node.body.lastToken());
	1359
	1360	if (src_has_newline) {
	1361	const after_rparen_space = if (if_node.payload == null) Space.Newline else Space.Space;
	1362	try renderToken(tree, stream, rparen, indent, start_col, after_rparen_space); // )
	1363
	1364	if (if_node.payload) \|payload\| {
	1365	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Newline);
	1366	}
	1367
	1368	const new_indent = indent + indent_delta;
	1369	try stream.writeByteNTimes(' ', new_indent);
	1370
	1371	if (if_node.@"else") \|@"else"\| {
	1372	const else_is_block = nodeIsBlock(@"else".body);
	1373	try renderExpression(allocator, stream, tree, new_indent, start_col, if_node.body, Space.Newline);
	1374	try stream.writeByteNTimes(' ', indent);
	1375
	1376	if (else_is_block) {
	1377	try renderToken(tree, stream, @"else".else_token, indent, start_col, Space.Space); // else
	1378
	1379	if (@"else".payload) \|payload\| {
	1380	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Space);
	1381	}
	1382
	1383	return renderExpression(allocator, stream, tree, indent, start_col, @"else".body, space);
	1384	} else {
	1385	const after_else_space = if (@"else".payload == null) Space.Newline else Space.Space;
	1386	try renderToken(tree, stream, @"else".else_token, indent, start_col, after_else_space); // else
	1387
	1388	if (@"else".payload) \|payload\| {
	1389	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Newline);
	1390	}
	1391	try stream.writeByteNTimes(' ', new_indent);
	1392
	1393	return renderExpression(allocator, stream, tree, new_indent, start_col, @"else".body, space);
	1394	}
	1395	} else {
	1396	return renderExpression(allocator, stream, tree, new_indent, start_col, if_node.body, space);
	1397	}
	1398	}
	1399
	1400	try renderToken(tree, stream, rparen, indent, start_col, Space.Space); // )
	1401
	1402	if (if_node.payload) \|payload\| {
	1403	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Space);
	1404	}
	1405
	1406	if (if_node.@"else") \|@"else"\| {
	1407	try renderExpression(allocator, stream, tree, indent, start_col, if_node.body, Space.Space);
	1408	try renderToken(tree, stream, @"else".else_token, indent, start_col, Space.Space);
	1409
	1410	if (@"else".payload) \|payload\| {
	1411	try renderExpression(allocator, stream, tree, indent, start_col, payload, Space.Space);
	1412	}
	1413
	1414	return renderExpression(allocator, stream, tree, indent, start_col, @"else".body, space);
	1415	} else {
	1416	return renderExpression(allocator, stream, tree, indent, start_col, if_node.body, space);
	1417	}
	1418	},
	1419
	1420	ast.Node.Id.Asm => {
	1421	const asm_node = @fieldParentPtr(ast.Node.Asm, "base", base);
	1422
	1423	try renderToken(tree, stream, asm_node.asm_token, indent, start_col, Space.Space); // asm
	1424
	1425	if (asm_node.volatile_token) \|volatile_token\| {
	1426	try renderToken(tree, stream, volatile_token, indent, start_col, Space.Space); // volatile
	1427	try renderToken(tree, stream, tree.nextToken(volatile_token), indent, start_col, Space.None); // (
	1428	} else {
	1429	try renderToken(tree, stream, tree.nextToken(asm_node.asm_token), indent, start_col, Space.None); // (
	1430	}
	1431
	1432	if (asm_node.outputs.len == 0 and asm_node.inputs.len == 0 and asm_node.clobbers.len == 0) {
	1433	try renderExpression(allocator, stream, tree, indent, start_col, asm_node.template, Space.None);
	1434	return renderToken(tree, stream, asm_node.rparen, indent, start_col, space);
	1435	}
	1436
	1437	try renderExpression(allocator, stream, tree, indent, start_col, asm_node.template, Space.Newline);
	1438
	1439	const indent_once = indent + indent_delta;
	1440	try stream.writeByteNTimes(' ', indent_once);
	1441
	1442	const colon1 = tree.nextToken(asm_node.template.lastToken());
	1443	const indent_extra = indent_once + 2;
	1444
	1445	const colon2 = if (asm_node.outputs.len == 0) blk: {
	1446	try renderToken(tree, stream, colon1, indent, start_col, Space.Newline); // :
	1447	try stream.writeByteNTimes(' ', indent_once);
	1448
	1449	break :blk tree.nextToken(colon1);
	1450	} else blk: {
	1451	try renderToken(tree, stream, colon1, indent, start_col, Space.Space); // :
	1452
	1453	var it = asm_node.outputs.iterator(0);
	1454	while (true) {
	1455	const asm_output = ??it.next();
	1456	const node = &(asm_output.*).base;
	1457
	1458	if (it.peek()) \|next_asm_output\| {
	1459	try renderExpression(allocator, stream, tree, indent_extra, start_col, node, Space.None);
	1460	const next_node = &(next_asm_output.*).base;
	1461
	1462	const comma = tree.prevToken(next_asm_output.*.firstToken());
	1463	try renderToken(tree, stream, comma, indent_extra, start_col, Space.Newline); // ,
	1464	try renderExtraNewline(tree, stream, start_col, next_node);
	1465
	1466	try stream.writeByteNTimes(' ', indent_extra);
	1467	} else if (asm_node.inputs.len == 0 and asm_node.clobbers.len == 0) {
	1468	try renderExpression(allocator, stream, tree, indent_extra, start_col, node, Space.Newline);
	1469	try stream.writeByteNTimes(' ', indent);
	1470	return renderToken(tree, stream, asm_node.rparen, indent, start_col, space);
	1471	} else {
	1472	try renderExpression(allocator, stream, tree, indent_extra, start_col, node, Space.Newline);
	1473	try stream.writeByteNTimes(' ', indent_once);
	1474	const comma_or_colon = tree.nextToken(node.lastToken());
	1475	break :blk switch (tree.tokens.at(comma_or_colon).id) {
	1476	Token.Id.Comma => tree.nextToken(comma_or_colon),
	1477	else => comma_or_colon,
	1478	};
	1479	}
	1480	}
	1481	};
	1482
	1483	const colon3 = if (asm_node.inputs.len == 0) blk: {
	1484	try renderToken(tree, stream, colon2, indent, start_col, Space.Newline); // :
	1485	try stream.writeByteNTimes(' ', indent_once);
	1486
	1487	break :blk tree.nextToken(colon2);
	1488	} else blk: {
	1489	try renderToken(tree, stream, colon2, indent, start_col, Space.Space); // :
	1490
	1491	var it = asm_node.inputs.iterator(0);
	1492	while (true) {
	1493	const asm_input = ??it.next();
	1494	const node = &(asm_input.*).base;
	1495
	1496	if (it.peek()) \|next_asm_input\| {
	1497	try renderExpression(allocator, stream, tree, indent_extra, start_col, node, Space.None);
	1498	const next_node = &(next_asm_input.*).base;
	1499
	1500	const comma = tree.prevToken(next_asm_input.*.firstToken());
	1501	try renderToken(tree, stream, comma, indent_extra, start_col, Space.Newline); // ,
	1502	try renderExtraNewline(tree, stream, start_col, next_node);
	1503
	1504	try stream.writeByteNTimes(' ', indent_extra);
	1505	} else if (asm_node.clobbers.len == 0) {
	1506	try renderExpression(allocator, stream, tree, indent_extra, start_col, node, Space.Newline);
	1507	try stream.writeByteNTimes(' ', indent);
	1508	return renderToken(tree, stream, asm_node.rparen, indent, start_col, space); // )
	1509	} else {
	1510	try renderExpression(allocator, stream, tree, indent_extra, start_col, node, Space.Newline);
	1511	try stream.writeByteNTimes(' ', indent_once);
	1512	const comma_or_colon = tree.nextToken(node.lastToken());
	1513	break :blk switch (tree.tokens.at(comma_or_colon).id) {
	1514	Token.Id.Comma => tree.nextToken(comma_or_colon),
	1515	else => comma_or_colon,
	1516	};
	1517	}
	1518	}
	1519	};
	1520
	1521	try renderToken(tree, stream, colon3, indent, start_col, Space.Space); // :
	1522
	1523	var it = asm_node.clobbers.iterator(0);
	1524	while (true) {
	1525	const clobber_token = ??it.next();
	1526
	1527	if (it.peek() == null) {
	1528	try renderToken(tree, stream, clobber_token.*, indent_once, start_col, Space.Newline);
	1529	try stream.writeByteNTimes(' ', indent);
	1530	return renderToken(tree, stream, asm_node.rparen, indent, start_col, space);
	1531	} else {
	1532	try renderToken(tree, stream, clobber_token.*, indent_once, start_col, Space.None);
	1533	const comma = tree.nextToken(clobber_token.*);
	1534	try renderToken(tree, stream, comma, indent_once, start_col, Space.Space); // ,
	1535	}
	1536	}
	1537	},
	1538
	1539	ast.Node.Id.AsmInput => {
	1540	const asm_input = @fieldParentPtr(ast.Node.AsmInput, "base", base);
	1541
	1542	try stream.write("[");
	1543	try renderExpression(allocator, stream, tree, indent, start_col, asm_input.symbolic_name, Space.None);
	1544	try stream.write("] ");
	1545	try renderExpression(allocator, stream, tree, indent, start_col, asm_input.constraint, Space.None);
	1546	try stream.write(" (");
	1547	try renderExpression(allocator, stream, tree, indent, start_col, asm_input.expr, Space.None);
	1548	return renderToken(tree, stream, asm_input.lastToken(), indent, start_col, space); // )
	1549	},
	1550
	1551	ast.Node.Id.AsmOutput => {
	1552	const asm_output = @fieldParentPtr(ast.Node.AsmOutput, "base", base);
	1553
	1554	try stream.write("[");
	1555	try renderExpression(allocator, stream, tree, indent, start_col, asm_output.symbolic_name, Space.None);
	1556	try stream.write("] ");
	1557	try renderExpression(allocator, stream, tree, indent, start_col, asm_output.constraint, Space.None);
	1558	try stream.write(" (");
	1559
	1560	switch (asm_output.kind) {
	1561	ast.Node.AsmOutput.Kind.Variable => \|variable_name\| {
	1562	try renderExpression(allocator, stream, tree, indent, start_col, &variable_name.base, Space.None);
	1563	},
	1564	ast.Node.AsmOutput.Kind.Return => \|return_type\| {
	1565	try stream.write("-> ");
	1566	try renderExpression(allocator, stream, tree, indent, start_col, return_type, Space.None);
	1567	},
	1568	}
	1569
	1570	return renderToken(tree, stream, asm_output.lastToken(), indent, start_col, space); // )
	1571	},
	1572
	1573	ast.Node.Id.StructField,
	1574	ast.Node.Id.UnionTag,
	1575	ast.Node.Id.EnumTag,
	1576	ast.Node.Id.Root,
	1577	ast.Node.Id.VarDecl,
	1578	ast.Node.Id.Use,
	1579	ast.Node.Id.TestDecl,
	1580	ast.Node.Id.ParamDecl,
	1581	=> unreachable,
	1582	}
	1583	}
	1584
	1585	fn renderVarDecl(
	1586	allocator: &mem.Allocator,
	1587	stream: var,
	1588	tree: &ast.Tree,
	1589	indent: usize,
	1590	start_col: &usize,
	1591	var_decl: &ast.Node.VarDecl,
	1592	) (@typeOf(stream).Child.Error \|\| Error)!void {
	1593	if (var_decl.visib_token) \|visib_token\| {
	1594	try renderToken(tree, stream, visib_token, indent, start_col, Space.Space); // pub
	1595	}
	1596
	1597	if (var_decl.extern_export_token) \|extern_export_token\| {
	1598	try renderToken(tree, stream, extern_export_token, indent, start_col, Space.Space); // extern
	1599
	1600	if (var_decl.lib_name) \|lib_name\| {
	1601	try renderExpression(allocator, stream, tree, indent, start_col, lib_name, Space.Space); // "lib"
	1602	}
	1603	}
	1604
	1605	if (var_decl.comptime_token) \|comptime_token\| {
	1606	try renderToken(tree, stream, comptime_token, indent, start_col, Space.Space); // comptime
	1607	}
	1608
	1609	try renderToken(tree, stream, var_decl.mut_token, indent, start_col, Space.Space); // var
	1610
	1611	const name_space = if (var_decl.type_node == null and (var_decl.align_node != null or
	1612	var_decl.init_node != null)) Space.Space else Space.None;
	1613	try renderToken(tree, stream, var_decl.name_token, indent, start_col, name_space);
	1614
	1615	if (var_decl.type_node) \|type_node\| {
	1616	try renderToken(tree, stream, tree.nextToken(var_decl.name_token), indent, start_col, Space.Space);
	1617	const s = if (var_decl.align_node != null or var_decl.init_node != null) Space.Space else Space.None;
	1618	try renderExpression(allocator, stream, tree, indent, start_col, type_node, s);
	1619	}
	1620
	1621	if (var_decl.align_node) \|align_node\| {
	1622	const lparen = tree.prevToken(align_node.firstToken());
	1623	const align_kw = tree.prevToken(lparen);
	1624	const rparen = tree.nextToken(align_node.lastToken());
	1625	try renderToken(tree, stream, align_kw, indent, start_col, Space.None); // align
	1626	try renderToken(tree, stream, lparen, indent, start_col, Space.None); // (
	1627	try renderExpression(allocator, stream, tree, indent, start_col, align_node, Space.None);
	1628	const s = if (var_decl.init_node != null) Space.Space else Space.None;
	1629	try renderToken(tree, stream, rparen, indent, start_col, s); // )
	1630	}
	1631
	1632	if (var_decl.init_node) \|init_node\| {
	1633	const s = if (init_node.id == ast.Node.Id.MultilineStringLiteral) Space.None else Space.Space;
	1634	try renderToken(tree, stream, var_decl.eq_token, indent, start_col, s); // =
	1635	try renderExpression(allocator, stream, tree, indent, start_col, init_node, Space.None);
	1636	}
	1637
	1638	try renderToken(tree, stream, var_decl.semicolon_token, indent, start_col, Space.Newline);
	1639	}
	1640
	1641	fn renderParamDecl(
	1642	allocator: &mem.Allocator,
	1643	stream: var,
	1644	tree: &ast.Tree,
	1645	indent: usize,
	1646	start_col: &usize,
	1647	base: &ast.Node,
	1648	space: Space,
	1649	) (@typeOf(stream).Child.Error \|\| Error)!void {
	1650	const param_decl = @fieldParentPtr(ast.Node.ParamDecl, "base", base);
	1651
	1652	if (param_decl.comptime_token) \|comptime_token\| {
	1653	try renderToken(tree, stream, comptime_token, indent, start_col, Space.Space);
	1654	}
	1655	if (param_decl.noalias_token) \|noalias_token\| {
	1656	try renderToken(tree, stream, noalias_token, indent, start_col, Space.Space);
	1657	}
	1658	if (param_decl.name_token) \|name_token\| {
	1659	try renderToken(tree, stream, name_token, indent, start_col, Space.None);
	1660	try renderToken(tree, stream, tree.nextToken(name_token), indent, start_col, Space.Space); // :
	1661	}
	1662	if (param_decl.var_args_token) \|var_args_token\| {
	1663	try renderToken(tree, stream, var_args_token, indent, start_col, space);
	1664	} else {
	1665	try renderExpression(allocator, stream, tree, indent, start_col, param_decl.type_node, space);
	1666	}
	1667	}
	1668
	1669	fn renderStatement(
	1670	allocator: &mem.Allocator,
	1671	stream: var,
	1672	tree: &ast.Tree,
	1673	indent: usize,
	1674	start_col: &usize,
	1675	base: &ast.Node,
	1676	) (@typeOf(stream).Child.Error \|\| Error)!void {
	1677	switch (base.id) {
	1678	ast.Node.Id.VarDecl => {
	1679	const var_decl = @fieldParentPtr(ast.Node.VarDecl, "base", base);
	1680	try renderVarDecl(allocator, stream, tree, indent, start_col, var_decl);
	1681	},
	1682	else => {
	1683	if (base.requireSemiColon()) {
	1684	try renderExpression(allocator, stream, tree, indent, start_col, base, Space.None);
	1685
	1686	const semicolon_index = tree.nextToken(base.lastToken());
	1687	assert(tree.tokens.at(semicolon_index).id == Token.Id.Semicolon);
	1688	try renderToken(tree, stream, semicolon_index, indent, start_col, Space.Newline);
	1689	} else {
	1690	try renderExpression(allocator, stream, tree, indent, start_col, base, Space.Newline);
	1691	}
	1692	},
	1693	}
	1694	}
	1695
	1696	const Space = enum {
	1697	None,
	1698	Newline,
	1699	Comma,
	1700	Space,
	1701	SpaceOrOutdent,
	1702	NoNewline,
	1703	NoComment,
	1704	BlockStart,
	1705	};
	1706
	1707	fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent: usize, start_col: &usize, space: Space) (@typeOf(stream).Child.Error \|\| Error)!void {
	1708	if (space == Space.BlockStart) {
	1709	if (start_col.* < indent + indent_delta)
	1710	return renderToken(tree, stream, token_index, indent, start_col, Space.Space);
	1711	try renderToken(tree, stream, token_index, indent, start_col, Space.Newline);
	1712	try stream.writeByteNTimes(' ', indent);
	1713	start_col.* = indent;
	1714	return;
	1715	}
	1716
	1717	var token = tree.tokens.at(token_index);
	1718	try stream.write(mem.trimRight(u8, tree.tokenSlicePtr(token), " "));
	1719
	1720	if (space == Space.NoComment)
	1721	return;
	1722
	1723	var next_token = tree.tokens.at(token_index + 1);
	1724
	1725	if (space == Space.Comma) switch (next_token.id) {
	1726	Token.Id.Comma => return renderToken(tree, stream, token_index + 1, indent, start_col, Space.Newline),
	1727	Token.Id.LineComment => {
	1728	try stream.write(", ");
	1729	return renderToken(tree, stream, token_index + 1, indent, start_col, Space.Newline);
	1730	},
	1731	else => {
	1732	if (tree.tokens.at(token_index + 2).id == Token.Id.MultilineStringLiteralLine) {
	1733	try stream.write(",");
	1734	return;
	1735	} else {
	1736	try stream.write(",\n");
	1737	start_col.* = 0;
	1738	return;
	1739	}
	1740	},
	1741	};
	1742
	1743	// Skip over same line doc comments
	1744	var offset: usize = 1;
	1745	if (next_token.id == Token.Id.DocComment) {
	1746	const loc = tree.tokenLocationPtr(token.end, next_token);
	1747	if (loc.line == 0) {
	1748	offset += 1;
	1749	next_token = tree.tokens.at(token_index + offset);
	1750	}
	1751	}
	1752
	1753	if (next_token.id != Token.Id.LineComment) blk: {
	1754	switch (space) {
	1755	Space.None, Space.NoNewline => return,
	1756	Space.Newline => {
	1757	if (next_token.id == Token.Id.MultilineStringLiteralLine) {
	1758	return;
	1759	} else {
	1760	try stream.write("\n");
	1761	start_col.* = 0;
	1762	return;
	1763	}
	1764	},
	1765	Space.Space, Space.SpaceOrOutdent => {
	1766	if (next_token.id == Token.Id.MultilineStringLiteralLine)
	1767	return;
	1768	try stream.writeByte(' ');
	1769	return;
	1770	},
	1771	Space.NoComment, Space.Comma, Space.BlockStart => unreachable,
	1772	}
	1773	}
	1774
	1775	const comment_is_empty = mem.trimRight(u8, tree.tokenSlicePtr(next_token), " ").len == 2;
	1776	if (comment_is_empty) {
	1777	switch (space) {
	1778	Space.Newline => {
	1779	try stream.writeByte('\n');
	1780	start_col.* = 0;
	1781	return;
	1782	},
	1783	else => {},
	1784	}
	1785	}
	1786
	1787	var loc = tree.tokenLocationPtr(token.end, next_token);
	1788	if (loc.line == 0) {
	1789	try stream.print(" {}", mem.trimRight(u8, tree.tokenSlicePtr(next_token), " "));
	1790	offset = 2;
	1791	token = next_token;
	1792	next_token = tree.tokens.at(token_index + offset);
	1793	if (next_token.id != Token.Id.LineComment) {
	1794	switch (space) {
	1795	Space.None, Space.Space => {
	1796	try stream.writeByte('\n');
	1797	const after_comment_token = tree.tokens.at(token_index + offset);
	1798	const next_line_indent = switch (after_comment_token.id) {
	1799	Token.Id.RParen, Token.Id.RBrace, Token.Id.RBracket => indent,
	1800	else => indent + indent_delta,
	1801	};
	1802	try stream.writeByteNTimes(' ', next_line_indent);
	1803	start_col.* = next_line_indent;
	1804	},
	1805	Space.SpaceOrOutdent => {
	1806	try stream.writeByte('\n');
	1807	try stream.writeByteNTimes(' ', indent);
	1808	start_col.* = indent;
	1809	},
	1810	Space.Newline => {
	1811	if (next_token.id == Token.Id.MultilineStringLiteralLine) {
	1812	return;
	1813	} else {
	1814	try stream.write("\n");
	1815	start_col.* = 0;
	1816	return;
	1817	}
	1818	},
	1819	Space.NoNewline => {},
	1820	Space.NoComment, Space.Comma, Space.BlockStart => unreachable,
	1821	}
	1822	return;
	1823	}
	1824	loc = tree.tokenLocationPtr(token.end, next_token);
	1825	}
	1826
	1827	while (true) {
	1828	assert(loc.line != 0);
	1829	const newline_count = if (loc.line == 1) u8(1) else u8(2);
	1830	try stream.writeByteNTimes('\n', newline_count);
	1831	try stream.writeByteNTimes(' ', indent);
	1832	try stream.write(mem.trimRight(u8, tree.tokenSlicePtr(next_token), " "));
	1833
	1834	offset += 1;
	1835	token = next_token;
	1836	next_token = tree.tokens.at(token_index + offset);
	1837	if (next_token.id != Token.Id.LineComment) {
	1838	switch (space) {
	1839	Space.Newline => {
	1840	if (next_token.id == Token.Id.MultilineStringLiteralLine) {
	1841	return;
	1842	} else {
	1843	try stream.write("\n");
	1844	start_col.* = 0;
	1845	return;
	1846	}
	1847	},
	1848	Space.None, Space.Space => {
	1849	try stream.writeByte('\n');
	1850
	1851	const after_comment_token = tree.tokens.at(token_index + offset);
	1852	const next_line_indent = switch (after_comment_token.id) {
	1853	Token.Id.RParen, Token.Id.RBrace, Token.Id.RBracket => indent - indent_delta,
	1854	else => indent,
	1855	};
	1856	try stream.writeByteNTimes(' ', next_line_indent);
	1857	start_col.* = next_line_indent;
	1858	},
	1859	Space.SpaceOrOutdent => {
	1860	try stream.writeByte('\n');
	1861	try stream.writeByteNTimes(' ', indent);
	1862	start_col.* = indent;
	1863	},
	1864	Space.NoNewline => {},
	1865	Space.NoComment, Space.Comma, Space.BlockStart => unreachable,
	1866	}
	1867	return;
	1868	}
	1869	loc = tree.tokenLocationPtr(token.end, next_token);
	1870	}
	1871	}
	1872
	1873	fn renderDocComments(
	1874	tree: &ast.Tree,
	1875	stream: var,
	1876	node: var,
	1877	indent: usize,
	1878	start_col: &usize,
	1879	) (@typeOf(stream).Child.Error \|\| Error)!void {
1263	1880	const comment = node.doc_comments ?? return;
1264	1881	var it = comment.lines.iterator(0);
	1882	const first_token = node.firstToken();
1265	1883	while (it.next()) \|line_token_index\| {
1266		try stream.print("{}\n", tree.tokenSlice(*line_token_index));
1267		try stream.writeByteNTimes(' ', indent);
	1884	if (line_token_index.* < first_token) {
	1885	try renderToken(tree, stream, line_token_index.*, indent, start_col, Space.Newline);
	1886	try stream.writeByteNTimes(' ', indent);
	1887	} else {
	1888	try renderToken(tree, stream, line_token_index.*, indent, start_col, Space.NoComment);
	1889	try stream.write("\n");
	1890	try stream.writeByteNTimes(' ', indent);
	1891	}
1268	1892	}
1269	1893	}
1270	1894
	1895	fn nodeIsBlock(base: &const ast.Node) bool {
	1896	return switch (base.id) {
	1897	ast.Node.Id.Block,
	1898	ast.Node.Id.If,
	1899	ast.Node.Id.For,
	1900	ast.Node.Id.While,
	1901	ast.Node.Id.Switch,
	1902	=> true,
	1903	else => false,
	1904	};
	1905	}

std/zig/tokenizer.zig+195-110

...	...	@@ -6,62 +6,63 @@ pub const Token = struct {
6	6	start: usize,
7	7	end: usize,
8	8
9		const Keyword = struct {
	9	pub const Keyword = struct {
10	10	bytes: []const u8,
11	11	id: Id,
12	12	};
13	13
14		const keywords = []Keyword {
15		Keyword{.bytes="align", .id = Id.Keyword_align},
16		Keyword{.bytes="and", .id = Id.Keyword_and},
17		Keyword{.bytes="asm", .id = Id.Keyword_asm},
18		Keyword{.bytes="async", .id = Id.Keyword_async},
19		Keyword{.bytes="await", .id = Id.Keyword_await},
20		Keyword{.bytes="break", .id = Id.Keyword_break},
21		Keyword{.bytes="catch", .id = Id.Keyword_catch},
22		Keyword{.bytes="cancel", .id = Id.Keyword_cancel},
23		Keyword{.bytes="comptime", .id = Id.Keyword_comptime},
24		Keyword{.bytes="const", .id = Id.Keyword_const},
25		Keyword{.bytes="continue", .id = Id.Keyword_continue},
26		Keyword{.bytes="defer", .id = Id.Keyword_defer},
27		Keyword{.bytes="else", .id = Id.Keyword_else},
28		Keyword{.bytes="enum", .id = Id.Keyword_enum},
29		Keyword{.bytes="errdefer", .id = Id.Keyword_errdefer},
30		Keyword{.bytes="error", .id = Id.Keyword_error},
31		Keyword{.bytes="export", .id = Id.Keyword_export},
32		Keyword{.bytes="extern", .id = Id.Keyword_extern},
33		Keyword{.bytes="false", .id = Id.Keyword_false},
34		Keyword{.bytes="fn", .id = Id.Keyword_fn},
35		Keyword{.bytes="for", .id = Id.Keyword_for},
36		Keyword{.bytes="if", .id = Id.Keyword_if},
37		Keyword{.bytes="inline", .id = Id.Keyword_inline},
38		Keyword{.bytes="nakedcc", .id = Id.Keyword_nakedcc},
39		Keyword{.bytes="noalias", .id = Id.Keyword_noalias},
40		Keyword{.bytes="null", .id = Id.Keyword_null},
41		Keyword{.bytes="or", .id = Id.Keyword_or},
42		Keyword{.bytes="packed", .id = Id.Keyword_packed},
43		Keyword{.bytes="promise", .id = Id.Keyword_promise},
44		Keyword{.bytes="pub", .id = Id.Keyword_pub},
45		Keyword{.bytes="resume", .id = Id.Keyword_resume},
46		Keyword{.bytes="return", .id = Id.Keyword_return},
47		Keyword{.bytes="section", .id = Id.Keyword_section},
48		Keyword{.bytes="stdcallcc", .id = Id.Keyword_stdcallcc},
49		Keyword{.bytes="struct", .id = Id.Keyword_struct},
50		Keyword{.bytes="suspend", .id = Id.Keyword_suspend},
51		Keyword{.bytes="switch", .id = Id.Keyword_switch},
52		Keyword{.bytes="test", .id = Id.Keyword_test},
53		Keyword{.bytes="this", .id = Id.Keyword_this},
54		Keyword{.bytes="true", .id = Id.Keyword_true},
55		Keyword{.bytes="try", .id = Id.Keyword_try},
56		Keyword{.bytes="undefined", .id = Id.Keyword_undefined},
57		Keyword{.bytes="union", .id = Id.Keyword_union},
58		Keyword{.bytes="unreachable", .id = Id.Keyword_unreachable},
59		Keyword{.bytes="use", .id = Id.Keyword_use},
60		Keyword{.bytes="var", .id = Id.Keyword_var},
61		Keyword{.bytes="volatile", .id = Id.Keyword_volatile},
62		Keyword{.bytes="while", .id = Id.Keyword_while},
	14	pub const keywords = []Keyword{
	15	Keyword{ .bytes = "align", .id = Id.Keyword_align },
	16	Keyword{ .bytes = "and", .id = Id.Keyword_and },
	17	Keyword{ .bytes = "asm", .id = Id.Keyword_asm },
	18	Keyword{ .bytes = "async", .id = Id.Keyword_async },
	19	Keyword{ .bytes = "await", .id = Id.Keyword_await },
	20	Keyword{ .bytes = "break", .id = Id.Keyword_break },
	21	Keyword{ .bytes = "catch", .id = Id.Keyword_catch },
	22	Keyword{ .bytes = "cancel", .id = Id.Keyword_cancel },
	23	Keyword{ .bytes = "comptime", .id = Id.Keyword_comptime },
	24	Keyword{ .bytes = "const", .id = Id.Keyword_const },
	25	Keyword{ .bytes = "continue", .id = Id.Keyword_continue },
	26	Keyword{ .bytes = "defer", .id = Id.Keyword_defer },
	27	Keyword{ .bytes = "else", .id = Id.Keyword_else },
	28	Keyword{ .bytes = "enum", .id = Id.Keyword_enum },
	29	Keyword{ .bytes = "errdefer", .id = Id.Keyword_errdefer },
	30	Keyword{ .bytes = "error", .id = Id.Keyword_error },
	31	Keyword{ .bytes = "export", .id = Id.Keyword_export },
	32	Keyword{ .bytes = "extern", .id = Id.Keyword_extern },
	33	Keyword{ .bytes = "false", .id = Id.Keyword_false },
	34	Keyword{ .bytes = "fn", .id = Id.Keyword_fn },
	35	Keyword{ .bytes = "for", .id = Id.Keyword_for },
	36	Keyword{ .bytes = "if", .id = Id.Keyword_if },
	37	Keyword{ .bytes = "inline", .id = Id.Keyword_inline },
	38	Keyword{ .bytes = "nakedcc", .id = Id.Keyword_nakedcc },
	39	Keyword{ .bytes = "noalias", .id = Id.Keyword_noalias },
	40	Keyword{ .bytes = "null", .id = Id.Keyword_null },
	41	Keyword{ .bytes = "or", .id = Id.Keyword_or },
	42	Keyword{ .bytes = "packed", .id = Id.Keyword_packed },
	43	Keyword{ .bytes = "promise", .id = Id.Keyword_promise },
	44	Keyword{ .bytes = "pub", .id = Id.Keyword_pub },
	45	Keyword{ .bytes = "resume", .id = Id.Keyword_resume },
	46	Keyword{ .bytes = "return", .id = Id.Keyword_return },
	47	Keyword{ .bytes = "section", .id = Id.Keyword_section },
	48	Keyword{ .bytes = "stdcallcc", .id = Id.Keyword_stdcallcc },
	49	Keyword{ .bytes = "struct", .id = Id.Keyword_struct },
	50	Keyword{ .bytes = "suspend", .id = Id.Keyword_suspend },
	51	Keyword{ .bytes = "switch", .id = Id.Keyword_switch },
	52	Keyword{ .bytes = "test", .id = Id.Keyword_test },
	53	Keyword{ .bytes = "this", .id = Id.Keyword_this },
	54	Keyword{ .bytes = "true", .id = Id.Keyword_true },
	55	Keyword{ .bytes = "try", .id = Id.Keyword_try },
	56	Keyword{ .bytes = "undefined", .id = Id.Keyword_undefined },
	57	Keyword{ .bytes = "union", .id = Id.Keyword_union },
	58	Keyword{ .bytes = "unreachable", .id = Id.Keyword_unreachable },
	59	Keyword{ .bytes = "use", .id = Id.Keyword_use },
	60	Keyword{ .bytes = "var", .id = Id.Keyword_var },
	61	Keyword{ .bytes = "volatile", .id = Id.Keyword_volatile },
	62	Keyword{ .bytes = "while", .id = Id.Keyword_while },
63	63	};
64	64
	65	// TODO perfect hash at comptime
65	66	fn getKeyword(bytes: []const u8) ?Id {
66	67	for (keywords) \|kw\| {
67	68	if (mem.eql(u8, kw.bytes, bytes)) {
...	...	@@ -71,7 +72,10 @@ pub const Token = struct {
71	72	return null;
72	73	}
73	74
74		const StrLitKind = enum {Normal, C};
	75	const StrLitKind = enum {
	76	Normal,
	77	C,
	78	};
75	79
76	80	pub const Id = union(enum) {
77	81	Invalid,
...	...	@@ -201,7 +205,7 @@ pub const Tokenizer = struct {
201	205	}
202	206
203	207	pub fn init(buffer: []const u8) Tokenizer {
204		return Tokenizer {
	208	return Tokenizer{
205	209	.buffer = buffer,
206	210	.index = 0,
207	211	.pending_invalid_token = null,
...	...	@@ -216,9 +220,10 @@ pub const Tokenizer = struct {
216	220	StringLiteral,
217	221	StringLiteralBackslash,
218	222	MultilineStringLiteralLine,
219		MultilineStringLiteralLineBackslash,
220	223	CharLiteral,
221	224	CharLiteralBackslash,
	225	CharLiteralEscape1,
	226	CharLiteralEscape2,
222	227	CharLiteralEnd,
223	228	Backslash,
224	229	Equal,
...	...	@@ -236,10 +241,15 @@ pub const Tokenizer = struct {
236	241	Zero,
237	242	IntegerLiteral,
238	243	IntegerLiteralWithRadix,
	244	IntegerLiteralWithRadixHex,
239	245	NumberDot,
	246	NumberDotHex,
240	247	FloatFraction,
	248	FloatFractionHex,
241	249	FloatExponentUnsigned,
	250	FloatExponentUnsignedHex,
242	251	FloatExponentNumber,
	252	FloatExponentNumberHex,
243	253	Ampersand,
244	254	Caret,
245	255	Percent,
...	...	@@ -262,7 +272,7 @@ pub const Tokenizer = struct {
262	272	}
263	273	const start_index = self.index;
264	274	var state = State.Start;
265		var result = Token {
	275	var result = Token{
266	276	.id = Token.Id.Eof,
267	277	.start = self.index,
268	278	.end = undefined,
...	...	@@ -283,7 +293,7 @@ pub const Tokenizer = struct {
283	293	},
284	294	'"' => {
285	295	state = State.StringLiteral;
286		result.id = Token.Id { .StringLiteral = Token.StrLitKind.Normal };
	296	result.id = Token.Id{ .StringLiteral = Token.StrLitKind.Normal };
287	297	},
288	298	'\'' => {
289	299	state = State.CharLiteral;
...	...	@@ -362,7 +372,7 @@ pub const Tokenizer = struct {
362	372	},
363	373	'\\' => {
364	374	state = State.Backslash;
365		result.id = Token.Id { .MultilineStringLiteralLine = Token.StrLitKind.Normal };
	375	result.id = Token.Id{ .MultilineStringLiteralLine = Token.StrLitKind.Normal };
366	376	},
367	377	'{' => {
368	378	result.id = Token.Id.LBrace;
...	...	@@ -448,7 +458,7 @@ pub const Tokenizer = struct {
448	458	else => {
449	459	result.id = Token.Id.Asterisk;
450	460	break;
451		}
	461	},
452	462	},
453	463
454	464	State.AsteriskPercent => switch (c) {
...	...	@@ -460,7 +470,7 @@ pub const Tokenizer = struct {
460	470	else => {
461	471	result.id = Token.Id.AsteriskPercent;
462	472	break;
463		}
	473	},
464	474	},
465	475
466	476	State.QuestionMark => switch (c) {
...	...	@@ -528,7 +538,7 @@ pub const Tokenizer = struct {
528	538	else => {
529	539	result.id = Token.Id.Caret;
530	540	break;
531		}
	541	},
532	542	},
533	543
534	544	State.Identifier => switch (c) {
...	...	@@ -553,11 +563,11 @@ pub const Tokenizer = struct {
553	563	State.C => switch (c) {
554	564	'\\' => {
555	565	state = State.Backslash;
556		result.id = Token.Id { .MultilineStringLiteralLine = Token.StrLitKind.C };
	566	result.id = Token.Id{ .MultilineStringLiteralLine = Token.StrLitKind.C };
557	567	},
558	568	'"' => {
559	569	state = State.StringLiteral;
560		result.id = Token.Id { .StringLiteral = Token.StrLitKind.C };
	570	result.id = Token.Id{ .StringLiteral = Token.StrLitKind.C };
561	571	},
562	572	'a'...'z', 'A'...'Z', '_', '0'...'9' => {
563	573	state = State.Identifier;
...	...	@@ -598,7 +608,7 @@ pub const Tokenizer = struct {
598	608	}
599	609
600	610	state = State.CharLiteralEnd;
601		}
	611	},
602	612	},
603	613
604	614	State.CharLiteralBackslash => switch (c) {
...	...	@@ -606,11 +616,34 @@ pub const Tokenizer = struct {
606	616	result.id = Token.Id.Invalid;
607	617	break;
608	618	},
	619	'x' => {
	620	state = State.CharLiteralEscape1;
	621	},
609	622	else => {
610	623	state = State.CharLiteralEnd;
611	624	},
612	625	},
613	626
	627	State.CharLiteralEscape1 => switch (c) {
	628	'0'...'9', 'a'...'z', 'A'...'F' => {
	629	state = State.CharLiteralEscape2;
	630	},
	631	else => {
	632	result.id = Token.Id.Invalid;
	633	break;
	634	},
	635	},
	636
	637	State.CharLiteralEscape2 => switch (c) {
	638	'0'...'9', 'a'...'z', 'A'...'F' => {
	639	state = State.CharLiteralEnd;
	640	},
	641	else => {
	642	result.id = Token.Id.Invalid;
	643	break;
	644	},
	645	},
	646
614	647	State.CharLiteralEnd => switch (c) {
615	648	'\'' => {
616	649	result.id = Token.Id.CharLiteral;
...	...	@@ -624,9 +657,6 @@ pub const Tokenizer = struct {
624	657	},
625	658
626	659	State.MultilineStringLiteralLine => switch (c) {
627		'\\' => {
628		state = State.MultilineStringLiteralLineBackslash;
629		},
630	660	'\n' => {
631	661	self.index += 1;
632	662	break;
...	...	@@ -634,13 +664,6 @@ pub const Tokenizer = struct {
634	664	else => self.checkLiteralCharacter(),
635	665	},
636	666
637		State.MultilineStringLiteralLineBackslash => switch (c) {
638		'\n' => break, // Look for this error later.
639		else => {
640		state = State.MultilineStringLiteralLine;
641		},
642		},
643
644	667	State.Bang => switch (c) {
645	668	'=' => {
646	669	result.id = Token.Id.BangEqual;
...	...	@@ -716,7 +739,7 @@ pub const Tokenizer = struct {
716	739	else => {
717	740	result.id = Token.Id.MinusPercent;
718	741	break;
719		}
	742	},
720	743	},
721	744
722	745	State.AngleBracketLeft => switch (c) {
...	...	@@ -839,9 +862,12 @@ pub const Tokenizer = struct {
839	862	else => self.checkLiteralCharacter(),
840	863	},
841	864	State.Zero => switch (c) {
842		'b', 'o', 'x' => {
	865	'b', 'o' => {
843	866	state = State.IntegerLiteralWithRadix;
844	867	},
	868	'x' => {
	869	state = State.IntegerLiteralWithRadixHex;
	870	},
845	871	else => {
846	872	// reinterpret as a normal number
847	873	self.index -= 1;
...	...	@@ -862,8 +888,15 @@ pub const Tokenizer = struct {
862	888	'.' => {
863	889	state = State.NumberDot;
864	890	},
	891	'0'...'9' => {},
	892	else => break,
	893	},
	894	State.IntegerLiteralWithRadixHex => switch (c) {
	895	'.' => {
	896	state = State.NumberDotHex;
	897	},
865	898	'p', 'P' => {
866		state = State.FloatExponentUnsigned;
	899	state = State.FloatExponentUnsignedHex;
867	900	},
868	901	'0'...'9', 'a'...'f', 'A'...'F' => {},
869	902	else => break,
...	...	@@ -880,13 +913,32 @@ pub const Tokenizer = struct {
880	913	state = State.FloatFraction;
881	914	},
882	915	},
	916	State.NumberDotHex => switch (c) {
	917	'.' => {
	918	self.index -= 1;
	919	state = State.Start;
	920	break;
	921	},
	922	else => {
	923	self.index -= 1;
	924	result.id = Token.Id.FloatLiteral;
	925	state = State.FloatFractionHex;
	926	},
	927	},
883	928	State.FloatFraction => switch (c) {
884		'p', 'P', 'e', 'E' => {
	929	'e', 'E' => {
885	930	state = State.FloatExponentUnsigned;
886	931	},
887	932	'0'...'9' => {},
888	933	else => break,
889	934	},
	935	State.FloatFractionHex => switch (c) {
	936	'p', 'P' => {
	937	state = State.FloatExponentUnsignedHex;
	938	},
	939	'0'...'9', 'a'...'f', 'A'...'F' => {},
	940	else => break,
	941	},
890	942	State.FloatExponentUnsigned => switch (c) {
891	943	'+', '-' => {
892	944	state = State.FloatExponentNumber;
...	...	@@ -895,9 +947,23 @@ pub const Tokenizer = struct {
895	947	// reinterpret as a normal exponent number
896	948	self.index -= 1;
897	949	state = State.FloatExponentNumber;
898		}
	950	},
	951	},
	952	State.FloatExponentUnsignedHex => switch (c) {
	953	'+', '-' => {
	954	state = State.FloatExponentNumberHex;
	955	},
	956	else => {
	957	// reinterpret as a normal exponent number
	958	self.index -= 1;
	959	state = State.FloatExponentNumberHex;
	960	},
899	961	},
900	962	State.FloatExponentNumber => switch (c) {
	963	'0'...'9' => {},
	964	else => break,
	965	},
	966	State.FloatExponentNumberHex => switch (c) {
901	967	'0'...'9', 'a'...'f', 'A'...'F' => {},
902	968	else => break,
903	969	},
...	...	@@ -908,19 +974,22 @@ pub const Tokenizer = struct {
908	974	State.C,
909	975	State.IntegerLiteral,
910	976	State.IntegerLiteralWithRadix,
	977	State.IntegerLiteralWithRadixHex,
911	978	State.FloatFraction,
	979	State.FloatFractionHex,
912	980	State.FloatExponentNumber,
	981	State.FloatExponentNumberHex,
913	982	State.StringLiteral, // find this error later
914	983	State.MultilineStringLiteralLine,
915		State.Builtin => {},
	984	State.Builtin,
	985	=> {},
916	986
917	987	State.Identifier => {
918	988	if (Token.getKeyword(self.buffer[result.start..self.index])) \|id\| {
919	989	result.id = id;
920	990	}
921	991	},
922		State.LineCommentStart,
923		State.LineComment => {
	992	State.LineCommentStart, State.LineComment => {
924	993	result.id = Token.Id.LineComment;
925	994	},
926	995	State.DocComment, State.DocCommentStart => {
...	...	@@ -928,14 +997,18 @@ pub const Tokenizer = struct {
928	997	},
929	998
930	999	State.NumberDot,
	1000	State.NumberDotHex,
931	1001	State.FloatExponentUnsigned,
	1002	State.FloatExponentUnsignedHex,
932	1003	State.SawAtSign,
933	1004	State.Backslash,
934		State.MultilineStringLiteralLineBackslash,
935	1005	State.CharLiteral,
936	1006	State.CharLiteralBackslash,
	1007	State.CharLiteralEscape1,
	1008	State.CharLiteralEscape2,
937	1009	State.CharLiteralEnd,
938		State.StringLiteralBackslash => {
	1010	State.StringLiteralBackslash,
	1011	=> {
939	1012	result.id = Token.Id.Invalid;
940	1013	},
941	1014
...	...	@@ -1020,7 +1093,7 @@ pub const Tokenizer = struct {
1020	1093	if (self.pending_invalid_token != null) return;
1021	1094	const invalid_length = self.getInvalidCharacterLength();
1022	1095	if (invalid_length == 0) return;
1023		self.pending_invalid_token = Token {
	1096	self.pending_invalid_token = Token{
1024	1097	.id = Token.Id.Invalid,
1025	1098	.start = self.index,
1026	1099	.end = self.index + invalid_length,
...	...	@@ -1065,16 +1138,27 @@ pub const Tokenizer = struct {
1065	1138	}
1066	1139	};
1067	1140
	1141	test "tokenizer" {
	1142	testTokenize("test", []Token.Id{Token.Id.Keyword_test});
	1143	}
1068	1144
	1145	test "tokenizer - char literal with hex escape" {
	1146	testTokenize(
	1147	\\'\x1b'
	1148	, []Token.Id{Token.Id.CharLiteral});
	1149	}
1069	1150
1070		test "tokenizer" {
1071		testTokenize("test", []Token.Id {
1072		Token.Id.Keyword_test,
	1151	test "tokenizer - float literal e exponent" {
	1152	testTokenize("a = 4.94065645841246544177e-324;\n", []Token.Id{
	1153	Token.Id.Identifier,
	1154	Token.Id.Equal,
	1155	Token.Id.FloatLiteral,
	1156	Token.Id.Semicolon,
1073	1157	});
1074	1158	}
1075	1159
1076		test "tokenizer - float literal" {
1077		testTokenize("a = 4.94065645841246544177e-324;\n", []Token.Id {
	1160	test "tokenizer - float literal p exponent" {
	1161	testTokenize("a = 0x1.a827999fcef32p+1022;\n", []Token.Id{
1078	1162	Token.Id.Identifier,
1079	1163	Token.Id.Equal,
1080	1164	Token.Id.FloatLiteral,
...	...	@@ -1083,31 +1167,31 @@ test "tokenizer - float literal" {
1083	1167	}
1084	1168
1085	1169	test "tokenizer - chars" {
1086		testTokenize("'c'", []Token.Id {Token.Id.CharLiteral});
	1170	testTokenize("'c'", []Token.Id{Token.Id.CharLiteral});
1087	1171	}
1088	1172
1089	1173	test "tokenizer - invalid token characters" {
1090	1174	testTokenize("#", []Token.Id{Token.Id.Invalid});
1091	1175	testTokenize("`", []Token.Id{Token.Id.Invalid});
1092		testTokenize("'c", []Token.Id {Token.Id.Invalid});
1093		testTokenize("'", []Token.Id {Token.Id.Invalid});
1094		testTokenize("''", []Token.Id {Token.Id.Invalid, Token.Id.Invalid});
	1176	testTokenize("'c", []Token.Id{Token.Id.Invalid});
	1177	testTokenize("'", []Token.Id{Token.Id.Invalid});
	1178	testTokenize("''", []Token.Id{ Token.Id.Invalid, Token.Id.Invalid });
1095	1179	}
1096	1180
1097	1181	test "tokenizer - invalid literal/comment characters" {
1098		testTokenize("\"\x00\"", []Token.Id {
1099		Token.Id { .StringLiteral = Token.StrLitKind.Normal },
	1182	testTokenize("\"\x00\"", []Token.Id{
	1183	Token.Id{ .StringLiteral = Token.StrLitKind.Normal },
1100	1184	Token.Id.Invalid,
1101	1185	});
1102		testTokenize("//\x00", []Token.Id {
	1186	testTokenize("//\x00", []Token.Id{
1103	1187	Token.Id.LineComment,
1104	1188	Token.Id.Invalid,
1105	1189	});
1106		testTokenize("//\x1f", []Token.Id {
	1190	testTokenize("//\x1f", []Token.Id{
1107	1191	Token.Id.LineComment,
1108	1192	Token.Id.Invalid,
1109	1193	});
1110		testTokenize("//\x7f", []Token.Id {
	1194	testTokenize("//\x7f", []Token.Id{
1111	1195	Token.Id.LineComment,
1112	1196	Token.Id.Invalid,
1113	1197	});
...	...	@@ -1176,18 +1260,16 @@ test "tokenizer - illegal unicode codepoints" {
1176	1260	test "tokenizer - string identifier and builtin fns" {
1177	1261	testTokenize(
1178	1262	\\const @"if" = @import("std");
1179		,
1180		[]Token.Id{
1181		Token.Id.Keyword_const,
1182		Token.Id.Identifier,
1183		Token.Id.Equal,
1184		Token.Id.Builtin,
1185		Token.Id.LParen,
1186		Token.Id {.StringLiteral = Token.StrLitKind.Normal},
1187		Token.Id.RParen,
1188		Token.Id.Semicolon,
1189		}
1190		);
	1263	, []Token.Id{
	1264	Token.Id.Keyword_const,
	1265	Token.Id.Identifier,
	1266	Token.Id.Equal,
	1267	Token.Id.Builtin,
	1268	Token.Id.LParen,
	1269	Token.Id{ .StringLiteral = Token.StrLitKind.Normal },
	1270	Token.Id.RParen,
	1271	Token.Id.Semicolon,
	1272	});
1191	1273	}
1192	1274
1193	1275	test "tokenizer - pipe and then invalid" {
...	...	@@ -1229,7 +1311,10 @@ fn testTokenize(source: []const u8, expected_tokens: []const Token.Id) void {
1229	1311	}
1230	1312	switch (expected_token_id) {
1231	1313	Token.Id.StringLiteral => \|expected_kind\| {
1232		std.debug.assert(expected_kind == switch (token.id) { Token.Id.StringLiteral => \|kind\| kind, else => unreachable });
	1314	std.debug.assert(expected_kind == switch (token.id) {
	1315	Token.Id.StringLiteral => \|kind\| kind,
	1316	else => unreachable,
	1317	});
1233	1318	},
1234	1319	else => {},
1235	1320	}

test/behavior.zig+4-2

...	...	@@ -23,6 +23,7 @@ comptime {
23	23	_ = @import("cases/eval.zig");
24	24	_ = @import("cases/field_parent_ptr.zig");
25	25	_ = @import("cases/fn.zig");
	26	_ = @import("cases/fn_in_struct_in_comptime.zig");
26	27	_ = @import("cases/for.zig");
27	28	_ = @import("cases/generics.zig");
28	29	_ = @import("cases/if.zig");
...	...	@@ -32,11 +33,12 @@ comptime {
32	33	_ = @import("cases/math.zig");
33	34	_ = @import("cases/misc.zig");
34	35	_ = @import("cases/namespace_depends_on_compile_var/index.zig");
	36	_ = @import("cases/new_stack_call.zig");
35	37	_ = @import("cases/null.zig");
	38	_ = @import("cases/pointers.zig");
36	39	_ = @import("cases/pub_enum/index.zig");
37	40	_ = @import("cases/ref_var_in_if_after_if_2nd_switch_prong.zig");
38	41	_ = @import("cases/reflection.zig");
39		_ = @import("cases/type_info.zig");
40	42	_ = @import("cases/sizeof_and_typeof.zig");
41	43	_ = @import("cases/slice.zig");
42	44	_ = @import("cases/struct.zig");
...	...	@@ -48,10 +50,10 @@ comptime {
48	50	_ = @import("cases/syntax.zig");
49	51	_ = @import("cases/this.zig");
50	52	_ = @import("cases/try.zig");
	53	_ = @import("cases/type_info.zig");
51	54	_ = @import("cases/undefined.zig");
52	55	_ = @import("cases/union.zig");
53	56	_ = @import("cases/var_args.zig");
54	57	_ = @import("cases/void.zig");
55	58	_ = @import("cases/while.zig");
56		_ = @import("cases/fn_in_struct_in_comptime.zig");
57	59	}

test/build_examples.zig+1-1

...	...	@@ -9,7 +9,7 @@ pub fn addCases(cases: &tests.BuildExamplesContext) void {
9	9	cases.add("example/guess_number/main.zig");
10	10	if (!is_windows) {
11	11	// TODO get this test passing on windows
12		// See https://github.com/zig-lang/zig/issues/538
	12	// See https://github.com/ziglang/zig/issues/538
13	13	cases.addBuildFile("example/shared_library/build.zig");
14	14	cases.addBuildFile("example/mix_o_files/build.zig");
15	15	}

test/cases/align.zig+60-26

...	...	@@ -10,7 +10,9 @@ test "global variable alignment" {
10	10	assert(@typeOf(slice) == []align(4) u8);
11	11	}
12	12
13		fn derp() align(@sizeOf(usize) * 2) i32 { return 1234; }
	13	fn derp() align(@sizeOf(usize) * 2) i32 {
	14	return 1234;
	15	}
14	16	fn noop1() align(1) void {}
15	17	fn noop4() align(4) void {}
16	18
...	...	@@ -22,7 +24,6 @@ test "function alignment" {
22	24	noop4();
23	25	}
24	26
25
26	27	var baz: packed struct {
27	28	a: u32,
28	29	b: u32,
...	...	@@ -32,7 +33,6 @@ test "packed struct alignment" {
32	33	assert(@typeOf(&baz.b) == &align(1) u32);
33	34	}
34	35
35
36	36	const blah: packed struct {
37	37	a: u3,
38	38	b: u3,
...	...	@@ -53,29 +53,43 @@ test "implicitly decreasing pointer alignment" {
53	53	assert(addUnaligned(&a, &b) == 7);
54	54	}
55	55
56		fn addUnaligned(a: &align(1) const u32, b: &align(1) const u32) u32 { return a + b; }
	56	fn addUnaligned(a: &align(1) const u32, b: &align(1) const u32) u32 {
	57	return a.* + b.*;
	58	}
57	59
58	60	test "implicitly decreasing slice alignment" {
59	61	const a: u32 align(4) = 3;
60	62	const b: u32 align(8) = 4;
61	63	assert(addUnalignedSlice((&a)[0..1], (&b)[0..1]) == 7);
62	64	}
63		fn addUnalignedSlice(a: []align(1) const u32, b: []align(1) const u32) u32 { return a[0] + b[0]; }
	65	fn addUnalignedSlice(a: []align(1) const u32, b: []align(1) const u32) u32 {
	66	return a[0] + b[0];
	67	}
64	68
65	69	test "specifying alignment allows pointer cast" {
66	70	testBytesAlign(0x33);
67	71	}
68	72	fn testBytesAlign(b: u8) void {
69		var bytes align(4) = []u8{b, b, b, b};
	73	var bytes align(4) = []u8{
	74	b,
	75	b,
	76	b,
	77	b,
	78	};
70	79	const ptr = @ptrCast(&u32, &bytes[0]);
71		assert(*ptr == 0x33333333);
	80	assert(ptr.* == 0x33333333);
72	81	}
73	82
74	83	test "specifying alignment allows slice cast" {
75	84	testBytesAlignSlice(0x33);
76	85	}
77	86	fn testBytesAlignSlice(b: u8) void {
78		var bytes align(4) = []u8{b, b, b, b};
	87	var bytes align(4) = []u8{
	88	b,
	89	b,
	90	b,
	91	b,
	92	};
79	93	const slice = ([]u32)(bytes[0..]);
80	94	assert(slice[0] == 0x33333333);
81	95	}
...	...	@@ -89,11 +103,14 @@ fn expectsOnly1(x: &align(1) u32) void {
89	103	expects4(@alignCast(4, x));
90	104	}
91	105	fn expects4(x: &align(4) u32) void {
92		*x += 1;
	106	x.* += 1;
93	107	}
94	108
95	109	test "@alignCast slices" {
96		var array align(4) = []u32{1, 1};
	110	var array align(4) = []u32{
	111	1,
	112	1,
	113	};
97	114	const slice = array[0..];
98	115	sliceExpectsOnly1(slice);
99	116	assert(slice[0] == 2);
...	...	@@ -105,31 +122,34 @@ fn sliceExpects4(slice: []align(4) u32) void {
105	122	slice[0] += 1;
106	123	}
107	124
108
109	125	test "implicitly decreasing fn alignment" {
110	126	testImplicitlyDecreaseFnAlign(alignedSmall, 1234);
111	127	testImplicitlyDecreaseFnAlign(alignedBig, 5678);
112	128	}
113	129
114		fn testImplicitlyDecreaseFnAlign(ptr: fn () align(1) i32, answer: i32) void {
	130	fn testImplicitlyDecreaseFnAlign(ptr: fn() align(1) i32, answer: i32) void {
115	131	assert(ptr() == answer);
116	132	}
117	133
118		fn alignedSmall() align(8) i32 { return 1234; }
119		fn alignedBig() align(16) i32 { return 5678; }
120
	134	fn alignedSmall() align(8) i32 {
	135	return 1234;
	136	}
	137	fn alignedBig() align(16) i32 {
	138	return 5678;
	139	}
121	140
122	141	test "@alignCast functions" {
123	142	assert(fnExpectsOnly1(simple4) == 0x19);
124	143	}
125		fn fnExpectsOnly1(ptr: fn()align(1) i32) i32 {
	144	fn fnExpectsOnly1(ptr: fn() align(1) i32) i32 {
126	145	return fnExpects4(@alignCast(4, ptr));
127	146	}
128		fn fnExpects4(ptr: fn()align(4) i32) i32 {
	147	fn fnExpects4(ptr: fn() align(4) i32) i32 {
129	148	return ptr();
130	149	}
131		fn simple4() align(4) i32 { return 0x19; }
132
	150	fn simple4() align(4) i32 {
	151	return 0x19;
	152	}
133	153
134	154	test "generic function with align param" {
135	155	assert(whyWouldYouEverDoThis(1) == 0x1);
...	...	@@ -137,8 +157,9 @@ test "generic function with align param" {
137	157	assert(whyWouldYouEverDoThis(8) == 0x1);
138	158	}
139	159
140		fn whyWouldYouEverDoThis(comptime align_bytes: u8) align(align_bytes) u8 { return 0x1; }
141
	160	fn whyWouldYouEverDoThis(comptime align_bytes: u8) align(align_bytes) u8 {
	161	return 0x1;
	162	}
142	163
143	164	test "@ptrCast preserves alignment of bigger source" {
144	165	var x: u32 align(16) = 1234;
...	...	@@ -146,24 +167,38 @@ test "@ptrCast preserves alignment of bigger source" {
146	167	assert(@typeOf(ptr) == &align(16) u8);
147	168	}
148	169
149
150	170	test "compile-time known array index has best alignment possible" {
151	171	// take full advantage of over-alignment
152		var array align(4) = []u8 {1, 2, 3, 4};
	172	var array align(4) = []u8{
	173	1,
	174	2,
	175	3,
	176	4,
	177	};
153	178	assert(@typeOf(&array[0]) == &align(4) u8);
154	179	assert(@typeOf(&array[1]) == &u8);
155	180	assert(@typeOf(&array[2]) == &align(2) u8);
156	181	assert(@typeOf(&array[3]) == &u8);
157	182
158	183	// because align is too small but we still figure out to use 2
159		var bigger align(2) = []u64{1, 2, 3, 4};
	184	var bigger align(2) = []u64{
	185	1,
	186	2,
	187	3,
	188	4,
	189	};
160	190	assert(@typeOf(&bigger[0]) == &align(2) u64);
161	191	assert(@typeOf(&bigger[1]) == &align(2) u64);
162	192	assert(@typeOf(&bigger[2]) == &align(2) u64);
163	193	assert(@typeOf(&bigger[3]) == &align(2) u64);
164	194
165	195	// because pointer is align 2 and u32 align % 2 == 0 we can assume align 2
166		var smaller align(2) = []u32{1, 2, 3, 4};
	196	var smaller align(2) = []u32{
	197	1,
	198	2,
	199	3,
	200	4,
	201	};
167	202	testIndex(&smaller[0], 0, &align(2) u32);
168	203	testIndex(&smaller[0], 1, &align(2) u32);
169	204	testIndex(&smaller[0], 2, &align(2) u32);
...	...	@@ -182,7 +217,6 @@ fn testIndex2(ptr: &align(4) u8, index: usize, comptime T: type) void {
182	217	assert(@typeOf(&ptr[index]) == T);
183	218	}
184	219
185
186	220	test "alignstack" {
187	221	assert(fnWithAlignedStack() == 1234);
188	222	}

test/cases/alignof.zig+5-1

...	...	@@ -1,7 +1,11 @@
1	1	const assert = @import("std").debug.assert;
2	2	const builtin = @import("builtin");
3	3
4		const Foo = struct { x: u32, y: u32, z: u32, };
	4	const Foo = struct {
	5	x: u32,
	6	y: u32,
	7	z: u32,
	8	};
5	9
6	10	test "@alignOf(T) before referencing T" {
7	11	comptime assert(@alignOf(Foo) != @maxValue(usize));

test/cases/array.zig+29-10

...	...	@@ -2,9 +2,9 @@ const assert = @import("std").debug.assert;
2	2	const mem = @import("std").mem;
3	3
4	4	test "arrays" {
5		var array : [5]u32 = undefined;
	5	var array: [5]u32 = undefined;
6	6
7		var i : u32 = 0;
	7	var i: u32 = 0;
8	8	while (i < 5) {
9	9	array[i] = i + 1;
10	10	i = array[i];
...	...	@@ -34,24 +34,41 @@ test "void arrays" {
34	34	}
35	35
36	36	test "array literal" {
37		const hex_mult = []u16{4096, 256, 16, 1};
	37	const hex_mult = []u16{
	38	4096,
	39	256,
	40	16,
	41	1,
	42	};
38	43
39	44	assert(hex_mult.len == 4);
40	45	assert(hex_mult[1] == 256);
41	46	}
42	47
43	48	test "array dot len const expr" {
44		assert(comptime x: {break :x some_array.len == 4;});
	49	assert(comptime x: {
	50	break :x some_array.len == 4;
	51	});
45	52	}
46	53
47	54	const ArrayDotLenConstExpr = struct {
48	55	y: [some_array.len]u8,
49	56	};
50		const some_array = []u8 {0, 1, 2, 3};
51
	57	const some_array = []u8{
	58	0,
	59	1,
	60	2,
	61	3,
	62	};
52	63
53	64	test "nested arrays" {
54		const array_of_strings = [][]const u8 {"hello", "this", "is", "my", "thing"};
	65	const array_of_strings = [][]const u8{
	66	"hello",
	67	"this",
	68	"is",
	69	"my",
	70	"thing",
	71	};
55	72	for (array_of_strings) \|s, i\| {
56	73	if (i == 0) assert(mem.eql(u8, s, "hello"));
57	74	if (i == 1) assert(mem.eql(u8, s, "this"));
...	...	@@ -61,7 +78,6 @@ test "nested arrays" {
61	78	}
62	79	}
63	80
64
65	81	var s_array: [8]Sub = undefined;
66	82	const Sub = struct {
67	83	b: u8,
...	...	@@ -70,7 +86,7 @@ const Str = struct {
70	86	a: []Sub,
71	87	};
72	88	test "set global var array via slice embedded in struct" {
73		var s = Str { .a = s_array[0..]};
	89	var s = Str{ .a = s_array[0..] };
74	90
75	91	s.a[0].b = 1;
76	92	s.a[1].b = 2;
...	...	@@ -82,7 +98,10 @@ test "set global var array via slice embedded in struct" {
82	98	}
83	99
84	100	test "array literal with specified size" {
85		var array = [2]u8{1, 2};
	101	var array = [2]u8{
	102	1,
	103	2,
	104	};
86	105	assert(array[0] == 1);
87	106	assert(array[1] == 2);
88	107	}

test/cases/bitcast.zig+6-2

...	...	@@ -10,5 +10,9 @@ fn testBitCast_i32_u32() void {
10	10	assert(conv2(@maxValue(u32)) == -1);
11	11	}
12	12
13		fn conv(x: i32) u32 { return @bitCast(u32, x); }
14		fn conv2(x: u32) i32 { return @bitCast(i32, x); }
	13	fn conv(x: i32) u32 {
	14	return @bitCast(u32, x);
	15	}
	16	fn conv2(x: u32) i32 {
	17	return @bitCast(i32, x);
	18	}

test/cases/bugs/394.zig+12-3

...	...	@@ -1,9 +1,18 @@
1		const E = union(enum) { A: [9]u8, B: u64, };
2		const S = struct { x: u8, y: E, };
	1	const E = union(enum) {
	2	A: [9]u8,
	3	B: u64,
	4	};
	5	const S = struct {
	6	x: u8,
	7	y: E,
	8	};
3	9
4	10	const assert = @import("std").debug.assert;
5	11
6	12	test "bug 394 fixed" {
7		const x = S { .x = 3, .y = E {.B = 1 } };
	13	const x = S{
	14	.x = 3,
	15	.y = E{ .B = 1 },
	16	};
8	17	assert(x.x == 3);
9	18	}

test/cases/bugs/655.zig+1-1

...	...	@@ -8,5 +8,5 @@ test "function with &const parameter with type dereferenced by namespace" {
8	8	}
9	9
10	10	fn foo(x: &const other_file.Integer) void {
11		std.debug.assert(*x == 1234);
	11	std.debug.assert(x.* == 1234);
12	12	}

test/cases/bugs/656.zig+5-4

...	...	@@ -14,12 +14,13 @@ test "nullable if after an if in a switch prong of a switch with 2 prongs in an
14	14	}
15	15
16	16	fn foo(a: bool, b: bool) void {
17		var prefix_op = PrefixOp { .AddrOf = Value { .align_expr = 1234 } };
18		if (a) {
19		} else {
	17	var prefix_op = PrefixOp{
	18	.AddrOf = Value{ .align_expr = 1234 },
	19	};
	20	if (a) {} else {
20	21	switch (prefix_op) {
21	22	PrefixOp.AddrOf => \|addr_of_info\| {
22		if (b) { }
	23	if (b) {}
23	24	if (addr_of_info.align_expr) \|align_expr\| {
24	25	assert(align_expr == 1234);
25	26	}

test/cases/bugs/828.zig+7-11

...	...	@@ -1,20 +1,16 @@
1	1	const CountBy = struct {
2	2	a: usize,
3
4		const One = CountBy {
5		.a = 1,
6		};
7
	3
	4	const One = CountBy{ .a = 1 };
	5
8	6	pub fn counter(self: &const CountBy) Counter {
9		return Counter {
10		.i = 0,
11		};
	7	return Counter{ .i = 0 };
12	8	}
13	9	};
14	10
15	11	const Counter = struct {
16	12	i: usize,
17
	13
18	14	pub fn count(self: &Counter) bool {
19	15	self.i += 1;
20	16	return self.i <= 10;
...	...	@@ -24,8 +20,8 @@ const Counter = struct {
24	20	fn constCount(comptime cb: &const CountBy, comptime unused: u32) void {
25	21	comptime {
26	22	var cnt = cb.counter();
27		if(cnt.i != 0) @compileError("Counter instance reused!");
28		while(cnt.count()){}
	23	if (cnt.i != 0) @compileError("Counter instance reused!");
	24	while (cnt.count()) {}
29	25	}
30	26	}
31	27

test/cases/bugs/920.zig+12-7

...	...	@@ -12,8 +12,7 @@ const ZigTable = struct {
12	12	zero_case: fn(&Random, f64) f64,
13	13	};
14	14
15		fn ZigTableGen(comptime is_symmetric: bool, comptime r: f64, comptime v: f64, comptime f: fn(f64) f64,
16		comptime f_inv: fn(f64) f64, comptime zero_case: fn(&Random, f64) f64) ZigTable {
	15	fn ZigTableGen(comptime is_symmetric: bool, comptime r: f64, comptime v: f64, comptime f: fn(f64) f64, comptime f_inv: fn(f64) f64, comptime zero_case: fn(&Random, f64) f64) ZigTable {
17	16	var tables: ZigTable = undefined;
18	17
19	18	tables.is_symmetric = is_symmetric;
...	...	@@ -26,12 +25,12 @@ fn ZigTableGen(comptime is_symmetric: bool, comptime r: f64, comptime v: f64, co
26	25
27	26	for (tables.x[2..256]) \|*entry, i\| {
28	27	const last = tables.x[2 + i - 1];
29		*entry = f_inv(v / last + f(last));
	28	entry.* = f_inv(v / last + f(last));
30	29	}
31	30	tables.x[256] = 0;
32	31
33	32	for (tables.f[0..]) \|*entry, i\| {
34		*entry = f(tables.x[i]);
	33	entry.* = f(tables.x[i]);
35	34	}
36	35
37	36	return tables;
...	...	@@ -40,9 +39,15 @@ fn ZigTableGen(comptime is_symmetric: bool, comptime r: f64, comptime v: f64, co
40	39	const norm_r = 3.6541528853610088;
41	40	const norm_v = 0.00492867323399;
42	41
43		fn norm_f(x: f64) f64 { return math.exp(-x * x / 2.0); }
44		fn norm_f_inv(y: f64) f64 { return math.sqrt(-2.0 * math.ln(y)); }
45		fn norm_zero_case(random: &Random, u: f64) f64 { return 0.0; }
	42	fn norm_f(x: f64) f64 {
	43	return math.exp(-x * x / 2.0);
	44	}
	45	fn norm_f_inv(y: f64) f64 {
	46	return math.sqrt(-2.0 * math.ln(y));
	47	}
	48	fn norm_zero_case(random: &Random, u: f64) f64 {
	49	return 0.0;
	50	}
46	51
47	52	const NormalDist = blk: {
48	53	@setEvalBranchQuota(30000);

test/cases/cast.zig+27-28

...	...	@@ -17,7 +17,7 @@ test "pointer reinterpret const float to int" {
17	17	const float: f64 = 5.99999999999994648725e-01;
18	18	const float_ptr = &float;
19	19	const int_ptr = @ptrCast(&const i32, float_ptr);
20		const int_val = *int_ptr;
	20	const int_val = int_ptr.*;
21	21	assert(int_val == 858993411);
22	22	}
23	23
...	...	@@ -29,25 +29,25 @@ test "implicitly cast a pointer to a const pointer of it" {
29	29	}
30	30
31	31	fn funcWithConstPtrPtr(x: &const &i32) void {
32		**x += 1;
	32	x.. += 1;
33	33	}
34	34
35	35	test "implicitly cast a container to a const pointer of it" {
36		const z = Struct(void) { .x = void{} };
	36	const z = Struct(void){ .x = void{} };
37	37	assert(0 == @sizeOf(@typeOf(z)));
38	38	assert(void{} == Struct(void).pointer(z).x);
39	39	assert(void{} == Struct(void).pointer(&z).x);
40	40	assert(void{} == Struct(void).maybePointer(z).x);
41	41	assert(void{} == Struct(void).maybePointer(&z).x);
42	42	assert(void{} == Struct(void).maybePointer(null).x);
43		const s = Struct(u8) { .x = 42 };
	43	const s = Struct(u8){ .x = 42 };
44	44	assert(0 != @sizeOf(@typeOf(s)));
45	45	assert(42 == Struct(u8).pointer(s).x);
46	46	assert(42 == Struct(u8).pointer(&s).x);
47	47	assert(42 == Struct(u8).maybePointer(s).x);
48	48	assert(42 == Struct(u8).maybePointer(&s).x);
49	49	assert(0 == Struct(u8).maybePointer(null).x);
50		const u = Union { .x = 42 };
	50	const u = Union{ .x = 42 };
51	51	assert(42 == Union.pointer(u).x);
52	52	assert(42 == Union.pointer(&u).x);
53	53	assert(42 == Union.maybePointer(u).x);
...	...	@@ -67,12 +67,12 @@ fn Struct(comptime T: type) type {
67	67	x: T,
68	68
69	69	fn pointer(self: &const Self) Self {
70		return *self;
	70	return self.*;
71	71	}
72	72
73	73	fn maybePointer(self: ?&const Self) Self {
74		const none = Self { .x = if (T == void) void{} else 0 };
75		return *(self ?? &none);
	74	const none = Self{ .x = if (T == void) void{} else 0 };
	75	return (self ?? &none).*;
76	76	}
77	77	};
78	78	}
...	...	@@ -81,12 +81,12 @@ const Union = union {
81	81	x: u8,
82	82
83	83	fn pointer(self: &const Union) Union {
84		return *self;
	84	return self.*;
85	85	}
86	86
87	87	fn maybePointer(self: ?&const Union) Union {
88		const none = Union { .x = 0 };
89		return *(self ?? &none);
	88	const none = Union{ .x = 0 };
	89	return (self ?? &none).*;
90	90	}
91	91	};
92	92
...	...	@@ -95,11 +95,11 @@ const Enum = enum {
95	95	Some,
96	96
97	97	fn pointer(self: &const Enum) Enum {
98		return *self;
	98	return self.*;
99	99	}
100	100
101	101	fn maybePointer(self: ?&const Enum) Enum {
102		return *(self ?? &Enum.None);
	102	return (self ?? &Enum.None).*;
103	103	}
104	104	};
105	105
...	...	@@ -108,19 +108,19 @@ test "implicitly cast indirect pointer to maybe-indirect pointer" {
108	108	const Self = this;
109	109	x: u8,
110	110	fn constConst(p: &const &const Self) u8 {
111		return (*p).x;
	111	return (p.*).x;
112	112	}
113	113	fn maybeConstConst(p: ?&const &const Self) u8 {
114		return (*??p).x;
	114	return ((??p).*).x;
115	115	}
116	116	fn constConstConst(p: &const &const &const Self) u8 {
117		return (**p).x;
	117	return (p..).x;
118	118	}
119	119	fn maybeConstConstConst(p: ?&const &const &const Self) u8 {
120		return (**??p).x;
	120	return ((??p)..).x;
121	121	}
122	122	};
123		const s = S { .x = 42 };
	123	const s = S{ .x = 42 };
124	124	const p = &s;
125	125	const q = &p;
126	126	const r = &q;
...	...	@@ -154,7 +154,6 @@ fn boolToStr(b: bool) []const u8 {
154	154	return if (b) "true" else "false";
155	155	}
156	156
157
158	157	test "peer resolve array and const slice" {
159	158	testPeerResolveArrayConstSlice(true);
160	159	comptime testPeerResolveArrayConstSlice(true);
...	...	@@ -168,12 +167,12 @@ fn testPeerResolveArrayConstSlice(b: bool) void {
168	167
169	168	test "integer literal to &const int" {
170	169	const x: &const i32 = 3;
171		assert(*x == 3);
	170	assert(x.* == 3);
172	171	}
173	172
174	173	test "string literal to &const []const u8" {
175	174	const x: &const []const u8 = "hello";
176		assert(mem.eql(u8, *x, "hello"));
	175	assert(mem.eql(u8, x.*, "hello"));
177	176	}
178	177
179	178	test "implicitly cast from T to error!?T" {
...	...	@@ -205,7 +204,6 @@ fn implicitIntLitToMaybe() void {
205	204	const g: error!?i32 = 1;
206	205	}
207	206
208
209	207	test "return null from fn() error!?&T" {
210	208	const a = returnNullFromMaybeTypeErrorRef();
211	209	const b = returnNullLitFromMaybeTypeErrorRef();
...	...	@@ -235,7 +233,6 @@ fn peerTypeTAndMaybeT(c: bool, b: bool) ?usize {
235	233	return usize(3);
236	234	}
237	235
238
239	236	test "peer type resolution: [0]u8 and []const u8" {
240	237	assert(peerTypeEmptyArrayAndSlice(true, "hi").len == 0);
241	238	assert(peerTypeEmptyArrayAndSlice(false, "hi").len == 1);
...	...	@@ -246,7 +243,7 @@ test "peer type resolution: [0]u8 and []const u8" {
246	243	}
247	244	fn peerTypeEmptyArrayAndSlice(a: bool, slice: []const u8) []const u8 {
248	245	if (a) {
249		return []const u8 {};
	246	return []const u8{};
250	247	}
251	248
252	249	return slice[0..1];
...	...	@@ -261,7 +258,6 @@ fn castToMaybeSlice() ?[]const u8 {
261	258	return "hi";
262	259	}
263	260
264
265	261	test "implicitly cast from [0]T to error![]T" {
266	262	testCastZeroArrayToErrSliceMut();
267	263	comptime testCastZeroArrayToErrSliceMut();
...	...	@@ -329,12 +325,10 @@ fn foo(args: ...) void {
329	325	assert(@typeOf(args[0]) == &const [5]u8);
330	326	}
331	327
332
333	328	test "peer type resolution: error and [N]T" {
334	329	// TODO: implicit error!T to error!U where T can implicitly cast to U
335	330	//assert(mem.eql(u8, try testPeerErrorAndArray(0), "OK"));
336	331	//comptime assert(mem.eql(u8, try testPeerErrorAndArray(0), "OK"));
337
338	332	assert(mem.eql(u8, try testPeerErrorAndArray2(1), "OKK"));
339	333	comptime assert(mem.eql(u8, try testPeerErrorAndArray2(1), "OKK"));
340	334	}
...	...	@@ -378,7 +372,12 @@ fn cast128Float(x: u128) f128 {
378	372	}
379	373
380	374	test "const slice widen cast" {
381		const bytes align(4) = []u8{0x12, 0x12, 0x12, 0x12};
	375	const bytes align(4) = []u8{
	376	0x12,
	377	0x12,
	378	0x12,
	379	0x12,
	380	};
382	381
383	382	const u32_value = ([]const u32)(bytes[0..])[0];
384	383	assert(u32_value == 0x12121212);

test/cases/const_slice_child.zig+1-1

...	...	@@ -4,7 +4,7 @@ const assert = debug.assert;
4	4	var argv: &const &const u8 = undefined;
5	5
6	6	test "const slice child" {
7		const strs = ([]&const u8) {
	7	const strs = ([]&const u8){
8	8	c"one",
9	9	c"two",
10	10	c"three",

test/cases/coroutines.zig+7-22

...	...	@@ -10,7 +10,6 @@ test "create a coroutine and cancel it" {
10	10	cancel p;
11	11	assert(x == 2);
12	12	}
13
14	13	async fn simpleAsyncFn() void {
15	14	x += 1;
16	15	suspend;
...	...	@@ -28,7 +27,6 @@ test "coroutine suspend, resume, cancel" {
28	27
29	28	assert(std.mem.eql(u8, points, "abcdefg"));
30	29	}
31
32	30	async fn testAsyncSeq() void {
33	31	defer seq('e');
34	32
...	...	@@ -54,7 +52,6 @@ test "coroutine suspend with block" {
54	52
55	53	var a_promise: promise = undefined;
56	54	var result = false;
57
58	55	async fn testSuspendBlock() void {
59	56	suspend \|p\| {
60	57	comptime assert(@typeOf(p) == promise->void);
...	...	@@ -75,7 +72,6 @@ test "coroutine await" {
75	72	assert(await_final_result == 1234);
76	73	assert(std.mem.eql(u8, await_points, "abcdefghi"));
77	74	}
78
79	75	async fn await_amain() void {
80	76	await_seq('b');
81	77	const p = async await_another() catch unreachable;
...	...	@@ -83,7 +79,6 @@ async fn await_amain() void {
83	79	await_final_result = await p;
84	80	await_seq('h');
85	81	}
86
87	82	async fn await_another() i32 {
88	83	await_seq('c');
89	84	suspend \|p\| {
...	...	@@ -102,7 +97,6 @@ fn await_seq(c: u8) void {
102	97	await_seq_index += 1;
103	98	}
104	99
105
106	100	var early_final_result: i32 = 0;
107	101
108	102	test "coroutine await early return" {
...	...	@@ -112,7 +106,6 @@ test "coroutine await early return" {
112	106	assert(early_final_result == 1234);
113	107	assert(std.mem.eql(u8, early_points, "abcdef"));
114	108	}
115
116	109	async fn early_amain() void {
117	110	early_seq('b');
118	111	const p = async early_another() catch unreachable;
...	...	@@ -120,7 +113,6 @@ async fn early_amain() void {
120	113	early_final_result = await p;
121	114	early_seq('e');
122	115	}
123
124	116	async fn early_another() i32 {
125	117	early_seq('c');
126	118	return 1234;
...	...	@@ -142,7 +134,6 @@ test "coro allocation failure" {
142	134	error.OutOfMemory => {},
143	135	}
144	136	}
145
146	137	async fn asyncFuncThatNeverGetsRun() void {
147	138	@panic("coro frame allocation should fail");
148	139	}
...	...	@@ -165,18 +156,15 @@ test "async fn pointer in a struct field" {
165	156	const Foo = struct {
166	157	bar: async<&std.mem.Allocator> fn(&i32) void,
167	158	};
168		var foo = Foo {
169		.bar = simpleAsyncFn2,
170		};
	159	var foo = Foo{ .bar = simpleAsyncFn2 };
171	160	const p = (async<std.debug.global_allocator> foo.bar(&data)) catch unreachable;
172	161	assert(data == 2);
173	162	cancel p;
174	163	assert(data == 4);
175	164	}
176
177	165	async<&std.mem.Allocator> fn simpleAsyncFn2(y: &i32) void {
178		defer *y += 2;
179		*y += 1;
	166	defer y.* += 2;
	167	y.* += 1;
180	168	suspend;
181	169	}
182	170
...	...	@@ -185,7 +173,6 @@ test "async fn with inferred error set" {
185	173	resume p;
186	174	cancel p;
187	175	}
188
189	176	async fn failing() !void {
190	177	suspend;
191	178	return error.Fail;
...	...	@@ -205,15 +192,14 @@ test "error return trace across suspend points - async return" {
205	192	cancel p2;
206	193	}
207	194
208		fn nonFailing() promise->error!void {
	195	// TODO https://github.com/ziglang/zig/issues/760
	196	fn nonFailing() (promise->error!void) {
209	197	return async<std.debug.global_allocator> suspendThenFail() catch unreachable;
210	198	}
211
212	199	async fn suspendThenFail() error!void {
213	200	suspend;
214	201	return error.Fail;
215	202	}
216
217	203	async fn printTrace(p: promise->error!void) void {
218	204	(await p) catch \|e\| {
219	205	std.debug.assert(e == error.Fail);
...	...	@@ -234,12 +220,11 @@ test "break from suspend" {
234	220	cancel p;
235	221	std.debug.assert(my_result == 2);
236	222	}
237
238	223	async fn testBreakFromSuspend(my_result: &i32) void {
239	224	s: suspend \|p\| {
240	225	break :s;
241	226	}
242		*my_result += 1;
	227	my_result.* += 1;
243	228	suspend;
244		*my_result += 1;
	229	my_result.* += 1;
245	230	}

test/cases/defer.zig+12-3

...	...	@@ -5,9 +5,18 @@ var index: usize = undefined;
5	5
6	6	fn runSomeErrorDefers(x: bool) !bool {
7	7	index = 0;
8		defer {result[index] = 'a'; index += 1;}
9		errdefer {result[index] = 'b'; index += 1;}
10		defer {result[index] = 'c'; index += 1;}
	8	defer {
	9	result[index] = 'a';
	10	index += 1;
	11	}
	12	errdefer {
	13	result[index] = 'b';
	14	index += 1;
	15	}
	16	defer {
	17	result[index] = 'c';
	18	index += 1;
	19	}
11	20	return if (x) x else error.FalseNotAllowed;
12	21	}
13	22

test/cases/enum.zig+541-59

...	...	@@ -2,8 +2,13 @@ const assert = @import("std").debug.assert;
2	2	const mem = @import("std").mem;
3	3
4	4	test "enum type" {
5		const foo1 = Foo{ .One = 13};
6		const foo2 = Foo{. Two = Point { .x = 1234, .y = 5678, }};
	5	const foo1 = Foo{ .One = 13 };
	6	const foo2 = Foo{
	7	.Two = Point{
	8	.x = 1234,
	9	.y = 5678,
	10	},
	11	};
7	12	const bar = Bar.B;
8	13
9	14	assert(bar == Bar.B);
...	...	@@ -41,26 +46,25 @@ const Bar = enum {
41	46	};
42	47
43	48	fn returnAnInt(x: i32) Foo {
44		return Foo { .One = x };
	49	return Foo{ .One = x };
45	50	}
46	51
47
48	52	test "constant enum with payload" {
49		var empty = AnEnumWithPayload {.Empty = {}};
50		var full = AnEnumWithPayload {.Full = 13};
	53	var empty = AnEnumWithPayload{ .Empty = {} };
	54	var full = AnEnumWithPayload{ .Full = 13 };
51	55	shouldBeEmpty(empty);
52	56	shouldBeNotEmpty(full);
53	57	}
54	58
55	59	fn shouldBeEmpty(x: &const AnEnumWithPayload) void {
56		switch (*x) {
	60	switch (x.*) {
57	61	AnEnumWithPayload.Empty => {},
58	62	else => unreachable,
59	63	}
60	64	}
61	65
62	66	fn shouldBeNotEmpty(x: &const AnEnumWithPayload) void {
63		switch (*x) {
	67	switch (x.*) {
64	68	AnEnumWithPayload.Empty => unreachable,
65	69	else => {},
66	70	}
...	...	@@ -71,8 +75,6 @@ const AnEnumWithPayload = union(enum) {
71	75	Full: i32,
72	76	};
73	77
74
75
76	78	const Number = enum {
77	79	Zero,
78	80	One,
...	...	@@ -93,7 +95,6 @@ fn shouldEqual(n: Number, expected: u3) void {
93	95	assert(u3(n) == expected);
94	96	}
95	97
96
97	98	test "int to enum" {
98	99	testIntToEnumEval(3);
99	100	}
...	...	@@ -108,7 +109,6 @@ const IntToEnumNumber = enum {
108	109	Four,
109	110	};
110	111
111
112	112	test "@tagName" {
113	113	assert(mem.eql(u8, testEnumTagNameBare(BareNumber.Three), "Three"));
114	114	comptime assert(mem.eql(u8, testEnumTagNameBare(BareNumber.Three), "Three"));
...	...	@@ -124,7 +124,6 @@ const BareNumber = enum {
124	124	Three,
125	125	};
126	126
127
128	127	test "enum alignment" {
129	128	comptime {
130	129	assert(@alignOf(AlignTestEnum) >= @alignOf([9]u8));
...	...	@@ -137,47 +136,529 @@ const AlignTestEnum = union(enum) {
137	136	B: u64,
138	137	};
139	138
140		const ValueCount1 = enum { I0 };
141		const ValueCount2 = enum { I0, I1 };
	139	const ValueCount1 = enum {
	140	I0,
	141	};
	142	const ValueCount2 = enum {
	143	I0,
	144	I1,
	145	};
142	146	const ValueCount256 = enum {
143		I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15,
144		I16, I17, I18, I19, I20, I21, I22, I23, I24, I25, I26, I27, I28, I29, I30, I31,
145		I32, I33, I34, I35, I36, I37, I38, I39, I40, I41, I42, I43, I44, I45, I46, I47,
146		I48, I49, I50, I51, I52, I53, I54, I55, I56, I57, I58, I59, I60, I61, I62, I63,
147		I64, I65, I66, I67, I68, I69, I70, I71, I72, I73, I74, I75, I76, I77, I78, I79,
148		I80, I81, I82, I83, I84, I85, I86, I87, I88, I89, I90, I91, I92, I93, I94, I95,
149		I96, I97, I98, I99, I100, I101, I102, I103, I104, I105, I106, I107, I108, I109,
150		I110, I111, I112, I113, I114, I115, I116, I117, I118, I119, I120, I121, I122, I123,
151		I124, I125, I126, I127, I128, I129, I130, I131, I132, I133, I134, I135, I136, I137,
152		I138, I139, I140, I141, I142, I143, I144, I145, I146, I147, I148, I149, I150, I151,
153		I152, I153, I154, I155, I156, I157, I158, I159, I160, I161, I162, I163, I164, I165,
154		I166, I167, I168, I169, I170, I171, I172, I173, I174, I175, I176, I177, I178, I179,
155		I180, I181, I182, I183, I184, I185, I186, I187, I188, I189, I190, I191, I192, I193,
156		I194, I195, I196, I197, I198, I199, I200, I201, I202, I203, I204, I205, I206, I207,
157		I208, I209, I210, I211, I212, I213, I214, I215, I216, I217, I218, I219, I220, I221,
158		I222, I223, I224, I225, I226, I227, I228, I229, I230, I231, I232, I233, I234, I235,
159		I236, I237, I238, I239, I240, I241, I242, I243, I244, I245, I246, I247, I248, I249,
160		I250, I251, I252, I253, I254, I255
	147	I0,
	148	I1,
	149	I2,
	150	I3,
	151	I4,
	152	I5,
	153	I6,
	154	I7,
	155	I8,
	156	I9,
	157	I10,
	158	I11,
	159	I12,
	160	I13,
	161	I14,
	162	I15,
	163	I16,
	164	I17,
	165	I18,
	166	I19,
	167	I20,
	168	I21,
	169	I22,
	170	I23,
	171	I24,
	172	I25,
	173	I26,
	174	I27,
	175	I28,
	176	I29,
	177	I30,
	178	I31,
	179	I32,
	180	I33,
	181	I34,
	182	I35,
	183	I36,
	184	I37,
	185	I38,
	186	I39,
	187	I40,
	188	I41,
	189	I42,
	190	I43,
	191	I44,
	192	I45,
	193	I46,
	194	I47,
	195	I48,
	196	I49,
	197	I50,
	198	I51,
	199	I52,
	200	I53,
	201	I54,
	202	I55,
	203	I56,
	204	I57,
	205	I58,
	206	I59,
	207	I60,
	208	I61,
	209	I62,
	210	I63,
	211	I64,
	212	I65,
	213	I66,
	214	I67,
	215	I68,
	216	I69,
	217	I70,
	218	I71,
	219	I72,
	220	I73,
	221	I74,
	222	I75,
	223	I76,
	224	I77,
	225	I78,
	226	I79,
	227	I80,
	228	I81,
	229	I82,
	230	I83,
	231	I84,
	232	I85,
	233	I86,
	234	I87,
	235	I88,
	236	I89,
	237	I90,
	238	I91,
	239	I92,
	240	I93,
	241	I94,
	242	I95,
	243	I96,
	244	I97,
	245	I98,
	246	I99,
	247	I100,
	248	I101,
	249	I102,
	250	I103,
	251	I104,
	252	I105,
	253	I106,
	254	I107,
	255	I108,
	256	I109,
	257	I110,
	258	I111,
	259	I112,
	260	I113,
	261	I114,
	262	I115,
	263	I116,
	264	I117,
	265	I118,
	266	I119,
	267	I120,
	268	I121,
	269	I122,
	270	I123,
	271	I124,
	272	I125,
	273	I126,
	274	I127,
	275	I128,
	276	I129,
	277	I130,
	278	I131,
	279	I132,
	280	I133,
	281	I134,
	282	I135,
	283	I136,
	284	I137,
	285	I138,
	286	I139,
	287	I140,
	288	I141,
	289	I142,
	290	I143,
	291	I144,
	292	I145,
	293	I146,
	294	I147,
	295	I148,
	296	I149,
	297	I150,
	298	I151,
	299	I152,
	300	I153,
	301	I154,
	302	I155,
	303	I156,
	304	I157,
	305	I158,
	306	I159,
	307	I160,
	308	I161,
	309	I162,
	310	I163,
	311	I164,
	312	I165,
	313	I166,
	314	I167,
	315	I168,
	316	I169,
	317	I170,
	318	I171,
	319	I172,
	320	I173,
	321	I174,
	322	I175,
	323	I176,
	324	I177,
	325	I178,
	326	I179,
	327	I180,
	328	I181,
	329	I182,
	330	I183,
	331	I184,
	332	I185,
	333	I186,
	334	I187,
	335	I188,
	336	I189,
	337	I190,
	338	I191,
	339	I192,
	340	I193,
	341	I194,
	342	I195,
	343	I196,
	344	I197,
	345	I198,
	346	I199,
	347	I200,
	348	I201,
	349	I202,
	350	I203,
	351	I204,
	352	I205,
	353	I206,
	354	I207,
	355	I208,
	356	I209,
	357	I210,
	358	I211,
	359	I212,
	360	I213,
	361	I214,
	362	I215,
	363	I216,
	364	I217,
	365	I218,
	366	I219,
	367	I220,
	368	I221,
	369	I222,
	370	I223,
	371	I224,
	372	I225,
	373	I226,
	374	I227,
	375	I228,
	376	I229,
	377	I230,
	378	I231,
	379	I232,
	380	I233,
	381	I234,
	382	I235,
	383	I236,
	384	I237,
	385	I238,
	386	I239,
	387	I240,
	388	I241,
	389	I242,
	390	I243,
	391	I244,
	392	I245,
	393	I246,
	394	I247,
	395	I248,
	396	I249,
	397	I250,
	398	I251,
	399	I252,
	400	I253,
	401	I254,
	402	I255,
161	403	};
162	404	const ValueCount257 = enum {
163		I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, I10, I11, I12, I13, I14, I15,
164		I16, I17, I18, I19, I20, I21, I22, I23, I24, I25, I26, I27, I28, I29, I30, I31,
165		I32, I33, I34, I35, I36, I37, I38, I39, I40, I41, I42, I43, I44, I45, I46, I47,
166		I48, I49, I50, I51, I52, I53, I54, I55, I56, I57, I58, I59, I60, I61, I62, I63,
167		I64, I65, I66, I67, I68, I69, I70, I71, I72, I73, I74, I75, I76, I77, I78, I79,
168		I80, I81, I82, I83, I84, I85, I86, I87, I88, I89, I90, I91, I92, I93, I94, I95,
169		I96, I97, I98, I99, I100, I101, I102, I103, I104, I105, I106, I107, I108, I109,
170		I110, I111, I112, I113, I114, I115, I116, I117, I118, I119, I120, I121, I122, I123,
171		I124, I125, I126, I127, I128, I129, I130, I131, I132, I133, I134, I135, I136, I137,
172		I138, I139, I140, I141, I142, I143, I144, I145, I146, I147, I148, I149, I150, I151,
173		I152, I153, I154, I155, I156, I157, I158, I159, I160, I161, I162, I163, I164, I165,
174		I166, I167, I168, I169, I170, I171, I172, I173, I174, I175, I176, I177, I178, I179,
175		I180, I181, I182, I183, I184, I185, I186, I187, I188, I189, I190, I191, I192, I193,
176		I194, I195, I196, I197, I198, I199, I200, I201, I202, I203, I204, I205, I206, I207,
177		I208, I209, I210, I211, I212, I213, I214, I215, I216, I217, I218, I219, I220, I221,
178		I222, I223, I224, I225, I226, I227, I228, I229, I230, I231, I232, I233, I234, I235,
179		I236, I237, I238, I239, I240, I241, I242, I243, I244, I245, I246, I247, I248, I249,
180		I250, I251, I252, I253, I254, I255, I256
	405	I0,
	406	I1,
	407	I2,
	408	I3,
	409	I4,
	410	I5,
	411	I6,
	412	I7,
	413	I8,
	414	I9,
	415	I10,
	416	I11,
	417	I12,
	418	I13,
	419	I14,
	420	I15,
	421	I16,
	422	I17,
	423	I18,
	424	I19,
	425	I20,
	426	I21,
	427	I22,
	428	I23,
	429	I24,
	430	I25,
	431	I26,
	432	I27,
	433	I28,
	434	I29,
	435	I30,
	436	I31,
	437	I32,
	438	I33,
	439	I34,
	440	I35,
	441	I36,
	442	I37,
	443	I38,
	444	I39,
	445	I40,
	446	I41,
	447	I42,
	448	I43,
	449	I44,
	450	I45,
	451	I46,
	452	I47,
	453	I48,
	454	I49,
	455	I50,
	456	I51,
	457	I52,
	458	I53,
	459	I54,
	460	I55,
	461	I56,
	462	I57,
	463	I58,
	464	I59,
	465	I60,
	466	I61,
	467	I62,
	468	I63,
	469	I64,
	470	I65,
	471	I66,
	472	I67,
	473	I68,
	474	I69,
	475	I70,
	476	I71,
	477	I72,
	478	I73,
	479	I74,
	480	I75,
	481	I76,
	482	I77,
	483	I78,
	484	I79,
	485	I80,
	486	I81,
	487	I82,
	488	I83,
	489	I84,
	490	I85,
	491	I86,
	492	I87,
	493	I88,
	494	I89,
	495	I90,
	496	I91,
	497	I92,
	498	I93,
	499	I94,
	500	I95,
	501	I96,
	502	I97,
	503	I98,
	504	I99,
	505	I100,
	506	I101,
	507	I102,
	508	I103,
	509	I104,
	510	I105,
	511	I106,
	512	I107,
	513	I108,
	514	I109,
	515	I110,
	516	I111,
	517	I112,
	518	I113,
	519	I114,
	520	I115,
	521	I116,
	522	I117,
	523	I118,
	524	I119,
	525	I120,
	526	I121,
	527	I122,
	528	I123,
	529	I124,
	530	I125,
	531	I126,
	532	I127,
	533	I128,
	534	I129,
	535	I130,
	536	I131,
	537	I132,
	538	I133,
	539	I134,
	540	I135,
	541	I136,
	542	I137,
	543	I138,
	544	I139,
	545	I140,
	546	I141,
	547	I142,
	548	I143,
	549	I144,
	550	I145,
	551	I146,
	552	I147,
	553	I148,
	554	I149,
	555	I150,
	556	I151,
	557	I152,
	558	I153,
	559	I154,
	560	I155,
	561	I156,
	562	I157,
	563	I158,
	564	I159,
	565	I160,
	566	I161,
	567	I162,
	568	I163,
	569	I164,
	570	I165,
	571	I166,
	572	I167,
	573	I168,
	574	I169,
	575	I170,
	576	I171,
	577	I172,
	578	I173,
	579	I174,
	580	I175,
	581	I176,
	582	I177,
	583	I178,
	584	I179,
	585	I180,
	586	I181,
	587	I182,
	588	I183,
	589	I184,
	590	I185,
	591	I186,
	592	I187,
	593	I188,
	594	I189,
	595	I190,
	596	I191,
	597	I192,
	598	I193,
	599	I194,
	600	I195,
	601	I196,
	602	I197,
	603	I198,
	604	I199,
	605	I200,
	606	I201,
	607	I202,
	608	I203,
	609	I204,
	610	I205,
	611	I206,
	612	I207,
	613	I208,
	614	I209,
	615	I210,
	616	I211,
	617	I212,
	618	I213,
	619	I214,
	620	I215,
	621	I216,
	622	I217,
	623	I218,
	624	I219,
	625	I220,
	626	I221,
	627	I222,
	628	I223,
	629	I224,
	630	I225,
	631	I226,
	632	I227,
	633	I228,
	634	I229,
	635	I230,
	636	I231,
	637	I232,
	638	I233,
	639	I234,
	640	I235,
	641	I236,
	642	I237,
	643	I238,
	644	I239,
	645	I240,
	646	I241,
	647	I242,
	648	I243,
	649	I244,
	650	I245,
	651	I246,
	652	I247,
	653	I248,
	654	I249,
	655	I250,
	656	I251,
	657	I252,
	658	I253,
	659	I254,
	660	I255,
	661	I256,
181	662	};
182	663
183	664	test "enum sizes" {
...	...	@@ -189,11 +670,11 @@ test "enum sizes" {
189	670	}
190	671	}
191	672
192		const Small2 = enum (u2) {
	673	const Small2 = enum(u2) {
193	674	One,
194	675	Two,
195	676	};
196		const Small = enum (u2) {
	677	const Small = enum(u2) {
197	678	One,
198	679	Two,
199	680	Three,
...	...	@@ -213,8 +694,7 @@ test "set enum tag type" {
213	694	}
214	695	}
215	696
216
217		const A = enum (u3) {
	697	const A = enum(u3) {
218	698	One,
219	699	Two,
220	700	Three,
...	...	@@ -225,7 +705,7 @@ const A = enum (u3) {
225	705	Four2,
226	706	};
227	707
228		const B = enum (u3) {
	708	const B = enum(u3) {
229	709	One3,
230	710	Two3,
231	711	Three3,
...	...	@@ -236,7 +716,7 @@ const B = enum (u3) {
236	716	Four23,
237	717	};
238	718
239		const C = enum (u2) {
	719	const C = enum(u2) {
240	720	One4,
241	721	Two4,
242	722	Three4,
...	...	@@ -249,7 +729,7 @@ const BitFieldOfEnums = packed struct {
249	729	c: C,
250	730	};
251	731
252		const bit_field_1 = BitFieldOfEnums {
	732	const bit_field_1 = BitFieldOfEnums{
253	733	.a = A.Two,
254	734	.b = B.Three3,
255	735	.c = C.Four4,
...	...	@@ -389,7 +869,9 @@ test "enum with tag values don't require parens" {
389	869	}
390	870
391	871	test "enum with 1 field but explicit tag type should still have the tag type" {
392		const Enum = enum(u8) { B = 2 };
	872	const Enum = enum(u8) {
	873	B = 2,
	874	};
393	875	comptime @import("std").debug.assert(@sizeOf(Enum) == @sizeOf(u8));
394	876	}
395	877

test/cases/enum_with_members.zig+3-3

...	...	@@ -7,7 +7,7 @@ const ET = union(enum) {
7	7	UINT: u32,
8	8
9	9	pub fn print(a: &const ET, buf: []u8) error!usize {
10		return switch (*a) {
	10	return switch (a.*) {
11	11	ET.SINT => \|x\| fmt.formatIntBuf(buf, x, 10, false, 0),
12	12	ET.UINT => \|x\| fmt.formatIntBuf(buf, x, 10, false, 0),
13	13	};
...	...	@@ -15,8 +15,8 @@ const ET = union(enum) {
15	15	};
16	16
17	17	test "enum with members" {
18		const a = ET { .SINT = -42 };
19		const b = ET { .UINT = 42 };
	18	const a = ET{ .SINT = -42 };
	19	const b = ET{ .UINT = 42 };
20	20	var buf: [20]u8 = undefined;
21	21
22	22	assert((a.print(buf[0..]) catch unreachable) == 3);

test/cases/error.zig+27-25

...	...	@@ -30,14 +30,12 @@ test "@errorName" {
30	30	assert(mem.eql(u8, @errorName(error.ALongerErrorName), "ALongerErrorName"));
31	31	}
32	32
33
34	33	test "error values" {
35	34	const a = i32(error.err1);
36	35	const b = i32(error.err2);
37	36	assert(a != b);
38	37	}
39	38
40
41	39	test "redefinition of error values allowed" {
42	40	shouldBeNotEqual(error.AnError, error.SecondError);
43	41	}
...	...	@@ -45,7 +43,6 @@ fn shouldBeNotEqual(a: error, b: error) void {
45	43	if (a == b) unreachable;
46	44	}
47	45
48
49	46	test "error binary operator" {
50	47	const a = errBinaryOperatorG(true) catch 3;
51	48	const b = errBinaryOperatorG(false) catch 3;
...	...	@@ -56,20 +53,20 @@ fn errBinaryOperatorG(x: bool) error!isize {
56	53	return if (x) error.ItBroke else isize(10);
57	54	}
58	55
59
60	56	test "unwrap simple value from error" {
61	57	const i = unwrapSimpleValueFromErrorDo() catch unreachable;
62	58	assert(i == 13);
63	59	}
64		fn unwrapSimpleValueFromErrorDo() error!isize { return 13; }
65
	60	fn unwrapSimpleValueFromErrorDo() error!isize {
	61	return 13;
	62	}
66	63
67	64	test "error return in assignment" {
68	65	doErrReturnInAssignment() catch unreachable;
69	66	}
70	67
71	68	fn doErrReturnInAssignment() error!void {
72		var x : i32 = undefined;
	69	var x: i32 = undefined;
73	70	x = try makeANonErr();
74	71	}
75	72
...	...	@@ -95,7 +92,10 @@ test "error set type " {
95	92	comptime testErrorSetType();
96	93	}
97	94
98		const MyErrSet = error {OutOfMemory, FileNotFound};
	95	const MyErrSet = error{
	96	OutOfMemory,
	97	FileNotFound,
	98	};
99	99
100	100	fn testErrorSetType() void {
101	101	assert(@memberCount(MyErrSet) == 2);
...	...	@@ -109,14 +109,19 @@ fn testErrorSetType() void {
109	109	}
110	110	}
111	111
112
113	112	test "explicit error set cast" {
114	113	testExplicitErrorSetCast(Set1.A);
115	114	comptime testExplicitErrorSetCast(Set1.A);
116	115	}
117	116
118		const Set1 = error{A, B};
119		const Set2 = error{A, C};
	117	const Set1 = error{
	118	A,
	119	B,
	120	};
	121	const Set2 = error{
	122	A,
	123	C,
	124	};
120	125
121	126	fn testExplicitErrorSetCast(set1: Set1) void {
122	127	var x = Set2(set1);
...	...	@@ -129,7 +134,7 @@ test "comptime test error for empty error set" {
129	134	comptime testComptimeTestErrorEmptySet(1234);
130	135	}
131	136
132		const EmptyErrorSet = error {};
	137	const EmptyErrorSet = error{};
133	138
134	139	fn testComptimeTestErrorEmptySet(x: EmptyErrorSet!i32) void {
135	140	if (x) \|v\| assert(v == 1234) else \|err\| @compileError("bad");
...	...	@@ -145,7 +150,10 @@ test "comptime err to int of error set with only 1 possible value" {
145	150	testErrToIntWithOnePossibleValue(error.A, u32(error.A));
146	151	comptime testErrToIntWithOnePossibleValue(error.A, u32(error.A));
147	152	}
148		fn testErrToIntWithOnePossibleValue(x: error{A}, comptime value: u32) void {
	153	fn testErrToIntWithOnePossibleValue(
	154	x: error{A},
	155	comptime value: u32,
	156	) void {
149	157	if (u32(x) != value) {
150	158	@compileError("bad");
151	159	}
...	...	@@ -176,7 +184,6 @@ fn quux_1() !i32 {
176	184	return error.C;
177	185	}
178	186
179
180	187	test "error: fn returning empty error set can be passed as fn returning any error" {
181	188	entry();
182	189	comptime entry();
...	...	@@ -186,12 +193,11 @@ fn entry() void {
186	193	foo2(bar2);
187	194	}
188	195
189		fn foo2(f: fn()error!void) void {
	196	fn foo2(f: fn() error!void) void {
190	197	const x = f();
191	198	}
192	199
193		fn bar2() (error{}!void) { }
194
	200	fn bar2() (error{}!void) {}
195	201
196	202	test "error: Zero sized error set returned with value payload crash" {
197	203	_ = foo3(0);
...	...	@@ -203,7 +209,6 @@ fn foo3(b: usize) Error!usize {
203	209	return b;
204	210	}
205	211
206
207	212	test "error: Infer error set from literals" {
208	213	_ = nullLiteral("n") catch \|err\| handleErrors(err);
209	214	_ = floatLiteral("n") catch \|err\| handleErrors(err);
...	...	@@ -215,29 +220,26 @@ test "error: Infer error set from literals" {
215	220
216	221	fn handleErrors(err: var) noreturn {
217	222	switch (err) {
218		error.T => {}
	223	error.T => {},
219	224	}
220	225
221	226	unreachable;
222	227	}
223	228
224	229	fn nullLiteral(str: []const u8) !?i64 {
225		if (str[0] == 'n')
226		return null;
	230	if (str[0] == 'n') return null;
227	231
228	232	return error.T;
229	233	}
230	234
231	235	fn floatLiteral(str: []const u8) !?f64 {
232		if (str[0] == 'n')
233		return 1.0;
	236	if (str[0] == 'n') return 1.0;
234	237
235	238	return error.T;
236	239	}
237	240
238	241	fn intLiteral(str: []const u8) !?i64 {
239		if (str[0] == 'n')
240		return 1;
	242	if (str[0] == 'n') return 1;
241	243
242	244	return error.T;
243	245	}

test/cases/eval.zig+98-58

...	...	@@ -11,8 +11,6 @@ fn fibonacci(x: i32) i32 {
11	11	return fibonacci(x - 1) + fibonacci(x - 2);
12	12	}
13	13
14
15
16	14	fn unwrapAndAddOne(blah: ?i32) i32 {
17	15	return ??blah + 1;
18	16	}
...	...	@@ -40,13 +38,13 @@ test "inline variable gets result of const if" {
40	38	assert(gimme1or2(false) == 2);
41	39	}
42	40
43
44	41	test "static function evaluation" {
45	42	assert(statically_added_number == 3);
46	43	}
47	44	const statically_added_number = staticAdd(1, 2);
48		fn staticAdd(a: i32, b: i32) i32 { return a + b; }
49
	45	fn staticAdd(a: i32, b: i32) i32 {
	46	return a + b;
	47	}
50	48
51	49	test "const expr eval on single expr blocks" {
52	50	assert(constExprEvalOnSingleExprBlocksFn(1, true) == 3);
...	...	@@ -64,9 +62,6 @@ fn constExprEvalOnSingleExprBlocksFn(x: i32, b: bool) i32 {
64	62	return result;
65	63	}
66	64
67
68
69
70	65	test "statically initialized list" {
71	66	assert(static_point_list[0].x == 1);
72	67	assert(static_point_list[0].y == 2);
...	...	@@ -77,15 +72,17 @@ const Point = struct {
77	72	x: i32,
78	73	y: i32,
79	74	};
80		const static_point_list = []Point { makePoint(1, 2), makePoint(3, 4) };
	75	const static_point_list = []Point{
	76	makePoint(1, 2),
	77	makePoint(3, 4),
	78	};
81	79	fn makePoint(x: i32, y: i32) Point {
82		return Point {
	80	return Point{
83	81	.x = x,
84	82	.y = y,
85	83	};
86	84	}
87	85
88
89	86	test "static eval list init" {
90	87	assert(static_vec3.data[2] == 1.0);
91	88	assert(vec3(0.0, 0.0, 3.0).data[2] == 3.0);
...	...	@@ -95,18 +92,18 @@ pub const Vec3 = struct {
95	92	data: [3]f32,
96	93	};
97	94	pub fn vec3(x: f32, y: f32, z: f32) Vec3 {
98		return Vec3 {
99		.data = []f32 { x, y, z, },
100		};
	95	return Vec3{ .data = []f32{
	96	x,
	97	y,
	98	z,
	99	} };
101	100	}
102	101
103
104	102	test "constant expressions" {
105		var array : [array_size]u8 = undefined;
	103	var array: [array_size]u8 = undefined;
106	104	assert(@sizeOf(@typeOf(array)) == 20);
107	105	}
108		const array_size : u8 = 20;
109
	106	const array_size: u8 = 20;
110	107
111	108	test "constant struct with negation" {
112	109	assert(vertices[0].x == -0.6);
...	...	@@ -118,13 +115,30 @@ const Vertex = struct {
118	115	g: f32,
119	116	b: f32,
120	117	};
121		const vertices = []Vertex {
122		Vertex { .x = -0.6, .y = -0.4, .r = 1.0, .g = 0.0, .b = 0.0 },
123		Vertex { .x = 0.6, .y = -0.4, .r = 0.0, .g = 1.0, .b = 0.0 },
124		Vertex { .x = 0.0, .y = 0.6, .r = 0.0, .g = 0.0, .b = 1.0 },
	118	const vertices = []Vertex{
	119	Vertex{
	120	.x = -0.6,
	121	.y = -0.4,
	122	.r = 1.0,
	123	.g = 0.0,
	124	.b = 0.0,
	125	},
	126	Vertex{
	127	.x = 0.6,
	128	.y = -0.4,
	129	.r = 0.0,
	130	.g = 1.0,
	131	.b = 0.0,
	132	},
	133	Vertex{
	134	.x = 0.0,
	135	.y = 0.6,
	136	.r = 0.0,
	137	.g = 0.0,
	138	.b = 1.0,
	139	},
125	140	};
126	141
127
128	142	test "statically initialized struct" {
129	143	st_init_str_foo.x += 1;
130	144	assert(st_init_str_foo.x == 14);
...	...	@@ -133,15 +147,21 @@ const StInitStrFoo = struct {
133	147	x: i32,
134	148	y: bool,
135	149	};
136		var st_init_str_foo = StInitStrFoo { .x = 13, .y = true, };
137
	150	var st_init_str_foo = StInitStrFoo{
	151	.x = 13,
	152	.y = true,
	153	};
138	154
139	155	test "statically initalized array literal" {
140		const y : [4]u8 = st_init_arr_lit_x;
	156	const y: [4]u8 = st_init_arr_lit_x;
141	157	assert(y[3] == 4);
142	158	}
143		const st_init_arr_lit_x = []u8{1,2,3,4};
144
	159	const st_init_arr_lit_x = []u8{
	160	1,
	161	2,
	162	3,
	163	4,
	164	};
145	165
146	166	test "const slice" {
147	167	comptime {
...	...	@@ -199,13 +219,28 @@ const CmdFn = struct {
199	219	};
200	220
201	221	const cmd_fns = []CmdFn{
202		CmdFn {.name = "one", .func = one},
203		CmdFn {.name = "two", .func = two},
204		CmdFn {.name = "three", .func = three},
	222	CmdFn{
	223	.name = "one",
	224	.func = one,
	225	},
	226	CmdFn{
	227	.name = "two",
	228	.func = two,
	229	},
	230	CmdFn{
	231	.name = "three",
	232	.func = three,
	233	},
205	234	};
206		fn one(value: i32) i32 { return value + 1; }
207		fn two(value: i32) i32 { return value + 2; }
208		fn three(value: i32) i32 { return value + 3; }
	235	fn one(value: i32) i32 {
	236	return value + 1;
	237	}
	238	fn two(value: i32) i32 {
	239	return value + 2;
	240	}
	241	fn three(value: i32) i32 {
	242	return value + 3;
	243	}
209	244
210	245	fn performFn(comptime prefix_char: u8, start_value: i32) i32 {
211	246	var result: i32 = start_value;
...	...	@@ -229,7 +264,7 @@ test "eval @setRuntimeSafety at compile-time" {
229	264	assert(result == 1234);
230	265	}
231	266
232		fn fnWithSetRuntimeSafety() i32{
	267	fn fnWithSetRuntimeSafety() i32 {
233	268	@setRuntimeSafety(true);
234	269	return 1234;
235	270	}
...	...	@@ -244,7 +279,6 @@ fn fnWithFloatMode() f32 {
244	279	return 1234.0;
245	280	}
246	281
247
248	282	const SimpleStruct = struct {
249	283	field: i32,
250	284
...	...	@@ -253,7 +287,7 @@ const SimpleStruct = struct {
253	287	}
254	288	};
255	289
256		var simple_struct = SimpleStruct{ .field = 1234, };
	290	var simple_struct = SimpleStruct{ .field = 1234 };
257	291
258	292	const bound_fn = simple_struct.method;
259	293
...	...	@@ -261,8 +295,6 @@ test "call method on bound fn referring to var instance" {
261	295	assert(bound_fn() == 1237);
262	296	}
263	297
264
265
266	298	test "ptr to local array argument at comptime" {
267	299	comptime {
268	300	var bytes: [10]u8 = undefined;
...	...	@@ -277,7 +309,6 @@ fn modifySomeBytes(bytes: []u8) void {
277	309	bytes[9] = 'b';
278	310	}
279	311
280
281	312	test "comparisons 0 <= uint and 0 > uint should be comptime" {
282	313	testCompTimeUIntComparisons(1234);
283	314	}
...	...	@@ -296,8 +327,6 @@ fn testCompTimeUIntComparisons(x: u32) void {
296	327	}
297	328	}
298	329
299
300
301	330	test "const ptr to variable data changes at runtime" {
302	331	assert(foo_ref.name[0] == 'a');
303	332	foo_ref.name = "b";
...	...	@@ -308,11 +337,9 @@ const Foo = struct {
308	337	name: []const u8,
309	338	};
310	339
311		var foo_contents = Foo { .name = "a", };
	340	var foo_contents = Foo{ .name = "a" };
312	341	const foo_ref = &foo_contents;
313	342
314
315
316	343	test "create global array with for loop" {
317	344	assert(global_array[5] == 5 * 5);
318	345	assert(global_array[9] == 9 * 9);
...	...	@@ -321,7 +348,7 @@ test "create global array with for loop" {
321	348	const global_array = x: {
322	349	var result: [10]usize = undefined;
323	350	for (result) \|*item, index\| {
324		item = index index;
	351	item.* = index * index;
325	352	}
326	353	break :x result;
327	354	};
...	...	@@ -379,7 +406,7 @@ test "f128 at compile time is lossy" {
379	406
380	407	pub fn TypeWithCompTimeSlice(comptime field_name: []const u8) type {
381	408	return struct {
382		pub const Node = struct { };
	409	pub const Node = struct {};
383	410	};
384	411	}
385	412
...	...	@@ -401,10 +428,10 @@ fn copyWithPartialInline(s: []u32, b: []u8) void {
401	428	comptime var i: usize = 0;
402	429	inline while (i < 4) : (i += 1) {
403	430	s[i] = 0;
404		s[i] \|= u32(b[i*4+0]) << 24;
405		s[i] \|= u32(b[i*4+1]) << 16;
406		s[i] \|= u32(b[i*4+2]) << 8;
407		s[i] \|= u32(b[i*4+3]) << 0;
	431	s[i] \|= u32(b[i * 4 + 0]) << 24;
	432	s[i] \|= u32(b[i * 4 + 1]) << 16;
	433	s[i] \|= u32(b[i * 4 + 2]) << 8;
	434	s[i] \|= u32(b[i * 4 + 3]) << 0;
408	435	}
409	436	}
410	437
...	...	@@ -413,7 +440,7 @@ test "binary math operator in partially inlined function" {
413	440	var b: [16]u8 = undefined;
414	441
415	442	for (b) \|*r, i\|
416		*r = u8(i + 1);
	443	r.* = u8(i + 1);
417	444
418	445	copyWithPartialInline(s[0..], b[0..]);
419	446	assert(s[0] == 0x1020304);
...	...	@@ -422,7 +449,6 @@ test "binary math operator in partially inlined function" {
422	449	assert(s[3] == 0xd0e0f10);
423	450	}
424	451
425
426	452	test "comptime function with the same args is memoized" {
427	453	comptime {
428	454	assert(MakeType(i32) == MakeType(i32));
...	...	@@ -447,12 +473,12 @@ test "comptime function with mutable pointer is not memoized" {
447	473	}
448	474
449	475	fn increment(value: &i32) void {
450		*value += 1;
	476	value.* += 1;
451	477	}
452	478
453	479	fn generateTable(comptime T: type) [1010]T {
454		var res : [1010]T = undefined;
455		var i : usize = 0;
	480	var res: [1010]T = undefined;
	481	var i: usize = 0;
456	482	while (i < 1010) : (i += 1) {
457	483	res[i] = T(i);
458	484	}
...	...	@@ -496,9 +522,8 @@ const SingleFieldStruct = struct {
496	522	}
497	523	};
498	524	test "const ptr to comptime mutable data is not memoized" {
499
500	525	comptime {
501		var foo = SingleFieldStruct {.x = 1};
	526	var foo = SingleFieldStruct{ .x = 1 };
502	527	assert(foo.read_x() == 1);
503	528	foo.x = 2;
504	529	assert(foo.read_x() == 2);
...	...	@@ -536,3 +561,18 @@ test "runtime 128 bit integer division" {
536	561	var c = a / b;
537	562	assert(c == 15231399999);
538	563	}
	564
	565	pub const Info = struct {
	566	version: u8,
	567	};
	568
	569	pub const diamond_info = Info{ .version = 0 };
	570
	571	test "comptime modification of const struct field" {
	572	comptime {
	573	var res = diamond_info;
	574	res.version = 1;
	575	assert(diamond_info.version == 0);
	576	assert(res.version == 1);
	577	}
	578	}

test/cases/field_parent_ptr.zig+1-1

...	...	@@ -17,7 +17,7 @@ const Foo = struct {
17	17	d: i32,
18	18	};
19	19
20		const foo = Foo {
	20	const foo = Foo{
21	21	.a = true,
22	22	.b = 0.123,
23	23	.c = 1234,

test/cases/fn.zig+26-18

...	...	@@ -7,7 +7,6 @@ fn testParamsAdd(a: i32, b: i32) i32 {
7	7	return a + b;
8	8	}
9	9
10
11	10	test "local variables" {
12	11	testLocVars(2);
13	12	}
...	...	@@ -16,7 +15,6 @@ fn testLocVars(b: i32) void {
16	15	if (a + b != 3) unreachable;
17	16	}
18	17
19
20	18	test "void parameters" {
21	19	voidFun(1, void{}, 2, {});
22	20	}
...	...	@@ -27,9 +25,8 @@ fn voidFun(a: i32, b: void, c: i32, d: void) void {
27	25	return vv;
28	26	}
29	27
30
31	28	test "mutable local variables" {
32		var zero : i32 = 0;
	29	var zero: i32 = 0;
33	30	assert(zero == 0);
34	31
35	32	var i = i32(0);
...	...	@@ -41,7 +38,7 @@ test "mutable local variables" {
41	38
42	39	test "separate block scopes" {
43	40	{
44		const no_conflict : i32 = 5;
	41	const no_conflict: i32 = 5;
45	42	assert(no_conflict == 5);
46	43	}
47	44
...	...	@@ -56,8 +53,7 @@ test "call function with empty string" {
56	53	acceptsString("");
57	54	}
58	55
59		fn acceptsString(foo: []u8) void { }
60
	56	fn acceptsString(foo: []u8) void {}
61	57
62	58	fn @"weird function name"() i32 {
63	59	return 1234;
...	...	@@ -70,31 +66,43 @@ test "implicit cast function unreachable return" {
70	66	wantsFnWithVoid(fnWithUnreachable);
71	67	}
72	68
73		fn wantsFnWithVoid(f: fn() void) void { }
	69	fn wantsFnWithVoid(f: fn() void) void {}
74	70
75	71	fn fnWithUnreachable() noreturn {
76	72	unreachable;
77	73	}
78	74
79
80	75	test "function pointers" {
81		const fns = []@typeOf(fn1) { fn1, fn2, fn3, fn4, };
	76	const fns = []@typeOf(fn1){
	77	fn1,
	78	fn2,
	79	fn3,
	80	fn4,
	81	};
82	82	for (fns) \|f, i\| {
83	83	assert(f() == u32(i) + 5);
84	84	}
85	85	}
86		fn fn1() u32 {return 5;}
87		fn fn2() u32 {return 6;}
88		fn fn3() u32 {return 7;}
89		fn fn4() u32 {return 8;}
90
	86	fn fn1() u32 {
	87	return 5;
	88	}
	89	fn fn2() u32 {
	90	return 6;
	91	}
	92	fn fn3() u32 {
	93	return 7;
	94	}
	95	fn fn4() u32 {
	96	return 8;
	97	}
91	98
92	99	test "inline function call" {
93	100	assert(@inlineCall(add, 3, 9) == 12);
94	101	}
95	102
96		fn add(a: i32, b: i32) i32 { return a + b; }
97
	103	fn add(a: i32, b: i32) i32 {
	104	return a + b;
	105	}
98	106
99	107	test "number literal as an argument" {
100	108	numberLiteralArg(3);
...	...	@@ -110,4 +118,4 @@ test "assign inline fn to const variable" {
110	118	a();
111	119	}
112	120
113		inline fn inlineFn() void { }
	121	inline fn inlineFn() void {}

test/cases/fn_in_struct_in_comptime.zig+1-1

...	...	@@ -1,6 +1,6 @@
1	1	const assert = @import("std").debug.assert;
2	2
3		fn get_foo() fn(&u8)usize {
	3	fn get_foo() fn(&u8) usize {
4	4	comptime {
5	5	return struct {
6	6	fn func(ptr: &u8) usize {

test/cases/for.zig+37-7

...	...	@@ -3,8 +3,14 @@ const assert = std.debug.assert;
3	3	const mem = std.mem;
4	4
5	5	test "continue in for loop" {
6		const array = []i32 {1, 2, 3, 4, 5};
7		var sum : i32 = 0;
	6	const array = []i32{
	7	1,
	8	2,
	9	3,
	10	4,
	11	5,
	12	};
	13	var sum: i32 = 0;
8	14	for (array) \|x\| {
9	15	sum += x;
10	16	if (x < 3) {
...	...	@@ -24,17 +30,39 @@ test "for loop with pointer elem var" {
24	30	}
25	31	fn mangleString(s: []u8) void {
26	32	for (s) \|*c\| {
27		*c += 1;
	33	c.* += 1;
28	34	}
29	35	}
30	36
31	37	test "basic for loop" {
32		const expected_result = []u8{9, 8, 7, 6, 0, 1, 2, 3, 9, 8, 7, 6, 0, 1, 2, 3 };
	38	const expected_result = []u8{
	39	9,
	40	8,
	41	7,
	42	6,
	43	0,
	44	1,
	45	2,
	46	3,
	47	9,
	48	8,
	49	7,
	50	6,
	51	0,
	52	1,
	53	2,
	54	3,
	55	};
33	56
34	57	var buffer: [expected_result.len]u8 = undefined;
35	58	var buf_index: usize = 0;
36	59
37		const array = []u8 {9, 8, 7, 6};
	60	const array = []u8{
	61	9,
	62	8,
	63	7,
	64	6,
	65	};
38	66	for (array) \|item\| {
39	67	buffer[buf_index] = item;
40	68	buf_index += 1;
...	...	@@ -65,7 +93,8 @@ fn testBreakOuter() void {
65	93	var array = "aoeu";
66	94	var count: usize = 0;
67	95	outer: for (array) \|_\| {
68		for (array) \|_2\| { // TODO shouldn't get error for redeclaring "_"
	96	// TODO shouldn't get error for redeclaring "_"
	97	for (array) \|_2\| {
69	98	count += 1;
70	99	break :outer;
71	100	}
...	...	@@ -82,7 +111,8 @@ fn testContinueOuter() void {
82	111	var array = "aoeu";
83	112	var counter: usize = 0;
84	113	outer: for (array) \|_\| {
85		for (array) \|_2\| { // TODO shouldn't get error for redeclaring "_"
	114	// TODO shouldn't get error for redeclaring "_"
	115	for (array) \|_2\| {
86	116	counter += 1;
87	117	continue :outer;
88	118	}

test/cases/generics.zig+29-15

...	...	@@ -37,7 +37,6 @@ test "fn with comptime args" {
37	37	assert(sameButWithFloats(0.43, 0.49) == 0.49);
38	38	}
39	39
40
41	40	test "var params" {
42	41	assert(max_i32(12, 34) == 34);
43	42	assert(max_f64(1.2, 3.4) == 3.4);
...	...	@@ -60,7 +59,6 @@ fn max_f64(a: f64, b: f64) f64 {
60	59	return max_var(a, b);
61	60	}
62	61
63
64	62	pub fn List(comptime T: type) type {
65	63	return SmallList(T, 8);
66	64	}
...	...	@@ -82,10 +80,15 @@ test "function with return type type" {
82	80	assert(list2.prealloc_items.len == 8);
83	81	}
84	82
85
86	83	test "generic struct" {
87		var a1 = GenNode(i32) {.value = 13, .next = null,};
88		var b1 = GenNode(bool) {.value = true, .next = null,};
	84	var a1 = GenNode(i32){
	85	.value = 13,
	86	.next = null,
	87	};
	88	var b1 = GenNode(bool){
	89	.value = true,
	90	.next = null,
	91	};
89	92	assert(a1.value == 13);
90	93	assert(a1.value == a1.getVal());
91	94	assert(b1.getVal());
...	...	@@ -94,7 +97,9 @@ fn GenNode(comptime T: type) type {
94	97	return struct {
95	98	value: T,
96	99	next: ?&GenNode(T),
97		fn getVal(n: &const GenNode(T)) T { return n.value; }
	100	fn getVal(n: &const GenNode(T)) T {
	101	return n.value;
	102	}
98	103	};
99	104	}
100	105
...	...	@@ -107,7 +112,6 @@ fn GenericDataThing(comptime count: isize) type {
107	112	};
108	113	}
109	114
110
111	115	test "use generic param in generic param" {
112	116	assert(aGenericFn(i32, 3, 4) == 7);
113	117	}
...	...	@@ -115,21 +119,31 @@ fn aGenericFn(comptime T: type, comptime a: T, b: T) T {
115	119	return a + b;
116	120	}
117	121
118
119	122	test "generic fn with implicit cast" {
120		assert(getFirstByte(u8, []u8 {13}) == 13);
121		assert(getFirstByte(u16, []u16 {0, 13}) == 0);
	123	assert(getFirstByte(u8, []u8{13}) == 13);
	124	assert(getFirstByte(u16, []u16{
	125	0,
	126	13,
	127	}) == 0);
	128	}
	129	fn getByte(ptr: ?&const u8) u8 {
	130	return (??ptr).*;
122	131	}
123		fn getByte(ptr: ?&const u8) u8 {return *??ptr;}
124	132	fn getFirstByte(comptime T: type, mem: []const T) u8 {
125	133	return getByte(@ptrCast(&const u8, &mem[0]));
126	134	}
127	135
	136	const foos = []fn(var) bool{
	137	foo1,
	138	foo2,
	139	};
128	140
129		const foos = []fn(var) bool { foo1, foo2 };
130
131		fn foo1(arg: var) bool { return arg; }
132		fn foo2(arg: var) bool { return !arg; }
	141	fn foo1(arg: var) bool {
	142	return arg;
	143	}
	144	fn foo2(arg: var) bool {
	145	return !arg;
	146	}
133	147
134	148	test "array of generic fns" {
135	149	assert(foos[0](true));

test/cases/if.zig-1

...	...	@@ -23,7 +23,6 @@ fn firstEqlThird(a: i32, b: i32, c: i32) void {
23	23	}
24	24	}
25	25
26
27	26	test "else if expression" {
28	27	assert(elseIfExpressionF(1) == 1);
29	28	}

test/cases/import/a_namespace.zig+3-1

...	...	@@ -1 +1,3 @@
1		pub fn foo() i32 { return 1234; }
	1	pub fn foo() i32 {
	2	return 1234;
	3	}

test/cases/incomplete_struct_param_tld.zig+3-5

...	...	@@ -21,11 +21,9 @@ fn foo(a: &const A) i32 {
21	21	}
22	22
23	23	test "incomplete struct param top level declaration" {
24		const a = A {
25		.b = B {
26		.c = C {
27		.x = 13,
28		},
	24	const a = A{
	25	.b = B{
	26	.c = C{ .x = 13 },
29	27	},
30	28	};
31	29	assert(foo(a) == 13);

test/cases/ir_block_deps.zig+3-1

...	...	@@ -11,7 +11,9 @@ fn foo(id: u64) !i32 {
11	11	};
12	12	}
13	13
14		fn getErrInt() error!i32 { return 0; }
	14	fn getErrInt() error!i32 {
	15	return 0;
	16	}
15	17
16	18	test "ir block deps" {
17	19	assert((foo(1) catch unreachable) == 0);

test/cases/math.zig+41-53

...	...	@@ -28,25 +28,12 @@ fn testDivision() void {
28	28	assert(divTrunc(f32, -5.0, 3.0) == -1.0);
29	29
30	30	comptime {
31		assert(
32		1194735857077236777412821811143690633098347576 %
33		508740759824825164163191790951174292733114988 ==
34		177254337427586449086438229241342047632117600);
35		assert(@rem(-1194735857077236777412821811143690633098347576,
36		508740759824825164163191790951174292733114988) ==
37		-177254337427586449086438229241342047632117600);
38		assert(1194735857077236777412821811143690633098347576 /
39		508740759824825164163191790951174292733114988 ==
40		2);
41		assert(@divTrunc(-1194735857077236777412821811143690633098347576,
42		508740759824825164163191790951174292733114988) ==
43		-2);
44		assert(@divTrunc(1194735857077236777412821811143690633098347576,
45		-508740759824825164163191790951174292733114988) ==
46		-2);
47		assert(@divTrunc(-1194735857077236777412821811143690633098347576,
48		-508740759824825164163191790951174292733114988) ==
49		2);
	31	assert(1194735857077236777412821811143690633098347576 % 508740759824825164163191790951174292733114988 == 177254337427586449086438229241342047632117600);
	32	assert(@rem(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -177254337427586449086438229241342047632117600);
	33	assert(1194735857077236777412821811143690633098347576 / 508740759824825164163191790951174292733114988 == 2);
	34	assert(@divTrunc(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -2);
	35	assert(@divTrunc(1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == -2);
	36	assert(@divTrunc(-1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == 2);
50	37	assert(4126227191251978491697987544882340798050766755606969681711 % 10 == 1);
51	38	}
52	39	}
...	...	@@ -114,18 +101,28 @@ fn ctz(x: var) usize {
114	101
115	102	test "assignment operators" {
116	103	var i: u32 = 0;
117		i += 5; assert(i == 5);
118		i -= 2; assert(i == 3);
119		i *= 20; assert(i == 60);
120		i /= 3; assert(i == 20);
121		i %= 11; assert(i == 9);
122		i <<= 1; assert(i == 18);
123		i >>= 2; assert(i == 4);
	104	i += 5;
	105	assert(i == 5);
	106	i -= 2;
	107	assert(i == 3);
	108	i *= 20;
	109	assert(i == 60);
	110	i /= 3;
	111	assert(i == 20);
	112	i %= 11;
	113	assert(i == 9);
	114	i <<= 1;
	115	assert(i == 18);
	116	i >>= 2;
	117	assert(i == 4);
124	118	i = 6;
125		i &= 5; assert(i == 4);
126		i ^= 6; assert(i == 2);
	119	i &= 5;
	120	assert(i == 4);
	121	i ^= 6;
	122	assert(i == 2);
127	123	i = 6;
128		i \|= 3; assert(i == 7);
	124	i \|= 3;
	125	assert(i == 7);
129	126	}
130	127
131	128	test "three expr in a row" {
...	...	@@ -138,7 +135,7 @@ fn testThreeExprInARow(f: bool, t: bool) void {
138	135	assertFalse(1 \| 2 \| 4 != 7);
139	136	assertFalse(3 ^ 6 ^ 8 != 13);
140	137	assertFalse(7 & 14 & 28 != 4);
141		assertFalse(9 << 1 << 2 != 9 << 3);
	138	assertFalse(9 << 1 << 2 != 9 << 3);
142	139	assertFalse(90 >> 1 >> 2 != 90 >> 3);
143	140	assertFalse(100 - 1 + 1000 != 1099);
144	141	assertFalse(5 * 4 / 2 % 3 != 1);
...	...	@@ -150,7 +147,6 @@ fn assertFalse(b: bool) void {
150	147	assert(!b);
151	148	}
152	149
153
154	150	test "const number literal" {
155	151	const one = 1;
156	152	const eleven = ten + one;
...	...	@@ -159,8 +155,6 @@ test "const number literal" {
159	155	}
160	156	const ten = 10;
161	157
162
163
164	158	test "unsigned wrapping" {
165	159	testUnsignedWrappingEval(@maxValue(u32));
166	160	comptime testUnsignedWrappingEval(@maxValue(u32));
...	...	@@ -203,7 +197,7 @@ fn test_u64_div() void {
203	197	assert(result.remainder == 100663296);
204	198	}
205	199	fn divWithResult(a: u64, b: u64) DivResult {
206		return DivResult {
	200	return DivResult{
207	201	.quotient = a / b,
208	202	.remainder = a % b,
209	203	};
...	...	@@ -214,8 +208,12 @@ const DivResult = struct {
214	208	};
215	209
216	210	test "binary not" {
217		assert(comptime x: {break :x ~u16(0b1010101010101010) == 0b0101010101010101;});
218		assert(comptime x: {break :x ~u64(2147483647) == 18446744071562067968;});
	211	assert(comptime x: {
	212	break :x ~u16(0b1010101010101010) == 0b0101010101010101;
	213	});
	214	assert(comptime x: {
	215	break :x ~u64(2147483647) == 18446744071562067968;
	216	});
219	217	testBinaryNot(0b1010101010101010);
220	218	}
221	219
...	...	@@ -319,27 +317,15 @@ fn testShrExact(x: u8) void {
319	317
320	318	test "big number addition" {
321	319	comptime {
322		assert(
323		35361831660712422535336160538497375248 +
324		101752735581729509668353361206450473702 ==
325		137114567242441932203689521744947848950);
326		assert(
327		594491908217841670578297176641415611445982232488944558774612 +
328		390603545391089362063884922208143568023166603618446395589768 ==
329		985095453608931032642182098849559179469148836107390954364380);
	320	assert(35361831660712422535336160538497375248 + 101752735581729509668353361206450473702 == 137114567242441932203689521744947848950);
	321	assert(594491908217841670578297176641415611445982232488944558774612 + 390603545391089362063884922208143568023166603618446395589768 == 985095453608931032642182098849559179469148836107390954364380);
330	322	}
331	323	}
332	324
333	325	test "big number multiplication" {
334	326	comptime {
335		assert(
336		45960427431263824329884196484953148229 *
337		128339149605334697009938835852565949723 ==
338		5898522172026096622534201617172456926982464453350084962781392314016180490567);
339		assert(
340		594491908217841670578297176641415611445982232488944558774612 *
341		390603545391089362063884922208143568023166603618446395589768 ==
342		232210647056203049913662402532976186578842425262306016094292237500303028346593132411865381225871291702600263463125370016);
	327	assert(45960427431263824329884196484953148229 * 128339149605334697009938835852565949723 == 5898522172026096622534201617172456926982464453350084962781392314016180490567);
	328	assert(594491908217841670578297176641415611445982232488944558774612 * 390603545391089362063884922208143568023166603618446395589768 == 232210647056203049913662402532976186578842425262306016094292237500303028346593132411865381225871291702600263463125370016);
343	329	}
344	330	}
345	331
...	...	@@ -405,7 +391,9 @@ test "f128" {
405	391	comptime test_f128();
406	392	}
407	393
408		fn make_f128(x: f128) f128 { return x; }
	394	fn make_f128(x: f128) f128 {
	395	return x;
	396	}
409	397
410	398	fn test_f128() void {
411	399	assert(@sizeOf(f128) == 16);

test/cases/misc.zig+127-86

...	...	@@ -4,6 +4,7 @@ const cstr = @import("std").cstr;
4	4	const builtin = @import("builtin");
5	5
6	6	// normal comment
	7
7	8	/// this is a documentation comment
8	9	/// doc comment line 2
9	10	fn emptyFunctionWithComments() void {}
...	...	@@ -16,8 +17,7 @@ comptime {
16	17	@export("disabledExternFn", disabledExternFn, builtin.GlobalLinkage.Internal);
17	18	}
18	19
19		extern fn disabledExternFn() void {
20		}
	20	extern fn disabledExternFn() void {}
21	21
22	22	test "call disabled extern fn" {
23	23	disabledExternFn();
...	...	@@ -110,17 +110,29 @@ fn testShortCircuit(f: bool, t: bool) void {
110	110	var hit_3 = f;
111	111	var hit_4 = f;
112	112
113		if (t or x: {assert(f); break :x f;}) {
	113	if (t or x: {
	114	assert(f);
	115	break :x f;
	116	}) {
114	117	hit_1 = t;
115	118	}
116		if (f or x: { hit_2 = t; break :x f; }) {
	119	if (f or x: {
	120	hit_2 = t;
	121	break :x f;
	122	}) {
117	123	assert(f);
118	124	}
119	125
120		if (t and x: { hit_3 = t; break :x f; }) {
	126	if (t and x: {
	127	hit_3 = t;
	128	break :x f;
	129	}) {
121	130	assert(f);
122	131	}
123		if (f and x: {assert(f); break :x f;}) {
	132	if (f and x: {
	133	assert(f);
	134	break :x f;
	135	}) {
124	136	assert(f);
125	137	} else {
126	138	hit_4 = t;
...	...	@@ -146,8 +158,8 @@ test "return string from function" {
146	158	assert(mem.eql(u8, first4KeysOfHomeRow(), "aoeu"));
147	159	}
148	160
149		const g1 : i32 = 1233 + 1;
150		var g2 : i32 = 0;
	161	const g1: i32 = 1233 + 1;
	162	var g2: i32 = 0;
151	163
152	164	test "global variables" {
153	165	assert(g2 == 0);
...	...	@@ -155,10 +167,9 @@ test "global variables" {
155	167	assert(g2 == 1234);
156	168	}
157	169
158
159	170	test "memcpy and memset intrinsics" {
160		var foo : [20]u8 = undefined;
161		var bar : [20]u8 = undefined;
	171	var foo: [20]u8 = undefined;
	172	var bar: [20]u8 = undefined;
162	173
163	174	@memset(&foo[0], 'A', foo.len);
164	175	@memcpy(&bar[0], &foo[0], bar.len);
...	...	@@ -167,12 +178,14 @@ test "memcpy and memset intrinsics" {
167	178	}
168	179
169	180	test "builtin static eval" {
170		const x : i32 = comptime x: {break :x 1 + 2 + 3;};
	181	const x: i32 = comptime x: {
	182	break :x 1 + 2 + 3;
	183	};
171	184	assert(x == comptime 6);
172	185	}
173	186
174	187	test "slicing" {
175		var array : [20]i32 = undefined;
	188	var array: [20]i32 = undefined;
176	189
177	190	array[5] = 1234;
178	191
...	...	@@ -187,15 +200,15 @@ test "slicing" {
187	200	if (slice_rest.len != 10) unreachable;
188	201	}
189	202
190
191	203	test "constant equal function pointers" {
192	204	const alias = emptyFn;
193		assert(comptime x: {break :x emptyFn == alias;});
	205	assert(comptime x: {
	206	break :x emptyFn == alias;
	207	});
194	208	}
195	209
196	210	fn emptyFn() void {}
197	211
198
199	212	test "hex escape" {
200	213	assert(mem.eql(u8, "\x68\x65\x6c\x6c\x6f", "hello"));
201	214	}
...	...	@@ -238,18 +251,16 @@ test "multiline C string" {
238	251	assert(cstr.cmp(s1, s2) == 0);
239	252	}
240	253
241
242	254	test "type equality" {
243	255	assert(&const u8 != &u8);
244	256	}
245	257
246
247	258	const global_a: i32 = 1234;
248	259	const global_b: &const i32 = &global_a;
249	260	const global_c: &const f32 = @ptrCast(&const f32, global_b);
250	261	test "compile time global reinterpret" {
251	262	const d = @ptrCast(&const i32, global_c);
252		assert(*d == 1234);
	263	assert(d.* == 1234);
253	264	}
254	265
255	266	test "explicit cast maybe pointers" {
...	...	@@ -261,12 +272,11 @@ test "generic malloc free" {
261	272	const a = memAlloc(u8, 10) catch unreachable;
262	273	memFree(u8, a);
263	274	}
264		var some_mem : [100]u8 = undefined;
	275	var some_mem: [100]u8 = undefined;
265	276	fn memAlloc(comptime T: type, n: usize) error![]T {
266	277	return @ptrCast(&T, &some_mem[0])[0..n];
267	278	}
268		fn memFree(comptime T: type, memory: []T) void { }
269
	279	fn memFree(comptime T: type, memory: []T) void {}
270	280
271	281	test "cast undefined" {
272	282	const array: [100]u8 = undefined;
...	...	@@ -275,32 +285,35 @@ test "cast undefined" {
275	285	}
276	286	fn testCastUndefined(x: []const u8) void {}
277	287
278
279	288	test "cast small unsigned to larger signed" {
280	289	assert(castSmallUnsignedToLargerSigned1(200) == i16(200));
281	290	assert(castSmallUnsignedToLargerSigned2(9999) == i64(9999));
282	291	}
283		fn castSmallUnsignedToLargerSigned1(x: u8) i16 { return x; }
284		fn castSmallUnsignedToLargerSigned2(x: u16) i64 { return x; }
285
	292	fn castSmallUnsignedToLargerSigned1(x: u8) i16 {
	293	return x;
	294	}
	295	fn castSmallUnsignedToLargerSigned2(x: u16) i64 {
	296	return x;
	297	}
286	298
287	299	test "implicit cast after unreachable" {
288	300	assert(outer() == 1234);
289	301	}
290		fn inner() i32 { return 1234; }
	302	fn inner() i32 {
	303	return 1234;
	304	}
291	305	fn outer() i64 {
292	306	return inner();
293	307	}
294	308
295
296	309	test "pointer dereferencing" {
297	310	var x = i32(3);
298	311	const y = &x;
299	312
300		*y += 1;
	313	y.* += 1;
301	314
302	315	assert(x == 4);
303		assert(*y == 4);
	316	assert(y.* == 4);
304	317	}
305	318
306	319	test "call result of if else expression" {
...	...	@@ -310,9 +323,12 @@ test "call result of if else expression" {
310	323	fn f2(x: bool) []const u8 {
311	324	return (if (x) fA else fB)();
312	325	}
313		fn fA() []const u8 { return "a"; }
314		fn fB() []const u8 { return "b"; }
315
	326	fn fA() []const u8 {
	327	return "a";
	328	}
	329	fn fB() []const u8 {
	330	return "b";
	331	}
316	332
317	333	test "const expression eval handling of variables" {
318	334	var x = true;
...	...	@@ -321,8 +337,6 @@ test "const expression eval handling of variables" {
321	337	}
322	338	}
323	339
324
325
326	340	test "constant enum initialization with differing sizes" {
327	341	test3_1(test3_foo);
328	342	test3_2(test3_bar);
...	...	@@ -336,10 +350,15 @@ const Test3Point = struct {
336	350	x: i32,
337	351	y: i32,
338	352	};
339		const test3_foo = Test3Foo { .Three = Test3Point {.x = 3, .y = 4}};
340		const test3_bar = Test3Foo { .Two = 13};
	353	const test3_foo = Test3Foo{
	354	.Three = Test3Point{
	355	.x = 3,
	356	.y = 4,
	357	},
	358	};
	359	const test3_bar = Test3Foo{ .Two = 13 };
341	360	fn test3_1(f: &const Test3Foo) void {
342		switch (*f) {
	361	switch (f.*) {
343	362	Test3Foo.Three => \|pt\| {
344	363	assert(pt.x == 3);
345	364	assert(pt.y == 4);
...	...	@@ -348,7 +367,7 @@ fn test3_1(f: &const Test3Foo) void {
348	367	}
349	368	}
350	369	fn test3_2(f: &const Test3Foo) void {
351		switch (*f) {
	370	switch (f.*) {
352	371	Test3Foo.Two => \|x\| {
353	372	assert(x == 13);
354	373	},
...	...	@@ -356,23 +375,19 @@ fn test3_2(f: &const Test3Foo) void {
356	375	}
357	376	}
358	377
359
360	378	test "character literals" {
361	379	assert('\'' == single_quote);
362	380	}
363	381	const single_quote = '\'';
364	382
365
366
367	383	test "take address of parameter" {
368	384	testTakeAddressOfParameter(12.34);
369	385	}
370	386	fn testTakeAddressOfParameter(f: f32) void {
371	387	const f_ptr = &f;
372		assert(*f_ptr == 12.34);
	388	assert(f_ptr.* == 12.34);
373	389	}
374	390
375
376	391	test "pointer comparison" {
377	392	const a = ([]const u8)("a");
378	393	const b = &a;
...	...	@@ -382,23 +397,30 @@ fn ptrEql(a: &const []const u8, b: &const []const u8) bool {
382	397	return a == b;
383	398	}
384	399
385
386	400	test "C string concatenation" {
387	401	const a = c"OK" ++ c" IT " ++ c"WORKED";
388	402	const b = c"OK IT WORKED";
389	403
390	404	const len = cstr.len(b);
391	405	const len_with_null = len + 1;
392		{var i: u32 = 0; while (i < len_with_null) : (i += 1) {
393		assert(a[i] == b[i]);
394		}}
	406	{
	407	var i: u32 = 0;
	408	while (i < len_with_null) : (i += 1) {
	409	assert(a[i] == b[i]);
	410	}
	411	}
395	412	assert(a[len] == 0);
396	413	assert(b[len] == 0);
397	414	}
398	415
399	416	test "cast slice to u8 slice" {
400	417	assert(@sizeOf(i32) == 4);
401		var big_thing_array = []i32{1, 2, 3, 4};
	418	var big_thing_array = []i32{
	419	1,
	420	2,
	421	3,
	422	4,
	423	};
402	424	const big_thing_slice: []i32 = big_thing_array[0..];
403	425	const bytes = ([]u8)(big_thing_slice);
404	426	assert(bytes.len == 4 * 4);
...	...	@@ -421,23 +443,20 @@ test "pointer to void return type" {
421	443	}
422	444	fn testPointerToVoidReturnType() error!void {
423	445	const a = testPointerToVoidReturnType2();
424		return *a;
	446	return a.*;
425	447	}
426	448	const test_pointer_to_void_return_type_x = void{};
427	449	fn testPointerToVoidReturnType2() &const void {
428	450	return &test_pointer_to_void_return_type_x;
429	451	}
430	452
431
432	453	test "non const ptr to aliased type" {
433	454	const int = i32;
434	455	assert(?&int == ?&i32);
435	456	}
436	457
437
438
439	458	test "array 2D const double ptr" {
440		const rect_2d_vertexes = [][1]f32 {
	459	const rect_2d_vertexes = [][1]f32{
441	460	[]f32{1.0},
442	461	[]f32{2.0},
443	462	};
...	...	@@ -450,10 +469,21 @@ fn testArray2DConstDoublePtr(ptr: &const f32) void {
450	469	}
451	470
452	471	const Tid = builtin.TypeId;
453		const AStruct = struct { x: i32, };
454		const AnEnum = enum { One, Two, };
455		const AUnionEnum = union(enum) { One: i32, Two: void, };
456		const AUnion = union { One: void, Two: void };
	472	const AStruct = struct {
	473	x: i32,
	474	};
	475	const AnEnum = enum {
	476	One,
	477	Two,
	478	};
	479	const AUnionEnum = union(enum) {
	480	One: i32,
	481	Two: void,
	482	};
	483	const AUnion = union {
	484	One: void,
	485	Two: void,
	486	};
457	487
458	488	test "@typeId" {
459	489	comptime {
...	...	@@ -481,9 +511,11 @@ test "@typeId" {
481	511	assert(@typeId(@typeOf(AUnionEnum.One)) == Tid.Enum);
482	512	assert(@typeId(AUnionEnum) == Tid.Union);
483	513	assert(@typeId(AUnion) == Tid.Union);
484		assert(@typeId(fn()void) == Tid.Fn);
	514	assert(@typeId(fn() void) == Tid.Fn);
485	515	assert(@typeId(@typeOf(builtin)) == Tid.Namespace);
486		assert(@typeId(@typeOf(x: {break :x this;})) == Tid.Block);
	516	assert(@typeId(@typeOf(x: {
	517	break :x this;
	518	})) == Tid.Block);
487	519	// TODO bound fn
488	520	// TODO arg tuple
489	521	// TODO opaque
...	...	@@ -499,8 +531,7 @@ test "@canImplicitCast" {
499	531	}
500	532
501	533	test "@typeName" {
502		const Struct = struct {
503		};
	534	const Struct = struct {};
504	535	const Union = union {
505	536	unused: u8,
506	537	};
...	...	@@ -510,7 +541,7 @@ test "@typeName" {
510	541	comptime {
511	542	assert(mem.eql(u8, @typeName(i64), "i64"));
512	543	assert(mem.eql(u8, @typeName(&usize), "&usize"));
513		// https://github.com/zig-lang/zig/issues/675
	544	// https://github.com/ziglang/zig/issues/675
514	545	assert(mem.eql(u8, @typeName(TypeFromFn(u8)), "TypeFromFn(u8)"));
515	546	assert(mem.eql(u8, @typeName(Struct), "Struct"));
516	547	assert(mem.eql(u8, @typeName(Union), "Union"));
...	...	@@ -525,14 +556,19 @@ fn TypeFromFn(comptime T: type) type {
525	556	test "volatile load and store" {
526	557	var number: i32 = 1234;
527	558	const ptr = (&volatile i32)(&number);
528		*ptr += 1;
529		assert(*ptr == 1235);
	559	ptr.* += 1;
	560	assert(ptr.* == 1235);
530	561	}
531	562
532	563	test "slice string literal has type []const u8" {
533	564	comptime {
534	565	assert(@typeOf("aoeu"[0..]) == []const u8);
535		const array = []i32{1, 2, 3, 4};
	566	const array = []i32{
	567	1,
	568	2,
	569	3,
	570	4,
	571	};
536	572	assert(@typeOf(array[0..]) == []const i32);
537	573	}
538	574	}
...	...	@@ -543,13 +579,12 @@ test "global variable initialized to global variable array element" {
543	579	const GDTEntry = struct {
544	580	field: i32,
545	581	};
546		var gdt = []GDTEntry {
547		GDTEntry {.field = 1},
548		GDTEntry {.field = 2},
	582	var gdt = []GDTEntry{
	583	GDTEntry{ .field = 1 },
	584	GDTEntry{ .field = 2 },
549	585	};
550	586	var global_ptr = &gdt[0];
551	587
552
553	588	// can't really run this test but we can make sure it has no compile error
554	589	// and generates code
555	590	const vram = @intToPtr(&volatile u8, 0x20000000)[0..0x8000];
...	...	@@ -584,7 +619,7 @@ test "comptime if inside runtime while which unconditionally breaks" {
584	619	}
585	620	fn testComptimeIfInsideRuntimeWhileWhichUnconditionallyBreaks(cond: bool) void {
586	621	while (cond) {
587		if (false) { }
	622	if (false) {}
588	623	break;
589	624	}
590	625	}
...	...	@@ -607,7 +642,7 @@ fn testStructInFn() void {
607	642	kind: BlockKind,
608	643	};
609	644
610		var block = Block { .kind = 1234 };
	645	var block = Block{ .kind = 1234 };
611	646
612	647	block.kind += 1;
613	648
...	...	@@ -617,7 +652,9 @@ fn testStructInFn() void {
617	652	fn fnThatClosesOverLocalConst() type {
618	653	const c = 1;
619	654	return struct {
620		fn g() i32 { return c; }
	655	fn g() i32 {
	656	return c;
	657	}
621	658	};
622	659	}
623	660
...	...	@@ -635,22 +672,27 @@ fn thisIsAColdFn() void {
635	672	@setCold(true);
636	673	}
637	674
638
639		const PackedStruct = packed struct { a: u8, b: u8, };
640		const PackedUnion = packed union { a: u8, b: u32, };
641		const PackedEnum = packed enum { A, B, };
	675	const PackedStruct = packed struct {
	676	a: u8,
	677	b: u8,
	678	};
	679	const PackedUnion = packed union {
	680	a: u8,
	681	b: u32,
	682	};
	683	const PackedEnum = packed enum {
	684	A,
	685	B,
	686	};
642	687
643	688	test "packed struct, enum, union parameters in extern function" {
644		testPackedStuff(
645		PackedStruct{.a = 1, .b = 2},
646		PackedUnion{.a = 1},
647		PackedEnum.A,
648		);
649		}
650
651		export fn testPackedStuff(a: &const PackedStruct, b: &const PackedUnion, c: PackedEnum) void {
	689	testPackedStuff(PackedStruct{
	690	.a = 1,
	691	.b = 2,
	692	}, PackedUnion{ .a = 1 }, PackedEnum.A);
652	693	}
653	694
	695	export fn testPackedStuff(a: &const PackedStruct, b: &const PackedUnion, c: PackedEnum) void {}
654	696
655	697	test "slicing zero length array" {
656	698	const s1 = ""[0..];
...	...	@@ -661,7 +703,6 @@ test "slicing zero length array" {
661	703	assert(mem.eql(u32, s2, []u32{}));
662	704	}
663	705
664
665	706	const addr1 = @ptrCast(&const u8, emptyFn);
666	707	test "comptime cast fn to ptr" {
667	708	const addr2 = @ptrCast(&const u8, emptyFn);

test/cases/namespace_depends_on_compile_var/index.zig+1-1

...	...	@@ -8,7 +8,7 @@ test "namespace depends on compile var" {
8	8	assert(!some_namespace.a_bool);
9	9	}
10	10	}
11		const some_namespace = switch(builtin.os) {
	11	const some_namespace = switch (builtin.os) {
12	12	builtin.Os.linux => @import("a.zig"),
13	13	else => @import("b.zig"),
14	14	};

test/cases/new_stack_call.zig created+26

...	...	@@ -0,0 +1,26 @@
	1	const std = @import("std");
	2	const assert = std.debug.assert;
	3
	4	var new_stack_bytes: [1024]u8 = undefined;
	5
	6	test "calling a function with a new stack" {
	7	const arg = 1234;
	8
	9	const a = @newStackCall(new_stack_bytes[0..512], targetFunction, arg);
	10	const b = @newStackCall(new_stack_bytes[512..], targetFunction, arg);
	11	_ = targetFunction(arg);
	12
	13	assert(arg == 1234);
	14	assert(a < b);
	15	}
	16
	17	fn targetFunction(x: i32) usize {
	18	assert(x == 1234);
	19
	20	var local_variable: i32 = 42;
	21	const ptr = &local_variable;
	22	ptr.* += 1;
	23
	24	assert(local_variable == 43);
	25	return @ptrToInt(ptr);
	26	}

test/cases/null.zig+13-18

...	...	@@ -1,7 +1,7 @@
1	1	const assert = @import("std").debug.assert;
2	2
3	3	test "nullable type" {
4		const x : ?bool = true;
	4	const x: ?bool = true;
5	5
6	6	if (x) \|y\| {
7	7	if (y) {
...	...	@@ -13,13 +13,13 @@ test "nullable type" {
13	13	unreachable;
14	14	}
15	15
16		const next_x : ?i32 = null;
	16	const next_x: ?i32 = null;
17	17
18	18	const z = next_x ?? 1234;
19	19
20	20	assert(z == 1234);
21	21
22		const final_x : ?i32 = 13;
	22	const final_x: ?i32 = 13;
23	23
24	24	const num = final_x ?? unreachable;
25	25
...	...	@@ -30,19 +30,17 @@ test "test maybe object and get a pointer to the inner value" {
30	30	var maybe_bool: ?bool = true;
31	31
32	32	if (maybe_bool) \|*b\| {
33		*b = false;
	33	b.* = false;
34	34	}
35	35
36	36	assert(??maybe_bool == false);
37	37	}
38	38
39
40	39	test "rhs maybe unwrap return" {
41	40	const x: ?bool = true;
42	41	const y = x ?? return;
43	42	}
44	43
45
46	44	test "maybe return" {
47	45	maybeReturnImpl();
48	46	comptime maybeReturnImpl();
...	...	@@ -50,8 +48,7 @@ test "maybe return" {
50	48
51	49	fn maybeReturnImpl() void {
52	50	assert(??foo(1235));
53		if (foo(null) != null)
54		unreachable;
	51	if (foo(null) != null) unreachable;
55	52	assert(!??foo(1234));
56	53	}
57	54
...	...	@@ -60,12 +57,16 @@ fn foo(x: ?i32) ?bool {
60	57	return value > 1234;
61	58	}
62	59
63
64	60	test "if var maybe pointer" {
65		assert(shouldBeAPlus1(Particle {.a = 14, .b = 1, .c = 1, .d = 1}) == 15);
	61	assert(shouldBeAPlus1(Particle{
	62	.a = 14,
	63	.b = 1,
	64	.c = 1,
	65	.d = 1,
	66	}) == 15);
66	67	}
67	68	fn shouldBeAPlus1(p: &const Particle) u64 {
68		var maybe_particle: ?Particle = *p;
	69	var maybe_particle: ?Particle = p.*;
69	70	if (maybe_particle) \|*particle\| {
70	71	particle.a += 1;
71	72	}
...	...	@@ -81,7 +82,6 @@ const Particle = struct {
81	82	d: u64,
82	83	};
83	84
84
85	85	test "null literal outside function" {
86	86	const is_null = here_is_a_null_literal.context == null;
87	87	assert(is_null);
...	...	@@ -92,10 +92,7 @@ test "null literal outside function" {
92	92	const SillyStruct = struct {
93	93	context: ?i32,
94	94	};
95		const here_is_a_null_literal = SillyStruct {
96		.context = null,
97		};
98
	95	const here_is_a_null_literal = SillyStruct{ .context = null };
99	96
100	97	test "test null runtime" {
101	98	testTestNullRuntime(null);
...	...	@@ -123,8 +120,6 @@ fn bar(x: ?void) ?void {
123	120	}
124	121	}
125	122
126
127
128	123	const StructWithNullable = struct {
129	124	field: ?i32,
130	125	};

test/cases/pointers.zig created+14

...	...	@@ -0,0 +1,14 @@
	1	const std = @import("std");
	2	const assert = std.debug.assert;
	3
	4	test "dereference pointer" {
	5	comptime testDerefPtr();
	6	testDerefPtr();
	7	}
	8
	9	fn testDerefPtr() void {
	10	var x: i32 = 1234;
	11	var y = &x;
	12	y.* += 1;
	13	assert(x == 1235);
	14	}

test/cases/ref_var_in_if_after_if_2nd_switch_prong.zig+1-1

...	...	@@ -23,7 +23,7 @@ fn foo(c: bool, k: Num, c2: bool, b: []const u8) void {
23	23	if (c) {
24	24	const output_path = b;
25	25
26		if (c2) { }
	26	if (c2) {}
27	27
28	28	a(output_path);
29	29	}

test/cases/reflection.zig+4-3

...	...	@@ -23,7 +23,9 @@ test "reflection: function return type, var args, and param types" {
23	23	}
24	24	}
25	25
26		fn dummy(a: bool, b: i32, c: f32) i32 { return 1234; }
	26	fn dummy(a: bool, b: i32, c: f32) i32 {
	27	return 1234;
	28	}
27	29	fn dummy_varargs(args: ...) void {}
28	30
29	31	test "reflection: struct member types and names" {
...	...	@@ -54,11 +56,10 @@ test "reflection: enum member types and names" {
54	56	assert(mem.eql(u8, @memberName(Bar, 2), "Three"));
55	57	assert(mem.eql(u8, @memberName(Bar, 3), "Four"));
56	58	}
57
58	59	}
59	60
60	61	test "reflection: @field" {
61		var f = Foo {
	62	var f = Foo{
62	63	.one = 42,
63	64	.two = true,
64	65	.three = void{},

test/cases/slice.zig+6-2

...	...	@@ -18,7 +18,11 @@ test "slice child property" {
18	18	}
19	19
20	20	test "runtime safety lets us slice from len..len" {
21		var an_array = []u8{1, 2, 3};
	21	var an_array = []u8{
	22	1,
	23	2,
	24	3,
	25	};
22	26	assert(mem.eql(u8, sliceFromLenToLen(an_array[0..], 3, 3), ""));
23	27	}
24	28
...	...	@@ -27,7 +31,7 @@ fn sliceFromLenToLen(a_slice: []u8, start: usize, end: usize) []u8 {
27	31	}
28	32
29	33	test "implicitly cast array of size 0 to slice" {
30		var msg = []u8 {};
	34	var msg = []u8{};
31	35	assertLenIsZero(msg);
32	36	}
33	37

test/cases/struct.zig+41-38

...	...	@@ -2,9 +2,11 @@ const assert = @import("std").debug.assert;
2	2	const builtin = @import("builtin");
3	3
4	4	const StructWithNoFields = struct {
5		fn add(a: i32, b: i32) i32 { return a + b; }
	5	fn add(a: i32, b: i32) i32 {
	6	return a + b;
	7	}
6	8	};
7		const empty_global_instance = StructWithNoFields {};
	9	const empty_global_instance = StructWithNoFields{};
8	10
9	11	test "call struct static method" {
10	12	const result = StructWithNoFields.add(3, 4);
...	...	@@ -25,7 +27,7 @@ test "invake static method in global scope" {
25	27	}
26	28
27	29	test "void struct fields" {
28		const foo = VoidStructFieldsFoo {
	30	const foo = VoidStructFieldsFoo{
29	31	.a = void{},
30	32	.b = 1,
31	33	.c = void{},
...	...	@@ -34,12 +36,11 @@ test "void struct fields" {
34	36	assert(@sizeOf(VoidStructFieldsFoo) == 4);
35	37	}
36	38	const VoidStructFieldsFoo = struct {
37		a : void,
38		b : i32,
39		c : void,
	39	a: void,
	40	b: i32,
	41	c: void,
40	42	};
41	43
42
43	44	test "structs" {
44	45	var foo: StructFoo = undefined;
45	46	@memset(@ptrCast(&u8, &foo), 0, @sizeOf(StructFoo));
...	...	@@ -50,9 +51,9 @@ test "structs" {
50	51	assert(foo.c == 100);
51	52	}
52	53	const StructFoo = struct {
53		a : i32,
54		b : bool,
55		c : f32,
	54	a: i32,
	55	b: bool,
	56	c: f32,
56	57	};
57	58	fn testFoo(foo: &const StructFoo) void {
58	59	assert(foo.b);
...	...	@@ -61,7 +62,6 @@ fn testMutation(foo: &StructFoo) void {
61	62	foo.c = 100;
62	63	}
63	64
64
65	65	const Node = struct {
66	66	val: Val,
67	67	next: &Node,
...	...	@@ -72,10 +72,10 @@ const Val = struct {
72	72	};
73	73
74	74	test "struct point to self" {
75		var root : Node = undefined;
	75	var root: Node = undefined;
76	76	root.val.x = 1;
77	77
78		var node : Node = undefined;
	78	var node: Node = undefined;
79	79	node.next = &root;
80	80	node.val.x = 2;
81	81
...	...	@@ -85,8 +85,8 @@ test "struct point to self" {
85	85	}
86	86
87	87	test "struct byval assign" {
88		var foo1 : StructFoo = undefined;
89		var foo2 : StructFoo = undefined;
	88	var foo1: StructFoo = undefined;
	89	var foo2: StructFoo = undefined;
90	90
91	91	foo1.a = 1234;
92	92	foo2.a = 0;
...	...	@@ -96,46 +96,47 @@ test "struct byval assign" {
96	96	}
97	97
98	98	fn structInitializer() void {
99		const val = Val { .x = 42 };
	99	const val = Val{ .x = 42 };
100	100	assert(val.x == 42);
101	101	}
102	102
103
104	103	test "fn call of struct field" {
105		assert(callStructField(Foo {.ptr = aFunc,}) == 13);
	104	assert(callStructField(Foo{ .ptr = aFunc }) == 13);
106	105	}
107	106
108	107	const Foo = struct {
109	108	ptr: fn() i32,
110	109	};
111	110
112		fn aFunc() i32 { return 13; }
	111	fn aFunc() i32 {
	112	return 13;
	113	}
113	114
114	115	fn callStructField(foo: &const Foo) i32 {
115	116	return foo.ptr();
116	117	}
117	118
118
119	119	test "store member function in variable" {
120		const instance = MemberFnTestFoo { .x = 1234, };
	120	const instance = MemberFnTestFoo{ .x = 1234 };
121	121	const memberFn = MemberFnTestFoo.member;
122	122	const result = memberFn(instance);
123	123	assert(result == 1234);
124	124	}
125	125	const MemberFnTestFoo = struct {
126	126	x: i32,
127		fn member(foo: &const MemberFnTestFoo) i32 { return foo.x; }
	127	fn member(foo: &const MemberFnTestFoo) i32 {
	128	return foo.x;
	129	}
128	130	};
129	131
130
131	132	test "call member function directly" {
132		const instance = MemberFnTestFoo { .x = 1234, };
	133	const instance = MemberFnTestFoo{ .x = 1234 };
133	134	const result = MemberFnTestFoo.member(instance);
134	135	assert(result == 1234);
135	136	}
136	137
137	138	test "member functions" {
138		const r = MemberFnRand {.seed = 1234};
	139	const r = MemberFnRand{ .seed = 1234 };
139	140	assert(r.getSeed() == 1234);
140	141	}
141	142	const MemberFnRand = struct {
...	...	@@ -154,7 +155,7 @@ const Bar = struct {
154	155	y: i32,
155	156	};
156	157	fn makeBar(x: i32, y: i32) Bar {
157		return Bar {
	158	return Bar{
158	159	.x = x,
159	160	.y = y,
160	161	};
...	...	@@ -170,17 +171,16 @@ const EmptyStruct = struct {
170	171	}
171	172	};
172	173
173
174	174	test "return empty struct from fn" {
175	175	_ = testReturnEmptyStructFromFn();
176	176	}
177	177	const EmptyStruct2 = struct {};
178	178	fn testReturnEmptyStructFromFn() EmptyStruct2 {
179		return EmptyStruct2 {};
	179	return EmptyStruct2{};
180	180	}
181	181
182	182	test "pass slice of empty struct to fn" {
183		assert(testPassSliceOfEmptyStructToFn([]EmptyStruct2{ EmptyStruct2{} }) == 1);
	183	assert(testPassSliceOfEmptyStructToFn([]EmptyStruct2{EmptyStruct2{}}) == 1);
184	184	}
185	185	fn testPassSliceOfEmptyStructToFn(slice: []const EmptyStruct2) usize {
186	186	return slice.len;
...	...	@@ -192,7 +192,7 @@ const APackedStruct = packed struct {
192	192	};
193	193
194	194	test "packed struct" {
195		var foo = APackedStruct {
	195	var foo = APackedStruct{
196	196	.x = 1,
197	197	.y = 2,
198	198	};
...	...	@@ -201,14 +201,13 @@ test "packed struct" {
201	201	assert(four == 4);
202	202	}
203	203
204
205	204	const BitField1 = packed struct {
206	205	a: u3,
207	206	b: u3,
208	207	c: u2,
209	208	};
210	209
211		const bit_field_1 = BitField1 {
	210	const bit_field_1 = BitField1{
212	211	.a = 1,
213	212	.b = 2,
214	213	.c = 3,
...	...	@@ -258,7 +257,7 @@ test "packed struct 24bits" {
258	257	assert(@sizeOf(Foo96Bits) == 12);
259	258	}
260	259
261		var value = Foo96Bits {
	260	var value = Foo96Bits{
262	261	.a = 0,
263	262	.b = 0,
264	263	.c = 0,
...	...	@@ -360,11 +359,15 @@ test "aligned array of packed struct" {
360	359	assert(ptr.a[1].b == 0xbb);
361	360	}
362	361
363
364
365	362	test "runtime struct initialization of bitfield" {
366		const s1 = Nibbles { .x = x1, .y = x1 };
367		const s2 = Nibbles { .x = u4(x2), .y = u4(x2) };
	363	const s1 = Nibbles{
	364	.x = x1,
	365	.y = x1,
	366	};
	367	const s2 = Nibbles{
	368	.x = u4(x2),
	369	.y = u4(x2),
	370	};
368	371
369	372	assert(s1.x == x1);
370	373	assert(s1.y == x1);
...	...	@@ -394,7 +397,7 @@ test "native bit field understands endianness" {
394	397	var all: u64 = 0x7765443322221111;
395	398	var bytes: [8]u8 = undefined;
396	399	@memcpy(&bytes[0], @ptrCast(&u8, &all), 8);
397		var bitfields = *@ptrCast(&Bitfields, &bytes[0]);
	400	var bitfields = @ptrCast(&Bitfields, &bytes[0]).*;
398	401
399	402	assert(bitfields.f1 == 0x1111);
400	403	assert(bitfields.f2 == 0x2222);

test/cases/struct_contains_null_ptr_itself.zig-1

...	...	@@ -19,4 +19,3 @@ pub const Node = struct {
19	19	pub const NodeLineComment = struct {
20	20	base: Node,
21	21	};
22

test/cases/struct_contains_slice_of_itself.zig+7-7

...	...	@@ -7,30 +7,30 @@ const Node = struct {
7	7
8	8	test "struct contains slice of itself" {
9	9	var other_nodes = []Node{
10		Node {
	10	Node{
11	11	.payload = 31,
12	12	.children = []Node{},
13	13	},
14		Node {
	14	Node{
15	15	.payload = 32,
16	16	.children = []Node{},
17	17	},
18	18	};
19		var nodes = []Node {
20		Node {
	19	var nodes = []Node{
	20	Node{
21	21	.payload = 1,
22	22	.children = []Node{},
23	23	},
24		Node {
	24	Node{
25	25	.payload = 2,
26	26	.children = []Node{},
27	27	},
28		Node {
	28	Node{
29	29	.payload = 3,
30	30	.children = other_nodes[0..],
31	31	},
32	32	};
33		const root = Node {
	33	const root = Node{
34	34	.payload = 1234,
35	35	.children = nodes[0..],
36	36	};

test/cases/switch.zig+14-17

...	...	@@ -6,7 +6,7 @@ test "switch with numbers" {
6	6
7	7	fn testSwitchWithNumbers(x: u32) void {
8	8	const result = switch (x) {
9		1, 2, 3, 4 ... 8 => false,
	9	1, 2, 3, 4...8 => false,
10	10	13 => true,
11	11	else => false,
12	12	};
...	...	@@ -22,9 +22,9 @@ test "switch with all ranges" {
22	22
23	23	fn testSwitchWithAllRanges(x: u32, y: u32) u32 {
24	24	return switch (x) {
25		0 ... 100 => 1,
26		101 ... 200 => 2,
27		201 ... 300 => 3,
	25	0...100 => 1,
	26	101...200 => 2,
	27	201...300 => 3,
28	28	else => y,
29	29	};
30	30	}
...	...	@@ -61,7 +61,6 @@ fn nonConstSwitchOnEnum(fruit: Fruit) void {
61	61	}
62	62	}
63	63
64
65	64	test "switch statement" {
66	65	nonConstSwitch(SwitchStatmentFoo.C);
67	66	}
...	...	@@ -81,11 +80,10 @@ const SwitchStatmentFoo = enum {
81	80	D,
82	81	};
83	82
84
85	83	test "switch prong with variable" {
86		switchProngWithVarFn(SwitchProngWithVarEnum { .One = 13});
87		switchProngWithVarFn(SwitchProngWithVarEnum { .Two = 13.0});
88		switchProngWithVarFn(SwitchProngWithVarEnum { .Meh = {}});
	84	switchProngWithVarFn(SwitchProngWithVarEnum{ .One = 13 });
	85	switchProngWithVarFn(SwitchProngWithVarEnum{ .Two = 13.0 });
	86	switchProngWithVarFn(SwitchProngWithVarEnum{ .Meh = {} });
89	87	}
90	88	const SwitchProngWithVarEnum = union(enum) {
91	89	One: i32,
...	...	@@ -93,7 +91,7 @@ const SwitchProngWithVarEnum = union(enum) {
93	91	Meh: void,
94	92	};
95	93	fn switchProngWithVarFn(a: &const SwitchProngWithVarEnum) void {
96		switch(*a) {
	94	switch (a.*) {
97	95	SwitchProngWithVarEnum.One => \|x\| {
98	96	assert(x == 13);
99	97	},
...	...	@@ -112,9 +110,9 @@ test "switch on enum using pointer capture" {
112	110	}
113	111
114	112	fn testSwitchEnumPtrCapture() void {
115		var value = SwitchProngWithVarEnum { .One = 1234 };
	113	var value = SwitchProngWithVarEnum{ .One = 1234 };
116	114	switch (value) {
117		SwitchProngWithVarEnum.One => \|x\| x += 1,
	115	SwitchProngWithVarEnum.One => \|x\| x. += 1,
118	116	else => unreachable,
119	117	}
120	118	switch (value) {
...	...	@@ -135,14 +133,13 @@ fn returnsFive() i32 {
135	133	return 5;
136	134	}
137	135
138
139	136	const Number = union(enum) {
140	137	One: u64,
141	138	Two: u8,
142	139	Three: f32,
143	140	};
144	141
145		const number = Number { .Three = 1.23 };
	142	const number = Number{ .Three = 1.23 };
146	143
147	144	fn returnsFalse() bool {
148	145	switch (number) {
...	...	@@ -196,11 +193,11 @@ fn testSwitchHandleAllCasesExhaustive(x: u2) u2 {
196	193
197	194	fn testSwitchHandleAllCasesRange(x: u8) u8 {
198	195	return switch (x) {
199		0 ... 100 => u8(0),
200		101 ... 200 => 1,
	196	0...100 => u8(0),
	197	101...200 => 1,
201	198	201, 203 => 2,
202	199	202 => 4,
203		204 ... 255 => 3,
	200	204...255 => 3,
204	201	};
205	202	}
206	203

test/cases/switch_prong_err_enum.zig+4-2

...	...	@@ -14,14 +14,16 @@ const FormValue = union(enum) {
14	14
15	15	fn doThing(form_id: u64) error!FormValue {
16	16	return switch (form_id) {
17		17 => FormValue { .Address = try readOnce() },
	17	17 => FormValue{ .Address = try readOnce() },
18	18	else => error.InvalidDebugInfo,
19	19	};
20	20	}
21	21
22	22	test "switch prong returns error enum" {
23	23	switch (doThing(17) catch unreachable) {
24		FormValue.Address => \|payload\| { assert(payload == 1); },
	24	FormValue.Address => \|payload\| {
	25	assert(payload == 1);
	26	},
25	27	else => unreachable,
26	28	}
27	29	assert(read_count == 1);

test/cases/switch_prong_implicit_cast.zig+2-2

...	...	@@ -7,8 +7,8 @@ const FormValue = union(enum) {
7	7
8	8	fn foo(id: u64) !FormValue {
9	9	return switch (id) {
10		2 => FormValue { .Two = true },
11		1 => FormValue { .One = {} },
	10	2 => FormValue{ .Two = true },
	11	1 => FormValue{ .One = {} },
12	12	else => return error.Whatever,
13	13	};
14	14	}

test/cases/syntax.zig-7

...	...	@@ -2,11 +2,9 @@
2	2
3	3	const struct_trailing_comma = struct { x: i32, y: i32, };
4	4	const struct_no_comma = struct { x: i32, y: i32 };
5		const struct_no_comma_void_type = struct { x: i32, y };
6	5	const struct_fn_no_comma = struct { fn m() void {} y: i32 };
7	6
8	7	const enum_no_comma = enum { A, B };
9		const enum_no_comma_type = enum { A, B: i32 };
10	8
11	9	fn container_init() void {
12	10	const S = struct { x: i32, y: i32 };
...	...	@@ -36,16 +34,11 @@ fn switch_prongs(x: i32) void {
36	34
37	35	const fn_no_comma = fn(i32, i32)void;
38	36	const fn_trailing_comma = fn(i32, i32,)void;
39		const fn_vararg_trailing_comma = fn(i32, i32, ...,)void;
40	37
41	38	fn fn_calls() void {
42	39	fn add(x: i32, y: i32,) i32 { x + y };
43	40	_ = add(1, 2);
44	41	_ = add(1, 2,);
45
46		fn swallow(x: ...,) void {};
47		_ = swallow(1,2,3,);
48		_ = swallow();
49	42	}
50	43
51	44	fn asm_lists() void {

test/cases/this.zig+1-1

...	...	@@ -29,7 +29,7 @@ test "this refer to module call private fn" {
29	29	}
30	30
31	31	test "this refer to container" {
32		var pt = Point(i32) {
	32	var pt = Point(i32){
33	33	.x = 12,
34	34	.y = 34,
35	35	};

test/cases/try.zig+1-4

...	...	@@ -3,13 +3,10 @@ const assert = @import("std").debug.assert;
3	3	test "try on error union" {
4	4	tryOnErrorUnionImpl();
5	5	comptime tryOnErrorUnionImpl();
6
7	6	}
8	7
9	8	fn tryOnErrorUnionImpl() void {
10		const x = if (returnsTen()) \|val\|
11		val + 1
12		else \|err\| switch (err) {
	9	const x = if (returnsTen()) \|val\| val + 1 else \|err\| switch (err) {
13	10	error.ItBroke, error.NoMem => 1,
14	11	error.CrappedOut => i32(2),
15	12	else => unreachable,

test/cases/type_info.zig+184-142

...	...	@@ -4,167 +4,199 @@ const TypeInfo = @import("builtin").TypeInfo;
4	4	const TypeId = @import("builtin").TypeId;
5	5
6	6	test "type info: tag type, void info" {
7		comptime {
8		assert(@TagType(TypeInfo) == TypeId);
9		const void_info = @typeInfo(void);
10		assert(TypeId(void_info) == TypeId.Void);
11		assert(void_info.Void == {});
12		}
	7	testBasic();
	8	comptime testBasic();
	9	}
	10
	11	fn testBasic() void {
	12	assert(@TagType(TypeInfo) == TypeId);
	13	const void_info = @typeInfo(void);
	14	assert(TypeId(void_info) == TypeId.Void);
	15	assert(void_info.Void == {});
13	16	}
14	17
15	18	test "type info: integer, floating point type info" {
16		comptime {
17		const u8_info = @typeInfo(u8);
18		assert(TypeId(u8_info) == TypeId.Int);
19		assert(!u8_info.Int.is_signed);
20		assert(u8_info.Int.bits == 8);
	19	testIntFloat();
	20	comptime testIntFloat();
	21	}
21	22
22		const f64_info = @typeInfo(f64);
23		assert(TypeId(f64_info) == TypeId.Float);
24		assert(f64_info.Float.bits == 64);
25		}
	23	fn testIntFloat() void {
	24	const u8_info = @typeInfo(u8);
	25	assert(TypeId(u8_info) == TypeId.Int);
	26	assert(!u8_info.Int.is_signed);
	27	assert(u8_info.Int.bits == 8);
	28
	29	const f64_info = @typeInfo(f64);
	30	assert(TypeId(f64_info) == TypeId.Float);
	31	assert(f64_info.Float.bits == 64);
26	32	}
27	33
28	34	test "type info: pointer type info" {
29		comptime {
30		const u32_ptr_info = @typeInfo(&u32);
31		assert(TypeId(u32_ptr_info) == TypeId.Pointer);
32		assert(u32_ptr_info.Pointer.is_const == false);
33		assert(u32_ptr_info.Pointer.is_volatile == false);
34		assert(u32_ptr_info.Pointer.alignment == 4);
35		assert(u32_ptr_info.Pointer.child == u32);
36		}
	35	testPointer();
	36	comptime testPointer();
	37	}
	38
	39	fn testPointer() void {
	40	const u32_ptr_info = @typeInfo(&u32);
	41	assert(TypeId(u32_ptr_info) == TypeId.Pointer);
	42	assert(u32_ptr_info.Pointer.is_const == false);
	43	assert(u32_ptr_info.Pointer.is_volatile == false);
	44	assert(u32_ptr_info.Pointer.alignment == 4);
	45	assert(u32_ptr_info.Pointer.child == u32);
37	46	}
38	47
39	48	test "type info: slice type info" {
40		comptime {
41		const u32_slice_info = @typeInfo([]u32);
42		assert(TypeId(u32_slice_info) == TypeId.Slice);
43		assert(u32_slice_info.Slice.is_const == false);
44		assert(u32_slice_info.Slice.is_volatile == false);
45		assert(u32_slice_info.Slice.alignment == 4);
46		assert(u32_slice_info.Slice.child == u32);
47		}
	49	testSlice();
	50	comptime testSlice();
	51	}
	52
	53	fn testSlice() void {
	54	const u32_slice_info = @typeInfo([]u32);
	55	assert(TypeId(u32_slice_info) == TypeId.Slice);
	56	assert(u32_slice_info.Slice.is_const == false);
	57	assert(u32_slice_info.Slice.is_volatile == false);
	58	assert(u32_slice_info.Slice.alignment == 4);
	59	assert(u32_slice_info.Slice.child == u32);
48	60	}
49	61
50	62	test "type info: array type info" {
51		comptime {
52		const arr_info = @typeInfo([42]bool);
53		assert(TypeId(arr_info) == TypeId.Array);
54		assert(arr_info.Array.len == 42);
55		assert(arr_info.Array.child == bool);
56		}
	63	testArray();
	64	comptime testArray();
	65	}
	66
	67	fn testArray() void {
	68	const arr_info = @typeInfo([42]bool);
	69	assert(TypeId(arr_info) == TypeId.Array);
	70	assert(arr_info.Array.len == 42);
	71	assert(arr_info.Array.child == bool);
57	72	}
58	73
59	74	test "type info: nullable type info" {
60		comptime {
61		const null_info = @typeInfo(?void);
62		assert(TypeId(null_info) == TypeId.Nullable);
63		assert(null_info.Nullable.child == void);
64		}
	75	testNullable();
	76	comptime testNullable();
	77	}
	78
	79	fn testNullable() void {
	80	const null_info = @typeInfo(?void);
	81	assert(TypeId(null_info) == TypeId.Nullable);
	82	assert(null_info.Nullable.child == void);
65	83	}
66	84
67	85	test "type info: promise info" {
68		comptime {
69		const null_promise_info = @typeInfo(promise);
70		assert(TypeId(null_promise_info) == TypeId.Promise);
71		assert(null_promise_info.Promise.child == @typeOf(undefined));
	86	testPromise();
	87	comptime testPromise();
	88	}
72	89
73		const promise_info = @typeInfo(promise->usize);
74		assert(TypeId(promise_info) == TypeId.Promise);
75		assert(promise_info.Promise.child == usize);
76		}
	90	fn testPromise() void {
	91	const null_promise_info = @typeInfo(promise);
	92	assert(TypeId(null_promise_info) == TypeId.Promise);
	93	assert(null_promise_info.Promise.child == @typeOf(undefined));
77	94
	95	const promise_info = @typeInfo(promise->usize);
	96	assert(TypeId(promise_info) == TypeId.Promise);
	97	assert(promise_info.Promise.child == usize);
78	98	}
79	99
80	100	test "type info: error set, error union info" {
81		comptime {
82		const TestErrorSet = error {
83		First,
84		Second,
85		Third,
86		};
87
88		const error_set_info = @typeInfo(TestErrorSet);
89		assert(TypeId(error_set_info) == TypeId.ErrorSet);
90		assert(error_set_info.ErrorSet.errors.len == 3);
91		assert(mem.eql(u8, error_set_info.ErrorSet.errors[0].name, "First"));
92		assert(error_set_info.ErrorSet.errors[2].value == usize(TestErrorSet.Third));
93
94		const error_union_info = @typeInfo(TestErrorSet!usize);
95		assert(TypeId(error_union_info) == TypeId.ErrorUnion);
96		assert(error_union_info.ErrorUnion.error_set == TestErrorSet);
97		assert(error_union_info.ErrorUnion.payload == usize);
98		}
	101	testErrorSet();
	102	comptime testErrorSet();
	103	}
	104
	105	fn testErrorSet() void {
	106	const TestErrorSet = error{
	107	First,
	108	Second,
	109	Third,
	110	};
	111
	112	const error_set_info = @typeInfo(TestErrorSet);
	113	assert(TypeId(error_set_info) == TypeId.ErrorSet);
	114	assert(error_set_info.ErrorSet.errors.len == 3);
	115	assert(mem.eql(u8, error_set_info.ErrorSet.errors[0].name, "First"));
	116	assert(error_set_info.ErrorSet.errors[2].value == usize(TestErrorSet.Third));
	117
	118	const error_union_info = @typeInfo(TestErrorSet!usize);
	119	assert(TypeId(error_union_info) == TypeId.ErrorUnion);
	120	assert(error_union_info.ErrorUnion.error_set == TestErrorSet);
	121	assert(error_union_info.ErrorUnion.payload == usize);
99	122	}
100	123
101	124	test "type info: enum info" {
102		comptime {
103		const Os = @import("builtin").Os;
	125	testEnum();
	126	comptime testEnum();
	127	}
104	128
105		const os_info = @typeInfo(Os);
106		assert(TypeId(os_info) == TypeId.Enum);
107		assert(os_info.Enum.layout == TypeInfo.ContainerLayout.Auto);
108		assert(os_info.Enum.fields.len == 32);
109		assert(mem.eql(u8, os_info.Enum.fields[1].name, "ananas"));
110		assert(os_info.Enum.fields[10].value == 10);
111		assert(os_info.Enum.tag_type == u5);
112		assert(os_info.Enum.defs.len == 0);
113		}
	129	fn testEnum() void {
	130	const Os = @import("builtin").Os;
	131
	132	const os_info = @typeInfo(Os);
	133	assert(TypeId(os_info) == TypeId.Enum);
	134	assert(os_info.Enum.layout == TypeInfo.ContainerLayout.Auto);
	135	assert(os_info.Enum.fields.len == 32);
	136	assert(mem.eql(u8, os_info.Enum.fields[1].name, "ananas"));
	137	assert(os_info.Enum.fields[10].value == 10);
	138	assert(os_info.Enum.tag_type == u5);
	139	assert(os_info.Enum.defs.len == 0);
114	140	}
115	141
116	142	test "type info: union info" {
117		comptime {
118		const typeinfo_info = @typeInfo(TypeInfo);
119		assert(TypeId(typeinfo_info) == TypeId.Union);
120		assert(typeinfo_info.Union.layout == TypeInfo.ContainerLayout.Auto);
121		assert(typeinfo_info.Union.tag_type == TypeId);
122		assert(typeinfo_info.Union.fields.len == 26);
123		assert(typeinfo_info.Union.fields[4].enum_field != null);
124		assert((??typeinfo_info.Union.fields[4].enum_field).value == 4);
125		assert(typeinfo_info.Union.fields[4].field_type == @typeOf(@typeInfo(u8).Int));
126		assert(typeinfo_info.Union.defs.len == 21);
127
128		const TestNoTagUnion = union {
129		Foo: void,
130		Bar: u32,
131		};
132
133		const notag_union_info = @typeInfo(TestNoTagUnion);
134		assert(TypeId(notag_union_info) == TypeId.Union);
135		assert(notag_union_info.Union.tag_type == @typeOf(undefined));
136		assert(notag_union_info.Union.layout == TypeInfo.ContainerLayout.Auto);
137		assert(notag_union_info.Union.fields.len == 2);
138		assert(notag_union_info.Union.fields[0].enum_field == null);
139		assert(notag_union_info.Union.fields[1].field_type == u32);
140
141		const TestExternUnion = extern union {
142		foo: &c_void,
143		};
144
145		const extern_union_info = @typeInfo(TestExternUnion);
146		assert(extern_union_info.Union.layout == TypeInfo.ContainerLayout.Extern);
147		assert(extern_union_info.Union.tag_type == @typeOf(undefined));
148		assert(extern_union_info.Union.fields[0].enum_field == null);
149		assert(extern_union_info.Union.fields[0].field_type == &c_void);
150		}
	143	testUnion();
	144	comptime testUnion();
	145	}
	146
	147	fn testUnion() void {
	148	const typeinfo_info = @typeInfo(TypeInfo);
	149	assert(TypeId(typeinfo_info) == TypeId.Union);
	150	assert(typeinfo_info.Union.layout == TypeInfo.ContainerLayout.Auto);
	151	assert(typeinfo_info.Union.tag_type == TypeId);
	152	assert(typeinfo_info.Union.fields.len == 26);
	153	assert(typeinfo_info.Union.fields[4].enum_field != null);
	154	assert((??typeinfo_info.Union.fields[4].enum_field).value == 4);
	155	assert(typeinfo_info.Union.fields[4].field_type == @typeOf(@typeInfo(u8).Int));
	156	assert(typeinfo_info.Union.defs.len == 21);
	157
	158	const TestNoTagUnion = union {
	159	Foo: void,
	160	Bar: u32,
	161	};
	162
	163	const notag_union_info = @typeInfo(TestNoTagUnion);
	164	assert(TypeId(notag_union_info) == TypeId.Union);
	165	assert(notag_union_info.Union.tag_type == @typeOf(undefined));
	166	assert(notag_union_info.Union.layout == TypeInfo.ContainerLayout.Auto);
	167	assert(notag_union_info.Union.fields.len == 2);
	168	assert(notag_union_info.Union.fields[0].enum_field == null);
	169	assert(notag_union_info.Union.fields[1].field_type == u32);
	170
	171	const TestExternUnion = extern union {
	172	foo: &c_void,
	173	};
	174
	175	const extern_union_info = @typeInfo(TestExternUnion);
	176	assert(extern_union_info.Union.layout == TypeInfo.ContainerLayout.Extern);
	177	assert(extern_union_info.Union.tag_type == @typeOf(undefined));
	178	assert(extern_union_info.Union.fields[0].enum_field == null);
	179	assert(extern_union_info.Union.fields[0].field_type == &c_void);
151	180	}
152	181
153	182	test "type info: struct info" {
154		comptime {
155		const struct_info = @typeInfo(TestStruct);
156		assert(TypeId(struct_info) == TypeId.Struct);
157		assert(struct_info.Struct.layout == TypeInfo.ContainerLayout.Packed);
158		assert(struct_info.Struct.fields.len == 3);
159		assert(struct_info.Struct.fields[1].offset == null);
160		assert(struct_info.Struct.fields[2].field_type == &TestStruct);
161		assert(struct_info.Struct.defs.len == 2);
162		assert(struct_info.Struct.defs[0].is_pub);
163		assert(!struct_info.Struct.defs[0].data.Fn.is_extern);
164		assert(struct_info.Struct.defs[0].data.Fn.lib_name == null);
165		assert(struct_info.Struct.defs[0].data.Fn.return_type == void);
166		assert(struct_info.Struct.defs[0].data.Fn.fn_type == fn(&const TestStruct)void);
167		}
	183	testStruct();
	184	comptime testStruct();
	185	}
	186
	187	fn testStruct() void {
	188	const struct_info = @typeInfo(TestStruct);
	189	assert(TypeId(struct_info) == TypeId.Struct);
	190	assert(struct_info.Struct.layout == TypeInfo.ContainerLayout.Packed);
	191	assert(struct_info.Struct.fields.len == 3);
	192	assert(struct_info.Struct.fields[1].offset == null);
	193	assert(struct_info.Struct.fields[2].field_type == &TestStruct);
	194	assert(struct_info.Struct.defs.len == 2);
	195	assert(struct_info.Struct.defs[0].is_pub);
	196	assert(!struct_info.Struct.defs[0].data.Fn.is_extern);
	197	assert(struct_info.Struct.defs[0].data.Fn.lib_name == null);
	198	assert(struct_info.Struct.defs[0].data.Fn.return_type == void);
	199	assert(struct_info.Struct.defs[0].data.Fn.fn_type == fn(&const TestStruct) void);
168	200	}
169	201
170	202	const TestStruct = packed struct {
...	...	@@ -178,23 +210,33 @@ const TestStruct = packed struct {
178	210	};
179	211
180	212	test "type info: function type info" {
181		comptime {
182		const fn_info = @typeInfo(@typeOf(foo));
183		assert(TypeId(fn_info) == TypeId.Fn);
184		assert(fn_info.Fn.calling_convention == TypeInfo.CallingConvention.Unspecified);
185		assert(fn_info.Fn.is_generic);
186		assert(fn_info.Fn.args.len == 2);
187		assert(fn_info.Fn.is_var_args);
188		assert(fn_info.Fn.return_type == @typeOf(undefined));
189		assert(fn_info.Fn.async_allocator_type == @typeOf(undefined));
190
191		const test_instance: TestStruct = undefined;
192		const bound_fn_info = @typeInfo(@typeOf(test_instance.foo));
193		assert(TypeId(bound_fn_info) == TypeId.BoundFn);
194		assert(bound_fn_info.BoundFn.args[0].arg_type == &const TestStruct);
195		}
	213	testFunction();
	214	comptime testFunction();
	215	}
	216
	217	fn testFunction() void {
	218	const fn_info = @typeInfo(@typeOf(foo));
	219	assert(TypeId(fn_info) == TypeId.Fn);
	220	assert(fn_info.Fn.calling_convention == TypeInfo.CallingConvention.Unspecified);
	221	assert(fn_info.Fn.is_generic);
	222	assert(fn_info.Fn.args.len == 2);
	223	assert(fn_info.Fn.is_var_args);
	224	assert(fn_info.Fn.return_type == @typeOf(undefined));
	225	assert(fn_info.Fn.async_allocator_type == @typeOf(undefined));
	226
	227	const test_instance: TestStruct = undefined;
	228	const bound_fn_info = @typeInfo(@typeOf(test_instance.foo));
	229	assert(TypeId(bound_fn_info) == TypeId.BoundFn);
	230	assert(bound_fn_info.BoundFn.args[0].arg_type == &const TestStruct);
196	231	}
197	232
198	233	fn foo(comptime a: usize, b: bool, args: ...) usize {
199	234	return 0;
200	235	}
	236
	237	test "typeInfo with comptime parameter in struct fn def" {
	238	const S = struct {
	239	pub fn func(comptime x: f32) void {}
	240	};
	241	comptime var info = @typeInfo(S);
	242	}

test/cases/undefined.zig+2-2

...	...	@@ -63,6 +63,6 @@ test "assign undefined to struct with method" {
63	63	}
64	64
65	65	test "type name of undefined" {
66		const x = undefined;
67		assert(mem.eql(u8, @typeName(@typeOf(x)), "(undefined)"));
	66	const x = undefined;
	67	assert(mem.eql(u8, @typeName(@typeOf(x)), "(undefined)"));
68	68	}

test/cases/union.zig+52-39

...	...	@@ -10,47 +10,50 @@ const Agg = struct {
10	10	val2: Value,
11	11	};
12	12
13		const v1 = Value { .Int = 1234 };
14		const v2 = Value { .Array = []u8{3} ** 9 };
	13	const v1 = Value{ .Int = 1234 };
	14	const v2 = Value{ .Array = []u8{3} ** 9 };
15	15
16		const err = (error!Agg)(Agg {
	16	const err = (error!Agg)(Agg{
17	17	.val1 = v1,
18	18	.val2 = v2,
19	19	});
20	20
21		const array = []Value { v1, v2, v1, v2};
22
	21	const array = []Value{
	22	v1,
	23	v2,
	24	v1,
	25	v2,
	26	};
23	27
24	28	test "unions embedded in aggregate types" {
25	29	switch (array[1]) {
26	30	Value.Array => \|arr\| assert(arr[4] == 3),
27	31	else => unreachable,
28	32	}
29		switch((err catch unreachable).val1) {
	33	switch ((err catch unreachable).val1) {
30	34	Value.Int => \|x\| assert(x == 1234),
31	35	else => unreachable,
32	36	}
33	37	}
34	38
35
36	39	const Foo = union {
37	40	float: f64,
38	41	int: i32,
39	42	};
40	43
41	44	test "basic unions" {
42		var foo = Foo { .int = 1 };
	45	var foo = Foo{ .int = 1 };
43	46	assert(foo.int == 1);
44		foo = Foo {.float = 12.34};
	47	foo = Foo{ .float = 12.34 };
45	48	assert(foo.float == 12.34);
46	49	}
47	50
48	51	test "comptime union field access" {
49	52	comptime {
50		var foo = Foo { .int = 0 };
	53	var foo = Foo{ .int = 0 };
51	54	assert(foo.int == 0);
52	55
53		foo = Foo { .float = 42.42 };
	56	foo = Foo{ .float = 42.42 };
54	57	assert(foo.float == 42.42);
55	58	}
56	59	}
...	...	@@ -66,11 +69,11 @@ test "init union with runtime value" {
66	69	}
67	70
68	71	fn setFloat(foo: &Foo, x: f64) void {
69		*foo = Foo { .float = x };
	72	foo.* = Foo{ .float = x };
70	73	}
71	74
72	75	fn setInt(foo: &Foo, x: i32) void {
73		*foo = Foo { .int = x };
	76	foo.* = Foo{ .int = x };
74	77	}
75	78
76	79	const FooExtern = extern union {
...	...	@@ -79,13 +82,12 @@ const FooExtern = extern union {
79	82	};
80	83
81	84	test "basic extern unions" {
82		var foo = FooExtern { .int = 1 };
	85	var foo = FooExtern{ .int = 1 };
83	86	assert(foo.int == 1);
84	87	foo.float = 12.34;
85	88	assert(foo.float == 12.34);
86	89	}
87	90
88
89	91	const Letter = enum {
90	92	A,
91	93	B,
...	...	@@ -103,12 +105,12 @@ test "union with specified enum tag" {
103	105	}
104	106
105	107	fn doTest() void {
106		assert(bar(Payload {.A = 1234}) == -10);
	108	assert(bar(Payload{ .A = 1234 }) == -10);
107	109	}
108	110
109	111	fn bar(value: &const Payload) i32 {
110		assert(Letter(*value) == Letter.A);
111		return switch (*value) {
	112	assert(Letter(value.*) == Letter.A);
	113	return switch (value.*) {
112	114	Payload.A => \|x\| return x - 1244,
113	115	Payload.B => \|x\| if (x == 12.34) i32(20) else 21,
114	116	Payload.C => \|x\| if (x) i32(30) else 31,
...	...	@@ -141,13 +143,13 @@ const MultipleChoice2 = union(enum(u32)) {
141	143
142	144	test "union(enum(u32)) with specified and unspecified tag values" {
143	145	comptime assert(@TagType(@TagType(MultipleChoice2)) == u32);
144		testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2 {.C = 123});
145		comptime testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2 { .C = 123} );
	146	testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2{ .C = 123 });
	147	comptime testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2{ .C = 123 });
146	148	}
147	149
148	150	fn testEnumWithSpecifiedAndUnspecifiedTagValues(x: &const MultipleChoice2) void {
149		assert(u32(@TagType(MultipleChoice2)(*x)) == 60);
150		assert(1123 == switch (*x) {
	151	assert(u32(@TagType(MultipleChoice2)(x.*)) == 60);
	152	assert(1123 == switch (x.*) {
151	153	MultipleChoice2.A => 1,
152	154	MultipleChoice2.B => 2,
153	155	MultipleChoice2.C => \|v\| i32(1000) + v,
...	...	@@ -160,10 +162,9 @@ fn testEnumWithSpecifiedAndUnspecifiedTagValues(x: &const MultipleChoice2) void
160	162	});
161	163	}
162	164
163
164	165	const ExternPtrOrInt = extern union {
165	166	ptr: &u8,
166		int: u64
	167	int: u64,
167	168	};
168	169	test "extern union size" {
169	170	comptime assert(@sizeOf(ExternPtrOrInt) == 8);
...	...	@@ -171,7 +172,7 @@ test "extern union size" {
171	172
172	173	const PackedPtrOrInt = packed union {
173	174	ptr: &u8,
174		int: u64
	175	int: u64,
175	176	};
176	177	test "extern union size" {
177	178	comptime assert(@sizeOf(PackedPtrOrInt) == 8);
...	...	@@ -184,8 +185,16 @@ test "union with only 1 field which is void should be zero bits" {
184	185	comptime assert(@sizeOf(ZeroBits) == 0);
185	186	}
186	187
187		const TheTag = enum {A, B, C};
188		const TheUnion = union(TheTag) { A: i32, B: i32, C: i32 };
	188	const TheTag = enum {
	189	A,
	190	B,
	191	C,
	192	};
	193	const TheUnion = union(TheTag) {
	194	A: i32,
	195	B: i32,
	196	C: i32,
	197	};
189	198	test "union field access gives the enum values" {
190	199	assert(TheUnion.A == TheTag.A);
191	200	assert(TheUnion.B == TheTag.B);
...	...	@@ -193,20 +202,28 @@ test "union field access gives the enum values" {
193	202	}
194	203
195	204	test "cast union to tag type of union" {
196		testCastUnionToTagType(TheUnion {.B = 1234});
197		comptime testCastUnionToTagType(TheUnion {.B = 1234});
	205	testCastUnionToTagType(TheUnion{ .B = 1234 });
	206	comptime testCastUnionToTagType(TheUnion{ .B = 1234 });
198	207	}
199	208
200	209	fn testCastUnionToTagType(x: &const TheUnion) void {
201		assert(TheTag(*x) == TheTag.B);
	210	assert(TheTag(x.*) == TheTag.B);
202	211	}
203	212
204	213	test "cast tag type of union to union" {
205	214	var x: Value2 = Letter2.B;
206	215	assert(Letter2(x) == Letter2.B);
207	216	}
208		const Letter2 = enum { A, B, C };
209		const Value2 = union(Letter2) { A: i32, B, C, };
	217	const Letter2 = enum {
	218	A,
	219	B,
	220	C,
	221	};
	222	const Value2 = union(Letter2) {
	223	A: i32,
	224	B,
	225	C,
	226	};
210	227
211	228	test "implicit cast union to its tag type" {
212	229	var x: Value2 = Letter2.B;
...	...	@@ -227,19 +244,16 @@ const TheUnion2 = union(enum) {
227	244	};
228	245
229	246	fn assertIsTheUnion2Item1(value: &const TheUnion2) void {
230		assert(*value == TheUnion2.Item1);
	247	assert(value.* == TheUnion2.Item1);
231	248	}
232	249
233
234	250	pub const PackThis = union(enum) {
235	251	Invalid: bool,
236	252	StringLiteral: u2,
237	253	};
238	254
239	255	test "constant packed union" {
240		testConstPackedUnion([]PackThis {
241		PackThis { .StringLiteral = 1 },
242		});
	256	testConstPackedUnion([]PackThis{PackThis{ .StringLiteral = 1 }});
243	257	}
244	258
245	259	fn testConstPackedUnion(expected_tokens: []const PackThis) void {
...	...	@@ -252,7 +266,7 @@ test "switch on union with only 1 field" {
252	266	switch (r) {
253	267	PartialInst.Compiled => {
254	268	var z: PartialInstWithPayload = undefined;
255		z = PartialInstWithPayload { .Compiled = 1234 };
	269	z = PartialInstWithPayload{ .Compiled = 1234 };
256	270	switch (z) {
257	271	PartialInstWithPayload.Compiled => \|x\| {
258	272	assert(x == 1234);
...	...	@@ -272,7 +286,6 @@ const PartialInstWithPayload = union(enum) {
272	286	Compiled: i32,
273	287	};
274	288
275
276	289	test "access a member of tagged union with conflicting enum tag name" {
277	290	const Bar = union(enum) {
278	291	A: A,

test/cases/var_args.zig+16-9

...	...	@@ -2,9 +2,12 @@ const assert = @import("std").debug.assert;
2	2
3	3	fn add(args: ...) i32 {
4	4	var sum = i32(0);
5		{comptime var i: usize = 0; inline while (i < args.len) : (i += 1) {
6		sum += args[i];
7		}}
	5	{
	6	comptime var i: usize = 0;
	7	inline while (i < args.len) : (i += 1) {
	8	sum += args[i];
	9	}
	10	}
8	11	return sum;
9	12	}
10	13
...	...	@@ -55,18 +58,23 @@ fn extraFn(extra: u32, args: ...) usize {
55	58	return args.len;
56	59	}
57	60
	61	const foos = []fn(...) bool{
	62	foo1,
	63	foo2,
	64	};
58	65
59		const foos = []fn(...) bool { foo1, foo2 };
60
61		fn foo1(args: ...) bool { return true; }
62		fn foo2(args: ...) bool { return false; }
	66	fn foo1(args: ...) bool {
	67	return true;
	68	}
	69	fn foo2(args: ...) bool {
	70	return false;
	71	}
63	72
64	73	test "array of var args functions" {
65	74	assert(foos[0]());
66	75	assert(!foos[1]());
67	76	}
68	77
69
70	78	test "pass array and slice of same array to var args should have same pointers" {
71	79	const array = "hi";
72	80	const slice: []const u8 = array;
...	...	@@ -79,7 +87,6 @@ fn assertSlicePtrsEql(args: ...) void {
79	87	assert(s1.ptr == s2.ptr);
80	88	}
81	89
82
83	90	test "pass zero length array to var args param" {
84	91	doNothingWithFirstArg("");
85	92	}

test/cases/void.zig+1-1

...	...	@@ -8,7 +8,7 @@ const Foo = struct {
8	8
9	9	test "compare void with void compile time known" {
10	10	comptime {
11		const foo = Foo {
	11	const foo = Foo{
12	12	.a = {},
13	13	.b = 1,
14	14	.c = {},

test/cases/while.zig+41-24

...	...	@@ -1,7 +1,7 @@
1	1	const assert = @import("std").debug.assert;
2	2
3	3	test "while loop" {
4		var i : i32 = 0;
	4	var i: i32 = 0;
5	5	while (i < 4) {
6	6	i += 1;
7	7	}
...	...	@@ -35,7 +35,7 @@ test "continue and break" {
35	35	}
36	36	var continue_and_break_counter: i32 = 0;
37	37	fn runContinueAndBreakTest() void {
38		var i : i32 = 0;
	38	var i: i32 = 0;
39	39	while (true) {
40	40	continue_and_break_counter += 2;
41	41	i += 1;
...	...	@@ -58,10 +58,13 @@ fn returnWithImplicitCastFromWhileLoopTest() error!void {
58	58
59	59	test "while with continue expression" {
60	60	var sum: i32 = 0;
61		{var i: i32 = 0; while (i < 10) : (i += 1) {
62		if (i == 5) continue;
63		sum += i;
64		}}
	61	{
	62	var i: i32 = 0;
	63	while (i < 10) : (i += 1) {
	64	if (i == 5) continue;
	65	sum += i;
	66	}
	67	}
65	68	assert(sum == 40);
66	69	}
67	70
...	...	@@ -117,17 +120,13 @@ test "while with error union condition" {
117	120
118	121	var numbers_left: i32 = undefined;
119	122	fn getNumberOrErr() error!i32 {
120		return if (numbers_left == 0)
121		error.OutOfNumbers
122		else x: {
	123	return if (numbers_left == 0) error.OutOfNumbers else x: {
123	124	numbers_left -= 1;
124	125	break :x numbers_left;
125	126	};
126	127	}
127	128	fn getNumberOrNull() ?i32 {
128		return if (numbers_left == 0)
129		null
130		else x: {
	129	return if (numbers_left == 0) null else x: {
131	130	numbers_left -= 1;
132	131	break :x numbers_left;
133	132	};
...	...	@@ -136,42 +135,48 @@ fn getNumberOrNull() ?i32 {
136	135	test "while on nullable with else result follow else prong" {
137	136	const result = while (returnNull()) \|value\| {
138	137	break value;
139		} else i32(2);
	138	} else
	139	i32(2);
140	140	assert(result == 2);
141	141	}
142	142
143	143	test "while on nullable with else result follow break prong" {
144	144	const result = while (returnMaybe(10)) \|value\| {
145	145	break value;
146		} else i32(2);
	146	} else
	147	i32(2);
147	148	assert(result == 10);
148	149	}
149	150
150	151	test "while on error union with else result follow else prong" {
151	152	const result = while (returnError()) \|value\| {
152	153	break value;
153		} else \|err\| i32(2);
	154	} else \|err\|
	155	i32(2);
154	156	assert(result == 2);
155	157	}
156	158
157	159	test "while on error union with else result follow break prong" {
158	160	const result = while (returnSuccess(10)) \|value\| {
159	161	break value;
160		} else \|err\| i32(2);
	162	} else \|err\|
	163	i32(2);
161	164	assert(result == 10);
162	165	}
163	166
164	167	test "while on bool with else result follow else prong" {
165	168	const result = while (returnFalse()) {
166	169	break i32(10);
167		} else i32(2);
	170	} else
	171	i32(2);
168	172	assert(result == 2);
169	173	}
170	174
171	175	test "while on bool with else result follow break prong" {
172	176	const result = while (returnTrue()) {
173	177	break i32(10);
174		} else i32(2);
	178	} else
	179	i32(2);
175	180	assert(result == 10);
176	181	}
177	182
...	...	@@ -202,9 +207,21 @@ fn testContinueOuter() void {
202	207	}
203	208	}
204	209
205		fn returnNull() ?i32 { return null; }
206		fn returnMaybe(x: i32) ?i32 { return x; }
207		fn returnError() error!i32 { return error.YouWantedAnError; }
208		fn returnSuccess(x: i32) error!i32 { return x; }
209		fn returnFalse() bool { return false; }
210		fn returnTrue() bool { return true; }
	210	fn returnNull() ?i32 {
	211	return null;
	212	}
	213	fn returnMaybe(x: i32) ?i32 {
	214	return x;
	215	}
	216	fn returnError() error!i32 {
	217	return error.YouWantedAnError;
	218	}
	219	fn returnSuccess(x: i32) error!i32 {
	220	return x;
	221	}
	222	fn returnFalse() bool {
	223	return false;
	224	}
	225	fn returnTrue() bool {
	226	return true;
	227	}

test/compare_output.zig+6-6

...	...	@@ -131,7 +131,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
131	131	\\const is_windows = builtin.os == builtin.Os.windows;
132	132	\\const c = @cImport({
133	133	\\ if (is_windows) {
134		\\ // See https://github.com/zig-lang/zig/issues/515
	134	\\ // See https://github.com/ziglang/zig/issues/515
135	135	\\ @cDefine("_NO_CRT_STDIO_INLINE", "1");
136	136	\\ @cInclude("io.h");
137	137	\\ @cInclude("fcntl.h");
...	...	@@ -287,9 +287,9 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
287	287	\\export fn compare_fn(a: ?&const c_void, b: ?&const c_void) c_int {
288	288	\\ const a_int = @ptrCast(&align(1) const i32, a ?? unreachable);
289	289	\\ const b_int = @ptrCast(&align(1) const i32, b ?? unreachable);
290		\\ if (a_int < b_int) {
	290	\\ if (a_int.* < b_int.*) {
291	291	\\ return -1;
292		\\ } else if (a_int > b_int) {
	292	\\ } else if (a_int.* > b_int.*) {
293	293	\\ return 1;
294	294	\\ } else {
295	295	\\ return 0;
...	...	@@ -316,7 +316,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
316	316	\\const is_windows = builtin.os == builtin.Os.windows;
317	317	\\const c = @cImport({
318	318	\\ if (is_windows) {
319		\\ // See https://github.com/zig-lang/zig/issues/515
	319	\\ // See https://github.com/ziglang/zig/issues/515
320	320	\\ @cDefine("_NO_CRT_STDIO_INLINE", "1");
321	321	\\ @cInclude("io.h");
322	322	\\ @cInclude("fcntl.h");
...	...	@@ -475,7 +475,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
475	475	\\
476	476	);
477	477
478		tc.setCommandLineArgs([][]const u8 {
	478	tc.setCommandLineArgs([][]const u8{
479	479	"first arg",
480	480	"'a' 'b' \\",
481	481	"bare",
...	...	@@ -516,7 +516,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
516	516	\\
517	517	);
518	518
519		tc.setCommandLineArgs([][]const u8 {
	519	tc.setCommandLineArgs([][]const u8{
520	520	"first arg",
521	521	"'a' 'b' \\",
522	522	"bare",

test/compile_errors.zig+1514-730

...	...	@@ -1,10 +1,11 @@
1	1	const tests = @import("tests.zig");
2	2
3	3	pub fn addCases(cases: &tests.CompileErrorContext) void {
4		cases.add("invalid deref on switch target",
	4	cases.add(
	5	"invalid deref on switch target",
5	6	\\comptime {
6	7	\\ var tile = Tile.Empty;
7		\\ switch (*tile) {
	8	\\ switch (tile.*) {
8	9	\\ Tile.Empty => {},
9	10	\\ Tile.Filled => {},
10	11	\\ }
...	...	@@ -14,15 +15,19 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
14	15	\\ Filled,
15	16	\\};
16	17	,
17		".tmp_source.zig:3:13: error: invalid deref on switch target");
	18	".tmp_source.zig:3:17: error: invalid deref on switch target",
	19	);
18	20
19		cases.add("invalid field access in comptime",
	21	cases.add(
	22	"invalid field access in comptime",
20	23	\\comptime { var x = doesnt_exist.whatever; }
21	24	,
22		".tmp_source.zig:1:20: error: use of undeclared identifier 'doesnt_exist'");
	25	".tmp_source.zig:1:20: error: use of undeclared identifier 'doesnt_exist'",
	26	);
23	27
24		cases.add("suspend inside suspend block",
25		\\const std = @import("std");
	28	cases.add(
	29	"suspend inside suspend block",
	30	\\const std = @import("std",);
26	31	\\
27	32	\\export fn entry() void {
28	33	\\ var buf: [500]u8 = undefined;
...	...	@@ -39,27 +44,32 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
39	44	\\}
40	45	,
41	46	".tmp_source.zig:12:9: error: cannot suspend inside suspend block",
42		".tmp_source.zig:11:5: note: other suspend block here");
	47	".tmp_source.zig:11:5: note: other suspend block here",
	48	);
43	49
44		cases.add("assign inline fn to non-comptime var",
	50	cases.add(
	51	"assign inline fn to non-comptime var",
45	52	\\export fn entry() void {
46	53	\\ var a = b;
47	54	\\}
48	55	\\inline fn b() void { }
49	56	,
50	57	".tmp_source.zig:2:5: error: functions marked inline must be stored in const or comptime var",
51		".tmp_source.zig:4:8: note: declared here");
	58	".tmp_source.zig:4:8: note: declared here",
	59	);
52	60
53		cases.add("wrong type passed to @panic",
	61	cases.add(
	62	"wrong type passed to @panic",
54	63	\\export fn entry() void {
55	64	\\ var e = error.Foo;
56	65	\\ @panic(e);
57	66	\\}
58	67	,
59		".tmp_source.zig:3:12: error: expected type '[]const u8', found 'error{Foo}'");
	68	".tmp_source.zig:3:12: error: expected type '[]const u8', found 'error{Foo}'",
	69	);
60	70
61
62		cases.add("@tagName used on union with no associated enum tag",
	71	cases.add(
	72	"@tagName used on union with no associated enum tag",
63	73	\\const FloatInt = extern union {
64	74	\\ Float: f32,
65	75	\\ Int: i32,
...	...	@@ -70,10 +80,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
70	80	\\}
71	81	,
72	82	".tmp_source.zig:7:19: error: union has no associated enum",
73		".tmp_source.zig:1:18: note: declared here");
	83	".tmp_source.zig:1:18: note: declared here",
	84	);
74	85
75		cases.add("returning error from void async function",
76		\\const std = @import("std");
	86	cases.add(
	87	"returning error from void async function",
	88	\\const std = @import("std",);
77	89	\\export fn entry() void {
78	90	\\ const p = async<std.debug.global_allocator> amain() catch unreachable;
79	91	\\}
...	...	@@ -81,31 +93,39 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
81	93	\\ return error.ShouldBeCompileError;
82	94	\\}
83	95	,
84		".tmp_source.zig:6:17: error: expected type 'void', found 'error{ShouldBeCompileError}'");
	96	".tmp_source.zig:6:17: error: expected type 'void', found 'error{ShouldBeCompileError}'",
	97	);
85	98
86		cases.add("var not allowed in structs",
	99	cases.add(
	100	"var not allowed in structs",
87	101	\\export fn entry() void {
88	102	\\ var s = (struct{v: var}){.v=i32(10)};
89	103	\\}
90	104	,
91		".tmp_source.zig:2:23: error: invalid token: 'var'");
	105	".tmp_source.zig:2:23: error: invalid token: 'var'",
	106	);
92	107
93		cases.add("@ptrCast discards const qualifier",
	108	cases.add(
	109	"@ptrCast discards const qualifier",
94	110	\\export fn entry() void {
95	111	\\ const x: i32 = 1234;
96	112	\\ const y = @ptrCast(&i32, &x);
97	113	\\}
98	114	,
99		".tmp_source.zig:3:15: error: cast discards const qualifier");
	115	".tmp_source.zig:3:15: error: cast discards const qualifier",
	116	);
100	117
101		cases.add("comptime slice of undefined pointer non-zero len",
	118	cases.add(
	119	"comptime slice of undefined pointer non-zero len",
102	120	\\export fn entry() void {
103	121	\\ const slice = (&i32)(undefined)[0..1];
104	122	\\}
105	123	,
106		".tmp_source.zig:2:36: error: non-zero length slice of undefined pointer");
	124	".tmp_source.zig:2:36: error: non-zero length slice of undefined pointer",
	125	);
107	126
108		cases.add("type checking function pointers",
	127	cases.add(
	128	"type checking function pointers",
109	129	\\fn a(b: fn (&const u8) void) void {
110	130	\\ b('a');
111	131	\\}
...	...	@@ -116,9 +136,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
116	136	\\ a(c);
117	137	\\}
118	138	,
119		".tmp_source.zig:8:7: error: expected type 'fn(&const u8) void', found 'fn(u8) void'");
	139	".tmp_source.zig:8:7: error: expected type 'fn(&const u8) void', found 'fn(u8) void'",
	140	);
120	141
121		cases.add("no else prong on switch on global error set",
	142	cases.add(
	143	"no else prong on switch on global error set",
122	144	\\export fn entry() void {
123	145	\\ foo(error.A);
124	146	\\}
...	...	@@ -128,18 +150,22 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
128	150	\\ }
129	151	\\}
130	152	,
131		".tmp_source.zig:5:5: error: else prong required when switching on type 'error'");
	153	".tmp_source.zig:5:5: error: else prong required when switching on type 'error'",
	154	);
132	155
133		cases.add("inferred error set with no returned error",
	156	cases.add(
	157	"inferred error set with no returned error",
134	158	\\export fn entry() void {
135	159	\\ foo() catch unreachable;
136	160	\\}
137	161	\\fn foo() !void {
138	162	\\}
139	163	,
140		".tmp_source.zig:4:11: error: function with inferred error set must return at least one possible error");
	164	".tmp_source.zig:4:11: error: function with inferred error set must return at least one possible error",
	165	);
141	166
142		cases.add("error not handled in switch",
	167	cases.add(
	168	"error not handled in switch",
143	169	\\export fn entry() void {
144	170	\\ foo(452) catch \|err\| switch (err) {
145	171	\\ error.Foo => {},
...	...	@@ -155,9 +181,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
155	181	\\}
156	182	,
157	183	".tmp_source.zig:2:26: error: error.Baz not handled in switch",
158		".tmp_source.zig:2:26: error: error.Bar not handled in switch");
	184	".tmp_source.zig:2:26: error: error.Bar not handled in switch",
	185	);
159	186
160		cases.add("duplicate error in switch",
	187	cases.add(
	188	"duplicate error in switch",
161	189	\\export fn entry() void {
162	190	\\ foo(452) catch \|err\| switch (err) {
163	191	\\ error.Foo => {},
...	...	@@ -175,9 +203,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
175	203	\\}
176	204	,
177	205	".tmp_source.zig:5:14: error: duplicate switch value: '@typeOf(foo).ReturnType.ErrorSet.Foo'",
178		".tmp_source.zig:3:14: note: other value is here");
	206	".tmp_source.zig:3:14: note: other value is here",
	207	);
179	208
180		cases.add("range operator in switch used on error set",
	209	cases.add(
	210	"range operator in switch used on error set",
181	211	\\export fn entry() void {
182	212	\\ try foo(452) catch \|err\| switch (err) {
183	213	\\ error.A ... error.B => {},
...	...	@@ -192,31 +222,39 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
192	222	\\ }
193	223	\\}
194	224	,
195		".tmp_source.zig:3:17: error: operator not allowed for errors");
	225	".tmp_source.zig:3:17: error: operator not allowed for errors",
	226	);
196	227
197		cases.add("inferring error set of function pointer",
	228	cases.add(
	229	"inferring error set of function pointer",
198	230	\\comptime {
199	231	\\ const z: ?fn()!void = null;
200	232	\\}
201	233	,
202		".tmp_source.zig:2:15: error: inferring error set of return type valid only for function definitions");
	234	".tmp_source.zig:2:15: error: inferring error set of return type valid only for function definitions",
	235	);
203	236
204		cases.add("access non-existent member of error set",
	237	cases.add(
	238	"access non-existent member of error set",
205	239	\\const Foo = error{A};
206	240	\\comptime {
207	241	\\ const z = Foo.Bar;
208	242	\\}
209	243	,
210		".tmp_source.zig:3:18: error: no error named 'Bar' in 'Foo'");
	244	".tmp_source.zig:3:18: error: no error named 'Bar' in 'Foo'",
	245	);
211	246
212		cases.add("error union operator with non error set LHS",
	247	cases.add(
	248	"error union operator with non error set LHS",
213	249	\\comptime {
214	250	\\ const z = i32!i32;
215	251	\\}
216	252	,
217		".tmp_source.zig:2:15: error: expected error set type, found type 'i32'");
	253	".tmp_source.zig:2:15: error: expected error set type, found type 'i32'",
	254	);
218	255
219		cases.add("error equality but sets have no common members",
	256	cases.add(
	257	"error equality but sets have no common members",
220	258	\\const Set1 = error{A, C};
221	259	\\const Set2 = error{B, D};
222	260	\\export fn entry() void {
...	...	@@ -228,16 +266,20 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
228	266	\\ }
229	267	\\}
230	268	,
231		".tmp_source.zig:7:11: error: error sets 'Set1' and 'Set2' have no common errors");
	269	".tmp_source.zig:7:11: error: error sets 'Set1' and 'Set2' have no common errors",
	270	);
232	271
233		cases.add("only equality binary operator allowed for error sets",
	272	cases.add(
	273	"only equality binary operator allowed for error sets",
234	274	\\comptime {
235	275	\\ const z = error.A > error.B;
236	276	\\}
237	277	,
238		".tmp_source.zig:2:23: error: operator not allowed for errors");
	278	".tmp_source.zig:2:23: error: operator not allowed for errors",
	279	);
239	280
240		cases.add("explicit error set cast known at comptime violates error sets",
	281	cases.add(
	282	"explicit error set cast known at comptime violates error sets",
241	283	\\const Set1 = error {A, B};
242	284	\\const Set2 = error {A, C};
243	285	\\comptime {
...	...	@@ -245,9 +287,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
245	287	\\ var y = Set2(x);
246	288	\\}
247	289	,
248		".tmp_source.zig:5:17: error: error.B not a member of error set 'Set2'");
	290	".tmp_source.zig:5:17: error: error.B not a member of error set 'Set2'",
	291	);
249	292
250		cases.add("cast error union of global error set to error union of smaller error set",
	293	cases.add(
	294	"cast error union of global error set to error union of smaller error set",
251	295	\\const SmallErrorSet = error{A};
252	296	\\export fn entry() void {
253	297	\\ var x: SmallErrorSet!i32 = foo();
...	...	@@ -257,9 +301,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
257	301	\\}
258	302	,
259	303	".tmp_source.zig:3:35: error: expected 'SmallErrorSet!i32', found 'error!i32'",
260		".tmp_source.zig:3:35: note: unable to cast global error set into smaller set");
	304	".tmp_source.zig:3:35: note: unable to cast global error set into smaller set",
	305	);
261	306
262		cases.add("cast global error set to error set",
	307	cases.add(
	308	"cast global error set to error set",
263	309	\\const SmallErrorSet = error{A};
264	310	\\export fn entry() void {
265	311	\\ var x: SmallErrorSet = foo();
...	...	@@ -269,9 +315,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
269	315	\\}
270	316	,
271	317	".tmp_source.zig:3:31: error: expected 'SmallErrorSet', found 'error'",
272		".tmp_source.zig:3:31: note: unable to cast global error set into smaller set");
	318	".tmp_source.zig:3:31: note: unable to cast global error set into smaller set",
	319	);
273	320
274		cases.add("recursive inferred error set",
	321	cases.add(
	322	"recursive inferred error set",
275	323	\\export fn entry() void {
276	324	\\ foo() catch unreachable;
277	325	\\}
...	...	@@ -279,9 +327,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
279	327	\\ try foo();
280	328	\\}
281	329	,
282		".tmp_source.zig:5:5: error: cannot resolve inferred error set '@typeOf(foo).ReturnType.ErrorSet': function 'foo' not fully analyzed yet");
	330	".tmp_source.zig:5:5: error: cannot resolve inferred error set '@typeOf(foo).ReturnType.ErrorSet': function 'foo' not fully analyzed yet",
	331	);
283	332
284		cases.add("implicit cast of error set not a subset",
	333	cases.add(
	334	"implicit cast of error set not a subset",
285	335	\\const Set1 = error{A, B};
286	336	\\const Set2 = error{A, C};
287	337	\\export fn entry() void {
...	...	@@ -292,18 +342,22 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
292	342	\\}
293	343	,
294	344	".tmp_source.zig:7:19: error: expected 'Set2', found 'Set1'",
295		".tmp_source.zig:1:23: note: 'error.B' not a member of destination error set");
	345	".tmp_source.zig:1:23: note: 'error.B' not a member of destination error set",
	346	);
296	347
297		cases.add("int to err global invalid number",
	348	cases.add(
	349	"int to err global invalid number",
298	350	\\const Set1 = error{A, B};
299	351	\\comptime {
300	352	\\ var x: usize = 3;
301	353	\\ var y = error(x);
302	354	\\}
303	355	,
304		".tmp_source.zig:4:18: error: integer value 3 represents no error");
	356	".tmp_source.zig:4:18: error: integer value 3 represents no error",
	357	);
305	358
306		cases.add("int to err non global invalid number",
	359	cases.add(
	360	"int to err non global invalid number",
307	361	\\const Set1 = error{A, B};
308	362	\\const Set2 = error{A, C};
309	363	\\comptime {
...	...	@@ -311,16 +365,20 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
311	365	\\ var y = Set2(x);
312	366	\\}
313	367	,
314		".tmp_source.zig:5:17: error: integer value 2 represents no error in 'Set2'");
	368	".tmp_source.zig:5:17: error: integer value 2 represents no error in 'Set2'",
	369	);
315	370
316		cases.add("@memberCount of error",
	371	cases.add(
	372	"@memberCount of error",
317	373	\\comptime {
318	374	\\ _ = @memberCount(error);
319	375	\\}
320	376	,
321		".tmp_source.zig:2:9: error: global error set member count not available at comptime");
	377	".tmp_source.zig:2:9: error: global error set member count not available at comptime",
	378	);
322	379
323		cases.add("duplicate error value in error set",
	380	cases.add(
	381	"duplicate error value in error set",
324	382	\\const Foo = error {
325	383	\\ Bar,
326	384	\\ Bar,
...	...	@@ -330,22 +388,30 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
330	388	\\}
331	389	,
332	390	".tmp_source.zig:3:5: error: duplicate error: 'Bar'",
333		".tmp_source.zig:2:5: note: other error here");
	391	".tmp_source.zig:2:5: note: other error here",
	392	);
334	393
335		cases.add("cast negative integer literal to usize",
	394	cases.add(
	395	"cast negative integer literal to usize",
336	396	\\export fn entry() void {
337	397	\\ const x = usize(-10);
338	398	\\}
339		, ".tmp_source.zig:2:21: error: cannot cast negative value -10 to unsigned integer type 'usize'");
	399	,
	400	".tmp_source.zig:2:21: error: cannot cast negative value -10 to unsigned integer type 'usize'",
	401	);
340	402
341		cases.add("use invalid number literal as array index",
	403	cases.add(
	404	"use invalid number literal as array index",
342	405	\\var v = 25;
343	406	\\export fn entry() void {
344	407	\\ var arr: [v]u8 = undefined;
345	408	\\}
346		, ".tmp_source.zig:1:1: error: unable to infer variable type");
	409	,
	410	".tmp_source.zig:1:1: error: unable to infer variable type",
	411	);
347	412
348		cases.add("duplicate struct field",
	413	cases.add(
	414	"duplicate struct field",
349	415	\\const Foo = struct {
350	416	\\ Bar: i32,
351	417	\\ Bar: usize,
...	...	@@ -355,9 +421,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
355	421	\\}
356	422	,
357	423	".tmp_source.zig:3:5: error: duplicate struct field: 'Bar'",
358		".tmp_source.zig:2:5: note: other field here");
	424	".tmp_source.zig:2:5: note: other field here",
	425	);
359	426
360		cases.add("duplicate union field",
	427	cases.add(
	428	"duplicate union field",
361	429	\\const Foo = union {
362	430	\\ Bar: i32,
363	431	\\ Bar: usize,
...	...	@@ -367,9 +435,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
367	435	\\}
368	436	,
369	437	".tmp_source.zig:3:5: error: duplicate union field: 'Bar'",
370		".tmp_source.zig:2:5: note: other field here");
	438	".tmp_source.zig:2:5: note: other field here",
	439	);
371	440
372		cases.add("duplicate enum field",
	441	cases.add(
	442	"duplicate enum field",
373	443	\\const Foo = enum {
374	444	\\ Bar,
375	445	\\ Bar,
...	...	@@ -380,77 +450,108 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
380	450	\\}
381	451	,
382	452	".tmp_source.zig:3:5: error: duplicate enum field: 'Bar'",
383		".tmp_source.zig:2:5: note: other field here");
	453	".tmp_source.zig:2:5: note: other field here",
	454	);
384	455
385		cases.add("calling function with naked calling convention",
	456	cases.add(
	457	"calling function with naked calling convention",
386	458	\\export fn entry() void {
387	459	\\ foo();
388	460	\\}
389	461	\\nakedcc fn foo() void { }
390	462	,
391	463	".tmp_source.zig:2:5: error: unable to call function with naked calling convention",
392		".tmp_source.zig:4:9: note: declared here");
	464	".tmp_source.zig:4:9: note: declared here",
	465	);
393	466
394		cases.add("function with invalid return type",
	467	cases.add(
	468	"function with invalid return type",
395	469	\\export fn foo() boid {}
396		, ".tmp_source.zig:1:17: error: use of undeclared identifier 'boid'");
	470	,
	471	".tmp_source.zig:1:17: error: use of undeclared identifier 'boid'",
	472	);
397	473
398		cases.add("function with non-extern non-packed enum parameter",
	474	cases.add(
	475	"function with non-extern non-packed enum parameter",
399	476	\\const Foo = enum { A, B, C };
400	477	\\export fn entry(foo: Foo) void { }
401		, ".tmp_source.zig:2:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'");
	478	,
	479	".tmp_source.zig:2:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
	480	);
402	481
403		cases.add("function with non-extern non-packed struct parameter",
	482	cases.add(
	483	"function with non-extern non-packed struct parameter",
404	484	\\const Foo = struct {
405	485	\\ A: i32,
406	486	\\ B: f32,
407	487	\\ C: bool,
408	488	\\};
409	489	\\export fn entry(foo: Foo) void { }
410		, ".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'");
	490	,
	491	".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
	492	);
411	493
412		cases.add("function with non-extern non-packed union parameter",
	494	cases.add(
	495	"function with non-extern non-packed union parameter",
413	496	\\const Foo = union {
414	497	\\ A: i32,
415	498	\\ B: f32,
416	499	\\ C: bool,
417	500	\\};
418	501	\\export fn entry(foo: Foo) void { }
419		, ".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'");
	502	,
	503	".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'",
	504	);
420	505
421		cases.add("switch on enum with 1 field with no prongs",
	506	cases.add(
	507	"switch on enum with 1 field with no prongs",
422	508	\\const Foo = enum { M };
423	509	\\
424	510	\\export fn entry() void {
425	511	\\ var f = Foo.M;
426	512	\\ switch (f) {}
427	513	\\}
428		, ".tmp_source.zig:5:5: error: enumeration value 'Foo.M' not handled in switch");
	514	,
	515	".tmp_source.zig:5:5: error: enumeration value 'Foo.M' not handled in switch",
	516	);
429	517
430		cases.add("shift by negative comptime integer",
	518	cases.add(
	519	"shift by negative comptime integer",
431	520	\\comptime {
432	521	\\ var a = 1 >> -1;
433	522	\\}
434		, ".tmp_source.zig:2:18: error: shift by negative value -1");
	523	,
	524	".tmp_source.zig:2:18: error: shift by negative value -1",
	525	);
435	526
436		cases.add("@panic called at compile time",
	527	cases.add(
	528	"@panic called at compile time",
437	529	\\export fn entry() void {
438	530	\\ comptime {
439		\\ @panic("aoeu");
	531	\\ @panic("aoeu",);
440	532	\\ }
441	533	\\}
442		, ".tmp_source.zig:3:9: error: encountered @panic at compile-time");
	534	,
	535	".tmp_source.zig:3:9: error: encountered @panic at compile-time",
	536	);
443	537
444		cases.add("wrong return type for main",
	538	cases.add(
	539	"wrong return type for main",
445	540	\\pub fn main() f32 { }
446		, "error: expected return type of main to be 'u8', 'noreturn', 'void', or '!void'");
	541	,
	542	"error: expected return type of main to be 'u8', 'noreturn', 'void', or '!void'",
	543	);
447	544
448		cases.add("double ?? on main return value",
	545	cases.add(
	546	"double ?? on main return value",
449	547	\\pub fn main() ??void {
450	548	\\}
451		, "error: expected return type of main to be 'u8', 'noreturn', 'void', or '!void'");
	549	,
	550	"error: expected return type of main to be 'u8', 'noreturn', 'void', or '!void'",
	551	);
452	552
453		cases.add("bad identifier in function with struct defined inside function which references local const",
	553	cases.add(
	554	"bad identifier in function with struct defined inside function which references local const",
454	555	\\export fn entry() void {
455	556	\\ const BlockKind = u32;
456	557	\\
...	...	@@ -460,9 +561,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
460	561	\\
461	562	\\ bogus;
462	563	\\}
463		, ".tmp_source.zig:8:5: error: use of undeclared identifier 'bogus'");
	564	,
	565	".tmp_source.zig:8:5: error: use of undeclared identifier 'bogus'",
	566	);
464	567
465		cases.add("labeled break not found",
	568	cases.add(
	569	"labeled break not found",
466	570	\\export fn entry() void {
467	571	\\ blah: while (true) {
468	572	\\ while (true) {
...	...	@@ -470,9 +574,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
470	574	\\ }
471	575	\\ }
472	576	\\}
473		, ".tmp_source.zig:4:13: error: label not found: 'outer'");
	577	,
	578	".tmp_source.zig:4:13: error: label not found: 'outer'",
	579	);
474	580
475		cases.add("labeled continue not found",
	581	cases.add(
	582	"labeled continue not found",
476	583	\\export fn entry() void {
477	584	\\ var i: usize = 0;
478	585	\\ blah: while (i < 10) : (i += 1) {
...	...	@@ -481,9 +588,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
481	588	\\ }
482	589	\\ }
483	590	\\}
484		, ".tmp_source.zig:5:13: error: labeled loop not found: 'outer'");
	591	,
	592	".tmp_source.zig:5:13: error: labeled loop not found: 'outer'",
	593	);
485	594
486		cases.add("attempt to use 0 bit type in extern fn",
	595	cases.add(
	596	"attempt to use 0 bit type in extern fn",
487	597	\\extern fn foo(ptr: extern fn(&void) void) void;
488	598	\\
489	599	\\export fn entry() void {
...	...	@@ -491,390 +601,541 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
491	601	\\}
492	602	\\
493	603	\\extern fn bar(x: &void) void { }
494		, ".tmp_source.zig:7:18: error: parameter of type '&void' has 0 bits; not allowed in function with calling convention 'ccc'");
	604	,
	605	".tmp_source.zig:7:18: error: parameter of type '&void' has 0 bits; not allowed in function with calling convention 'ccc'",
	606	);
495	607
496		cases.add("implicit semicolon - block statement",
	608	cases.add(
	609	"implicit semicolon - block statement",
497	610	\\export fn entry() void {
498	611	\\ {}
499	612	\\ var good = {};
500	613	\\ ({})
501	614	\\ var bad = {};
502	615	\\}
503		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	616	,
	617	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	618	);
504	619
505		cases.add("implicit semicolon - block expr",
	620	cases.add(
	621	"implicit semicolon - block expr",
506	622	\\export fn entry() void {
507	623	\\ _ = {};
508	624	\\ var good = {};
509	625	\\ _ = {}
510	626	\\ var bad = {};
511	627	\\}
512		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	628	,
	629	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	630	);
513	631
514		cases.add("implicit semicolon - comptime statement",
	632	cases.add(
	633	"implicit semicolon - comptime statement",
515	634	\\export fn entry() void {
516	635	\\ comptime {}
517	636	\\ var good = {};
518	637	\\ comptime ({})
519	638	\\ var bad = {};
520	639	\\}
521		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	640	,
	641	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	642	);
522	643
523		cases.add("implicit semicolon - comptime expression",
	644	cases.add(
	645	"implicit semicolon - comptime expression",
524	646	\\export fn entry() void {
525	647	\\ _ = comptime {};
526	648	\\ var good = {};
527	649	\\ _ = comptime {}
528	650	\\ var bad = {};
529	651	\\}
530		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	652	,
	653	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	654	);
531	655
532		cases.add("implicit semicolon - defer",
	656	cases.add(
	657	"implicit semicolon - defer",
533	658	\\export fn entry() void {
534	659	\\ defer {}
535	660	\\ var good = {};
536	661	\\ defer ({})
537	662	\\ var bad = {};
538	663	\\}
539		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	664	,
	665	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	666	);
540	667
541		cases.add("implicit semicolon - if statement",
	668	cases.add(
	669	"implicit semicolon - if statement",
542	670	\\export fn entry() void {
543	671	\\ if(true) {}
544	672	\\ var good = {};
545	673	\\ if(true) ({})
546	674	\\ var bad = {};
547	675	\\}
548		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	676	,
	677	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	678	);
549	679
550		cases.add("implicit semicolon - if expression",
	680	cases.add(
	681	"implicit semicolon - if expression",
551	682	\\export fn entry() void {
552	683	\\ _ = if(true) {};
553	684	\\ var good = {};
554	685	\\ _ = if(true) {}
555	686	\\ var bad = {};
556	687	\\}
557		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	688	,
	689	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	690	);
558	691
559		cases.add("implicit semicolon - if-else statement",
	692	cases.add(
	693	"implicit semicolon - if-else statement",
560	694	\\export fn entry() void {
561	695	\\ if(true) {} else {}
562	696	\\ var good = {};
563	697	\\ if(true) ({}) else ({})
564	698	\\ var bad = {};
565	699	\\}
566		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	700	,
	701	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	702	);
567	703
568		cases.add("implicit semicolon - if-else expression",
	704	cases.add(
	705	"implicit semicolon - if-else expression",
569	706	\\export fn entry() void {
570	707	\\ _ = if(true) {} else {};
571	708	\\ var good = {};
572	709	\\ _ = if(true) {} else {}
573	710	\\ var bad = {};
574	711	\\}
575		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	712	,
	713	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	714	);
576	715
577		cases.add("implicit semicolon - if-else-if statement",
	716	cases.add(
	717	"implicit semicolon - if-else-if statement",
578	718	\\export fn entry() void {
579	719	\\ if(true) {} else if(true) {}
580	720	\\ var good = {};
581	721	\\ if(true) ({}) else if(true) ({})
582	722	\\ var bad = {};
583	723	\\}
584		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	724	,
	725	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	726	);
585	727
586		cases.add("implicit semicolon - if-else-if expression",
	728	cases.add(
	729	"implicit semicolon - if-else-if expression",
587	730	\\export fn entry() void {
588	731	\\ _ = if(true) {} else if(true) {};
589	732	\\ var good = {};
590	733	\\ _ = if(true) {} else if(true) {}
591	734	\\ var bad = {};
592	735	\\}
593		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	736	,
	737	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	738	);
594	739
595		cases.add("implicit semicolon - if-else-if-else statement",
	740	cases.add(
	741	"implicit semicolon - if-else-if-else statement",
596	742	\\export fn entry() void {
597	743	\\ if(true) {} else if(true) {} else {}
598	744	\\ var good = {};
599	745	\\ if(true) ({}) else if(true) ({}) else ({})
600	746	\\ var bad = {};
601	747	\\}
602		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	748	,
	749	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	750	);
603	751
604		cases.add("implicit semicolon - if-else-if-else expression",
	752	cases.add(
	753	"implicit semicolon - if-else-if-else expression",
605	754	\\export fn entry() void {
606	755	\\ _ = if(true) {} else if(true) {} else {};
607	756	\\ var good = {};
608	757	\\ _ = if(true) {} else if(true) {} else {}
609	758	\\ var bad = {};
610	759	\\}
611		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	760	,
	761	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	762	);
612	763
613		cases.add("implicit semicolon - test statement",
	764	cases.add(
	765	"implicit semicolon - test statement",
614	766	\\export fn entry() void {
615	767	\\ if (foo()) \|_\| {}
616	768	\\ var good = {};
617	769	\\ if (foo()) \|_\| ({})
618	770	\\ var bad = {};
619	771	\\}
620		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	772	,
	773	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	774	);
621	775
622		cases.add("implicit semicolon - test expression",
	776	cases.add(
	777	"implicit semicolon - test expression",
623	778	\\export fn entry() void {
624	779	\\ _ = if (foo()) \|_\| {};
625	780	\\ var good = {};
626	781	\\ _ = if (foo()) \|_\| {}
627	782	\\ var bad = {};
628	783	\\}
629		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	784	,
	785	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	786	);
630	787
631		cases.add("implicit semicolon - while statement",
	788	cases.add(
	789	"implicit semicolon - while statement",
632	790	\\export fn entry() void {
633	791	\\ while(true) {}
634	792	\\ var good = {};
635	793	\\ while(true) ({})
636	794	\\ var bad = {};
637	795	\\}
638		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	796	,
	797	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	798	);
639	799
640		cases.add("implicit semicolon - while expression",
	800	cases.add(
	801	"implicit semicolon - while expression",
641	802	\\export fn entry() void {
642	803	\\ _ = while(true) {};
643	804	\\ var good = {};
644	805	\\ _ = while(true) {}
645	806	\\ var bad = {};
646	807	\\}
647		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	808	,
	809	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	810	);
648	811
649		cases.add("implicit semicolon - while-continue statement",
	812	cases.add(
	813	"implicit semicolon - while-continue statement",
650	814	\\export fn entry() void {
651	815	\\ while(true):({}) {}
652	816	\\ var good = {};
653	817	\\ while(true):({}) ({})
654	818	\\ var bad = {};
655	819	\\}
656		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	820	,
	821	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	822	);
657	823
658		cases.add("implicit semicolon - while-continue expression",
	824	cases.add(
	825	"implicit semicolon - while-continue expression",
659	826	\\export fn entry() void {
660	827	\\ _ = while(true):({}) {};
661	828	\\ var good = {};
662	829	\\ _ = while(true):({}) {}
663	830	\\ var bad = {};
664	831	\\}
665		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	832	,
	833	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	834	);
666	835
667		cases.add("implicit semicolon - for statement",
	836	cases.add(
	837	"implicit semicolon - for statement",
668	838	\\export fn entry() void {
669	839	\\ for(foo()) {}
670	840	\\ var good = {};
671	841	\\ for(foo()) ({})
672	842	\\ var bad = {};
673	843	\\}
674		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	844	,
	845	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	846	);
675	847
676		cases.add("implicit semicolon - for expression",
	848	cases.add(
	849	"implicit semicolon - for expression",
677	850	\\export fn entry() void {
678	851	\\ _ = for(foo()) {};
679	852	\\ var good = {};
680	853	\\ _ = for(foo()) {}
681	854	\\ var bad = {};
682	855	\\}
683		, ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
	856	,
	857	".tmp_source.zig:5:5: error: expected token ';', found 'var'",
	858	);
684	859
685		cases.add("multiple function definitions",
	860	cases.add(
	861	"multiple function definitions",
686	862	\\fn a() void {}
687	863	\\fn a() void {}
688	864	\\export fn entry() void { a(); }
689		, ".tmp_source.zig:2:1: error: redefinition of 'a'");
	865	,
	866	".tmp_source.zig:2:1: error: redefinition of 'a'",
	867	);
690	868
691		cases.add("unreachable with return",
	869	cases.add(
	870	"unreachable with return",
692	871	\\fn a() noreturn {return;}
693	872	\\export fn entry() void { a(); }
694		, ".tmp_source.zig:1:18: error: expected type 'noreturn', found 'void'");
	873	,
	874	".tmp_source.zig:1:18: error: expected type 'noreturn', found 'void'",
	875	);
695	876
696		cases.add("control reaches end of non-void function",
	877	cases.add(
	878	"control reaches end of non-void function",
697	879	\\fn a() i32 {}
698	880	\\export fn entry() void { _ = a(); }
699		, ".tmp_source.zig:1:12: error: expected type 'i32', found 'void'");
	881	,
	882	".tmp_source.zig:1:12: error: expected type 'i32', found 'void'",
	883	);
700	884
701		cases.add("undefined function call",
	885	cases.add(
	886	"undefined function call",
702	887	\\export fn a() void {
703	888	\\ b();
704	889	\\}
705		, ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'");
	890	,
	891	".tmp_source.zig:2:5: error: use of undeclared identifier 'b'",
	892	);
706	893
707		cases.add("wrong number of arguments",
	894	cases.add(
	895	"wrong number of arguments",
708	896	\\export fn a() void {
709	897	\\ b(1);
710	898	\\}
711	899	\\fn b(a: i32, b: i32, c: i32) void { }
712		, ".tmp_source.zig:2:6: error: expected 3 arguments, found 1");
	900	,
	901	".tmp_source.zig:2:6: error: expected 3 arguments, found 1",
	902	);
713	903
714		cases.add("invalid type",
	904	cases.add(
	905	"invalid type",
715	906	\\fn a() bogus {}
716	907	\\export fn entry() void { _ = a(); }
717		, ".tmp_source.zig:1:8: error: use of undeclared identifier 'bogus'");
	908	,
	909	".tmp_source.zig:1:8: error: use of undeclared identifier 'bogus'",
	910	);
718	911
719		cases.add("pointer to noreturn",
	912	cases.add(
	913	"pointer to noreturn",
720	914	\\fn a() &noreturn {}
721	915	\\export fn entry() void { _ = a(); }
722		, ".tmp_source.zig:1:9: error: pointer to noreturn not allowed");
	916	,
	917	".tmp_source.zig:1:9: error: pointer to noreturn not allowed",
	918	);
723	919
724		cases.add("unreachable code",
	920	cases.add(
	921	"unreachable code",
725	922	\\export fn a() void {
726	923	\\ return;
727	924	\\ b();
728	925	\\}
729	926	\\
730	927	\\fn b() void {}
731		, ".tmp_source.zig:3:5: error: unreachable code");
	928	,
	929	".tmp_source.zig:3:5: error: unreachable code",
	930	);
732	931
733		cases.add("bad import",
734		\\const bogus = @import("bogus-does-not-exist.zig");
	932	cases.add(
	933	"bad import",
	934	\\const bogus = @import("bogus-does-not-exist.zig",);
735	935	\\export fn entry() void { bogus.bogo(); }
736		, ".tmp_source.zig:1:15: error: unable to find 'bogus-does-not-exist.zig'");
	936	,
	937	".tmp_source.zig:1:15: error: unable to find 'bogus-does-not-exist.zig'",
	938	);
737	939
738		cases.add("undeclared identifier",
	940	cases.add(
	941	"undeclared identifier",
739	942	\\export fn a() void {
740	943	\\ return
741	944	\\ b +
742	945	\\ c;
743	946	\\}
744	947	,
745		".tmp_source.zig:3:5: error: use of undeclared identifier 'b'",
746		".tmp_source.zig:4:5: error: use of undeclared identifier 'c'");
	948	".tmp_source.zig:3:5: error: use of undeclared identifier 'b'",
	949	".tmp_source.zig:4:5: error: use of undeclared identifier 'c'",
	950	);
747	951
748		cases.add("parameter redeclaration",
	952	cases.add(
	953	"parameter redeclaration",
749	954	\\fn f(a : i32, a : i32) void {
750	955	\\}
751	956	\\export fn entry() void { f(1, 2); }
752		, ".tmp_source.zig:1:15: error: redeclaration of variable 'a'");
	957	,
	958	".tmp_source.zig:1:15: error: redeclaration of variable 'a'",
	959	);
753	960
754		cases.add("local variable redeclaration",
	961	cases.add(
	962	"local variable redeclaration",
755	963	\\export fn f() void {
756	964	\\ const a : i32 = 0;
757	965	\\ const a = 0;
758	966	\\}
759		, ".tmp_source.zig:3:5: error: redeclaration of variable 'a'");
	967	,
	968	".tmp_source.zig:3:5: error: redeclaration of variable 'a'",
	969	);
760	970
761		cases.add("local variable redeclares parameter",
	971	cases.add(
	972	"local variable redeclares parameter",
762	973	\\fn f(a : i32) void {
763	974	\\ const a = 0;
764	975	\\}
765	976	\\export fn entry() void { f(1); }
766		, ".tmp_source.zig:2:5: error: redeclaration of variable 'a'");
	977	,
	978	".tmp_source.zig:2:5: error: redeclaration of variable 'a'",
	979	);
767	980
768		cases.add("variable has wrong type",
	981	cases.add(
	982	"variable has wrong type",
769	983	\\export fn f() i32 {
770	984	\\ const a = c"a";
771	985	\\ return a;
772	986	\\}
773		, ".tmp_source.zig:3:12: error: expected type 'i32', found '&const u8'");
	987	,
	988	".tmp_source.zig:3:12: error: expected type 'i32', found '&const u8'",
	989	);
774	990
775		cases.add("if condition is bool, not int",
	991	cases.add(
	992	"if condition is bool, not int",
776	993	\\export fn f() void {
777	994	\\ if (0) {}
778	995	\\}
779		, ".tmp_source.zig:2:9: error: integer value 0 cannot be implicitly casted to type 'bool'");
	996	,
	997	".tmp_source.zig:2:9: error: integer value 0 cannot be implicitly casted to type 'bool'",
	998	);
780	999
781		cases.add("assign unreachable",
	1000	cases.add(
	1001	"assign unreachable",
782	1002	\\export fn f() void {
783	1003	\\ const a = return;
784	1004	\\}
785		, ".tmp_source.zig:2:5: error: unreachable code");
	1005	,
	1006	".tmp_source.zig:2:5: error: unreachable code",
	1007	);
786	1008
787		cases.add("unreachable variable",
	1009	cases.add(
	1010	"unreachable variable",
788	1011	\\export fn f() void {
789	1012	\\ const a: noreturn = {};
790	1013	\\}
791		, ".tmp_source.zig:2:14: error: variable of type 'noreturn' not allowed");
	1014	,
	1015	".tmp_source.zig:2:14: error: variable of type 'noreturn' not allowed",
	1016	);
792	1017
793		cases.add("unreachable parameter",
	1018	cases.add(
	1019	"unreachable parameter",
794	1020	\\fn f(a: noreturn) void {}
795	1021	\\export fn entry() void { f(); }
796		, ".tmp_source.zig:1:9: error: parameter of type 'noreturn' not allowed");
	1022	,
	1023	".tmp_source.zig:1:9: error: parameter of type 'noreturn' not allowed",
	1024	);
797	1025
798		cases.add("bad assignment target",
	1026	cases.add(
	1027	"bad assignment target",
799	1028	\\export fn f() void {
800	1029	\\ 3 = 3;
801	1030	\\}
802		, ".tmp_source.zig:2:7: error: cannot assign to constant");
	1031	,
	1032	".tmp_source.zig:2:7: error: cannot assign to constant",
	1033	);
803	1034
804		cases.add("assign to constant variable",
	1035	cases.add(
	1036	"assign to constant variable",
805	1037	\\export fn f() void {
806	1038	\\ const a = 3;
807	1039	\\ a = 4;
808	1040	\\}
809		, ".tmp_source.zig:3:7: error: cannot assign to constant");
	1041	,
	1042	".tmp_source.zig:3:7: error: cannot assign to constant",
	1043	);
810	1044
811		cases.add("use of undeclared identifier",
	1045	cases.add(
	1046	"use of undeclared identifier",
812	1047	\\export fn f() void {
813	1048	\\ b = 3;
814	1049	\\}
815		, ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'");
	1050	,
	1051	".tmp_source.zig:2:5: error: use of undeclared identifier 'b'",
	1052	);
816	1053
817		cases.add("const is a statement, not an expression",
	1054	cases.add(
	1055	"const is a statement, not an expression",
818	1056	\\export fn f() void {
819	1057	\\ (const a = 0);
820	1058	\\}
821		, ".tmp_source.zig:2:6: error: invalid token: 'const'");
	1059	,
	1060	".tmp_source.zig:2:6: error: invalid token: 'const'",
	1061	);
822	1062
823		cases.add("array access of undeclared identifier",
	1063	cases.add(
	1064	"array access of undeclared identifier",
824	1065	\\export fn f() void {
825	1066	\\ i[i] = i[i];
826	1067	\\}
827		, ".tmp_source.zig:2:5: error: use of undeclared identifier 'i'",
828		".tmp_source.zig:2:12: error: use of undeclared identifier 'i'");
	1068	,
	1069	".tmp_source.zig:2:5: error: use of undeclared identifier 'i'",
	1070	".tmp_source.zig:2:12: error: use of undeclared identifier 'i'",
	1071	);
829	1072
830		cases.add("array access of non array",
	1073	cases.add(
	1074	"array access of non array",
831	1075	\\export fn f() void {
832	1076	\\ var bad : bool = undefined;
833	1077	\\ bad[bad] = bad[bad];
834	1078	\\}
835		, ".tmp_source.zig:3:8: error: array access of non-array type 'bool'",
836		".tmp_source.zig:3:19: error: array access of non-array type 'bool'");
	1079	,
	1080	".tmp_source.zig:3:8: error: array access of non-array type 'bool'",
	1081	".tmp_source.zig:3:19: error: array access of non-array type 'bool'",
	1082	);
837	1083
838		cases.add("array access with non integer index",
	1084	cases.add(
	1085	"array access with non integer index",
839	1086	\\export fn f() void {
840	1087	\\ var array = "aoeu";
841	1088	\\ var bad = false;
842	1089	\\ array[bad] = array[bad];
843	1090	\\}
844		, ".tmp_source.zig:4:11: error: expected type 'usize', found 'bool'",
845		".tmp_source.zig:4:24: error: expected type 'usize', found 'bool'");
	1091	,
	1092	".tmp_source.zig:4:11: error: expected type 'usize', found 'bool'",
	1093	".tmp_source.zig:4:24: error: expected type 'usize', found 'bool'",
	1094	);
846	1095
847		cases.add("write to const global variable",
	1096	cases.add(
	1097	"write to const global variable",
848	1098	\\const x : i32 = 99;
849	1099	\\fn f() void {
850	1100	\\ x = 1;
851	1101	\\}
852	1102	\\export fn entry() void { f(); }
853		, ".tmp_source.zig:3:7: error: cannot assign to constant");
854
	1103	,
	1104	".tmp_source.zig:3:7: error: cannot assign to constant",
	1105	);
855	1106
856		cases.add("missing else clause",
	1107	cases.add(
	1108	"missing else clause",
857	1109	\\fn f(b: bool) void {
858	1110	\\ const x : i32 = if (b) h: { break :h 1; };
859	1111	\\ const y = if (b) h: { break :h i32(1); };
860	1112	\\}
861	1113	\\export fn entry() void { f(true); }
862		, ".tmp_source.zig:2:42: error: integer value 1 cannot be implicitly casted to type 'void'",
863		".tmp_source.zig:3:15: error: incompatible types: 'i32' and 'void'");
	1114	,
	1115	".tmp_source.zig:2:42: error: integer value 1 cannot be implicitly casted to type 'void'",
	1116	".tmp_source.zig:3:15: error: incompatible types: 'i32' and 'void'",
	1117	);
864	1118
865		cases.add("direct struct loop",
	1119	cases.add(
	1120	"direct struct loop",
866	1121	\\const A = struct { a : A, };
867	1122	\\export fn entry() usize { return @sizeOf(A); }
868		, ".tmp_source.zig:1:11: error: struct 'A' contains itself");
	1123	,
	1124	".tmp_source.zig:1:11: error: struct 'A' contains itself",
	1125	);
869	1126
870		cases.add("indirect struct loop",
	1127	cases.add(
	1128	"indirect struct loop",
871	1129	\\const A = struct { b : B, };
872	1130	\\const B = struct { c : C, };
873	1131	\\const C = struct { a : A, };
874	1132	\\export fn entry() usize { return @sizeOf(A); }
875		, ".tmp_source.zig:1:11: error: struct 'A' contains itself");
	1133	,
	1134	".tmp_source.zig:1:11: error: struct 'A' contains itself",
	1135	);
876	1136
877		cases.add("invalid struct field",
	1137	cases.add(
	1138	"invalid struct field",
878	1139	\\const A = struct { x : i32, };
879	1140	\\export fn f() void {
880	1141	\\ var a : A = undefined;
...	...	@@ -882,27 +1143,37 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
882	1143	\\ const y = a.bar;
883	1144	\\}
884	1145	,
885		".tmp_source.zig:4:6: error: no member named 'foo' in struct 'A'",
886		".tmp_source.zig:5:16: error: no member named 'bar' in struct 'A'");
	1146	".tmp_source.zig:4:6: error: no member named 'foo' in struct 'A'",
	1147	".tmp_source.zig:5:16: error: no member named 'bar' in struct 'A'",
	1148	);
887	1149
888		cases.add("redefinition of struct",
	1150	cases.add(
	1151	"redefinition of struct",
889	1152	\\const A = struct { x : i32, };
890	1153	\\const A = struct { y : i32, };
891		, ".tmp_source.zig:2:1: error: redefinition of 'A'");
	1154	,
	1155	".tmp_source.zig:2:1: error: redefinition of 'A'",
	1156	);
892	1157
893		cases.add("redefinition of enums",
	1158	cases.add(
	1159	"redefinition of enums",
894	1160	\\const A = enum {};
895	1161	\\const A = enum {};
896		, ".tmp_source.zig:2:1: error: redefinition of 'A'");
	1162	,
	1163	".tmp_source.zig:2:1: error: redefinition of 'A'",
	1164	);
897	1165
898		cases.add("redefinition of global variables",
	1166	cases.add(
	1167	"redefinition of global variables",
899	1168	\\var a : i32 = 1;
900	1169	\\var a : i32 = 2;
901	1170	,
902		".tmp_source.zig:2:1: error: redefinition of 'a'",
903		".tmp_source.zig:1:1: note: previous definition is here");
	1171	".tmp_source.zig:2:1: error: redefinition of 'a'",
	1172	".tmp_source.zig:1:1: note: previous definition is here",
	1173	);
904	1174
905		cases.add("duplicate field in struct value expression",
	1175	cases.add(
	1176	"duplicate field in struct value expression",
906	1177	\\const A = struct {
907	1178	\\ x : i32,
908	1179	\\ y : i32,
...	...	@@ -916,9 +1187,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
916	1187	\\ .z = 4,
917	1188	\\ };
918	1189	\\}
919		, ".tmp_source.zig:11:9: error: duplicate field");
	1190	,
	1191	".tmp_source.zig:11:9: error: duplicate field",
	1192	);
920	1193
921		cases.add("missing field in struct value expression",
	1194	cases.add(
	1195	"missing field in struct value expression",
922	1196	\\const A = struct {
923	1197	\\ x : i32,
924	1198	\\ y : i32,
...	...	@@ -932,9 +1206,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
932	1206	\\ .y = 2,
933	1207	\\ };
934	1208	\\}
935		, ".tmp_source.zig:9:17: error: missing field: 'x'");
	1209	,
	1210	".tmp_source.zig:9:17: error: missing field: 'x'",
	1211	);
936	1212
937		cases.add("invalid field in struct value expression",
	1213	cases.add(
	1214	"invalid field in struct value expression",
938	1215	\\const A = struct {
939	1216	\\ x : i32,
940	1217	\\ y : i32,
...	...	@@ -947,66 +1224,95 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
947	1224	\\ .foo = 42,
948	1225	\\ };
949	1226	\\}
950		, ".tmp_source.zig:10:9: error: no member named 'foo' in struct 'A'");
	1227	,
	1228	".tmp_source.zig:10:9: error: no member named 'foo' in struct 'A'",
	1229	);
951	1230
952		cases.add("invalid break expression",
	1231	cases.add(
	1232	"invalid break expression",
953	1233	\\export fn f() void {
954	1234	\\ break;
955	1235	\\}
956		, ".tmp_source.zig:2:5: error: break expression outside loop");
	1236	,
	1237	".tmp_source.zig:2:5: error: break expression outside loop",
	1238	);
957	1239
958		cases.add("invalid continue expression",
	1240	cases.add(
	1241	"invalid continue expression",
959	1242	\\export fn f() void {
960	1243	\\ continue;
961	1244	\\}
962		, ".tmp_source.zig:2:5: error: continue expression outside loop");
	1245	,
	1246	".tmp_source.zig:2:5: error: continue expression outside loop",
	1247	);
963	1248
964		cases.add("invalid maybe type",
	1249	cases.add(
	1250	"invalid maybe type",
965	1251	\\export fn f() void {
966	1252	\\ if (true) \|x\| { }
967	1253	\\}
968		, ".tmp_source.zig:2:9: error: expected nullable type, found 'bool'");
	1254	,
	1255	".tmp_source.zig:2:9: error: expected nullable type, found 'bool'",
	1256	);
969	1257
970		cases.add("cast unreachable",
	1258	cases.add(
	1259	"cast unreachable",
971	1260	\\fn f() i32 {
972	1261	\\ return i32(return 1);
973	1262	\\}
974	1263	\\export fn entry() void { _ = f(); }
975		, ".tmp_source.zig:2:15: error: unreachable code");
	1264	,
	1265	".tmp_source.zig:2:15: error: unreachable code",
	1266	);
976	1267
977		cases.add("invalid builtin fn",
	1268	cases.add(
	1269	"invalid builtin fn",
978	1270	\\fn f() @bogus(foo) {
979	1271	\\}
980	1272	\\export fn entry() void { _ = f(); }
981		, ".tmp_source.zig:1:8: error: invalid builtin function: 'bogus'");
	1273	,
	1274	".tmp_source.zig:1:8: error: invalid builtin function: 'bogus'",
	1275	);
982	1276
983		cases.add("top level decl dependency loop",
	1277	cases.add(
	1278	"top level decl dependency loop",
984	1279	\\const a : @typeOf(b) = 0;
985	1280	\\const b : @typeOf(a) = 0;
986	1281	\\export fn entry() void {
987	1282	\\ const c = a + b;
988	1283	\\}
989		, ".tmp_source.zig:1:1: error: 'a' depends on itself");
	1284	,
	1285	".tmp_source.zig:1:1: error: 'a' depends on itself",
	1286	);
990	1287
991		cases.add("noalias on non pointer param",
	1288	cases.add(
	1289	"noalias on non pointer param",
992	1290	\\fn f(noalias x: i32) void {}
993	1291	\\export fn entry() void { f(1234); }
994		, ".tmp_source.zig:1:6: error: noalias on non-pointer parameter");
	1292	,
	1293	".tmp_source.zig:1:6: error: noalias on non-pointer parameter",
	1294	);
995	1295
996		cases.add("struct init syntax for array",
	1296	cases.add(
	1297	"struct init syntax for array",
997	1298	\\const foo = []u16{.x = 1024,};
998	1299	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
999		, ".tmp_source.zig:1:18: error: type '[]u16' does not support struct initialization syntax");
	1300	,
	1301	".tmp_source.zig:1:18: error: type '[]u16' does not support struct initialization syntax",
	1302	);
1000	1303
1001		cases.add("type variables must be constant",
	1304	cases.add(
	1305	"type variables must be constant",
1002	1306	\\var foo = u8;
1003	1307	\\export fn entry() foo {
1004	1308	\\ return 1;
1005	1309	\\}
1006		, ".tmp_source.zig:1:1: error: variable of type 'type' must be constant");
1007
	1310	,
	1311	".tmp_source.zig:1:1: error: variable of type 'type' must be constant",
	1312	);
1008	1313
1009		cases.add("variables shadowing types",
	1314	cases.add(
	1315	"variables shadowing types",
1010	1316	\\const Foo = struct {};
1011	1317	\\const Bar = struct {};
1012	1318	\\
...	...	@@ -1018,12 +1324,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1018	1324	\\ f(1234);
1019	1325	\\}
1020	1326	,
1021		".tmp_source.zig:4:6: error: redefinition of 'Foo'",
1022		".tmp_source.zig:1:1: note: previous definition is here",
1023		".tmp_source.zig:5:5: error: redefinition of 'Bar'",
1024		".tmp_source.zig:2:1: note: previous definition is here");
	1327	".tmp_source.zig:4:6: error: redefinition of 'Foo'",
	1328	".tmp_source.zig:1:1: note: previous definition is here",
	1329	".tmp_source.zig:5:5: error: redefinition of 'Bar'",
	1330	".tmp_source.zig:2:1: note: previous definition is here",
	1331	);
1025	1332
1026		cases.add("switch expression - missing enumeration prong",
	1333	cases.add(
	1334	"switch expression - missing enumeration prong",
1027	1335	\\const Number = enum {
1028	1336	\\ One,
1029	1337	\\ Two,
...	...	@@ -1039,9 +1347,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1039	1347	\\}
1040	1348	\\
1041	1349	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1042		, ".tmp_source.zig:8:5: error: enumeration value 'Number.Four' not handled in switch");
	1350	,
	1351	".tmp_source.zig:8:5: error: enumeration value 'Number.Four' not handled in switch",
	1352	);
1043	1353
1044		cases.add("switch expression - duplicate enumeration prong",
	1354	cases.add(
	1355	"switch expression - duplicate enumeration prong",
1045	1356	\\const Number = enum {
1046	1357	\\ One,
1047	1358	\\ Two,
...	...	@@ -1059,10 +1370,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1059	1370	\\}
1060	1371	\\
1061	1372	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1062		, ".tmp_source.zig:13:15: error: duplicate switch value",
1063		".tmp_source.zig:10:15: note: other value is here");
	1373	,
	1374	".tmp_source.zig:13:15: error: duplicate switch value",
	1375	".tmp_source.zig:10:15: note: other value is here",
	1376	);
1064	1377
1065		cases.add("switch expression - duplicate enumeration prong when else present",
	1378	cases.add(
	1379	"switch expression - duplicate enumeration prong when else present",
1066	1380	\\const Number = enum {
1067	1381	\\ One,
1068	1382	\\ Two,
...	...	@@ -1081,10 +1395,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1081	1395	\\}
1082	1396	\\
1083	1397	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1084		, ".tmp_source.zig:13:15: error: duplicate switch value",
1085		".tmp_source.zig:10:15: note: other value is here");
	1398	,
	1399	".tmp_source.zig:13:15: error: duplicate switch value",
	1400	".tmp_source.zig:10:15: note: other value is here",
	1401	);
1086	1402
1087		cases.add("switch expression - multiple else prongs",
	1403	cases.add(
	1404	"switch expression - multiple else prongs",
1088	1405	\\fn f(x: u32) void {
1089	1406	\\ const value: bool = switch (x) {
1090	1407	\\ 1234 => false,
...	...	@@ -1095,9 +1412,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1095	1412	\\export fn entry() void {
1096	1413	\\ f(1234);
1097	1414	\\}
1098		, ".tmp_source.zig:5:9: error: multiple else prongs in switch expression");
	1415	,
	1416	".tmp_source.zig:5:9: error: multiple else prongs in switch expression",
	1417	);
1099	1418
1100		cases.add("switch expression - non exhaustive integer prongs",
	1419	cases.add(
	1420	"switch expression - non exhaustive integer prongs",
1101	1421	\\fn foo(x: u8) void {
1102	1422	\\ switch (x) {
1103	1423	\\ 0 => {},
...	...	@@ -1105,9 +1425,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1105	1425	\\}
1106	1426	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1107	1427	,
1108		".tmp_source.zig:2:5: error: switch must handle all possibilities");
	1428	".tmp_source.zig:2:5: error: switch must handle all possibilities",
	1429	);
1109	1430
1110		cases.add("switch expression - duplicate or overlapping integer value",
	1431	cases.add(
	1432	"switch expression - duplicate or overlapping integer value",
1111	1433	\\fn foo(x: u8) u8 {
1112	1434	\\ return switch (x) {
1113	1435	\\ 0 ... 100 => u8(0),
...	...	@@ -1119,9 +1441,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1119	1441	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1120	1442	,
1121	1443	".tmp_source.zig:6:9: error: duplicate switch value",
1122		".tmp_source.zig:5:14: note: previous value is here");
	1444	".tmp_source.zig:5:14: note: previous value is here",
	1445	);
1123	1446
1124		cases.add("switch expression - switch on pointer type with no else",
	1447	cases.add(
	1448	"switch expression - switch on pointer type with no else",
1125	1449	\\fn foo(x: &u8) void {
1126	1450	\\ switch (x) {
1127	1451	\\ &y => {},
...	...	@@ -1130,54 +1454,77 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1130	1454	\\const y: u8 = 100;
1131	1455	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1132	1456	,
1133		".tmp_source.zig:2:5: error: else prong required when switching on type '&u8'");
	1457	".tmp_source.zig:2:5: error: else prong required when switching on type '&u8'",
	1458	);
1134	1459
1135		cases.add("global variable initializer must be constant expression",
	1460	cases.add(
	1461	"global variable initializer must be constant expression",
1136	1462	\\extern fn foo() i32;
1137	1463	\\const x = foo();
1138	1464	\\export fn entry() i32 { return x; }
1139		, ".tmp_source.zig:2:11: error: unable to evaluate constant expression");
	1465	,
	1466	".tmp_source.zig:2:11: error: unable to evaluate constant expression",
	1467	);
1140	1468
1141		cases.add("array concatenation with wrong type",
	1469	cases.add(
	1470	"array concatenation with wrong type",
1142	1471	\\const src = "aoeu";
1143	1472	\\const derp = usize(1234);
1144	1473	\\const a = derp ++ "foo";
1145	1474	\\
1146	1475	\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
1147		, ".tmp_source.zig:3:11: error: expected array or C string literal, found 'usize'");
	1476	,
	1477	".tmp_source.zig:3:11: error: expected array or C string literal, found 'usize'",
	1478	);
1148	1479
1149		cases.add("non compile time array concatenation",
	1480	cases.add(
	1481	"non compile time array concatenation",
1150	1482	\\fn f() []u8 {
1151	1483	\\ return s ++ "foo";
1152	1484	\\}
1153	1485	\\var s: [10]u8 = undefined;
1154	1486	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1155		, ".tmp_source.zig:2:12: error: unable to evaluate constant expression");
	1487	,
	1488	".tmp_source.zig:2:12: error: unable to evaluate constant expression",
	1489	);
1156	1490
1157		cases.add("@cImport with bogus include",
	1491	cases.add(
	1492	"@cImport with bogus include",
1158	1493	\\const c = @cImport(@cInclude("bogus.h"));
1159	1494	\\export fn entry() usize { return @sizeOf(@typeOf(c.bogo)); }
1160		, ".tmp_source.zig:1:11: error: C import failed",
1161		".h:1:10: note: 'bogus.h' file not found");
	1495	,
	1496	".tmp_source.zig:1:11: error: C import failed",
	1497	".h:1:10: note: 'bogus.h' file not found",
	1498	);
1162	1499
1163		cases.add("address of number literal",
	1500	cases.add(
	1501	"address of number literal",
1164	1502	\\const x = 3;
1165	1503	\\const y = &x;
1166	1504	\\fn foo() &const i32 { return y; }
1167	1505	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1168		, ".tmp_source.zig:3:30: error: expected type '&const i32', found '&const (integer literal)'");
	1506	,
	1507	".tmp_source.zig:3:30: error: expected type '&const i32', found '&const (integer literal)'",
	1508	);
1169	1509
1170		cases.add("integer overflow error",
	1510	cases.add(
	1511	"integer overflow error",
1171	1512	\\const x : u8 = 300;
1172	1513	\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
1173		, ".tmp_source.zig:1:16: error: integer value 300 cannot be implicitly casted to type 'u8'");
	1514	,
	1515	".tmp_source.zig:1:16: error: integer value 300 cannot be implicitly casted to type 'u8'",
	1516	);
1174	1517
1175		cases.add("incompatible number literals",
	1518	cases.add(
	1519	"incompatible number literals",
1176	1520	\\const x = 2 == 2.0;
1177	1521	\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
1178		, ".tmp_source.zig:1:11: error: integer value 2 cannot be implicitly casted to type '(float literal)'");
	1522	,
	1523	".tmp_source.zig:1:11: error: integer value 2 cannot be implicitly casted to type '(float literal)'",
	1524	);
1179	1525
1180		cases.add("missing function call param",
	1526	cases.add(
	1527	"missing function call param",
1181	1528	\\const Foo = struct {
1182	1529	\\ a: i32,
1183	1530	\\ b: i32,
...	...	@@ -1201,58 +1548,73 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1201	1548	\\}
1202	1549	\\
1203	1550	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1204		, ".tmp_source.zig:20:34: error: expected 1 arguments, found 0");
	1551	,
	1552	".tmp_source.zig:20:34: error: expected 1 arguments, found 0",
	1553	);
1205	1554
1206		cases.add("missing function name and param name",
	1555	cases.add(
	1556	"missing function name and param name",
1207	1557	\\fn () void {}
1208	1558	\\fn f(i32) void {}
1209	1559	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1210	1560	,
1211		".tmp_source.zig:1:1: error: missing function name",
1212		".tmp_source.zig:2:6: error: missing parameter name");
	1561	".tmp_source.zig:1:1: error: missing function name",
	1562	".tmp_source.zig:2:6: error: missing parameter name",
	1563	);
1213	1564
1214		cases.add("wrong function type",
	1565	cases.add(
	1566	"wrong function type",
1215	1567	\\const fns = []fn() void { a, b, c };
1216	1568	\\fn a() i32 {return 0;}
1217	1569	\\fn b() i32 {return 1;}
1218	1570	\\fn c() i32 {return 2;}
1219	1571	\\export fn entry() usize { return @sizeOf(@typeOf(fns)); }
1220		, ".tmp_source.zig:1:27: error: expected type 'fn() void', found 'fn() i32'");
	1572	,
	1573	".tmp_source.zig:1:27: error: expected type 'fn() void', found 'fn() i32'",
	1574	);
1221	1575
1222		cases.add("extern function pointer mismatch",
	1576	cases.add(
	1577	"extern function pointer mismatch",
1223	1578	\\const fns = [](fn(i32)i32) { a, b, c };
1224	1579	\\pub fn a(x: i32) i32 {return x + 0;}
1225	1580	\\pub fn b(x: i32) i32 {return x + 1;}
1226	1581	\\export fn c(x: i32) i32 {return x + 2;}
1227	1582	\\
1228	1583	\\export fn entry() usize { return @sizeOf(@typeOf(fns)); }
1229		, ".tmp_source.zig:1:36: error: expected type 'fn(i32) i32', found 'extern fn(i32) i32'");
1230
	1584	,
	1585	".tmp_source.zig:1:36: error: expected type 'fn(i32) i32', found 'extern fn(i32) i32'",
	1586	);
1231	1587
1232		cases.add("implicit cast from f64 to f32",
	1588	cases.add(
	1589	"implicit cast from f64 to f32",
1233	1590	\\const x : f64 = 1.0;
1234	1591	\\const y : f32 = x;
1235	1592	\\
1236	1593	\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
1237		, ".tmp_source.zig:2:17: error: expected type 'f32', found 'f64'");
1238
	1594	,
	1595	".tmp_source.zig:2:17: error: expected type 'f32', found 'f64'",
	1596	);
1239	1597
1240		cases.add("colliding invalid top level functions",
	1598	cases.add(
	1599	"colliding invalid top level functions",
1241	1600	\\fn func() bogus {}
1242	1601	\\fn func() bogus {}
1243	1602	\\export fn entry() usize { return @sizeOf(@typeOf(func)); }
1244	1603	,
1245		".tmp_source.zig:2:1: error: redefinition of 'func'",
1246		".tmp_source.zig:1:11: error: use of undeclared identifier 'bogus'");
	1604	".tmp_source.zig:2:1: error: redefinition of 'func'",
	1605	".tmp_source.zig:1:11: error: use of undeclared identifier 'bogus'",
	1606	);
1247	1607
1248
1249		cases.add("bogus compile var",
	1608	cases.add(
	1609	"bogus compile var",
1250	1610	\\const x = @import("builtin").bogus;
1251	1611	\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
1252		, ".tmp_source.zig:1:29: error: no member named 'bogus' in '");
1253
	1612	,
	1613	".tmp_source.zig:1:29: error: no member named 'bogus' in '",
	1614	);
1254	1615
1255		cases.add("non constant expression in array size outside function",
	1616	cases.add(
	1617	"non constant expression in array size outside function",
1256	1618	\\const Foo = struct {
1257	1619	\\ y: [get()]u8,
1258	1620	\\};
...	...	@@ -1261,22 +1623,25 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1261	1623	\\
1262	1624	\\export fn entry() usize { return @sizeOf(@typeOf(Foo)); }
1263	1625	,
1264		".tmp_source.zig:5:25: error: unable to evaluate constant expression",
1265		".tmp_source.zig:2:12: note: called from here",
1266		".tmp_source.zig:2:8: note: called from here");
1267
	1626	".tmp_source.zig:5:25: error: unable to evaluate constant expression",
	1627	".tmp_source.zig:2:12: note: called from here",
	1628	".tmp_source.zig:2:8: note: called from here",
	1629	);
1268	1630
1269		cases.add("addition with non numbers",
	1631	cases.add(
	1632	"addition with non numbers",
1270	1633	\\const Foo = struct {
1271	1634	\\ field: i32,
1272	1635	\\};
1273	1636	\\const x = Foo {.field = 1} + Foo {.field = 2};
1274	1637	\\
1275	1638	\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
1276		, ".tmp_source.zig:4:28: error: invalid operands to binary expression: 'Foo' and 'Foo'");
1277
	1639	,
	1640	".tmp_source.zig:4:28: error: invalid operands to binary expression: 'Foo' and 'Foo'",
	1641	);
1278	1642
1279		cases.add("division by zero",
	1643	cases.add(
	1644	"division by zero",
1280	1645	\\const lit_int_x = 1 / 0;
1281	1646	\\const lit_float_x = 1.0 / 0.0;
1282	1647	\\const int_x = u32(1) / u32(0);
...	...	@@ -1287,49 +1652,65 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1287	1652	\\export fn entry3() usize { return @sizeOf(@typeOf(int_x)); }
1288	1653	\\export fn entry4() usize { return @sizeOf(@typeOf(float_x)); }
1289	1654	,
1290		".tmp_source.zig:1:21: error: division by zero",
1291		".tmp_source.zig:2:25: error: division by zero",
1292		".tmp_source.zig:3:22: error: division by zero",
1293		".tmp_source.zig:4:26: error: division by zero");
1294
	1655	".tmp_source.zig:1:21: error: division by zero",
	1656	".tmp_source.zig:2:25: error: division by zero",
	1657	".tmp_source.zig:3:22: error: division by zero",
	1658	".tmp_source.zig:4:26: error: division by zero",
	1659	);
1295	1660
1296		cases.add("normal string with newline",
	1661	cases.add(
	1662	"normal string with newline",
1297	1663	\\const foo = "a
1298	1664	\\b";
1299	1665	\\
1300	1666	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1301		, ".tmp_source.zig:1:13: error: newline not allowed in string literal");
	1667	,
	1668	".tmp_source.zig:1:13: error: newline not allowed in string literal",
	1669	);
1302	1670
1303		cases.add("invalid comparison for function pointers",
	1671	cases.add(
	1672	"invalid comparison for function pointers",
1304	1673	\\fn foo() void {}
1305	1674	\\const invalid = foo > foo;
1306	1675	\\
1307	1676	\\export fn entry() usize { return @sizeOf(@typeOf(invalid)); }
1308		, ".tmp_source.zig:2:21: error: operator not allowed for type 'fn() void'");
	1677	,
	1678	".tmp_source.zig:2:21: error: operator not allowed for type 'fn() void'",
	1679	);
1309	1680
1310		cases.add("generic function instance with non-constant expression",
	1681	cases.add(
	1682	"generic function instance with non-constant expression",
1311	1683	\\fn foo(comptime x: i32, y: i32) i32 { return x + y; }
1312	1684	\\fn test1(a: i32, b: i32) i32 {
1313	1685	\\ return foo(a, b);
1314	1686	\\}
1315	1687	\\
1316	1688	\\export fn entry() usize { return @sizeOf(@typeOf(test1)); }
1317		, ".tmp_source.zig:3:16: error: unable to evaluate constant expression");
	1689	,
	1690	".tmp_source.zig:3:16: error: unable to evaluate constant expression",
	1691	);
1318	1692
1319		cases.add("assign null to non-nullable pointer",
	1693	cases.add(
	1694	"assign null to non-nullable pointer",
1320	1695	\\const a: &u8 = null;
1321	1696	\\
1322	1697	\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
1323		, ".tmp_source.zig:1:16: error: expected type '&u8', found '(null)'");
	1698	,
	1699	".tmp_source.zig:1:16: error: expected type '&u8', found '(null)'",
	1700	);
1324	1701
1325		cases.add("indexing an array of size zero",
	1702	cases.add(
	1703	"indexing an array of size zero",
1326	1704	\\const array = []u8{};
1327	1705	\\export fn foo() void {
1328	1706	\\ const pointer = &array[0];
1329	1707	\\}
1330		, ".tmp_source.zig:3:27: error: index 0 outside array of size 0");
	1708	,
	1709	".tmp_source.zig:3:27: error: index 0 outside array of size 0",
	1710	);
1331	1711
1332		cases.add("compile time division by zero",
	1712	cases.add(
	1713	"compile time division by zero",
1333	1714	\\const y = foo(0);
1334	1715	\\fn foo(x: u32) u32 {
1335	1716	\\ return 1 / x;
...	...	@@ -1337,17 +1718,21 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1337	1718	\\
1338	1719	\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
1339	1720	,
1340		".tmp_source.zig:3:14: error: division by zero",
1341		".tmp_source.zig:1:14: note: called from here");
	1721	".tmp_source.zig:3:14: error: division by zero",
	1722	".tmp_source.zig:1:14: note: called from here",
	1723	);
1342	1724
1343		cases.add("branch on undefined value",
	1725	cases.add(
	1726	"branch on undefined value",
1344	1727	\\const x = if (undefined) true else false;
1345	1728	\\
1346	1729	\\export fn entry() usize { return @sizeOf(@typeOf(x)); }
1347		, ".tmp_source.zig:1:15: error: use of undefined value");
1348
	1730	,
	1731	".tmp_source.zig:1:15: error: use of undefined value",
	1732	);
1349	1733
1350		cases.add("endless loop in function evaluation",
	1734	cases.add(
	1735	"endless loop in function evaluation",
1351	1736	\\const seventh_fib_number = fibbonaci(7);
1352	1737	\\fn fibbonaci(x: i32) i32 {
1353	1738	\\ return fibbonaci(x - 1) + fibbonaci(x - 2);
...	...	@@ -1355,16 +1740,22 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1355	1740	\\
1356	1741	\\export fn entry() usize { return @sizeOf(@typeOf(seventh_fib_number)); }
1357	1742	,
1358		".tmp_source.zig:3:21: error: evaluation exceeded 1000 backwards branches",
1359		".tmp_source.zig:3:21: note: called from here");
	1743	".tmp_source.zig:3:21: error: evaluation exceeded 1000 backwards branches",
	1744	".tmp_source.zig:3:21: note: called from here",
	1745	);
1360	1746
1361		cases.add("@embedFile with bogus file",
1362		\\const resource = @embedFile("bogus.txt");
	1747	cases.add(
	1748	"@embedFile with bogus file",
	1749	\\const resource = @embedFile("bogus.txt",);
1363	1750	\\
1364	1751	\\export fn entry() usize { return @sizeOf(@typeOf(resource)); }
1365		, ".tmp_source.zig:1:29: error: unable to find '", "bogus.txt'");
	1752	,
	1753	".tmp_source.zig:1:29: error: unable to find '",
	1754	"bogus.txt'",
	1755	);
1366	1756
1367		cases.add("non-const expression in struct literal outside function",
	1757	cases.add(
	1758	"non-const expression in struct literal outside function",
1368	1759	\\const Foo = struct {
1369	1760	\\ x: i32,
1370	1761	\\};
...	...	@@ -1372,9 +1763,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1372	1763	\\extern fn get_it() i32;
1373	1764	\\
1374	1765	\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
1375		, ".tmp_source.zig:4:21: error: unable to evaluate constant expression");
	1766	,
	1767	".tmp_source.zig:4:21: error: unable to evaluate constant expression",
	1768	);
1376	1769
1377		cases.add("non-const expression function call with struct return value outside function",
	1770	cases.add(
	1771	"non-const expression function call with struct return value outside function",
1378	1772	\\const Foo = struct {
1379	1773	\\ x: i32,
1380	1774	\\};
...	...	@@ -1387,19 +1781,24 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1387	1781	\\
1388	1782	\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
1389	1783	,
1390		".tmp_source.zig:6:24: error: unable to evaluate constant expression",
1391		".tmp_source.zig:4:17: note: called from here");
	1784	".tmp_source.zig:6:24: error: unable to evaluate constant expression",
	1785	".tmp_source.zig:4:17: note: called from here",
	1786	);
1392	1787
1393		cases.add("undeclared identifier error should mark fn as impure",
	1788	cases.add(
	1789	"undeclared identifier error should mark fn as impure",
1394	1790	\\export fn foo() void {
1395	1791	\\ test_a_thing();
1396	1792	\\}
1397	1793	\\fn test_a_thing() void {
1398	1794	\\ bad_fn_call();
1399	1795	\\}
1400		, ".tmp_source.zig:5:5: error: use of undeclared identifier 'bad_fn_call'");
	1796	,
	1797	".tmp_source.zig:5:5: error: use of undeclared identifier 'bad_fn_call'",
	1798	);
1401	1799
1402		cases.add("illegal comparison of types",
	1800	cases.add(
	1801	"illegal comparison of types",
1403	1802	\\fn bad_eql_1(a: []u8, b: []u8) bool {
1404	1803	\\ return a == b;
1405	1804	\\}
...	...	@@ -1408,16 +1807,18 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1408	1807	\\ Two: i32,
1409	1808	\\};
1410	1809	\\fn bad_eql_2(a: &const EnumWithData, b: &const EnumWithData) bool {
1411		\\ return a == b;
	1810	\\ return a.* == b.*;
1412	1811	\\}
1413	1812	\\
1414	1813	\\export fn entry1() usize { return @sizeOf(@typeOf(bad_eql_1)); }
1415	1814	\\export fn entry2() usize { return @sizeOf(@typeOf(bad_eql_2)); }
1416	1815	,
1417		".tmp_source.zig:2:14: error: operator not allowed for type '[]u8'",
1418		".tmp_source.zig:9:15: error: operator not allowed for type 'EnumWithData'");
	1816	".tmp_source.zig:2:14: error: operator not allowed for type '[]u8'",
	1817	".tmp_source.zig:9:16: error: operator not allowed for type 'EnumWithData'",
	1818	);
1419	1819
1420		cases.add("non-const switch number literal",
	1820	cases.add(
	1821	"non-const switch number literal",
1421	1822	\\export fn foo() void {
1422	1823	\\ const x = switch (bar()) {
1423	1824	\\ 1, 2 => 1,
...	...	@@ -1428,25 +1829,34 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1428	1829	\\fn bar() i32 {
1429	1830	\\ return 2;
1430	1831	\\}
1431		, ".tmp_source.zig:2:15: error: unable to infer expression type");
	1832	,
	1833	".tmp_source.zig:2:15: error: unable to infer expression type",
	1834	);
1432	1835
1433		cases.add("atomic orderings of cmpxchg - failure stricter than success",
	1836	cases.add(
	1837	"atomic orderings of cmpxchg - failure stricter than success",
1434	1838	\\const AtomicOrder = @import("builtin").AtomicOrder;
1435	1839	\\export fn f() void {
1436	1840	\\ var x: i32 = 1234;
1437	1841	\\ while (!@cmpxchgWeak(i32, &x, 1234, 5678, AtomicOrder.Monotonic, AtomicOrder.SeqCst)) {}
1438	1842	\\}
1439		, ".tmp_source.zig:4:81: error: failure atomic ordering must be no stricter than success");
	1843	,
	1844	".tmp_source.zig:4:81: error: failure atomic ordering must be no stricter than success",
	1845	);
1440	1846
1441		cases.add("atomic orderings of cmpxchg - success Monotonic or stricter",
	1847	cases.add(
	1848	"atomic orderings of cmpxchg - success Monotonic or stricter",
1442	1849	\\const AtomicOrder = @import("builtin").AtomicOrder;
1443	1850	\\export fn f() void {
1444	1851	\\ var x: i32 = 1234;
1445	1852	\\ while (!@cmpxchgWeak(i32, &x, 1234, 5678, AtomicOrder.Unordered, AtomicOrder.Unordered)) {}
1446	1853	\\}
1447		, ".tmp_source.zig:4:58: error: success atomic ordering must be Monotonic or stricter");
	1854	,
	1855	".tmp_source.zig:4:58: error: success atomic ordering must be Monotonic or stricter",
	1856	);
1448	1857
1449		cases.add("negation overflow in function evaluation",
	1858	cases.add(
	1859	"negation overflow in function evaluation",
1450	1860	\\const y = neg(-128);
1451	1861	\\fn neg(x: i8) i8 {
1452	1862	\\ return -x;
...	...	@@ -1454,10 +1864,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1454	1864	\\
1455	1865	\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
1456	1866	,
1457		".tmp_source.zig:3:12: error: negation caused overflow",
1458		".tmp_source.zig:1:14: note: called from here");
	1867	".tmp_source.zig:3:12: error: negation caused overflow",
	1868	".tmp_source.zig:1:14: note: called from here",
	1869	);
1459	1870
1460		cases.add("add overflow in function evaluation",
	1871	cases.add(
	1872	"add overflow in function evaluation",
1461	1873	\\const y = add(65530, 10);
1462	1874	\\fn add(a: u16, b: u16) u16 {
1463	1875	\\ return a + b;
...	...	@@ -1465,11 +1877,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1465	1877	\\
1466	1878	\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
1467	1879	,
1468		".tmp_source.zig:3:14: error: operation caused overflow",
1469		".tmp_source.zig:1:14: note: called from here");
1470
	1880	".tmp_source.zig:3:14: error: operation caused overflow",
	1881	".tmp_source.zig:1:14: note: called from here",
	1882	);
1471	1883
1472		cases.add("sub overflow in function evaluation",
	1884	cases.add(
	1885	"sub overflow in function evaluation",
1473	1886	\\const y = sub(10, 20);
1474	1887	\\fn sub(a: u16, b: u16) u16 {
1475	1888	\\ return a - b;
...	...	@@ -1477,10 +1890,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1477	1890	\\
1478	1891	\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
1479	1892	,
1480		".tmp_source.zig:3:14: error: operation caused overflow",
1481		".tmp_source.zig:1:14: note: called from here");
	1893	".tmp_source.zig:3:14: error: operation caused overflow",
	1894	".tmp_source.zig:1:14: note: called from here",
	1895	);
1482	1896
1483		cases.add("mul overflow in function evaluation",
	1897	cases.add(
	1898	"mul overflow in function evaluation",
1484	1899	\\const y = mul(300, 6000);
1485	1900	\\fn mul(a: u16, b: u16) u16 {
1486	1901	\\ return a * b;
...	...	@@ -1488,58 +1903,77 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1488	1903	\\
1489	1904	\\export fn entry() usize { return @sizeOf(@typeOf(y)); }
1490	1905	,
1491		".tmp_source.zig:3:14: error: operation caused overflow",
1492		".tmp_source.zig:1:14: note: called from here");
	1906	".tmp_source.zig:3:14: error: operation caused overflow",
	1907	".tmp_source.zig:1:14: note: called from here",
	1908	);
1493	1909
1494		cases.add("truncate sign mismatch",
	1910	cases.add(
	1911	"truncate sign mismatch",
1495	1912	\\fn f() i8 {
1496	1913	\\ const x: u32 = 10;
1497	1914	\\ return @truncate(i8, x);
1498	1915	\\}
1499	1916	\\
1500	1917	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1501		, ".tmp_source.zig:3:26: error: expected signed integer type, found 'u32'");
	1918	,
	1919	".tmp_source.zig:3:26: error: expected signed integer type, found 'u32'",
	1920	);
1502	1921
1503		cases.add("try in function with non error return type",
	1922	cases.add(
	1923	"try in function with non error return type",
1504	1924	\\export fn f() void {
1505	1925	\\ try something();
1506	1926	\\}
1507	1927	\\fn something() error!void { }
1508	1928	,
1509		".tmp_source.zig:2:5: error: expected type 'void', found 'error'");
	1929	".tmp_source.zig:2:5: error: expected type 'void', found 'error'",
	1930	);
1510	1931
1511		cases.add("invalid pointer for var type",
	1932	cases.add(
	1933	"invalid pointer for var type",
1512	1934	\\extern fn ext() usize;
1513	1935	\\var bytes: [ext()]u8 = undefined;
1514	1936	\\export fn f() void {
1515	1937	\\ for (bytes) \|*b, i\| {
1516		\\ *b = u8(i);
	1938	\\ b.* = u8(i);
1517	1939	\\ }
1518	1940	\\}
1519		, ".tmp_source.zig:2:13: error: unable to evaluate constant expression");
	1941	,
	1942	".tmp_source.zig:2:13: error: unable to evaluate constant expression",
	1943	);
1520	1944
1521		cases.add("export function with comptime parameter",
	1945	cases.add(
	1946	"export function with comptime parameter",
1522	1947	\\export fn foo(comptime x: i32, y: i32) i32{
1523	1948	\\ return x + y;
1524	1949	\\}
1525		, ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'");
	1950	,
	1951	".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'",
	1952	);
1526	1953
1527		cases.add("extern function with comptime parameter",
	1954	cases.add(
	1955	"extern function with comptime parameter",
1528	1956	\\extern fn foo(comptime x: i32, y: i32) i32;
1529	1957	\\fn f() i32 {
1530	1958	\\ return foo(1, 2);
1531	1959	\\}
1532	1960	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1533		, ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'");
	1961	,
	1962	".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'",
	1963	);
1534	1964
1535		cases.add("convert fixed size array to slice with invalid size",
	1965	cases.add(
	1966	"convert fixed size array to slice with invalid size",
1536	1967	\\export fn f() void {
1537	1968	\\ var array: [5]u8 = undefined;
1538	1969	\\ var foo = ([]const u32)(array)[0];
1539	1970	\\}
1540		, ".tmp_source.zig:3:28: error: unable to convert [5]u8 to []const u32: size mismatch");
	1971	,
	1972	".tmp_source.zig:3:28: error: unable to convert [5]u8 to []const u32: size mismatch",
	1973	);
1541	1974
1542		cases.add("non-pure function returns type",
	1975	cases.add(
	1976	"non-pure function returns type",
1543	1977	\\var a: u32 = 0;
1544	1978	\\pub fn List(comptime T: type) type {
1545	1979	\\ a += 1;
...	...	@@ -1558,18 +1992,24 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1558	1992	\\ var list: List(i32) = undefined;
1559	1993	\\ list.length = 10;
1560	1994	\\}
1561		, ".tmp_source.zig:3:7: error: unable to evaluate constant expression",
1562		".tmp_source.zig:16:19: note: called from here");
	1995	,
	1996	".tmp_source.zig:3:7: error: unable to evaluate constant expression",
	1997	".tmp_source.zig:16:19: note: called from here",
	1998	);
1563	1999
1564		cases.add("bogus method call on slice",
	2000	cases.add(
	2001	"bogus method call on slice",
1565	2002	\\var self = "aoeu";
1566	2003	\\fn f(m: []const u8) void {
1567	2004	\\ m.copy(u8, self[0..], m);
1568	2005	\\}
1569	2006	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1570		, ".tmp_source.zig:3:6: error: no member named 'copy' in '[]const u8'");
	2007	,
	2008	".tmp_source.zig:3:6: error: no member named 'copy' in '[]const u8'",
	2009	);
1571	2010
1572		cases.add("wrong number of arguments for method fn call",
	2011	cases.add(
	2012	"wrong number of arguments for method fn call",
1573	2013	\\const Foo = struct {
1574	2014	\\ fn method(self: &const Foo, a: i32) void {}
1575	2015	\\};
...	...	@@ -1578,34 +2018,49 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1578	2018	\\ foo.method(1, 2);
1579	2019	\\}
1580	2020	\\export fn entry() usize { return @sizeOf(@typeOf(f)); }
1581		, ".tmp_source.zig:6:15: error: expected 2 arguments, found 3");
	2021	,
	2022	".tmp_source.zig:6:15: error: expected 2 arguments, found 3",
	2023	);
1582	2024
1583		cases.add("assign through constant pointer",
	2025	cases.add(
	2026	"assign through constant pointer",
1584	2027	\\export fn f() void {
1585	2028	\\ var cstr = c"Hat";
1586	2029	\\ cstr[0] = 'W';
1587	2030	\\}
1588		, ".tmp_source.zig:3:11: error: cannot assign to constant");
	2031	,
	2032	".tmp_source.zig:3:11: error: cannot assign to constant",
	2033	);
1589	2034
1590		cases.add("assign through constant slice",
	2035	cases.add(
	2036	"assign through constant slice",
1591	2037	\\export fn f() void {
1592	2038	\\ var cstr: []const u8 = "Hat";
1593	2039	\\ cstr[0] = 'W';
1594	2040	\\}
1595		, ".tmp_source.zig:3:11: error: cannot assign to constant");
	2041	,
	2042	".tmp_source.zig:3:11: error: cannot assign to constant",
	2043	);
1596	2044
1597		cases.add("main function with bogus args type",
	2045	cases.add(
	2046	"main function with bogus args type",
1598	2047	\\pub fn main(args: [][]bogus) !void {}
1599		, ".tmp_source.zig:1:23: error: use of undeclared identifier 'bogus'");
	2048	,
	2049	".tmp_source.zig:1:23: error: use of undeclared identifier 'bogus'",
	2050	);
1600	2051
1601		cases.add("for loop missing element param",
	2052	cases.add(
	2053	"for loop missing element param",
1602	2054	\\fn foo(blah: []u8) void {
1603	2055	\\ for (blah) { }
1604	2056	\\}
1605	2057	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1606		, ".tmp_source.zig:2:5: error: for loop expression missing element parameter");
	2058	,
	2059	".tmp_source.zig:2:5: error: for loop expression missing element parameter",
	2060	);
1607	2061
1608		cases.add("misspelled type with pointer only reference",
	2062	cases.add(
	2063	"misspelled type with pointer only reference",
1609	2064	\\const JasonHM = u8;
1610	2065	\\const JasonList = &JsonNode;
1611	2066	\\
...	...	@@ -1636,9 +2091,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1636	2091	\\}
1637	2092	\\
1638	2093	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1639		, ".tmp_source.zig:5:16: error: use of undeclared identifier 'JsonList'");
	2094	,
	2095	".tmp_source.zig:5:16: error: use of undeclared identifier 'JsonList'",
	2096	);
1640	2097
1641		cases.add("method call with first arg type primitive",
	2098	cases.add(
	2099	"method call with first arg type primitive",
1642	2100	\\const Foo = struct {
1643	2101	\\ x: i32,
1644	2102	\\
...	...	@@ -1654,9 +2112,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1654	2112	\\
1655	2113	\\ derp.init();
1656	2114	\\}
1657		, ".tmp_source.zig:14:5: error: expected type 'i32', found '&const Foo'");
	2115	,
	2116	".tmp_source.zig:14:5: error: expected type 'i32', found '&const Foo'",
	2117	);
1658	2118
1659		cases.add("method call with first arg type wrong container",
	2119	cases.add(
	2120	"method call with first arg type wrong container",
1660	2121	\\pub const List = struct {
1661	2122	\\ len: usize,
1662	2123	\\ allocator: &Allocator,
...	...	@@ -1681,26 +2142,33 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1681	2142	\\ var x = List.init(&global_allocator);
1682	2143	\\ x.init();
1683	2144	\\}
1684		, ".tmp_source.zig:23:5: error: expected type '&Allocator', found '&List'");
	2145	,
	2146	".tmp_source.zig:23:5: error: expected type '&Allocator', found '&List'",
	2147	);
1685	2148
1686		cases.add("binary not on number literal",
	2149	cases.add(
	2150	"binary not on number literal",
1687	2151	\\const TINY_QUANTUM_SHIFT = 4;
1688	2152	\\const TINY_QUANTUM_SIZE = 1 << TINY_QUANTUM_SHIFT;
1689	2153	\\var block_aligned_stuff: usize = (4 + TINY_QUANTUM_SIZE) & ~(TINY_QUANTUM_SIZE - 1);
1690	2154	\\
1691	2155	\\export fn entry() usize { return @sizeOf(@typeOf(block_aligned_stuff)); }
1692		, ".tmp_source.zig:3:60: error: unable to perform binary not operation on type '(integer literal)'");
	2156	,
	2157	".tmp_source.zig:3:60: error: unable to perform binary not operation on type '(integer literal)'",
	2158	);
1693	2159
1694	2160	cases.addCase(x: {
1695		const tc = cases.create("multiple files with private function error",
1696		\\const foo = @import("foo.zig");
	2161	const tc = cases.create(
	2162	"multiple files with private function error",
	2163	\\const foo = @import("foo.zig",);
1697	2164	\\
1698	2165	\\export fn callPrivFunction() void {
1699	2166	\\ foo.privateFunction();
1700	2167	\\}
1701	2168	,
1702	2169	".tmp_source.zig:4:8: error: 'privateFunction' is private",
1703		"foo.zig:1:1: note: declared here");
	2170	"foo.zig:1:1: note: declared here",
	2171	);
1704	2172
1705	2173	tc.addSourceFile("foo.zig",
1706	2174	\\fn privateFunction() void { }
...	...	@@ -1709,14 +2177,18 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1709	2177	break :x tc;
1710	2178	});
1711	2179
1712		cases.add("container init with non-type",
	2180	cases.add(
	2181	"container init with non-type",
1713	2182	\\const zero: i32 = 0;
1714	2183	\\const a = zero{1};
1715	2184	\\
1716	2185	\\export fn entry() usize { return @sizeOf(@typeOf(a)); }
1717		, ".tmp_source.zig:2:11: error: expected type, found 'i32'");
	2186	,
	2187	".tmp_source.zig:2:11: error: expected type, found 'i32'",
	2188	);
1718	2189
1719		cases.add("assign to constant field",
	2190	cases.add(
	2191	"assign to constant field",
1720	2192	\\const Foo = struct {
1721	2193	\\ field: i32,
1722	2194	\\};
...	...	@@ -1724,9 +2196,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1724	2196	\\ const f = Foo {.field = 1234,};
1725	2197	\\ f.field = 0;
1726	2198	\\}
1727		, ".tmp_source.zig:6:13: error: cannot assign to constant");
	2199	,
	2200	".tmp_source.zig:6:13: error: cannot assign to constant",
	2201	);
1728	2202
1729		cases.add("return from defer expression",
	2203	cases.add(
	2204	"return from defer expression",
1730	2205	\\pub fn testTrickyDefer() !void {
1731	2206	\\ defer canFail() catch {};
1732	2207	\\
...	...	@@ -1742,9 +2217,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1742	2217	\\}
1743	2218	\\
1744	2219	\\export fn entry() usize { return @sizeOf(@typeOf(testTrickyDefer)); }
1745		, ".tmp_source.zig:4:11: error: cannot return from defer expression");
	2220	,
	2221	".tmp_source.zig:4:11: error: cannot return from defer expression",
	2222	);
1746	2223
1747		cases.add("attempt to access var args out of bounds",
	2224	cases.add(
	2225	"attempt to access var args out of bounds",
1748	2226	\\fn add(args: ...) i32 {
1749	2227	\\ return args[0] + args[1];
1750	2228	\\}
...	...	@@ -1755,10 +2233,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1755	2233	\\
1756	2234	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1757	2235	,
1758		".tmp_source.zig:2:26: error: index 1 outside argument list of size 1",
1759		".tmp_source.zig:6:15: note: called from here");
	2236	".tmp_source.zig:2:26: error: index 1 outside argument list of size 1",
	2237	".tmp_source.zig:6:15: note: called from here",
	2238	);
1760	2239
1761		cases.add("pass integer literal to var args",
	2240	cases.add(
	2241	"pass integer literal to var args",
1762	2242	\\fn add(args: ...) i32 {
1763	2243	\\ var sum = i32(0);
1764	2244	\\ {comptime var i: usize = 0; inline while (i < args.len) : (i += 1) {
...	...	@@ -1772,32 +2252,44 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1772	2252	\\}
1773	2253	\\
1774	2254	\\export fn entry() usize { return @sizeOf(@typeOf(bar)); }
1775		, ".tmp_source.zig:10:16: error: compiler bug: integer and float literals in var args function must be casted");
	2255	,
	2256	".tmp_source.zig:10:16: error: compiler bug: integer and float literals in var args function must be casted",
	2257	);
1776	2258
1777		cases.add("assign too big number to u16",
	2259	cases.add(
	2260	"assign too big number to u16",
1778	2261	\\export fn foo() void {
1779	2262	\\ var vga_mem: u16 = 0xB8000;
1780	2263	\\}
1781		, ".tmp_source.zig:2:24: error: integer value 753664 cannot be implicitly casted to type 'u16'");
	2264	,
	2265	".tmp_source.zig:2:24: error: integer value 753664 cannot be implicitly casted to type 'u16'",
	2266	);
1782	2267
1783		cases.add("global variable alignment non power of 2",
	2268	cases.add(
	2269	"global variable alignment non power of 2",
1784	2270	\\const some_data: [100]u8 align(3) = undefined;
1785	2271	\\export fn entry() usize { return @sizeOf(@typeOf(some_data)); }
1786		, ".tmp_source.zig:1:32: error: alignment value 3 is not a power of 2");
	2272	,
	2273	".tmp_source.zig:1:32: error: alignment value 3 is not a power of 2",
	2274	);
1787	2275
1788		cases.add("function alignment non power of 2",
	2276	cases.add(
	2277	"function alignment non power of 2",
1789	2278	\\extern fn foo() align(3) void;
1790	2279	\\export fn entry() void { return foo(); }
1791		, ".tmp_source.zig:1:23: error: alignment value 3 is not a power of 2");
	2280	,
	2281	".tmp_source.zig:1:23: error: alignment value 3 is not a power of 2",
	2282	);
1792	2283
1793		cases.add("compile log",
	2284	cases.add(
	2285	"compile log",
1794	2286	\\export fn foo() void {
1795		\\ comptime bar(12, "hi");
	2287	\\ comptime bar(12, "hi",);
1796	2288	\\}
1797	2289	\\fn bar(a: i32, b: []const u8) void {
1798		\\ @compileLog("begin");
	2290	\\ @compileLog("begin",);
1799	2291	\\ @compileLog("a", a, "b", b);
1800		\\ @compileLog("end");
	2292	\\ @compileLog("end",);
1801	2293	\\}
1802	2294	,
1803	2295	".tmp_source.zig:5:5: error: found compile log statement",
...	...	@@ -1805,9 +2297,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1805	2297	".tmp_source.zig:6:5: error: found compile log statement",
1806	2298	".tmp_source.zig:2:17: note: called from here",
1807	2299	".tmp_source.zig:7:5: error: found compile log statement",
1808		".tmp_source.zig:2:17: note: called from here");
	2300	".tmp_source.zig:2:17: note: called from here",
	2301	);
1809	2302
1810		cases.add("casting bit offset pointer to regular pointer",
	2303	cases.add(
	2304	"casting bit offset pointer to regular pointer",
1811	2305	\\const BitField = packed struct {
1812	2306	\\ a: u3,
1813	2307	\\ b: u3,
...	...	@@ -1819,13 +2313,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1819	2313	\\}
1820	2314	\\
1821	2315	\\fn bar(x: &const u3) u3 {
1822		\\ return *x;
	2316	\\ return x.*;
1823	2317	\\}
1824	2318	\\
1825	2319	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1826		, ".tmp_source.zig:8:26: error: expected type '&const u3', found '&align(1:3:6) const u3'");
	2320	,
	2321	".tmp_source.zig:8:26: error: expected type '&const u3', found '&align(1:3:6) const u3'",
	2322	);
1827	2323
1828		cases.add("referring to a struct that is invalid",
	2324	cases.add(
	2325	"referring to a struct that is invalid",
1829	2326	\\const UsbDeviceRequest = struct {
1830	2327	\\ Type: u8,
1831	2328	\\};
...	...	@@ -1838,10 +2335,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1838	2335	\\ if (!ok) unreachable;
1839	2336	\\}
1840	2337	,
1841		".tmp_source.zig:10:14: error: unable to evaluate constant expression",
1842		".tmp_source.zig:6:20: note: called from here");
	2338	".tmp_source.zig:10:14: error: unable to evaluate constant expression",
	2339	".tmp_source.zig:6:20: note: called from here",
	2340	);
1843	2341
1844		cases.add("control flow uses comptime var at runtime",
	2342	cases.add(
	2343	"control flow uses comptime var at runtime",
1845	2344	\\export fn foo() void {
1846	2345	\\ comptime var i = 0;
1847	2346	\\ while (i < 5) : (i += 1) {
...	...	@@ -1851,68 +2350,94 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1851	2350	\\
1852	2351	\\fn bar() void { }
1853	2352	,
1854		".tmp_source.zig:3:5: error: control flow attempts to use compile-time variable at runtime",
1855		".tmp_source.zig:3:24: note: compile-time variable assigned here");
	2353	".tmp_source.zig:3:5: error: control flow attempts to use compile-time variable at runtime",
	2354	".tmp_source.zig:3:24: note: compile-time variable assigned here",
	2355	);
1856	2356
1857		cases.add("ignored return value",
	2357	cases.add(
	2358	"ignored return value",
1858	2359	\\export fn foo() void {
1859	2360	\\ bar();
1860	2361	\\}
1861	2362	\\fn bar() i32 { return 0; }
1862		, ".tmp_source.zig:2:8: error: expression value is ignored");
	2363	,
	2364	".tmp_source.zig:2:8: error: expression value is ignored",
	2365	);
1863	2366
1864		cases.add("ignored assert-err-ok return value",
	2367	cases.add(
	2368	"ignored assert-err-ok return value",
1865	2369	\\export fn foo() void {
1866	2370	\\ bar() catch unreachable;
1867	2371	\\}
1868	2372	\\fn bar() error!i32 { return 0; }
1869		, ".tmp_source.zig:2:11: error: expression value is ignored");
	2373	,
	2374	".tmp_source.zig:2:11: error: expression value is ignored",
	2375	);
1870	2376
1871		cases.add("ignored statement value",
	2377	cases.add(
	2378	"ignored statement value",
1872	2379	\\export fn foo() void {
1873	2380	\\ 1;
1874	2381	\\}
1875		, ".tmp_source.zig:2:5: error: expression value is ignored");
	2382	,
	2383	".tmp_source.zig:2:5: error: expression value is ignored",
	2384	);
1876	2385
1877		cases.add("ignored comptime statement value",
	2386	cases.add(
	2387	"ignored comptime statement value",
1878	2388	\\export fn foo() void {
1879	2389	\\ comptime {1;}
1880	2390	\\}
1881		, ".tmp_source.zig:2:15: error: expression value is ignored");
	2391	,
	2392	".tmp_source.zig:2:15: error: expression value is ignored",
	2393	);
1882	2394
1883		cases.add("ignored comptime value",
	2395	cases.add(
	2396	"ignored comptime value",
1884	2397	\\export fn foo() void {
1885	2398	\\ comptime 1;
1886	2399	\\}
1887		, ".tmp_source.zig:2:5: error: expression value is ignored");
	2400	,
	2401	".tmp_source.zig:2:5: error: expression value is ignored",
	2402	);
1888	2403
1889		cases.add("ignored defered statement value",
	2404	cases.add(
	2405	"ignored defered statement value",
1890	2406	\\export fn foo() void {
1891	2407	\\ defer {1;}
1892	2408	\\}
1893		, ".tmp_source.zig:2:12: error: expression value is ignored");
	2409	,
	2410	".tmp_source.zig:2:12: error: expression value is ignored",
	2411	);
1894	2412
1895		cases.add("ignored defered function call",
	2413	cases.add(
	2414	"ignored defered function call",
1896	2415	\\export fn foo() void {
1897	2416	\\ defer bar();
1898	2417	\\}
1899	2418	\\fn bar() error!i32 { return 0; }
1900		, ".tmp_source.zig:2:14: error: expression value is ignored");
	2419	,
	2420	".tmp_source.zig:2:14: error: expression value is ignored",
	2421	);
1901	2422
1902		cases.add("dereference an array",
	2423	cases.add(
	2424	"dereference an array",
1903	2425	\\var s_buffer: [10]u8 = undefined;
1904	2426	\\pub fn pass(in: []u8) []u8 {
1905	2427	\\ var out = &s_buffer;
1906		\\ *out[0] = in[0];
1907		\\ return (*out)[0..1];
	2428	\\ out[0].* = in[0];
	2429	\\ return out.*[0..1];
1908	2430	\\}
1909	2431	\\
1910	2432	\\export fn entry() usize { return @sizeOf(@typeOf(pass)); }
1911		, ".tmp_source.zig:4:5: error: attempt to dereference non pointer type '[10]u8'");
	2433	,
	2434	".tmp_source.zig:4:11: error: attempt to dereference non pointer type '[10]u8'",
	2435	);
1912	2436
1913		cases.add("pass const ptr to mutable ptr fn",
	2437	cases.add(
	2438	"pass const ptr to mutable ptr fn",
1914	2439	\\fn foo() bool {
1915		\\ const a = ([]const u8)("a");
	2440	\\ const a = ([]const u8)("a",);
1916	2441	\\ const b = &a;
1917	2442	\\ return ptrEql(b, b);
1918	2443	\\}
...	...	@@ -1921,18 +2446,22 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1921	2446	\\}
1922	2447	\\
1923	2448	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1924		, ".tmp_source.zig:4:19: error: expected type '&[]const u8', found '&const []const u8'");
	2449	,
	2450	".tmp_source.zig:4:19: error: expected type '&[]const u8', found '&const []const u8'",
	2451	);
1925	2452
1926	2453	cases.addCase(x: {
1927		const tc = cases.create("export collision",
1928		\\const foo = @import("foo.zig");
	2454	const tc = cases.create(
	2455	"export collision",
	2456	\\const foo = @import("foo.zig",);
1929	2457	\\
1930	2458	\\export fn bar() usize {
1931	2459	\\ return foo.baz;
1932	2460	\\}
1933	2461	,
1934	2462	"foo.zig:1:8: error: exported symbol collision: 'bar'",
1935		".tmp_source.zig:3:8: note: other symbol here");
	2463	".tmp_source.zig:3:8: note: other symbol here",
	2464	);
1936	2465
1937	2466	tc.addSourceFile("foo.zig",
1938	2467	\\export fn bar() void {}
...	...	@@ -1942,35 +2471,48 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1942	2471	break :x tc;
1943	2472	});
1944	2473
1945		cases.add("pass non-copyable type by value to function",
	2474	cases.add(
	2475	"pass non-copyable type by value to function",
1946	2476	\\const Point = struct { x: i32, y: i32, };
1947	2477	\\fn foo(p: Point) void { }
1948	2478	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1949		, ".tmp_source.zig:2:11: error: type 'Point' is not copyable; cannot pass by value");
	2479	,
	2480	".tmp_source.zig:2:11: error: type 'Point' is not copyable; cannot pass by value",
	2481	);
1950	2482
1951		cases.add("implicit cast from array to mutable slice",
	2483	cases.add(
	2484	"implicit cast from array to mutable slice",
1952	2485	\\var global_array: [10]i32 = undefined;
1953	2486	\\fn foo(param: []i32) void {}
1954	2487	\\export fn entry() void {
1955	2488	\\ foo(global_array);
1956	2489	\\}
1957		, ".tmp_source.zig:4:9: error: expected type '[]i32', found '[10]i32'");
	2490	,
	2491	".tmp_source.zig:4:9: error: expected type '[]i32', found '[10]i32'",
	2492	);
1958	2493
1959		cases.add("ptrcast to non-pointer",
	2494	cases.add(
	2495	"ptrcast to non-pointer",
1960	2496	\\export fn entry(a: &i32) usize {
1961	2497	\\ return @ptrCast(usize, a);
1962	2498	\\}
1963		, ".tmp_source.zig:2:21: error: expected pointer, found 'usize'");
	2499	,
	2500	".tmp_source.zig:2:21: error: expected pointer, found 'usize'",
	2501	);
1964	2502
1965		cases.add("too many error values to cast to small integer",
	2503	cases.add(
	2504	"too many error values to cast to small integer",
1966	2505	\\const Error = error { A, B, C, D, E, F, G, H };
1967	2506	\\fn foo(e: Error) u2 {
1968	2507	\\ return u2(e);
1969	2508	\\}
1970	2509	\\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
1971		, ".tmp_source.zig:3:14: error: too many error values to fit in 'u2'");
	2510	,
	2511	".tmp_source.zig:3:14: error: too many error values to fit in 'u2'",
	2512	);
1972	2513
1973		cases.add("asm at compile time",
	2514	cases.add(
	2515	"asm at compile time",
1974	2516	\\comptime {
1975	2517	\\ doSomeAsm();
1976	2518	\\}
...	...	@@ -1982,48 +2524,66 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
1982	2524	\\ \\.set aoeu, derp;
1983	2525	\\ );
1984	2526	\\}
1985		, ".tmp_source.zig:6:5: error: unable to evaluate constant expression");
	2527	,
	2528	".tmp_source.zig:6:5: error: unable to evaluate constant expression",
	2529	);
1986	2530
1987		cases.add("invalid member of builtin enum",
1988		\\const builtin = @import("builtin");
	2531	cases.add(
	2532	"invalid member of builtin enum",
	2533	\\const builtin = @import("builtin",);
1989	2534	\\export fn entry() void {
1990	2535	\\ const foo = builtin.Arch.x86;
1991	2536	\\}
1992		, ".tmp_source.zig:3:29: error: container 'Arch' has no member called 'x86'");
	2537	,
	2538	".tmp_source.zig:3:29: error: container 'Arch' has no member called 'x86'",
	2539	);
1993	2540
1994		cases.add("int to ptr of 0 bits",
	2541	cases.add(
	2542	"int to ptr of 0 bits",
1995	2543	\\export fn foo() void {
1996	2544	\\ var x: usize = 0x1000;
1997	2545	\\ var y: &void = @intToPtr(&void, x);
1998	2546	\\}
1999		, ".tmp_source.zig:3:31: error: type '&void' has 0 bits and cannot store information");
	2547	,
	2548	".tmp_source.zig:3:31: error: type '&void' has 0 bits and cannot store information",
	2549	);
2000	2550
2001		cases.add("@fieldParentPtr - non struct",
	2551	cases.add(
	2552	"@fieldParentPtr - non struct",
2002	2553	\\const Foo = i32;
2003	2554	\\export fn foo(a: &i32) &Foo {
2004	2555	\\ return @fieldParentPtr(Foo, "a", a);
2005	2556	\\}
2006		, ".tmp_source.zig:3:28: error: expected struct type, found 'i32'");
	2557	,
	2558	".tmp_source.zig:3:28: error: expected struct type, found 'i32'",
	2559	);
2007	2560
2008		cases.add("@fieldParentPtr - bad field name",
	2561	cases.add(
	2562	"@fieldParentPtr - bad field name",
2009	2563	\\const Foo = extern struct {
2010	2564	\\ derp: i32,
2011	2565	\\};
2012	2566	\\export fn foo(a: &i32) &Foo {
2013	2567	\\ return @fieldParentPtr(Foo, "a", a);
2014	2568	\\}
2015		, ".tmp_source.zig:5:33: error: struct 'Foo' has no field 'a'");
	2569	,
	2570	".tmp_source.zig:5:33: error: struct 'Foo' has no field 'a'",
	2571	);
2016	2572
2017		cases.add("@fieldParentPtr - field pointer is not pointer",
	2573	cases.add(
	2574	"@fieldParentPtr - field pointer is not pointer",
2018	2575	\\const Foo = extern struct {
2019	2576	\\ a: i32,
2020	2577	\\};
2021	2578	\\export fn foo(a: i32) &Foo {
2022	2579	\\ return @fieldParentPtr(Foo, "a", a);
2023	2580	\\}
2024		, ".tmp_source.zig:5:38: error: expected pointer, found 'i32'");
	2581	,
	2582	".tmp_source.zig:5:38: error: expected pointer, found 'i32'",
	2583	);
2025	2584
2026		cases.add("@fieldParentPtr - comptime field ptr not based on struct",
	2585	cases.add(
	2586	"@fieldParentPtr - comptime field ptr not based on struct",
2027	2587	\\const Foo = struct {
2028	2588	\\ a: i32,
2029	2589	\\ b: i32,
...	...	@@ -2034,9 +2594,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2034	2594	\\ const field_ptr = @intToPtr(&i32, 0x1234);
2035	2595	\\ const another_foo_ptr = @fieldParentPtr(Foo, "b", field_ptr);
2036	2596	\\}
2037		, ".tmp_source.zig:9:55: error: pointer value not based on parent struct");
	2597	,
	2598	".tmp_source.zig:9:55: error: pointer value not based on parent struct",
	2599	);
2038	2600
2039		cases.add("@fieldParentPtr - comptime wrong field index",
	2601	cases.add(
	2602	"@fieldParentPtr - comptime wrong field index",
2040	2603	\\const Foo = struct {
2041	2604	\\ a: i32,
2042	2605	\\ b: i32,
...	...	@@ -2046,76 +2609,100 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2046	2609	\\comptime {
2047	2610	\\ const another_foo_ptr = @fieldParentPtr(Foo, "b", &foo.a);
2048	2611	\\}
2049		, ".tmp_source.zig:8:29: error: field 'b' has index 1 but pointer value is index 0 of struct 'Foo'");
	2612	,
	2613	".tmp_source.zig:8:29: error: field 'b' has index 1 but pointer value is index 0 of struct 'Foo'",
	2614	);
2050	2615
2051		cases.add("@offsetOf - non struct",
	2616	cases.add(
	2617	"@offsetOf - non struct",
2052	2618	\\const Foo = i32;
2053	2619	\\export fn foo() usize {
2054		\\ return @offsetOf(Foo, "a");
	2620	\\ return @offsetOf(Foo, "a",);
2055	2621	\\}
2056		, ".tmp_source.zig:3:22: error: expected struct type, found 'i32'");
	2622	,
	2623	".tmp_source.zig:3:22: error: expected struct type, found 'i32'",
	2624	);
2057	2625
2058		cases.add("@offsetOf - bad field name",
	2626	cases.add(
	2627	"@offsetOf - bad field name",
2059	2628	\\const Foo = struct {
2060	2629	\\ derp: i32,
2061	2630	\\};
2062	2631	\\export fn foo() usize {
2063		\\ return @offsetOf(Foo, "a");
	2632	\\ return @offsetOf(Foo, "a",);
2064	2633	\\}
2065		, ".tmp_source.zig:5:27: error: struct 'Foo' has no field 'a'");
	2634	,
	2635	".tmp_source.zig:5:27: error: struct 'Foo' has no field 'a'",
	2636	);
2066	2637
2067		cases.addExe("missing main fn in executable",
	2638	cases.addExe(
	2639	"missing main fn in executable",
2068	2640	\\
2069		, "error: no member named 'main' in '");
	2641	,
	2642	"error: no member named 'main' in '",
	2643	);
2070	2644
2071		cases.addExe("private main fn",
	2645	cases.addExe(
	2646	"private main fn",
2072	2647	\\fn main() void {}
2073	2648	,
2074	2649	"error: 'main' is private",
2075		".tmp_source.zig:1:1: note: declared here");
	2650	".tmp_source.zig:1:1: note: declared here",
	2651	);
2076	2652
2077		cases.add("setting a section on an extern variable",
	2653	cases.add(
	2654	"setting a section on an extern variable",
2078	2655	\\extern var foo: i32 section(".text2");
2079	2656	\\export fn entry() i32 {
2080	2657	\\ return foo;
2081	2658	\\}
2082	2659	,
2083		".tmp_source.zig:1:29: error: cannot set section of external variable 'foo'");
	2660	".tmp_source.zig:1:29: error: cannot set section of external variable 'foo'",
	2661	);
2084	2662
2085		cases.add("setting a section on a local variable",
	2663	cases.add(
	2664	"setting a section on a local variable",
2086	2665	\\export fn entry() i32 {
2087	2666	\\ var foo: i32 section(".text2") = 1234;
2088	2667	\\ return foo;
2089	2668	\\}
2090	2669	,
2091		".tmp_source.zig:2:26: error: cannot set section of local variable 'foo'");
	2670	".tmp_source.zig:2:26: error: cannot set section of local variable 'foo'",
	2671	);
2092	2672
2093		cases.add("setting a section on an extern fn",
	2673	cases.add(
	2674	"setting a section on an extern fn",
2094	2675	\\extern fn foo() section(".text2") void;
2095	2676	\\export fn entry() void {
2096	2677	\\ foo();
2097	2678	\\}
2098	2679	,
2099		".tmp_source.zig:1:25: error: cannot set section of external function 'foo'");
	2680	".tmp_source.zig:1:25: error: cannot set section of external function 'foo'",
	2681	);
2100	2682
2101		cases.add("returning address of local variable - simple",
	2683	cases.add(
	2684	"returning address of local variable - simple",
2102	2685	\\export fn foo() &i32 {
2103	2686	\\ var a: i32 = undefined;
2104	2687	\\ return &a;
2105	2688	\\}
2106	2689	,
2107		".tmp_source.zig:3:13: error: function returns address of local variable");
	2690	".tmp_source.zig:3:13: error: function returns address of local variable",
	2691	);
2108	2692
2109		cases.add("returning address of local variable - phi",
	2693	cases.add(
	2694	"returning address of local variable - phi",
2110	2695	\\export fn foo(c: bool) &i32 {
2111	2696	\\ var a: i32 = undefined;
2112	2697	\\ var b: i32 = undefined;
2113	2698	\\ return if (c) &a else &b;
2114	2699	\\}
2115	2700	,
2116		".tmp_source.zig:4:12: error: function returns address of local variable");
	2701	".tmp_source.zig:4:12: error: function returns address of local variable",
	2702	);
2117	2703
2118		cases.add("inner struct member shadowing outer struct member",
	2704	cases.add(
	2705	"inner struct member shadowing outer struct member",
2119	2706	\\fn A() type {
2120	2707	\\ return struct {
2121	2708	\\ b: B(),
...	...	@@ -2137,57 +2724,71 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2137	2724	\\}
2138	2725	,
2139	2726	".tmp_source.zig:9:17: error: redefinition of 'Self'",
2140		".tmp_source.zig:5:9: note: previous definition is here");
	2727	".tmp_source.zig:5:9: note: previous definition is here",
	2728	);
2141	2729
2142		cases.add("while expected bool, got nullable",
	2730	cases.add(
	2731	"while expected bool, got nullable",
2143	2732	\\export fn foo() void {
2144	2733	\\ while (bar()) {}
2145	2734	\\}
2146	2735	\\fn bar() ?i32 { return 1; }
2147	2736	,
2148		".tmp_source.zig:2:15: error: expected type 'bool', found '?i32'");
	2737	".tmp_source.zig:2:15: error: expected type 'bool', found '?i32'",
	2738	);
2149	2739
2150		cases.add("while expected bool, got error union",
	2740	cases.add(
	2741	"while expected bool, got error union",
2151	2742	\\export fn foo() void {
2152	2743	\\ while (bar()) {}
2153	2744	\\}
2154	2745	\\fn bar() error!i32 { return 1; }
2155	2746	,
2156		".tmp_source.zig:2:15: error: expected type 'bool', found 'error!i32'");
	2747	".tmp_source.zig:2:15: error: expected type 'bool', found 'error!i32'",
	2748	);
2157	2749
2158		cases.add("while expected nullable, got bool",
	2750	cases.add(
	2751	"while expected nullable, got bool",
2159	2752	\\export fn foo() void {
2160	2753	\\ while (bar()) \|x\| {}
2161	2754	\\}
2162	2755	\\fn bar() bool { return true; }
2163	2756	,
2164		".tmp_source.zig:2:15: error: expected nullable type, found 'bool'");
	2757	".tmp_source.zig:2:15: error: expected nullable type, found 'bool'",
	2758	);
2165	2759
2166		cases.add("while expected nullable, got error union",
	2760	cases.add(
	2761	"while expected nullable, got error union",
2167	2762	\\export fn foo() void {
2168	2763	\\ while (bar()) \|x\| {}
2169	2764	\\}
2170	2765	\\fn bar() error!i32 { return 1; }
2171	2766	,
2172		".tmp_source.zig:2:15: error: expected nullable type, found 'error!i32'");
	2767	".tmp_source.zig:2:15: error: expected nullable type, found 'error!i32'",
	2768	);
2173	2769
2174		cases.add("while expected error union, got bool",
	2770	cases.add(
	2771	"while expected error union, got bool",
2175	2772	\\export fn foo() void {
2176	2773	\\ while (bar()) \|x\| {} else \|err\| {}
2177	2774	\\}
2178	2775	\\fn bar() bool { return true; }
2179	2776	,
2180		".tmp_source.zig:2:15: error: expected error union type, found 'bool'");
	2777	".tmp_source.zig:2:15: error: expected error union type, found 'bool'",
	2778	);
2181	2779
2182		cases.add("while expected error union, got nullable",
	2780	cases.add(
	2781	"while expected error union, got nullable",
2183	2782	\\export fn foo() void {
2184	2783	\\ while (bar()) \|x\| {} else \|err\| {}
2185	2784	\\}
2186	2785	\\fn bar() ?i32 { return 1; }
2187	2786	,
2188		".tmp_source.zig:2:15: error: expected error union type, found '?i32'");
	2787	".tmp_source.zig:2:15: error: expected error union type, found '?i32'",
	2788	);
2189	2789
2190		cases.add("inline fn calls itself indirectly",
	2790	cases.add(
	2791	"inline fn calls itself indirectly",
2191	2792	\\export fn foo() void {
2192	2793	\\ bar();
2193	2794	\\}
...	...	@@ -2201,91 +2802,113 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2201	2802	\\}
2202	2803	\\extern fn quux() void;
2203	2804	,
2204		".tmp_source.zig:4:8: error: unable to inline function");
	2805	".tmp_source.zig:4:8: error: unable to inline function",
	2806	);
2205	2807
2206		cases.add("save reference to inline function",
	2808	cases.add(
	2809	"save reference to inline function",
2207	2810	\\export fn foo() void {
2208	2811	\\ quux(@ptrToInt(bar));
2209	2812	\\}
2210	2813	\\inline fn bar() void { }
2211	2814	\\extern fn quux(usize) void;
2212	2815	,
2213		".tmp_source.zig:4:8: error: unable to inline function");
	2816	".tmp_source.zig:4:8: error: unable to inline function",
	2817	);
2214	2818
2215		cases.add("signed integer division",
	2819	cases.add(
	2820	"signed integer division",
2216	2821	\\export fn foo(a: i32, b: i32) i32 {
2217	2822	\\ return a / b;
2218	2823	\\}
2219	2824	,
2220		".tmp_source.zig:2:14: error: division with 'i32' and 'i32': signed integers must use @divTrunc, @divFloor, or @divExact");
	2825	".tmp_source.zig:2:14: error: division with 'i32' and 'i32': signed integers must use @divTrunc, @divFloor, or @divExact",
	2826	);
2221	2827
2222		cases.add("signed integer remainder division",
	2828	cases.add(
	2829	"signed integer remainder division",
2223	2830	\\export fn foo(a: i32, b: i32) i32 {
2224	2831	\\ return a % b;
2225	2832	\\}
2226	2833	,
2227		".tmp_source.zig:2:14: error: remainder division with 'i32' and 'i32': signed integers and floats must use @rem or @mod");
	2834	".tmp_source.zig:2:14: error: remainder division with 'i32' and 'i32': signed integers and floats must use @rem or @mod",
	2835	);
2228	2836
2229		cases.add("cast negative value to unsigned integer",
	2837	cases.add(
	2838	"cast negative value to unsigned integer",
2230	2839	\\comptime {
2231	2840	\\ const value: i32 = -1;
2232	2841	\\ const unsigned = u32(value);
2233	2842	\\}
2234	2843	,
2235		".tmp_source.zig:3:25: error: attempt to cast negative value to unsigned integer");
	2844	".tmp_source.zig:3:25: error: attempt to cast negative value to unsigned integer",
	2845	);
2236	2846
2237		cases.add("compile-time division by zero",
	2847	cases.add(
	2848	"compile-time division by zero",
2238	2849	\\comptime {
2239	2850	\\ const a: i32 = 1;
2240	2851	\\ const b: i32 = 0;
2241	2852	\\ const c = a / b;
2242	2853	\\}
2243	2854	,
2244		".tmp_source.zig:4:17: error: division by zero");
	2855	".tmp_source.zig:4:17: error: division by zero",
	2856	);
2245	2857
2246		cases.add("compile-time remainder division by zero",
	2858	cases.add(
	2859	"compile-time remainder division by zero",
2247	2860	\\comptime {
2248	2861	\\ const a: i32 = 1;
2249	2862	\\ const b: i32 = 0;
2250	2863	\\ const c = a % b;
2251	2864	\\}
2252	2865	,
2253		".tmp_source.zig:4:17: error: division by zero");
	2866	".tmp_source.zig:4:17: error: division by zero",
	2867	);
2254	2868
2255		cases.add("compile-time integer cast truncates bits",
	2869	cases.add(
	2870	"compile-time integer cast truncates bits",
2256	2871	\\comptime {
2257	2872	\\ const spartan_count: u16 = 300;
2258	2873	\\ const byte = u8(spartan_count);
2259	2874	\\}
2260	2875	,
2261		".tmp_source.zig:3:20: error: cast from 'u16' to 'u8' truncates bits");
	2876	".tmp_source.zig:3:20: error: cast from 'u16' to 'u8' truncates bits",
	2877	);
2262	2878
2263		cases.add("@setRuntimeSafety twice for same scope",
	2879	cases.add(
	2880	"@setRuntimeSafety twice for same scope",
2264	2881	\\export fn foo() void {
2265	2882	\\ @setRuntimeSafety(false);
2266	2883	\\ @setRuntimeSafety(false);
2267	2884	\\}
2268	2885	,
2269	2886	".tmp_source.zig:3:5: error: runtime safety set twice for same scope",
2270		".tmp_source.zig:2:5: note: first set here");
	2887	".tmp_source.zig:2:5: note: first set here",
	2888	);
2271	2889
2272		cases.add("@setFloatMode twice for same scope",
	2890	cases.add(
	2891	"@setFloatMode twice for same scope",
2273	2892	\\export fn foo() void {
2274	2893	\\ @setFloatMode(this, @import("builtin").FloatMode.Optimized);
2275	2894	\\ @setFloatMode(this, @import("builtin").FloatMode.Optimized);
2276	2895	\\}
2277	2896	,
2278	2897	".tmp_source.zig:3:5: error: float mode set twice for same scope",
2279		".tmp_source.zig:2:5: note: first set here");
	2898	".tmp_source.zig:2:5: note: first set here",
	2899	);
2280	2900
2281		cases.add("array access of type",
	2901	cases.add(
	2902	"array access of type",
2282	2903	\\export fn foo() void {
2283	2904	\\ var b: u8[40] = undefined;
2284	2905	\\}
2285	2906	,
2286		".tmp_source.zig:2:14: error: array access of non-array type 'type'");
	2907	".tmp_source.zig:2:14: error: array access of non-array type 'type'",
	2908	);
2287	2909
2288		cases.add("cannot break out of defer expression",
	2910	cases.add(
	2911	"cannot break out of defer expression",
2289	2912	\\export fn foo() void {
2290	2913	\\ while (true) {
2291	2914	\\ defer {
...	...	@@ -2294,9 +2917,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2294	2917	\\ }
2295	2918	\\}
2296	2919	,
2297		".tmp_source.zig:4:13: error: cannot break out of defer expression");
	2920	".tmp_source.zig:4:13: error: cannot break out of defer expression",
	2921	);
2298	2922
2299		cases.add("cannot continue out of defer expression",
	2923	cases.add(
	2924	"cannot continue out of defer expression",
2300	2925	\\export fn foo() void {
2301	2926	\\ while (true) {
2302	2927	\\ defer {
...	...	@@ -2305,9 +2930,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2305	2930	\\ }
2306	2931	\\}
2307	2932	,
2308		".tmp_source.zig:4:13: error: cannot continue out of defer expression");
	2933	".tmp_source.zig:4:13: error: cannot continue out of defer expression",
	2934	);
2309	2935
2310		cases.add("calling a var args function only known at runtime",
	2936	cases.add(
	2937	"calling a var args function only known at runtime",
2311	2938	\\var foos = []fn(...) void { foo1, foo2 };
2312	2939	\\
2313	2940	\\fn foo1(args: ...) void {}
...	...	@@ -2317,9 +2944,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2317	2944	\\ foos[0]();
2318	2945	\\}
2319	2946	,
2320		".tmp_source.zig:7:9: error: calling a generic function requires compile-time known function value");
	2947	".tmp_source.zig:7:9: error: calling a generic function requires compile-time known function value",
	2948	);
2321	2949
2322		cases.add("calling a generic function only known at runtime",
	2950	cases.add(
	2951	"calling a generic function only known at runtime",
2323	2952	\\var foos = []fn(var) void { foo1, foo2 };
2324	2953	\\
2325	2954	\\fn foo1(arg: var) void {}
...	...	@@ -2329,10 +2958,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2329	2958	\\ foos[0](true);
2330	2959	\\}
2331	2960	,
2332		".tmp_source.zig:7:9: error: calling a generic function requires compile-time known function value");
	2961	".tmp_source.zig:7:9: error: calling a generic function requires compile-time known function value",
	2962	);
2333	2963
2334		cases.add("@compileError shows traceback of references that caused it",
2335		\\const foo = @compileError("aoeu");
	2964	cases.add(
	2965	"@compileError shows traceback of references that caused it",
	2966	\\const foo = @compileError("aoeu",);
2336	2967	\\
2337	2968	\\const bar = baz + foo;
2338	2969	\\const baz = 1;
...	...	@@ -2343,9 +2974,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2343	2974	,
2344	2975	".tmp_source.zig:1:13: error: aoeu",
2345	2976	".tmp_source.zig:3:19: note: referenced here",
2346		".tmp_source.zig:7:12: note: referenced here");
	2977	".tmp_source.zig:7:12: note: referenced here",
	2978	);
2347	2979
2348		cases.add("instantiating an undefined value for an invalid struct that contains itself",
	2980	cases.add(
	2981	"instantiating an undefined value for an invalid struct that contains itself",
2349	2982	\\const Foo = struct {
2350	2983	\\ x: Foo,
2351	2984	\\};
...	...	@@ -2356,73 +2989,93 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2356	2989	\\ return @sizeOf(@typeOf(foo.x));
2357	2990	\\}
2358	2991	,
2359		".tmp_source.zig:1:13: error: struct 'Foo' contains itself");
	2992	".tmp_source.zig:1:13: error: struct 'Foo' contains itself",
	2993	);
2360	2994
2361		cases.add("float literal too large error",
	2995	cases.add(
	2996	"float literal too large error",
2362	2997	\\comptime {
2363	2998	\\ const a = 0x1.0p16384;
2364	2999	\\}
2365	3000	,
2366		".tmp_source.zig:2:15: error: float literal out of range of any type");
	3001	".tmp_source.zig:2:15: error: float literal out of range of any type",
	3002	);
2367	3003
2368		cases.add("float literal too small error (denormal)",
	3004	cases.add(
	3005	"float literal too small error (denormal)",
2369	3006	\\comptime {
2370	3007	\\ const a = 0x1.0p-16384;
2371	3008	\\}
2372	3009	,
2373		".tmp_source.zig:2:15: error: float literal out of range of any type");
	3010	".tmp_source.zig:2:15: error: float literal out of range of any type",
	3011	);
2374	3012
2375		cases.add("explicit cast float literal to integer when there is a fraction component",
	3013	cases.add(
	3014	"explicit cast float literal to integer when there is a fraction component",
2376	3015	\\export fn entry() i32 {
2377	3016	\\ return i32(12.34);
2378	3017	\\}
2379	3018	,
2380		".tmp_source.zig:2:16: error: fractional component prevents float value 12.340000 from being casted to type 'i32'");
	3019	".tmp_source.zig:2:16: error: fractional component prevents float value 12.340000 from being casted to type 'i32'",
	3020	);
2381	3021
2382		cases.add("non pointer given to @ptrToInt",
	3022	cases.add(
	3023	"non pointer given to @ptrToInt",
2383	3024	\\export fn entry(x: i32) usize {
2384	3025	\\ return @ptrToInt(x);
2385	3026	\\}
2386	3027	,
2387		".tmp_source.zig:2:22: error: expected pointer, found 'i32'");
	3028	".tmp_source.zig:2:22: error: expected pointer, found 'i32'",
	3029	);
2388	3030
2389		cases.add("@shlExact shifts out 1 bits",
	3031	cases.add(
	3032	"@shlExact shifts out 1 bits",
2390	3033	\\comptime {
2391	3034	\\ const x = @shlExact(u8(0b01010101), 2);
2392	3035	\\}
2393	3036	,
2394		".tmp_source.zig:2:15: error: operation caused overflow");
	3037	".tmp_source.zig:2:15: error: operation caused overflow",
	3038	);
2395	3039
2396		cases.add("@shrExact shifts out 1 bits",
	3040	cases.add(
	3041	"@shrExact shifts out 1 bits",
2397	3042	\\comptime {
2398	3043	\\ const x = @shrExact(u8(0b10101010), 2);
2399	3044	\\}
2400	3045	,
2401		".tmp_source.zig:2:15: error: exact shift shifted out 1 bits");
	3046	".tmp_source.zig:2:15: error: exact shift shifted out 1 bits",
	3047	);
2402	3048
2403		cases.add("shifting without int type or comptime known",
	3049	cases.add(
	3050	"shifting without int type or comptime known",
2404	3051	\\export fn entry(x: u8) u8 {
2405	3052	\\ return 0x11 << x;
2406	3053	\\}
2407	3054	,
2408		".tmp_source.zig:2:17: error: LHS of shift must be an integer type, or RHS must be compile-time known");
	3055	".tmp_source.zig:2:17: error: LHS of shift must be an integer type, or RHS must be compile-time known",
	3056	);
2409	3057
2410		cases.add("shifting RHS is log2 of LHS int bit width",
	3058	cases.add(
	3059	"shifting RHS is log2 of LHS int bit width",
2411	3060	\\export fn entry(x: u8, y: u8) u8 {
2412	3061	\\ return x << y;
2413	3062	\\}
2414	3063	,
2415		".tmp_source.zig:2:17: error: expected type 'u3', found 'u8'");
	3064	".tmp_source.zig:2:17: error: expected type 'u3', found 'u8'",
	3065	);
2416	3066
2417		cases.add("globally shadowing a primitive type",
	3067	cases.add(
	3068	"globally shadowing a primitive type",
2418	3069	\\const u16 = @intType(false, 8);
2419	3070	\\export fn entry() void {
2420	3071	\\ const a: u16 = 300;
2421	3072	\\}
2422	3073	,
2423		".tmp_source.zig:1:1: error: declaration shadows type 'u16'");
	3074	".tmp_source.zig:1:1: error: declaration shadows type 'u16'",
	3075	);
2424	3076
2425		cases.add("implicitly increasing pointer alignment",
	3077	cases.add(
	3078	"implicitly increasing pointer alignment",
2426	3079	\\const Foo = packed struct {
2427	3080	\\ a: u8,
2428	3081	\\ b: u32,
...	...	@@ -2434,12 +3087,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2434	3087	\\}
2435	3088	\\
2436	3089	\\fn bar(x: &u32) void {
2437		\\ *x += 1;
	3090	\\ x.* += 1;
2438	3091	\\}
2439	3092	,
2440		".tmp_source.zig:8:13: error: expected type '&u32', found '&align(1) u32'");
	3093	".tmp_source.zig:8:13: error: expected type '&u32', found '&align(1) u32'",
	3094	);
2441	3095
2442		cases.add("implicitly increasing slice alignment",
	3096	cases.add(
	3097	"implicitly increasing slice alignment",
2443	3098	\\const Foo = packed struct {
2444	3099	\\ a: u8,
2445	3100	\\ b: u32,
...	...	@@ -2455,20 +3110,24 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2455	3110	\\ x[0] += 1;
2456	3111	\\}
2457	3112	,
2458		".tmp_source.zig:9:17: error: expected type '[]u32', found '[]align(1) u32'");
	3113	".tmp_source.zig:9:17: error: expected type '[]u32', found '[]align(1) u32'",
	3114	);
2459	3115
2460		cases.add("increase pointer alignment in @ptrCast",
	3116	cases.add(
	3117	"increase pointer alignment in @ptrCast",
2461	3118	\\export fn entry() u32 {
2462	3119	\\ var bytes: [4]u8 = []u8{0x01, 0x02, 0x03, 0x04};
2463	3120	\\ const ptr = @ptrCast(&u32, &bytes[0]);
2464		\\ return *ptr;
	3121	\\ return ptr.*;
2465	3122	\\}
2466	3123	,
2467	3124	".tmp_source.zig:3:17: error: cast increases pointer alignment",
2468	3125	".tmp_source.zig:3:38: note: '&u8' has alignment 1",
2469		".tmp_source.zig:3:27: note: '&u32' has alignment 4");
	3126	".tmp_source.zig:3:27: note: '&u32' has alignment 4",
	3127	);
2470	3128
2471		cases.add("increase pointer alignment in slice resize",
	3129	cases.add(
	3130	"increase pointer alignment in slice resize",
2472	3131	\\export fn entry() u32 {
2473	3132	\\ var bytes = []u8{0x01, 0x02, 0x03, 0x04};
2474	3133	\\ return ([]u32)(bytes[0..])[0];
...	...	@@ -2476,16 +3135,20 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2476	3135	,
2477	3136	".tmp_source.zig:3:19: error: cast increases pointer alignment",
2478	3137	".tmp_source.zig:3:19: note: '[]u8' has alignment 1",
2479		".tmp_source.zig:3:19: note: '[]u32' has alignment 4");
	3138	".tmp_source.zig:3:19: note: '[]u32' has alignment 4",
	3139	);
2480	3140
2481		cases.add("@alignCast expects pointer or slice",
	3141	cases.add(
	3142	"@alignCast expects pointer or slice",
2482	3143	\\export fn entry() void {
2483	3144	\\ @alignCast(4, u32(3));
2484	3145	\\}
2485	3146	,
2486		".tmp_source.zig:2:22: error: expected pointer or slice, found 'u32'");
	3147	".tmp_source.zig:2:22: error: expected pointer or slice, found 'u32'",
	3148	);
2487	3149
2488		cases.add("passing an under-aligned function pointer",
	3150	cases.add(
	3151	"passing an under-aligned function pointer",
2489	3152	\\export fn entry() void {
2490	3153	\\ testImplicitlyDecreaseFnAlign(alignedSmall, 1234);
2491	3154	\\}
...	...	@@ -2494,9 +3157,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2494	3157	\\}
2495	3158	\\fn alignedSmall() align(4) i32 { return 1234; }
2496	3159	,
2497		".tmp_source.zig:2:35: error: expected type 'fn() align(8) i32', found 'fn() align(4) i32'");
	3160	".tmp_source.zig:2:35: error: expected type 'fn() align(8) i32', found 'fn() align(4) i32'",
	3161	);
2498	3162
2499		cases.add("passing a not-aligned-enough pointer to cmpxchg",
	3163	cases.add(
	3164	"passing a not-aligned-enough pointer to cmpxchg",
2500	3165	\\const AtomicOrder = @import("builtin").AtomicOrder;
2501	3166	\\export fn entry() bool {
2502	3167	\\ var x: i32 align(1) = 1234;
...	...	@@ -2504,16 +3169,20 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2504	3169	\\ return x == 5678;
2505	3170	\\}
2506	3171	,
2507		".tmp_source.zig:4:32: error: expected type '&i32', found '&align(1) i32'");
	3172	".tmp_source.zig:4:32: error: expected type '&i32', found '&align(1) i32'",
	3173	);
2508	3174
2509		cases.add("wrong size to an array literal",
	3175	cases.add(
	3176	"wrong size to an array literal",
2510	3177	\\comptime {
2511	3178	\\ const array = [2]u8{1, 2, 3};
2512	3179	\\}
2513	3180	,
2514		".tmp_source.zig:2:24: error: expected [2]u8 literal, found [3]u8 literal");
	3181	".tmp_source.zig:2:24: error: expected [2]u8 literal, found [3]u8 literal",
	3182	);
2515	3183
2516		cases.add("@setEvalBranchQuota in non-root comptime execution context",
	3184	cases.add(
	3185	"@setEvalBranchQuota in non-root comptime execution context",
2517	3186	\\comptime {
2518	3187	\\ foo();
2519	3188	\\}
...	...	@@ -2523,9 +3192,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2523	3192	,
2524	3193	".tmp_source.zig:5:5: error: @setEvalBranchQuota must be called from the top of the comptime stack",
2525	3194	".tmp_source.zig:2:8: note: called from here",
2526		".tmp_source.zig:1:10: note: called from here");
	3195	".tmp_source.zig:1:10: note: called from here",
	3196	);
2527	3197
2528		cases.add("wrong pointer implicitly casted to pointer to @OpaqueType()",
	3198	cases.add(
	3199	"wrong pointer implicitly casted to pointer to @OpaqueType()",
2529	3200	\\const Derp = @OpaqueType();
2530	3201	\\extern fn bar(d: &Derp) void;
2531	3202	\\export fn foo() void {
...	...	@@ -2533,23 +3204,25 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2533	3204	\\ bar(@ptrCast(&c_void, &x));
2534	3205	\\}
2535	3206	,
2536		".tmp_source.zig:5:9: error: expected type '&Derp', found '&c_void'");
	3207	".tmp_source.zig:5:9: error: expected type '&Derp', found '&c_void'",
	3208	);
2537	3209
2538		cases.add("non-const variables of things that require const variables",
	3210	cases.add(
	3211	"non-const variables of things that require const variables",
2539	3212	\\const Opaque = @OpaqueType();
2540	3213	\\
2541	3214	\\export fn entry(opaque: &Opaque) void {
2542	3215	\\ var m2 = &2;
2543		\\ const y: u32 = *m2;
	3216	\\ const y: u32 = m2.*;
2544	3217	\\
2545	3218	\\ var a = undefined;
2546	3219	\\ var b = 1;
2547	3220	\\ var c = 1.0;
2548	3221	\\ var d = this;
2549	3222	\\ var e = null;
2550		\\ var f = *opaque;
	3223	\\ var f = opaque.*;
2551	3224	\\ var g = i32;
2552		\\ var h = @import("std");
	3225	\\ var h = @import("std",);
2553	3226	\\ var i = (Foo {}).bar;
2554	3227	\\
2555	3228	\\ var z: noreturn = return;
...	...	@@ -2569,26 +3242,32 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2569	3242	".tmp_source.zig:13:4: error: variable of type 'type' must be const or comptime",
2570	3243	".tmp_source.zig:14:4: error: variable of type '(namespace)' must be const or comptime",
2571	3244	".tmp_source.zig:15:4: error: variable of type '(bound fn(&const Foo) void)' must be const or comptime",
2572		".tmp_source.zig:17:4: error: unreachable code");
	3245	".tmp_source.zig:17:4: error: unreachable code",
	3246	);
2573	3247
2574		cases.add("wrong types given to atomic order args in cmpxchg",
	3248	cases.add(
	3249	"wrong types given to atomic order args in cmpxchg",
2575	3250	\\export fn entry() void {
2576	3251	\\ var x: i32 = 1234;
2577	3252	\\ while (!@cmpxchgWeak(i32, &x, 1234, 5678, u32(1234), u32(1234))) {}
2578	3253	\\}
2579	3254	,
2580		".tmp_source.zig:3:50: error: expected type 'AtomicOrder', found 'u32'");
	3255	".tmp_source.zig:3:50: error: expected type 'AtomicOrder', found 'u32'",
	3256	);
2581	3257
2582		cases.add("wrong types given to @export",
	3258	cases.add(
	3259	"wrong types given to @export",
2583	3260	\\extern fn entry() void { }
2584	3261	\\comptime {
2585	3262	\\ @export("entry", entry, u32(1234));
2586	3263	\\}
2587	3264	,
2588		".tmp_source.zig:3:32: error: expected type 'GlobalLinkage', found 'u32'");
	3265	".tmp_source.zig:3:32: error: expected type 'GlobalLinkage', found 'u32'",
	3266	);
2589	3267
2590		cases.add("struct with invalid field",
2591		\\const std = @import("std");
	3268	cases.add(
	3269	"struct with invalid field",
	3270	\\const std = @import("std",);
2592	3271	\\const Allocator = std.mem.Allocator;
2593	3272	\\const ArrayList = std.ArrayList;
2594	3273	\\
...	...	@@ -2612,23 +3291,29 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2612	3291	\\ };
2613	3292	\\}
2614	3293	,
2615		".tmp_source.zig:14:17: error: use of undeclared identifier 'HeaderValue'");
	3294	".tmp_source.zig:14:17: error: use of undeclared identifier 'HeaderValue'",
	3295	);
2616	3296
2617		cases.add("@setAlignStack outside function",
	3297	cases.add(
	3298	"@setAlignStack outside function",
2618	3299	\\comptime {
2619	3300	\\ @setAlignStack(16);
2620	3301	\\}
2621	3302	,
2622		".tmp_source.zig:2:5: error: @setAlignStack outside function");
	3303	".tmp_source.zig:2:5: error: @setAlignStack outside function",
	3304	);
2623	3305
2624		cases.add("@setAlignStack in naked function",
	3306	cases.add(
	3307	"@setAlignStack in naked function",
2625	3308	\\export nakedcc fn entry() void {
2626	3309	\\ @setAlignStack(16);
2627	3310	\\}
2628	3311	,
2629		".tmp_source.zig:2:5: error: @setAlignStack in naked function");
	3312	".tmp_source.zig:2:5: error: @setAlignStack in naked function",
	3313	);
2630	3314
2631		cases.add("@setAlignStack in inline function",
	3315	cases.add(
	3316	"@setAlignStack in inline function",
2632	3317	\\export fn entry() void {
2633	3318	\\ foo();
2634	3319	\\}
...	...	@@ -2636,25 +3321,31 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2636	3321	\\ @setAlignStack(16);
2637	3322	\\}
2638	3323	,
2639		".tmp_source.zig:5:5: error: @setAlignStack in inline function");
	3324	".tmp_source.zig:5:5: error: @setAlignStack in inline function",
	3325	);
2640	3326
2641		cases.add("@setAlignStack set twice",
	3327	cases.add(
	3328	"@setAlignStack set twice",
2642	3329	\\export fn entry() void {
2643	3330	\\ @setAlignStack(16);
2644	3331	\\ @setAlignStack(16);
2645	3332	\\}
2646	3333	,
2647	3334	".tmp_source.zig:3:5: error: alignstack set twice",
2648		".tmp_source.zig:2:5: note: first set here");
	3335	".tmp_source.zig:2:5: note: first set here",
	3336	);
2649	3337
2650		cases.add("@setAlignStack too big",
	3338	cases.add(
	3339	"@setAlignStack too big",
2651	3340	\\export fn entry() void {
2652	3341	\\ @setAlignStack(511 + 1);
2653	3342	\\}
2654	3343	,
2655		".tmp_source.zig:2:5: error: attempt to @setAlignStack(512); maximum is 256");
	3344	".tmp_source.zig:2:5: error: attempt to @setAlignStack(512); maximum is 256",
	3345	);
2656	3346
2657		cases.add("storing runtime value in compile time variable then using it",
	3347	cases.add(
	3348	"storing runtime value in compile time variable then using it",
2658	3349	\\const Mode = @import("builtin").Mode;
2659	3350	\\
2660	3351	\\fn Free(comptime filename: []const u8) TestCase {
...	...	@@ -2697,9 +3388,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2697	3388	\\ }
2698	3389	\\}
2699	3390	,
2700		".tmp_source.zig:37:16: error: cannot store runtime value in compile time variable");
	3391	".tmp_source.zig:37:16: error: cannot store runtime value in compile time variable",
	3392	);
2701	3393
2702		cases.add("field access of opaque type",
	3394	cases.add(
	3395	"field access of opaque type",
2703	3396	\\const MyType = @OpaqueType();
2704	3397	\\
2705	3398	\\export fn entry() bool {
...	...	@@ -2711,120 +3404,148 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2711	3404	\\ return x.blah;
2712	3405	\\}
2713	3406	,
2714		".tmp_source.zig:9:13: error: type '&MyType' does not support field access");
	3407	".tmp_source.zig:9:13: error: type '&MyType' does not support field access",
	3408	);
2715	3409
2716		cases.add("carriage return special case",
	3410	cases.add(
	3411	"carriage return special case",
2717	3412	"fn test() bool {\r\n" ++
2718		" true\r\n" ++
2719		"}\r\n"
2720		,
2721		".tmp_source.zig:1:17: error: invalid carriage return, only '\\n' line endings are supported");
2722
2723		cases.add("non-printable invalid character",
2724		"\xff\xfe" ++
2725		\\fn test() bool {\r
2726		\\ true\r
2727		\\}
2728		,
2729		".tmp_source.zig:1:1: error: invalid character: '\\xff'");
	3413	" true\r\n" ++
	3414	"}\r\n",
	3415	".tmp_source.zig:1:17: error: invalid carriage return, only '\\n' line endings are supported",
	3416	);
	3417
	3418	cases.add(
	3419	"non-printable invalid character",
	3420	"\xff\xfe" ++
	3421	\\fn test() bool {\r
	3422	\\ true\r
	3423	\\}
	3424	,
	3425	".tmp_source.zig:1:1: error: invalid character: '\\xff'",
	3426	);
2730	3427
2731		cases.add("non-printable invalid character with escape alternative",
	3428	cases.add(
	3429	"non-printable invalid character with escape alternative",
2732	3430	"fn test() bool {\n" ++
2733		"\ttrue\n" ++
2734		"}\n"
2735		,
2736		".tmp_source.zig:2:1: error: invalid character: '\\t'");
	3431	"\ttrue\n" ++
	3432	"}\n",
	3433	".tmp_source.zig:2:1: error: invalid character: '\\t'",
	3434	);
2737	3435
2738		cases.add("@ArgType given non function parameter",
	3436	cases.add(
	3437	"@ArgType given non function parameter",
2739	3438	\\comptime {
2740	3439	\\ _ = @ArgType(i32, 3);
2741	3440	\\}
2742	3441	,
2743		".tmp_source.zig:2:18: error: expected function, found 'i32'");
	3442	".tmp_source.zig:2:18: error: expected function, found 'i32'",
	3443	);
2744	3444
2745		cases.add("@ArgType arg index out of bounds",
	3445	cases.add(
	3446	"@ArgType arg index out of bounds",
2746	3447	\\comptime {
2747	3448	\\ _ = @ArgType(@typeOf(add), 2);
2748	3449	\\}
2749	3450	\\fn add(a: i32, b: i32) i32 { return a + b; }
2750	3451	,
2751		".tmp_source.zig:2:32: error: arg index 2 out of bounds; 'fn(i32, i32) i32' has 2 arguments");
	3452	".tmp_source.zig:2:32: error: arg index 2 out of bounds; 'fn(i32, i32) i32' has 2 arguments",
	3453	);
2752	3454
2753		cases.add("@memberType on unsupported type",
	3455	cases.add(
	3456	"@memberType on unsupported type",
2754	3457	\\comptime {
2755	3458	\\ _ = @memberType(i32, 0);
2756	3459	\\}
2757	3460	,
2758		".tmp_source.zig:2:21: error: type 'i32' does not support @memberType");
	3461	".tmp_source.zig:2:21: error: type 'i32' does not support @memberType",
	3462	);
2759	3463
2760		cases.add("@memberType on enum",
	3464	cases.add(
	3465	"@memberType on enum",
2761	3466	\\comptime {
2762	3467	\\ _ = @memberType(Foo, 0);
2763	3468	\\}
2764	3469	\\const Foo = enum {A,};
2765	3470	,
2766		".tmp_source.zig:2:21: error: type 'Foo' does not support @memberType");
	3471	".tmp_source.zig:2:21: error: type 'Foo' does not support @memberType",
	3472	);
2767	3473
2768		cases.add("@memberType struct out of bounds",
	3474	cases.add(
	3475	"@memberType struct out of bounds",
2769	3476	\\comptime {
2770	3477	\\ _ = @memberType(Foo, 0);
2771	3478	\\}
2772	3479	\\const Foo = struct {};
2773	3480	,
2774		".tmp_source.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members");
	3481	".tmp_source.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members",
	3482	);
2775	3483
2776		cases.add("@memberType union out of bounds",
	3484	cases.add(
	3485	"@memberType union out of bounds",
2777	3486	\\comptime {
2778	3487	\\ _ = @memberType(Foo, 1);
2779	3488	\\}
2780	3489	\\const Foo = union {A: void,};
2781	3490	,
2782		".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members");
	3491	".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
	3492	);
2783	3493
2784		cases.add("@memberName on unsupported type",
	3494	cases.add(
	3495	"@memberName on unsupported type",
2785	3496	\\comptime {
2786	3497	\\ _ = @memberName(i32, 0);
2787	3498	\\}
2788	3499	,
2789		".tmp_source.zig:2:21: error: type 'i32' does not support @memberName");
	3500	".tmp_source.zig:2:21: error: type 'i32' does not support @memberName",
	3501	);
2790	3502
2791		cases.add("@memberName struct out of bounds",
	3503	cases.add(
	3504	"@memberName struct out of bounds",
2792	3505	\\comptime {
2793	3506	\\ _ = @memberName(Foo, 0);
2794	3507	\\}
2795	3508	\\const Foo = struct {};
2796	3509	,
2797		".tmp_source.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members");
	3510	".tmp_source.zig:2:26: error: member index 0 out of bounds; 'Foo' has 0 members",
	3511	);
2798	3512
2799		cases.add("@memberName enum out of bounds",
	3513	cases.add(
	3514	"@memberName enum out of bounds",
2800	3515	\\comptime {
2801	3516	\\ _ = @memberName(Foo, 1);
2802	3517	\\}
2803	3518	\\const Foo = enum {A,};
2804	3519	,
2805		".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members");
	3520	".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
	3521	);
2806	3522
2807		cases.add("@memberName union out of bounds",
	3523	cases.add(
	3524	"@memberName union out of bounds",
2808	3525	\\comptime {
2809	3526	\\ _ = @memberName(Foo, 1);
2810	3527	\\}
2811	3528	\\const Foo = union {A:i32,};
2812	3529	,
2813		".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members");
	3530	".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members",
	3531	);
2814	3532
2815		cases.add("calling var args extern function, passing array instead of pointer",
	3533	cases.add(
	3534	"calling var args extern function, passing array instead of pointer",
2816	3535	\\export fn entry() void {
2817		\\ foo("hello");
	3536	\\ foo("hello",);
2818	3537	\\}
2819	3538	\\pub extern fn foo(format: &const u8, ...) void;
2820	3539	,
2821		".tmp_source.zig:2:9: error: expected type '&const u8', found '[5]u8'");
	3540	".tmp_source.zig:2:9: error: expected type '&const u8', found '[5]u8'",
	3541	);
2822	3542
2823		cases.add("constant inside comptime function has compile error",
	3543	cases.add(
	3544	"constant inside comptime function has compile error",
2824	3545	\\const ContextAllocator = MemoryPool(usize);
2825	3546	\\
2826	3547	\\pub fn MemoryPool(comptime T: type) type {
2827		\\ const free_list_t = @compileError("aoeu");
	3548	\\ const free_list_t = @compileError("aoeu",);
2828	3549	\\
2829	3550	\\ return struct {
2830	3551	\\ free_list: free_list_t,
...	...	@@ -2837,9 +3558,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2837	3558	,
2838	3559	".tmp_source.zig:4:25: error: aoeu",
2839	3560	".tmp_source.zig:1:36: note: called from here",
2840		".tmp_source.zig:12:20: note: referenced here");
	3561	".tmp_source.zig:12:20: note: referenced here",
	3562	);
2841	3563
2842		cases.add("specify enum tag type that is too small",
	3564	cases.add(
	3565	"specify enum tag type that is too small",
2843	3566	\\const Small = enum (u2) {
2844	3567	\\ One,
2845	3568	\\ Two,
...	...	@@ -2852,9 +3575,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2852	3575	\\ var x = Small.One;
2853	3576	\\}
2854	3577	,
2855		".tmp_source.zig:1:20: error: 'u2' too small to hold all bits; must be at least 'u3'");
	3578	".tmp_source.zig:1:20: error: 'u2' too small to hold all bits; must be at least 'u3'",
	3579	);
2856	3580
2857		cases.add("specify non-integer enum tag type",
	3581	cases.add(
	3582	"specify non-integer enum tag type",
2858	3583	\\const Small = enum (f32) {
2859	3584	\\ One,
2860	3585	\\ Two,
...	...	@@ -2865,9 +3590,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2865	3590	\\ var x = Small.One;
2866	3591	\\}
2867	3592	,
2868		".tmp_source.zig:1:20: error: expected integer, found 'f32'");
	3593	".tmp_source.zig:1:20: error: expected integer, found 'f32'",
	3594	);
2869	3595
2870		cases.add("implicitly casting enum to tag type",
	3596	cases.add(
	3597	"implicitly casting enum to tag type",
2871	3598	\\const Small = enum(u2) {
2872	3599	\\ One,
2873	3600	\\ Two,
...	...	@@ -2879,9 +3606,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2879	3606	\\ var x: u2 = Small.Two;
2880	3607	\\}
2881	3608	,
2882		".tmp_source.zig:9:22: error: expected type 'u2', found 'Small'");
	3609	".tmp_source.zig:9:22: error: expected type 'u2', found 'Small'",
	3610	);
2883	3611
2884		cases.add("explicitly casting enum to non tag type",
	3612	cases.add(
	3613	"explicitly casting enum to non tag type",
2885	3614	\\const Small = enum(u2) {
2886	3615	\\ One,
2887	3616	\\ Two,
...	...	@@ -2893,9 +3622,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2893	3622	\\ var x = u3(Small.Two);
2894	3623	\\}
2895	3624	,
2896		".tmp_source.zig:9:15: error: enum to integer cast to 'u3' instead of its tag type, 'u2'");
	3625	".tmp_source.zig:9:15: error: enum to integer cast to 'u3' instead of its tag type, 'u2'",
	3626	);
2897	3627
2898		cases.add("explicitly casting non tag type to enum",
	3628	cases.add(
	3629	"explicitly casting non tag type to enum",
2899	3630	\\const Small = enum(u2) {
2900	3631	\\ One,
2901	3632	\\ Two,
...	...	@@ -2908,9 +3639,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2908	3639	\\ var x = Small(y);
2909	3640	\\}
2910	3641	,
2911		".tmp_source.zig:10:18: error: integer to enum cast from 'u3' instead of its tag type, 'u2'");
	3642	".tmp_source.zig:10:18: error: integer to enum cast from 'u3' instead of its tag type, 'u2'",
	3643	);
2912	3644
2913		cases.add("non unsigned integer enum tag type",
	3645	cases.add(
	3646	"non unsigned integer enum tag type",
2914	3647	\\const Small = enum(i2) {
2915	3648	\\ One,
2916	3649	\\ Two,
...	...	@@ -2922,9 +3655,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2922	3655	\\ var y = Small.Two;
2923	3656	\\}
2924	3657	,
2925		".tmp_source.zig:1:19: error: expected unsigned integer, found 'i2'");
	3658	".tmp_source.zig:1:19: error: expected unsigned integer, found 'i2'",
	3659	);
2926	3660
2927		cases.add("struct fields with value assignments",
	3661	cases.add(
	3662	"struct fields with value assignments",
2928	3663	\\const MultipleChoice = struct {
2929	3664	\\ A: i32 = 20,
2930	3665	\\};
...	...	@@ -2932,9 +3667,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2932	3667	\\ var x: MultipleChoice = undefined;
2933	3668	\\}
2934	3669	,
2935		".tmp_source.zig:2:14: error: enums, not structs, support field assignment");
	3670	".tmp_source.zig:2:14: error: enums, not structs, support field assignment",
	3671	);
2936	3672
2937		cases.add("union fields with value assignments",
	3673	cases.add(
	3674	"union fields with value assignments",
2938	3675	\\const MultipleChoice = union {
2939	3676	\\ A: i32 = 20,
2940	3677	\\};
...	...	@@ -2943,25 +3680,31 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2943	3680	\\}
2944	3681	,
2945	3682	".tmp_source.zig:2:14: error: non-enum union field assignment",
2946		".tmp_source.zig:1:24: note: consider 'union(enum)' here");
	3683	".tmp_source.zig:1:24: note: consider 'union(enum)' here",
	3684	);
2947	3685
2948		cases.add("enum with 0 fields",
	3686	cases.add(
	3687	"enum with 0 fields",
2949	3688	\\const Foo = enum {};
2950	3689	\\export fn entry() usize {
2951	3690	\\ return @sizeOf(Foo);
2952	3691	\\}
2953	3692	,
2954		".tmp_source.zig:1:13: error: enums must have 1 or more fields");
	3693	".tmp_source.zig:1:13: error: enums must have 1 or more fields",
	3694	);
2955	3695
2956		cases.add("union with 0 fields",
	3696	cases.add(
	3697	"union with 0 fields",
2957	3698	\\const Foo = union {};
2958	3699	\\export fn entry() usize {
2959	3700	\\ return @sizeOf(Foo);
2960	3701	\\}
2961	3702	,
2962		".tmp_source.zig:1:13: error: unions must have 1 or more fields");
	3703	".tmp_source.zig:1:13: error: unions must have 1 or more fields",
	3704	);
2963	3705
2964		cases.add("enum value already taken",
	3706	cases.add(
	3707	"enum value already taken",
2965	3708	\\const MultipleChoice = enum(u32) {
2966	3709	\\ A = 20,
2967	3710	\\ B = 40,
...	...	@@ -2974,9 +3717,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2974	3717	\\}
2975	3718	,
2976	3719	".tmp_source.zig:6:9: error: enum tag value 60 already taken",
2977		".tmp_source.zig:4:9: note: other occurrence here");
	3720	".tmp_source.zig:4:9: note: other occurrence here",
	3721	);
2978	3722
2979		cases.add("union with specified enum omits field",
	3723	cases.add(
	3724	"union with specified enum omits field",
2980	3725	\\const Letter = enum {
2981	3726	\\ A,
2982	3727	\\ B,
...	...	@@ -2991,9 +3736,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
2991	3736	\\}
2992	3737	,
2993	3738	".tmp_source.zig:6:17: error: enum field missing: 'C'",
2994		".tmp_source.zig:4:5: note: declared here");
	3739	".tmp_source.zig:4:5: note: declared here",
	3740	);
2995	3741
2996		cases.add("@TagType when union has no attached enum",
	3742	cases.add(
	3743	"@TagType when union has no attached enum",
2997	3744	\\const Foo = union {
2998	3745	\\ A: i32,
2999	3746	\\};
...	...	@@ -3002,9 +3749,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3002	3749	\\}
3003	3750	,
3004	3751	".tmp_source.zig:5:24: error: union 'Foo' has no tag",
3005		".tmp_source.zig:1:13: note: consider 'union(enum)' here");
	3752	".tmp_source.zig:1:13: note: consider 'union(enum)' here",
	3753	);
3006	3754
3007		cases.add("non-integer tag type to automatic union enum",
	3755	cases.add(
	3756	"non-integer tag type to automatic union enum",
3008	3757	\\const Foo = union(enum(f32)) {
3009	3758	\\ A: i32,
3010	3759	\\};
...	...	@@ -3012,9 +3761,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3012	3761	\\ const x = @TagType(Foo);
3013	3762	\\}
3014	3763	,
3015		".tmp_source.zig:1:23: error: expected integer tag type, found 'f32'");
	3764	".tmp_source.zig:1:23: error: expected integer tag type, found 'f32'",
	3765	);
3016	3766
3017		cases.add("non-enum tag type passed to union",
	3767	cases.add(
	3768	"non-enum tag type passed to union",
3018	3769	\\const Foo = union(u32) {
3019	3770	\\ A: i32,
3020	3771	\\};
...	...	@@ -3022,9 +3773,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3022	3773	\\ const x = @TagType(Foo);
3023	3774	\\}
3024	3775	,
3025		".tmp_source.zig:1:18: error: expected enum tag type, found 'u32'");
	3776	".tmp_source.zig:1:18: error: expected enum tag type, found 'u32'",
	3777	);
3026	3778
3027		cases.add("union auto-enum value already taken",
	3779	cases.add(
	3780	"union auto-enum value already taken",
3028	3781	\\const MultipleChoice = union(enum(u32)) {
3029	3782	\\ A = 20,
3030	3783	\\ B = 40,
...	...	@@ -3037,9 +3790,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3037	3790	\\}
3038	3791	,
3039	3792	".tmp_source.zig:6:9: error: enum tag value 60 already taken",
3040		".tmp_source.zig:4:9: note: other occurrence here");
	3793	".tmp_source.zig:4:9: note: other occurrence here",
	3794	);
3041	3795
3042		cases.add("union enum field does not match enum",
	3796	cases.add(
	3797	"union enum field does not match enum",
3043	3798	\\const Letter = enum {
3044	3799	\\ A,
3045	3800	\\ B,
...	...	@@ -3056,9 +3811,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3056	3811	\\}
3057	3812	,
3058	3813	".tmp_source.zig:10:5: error: enum field not found: 'D'",
3059		".tmp_source.zig:1:16: note: enum declared here");
	3814	".tmp_source.zig:1:16: note: enum declared here",
	3815	);
3060	3816
3061		cases.add("field type supplied in an enum",
	3817	cases.add(
	3818	"field type supplied in an enum",
3062	3819	\\const Letter = enum {
3063	3820	\\ A: void,
3064	3821	\\ B,
...	...	@@ -3069,9 +3826,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3069	3826	\\}
3070	3827	,
3071	3828	".tmp_source.zig:2:8: error: structs and unions, not enums, support field types",
3072		".tmp_source.zig:1:16: note: consider 'union(enum)' here");
	3829	".tmp_source.zig:1:16: note: consider 'union(enum)' here",
	3830	);
3073	3831
3074		cases.add("struct field missing type",
	3832	cases.add(
	3833	"struct field missing type",
3075	3834	\\const Letter = struct {
3076	3835	\\ A,
3077	3836	\\};
...	...	@@ -3079,9 +3838,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3079	3838	\\ var a = Letter { .A = {} };
3080	3839	\\}
3081	3840	,
3082		".tmp_source.zig:2:5: error: struct field missing type");
	3841	".tmp_source.zig:2:5: error: struct field missing type",
	3842	);
3083	3843
3084		cases.add("extern union field missing type",
	3844	cases.add(
	3845	"extern union field missing type",
3085	3846	\\const Letter = extern union {
3086	3847	\\ A,
3087	3848	\\};
...	...	@@ -3089,9 +3850,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3089	3850	\\ var a = Letter { .A = {} };
3090	3851	\\}
3091	3852	,
3092		".tmp_source.zig:2:5: error: union field missing type");
	3853	".tmp_source.zig:2:5: error: union field missing type",
	3854	);
3093	3855
3094		cases.add("extern union given enum tag type",
	3856	cases.add(
	3857	"extern union given enum tag type",
3095	3858	\\const Letter = enum {
3096	3859	\\ A,
3097	3860	\\ B,
...	...	@@ -3106,9 +3869,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3106	3869	\\ var a = Payload { .A = 1234 };
3107	3870	\\}
3108	3871	,
3109		".tmp_source.zig:6:29: error: extern union does not support enum tag type");
	3872	".tmp_source.zig:6:29: error: extern union does not support enum tag type",
	3873	);
3110	3874
3111		cases.add("packed union given enum tag type",
	3875	cases.add(
	3876	"packed union given enum tag type",
3112	3877	\\const Letter = enum {
3113	3878	\\ A,
3114	3879	\\ B,
...	...	@@ -3123,9 +3888,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3123	3888	\\ var a = Payload { .A = 1234 };
3124	3889	\\}
3125	3890	,
3126		".tmp_source.zig:6:29: error: packed union does not support enum tag type");
	3891	".tmp_source.zig:6:29: error: packed union does not support enum tag type",
	3892	);
3127	3893
3128		cases.add("switch on union with no attached enum",
	3894	cases.add(
	3895	"switch on union with no attached enum",
3129	3896	\\const Payload = union {
3130	3897	\\ A: i32,
3131	3898	\\ B: f64,
...	...	@@ -3136,16 +3903,18 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3136	3903	\\ foo(a);
3137	3904	\\}
3138	3905	\\fn foo(a: &const Payload) void {
3139		\\ switch (*a) {
	3906	\\ switch (a.*) {
3140	3907	\\ Payload.A => {},
3141	3908	\\ else => unreachable,
3142	3909	\\ }
3143	3910	\\}
3144	3911	,
3145		".tmp_source.zig:11:13: error: switch on union which has no attached enum",
3146		".tmp_source.zig:1:17: note: consider 'union(enum)' here");
	3912	".tmp_source.zig:11:14: error: switch on union which has no attached enum",
	3913	".tmp_source.zig:1:17: note: consider 'union(enum)' here",
	3914	);
3147	3915
3148		cases.add("enum in field count range but not matching tag",
	3916	cases.add(
	3917	"enum in field count range but not matching tag",
3149	3918	\\const Foo = enum(u32) {
3150	3919	\\ A = 10,
3151	3920	\\ B = 11,
...	...	@@ -3155,9 +3924,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3155	3924	\\}
3156	3925	,
3157	3926	".tmp_source.zig:6:16: error: enum 'Foo' has no tag matching integer value 0",
3158		".tmp_source.zig:1:13: note: 'Foo' declared here");
	3927	".tmp_source.zig:1:13: note: 'Foo' declared here",
	3928	);
3159	3929
3160		cases.add("comptime cast enum to union but field has payload",
	3930	cases.add(
	3931	"comptime cast enum to union but field has payload",
3161	3932	\\const Letter = enum { A, B, C };
3162	3933	\\const Value = union(Letter) {
3163	3934	\\ A: i32,
...	...	@@ -3169,9 +3940,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3169	3940	\\}
3170	3941	,
3171	3942	".tmp_source.zig:8:26: error: cast to union 'Value' must initialize 'i32' field 'A'",
3172		".tmp_source.zig:3:5: note: field 'A' declared here");
	3943	".tmp_source.zig:3:5: note: field 'A' declared here",
	3944	);
3173	3945
3174		cases.add("runtime cast to union which has non-void fields",
	3946	cases.add(
	3947	"runtime cast to union which has non-void fields",
3175	3948	\\const Letter = enum { A, B, C };
3176	3949	\\const Value = union(Letter) {
3177	3950	\\ A: i32,
...	...	@@ -3186,9 +3959,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3186	3959	\\}
3187	3960	,
3188	3961	".tmp_source.zig:11:20: error: runtime cast to union 'Value' which has non-void fields",
3189		".tmp_source.zig:3:5: note: field 'A' has type 'i32'");
	3962	".tmp_source.zig:3:5: note: field 'A' has type 'i32'",
	3963	);
3190	3964
3191		cases.add("self-referencing function pointer field",
	3965	cases.add(
	3966	"self-referencing function pointer field",
3192	3967	\\const S = struct {
3193	3968	\\ f: fn(_: S) void,
3194	3969	\\};
...	...	@@ -3198,19 +3973,23 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3198	3973	\\ var _ = S { .f = f };
3199	3974	\\}
3200	3975	,
3201		".tmp_source.zig:4:9: error: type 'S' is not copyable; cannot pass by value");
	3976	".tmp_source.zig:4:9: error: type 'S' is not copyable; cannot pass by value",
	3977	);
3202	3978
3203		cases.add("taking offset of void field in struct",
	3979	cases.add(
	3980	"taking offset of void field in struct",
3204	3981	\\const Empty = struct {
3205	3982	\\ val: void,
3206	3983	\\};
3207	3984	\\export fn foo() void {
3208		\\ const fieldOffset = @offsetOf(Empty, "val");
	3985	\\ const fieldOffset = @offsetOf(Empty, "val",);
3209	3986	\\}
3210	3987	,
3211		".tmp_source.zig:5:42: error: zero-bit field 'val' in struct 'Empty' has no offset");
	3988	".tmp_source.zig:5:42: error: zero-bit field 'val' in struct 'Empty' has no offset",
	3989	);
3212	3990
3213		cases.add("invalid union field access in comptime",
	3991	cases.add(
	3992	"invalid union field access in comptime",
3214	3993	\\const Foo = union {
3215	3994	\\ Bar: u8,
3216	3995	\\ Baz: void,
...	...	@@ -3220,21 +3999,26 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
3220	3999	\\ const bar_val = foo.Bar;
3221	4000	\\}
3222	4001	,
3223		".tmp_source.zig:7:24: error: accessing union field 'Bar' while field 'Baz' is set");
	4002	".tmp_source.zig:7:24: error: accessing union field 'Bar' while field 'Baz' is set",
	4003	);
3224	4004
3225		cases.add("getting return type of generic function",
	4005	cases.add(
	4006	"getting return type of generic function",
3226	4007	\\fn generic(a: var) void {}
3227	4008	\\comptime {
3228	4009	\\ _ = @typeOf(generic).ReturnType;
3229	4010	\\}
3230	4011	,
3231		".tmp_source.zig:3:25: error: ReturnType has not been resolved because 'fn(var)var' is generic");
	4012	".tmp_source.zig:3:25: error: ReturnType has not been resolved because 'fn(var)var' is generic",
	4013	);
3232	4014
3233		cases.add("getting @ArgType of generic function",
	4015	cases.add(
	4016	"getting @ArgType of generic function",
3234	4017	\\fn generic(a: var) void {}
3235	4018	\\comptime {
3236	4019	\\ _ = @ArgType(@typeOf(generic), 0);
3237	4020	\\}
3238	4021	,
3239		".tmp_source.zig:3:36: error: @ArgType could not resolve the type of arg 0 because 'fn(var)var' is generic");
	4022	".tmp_source.zig:3:36: error: @ArgType could not resolve the type of arg 0 because 'fn(var)var' is generic",
	4023	);
3240	4024	}

test/gen_h.zig-1

...	...	@@ -76,5 +76,4 @@ pub fn addCases(cases: &tests.GenHContext) void {
76	76	\\TEST_EXPORT void entry(struct Foo foo, uint8_t bar[]);
77	77	\\
78	78	);
79
80	79	}

test/standalone/brace_expansion/main.zig+14-16

...	...	@@ -16,7 +16,7 @@ const Token = union(enum) {
16	16
17	17	var global_allocator: &mem.Allocator = undefined;
18	18
19		fn tokenize(input:[] const u8) !ArrayList(Token) {
	19	fn tokenize(input: []const u8) !ArrayList(Token) {
20	20	const State = enum {
21	21	Start,
22	22	Word,
...	...	@@ -41,7 +41,7 @@ fn tokenize(input:[] const u8) !ArrayList(Token) {
41	41	State.Word => switch (b) {
42	42	'a'...'z', 'A'...'Z' => {},
43	43	'{', '}', ',' => {
44		try token_list.append(Token { .Word = input[tok_begin..i] });
	44	try token_list.append(Token{ .Word = input[tok_begin..i] });
45	45	switch (b) {
46	46	'{' => try token_list.append(Token.OpenBrace),
47	47	'}' => try token_list.append(Token.CloseBrace),
...	...	@@ -56,7 +56,7 @@ fn tokenize(input:[] const u8) !ArrayList(Token) {
56	56	}
57	57	switch (state) {
58	58	State.Start => {},
59		State.Word => try token_list.append(Token {.Word = input[tok_begin..] }),
	59	State.Word => try token_list.append(Token{ .Word = input[tok_begin..] }),
60	60	}
61	61	try token_list.append(Token.Eof);
62	62	return token_list;
...	...	@@ -68,24 +68,24 @@ const Node = union(enum) {
68	68	Combine: []Node,
69	69	};
70	70
71		const ParseError = error {
	71	const ParseError = error{
72	72	InvalidInput,
73	73	OutOfMemory,
74	74	};
75	75
76	76	fn parse(tokens: &const ArrayList(Token), token_index: &usize) ParseError!Node {
77		const first_token = tokens.items[*token_index];
78		*token_index += 1;
	77	const first_token = tokens.items[token_index.*];
	78	token_index.* += 1;
79	79
80	80	const result_node = switch (first_token) {
81		Token.Word => \|word\| Node { .Scalar = word },
	81	Token.Word => \|word\| Node{ .Scalar = word },
82	82	Token.OpenBrace => blk: {
83	83	var list = ArrayList(Node).init(global_allocator);
84	84	while (true) {
85	85	try list.append(try parse(tokens, token_index));
86	86
87		const token = tokens.items[*token_index];
88		*token_index += 1;
	87	const token = tokens.items[token_index.*];
	88	token_index.* += 1;
89	89
90	90	switch (token) {
91	91	Token.CloseBrace => break,
...	...	@@ -93,17 +93,17 @@ fn parse(tokens: &const ArrayList(Token), token_index: &usize) ParseError!Node {
93	93	else => return error.InvalidInput,
94	94	}
95	95	}
96		break :blk Node { .List = list };
	96	break :blk Node{ .List = list };
97	97	},
98	98	else => return error.InvalidInput,
99	99	};
100	100
101		switch (tokens.items[*token_index]) {
	101	switch (tokens.items[token_index.*]) {
102	102	Token.Word, Token.OpenBrace => {
103	103	const pair = try global_allocator.alloc(Node, 2);
104	104	pair[0] = result_node;
105	105	pair[1] = try parse(tokens, token_index);
106		return Node { .Combine = pair };
	106	return Node{ .Combine = pair };
107	107	},
108	108	else => return result_node,
109	109	}
...	...	@@ -137,13 +137,11 @@ fn expandString(input: []const u8, output: &Buffer) !void {
137	137	}
138	138	}
139	139
140		const ExpandNodeError = error {
141		OutOfMemory,
142		};
	140	const ExpandNodeError = error{OutOfMemory};
143	141
144	142	fn expandNode(node: &const Node, output: &ArrayList(Buffer)) ExpandNodeError!void {
145	143	assert(output.len == 0);
146		switch (*node) {
	144	switch (node.*) {
147	145	Node.Scalar => \|scalar\| {
148	146	try output.append(try Buffer.init(global_allocator, scalar));
149	147	},

test/standalone/issue_339/test.zig+4-1

...	...	@@ -1,5 +1,8 @@
1	1	const StackTrace = @import("builtin").StackTrace;
2		pub fn panic(msg: []const u8, stack_trace: ?&StackTrace) noreturn { @breakpoint(); while (true) {} }
	2	pub fn panic(msg: []const u8, stack_trace: ?&StackTrace) noreturn {
	3	@breakpoint();
	4	while (true) {}
	5	}
3	6
4	7	fn bar() error!void {}
5	8

test/standalone/pkg_import/pkg.zig+3-1

...	...	@@ -1 +1,3 @@
1		pub fn add(a: i32, b: i32) i32 { return a + b; }
	1	pub fn add(a: i32, b: i32) i32 {
	2	return a + b;
	3	}

test/standalone/use_alias/main.zig+1-1

...	...	@@ -2,7 +2,7 @@ const c = @import("c.zig");
2	2	const assert = @import("std").debug.assert;
3	3
4	4	test "symbol exists" {
5		var foo = c.Foo {
	5	var foo = c.Foo{
6	6	.a = 1,
7	7	.b = 1,
8	8	};

test/tests.zig+90-100

...	...	@@ -27,18 +27,18 @@ const TestTarget = struct {
27	27	environ: builtin.Environ,
28	28	};
29	29
30		const test_targets = []TestTarget {
31		TestTarget {
	30	const test_targets = []TestTarget{
	31	TestTarget{
32	32	.os = builtin.Os.linux,
33	33	.arch = builtin.Arch.x86_64,
34	34	.environ = builtin.Environ.gnu,
35	35	},
36		TestTarget {
	36	TestTarget{
37	37	.os = builtin.Os.macosx,
38	38	.arch = builtin.Arch.x86_64,
39	39	.environ = builtin.Environ.unknown,
40	40	},
41		TestTarget {
	41	TestTarget{
42	42	.os = builtin.Os.windows,
43	43	.arch = builtin.Arch.x86_64,
44	44	.environ = builtin.Environ.msvc,
...	...	@@ -49,7 +49,7 @@ const max_stdout_size = 1 * 1024 * 1024; // 1 MB
49	49
50	50	pub fn addCompareOutputTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
51	51	const cases = b.allocator.create(CompareOutputContext) catch unreachable;
52		*cases = CompareOutputContext {
	52	cases.* = CompareOutputContext{
53	53	.b = b,
54	54	.step = b.step("test-compare-output", "Run the compare output tests"),
55	55	.test_index = 0,
...	...	@@ -63,7 +63,7 @@ pub fn addCompareOutputTests(b: &build.Builder, test_filter: ?[]const u8) &build
63	63
64	64	pub fn addRuntimeSafetyTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
65	65	const cases = b.allocator.create(CompareOutputContext) catch unreachable;
66		*cases = CompareOutputContext {
	66	cases.* = CompareOutputContext{
67	67	.b = b,
68	68	.step = b.step("test-runtime-safety", "Run the runtime safety tests"),
69	69	.test_index = 0,
...	...	@@ -77,7 +77,7 @@ pub fn addRuntimeSafetyTests(b: &build.Builder, test_filter: ?[]const u8) &build
77	77
78	78	pub fn addCompileErrorTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
79	79	const cases = b.allocator.create(CompileErrorContext) catch unreachable;
80		*cases = CompileErrorContext {
	80	cases.* = CompileErrorContext{
81	81	.b = b,
82	82	.step = b.step("test-compile-errors", "Run the compile error tests"),
83	83	.test_index = 0,
...	...	@@ -91,7 +91,7 @@ pub fn addCompileErrorTests(b: &build.Builder, test_filter: ?[]const u8) &build.
91	91
92	92	pub fn addBuildExampleTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
93	93	const cases = b.allocator.create(BuildExamplesContext) catch unreachable;
94		*cases = BuildExamplesContext {
	94	cases.* = BuildExamplesContext{
95	95	.b = b,
96	96	.step = b.step("test-build-examples", "Build the examples"),
97	97	.test_index = 0,
...	...	@@ -105,7 +105,7 @@ pub fn addBuildExampleTests(b: &build.Builder, test_filter: ?[]const u8) &build.
105	105
106	106	pub fn addAssembleAndLinkTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
107	107	const cases = b.allocator.create(CompareOutputContext) catch unreachable;
108		*cases = CompareOutputContext {
	108	cases.* = CompareOutputContext{
109	109	.b = b,
110	110	.step = b.step("test-asm-link", "Run the assemble and link tests"),
111	111	.test_index = 0,
...	...	@@ -119,7 +119,7 @@ pub fn addAssembleAndLinkTests(b: &build.Builder, test_filter: ?[]const u8) &bui
119	119
120	120	pub fn addTranslateCTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
121	121	const cases = b.allocator.create(TranslateCContext) catch unreachable;
122		*cases = TranslateCContext {
	122	cases.* = TranslateCContext{
123	123	.b = b,
124	124	.step = b.step("test-translate-c", "Run the C transation tests"),
125	125	.test_index = 0,
...	...	@@ -133,7 +133,7 @@ pub fn addTranslateCTests(b: &build.Builder, test_filter: ?[]const u8) &build.St
133	133
134	134	pub fn addGenHTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
135	135	const cases = b.allocator.create(GenHContext) catch unreachable;
136		*cases = GenHContext {
	136	cases.* = GenHContext{
137	137	.b = b,
138	138	.step = b.step("test-gen-h", "Run the C header file generation tests"),
139	139	.test_index = 0,
...	...	@@ -145,22 +145,26 @@ pub fn addGenHTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
145	145	return cases.step;
146	146	}
147	147
148
149		pub fn addPkgTests(b: &build.Builder, test_filter: ?[]const u8, root_src: []const u8,
150		name:[] const u8, desc: []const u8, with_lldb: bool) &build.Step
151		{
	148	pub fn addPkgTests(b: &build.Builder, test_filter: ?[]const u8, root_src: []const u8, name: []const u8, desc: []const u8, with_lldb: bool) &build.Step {
152	149	const step = b.step(b.fmt("test-{}", name), desc);
153	150	for (test_targets) \|test_target\| {
154	151	const is_native = (test_target.os == builtin.os and test_target.arch == builtin.arch);
155		for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast, Mode.ReleaseSmall}) \|mode\| {
156		for ([]bool{false, true}) \|link_libc\| {
	152	for ([]Mode{
	153	Mode.Debug,
	154	Mode.ReleaseSafe,
	155	Mode.ReleaseFast,
	156	Mode.ReleaseSmall,
	157	}) \|mode\| {
	158	for ([]bool{
	159	false,
	160	true,
	161	}) \|link_libc\| {
157	162	if (link_libc and !is_native) {
158	163	// don't assume we have a cross-compiling libc set up
159	164	continue;
160	165	}
161	166	const these_tests = b.addTest(root_src);
162		these_tests.setNamePrefix(b.fmt("{}-{}-{}-{}-{} ", name, @tagName(test_target.os),
163		@tagName(test_target.arch), @tagName(mode), if (link_libc) "c" else "bare"));
	167	these_tests.setNamePrefix(b.fmt("{}-{}-{}-{}-{} ", name, @tagName(test_target.os), @tagName(test_target.arch), @tagName(mode), if (link_libc) "c" else "bare"));
164	168	these_tests.setFilter(test_filter);
165	169	these_tests.setBuildMode(mode);
166	170	if (!is_native) {
...	...	@@ -171,7 +175,15 @@ pub fn addPkgTests(b: &build.Builder, test_filter: ?[]const u8, root_src: []cons
171	175	}
172	176	if (with_lldb) {
173	177	these_tests.setExecCmd([]?[]const u8{
174		"lldb", null, "-o", "run", "-o", "bt", "-o", "exit"});
	178	"lldb",
	179	null,
	180	"-o",
	181	"run",
	182	"-o",
	183	"bt",
	184	"-o",
	185	"exit",
	186	});
175	187	}
176	188	step.dependOn(&these_tests.step);
177	189	}
...	...	@@ -206,7 +218,7 @@ pub const CompareOutputContext = struct {
206	218	};
207	219
208	220	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {
209		self.sources.append(SourceFile {
	221	self.sources.append(SourceFile{
210	222	.filename = filename,
211	223	.source = source,
212	224	}) catch unreachable;
...	...	@@ -226,13 +238,10 @@ pub const CompareOutputContext = struct {
226	238	test_index: usize,
227	239	cli_args: []const []const u8,
228	240
229		pub fn create(context: &CompareOutputContext, exe_path: []const u8,
230		name: []const u8, expected_output: []const u8,
231		cli_args: []const []const u8) &RunCompareOutputStep
232		{
	241	pub fn create(context: &CompareOutputContext, exe_path: []const u8, name: []const u8, expected_output: []const u8, cli_args: []const []const u8) &RunCompareOutputStep {
233	242	const allocator = context.b.allocator;
234	243	const ptr = allocator.create(RunCompareOutputStep) catch unreachable;
235		*ptr = RunCompareOutputStep {
	244	ptr.* = RunCompareOutputStep{
236	245	.context = context,
237	246	.exe_path = exe_path,
238	247	.name = name,
...	...	@@ -258,7 +267,7 @@ pub const CompareOutputContext = struct {
258	267	args.append(arg) catch unreachable;
259	268	}
260	269
261		warn("Test {}/{} {}...", self.test_index+1, self.context.test_index, self.name);
	270	warn("Test {}/{} {}...", self.test_index + 1, self.context.test_index, self.name);
262	271
263	272	const child = os.ChildProcess.init(args.toSliceConst(), b.allocator) catch unreachable;
264	273	defer child.deinit();
...	...	@@ -295,7 +304,6 @@ pub const CompareOutputContext = struct {
295	304	},
296	305	}
297	306
298
299	307	if (!mem.eql(u8, self.expected_output, stdout.toSliceConst())) {
300	308	warn(
301	309	\\
...	...	@@ -318,12 +326,10 @@ pub const CompareOutputContext = struct {
318	326	name: []const u8,
319	327	test_index: usize,
320	328
321		pub fn create(context: &CompareOutputContext, exe_path: []const u8,
322		name: []const u8) &RuntimeSafetyRunStep
323		{
	329	pub fn create(context: &CompareOutputContext, exe_path: []const u8, name: []const u8) &RuntimeSafetyRunStep {
324	330	const allocator = context.b.allocator;
325	331	const ptr = allocator.create(RuntimeSafetyRunStep) catch unreachable;
326		*ptr = RuntimeSafetyRunStep {
	332	ptr.* = RuntimeSafetyRunStep{
327	333	.context = context,
328	334	.exe_path = exe_path,
329	335	.name = name,
...	...	@@ -340,7 +346,7 @@ pub const CompareOutputContext = struct {
340	346
341	347	const full_exe_path = b.pathFromRoot(self.exe_path);
342	348
343		warn("Test {}/{} {}...", self.test_index+1, self.context.test_index, self.name);
	349	warn("Test {}/{} {}...", self.test_index + 1, self.context.test_index, self.name);
344	350
345	351	const child = os.ChildProcess.init([][]u8{full_exe_path}, b.allocator) catch unreachable;
346	352	defer child.deinit();
...	...	@@ -358,19 +364,16 @@ pub const CompareOutputContext = struct {
358	364	switch (term) {
359	365	Term.Exited => \|code\| {
360	366	if (code != expected_exit_code) {
361		warn("\nProgram expected to exit with code {} " ++
362		"but exited with code {}\n", expected_exit_code, code);
	367	warn("\nProgram expected to exit with code {} " ++ "but exited with code {}\n", expected_exit_code, code);
363	368	return error.TestFailed;
364	369	}
365	370	},
366	371	Term.Signal => \|sig\| {
367		warn("\nProgram expected to exit with code {} " ++
368		"but instead signaled {}\n", expected_exit_code, sig);
	372	warn("\nProgram expected to exit with code {} " ++ "but instead signaled {}\n", expected_exit_code, sig);
369	373	return error.TestFailed;
370	374	},
371	375	else => {
372		warn("\nProgram expected to exit with code {}" ++
373		" but exited in an unexpected way\n", expected_exit_code);
	376	warn("\nProgram expected to exit with code {}" ++ " but exited in an unexpected way\n", expected_exit_code);
374	377	return error.TestFailed;
375	378	},
376	379	}
...	...	@@ -379,10 +382,8 @@ pub const CompareOutputContext = struct {
379	382	}
380	383	};
381	384
382		pub fn createExtra(self: &CompareOutputContext, name: []const u8, source: []const u8,
383		expected_output: []const u8, special: Special) TestCase
384		{
385		var tc = TestCase {
	385	pub fn createExtra(self: &CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8, special: Special) TestCase {
	386	var tc = TestCase{
386	387	.name = name,
387	388	.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
388	389	.expected_output = expected_output,
...	...	@@ -395,9 +396,7 @@ pub const CompareOutputContext = struct {
395	396	return tc;
396	397	}
397	398
398		pub fn create(self: &CompareOutputContext, name: []const u8, source: []const u8,
399		expected_output: []const u8) TestCase
400		{
	399	pub fn create(self: &CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) TestCase {
401	400	return createExtra(self, name, source, expected_output, Special.None);
402	401	}
403	402
...	...	@@ -431,8 +430,7 @@ pub const CompareOutputContext = struct {
431	430	Special.Asm => {
432	431	const annotated_case_name = fmt.allocPrint(self.b.allocator, "assemble-and-link {}", case.name) catch unreachable;
433	432	if (self.test_filter) \|filter\| {
434		if (mem.indexOf(u8, annotated_case_name, filter) == null)
435		return;
	433	if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
436	434	}
437	435
438	436	const exe = b.addExecutable("test", null);
...	...	@@ -444,19 +442,21 @@ pub const CompareOutputContext = struct {
444	442	exe.step.dependOn(&write_src.step);
445	443	}
446	444
447		const run_and_cmp_output = RunCompareOutputStep.create(self, exe.getOutputPath(), annotated_case_name,
448		case.expected_output, case.cli_args);
	445	const run_and_cmp_output = RunCompareOutputStep.create(self, exe.getOutputPath(), annotated_case_name, case.expected_output, case.cli_args);
449	446	run_and_cmp_output.step.dependOn(&exe.step);
450	447
451	448	self.step.dependOn(&run_and_cmp_output.step);
452	449	},
453	450	Special.None => {
454		for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast, Mode.ReleaseSmall}) \|mode\| {
455		const annotated_case_name = fmt.allocPrint(self.b.allocator, "{} {} ({})",
456		"compare-output", case.name, @tagName(mode)) catch unreachable;
	451	for ([]Mode{
	452	Mode.Debug,
	453	Mode.ReleaseSafe,
	454	Mode.ReleaseFast,
	455	Mode.ReleaseSmall,
	456	}) \|mode\| {
	457	const annotated_case_name = fmt.allocPrint(self.b.allocator, "{} {} ({})", "compare-output", case.name, @tagName(mode)) catch unreachable;
457	458	if (self.test_filter) \|filter\| {
458		if (mem.indexOf(u8, annotated_case_name, filter) == null)
459		continue;
	459	if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;
460	460	}
461	461
462	462	const exe = b.addExecutable("test", root_src);
...	...	@@ -471,8 +471,7 @@ pub const CompareOutputContext = struct {
471	471	exe.step.dependOn(&write_src.step);
472	472	}
473	473
474		const run_and_cmp_output = RunCompareOutputStep.create(self, exe.getOutputPath(),
475		annotated_case_name, case.expected_output, case.cli_args);
	474	const run_and_cmp_output = RunCompareOutputStep.create(self, exe.getOutputPath(), annotated_case_name, case.expected_output, case.cli_args);
476	475	run_and_cmp_output.step.dependOn(&exe.step);
477	476
478	477	self.step.dependOn(&run_and_cmp_output.step);
...	...	@@ -481,8 +480,7 @@ pub const CompareOutputContext = struct {
481	480	Special.RuntimeSafety => {
482	481	const annotated_case_name = fmt.allocPrint(self.b.allocator, "safety {}", case.name) catch unreachable;
483	482	if (self.test_filter) \|filter\| {
484		if (mem.indexOf(u8, annotated_case_name, filter) == null)
485		return;
	483	if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
486	484	}
487	485
488	486	const exe = b.addExecutable("test", root_src);
...	...	@@ -524,7 +522,7 @@ pub const CompileErrorContext = struct {
524	522	};
525	523
526	524	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {
527		self.sources.append(SourceFile {
	525	self.sources.append(SourceFile{
528	526	.filename = filename,
529	527	.source = source,
530	528	}) catch unreachable;
...	...	@@ -543,12 +541,10 @@ pub const CompileErrorContext = struct {
543	541	case: &const TestCase,
544	542	build_mode: Mode,
545	543
546		pub fn create(context: &CompileErrorContext, name: []const u8,
547		case: &const TestCase, build_mode: Mode) &CompileCmpOutputStep
548		{
	544	pub fn create(context: &CompileErrorContext, name: []const u8, case: &const TestCase, build_mode: Mode) &CompileCmpOutputStep {
549	545	const allocator = context.b.allocator;
550	546	const ptr = allocator.create(CompileCmpOutputStep) catch unreachable;
551		*ptr = CompileCmpOutputStep {
	547	ptr.* = CompileCmpOutputStep{
552	548	.step = build.Step.init("CompileCmpOutput", allocator, make),
553	549	.context = context,
554	550	.name = name,
...	...	@@ -586,7 +582,7 @@ pub const CompileErrorContext = struct {
586	582	Mode.ReleaseSmall => zig_args.append("--release-small") catch unreachable,
587	583	}
588	584
589		warn("Test {}/{} {}...", self.test_index+1, self.context.test_index, self.name);
	585	warn("Test {}/{} {}...", self.test_index + 1, self.context.test_index, self.name);
590	586
591	587	if (b.verbose) {
592	588	printInvocation(zig_args.toSliceConst());
...	...	@@ -626,7 +622,6 @@ pub const CompileErrorContext = struct {
626	622	},
627	623	}
628	624
629
630	625	const stdout = stdout_buf.toSliceConst();
631	626	const stderr = stderr_buf.toSliceConst();
632	627
...	...	@@ -666,11 +661,9 @@ pub const CompileErrorContext = struct {
666	661	warn("\n");
667	662	}
668	663
669		pub fn create(self: &CompileErrorContext, name: []const u8, source: []const u8,
670		expected_lines: ...) &TestCase
671		{
	664	pub fn create(self: &CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) &TestCase {
672	665	const tc = self.b.allocator.create(TestCase) catch unreachable;
673		*tc = TestCase {
	666	tc.* = TestCase{
674	667	.name = name,
675	668	.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
676	669	.expected_errors = ArrayList([]const u8).init(self.b.allocator),
...	...	@@ -705,12 +698,13 @@ pub const CompileErrorContext = struct {
705	698	pub fn addCase(self: &CompileErrorContext, case: &const TestCase) void {
706	699	const b = self.b;
707	700
708		for ([]Mode{Mode.Debug, Mode.ReleaseFast}) \|mode\| {
709		const annotated_case_name = fmt.allocPrint(self.b.allocator, "compile-error {} ({})",
710		case.name, @tagName(mode)) catch unreachable;
	701	for ([]Mode{
	702	Mode.Debug,
	703	Mode.ReleaseFast,
	704	}) \|mode\| {
	705	const annotated_case_name = fmt.allocPrint(self.b.allocator, "compile-error {} ({})", case.name, @tagName(mode)) catch unreachable;
711	706	if (self.test_filter) \|filter\| {
712		if (mem.indexOf(u8, annotated_case_name, filter) == null)
713		continue;
	707	if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;
714	708	}
715	709
716	710	const compile_and_cmp_errors = CompileCmpOutputStep.create(self, annotated_case_name, case, mode);
...	...	@@ -744,8 +738,7 @@ pub const BuildExamplesContext = struct {
744	738
745	739	const annotated_case_name = b.fmt("build {} (Debug)", build_file);
746	740	if (self.test_filter) \|filter\| {
747		if (mem.indexOf(u8, annotated_case_name, filter) == null)
748		return;
	741	if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
749	742	}
750	743
751	744	var zig_args = ArrayList([]const u8).init(b.allocator);
...	...	@@ -773,12 +766,15 @@ pub const BuildExamplesContext = struct {
773	766	pub fn addAllArgs(self: &BuildExamplesContext, root_src: []const u8, link_libc: bool) void {
774	767	const b = self.b;
775	768
776		for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast, Mode.ReleaseSmall}) \|mode\| {
777		const annotated_case_name = fmt.allocPrint(self.b.allocator, "build {} ({})",
778		root_src, @tagName(mode)) catch unreachable;
	769	for ([]Mode{
	770	Mode.Debug,
	771	Mode.ReleaseSafe,
	772	Mode.ReleaseFast,
	773	Mode.ReleaseSmall,
	774	}) \|mode\| {
	775	const annotated_case_name = fmt.allocPrint(self.b.allocator, "build {} ({})", root_src, @tagName(mode)) catch unreachable;
779	776	if (self.test_filter) \|filter\| {
780		if (mem.indexOf(u8, annotated_case_name, filter) == null)
781		continue;
	777	if (mem.indexOf(u8, annotated_case_name, filter) == null) continue;
782	778	}
783	779
784	780	const exe = b.addExecutable("test", root_src);
...	...	@@ -813,7 +809,7 @@ pub const TranslateCContext = struct {
813	809	};
814	810
815	811	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {
816		self.sources.append(SourceFile {
	812	self.sources.append(SourceFile{
817	813	.filename = filename,
818	814	.source = source,
819	815	}) catch unreachable;
...	...	@@ -834,7 +830,7 @@ pub const TranslateCContext = struct {
834	830	pub fn create(context: &TranslateCContext, name: []const u8, case: &const TestCase) &TranslateCCmpOutputStep {
835	831	const allocator = context.b.allocator;
836	832	const ptr = allocator.create(TranslateCCmpOutputStep) catch unreachable;
837		*ptr = TranslateCCmpOutputStep {
	833	ptr.* = TranslateCCmpOutputStep{
838	834	.step = build.Step.init("ParseCCmpOutput", allocator, make),
839	835	.context = context,
840	836	.name = name,
...	...	@@ -857,7 +853,7 @@ pub const TranslateCContext = struct {
857	853	zig_args.append("translate-c") catch unreachable;
858	854	zig_args.append(b.pathFromRoot(root_src)) catch unreachable;
859	855
860		warn("Test {}/{} {}...", self.test_index+1, self.context.test_index, self.name);
	856	warn("Test {}/{} {}...", self.test_index + 1, self.context.test_index, self.name);
861	857
862	858	if (b.verbose) {
863	859	printInvocation(zig_args.toSliceConst());
...	...	@@ -939,11 +935,9 @@ pub const TranslateCContext = struct {
939	935	warn("\n");
940	936	}
941	937
942		pub fn create(self: &TranslateCContext, allow_warnings: bool, filename: []const u8, name: []const u8,
943		source: []const u8, expected_lines: ...) &TestCase
944		{
	938	pub fn create(self: &TranslateCContext, allow_warnings: bool, filename: []const u8, name: []const u8, source: []const u8, expected_lines: ...) &TestCase {
945	939	const tc = self.b.allocator.create(TestCase) catch unreachable;
946		*tc = TestCase {
	940	tc.* = TestCase{
947	941	.name = name,
948	942	.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
949	943	.expected_lines = ArrayList([]const u8).init(self.b.allocator),
...	...	@@ -977,8 +971,7 @@ pub const TranslateCContext = struct {
977	971
978	972	const annotated_case_name = fmt.allocPrint(self.b.allocator, "translate-c {}", case.name) catch unreachable;
979	973	if (self.test_filter) \|filter\| {
980		if (mem.indexOf(u8, annotated_case_name, filter) == null)
981		return;
	974	if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
982	975	}
983	976
984	977	const translate_c_and_cmp = TranslateCCmpOutputStep.create(self, annotated_case_name, case);
...	...	@@ -1009,7 +1002,7 @@ pub const GenHContext = struct {
1009	1002	};
1010	1003
1011	1004	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {
1012		self.sources.append(SourceFile {
	1005	self.sources.append(SourceFile{
1013	1006	.filename = filename,
1014	1007	.source = source,
1015	1008	}) catch unreachable;
...	...	@@ -1031,7 +1024,7 @@ pub const GenHContext = struct {
1031	1024	pub fn create(context: &GenHContext, h_path: []const u8, name: []const u8, case: &const TestCase) &GenHCmpOutputStep {
1032	1025	const allocator = context.b.allocator;
1033	1026	const ptr = allocator.create(GenHCmpOutputStep) catch unreachable;
1034		*ptr = GenHCmpOutputStep {
	1027	ptr.* = GenHCmpOutputStep{
1035	1028	.step = build.Step.init("ParseCCmpOutput", allocator, make),
1036	1029	.context = context,
1037	1030	.h_path = h_path,
...	...	@@ -1047,7 +1040,7 @@ pub const GenHContext = struct {
1047	1040	const self = @fieldParentPtr(GenHCmpOutputStep, "step", step);
1048	1041	const b = self.context.b;
1049	1042
1050		warn("Test {}/{} {}...", self.test_index+1, self.context.test_index, self.name);
	1043	warn("Test {}/{} {}...", self.test_index + 1, self.context.test_index, self.name);
1051	1044
1052	1045	const full_h_path = b.pathFromRoot(self.h_path);
1053	1046	const actual_h = try io.readFileAlloc(b.allocator, full_h_path);
...	...	@@ -1076,11 +1069,9 @@ pub const GenHContext = struct {
1076	1069	warn("\n");
1077	1070	}
1078	1071
1079		pub fn create(self: &GenHContext, filename: []const u8, name: []const u8,
1080		source: []const u8, expected_lines: ...) &TestCase
1081		{
	1072	pub fn create(self: &GenHContext, filename: []const u8, name: []const u8, source: []const u8, expected_lines: ...) &TestCase {
1082	1073	const tc = self.b.allocator.create(TestCase) catch unreachable;
1083		*tc = TestCase {
	1074	tc.* = TestCase{
1084	1075	.name = name,
1085	1076	.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
1086	1077	.expected_lines = ArrayList([]const u8).init(self.b.allocator),
...	...	@@ -1105,8 +1096,7 @@ pub const GenHContext = struct {
1105	1096	const mode = builtin.Mode.Debug;
1106	1097	const annotated_case_name = fmt.allocPrint(self.b.allocator, "gen-h {} ({})", case.name, @tagName(mode)) catch unreachable;
1107	1098	if (self.test_filter) \|filter\| {
1108		if (mem.indexOf(u8, annotated_case_name, filter) == null)
1109		return;
	1099	if (mem.indexOf(u8, annotated_case_name, filter) == null) return;
1110	1100	}
1111	1101
1112	1102	const obj = b.addObject("test", root_src);

test/translate_c.zig+74-75

...	...	@@ -638,7 +638,6 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
638	638	\\}
639	639	);
640	640
641
642	641	cases.addC("c style cast",
643	642	\\int float_to_int(float a) {
644	643	\\ return (int)a;
...	...	@@ -720,43 +719,43 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
720	719	\\ var a: c_int = 0;
721	720	\\ a += x: {
722	721	\\ const _ref = &a;
723		\\ (_ref) = ((_ref) + 1);
724		\\ break :x *_ref;
	722	\\ _ref.* = (_ref.* + 1);
	723	\\ break :x _ref.*;
725	724	\\ };
726	725	\\ a -= x: {
727	726	\\ const _ref = &a;
728		\\ (_ref) = ((_ref) - 1);
729		\\ break :x *_ref;
	727	\\ _ref.* = (_ref.* - 1);
	728	\\ break :x _ref.*;
730	729	\\ };
731	730	\\ a *= x: {
732	731	\\ const _ref = &a;
733		\\ (_ref) = ((_ref) * 1);
734		\\ break :x *_ref;
	732	\\ _ref.* = (_ref.* * 1);
	733	\\ break :x _ref.*;
735	734	\\ };
736	735	\\ a &= x: {
737	736	\\ const _ref = &a;
738		\\ (_ref) = ((_ref) & 1);
739		\\ break :x *_ref;
	737	\\ _ref.* = (_ref.* & 1);
	738	\\ break :x _ref.*;
740	739	\\ };
741	740	\\ a \|= x: {
742	741	\\ const _ref = &a;
743		\\ (_ref) = ((_ref) \| 1);
744		\\ break :x *_ref;
	742	\\ _ref.* = (_ref.* \| 1);
	743	\\ break :x _ref.*;
745	744	\\ };
746	745	\\ a ^= x: {
747	746	\\ const _ref = &a;
748		\\ (_ref) = ((_ref) ^ 1);
749		\\ break :x *_ref;
	747	\\ _ref.* = (_ref.* ^ 1);
	748	\\ break :x _ref.*;
750	749	\\ };
751	750	\\ a >>= @import("std").math.Log2Int(c_int)(x: {
752	751	\\ const _ref = &a;
753		\\ (_ref) = ((_ref) >> @import("std").math.Log2Int(c_int)(1));
754		\\ break :x *_ref;
	752	\\ _ref.* = (_ref.* >> @import("std").math.Log2Int(c_int)(1));
	753	\\ break :x _ref.*;
755	754	\\ });
756	755	\\ a <<= @import("std").math.Log2Int(c_int)(x: {
757	756	\\ const _ref = &a;
758		\\ (_ref) = ((_ref) << @import("std").math.Log2Int(c_int)(1));
759		\\ break :x *_ref;
	757	\\ _ref.* = (_ref.* << @import("std").math.Log2Int(c_int)(1));
	758	\\ break :x _ref.*;
760	759	\\ });
761	760	\\}
762	761	);
...	...	@@ -778,43 +777,43 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
778	777	\\ var a: c_uint = c_uint(0);
779	778	\\ a +%= x: {
780	779	\\ const _ref = &a;
781		\\ (_ref) = ((_ref) +% c_uint(1));
782		\\ break :x *_ref;
	780	\\ _ref.* = (_ref.* +% c_uint(1));
	781	\\ break :x _ref.*;
783	782	\\ };
784	783	\\ a -%= x: {
785	784	\\ const _ref = &a;
786		\\ (_ref) = ((_ref) -% c_uint(1));
787		\\ break :x *_ref;
	785	\\ _ref.* = (_ref.* -% c_uint(1));
	786	\\ break :x _ref.*;
788	787	\\ };
789	788	\\ a *%= x: {
790	789	\\ const _ref = &a;
791		\\ (_ref) = ((_ref) *% c_uint(1));
792		\\ break :x *_ref;
	790	\\ _ref.* = (_ref.* *% c_uint(1));
	791	\\ break :x _ref.*;
793	792	\\ };
794	793	\\ a &= x: {
795	794	\\ const _ref = &a;
796		\\ (_ref) = ((_ref) & c_uint(1));
797		\\ break :x *_ref;
	795	\\ _ref.* = (_ref.* & c_uint(1));
	796	\\ break :x _ref.*;
798	797	\\ };
799	798	\\ a \|= x: {
800	799	\\ const _ref = &a;
801		\\ (_ref) = ((_ref) \| c_uint(1));
802		\\ break :x *_ref;
	800	\\ _ref.* = (_ref.* \| c_uint(1));
	801	\\ break :x _ref.*;
803	802	\\ };
804	803	\\ a ^= x: {
805	804	\\ const _ref = &a;
806		\\ (_ref) = ((_ref) ^ c_uint(1));
807		\\ break :x *_ref;
	805	\\ _ref.* = (_ref.* ^ c_uint(1));
	806	\\ break :x _ref.*;
808	807	\\ };
809	808	\\ a >>= @import("std").math.Log2Int(c_uint)(x: {
810	809	\\ const _ref = &a;
811		\\ (_ref) = ((_ref) >> @import("std").math.Log2Int(c_uint)(1));
812		\\ break :x *_ref;
	810	\\ _ref.* = (_ref.* >> @import("std").math.Log2Int(c_uint)(1));
	811	\\ break :x _ref.*;
813	812	\\ });
814	813	\\ a <<= @import("std").math.Log2Int(c_uint)(x: {
815	814	\\ const _ref = &a;
816		\\ (_ref) = ((_ref) << @import("std").math.Log2Int(c_uint)(1));
817		\\ break :x *_ref;
	815	\\ _ref.* = (_ref.* << @import("std").math.Log2Int(c_uint)(1));
	816	\\ break :x _ref.*;
818	817	\\ });
819	818	\\}
820	819	);
...	...	@@ -853,26 +852,26 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
853	852	\\ u -%= 1;
854	853	\\ i = x: {
855	854	\\ const _ref = &i;
856		\\ const _tmp = *_ref;
857		\\ (*_ref) += 1;
	855	\\ const _tmp = _ref.*;
	856	\\ _ref.* += 1;
858	857	\\ break :x _tmp;
859	858	\\ };
860	859	\\ i = x: {
861	860	\\ const _ref = &i;
862		\\ const _tmp = *_ref;
863		\\ (*_ref) -= 1;
	861	\\ const _tmp = _ref.*;
	862	\\ _ref.* -= 1;
864	863	\\ break :x _tmp;
865	864	\\ };
866	865	\\ u = x: {
867	866	\\ const _ref = &u;
868		\\ const _tmp = *_ref;
869		\\ (*_ref) +%= 1;
	867	\\ const _tmp = _ref.*;
	868	\\ _ref.* +%= 1;
870	869	\\ break :x _tmp;
871	870	\\ };
872	871	\\ u = x: {
873	872	\\ const _ref = &u;
874		\\ const _tmp = *_ref;
875		\\ (*_ref) -%= 1;
	873	\\ const _tmp = _ref.*;
	874	\\ _ref.* -%= 1;
876	875	\\ break :x _tmp;
877	876	\\ };
878	877	\\}
...	...	@@ -901,23 +900,23 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
901	900	\\ u -%= 1;
902	901	\\ i = x: {
903	902	\\ const _ref = &i;
904		\\ (*_ref) += 1;
905		\\ break :x *_ref;
	903	\\ _ref.* += 1;
	904	\\ break :x _ref.*;
906	905	\\ };
907	906	\\ i = x: {
908	907	\\ const _ref = &i;
909		\\ (*_ref) -= 1;
910		\\ break :x *_ref;
	908	\\ _ref.* -= 1;
	909	\\ break :x _ref.*;
911	910	\\ };
912	911	\\ u = x: {
913	912	\\ const _ref = &u;
914		\\ (*_ref) +%= 1;
915		\\ break :x *_ref;
	913	\\ _ref.* +%= 1;
	914	\\ break :x _ref.*;
916	915	\\ };
917	916	\\ u = x: {
918	917	\\ const _ref = &u;
919		\\ (*_ref) -%= 1;
920		\\ break :x *_ref;
	918	\\ _ref.* -%= 1;
	919	\\ break :x _ref.*;
921	920	\\ };
922	921	\\}
923	922	);
...	...	@@ -985,7 +984,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
985	984	\\}
986	985	,
987	986	\\pub export fn foo(x: ?&c_int) void {
988		\\ (*??x) = 1;
	987	\\ (??x).* = 1;
989	988	\\}
990	989	);
991	990
...	...	@@ -1013,7 +1012,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1013	1012	\\pub fn foo() c_int {
1014	1013	\\ var x: c_int = 1234;
1015	1014	\\ var ptr: ?&c_int = &x;
1016		\\ return *??ptr;
	1015	\\ return (??ptr).*;
1017	1016	\\}
1018	1017	);
1019	1018
...	...	@@ -1289,29 +1288,29 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1289	1288	\\ }
1290	1289	\\}
1291	1290	,
1292		\\pub fn switch_fn(i: c_int) c_int {
1293		\\ var res: c_int = 0;
1294		\\ __switch: {
1295		\\ __case_2: {
1296		\\ __default: {
1297		\\ __case_1: {
1298		\\ __case_0: {
1299		\\ switch (i) {
1300		\\ 0 => break :__case_0,
1301		\\ 1 => break :__case_1,
1302		\\ else => break :__default,
1303		\\ 2 => break :__case_2,
1304		\\ }
1305		\\ }
1306		\\ res = 1;
1307		\\ }
1308		\\ res = 2;
1309		\\ }
1310		\\ res = (3 * i);
1311		\\ break :__switch;
1312		\\ }
1313		\\ res = 5;
1314		\\ }
1315		\\}
	1291	\\pub fn switch_fn(i: c_int) c_int {
	1292	\\ var res: c_int = 0;
	1293	\\ __switch: {
	1294	\\ __case_2: {
	1295	\\ __default: {
	1296	\\ __case_1: {
	1297	\\ __case_0: {
	1298	\\ switch (i) {
	1299	\\ 0 => break :__case_0,
	1300	\\ 1 => break :__case_1,
	1301	\\ else => break :__default,
	1302	\\ 2 => break :__case_2,
	1303	\\ }
	1304	\\ }
	1305	\\ res = 1;
	1306	\\ }
	1307	\\ res = 2;
	1308	\\ }
	1309	\\ res = (3 * i);
	1310	\\ break :__switch;
	1311	\\ }
	1312	\\ res = 5;
	1313	\\ }
	1314	\\}
1316	1315	);
1317	1316	}

author	tgschultz <tgschultz@gmail.com> 2018-05-30 08:26:13-05:00
committer	GitHub <noreply@github.com> 2018-05-30 08:26:13-05:00
log	8174f972a779384b287528e46ea086c714ce5553
tree	02e919ffd9a783abb5b984aaefd9c4b03f608e8b
parent	8c1872543c8cf76215cc4bf3ced4637bb1065a4e
parent	15302e84a45a04cfe94a8842318f02a608055962
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #2 from ziglang/master