Commit 58ce79f9352a6139c873df6d99d1531101350e9f | zig

build.zig+7-7

doc/docgen.zig+11-11

...	@@ -104,7 +104,7 @@ const Tokenizer = struct {	...	@@ -104,7 +104,7 @@ const Tokenizer = struct {
104	};	104	};
105	}	105	}
106		106
107	fn next(self: &Tokenizer) Token {	107	fn next(self: *Tokenizer) Token {
108	var result = Token{	108	var result = Token{
109	.id = Token.Id.Eof,	109	.id = Token.Id.Eof,
110	.start = self.index,	110	.start = self.index,
...	@@ -196,7 +196,7 @@ const Tokenizer = struct {	...	@@ -196,7 +196,7 @@ const Tokenizer = struct {
196	line_end: usize,	196	line_end: usize,
197	};	197	};
198		198
199	fn getTokenLocation(self: &Tokenizer, token: &const Token) Location {	199	fn getTokenLocation(self: Tokenizer, token: const Token) Location {
200	var loc = Location{	200	var loc = Location{
201	.line = 0,	201	.line = 0,
202	.column = 0,	202	.column = 0,
...	@@ -221,7 +221,7 @@ const Tokenizer = struct {	...	@@ -221,7 +221,7 @@ const Tokenizer = struct {
221	}	221	}
222	};	222	};
223		223
224	fn parseError(tokenizer: &Tokenizer, token: &const Token, comptime fmt: []const u8, args: ...) error {	224	fn parseError(tokenizer: Tokenizer, token: const Token, comptime fmt: []const u8, args: ...) error {
225	const loc = tokenizer.getTokenLocation(token);	225	const loc = tokenizer.getTokenLocation(token);
226	warn("{}:{}:{}: error: " ++ fmt ++ "\n", tokenizer.source_file_name, loc.line + 1, loc.column + 1, args);	226	warn("{}:{}:{}: error: " ++ fmt ++ "\n", tokenizer.source_file_name, loc.line + 1, loc.column + 1, args);
227	if (loc.line_start <= loc.line_end) {	227	if (loc.line_start <= loc.line_end) {
...	@@ -244,13 +244,13 @@ fn parseError(tokenizer: &Tokenizer, token: &const Token, comptime fmt: []const	...	@@ -244,13 +244,13 @@ fn parseError(tokenizer: &Tokenizer, token: &const Token, comptime fmt: []const
244	return error.ParseError;	244	return error.ParseError;
245	}	245	}
246		246
247	fn assertToken(tokenizer: &Tokenizer, token: &const Token, id: Token.Id) !void {	247	fn assertToken(tokenizer: Tokenizer, token: const Token, id: Token.Id) !void {
248	if (token.id != id) {	248	if (token.id != id) {
249	return parseError(tokenizer, token, "expected {}, found {}", @tagName(id), @tagName(token.id));	249	return parseError(tokenizer, token, "expected {}, found {}", @tagName(id), @tagName(token.id));
250	}	250	}
251	}	251	}
252		252
253	fn eatToken(tokenizer: &Tokenizer, id: Token.Id) !Token {	253	fn eatToken(tokenizer: *Tokenizer, id: Token.Id) !Token {
254	const token = tokenizer.next();	254	const token = tokenizer.next();
255	try assertToken(tokenizer, token, id);	255	try assertToken(tokenizer, token, id);
256	return token;	256	return token;
...	@@ -317,7 +317,7 @@ const Action = enum {	...	@@ -317,7 +317,7 @@ const Action = enum {
317	Close,	317	Close,
318	};	318	};
319		319
320	fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {	320	fn genToc(allocator: mem.Allocator, tokenizer: Tokenizer) !Toc {
321	var urls = std.HashMap([]const u8, Token, mem.hash_slice_u8, mem.eql_slice_u8).init(allocator);	321	var urls = std.HashMap([]const u8, Token, mem.hash_slice_u8, mem.eql_slice_u8).init(allocator);
322	errdefer urls.deinit();	322	errdefer urls.deinit();
323		323
...	@@ -546,7 +546,7 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {	...	@@ -546,7 +546,7 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
546	};	546	};
547	}	547	}
548		548
549	fn urlize(allocator: &mem.Allocator, input: []const u8) ![]u8 {	549	fn urlize(allocator: *mem.Allocator, input: []const u8) ![]u8 {
550	var buf = try std.Buffer.initSize(allocator, 0);	550	var buf = try std.Buffer.initSize(allocator, 0);
551	defer buf.deinit();	551	defer buf.deinit();
552		552
...	@@ -566,7 +566,7 @@ fn urlize(allocator: &mem.Allocator, input: []const u8) ![]u8 {	...	@@ -566,7 +566,7 @@ fn urlize(allocator: &mem.Allocator, input: []const u8) ![]u8 {
566	return buf.toOwnedSlice();	566	return buf.toOwnedSlice();
567	}	567	}
568		568
569	fn escapeHtml(allocator: &mem.Allocator, input: []const u8) ![]u8 {	569	fn escapeHtml(allocator: *mem.Allocator, input: []const u8) ![]u8 {
570	var buf = try std.Buffer.initSize(allocator, 0);	570	var buf = try std.Buffer.initSize(allocator, 0);
571	defer buf.deinit();	571	defer buf.deinit();
572		572
...	@@ -608,7 +608,7 @@ test "term color" {	...	@@ -608,7 +608,7 @@ test "term color" {
608	assert(mem.eql(u8, result, "A<span class=\"t32\">green</span>B"));	608	assert(mem.eql(u8, result, "A<span class=\"t32\">green</span>B"));
609	}	609	}
610		610
611	fn termColor(allocator: &mem.Allocator, input: []const u8) ![]u8 {	611	fn termColor(allocator: *mem.Allocator, input: []const u8) ![]u8 {
612	var buf = try std.Buffer.initSize(allocator, 0);	612	var buf = try std.Buffer.initSize(allocator, 0);
613	defer buf.deinit();	613	defer buf.deinit();
614		614
...	@@ -688,7 +688,7 @@ fn termColor(allocator: &mem.Allocator, input: []const u8) ![]u8 {	...	@@ -688,7 +688,7 @@ fn termColor(allocator: &mem.Allocator, input: []const u8) ![]u8 {
688	return buf.toOwnedSlice();	688	return buf.toOwnedSlice();
689	}	689	}
690		690
691	fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var, zig_exe: []const u8) !void {	691	fn genHtml(allocator: mem.Allocator, tokenizer: Tokenizer, toc: *Toc, out: var, zig_exe: []const u8) !void {
692	var code_progress_index: usize = 0;	692	var code_progress_index: usize = 0;
693	for (toc.nodes) \|node\| {	693	for (toc.nodes) \|node\| {
694	switch (node) {	694	switch (node) {
...	@@ -1036,7 +1036,7 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var	...	@@ -1036,7 +1036,7 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
1036	}	1036	}
1037	}	1037	}
1038		1038
1039	fn exec(allocator: &mem.Allocator, args: []const []const u8) !os.ChildProcess.ExecResult {	1039	fn exec(allocator: *mem.Allocator, args: []const []const u8) !os.ChildProcess.ExecResult {
1040	const result = try os.ChildProcess.exec(allocator, args, null, null, max_doc_file_size);	1040	const result = try os.ChildProcess.exec(allocator, args, null, null, max_doc_file_size);
1041	switch (result.term) {	1041	switch (result.term) {
1042	os.ChildProcess.Term.Exited => \|exit_code\| {	1042	os.ChildProcess.Term.Exited => \|exit_code\| {

doc/langref.html.in+133-125

 @@ -458,7 +458,7 @@ test "string literals" {
     // A C string literal is a null terminated pointer.
     const null_terminated_bytes = c"hello";
-    assert(@typeOf(null_terminated_bytes) == &const u8);
+    assert(@typeOf(null_terminated_bytes) == [*]const u8);
     assert(null_terminated_bytes[5] == 0);
 }
       {#code_end#}
 @@ -547,7 +547,7 @@ const c_string_literal =
 ;
       {#code_end#}
       <p>
-      In this example the variable <code>c_string_literal</code> has type <code>&amp;const char</code> and
+      In this example the variable <code>c_string_literal</code> has type <code>[*]const char</code> and
       has a terminating null byte.
       </p>
       {#see_also|@embedFile#}
 @@ -1288,7 +1288,7 @@ const assert = @import("std").debug.assert;
 const mem = @import("std").mem;
 // array literal
-const message = []u8{'h', 'e', 'l', 'l', 'o'};
+const message = []u8{ 'h', 'e', 'l', 'l', 'o' };
 // get the size of an array
 comptime {
 @@ -1324,11 +1324,11 @@ test "modify an array" {
 // array concatenation works if the values are known
 // at compile time
-const part_one = []i32{1, 2, 3, 4};
+const part_one = []i32{ 1, 2, 3, 4 };
-const part_two = []i32{5, 6, 7, 8};
+const part_two = []i32{ 5, 6, 7, 8 };
 const all_of_it = part_one ++ part_two;
 comptime {
-    assert(mem.eql(i32, all_of_it, []i32{1,2,3,4,5,6,7,8}));
+    assert(mem.eql(i32, all_of_it, []i32{ 1, 2, 3, 4, 5, 6, 7, 8 }));
 }
 // remember that string literals are arrays
 @@ -1357,7 +1357,7 @@ comptime {
 var fancy_array = init: {
     var initial_value: [10]Point = undefined;
     for (initial_value) |*pt, i| {
-        pt.* = Point {
+        pt.* = Point{
             .x = i32(i),
             .y = i32(i) * 2,
         };
 @@ -1377,7 +1377,7 @@ test "compile-time array initalization" {
 // call a function to initialize an array
 var more_points = []Point{makePoint(3)} ** 10;
 fn makePoint(x: i32) Point {
-    return Point {
+    return Point{
         .x = x,
         .y = x * 2,
     };
 @@ -1403,36 +1403,35 @@ test "address of syntax" {
     assert(x_ptr.* == 1234);
     // When you get the address of a const variable, you get a const pointer.
-    assert(@typeOf(x_ptr) == &const i32);
+    assert(@typeOf(x_ptr) == *const i32);
     // If you want to mutate the value, you'd need an address of a mutable variable:
     var y: i32 = 5678;
     const y_ptr = &y;
-    assert(@typeOf(y_ptr) == &i32);
+    assert(@typeOf(y_ptr) == *i32);
     y_ptr.* += 1;
     assert(y_ptr.* == 5679);
 }
 test "pointer array access" {
-    // Pointers do not support pointer arithmetic. If you
+    // Taking an address of an individual element gives a
-    // need such a thing, use array index syntax:
+    // pointer to a single item. This kind of pointer
+    // does not support pointer arithmetic.
     var array = []u8{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    const ptr = &array[1];
+    const ptr = &array[2];
+    assert(@typeOf(ptr) == *u8);
     assert(array[2] == 3);
-    ptr[1] += 1;
+    ptr.* += 1;
     assert(array[2] == 4);
 }
 test "pointer slicing" {
     // In Zig, we prefer using slices over null-terminated pointers.
-    // You can turn a pointer into a slice using slice syntax:
+    // You can turn an array into a slice using slice syntax:
     var array = []u8{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-    const ptr = &array[1];
+    const slice = array[2..4];
-    const slice = ptr[1..3];
-    assert(slice.ptr == &ptr[1]);
     assert(slice.len == 2);
     // Slices have bounds checking and are therefore protected
 @@ -1455,7 +1454,7 @@ comptime {
 test "@ptrToInt and @intToPtr" {
     // To convert an integer address into a pointer, use @intToPtr:
-    const ptr = @intToPtr(&i32, 0xdeadbeef);
+    const ptr = @intToPtr(*i32, 0xdeadbeef);
     // To convert a pointer to an integer, use @ptrToInt:
     const addr = @ptrToInt(ptr);
 @@ -1467,7 +1466,7 @@ test "@ptrToInt and @intToPtr" {
 comptime {
     // Zig is able to do this at compile-time, as long as
     // ptr is never dereferenced.
-    const ptr = @intToPtr(&i32, 0xdeadbeef);
+    const ptr = @intToPtr(*i32, 0xdeadbeef);
     const addr = @ptrToInt(ptr);
     assert(@typeOf(addr) == usize);
     assert(addr == 0xdeadbeef);
 @@ -1477,17 +1476,17 @@ test "volatile" {
     // In Zig, loads and stores are assumed to not have side effects.
     // If a given load or store should have side effects, such as
     // Memory Mapped Input/Output (MMIO), use `volatile`:
-    const mmio_ptr = @intToPtr(&volatile u8, 0x12345678);
+    const mmio_ptr = @intToPtr(*volatile u8, 0x12345678);
     // Now loads and stores with mmio_ptr are guaranteed to all happen
     // and in the same order as in source code.
-    assert(@typeOf(mmio_ptr) == &volatile u8);
+    assert(@typeOf(mmio_ptr) == *volatile u8);
 }
 test "nullable pointers" {
     // Pointers cannot be null. If you want a null pointer, use the nullable
     // prefix `?` to make the pointer type nullable.
-    var ptr: ?&i32 = null;
+    var ptr: ?*i32 = null;
     var x: i32 = 1;
     ptr = &x;
 @@ -1496,7 +1495,7 @@ test "nullable pointers" {
     // Nullable pointers are the same size as normal pointers, because pointer
     // value 0 is used as the null value.
-    assert(@sizeOf(?&i32) == @sizeOf(&i32));
+    assert(@sizeOf(?*i32) == @sizeOf(*i32));
 }
 test "pointer casting" {
 @@ -1504,7 +1503,7 @@ test "pointer casting" {
     // operation that Zig cannot protect you against. Use @ptrCast only when other
     // conversions are not possible.
     const bytes align(@alignOf(u32)) = []u8{0x12, 0x12, 0x12, 0x12};
-    const u32_ptr = @ptrCast(&const u32, &bytes[0]);
+    const u32_ptr = @ptrCast(*const u32, &bytes[0]);
     assert(u32_ptr.* == 0x12121212);
     // Even this example is contrived - there are better ways to do the above than
 @@ -1518,7 +1517,7 @@ test "pointer casting" {
 test "pointer child type" {
     // pointer types have a `child` field which tells you the type they point to.
-    assert((&u32).Child == u32);
+    assert((*u32).Child == u32);
 }
       {#code_end#}
       {#header_open|Alignment#}
 @@ -1543,15 +1542,15 @@ const builtin = @import("builtin");
 test "variable alignment" {
     var x: i32 = 1234;
     const align_of_i32 = @alignOf(@typeOf(x));
-    assert(@typeOf(&x) == &i32);
+    assert(@typeOf(&x) == *i32);
-    assert(&i32 == &align(align_of_i32) i32);
+    assert(*i32 == *align(align_of_i32) i32);
     if (builtin.arch == builtin.Arch.x86_64) {
-        assert((&i32).alignment == 4);
+        assert((*i32).alignment == 4);
     }
 }
       {#code_end#}
-      <p>In the same way that a <code>&amp;i32</code> can be implicitly cast to a
+      <p>In the same way that a <code>*i32</code> can be implicitly cast to a
-      <code>&amp;const i32</code>, a pointer with a larger alignment can be implicitly
+      <code>*const i32</code>, a pointer with a larger alignment can be implicitly
       cast to a pointer with a smaller alignment, but not vice versa.
       </p>
       <p>
 @@ -1565,7 +1564,7 @@ var foo: u8 align(4) = 100;
 test "global variable alignment" {
     assert(@typeOf(&foo).alignment == 4);
-    assert(@typeOf(&foo) == &align(4) u8);
+    assert(@typeOf(&foo) == *align(4) u8);
     const slice = (&foo)[0..1];
     assert(@typeOf(slice) == []align(4) u8);
 }
 @@ -1610,7 +1609,7 @@ fn foo(bytes: []u8) u32 {
       <code>u8</code> can alias any memory.
       </p>
       <p>As an example, this code produces undefined behavior:</p>
-      <pre><code class="zig">@ptrCast(&amp;u32, f32(12.34)).*</code></pre>
+      <pre><code class="zig">@ptrCast(*u32, f32(12.34)).*</code></pre>
       <p>Instead, use {#link|@bitCast#}:
       <pre><code class="zig">@bitCast(u32, f32(12.34))</code></pre>
       <p>As an added benefit, the <code>@bitcast</code> version works at compile-time.</p>
 @@ -1622,18 +1621,27 @@ fn foo(bytes: []u8) u32 {
 const assert = @import("std").debug.assert;
 test "basic slices" {
-    var array = []i32{1, 2, 3, 4};
+    var array = []i32{ 1, 2, 3, 4 };
     // A slice is a pointer and a length. The difference between an array and
     // a slice is that the array's length is part of the type and known at
     // compile-time, whereas the slice's length is known at runtime.
     // Both can be accessed with the `len` field.
     const slice = array[0..array.len];
-    assert(slice.ptr == &array[0]);
+    assert(&slice[0] == &array[0]);
     assert(slice.len == array.len);
+    // Using the address-of operator on a slice gives a pointer to a single
+    // item, while using the `ptr` field gives an unknown length pointer.
+    assert(@typeOf(slice.ptr) == [*]i32);
+    assert(@typeOf(&slice[0]) == *i32);
+    assert(@ptrToInt(slice.ptr) == @ptrToInt(&slice[0]));
     // Slices have array bounds checking. If you try to access something out
     // of bounds, you'll get a safety check failure:
     slice[10] += 1;
+    // Note that `slice.ptr` does not invoke safety checking, while `&slice[0]`
+    // asserts that the slice has len >= 1.
 }
       {#code_end#}
       <p>This is one reason we prefer slices to pointers.</p>
 @@ -1736,7 +1744,7 @@ const Vec3 = struct {
         };
     }
-    pub fn dot(self: &const Vec3, other: &const Vec3) f32 {
+    pub fn dot(self: *const Vec3, other: *const Vec3) f32 {
         return self.x * other.x + self.y * other.y + self.z * other.z;
     }
 };
 @@ -1768,7 +1776,7 @@ test "struct namespaced variable" {
 // struct field order is determined by the compiler for optimal performance.
 // however, you can still calculate a struct base pointer given a field pointer:
-fn setYBasedOnX(x: &f32, y: f32) void {
+fn setYBasedOnX(x: *f32, y: f32) void {
     const point = @fieldParentPtr(Point, "x", x);
     point.y = y;
 }
 @@ -1786,13 +1794,13 @@ test "field parent pointer" {
 fn LinkedList(comptime T: type) type {
     return struct {
         pub const Node = struct {
-            prev: ?&Node,
+            prev: ?*Node,
-            next: ?&Node,
+            next: ?*Node,
             data: T,
         };
-        first: ?&Node,
+        first: ?*Node,
-        last:  ?&Node,
+        last:  ?*Node,
         len:   usize,
     };
 }
 @@ -2039,7 +2047,7 @@ const Variant = union(enum) {
     Int: i32,
     Bool: bool,
-    fn truthy(self: &const Variant) bool {
+    fn truthy(self: *const Variant) bool {
         return switch (self.*) {
             Variant.Int => |x_int| x_int != 0,
             Variant.Bool => |x_bool| x_bool,
 @@ -2786,7 +2794,7 @@ test "pass aggregate type by value to function" {
 }
       {#code_end#}
       <p>
-      Instead, one must use <code>&amp;const</code>. Zig allows implicitly casting something
+      Instead, one must use <code>*const</code>. Zig allows implicitly casting something
       to a const pointer to it:
       </p>
       {#code_begin|test#}
 @@ -2794,7 +2802,7 @@ const Foo = struct {
     x: i32,
 };
-fn bar(foo: &const Foo) void {}
+fn bar(foo: *const Foo) void {}
 test "implicitly cast to const pointer" {
     bar(Foo {.x = 12,});
 @@ -3208,16 +3216,16 @@ struct Foo *do_a_thing(void) {
       <p>Zig code</p>
       {#code_begin|syntax#}
 // malloc prototype included for reference
-extern fn malloc(size: size_t) ?&u8;
+extern fn malloc(size: size_t) ?*u8;
-fn doAThing() ?&Foo {
+fn doAThing() ?*Foo {
     const ptr = malloc(1234) ?? return null;
     // ...
 }
       {#code_end#}
       <p>
         Here, Zig is at least as convenient, if not more, than C. And, the type of "ptr"
-        is <code>&u8</code> <em>not</em> <code>?&u8</code>. The <code>??</code> operator
+        is <code>*u8</code> <em>not</em> <code>?*u8</code>. The <code>??</code> operator
         unwrapped the nullable type and therefore <code>ptr</code> is guaranteed to be non-null everywhere
         it is used in the function.
       </p>
 @@ -3237,7 +3245,7 @@ fn doAThing() ?&Foo {
         In Zig you can accomplish the same thing:
       </p>
       {#code_begin|syntax#}
-fn doAThing(nullable_foo: ?&Foo) void {
+fn doAThing(nullable_foo: ?*Foo) void {
     // do some stuff
     if (nullable_foo) |foo| {
 @@ -3713,7 +3721,7 @@ fn List(comptime T: type) type {
       </p>
       {#code_begin|syntax#}
 const Node = struct {
-    next: &Node,
+    next: *Node,
     name: []u8,
 };
       {#code_end#}
 @@ -3745,7 +3753,7 @@ pub fn main() void {
       {#code_begin|syntax#}
 /// Calls print and then flushes the buffer.
-pub fn printf(self: &OutStream, comptime format: []const u8, args: ...) error!void {
+pub fn printf(self: *OutStream, comptime format: []const u8, args: ...) error!void {
     const State = enum {
         Start,
         OpenBrace,
 @@ -3817,7 +3825,7 @@ pub fn printf(self: &OutStream, comptime format: []const u8, args: ...) error!vo
       and emits a function that actually looks like this:
       </p>
       {#code_begin|syntax#}
-pub fn printf(self: &OutStream, arg0: i32, arg1: []const u8) !void {
+pub fn printf(self: *OutStream, arg0: i32, arg1: []const u8) !void {
     try self.write("here is a string: '");
     try self.printValue(arg0);
     try self.write("' here is a number: ");
 @@ -3831,7 +3839,7 @@ pub fn printf(self: &OutStream, arg0: i32, arg1: []const u8) !void {
       on the type:
       </p>
       {#code_begin|syntax#}
-pub fn printValue(self: &OutStream, value: var) !void {
+pub fn printValue(self: *OutStream, value: var) !void {
     const T = @typeOf(value);
     if (@isInteger(T)) {
         return self.printInt(T, value);
 @@ -3911,7 +3919,7 @@ pub fn main() void {
       at compile time.
       </p>
       {#header_open|@addWithOverflow#}
-      <pre><code class="zig">@addWithOverflow(comptime T: type, a: T, b: T, result: &T) -&gt; bool</code></pre>
+      <pre><code class="zig">@addWithOverflow(comptime T: type, a: T, b: T, result: *T) bool</code></pre>
       <p>
       Performs <code>result.* = a + b</code>. If overflow or underflow occurs,
       stores the overflowed bits in <code>result</code> and returns <code>true</code>.
 @@ -3919,7 +3927,7 @@ pub fn main() void {
       </p>
       {#header_close#}
       {#header_open|@ArgType#}
-      <pre><code class="zig">@ArgType(comptime T: type, comptime n: usize) -&gt; type</code></pre>
+      <pre><code class="zig">@ArgType(comptime T: type, comptime n: usize) type</code></pre>
       <p>
       This builtin function takes a function type and returns the type of the parameter at index <code>n</code>.
       </p>
 @@ -3931,7 +3939,7 @@ pub fn main() void {
       </p>
       {#header_close#}
       {#header_open|@atomicLoad#}
-      <pre><code class="zig">@atomicLoad(comptime T: type, ptr: &amp;const T, comptime ordering: builtin.AtomicOrder) -&gt; T</code></pre>
+      <pre><code class="zig">@atomicLoad(comptime T: type, ptr: *const T, comptime ordering: builtin.AtomicOrder) T</code></pre>
       <p>
       This builtin function atomically dereferences a pointer and returns the value.
       </p>
 @@ -3950,7 +3958,7 @@ pub fn main() void {
       </p>
       {#header_close#}
       {#header_open|@atomicRmw#}
-      <pre><code class="zig">@atomicRmw(comptime T: type, ptr: &amp;T, comptime op: builtin.AtomicRmwOp, operand: T, comptime ordering: builtin.AtomicOrder) -&gt; T</code></pre>
+      <pre><code class="zig">@atomicRmw(comptime T: type, ptr: *T, comptime op: builtin.AtomicRmwOp, operand: T, comptime ordering: builtin.AtomicOrder) T</code></pre>
       <p>
       This builtin function atomically modifies memory and then returns the previous value.
       </p>
 @@ -3969,7 +3977,7 @@ pub fn main() void {
       </p>
       {#header_close#}
       {#header_open|@bitCast#}
-      <pre><code class="zig">@bitCast(comptime DestType: type, value: var) -&gt; DestType</code></pre>
+      <pre><code class="zig">@bitCast(comptime DestType: type, value: var) DestType</code></pre>
       <p>
       Converts a value of one type to another type.
       </p>
 @@ -4002,9 +4010,9 @@ pub fn main() void {
       {#header_close#}
       {#header_open|@alignCast#}
-      <pre><code class="zig">@alignCast(comptime alignment: u29, ptr: var) -&gt; var</code></pre>
+      <pre><code class="zig">@alignCast(comptime alignment: u29, ptr: var) var</code></pre>
       <p>
-      <code>ptr</code> can be <code>&amp;T</code>, <code>fn()</code>, <code>?&amp;T</code>,
+      <code>ptr</code> can be <code>*T</code>, <code>fn()</code>, <code>?*T</code>,
       <code>?fn()</code>, or <code>[]T</code>. It returns the same type as <code>ptr</code>
       except with the alignment adjusted to the new value.
       </p>
 @@ -4013,7 +4021,7 @@ pub fn main() void {
       {#header_close#}
       {#header_open|@alignOf#}
-      <pre><code class="zig">@alignOf(comptime T: type) -&gt; (number literal)</code></pre>
+      <pre><code class="zig">@alignOf(comptime T: type) (number literal)</code></pre>
       <p>
       This function returns the number of bytes that this type should be aligned to
       for the current target to match the C ABI. When the child type of a pointer has
 @@ -4021,7 +4029,7 @@ pub fn main() void {
       </p>
       <pre><code class="zig">const assert = @import("std").debug.assert;
 comptime {
-    assert(&u32 == &align(@alignOf(u32)) u32);
+    assert(*u32 == *align(@alignOf(u32)) u32);
 }</code></pre>
       <p>
       The result is a target-specific compile time constant. It is guaranteed to be
 @@ -4049,7 +4057,7 @@ comptime {
       {#see_also|Import from C Header File|@cInclude|@cImport|@cUndef|void#}
       {#header_close#}
       {#header_open|@cImport#}
-      <pre><code class="zig">@cImport(expression) -&gt; (namespace)</code></pre>
+      <pre><code class="zig">@cImport(expression) (namespace)</code></pre>
       <p>
       This function parses C code and imports the functions, types, variables, and
       compatible macro definitions into the result namespace.
 @@ -4095,13 +4103,13 @@ comptime {
       {#see_also|Import from C Header File|@cImport|@cDefine|@cInclude#}
       {#header_close#}
       {#header_open|@canImplicitCast#}
-      <pre><code class="zig">@canImplicitCast(comptime T: type, value) -&gt; bool</code></pre>
+      <pre><code class="zig">@canImplicitCast(comptime T: type, value) bool</code></pre>
       <p>
       Returns whether a value can be implicitly casted to a given type.
       </p>
       {#header_close#}
       {#header_open|@clz#}
-      <pre><code class="zig">@clz(x: T) -&gt; U</code></pre>
+      <pre><code class="zig">@clz(x: T) U</code></pre>
       <p>
       This function counts the number of leading zeroes in <code>x</code> which is an integer
       type <code>T</code>.
 @@ -4116,13 +4124,13 @@ comptime {
       {#header_close#}
       {#header_open|@cmpxchgStrong#}
-      <pre><code class="zig">@cmpxchgStrong(comptime T: type, ptr: &T, expected_value: T, new_value: T, success_order: AtomicOrder, fail_order: AtomicOrder) -&gt; ?T</code></pre>
+      <pre><code class="zig">@cmpxchgStrong(comptime T: type, ptr: *T, expected_value: T, new_value: T, success_order: AtomicOrder, fail_order: AtomicOrder) ?T</code></pre>
       <p>
       This function performs a strong atomic compare exchange operation. It's the equivalent of this code,
       except atomic:
       </p>
       {#code_begin|syntax#}
-fn cmpxchgStrongButNotAtomic(comptime T: type, ptr: &T, expected_value: T, new_value: T) ?T {
+fn cmpxchgStrongButNotAtomic(comptime T: type, ptr: *T, expected_value: T, new_value: T) ?T {
     const old_value = ptr.*;
     if (old_value == expected_value) {
         ptr.* = new_value;
 @@ -4143,13 +4151,13 @@ fn cmpxchgStrongButNotAtomic(comptime T: type, ptr: &T, expected_value: T, new_v
       {#see_also|Compile Variables|cmpxchgWeak#}
       {#header_close#}
       {#header_open|@cmpxchgWeak#}
-      <pre><code class="zig">@cmpxchgWeak(comptime T: type, ptr: &T, expected_value: T, new_value: T, success_order: AtomicOrder, fail_order: AtomicOrder) -&gt; ?T</code></pre>
+      <pre><code class="zig">@cmpxchgWeak(comptime T: type, ptr: *T, expected_value: T, new_value: T, success_order: AtomicOrder, fail_order: AtomicOrder) ?T</code></pre>
       <p>
       This function performs a weak atomic compare exchange operation. It's the equivalent of this code,
       except atomic:
       </p>
       {#code_begin|syntax#}
-fn cmpxchgWeakButNotAtomic(comptime T: type, ptr: &T, expected_value: T, new_value: T) ?T {
+fn cmpxchgWeakButNotAtomic(comptime T: type, ptr: *T, expected_value: T, new_value: T) ?T {
     const old_value = ptr.*;
     if (old_value == expected_value and usuallyTrueButSometimesFalse()) {
         ptr.* = new_value;
 @@ -4237,7 +4245,7 @@ test "main" {
       {#code_end#}
       {#header_close#}
       {#header_open|@ctz#}
-      <pre><code class="zig">@ctz(x: T) -&gt; U</code></pre>
+      <pre><code class="zig">@ctz(x: T) U</code></pre>
       <p>
       This function counts the number of trailing zeroes in <code>x</code> which is an integer
       type <code>T</code>.
 @@ -4251,7 +4259,7 @@ test "main" {
       </p>
       {#header_close#}
       {#header_open|@divExact#}
-      <pre><code class="zig">@divExact(numerator: T, denominator: T) -&gt; T</code></pre>
+      <pre><code class="zig">@divExact(numerator: T, denominator: T) T</code></pre>
       <p>
       Exact division. Caller guarantees <code>denominator != 0</code> and
       <code>@divTrunc(numerator, denominator) * denominator == numerator</code>.
 @@ -4264,7 +4272,7 @@ test "main" {
       {#see_also|@divTrunc|@divFloor#}
       {#header_close#}
       {#header_open|@divFloor#}
-      <pre><code class="zig">@divFloor(numerator: T, denominator: T) -&gt; T</code></pre>
+      <pre><code class="zig">@divFloor(numerator: T, denominator: T) T</code></pre>
       <p>
       Floored division. Rounds toward negative infinity. For unsigned integers it is
       the same as <code>numerator / denominator</code>. Caller guarantees <code>denominator != 0</code> and
 @@ -4278,7 +4286,7 @@ test "main" {
       {#see_also|@divTrunc|@divExact#}
       {#header_close#}
       {#header_open|@divTrunc#}
-      <pre><code class="zig">@divTrunc(numerator: T, denominator: T) -&gt; T</code></pre>
+      <pre><code class="zig">@divTrunc(numerator: T, denominator: T) T</code></pre>
       <p>
       Truncated division. Rounds toward zero. For unsigned integers it is
       the same as <code>numerator / denominator</code>. Caller guarantees <code>denominator != 0</code> and
 @@ -4292,7 +4300,7 @@ test "main" {
       {#see_also|@divFloor|@divExact#}
       {#header_close#}
       {#header_open|@embedFile#}
-      <pre><code class="zig">@embedFile(comptime path: []const u8) -&gt; [X]u8</code></pre>
+      <pre><code class="zig">@embedFile(comptime path: []const u8) [X]u8</code></pre>
       <p>
       This function returns a compile time constant fixed-size array with length
       equal to the byte count of the file given by <code>path</code>. The contents of the array
 @@ -4304,19 +4312,19 @@ test "main" {
       {#see_also|@import#}
       {#header_close#}
       {#header_open|@export#}
-      <pre><code class="zig">@export(comptime name: []const u8, target: var, linkage: builtin.GlobalLinkage) -&gt; []const u8</code></pre>
+      <pre><code class="zig">@export(comptime name: []const u8, target: var, linkage: builtin.GlobalLinkage) []const u8</code></pre>
       <p>
       Creates a symbol in the output object file.
       </p>
       {#header_close#}
       {#header_open|@tagName#}
-      <pre><code class="zig">@tagName(value: var) -&gt; []const u8</code></pre>
+      <pre><code class="zig">@tagName(value: var) []const u8</code></pre>
       <p>
       Converts an enum value or union value to a slice of bytes representing the name.
       </p>
       {#header_close#}
       {#header_open|@TagType#}
-      <pre><code class="zig">@TagType(T: type) -&gt; type</code></pre>
+      <pre><code class="zig">@TagType(T: type) type</code></pre>
       <p>
       For an enum, returns the integer type that is used to store the enumeration value.
       </p>
 @@ -4325,7 +4333,7 @@ test "main" {
       </p>
       {#header_close#}
       {#header_open|@errorName#}
-      <pre><code class="zig">@errorName(err: error) -&gt; []u8</code></pre>
+      <pre><code class="zig">@errorName(err: error) []u8</code></pre>
       <p>
       This function returns the string representation of an error. If an error
       declaration is:
 @@ -4341,7 +4349,7 @@ test "main" {
       </p>
       {#header_close#}
       {#header_open|@errorReturnTrace#}
-      <pre><code class="zig">@errorReturnTrace() -&gt; ?&builtin.StackTrace</code></pre>
+      <pre><code class="zig">@errorReturnTrace() ?*builtin.StackTrace</code></pre>
       <p>
       If the binary is built with error return tracing, and this function is invoked in a
       function that calls a function with an error or error union return type, returns a
 @@ -4360,7 +4368,7 @@ test "main" {
       {#header_close#}
       {#header_open|@fieldParentPtr#}
       <pre><code class="zig">@fieldParentPtr(comptime ParentType: type, comptime field_name: []const u8,
-    field_ptr: &T) -&gt; &ParentType</code></pre>
+    field_ptr: *T) *ParentType</code></pre>
       <p>
       Given a pointer to a field, returns the base pointer of a struct.
       </p>
 @@ -4380,7 +4388,7 @@ test "main" {
       </p>
       {#header_close#}
       {#header_open|@import#}
-      <pre><code class="zig">@import(comptime path: []u8) -&gt; (namespace)</code></pre>
+      <pre><code class="zig">@import(comptime path: []u8) (namespace)</code></pre>
       <p>
       This function finds a zig file corresponding to <code>path</code> and imports all the
       public top level declarations into the resulting namespace.
 @@ -4400,7 +4408,7 @@ test "main" {
       {#see_also|Compile Variables|@embedFile#}
       {#header_close#}
       {#header_open|@inlineCall#}
-      <pre><code class="zig">@inlineCall(function: X, args: ...) -&gt; Y</code></pre>
+      <pre><code class="zig">@inlineCall(function: X, args: ...) Y</code></pre>
       <p>
       This calls a function, in the same way that invoking an expression with parentheses does:
       </p>
 @@ -4420,19 +4428,19 @@ fn add(a: i32, b: i32) i32 { return a + b; }
       {#see_also|@noInlineCall#}
       {#header_close#}
       {#header_open|@intToPtr#}
-      <pre><code class="zig">@intToPtr(comptime DestType: type, int: usize) -&gt; DestType</code></pre>
+      <pre><code class="zig">@intToPtr(comptime DestType: type, int: usize) DestType</code></pre>
       <p>
       Converts an integer to a pointer. To convert the other way, use {#link|@ptrToInt#}.
       </p>
       {#header_close#}
       {#header_open|@IntType#}
-      <pre><code class="zig">@IntType(comptime is_signed: bool, comptime bit_count: u8) -&gt; type</code></pre>
+      <pre><code class="zig">@IntType(comptime is_signed: bool, comptime bit_count: u8) type</code></pre>
       <p>
       This function returns an integer type with the given signness and bit count.
       </p>
       {#header_close#}
       {#header_open|@maxValue#}
-      <pre><code class="zig">@maxValue(comptime T: type) -&gt; (number literal)</code></pre>
+      <pre><code class="zig">@maxValue(comptime T: type) (number literal)</code></pre>
       <p>
       This function returns the maximum value of the integer type <code>T</code>.
       </p>
 @@ -4441,7 +4449,7 @@ fn add(a: i32, b: i32) i32 { return a + b; }
       </p>
       {#header_close#}
       {#header_open|@memberCount#}
-      <pre><code class="zig">@memberCount(comptime T: type) -&gt; (number literal)</code></pre>
+      <pre><code class="zig">@memberCount(comptime T: type) (number literal)</code></pre>
       <p>
       This function returns the number of members in a struct, enum, or union type.
       </p>
 @@ -4453,7 +4461,7 @@ fn add(a: i32, b: i32) i32 { return a + b; }
       </p>
       {#header_close#}
       {#header_open|@memberName#}
-      <pre><code class="zig">@memberName(comptime T: type, comptime index: usize) -&gt; [N]u8</code></pre>
+      <pre><code class="zig">@memberName(comptime T: type, comptime index: usize) [N]u8</code></pre>
       <p>Returns the field name of a struct, union, or enum.</p>
       <p>
       The result is a compile time constant.
 @@ -4463,15 +4471,15 @@ fn add(a: i32, b: i32) i32 { return a + b; }
       </p>
       {#header_close#}
       {#header_open|@field#}
-      <pre><code class="zig">@field(lhs: var, comptime field_name: []const u8) -&gt; (field)</code></pre>
+      <pre><code class="zig">@field(lhs: var, comptime field_name: []const u8) (field)</code></pre>
       <p>Preforms field access equivalent to <code>lhs.-&gtfield_name-&lt</code>.</p>
       {#header_close#}
       {#header_open|@memberType#}
-      <pre><code class="zig">@memberType(comptime T: type, comptime index: usize) -&gt; type</code></pre>
+      <pre><code class="zig">@memberType(comptime T: type, comptime index: usize) type</code></pre>
       <p>Returns the field type of a struct or union.</p>
       {#header_close#}
       {#header_open|@memcpy#}
-      <pre><code class="zig">@memcpy(noalias dest: &u8, noalias source: &const u8, byte_count: usize)</code></pre>
+      <pre><code class="zig">@memcpy(noalias dest: *u8, noalias source: *const u8, byte_count: usize)</code></pre>
       <p>
       This function copies bytes from one region of memory to another. <code>dest</code> and
       <code>source</code> are both pointers and must not overlap.
 @@ -4489,7 +4497,7 @@ fn add(a: i32, b: i32) i32 { return a + b; }
 mem.copy(u8, dest[0...byte_count], source[0...byte_count]);</code></pre>
       {#header_close#}
       {#header_open|@memset#}
-      <pre><code class="zig">@memset(dest: &u8, c: u8, byte_count: usize)</code></pre>
+      <pre><code class="zig">@memset(dest: *u8, c: u8, byte_count: usize)</code></pre>
       <p>
       This function sets a region of memory to <code>c</code>. <code>dest</code> is a pointer.
       </p>
 @@ -4506,7 +4514,7 @@ mem.copy(u8, dest[0...byte_count], source[0...byte_count]);</code></pre>
 mem.set(u8, dest, c);</code></pre>
       {#header_close#}
       {#header_open|@minValue#}
-      <pre><code class="zig">@minValue(comptime T: type) -&gt; (number literal)</code></pre>
+      <pre><code class="zig">@minValue(comptime T: type) (number literal)</code></pre>
       <p>
       This function returns the minimum value of the integer type T.
       </p>
 @@ -4515,7 +4523,7 @@ mem.set(u8, dest, c);</code></pre>
       </p>
       {#header_close#}
       {#header_open|@mod#}
-      <pre><code class="zig">@mod(numerator: T, denominator: T) -&gt; T</code></pre>
+      <pre><code class="zig">@mod(numerator: T, denominator: T) T</code></pre>
       <p>
       Modulus division. For unsigned integers this is the same as
       <code>numerator % denominator</code>. Caller guarantees <code>denominator &gt; 0</code>.
 @@ -4528,7 +4536,7 @@ mem.set(u8, dest, c);</code></pre>
       {#see_also|@rem#}
       {#header_close#}
       {#header_open|@mulWithOverflow#}
-      <pre><code class="zig">@mulWithOverflow(comptime T: type, a: T, b: T, result: &T) -&gt; bool</code></pre>
+      <pre><code class="zig">@mulWithOverflow(comptime T: type, a: T, b: T, result: *T) bool</code></pre>
       <p>
       Performs <code>result.* = a * b</code>. If overflow or underflow occurs,
       stores the overflowed bits in <code>result</code> and returns <code>true</code>.
 @@ -4536,7 +4544,7 @@ mem.set(u8, dest, c);</code></pre>
       </p>
       {#header_close#}
       {#header_open|@newStackCall#}
-      <pre><code class="zig">@newStackCall(new_stack: []u8, function: var, args: ...) -&gt; var</code></pre>
+      <pre><code class="zig">@newStackCall(new_stack: []u8, function: var, args: ...) var</code></pre>
       <p>
       This calls a function, in the same way that invoking an expression with parentheses does. However,
       instead of using the same stack as the caller, the function uses the stack provided in the <code>new_stack</code>
 @@ -4572,7 +4580,7 @@ fn targetFunction(x: i32) usize {
       {#code_end#}
       {#header_close#}
       {#header_open|@noInlineCall#}
-      <pre><code class="zig">@noInlineCall(function: var, args: ...) -&gt; var</code></pre>
+      <pre><code class="zig">@noInlineCall(function: var, args: ...) var</code></pre>
       <p>
       This calls a function, in the same way that invoking an expression with parentheses does:
       </p>
 @@ -4594,13 +4602,13 @@ fn add(a: i32, b: i32) i32 {
       {#see_also|@inlineCall#}
       {#header_close#}
       {#header_open|@offsetOf#}
-      <pre><code class="zig">@offsetOf(comptime T: type, comptime field_name: [] const u8) -&gt; (number literal)</code></pre>
+      <pre><code class="zig">@offsetOf(comptime T: type, comptime field_name: [] const u8) (number literal)</code></pre>
       <p>
       This function returns the byte offset of a field relative to its containing struct.
       </p>
       {#header_close#}
       {#header_open|@OpaqueType#}
-      <pre><code class="zig">@OpaqueType() -&gt; type</code></pre>
+      <pre><code class="zig">@OpaqueType() type</code></pre>
       <p>
       Creates a new type with an unknown size and alignment.
       </p>
 @@ -4608,12 +4616,12 @@ fn add(a: i32, b: i32) i32 {
       This is typically used for type safety when interacting with C code that does not expose struct details.
       Example:
       </p>
-      {#code_begin|test_err|expected type '&Derp', found '&Wat'#}
+      {#code_begin|test_err|expected type '*Derp', found '*Wat'#}
 const Derp = @OpaqueType();
 const Wat = @OpaqueType();
-extern fn bar(d: &Derp) void;
+extern fn bar(d: *Derp) void;
-export fn foo(w: &Wat) void {
+export fn foo(w: *Wat) void {
     bar(w);
 }
 @@ -4623,7 +4631,7 @@ test "call foo" {
       {#code_end#}
       {#header_close#}
       {#header_open|@panic#}
-      <pre><code class="zig">@panic(message: []const u8) -&gt; noreturn</code></pre>
+      <pre><code class="zig">@panic(message: []const u8) noreturn</code></pre>
       <p>
       Invokes the panic handler function. By default the panic handler function
       calls the public <code>panic</code> function exposed in the root source file, or
 @@ -4639,19 +4647,19 @@ test "call foo" {
       {#see_also|Root Source File#}
       {#header_close#}
       {#header_open|@ptrCast#}
-      <pre><code class="zig">@ptrCast(comptime DestType: type, value: var) -&gt; DestType</code></pre>
+      <pre><code class="zig">@ptrCast(comptime DestType: type, value: var) DestType</code></pre>
       <p>
       Converts a pointer of one type to a pointer of another type.
       </p>
       {#header_close#}
       {#header_open|@ptrToInt#}
-      <pre><code class="zig">@ptrToInt(value: var) -&gt; usize</code></pre>
+      <pre><code class="zig">@ptrToInt(value: var) usize</code></pre>
       <p>
       Converts <code>value</code> to a <code>usize</code> which is the address of the pointer. <code>value</code> can be one of these types:
       </p>
       <ul>
-        <li><code>&amp;T</code></li>
+        <li><code>*T</code></li>
-        <li><code>?&amp;T</code></li>
+        <li><code>?*T</code></li>
         <li><code>fn()</code></li>
         <li><code>?fn()</code></li>
       </ul>
 @@ -4659,7 +4667,7 @@ test "call foo" {
       {#header_close#}
       {#header_open|@rem#}
-      <pre><code class="zig">@rem(numerator: T, denominator: T) -&gt; T</code></pre>
+      <pre><code class="zig">@rem(numerator: T, denominator: T) T</code></pre>
       <p>
       Remainder division. For unsigned integers this is the same as
       <code>numerator % denominator</code>. Caller guarantees <code>denominator &gt; 0</code>.
 @@ -4776,13 +4784,13 @@ pub const FloatMode = enum {
       {#see_also|Compile Variables#}
       {#header_close#}
       {#header_open|@setGlobalSection#}
-      <pre><code class="zig">@setGlobalSection(global_variable_name, comptime section_name: []const u8) -&gt; bool</code></pre>
+      <pre><code class="zig">@setGlobalSection(global_variable_name, comptime section_name: []const u8) bool</code></pre>
       <p>
       Puts the global variable in the specified section.
       </p>
       {#header_close#}
       {#header_open|@shlExact#}
-      <pre><code class="zig">@shlExact(value: T, shift_amt: Log2T) -&gt; T</code></pre>
+      <pre><code class="zig">@shlExact(value: T, shift_amt: Log2T) T</code></pre>
       <p>
       Performs the left shift operation (<code>&lt;&lt;</code>). Caller guarantees
       that the shift will not shift any 1 bits out.
 @@ -4794,7 +4802,7 @@ pub const FloatMode = enum {
       {#see_also|@shrExact|@shlWithOverflow#}
       {#header_close#}
       {#header_open|@shlWithOverflow#}
-      <pre><code class="zig">@shlWithOverflow(comptime T: type, a: T, shift_amt: Log2T, result: &T) -&gt; bool</code></pre>
+      <pre><code class="zig">@shlWithOverflow(comptime T: type, a: T, shift_amt: Log2T, result: *T) bool</code></pre>
       <p>
       Performs <code>result.* = a &lt;&lt; b</code>. If overflow or underflow occurs,
       stores the overflowed bits in <code>result</code> and returns <code>true</code>.
 @@ -4807,7 +4815,7 @@ pub const FloatMode = enum {
       {#see_also|@shlExact|@shrExact#}
       {#header_close#}
       {#header_open|@shrExact#}
-      <pre><code class="zig">@shrExact(value: T, shift_amt: Log2T) -&gt; T</code></pre>
+      <pre><code class="zig">@shrExact(value: T, shift_amt: Log2T) T</code></pre>
       <p>
       Performs the right shift operation (<code>&gt;&gt;</code>). Caller guarantees
       that the shift will not shift any 1 bits out.
 @@ -4819,7 +4827,7 @@ pub const FloatMode = enum {
       {#see_also|@shlExact|@shlWithOverflow#}
       {#header_close#}
       {#header_open|@sizeOf#}
-      <pre><code class="zig">@sizeOf(comptime T: type) -&gt; (number literal)</code></pre>
+      <pre><code class="zig">@sizeOf(comptime T: type) (number literal)</code></pre>
       <p>
       This function returns the number of bytes it takes to store <code>T</code> in memory.
       </p>
 @@ -4828,7 +4836,7 @@ pub const FloatMode = enum {
       </p>
       {#header_close#}
       {#header_open|@sqrt#}
-      <pre><code class="zig">@sqrt(comptime T: type, value: T) -&gt; T</code></pre>
+      <pre><code class="zig">@sqrt(comptime T: type, value: T) T</code></pre>
       <p>
       Performs the square root of a floating point number. Uses a dedicated hardware instruction
       when available. Currently only supports f32 and f64 at runtime. f128 at runtime is TODO.
 @@ -4838,7 +4846,7 @@ pub const FloatMode = enum {
       </p>
       {#header_close#}
       {#header_open|@subWithOverflow#}
-      <pre><code class="zig">@subWithOverflow(comptime T: type, a: T, b: T, result: &T) -&gt; bool</code></pre>
+      <pre><code class="zig">@subWithOverflow(comptime T: type, a: T, b: T, result: *T) bool</code></pre>
       <p>
       Performs <code>result.* = a - b</code>. If overflow or underflow occurs,
       stores the overflowed bits in <code>result</code> and returns <code>true</code>.
 @@ -4846,7 +4854,7 @@ pub const FloatMode = enum {
       </p>
       {#header_close#}
       {#header_open|@truncate#}
-      <pre><code class="zig">@truncate(comptime T: type, integer) -&gt; T</code></pre>
+      <pre><code class="zig">@truncate(comptime T: type, integer) T</code></pre>
       <p>
       This function truncates bits from an integer type, resulting in a smaller
       integer type.
 @@ -4870,7 +4878,7 @@ const b: u8 = @truncate(u8, a);
       {#header_close#}
       {#header_open|@typeId#}
-      <pre><code class="zig">@typeId(comptime T: type) -&gt; @import("builtin").TypeId</code></pre>
+      <pre><code class="zig">@typeId(comptime T: type) @import("builtin").TypeId</code></pre>
       <p>
       Returns which kind of type something is. Possible values:
       </p>
 @@ -4904,7 +4912,7 @@ pub const TypeId = enum {
       {#code_end#}
       {#header_close#}
       {#header_open|@typeInfo#}
-      <pre><code class="zig">@typeInfo(comptime T: type) -&gt; @import("builtin").TypeInfo</code></pre>
+      <pre><code class="zig">@typeInfo(comptime T: type) @import("builtin").TypeInfo</code></pre>
       <p>
       Returns information on the type. Returns a value of the following union:
       </p>
 @@ -5080,14 +5088,14 @@ pub const TypeInfo = union(TypeId) {
       {#code_end#}
       {#header_close#}
       {#header_open|@typeName#}
-      <pre><code class="zig">@typeName(T: type) -&gt; []u8</code></pre>
+      <pre><code class="zig">@typeName(T: type) []u8</code></pre>
       <p>
       This function returns the string representation of a type.
       </p>
       {#header_close#}
       {#header_open|@typeOf#}
-      <pre><code class="zig">@typeOf(expression) -&gt; type</code></pre>
+      <pre><code class="zig">@typeOf(expression) type</code></pre>
       <p>
       This function returns a compile-time constant, which is the type of the
       expression passed as an argument. The expression is evaluated.
 @@ -5937,7 +5945,7 @@ pub const __zig_test_fn_slice = {}; // overwritten later
       {#header_open|C String Literals#}
       {#code_begin|exe#}
       {#link_libc#}
-extern fn puts(&const u8) void;
+extern fn puts([*]const u8) void;
 pub fn main() void {
     puts(c"this has a null terminator");
 @@ -5996,8 +6004,8 @@ const c = @cImport({
       {#code_begin|syntax#}
 const base64 = @import("std").base64;
-export fn decode_base_64(dest_ptr: &u8, dest_len: usize,
+export fn decode_base_64(dest_ptr: *u8, dest_len: usize,
-    source_ptr: &const u8, source_len: usize) usize
+    source_ptr: *const u8, source_len: usize) usize
 {
     const src = source_ptr[0..source_len];
     const dest = dest_ptr[0..dest_len];
 @@ -6028,7 +6036,7 @@ int main(int argc, char **argv) {
       {#code_begin|syntax#}
 const Builder = @import("std").build.Builder;
-pub fn build(b: &Builder) void {
+pub fn build(b: *Builder) void {
     const obj = b.addObject("base64", "base64.zig");
     const exe = b.addCExecutable("test");
 @@ -6450,7 +6458,7 @@ ContainerInitBody = list(StructLiteralField, ",") | list(Expression, ",")
 StructLiteralField = "." Symbol "=" Expression
-PrefixOp = "!" | "-" | "~" | ("*" option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) | "?" | "??" | "-%" | "try" | "await"
+PrefixOp = "!" | "-" | "~" | (("*" | "[*]") option("align" "(" Expression option(":" Integer ":" Integer) ")" ) option("const") option("volatile")) | "?" | "??" | "-%" | "try" | "await"
 PrimaryExpression = Integer | Float | String | CharLiteral | KeywordLiteral | GroupedExpression | BlockExpression(BlockOrExpression) | Symbol | ("@" Symbol FnCallExpression) | ArrayType | FnProto | AsmExpression | ContainerDecl | ("continue" option(":" Symbol)) | ErrorSetDecl | PromiseType
 @@ -6544,7 +6552,7 @@ hljs.registerLanguage("zig", function(t) {
         a = t.IR + "\\s*\\(",
         c = {
             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",
-            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",
+            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 typeName newStackCall",
             literal: "true false null undefined"
         },
         n = [e, t.CLCM, t.CBCM, s, r];

example/cat/main.zig+1-1

...	@@ -41,7 +41,7 @@ fn usage(exe: []const u8) !void {	...	@@ -41,7 +41,7 @@ fn usage(exe: []const u8) !void {
41	return error.Invalid;	41	return error.Invalid;
42	}	42	}
43		43
44	fn cat_file(stdout: &os.File, file: &os.File) !void {	44	fn cat_file(stdout: os.File, file: os.File) !void {
45	var buf: [1024 * 4]u8 = undefined;	45	var buf: [1024 * 4]u8 = undefined;
46		46
47	while (true) {	47	while (true) {

example/hello_world/hello_libc.zig+1-1

...	@@ -7,7 +7,7 @@ const c = @cImport({	...	@@ -7,7 +7,7 @@ const c = @cImport({
7		7
8	const msg = c"Hello, world!\n";	8	const msg = c"Hello, world!\n";
9		9
10	export fn main(argc: c_int, argv: &&u8) c_int {	10	export fn main(argc: c_int, argv: **u8) c_int {
11	if (c.printf(msg) != c_int(c.strlen(msg))) return -1;	11	if (c.printf(msg) != c_int(c.strlen(msg))) return -1;
12		12
13	return 0;	13	return 0;

example/mix_o_files/base64.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const base64 = @import("std").base64;	1	const base64 = @import("std").base64;
2		2
3	export fn decode_base_64(dest_ptr: &u8, dest_len: usize, source_ptr: &const u8, source_len: usize) usize {	3	export fn decode_base_64(dest_ptr: u8, dest_len: usize, source_ptr: const u8, source_len: usize) usize {
4	const src = source_ptr[0..source_len];	4	const src = source_ptr[0..source_len];
5	const dest = dest_ptr[0..dest_len];	5	const dest = dest_ptr[0..dest_len];
6	const base64_decoder = base64.standard_decoder_unsafe;	6	const base64_decoder = base64.standard_decoder_unsafe;

example/mix_o_files/build.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	const obj = b.addObject("base64", "base64.zig");	4	const obj = b.addObject("base64", "base64.zig");
5		5
6	const exe = b.addCExecutable("test");	6	const exe = b.addCExecutable("test");

example/shared_library/build.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0));	4	const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0));
5		5
6	const exe = b.addCExecutable("test");	6	const exe = b.addCExecutable("test");

src-self-hosted/arg.zig+6-6

...	@@ -30,7 +30,7 @@ fn argInAllowedSet(maybe_set: ?[]const []const u8, arg: []const u8) bool {	...	@@ -30,7 +30,7 @@ fn argInAllowedSet(maybe_set: ?[]const []const u8, arg: []const u8) bool {
30	}	30	}
31		31
32	// Modifies the current argument index during iteration	32	// Modifies the current argument index during iteration
33	fn readFlagArguments(allocator: &Allocator, args: []const []const u8, required: usize, allowed_set: ?[]const []const u8, index: &usize) !FlagArg {	33	fn readFlagArguments(allocator: Allocator, args: []const []const u8, required: usize, allowed_set: ?[]const []const u8, index: usize) !FlagArg {
34	switch (required) {	34	switch (required) {
35	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?
36	1 => {	36	1 => {
...	@@ -79,7 +79,7 @@ pub const Args = struct {	...	@@ -79,7 +79,7 @@ pub const Args = struct {
79	flags: HashMapFlags,	79	flags: HashMapFlags,
80	positionals: ArrayList([]const u8),	80	positionals: ArrayList([]const u8),
81		81
82	pub fn parse(allocator: &Allocator, comptime spec: []const Flag, args: []const []const u8) !Args {	82	pub fn parse(allocator: *Allocator, comptime spec: []const Flag, args: []const []const u8) !Args {
83	var parsed = Args{	83	var parsed = Args{
84	.flags = HashMapFlags.init(allocator),	84	.flags = HashMapFlags.init(allocator),
85	.positionals = ArrayList([]const u8).init(allocator),	85	.positionals = ArrayList([]const u8).init(allocator),
...	@@ -143,18 +143,18 @@ pub const Args = struct {	...	@@ -143,18 +143,18 @@ pub const Args = struct {
143	return parsed;	143	return parsed;
144	}	144	}
145		145
146	pub fn deinit(self: &Args) void {	146	pub fn deinit(self: *Args) void {
147	self.flags.deinit();	147	self.flags.deinit();
148	self.positionals.deinit();	148	self.positionals.deinit();
149	}	149	}
150		150
151	// e.g. --help	151	// e.g. --help
152	pub fn present(self: &Args, name: []const u8) bool {	152	pub fn present(self: *Args, name: []const u8) bool {
153	return self.flags.contains(name);	153	return self.flags.contains(name);
154	}	154	}
155		155
156	// e.g. --name value	156	// e.g. --name value
157	pub fn single(self: &Args, name: []const u8) ?[]const u8 {	157	pub fn single(self: *Args, name: []const u8) ?[]const u8 {
158	if (self.flags.get(name)) \|entry\| {	158	if (self.flags.get(name)) \|entry\| {
159	switch (entry.value) {	159	switch (entry.value) {
160	FlagArg.Single => \|inner\| {	160	FlagArg.Single => \|inner\| {
...	@@ -168,7 +168,7 @@ pub const Args = struct {	...	@@ -168,7 +168,7 @@ pub const Args = struct {
168	}	168	}
169		169
170	// e.g. --names value1 value2 value3	170	// e.g. --names value1 value2 value3
171	pub fn many(self: &Args, name: []const u8) ?[]const []const u8 {	171	pub fn many(self: *Args, name: []const u8) ?[]const []const u8 {
172	if (self.flags.get(name)) \|entry\| {	172	if (self.flags.get(name)) \|entry\| {
173	switch (entry.value) {	173	switch (entry.value) {
174	FlagArg.Many => \|inner\| {	174	FlagArg.Many => \|inner\| {

src-self-hosted/errmsg.zig created+87

...	@@ -0,0 +1,87 @@
1	const std = @import("std");
2	const mem = std.mem;
3	const os = std.os;
4	const Token = std.zig.Token;
5	const ast = std.zig.ast;
6	const TokenIndex = std.zig.ast.TokenIndex;
7
8	pub const Color = enum {
9	Auto,
10	Off,
11	On,
12	};
13
14	pub const Msg = struct {
15	path: []const u8,
16	text: []u8,
17	first_token: TokenIndex,
18	last_token: TokenIndex,
19	tree: *ast.Tree,
20	};
21
22	/// `path` must outlive the returned Msg
23	/// `tree` must outlive the returned Msg
24	/// Caller owns returned Msg and must free with `allocator`
25	pub fn createFromParseError(
26	allocator: *mem.Allocator,
27	parse_error: *const ast.Error,
28	tree: *ast.Tree,
29	path: []const u8,
30	) !*Msg {
31	const loc_token = parse_error.loc();
32	var text_buf = try std.Buffer.initSize(allocator, 0);
33	defer text_buf.deinit();
34
35	var out_stream = &std.io.BufferOutStream.init(&text_buf).stream;
36	try parse_error.render(&tree.tokens, out_stream);
37
38	const msg = try allocator.construct(Msg{
39	.tree = tree,
40	.path = path,
41	.text = text_buf.toOwnedSlice(),
42	.first_token = loc_token,
43	.last_token = loc_token,
44	});
45	errdefer allocator.destroy(msg);
46
47	return msg;
48	}
49
50	pub fn printToStream(stream: var, msg: *const Msg, color_on: bool) !void {
51	const first_token = msg.tree.tokens.at(msg.first_token);
52	const last_token = msg.tree.tokens.at(msg.last_token);
53	const start_loc = msg.tree.tokenLocationPtr(0, first_token);
54	const end_loc = msg.tree.tokenLocationPtr(first_token.end, last_token);
55	if (!color_on) {
56	try stream.print(
57	"{}:{}:{}: error: {}\n",
58	msg.path,
59	start_loc.line + 1,
60	start_loc.column + 1,
61	msg.text,
62	);
63	return;
64	}
65
66	try stream.print(
67	"{}:{}:{}: error: {}\n{}\n",
68	msg.path,
69	start_loc.line + 1,
70	start_loc.column + 1,
71	msg.text,
72	msg.tree.source[start_loc.line_start..start_loc.line_end],
73	);
74	try stream.writeByteNTimes(' ', start_loc.column);
75	try stream.writeByteNTimes('~', last_token.end - first_token.start);
76	try stream.write("\n");
77	}
78
79	pub fn printToFile(file: os.File, msg: const Msg, color: Color) !void {
80	const color_on = switch (color) {
81	Color.Auto => file.isTty(),
82	Color.On => true,
83	Color.Off => false,
84	};
85	var stream = &std.io.FileOutStream.init(file).stream;
86	return printToStream(stream, msg, color_on);
87	}

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

...	@@ -7,7 +7,7 @@ const os = std.os;	...	@@ -7,7 +7,7 @@ const os = std.os;
7	const warn = std.debug.warn;	7	const warn = std.debug.warn;
8		8
9	/// Caller must free result	9	/// Caller must free result
10	pub fn testZigInstallPrefix(allocator: &mem.Allocator, test_path: []const u8) ![]u8 {	10	pub fn testZigInstallPrefix(allocator: *mem.Allocator, test_path: []const u8) ![]u8 {
11	const test_zig_dir = try os.path.join(allocator, test_path, "lib", "zig");	11	const test_zig_dir = try os.path.join(allocator, test_path, "lib", "zig");
12	errdefer allocator.free(test_zig_dir);	12	errdefer allocator.free(test_zig_dir);
13		13
...	@@ -21,7 +21,7 @@ pub fn testZigInstallPrefix(allocator: &mem.Allocator, test_path: []const u8) ![	...	@@ -21,7 +21,7 @@ pub fn testZigInstallPrefix(allocator: &mem.Allocator, test_path: []const u8) ![
21	}	21	}
22		22
23	/// Caller must free result	23	/// Caller must free result
24	pub fn findZigLibDir(allocator: &mem.Allocator) ![]u8 {	24	pub fn findZigLibDir(allocator: *mem.Allocator) ![]u8 {
25	const self_exe_path = try os.selfExeDirPath(allocator);	25	const self_exe_path = try os.selfExeDirPath(allocator);
26	defer allocator.free(self_exe_path);	26	defer allocator.free(self_exe_path);
27		27
...	@@ -42,7 +42,7 @@ pub fn findZigLibDir(allocator: &mem.Allocator) ![]u8 {	...	@@ -42,7 +42,7 @@ pub fn findZigLibDir(allocator: &mem.Allocator) ![]u8 {
42	return error.FileNotFound;	42	return error.FileNotFound;
43	}	43	}
44		44
45	pub fn resolveZigLibDir(allocator: &mem.Allocator) ![]u8 {	45	pub fn resolveZigLibDir(allocator: *mem.Allocator) ![]u8 {
46	return findZigLibDir(allocator) catch \|err\| {	46	return findZigLibDir(allocator) catch \|err\| {
47	warn(	47	warn(
48	\\Unable to find zig lib directory: {}.	48	\\Unable to find zig lib directory: {}.

src-self-hosted/ir.zig+1-1

...	@@ -2,7 +2,7 @@ const Scope = @import("scope.zig").Scope;	...	@@ -2,7 +2,7 @@ const Scope = @import("scope.zig").Scope;
2		2
3	pub const Instruction = struct {	3	pub const Instruction = struct {
4	id: Id,	4	id: Id,
5	scope: &Scope,	5	scope: *Scope,
6		6
7	pub const Id = enum {	7	pub const Id = enum {
8	Br,	8	Br,

src-self-hosted/main.zig+73-54

...	@@ -15,9 +15,11 @@ const Args = arg.Args;	...	@@ -15,9 +15,11 @@ const Args = arg.Args;
15	const Flag = arg.Flag;	15	const Flag = arg.Flag;
16	const Module = @import("module.zig").Module;	16	const Module = @import("module.zig").Module;
17	const Target = @import("target.zig").Target;	17	const Target = @import("target.zig").Target;
		18	const errmsg = @import("errmsg.zig");
18		19
19	var stderr: &io.OutStream(io.FileOutStream.Error) = undefined;	20	var stderr_file: os.File = undefined;
20	var stdout: &io.OutStream(io.FileOutStream.Error) = undefined;	21	var stderr: *io.OutStream(io.FileOutStream.Error) = undefined;
		22	var stdout: *io.OutStream(io.FileOutStream.Error) = undefined;
21		23
22	const usage =	24	const usage =
23	\\usage: zig [command] [options]	25	\\usage: zig [command] [options]
...	@@ -41,7 +43,7 @@ const usage =	...	@@ -41,7 +43,7 @@ const usage =
41		43
42	const Command = struct {	44	const Command = struct {
43	name: []const u8,	45	name: []const u8,
44	exec: fn(&Allocator, []const []const u8) error!void,	46	exec: fn (*Allocator, []const []const u8) error!void,
45	};	47	};
46		48
47	pub fn main() !void {	49	pub fn main() !void {
...	@@ -51,7 +53,7 @@ pub fn main() !void {	...	@@ -51,7 +53,7 @@ pub fn main() !void {
51	var stdout_out_stream = std.io.FileOutStream.init(&stdout_file);	53	var stdout_out_stream = std.io.FileOutStream.init(&stdout_file);
52	stdout = &stdout_out_stream.stream;	54	stdout = &stdout_out_stream.stream;
53		55
54	var stderr_file = try std.io.getStdErr();	56	stderr_file = try std.io.getStdErr();
55	var stderr_out_stream = std.io.FileOutStream.init(&stderr_file);	57	var stderr_out_stream = std.io.FileOutStream.init(&stderr_file);
56	stderr = &stderr_out_stream.stream;	58	stderr = &stderr_out_stream.stream;
57		59
...	@@ -189,7 +191,7 @@ const missing_build_file =	...	@@ -189,7 +191,7 @@ const missing_build_file =
189	\\	191	\\
190	;	192	;
191		193
192	fn cmdBuild(allocator: &Allocator, args: []const []const u8) !void {	194	fn cmdBuild(allocator: *Allocator, args: []const []const u8) !void {
193	var flags = try Args.parse(allocator, args_build_spec, args);	195	var flags = try Args.parse(allocator, args_build_spec, args);
194	defer flags.deinit();	196	defer flags.deinit();
195		197
...	@@ -424,7 +426,7 @@ const args_build_generic = []Flag{	...	@@ -424,7 +426,7 @@ const args_build_generic = []Flag{
424	Flag.Arg1("--ver-patch"),	426	Flag.Arg1("--ver-patch"),
425	};	427	};
426		428
427	fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Module.Kind) !void {	429	fn buildOutputType(allocator: *Allocator, args: []const []const u8, out_type: Module.Kind) !void {
428	var flags = try Args.parse(allocator, args_build_generic, args);	430	var flags = try Args.parse(allocator, args_build_generic, args);
429	defer flags.deinit();	431	defer flags.deinit();
430		432
...	@@ -440,18 +442,19 @@ fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Mo	...	@@ -440,18 +442,19 @@ fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Mo
440	build_mode = builtin.Mode.ReleaseSafe;	442	build_mode = builtin.Mode.ReleaseSafe;
441	}	443	}
442		444
443	var color = Module.ErrColor.Auto;	445	const color = blk: {
444	if (flags.single("color")) \|color_flag\| {	446	if (flags.single("color")) \|color_flag\| {
445	if (mem.eql(u8, color_flag, "auto")) {	447	if (mem.eql(u8, color_flag, "auto")) {
446	color = Module.ErrColor.Auto;	448	break :blk errmsg.Color.Auto;
447	} else if (mem.eql(u8, color_flag, "on")) {	449	} else if (mem.eql(u8, color_flag, "on")) {
448	color = Module.ErrColor.On;	450	break :blk errmsg.Color.On;
449	} else if (mem.eql(u8, color_flag, "off")) {	451	} else if (mem.eql(u8, color_flag, "off")) {
450	color = Module.ErrColor.Off;	452	break :blk errmsg.Color.Off;
		453	} else unreachable;
451	} else {	454	} else {
452	unreachable;	455	break :blk errmsg.Color.Auto;
453	}	456	}
454	}	457	};
455		458
456	var emit_type = Module.Emit.Binary;	459	var emit_type = Module.Emit.Binary;
457	if (flags.single("emit")) \|emit_flag\| {	460	if (flags.single("emit")) \|emit_flag\| {
...	@@ -658,19 +661,19 @@ fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Mo	...	@@ -658,19 +661,19 @@ fn buildOutputType(allocator: &Allocator, args: []const []const u8, out_type: Mo
658	try stderr.print("building {}: {}\n", @tagName(out_type), in_file);	661	try stderr.print("building {}: {}\n", @tagName(out_type), in_file);
659	}	662	}
660		663
661	fn cmdBuildExe(allocator: &Allocator, args: []const []const u8) !void {	664	fn cmdBuildExe(allocator: *Allocator, args: []const []const u8) !void {
662	try buildOutputType(allocator, args, Module.Kind.Exe);	665	try buildOutputType(allocator, args, Module.Kind.Exe);
663	}	666	}
664		667
665	// cmd:build-lib ///////////////////////////////////////////////////////////////////////////////////	668	// cmd:build-lib ///////////////////////////////////////////////////////////////////////////////////
666		669
667	fn cmdBuildLib(allocator: &Allocator, args: []const []const u8) !void {	670	fn cmdBuildLib(allocator: *Allocator, args: []const []const u8) !void {
668	try buildOutputType(allocator, args, Module.Kind.Lib);	671	try buildOutputType(allocator, args, Module.Kind.Lib);
669	}	672	}
670		673
671	// cmd:build-obj ///////////////////////////////////////////////////////////////////////////////////	674	// cmd:build-obj ///////////////////////////////////////////////////////////////////////////////////
672		675
673	fn cmdBuildObj(allocator: &Allocator, args: []const []const u8) !void {	676	fn cmdBuildObj(allocator: *Allocator, args: []const []const u8) !void {
674	try buildOutputType(allocator, args, Module.Kind.Obj);	677	try buildOutputType(allocator, args, Module.Kind.Obj);
675	}	678	}
676		679
...	@@ -683,13 +686,21 @@ const usage_fmt =	...	@@ -683,13 +686,21 @@ const usage_fmt =
683	\\	686	\\
684	\\Options:	687	\\Options:
685	\\ --help Print this help and exit	688	\\ --help Print this help and exit
		689	\\ --color [auto\|off\|on] Enable or disable colored error messages
686	\\	690	\\
687	\\	691	\\
688	;	692	;
689		693
690	const args_fmt_spec = []Flag{Flag.Bool("--help")};	694	const args_fmt_spec = []Flag{
		695	Flag.Bool("--help"),
		696	Flag.Option("--color", []const []const u8{
		697	"auto",
		698	"off",
		699	"on",
		700	}),
		701	};
691		702
692	fn cmdFmt(allocator: &Allocator, args: []const []const u8) !void {	703	fn cmdFmt(allocator: *Allocator, args: []const []const u8) !void {
693	var flags = try Args.parse(allocator, args_fmt_spec, args);	704	var flags = try Args.parse(allocator, args_fmt_spec, args);
694	defer flags.deinit();	705	defer flags.deinit();
695		706
...	@@ -703,61 +714,69 @@ fn cmdFmt(allocator: &Allocator, args: []const []const u8) !void {	...	@@ -703,61 +714,69 @@ fn cmdFmt(allocator: &Allocator, args: []const []const u8) !void {
703	os.exit(1);	714	os.exit(1);
704	}	715	}
705		716
		717	const color = blk: {
		718	if (flags.single("color")) \|color_flag\| {
		719	if (mem.eql(u8, color_flag, "auto")) {
		720	break :blk errmsg.Color.Auto;
		721	} else if (mem.eql(u8, color_flag, "on")) {
		722	break :blk errmsg.Color.On;
		723	} else if (mem.eql(u8, color_flag, "off")) {
		724	break :blk errmsg.Color.Off;
		725	} else unreachable;
		726	} else {
		727	break :blk errmsg.Color.Auto;
		728	}
		729	};
		730
		731	var fmt_errors = false;
706	for (flags.positionals.toSliceConst()) \|file_path\| {	732	for (flags.positionals.toSliceConst()) \|file_path\| {
707	var file = try os.File.openRead(allocator, file_path);	733	var file = try os.File.openRead(allocator, file_path);
708	defer file.close();	734	defer file.close();
709		735
710	const source_code = io.readFileAlloc(allocator, file_path) catch \|err\| {	736	const source_code = io.readFileAlloc(allocator, file_path) catch \|err\| {
711	try stderr.print("unable to open '{}': {}", file_path, err);	737	try stderr.print("unable to open '{}': {}", file_path, err);
		738	fmt_errors = true;
712	continue;	739	continue;
713	};	740	};
714	defer allocator.free(source_code);	741	defer allocator.free(source_code);
715		742
716	var tree = std.zig.parse(allocator, source_code) catch \|err\| {	743	var tree = std.zig.parse(allocator, source_code) catch \|err\| {
717	try stderr.print("error parsing file '{}': {}\n", file_path, err);	744	try stderr.print("error parsing file '{}': {}\n", file_path, err);
		745	fmt_errors = true;
718	continue;	746	continue;
719	};	747	};
720	defer tree.deinit();	748	defer tree.deinit();
721		749
722	var error_it = tree.errors.iterator(0);	750	var error_it = tree.errors.iterator(0);
723	while (error_it.next()) \|parse_error\| {	751	while (error_it.next()) \|parse_error\| {
724	const token = tree.tokens.at(parse_error.loc());	752	const msg = try errmsg.createFromParseError(allocator, parse_error, &tree, file_path);
725	const loc = tree.tokenLocation(0, parse_error.loc());	753	defer allocator.destroy(msg);
726	try stderr.print("{}:{}:{}: error: ", file_path, loc.line + 1, loc.column + 1);	754
727	try tree.renderError(parse_error, stderr);	755	try errmsg.printToFile(&stderr_file, msg, color);
728	try stderr.print("\n{}\n", source_code[loc.line_start..loc.line_end]);
729	{
730	var i: usize = 0;
731	while (i < loc.column) : (i += 1) {
732	try stderr.write(" ");
733	}
734	}
735	{
736	const caret_count = token.end - token.start;
737	var i: usize = 0;
738	while (i < caret_count) : (i += 1) {
739	try stderr.write("~");
740	}
741	}
742	try stderr.write("\n");
743	}	756	}
744	if (tree.errors.len != 0) {	757	if (tree.errors.len != 0) {
		758	fmt_errors = true;
745	continue;	759	continue;
746	}	760	}
747		761
748	try stderr.print("{}\n", file_path);
749
750	const baf = try io.BufferedAtomicFile.create(allocator, file_path);	762	const baf = try io.BufferedAtomicFile.create(allocator, file_path);
751	defer baf.destroy();	763	defer baf.destroy();
752		764
753	try std.zig.render(allocator, baf.stream(), &tree);	765	const anything_changed = try std.zig.render(allocator, baf.stream(), &tree);
754	try baf.finish();	766	if (anything_changed) {
		767	try stderr.print("{}\n", file_path);
		768	try baf.finish();
		769	}
		770	}
		771
		772	if (fmt_errors) {
		773	os.exit(1);
755	}	774	}
756	}	775	}
757		776
758	// cmd:targets /////////////////////////////////////////////////////////////////////////////////////	777	// cmd:targets /////////////////////////////////////////////////////////////////////////////////////
759		778
760	fn cmdTargets(allocator: &Allocator, args: []const []const u8) !void {	779	fn cmdTargets(allocator: *Allocator, args: []const []const u8) !void {
761	try stdout.write("Architectures:\n");	780	try stdout.write("Architectures:\n");
762	{	781	{
763	comptime var i: usize = 0;	782	comptime var i: usize = 0;
...	@@ -799,7 +818,7 @@ fn cmdTargets(allocator: &Allocator, args: []const []const u8) !void {	...	@@ -799,7 +818,7 @@ fn cmdTargets(allocator: &Allocator, args: []const []const u8) !void {
799		818
800	// cmd:version /////////////////////////////////////////////////////////////////////////////////////	819	// cmd:version /////////////////////////////////////////////////////////////////////////////////////
801		820
802	fn cmdVersion(allocator: &Allocator, args: []const []const u8) !void {	821	fn cmdVersion(allocator: *Allocator, args: []const []const u8) !void {
803	try stdout.print("{}\n", std.cstr.toSliceConst(c.ZIG_VERSION_STRING));	822	try stdout.print("{}\n", std.cstr.toSliceConst(c.ZIG_VERSION_STRING));
804	}	823	}
805		824
...	@@ -816,7 +835,7 @@ const usage_test =	...	@@ -816,7 +835,7 @@ const usage_test =
816		835
817	const args_test_spec = []Flag{Flag.Bool("--help")};	836	const args_test_spec = []Flag{Flag.Bool("--help")};
818		837
819	fn cmdTest(allocator: &Allocator, args: []const []const u8) !void {	838	fn cmdTest(allocator: *Allocator, args: []const []const u8) !void {
820	var flags = try Args.parse(allocator, args_build_spec, args);	839	var flags = try Args.parse(allocator, args_build_spec, args);
821	defer flags.deinit();	840	defer flags.deinit();
822		841
...	@@ -851,14 +870,14 @@ const usage_run =	...	@@ -851,14 +870,14 @@ const usage_run =
851		870
852	const args_run_spec = []Flag{Flag.Bool("--help")};	871	const args_run_spec = []Flag{Flag.Bool("--help")};
853		872
854	fn cmdRun(allocator: &Allocator, args: []const []const u8) !void {	873	fn cmdRun(allocator: *Allocator, args: []const []const u8) !void {
855	var compile_args = args;	874	var compile_args = args;
856	var runtime_args: []const []const u8 = []const []const u8{};	875	var runtime_args: []const []const u8 = []const []const u8{};
857		876
858	for (args) \|argv, i\| {	877	for (args) \|argv, i\| {
859	if (mem.eql(u8, argv, "--")) {	878	if (mem.eql(u8, argv, "--")) {
860	compile_args = args[0..i];	879	compile_args = args[0..i];
861	runtime_args = args[i + 1..];	880	runtime_args = args[i + 1 ..];
862	break;	881	break;
863	}	882	}
864	}	883	}
...	@@ -901,7 +920,7 @@ const args_translate_c_spec = []Flag{	...	@@ -901,7 +920,7 @@ const args_translate_c_spec = []Flag{
901	Flag.Arg1("--output"),	920	Flag.Arg1("--output"),
902	};	921	};
903		922
904	fn cmdTranslateC(allocator: &Allocator, args: []const []const u8) !void {	923	fn cmdTranslateC(allocator: *Allocator, args: []const []const u8) !void {
905	var flags = try Args.parse(allocator, args_translate_c_spec, args);	924	var flags = try Args.parse(allocator, args_translate_c_spec, args);
906	defer flags.deinit();	925	defer flags.deinit();
907		926
...	@@ -947,7 +966,7 @@ fn cmdTranslateC(allocator: &Allocator, args: []const []const u8) !void {	...	@@ -947,7 +966,7 @@ fn cmdTranslateC(allocator: &Allocator, args: []const []const u8) !void {
947		966
948	// cmd:help ////////////////////////////////////////////////////////////////////////////////////////	967	// cmd:help ////////////////////////////////////////////////////////////////////////////////////////
949		968
950	fn cmdHelp(allocator: &Allocator, args: []const []const u8) !void {	969	fn cmdHelp(allocator: *Allocator, args: []const []const u8) !void {
951	try stderr.write(usage);	970	try stderr.write(usage);
952	}	971	}
953		972
...	@@ -970,7 +989,7 @@ const info_zen =	...	@@ -970,7 +989,7 @@ const info_zen =
970	\\	989	\\
971	;	990	;
972		991
973	fn cmdZen(allocator: &Allocator, args: []const []const u8) !void {	992	fn cmdZen(allocator: *Allocator, args: []const []const u8) !void {
974	try stdout.write(info_zen);	993	try stdout.write(info_zen);
975	}	994	}
976		995
...	@@ -985,7 +1004,7 @@ const usage_internal =	...	@@ -985,7 +1004,7 @@ const usage_internal =
985	\\	1004	\\
986	;	1005	;
987		1006
988	fn cmdInternal(allocator: &Allocator, args: []const []const u8) !void {	1007	fn cmdInternal(allocator: *Allocator, args: []const []const u8) !void {
989	if (args.len == 0) {	1008	if (args.len == 0) {
990	try stderr.write(usage_internal);	1009	try stderr.write(usage_internal);
991	os.exit(1);	1010	os.exit(1);
...	@@ -1007,7 +1026,7 @@ fn cmdInternal(allocator: &Allocator, args: []const []const u8) !void {	...	@@ -1007,7 +1026,7 @@ fn cmdInternal(allocator: &Allocator, args: []const []const u8) !void {
1007	try stderr.write(usage_internal);	1026	try stderr.write(usage_internal);
1008	}	1027	}
1009		1028
1010	fn cmdInternalBuildInfo(allocator: &Allocator, args: []const []const u8) !void {	1029	fn cmdInternalBuildInfo(allocator: *Allocator, args: []const []const u8) !void {
1011	try stdout.print(	1030	try stdout.print(
1012	\\ZIG_CMAKE_BINARY_DIR {}	1031	\\ZIG_CMAKE_BINARY_DIR {}
1013	\\ZIG_CXX_COMPILER {}	1032	\\ZIG_CXX_COMPILER {}

src-self-hosted/module.zig+19-24

 @@ -10,9 +10,10 @@ const Target = @import("target.zig").Target;
 const warn = std.debug.warn;
 const Token = std.zig.Token;
 const ArrayList = std.ArrayList;
+const errmsg = @import("errmsg.zig");
 pub const Module = struct {
-    allocator: &mem.Allocator,
+    allocator: *mem.Allocator,
     name: Buffer,
     root_src_path: ?[]const u8,
     module: llvm.ModuleRef,
 @@ -52,10 +53,10 @@ pub const Module = struct {
     windows_subsystem_windows: bool,
     windows_subsystem_console: bool,
-    link_libs_list: ArrayList(&LinkLib),
+    link_libs_list: ArrayList(*LinkLib),
-    libc_link_lib: ?&LinkLib,
+    libc_link_lib: ?*LinkLib,
-    err_color: ErrColor,
+    err_color: errmsg.Color,
     verbose_tokenize: bool,
     verbose_ast_tree: bool,
 @@ -87,12 +88,6 @@ pub const Module = struct {
         Obj,
     };
-    pub const ErrColor = enum {
-        Auto,
-        Off,
-        On,
-    };
     pub const LinkLib = struct {
         name: []const u8,
         path: ?[]const u8,
 @@ -111,19 +106,19 @@ pub const Module = struct {
     pub const CliPkg = struct {
         name: []const u8,
         path: []const u8,
-        children: ArrayList(&CliPkg),
+        children: ArrayList(*CliPkg),
-        parent: ?&CliPkg,
+        parent: ?*CliPkg,
-        pub fn init(allocator: &mem.Allocator, name: []const u8, path: []const u8, parent: ?&CliPkg) !&CliPkg {
+        pub fn init(allocator: *mem.Allocator, name: []const u8, path: []const u8, parent: ?*CliPkg) !*CliPkg {
             var pkg = try allocator.create(CliPkg);
             pkg.name = name;
             pkg.path = path;
-            pkg.children = ArrayList(&CliPkg).init(allocator);
+            pkg.children = ArrayList(*CliPkg).init(allocator);
             pkg.parent = parent;
             return pkg;
         }
-        pub fn deinit(self: &CliPkg) void {
+        pub fn deinit(self: *CliPkg) void {
             for (self.children.toSliceConst()) |child| {
                 child.deinit();
             }
 @@ -131,7 +126,7 @@ pub const Module = struct {
         }
     };
-    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 {
+    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 {
         var name_buffer = try Buffer.init(allocator, name);
         errdefer name_buffer.deinit();
 @@ -193,9 +188,9 @@ pub const Module = struct {
             .link_objects = [][]const u8{},
             .windows_subsystem_windows = false,
             .windows_subsystem_console = false,
-            .link_libs_list = ArrayList(&LinkLib).init(allocator),
+            .link_libs_list = ArrayList(*LinkLib).init(allocator),
             .libc_link_lib = null,
-            .err_color = ErrColor.Auto,
+            .err_color = errmsg.Color.Auto,
             .darwin_frameworks = [][]const u8{},
             .darwin_version_min = DarwinVersionMin.None,
             .test_filters = [][]const u8{},
 @@ -205,11 +200,11 @@ pub const Module = struct {
         return module_ptr;
     }
-    fn dump(self: &Module) void {
+    fn dump(self: *Module) void {
         c.LLVMDumpModule(self.module);
     }
-    pub fn destroy(self: &Module) void {
+    pub fn destroy(self: *Module) void {
         c.LLVMDisposeBuilder(self.builder);
         c.LLVMDisposeModule(self.module);
         c.LLVMContextDispose(self.context);
 @@ -218,7 +213,7 @@ pub const Module = struct {
         self.allocator.destroy(self);
     }
-    pub fn build(self: &Module) !void {
+    pub fn build(self: *Module) !void {
         if (self.llvm_argv.len != 0) {
             var c_compatible_args = try std.cstr.NullTerminated2DArray.fromSlices(self.allocator, [][]const []const u8{
                 [][]const u8{"zig (LLVM option parsing)"},
 @@ -255,7 +250,7 @@ pub const Module = struct {
         const out_stream = &stderr_file_out_stream.stream;
         warn("====fmt:====\n");
-        try std.zig.render(self.allocator, out_stream, &tree);
+        _ = try std.zig.render(self.allocator, out_stream, &tree);
         warn("====ir:====\n");
         warn("TODO\n\n");
 @@ -264,12 +259,12 @@ pub const Module = struct {
         self.dump();
     }
-    pub fn link(self: &Module, out_file: ?[]const u8) !void {
+    pub fn link(self: *Module, out_file: ?[]const u8) !void {
         warn("TODO link");
         return error.Todo;
     }
-    pub fn addLinkLib(self: &Module, name: []const u8, provided_explicitly: bool) !&LinkLib {
+    pub fn addLinkLib(self: *Module, name: []const u8, provided_explicitly: bool) !*LinkLib {
         const is_libc = mem.eql(u8, name, "c");
         if (is_libc) {

src-self-hosted/scope.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	pub const Scope = struct {	1	pub const Scope = struct {
2	id: Id,	2	id: Id,
3	parent: &Scope,	3	parent: *Scope,
4		4
5	pub const Id = enum {	5	pub const Id = enum {
6	Decls,	6	Decls,

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

...	@@ -11,7 +11,7 @@ pub const Target = union(enum) {	...	@@ -11,7 +11,7 @@ pub const Target = union(enum) {
11	Native,	11	Native,
12	Cross: CrossTarget,	12	Cross: CrossTarget,
13		13
14	pub fn oFileExt(self: &const Target) []const u8 {	14	pub fn oFileExt(self: *const Target) []const u8 {
15	const environ = switch (self.*) {	15	const environ = switch (self.*) {
16	Target.Native => builtin.environ,	16	Target.Native => builtin.environ,
17	Target.Cross => \|t\| t.environ,	17	Target.Cross => \|t\| t.environ,
...	@@ -22,28 +22,28 @@ pub const Target = union(enum) {	...	@@ -22,28 +22,28 @@ pub const Target = union(enum) {
22	};	22	};
23	}	23	}
24		24
25	pub fn exeFileExt(self: &const Target) []const u8 {	25	pub fn exeFileExt(self: *const Target) []const u8 {
26	return switch (self.getOs()) {	26	return switch (self.getOs()) {
27	builtin.Os.windows => ".exe",	27	builtin.Os.windows => ".exe",
28	else => "",	28	else => "",
29	};	29	};
30	}	30	}
31		31
32	pub fn getOs(self: &const Target) builtin.Os {	32	pub fn getOs(self: *const Target) builtin.Os {
33	return switch (self.*) {	33	return switch (self.*) {
34	Target.Native => builtin.os,	34	Target.Native => builtin.os,
35	Target.Cross => \|t\| t.os,	35	Target.Cross => \|t\| t.os,
36	};	36	};
37	}	37	}
38		38
39	pub fn isDarwin(self: &const Target) bool {	39	pub fn isDarwin(self: *const Target) bool {
40	return switch (self.getOs()) {	40	return switch (self.getOs()) {
41	builtin.Os.ios, builtin.Os.macosx => true,	41	builtin.Os.ios, builtin.Os.macosx => true,
42	else => false,	42	else => false,
43	};	43	};
44	}	44	}
45		45
46	pub fn isWindows(self: &const Target) bool {	46	pub fn isWindows(self: *const Target) bool {
47	return switch (self.getOs()) {	47	return switch (self.getOs()) {
48	builtin.Os.windows => true,	48	builtin.Os.windows => true,
49	else => false,	49	else => false,

src/all_types.hpp+26-17

 @@ -374,7 +374,7 @@ enum NodeType {
     NodeTypeCharLiteral,
     NodeTypeSymbol,
     NodeTypePrefixOpExpr,
-    NodeTypeAddrOfExpr,
+    NodeTypePointerType,
     NodeTypeFnCallExpr,
     NodeTypeArrayAccessExpr,
     NodeTypeSliceExpr,
 @@ -616,6 +616,7 @@ enum PrefixOp {
     PrefixOpNegationWrap,
     PrefixOpMaybe,
     PrefixOpUnwrapMaybe,
+    PrefixOpAddrOf,
 };
 struct AstNodePrefixOpExpr {
 @@ -623,7 +624,8 @@ struct AstNodePrefixOpExpr {
     AstNode *primary_expr;
 };
-struct AstNodeAddrOfExpr {
+struct AstNodePointerType {
+    Token *star_token;
     AstNode *align_expr;
     BigInt *bit_offset_start;
     BigInt *bit_offset_end;
 @@ -899,7 +901,7 @@ struct AstNode {
         AstNodeBinOpExpr bin_op_expr;
         AstNodeCatchExpr unwrap_err_expr;
         AstNodePrefixOpExpr prefix_op_expr;
-        AstNodeAddrOfExpr addr_of_expr;
+        AstNodePointerType pointer_type;
         AstNodeFnCallExpr fn_call_expr;
         AstNodeArrayAccessExpr array_access_expr;
         AstNodeSliceExpr slice_expr;
 @@ -972,8 +974,14 @@ struct FnTypeId {
 uint32_t fn_type_id_hash(FnTypeId*);
 bool fn_type_id_eql(FnTypeId *a, FnTypeId *b);
+enum PtrLen {
+    PtrLenUnknown,
+    PtrLenSingle,
+};
 struct TypeTableEntryPointer {
     TypeTableEntry *child_type;
+    PtrLen ptr_len;
     bool is_const;
     bool is_volatile;
     uint32_t alignment;
 @@ -1395,6 +1403,7 @@ struct TypeId {
     union {
         struct {
             TypeTableEntry *child_type;
+            PtrLen ptr_len;
             bool is_const;
             bool is_volatile;
             uint32_t alignment;
 @@ -2051,7 +2060,7 @@ enum IrInstructionId {
     IrInstructionIdTypeInfo,
     IrInstructionIdTypeId,
     IrInstructionIdSetEvalBranchQuota,
-    IrInstructionIdPtrTypeOf,
+    IrInstructionIdPtrType,
     IrInstructionIdAlignCast,
     IrInstructionIdOpaqueType,
     IrInstructionIdSetAlignStack,
 @@ -2264,6 +2273,7 @@ struct IrInstructionElemPtr {
     IrInstruction *array_ptr;
     IrInstruction *elem_index;
+    PtrLen ptr_len;
     bool is_const;
     bool safety_check_on;
 };
 @@ -2272,8 +2282,6 @@ struct IrInstructionVarPtr {
     IrInstruction base;
     VariableTableEntry *var;
-    bool is_const;
-    bool is_volatile;
 };
 struct IrInstructionCall {
 @@ -2410,6 +2418,18 @@ struct IrInstructionArrayType {
     IrInstruction *child_type;
 };
+struct IrInstructionPtrType {
+    IrInstruction base;
+    IrInstruction *align_value;
+    IrInstruction *child_type;
+    uint32_t bit_offset_start;
+    uint32_t bit_offset_end;
+    PtrLen ptr_len;
+    bool is_const;
+    bool is_volatile;
+};
 struct IrInstructionPromiseType {
     IrInstruction base;
 @@ -2889,17 +2909,6 @@ struct IrInstructionSetEvalBranchQuota {
     IrInstruction *new_quota;
 };
-struct IrInstructionPtrTypeOf {
-    IrInstruction base;
-    IrInstruction *align_value;
-    IrInstruction *child_type;
-    uint32_t bit_offset_start;
-    uint32_t bit_offset_end;
-    bool is_const;
-    bool is_volatile;
-};
 struct IrInstructionAlignCast {
     IrInstruction base;

src/analyze.cpp+41-21

src/analyze.hpp+2-2

...	@@ -16,7 +16,7 @@ ErrorMsg add_error_note(CodeGen g, ErrorMsg parent_msg, AstNode node, Buf *m	...	@@ -16,7 +16,7 @@ ErrorMsg add_error_note(CodeGen g, ErrorMsg parent_msg, AstNode node, Buf *m
16	TypeTableEntry *new_type_table_entry(TypeTableEntryId id);	16	TypeTableEntry *new_type_table_entry(TypeTableEntryId id);
17	TypeTableEntry get_pointer_to_type(CodeGen g, TypeTableEntry *child_type, bool is_const);	17	TypeTableEntry get_pointer_to_type(CodeGen g, TypeTableEntry *child_type, bool is_const);
18	TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type, bool is_const,	18	TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type, bool is_const,
19	bool is_volatile, uint32_t byte_alignment, uint32_t bit_offset, uint32_t unaligned_bit_count);	19	bool is_volatile, PtrLen ptr_len, uint32_t byte_alignment, uint32_t bit_offset, uint32_t unaligned_bit_count);
20	uint64_t type_size(CodeGen g, TypeTableEntry type_entry);	20	uint64_t type_size(CodeGen g, TypeTableEntry type_entry);
21	uint64_t type_size_bits(CodeGen g, TypeTableEntry type_entry);	21	uint64_t type_size_bits(CodeGen g, TypeTableEntry type_entry);
22	TypeTableEntry *get_int_type_ptr(CodeGen g, bool is_signed, uint32_t size_in_bits);	22	TypeTableEntry *get_int_type_ptr(CodeGen g, bool is_signed, uint32_t size_in_bits);
...	@@ -191,7 +191,7 @@ void add_fn_export(CodeGen g, FnTableEntry fn_table_entry, Buf *symbol_name, G	...	@@ -191,7 +191,7 @@ void add_fn_export(CodeGen g, FnTableEntry fn_table_entry, Buf *symbol_name, G
191		191
192	ConstExprValue get_builtin_value(CodeGen codegen, const char *name);	192	ConstExprValue get_builtin_value(CodeGen codegen, const char *name);
193	TypeTableEntry get_ptr_to_stack_trace_type(CodeGen g);	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	TypeTableEntry get_auto_err_set_type(CodeGen g, FnTableEntry *fn_entry);	196	TypeTableEntry get_auto_err_set_type(CodeGen g, FnTableEntry *fn_entry);
197		197

src/ast_render.cpp+22-15

 @@ -68,6 +68,7 @@ static const char *prefix_op_str(PrefixOp prefix_op) {
         case PrefixOpBinNot: return "~";
         case PrefixOpMaybe: return "?";
         case PrefixOpUnwrapMaybe: return "??";
+        case PrefixOpAddrOf: return "&";
     }
     zig_unreachable();
 }
 @@ -185,8 +186,6 @@ static const char *node_type_str(NodeType node_type) {
             return "Symbol";
         case NodeTypePrefixOpExpr:
             return "PrefixOpExpr";
-        case NodeTypeAddrOfExpr:
-            return "AddrOfExpr";
         case NodeTypeUse:
             return "Use";
         case NodeTypeBoolLiteral:
 @@ -251,6 +250,8 @@ static const char *node_type_str(NodeType node_type) {
             return "Suspend";
         case NodeTypePromiseType:
             return "PromiseType";
+        case NodeTypePointerType:
+            return "PointerType";
     }
     zig_unreachable();
 }
 @@ -616,41 +617,47 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
                 fprintf(ar->f, "%s", prefix_op_str(op));
                 AstNode *child_node = node->data.prefix_op_expr.primary_expr;
-                bool new_grouped = child_node->type == NodeTypePrefixOpExpr || child_node->type == NodeTypeAddrOfExpr;
+                bool new_grouped = child_node->type == NodeTypePrefixOpExpr || child_node->type == NodeTypePointerType;
                 render_node_extra(ar, child_node, new_grouped);
                 if (!grouped) fprintf(ar->f, ")");
                 break;
             }
-        case NodeTypeAddrOfExpr:
+        case NodeTypePointerType:
             {
                 if (!grouped) fprintf(ar->f, "(");
-                fprintf(ar->f, "&");
+                const char *star = "[*]";
-                if (node->data.addr_of_expr.align_expr != nullptr) {
+                if (node->data.pointer_type.star_token != nullptr &&
+                    (node->data.pointer_type.star_token->id == TokenIdStar || node->data.pointer_type.star_token->id == TokenIdStarStar))
+                {
+                    star = "*";
+                }
+                fprintf(ar->f, "%s", star);
+                if (node->data.pointer_type.align_expr != nullptr) {
                     fprintf(ar->f, "align(");
-                    render_node_grouped(ar, node->data.addr_of_expr.align_expr);
+                    render_node_grouped(ar, node->data.pointer_type.align_expr);
-                    if (node->data.addr_of_expr.bit_offset_start != nullptr) {
+                    if (node->data.pointer_type.bit_offset_start != nullptr) {
-                        assert(node->data.addr_of_expr.bit_offset_end != nullptr);
+                        assert(node->data.pointer_type.bit_offset_end != nullptr);
                         Buf offset_start_buf = BUF_INIT;
                         buf_resize(&offset_start_buf, 0);
-                        bigint_append_buf(&offset_start_buf, node->data.addr_of_expr.bit_offset_start, 10);
+                        bigint_append_buf(&offset_start_buf, node->data.pointer_type.bit_offset_start, 10);
                         Buf offset_end_buf = BUF_INIT;
                         buf_resize(&offset_end_buf, 0);
-                        bigint_append_buf(&offset_end_buf, node->data.addr_of_expr.bit_offset_end, 10);
+                        bigint_append_buf(&offset_end_buf, node->data.pointer_type.bit_offset_end, 10);
                         fprintf(ar->f, ":%s:%s ", buf_ptr(&offset_start_buf), buf_ptr(&offset_end_buf));
                     }
                     fprintf(ar->f, ") ");
                 }
-                if (node->data.addr_of_expr.is_const) {
+                if (node->data.pointer_type.is_const) {
                     fprintf(ar->f, "const ");
                 }
-                if (node->data.addr_of_expr.is_volatile) {
+                if (node->data.pointer_type.is_volatile) {
                     fprintf(ar->f, "volatile ");
                 }
-                render_node_ungrouped(ar, node->data.addr_of_expr.op_expr);
+                render_node_ungrouped(ar, node->data.pointer_type.op_expr);
                 if (!grouped) fprintf(ar->f, ")");
                 break;
             }
 @@ -669,7 +676,7 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) {
                     fprintf(ar->f, " ");
                 }
                 AstNode *fn_ref_node = node->data.fn_call_expr.fn_ref_expr;
-                bool grouped = (fn_ref_node->type != NodeTypePrefixOpExpr && fn_ref_node->type != NodeTypeAddrOfExpr);
+                bool grouped = (fn_ref_node->type != NodeTypePrefixOpExpr && fn_ref_node->type != NodeTypePointerType);
                 render_node_extra(ar, fn_ref_node, grouped);
                 fprintf(ar->f, "(");
                 for (size_t i = 0; i < node->data.fn_call_expr.params.length; i += 1) {

src/codegen.cpp+36-15

src/ir.cpp+331-265

...	@@ -41,10 +41,6 @@ struct IrAnalyze {	...	@@ -41,10 +41,6 @@ struct IrAnalyze {
41	static const LVal LVAL_NONE = { false, false, false };	41	static const LVal LVAL_NONE = { false, false, false };
42	static const LVal LVAL_PTR = { true, false, false };	42	static const LVal LVAL_PTR = { true, false, false };
43		43
44	static LVal make_lval_addr(bool is_const, bool is_volatile) {
45	return { true, is_const, is_volatile };
46	}
47
48	enum ConstCastResultId {	44	enum ConstCastResultId {
49	ConstCastResultIdOk,	45	ConstCastResultIdOk,
50	ConstCastResultIdErrSet,	46	ConstCastResultIdErrSet,
...	@@ -108,8 +104,7 @@ static IrInstruction ir_get_deref(IrAnalyze ira, IrInstruction *source_instruc	...	@@ -108,8 +104,7 @@ static IrInstruction ir_get_deref(IrAnalyze ira, IrInstruction *source_instruc
108	static ErrorMsg exec_add_error_node(CodeGen codegen, IrExecutable exec, AstNode source_node, Buf *msg);	104	static ErrorMsg exec_add_error_node(CodeGen codegen, IrExecutable exec, AstNode source_node, Buf *msg);
109	static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_name,	105	static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_name,
110	IrInstruction source_instr, IrInstruction container_ptr, TypeTableEntry *container_type);	106	IrInstruction source_instr, IrInstruction container_ptr, TypeTableEntry *container_type);
111	static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction *instruction,	107	static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction instruction, VariableTableEntry var);
112	VariableTableEntry *var, bool is_const_ptr, bool is_volatile_ptr);
113	static TypeTableEntry ir_resolve_atomic_operand_type(IrAnalyze ira, IrInstruction *op);	108	static TypeTableEntry ir_resolve_atomic_operand_type(IrAnalyze ira, IrInstruction *op);
114	static IrInstruction ir_lval_wrap(IrBuilder irb, Scope scope, IrInstruction value, LVal lval);	109	static IrInstruction ir_lval_wrap(IrBuilder irb, Scope scope, IrInstruction value, LVal lval);
115		110
...	@@ -629,8 +624,8 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionSetEvalBranchQuo	...	@@ -629,8 +624,8 @@ static constexpr IrInstructionId ir_instruction_id(IrInstructionSetEvalBranchQuo
629	return IrInstructionIdSetEvalBranchQuota;	624	return IrInstructionIdSetEvalBranchQuota;
630	}	625	}
631		626
632	static constexpr IrInstructionId ir_instruction_id(IrInstructionPtrTypeOf *) {	627	static constexpr IrInstructionId ir_instruction_id(IrInstructionPtrType *) {
633	return IrInstructionIdPtrTypeOf;	628	return IrInstructionIdPtrType;
634	}	629	}
635		630
636	static constexpr IrInstructionId ir_instruction_id(IrInstructionAlignCast *) {	631	static constexpr IrInstructionId ir_instruction_id(IrInstructionAlignCast *) {
...	@@ -1004,13 +999,9 @@ static IrInstruction ir_build_bin_op_from(IrBuilder irb, IrInstruction *old_in	...	@@ -1004,13 +999,9 @@ static IrInstruction ir_build_bin_op_from(IrBuilder irb, IrInstruction *old_in
1004	return new_instruction;	999	return new_instruction;
1005	}	1000	}
1006		1001
1007	static IrInstruction ir_build_var_ptr(IrBuilder irb, Scope scope, AstNode source_node,	1002	static IrInstruction ir_build_var_ptr(IrBuilder irb, Scope scope, AstNode source_node, VariableTableEntry *var) {
1008	VariableTableEntry *var, bool is_const, bool is_volatile)
1009	{
1010	IrInstructionVarPtr *instruction = ir_build_instruction<IrInstructionVarPtr>(irb, scope, source_node);	1003	IrInstructionVarPtr *instruction = ir_build_instruction<IrInstructionVarPtr>(irb, scope, source_node);
1011	instruction->var = var;	1004	instruction->var = var;
1012	instruction->is_const = is_const;
1013	instruction->is_volatile = is_volatile;
1014		1005
1015	ir_ref_var(var);	1006	ir_ref_var(var);
1016		1007
...	@@ -1018,12 +1009,13 @@ static IrInstruction ir_build_var_ptr(IrBuilder irb, Scope scope, AstNode so	...	@@ -1018,12 +1009,13 @@ static IrInstruction ir_build_var_ptr(IrBuilder irb, Scope scope, AstNode so
1018	}	1009	}
1019		1010
1020	static IrInstruction ir_build_elem_ptr(IrBuilder irb, Scope scope, AstNode source_node, IrInstruction *array_ptr,	1011	static IrInstruction ir_build_elem_ptr(IrBuilder irb, Scope scope, AstNode source_node, IrInstruction *array_ptr,
1021	IrInstruction *elem_index, bool safety_check_on)	1012	IrInstruction *elem_index, bool safety_check_on, PtrLen ptr_len)
1022	{	1013	{
1023	IrInstructionElemPtr *instruction = ir_build_instruction<IrInstructionElemPtr>(irb, scope, source_node);	1014	IrInstructionElemPtr *instruction = ir_build_instruction<IrInstructionElemPtr>(irb, scope, source_node);
1024	instruction->array_ptr = array_ptr;	1015	instruction->array_ptr = array_ptr;
1025	instruction->elem_index = elem_index;	1016	instruction->elem_index = elem_index;
1026	instruction->safety_check_on = safety_check_on;	1017	instruction->safety_check_on = safety_check_on;
		1018	instruction->ptr_len = ptr_len;
1027		1019
1028	ir_ref_instruction(array_ptr, irb->current_basic_block);	1020	ir_ref_instruction(array_ptr, irb->current_basic_block);
1029	ir_ref_instruction(elem_index, irb->current_basic_block);	1021	ir_ref_instruction(elem_index, irb->current_basic_block);
...	@@ -1031,15 +1023,6 @@ static IrInstruction ir_build_elem_ptr(IrBuilder irb, Scope scope, AstNode s	...	@@ -1031,15 +1023,6 @@ static IrInstruction ir_build_elem_ptr(IrBuilder irb, Scope scope, AstNode s
1031	return &instruction->base;	1023	return &instruction->base;
1032	}	1024	}
1033		1025
1034	static IrInstruction ir_build_elem_ptr_from(IrBuilder irb, IrInstruction *old_instruction,
1035	IrInstruction array_ptr, IrInstruction elem_index, bool safety_check_on)
1036	{
1037	IrInstruction *new_instruction = ir_build_elem_ptr(irb, old_instruction->scope,
1038	old_instruction->source_node, array_ptr, elem_index, safety_check_on);
1039	ir_link_new_instruction(new_instruction, old_instruction);
1040	return new_instruction;
1041	}
1042
1043	static IrInstruction ir_build_field_ptr_instruction(IrBuilder irb, Scope scope, AstNode source_node,	1026	static IrInstruction ir_build_field_ptr_instruction(IrBuilder irb, Scope scope, AstNode source_node,
1044	IrInstruction container_ptr, IrInstruction field_name_expr)	1027	IrInstruction container_ptr, IrInstruction field_name_expr)
1045	{	1028	{
...	@@ -1196,15 +1179,16 @@ static IrInstruction ir_build_br_from(IrBuilder irb, IrInstruction *old_instru	...	@@ -1196,15 +1179,16 @@ static IrInstruction ir_build_br_from(IrBuilder irb, IrInstruction *old_instru
1196	return new_instruction;	1179	return new_instruction;
1197	}	1180	}
1198		1181
1199	static IrInstruction ir_build_ptr_type_of(IrBuilder irb, Scope scope, AstNode source_node,	1182	static IrInstruction ir_build_ptr_type(IrBuilder irb, Scope scope, AstNode source_node,
1200	IrInstruction child_type, bool is_const, bool is_volatile, IrInstruction align_value,	1183	IrInstruction *child_type, bool is_const, bool is_volatile, PtrLen ptr_len,
1201	uint32_t bit_offset_start, uint32_t bit_offset_end)	1184	IrInstruction *align_value, uint32_t bit_offset_start, uint32_t bit_offset_end)
1202	{	1185	{
1203	IrInstructionPtrTypeOf *ptr_type_of_instruction = ir_build_instruction<IrInstructionPtrTypeOf>(irb, scope, source_node);	1186	IrInstructionPtrType *ptr_type_of_instruction = ir_build_instruction<IrInstructionPtrType>(irb, scope, source_node);
1204	ptr_type_of_instruction->align_value = align_value;	1187	ptr_type_of_instruction->align_value = align_value;
1205	ptr_type_of_instruction->child_type = child_type;	1188	ptr_type_of_instruction->child_type = child_type;
1206	ptr_type_of_instruction->is_const = is_const;	1189	ptr_type_of_instruction->is_const = is_const;
1207	ptr_type_of_instruction->is_volatile = is_volatile;	1190	ptr_type_of_instruction->is_volatile = is_volatile;
		1191	ptr_type_of_instruction->ptr_len = ptr_len;
1208	ptr_type_of_instruction->bit_offset_start = bit_offset_start;	1192	ptr_type_of_instruction->bit_offset_start = bit_offset_start;
1209	ptr_type_of_instruction->bit_offset_end = bit_offset_end;	1193	ptr_type_of_instruction->bit_offset_end = bit_offset_end;
1210		1194
...	@@ -3519,8 +3503,7 @@ static IrInstruction ir_gen_symbol(IrBuilder irb, Scope scope, AstNode node,	...	@@ -3519,8 +3503,7 @@ static IrInstruction ir_gen_symbol(IrBuilder irb, Scope scope, AstNode node,
3519		3503
3520	VariableTableEntry *var = find_variable(irb->codegen, scope, variable_name);	3504	VariableTableEntry *var = find_variable(irb->codegen, scope, variable_name);
3521	if (var) {	3505	if (var) {
3522	IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, node, var,	3506	IrInstruction *var_ptr = ir_build_var_ptr(irb, scope, node, var);
3523	!lval.is_ptr \|\| lval.is_const, lval.is_ptr && lval.is_volatile);
3524	if (lval.is_ptr)	3507	if (lval.is_ptr)
3525	return var_ptr;	3508	return var_ptr;
3526	else	3509	else
...	@@ -3557,7 +3540,7 @@ static IrInstruction ir_gen_array_access(IrBuilder irb, Scope *scope, AstNode	...	@@ -3557,7 +3540,7 @@ static IrInstruction ir_gen_array_access(IrBuilder irb, Scope *scope, AstNode
3557	return subscript_instruction;	3540	return subscript_instruction;
3558		3541
3559	IrInstruction *ptr_instruction = ir_build_elem_ptr(irb, scope, node, array_ref_instruction,	3542	IrInstruction *ptr_instruction = ir_build_elem_ptr(irb, scope, node, array_ref_instruction,
3560	subscript_instruction, true);	3543	subscript_instruction, true, PtrLenSingle);
3561	if (lval.is_ptr)	3544	if (lval.is_ptr)
3562	return ptr_instruction;	3545	return ptr_instruction;
3563		3546
...	@@ -4609,14 +4592,8 @@ static IrInstruction ir_gen_if_bool_expr(IrBuilder irb, Scope *scope, AstNode	...	@@ -4609,14 +4592,8 @@ static IrInstruction ir_gen_if_bool_expr(IrBuilder irb, Scope *scope, AstNode
4609	}	4592	}
4610		4593
4611	static IrInstruction ir_gen_prefix_op_id_lval(IrBuilder irb, Scope scope, AstNode node, IrUnOp op_id, LVal lval) {	4594	static IrInstruction ir_gen_prefix_op_id_lval(IrBuilder irb, Scope scope, AstNode node, IrUnOp op_id, LVal lval) {
4612	AstNode *expr_node;	4595	assert(node->type == NodeTypePrefixOpExpr);
4613	if (node->type == NodeTypePrefixOpExpr) {	4596	AstNode *expr_node = node->data.prefix_op_expr.primary_expr;
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	}
4620		4597
4621	IrInstruction *value = ir_gen_node_extra(irb, expr_node, scope, lval);	4598	IrInstruction *value = ir_gen_node_extra(irb, expr_node, scope, lval);
4622	if (value == irb->codegen->invalid_instruction)	4599	if (value == irb->codegen->invalid_instruction)
...	@@ -4640,16 +4617,17 @@ static IrInstruction ir_lval_wrap(IrBuilder irb, Scope scope, IrInstruction	...	@@ -4640,16 +4617,17 @@ static IrInstruction ir_lval_wrap(IrBuilder irb, Scope scope, IrInstruction
4640	return ir_build_ref(irb, scope, value->source_node, value, lval.is_const, lval.is_volatile);	4617	return ir_build_ref(irb, scope, value->source_node, value, lval.is_const, lval.is_volatile);
4641	}	4618	}
4642		4619
4643	static IrInstruction ir_gen_address_of(IrBuilder irb, Scope scope, AstNode node) {	4620	static IrInstruction ir_gen_pointer_type(IrBuilder irb, Scope scope, AstNode node) {
4644	assert(node->type == NodeTypeAddrOfExpr);	4621	assert(node->type == NodeTypePointerType);
4645	bool is_const = node->data.addr_of_expr.is_const;	4622	// The null check here is for C imports which don't set a token on the AST node. We could potentially
4646	bool is_volatile = node->data.addr_of_expr.is_volatile;	4623	// update that code to create a fake token and then remove this check.
4647	AstNode *expr_node = node->data.addr_of_expr.op_expr;	4624	PtrLen ptr_len = (node->data.pointer_type.star_token != nullptr &&
4648	AstNode *align_expr = node->data.addr_of_expr.align_expr;	4625	(node->data.pointer_type.star_token->id == TokenIdStar \|\|
4649		4626	node->data.pointer_type.star_token->id == TokenIdStarStar)) ? PtrLenSingle : PtrLenUnknown;
4650	if (align_expr == nullptr && !is_const && !is_volatile) {	4627	bool is_const = node->data.pointer_type.is_const;
4651	return ir_gen_node_extra(irb, expr_node, scope, make_lval_addr(is_const, is_volatile));	4628	bool is_volatile = node->data.pointer_type.is_volatile;
4652	}	4629	AstNode *expr_node = node->data.pointer_type.op_expr;
		4630	AstNode *align_expr = node->data.pointer_type.align_expr;
4653		4631
4654	IrInstruction *align_value;	4632	IrInstruction *align_value;
4655	if (align_expr != nullptr) {	4633	if (align_expr != nullptr) {
...	@@ -4665,27 +4643,27 @@ static IrInstruction ir_gen_address_of(IrBuilder irb, Scope scope, AstNode n	...	@@ -4665,27 +4643,27 @@ static IrInstruction ir_gen_address_of(IrBuilder irb, Scope scope, AstNode n
4665	return child_type;	4643	return child_type;
4666		4644
4667	uint32_t bit_offset_start = 0;	4645	uint32_t bit_offset_start = 0;
4668	if (node->data.addr_of_expr.bit_offset_start != nullptr) {	4646	if (node->data.pointer_type.bit_offset_start != nullptr) {
4669	if (!bigint_fits_in_bits(node->data.addr_of_expr.bit_offset_start, 32, false)) {	4647	if (!bigint_fits_in_bits(node->data.pointer_type.bit_offset_start, 32, false)) {
4670	Buf *val_buf = buf_alloc();	4648	Buf *val_buf = buf_alloc();
4671	bigint_append_buf(val_buf, node->data.addr_of_expr.bit_offset_start, 10);	4649	bigint_append_buf(val_buf, node->data.pointer_type.bit_offset_start, 10);
4672	exec_add_error_node(irb->codegen, irb->exec, node,	4650	exec_add_error_node(irb->codegen, irb->exec, node,
4673	buf_sprintf("value %s too large for u32 bit offset", buf_ptr(val_buf)));	4651	buf_sprintf("value %s too large for u32 bit offset", buf_ptr(val_buf)));
4674	return irb->codegen->invalid_instruction;	4652	return irb->codegen->invalid_instruction;
4675	}	4653	}
4676	bit_offset_start = bigint_as_unsigned(node->data.addr_of_expr.bit_offset_start);	4654	bit_offset_start = bigint_as_unsigned(node->data.pointer_type.bit_offset_start);
4677	}	4655	}
4678		4656
4679	uint32_t bit_offset_end = 0;	4657	uint32_t bit_offset_end = 0;
4680	if (node->data.addr_of_expr.bit_offset_end != nullptr) {	4658	if (node->data.pointer_type.bit_offset_end != nullptr) {
4681	if (!bigint_fits_in_bits(node->data.addr_of_expr.bit_offset_end, 32, false)) {	4659	if (!bigint_fits_in_bits(node->data.pointer_type.bit_offset_end, 32, false)) {
4682	Buf *val_buf = buf_alloc();	4660	Buf *val_buf = buf_alloc();
4683	bigint_append_buf(val_buf, node->data.addr_of_expr.bit_offset_end, 10);	4661	bigint_append_buf(val_buf, node->data.pointer_type.bit_offset_end, 10);
4684	exec_add_error_node(irb->codegen, irb->exec, node,	4662	exec_add_error_node(irb->codegen, irb->exec, node,
4685	buf_sprintf("value %s too large for u32 bit offset", buf_ptr(val_buf)));	4663	buf_sprintf("value %s too large for u32 bit offset", buf_ptr(val_buf)));
4686	return irb->codegen->invalid_instruction;	4664	return irb->codegen->invalid_instruction;
4687	}	4665	}
4688	bit_offset_end = bigint_as_unsigned(node->data.addr_of_expr.bit_offset_end);	4666	bit_offset_end = bigint_as_unsigned(node->data.pointer_type.bit_offset_end);
4689	}	4667	}
4690		4668
4691	if ((bit_offset_start != 0 \|\| bit_offset_end != 0) && bit_offset_start >= bit_offset_end) {	4669	if ((bit_offset_start != 0 \|\| bit_offset_end != 0) && bit_offset_start >= bit_offset_end) {
...	@@ -4694,8 +4672,8 @@ static IrInstruction ir_gen_address_of(IrBuilder irb, Scope scope, AstNode n	...	@@ -4694,8 +4672,8 @@ static IrInstruction ir_gen_address_of(IrBuilder irb, Scope scope, AstNode n
4694	return irb->codegen->invalid_instruction;	4672	return irb->codegen->invalid_instruction;
4695	}	4673	}
4696		4674
4697	return ir_build_ptr_type_of(irb, scope, node, child_type, is_const, is_volatile,	4675	return ir_build_ptr_type(irb, scope, node, child_type, is_const, is_volatile,
4698	align_value, bit_offset_start, bit_offset_end);	4676	ptr_len, align_value, bit_offset_start, bit_offset_end);
4699	}	4677	}
4700		4678
4701	static IrInstruction ir_gen_err_assert_ok(IrBuilder irb, Scope scope, AstNode source_node, AstNode *expr_node,	4679	static IrInstruction ir_gen_err_assert_ok(IrBuilder irb, Scope scope, AstNode source_node, AstNode *expr_node,
...	@@ -4761,6 +4739,10 @@ static IrInstruction ir_gen_prefix_op_expr(IrBuilder irb, Scope *scope, AstNod	...	@@ -4761,6 +4739,10 @@ static IrInstruction ir_gen_prefix_op_expr(IrBuilder irb, Scope *scope, AstNod
4761	return ir_lval_wrap(irb, scope, ir_gen_prefix_op_id(irb, scope, node, IrUnOpMaybe), lval);	4739	return ir_lval_wrap(irb, scope, ir_gen_prefix_op_id(irb, scope, node, IrUnOpMaybe), lval);
4762	case PrefixOpUnwrapMaybe:	4740	case PrefixOpUnwrapMaybe:
4763	return ir_gen_maybe_assert_ok(irb, scope, node, lval);	4741	return ir_gen_maybe_assert_ok(irb, scope, node, lval);
		4742	case PrefixOpAddrOf: {
		4743	AstNode *expr_node = node->data.prefix_op_expr.primary_expr;
		4744	return ir_lval_wrap(irb, scope, ir_gen_node_extra(irb, expr_node, scope, LVAL_PTR), lval);
		4745	}
4764	}	4746	}
4765	zig_unreachable();	4747	zig_unreachable();
4766	}	4748	}
...	@@ -5150,7 +5132,7 @@ static IrInstruction ir_gen_for_expr(IrBuilder irb, Scope *parent_scope, AstNo	...	@@ -5150,7 +5132,7 @@ static IrInstruction ir_gen_for_expr(IrBuilder irb, Scope *parent_scope, AstNo
5150		5132
5151	IrInstruction *undefined_value = ir_build_const_undefined(irb, child_scope, elem_node);	5133	IrInstruction *undefined_value = ir_build_const_undefined(irb, child_scope, elem_node);
5152	ir_build_var_decl(irb, child_scope, elem_node, elem_var, elem_var_type, nullptr, undefined_value);	5134	ir_build_var_decl(irb, child_scope, elem_node, elem_var, elem_var_type, nullptr, undefined_value);
5153	IrInstruction *elem_var_ptr = ir_build_var_ptr(irb, child_scope, node, elem_var, false, false);	5135	IrInstruction *elem_var_ptr = ir_build_var_ptr(irb, child_scope, node, elem_var);
5154		5136
5155	AstNode *index_var_source_node;	5137	AstNode *index_var_source_node;
5156	VariableTableEntry *index_var;	5138	VariableTableEntry *index_var;
...	@@ -5168,7 +5150,7 @@ static IrInstruction ir_gen_for_expr(IrBuilder irb, Scope *parent_scope, AstNo	...	@@ -5168,7 +5150,7 @@ static IrInstruction ir_gen_for_expr(IrBuilder irb, Scope *parent_scope, AstNo
5168	IrInstruction *zero = ir_build_const_usize(irb, child_scope, node, 0);	5150	IrInstruction *zero = ir_build_const_usize(irb, child_scope, node, 0);
5169	IrInstruction *one = ir_build_const_usize(irb, child_scope, node, 1);	5151	IrInstruction *one = ir_build_const_usize(irb, child_scope, node, 1);
5170	ir_build_var_decl(irb, child_scope, index_var_source_node, index_var, usize, nullptr, zero);	5152	ir_build_var_decl(irb, child_scope, index_var_source_node, index_var, usize, nullptr, zero);
5171	IrInstruction *index_ptr = ir_build_var_ptr(irb, child_scope, node, index_var, false, false);	5153	IrInstruction *index_ptr = ir_build_var_ptr(irb, child_scope, node, index_var);
5172		5154
5173		5155
5174	IrBasicBlock *cond_block = ir_create_basic_block(irb, child_scope, "ForCond");	5156	IrBasicBlock *cond_block = ir_create_basic_block(irb, child_scope, "ForCond");
...	@@ -5188,7 +5170,7 @@ static IrInstruction ir_gen_for_expr(IrBuilder irb, Scope *parent_scope, AstNo	...	@@ -5188,7 +5170,7 @@ static IrInstruction ir_gen_for_expr(IrBuilder irb, Scope *parent_scope, AstNo
5188	ir_mark_gen(ir_build_cond_br(irb, child_scope, node, cond, body_block, else_block, is_comptime));	5170	ir_mark_gen(ir_build_cond_br(irb, child_scope, node, cond, body_block, else_block, is_comptime));
5189		5171
5190	ir_set_cursor_at_end_and_append_block(irb, body_block);	5172	ir_set_cursor_at_end_and_append_block(irb, body_block);
5191	IrInstruction *elem_ptr = ir_build_elem_ptr(irb, child_scope, node, array_val_ptr, index_val, false);	5173	IrInstruction *elem_ptr = ir_build_elem_ptr(irb, child_scope, node, array_val_ptr, index_val, false, PtrLenSingle);
5192	IrInstruction *elem_val;	5174	IrInstruction *elem_val;
5193	if (node->data.for_expr.elem_is_ptr) {	5175	if (node->data.for_expr.elem_is_ptr) {
5194	elem_val = elem_ptr;	5176	elem_val = elem_ptr;
...	@@ -6397,7 +6379,7 @@ static IrInstruction ir_gen_await_expr(IrBuilder irb, Scope *parent_scope, Ast	...	@@ -6397,7 +6379,7 @@ static IrInstruction ir_gen_await_expr(IrBuilder irb, Scope *parent_scope, Ast
6397	IrInstruction *promise_result_type = ir_build_promise_result_type(irb, parent_scope, node, target_promise_type);	6379	IrInstruction *promise_result_type = ir_build_promise_result_type(irb, parent_scope, node, target_promise_type);
6398	ir_build_await_bookkeeping(irb, parent_scope, node, promise_result_type);	6380	ir_build_await_bookkeeping(irb, parent_scope, node, promise_result_type);
6399	ir_build_var_decl(irb, parent_scope, node, result_var, promise_result_type, nullptr, undefined_value);	6381	ir_build_var_decl(irb, parent_scope, node, result_var, promise_result_type, nullptr, undefined_value);
6400	IrInstruction *my_result_var_ptr = ir_build_var_ptr(irb, parent_scope, node, result_var, false, false);	6382	IrInstruction *my_result_var_ptr = ir_build_var_ptr(irb, parent_scope, node, result_var);
6401	ir_build_store_ptr(irb, parent_scope, node, result_ptr_field_ptr, my_result_var_ptr);	6383	ir_build_store_ptr(irb, parent_scope, node, result_ptr_field_ptr, my_result_var_ptr);
6402	IrInstruction *save_token = ir_build_coro_save(irb, parent_scope, node, irb->exec->coro_handle);	6384	IrInstruction *save_token = ir_build_coro_save(irb, parent_scope, node, irb->exec->coro_handle);
6403	IrInstruction *promise_type_val = ir_build_const_type(irb, parent_scope, node,	6385	IrInstruction *promise_type_val = ir_build_const_type(irb, parent_scope, node,
...	@@ -6568,8 +6550,6 @@ static IrInstruction ir_gen_node_raw(IrBuilder irb, AstNode node, Scope scop	...	@@ -6568,8 +6550,6 @@ static IrInstruction ir_gen_node_raw(IrBuilder irb, AstNode node, Scope scop
6568	return ir_lval_wrap(irb, scope, ir_gen_if_bool_expr(irb, scope, node), lval);	6550	return ir_lval_wrap(irb, scope, ir_gen_if_bool_expr(irb, scope, node), lval);
6569	case NodeTypePrefixOpExpr:	6551	case NodeTypePrefixOpExpr:
6570	return ir_gen_prefix_op_expr(irb, scope, node, lval);	6552	return ir_gen_prefix_op_expr(irb, scope, node, lval);
6571	case NodeTypeAddrOfExpr:
6572	return ir_lval_wrap(irb, scope, ir_gen_address_of(irb, scope, node), lval);
6573	case NodeTypeContainerInitExpr:	6553	case NodeTypeContainerInitExpr:
6574	return ir_lval_wrap(irb, scope, ir_gen_container_init_expr(irb, scope, node), lval);	6554	return ir_lval_wrap(irb, scope, ir_gen_container_init_expr(irb, scope, node), lval);
6575	case NodeTypeVariableDeclaration:	6555	case NodeTypeVariableDeclaration:
...	@@ -6592,14 +6572,23 @@ static IrInstruction ir_gen_node_raw(IrBuilder irb, AstNode node, Scope scop	...	@@ -6592,14 +6572,23 @@ static IrInstruction ir_gen_node_raw(IrBuilder irb, AstNode node, Scope scop
6592		6572
6593	return ir_build_load_ptr(irb, scope, node, ptr_instruction);	6573	return ir_build_load_ptr(irb, scope, node, ptr_instruction);
6594	}	6574	}
6595	case NodeTypePtrDeref:	6575	case NodeTypePtrDeref: {
6596	return ir_gen_prefix_op_id_lval(irb, scope, node, IrUnOpDereference, lval);	6576	assert(node->type == NodeTypePtrDeref);
		6577	AstNode *expr_node = node->data.ptr_deref_expr.target;
		6578	IrInstruction *value = ir_gen_node_extra(irb, expr_node, scope, lval);
		6579	if (value == irb->codegen->invalid_instruction)
		6580	return value;
		6581
		6582	return ir_build_un_op(irb, scope, node, IrUnOpDereference, value);
		6583	}
6597	case NodeTypeThisLiteral:	6584	case NodeTypeThisLiteral:
6598	return ir_lval_wrap(irb, scope, ir_gen_this_literal(irb, scope, node), lval);	6585	return ir_lval_wrap(irb, scope, ir_gen_this_literal(irb, scope, node), lval);
6599	case NodeTypeBoolLiteral:	6586	case NodeTypeBoolLiteral:
6600	return ir_lval_wrap(irb, scope, ir_gen_bool_literal(irb, scope, node), lval);	6587	return ir_lval_wrap(irb, scope, ir_gen_bool_literal(irb, scope, node), lval);
6601	case NodeTypeArrayType:	6588	case NodeTypeArrayType:
6602	return ir_lval_wrap(irb, scope, ir_gen_array_type(irb, scope, node), lval);	6589	return ir_lval_wrap(irb, scope, ir_gen_array_type(irb, scope, node), lval);
		6590	case NodeTypePointerType:
		6591	return ir_lval_wrap(irb, scope, ir_gen_pointer_type(irb, scope, node), lval);
6603	case NodeTypePromiseType:	6592	case NodeTypePromiseType:
6604	return ir_lval_wrap(irb, scope, ir_gen_promise_type(irb, scope, node), lval);	6593	return ir_lval_wrap(irb, scope, ir_gen_promise_type(irb, scope, node), lval);
6605	case NodeTypeStringLiteral:	6594	case NodeTypeStringLiteral:
...	@@ -6711,15 +6700,14 @@ bool ir_gen(CodeGen codegen, AstNode node, Scope scope, IrExecutable ir_exec	...	@@ -6711,15 +6700,14 @@ bool ir_gen(CodeGen codegen, AstNode node, Scope scope, IrExecutable ir_exec
6711	IrInstruction *coro_frame_type_value = ir_build_const_type(irb, coro_scope, node, coro_frame_type);	6700	IrInstruction *coro_frame_type_value = ir_build_const_type(irb, coro_scope, node, coro_frame_type);
6712	// TODO mark this var decl as "no safety" e.g. disable initializing the undef value to 0xaa	6701	// TODO mark this var decl as "no safety" e.g. disable initializing the undef value to 0xaa
6713	ir_build_var_decl(irb, coro_scope, node, promise_var, coro_frame_type_value, nullptr, undef);	6702	ir_build_var_decl(irb, coro_scope, node, promise_var, coro_frame_type_value, nullptr, undef);
6714	coro_promise_ptr = ir_build_var_ptr(irb, coro_scope, node, promise_var, false, false);	6703	coro_promise_ptr = ir_build_var_ptr(irb, coro_scope, node, promise_var);
6715		6704
6716	VariableTableEntry *await_handle_var = ir_create_var(irb, node, coro_scope, nullptr, false, false, true, const_bool_false);	6705	VariableTableEntry *await_handle_var = ir_create_var(irb, node, coro_scope, nullptr, false, false, true, const_bool_false);
6717	IrInstruction *null_value = ir_build_const_null(irb, coro_scope, node);	6706	IrInstruction *null_value = ir_build_const_null(irb, coro_scope, node);
6718	IrInstruction *await_handle_type_val = ir_build_const_type(irb, coro_scope, node,	6707	IrInstruction *await_handle_type_val = ir_build_const_type(irb, coro_scope, node,
6719	get_maybe_type(irb->codegen, irb->codegen->builtin_types.entry_promise));	6708	get_maybe_type(irb->codegen, irb->codegen->builtin_types.entry_promise));
6720	ir_build_var_decl(irb, coro_scope, node, await_handle_var, await_handle_type_val, nullptr, null_value);	6709	ir_build_var_decl(irb, coro_scope, node, await_handle_var, await_handle_type_val, nullptr, null_value);
6721	irb->exec->await_handle_var_ptr = ir_build_var_ptr(irb, coro_scope, node,	6710	irb->exec->await_handle_var_ptr = ir_build_var_ptr(irb, coro_scope, node, await_handle_var);
6722	await_handle_var, false, false);
6723		6711
6724	u8_ptr_type = ir_build_const_type(irb, coro_scope, node,	6712	u8_ptr_type = ir_build_const_type(irb, coro_scope, node,
6725	get_pointer_to_type(irb->codegen, irb->codegen->builtin_types.entry_u8, false));	6713	get_pointer_to_type(irb->codegen, irb->codegen->builtin_types.entry_u8, false));
...	@@ -6821,9 +6809,13 @@ bool ir_gen(CodeGen codegen, AstNode node, Scope scope, IrExecutable ir_exec	...	@@ -6821,9 +6809,13 @@ bool ir_gen(CodeGen codegen, AstNode node, Scope scope, IrExecutable ir_exec
6821		6809
6822	ir_set_cursor_at_end_and_append_block(irb, irb->exec->coro_normal_final);	6810	ir_set_cursor_at_end_and_append_block(irb, irb->exec->coro_normal_final);
6823	if (type_has_bits(return_type)) {	6811	if (type_has_bits(return_type)) {
		6812	IrInstruction *u8_ptr_type_unknown_len = ir_build_const_type(irb, scope, node,
		6813	get_pointer_to_type_extra(irb->codegen, irb->codegen->builtin_types.entry_u8,
		6814	false, false, PtrLenUnknown, get_abi_alignment(irb->codegen, irb->codegen->builtin_types.entry_u8),
		6815	0, 0));
6824	IrInstruction *result_ptr = ir_build_load_ptr(irb, scope, node, irb->exec->coro_result_ptr_field_ptr);	6816	IrInstruction *result_ptr = ir_build_load_ptr(irb, scope, node, irb->exec->coro_result_ptr_field_ptr);
6825	IrInstruction *result_ptr_as_u8_ptr = ir_build_ptr_cast(irb, scope, node, u8_ptr_type, result_ptr);	6817	IrInstruction *result_ptr_as_u8_ptr = ir_build_ptr_cast(irb, scope, node, u8_ptr_type_unknown_len, result_ptr);
6826	IrInstruction *return_value_ptr_as_u8_ptr = ir_build_ptr_cast(irb, scope, node, u8_ptr_type,	6818	IrInstruction *return_value_ptr_as_u8_ptr = ir_build_ptr_cast(irb, scope, node, u8_ptr_type_unknown_len,
6827	irb->exec->coro_result_field_ptr);	6819	irb->exec->coro_result_field_ptr);
6828	IrInstruction *return_type_inst = ir_build_const_type(irb, scope, node,	6820	IrInstruction *return_type_inst = ir_build_const_type(irb, scope, node,
6829	fn_entry->type_entry->data.fn.fn_type_id.return_type);	6821	fn_entry->type_entry->data.fn.fn_type_id.return_type);
...	@@ -6859,7 +6851,7 @@ bool ir_gen(CodeGen codegen, AstNode node, Scope scope, IrExecutable ir_exec	...	@@ -6859,7 +6851,7 @@ bool ir_gen(CodeGen codegen, AstNode node, Scope scope, IrExecutable ir_exec
6859	IrInstruction *coro_mem_ptr_maybe = ir_build_coro_free(irb, scope, node, coro_id, irb->exec->coro_handle);	6851	IrInstruction *coro_mem_ptr_maybe = ir_build_coro_free(irb, scope, node, coro_id, irb->exec->coro_handle);
6860	IrInstruction *coro_mem_ptr = ir_build_ptr_cast(irb, scope, node, u8_ptr_type, coro_mem_ptr_maybe);	6852	IrInstruction *coro_mem_ptr = ir_build_ptr_cast(irb, scope, node, u8_ptr_type, coro_mem_ptr_maybe);
6861	IrInstruction *coro_mem_ptr_ref = ir_build_ref(irb, scope, node, coro_mem_ptr, true, false);	6853	IrInstruction *coro_mem_ptr_ref = ir_build_ref(irb, scope, node, coro_mem_ptr, true, false);
6862	IrInstruction *coro_size_ptr = ir_build_var_ptr(irb, scope, node, coro_size_var, true, false);	6854	IrInstruction *coro_size_ptr = ir_build_var_ptr(irb, scope, node, coro_size_var);
6863	IrInstruction *coro_size = ir_build_load_ptr(irb, scope, node, coro_size_ptr);	6855	IrInstruction *coro_size = ir_build_load_ptr(irb, scope, node, coro_size_ptr);
6864	IrInstruction *mem_slice = ir_build_slice(irb, scope, node, coro_mem_ptr_ref, zero, coro_size, false);	6856	IrInstruction *mem_slice = ir_build_slice(irb, scope, node, coro_mem_ptr_ref, zero, coro_size, false);
6865	size_t arg_count = 2;	6857	size_t arg_count = 2;
...	@@ -7633,38 +7625,16 @@ static bool slice_is_const(TypeTableEntry *type) {	...	@@ -7633,38 +7625,16 @@ static bool slice_is_const(TypeTableEntry *type) {
7633	return type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.is_const;	7625	return type->data.structure.fields[slice_ptr_index].type_entry->data.pointer.is_const;
7634	}	7626	}
7635		7627
7636	static bool resolve_inferred_error_set(IrAnalyze ira, TypeTableEntry err_set_type, AstNode *source_node) {
7637	assert(err_set_type->id == TypeTableEntryIdErrorSet);
7638	FnTableEntry *infer_fn = err_set_type->data.error_set.infer_fn;
7639	if (infer_fn != nullptr) {
7640	if (infer_fn->anal_state == FnAnalStateInvalid) {
7641	return false;
7642	} else if (infer_fn->anal_state == FnAnalStateReady) {
7643	analyze_fn_body(ira->codegen, infer_fn);
7644	if (err_set_type->data.error_set.infer_fn != nullptr) {
7645	assert(ira->codegen->errors.length != 0);
7646	return false;
7647	}
7648	} else {
7649	ir_add_error_node(ira, source_node,
7650	buf_sprintf("cannot resolve inferred error set '%s': function '%s' not fully analyzed yet",
7651	buf_ptr(&err_set_type->name), buf_ptr(&err_set_type->data.error_set.infer_fn->symbol_name)));
7652	return false;
7653	}
7654	}
7655	return true;
7656	}
7657
7658	static TypeTableEntry get_error_set_intersection(IrAnalyze ira, TypeTableEntry set1, TypeTableEntry set2,	7628	static TypeTableEntry get_error_set_intersection(IrAnalyze ira, TypeTableEntry set1, TypeTableEntry set2,
7659	AstNode *source_node)	7629	AstNode *source_node)
7660	{	7630	{
7661	assert(set1->id == TypeTableEntryIdErrorSet);	7631	assert(set1->id == TypeTableEntryIdErrorSet);
7662	assert(set2->id == TypeTableEntryIdErrorSet);	7632	assert(set2->id == TypeTableEntryIdErrorSet);
7663		7633
7664	if (!resolve_inferred_error_set(ira, set1, source_node)) {	7634	if (!resolve_inferred_error_set(ira->codegen, set1, source_node)) {
7665	return ira->codegen->builtin_types.entry_invalid;	7635	return ira->codegen->builtin_types.entry_invalid;
7666	}	7636	}
7667	if (!resolve_inferred_error_set(ira, set2, source_node)) {	7637	if (!resolve_inferred_error_set(ira->codegen, set2, source_node)) {
7668	return ira->codegen->builtin_types.entry_invalid;	7638	return ira->codegen->builtin_types.entry_invalid;
7669	}	7639	}
7670	if (type_is_global_error_set(set1)) {	7640	if (type_is_global_error_set(set1)) {
...	@@ -7723,6 +7693,7 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, TypeTableEntry	...	@@ -7723,6 +7693,7 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, TypeTableEntry
7723	// pointer const	7693	// pointer const
7724	if (expected_type->id == TypeTableEntryIdPointer &&	7694	if (expected_type->id == TypeTableEntryIdPointer &&
7725	actual_type->id == TypeTableEntryIdPointer &&	7695	actual_type->id == TypeTableEntryIdPointer &&
		7696	(actual_type->data.pointer.ptr_len == expected_type->data.pointer.ptr_len) &&
7726	(!actual_type->data.pointer.is_const \|\| expected_type->data.pointer.is_const) &&	7697	(!actual_type->data.pointer.is_const \|\| expected_type->data.pointer.is_const) &&
7727	(!actual_type->data.pointer.is_volatile \|\| expected_type->data.pointer.is_volatile) &&	7698	(!actual_type->data.pointer.is_volatile \|\| expected_type->data.pointer.is_volatile) &&
7728	actual_type->data.pointer.bit_offset == expected_type->data.pointer.bit_offset &&	7699	actual_type->data.pointer.bit_offset == expected_type->data.pointer.bit_offset &&
...	@@ -7803,7 +7774,7 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, TypeTableEntry	...	@@ -7803,7 +7774,7 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, TypeTableEntry
7803	return result;	7774	return result;
7804	}	7775	}
7805		7776
7806	if (!resolve_inferred_error_set(ira, contained_set, source_node)) {	7777	if (!resolve_inferred_error_set(ira->codegen, contained_set, source_node)) {
7807	result.id = ConstCastResultIdUnresolvedInferredErrSet;	7778	result.id = ConstCastResultIdUnresolvedInferredErrSet;
7808	return result;	7779	return result;
7809	}	7780	}
...	@@ -7966,11 +7937,20 @@ static ImplicitCastMatchResult ir_types_match_with_implicit_cast(IrAnalyze *ira,	...	@@ -7966,11 +7937,20 @@ static ImplicitCastMatchResult ir_types_match_with_implicit_cast(IrAnalyze *ira,
7966	return ImplicitCastMatchResultReportedError;	7937	return ImplicitCastMatchResultReportedError;
7967	}	7938	}
7968		7939
		7940	// implicit conversion from ?T to ?U
		7941	if (expected_type->id == TypeTableEntryIdMaybe && actual_type->id == TypeTableEntryIdMaybe) {
		7942	ImplicitCastMatchResult res = ir_types_match_with_implicit_cast(ira, expected_type->data.maybe.child_type,
		7943	actual_type->data.maybe.child_type, value);
		7944	if (res != ImplicitCastMatchResultNo)
		7945	return res;
		7946	}
		7947
7969	// implicit conversion from non maybe type to maybe type	7948	// implicit conversion from non maybe type to maybe type
7970	if (expected_type->id == TypeTableEntryIdMaybe &&	7949	if (expected_type->id == TypeTableEntryIdMaybe) {
7971	ir_types_match_with_implicit_cast(ira, expected_type->data.maybe.child_type, actual_type, value))	7950	ImplicitCastMatchResult res = ir_types_match_with_implicit_cast(ira, expected_type->data.maybe.child_type,
7972	{	7951	actual_type, value);
7973	return ImplicitCastMatchResultYes;	7952	if (res != ImplicitCastMatchResultNo)
		7953	return res;
7974	}	7954	}
7975		7955
7976	// implicit conversion from null literal to maybe type	7956	// implicit conversion from null literal to maybe type
...	@@ -8192,7 +8172,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod	...	@@ -8192,7 +8172,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8192	err_set_type = ira->codegen->builtin_types.entry_global_error_set;	8172	err_set_type = ira->codegen->builtin_types.entry_global_error_set;
8193	} else {	8173	} else {
8194	err_set_type = prev_inst->value.type;	8174	err_set_type = prev_inst->value.type;
8195	if (!resolve_inferred_error_set(ira, err_set_type, prev_inst->source_node)) {	8175	if (!resolve_inferred_error_set(ira->codegen, err_set_type, prev_inst->source_node)) {
8196	return ira->codegen->builtin_types.entry_invalid;	8176	return ira->codegen->builtin_types.entry_invalid;
8197	}	8177	}
8198	update_errors_helper(ira->codegen, &errors, &errors_count);	8178	update_errors_helper(ira->codegen, &errors, &errors_count);
...	@@ -8231,7 +8211,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod	...	@@ -8231,7 +8211,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8231	if (type_is_global_error_set(err_set_type)) {	8211	if (type_is_global_error_set(err_set_type)) {
8232	continue;	8212	continue;
8233	}	8213	}
8234	if (!resolve_inferred_error_set(ira, cur_type, cur_inst->source_node)) {	8214	if (!resolve_inferred_error_set(ira->codegen, cur_type, cur_inst->source_node)) {
8235	return ira->codegen->builtin_types.entry_invalid;	8215	return ira->codegen->builtin_types.entry_invalid;
8236	}	8216	}
8237	if (type_is_global_error_set(cur_type)) {	8217	if (type_is_global_error_set(cur_type)) {
...	@@ -8297,7 +8277,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod	...	@@ -8297,7 +8277,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8297	continue;	8277	continue;
8298	}	8278	}
8299	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;	8279	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;
8300	if (!resolve_inferred_error_set(ira, cur_err_set_type, cur_inst->source_node)) {	8280	if (!resolve_inferred_error_set(ira->codegen, cur_err_set_type, cur_inst->source_node)) {
8301	return ira->codegen->builtin_types.entry_invalid;	8281	return ira->codegen->builtin_types.entry_invalid;
8302	}	8282	}
8303	if (type_is_global_error_set(cur_err_set_type)) {	8283	if (type_is_global_error_set(cur_err_set_type)) {
...	@@ -8360,7 +8340,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod	...	@@ -8360,7 +8340,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8360	if (err_set_type != nullptr && type_is_global_error_set(err_set_type)) {	8340	if (err_set_type != nullptr && type_is_global_error_set(err_set_type)) {
8361	continue;	8341	continue;
8362	}	8342	}
8363	if (!resolve_inferred_error_set(ira, cur_type, cur_inst->source_node)) {	8343	if (!resolve_inferred_error_set(ira->codegen, cur_type, cur_inst->source_node)) {
8364	return ira->codegen->builtin_types.entry_invalid;	8344	return ira->codegen->builtin_types.entry_invalid;
8365	}	8345	}
8366		8346
...	@@ -8417,11 +8397,11 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod	...	@@ -8417,11 +8397,11 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8417	TypeTableEntry *prev_err_set_type = (err_set_type == nullptr) ? prev_type->data.error_union.err_set_type : err_set_type;	8397	TypeTableEntry *prev_err_set_type = (err_set_type == nullptr) ? prev_type->data.error_union.err_set_type : err_set_type;
8418	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;	8398	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;
8419		8399
8420	if (!resolve_inferred_error_set(ira, prev_err_set_type, cur_inst->source_node)) {	8400	if (!resolve_inferred_error_set(ira->codegen, prev_err_set_type, cur_inst->source_node)) {
8421	return ira->codegen->builtin_types.entry_invalid;	8401	return ira->codegen->builtin_types.entry_invalid;
8422	}	8402	}
8423		8403
8424	if (!resolve_inferred_error_set(ira, cur_err_set_type, cur_inst->source_node)) {	8404	if (!resolve_inferred_error_set(ira->codegen, cur_err_set_type, cur_inst->source_node)) {
8425	return ira->codegen->builtin_types.entry_invalid;	8405	return ira->codegen->builtin_types.entry_invalid;
8426	}	8406	}
8427		8407
...	@@ -8531,7 +8511,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod	...	@@ -8531,7 +8511,7 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8531	{	8511	{
8532	if (err_set_type != nullptr) {	8512	if (err_set_type != nullptr) {
8533	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;	8513	TypeTableEntry *cur_err_set_type = cur_type->data.error_union.err_set_type;
8534	if (!resolve_inferred_error_set(ira, cur_err_set_type, cur_inst->source_node)) {	8514	if (!resolve_inferred_error_set(ira->codegen, cur_err_set_type, cur_inst->source_node)) {
8535	return ira->codegen->builtin_types.entry_invalid;	8515	return ira->codegen->builtin_types.entry_invalid;
8536	}	8516	}
8537	if (type_is_global_error_set(cur_err_set_type) \|\| type_is_global_error_set(err_set_type)) {	8517	if (type_is_global_error_set(cur_err_set_type) \|\| type_is_global_error_set(err_set_type)) {
...	@@ -8667,7 +8647,11 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod	...	@@ -8667,7 +8647,11 @@ static TypeTableEntry ir_resolve_peer_types(IrAnalyze ira, AstNode *source_nod
8667		8647
8668	if (convert_to_const_slice) {	8648	if (convert_to_const_slice) {
8669	assert(prev_inst->value.type->id == TypeTableEntryIdArray);	8649	assert(prev_inst->value.type->id == TypeTableEntryIdArray);
8670	TypeTableEntry *ptr_type = get_pointer_to_type(ira->codegen, prev_inst->value.type->data.array.child_type, true);	8650	TypeTableEntry *ptr_type = get_pointer_to_type_extra(
		8651	ira->codegen, prev_inst->value.type->data.array.child_type,
		8652	true, false, PtrLenUnknown,
		8653	get_abi_alignment(ira->codegen, prev_inst->value.type->data.array.child_type),
		8654	0, 0);
8671	TypeTableEntry *slice_type = get_slice_type(ira->codegen, ptr_type);	8655	TypeTableEntry *slice_type = get_slice_type(ira->codegen, ptr_type);
8672	if (err_set_type != nullptr) {	8656	if (err_set_type != nullptr) {
8673	return get_error_union_type(ira->codegen, err_set_type, slice_type);	8657	return get_error_union_type(ira->codegen, err_set_type, slice_type);
...	@@ -8983,34 +8967,15 @@ static IrInstruction ir_get_const_ptr(IrAnalyze ira, IrInstruction *instructio	...	@@ -8983,34 +8967,15 @@ static IrInstruction ir_get_const_ptr(IrAnalyze ira, IrInstruction *instructio
8983	ConstExprValue pointee, TypeTableEntry pointee_type,	8967	ConstExprValue pointee, TypeTableEntry pointee_type,
8984	ConstPtrMut ptr_mut, bool ptr_is_const, bool ptr_is_volatile, uint32_t ptr_align)	8968	ConstPtrMut ptr_mut, bool ptr_is_const, bool ptr_is_volatile, uint32_t ptr_align)
8985	{	8969	{
8986	if (pointee_type->id == TypeTableEntryIdMetaType) {	8970	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, pointee_type,
8987	TypeTableEntry *type_entry = pointee->data.x_type;	8971	ptr_is_const, ptr_is_volatile, PtrLenSingle, ptr_align, 0, 0);
8988	if (type_entry->id == TypeTableEntryIdUnreachable) {	8972	IrInstruction *const_instr = ir_get_const(ira, instruction);
8989	ir_add_error(ira, instruction, buf_sprintf("pointer to noreturn not allowed"));	8973	ConstExprValue *const_val = &const_instr->value;
8990	return ira->codegen->invalid_instruction;	8974	const_val->type = ptr_type;
8991	}	8975	const_val->data.x_ptr.special = ConstPtrSpecialRef;
8992		8976	const_val->data.x_ptr.mut = ptr_mut;
8993	IrInstruction *const_instr = ir_get_const(ira, instruction);	8977	const_val->data.x_ptr.data.ref.pointee = pointee;
8994	ConstExprValue *const_val = &const_instr->value;	8978	return const_instr;
8995	const_val->type = pointee_type;
8996	type_ensure_zero_bits_known(ira->codegen, type_entry);
8997	if (type_is_invalid(type_entry)) {
8998	return ira->codegen->invalid_instruction;
8999	}
9000	const_val->data.x_type = get_pointer_to_type_extra(ira->codegen, type_entry,
9001	ptr_is_const, ptr_is_volatile, get_abi_alignment(ira->codegen, type_entry), 0, 0);
9002	return const_instr;
9003	} else {
9004	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, pointee_type,
9005	ptr_is_const, ptr_is_volatile, ptr_align, 0, 0);
9006	IrInstruction *const_instr = ir_get_const(ira, instruction);
9007	ConstExprValue *const_val = &const_instr->value;
9008	const_val->type = ptr_type;
9009	const_val->data.x_ptr.special = ConstPtrSpecialRef;
9010	const_val->data.x_ptr.mut = ptr_mut;
9011	const_val->data.x_ptr.data.ref.pointee = pointee;
9012	return const_instr;
9013	}
9014	}	8979	}
9015		8980
9016	static TypeTableEntry ir_analyze_const_ptr(IrAnalyze ira, IrInstruction *instruction,	8981	static TypeTableEntry ir_analyze_const_ptr(IrAnalyze ira, IrInstruction *instruction,
...	@@ -9213,7 +9178,7 @@ static IrInstruction ir_analyze_err_set_cast(IrAnalyze ira, IrInstruction *sou	...	@@ -9213,7 +9178,7 @@ static IrInstruction ir_analyze_err_set_cast(IrAnalyze ira, IrInstruction *sou
9213	if (!val)	9178	if (!val)
9214	return ira->codegen->invalid_instruction;	9179	return ira->codegen->invalid_instruction;
9215		9180
9216	if (!resolve_inferred_error_set(ira, wanted_type, source_instr->source_node)) {	9181	if (!resolve_inferred_error_set(ira->codegen, wanted_type, source_instr->source_node)) {
9217	return ira->codegen->invalid_instruction;	9182	return ira->codegen->invalid_instruction;
9218	}	9183	}
9219	if (!type_is_global_error_set(wanted_type)) {	9184	if (!type_is_global_error_set(wanted_type)) {
...	@@ -9338,14 +9303,13 @@ static IrInstruction ir_get_ref(IrAnalyze ira, IrInstruction *source_instructi	...	@@ -9338,14 +9303,13 @@ static IrInstruction ir_get_ref(IrAnalyze ira, IrInstruction *source_instructi
9338	ConstExprValue *val = ir_resolve_const(ira, value, UndefOk);	9303	ConstExprValue *val = ir_resolve_const(ira, value, UndefOk);
9339	if (!val)	9304	if (!val)
9340	return ira->codegen->invalid_instruction;	9305	return ira->codegen->invalid_instruction;
9341	bool final_is_const = (value->value.type->id == TypeTableEntryIdMetaType) ? is_const : true;
9342	return ir_get_const_ptr(ira, source_instruction, val, value->value.type,	9306	return ir_get_const_ptr(ira, source_instruction, val, value->value.type,
9343	ConstPtrMutComptimeConst, final_is_const, is_volatile,	9307	ConstPtrMutComptimeConst, is_const, is_volatile,
9344	get_abi_alignment(ira->codegen, value->value.type));	9308	get_abi_alignment(ira->codegen, value->value.type));
9345	}	9309	}
9346		9310
9347	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, value->value.type,	9311	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, value->value.type,
9348	is_const, is_volatile, get_abi_alignment(ira->codegen, value->value.type), 0, 0);	9312	is_const, is_volatile, PtrLenSingle, get_abi_alignment(ira->codegen, value->value.type), 0, 0);
9349	IrInstruction *new_instruction = ir_build_ref(&ira->new_irb, source_instruction->scope,	9313	IrInstruction *new_instruction = ir_build_ref(&ira->new_irb, source_instruction->scope,
9350	source_instruction->source_node, value, is_const, is_volatile);	9314	source_instruction->source_node, value, is_const, is_volatile);
9351	new_instruction->value.type = ptr_type;	9315	new_instruction->value.type = ptr_type;
...	@@ -9485,6 +9449,8 @@ static IrInstruction ir_analyze_enum_to_union(IrAnalyze ira, IrInstruction *so	...	@@ -9485,6 +9449,8 @@ static IrInstruction ir_analyze_enum_to_union(IrAnalyze ira, IrInstruction *so
9485	TypeUnionField *union_field = find_union_field_by_tag(wanted_type, &val->data.x_enum_tag);	9449	TypeUnionField *union_field = find_union_field_by_tag(wanted_type, &val->data.x_enum_tag);
9486	assert(union_field != nullptr);	9450	assert(union_field != nullptr);
9487	type_ensure_zero_bits_known(ira->codegen, union_field->type_entry);	9451	type_ensure_zero_bits_known(ira->codegen, union_field->type_entry);
		9452	if (type_is_invalid(union_field->type_entry))
		9453	return ira->codegen->invalid_instruction;
9488	if (!union_field->type_entry->zero_bits) {	9454	if (!union_field->type_entry->zero_bits) {
9489	AstNode *field_node = wanted_type->data.unionation.decl_node->data.container_decl.fields.at(	9455	AstNode *field_node = wanted_type->data.unionation.decl_node->data.container_decl.fields.at(
9490	union_field->enum_field->decl_index);	9456	union_field->enum_field->decl_index);
...	@@ -9654,7 +9620,7 @@ static IrInstruction ir_analyze_int_to_err(IrAnalyze ira, IrInstruction *sourc	...	@@ -9654,7 +9620,7 @@ static IrInstruction ir_analyze_int_to_err(IrAnalyze ira, IrInstruction *sourc
9654	IrInstruction *result = ir_create_const(&ira->new_irb, source_instr->scope,	9620	IrInstruction *result = ir_create_const(&ira->new_irb, source_instr->scope,
9655	source_instr->source_node, wanted_type);	9621	source_instr->source_node, wanted_type);
9656		9622
9657	if (!resolve_inferred_error_set(ira, wanted_type, source_instr->source_node)) {	9623	if (!resolve_inferred_error_set(ira->codegen, wanted_type, source_instr->source_node)) {
9658	return ira->codegen->invalid_instruction;	9624	return ira->codegen->invalid_instruction;
9659	}	9625	}
9660		9626
...	@@ -9752,7 +9718,7 @@ static IrInstruction ir_analyze_err_to_int(IrAnalyze ira, IrInstruction *sourc	...	@@ -9752,7 +9718,7 @@ static IrInstruction ir_analyze_err_to_int(IrAnalyze ira, IrInstruction *sourc
9752	zig_unreachable();	9718	zig_unreachable();
9753	}	9719	}
9754	if (!type_is_global_error_set(err_set_type)) {	9720	if (!type_is_global_error_set(err_set_type)) {
9755	if (!resolve_inferred_error_set(ira, err_set_type, source_instr->source_node)) {	9721	if (!resolve_inferred_error_set(ira->codegen, err_set_type, source_instr->source_node)) {
9756	return ira->codegen->invalid_instruction;	9722	return ira->codegen->invalid_instruction;
9757	}	9723	}
9758	if (err_set_type->data.error_set.err_count == 0) {	9724	if (err_set_type->data.error_set.err_count == 0) {
...	@@ -10067,6 +10033,9 @@ static IrInstruction ir_analyze_cast(IrAnalyze ira, IrInstruction *source_inst	...	@@ -10067,6 +10033,9 @@ static IrInstruction ir_analyze_cast(IrAnalyze ira, IrInstruction *source_inst
10067	if (actual_type->id == TypeTableEntryIdNumLitFloat \|\|	10033	if (actual_type->id == TypeTableEntryIdNumLitFloat \|\|
10068	actual_type->id == TypeTableEntryIdNumLitInt)	10034	actual_type->id == TypeTableEntryIdNumLitInt)
10069	{	10035	{
		10036	ensure_complete_type(ira->codegen, wanted_type);
		10037	if (type_is_invalid(wanted_type))
		10038	return ira->codegen->invalid_instruction;
10070	if (wanted_type->id == TypeTableEntryIdEnum) {	10039	if (wanted_type->id == TypeTableEntryIdEnum) {
10071	IrInstruction *cast1 = ir_analyze_cast(ira, source_instr, wanted_type->data.enumeration.tag_int_type, value);	10040	IrInstruction *cast1 = ir_analyze_cast(ira, source_instr, wanted_type->data.enumeration.tag_int_type, value);
10072	if (type_is_invalid(cast1->value.type))	10041	if (type_is_invalid(cast1->value.type))
...	@@ -10269,21 +10238,6 @@ static IrInstruction ir_get_deref(IrAnalyze ira, IrInstruction *source_instruc	...	@@ -10269,21 +10238,6 @@ static IrInstruction ir_get_deref(IrAnalyze ira, IrInstruction *source_instruc
10269	source_instruction->source_node, ptr);	10238	source_instruction->source_node, ptr);
10270	load_ptr_instruction->value.type = child_type;	10239	load_ptr_instruction->value.type = child_type;
10271	return load_ptr_instruction;	10240	return load_ptr_instruction;
10272	} else if (type_entry->id == TypeTableEntryIdMetaType) {
10273	ConstExprValue *ptr_val = ir_resolve_const(ira, ptr, UndefBad);
10274	if (!ptr_val)
10275	return ira->codegen->invalid_instruction;
10276
10277	TypeTableEntry *ptr_type = ptr_val->data.x_type;
10278	if (ptr_type->id == TypeTableEntryIdPointer) {
10279	TypeTableEntry *child_type = ptr_type->data.pointer.child_type;
10280	return ir_create_const_type(&ira->new_irb, source_instruction->scope,
10281	source_instruction->source_node, child_type);
10282	} else {
10283	ir_add_error(ira, source_instruction,
10284	buf_sprintf("attempt to dereference non pointer type '%s'", buf_ptr(&ptr_type->name)));
10285	return ira->codegen->invalid_instruction;
10286	}
10287	} else {	10241	} else {
10288	ir_add_error_node(ira, source_instruction->source_node,	10242	ir_add_error_node(ira, source_instruction->source_node,
10289	buf_sprintf("attempt to dereference non pointer type '%s'",	10243	buf_sprintf("attempt to dereference non pointer type '%s'",
...	@@ -10452,7 +10406,9 @@ static Buf ir_resolve_str(IrAnalyze ira, IrInstruction *value) {	...	@@ -10452,7 +10406,9 @@ static Buf ir_resolve_str(IrAnalyze ira, IrInstruction *value) {
10452	if (type_is_invalid(value->value.type))	10406	if (type_is_invalid(value->value.type))
10453	return nullptr;	10407	return nullptr;
10454		10408
10455	TypeTableEntry *ptr_type = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true);	10409	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, ira->codegen->builtin_types.entry_u8,
		10410	true, false, PtrLenUnknown,
		10411	get_abi_alignment(ira->codegen, ira->codegen->builtin_types.entry_u8), 0, 0);
10456	TypeTableEntry *str_type = get_slice_type(ira->codegen, ptr_type);	10412	TypeTableEntry *str_type = get_slice_type(ira->codegen, ptr_type);
10457	IrInstruction *casted_value = ir_implicit_cast(ira, value, str_type);	10413	IrInstruction *casted_value = ir_implicit_cast(ira, value, str_type);
10458	if (type_is_invalid(casted_value->value.type))	10414	if (type_is_invalid(casted_value->value.type))
...	@@ -10647,7 +10603,7 @@ static TypeTableEntry ir_analyze_bin_op_cmp(IrAnalyze ira, IrInstructionBinOp	...	@@ -10647,7 +10603,7 @@ static TypeTableEntry ir_analyze_bin_op_cmp(IrAnalyze ira, IrInstructionBinOp
10647	return ira->codegen->builtin_types.entry_invalid;	10603	return ira->codegen->builtin_types.entry_invalid;
10648	}	10604	}
10649		10605
10650	if (!resolve_inferred_error_set(ira, intersect_type, source_node)) {	10606	if (!resolve_inferred_error_set(ira->codegen, intersect_type, source_node)) {
10651	return ira->codegen->builtin_types.entry_invalid;	10607	return ira->codegen->builtin_types.entry_invalid;
10652	}	10608	}
10653		10609
...	@@ -11107,11 +11063,27 @@ static TypeTableEntry ir_analyze_bit_shift(IrAnalyze ira, IrInstructionBinOp *	...	@@ -11107,11 +11063,27 @@ static TypeTableEntry ir_analyze_bit_shift(IrAnalyze ira, IrInstructionBinOp *
11107	static TypeTableEntry ir_analyze_bin_op_math(IrAnalyze ira, IrInstructionBinOp *bin_op_instruction) {	11063	static TypeTableEntry ir_analyze_bin_op_math(IrAnalyze ira, IrInstructionBinOp *bin_op_instruction) {
11108	IrInstruction *op1 = bin_op_instruction->op1->other;	11064	IrInstruction *op1 = bin_op_instruction->op1->other;
11109	IrInstruction *op2 = bin_op_instruction->op2->other;	11065	IrInstruction *op2 = bin_op_instruction->op2->other;
		11066	IrBinOp op_id = bin_op_instruction->op_id;
		11067
		11068	// look for pointer math
		11069	if (op1->value.type->id == TypeTableEntryIdPointer && op1->value.type->data.pointer.ptr_len == PtrLenUnknown &&
		11070	(op_id == IrBinOpAdd \|\| op_id == IrBinOpSub))
		11071	{
		11072	IrInstruction *casted_op2 = ir_implicit_cast(ira, op2, ira->codegen->builtin_types.entry_usize);
		11073	if (casted_op2 == ira->codegen->invalid_instruction)
		11074	return ira->codegen->builtin_types.entry_invalid;
		11075
		11076	IrInstruction *result = ir_build_bin_op(&ira->new_irb, bin_op_instruction->base.scope,
		11077	bin_op_instruction->base.source_node, op_id, op1, casted_op2, true);
		11078	result->value.type = op1->value.type;
		11079	ir_link_new_instruction(result, &bin_op_instruction->base);
		11080	return result->value.type;
		11081	}
		11082
11110	IrInstruction *instructions[] = {op1, op2};	11083	IrInstruction *instructions[] = {op1, op2};
11111	TypeTableEntry *resolved_type = ir_resolve_peer_types(ira, bin_op_instruction->base.source_node, nullptr, instructions, 2);	11084	TypeTableEntry *resolved_type = ir_resolve_peer_types(ira, bin_op_instruction->base.source_node, nullptr, instructions, 2);
11112	if (type_is_invalid(resolved_type))	11085	if (type_is_invalid(resolved_type))
11113	return resolved_type;	11086	return resolved_type;
11114	IrBinOp op_id = bin_op_instruction->op_id;
11115		11087
11116	bool is_int = resolved_type->id == TypeTableEntryIdInt \|\| resolved_type->id == TypeTableEntryIdNumLitInt;	11088	bool is_int = resolved_type->id == TypeTableEntryIdInt \|\| resolved_type->id == TypeTableEntryIdNumLitInt;
11117	bool is_float = resolved_type->id == TypeTableEntryIdFloat \|\| resolved_type->id == TypeTableEntryIdNumLitFloat;	11089	bool is_float = resolved_type->id == TypeTableEntryIdFloat \|\| resolved_type->id == TypeTableEntryIdNumLitFloat;
...	@@ -11384,7 +11356,8 @@ static TypeTableEntry ir_analyze_array_cat(IrAnalyze ira, IrInstructionBinOp *	...	@@ -11384,7 +11356,8 @@ static TypeTableEntry ir_analyze_array_cat(IrAnalyze ira, IrInstructionBinOp *
11384		11356
11385	out_array_val = out_val;	11357	out_array_val = out_val;
11386	} else if (is_slice(op1_type) \|\| is_slice(op2_type)) {	11358	} else if (is_slice(op1_type) \|\| is_slice(op2_type)) {
11387	TypeTableEntry *ptr_type = get_pointer_to_type(ira->codegen, child_type, true);	11359	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, child_type,
		11360	true, false, PtrLenUnknown, get_abi_alignment(ira->codegen, child_type), 0, 0);
11388	result_type = get_slice_type(ira->codegen, ptr_type);	11361	result_type = get_slice_type(ira->codegen, ptr_type);
11389	out_array_val = create_const_vals(1);	11362	out_array_val = create_const_vals(1);
11390	out_array_val->special = ConstValSpecialStatic;	11363	out_array_val->special = ConstValSpecialStatic;
...	@@ -11404,7 +11377,9 @@ static TypeTableEntry ir_analyze_array_cat(IrAnalyze ira, IrInstructionBinOp *	...	@@ -11404,7 +11377,9 @@ static TypeTableEntry ir_analyze_array_cat(IrAnalyze ira, IrInstructionBinOp *
11404	} else {	11377	} else {
11405	new_len += 1; // null byte	11378	new_len += 1; // null byte
11406		11379
11407	result_type = get_pointer_to_type(ira->codegen, child_type, true);	11380	// TODO make this `[]null T` instead of `[]T`
		11381	result_type = get_pointer_to_type_extra(ira->codegen, child_type, true, false,
		11382	PtrLenUnknown, get_abi_alignment(ira->codegen, child_type), 0, 0);
11408		11383
11409	out_array_val = create_const_vals(1);	11384	out_array_val = create_const_vals(1);
11410	out_array_val->special = ConstValSpecialStatic;	11385	out_array_val->special = ConstValSpecialStatic;
...	@@ -11503,11 +11478,11 @@ static TypeTableEntry ir_analyze_merge_error_sets(IrAnalyze ira, IrInstruction	...	@@ -11503,11 +11478,11 @@ static TypeTableEntry ir_analyze_merge_error_sets(IrAnalyze ira, IrInstruction
11503	return ira->codegen->builtin_types.entry_type;	11478	return ira->codegen->builtin_types.entry_type;
11504	}	11479	}
11505		11480
11506	if (!resolve_inferred_error_set(ira, op1_type, instruction->op1->other->source_node)) {	11481	if (!resolve_inferred_error_set(ira->codegen, op1_type, instruction->op1->other->source_node)) {
11507	return ira->codegen->builtin_types.entry_invalid;	11482	return ira->codegen->builtin_types.entry_invalid;
11508	}	11483	}
11509		11484
11510	if (!resolve_inferred_error_set(ira, op2_type, instruction->op2->other->source_node)) {	11485	if (!resolve_inferred_error_set(ira->codegen, op2_type, instruction->op2->other->source_node)) {
11511	return ira->codegen->builtin_types.entry_invalid;	11486	return ira->codegen->builtin_types.entry_invalid;
11512	}	11487	}
11513		11488
...	@@ -11990,7 +11965,7 @@ IrInstruction ir_get_implicit_allocator(IrAnalyze ira, IrInstruction *source_i	...	@@ -11990,7 +11965,7 @@ IrInstruction ir_get_implicit_allocator(IrAnalyze ira, IrInstruction *source_i
11990	{	11965	{
11991	VariableTableEntry *coro_allocator_var = ira->old_irb.exec->coro_allocator_var;	11966	VariableTableEntry *coro_allocator_var = ira->old_irb.exec->coro_allocator_var;
11992	assert(coro_allocator_var != nullptr);	11967	assert(coro_allocator_var != nullptr);
11993	IrInstruction *var_ptr_inst = ir_get_var_ptr(ira, source_instr, coro_allocator_var, true, false);	11968	IrInstruction *var_ptr_inst = ir_get_var_ptr(ira, source_instr, coro_allocator_var);
11994	IrInstruction *result = ir_get_deref(ira, source_instr, var_ptr_inst);	11969	IrInstruction *result = ir_get_deref(ira, source_instr, var_ptr_inst);
11995	assert(result->value.type != nullptr);	11970	assert(result->value.type != nullptr);
11996	return result;	11971	return result;
...	@@ -12171,7 +12146,7 @@ static VariableTableEntry get_fn_var_by_index(FnTableEntry fn_entry, size_t in	...	@@ -12171,7 +12146,7 @@ static VariableTableEntry get_fn_var_by_index(FnTableEntry fn_entry, size_t in
12171	}	12146	}
12172		12147
12173	static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction *instruction,	12148	static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction *instruction,
12174	VariableTableEntry *var, bool is_const_ptr, bool is_volatile_ptr)	12149	VariableTableEntry *var)
12175	{	12150	{
12176	if (var->mem_slot_index != SIZE_MAX && var->owner_exec->analysis == nullptr) {	12151	if (var->mem_slot_index != SIZE_MAX && var->owner_exec->analysis == nullptr) {
12177	assert(ira->codegen->errors.length != 0);	12152	assert(ira->codegen->errors.length != 0);
...	@@ -12197,8 +12172,8 @@ static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction *instruction,	...	@@ -12197,8 +12172,8 @@ static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction *instruction,
12197	}	12172	}
12198	}	12173	}
12199		12174
12200	bool is_const = (var->value->type->id == TypeTableEntryIdMetaType) ? is_const_ptr : var->src_is_const;	12175	bool is_const = var->src_is_const;
12201	bool is_volatile = (var->value->type->id == TypeTableEntryIdMetaType) ? is_volatile_ptr : false;	12176	bool is_volatile = false;
12202	if (mem_slot != nullptr) {	12177	if (mem_slot != nullptr) {
12203	switch (mem_slot->special) {	12178	switch (mem_slot->special) {
12204	case ConstValSpecialRuntime:	12179	case ConstValSpecialRuntime:
...	@@ -12224,9 +12199,9 @@ static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction *instruction,	...	@@ -12224,9 +12199,9 @@ static IrInstruction ir_get_var_ptr(IrAnalyze ira, IrInstruction *instruction,
12224	no_mem_slot:	12199	no_mem_slot:
12225		12200
12226	IrInstruction *var_ptr_instruction = ir_build_var_ptr(&ira->new_irb,	12201	IrInstruction *var_ptr_instruction = ir_build_var_ptr(&ira->new_irb,
12227	instruction->scope, instruction->source_node, var, is_const, is_volatile);	12202	instruction->scope, instruction->source_node, var);
12228	var_ptr_instruction->value.type = get_pointer_to_type_extra(ira->codegen, var->value->type,	12203	var_ptr_instruction->value.type = get_pointer_to_type_extra(ira->codegen, var->value->type,
12229	var->src_is_const, is_volatile, var->align_bytes, 0, 0);	12204	var->src_is_const, is_volatile, PtrLenSingle, var->align_bytes, 0, 0);
12230	type_ensure_zero_bits_known(ira->codegen, var->value->type);	12205	type_ensure_zero_bits_known(ira->codegen, var->value->type);
12231		12206
12232	bool in_fn_scope = (scope_fn_entry(var->parent_scope) != nullptr);	12207	bool in_fn_scope = (scope_fn_entry(var->parent_scope) != nullptr);
...	@@ -12405,7 +12380,9 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal	...	@@ -12405,7 +12380,9 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12405		12380
12406	IrInstruction *casted_new_stack = nullptr;	12381	IrInstruction *casted_new_stack = nullptr;
12407	if (call_instruction->new_stack != nullptr) {	12382	if (call_instruction->new_stack != nullptr) {
12408	TypeTableEntry *u8_ptr = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, false);	12383	TypeTableEntry *u8_ptr = get_pointer_to_type_extra(ira->codegen, ira->codegen->builtin_types.entry_u8,
		12384	false, false, PtrLenUnknown,
		12385	get_abi_alignment(ira->codegen, ira->codegen->builtin_types.entry_u8), 0, 0);
12409	TypeTableEntry *u8_slice = get_slice_type(ira->codegen, u8_ptr);	12386	TypeTableEntry *u8_slice = get_slice_type(ira->codegen, u8_ptr);
12410	IrInstruction *new_stack = call_instruction->new_stack->other;	12387	IrInstruction *new_stack = call_instruction->new_stack->other;
12411	if (type_is_invalid(new_stack->value.type))	12388	if (type_is_invalid(new_stack->value.type))
...	@@ -12510,7 +12487,7 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal	...	@@ -12510,7 +12487,7 @@ static TypeTableEntry ir_analyze_fn_call(IrAnalyze ira, IrInstructionCall *cal
12510	buf_sprintf("compiler bug: var args can't handle void. https://github.com/ziglang/zig/issues/557"));	12487	buf_sprintf("compiler bug: var args can't handle void. https://github.com/ziglang/zig/issues/557"));
12511	return ira->codegen->builtin_types.entry_invalid;	12488	return ira->codegen->builtin_types.entry_invalid;
12512	}	12489	}
12513	IrInstruction *arg_var_ptr_inst = ir_get_var_ptr(ira, arg, arg_var, true, false);	12490	IrInstruction *arg_var_ptr_inst = ir_get_var_ptr(ira, arg, arg_var);
12514	if (type_is_invalid(arg_var_ptr_inst->value.type))	12491	if (type_is_invalid(arg_var_ptr_inst->value.type))
12515	return ira->codegen->builtin_types.entry_invalid;	12492	return ira->codegen->builtin_types.entry_invalid;
12516		12493
...	@@ -12833,6 +12810,10 @@ static TypeTableEntry ir_analyze_maybe(IrAnalyze ira, IrInstructionUnOp *un_op	...	@@ -12833,6 +12810,10 @@ static TypeTableEntry ir_analyze_maybe(IrAnalyze ira, IrInstructionUnOp *un_op
12833	TypeTableEntry *type_entry = ir_resolve_type(ira, value);	12810	TypeTableEntry *type_entry = ir_resolve_type(ira, value);
12834	if (type_is_invalid(type_entry))	12811	if (type_is_invalid(type_entry))
12835	return ira->codegen->builtin_types.entry_invalid;	12812	return ira->codegen->builtin_types.entry_invalid;
		12813	ensure_complete_type(ira->codegen, type_entry);
		12814	if (type_is_invalid(type_entry))
		12815	return ira->codegen->builtin_types.entry_invalid;
		12816
12836	switch (type_entry->id) {	12817	switch (type_entry->id) {
12837	case TypeTableEntryIdInvalid:	12818	case TypeTableEntryIdInvalid:
12838	zig_unreachable();	12819	zig_unreachable();
...	@@ -13144,17 +13125,16 @@ static TypeTableEntry ir_analyze_instruction_phi(IrAnalyze ira, IrInstructionP	...	@@ -13144,17 +13125,16 @@ static TypeTableEntry ir_analyze_instruction_phi(IrAnalyze ira, IrInstructionP
13144	}	13125	}
13145		13126
13146	static TypeTableEntry ir_analyze_var_ptr(IrAnalyze ira, IrInstruction *instruction,	13127	static TypeTableEntry ir_analyze_var_ptr(IrAnalyze ira, IrInstruction *instruction,
13147	VariableTableEntry *var, bool is_const_ptr, bool is_volatile_ptr)	13128	VariableTableEntry *var)
13148	{	13129	{
13149	IrInstruction *result = ir_get_var_ptr(ira, instruction, var, is_const_ptr, is_volatile_ptr);	13130	IrInstruction *result = ir_get_var_ptr(ira, instruction, var);
13150	ir_link_new_instruction(result, instruction);	13131	ir_link_new_instruction(result, instruction);
13151	return result->value.type;	13132	return result->value.type;
13152	}	13133	}
13153		13134
13154	static TypeTableEntry ir_analyze_instruction_var_ptr(IrAnalyze ira, IrInstructionVarPtr *var_ptr_instruction) {	13135	static TypeTableEntry ir_analyze_instruction_var_ptr(IrAnalyze ira, IrInstructionVarPtr *var_ptr_instruction) {
13155	VariableTableEntry *var = var_ptr_instruction->var;	13136	VariableTableEntry *var = var_ptr_instruction->var;
13156	return ir_analyze_var_ptr(ira, &var_ptr_instruction->base, var, var_ptr_instruction->is_const,	13137	return ir_analyze_var_ptr(ira, &var_ptr_instruction->base, var);
13157	var_ptr_instruction->is_volatile);
13158	}	13138	}
13159		13139
13160	static TypeTableEntry adjust_ptr_align(CodeGen g, TypeTableEntry *ptr_type, uint32_t new_align) {	13140	static TypeTableEntry adjust_ptr_align(CodeGen g, TypeTableEntry *ptr_type, uint32_t new_align) {
...	@@ -13162,10 +13142,21 @@ static TypeTableEntry adjust_ptr_align(CodeGen g, TypeTableEntry *ptr_type, ui	...	@@ -13162,10 +13142,21 @@ static TypeTableEntry adjust_ptr_align(CodeGen g, TypeTableEntry *ptr_type, ui
13162	return get_pointer_to_type_extra(g,	13142	return get_pointer_to_type_extra(g,
13163	ptr_type->data.pointer.child_type,	13143	ptr_type->data.pointer.child_type,
13164	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,	13144	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
		13145	ptr_type->data.pointer.ptr_len,
13165	new_align,	13146	new_align,
13166	ptr_type->data.pointer.bit_offset, ptr_type->data.pointer.unaligned_bit_count);	13147	ptr_type->data.pointer.bit_offset, ptr_type->data.pointer.unaligned_bit_count);
13167	}	13148	}
13168		13149
		13150	static TypeTableEntry adjust_ptr_len(CodeGen g, TypeTableEntry *ptr_type, PtrLen ptr_len) {
		13151	assert(ptr_type->id == TypeTableEntryIdPointer);
		13152	return get_pointer_to_type_extra(g,
		13153	ptr_type->data.pointer.child_type,
		13154	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
		13155	ptr_len,
		13156	ptr_type->data.pointer.alignment,
		13157	ptr_type->data.pointer.bit_offset, ptr_type->data.pointer.unaligned_bit_count);
		13158	}
		13159
13169	static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstructionElemPtr *elem_ptr_instruction) {	13160	static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstructionElemPtr *elem_ptr_instruction) {
13170	IrInstruction *array_ptr = elem_ptr_instruction->array_ptr->other;	13161	IrInstruction *array_ptr = elem_ptr_instruction->array_ptr->other;
13171	if (type_is_invalid(array_ptr->value.type))	13162	if (type_is_invalid(array_ptr->value.type))
...	@@ -13176,11 +13167,6 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc	...	@@ -13176,11 +13167,6 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc
13176	return ira->codegen->builtin_types.entry_invalid;	13167	return ira->codegen->builtin_types.entry_invalid;
13177		13168
13178	TypeTableEntry *ptr_type = array_ptr->value.type;	13169	TypeTableEntry *ptr_type = array_ptr->value.type;
13179	if (ptr_type->id == TypeTableEntryIdMetaType) {
13180	ir_add_error(ira, &elem_ptr_instruction->base,
13181	buf_sprintf("array access of non-array type '%s'", buf_ptr(&ptr_type->name)));
13182	return ira->codegen->builtin_types.entry_invalid;
13183	}
13184	assert(ptr_type->id == TypeTableEntryIdPointer);	13170	assert(ptr_type->id == TypeTableEntryIdPointer);
13185		13171
13186	TypeTableEntry *array_type = ptr_type->data.pointer.child_type;	13172	TypeTableEntry *array_type = ptr_type->data.pointer.child_type;
...	@@ -13201,6 +13187,7 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc	...	@@ -13201,6 +13187,7 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc
13201	if (ptr_type->data.pointer.unaligned_bit_count == 0) {	13187	if (ptr_type->data.pointer.unaligned_bit_count == 0) {
13202	return_type = get_pointer_to_type_extra(ira->codegen, child_type,	13188	return_type = get_pointer_to_type_extra(ira->codegen, child_type,
13203	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,	13189	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
		13190	elem_ptr_instruction->ptr_len,
13204	ptr_type->data.pointer.alignment, 0, 0);	13191	ptr_type->data.pointer.alignment, 0, 0);
13205	} else {	13192	} else {
13206	uint64_t elem_val_scalar;	13193	uint64_t elem_val_scalar;
...	@@ -13212,12 +13199,19 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc	...	@@ -13212,12 +13199,19 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc
13212		13199
13213	return_type = get_pointer_to_type_extra(ira->codegen, child_type,	13200	return_type = get_pointer_to_type_extra(ira->codegen, child_type,
13214	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,	13201	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
		13202	elem_ptr_instruction->ptr_len,
13215	1, (uint32_t)bit_offset, (uint32_t)bit_width);	13203	1, (uint32_t)bit_offset, (uint32_t)bit_width);
13216	}	13204	}
13217	} else if (array_type->id == TypeTableEntryIdPointer) {	13205	} else if (array_type->id == TypeTableEntryIdPointer) {
13218	return_type = array_type;	13206	if (array_type->data.pointer.ptr_len == PtrLenSingle) {
		13207	ir_add_error_node(ira, elem_ptr_instruction->base.source_node,
		13208	buf_sprintf("indexing not allowed on pointer to single item"));
		13209	return ira->codegen->builtin_types.entry_invalid;
		13210	}
		13211	return_type = adjust_ptr_len(ira->codegen, array_type, elem_ptr_instruction->ptr_len);
13219	} else if (is_slice(array_type)) {	13212	} else if (is_slice(array_type)) {
13220	return_type = array_type->data.structure.fields[slice_ptr_index].type_entry;	13213	return_type = adjust_ptr_len(ira->codegen, array_type->data.structure.fields[slice_ptr_index].type_entry,
		13214	elem_ptr_instruction->ptr_len);
13221	} else if (array_type->id == TypeTableEntryIdArgTuple) {	13215	} else if (array_type->id == TypeTableEntryIdArgTuple) {
13222	ConstExprValue *ptr_val = ir_resolve_const(ira, array_ptr, UndefBad);	13216	ConstExprValue *ptr_val = ir_resolve_const(ira, array_ptr, UndefBad);
13223	if (!ptr_val)	13217	if (!ptr_val)
...	@@ -13242,8 +13236,7 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc	...	@@ -13242,8 +13236,7 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc
13242	bool is_const = true;	13236	bool is_const = true;
13243	bool is_volatile = false;	13237	bool is_volatile = false;
13244	if (var) {	13238	if (var) {
13245	return ir_analyze_var_ptr(ira, &elem_ptr_instruction->base, var,	13239	return ir_analyze_var_ptr(ira, &elem_ptr_instruction->base, var);
13246	is_const, is_volatile);
13247	} else {	13240	} else {
13248	return ir_analyze_const_ptr(ira, &elem_ptr_instruction->base, &ira->codegen->const_void_val,	13241	return ir_analyze_const_ptr(ira, &elem_ptr_instruction->base, &ira->codegen->const_void_val,
13249	ira->codegen->builtin_types.entry_void, ConstPtrMutComptimeConst, is_const, is_volatile);	13242	ira->codegen->builtin_types.entry_void, ConstPtrMutComptimeConst, is_const, is_volatile);
...	@@ -13261,6 +13254,9 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc	...	@@ -13261,6 +13254,9 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc
13261		13254
13262	bool safety_check_on = elem_ptr_instruction->safety_check_on;	13255	bool safety_check_on = elem_ptr_instruction->safety_check_on;
13263	ensure_complete_type(ira->codegen, return_type->data.pointer.child_type);	13256	ensure_complete_type(ira->codegen, return_type->data.pointer.child_type);
		13257	if (type_is_invalid(return_type->data.pointer.child_type))
		13258	return ira->codegen->builtin_types.entry_invalid;
		13259
13264	uint64_t elem_size = type_size(ira->codegen, return_type->data.pointer.child_type);	13260	uint64_t elem_size = type_size(ira->codegen, return_type->data.pointer.child_type);
13265	uint64_t abi_align = get_abi_alignment(ira->codegen, return_type->data.pointer.child_type);	13261	uint64_t abi_align = get_abi_alignment(ira->codegen, return_type->data.pointer.child_type);
13266	uint64_t ptr_align = return_type->data.pointer.alignment;	13262	uint64_t ptr_align = return_type->data.pointer.alignment;
...	@@ -13357,8 +13353,10 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc	...	@@ -13357,8 +13353,10 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc
13357	} else if (is_slice(array_type)) {	13353	} else if (is_slice(array_type)) {
13358	ConstExprValue *ptr_field = &array_ptr_val->data.x_struct.fields[slice_ptr_index];	13354	ConstExprValue *ptr_field = &array_ptr_val->data.x_struct.fields[slice_ptr_index];
13359	if (ptr_field->data.x_ptr.special == ConstPtrSpecialHardCodedAddr) {	13355	if (ptr_field->data.x_ptr.special == ConstPtrSpecialHardCodedAddr) {
13360	ir_build_elem_ptr_from(&ira->new_irb, &elem_ptr_instruction->base, array_ptr,	13356	IrInstruction *result = ir_build_elem_ptr(&ira->new_irb, elem_ptr_instruction->base.scope, elem_ptr_instruction->base.source_node,
13361	casted_elem_index, false);	13357	array_ptr, casted_elem_index, false, elem_ptr_instruction->ptr_len);
		13358	result->value.type = return_type;
		13359	ir_link_new_instruction(result, &elem_ptr_instruction->base);
13362	return return_type;	13360	return return_type;
13363	}	13361	}
13364	ConstExprValue *len_field = &array_ptr_val->data.x_struct.fields[slice_len_index];	13362	ConstExprValue *len_field = &array_ptr_val->data.x_struct.fields[slice_len_index];
...	@@ -13426,8 +13424,10 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc	...	@@ -13426,8 +13424,10 @@ static TypeTableEntry ir_analyze_instruction_elem_ptr(IrAnalyze ira, IrInstruc
13426	}	13424	}
13427	}	13425	}
13428		13426
13429	ir_build_elem_ptr_from(&ira->new_irb, &elem_ptr_instruction->base, array_ptr,	13427	IrInstruction *result = ir_build_elem_ptr(&ira->new_irb, elem_ptr_instruction->base.scope, elem_ptr_instruction->base.source_node,
13430	casted_elem_index, safety_check_on);	13428	array_ptr, casted_elem_index, safety_check_on, elem_ptr_instruction->ptr_len);
		13429	result->value.type = return_type;
		13430	ir_link_new_instruction(result, &elem_ptr_instruction->base);
13431	return return_type;	13431	return return_type;
13432	}	13432	}
13433		13433
...	@@ -13502,7 +13502,7 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_	...	@@ -13502,7 +13502,7 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_
13502	return ira->codegen->invalid_instruction;	13502	return ira->codegen->invalid_instruction;
13503	ConstExprValue *field_val = &struct_val->data.x_struct.fields[field->src_index];	13503	ConstExprValue *field_val = &struct_val->data.x_struct.fields[field->src_index];
13504	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, field_val->type,	13504	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, field_val->type,
13505	is_const, is_volatile, align_bytes,	13505	is_const, is_volatile, PtrLenSingle, align_bytes,
13506	(uint32_t)(ptr_bit_offset + field->packed_bits_offset),	13506	(uint32_t)(ptr_bit_offset + field->packed_bits_offset),
13507	(uint32_t)unaligned_bit_count_for_result_type);	13507	(uint32_t)unaligned_bit_count_for_result_type);
13508	IrInstruction *result = ir_get_const(ira, source_instr);	13508	IrInstruction *result = ir_get_const(ira, source_instr);
...	@@ -13518,6 +13518,7 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_	...	@@ -13518,6 +13518,7 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_
13518	IrInstruction *result = ir_build_struct_field_ptr(&ira->new_irb, source_instr->scope, source_instr->source_node,	13518	IrInstruction *result = ir_build_struct_field_ptr(&ira->new_irb, source_instr->scope, source_instr->source_node,
13519	container_ptr, field);	13519	container_ptr, field);
13520	result->value.type = get_pointer_to_type_extra(ira->codegen, field->type_entry, is_const, is_volatile,	13520	result->value.type = get_pointer_to_type_extra(ira->codegen, field->type_entry, is_const, is_volatile,
		13521	PtrLenSingle,
13521	align_bytes,	13522	align_bytes,
13522	(uint32_t)(ptr_bit_offset + field->packed_bits_offset),	13523	(uint32_t)(ptr_bit_offset + field->packed_bits_offset),
13523	(uint32_t)unaligned_bit_count_for_result_type);	13524	(uint32_t)unaligned_bit_count_for_result_type);
...	@@ -13564,7 +13565,9 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_	...	@@ -13564,7 +13565,9 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_
13564	payload_val->type = field_type;	13565	payload_val->type = field_type;
13565	}	13566	}
13566		13567
13567	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, field_type, is_const, is_volatile,	13568	TypeTableEntry *ptr_type = get_pointer_to_type_extra(ira->codegen, field_type,
		13569	is_const, is_volatile,
		13570	PtrLenSingle,
13568	get_abi_alignment(ira->codegen, field_type), 0, 0);	13571	get_abi_alignment(ira->codegen, field_type), 0, 0);
13569		13572
13570	IrInstruction *result = ir_get_const(ira, source_instr);	13573	IrInstruction *result = ir_get_const(ira, source_instr);
...	@@ -13579,7 +13582,7 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_	...	@@ -13579,7 +13582,7 @@ static IrInstruction ir_analyze_container_field_ptr(IrAnalyze ira, Buf *field_
13579		13582
13580	IrInstruction *result = ir_build_union_field_ptr(&ira->new_irb, source_instr->scope, source_instr->source_node, container_ptr, field);	13583	IrInstruction *result = ir_build_union_field_ptr(&ira->new_irb, source_instr->scope, source_instr->source_node, container_ptr, field);
13581	result->value.type = get_pointer_to_type_extra(ira->codegen, field->type_entry, is_const, is_volatile,	13584	result->value.type = get_pointer_to_type_extra(ira->codegen, field->type_entry, is_const, is_volatile,
13582	get_abi_alignment(ira->codegen, field->type_entry), 0, 0);	13585	PtrLenSingle, get_abi_alignment(ira->codegen, field->type_entry), 0, 0);
13583	return result;	13586	return result;
13584	} else {	13587	} else {
13585	return ir_analyze_container_member_access_inner(ira, bare_type, field_name,	13588	return ir_analyze_container_member_access_inner(ira, bare_type, field_name,
...	@@ -13627,7 +13630,7 @@ static TypeTableEntry ir_analyze_decl_ref(IrAnalyze ira, IrInstruction *source	...	@@ -13627,7 +13630,7 @@ static TypeTableEntry ir_analyze_decl_ref(IrAnalyze ira, IrInstruction *source
13627	add_link_lib_symbol(ira, tld_var->extern_lib_name, &var->name, source_instruction->source_node);	13630	add_link_lib_symbol(ira, tld_var->extern_lib_name, &var->name, source_instruction->source_node);
13628	}	13631	}
13629		13632
13630	return ir_analyze_var_ptr(ira, source_instruction, var, false, false);	13633	return ir_analyze_var_ptr(ira, source_instruction, var);
13631	}	13634	}
13632	case TldIdFn:	13635	case TldIdFn:
13633	{	13636	{
...	@@ -13676,14 +13679,8 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru	...	@@ -13676,14 +13679,8 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru
13676	if (type_is_invalid(container_ptr->value.type))	13679	if (type_is_invalid(container_ptr->value.type))
13677	return ira->codegen->builtin_types.entry_invalid;	13680	return ira->codegen->builtin_types.entry_invalid;
13678		13681
13679	TypeTableEntry *container_type;	13682	TypeTableEntry *container_type = container_ptr->value.type->data.pointer.child_type;
13680	if (container_ptr->value.type->id == TypeTableEntryIdPointer) {	13683	assert(container_ptr->value.type->id == TypeTableEntryIdPointer);
13681	container_type = container_ptr->value.type->data.pointer.child_type;
13682	} else if (container_ptr->value.type->id == TypeTableEntryIdMetaType) {
13683	container_type = container_ptr->value.type;
13684	} else {
13685	zig_unreachable();
13686	}
13687		13684
13688	Buf *field_name = field_ptr_instruction->field_name_buffer;	13685	Buf *field_name = field_ptr_instruction->field_name_buffer;
13689	if (!field_name) {	13686	if (!field_name) {
...	@@ -13756,17 +13753,9 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru	...	@@ -13756,17 +13753,9 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru
13756	if (!container_ptr_val)	13753	if (!container_ptr_val)
13757	return ira->codegen->builtin_types.entry_invalid;	13754	return ira->codegen->builtin_types.entry_invalid;
13758		13755
13759	TypeTableEntry *child_type;	13756	assert(container_ptr->value.type->id == TypeTableEntryIdPointer);
13760	if (container_ptr->value.type->id == TypeTableEntryIdMetaType) {	13757	ConstExprValue *child_val = const_ptr_pointee(ira->codegen, container_ptr_val);
13761	TypeTableEntry *ptr_type = container_ptr_val->data.x_type;	13758	TypeTableEntry *child_type = child_val->data.x_type;
13762	assert(ptr_type->id == TypeTableEntryIdPointer);
13763	child_type = ptr_type->data.pointer.child_type;
13764	} else if (container_ptr->value.type->id == TypeTableEntryIdPointer) {
13765	ConstExprValue *child_val = const_ptr_pointee(ira->codegen, container_ptr_val);
13766	child_type = child_val->data.x_type;
13767	} else {
13768	zig_unreachable();
13769	}
13770		13759
13771	if (type_is_invalid(child_type)) {	13760	if (type_is_invalid(child_type)) {
13772	return ira->codegen->builtin_types.entry_invalid;	13761	return ira->codegen->builtin_types.entry_invalid;
...	@@ -13784,7 +13773,7 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru	...	@@ -13784,7 +13773,7 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru
13784	}	13773	}
13785	if (child_type->id == TypeTableEntryIdEnum) {	13774	if (child_type->id == TypeTableEntryIdEnum) {
13786	ensure_complete_type(ira->codegen, child_type);	13775	ensure_complete_type(ira->codegen, child_type);
13787	if (child_type->data.enumeration.is_invalid)	13776	if (type_is_invalid(child_type))
13788	return ira->codegen->builtin_types.entry_invalid;	13777	return ira->codegen->builtin_types.entry_invalid;
13789		13778
13790	TypeEnumField *field = find_enum_type_field(child_type, field_name);	13779	TypeEnumField *field = find_enum_type_field(child_type, field_name);
...	@@ -13851,7 +13840,7 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru	...	@@ -13851,7 +13840,7 @@ static TypeTableEntry ir_analyze_instruction_field_ptr(IrAnalyze ira, IrInstru
13851	}	13840	}
13852	err_set_type = err_entry->set_with_only_this_in_it;	13841	err_set_type = err_entry->set_with_only_this_in_it;
13853	} else {	13842	} else {
13854	if (!resolve_inferred_error_set(ira, child_type, field_ptr_instruction->base.source_node)) {	13843	if (!resolve_inferred_error_set(ira->codegen, child_type, field_ptr_instruction->base.source_node)) {
13855	return ira->codegen->builtin_types.entry_invalid;	13844	return ira->codegen->builtin_types.entry_invalid;
13856	}	13845	}
13857	err_entry = find_err_table_entry(child_type, field_name);	13846	err_entry = find_err_table_entry(child_type, field_name);
...	@@ -14186,7 +14175,7 @@ static TypeTableEntry ir_analyze_instruction_to_ptr_type(IrAnalyze ira,	...	@@ -14186,7 +14175,7 @@ static TypeTableEntry ir_analyze_instruction_to_ptr_type(IrAnalyze ira,
14186	if (type_entry->id == TypeTableEntryIdArray) {	14175	if (type_entry->id == TypeTableEntryIdArray) {
14187	ptr_type = get_pointer_to_type(ira->codegen, type_entry->data.array.child_type, false);	14176	ptr_type = get_pointer_to_type(ira->codegen, type_entry->data.array.child_type, false);
14188	} else if (is_slice(type_entry)) {	14177	} else if (is_slice(type_entry)) {
14189	ptr_type = type_entry->data.structure.fields[0].type_entry;	14178	ptr_type = adjust_ptr_len(ira->codegen, type_entry->data.structure.fields[0].type_entry, PtrLenSingle);
14190	} else if (type_entry->id == TypeTableEntryIdArgTuple) {	14179	} else if (type_entry->id == TypeTableEntryIdArgTuple) {
14191	ConstExprValue *arg_tuple_val = ir_resolve_const(ira, value, UndefBad);	14180	ConstExprValue *arg_tuple_val = ir_resolve_const(ira, value, UndefBad);
14192	if (!arg_tuple_val)	14181	if (!arg_tuple_val)
...	@@ -14434,7 +14423,7 @@ static TypeTableEntry ir_analyze_instruction_slice_type(IrAnalyze ira,	...	@@ -14434,7 +14423,7 @@ static TypeTableEntry ir_analyze_instruction_slice_type(IrAnalyze ira,
14434	{	14423	{
14435	type_ensure_zero_bits_known(ira->codegen, child_type);	14424	type_ensure_zero_bits_known(ira->codegen, child_type);
14436	TypeTableEntry *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, child_type,	14425	TypeTableEntry *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, child_type,
14437	is_const, is_volatile, align_bytes, 0, 0);	14426	is_const, is_volatile, PtrLenUnknown, align_bytes, 0, 0);
14438	TypeTableEntry *result_type = get_slice_type(ira->codegen, slice_ptr_type);	14427	TypeTableEntry *result_type = get_slice_type(ira->codegen, slice_ptr_type);
14439	ConstExprValue *out_val = ir_build_const_from(ira, &slice_type_instruction->base);	14428	ConstExprValue *out_val = ir_build_const_from(ira, &slice_type_instruction->base);
14440	out_val->data.x_type = result_type;	14429	out_val->data.x_type = result_type;
...	@@ -14657,27 +14646,27 @@ static TypeTableEntry ir_analyze_instruction_unwrap_maybe(IrAnalyze ira,	...	@@ -14657,27 +14646,27 @@ static TypeTableEntry ir_analyze_instruction_unwrap_maybe(IrAnalyze ira,
14657	return ira->codegen->builtin_types.entry_invalid;	14646	return ira->codegen->builtin_types.entry_invalid;
14658		14647
14659	TypeTableEntry *ptr_type = value->value.type;	14648	TypeTableEntry *ptr_type = value->value.type;
14660	if (ptr_type->id == TypeTableEntryIdMetaType) {	14649	assert(ptr_type->id == TypeTableEntryIdPointer);
		14650
		14651	TypeTableEntry *type_entry = ptr_type->data.pointer.child_type;
		14652	if (type_is_invalid(type_entry)) {
		14653	return ira->codegen->builtin_types.entry_invalid;
		14654	} else if (type_entry->id == TypeTableEntryIdMetaType) {
14661	// surprise! actually this is just ??T not an unwrap maybe instruction	14655	// surprise! actually this is just ??T not an unwrap maybe instruction
14662	TypeTableEntry *ptr_type_ptr = ir_resolve_type(ira, value);	14656	ConstExprValue *ptr_val = const_ptr_pointee(ira->codegen, &value->value);
14663	assert(ptr_type_ptr->id == TypeTableEntryIdPointer);	14657	assert(ptr_val->type->id == TypeTableEntryIdMetaType);
14664	TypeTableEntry *child_type = ptr_type_ptr->data.pointer.child_type;	14658	TypeTableEntry *child_type = ptr_val->data.x_type;
		14659
14665	type_ensure_zero_bits_known(ira->codegen, child_type);	14660	type_ensure_zero_bits_known(ira->codegen, child_type);
14666	TypeTableEntry *layer1 = get_maybe_type(ira->codegen, child_type);	14661	TypeTableEntry *layer1 = get_maybe_type(ira->codegen, child_type);
14667	TypeTableEntry *layer2 = get_maybe_type(ira->codegen, layer1);	14662	TypeTableEntry *layer2 = get_maybe_type(ira->codegen, layer1);
14668	TypeTableEntry *result_type = get_pointer_to_type(ira->codegen, layer2, true);
14669		14663
14670	IrInstruction *const_instr = ir_build_const_type(&ira->new_irb, unwrap_maybe_instruction->base.scope,	14664	IrInstruction *const_instr = ir_build_const_type(&ira->new_irb, unwrap_maybe_instruction->base.scope,
14671	unwrap_maybe_instruction->base.source_node, result_type);	14665	unwrap_maybe_instruction->base.source_node, layer2);
14672	ir_link_new_instruction(const_instr, &unwrap_maybe_instruction->base);	14666	IrInstruction *result_instr = ir_get_ref(ira, &unwrap_maybe_instruction->base, const_instr,
14673	return const_instr->value.type;	14667	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile);
14674	}	14668	ir_link_new_instruction(result_instr, &unwrap_maybe_instruction->base);
14675		14669	return result_instr->value.type;
14676	assert(ptr_type->id == TypeTableEntryIdPointer);
14677
14678	TypeTableEntry *type_entry = ptr_type->data.pointer.child_type;
14679	if (type_is_invalid(type_entry)) {
14680	return ira->codegen->builtin_types.entry_invalid;
14681	} else if (type_entry->id != TypeTableEntryIdMaybe) {	14670	} else if (type_entry->id != TypeTableEntryIdMaybe) {
14682	ir_add_error_node(ira, unwrap_maybe_instruction->value->source_node,	14671	ir_add_error_node(ira, unwrap_maybe_instruction->value->source_node,
14683	buf_sprintf("expected nullable type, found '%s'", buf_ptr(&type_entry->name)));	14672	buf_sprintf("expected nullable type, found '%s'", buf_ptr(&type_entry->name)));
...	@@ -14686,6 +14675,7 @@ static TypeTableEntry ir_analyze_instruction_unwrap_maybe(IrAnalyze ira,	...	@@ -14686,6 +14675,7 @@ static TypeTableEntry ir_analyze_instruction_unwrap_maybe(IrAnalyze ira,
14686	TypeTableEntry *child_type = type_entry->data.maybe.child_type;	14675	TypeTableEntry *child_type = type_entry->data.maybe.child_type;
14687	TypeTableEntry *result_type = get_pointer_to_type_extra(ira->codegen, child_type,	14676	TypeTableEntry *result_type = get_pointer_to_type_extra(ira->codegen, child_type,
14688	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,	14677	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
		14678	PtrLenSingle,
14689	get_abi_alignment(ira->codegen, child_type), 0, 0);	14679	get_abi_alignment(ira->codegen, child_type), 0, 0);
14690		14680
14691	if (instr_is_comptime(value)) {	14681	if (instr_is_comptime(value)) {
...	@@ -15203,6 +15193,8 @@ static TypeTableEntry ir_analyze_container_init_fields_union(IrAnalyze ira, Ir	...	@@ -15203,6 +15193,8 @@ static TypeTableEntry ir_analyze_container_init_fields_union(IrAnalyze ira, Ir
15203	assert(container_type->id == TypeTableEntryIdUnion);	15193	assert(container_type->id == TypeTableEntryIdUnion);
15204		15194
15205	ensure_complete_type(ira->codegen, container_type);	15195	ensure_complete_type(ira->codegen, container_type);
		15196	if (type_is_invalid(container_type))
		15197	return ira->codegen->builtin_types.entry_invalid;
15206		15198
15207	if (instr_field_count != 1) {	15199	if (instr_field_count != 1) {
15208	ir_add_error(ira, instruction,	15200	ir_add_error(ira, instruction,
...	@@ -15270,6 +15262,8 @@ static TypeTableEntry ir_analyze_container_init_fields(IrAnalyze ira, IrInstru	...	@@ -15270,6 +15262,8 @@ static TypeTableEntry ir_analyze_container_init_fields(IrAnalyze ira, IrInstru
15270	}	15262	}
15271		15263
15272	ensure_complete_type(ira->codegen, container_type);	15264	ensure_complete_type(ira->codegen, container_type);
		15265	if (type_is_invalid(container_type))
		15266	return ira->codegen->builtin_types.entry_invalid;
15273		15267
15274	size_t actual_field_count = container_type->data.structure.src_field_count;	15268	size_t actual_field_count = container_type->data.structure.src_field_count;
15275		15269
...	@@ -15629,7 +15623,8 @@ static TypeTableEntry ir_analyze_instruction_err_name(IrAnalyze ira, IrInstruc	...	@@ -15629,7 +15623,8 @@ static TypeTableEntry ir_analyze_instruction_err_name(IrAnalyze ira, IrInstruc
15629	if (type_is_invalid(casted_value->value.type))	15623	if (type_is_invalid(casted_value->value.type))
15630	return ira->codegen->builtin_types.entry_invalid;	15624	return ira->codegen->builtin_types.entry_invalid;
15631		15625
15632	TypeTableEntry *u8_ptr_type = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true);	15626	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(ira->codegen, ira->codegen->builtin_types.entry_u8,
		15627	true, false, PtrLenUnknown, get_abi_alignment(ira->codegen, ira->codegen->builtin_types.entry_u8), 0, 0);
15633	TypeTableEntry *str_type = get_slice_type(ira->codegen, u8_ptr_type);	15628	TypeTableEntry *str_type = get_slice_type(ira->codegen, u8_ptr_type);
15634	if (casted_value->value.special == ConstValSpecialStatic) {	15629	if (casted_value->value.special == ConstValSpecialStatic) {
15635	ErrorTableEntry *err = casted_value->value.data.x_err_set;	15630	ErrorTableEntry *err = casted_value->value.data.x_err_set;
...	@@ -15670,7 +15665,11 @@ static TypeTableEntry ir_analyze_instruction_enum_tag_name(IrAnalyze ira, IrIn	...	@@ -15670,7 +15665,11 @@ static TypeTableEntry ir_analyze_instruction_enum_tag_name(IrAnalyze ira, IrIn
15670	IrInstruction *result = ir_build_tag_name(&ira->new_irb, instruction->base.scope,	15665	IrInstruction *result = ir_build_tag_name(&ira->new_irb, instruction->base.scope,
15671	instruction->base.source_node, target);	15666	instruction->base.source_node, target);
15672	ir_link_new_instruction(result, &instruction->base);	15667	ir_link_new_instruction(result, &instruction->base);
15673	TypeTableEntry *u8_ptr_type = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true);	15668	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(
		15669	ira->codegen, ira->codegen->builtin_types.entry_u8,
		15670	true, false, PtrLenUnknown,
		15671	get_abi_alignment(ira->codegen, ira->codegen->builtin_types.entry_u8),
		15672	0, 0);
15674	result->value.type = get_slice_type(ira->codegen, u8_ptr_type);	15673	result->value.type = get_slice_type(ira->codegen, u8_ptr_type);
15675	return result->value.type;	15674	return result->value.type;
15676	}	15675	}
...	@@ -15723,6 +15722,7 @@ static TypeTableEntry ir_analyze_instruction_field_parent_ptr(IrAnalyze ira,	...	@@ -15723,6 +15722,7 @@ static TypeTableEntry ir_analyze_instruction_field_parent_ptr(IrAnalyze ira,
15723	TypeTableEntry *field_ptr_type = get_pointer_to_type_extra(ira->codegen, field->type_entry,	15722	TypeTableEntry *field_ptr_type = get_pointer_to_type_extra(ira->codegen, field->type_entry,
15724	field_ptr->value.type->data.pointer.is_const,	15723	field_ptr->value.type->data.pointer.is_const,
15725	field_ptr->value.type->data.pointer.is_volatile,	15724	field_ptr->value.type->data.pointer.is_volatile,
		15725	PtrLenSingle,
15726	field_ptr_align, 0, 0);	15726	field_ptr_align, 0, 0);
15727	IrInstruction *casted_field_ptr = ir_implicit_cast(ira, field_ptr, field_ptr_type);	15727	IrInstruction *casted_field_ptr = ir_implicit_cast(ira, field_ptr, field_ptr_type);
15728	if (type_is_invalid(casted_field_ptr->value.type))	15728	if (type_is_invalid(casted_field_ptr->value.type))
...	@@ -15731,6 +15731,7 @@ static TypeTableEntry ir_analyze_instruction_field_parent_ptr(IrAnalyze ira,	...	@@ -15731,6 +15731,7 @@ static TypeTableEntry ir_analyze_instruction_field_parent_ptr(IrAnalyze ira,
15731	TypeTableEntry *result_type = get_pointer_to_type_extra(ira->codegen, container_type,	15731	TypeTableEntry *result_type = get_pointer_to_type_extra(ira->codegen, container_type,
15732	casted_field_ptr->value.type->data.pointer.is_const,	15732	casted_field_ptr->value.type->data.pointer.is_const,
15733	casted_field_ptr->value.type->data.pointer.is_volatile,	15733	casted_field_ptr->value.type->data.pointer.is_volatile,
		15734	PtrLenSingle,
15734	parent_ptr_align, 0, 0);	15735	parent_ptr_align, 0, 0);
15735		15736
15736	if (instr_is_comptime(casted_field_ptr)) {	15737	if (instr_is_comptime(casted_field_ptr)) {
...	@@ -15775,6 +15776,8 @@ static TypeTableEntry ir_analyze_instruction_offset_of(IrAnalyze ira,	...	@@ -15775,6 +15776,8 @@ static TypeTableEntry ir_analyze_instruction_offset_of(IrAnalyze ira,
15775	return ira->codegen->builtin_types.entry_invalid;	15776	return ira->codegen->builtin_types.entry_invalid;
15776		15777
15777	ensure_complete_type(ira->codegen, container_type);	15778	ensure_complete_type(ira->codegen, container_type);
		15779	if (type_is_invalid(container_type))
		15780	return ira->codegen->builtin_types.entry_invalid;
15778		15781
15779	IrInstruction *field_name_value = instruction->field_name->other;	15782	IrInstruction *field_name_value = instruction->field_name->other;
15780	Buf *field_name = ir_resolve_str(ira, field_name_value);	15783	Buf *field_name = ir_resolve_str(ira, field_name_value);
...	@@ -15828,6 +15831,9 @@ static TypeTableEntry ir_type_info_get_type(IrAnalyze ira, const char *type_na	...	@@ -15828,6 +15831,9 @@ static TypeTableEntry ir_type_info_get_type(IrAnalyze ira, const char *type_na
15828	assert(type_info_var->type->id == TypeTableEntryIdMetaType);	15831	assert(type_info_var->type->id == TypeTableEntryIdMetaType);
15829		15832
15830	ensure_complete_type(ira->codegen, type_info_var->data.x_type);	15833	ensure_complete_type(ira->codegen, type_info_var->data.x_type);
		15834	if (type_is_invalid(type_info_var->data.x_type))
		15835	return ira->codegen->builtin_types.entry_invalid;
		15836
15831	type_info_type = type_info_var->data.x_type;	15837	type_info_type = type_info_var->data.x_type;
15832	assert(type_info_type->id == TypeTableEntryIdUnion);	15838	assert(type_info_type->id == TypeTableEntryIdUnion);
15833	}	15839	}
...	@@ -15853,26 +15859,37 @@ static TypeTableEntry ir_type_info_get_type(IrAnalyze ira, const char *type_na	...	@@ -15853,26 +15859,37 @@ static TypeTableEntry ir_type_info_get_type(IrAnalyze ira, const char *type_na
15853	VariableTableEntry *var = tld->var;	15859	VariableTableEntry *var = tld->var;
15854		15860
15855	ensure_complete_type(ira->codegen, var->value->type);	15861	ensure_complete_type(ira->codegen, var->value->type);
		15862	if (type_is_invalid(var->value->type))
		15863	return ira->codegen->builtin_types.entry_invalid;
15856	assert(var->value->type->id == TypeTableEntryIdMetaType);	15864	assert(var->value->type->id == TypeTableEntryIdMetaType);
15857	return var->value->data.x_type;	15865	return var->value->data.x_type;
15858	}	15866	}
15859		15867
15860	static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, ScopeDecls *decls_scope)	15868	static bool ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, ScopeDecls *decls_scope)
15861	{	15869	{
15862	TypeTableEntry *type_info_definition_type = ir_type_info_get_type(ira, "Definition");	15870	TypeTableEntry *type_info_definition_type = ir_type_info_get_type(ira, "Definition");
15863	ensure_complete_type(ira->codegen, type_info_definition_type);	15871	ensure_complete_type(ira->codegen, type_info_definition_type);
		15872	if (type_is_invalid(type_info_definition_type))
		15873	return false;
		15874
15864	ensure_field_index(type_info_definition_type, "name", 0);	15875	ensure_field_index(type_info_definition_type, "name", 0);
15865	ensure_field_index(type_info_definition_type, "is_pub", 1);	15876	ensure_field_index(type_info_definition_type, "is_pub", 1);
15866	ensure_field_index(type_info_definition_type, "data", 2);	15877	ensure_field_index(type_info_definition_type, "data", 2);
15867		15878
15868	TypeTableEntry *type_info_definition_data_type = ir_type_info_get_type(ira, "Data", type_info_definition_type);	15879	TypeTableEntry *type_info_definition_data_type = ir_type_info_get_type(ira, "Data", type_info_definition_type);
15869	ensure_complete_type(ira->codegen, type_info_definition_data_type);	15880	ensure_complete_type(ira->codegen, type_info_definition_data_type);
		15881	if (type_is_invalid(type_info_definition_data_type))
		15882	return false;
15870		15883
15871	TypeTableEntry *type_info_fn_def_type = ir_type_info_get_type(ira, "FnDef", type_info_definition_data_type);	15884	TypeTableEntry *type_info_fn_def_type = ir_type_info_get_type(ira, "FnDef", type_info_definition_data_type);
15872	ensure_complete_type(ira->codegen, type_info_fn_def_type);	15885	ensure_complete_type(ira->codegen, type_info_fn_def_type);
		15886	if (type_is_invalid(type_info_fn_def_type))
		15887	return false;
15873		15888
15874	TypeTableEntry *type_info_fn_def_inline_type = ir_type_info_get_type(ira, "Inline", type_info_fn_def_type);	15889	TypeTableEntry *type_info_fn_def_inline_type = ir_type_info_get_type(ira, "Inline", type_info_fn_def_type);
15875	ensure_complete_type(ira->codegen, type_info_fn_def_inline_type);	15890	ensure_complete_type(ira->codegen, type_info_fn_def_inline_type);
		15891	if (type_is_invalid(type_info_fn_def_inline_type))
		15892	return false;
15876		15893
15877	// Loop through our definitions once to figure out how many definitions we will generate info for.	15894	// Loop through our definitions once to figure out how many definitions we will generate info for.
15878	auto decl_it = decls_scope->decl_table.entry_iterator();	15895	auto decl_it = decls_scope->decl_table.entry_iterator();
...	@@ -15887,7 +15904,7 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop	...	@@ -15887,7 +15904,7 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
15887	resolve_top_level_decl(ira->codegen, curr_entry->value, false, curr_entry->value->source_node);	15904	resolve_top_level_decl(ira->codegen, curr_entry->value, false, curr_entry->value->source_node);
15888	if (curr_entry->value->resolution != TldResolutionOk)	15905	if (curr_entry->value->resolution != TldResolutionOk)
15889	{	15906	{
15890	return;	15907	return false;
15891	}	15908	}
15892	}	15909	}
15893		15910
...	@@ -15952,6 +15969,9 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop	...	@@ -15952,6 +15969,9 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
15952	{	15969	{
15953	VariableTableEntry var = ((TldVar )curr_entry->value)->var;	15970	VariableTableEntry var = ((TldVar )curr_entry->value)->var;
15954	ensure_complete_type(ira->codegen, var->value->type);	15971	ensure_complete_type(ira->codegen, var->value->type);
		15972	if (type_is_invalid(var->value->type))
		15973	return false;
		15974
15955	if (var->value->type->id == TypeTableEntryIdMetaType)	15975	if (var->value->type->id == TypeTableEntryIdMetaType)
15956	{	15976	{
15957	// We have a variable of type 'type', so it's actually a type definition.	15977	// We have a variable of type 'type', so it's actually a type definition.
...	@@ -15982,10 +16002,6 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop	...	@@ -15982,10 +16002,6 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
15982	FnTableEntry fn_entry = ((TldFn )curr_entry->value)->fn_entry;	16002	FnTableEntry fn_entry = ((TldFn )curr_entry->value)->fn_entry;
15983	assert(!fn_entry->is_test);	16003	assert(!fn_entry->is_test);
15984		16004
15985	analyze_fn_body(ira->codegen, fn_entry);
15986	if (fn_entry->anal_state == FnAnalStateInvalid)
15987	return;
15988
15989	AstNodeFnProto fn_node = (AstNodeFnProto )(fn_entry->proto_node);	16005	AstNodeFnProto fn_node = (AstNodeFnProto )(fn_entry->proto_node);
15990		16006
15991	ConstExprValue *fn_def_val = create_const_vals(1);	16007	ConstExprValue *fn_def_val = create_const_vals(1);
...	@@ -16031,11 +16047,13 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop	...	@@ -16031,11 +16047,13 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
16031	// lib_name: ?[]const u8	16047	// lib_name: ?[]const u8
16032	ensure_field_index(fn_def_val->type, "lib_name", 6);	16048	ensure_field_index(fn_def_val->type, "lib_name", 6);
16033	fn_def_fields[6].special = ConstValSpecialStatic;	16049	fn_def_fields[6].special = ConstValSpecialStatic;
16034	fn_def_fields[6].type = get_maybe_type(ira->codegen,	16050	TypeTableEntry *u8_ptr = get_pointer_to_type_extra(
16035	get_slice_type(ira->codegen, get_pointer_to_type(ira->codegen,	16051	ira->codegen, ira->codegen->builtin_types.entry_u8,
16036	ira->codegen->builtin_types.entry_u8, true)));	16052	true, false, PtrLenUnknown,
16037	if (fn_node->is_extern && buf_len(fn_node->lib_name) > 0)	16053	get_abi_alignment(ira->codegen, ira->codegen->builtin_types.entry_u8),
16038	{	16054	0, 0);
		16055	fn_def_fields[6].type = get_maybe_type(ira->codegen, get_slice_type(ira->codegen, u8_ptr));
		16056	if (fn_node->is_extern && buf_len(fn_node->lib_name) > 0) {
16039	fn_def_fields[6].data.x_maybe = create_const_vals(1);	16057	fn_def_fields[6].data.x_maybe = create_const_vals(1);
16040	ConstExprValue *lib_name = create_const_str_lit(ira->codegen, fn_node->lib_name);	16058	ConstExprValue *lib_name = create_const_str_lit(ira->codegen, fn_node->lib_name);
16041	init_const_slice(ira->codegen, fn_def_fields[6].data.x_maybe, lib_name, 0, buf_len(fn_node->lib_name), true);	16059	init_const_slice(ira->codegen, fn_def_fields[6].data.x_maybe, lib_name, 0, buf_len(fn_node->lib_name), true);
...	@@ -16057,8 +16075,8 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop	...	@@ -16057,8 +16075,8 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
16057	size_t fn_arg_count = fn_entry->variable_list.length;	16075	size_t fn_arg_count = fn_entry->variable_list.length;
16058	ConstExprValue *fn_arg_name_array = create_const_vals(1);	16076	ConstExprValue *fn_arg_name_array = create_const_vals(1);
16059	fn_arg_name_array->special = ConstValSpecialStatic;	16077	fn_arg_name_array->special = ConstValSpecialStatic;
16060	fn_arg_name_array->type = get_array_type(ira->codegen, get_slice_type(ira->codegen,	16078	fn_arg_name_array->type = get_array_type(ira->codegen,
16061	get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true)), fn_arg_count);	16079	get_slice_type(ira->codegen, u8_ptr), fn_arg_count);
16062	fn_arg_name_array->data.x_array.special = ConstArraySpecialNone;	16080	fn_arg_name_array->data.x_array.special = ConstArraySpecialNone;
16063	fn_arg_name_array->data.x_array.s_none.parent.id = ConstParentIdNone;	16081	fn_arg_name_array->data.x_array.s_none.parent.id = ConstParentIdNone;
16064	fn_arg_name_array->data.x_array.s_none.elements = create_const_vals(fn_arg_count);	16082	fn_arg_name_array->data.x_array.s_none.elements = create_const_vals(fn_arg_count);
...	@@ -16083,6 +16101,9 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop	...	@@ -16083,6 +16101,9 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
16083	{	16101	{
16084	TypeTableEntry type_entry = ((TldContainer )curr_entry->value)->type_entry;	16102	TypeTableEntry type_entry = ((TldContainer )curr_entry->value)->type_entry;
16085	ensure_complete_type(ira->codegen, type_entry);	16103	ensure_complete_type(ira->codegen, type_entry);
		16104	if (type_is_invalid(type_entry))
		16105	return false;
		16106
16086	// This is a type.	16107	// This is a type.
16087	bigint_init_unsigned(&inner_fields[2].data.x_union.tag, 0);	16108	bigint_init_unsigned(&inner_fields[2].data.x_union.tag, 0);
16088		16109
...	@@ -16103,6 +16124,7 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop	...	@@ -16103,6 +16124,7 @@ static void ir_make_type_info_defs(IrAnalyze ira, ConstExprValue out_val, Scop
16103	}	16124	}
16104		16125
16105	assert(definition_index == definition_count);	16126	assert(definition_index == definition_count);
		16127	return true;
16106	}	16128	}
16107		16129
16108	static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *type_entry)	16130	static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *type_entry)
...	@@ -16111,6 +16133,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t	...	@@ -16111,6 +16133,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t
16111	assert(!type_is_invalid(type_entry));	16133	assert(!type_is_invalid(type_entry));
16112		16134
16113	ensure_complete_type(ira->codegen, type_entry);	16135	ensure_complete_type(ira->codegen, type_entry);
		16136	if (type_is_invalid(type_entry))
		16137	return nullptr;
16114		16138
16115	const auto make_enum_field_val = [ira](ConstExprValue enum_field_val, TypeEnumField enum_field,	16139	const auto make_enum_field_val = [ira](ConstExprValue enum_field_val, TypeEnumField enum_field,
16116	TypeTableEntry *type_info_enum_field_type) {	16140	TypeTableEntry *type_info_enum_field_type) {
...	@@ -16338,7 +16362,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t	...	@@ -16338,7 +16362,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t
16338	}	16362	}
16339	// defs: []TypeInfo.Definition	16363	// defs: []TypeInfo.Definition
16340	ensure_field_index(result->type, "defs", 3);	16364	ensure_field_index(result->type, "defs", 3);
16341	ir_make_type_info_defs(ira, &fields[3], type_entry->data.enumeration.decls_scope);	16365	if (!ir_make_type_info_defs(ira, &fields[3], type_entry->data.enumeration.decls_scope))
		16366	return nullptr;
16342		16367
16343	break;	16368	break;
16344	}	16369	}
...	@@ -16493,7 +16518,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t	...	@@ -16493,7 +16518,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t
16493	}	16518	}
16494	// defs: []TypeInfo.Definition	16519	// defs: []TypeInfo.Definition
16495	ensure_field_index(result->type, "defs", 3);	16520	ensure_field_index(result->type, "defs", 3);
16496	ir_make_type_info_defs(ira, &fields[3], type_entry->data.unionation.decls_scope);	16521	if (!ir_make_type_info_defs(ira, &fields[3], type_entry->data.unionation.decls_scope))
		16522	return nullptr;
16497		16523
16498	break;	16524	break;
16499	}	16525	}
...	@@ -16504,6 +16530,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t	...	@@ -16504,6 +16530,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t
16504	buf_init_from_str(&ptr_field_name, "ptr");	16530	buf_init_from_str(&ptr_field_name, "ptr");
16505	TypeTableEntry *ptr_type = type_entry->data.structure.fields_by_name.get(&ptr_field_name)->type_entry;	16531	TypeTableEntry *ptr_type = type_entry->data.structure.fields_by_name.get(&ptr_field_name)->type_entry;
16506	ensure_complete_type(ira->codegen, ptr_type);	16532	ensure_complete_type(ira->codegen, ptr_type);
		16533	if (type_is_invalid(ptr_type))
		16534	return nullptr;
16507	buf_deinit(&ptr_field_name);	16535	buf_deinit(&ptr_field_name);
16508		16536
16509	result = create_ptr_like_type_info("Slice", ptr_type);	16537	result = create_ptr_like_type_info("Slice", ptr_type);
...	@@ -16574,7 +16602,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t	...	@@ -16574,7 +16602,8 @@ static ConstExprValue ir_make_type_info_value(IrAnalyze ira, TypeTableEntry *t
16574	}	16602	}
16575	// defs: []TypeInfo.Definition	16603	// defs: []TypeInfo.Definition
16576	ensure_field_index(result->type, "defs", 2);	16604	ensure_field_index(result->type, "defs", 2);
16577	ir_make_type_info_defs(ira, &fields[2], type_entry->data.structure.decls_scope);	16605	if (!ir_make_type_info_defs(ira, &fields[2], type_entry->data.structure.decls_scope))
		16606	return nullptr;
16578		16607
16579	break;	16608	break;
16580	}	16609	}
...	@@ -17125,7 +17154,8 @@ static TypeTableEntry ir_analyze_instruction_memset(IrAnalyze ira, IrInstructi	...	@@ -17125,7 +17154,8 @@ static TypeTableEntry ir_analyze_instruction_memset(IrAnalyze ira, IrInstructi
17125	TypeTableEntry *u8 = ira->codegen->builtin_types.entry_u8;	17154	TypeTableEntry *u8 = ira->codegen->builtin_types.entry_u8;
17126	uint32_t dest_align = (dest_uncasted_type->id == TypeTableEntryIdPointer) ?	17155	uint32_t dest_align = (dest_uncasted_type->id == TypeTableEntryIdPointer) ?
17127	dest_uncasted_type->data.pointer.alignment : get_abi_alignment(ira->codegen, u8);	17156	dest_uncasted_type->data.pointer.alignment : get_abi_alignment(ira->codegen, u8);
17128	TypeTableEntry *u8_ptr = get_pointer_to_type_extra(ira->codegen, u8, false, dest_is_volatile, dest_align, 0, 0);	17157	TypeTableEntry *u8_ptr = get_pointer_to_type_extra(ira->codegen, u8, false, dest_is_volatile,
		17158	PtrLenUnknown, dest_align, 0, 0);
17129		17159
17130	IrInstruction *casted_dest_ptr = ir_implicit_cast(ira, dest_ptr, u8_ptr);	17160	IrInstruction *casted_dest_ptr = ir_implicit_cast(ira, dest_ptr, u8_ptr);
17131	if (type_is_invalid(casted_dest_ptr->value.type))	17161	if (type_is_invalid(casted_dest_ptr->value.type))
...	@@ -17221,8 +17251,10 @@ static TypeTableEntry ir_analyze_instruction_memcpy(IrAnalyze ira, IrInstructi	...	@@ -17221,8 +17251,10 @@ static TypeTableEntry ir_analyze_instruction_memcpy(IrAnalyze ira, IrInstructi
17221	src_uncasted_type->data.pointer.alignment : get_abi_alignment(ira->codegen, u8);	17251	src_uncasted_type->data.pointer.alignment : get_abi_alignment(ira->codegen, u8);
17222		17252
17223	TypeTableEntry *usize = ira->codegen->builtin_types.entry_usize;	17253	TypeTableEntry *usize = ira->codegen->builtin_types.entry_usize;
17224	TypeTableEntry *u8_ptr_mut = get_pointer_to_type_extra(ira->codegen, u8, false, dest_is_volatile, dest_align, 0, 0);	17254	TypeTableEntry *u8_ptr_mut = get_pointer_to_type_extra(ira->codegen, u8, false, dest_is_volatile,
17225	TypeTableEntry *u8_ptr_const = get_pointer_to_type_extra(ira->codegen, u8, true, src_is_volatile, src_align, 0, 0);	17255	PtrLenUnknown, dest_align, 0, 0);
		17256	TypeTableEntry *u8_ptr_const = get_pointer_to_type_extra(ira->codegen, u8, true, src_is_volatile,
		17257	PtrLenUnknown, src_align, 0, 0);
17226		17258
17227	IrInstruction *casted_dest_ptr = ir_implicit_cast(ira, dest_ptr, u8_ptr_mut);	17259	IrInstruction *casted_dest_ptr = ir_implicit_cast(ira, dest_ptr, u8_ptr_mut);
17228	if (type_is_invalid(casted_dest_ptr->value.type))	17260	if (type_is_invalid(casted_dest_ptr->value.type))
...	@@ -17365,13 +17397,18 @@ static TypeTableEntry ir_analyze_instruction_slice(IrAnalyze ira, IrInstructio	...	@@ -17365,13 +17397,18 @@ static TypeTableEntry ir_analyze_instruction_slice(IrAnalyze ira, IrInstructio
17365	if (array_type->data.array.len == 0 && byte_alignment == 0) {	17397	if (array_type->data.array.len == 0 && byte_alignment == 0) {
17366	byte_alignment = get_abi_alignment(ira->codegen, array_type->data.array.child_type);	17398	byte_alignment = get_abi_alignment(ira->codegen, array_type->data.array.child_type);
17367	}	17399	}
		17400	bool is_comptime_const = ptr_ptr->value.special == ConstValSpecialStatic &&
		17401	ptr_ptr->value.data.x_ptr.mut == ConstPtrMutComptimeConst;
17368	TypeTableEntry *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, array_type->data.array.child_type,	17402	TypeTableEntry *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, array_type->data.array.child_type,
17369	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,	17403	ptr_type->data.pointer.is_const \|\| is_comptime_const,
		17404	ptr_type->data.pointer.is_volatile,
		17405	PtrLenUnknown,
17370	byte_alignment, 0, 0);	17406	byte_alignment, 0, 0);
17371	return_type = get_slice_type(ira->codegen, slice_ptr_type);	17407	return_type = get_slice_type(ira->codegen, slice_ptr_type);
17372	} else if (array_type->id == TypeTableEntryIdPointer) {	17408	} else if (array_type->id == TypeTableEntryIdPointer) {
17373	TypeTableEntry *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, array_type->data.pointer.child_type,	17409	TypeTableEntry *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, array_type->data.pointer.child_type,
17374	array_type->data.pointer.is_const, array_type->data.pointer.is_volatile,	17410	array_type->data.pointer.is_const, array_type->data.pointer.is_volatile,
		17411	PtrLenUnknown,
17375	array_type->data.pointer.alignment, 0, 0);	17412	array_type->data.pointer.alignment, 0, 0);
17376	return_type = get_slice_type(ira->codegen, slice_ptr_type);	17413	return_type = get_slice_type(ira->codegen, slice_ptr_type);
17377	if (!end) {	17414	if (!end) {
...	@@ -17553,6 +17590,10 @@ static TypeTableEntry ir_analyze_instruction_member_count(IrAnalyze ira, IrIns	...	@@ -17553,6 +17590,10 @@ static TypeTableEntry ir_analyze_instruction_member_count(IrAnalyze ira, IrIns
17553	return ira->codegen->builtin_types.entry_invalid;	17590	return ira->codegen->builtin_types.entry_invalid;
17554	TypeTableEntry *container_type = ir_resolve_type(ira, container);	17591	TypeTableEntry *container_type = ir_resolve_type(ira, container);
17555		17592
		17593	ensure_complete_type(ira->codegen, container_type);
		17594	if (type_is_invalid(container_type))
		17595	return ira->codegen->builtin_types.entry_invalid;
		17596
17556	uint64_t result;	17597	uint64_t result;
17557	if (type_is_invalid(container_type)) {	17598	if (type_is_invalid(container_type)) {
17558	return ira->codegen->builtin_types.entry_invalid;	17599	return ira->codegen->builtin_types.entry_invalid;
...	@@ -17563,7 +17604,7 @@ static TypeTableEntry ir_analyze_instruction_member_count(IrAnalyze ira, IrIns	...	@@ -17563,7 +17604,7 @@ static TypeTableEntry ir_analyze_instruction_member_count(IrAnalyze ira, IrIns
17563	} else if (container_type->id == TypeTableEntryIdUnion) {	17604	} else if (container_type->id == TypeTableEntryIdUnion) {
17564	result = container_type->data.unionation.src_field_count;	17605	result = container_type->data.unionation.src_field_count;
17565	} else if (container_type->id == TypeTableEntryIdErrorSet) {	17606	} else if (container_type->id == TypeTableEntryIdErrorSet) {
17566	if (!resolve_inferred_error_set(ira, container_type, instruction->base.source_node)) {	17607	if (!resolve_inferred_error_set(ira->codegen, container_type, instruction->base.source_node)) {
17567	return ira->codegen->builtin_types.entry_invalid;	17608	return ira->codegen->builtin_types.entry_invalid;
17568	}	17609	}
17569	if (type_is_global_error_set(container_type)) {	17610	if (type_is_global_error_set(container_type)) {
...	@@ -17587,6 +17628,11 @@ static TypeTableEntry ir_analyze_instruction_member_type(IrAnalyze ira, IrInst	...	@@ -17587,6 +17628,11 @@ static TypeTableEntry ir_analyze_instruction_member_type(IrAnalyze ira, IrInst
17587	if (type_is_invalid(container_type))	17628	if (type_is_invalid(container_type))
17588	return ira->codegen->builtin_types.entry_invalid;	17629	return ira->codegen->builtin_types.entry_invalid;
17589		17630
		17631	ensure_complete_type(ira->codegen, container_type);
		17632	if (type_is_invalid(container_type))
		17633	return ira->codegen->builtin_types.entry_invalid;
		17634
		17635
17590	uint64_t member_index;	17636	uint64_t member_index;
17591	IrInstruction *index_value = instruction->member_index->other;	17637	IrInstruction *index_value = instruction->member_index->other;
17592	if (!ir_resolve_usize(ira, index_value, &member_index))	17638	if (!ir_resolve_usize(ira, index_value, &member_index))
...	@@ -17629,6 +17675,10 @@ static TypeTableEntry ir_analyze_instruction_member_name(IrAnalyze ira, IrInst	...	@@ -17629,6 +17675,10 @@ static TypeTableEntry ir_analyze_instruction_member_name(IrAnalyze ira, IrInst
17629	if (type_is_invalid(container_type))	17675	if (type_is_invalid(container_type))
17630	return ira->codegen->builtin_types.entry_invalid;	17676	return ira->codegen->builtin_types.entry_invalid;
17631		17677
		17678	ensure_complete_type(ira->codegen, container_type);
		17679	if (type_is_invalid(container_type))
		17680	return ira->codegen->builtin_types.entry_invalid;
		17681
17632	uint64_t member_index;	17682	uint64_t member_index;
17633	IrInstruction *index_value = instruction->member_index->other;	17683	IrInstruction *index_value = instruction->member_index->other;
17634	if (!ir_resolve_usize(ira, index_value, &member_index))	17684	if (!ir_resolve_usize(ira, index_value, &member_index))
...	@@ -17795,6 +17845,7 @@ static TypeTableEntry ir_analyze_instruction_overflow_op(IrAnalyze ira, IrInst	...	@@ -17795,6 +17845,7 @@ static TypeTableEntry ir_analyze_instruction_overflow_op(IrAnalyze ira, IrInst
17795	if (result_ptr->value.type->id == TypeTableEntryIdPointer) {	17845	if (result_ptr->value.type->id == TypeTableEntryIdPointer) {
17796	expected_ptr_type = get_pointer_to_type_extra(ira->codegen, dest_type,	17846	expected_ptr_type = get_pointer_to_type_extra(ira->codegen, dest_type,
17797	false, result_ptr->value.type->data.pointer.is_volatile,	17847	false, result_ptr->value.type->data.pointer.is_volatile,
		17848	PtrLenSingle,
17798	result_ptr->value.type->data.pointer.alignment, 0, 0);	17849	result_ptr->value.type->data.pointer.alignment, 0, 0);
17799	} else {	17850	} else {
17800	expected_ptr_type = get_pointer_to_type(ira->codegen, dest_type, false);	17851	expected_ptr_type = get_pointer_to_type(ira->codegen, dest_type, false);
...	@@ -17867,7 +17918,7 @@ static TypeTableEntry ir_analyze_instruction_test_err(IrAnalyze ira, IrInstruc	...	@@ -17867,7 +17918,7 @@ static TypeTableEntry ir_analyze_instruction_test_err(IrAnalyze ira, IrInstruc
17867	}	17918	}
17868		17919
17869	TypeTableEntry *err_set_type = type_entry->data.error_union.err_set_type;	17920	TypeTableEntry *err_set_type = type_entry->data.error_union.err_set_type;
17870	if (!resolve_inferred_error_set(ira, err_set_type, instruction->base.source_node)) {	17921	if (!resolve_inferred_error_set(ira->codegen, err_set_type, instruction->base.source_node)) {
17871	return ira->codegen->builtin_types.entry_invalid;	17922	return ira->codegen->builtin_types.entry_invalid;
17872	}	17923	}
17873	if (!type_is_global_error_set(err_set_type) &&	17924	if (!type_is_global_error_set(err_set_type) &&
...	@@ -17950,6 +18001,7 @@ static TypeTableEntry ir_analyze_instruction_unwrap_err_payload(IrAnalyze ira,	...	@@ -17950,6 +18001,7 @@ static TypeTableEntry ir_analyze_instruction_unwrap_err_payload(IrAnalyze ira,
17950	TypeTableEntry *payload_type = type_entry->data.error_union.payload_type;	18001	TypeTableEntry *payload_type = type_entry->data.error_union.payload_type;
17951	TypeTableEntry *result_type = get_pointer_to_type_extra(ira->codegen, payload_type,	18002	TypeTableEntry *result_type = get_pointer_to_type_extra(ira->codegen, payload_type,
17952	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,	18003	ptr_type->data.pointer.is_const, ptr_type->data.pointer.is_volatile,
		18004	PtrLenSingle,
17953	get_abi_alignment(ira->codegen, payload_type), 0, 0);	18005	get_abi_alignment(ira->codegen, payload_type), 0, 0);
17954	if (instr_is_comptime(value)) {	18006	if (instr_is_comptime(value)) {
17955	ConstExprValue *ptr_val = ir_resolve_const(ira, value, UndefBad);	18007	ConstExprValue *ptr_val = ir_resolve_const(ira, value, UndefBad);
...	@@ -18135,7 +18187,7 @@ static TypeTableEntry ir_analyze_instruction_check_switch_prongs(IrAnalyze ira	...	@@ -18135,7 +18187,7 @@ static TypeTableEntry ir_analyze_instruction_check_switch_prongs(IrAnalyze ira
18135	}	18187	}
18136	}	18188	}
18137	} else if (switch_type->id == TypeTableEntryIdErrorSet) {	18189	} else if (switch_type->id == TypeTableEntryIdErrorSet) {
18138	if (!resolve_inferred_error_set(ira, switch_type, target_value->source_node)) {	18190	if (!resolve_inferred_error_set(ira->codegen, switch_type, target_value->source_node)) {
18139	return ira->codegen->builtin_types.entry_invalid;	18191	return ira->codegen->builtin_types.entry_invalid;
18140	}	18192	}
18141		18193
...	@@ -18291,7 +18343,8 @@ static TypeTableEntry ir_analyze_instruction_panic(IrAnalyze ira, IrInstructio	...	@@ -18291,7 +18343,8 @@ static TypeTableEntry ir_analyze_instruction_panic(IrAnalyze ira, IrInstructio
18291	return ir_unreach_error(ira);	18343	return ir_unreach_error(ira);
18292	}	18344	}
18293		18345
18294	TypeTableEntry *u8_ptr_type = get_pointer_to_type(ira->codegen, ira->codegen->builtin_types.entry_u8, true);	18346	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(ira->codegen, ira->codegen->builtin_types.entry_u8,
		18347	true, false, PtrLenUnknown, get_abi_alignment(ira->codegen, ira->codegen->builtin_types.entry_u8), 0, 0);
18295	TypeTableEntry *str_type = get_slice_type(ira->codegen, u8_ptr_type);	18348	TypeTableEntry *str_type = get_slice_type(ira->codegen, u8_ptr_type);
18296	IrInstruction *casted_msg = ir_implicit_cast(ira, msg, str_type);	18349	IrInstruction *casted_msg = ir_implicit_cast(ira, msg, str_type);
18297	if (type_is_invalid(casted_msg->value.type))	18350	if (type_is_invalid(casted_msg->value.type))
...	@@ -18570,7 +18623,12 @@ static TypeTableEntry ir_analyze_instruction_bit_cast(IrAnalyze ira, IrInstruc	...	@@ -18570,7 +18623,12 @@ static TypeTableEntry ir_analyze_instruction_bit_cast(IrAnalyze ira, IrInstruc
18570	return ira->codegen->builtin_types.entry_invalid;	18623	return ira->codegen->builtin_types.entry_invalid;
18571		18624
18572	ensure_complete_type(ira->codegen, dest_type);	18625	ensure_complete_type(ira->codegen, dest_type);
		18626	if (type_is_invalid(dest_type))
		18627	return ira->codegen->builtin_types.entry_invalid;
		18628
18573	ensure_complete_type(ira->codegen, src_type);	18629	ensure_complete_type(ira->codegen, src_type);
		18630	if (type_is_invalid(src_type))
		18631	return ira->codegen->builtin_types.entry_invalid;
18574		18632
18575	if (get_codegen_ptr_type(src_type) != nullptr) {	18633	if (get_codegen_ptr_type(src_type) != nullptr) {
18576	ir_add_error(ira, value,	18634	ir_add_error(ira, value,
...	@@ -18716,8 +18774,7 @@ static TypeTableEntry ir_analyze_instruction_decl_ref(IrAnalyze ira,	...	@@ -18716,8 +18774,7 @@ static TypeTableEntry ir_analyze_instruction_decl_ref(IrAnalyze ira,
18716	TldVar tld_var = (TldVar )tld;	18774	TldVar tld_var = (TldVar )tld;
18717	VariableTableEntry *var = tld_var->var;	18775	VariableTableEntry *var = tld_var->var;
18718		18776
18719	IrInstruction *var_ptr = ir_get_var_ptr(ira, &instruction->base, var,	18777	IrInstruction *var_ptr = ir_get_var_ptr(ira, &instruction->base, var);
18720	!lval.is_ptr \|\| lval.is_const, lval.is_ptr && lval.is_volatile);
18721	if (type_is_invalid(var_ptr->value.type))	18778	if (type_is_invalid(var_ptr->value.type))
18722	return ira->codegen->builtin_types.entry_invalid;	18779	return ira->codegen->builtin_types.entry_invalid;
18723		18780
...	@@ -18795,22 +18852,31 @@ static TypeTableEntry ir_analyze_instruction_ptr_to_int(IrAnalyze ira, IrInstr	...	@@ -18795,22 +18852,31 @@ static TypeTableEntry ir_analyze_instruction_ptr_to_int(IrAnalyze ira, IrInstr
18795	return usize;	18852	return usize;
18796	}	18853	}
18797		18854
18798	static TypeTableEntry ir_analyze_instruction_ptr_type_of(IrAnalyze ira, IrInstructionPtrTypeOf *instruction) {	18855	static TypeTableEntry ir_analyze_instruction_ptr_type(IrAnalyze ira, IrInstructionPtrType *instruction) {
18799	TypeTableEntry *child_type = ir_resolve_type(ira, instruction->child_type->other);	18856	TypeTableEntry *child_type = ir_resolve_type(ira, instruction->child_type->other);
18800	if (type_is_invalid(child_type))	18857	if (type_is_invalid(child_type))
18801	return ira->codegen->builtin_types.entry_invalid;	18858	return ira->codegen->builtin_types.entry_invalid;
18802		18859
		18860	if (child_type->id == TypeTableEntryIdUnreachable) {
		18861	ir_add_error(ira, &instruction->base, buf_sprintf("pointer to noreturn not allowed"));
		18862	return ira->codegen->builtin_types.entry_invalid;
		18863	}
		18864
18803	uint32_t align_bytes;	18865	uint32_t align_bytes;
18804	if (instruction->align_value != nullptr) {	18866	if (instruction->align_value != nullptr) {
18805	if (!ir_resolve_align(ira, instruction->align_value->other, &align_bytes))	18867	if (!ir_resolve_align(ira, instruction->align_value->other, &align_bytes))
18806	return ira->codegen->builtin_types.entry_invalid;	18868	return ira->codegen->builtin_types.entry_invalid;
18807	} else {	18869	} else {
		18870	type_ensure_zero_bits_known(ira->codegen, child_type);
		18871	if (type_is_invalid(child_type))
		18872	return ira->codegen->builtin_types.entry_invalid;
18808	align_bytes = get_abi_alignment(ira->codegen, child_type);	18873	align_bytes = get_abi_alignment(ira->codegen, child_type);
18809	}	18874	}
18810		18875
18811	ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base);	18876	ConstExprValue *out_val = ir_build_const_from(ira, &instruction->base);
18812	out_val->data.x_type = get_pointer_to_type_extra(ira->codegen, child_type,	18877	out_val->data.x_type = get_pointer_to_type_extra(ira->codegen, child_type,
18813	instruction->is_const, instruction->is_volatile, align_bytes,	18878	instruction->is_const, instruction->is_volatile,
		18879	instruction->ptr_len, align_bytes,
18814	instruction->bit_offset_start, instruction->bit_offset_end - instruction->bit_offset_start);	18880	instruction->bit_offset_start, instruction->bit_offset_end - instruction->bit_offset_start);
18815		18881
18816	return ira->codegen->builtin_types.entry_type;	18882	return ira->codegen->builtin_types.entry_type;
...	@@ -19623,8 +19689,8 @@ static TypeTableEntry ir_analyze_instruction_nocast(IrAnalyze ira, IrInstructi	...	@@ -19623,8 +19689,8 @@ static TypeTableEntry ir_analyze_instruction_nocast(IrAnalyze ira, IrInstructi
19623	return ir_analyze_instruction_type_id(ira, (IrInstructionTypeId *)instruction);	19689	return ir_analyze_instruction_type_id(ira, (IrInstructionTypeId *)instruction);
19624	case IrInstructionIdSetEvalBranchQuota:	19690	case IrInstructionIdSetEvalBranchQuota:
19625	return ir_analyze_instruction_set_eval_branch_quota(ira, (IrInstructionSetEvalBranchQuota *)instruction);	19691	return ir_analyze_instruction_set_eval_branch_quota(ira, (IrInstructionSetEvalBranchQuota *)instruction);
19626	case IrInstructionIdPtrTypeOf:	19692	case IrInstructionIdPtrType:
19627	return ir_analyze_instruction_ptr_type_of(ira, (IrInstructionPtrTypeOf *)instruction);	19693	return ir_analyze_instruction_ptr_type(ira, (IrInstructionPtrType *)instruction);
19628	case IrInstructionIdAlignCast:	19694	case IrInstructionIdAlignCast:
19629	return ir_analyze_instruction_align_cast(ira, (IrInstructionAlignCast *)instruction);	19695	return ir_analyze_instruction_align_cast(ira, (IrInstructionAlignCast *)instruction);
19630	case IrInstructionIdOpaqueType:	19696	case IrInstructionIdOpaqueType:
...	@@ -19800,7 +19866,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {	...	@@ -19800,7 +19866,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {
19800	case IrInstructionIdCheckStatementIsVoid:	19866	case IrInstructionIdCheckStatementIsVoid:
19801	case IrInstructionIdPanic:	19867	case IrInstructionIdPanic:
19802	case IrInstructionIdSetEvalBranchQuota:	19868	case IrInstructionIdSetEvalBranchQuota:
19803	case IrInstructionIdPtrTypeOf:	19869	case IrInstructionIdPtrType:
19804	case IrInstructionIdSetAlignStack:	19870	case IrInstructionIdSetAlignStack:
19805	case IrInstructionIdExport:	19871	case IrInstructionIdExport:
19806	case IrInstructionIdCancel:	19872	case IrInstructionIdCancel:

src/ir_print.cpp+3-3

...	@@ -921,7 +921,7 @@ static void ir_print_can_implicit_cast(IrPrint *irp, IrInstructionCanImplicitCas	...	@@ -921,7 +921,7 @@ static void ir_print_can_implicit_cast(IrPrint *irp, IrInstructionCanImplicitCas
921	fprintf(irp->f, ")");	921	fprintf(irp->f, ")");
922	}	922	}
923		923
924	static void ir_print_ptr_type_of(IrPrint irp, IrInstructionPtrTypeOf instruction) {	924	static void ir_print_ptr_type(IrPrint irp, IrInstructionPtrType instruction) {
925	fprintf(irp->f, "&");	925	fprintf(irp->f, "&");
926	if (instruction->align_value != nullptr) {	926	if (instruction->align_value != nullptr) {
927	fprintf(irp->f, "align(");	927	fprintf(irp->f, "align(");
...	@@ -1527,8 +1527,8 @@ static void ir_print_instruction(IrPrint irp, IrInstruction instruction) {	...	@@ -1527,8 +1527,8 @@ static void ir_print_instruction(IrPrint irp, IrInstruction instruction) {
1527	case IrInstructionIdCanImplicitCast:	1527	case IrInstructionIdCanImplicitCast:
1528	ir_print_can_implicit_cast(irp, (IrInstructionCanImplicitCast *)instruction);	1528	ir_print_can_implicit_cast(irp, (IrInstructionCanImplicitCast *)instruction);
1529	break;	1529	break;
1530	case IrInstructionIdPtrTypeOf:	1530	case IrInstructionIdPtrType:
1531	ir_print_ptr_type_of(irp, (IrInstructionPtrTypeOf *)instruction);	1531	ir_print_ptr_type(irp, (IrInstructionPtrType *)instruction);
1532	break;	1532	break;
1533	case IrInstructionIdDeclRef:	1533	case IrInstructionIdDeclRef:
1534	ir_print_decl_ref(irp, (IrInstructionDeclRef *)instruction);	1534	ir_print_decl_ref(irp, (IrInstructionDeclRef *)instruction);

src/parser.cpp+27-18

...	@@ -1167,20 +1167,20 @@ static PrefixOp tok_to_prefix_op(Token *token) {	...	@@ -1167,20 +1167,20 @@ static PrefixOp tok_to_prefix_op(Token *token) {
1167	case TokenIdTilde: return PrefixOpBinNot;	1167	case TokenIdTilde: return PrefixOpBinNot;
1168	case TokenIdMaybe: return PrefixOpMaybe;	1168	case TokenIdMaybe: return PrefixOpMaybe;
1169	case TokenIdDoubleQuestion: return PrefixOpUnwrapMaybe;	1169	case TokenIdDoubleQuestion: return PrefixOpUnwrapMaybe;
		1170	case TokenIdAmpersand: return PrefixOpAddrOf;
1170	default: return PrefixOpInvalid;	1171	default: return PrefixOpInvalid;
1171	}	1172	}
1172	}	1173	}
1173		1174
1174	static AstNode ast_parse_addr_of(ParseContext pc, size_t *token_index) {	1175	static AstNode ast_parse_pointer_type(ParseContext pc, size_t token_index, Token star_tok) {
1175	Token *ampersand_tok = ast_eat_token(pc, token_index, TokenIdAmpersand);	1176	AstNode *node = ast_create_node(pc, NodeTypePointerType, star_tok);
1176		1177	node->data.pointer_type.star_token = star_tok;
1177	AstNode *node = ast_create_node(pc, NodeTypeAddrOfExpr, ampersand_tok);
1178		1178
1179	Token token = &pc->tokens->at(token_index);	1179	Token token = &pc->tokens->at(token_index);
1180	if (token->id == TokenIdKeywordAlign) {	1180	if (token->id == TokenIdKeywordAlign) {
1181	*token_index += 1;	1181	*token_index += 1;
1182	ast_eat_token(pc, token_index, TokenIdLParen);	1182	ast_eat_token(pc, token_index, TokenIdLParen);
1183	node->data.addr_of_expr.align_expr = ast_parse_expression(pc, token_index, true);	1183	node->data.pointer_type.align_expr = ast_parse_expression(pc, token_index, true);
1184		1184
1185	token = &pc->tokens->at(*token_index);	1185	token = &pc->tokens->at(*token_index);
1186	if (token->id == TokenIdColon) {	1186	if (token->id == TokenIdColon) {
...	@@ -1189,35 +1189,45 @@ static AstNode ast_parse_addr_of(ParseContext pc, size_t *token_index) {	...	@@ -1189,35 +1189,45 @@ static AstNode ast_parse_addr_of(ParseContext pc, size_t *token_index) {
1189	ast_eat_token(pc, token_index, TokenIdColon);	1189	ast_eat_token(pc, token_index, TokenIdColon);
1190	Token *bit_offset_end_tok = ast_eat_token(pc, token_index, TokenIdIntLiteral);	1190	Token *bit_offset_end_tok = ast_eat_token(pc, token_index, TokenIdIntLiteral);
1191		1191
1192	node->data.addr_of_expr.bit_offset_start = token_bigint(bit_offset_start_tok);	1192	node->data.pointer_type.bit_offset_start = token_bigint(bit_offset_start_tok);
1193	node->data.addr_of_expr.bit_offset_end = token_bigint(bit_offset_end_tok);	1193	node->data.pointer_type.bit_offset_end = token_bigint(bit_offset_end_tok);
1194	}	1194	}
1195	ast_eat_token(pc, token_index, TokenIdRParen);	1195	ast_eat_token(pc, token_index, TokenIdRParen);
1196	token = &pc->tokens->at(*token_index);	1196	token = &pc->tokens->at(*token_index);
1197	}	1197	}
1198	if (token->id == TokenIdKeywordConst) {	1198	if (token->id == TokenIdKeywordConst) {
1199	*token_index += 1;	1199	*token_index += 1;
1200	node->data.addr_of_expr.is_const = true;	1200	node->data.pointer_type.is_const = true;
1201		1201
1202	token = &pc->tokens->at(*token_index);	1202	token = &pc->tokens->at(*token_index);
1203	}	1203	}
1204	if (token->id == TokenIdKeywordVolatile) {	1204	if (token->id == TokenIdKeywordVolatile) {
1205	*token_index += 1;	1205	*token_index += 1;
1206	node->data.addr_of_expr.is_volatile = true;	1206	node->data.pointer_type.is_volatile = true;
1207	}	1207	}
1208		1208
1209	node->data.addr_of_expr.op_expr = ast_parse_prefix_op_expr(pc, token_index, true);	1209	node->data.pointer_type.op_expr = ast_parse_prefix_op_expr(pc, token_index, true);
1210	return node;	1210	return node;
1211	}	1211	}
1212		1212
1213	/*	1213	/*
1214	PrefixOpExpression = PrefixOp ErrorSetExpr \| SuffixOpExpression	1214	PrefixOpExpression = PrefixOp ErrorSetExpr \| SuffixOpExpression
1215	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"
1216	*/	1216	*/
1217	static AstNode ast_parse_prefix_op_expr(ParseContext pc, size_t *token_index, bool mandatory) {	1217	static AstNode ast_parse_prefix_op_expr(ParseContext pc, size_t *token_index, bool mandatory) {
1218	Token token = &pc->tokens->at(token_index);	1218	Token token = &pc->tokens->at(token_index);
1219	if (token->id == TokenIdAmpersand) {	1219	if (token->id == TokenIdStar \|\| token->id == TokenIdBracketStarBracket) {
1220	return ast_parse_addr_of(pc, token_index);	1220	*token_index += 1;
		1221	return ast_parse_pointer_type(pc, token_index, token);
		1222	}
		1223	if (token->id == TokenIdStarStar) {
		1224	*token_index += 1;
		1225	AstNode *child_node = ast_parse_pointer_type(pc, token_index, token);
		1226	child_node->column += 1;
		1227	AstNode *parent_node = ast_create_node(pc, NodeTypePointerType, token);
		1228	parent_node->data.pointer_type.star_token = token;
		1229	parent_node->data.pointer_type.op_expr = child_node;
		1230	return parent_node;
1221	}	1231	}
1222	if (token->id == TokenIdKeywordTry) {	1232	if (token->id == TokenIdKeywordTry) {
1223	return ast_parse_try_expr(pc, token_index);	1233	return ast_parse_try_expr(pc, token_index);
...	@@ -1234,13 +1244,12 @@ static AstNode ast_parse_prefix_op_expr(ParseContext pc, size_t *token_index,	...	@@ -1234,13 +1244,12 @@ static AstNode ast_parse_prefix_op_expr(ParseContext pc, size_t *token_index,
1234		1244
1235		1245
1236	AstNode *node = ast_create_node(pc, NodeTypePrefixOpExpr, token);	1246	AstNode *node = ast_create_node(pc, NodeTypePrefixOpExpr, token);
1237	AstNode *parent_node = node;
1238		1247
1239	AstNode *prefix_op_expr = ast_parse_error_set_expr(pc, token_index, true);	1248	AstNode *prefix_op_expr = ast_parse_error_set_expr(pc, token_index, true);
1240	node->data.prefix_op_expr.primary_expr = prefix_op_expr;	1249	node->data.prefix_op_expr.primary_expr = prefix_op_expr;
1241	node->data.prefix_op_expr.prefix_op = prefix_op;	1250	node->data.prefix_op_expr.prefix_op = prefix_op;
1242		1251
1243	return parent_node;	1252	return node;
1244	}	1253	}
1245		1254
1246		1255
...	@@ -3121,9 +3130,9 @@ void ast_visit_node_children(AstNode node, void (visit)(AstNode *, void cont	...	@@ -3121,9 +3130,9 @@ void ast_visit_node_children(AstNode node, void (visit)(AstNode *, void cont
3121	case NodeTypeErrorType:	3130	case NodeTypeErrorType:
3122	// none	3131	// none
3123	break;	3132	break;
3124	case NodeTypeAddrOfExpr:	3133	case NodeTypePointerType:
3125	visit_field(&node->data.addr_of_expr.align_expr, visit, context);	3134	visit_field(&node->data.pointer_type.align_expr, visit, context);
3126	visit_field(&node->data.addr_of_expr.op_expr, visit, context);	3135	visit_field(&node->data.pointer_type.op_expr, visit, context);
3127	break;	3136	break;
3128	case NodeTypeErrorSetDecl:	3137	case NodeTypeErrorSetDecl:
3129	visit_node_list(&node->data.err_set_decl.decls, visit, context);	3138	visit_node_list(&node->data.err_set_decl.decls, visit, context);

src/tokenizer.cpp+30-1

 @@ -219,6 +219,8 @@ enum TokenizeState {
     TokenizeStateSawAtSign,
     TokenizeStateCharCode,
     TokenizeStateError,
+    TokenizeStateLBracket,
+    TokenizeStateLBracketStar,
 };
 @@ -539,8 +541,8 @@ void tokenize(Buf *buf, Tokenization *out) {
                         end_token(&t);
                         break;
                     case '[':
+                        t.state = TokenizeStateLBracket;
                         begin_token(&t, TokenIdLBracket);
-                        end_token(&t);
                         break;
                     case ']':
                         begin_token(&t, TokenIdRBracket);
 @@ -852,6 +854,30 @@ void tokenize(Buf *buf, Tokenization *out) {
                         continue;
                 }
                 break;
+            case TokenizeStateLBracket:
+                switch (c) {
+                    case '*':
+                        t.state = TokenizeStateLBracketStar;
+                        set_token_id(&t, t.cur_tok, TokenIdBracketStarBracket);
+                        break;
+                    default:
+                        // reinterpret as just an lbracket
+                        t.pos -= 1;
+                        end_token(&t);
+                        t.state = TokenizeStateStart;
+                        continue;
+                }
+                break;
+            case TokenizeStateLBracketStar:
+                switch (c) {
+                    case ']':
+                        end_token(&t);
+                        t.state = TokenizeStateStart;
+                        break;
+                    default:
+                        invalid_char_error(&t, c);
+                }
+                break;
             case TokenizeStateSawPlusPercent:
                 switch (c) {
                     case '=':
 @@ -1467,12 +1493,14 @@ void tokenize(Buf *buf, Tokenization *out) {
         case TokenizeStateLineString:
         case TokenizeStateLineStringEnd:
         case TokenizeStateSawBarBar:
+        case TokenizeStateLBracket:
             end_token(&t);
             break;
         case TokenizeStateSawDotDot:
         case TokenizeStateSawBackslash:
         case TokenizeStateLineStringContinue:
         case TokenizeStateLineStringContinueC:
+        case TokenizeStateLBracketStar:
             tokenize_error(&t, "unexpected EOF");
             break;
         case TokenizeStateLineComment:
 @@ -1509,6 +1537,7 @@ const char * token_name(TokenId id) {
         case TokenIdBitShiftRight: return ">>";
         case TokenIdBitShiftRightEq: return ">>=";
         case TokenIdBitXorEq: return "^=";
+        case TokenIdBracketStarBracket: return "[*]";
         case TokenIdCharLiteral: return "CharLiteral";
         case TokenIdCmpEq: return "==";
         case TokenIdCmpGreaterOrEq: return ">=";

src/tokenizer.hpp+1

...	@@ -28,6 +28,7 @@ enum TokenId {	...	@@ -28,6 +28,7 @@ enum TokenId {
28	TokenIdBitShiftRight,	28	TokenIdBitShiftRight,
29	TokenIdBitShiftRightEq,	29	TokenIdBitShiftRightEq,
30	TokenIdBitXorEq,	30	TokenIdBitXorEq,
		31	TokenIdBracketStarBracket,
31	TokenIdCharLiteral,	32	TokenIdCharLiteral,
32	TokenIdCmpEq,	33	TokenIdCmpEq,
33	TokenIdCmpGreaterOrEq,	34	TokenIdCmpGreaterOrEq,

src/translate_c.cpp+20-13

src/util.hpp+5-5

...	@@ -38,11 +38,11 @@ ATTRIBUTE_NORETURN	...	@@ -38,11 +38,11 @@ ATTRIBUTE_NORETURN
38	ATTRIBUTE_PRINTF(1, 2)	38	ATTRIBUTE_PRINTF(1, 2)
39	void zig_panic(const char *format, ...);	39	void zig_panic(const char *format, ...);
40		40
41	ATTRIBUTE_COLD	41	#ifdef WIN32
42	ATTRIBUTE_NORETURN	42	#define __func__ __FUNCTION__
43	static inline void zig_unreachable(void) {	43	#endif
44	zig_panic("unreachable");	44
45	}	45	#define zig_unreachable() zig_panic("unreachable: %s:%s:%d", __FILE__, __func__, __LINE__)
46		46
47	#if defined(_MSC_VER)	47	#if defined(_MSC_VER)
48	static inline int clzll(unsigned long long mask) {	48	static inline int clzll(unsigned long long mask) {

std/array_list.zig+26-26

...	@@ -17,10 +17,10 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {	...	@@ -17,10 +17,10 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
17	/// you uninitialized memory.	17	/// you uninitialized memory.
18	items: []align(A) T,	18	items: []align(A) T,
19	len: usize,	19	len: usize,
20	allocator: &Allocator,	20	allocator: *Allocator,
21		21
22	/// Deinitialize with `deinit` or use `toOwnedSlice`.	22	/// Deinitialize with `deinit` or use `toOwnedSlice`.
23	pub fn init(allocator: &Allocator) Self {	23	pub fn init(allocator: *Allocator) Self {
24	return Self{	24	return Self{
25	.items = []align(A) T{},	25	.items = []align(A) T{},
26	.len = 0,	26	.len = 0,
...	@@ -28,30 +28,30 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {	...	@@ -28,30 +28,30 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
28	};	28	};
29	}	29	}
30		30
31	pub fn deinit(l: &const Self) void {	31	pub fn deinit(l: *const Self) void {
32	l.allocator.free(l.items);	32	l.allocator.free(l.items);
33	}	33	}
34		34
35	pub fn toSlice(l: &const Self) []align(A) T {	35	pub fn toSlice(l: *const Self) []align(A) T {
36	return l.items[0..l.len];	36	return l.items[0..l.len];
37	}	37	}
38		38
39	pub fn toSliceConst(l: &const Self) []align(A) const T {	39	pub fn toSliceConst(l: *const Self) []align(A) const T {
40	return l.items[0..l.len];	40	return l.items[0..l.len];
41	}	41	}
42		42
43	pub fn at(l: &const Self, n: usize) T {	43	pub fn at(l: *const Self, n: usize) T {
44	return l.toSliceConst()[n];	44	return l.toSliceConst()[n];
45	}	45	}
46		46
47	pub fn count(self: &const Self) usize {	47	pub fn count(self: *const Self) usize {
48	return self.len;	48	return self.len;
49	}	49	}
50		50
51	/// ArrayList takes ownership of the passed in slice. The slice must have been	51	/// ArrayList takes ownership of the passed in slice. The slice must have been
52	/// allocated with `allocator`.	52	/// allocated with `allocator`.
53	/// Deinitialize with `deinit` or use `toOwnedSlice`.	53	/// Deinitialize with `deinit` or use `toOwnedSlice`.
54	pub fn fromOwnedSlice(allocator: &Allocator, slice: []align(A) T) Self {	54	pub fn fromOwnedSlice(allocator: *Allocator, slice: []align(A) T) Self {
55	return Self{	55	return Self{
56	.items = slice,	56	.items = slice,
57	.len = slice.len,	57	.len = slice.len,
...	@@ -60,51 +60,51 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {	...	@@ -60,51 +60,51 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
60	}	60	}
61		61
62	/// The caller owns the returned memory. ArrayList becomes empty.	62	/// The caller owns the returned memory. ArrayList becomes empty.
63	pub fn toOwnedSlice(self: &Self) []align(A) T {	63	pub fn toOwnedSlice(self: *Self) []align(A) T {
64	const allocator = self.allocator;	64	const allocator = self.allocator;
65	const result = allocator.alignedShrink(T, A, self.items, self.len);	65	const result = allocator.alignedShrink(T, A, self.items, self.len);
66	self.* = init(allocator);	66	self.* = init(allocator);
67	return result;	67	return result;
68	}	68	}
69		69
70	pub fn insert(l: &Self, n: usize, item: &const T) !void {	70	pub fn insert(l: Self, n: usize, item: const T) !void {
71	try l.ensureCapacity(l.len + 1);	71	try l.ensureCapacity(l.len + 1);
72	l.len += 1;	72	l.len += 1;
73		73
74	mem.copy(T, l.items[n + 1..l.len], l.items[n..l.len - 1]);	74	mem.copy(T, l.items[n + 1 .. l.len], l.items[n .. l.len - 1]);
75	l.items[n] = item.*;	75	l.items[n] = item.*;
76	}	76	}
77		77
78	pub fn insertSlice(l: &Self, n: usize, items: []align(A) const T) !void {	78	pub fn insertSlice(l: *Self, n: usize, items: []align(A) const T) !void {
79	try l.ensureCapacity(l.len + items.len);	79	try l.ensureCapacity(l.len + items.len);
80	l.len += items.len;	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]);	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);	83	mem.copy(T, l.items[n .. n + items.len], items);
84	}	84	}
85		85
86	pub fn append(l: &Self, item: &const T) !void {	86	pub fn append(l: Self, item: const T) !void {
87	const new_item_ptr = try l.addOne();	87	const new_item_ptr = try l.addOne();
88	new_item_ptr.* = item.*;	88	new_item_ptr.* = item.*;
89	}	89	}
90		90
91	pub fn appendSlice(l: &Self, items: []align(A) const T) !void {	91	pub fn appendSlice(l: *Self, items: []align(A) const T) !void {
92	try l.ensureCapacity(l.len + items.len);	92	try l.ensureCapacity(l.len + items.len);
93	mem.copy(T, l.items[l.len..], items);	93	mem.copy(T, l.items[l.len..], items);
94	l.len += items.len;	94	l.len += items.len;
95	}	95	}
96		96
97	pub fn resize(l: &Self, new_len: usize) !void {	97	pub fn resize(l: *Self, new_len: usize) !void {
98	try l.ensureCapacity(new_len);	98	try l.ensureCapacity(new_len);
99	l.len = new_len;	99	l.len = new_len;
100	}	100	}
101		101
102	pub fn shrink(l: &Self, new_len: usize) void {	102	pub fn shrink(l: *Self, new_len: usize) void {
103	assert(new_len <= l.len);	103	assert(new_len <= l.len);
104	l.len = new_len;	104	l.len = new_len;
105	}	105	}
106		106
107	pub fn ensureCapacity(l: &Self, new_capacity: usize) !void {	107	pub fn ensureCapacity(l: *Self, new_capacity: usize) !void {
108	var better_capacity = l.items.len;	108	var better_capacity = l.items.len;
109	if (better_capacity >= new_capacity) return;	109	if (better_capacity >= new_capacity) return;
110	while (true) {	110	while (true) {
...	@@ -114,7 +114,7 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {	...	@@ -114,7 +114,7 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
114	l.items = try l.allocator.alignedRealloc(T, A, l.items, better_capacity);	114	l.items = try l.allocator.alignedRealloc(T, A, l.items, better_capacity);
115	}	115	}
116		116
117	pub fn addOne(l: &Self) !&T {	117	pub fn addOne(l: Self) !T {
118	const new_length = l.len + 1;	118	const new_length = l.len + 1;
119	try l.ensureCapacity(new_length);	119	try l.ensureCapacity(new_length);
120	const result = &l.items[l.len];	120	const result = &l.items[l.len];
...	@@ -122,34 +122,34 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {	...	@@ -122,34 +122,34 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
122	return result;	122	return result;
123	}	123	}
124		124
125	pub fn pop(self: &Self) T {	125	pub fn pop(self: *Self) T {
126	self.len -= 1;	126	self.len -= 1;
127	return self.items[self.len];	127	return self.items[self.len];
128	}	128	}
129		129
130	pub fn popOrNull(self: &Self) ?T {	130	pub fn popOrNull(self: *Self) ?T {
131	if (self.len == 0) return null;	131	if (self.len == 0) return null;
132	return self.pop();	132	return self.pop();
133	}	133	}
134		134
135	pub const Iterator = struct {	135	pub const Iterator = struct {
136	list: &const Self,	136	list: *const Self,
137	// how many items have we returned	137	// how many items have we returned
138	count: usize,	138	count: usize,
139		139
140	pub fn next(it: &Iterator) ?T {	140	pub fn next(it: *Iterator) ?T {
141	if (it.count >= it.list.len) return null;	141	if (it.count >= it.list.len) return null;
142	const val = it.list.at(it.count);	142	const val = it.list.at(it.count);
143	it.count += 1;	143	it.count += 1;
144	return val;	144	return val;
145	}	145	}
146		146
147	pub fn reset(it: &Iterator) void {	147	pub fn reset(it: *Iterator) void {
148	it.count = 0;	148	it.count = 0;
149	}	149	}
150	};	150	};
151		151
152	pub fn iterator(self: &const Self) Iterator {	152	pub fn iterator(self: *const Self) Iterator {
153	return Iterator{	153	return Iterator{
154	.list = self,	154	.list = self,
155	.count = 0,	155	.count = 0,

std/atomic/queue.zig+16-16

...	@@ -5,36 +5,36 @@ const AtomicRmwOp = builtin.AtomicRmwOp;	...	@@ -5,36 +5,36 @@ const AtomicRmwOp = builtin.AtomicRmwOp;
5	/// Many reader, many writer, non-allocating, thread-safe, lock-free	5	/// Many reader, many writer, non-allocating, thread-safe, lock-free
6	pub fn Queue(comptime T: type) type {	6	pub fn Queue(comptime T: type) type {
7	return struct {	7	return struct {
8	head: &Node,	8	head: *Node,
9	tail: &Node,	9	tail: *Node,
10	root: Node,	10	root: Node,
11		11
12	pub const Self = this;	12	pub const Self = this;
13		13
14	pub const Node = struct {	14	pub const Node = struct {
15	next: ?&Node,	15	next: ?*Node,
16	data: T,	16	data: T,
17	};	17	};
18		18
19	// TODO: well defined copy elision: https://github.com/ziglang/zig/issues/287	19	// TODO: well defined copy elision: https://github.com/ziglang/zig/issues/287
20	pub fn init(self: &Self) void {	20	pub fn init(self: *Self) void {
21	self.root.next = null;	21	self.root.next = null;
22	self.head = &self.root;	22	self.head = &self.root;
23	self.tail = &self.root;	23	self.tail = &self.root;
24	}	24	}
25		25
26	pub fn put(self: &Self, node: &Node) void {	26	pub fn put(self: Self, node: Node) void {
27	node.next = null;	27	node.next = null;
28		28
29	const tail = @atomicRmw(&Node, &self.tail, AtomicRmwOp.Xchg, node, AtomicOrder.SeqCst);	29	const tail = @atomicRmw(*Node, &self.tail, AtomicRmwOp.Xchg, node, AtomicOrder.SeqCst);
30	_ = @atomicRmw(?&Node, &tail.next, AtomicRmwOp.Xchg, node, AtomicOrder.SeqCst);	30	_ = @atomicRmw(?*Node, &tail.next, AtomicRmwOp.Xchg, node, AtomicOrder.SeqCst);
31	}	31	}
32		32
33	pub fn get(self: &Self) ?&Node {	33	pub fn get(self: Self) ?Node {
34	var head = @atomicLoad(&Node, &self.head, AtomicOrder.SeqCst);	34	var head = @atomicLoad(*Node, &self.head, AtomicOrder.SeqCst);
35	while (true) {	35	while (true) {
36	const node = head.next ?? return null;	36	const node = head.next ?? return null;
37	head = @cmpxchgWeak(&Node, &self.head, head, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return node;	37	head = @cmpxchgWeak(*Node, &self.head, head, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return node;
38	}	38	}
39	}	39	}
40	};	40	};
...	@@ -42,8 +42,8 @@ pub fn Queue(comptime T: type) type {	...	@@ -42,8 +42,8 @@ pub fn Queue(comptime T: type) type {
42		42
43	const std = @import("std");	43	const std = @import("std");
44	const Context = struct {	44	const Context = struct {
45	allocator: &std.mem.Allocator,	45	allocator: *std.mem.Allocator,
46	queue: &Queue(i32),	46	queue: *Queue(i32),
47	put_sum: isize,	47	put_sum: isize,
48	get_sum: isize,	48	get_sum: isize,
49	get_count: usize,	49	get_count: usize,
...	@@ -79,11 +79,11 @@ test "std.atomic.queue" {	...	@@ -79,11 +79,11 @@ test "std.atomic.queue" {
79	.get_count = 0,	79	.get_count = 0,
80	};	80	};
81		81
82	var putters: [put_thread_count]&std.os.Thread = undefined;	82	var putters: [put_thread_count]*std.os.Thread = undefined;
83	for (putters) \|*t\| {	83	for (putters) \|*t\| {
84	t.* = try std.os.spawnThread(&context, startPuts);	84	t.* = try std.os.spawnThread(&context, startPuts);
85	}	85	}
86	var getters: [put_thread_count]&std.os.Thread = undefined;	86	var getters: [put_thread_count]*std.os.Thread = undefined;
87	for (getters) \|*t\| {	87	for (getters) \|*t\| {
88	t.* = try std.os.spawnThread(&context, startGets);	88	t.* = try std.os.spawnThread(&context, startGets);
89	}	89	}
...	@@ -98,7 +98,7 @@ test "std.atomic.queue" {	...	@@ -98,7 +98,7 @@ test "std.atomic.queue" {
98	std.debug.assert(context.get_count == puts_per_thread * put_thread_count);	98	std.debug.assert(context.get_count == puts_per_thread * put_thread_count);
99	}	99	}
100		100
101	fn startPuts(ctx: &Context) u8 {	101	fn startPuts(ctx: *Context) u8 {
102	var put_count: usize = puts_per_thread;	102	var put_count: usize = puts_per_thread;
103	var r = std.rand.DefaultPrng.init(0xdeadbeef);	103	var r = std.rand.DefaultPrng.init(0xdeadbeef);
104	while (put_count != 0) : (put_count -= 1) {	104	while (put_count != 0) : (put_count -= 1) {
...	@@ -112,7 +112,7 @@ fn startPuts(ctx: &Context) u8 {	...	@@ -112,7 +112,7 @@ fn startPuts(ctx: &Context) u8 {
112	return 0;	112	return 0;
113	}	113	}
114		114
115	fn startGets(ctx: &Context) u8 {	115	fn startGets(ctx: *Context) u8 {
116	while (true) {	116	while (true) {
117	while (ctx.queue.get()) \|node\| {	117	while (ctx.queue.get()) \|node\| {
118	std.os.time.sleep(0, 1); // let the os scheduler be our fuzz	118	std.os.time.sleep(0, 1); // let the os scheduler be our fuzz

std/atomic/stack.zig+18-18

...	@@ -4,12 +4,12 @@ const AtomicOrder = builtin.AtomicOrder;	...	@@ -4,12 +4,12 @@ const AtomicOrder = builtin.AtomicOrder;
4	/// Many reader, many writer, non-allocating, thread-safe, lock-free	4	/// Many reader, many writer, non-allocating, thread-safe, lock-free
5	pub fn Stack(comptime T: type) type {	5	pub fn Stack(comptime T: type) type {
6	return struct {	6	return struct {
7	root: ?&Node,	7	root: ?*Node,
8		8
9	pub const Self = this;	9	pub const Self = this;
10		10
11	pub const Node = struct {	11	pub const Node = struct {
12	next: ?&Node,	12	next: ?*Node,
13	data: T,	13	data: T,
14	};	14	};
15		15
...	@@ -19,36 +19,36 @@ pub fn Stack(comptime T: type) type {	...	@@ -19,36 +19,36 @@ pub fn Stack(comptime T: type) type {
19		19
20	/// push operation, but only if you are the first item in the stack. if you did not succeed in	20	/// push operation, but only if you are the first item in the stack. if you did not succeed in
21	/// being the first item in the stack, returns the other item that was there.	21	/// being the first item in the stack, returns the other item that was there.
22	pub fn pushFirst(self: &Self, node: &Node) ?&Node {	22	pub fn pushFirst(self: Self, node: Node) ?*Node {
23	node.next = null;	23	node.next = null;
24	return @cmpxchgStrong(?&Node, &self.root, null, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst);	24	return @cmpxchgStrong(?*Node, &self.root, null, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst);
25	}	25	}
26		26
27	pub fn push(self: &Self, node: &Node) void {	27	pub fn push(self: Self, node: Node) void {
28	var root = @atomicLoad(?&Node, &self.root, AtomicOrder.SeqCst);	28	var root = @atomicLoad(?*Node, &self.root, AtomicOrder.SeqCst);
29	while (true) {	29	while (true) {
30	node.next = root;	30	node.next = root;
31	root = @cmpxchgWeak(?&Node, &self.root, root, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? break;	31	root = @cmpxchgWeak(?*Node, &self.root, root, node, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? break;
32	}	32	}
33	}	33	}
34		34
35	pub fn pop(self: &Self) ?&Node {	35	pub fn pop(self: Self) ?Node {
36	var root = @atomicLoad(?&Node, &self.root, AtomicOrder.SeqCst);	36	var root = @atomicLoad(?*Node, &self.root, AtomicOrder.SeqCst);
37	while (true) {	37	while (true) {
38	root = @cmpxchgWeak(?&Node, &self.root, root, (root ?? return null).next, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return root;	38	root = @cmpxchgWeak(?*Node, &self.root, root, (root ?? return null).next, AtomicOrder.SeqCst, AtomicOrder.SeqCst) ?? return root;
39	}	39	}
40	}	40	}
41		41
42	pub fn isEmpty(self: &Self) bool {	42	pub fn isEmpty(self: *Self) bool {
43	return @atomicLoad(?&Node, &self.root, AtomicOrder.SeqCst) == null;	43	return @atomicLoad(?*Node, &self.root, AtomicOrder.SeqCst) == null;
44	}	44	}
45	};	45	};
46	}	46	}
47		47
48	const std = @import("std");	48	const std = @import("std");
49	const Context = struct {	49	const Context = struct {
50	allocator: &std.mem.Allocator,	50	allocator: *std.mem.Allocator,
51	stack: &Stack(i32),	51	stack: *Stack(i32),
52	put_sum: isize,	52	put_sum: isize,
53	get_sum: isize,	53	get_sum: isize,
54	get_count: usize,	54	get_count: usize,
...	@@ -82,11 +82,11 @@ test "std.atomic.stack" {	...	@@ -82,11 +82,11 @@ test "std.atomic.stack" {
82	.get_count = 0,	82	.get_count = 0,
83	};	83	};
84		84
85	var putters: [put_thread_count]&std.os.Thread = undefined;	85	var putters: [put_thread_count]*std.os.Thread = undefined;
86	for (putters) \|*t\| {	86	for (putters) \|*t\| {
87	t.* = try std.os.spawnThread(&context, startPuts);	87	t.* = try std.os.spawnThread(&context, startPuts);
88	}	88	}
89	var getters: [put_thread_count]&std.os.Thread = undefined;	89	var getters: [put_thread_count]*std.os.Thread = undefined;
90	for (getters) \|*t\| {	90	for (getters) \|*t\| {
91	t.* = try std.os.spawnThread(&context, startGets);	91	t.* = try std.os.spawnThread(&context, startGets);
92	}	92	}
...	@@ -101,7 +101,7 @@ test "std.atomic.stack" {	...	@@ -101,7 +101,7 @@ test "std.atomic.stack" {
101	std.debug.assert(context.get_count == puts_per_thread * put_thread_count);	101	std.debug.assert(context.get_count == puts_per_thread * put_thread_count);
102	}	102	}
103		103
104	fn startPuts(ctx: &Context) u8 {	104	fn startPuts(ctx: *Context) u8 {
105	var put_count: usize = puts_per_thread;	105	var put_count: usize = puts_per_thread;
106	var r = std.rand.DefaultPrng.init(0xdeadbeef);	106	var r = std.rand.DefaultPrng.init(0xdeadbeef);
107	while (put_count != 0) : (put_count -= 1) {	107	while (put_count != 0) : (put_count -= 1) {
...	@@ -115,7 +115,7 @@ fn startPuts(ctx: &Context) u8 {	...	@@ -115,7 +115,7 @@ fn startPuts(ctx: &Context) u8 {
115	return 0;	115	return 0;
116	}	116	}
117		117
118	fn startGets(ctx: &Context) u8 {	118	fn startGets(ctx: *Context) u8 {
119	while (true) {	119	while (true) {
120	while (ctx.stack.pop()) \|node\| {	120	while (ctx.stack.pop()) \|node\| {
121	std.os.time.sleep(0, 1); // let the os scheduler be our fuzz	121	std.os.time.sleep(0, 1); // let the os scheduler be our fuzz

std/base64.zig+8-7

std/buf_map.zig+9-9

...	@@ -11,12 +11,12 @@ pub const BufMap = struct {	...	@@ -11,12 +11,12 @@ pub const BufMap = struct {
11		11
12	const BufMapHashMap = HashMap([]const u8, []const u8, mem.hash_slice_u8, mem.eql_slice_u8);	12	const BufMapHashMap = HashMap([]const u8, []const u8, mem.hash_slice_u8, mem.eql_slice_u8);
13		13
14	pub fn init(allocator: &Allocator) BufMap {	14	pub fn init(allocator: *Allocator) BufMap {
15	var self = BufMap{ .hash_map = BufMapHashMap.init(allocator) };	15	var self = BufMap{ .hash_map = BufMapHashMap.init(allocator) };
16	return self;	16	return self;
17	}	17	}
18		18
19	pub fn deinit(self: &const BufMap) void {	19	pub fn deinit(self: *const BufMap) void {
20	var it = self.hash_map.iterator();	20	var it = self.hash_map.iterator();
21	while (true) {	21	while (true) {
22	const entry = it.next() ?? break;	22	const entry = it.next() ?? break;
...	@@ -27,7 +27,7 @@ pub const BufMap = struct {	...	@@ -27,7 +27,7 @@ pub const BufMap = struct {
27	self.hash_map.deinit();	27	self.hash_map.deinit();
28	}	28	}
29		29
30	pub fn set(self: &BufMap, key: []const u8, value: []const u8) !void {	30	pub fn set(self: *BufMap, key: []const u8, value: []const u8) !void {
31	self.delete(key);	31	self.delete(key);
32	const key_copy = try self.copy(key);	32	const key_copy = try self.copy(key);
33	errdefer self.free(key_copy);	33	errdefer self.free(key_copy);
...	@@ -36,30 +36,30 @@ pub const BufMap = struct {	...	@@ -36,30 +36,30 @@ pub const BufMap = struct {
36	_ = try self.hash_map.put(key_copy, value_copy);	36	_ = try self.hash_map.put(key_copy, value_copy);
37	}	37	}
38		38
39	pub fn get(self: &const BufMap, key: []const u8) ?[]const u8 {	39	pub fn get(self: *const BufMap, key: []const u8) ?[]const u8 {
40	const entry = self.hash_map.get(key) ?? return null;	40	const entry = self.hash_map.get(key) ?? return null;
41	return entry.value;	41	return entry.value;
42	}	42	}
43		43
44	pub fn delete(self: &BufMap, key: []const u8) void {	44	pub fn delete(self: *BufMap, key: []const u8) void {
45	const entry = self.hash_map.remove(key) ?? return;	45	const entry = self.hash_map.remove(key) ?? return;
46	self.free(entry.key);	46	self.free(entry.key);
47	self.free(entry.value);	47	self.free(entry.value);
48	}	48	}
49		49
50	pub fn count(self: &const BufMap) usize {	50	pub fn count(self: *const BufMap) usize {
51	return self.hash_map.count();	51	return self.hash_map.count();
52	}	52	}
53		53
54	pub fn iterator(self: &const BufMap) BufMapHashMap.Iterator {	54	pub fn iterator(self: *const BufMap) BufMapHashMap.Iterator {
55	return self.hash_map.iterator();	55	return self.hash_map.iterator();
56	}	56	}
57		57
58	fn free(self: &const BufMap, value: []const u8) void {	58	fn free(self: *const BufMap, value: []const u8) void {
59	self.hash_map.allocator.free(value);	59	self.hash_map.allocator.free(value);
60	}	60	}
61		61
62	fn copy(self: &const BufMap, value: []const u8) ![]const u8 {	62	fn copy(self: *const BufMap, value: []const u8) ![]const u8 {
63	return mem.dupe(self.hash_map.allocator, u8, value);	63	return mem.dupe(self.hash_map.allocator, u8, value);
64	}	64	}
65	};	65	};

std/buf_set.zig+9-9

...	@@ -9,12 +9,12 @@ pub const BufSet = struct {	...	@@ -9,12 +9,12 @@ pub const BufSet = struct {
9		9
10	const BufSetHashMap = HashMap([]const u8, void, mem.hash_slice_u8, mem.eql_slice_u8);	10	const BufSetHashMap = HashMap([]const u8, void, mem.hash_slice_u8, mem.eql_slice_u8);
11		11
12	pub fn init(a: &Allocator) BufSet {	12	pub fn init(a: *Allocator) BufSet {
13	var self = BufSet{ .hash_map = BufSetHashMap.init(a) };	13	var self = BufSet{ .hash_map = BufSetHashMap.init(a) };
14	return self;	14	return self;
15	}	15	}
16		16
17	pub fn deinit(self: &const BufSet) void {	17	pub fn deinit(self: *const BufSet) void {
18	var it = self.hash_map.iterator();	18	var it = self.hash_map.iterator();
19	while (true) {	19	while (true) {
20	const entry = it.next() ?? break;	20	const entry = it.next() ?? break;
...	@@ -24,7 +24,7 @@ pub const BufSet = struct {	...	@@ -24,7 +24,7 @@ pub const BufSet = struct {
24	self.hash_map.deinit();	24	self.hash_map.deinit();
25	}	25	}
26		26
27	pub fn put(self: &BufSet, key: []const u8) !void {	27	pub fn put(self: *BufSet, key: []const u8) !void {
28	if (self.hash_map.get(key) == null) {	28	if (self.hash_map.get(key) == null) {
29	const key_copy = try self.copy(key);	29	const key_copy = try self.copy(key);
30	errdefer self.free(key_copy);	30	errdefer self.free(key_copy);
...	@@ -32,28 +32,28 @@ pub const BufSet = struct {	...	@@ -32,28 +32,28 @@ pub const BufSet = struct {
32	}	32	}
33	}	33	}
34		34
35	pub fn delete(self: &BufSet, key: []const u8) void {	35	pub fn delete(self: *BufSet, key: []const u8) void {
36	const entry = self.hash_map.remove(key) ?? return;	36	const entry = self.hash_map.remove(key) ?? return;
37	self.free(entry.key);	37	self.free(entry.key);
38	}	38	}
39		39
40	pub fn count(self: &const BufSet) usize {	40	pub fn count(self: *const BufSet) usize {
41	return self.hash_map.count();	41	return self.hash_map.count();
42	}	42	}
43		43
44	pub fn iterator(self: &const BufSet) BufSetHashMap.Iterator {	44	pub fn iterator(self: *const BufSet) BufSetHashMap.Iterator {
45	return self.hash_map.iterator();	45	return self.hash_map.iterator();
46	}	46	}
47		47
48	pub fn allocator(self: &const BufSet) &Allocator {	48	pub fn allocator(self: const BufSet) Allocator {
49	return self.hash_map.allocator;	49	return self.hash_map.allocator;
50	}	50	}
51		51
52	fn free(self: &const BufSet, value: []const u8) void {	52	fn free(self: *const BufSet, value: []const u8) void {
53	self.hash_map.allocator.free(value);	53	self.hash_map.allocator.free(value);
54	}	54	}
55		55
56	fn copy(self: &const BufSet, value: []const u8) ![]const u8 {	56	fn copy(self: *const BufSet, value: []const u8) ![]const u8 {
57	const result = try self.hash_map.allocator.alloc(u8, value.len);	57	const result = try self.hash_map.allocator.alloc(u8, value.len);
58	mem.copy(u8, result, value);	58	mem.copy(u8, result, value);
59	return result;	59	return result;

std/buffer.zig+20-20

...	@@ -12,14 +12,14 @@ pub const Buffer = struct {	...	@@ -12,14 +12,14 @@ pub const Buffer = struct {
12	list: ArrayList(u8),	12	list: ArrayList(u8),
13		13
14	/// Must deinitialize with deinit.	14	/// Must deinitialize with deinit.
15	pub fn init(allocator: &Allocator, m: []const u8) !Buffer {	15	pub fn init(allocator: *Allocator, m: []const u8) !Buffer {
16	var self = try initSize(allocator, m.len);	16	var self = try initSize(allocator, m.len);
17	mem.copy(u8, self.list.items, m);	17	mem.copy(u8, self.list.items, m);
18	return self;	18	return self;
19	}	19	}
20		20
21	/// Must deinitialize with deinit.	21	/// Must deinitialize with deinit.
22	pub fn initSize(allocator: &Allocator, size: usize) !Buffer {	22	pub fn initSize(allocator: *Allocator, size: usize) !Buffer {
23	var self = initNull(allocator);	23	var self = initNull(allocator);
24	try self.resize(size);	24	try self.resize(size);
25	return self;	25	return self;
...	@@ -30,19 +30,19 @@ pub const Buffer = struct {	...	@@ -30,19 +30,19 @@ pub const Buffer = struct {
30	/// * ::replaceContents	30	/// * ::replaceContents
31	/// * ::replaceContentsBuffer	31	/// * ::replaceContentsBuffer
32	/// * ::resize	32	/// * ::resize
33	pub fn initNull(allocator: &Allocator) Buffer {	33	pub fn initNull(allocator: *Allocator) Buffer {
34	return Buffer{ .list = ArrayList(u8).init(allocator) };	34	return Buffer{ .list = ArrayList(u8).init(allocator) };
35	}	35	}
36		36
37	/// Must deinitialize with deinit.	37	/// Must deinitialize with deinit.
38	pub fn initFromBuffer(buffer: &const Buffer) !Buffer {	38	pub fn initFromBuffer(buffer: *const Buffer) !Buffer {
39	return Buffer.init(buffer.list.allocator, buffer.toSliceConst());	39	return Buffer.init(buffer.list.allocator, buffer.toSliceConst());
40	}	40	}
41		41
42	/// Buffer takes ownership of the passed in slice. The slice must have been	42	/// Buffer takes ownership of the passed in slice. The slice must have been
43	/// allocated with `allocator`.	43	/// allocated with `allocator`.
44	/// Must deinitialize with deinit.	44	/// Must deinitialize with deinit.
45	pub fn fromOwnedSlice(allocator: &Allocator, slice: []u8) Buffer {	45	pub fn fromOwnedSlice(allocator: *Allocator, slice: []u8) Buffer {
46	var self = Buffer{ .list = ArrayList(u8).fromOwnedSlice(allocator, slice) };	46	var self = Buffer{ .list = ArrayList(u8).fromOwnedSlice(allocator, slice) };
47	self.list.append(0);	47	self.list.append(0);
48	return self;	48	return self;
...	@@ -50,79 +50,79 @@ pub const Buffer = struct {	...	@@ -50,79 +50,79 @@ pub const Buffer = struct {
50		50
51	/// The caller owns the returned memory. The Buffer becomes null and	51	/// The caller owns the returned memory. The Buffer becomes null and
52	/// is safe to `deinit`.	52	/// is safe to `deinit`.
53	pub fn toOwnedSlice(self: &Buffer) []u8 {	53	pub fn toOwnedSlice(self: *Buffer) []u8 {
54	const allocator = self.list.allocator;	54	const allocator = self.list.allocator;
55	const result = allocator.shrink(u8, self.list.items, self.len());	55	const result = allocator.shrink(u8, self.list.items, self.len());
56	self.* = initNull(allocator);	56	self.* = initNull(allocator);
57	return result;	57	return result;
58	}	58	}
59		59
60	pub fn deinit(self: &Buffer) void {	60	pub fn deinit(self: *Buffer) void {
61	self.list.deinit();	61	self.list.deinit();
62	}	62	}
63		63
64	pub fn toSlice(self: &const Buffer) []u8 {	64	pub fn toSlice(self: *const Buffer) []u8 {
65	return self.list.toSlice()[0..self.len()];	65	return self.list.toSlice()[0..self.len()];
66	}	66	}
67		67
68	pub fn toSliceConst(self: &const Buffer) []const u8 {	68	pub fn toSliceConst(self: *const Buffer) []const u8 {
69	return self.list.toSliceConst()[0..self.len()];	69	return self.list.toSliceConst()[0..self.len()];
70	}	70	}
71		71
72	pub fn shrink(self: &Buffer, new_len: usize) void {	72	pub fn shrink(self: *Buffer, new_len: usize) void {
73	assert(new_len <= self.len());	73	assert(new_len <= self.len());
74	self.list.shrink(new_len + 1);	74	self.list.shrink(new_len + 1);
75	self.list.items[self.len()] = 0;	75	self.list.items[self.len()] = 0;
76	}	76	}
77		77
78	pub fn resize(self: &Buffer, new_len: usize) !void {	78	pub fn resize(self: *Buffer, new_len: usize) !void {
79	try self.list.resize(new_len + 1);	79	try self.list.resize(new_len + 1);
80	self.list.items[self.len()] = 0;	80	self.list.items[self.len()] = 0;
81	}	81	}
82		82
83	pub fn isNull(self: &const Buffer) bool {	83	pub fn isNull(self: *const Buffer) bool {
84	return self.list.len == 0;	84	return self.list.len == 0;
85	}	85	}
86		86
87	pub fn len(self: &const Buffer) usize {	87	pub fn len(self: *const Buffer) usize {
88	return self.list.len - 1;	88	return self.list.len - 1;
89	}	89	}
90		90
91	pub fn append(self: &Buffer, m: []const u8) !void {	91	pub fn append(self: *Buffer, m: []const u8) !void {
92	const old_len = self.len();	92	const old_len = self.len();
93	try self.resize(old_len + m.len);	93	try self.resize(old_len + m.len);
94	mem.copy(u8, self.list.toSlice()[old_len..], m);	94	mem.copy(u8, self.list.toSlice()[old_len..], m);
95	}	95	}
96		96
97	pub fn appendByte(self: &Buffer, byte: u8) !void {	97	pub fn appendByte(self: *Buffer, byte: u8) !void {
98	const old_len = self.len();	98	const old_len = self.len();
99	try self.resize(old_len + 1);	99	try self.resize(old_len + 1);
100	self.list.toSlice()[old_len] = byte;	100	self.list.toSlice()[old_len] = byte;
101	}	101	}
102		102
103	pub fn eql(self: &const Buffer, m: []const u8) bool {	103	pub fn eql(self: *const Buffer, m: []const u8) bool {
104	return mem.eql(u8, self.toSliceConst(), m);	104	return mem.eql(u8, self.toSliceConst(), m);
105	}	105	}
106		106
107	pub fn startsWith(self: &const Buffer, m: []const u8) bool {	107	pub fn startsWith(self: *const Buffer, m: []const u8) bool {
108	if (self.len() < m.len) return false;	108	if (self.len() < m.len) return false;
109	return mem.eql(u8, self.list.items[0..m.len], m);	109	return mem.eql(u8, self.list.items[0..m.len], m);
110	}	110	}
111		111
112	pub fn endsWith(self: &const Buffer, m: []const u8) bool {	112	pub fn endsWith(self: *const Buffer, m: []const u8) bool {
113	const l = self.len();	113	const l = self.len();
114	if (l < m.len) return false;	114	if (l < m.len) return false;
115	const start = l - m.len;	115	const start = l - m.len;
116	return mem.eql(u8, self.list.items[start..l], m);	116	return mem.eql(u8, self.list.items[start..l], m);
117	}	117	}
118		118
119	pub fn replaceContents(self: &const Buffer, m: []const u8) !void {	119	pub fn replaceContents(self: *const Buffer, m: []const u8) !void {
120	try self.resize(m.len);	120	try self.resize(m.len);
121	mem.copy(u8, self.list.toSlice(), m);	121	mem.copy(u8, self.list.toSlice(), m);
122	}	122	}
123		123
124	/// For passing to C functions.	124	/// For passing to C functions.
125	pub fn ptr(self: &const Buffer) &u8 {	125	pub fn ptr(self: const Buffer) []u8 {
126	return self.list.items.ptr;	126	return self.list.items.ptr;
127	}	127	}
128	};	128	};

std/build.zig+139-139

...	@@ -20,7 +20,7 @@ pub const Builder = struct {	...	@@ -20,7 +20,7 @@ pub const Builder = struct {
20	install_tls: TopLevelStep,	20	install_tls: TopLevelStep,
21	have_uninstall_step: bool,	21	have_uninstall_step: bool,
22	have_install_step: bool,	22	have_install_step: bool,
23	allocator: &Allocator,	23	allocator: *Allocator,
24	lib_paths: ArrayList([]const u8),	24	lib_paths: ArrayList([]const u8),
25	include_paths: ArrayList([]const u8),	25	include_paths: ArrayList([]const u8),
26	rpaths: ArrayList([]const u8),	26	rpaths: ArrayList([]const u8),
...	@@ -36,9 +36,9 @@ pub const Builder = struct {	...	@@ -36,9 +36,9 @@ pub const Builder = struct {
36	verbose_cimport: bool,	36	verbose_cimport: bool,
37	invalid_user_input: bool,	37	invalid_user_input: bool,
38	zig_exe: []const u8,	38	zig_exe: []const u8,
39	default_step: &Step,	39	default_step: *Step,
40	env_map: BufMap,	40	env_map: BufMap,
41	top_level_steps: ArrayList(&TopLevelStep),	41	top_level_steps: ArrayList(*TopLevelStep),
42	prefix: []const u8,	42	prefix: []const u8,
43	search_prefixes: ArrayList([]const u8),	43	search_prefixes: ArrayList([]const u8),
44	lib_dir: []const u8,	44	lib_dir: []const u8,
...	@@ -82,7 +82,7 @@ pub const Builder = struct {	...	@@ -82,7 +82,7 @@ pub const Builder = struct {
82	description: []const u8,	82	description: []const u8,
83	};	83	};
84		84
85	pub fn init(allocator: &Allocator, zig_exe: []const u8, build_root: []const u8, cache_root: []const u8) Builder {	85	pub fn init(allocator: *Allocator, zig_exe: []const u8, build_root: []const u8, cache_root: []const u8) Builder {
86	var self = Builder{	86	var self = Builder{
87	.zig_exe = zig_exe,	87	.zig_exe = zig_exe,
88	.build_root = build_root,	88	.build_root = build_root,
...	@@ -102,7 +102,7 @@ pub const Builder = struct {	...	@@ -102,7 +102,7 @@ pub const Builder = struct {
102	.user_input_options = UserInputOptionsMap.init(allocator),	102	.user_input_options = UserInputOptionsMap.init(allocator),
103	.available_options_map = AvailableOptionsMap.init(allocator),	103	.available_options_map = AvailableOptionsMap.init(allocator),
104	.available_options_list = ArrayList(AvailableOption).init(allocator),	104	.available_options_list = ArrayList(AvailableOption).init(allocator),
105	.top_level_steps = ArrayList(&TopLevelStep).init(allocator),	105	.top_level_steps = ArrayList(*TopLevelStep).init(allocator),
106	.default_step = undefined,	106	.default_step = undefined,
107	.env_map = os.getEnvMap(allocator) catch unreachable,	107	.env_map = os.getEnvMap(allocator) catch unreachable,
108	.prefix = undefined,	108	.prefix = undefined,
...	@@ -127,7 +127,7 @@ pub const Builder = struct {	...	@@ -127,7 +127,7 @@ pub const Builder = struct {
127	return self;	127	return self;
128	}	128	}
129		129
130	pub fn deinit(self: &Builder) void {	130	pub fn deinit(self: *Builder) void {
131	self.lib_paths.deinit();	131	self.lib_paths.deinit();
132	self.include_paths.deinit();	132	self.include_paths.deinit();
133	self.rpaths.deinit();	133	self.rpaths.deinit();
...	@@ -135,81 +135,81 @@ pub const Builder = struct {	...	@@ -135,81 +135,81 @@ pub const Builder = struct {
135	self.top_level_steps.deinit();	135	self.top_level_steps.deinit();
136	}	136	}
137		137
138	pub fn setInstallPrefix(self: &Builder, maybe_prefix: ?[]const u8) void {	138	pub fn setInstallPrefix(self: *Builder, maybe_prefix: ?[]const u8) void {
139	self.prefix = maybe_prefix ?? "/usr/local"; // TODO better default	139	self.prefix = maybe_prefix ?? "/usr/local"; // TODO better default
140	self.lib_dir = os.path.join(self.allocator, self.prefix, "lib") catch unreachable;	140	self.lib_dir = os.path.join(self.allocator, self.prefix, "lib") catch unreachable;
141	self.exe_dir = os.path.join(self.allocator, self.prefix, "bin") catch unreachable;	141	self.exe_dir = os.path.join(self.allocator, self.prefix, "bin") catch unreachable;
142	}	142	}
143		143
144	pub fn addExecutable(self: &Builder, name: []const u8, root_src: ?[]const u8) &LibExeObjStep {	144	pub fn addExecutable(self: Builder, name: []const u8, root_src: ?[]const u8) LibExeObjStep {
145	return LibExeObjStep.createExecutable(self, name, root_src);	145	return LibExeObjStep.createExecutable(self, name, root_src);
146	}	146	}
147		147
148	pub fn addObject(self: &Builder, name: []const u8, root_src: []const u8) &LibExeObjStep {	148	pub fn addObject(self: Builder, name: []const u8, root_src: []const u8) LibExeObjStep {
149	return LibExeObjStep.createObject(self, name, root_src);	149	return LibExeObjStep.createObject(self, name, root_src);
150	}	150	}
151		151
152	pub fn addSharedLibrary(self: &Builder, name: []const u8, root_src: ?[]const u8, ver: &const Version) &LibExeObjStep {	152	pub fn addSharedLibrary(self: Builder, name: []const u8, root_src: ?[]const u8, ver: const Version) *LibExeObjStep {
153	return LibExeObjStep.createSharedLibrary(self, name, root_src, ver);	153	return LibExeObjStep.createSharedLibrary(self, name, root_src, ver);
154	}	154	}
155		155
156	pub fn addStaticLibrary(self: &Builder, name: []const u8, root_src: ?[]const u8) &LibExeObjStep {	156	pub fn addStaticLibrary(self: Builder, name: []const u8, root_src: ?[]const u8) LibExeObjStep {
157	return LibExeObjStep.createStaticLibrary(self, name, root_src);	157	return LibExeObjStep.createStaticLibrary(self, name, root_src);
158	}	158	}
159		159
160	pub fn addTest(self: &Builder, root_src: []const u8) &TestStep {	160	pub fn addTest(self: Builder, root_src: []const u8) TestStep {
161	const test_step = self.allocator.create(TestStep) catch unreachable;	161	const test_step = self.allocator.create(TestStep) catch unreachable;
162	test_step.* = TestStep.init(self, root_src);	162	test_step.* = TestStep.init(self, root_src);
163	return test_step;	163	return test_step;
164	}	164	}
165		165
166	pub fn addAssemble(self: &Builder, name: []const u8, src: []const u8) &LibExeObjStep {	166	pub fn addAssemble(self: Builder, name: []const u8, src: []const u8) LibExeObjStep {
167	const obj_step = LibExeObjStep.createObject(self, name, null);	167	const obj_step = LibExeObjStep.createObject(self, name, null);
168	obj_step.addAssemblyFile(src);	168	obj_step.addAssemblyFile(src);
169	return obj_step;	169	return obj_step;
170	}	170	}
171		171
172	pub fn addCStaticLibrary(self: &Builder, name: []const u8) &LibExeObjStep {	172	pub fn addCStaticLibrary(self: Builder, name: []const u8) LibExeObjStep {
173	return LibExeObjStep.createCStaticLibrary(self, name);	173	return LibExeObjStep.createCStaticLibrary(self, name);
174	}	174	}
175		175
176	pub fn addCSharedLibrary(self: &Builder, name: []const u8, ver: &const Version) &LibExeObjStep {	176	pub fn addCSharedLibrary(self: Builder, name: []const u8, ver: const Version) *LibExeObjStep {
177	return LibExeObjStep.createCSharedLibrary(self, name, ver);	177	return LibExeObjStep.createCSharedLibrary(self, name, ver);
178	}	178	}
179		179
180	pub fn addCExecutable(self: &Builder, name: []const u8) &LibExeObjStep {	180	pub fn addCExecutable(self: Builder, name: []const u8) LibExeObjStep {
181	return LibExeObjStep.createCExecutable(self, name);	181	return LibExeObjStep.createCExecutable(self, name);
182	}	182	}
183		183
184	pub fn addCObject(self: &Builder, name: []const u8, src: []const u8) &LibExeObjStep {	184	pub fn addCObject(self: Builder, name: []const u8, src: []const u8) LibExeObjStep {
185	return LibExeObjStep.createCObject(self, name, src);	185	return LibExeObjStep.createCObject(self, name, src);
186	}	186	}
187		187
188	/// ::argv is copied.	188	/// ::argv is copied.
189	pub fn addCommand(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap, argv: []const []const u8) &CommandStep {	189	pub fn addCommand(self: Builder, cwd: ?[]const u8, env_map: const BufMap, argv: []const []const u8) *CommandStep {
190	return CommandStep.create(self, cwd, env_map, argv);	190	return CommandStep.create(self, cwd, env_map, argv);
191	}	191	}
192		192
193	pub fn addWriteFile(self: &Builder, file_path: []const u8, data: []const u8) &WriteFileStep {	193	pub fn addWriteFile(self: Builder, file_path: []const u8, data: []const u8) WriteFileStep {
194	const write_file_step = self.allocator.create(WriteFileStep) catch unreachable;	194	const write_file_step = self.allocator.create(WriteFileStep) catch unreachable;
195	write_file_step.* = WriteFileStep.init(self, file_path, data);	195	write_file_step.* = WriteFileStep.init(self, file_path, data);
196	return write_file_step;	196	return write_file_step;
197	}	197	}
198		198
199	pub fn addLog(self: &Builder, comptime format: []const u8, args: ...) &LogStep {	199	pub fn addLog(self: Builder, comptime format: []const u8, args: ...) LogStep {
200	const data = self.fmt(format, args);	200	const data = self.fmt(format, args);
201	const log_step = self.allocator.create(LogStep) catch unreachable;	201	const log_step = self.allocator.create(LogStep) catch unreachable;
202	log_step.* = LogStep.init(self, data);	202	log_step.* = LogStep.init(self, data);
203	return log_step;	203	return log_step;
204	}	204	}
205		205
206	pub fn addRemoveDirTree(self: &Builder, dir_path: []const u8) &RemoveDirStep {	206	pub fn addRemoveDirTree(self: Builder, dir_path: []const u8) RemoveDirStep {
207	const remove_dir_step = self.allocator.create(RemoveDirStep) catch unreachable;	207	const remove_dir_step = self.allocator.create(RemoveDirStep) catch unreachable;
208	remove_dir_step.* = RemoveDirStep.init(self, dir_path);	208	remove_dir_step.* = RemoveDirStep.init(self, dir_path);
209	return remove_dir_step;	209	return remove_dir_step;
210	}	210	}
211		211
212	pub fn version(self: &const Builder, major: u32, minor: u32, patch: u32) Version {	212	pub fn version(self: *const Builder, major: u32, minor: u32, patch: u32) Version {
213	return Version{	213	return Version{
214	.major = major,	214	.major = major,
215	.minor = minor,	215	.minor = minor,
...	@@ -217,20 +217,20 @@ pub const Builder = struct {	...	@@ -217,20 +217,20 @@ pub const Builder = struct {
217	};	217	};
218	}	218	}
219		219
220	pub fn addCIncludePath(self: &Builder, path: []const u8) void {	220	pub fn addCIncludePath(self: *Builder, path: []const u8) void {
221	self.include_paths.append(path) catch unreachable;	221	self.include_paths.append(path) catch unreachable;
222	}	222	}
223		223
224	pub fn addRPath(self: &Builder, path: []const u8) void {	224	pub fn addRPath(self: *Builder, path: []const u8) void {
225	self.rpaths.append(path) catch unreachable;	225	self.rpaths.append(path) catch unreachable;
226	}	226	}
227		227
228	pub fn addLibPath(self: &Builder, path: []const u8) void {	228	pub fn addLibPath(self: *Builder, path: []const u8) void {
229	self.lib_paths.append(path) catch unreachable;	229	self.lib_paths.append(path) catch unreachable;
230	}	230	}
231		231
232	pub fn make(self: &Builder, step_names: []const []const u8) !void {	232	pub fn make(self: *Builder, step_names: []const []const u8) !void {
233	var wanted_steps = ArrayList(&Step).init(self.allocator);	233	var wanted_steps = ArrayList(*Step).init(self.allocator);
234	defer wanted_steps.deinit();	234	defer wanted_steps.deinit();
235		235
236	if (step_names.len == 0) {	236	if (step_names.len == 0) {
...	@@ -247,7 +247,7 @@ pub const Builder = struct {	...	@@ -247,7 +247,7 @@ pub const Builder = struct {
247	}	247	}
248	}	248	}
249		249
250	pub fn getInstallStep(self: &Builder) &Step {	250	pub fn getInstallStep(self: Builder) Step {
251	if (self.have_install_step) return &self.install_tls.step;	251	if (self.have_install_step) return &self.install_tls.step;
252		252
253	self.top_level_steps.append(&self.install_tls) catch unreachable;	253	self.top_level_steps.append(&self.install_tls) catch unreachable;
...	@@ -255,7 +255,7 @@ pub const Builder = struct {	...	@@ -255,7 +255,7 @@ pub const Builder = struct {
255	return &self.install_tls.step;	255	return &self.install_tls.step;
256	}	256	}
257		257
258	pub fn getUninstallStep(self: &Builder) &Step {	258	pub fn getUninstallStep(self: Builder) Step {
259	if (self.have_uninstall_step) return &self.uninstall_tls.step;	259	if (self.have_uninstall_step) return &self.uninstall_tls.step;
260		260
261	self.top_level_steps.append(&self.uninstall_tls) catch unreachable;	261	self.top_level_steps.append(&self.uninstall_tls) catch unreachable;
...	@@ -263,7 +263,7 @@ pub const Builder = struct {	...	@@ -263,7 +263,7 @@ pub const Builder = struct {
263	return &self.uninstall_tls.step;	263	return &self.uninstall_tls.step;
264	}	264	}
265		265
266	fn makeUninstall(uninstall_step: &Step) error!void {	266	fn makeUninstall(uninstall_step: *Step) error!void {
267	const uninstall_tls = @fieldParentPtr(TopLevelStep, "step", uninstall_step);	267	const uninstall_tls = @fieldParentPtr(TopLevelStep, "step", uninstall_step);
268	const self = @fieldParentPtr(Builder, "uninstall_tls", uninstall_tls);	268	const self = @fieldParentPtr(Builder, "uninstall_tls", uninstall_tls);
269		269
...	@@ -277,7 +277,7 @@ pub const Builder = struct {	...	@@ -277,7 +277,7 @@ pub const Builder = struct {
277	// TODO remove empty directories	277	// TODO remove empty directories
278	}	278	}
279		279
280	fn makeOneStep(self: &Builder, s: &Step) error!void {	280	fn makeOneStep(self: Builder, s: Step) error!void {
281	if (s.loop_flag) {	281	if (s.loop_flag) {
282	warn("Dependency loop detected:\n {}\n", s.name);	282	warn("Dependency loop detected:\n {}\n", s.name);
283	return error.DependencyLoopDetected;	283	return error.DependencyLoopDetected;
...	@@ -298,7 +298,7 @@ pub const Builder = struct {	...	@@ -298,7 +298,7 @@ pub const Builder = struct {
298	try s.make();	298	try s.make();
299	}	299	}
300		300
301	fn getTopLevelStepByName(self: &Builder, name: []const u8) !&Step {	301	fn getTopLevelStepByName(self: Builder, name: []const u8) !Step {
302	for (self.top_level_steps.toSliceConst()) \|top_level_step\| {	302	for (self.top_level_steps.toSliceConst()) \|top_level_step\| {
303	if (mem.eql(u8, top_level_step.step.name, name)) {	303	if (mem.eql(u8, top_level_step.step.name, name)) {
304	return &top_level_step.step;	304	return &top_level_step.step;
...	@@ -308,7 +308,7 @@ pub const Builder = struct {	...	@@ -308,7 +308,7 @@ pub const Builder = struct {
308	return error.InvalidStepName;	308	return error.InvalidStepName;
309	}	309	}
310		310
311	fn processNixOSEnvVars(self: &Builder) void {	311	fn processNixOSEnvVars(self: *Builder) void {
312	if (os.getEnvVarOwned(self.allocator, "NIX_CFLAGS_COMPILE")) \|nix_cflags_compile\| {	312	if (os.getEnvVarOwned(self.allocator, "NIX_CFLAGS_COMPILE")) \|nix_cflags_compile\| {
313	var it = mem.split(nix_cflags_compile, " ");	313	var it = mem.split(nix_cflags_compile, " ");
314	while (true) {	314	while (true) {
...	@@ -350,7 +350,7 @@ pub const Builder = struct {	...	@@ -350,7 +350,7 @@ pub const Builder = struct {
350	}	350	}
351	}	351	}
352		352
353	pub fn option(self: &Builder, comptime T: type, name: []const u8, description: []const u8) ?T {	353	pub fn option(self: *Builder, comptime T: type, name: []const u8, description: []const u8) ?T {
354	const type_id = comptime typeToEnum(T);	354	const type_id = comptime typeToEnum(T);
355	const available_option = AvailableOption{	355	const available_option = AvailableOption{
356	.name = name,	356	.name = name,
...	@@ -403,7 +403,7 @@ pub const Builder = struct {	...	@@ -403,7 +403,7 @@ pub const Builder = struct {
403	}	403	}
404	}	404	}
405		405
406	pub fn step(self: &Builder, name: []const u8, description: []const u8) &Step {	406	pub fn step(self: Builder, name: []const u8, description: []const u8) Step {
407	const step_info = self.allocator.create(TopLevelStep) catch unreachable;	407	const step_info = self.allocator.create(TopLevelStep) catch unreachable;
408	step_info.* = TopLevelStep{	408	step_info.* = TopLevelStep{
409	.step = Step.initNoOp(name, self.allocator),	409	.step = Step.initNoOp(name, self.allocator),
...	@@ -413,7 +413,7 @@ pub const Builder = struct {	...	@@ -413,7 +413,7 @@ pub const Builder = struct {
413	return &step_info.step;	413	return &step_info.step;
414	}	414	}
415		415
416	pub fn standardReleaseOptions(self: &Builder) builtin.Mode {	416	pub fn standardReleaseOptions(self: *Builder) builtin.Mode {
417	if (self.release_mode) \|mode\| return mode;	417	if (self.release_mode) \|mode\| return mode;
418		418
419	const release_safe = self.option(bool, "release-safe", "optimizations on and safety on") ?? false;	419	const release_safe = self.option(bool, "release-safe", "optimizations on and safety on") ?? false;
...	@@ -429,7 +429,7 @@ pub const Builder = struct {	...	@@ -429,7 +429,7 @@ pub const Builder = struct {
429	return mode;	429	return mode;
430	}	430	}
431		431
432	pub fn addUserInputOption(self: &Builder, name: []const u8, value: []const u8) bool {	432	pub fn addUserInputOption(self: *Builder, name: []const u8, value: []const u8) bool {
433	if (self.user_input_options.put(name, UserInputOption{	433	if (self.user_input_options.put(name, UserInputOption{
434	.name = name,	434	.name = name,
435	.value = UserValue{ .Scalar = value },	435	.value = UserValue{ .Scalar = value },
...	@@ -466,7 +466,7 @@ pub const Builder = struct {	...	@@ -466,7 +466,7 @@ pub const Builder = struct {
466	return false;	466	return false;
467	}	467	}
468		468
469	pub fn addUserInputFlag(self: &Builder, name: []const u8) bool {	469	pub fn addUserInputFlag(self: *Builder, name: []const u8) bool {
470	if (self.user_input_options.put(name, UserInputOption{	470	if (self.user_input_options.put(name, UserInputOption{
471	.name = name,	471	.name = name,
472	.value = UserValue{ .Flag = {} },	472	.value = UserValue{ .Flag = {} },
...	@@ -500,7 +500,7 @@ pub const Builder = struct {	...	@@ -500,7 +500,7 @@ pub const Builder = struct {
500	};	500	};
501	}	501	}
502		502
503	fn markInvalidUserInput(self: &Builder) void {	503	fn markInvalidUserInput(self: *Builder) void {
504	self.invalid_user_input = true;	504	self.invalid_user_input = true;
505	}	505	}
506		506
...	@@ -514,7 +514,7 @@ pub const Builder = struct {	...	@@ -514,7 +514,7 @@ pub const Builder = struct {
514	};	514	};
515	}	515	}
516		516
517	pub fn validateUserInputDidItFail(self: &Builder) bool {	517	pub fn validateUserInputDidItFail(self: *Builder) bool {
518	// make sure all args are used	518	// make sure all args are used
519	var it = self.user_input_options.iterator();	519	var it = self.user_input_options.iterator();
520	while (true) {	520	while (true) {
...	@@ -528,7 +528,7 @@ pub const Builder = struct {	...	@@ -528,7 +528,7 @@ pub const Builder = struct {
528	return self.invalid_user_input;	528	return self.invalid_user_input;
529	}	529	}
530		530
531	fn spawnChild(self: &Builder, argv: []const []const u8) !void {	531	fn spawnChild(self: *Builder, argv: []const []const u8) !void {
532	return self.spawnChildEnvMap(null, &self.env_map, argv);	532	return self.spawnChildEnvMap(null, &self.env_map, argv);
533	}	533	}
534		534
...	@@ -540,7 +540,7 @@ pub const Builder = struct {	...	@@ -540,7 +540,7 @@ pub const Builder = struct {
540	warn("\n");	540	warn("\n");
541	}	541	}
542		542
543	fn spawnChildEnvMap(self: &Builder, cwd: ?[]const u8, env_map: &const BufMap, argv: []const []const u8) !void {	543	fn spawnChildEnvMap(self: Builder, cwd: ?[]const u8, env_map: const BufMap, argv: []const []const u8) !void {
544	if (self.verbose) {	544	if (self.verbose) {
545	printCmd(cwd, argv);	545	printCmd(cwd, argv);
546	}	546	}
...	@@ -573,28 +573,28 @@ pub const Builder = struct {	...	@@ -573,28 +573,28 @@ pub const Builder = struct {
573	}	573	}
574	}	574	}
575		575
576	pub fn makePath(self: &Builder, path: []const u8) !void {	576	pub fn makePath(self: *Builder, path: []const u8) !void {
577	os.makePath(self.allocator, self.pathFromRoot(path)) catch \|err\| {	577	os.makePath(self.allocator, self.pathFromRoot(path)) catch \|err\| {
578	warn("Unable to create path {}: {}\n", path, @errorName(err));	578	warn("Unable to create path {}: {}\n", path, @errorName(err));
579	return err;	579	return err;
580	};	580	};
581	}	581	}
582		582
583	pub fn installArtifact(self: &Builder, artifact: &LibExeObjStep) void {	583	pub fn installArtifact(self: Builder, artifact: LibExeObjStep) void {
584	self.getInstallStep().dependOn(&self.addInstallArtifact(artifact).step);	584	self.getInstallStep().dependOn(&self.addInstallArtifact(artifact).step);
585	}	585	}
586		586
587	pub fn addInstallArtifact(self: &Builder, artifact: &LibExeObjStep) &InstallArtifactStep {	587	pub fn addInstallArtifact(self: Builder, artifact: LibExeObjStep) *InstallArtifactStep {
588	return InstallArtifactStep.create(self, artifact);	588	return InstallArtifactStep.create(self, artifact);
589	}	589	}
590		590
591	///::dest_rel_path is relative to prefix path or it can be an absolute path	591	///::dest_rel_path is relative to prefix path or it can be an absolute path
592	pub fn installFile(self: &Builder, src_path: []const u8, dest_rel_path: []const u8) void {	592	pub fn installFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) void {
593	self.getInstallStep().dependOn(&self.addInstallFile(src_path, dest_rel_path).step);	593	self.getInstallStep().dependOn(&self.addInstallFile(src_path, dest_rel_path).step);
594	}	594	}
595		595
596	///::dest_rel_path is relative to prefix path or it can be an absolute path	596	///::dest_rel_path is relative to prefix path or it can be an absolute path
597	pub fn addInstallFile(self: &Builder, src_path: []const u8, dest_rel_path: []const u8) &InstallFileStep {	597	pub fn addInstallFile(self: Builder, src_path: []const u8, dest_rel_path: []const u8) InstallFileStep {
598	const full_dest_path = os.path.resolve(self.allocator, self.prefix, dest_rel_path) catch unreachable;	598	const full_dest_path = os.path.resolve(self.allocator, self.prefix, dest_rel_path) catch unreachable;
599	self.pushInstalledFile(full_dest_path);	599	self.pushInstalledFile(full_dest_path);
600		600
...	@@ -603,16 +603,16 @@ pub const Builder = struct {	...	@@ -603,16 +603,16 @@ pub const Builder = struct {
603	return install_step;	603	return install_step;
604	}	604	}
605		605
606	pub fn pushInstalledFile(self: &Builder, full_path: []const u8) void {	606	pub fn pushInstalledFile(self: *Builder, full_path: []const u8) void {
607	_ = self.getUninstallStep();	607	_ = self.getUninstallStep();
608	self.installed_files.append(full_path) catch unreachable;	608	self.installed_files.append(full_path) catch unreachable;
609	}	609	}
610		610
611	fn copyFile(self: &Builder, source_path: []const u8, dest_path: []const u8) !void {	611	fn copyFile(self: *Builder, source_path: []const u8, dest_path: []const u8) !void {
612	return self.copyFileMode(source_path, dest_path, os.default_file_mode);	612	return self.copyFileMode(source_path, dest_path, os.default_file_mode);
613	}	613	}
614		614
615	fn copyFileMode(self: &Builder, source_path: []const u8, dest_path: []const u8, mode: os.FileMode) !void {	615	fn copyFileMode(self: *Builder, source_path: []const u8, dest_path: []const u8, mode: os.FileMode) !void {
616	if (self.verbose) {	616	if (self.verbose) {
617	warn("cp {} {}\n", source_path, dest_path);	617	warn("cp {} {}\n", source_path, dest_path);
618	}	618	}
...	@@ -629,15 +629,15 @@ pub const Builder = struct {	...	@@ -629,15 +629,15 @@ pub const Builder = struct {
629	};	629	};
630	}	630	}
631		631
632	fn pathFromRoot(self: &Builder, rel_path: []const u8) []u8 {	632	fn pathFromRoot(self: *Builder, rel_path: []const u8) []u8 {
633	return os.path.resolve(self.allocator, self.build_root, rel_path) catch unreachable;	633	return os.path.resolve(self.allocator, self.build_root, rel_path) catch unreachable;
634	}	634	}
635		635
636	pub fn fmt(self: &Builder, comptime format: []const u8, args: ...) []u8 {	636	pub fn fmt(self: *Builder, comptime format: []const u8, args: ...) []u8 {
637	return fmt_lib.allocPrint(self.allocator, format, args) catch unreachable;	637	return fmt_lib.allocPrint(self.allocator, format, args) catch unreachable;
638	}	638	}
639		639
640	fn getCCExe(self: &Builder) []const u8 {	640	fn getCCExe(self: *Builder) []const u8 {
641	if (builtin.environ == builtin.Environ.msvc) {	641	if (builtin.environ == builtin.Environ.msvc) {
642	return "cl.exe";	642	return "cl.exe";
643	} else {	643	} else {
...	@@ -645,7 +645,7 @@ pub const Builder = struct {	...	@@ -645,7 +645,7 @@ pub const Builder = struct {
645	}	645	}
646	}	646	}
647		647
648	pub fn findProgram(self: &Builder, names: []const []const u8, paths: []const []const u8) ![]const u8 {	648	pub fn findProgram(self: *Builder, names: []const []const u8, paths: []const []const u8) ![]const u8 {
649	// TODO report error for ambiguous situations	649	// TODO report error for ambiguous situations
650	const exe_extension = (Target{ .Native = {} }).exeFileExt();	650	const exe_extension = (Target{ .Native = {} }).exeFileExt();
651	for (self.search_prefixes.toSliceConst()) \|search_prefix\| {	651	for (self.search_prefixes.toSliceConst()) \|search_prefix\| {
...	@@ -693,7 +693,7 @@ pub const Builder = struct {	...	@@ -693,7 +693,7 @@ pub const Builder = struct {
693	return error.FileNotFound;	693	return error.FileNotFound;
694	}	694	}
695		695
696	pub fn exec(self: &Builder, argv: []const []const u8) ![]u8 {	696	pub fn exec(self: *Builder, argv: []const []const u8) ![]u8 {
697	const max_output_size = 100 * 1024;	697	const max_output_size = 100 * 1024;
698	const result = try os.ChildProcess.exec(self.allocator, argv, null, null, max_output_size);	698	const result = try os.ChildProcess.exec(self.allocator, argv, null, null, max_output_size);
699	switch (result.term) {	699	switch (result.term) {
...	@@ -715,7 +715,7 @@ pub const Builder = struct {	...	@@ -715,7 +715,7 @@ pub const Builder = struct {
715	}	715	}
716	}	716	}
717		717
718	pub fn addSearchPrefix(self: &Builder, search_prefix: []const u8) void {	718	pub fn addSearchPrefix(self: *Builder, search_prefix: []const u8) void {
719	self.search_prefixes.append(search_prefix) catch unreachable;	719	self.search_prefixes.append(search_prefix) catch unreachable;
720	}	720	}
721	};	721	};
...	@@ -736,7 +736,7 @@ pub const Target = union(enum) {	...	@@ -736,7 +736,7 @@ pub const Target = union(enum) {
736	Native: void,	736	Native: void,
737	Cross: CrossTarget,	737	Cross: CrossTarget,
738		738
739	pub fn oFileExt(self: &const Target) []const u8 {	739	pub fn oFileExt(self: *const Target) []const u8 {
740	const environ = switch (self.*) {	740	const environ = switch (self.*) {
741	Target.Native => builtin.environ,	741	Target.Native => builtin.environ,
742	Target.Cross => \|t\| t.environ,	742	Target.Cross => \|t\| t.environ,
...	@@ -747,49 +747,49 @@ pub const Target = union(enum) {	...	@@ -747,49 +747,49 @@ pub const Target = union(enum) {
747	};	747	};
748	}	748	}
749		749
750	pub fn exeFileExt(self: &const Target) []const u8 {	750	pub fn exeFileExt(self: *const Target) []const u8 {
751	return switch (self.getOs()) {	751	return switch (self.getOs()) {
752	builtin.Os.windows => ".exe",	752	builtin.Os.windows => ".exe",
753	else => "",	753	else => "",
754	};	754	};
755	}	755	}
756		756
757	pub fn libFileExt(self: &const Target) []const u8 {	757	pub fn libFileExt(self: *const Target) []const u8 {
758	return switch (self.getOs()) {	758	return switch (self.getOs()) {
759	builtin.Os.windows => ".lib",	759	builtin.Os.windows => ".lib",
760	else => ".a",	760	else => ".a",
761	};	761	};
762	}	762	}
763		763
764	pub fn getOs(self: &const Target) builtin.Os {	764	pub fn getOs(self: *const Target) builtin.Os {
765	return switch (self.*) {	765	return switch (self.*) {
766	Target.Native => builtin.os,	766	Target.Native => builtin.os,
767	Target.Cross => \|t\| t.os,	767	Target.Cross => \|t\| t.os,
768	};	768	};
769	}	769	}
770		770
771	pub fn isDarwin(self: &const Target) bool {	771	pub fn isDarwin(self: *const Target) bool {
772	return switch (self.getOs()) {	772	return switch (self.getOs()) {
773	builtin.Os.ios, builtin.Os.macosx => true,	773	builtin.Os.ios, builtin.Os.macosx => true,
774	else => false,	774	else => false,
775	};	775	};
776	}	776	}
777		777
778	pub fn isWindows(self: &const Target) bool {	778	pub fn isWindows(self: *const Target) bool {
779	return switch (self.getOs()) {	779	return switch (self.getOs()) {
780	builtin.Os.windows => true,	780	builtin.Os.windows => true,
781	else => false,	781	else => false,
782	};	782	};
783	}	783	}
784		784
785	pub fn wantSharedLibSymLinks(self: &const Target) bool {	785	pub fn wantSharedLibSymLinks(self: *const Target) bool {
786	return !self.isWindows();	786	return !self.isWindows();
787	}	787	}
788	};	788	};
789		789
790	pub const LibExeObjStep = struct {	790	pub const LibExeObjStep = struct {
791	step: Step,	791	step: Step,
792	builder: &Builder,	792	builder: *Builder,
793	name: []const u8,	793	name: []const u8,
794	target: Target,	794	target: Target,
795	link_libs: BufSet,	795	link_libs: BufSet,
...	@@ -836,56 +836,56 @@ pub const LibExeObjStep = struct {	...	@@ -836,56 +836,56 @@ pub const LibExeObjStep = struct {
836	Obj,	836	Obj,
837	};	837	};
838		838
839	pub fn createSharedLibrary(builder: &Builder, name: []const u8, root_src: ?[]const u8, ver: &const Version) &LibExeObjStep {	839	pub fn createSharedLibrary(builder: Builder, name: []const u8, root_src: ?[]const u8, ver: const Version) *LibExeObjStep {
840	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	840	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
841	self.* = initExtraArgs(builder, name, root_src, Kind.Lib, false, ver);	841	self.* = initExtraArgs(builder, name, root_src, Kind.Lib, false, ver);
842	return self;	842	return self;
843	}	843	}
844		844
845	pub fn createCSharedLibrary(builder: &Builder, name: []const u8, version: &const Version) &LibExeObjStep {	845	pub fn createCSharedLibrary(builder: Builder, name: []const u8, version: const Version) *LibExeObjStep {
846	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	846	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
847	self.* = initC(builder, name, Kind.Lib, version, false);	847	self.* = initC(builder, name, Kind.Lib, version, false);
848	return self;	848	return self;
849	}	849	}
850		850
851	pub fn createStaticLibrary(builder: &Builder, name: []const u8, root_src: ?[]const u8) &LibExeObjStep {	851	pub fn createStaticLibrary(builder: Builder, name: []const u8, root_src: ?[]const u8) LibExeObjStep {
852	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	852	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
853	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));
854	return self;	854	return self;
855	}	855	}
856		856
857	pub fn createCStaticLibrary(builder: &Builder, name: []const u8) &LibExeObjStep {	857	pub fn createCStaticLibrary(builder: Builder, name: []const u8) LibExeObjStep {
858	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	858	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
859	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);
860	return self;	860	return self;
861	}	861	}
862		862
863	pub fn createObject(builder: &Builder, name: []const u8, root_src: []const u8) &LibExeObjStep {	863	pub fn createObject(builder: Builder, name: []const u8, root_src: []const u8) LibExeObjStep {
864	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	864	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
865	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));
866	return self;	866	return self;
867	}	867	}
868		868
869	pub fn createCObject(builder: &Builder, name: []const u8, src: []const u8) &LibExeObjStep {	869	pub fn createCObject(builder: Builder, name: []const u8, src: []const u8) LibExeObjStep {
870	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	870	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
871	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);
872	self.object_src = src;	872	self.object_src = src;
873	return self;	873	return self;
874	}	874	}
875		875
876	pub fn createExecutable(builder: &Builder, name: []const u8, root_src: ?[]const u8) &LibExeObjStep {	876	pub fn createExecutable(builder: Builder, name: []const u8, root_src: ?[]const u8) LibExeObjStep {
877	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	877	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
878	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));
879	return self;	879	return self;
880	}	880	}
881		881
882	pub fn createCExecutable(builder: &Builder, name: []const u8) &LibExeObjStep {	882	pub fn createCExecutable(builder: Builder, name: []const u8) LibExeObjStep {
883	const self = builder.allocator.create(LibExeObjStep) catch unreachable;	883	const self = builder.allocator.create(LibExeObjStep) catch unreachable;
884	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);
885	return self;	885	return self;
886	}	886	}
887		887
888	fn initExtraArgs(builder: &Builder, name: []const u8, root_src: ?[]const u8, kind: Kind, static: bool, ver: &const Version) 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{	889	var self = LibExeObjStep{
890	.strip = false,	890	.strip = false,
891	.builder = builder,	891	.builder = builder,
...	@@ -924,7 +924,7 @@ pub const LibExeObjStep = struct {	...	@@ -924,7 +924,7 @@ pub const LibExeObjStep = struct {
924	return self;	924	return self;
925	}	925	}
926		926
927	fn initC(builder: &Builder, name: []const u8, kind: Kind, version: &const Version, static: bool) LibExeObjStep {	927	fn initC(builder: Builder, name: []const u8, kind: Kind, version: const Version, static: bool) LibExeObjStep {
928	var self = LibExeObjStep{	928	var self = LibExeObjStep{
929	.builder = builder,	929	.builder = builder,
930	.name = name,	930	.name = name,
...	@@ -964,7 +964,7 @@ pub const LibExeObjStep = struct {	...	@@ -964,7 +964,7 @@ pub const LibExeObjStep = struct {
964	return self;	964	return self;
965	}	965	}
966		966
967	fn computeOutFileNames(self: &LibExeObjStep) void {	967	fn computeOutFileNames(self: *LibExeObjStep) void {
968	switch (self.kind) {	968	switch (self.kind) {
969	Kind.Obj => {	969	Kind.Obj => {
970	self.out_filename = self.builder.fmt("{}{}", self.name, self.target.oFileExt());	970	self.out_filename = self.builder.fmt("{}{}", self.name, self.target.oFileExt());
...	@@ -996,7 +996,7 @@ pub const LibExeObjStep = struct {	...	@@ -996,7 +996,7 @@ pub const LibExeObjStep = struct {
996	}	996	}
997	}	997	}
998		998
999	pub fn setTarget(self: &LibExeObjStep, target_arch: builtin.Arch, target_os: builtin.Os, target_environ: builtin.Environ) void {	999	pub fn setTarget(self: *LibExeObjStep, target_arch: builtin.Arch, target_os: builtin.Os, target_environ: builtin.Environ) void {
1000	self.target = Target{	1000	self.target = Target{
1001	.Cross = CrossTarget{	1001	.Cross = CrossTarget{
1002	.arch = target_arch,	1002	.arch = target_arch,
...	@@ -1008,16 +1008,16 @@ pub const LibExeObjStep = struct {	...	@@ -1008,16 +1008,16 @@ pub const LibExeObjStep = struct {
1008	}	1008	}
1009		1009
1010	// TODO respect this in the C args	1010	// TODO respect this in the C args
1011	pub fn setLinkerScriptPath(self: &LibExeObjStep, path: []const u8) void {	1011	pub fn setLinkerScriptPath(self: *LibExeObjStep, path: []const u8) void {
1012	self.linker_script = path;	1012	self.linker_script = path;
1013	}	1013	}
1014		1014
1015	pub fn linkFramework(self: &LibExeObjStep, framework_name: []const u8) void {	1015	pub fn linkFramework(self: *LibExeObjStep, framework_name: []const u8) void {
1016	assert(self.target.isDarwin());	1016	assert(self.target.isDarwin());
1017	self.frameworks.put(framework_name) catch unreachable;	1017	self.frameworks.put(framework_name) catch unreachable;
1018	}	1018	}
1019		1019
1020	pub fn linkLibrary(self: &LibExeObjStep, lib: &LibExeObjStep) void {	1020	pub fn linkLibrary(self: LibExeObjStep, lib: LibExeObjStep) void {
1021	assert(self.kind != Kind.Obj);	1021	assert(self.kind != Kind.Obj);
1022	assert(lib.kind == Kind.Lib);	1022	assert(lib.kind == Kind.Lib);
1023		1023
...	@@ -1038,26 +1038,26 @@ pub const LibExeObjStep = struct {	...	@@ -1038,26 +1038,26 @@ pub const LibExeObjStep = struct {
1038	}	1038	}
1039	}	1039	}
1040		1040
1041	pub fn linkSystemLibrary(self: &LibExeObjStep, name: []const u8) void {	1041	pub fn linkSystemLibrary(self: *LibExeObjStep, name: []const u8) void {
1042	assert(self.kind != Kind.Obj);	1042	assert(self.kind != Kind.Obj);
1043	self.link_libs.put(name) catch unreachable;	1043	self.link_libs.put(name) catch unreachable;
1044	}	1044	}
1045		1045
1046	pub fn addSourceFile(self: &LibExeObjStep, file: []const u8) void {	1046	pub fn addSourceFile(self: *LibExeObjStep, file: []const u8) void {
1047	assert(self.kind != Kind.Obj);	1047	assert(self.kind != Kind.Obj);
1048	assert(!self.is_zig);	1048	assert(!self.is_zig);
1049	self.source_files.append(file) catch unreachable;	1049	self.source_files.append(file) catch unreachable;
1050	}	1050	}
1051		1051
1052	pub fn setVerboseLink(self: &LibExeObjStep, value: bool) void {	1052	pub fn setVerboseLink(self: *LibExeObjStep, value: bool) void {
1053	self.verbose_link = value;	1053	self.verbose_link = value;
1054	}	1054	}
1055		1055
1056	pub fn setBuildMode(self: &LibExeObjStep, mode: builtin.Mode) void {	1056	pub fn setBuildMode(self: *LibExeObjStep, mode: builtin.Mode) void {
1057	self.build_mode = mode;	1057	self.build_mode = mode;
1058	}	1058	}
1059		1059
1060	pub fn setOutputPath(self: &LibExeObjStep, file_path: []const u8) void {	1060	pub fn setOutputPath(self: *LibExeObjStep, file_path: []const u8) void {
1061	self.output_path = file_path;	1061	self.output_path = file_path;
1062		1062
1063	// catch a common mistake	1063	// catch a common mistake
...	@@ -1066,11 +1066,11 @@ pub const LibExeObjStep = struct {	...	@@ -1066,11 +1066,11 @@ pub const LibExeObjStep = struct {
1066	}	1066	}
1067	}	1067	}
1068		1068
1069	pub fn getOutputPath(self: &LibExeObjStep) []const u8 {	1069	pub fn getOutputPath(self: *LibExeObjStep) []const u8 {
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;	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;
1071	}	1071	}
1072		1072
1073	pub fn setOutputHPath(self: &LibExeObjStep, file_path: []const u8) void {	1073	pub fn setOutputHPath(self: *LibExeObjStep, file_path: []const u8) void {
1074	self.output_h_path = file_path;	1074	self.output_h_path = file_path;
1075		1075
1076	// catch a common mistake	1076	// catch a common mistake
...	@@ -1079,21 +1079,21 @@ pub const LibExeObjStep = struct {	...	@@ -1079,21 +1079,21 @@ pub const LibExeObjStep = struct {
1079	}	1079	}
1080	}	1080	}
1081		1081
1082	pub fn getOutputHPath(self: &LibExeObjStep) []const u8 {	1082	pub fn getOutputHPath(self: *LibExeObjStep) []const u8 {
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;	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;
1084	}	1084	}
1085		1085
1086	pub fn addAssemblyFile(self: &LibExeObjStep, path: []const u8) void {	1086	pub fn addAssemblyFile(self: *LibExeObjStep, path: []const u8) void {
1087	self.assembly_files.append(path) catch unreachable;	1087	self.assembly_files.append(path) catch unreachable;
1088	}	1088	}
1089		1089
1090	pub fn addObjectFile(self: &LibExeObjStep, path: []const u8) void {	1090	pub fn addObjectFile(self: *LibExeObjStep, path: []const u8) void {
1091	assert(self.kind != Kind.Obj);	1091	assert(self.kind != Kind.Obj);
1092		1092
1093	self.object_files.append(path) catch unreachable;	1093	self.object_files.append(path) catch unreachable;
1094	}	1094	}
1095		1095
1096	pub fn addObject(self: &LibExeObjStep, obj: &LibExeObjStep) void {	1096	pub fn addObject(self: LibExeObjStep, obj: LibExeObjStep) void {
1097	assert(obj.kind == Kind.Obj);	1097	assert(obj.kind == Kind.Obj);
1098	assert(self.kind != Kind.Obj);	1098	assert(self.kind != Kind.Obj);
1099		1099
...	@@ -1110,15 +1110,15 @@ pub const LibExeObjStep = struct {	...	@@ -1110,15 +1110,15 @@ pub const LibExeObjStep = struct {
1110	self.include_dirs.append(self.builder.cache_root) catch unreachable;	1110	self.include_dirs.append(self.builder.cache_root) catch unreachable;
1111	}	1111	}
1112		1112
1113	pub fn addIncludeDir(self: &LibExeObjStep, path: []const u8) void {	1113	pub fn addIncludeDir(self: *LibExeObjStep, path: []const u8) void {
1114	self.include_dirs.append(path) catch unreachable;	1114	self.include_dirs.append(path) catch unreachable;
1115	}	1115	}
1116		1116
1117	pub fn addLibPath(self: &LibExeObjStep, path: []const u8) void {	1117	pub fn addLibPath(self: *LibExeObjStep, path: []const u8) void {
1118	self.lib_paths.append(path) catch unreachable;	1118	self.lib_paths.append(path) catch unreachable;
1119	}	1119	}
1120		1120
1121	pub fn addPackagePath(self: &LibExeObjStep, name: []const u8, pkg_index_path: []const u8) void {	1121	pub fn addPackagePath(self: *LibExeObjStep, name: []const u8, pkg_index_path: []const u8) void {
1122	assert(self.is_zig);	1122	assert(self.is_zig);
1123		1123
1124	self.packages.append(Pkg{	1124	self.packages.append(Pkg{
...	@@ -1127,23 +1127,23 @@ pub const LibExeObjStep = struct {	...	@@ -1127,23 +1127,23 @@ pub const LibExeObjStep = struct {
1127	}) catch unreachable;	1127	}) catch unreachable;
1128	}	1128	}
1129		1129
1130	pub fn addCompileFlags(self: &LibExeObjStep, flags: []const []const u8) void {	1130	pub fn addCompileFlags(self: *LibExeObjStep, flags: []const []const u8) void {
1131	for (flags) \|flag\| {	1131	for (flags) \|flag\| {
1132	self.cflags.append(flag) catch unreachable;	1132	self.cflags.append(flag) catch unreachable;
1133	}	1133	}
1134	}	1134	}
1135		1135
1136	pub fn setNoStdLib(self: &LibExeObjStep, disable: bool) void {	1136	pub fn setNoStdLib(self: *LibExeObjStep, disable: bool) void {
1137	assert(!self.is_zig);	1137	assert(!self.is_zig);
1138	self.disable_libc = disable;	1138	self.disable_libc = disable;
1139	}	1139	}
1140		1140
1141	fn make(step: &Step) !void {	1141	fn make(step: *Step) !void {
1142	const self = @fieldParentPtr(LibExeObjStep, "step", step);	1142	const self = @fieldParentPtr(LibExeObjStep, "step", step);
1143	return if (self.is_zig) self.makeZig() else self.makeC();	1143	return if (self.is_zig) self.makeZig() else self.makeC();
1144	}	1144	}
1145		1145
1146	fn makeZig(self: &LibExeObjStep) !void {	1146	fn makeZig(self: *LibExeObjStep) !void {
1147	const builder = self.builder;	1147	const builder = self.builder;
1148		1148
1149	assert(self.is_zig);	1149	assert(self.is_zig);
...	@@ -1309,7 +1309,7 @@ pub const LibExeObjStep = struct {	...	@@ -1309,7 +1309,7 @@ pub const LibExeObjStep = struct {
1309	}	1309	}
1310	}	1310	}
1311		1311
1312	fn appendCompileFlags(self: &LibExeObjStep, args: &ArrayList([]const u8)) void {	1312	fn appendCompileFlags(self: LibExeObjStep, args: ArrayList([]const u8)) void {
1313	if (!self.strip) {	1313	if (!self.strip) {
1314	args.append("-g") catch unreachable;	1314	args.append("-g") catch unreachable;
1315	}	1315	}
...	@@ -1354,7 +1354,7 @@ pub const LibExeObjStep = struct {	...	@@ -1354,7 +1354,7 @@ pub const LibExeObjStep = struct {
1354	}	1354	}
1355	}	1355	}
1356		1356
1357	fn makeC(self: &LibExeObjStep) !void {	1357	fn makeC(self: *LibExeObjStep) !void {
1358	const builder = self.builder;	1358	const builder = self.builder;
1359		1359
1360	const cc = builder.getCCExe();	1360	const cc = builder.getCCExe();
...	@@ -1580,7 +1580,7 @@ pub const LibExeObjStep = struct {	...	@@ -1580,7 +1580,7 @@ pub const LibExeObjStep = struct {
1580		1580
1581	pub const TestStep = struct {	1581	pub const TestStep = struct {
1582	step: Step,	1582	step: Step,
1583	builder: &Builder,	1583	builder: *Builder,
1584	root_src: []const u8,	1584	root_src: []const u8,
1585	build_mode: builtin.Mode,	1585	build_mode: builtin.Mode,
1586	verbose: bool,	1586	verbose: bool,
...	@@ -1591,7 +1591,7 @@ pub const TestStep = struct {	...	@@ -1591,7 +1591,7 @@ pub const TestStep = struct {
1591	exec_cmd_args: ?[]const ?[]const u8,	1591	exec_cmd_args: ?[]const ?[]const u8,
1592	include_dirs: ArrayList([]const u8),	1592	include_dirs: ArrayList([]const u8),
1593		1593
1594	pub fn init(builder: &Builder, root_src: []const u8) TestStep {	1594	pub fn init(builder: *Builder, root_src: []const u8) TestStep {
1595	const step_name = builder.fmt("test {}", root_src);	1595	const step_name = builder.fmt("test {}", root_src);
1596	return TestStep{	1596	return TestStep{
1597	.step = Step.init(step_name, builder.allocator, make),	1597	.step = Step.init(step_name, builder.allocator, make),
...	@@ -1608,31 +1608,31 @@ pub const TestStep = struct {	...	@@ -1608,31 +1608,31 @@ pub const TestStep = struct {
1608	};	1608	};
1609	}	1609	}
1610		1610
1611	pub fn setVerbose(self: &TestStep, value: bool) void {	1611	pub fn setVerbose(self: *TestStep, value: bool) void {
1612	self.verbose = value;	1612	self.verbose = value;
1613	}	1613	}
1614		1614
1615	pub fn addIncludeDir(self: &TestStep, path: []const u8) void {	1615	pub fn addIncludeDir(self: *TestStep, path: []const u8) void {
1616	self.include_dirs.append(path) catch unreachable;	1616	self.include_dirs.append(path) catch unreachable;
1617	}	1617	}
1618		1618
1619	pub fn setBuildMode(self: &TestStep, mode: builtin.Mode) void {	1619	pub fn setBuildMode(self: *TestStep, mode: builtin.Mode) void {
1620	self.build_mode = mode;	1620	self.build_mode = mode;
1621	}	1621	}
1622		1622
1623	pub fn linkSystemLibrary(self: &TestStep, name: []const u8) void {	1623	pub fn linkSystemLibrary(self: *TestStep, name: []const u8) void {
1624	self.link_libs.put(name) catch unreachable;	1624	self.link_libs.put(name) catch unreachable;
1625	}	1625	}
1626		1626
1627	pub fn setNamePrefix(self: &TestStep, text: []const u8) void {	1627	pub fn setNamePrefix(self: *TestStep, text: []const u8) void {
1628	self.name_prefix = text;	1628	self.name_prefix = text;
1629	}	1629	}
1630		1630
1631	pub fn setFilter(self: &TestStep, text: ?[]const u8) void {	1631	pub fn setFilter(self: *TestStep, text: ?[]const u8) void {
1632	self.filter = text;	1632	self.filter = text;
1633	}	1633	}
1634		1634
1635	pub fn setTarget(self: &TestStep, target_arch: builtin.Arch, target_os: builtin.Os, target_environ: builtin.Environ) void {	1635	pub fn setTarget(self: *TestStep, target_arch: builtin.Arch, target_os: builtin.Os, target_environ: builtin.Environ) void {
1636	self.target = Target{	1636	self.target = Target{
1637	.Cross = CrossTarget{	1637	.Cross = CrossTarget{
1638	.arch = target_arch,	1638	.arch = target_arch,
...	@@ -1642,11 +1642,11 @@ pub const TestStep = struct {	...	@@ -1642,11 +1642,11 @@ pub const TestStep = struct {
1642	};	1642	};
1643	}	1643	}
1644		1644
1645	pub fn setExecCmd(self: &TestStep, args: []const ?[]const u8) void {	1645	pub fn setExecCmd(self: *TestStep, args: []const ?[]const u8) void {
1646	self.exec_cmd_args = args;	1646	self.exec_cmd_args = args;
1647	}	1647	}
1648		1648
1649	fn make(step: &Step) !void {	1649	fn make(step: *Step) !void {
1650	const self = @fieldParentPtr(TestStep, "step", step);	1650	const self = @fieldParentPtr(TestStep, "step", step);
1651	const builder = self.builder;	1651	const builder = self.builder;
1652		1652
...	@@ -1739,13 +1739,13 @@ pub const TestStep = struct {	...	@@ -1739,13 +1739,13 @@ pub const TestStep = struct {
1739		1739
1740	pub const CommandStep = struct {	1740	pub const CommandStep = struct {
1741	step: Step,	1741	step: Step,
1742	builder: &Builder,	1742	builder: *Builder,
1743	argv: [][]const u8,	1743	argv: [][]const u8,
1744	cwd: ?[]const u8,	1744	cwd: ?[]const u8,
1745	env_map: &const BufMap,	1745	env_map: *const BufMap,
1746		1746
1747	/// ::argv is copied.	1747	/// ::argv is copied.
1748	pub fn create(builder: &Builder, cwd: ?[]const u8, env_map: &const BufMap, argv: []const []const u8) &CommandStep {	1748	pub fn create(builder: Builder, cwd: ?[]const u8, env_map: const BufMap, argv: []const []const u8) *CommandStep {
1749	const self = builder.allocator.create(CommandStep) catch unreachable;	1749	const self = builder.allocator.create(CommandStep) catch unreachable;
1750	self.* = CommandStep{	1750	self.* = CommandStep{
1751	.builder = builder,	1751	.builder = builder,
...	@@ -1759,7 +1759,7 @@ pub const CommandStep = struct {	...	@@ -1759,7 +1759,7 @@ pub const CommandStep = struct {
1759	return self;	1759	return self;
1760	}	1760	}
1761		1761
1762	fn make(step: &Step) !void {	1762	fn make(step: *Step) !void {
1763	const self = @fieldParentPtr(CommandStep, "step", step);	1763	const self = @fieldParentPtr(CommandStep, "step", step);
1764		1764
1765	const cwd = if (self.cwd) \|cwd\| self.builder.pathFromRoot(cwd) else self.builder.build_root;	1765	const cwd = if (self.cwd) \|cwd\| self.builder.pathFromRoot(cwd) else self.builder.build_root;
...	@@ -1769,13 +1769,13 @@ pub const CommandStep = struct {	...	@@ -1769,13 +1769,13 @@ pub const CommandStep = struct {
1769		1769
1770	const InstallArtifactStep = struct {	1770	const InstallArtifactStep = struct {
1771	step: Step,	1771	step: Step,
1772	builder: &Builder,	1772	builder: *Builder,
1773	artifact: &LibExeObjStep,	1773	artifact: *LibExeObjStep,
1774	dest_file: []const u8,	1774	dest_file: []const u8,
1775		1775
1776	const Self = this;	1776	const Self = this;
1777		1777
1778	pub fn create(builder: &Builder, artifact: &LibExeObjStep) &Self {	1778	pub fn create(builder: Builder, artifact: LibExeObjStep) *Self {
1779	const self = builder.allocator.create(Self) catch unreachable;	1779	const self = builder.allocator.create(Self) catch unreachable;
1780	const dest_dir = switch (artifact.kind) {	1780	const dest_dir = switch (artifact.kind) {
1781	LibExeObjStep.Kind.Obj => unreachable,	1781	LibExeObjStep.Kind.Obj => unreachable,
...	@@ -1797,7 +1797,7 @@ const InstallArtifactStep = struct {	...	@@ -1797,7 +1797,7 @@ const InstallArtifactStep = struct {
1797	return self;	1797	return self;
1798	}	1798	}
1799		1799
1800	fn make(step: &Step) !void {	1800	fn make(step: *Step) !void {
1801	const self = @fieldParentPtr(Self, "step", step);	1801	const self = @fieldParentPtr(Self, "step", step);
1802	const builder = self.builder;	1802	const builder = self.builder;
1803		1803
...	@@ -1818,11 +1818,11 @@ const InstallArtifactStep = struct {	...	@@ -1818,11 +1818,11 @@ const InstallArtifactStep = struct {
1818		1818
1819	pub const InstallFileStep = struct {	1819	pub const InstallFileStep = struct {
1820	step: Step,	1820	step: Step,
1821	builder: &Builder,	1821	builder: *Builder,
1822	src_path: []const u8,	1822	src_path: []const u8,
1823	dest_path: []const u8,	1823	dest_path: []const u8,
1824		1824
1825	pub fn init(builder: &Builder, src_path: []const u8, dest_path: []const u8) InstallFileStep {	1825	pub fn init(builder: *Builder, src_path: []const u8, dest_path: []const u8) InstallFileStep {
1826	return InstallFileStep{	1826	return InstallFileStep{
1827	.builder = builder,	1827	.builder = builder,
1828	.step = Step.init(builder.fmt("install {}", src_path), builder.allocator, make),	1828	.step = Step.init(builder.fmt("install {}", src_path), builder.allocator, make),
...	@@ -1831,7 +1831,7 @@ pub const InstallFileStep = struct {	...	@@ -1831,7 +1831,7 @@ pub const InstallFileStep = struct {
1831	};	1831	};
1832	}	1832	}
1833		1833
1834	fn make(step: &Step) !void {	1834	fn make(step: *Step) !void {
1835	const self = @fieldParentPtr(InstallFileStep, "step", step);	1835	const self = @fieldParentPtr(InstallFileStep, "step", step);
1836	try self.builder.copyFile(self.src_path, self.dest_path);	1836	try self.builder.copyFile(self.src_path, self.dest_path);
1837	}	1837	}
...	@@ -1839,11 +1839,11 @@ pub const InstallFileStep = struct {	...	@@ -1839,11 +1839,11 @@ pub const InstallFileStep = struct {
1839		1839
1840	pub const WriteFileStep = struct {	1840	pub const WriteFileStep = struct {
1841	step: Step,	1841	step: Step,
1842	builder: &Builder,	1842	builder: *Builder,
1843	file_path: []const u8,	1843	file_path: []const u8,
1844	data: []const u8,	1844	data: []const u8,
1845		1845
1846	pub fn init(builder: &Builder, file_path: []const u8, data: []const u8) WriteFileStep {	1846	pub fn init(builder: *Builder, file_path: []const u8, data: []const u8) WriteFileStep {
1847	return WriteFileStep{	1847	return WriteFileStep{
1848	.builder = builder,	1848	.builder = builder,
1849	.step = Step.init(builder.fmt("writefile {}", file_path), builder.allocator, make),	1849	.step = Step.init(builder.fmt("writefile {}", file_path), builder.allocator, make),
...	@@ -1852,7 +1852,7 @@ pub const WriteFileStep = struct {	...	@@ -1852,7 +1852,7 @@ pub const WriteFileStep = struct {
1852	};	1852	};
1853	}	1853	}
1854		1854
1855	fn make(step: &Step) !void {	1855	fn make(step: *Step) !void {
1856	const self = @fieldParentPtr(WriteFileStep, "step", step);	1856	const self = @fieldParentPtr(WriteFileStep, "step", step);
1857	const full_path = self.builder.pathFromRoot(self.file_path);	1857	const full_path = self.builder.pathFromRoot(self.file_path);
1858	const full_path_dir = os.path.dirname(full_path);	1858	const full_path_dir = os.path.dirname(full_path);
...	@@ -1869,10 +1869,10 @@ pub const WriteFileStep = struct {	...	@@ -1869,10 +1869,10 @@ pub const WriteFileStep = struct {
1869		1869
1870	pub const LogStep = struct {	1870	pub const LogStep = struct {
1871	step: Step,	1871	step: Step,
1872	builder: &Builder,	1872	builder: *Builder,
1873	data: []const u8,	1873	data: []const u8,
1874		1874
1875	pub fn init(builder: &Builder, data: []const u8) LogStep {	1875	pub fn init(builder: *Builder, data: []const u8) LogStep {
1876	return LogStep{	1876	return LogStep{
1877	.builder = builder,	1877	.builder = builder,
1878	.step = Step.init(builder.fmt("log {}", data), builder.allocator, make),	1878	.step = Step.init(builder.fmt("log {}", data), builder.allocator, make),
...	@@ -1880,7 +1880,7 @@ pub const LogStep = struct {	...	@@ -1880,7 +1880,7 @@ pub const LogStep = struct {
1880	};	1880	};
1881	}	1881	}
1882		1882
1883	fn make(step: &Step) error!void {	1883	fn make(step: *Step) error!void {
1884	const self = @fieldParentPtr(LogStep, "step", step);	1884	const self = @fieldParentPtr(LogStep, "step", step);
1885	warn("{}", self.data);	1885	warn("{}", self.data);
1886	}	1886	}
...	@@ -1888,10 +1888,10 @@ pub const LogStep = struct {	...	@@ -1888,10 +1888,10 @@ pub const LogStep = struct {
1888		1888
1889	pub const RemoveDirStep = struct {	1889	pub const RemoveDirStep = struct {
1890	step: Step,	1890	step: Step,
1891	builder: &Builder,	1891	builder: *Builder,
1892	dir_path: []const u8,	1892	dir_path: []const u8,
1893		1893
1894	pub fn init(builder: &Builder, dir_path: []const u8) RemoveDirStep {	1894	pub fn init(builder: *Builder, dir_path: []const u8) RemoveDirStep {
1895	return RemoveDirStep{	1895	return RemoveDirStep{
1896	.builder = builder,	1896	.builder = builder,
1897	.step = Step.init(builder.fmt("RemoveDir {}", dir_path), builder.allocator, make),	1897	.step = Step.init(builder.fmt("RemoveDir {}", dir_path), builder.allocator, make),
...	@@ -1899,7 +1899,7 @@ pub const RemoveDirStep = struct {	...	@@ -1899,7 +1899,7 @@ pub const RemoveDirStep = struct {
1899	};	1899	};
1900	}	1900	}
1901		1901
1902	fn make(step: &Step) !void {	1902	fn make(step: *Step) !void {
1903	const self = @fieldParentPtr(RemoveDirStep, "step", step);	1903	const self = @fieldParentPtr(RemoveDirStep, "step", step);
1904		1904
1905	const full_path = self.builder.pathFromRoot(self.dir_path);	1905	const full_path = self.builder.pathFromRoot(self.dir_path);
...	@@ -1912,39 +1912,39 @@ pub const RemoveDirStep = struct {	...	@@ -1912,39 +1912,39 @@ pub const RemoveDirStep = struct {
1912		1912
1913	pub const Step = struct {	1913	pub const Step = struct {
1914	name: []const u8,	1914	name: []const u8,
1915	makeFn: fn(self: &Step) error!void,	1915	makeFn: fn (self: *Step) error!void,
1916	dependencies: ArrayList(&Step),	1916	dependencies: ArrayList(*Step),
1917	loop_flag: bool,	1917	loop_flag: bool,
1918	done_flag: bool,	1918	done_flag: bool,
1919		1919
1920	pub fn init(name: []const u8, allocator: &Allocator, makeFn: fn(&Step) error!void) Step {	1920	pub fn init(name: []const u8, allocator: Allocator, makeFn: fn (Step) error!void) Step {
1921	return Step{	1921	return Step{
1922	.name = name,	1922	.name = name,
1923	.makeFn = makeFn,	1923	.makeFn = makeFn,
1924	.dependencies = ArrayList(&Step).init(allocator),	1924	.dependencies = ArrayList(*Step).init(allocator),
1925	.loop_flag = false,	1925	.loop_flag = false,
1926	.done_flag = false,	1926	.done_flag = false,
1927	};	1927	};
1928	}	1928	}
1929	pub fn initNoOp(name: []const u8, allocator: &Allocator) Step {	1929	pub fn initNoOp(name: []const u8, allocator: *Allocator) Step {
1930	return init(name, allocator, makeNoOp);	1930	return init(name, allocator, makeNoOp);
1931	}	1931	}
1932		1932
1933	pub fn make(self: &Step) !void {	1933	pub fn make(self: *Step) !void {
1934	if (self.done_flag) return;	1934	if (self.done_flag) return;
1935		1935
1936	try self.makeFn(self);	1936	try self.makeFn(self);
1937	self.done_flag = true;	1937	self.done_flag = true;
1938	}	1938	}
1939		1939
1940	pub fn dependOn(self: &Step, other: &Step) void {	1940	pub fn dependOn(self: Step, other: Step) void {
1941	self.dependencies.append(other) catch unreachable;	1941	self.dependencies.append(other) catch unreachable;
1942	}	1942	}
1943		1943
1944	fn makeNoOp(self: &Step) error!void {}	1944	fn makeNoOp(self: *Step) error!void {}
1945	};	1945	};
1946		1946
1947	fn doAtomicSymLinks(allocator: &Allocator, output_path: []const u8, filename_major_only: []const u8, filename_name_only: []const u8) !void {	1947	fn doAtomicSymLinks(allocator: *Allocator, output_path: []const u8, filename_major_only: []const u8, filename_name_only: []const u8) !void {
1948	const out_dir = os.path.dirname(output_path);	1948	const out_dir = os.path.dirname(output_path);
1949	const out_basename = os.path.basename(output_path);	1949	const out_basename = os.path.basename(output_path);
1950	// sym link for libfoo.so.1 to libfoo.so.1.2.3	1950	// sym link for libfoo.so.1 to libfoo.so.1.2.3

std/c/darwin.zig+5-5

...	@@ -1,10 +1,10 @@	...	@@ -1,10 +1,10 @@
1	extern "c" fn __error() &c_int;	1	extern "c" fn __error() *c_int;
2	pub extern "c" fn _NSGetExecutablePath(buf: &u8, bufsize: &u32) c_int;	2	pub extern "c" fn _NSGetExecutablePath(buf: []u8, bufsize: u32) c_int;
3		3
4	pub extern "c" fn __getdirentries64(fd: c_int, buf_ptr: &u8, buf_len: usize, basep: &i64) usize;	4	pub extern "c" fn __getdirentries64(fd: c_int, buf_ptr: []u8, buf_len: usize, basep: i64) usize;
5		5
6	pub extern "c" fn mach_absolute_time() u64;	6	pub extern "c" fn mach_absolute_time() u64;
7	pub extern "c" fn mach_timebase_info(tinfo: ?&mach_timebase_info_data) void;	7	pub extern "c" fn mach_timebase_info(tinfo: ?*mach_timebase_info_data) void;
8		8
9	pub use @import("../os/darwin_errno.zig");	9	pub use @import("../os/darwin_errno.zig");
10		10
...	@@ -60,7 +60,7 @@ pub const sigset_t = u32;	...	@@ -60,7 +60,7 @@ pub const sigset_t = u32;
60		60
61	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with function name.	61	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with function name.
62	pub const Sigaction = extern struct {	62	pub const Sigaction = extern struct {
63	handler: extern fn(c_int) void,	63	handler: extern fn (c_int) void,
64	sa_mask: sigset_t,	64	sa_mask: sigset_t,
65	sa_flags: c_int,	65	sa_flags: c_int,
66	};	66	};

std/c/index.zig+38-36

...	@@ -9,53 +9,55 @@ pub use switch (builtin.os) {	...	@@ -9,53 +9,55 @@ pub use switch (builtin.os) {
9	};	9	};
10	const empty_import = @import("../empty.zig");	10	const empty_import = @import("../empty.zig");
11		11
		12	// TODO https://github.com/ziglang/zig/issues/265 on this whole file
		13
12	pub extern "c" fn abort() noreturn;	14	pub extern "c" fn abort() noreturn;
13	pub extern "c" fn exit(code: c_int) noreturn;	15	pub extern "c" fn exit(code: c_int) noreturn;
14	pub extern "c" fn isatty(fd: c_int) c_int;	16	pub extern "c" fn isatty(fd: c_int) c_int;
15	pub extern "c" fn close(fd: c_int) c_int;	17	pub extern "c" fn close(fd: c_int) c_int;
16	pub extern "c" fn fstat(fd: c_int, buf: &Stat) c_int;	18	pub extern "c" fn fstat(fd: c_int, buf: *Stat) c_int;
17	pub extern "c" fn @"fstat$INODE64"(fd: c_int, buf: &Stat) c_int;	19	pub extern "c" fn @"fstat$INODE64"(fd: c_int, buf: *Stat) c_int;
18	pub extern "c" fn lseek(fd: c_int, offset: isize, whence: c_int) isize;	20	pub extern "c" fn lseek(fd: c_int, offset: isize, whence: c_int) isize;
19	pub extern "c" fn open(path: &const u8, oflag: c_int, ...) c_int;	21	pub extern "c" fn open(path: [*]const u8, oflag: c_int, ...) c_int;
20	pub extern "c" fn raise(sig: c_int) c_int;	22	pub extern "c" fn raise(sig: c_int) c_int;
21	pub extern "c" fn read(fd: c_int, buf: &c_void, nbyte: usize) isize;	23	pub extern "c" fn read(fd: c_int, buf: [*]c_void, nbyte: usize) isize;
22	pub extern "c" fn stat(noalias path: &const u8, noalias buf: &Stat) c_int;	24	pub extern "c" fn stat(noalias path: []const u8, noalias buf: Stat) c_int;
23	pub extern "c" fn write(fd: c_int, buf: &const c_void, nbyte: usize) isize;	25	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, fd: c_int, offset: isize) ?&c_void;	26	pub extern "c" fn mmap(addr: ?[]c_void, len: usize, prot: c_int, flags: c_int, fd: c_int, offset: isize) ?[]c_void;
25	pub extern "c" fn munmap(addr: &c_void, len: usize) c_int;	27	pub extern "c" fn munmap(addr: [*]c_void, len: usize) c_int;
26	pub extern "c" fn unlink(path: &const u8) c_int;	28	pub extern "c" fn unlink(path: [*]const u8) c_int;
27	pub extern "c" fn getcwd(buf: &u8, size: usize) ?&u8;	29	pub extern "c" fn getcwd(buf: []u8, size: usize) ?[]u8;
28	pub extern "c" fn waitpid(pid: c_int, stat_loc: &c_int, options: c_int) c_int;	30	pub extern "c" fn waitpid(pid: c_int, stat_loc: *c_int, options: c_int) c_int;
29	pub extern "c" fn fork() c_int;	31	pub extern "c" fn fork() c_int;
30	pub extern "c" fn access(path: &const u8, mode: c_uint) c_int;	32	pub extern "c" fn access(path: [*]const u8, mode: c_uint) c_int;
31	pub extern "c" fn pipe(fds: &c_int) c_int;	33	pub extern "c" fn pipe(fds: *[2]c_int) c_int;
32	pub extern "c" fn mkdir(path: &const u8, mode: c_uint) c_int;	34	pub extern "c" fn mkdir(path: [*]const u8, mode: c_uint) c_int;
33	pub extern "c" fn symlink(existing: &const u8, new: &const u8) c_int;	35	pub extern "c" fn symlink(existing: []const u8, new: []const u8) c_int;
34	pub extern "c" fn rename(old: &const u8, new: &const u8) c_int;	36	pub extern "c" fn rename(old: []const u8, new: []const u8) c_int;
35	pub extern "c" fn chdir(path: &const u8) c_int;	37	pub extern "c" fn chdir(path: [*]const u8) c_int;
36	pub extern "c" fn execve(path: &const u8, argv: &const ?&const u8, envp: &const ?&const u8) c_int;	38	pub extern "c" fn execve(path: []const u8, argv: []const ?[]const u8, envp: []const ?[*]const u8) c_int;
37	pub extern "c" fn dup(fd: c_int) c_int;	39	pub extern "c" fn dup(fd: c_int) c_int;
38	pub extern "c" fn dup2(old_fd: c_int, new_fd: c_int) c_int;	40	pub extern "c" fn dup2(old_fd: c_int, new_fd: c_int) c_int;
39	pub extern "c" fn readlink(noalias path: &const u8, noalias buf: &u8, bufsize: usize) isize;	41	pub extern "c" fn readlink(noalias path: []const u8, noalias buf: []u8, bufsize: usize) isize;
40	pub extern "c" fn realpath(noalias file_name: &const u8, noalias resolved_name: &u8) ?&u8;	42	pub extern "c" fn realpath(noalias file_name: []const u8, noalias resolved_name: []u8) ?[*]u8;
41	pub extern "c" fn sigprocmask(how: c_int, noalias set: &const sigset_t, noalias oset: ?&sigset_t) c_int;	43	pub extern "c" fn sigprocmask(how: c_int, noalias set: const sigset_t, noalias oset: ?sigset_t) c_int;
42	pub extern "c" fn gettimeofday(tv: ?&timeval, tz: ?&timezone) c_int;	44	pub extern "c" fn gettimeofday(tv: ?timeval, tz: ?timezone) c_int;
43	pub extern "c" fn sigaction(sig: c_int, noalias act: &const Sigaction, noalias oact: ?&Sigaction) c_int;	45	pub extern "c" fn sigaction(sig: c_int, noalias act: const Sigaction, noalias oact: ?Sigaction) c_int;
44	pub extern "c" fn nanosleep(rqtp: &const timespec, rmtp: ?&timespec) c_int;	46	pub extern "c" fn nanosleep(rqtp: const timespec, rmtp: ?timespec) c_int;
45	pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int;	47	pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int;
46	pub extern "c" fn setregid(rgid: c_uint, egid: c_uint) c_int;	48	pub extern "c" fn setregid(rgid: c_uint, egid: c_uint) c_int;
47	pub extern "c" fn rmdir(path: &const u8) c_int;	49	pub extern "c" fn rmdir(path: [*]const u8) c_int;
48		50
49	pub extern "c" fn aligned_alloc(alignment: usize, size: usize) ?&c_void;	51	pub extern "c" fn aligned_alloc(alignment: usize, size: usize) ?[*]c_void;
50	pub extern "c" fn malloc(usize) ?&c_void;	52	pub extern "c" fn malloc(usize) ?[*]c_void;
51	pub extern "c" fn realloc(&c_void, usize) ?&c_void;	53	pub extern "c" fn realloc([]c_void, usize) ?[]c_void;
52	pub extern "c" fn free(&c_void) void;	54	pub extern "c" fn free([*]c_void) void;
53	pub extern "c" fn posix_memalign(memptr: &&c_void, alignment: usize, size: usize) c_int;	55	pub extern "c" fn posix_memalign(memptr: []c_void, alignment: usize, size: usize) c_int;
54		56
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;	57	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;
56	pub extern "pthread" fn pthread_attr_init(attr: &pthread_attr_t) c_int;	58	pub extern "pthread" fn pthread_attr_init(attr: *pthread_attr_t) c_int;
57	pub extern "pthread" fn pthread_attr_setstack(attr: &pthread_attr_t, stackaddr: &c_void, stacksize: usize) c_int;	59	pub extern "pthread" fn pthread_attr_setstack(attr: pthread_attr_t, stackaddr: []c_void, stacksize: usize) c_int;
58	pub extern "pthread" fn pthread_attr_destroy(attr: &pthread_attr_t) c_int;	60	pub extern "pthread" fn pthread_attr_destroy(attr: *pthread_attr_t) c_int;
59	pub extern "pthread" fn pthread_join(thread: pthread_t, arg_return: ?&?&c_void) c_int;	61	pub extern "pthread" fn pthread_join(thread: pthread_t, arg_return: ??c_void) c_int;
60		62
61	pub const pthread_t = &@OpaqueType();	63	pub const pthread_t = *@OpaqueType();

std/c/linux.zig+2-2

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	pub use @import("../os/linux/errno.zig");	1	pub use @import("../os/linux/errno.zig");
2		2
3	pub extern "c" fn getrandom(buf_ptr: &u8, buf_len: usize, flags: c_uint) c_int;	3	pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) c_int;
4	extern "c" fn __errno_location() &c_int;	4	extern "c" fn __errno_location() *c_int;
5	pub const _errno = __errno_location;	5	pub const _errno = __errno_location;
6		6
7	pub const pthread_attr_t = extern struct {	7	pub const pthread_attr_t = extern struct {

std/c/windows.zig+1-1

...	@@ -1 +1 @@	...	@@ -1 +1 @@
1	pub extern "c" fn _errno() &c_int;	1	pub extern "c" fn _errno() *c_int;

std/crypto/blake2.zig+38-242

...	@@ -49,16 +49,16 @@ fn Blake2s(comptime out_len: usize) type {	...	@@ -49,16 +49,16 @@ fn Blake2s(comptime out_len: usize) type {
49	};	49	};
50		50
51	const sigma = [10][16]u8{	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 },	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 },	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 },	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 },	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 },	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 },	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 },	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 },	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 },	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 },	61	[]const u8{ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
62	};	62	};
63		63
64	h: [8]u32,	64	h: [8]u32,
...	@@ -75,7 +75,7 @@ fn Blake2s(comptime out_len: usize) type {	...	@@ -75,7 +75,7 @@ fn Blake2s(comptime out_len: usize) type {
75	return s;	75	return s;
76	}	76	}
77		77
78	pub fn reset(d: &Self) void {	78	pub fn reset(d: *Self) void {
79	mem.copy(u32, d.h[0..], iv[0..]);	79	mem.copy(u32, d.h[0..], iv[0..]);
80		80
81	// No key plus default parameters	81	// No key plus default parameters
...	@@ -90,7 +90,7 @@ fn Blake2s(comptime out_len: usize) type {	...	@@ -90,7 +90,7 @@ fn Blake2s(comptime out_len: usize) type {
90	d.final(out);	90	d.final(out);
91	}	91	}
92		92
93	pub fn update(d: &Self, b: []const u8) void {	93	pub fn update(d: *Self, b: []const u8) void {
94	var off: usize = 0;	94	var off: usize = 0;
95		95
96	// Partial buffer exists from previous update. Copy into buffer then hash.	96	// Partial buffer exists from previous update. Copy into buffer then hash.
...	@@ -105,7 +105,7 @@ fn Blake2s(comptime out_len: usize) type {	...	@@ -105,7 +105,7 @@ fn Blake2s(comptime out_len: usize) type {
105	// Full middle blocks.	105	// Full middle blocks.
106	while (off + 64 <= b.len) : (off += 64) {	106	while (off + 64 <= b.len) : (off += 64) {
107	d.t += 64;	107	d.t += 64;
108	d.round(b[off..off + 64], false);	108	d.round(b[off .. off + 64], false);
109	}	109	}
110		110
111	// Copy any remainder for next pass.	111	// Copy any remainder for next pass.
...	@@ -113,28 +113,28 @@ fn Blake2s(comptime out_len: usize) type {	...	@@ -113,28 +113,28 @@ fn Blake2s(comptime out_len: usize) type {
113	d.buf_len += u8(b[off..].len);	113	d.buf_len += u8(b[off..].len);
114	}	114	}
115		115
116	pub fn final(d: &Self, out: []u8) void {	116	pub fn final(d: *Self, out: []u8) void {
117	debug.assert(out.len >= out_len / 8);	117	debug.assert(out.len >= out_len / 8);
118		118
119	mem.set(u8, d.buf[d.buf_len..], 0);	119	mem.set(u8, d.buf[d.buf_len..], 0);
120	d.t += d.buf_len;	120	d.t += d.buf_len;
121	d.round(d.buf[0..], true);	121	d.round(d.buf[0..], true);
122		122
123	const rr = d.h[0..out_len / 32];	123	const rr = d.h[0 .. out_len / 32];
124		124
125	for (rr) \|s, j\| {	125	for (rr) \|s, j\| {
126	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Little);	126	mem.writeInt(out[4 * j .. 4 * j + 4], s, builtin.Endian.Little);
127	}	127	}
128	}	128	}
129		129
130	fn round(d: &Self, b: []const u8, last: bool) void {	130	fn round(d: *Self, b: []const u8, last: bool) void {
131	debug.assert(b.len == 64);	131	debug.assert(b.len == 64);
132		132
133	var m: [16]u32 = undefined;	133	var m: [16]u32 = undefined;
134	var v: [16]u32 = undefined;	134	var v: [16]u32 = undefined;
135		135
136	for (m) \|*r, i\| {	136	for (m) \|*r, i\| {
137	r.* = mem.readIntLE(u32, b[4 * i..4 * i + 4]);	137	r.* = mem.readIntLE(u32, b[4 * i .. 4 * i + 4]);
138	}	138	}
139		139
140	var k: usize = 0;	140	var k: usize = 0;
...	@@ -282,222 +282,18 @@ fn Blake2b(comptime out_len: usize) type {	...	@@ -282,222 +282,18 @@ fn Blake2b(comptime out_len: usize) type {
282	};	282	};
283		283
284	const sigma = [12][16]u8{	284	const sigma = [12][16]u8{
285	[]const u8{	285	[]const u8{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
286	0,	286	[]const u8{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
287	1,	287	[]const u8{ 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
288	2,	288	[]const u8{ 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
289	3,	289	[]const u8{ 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
290	4,	290	[]const u8{ 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
291	5,	291	[]const u8{ 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
292	6,	292	[]const u8{ 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
293	7,	293	[]const u8{ 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
294	8,	294	[]const u8{ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
295	9,	295	[]const u8{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
296	10,	296	[]const u8{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
297	11,
298	12,
299	13,
300	14,
301	15,
302	},
303	[]const u8{
304	14,
305	10,
306	4,
307	8,
308	9,
309	15,
310	13,
311	6,
312	1,
313	12,
314	0,
315	2,
316	11,
317	7,
318	5,
319	3,
320	},
321	[]const u8{
322	11,
323	8,
324	12,
325	0,
326	5,
327	2,
328	15,
329	13,
330	10,
331	14,
332	3,
333	6,
334	7,
335	1,
336	9,
337	4,
338	},
339	[]const u8{
340	7,
341	9,
342	3,
343	1,
344	13,
345	12,
346	11,
347	14,
348	2,
349	6,
350	5,
351	10,
352	4,
353	0,
354	15,
355	8,
356	},
357	[]const u8{
358	9,
359	0,
360	5,
361	7,
362	2,
363	4,
364	10,
365	15,
366	14,
367	1,
368	11,
369	12,
370	6,
371	8,
372	3,
373	13,
374	},
375	[]const u8{
376	2,
377	12,
378	6,
379	10,
380	0,
381	11,
382	8,
383	3,
384	4,
385	13,
386	7,
387	5,
388	15,
389	14,
390	1,
391	9,
392	},
393	[]const u8{
394	12,
395	5,
396	1,
397	15,
398	14,
399	13,
400	4,
401	10,
402	0,
403	7,
404	6,
405	3,
406	9,
407	2,
408	8,
409	11,
410	},
411	[]const u8{
412	13,
413	11,
414	7,
415	14,
416	12,
417	1,
418	3,
419	9,
420	5,
421	0,
422	15,
423	4,
424	8,
425	6,
426	2,
427	10,
428	},
429	[]const u8{
430	6,
431	15,
432	14,
433	9,
434	11,
435	3,
436	0,
437	8,
438	12,
439	2,
440	13,
441	7,
442	1,
443	4,
444	10,
445	5,
446	},
447	[]const u8{
448	10,
449	2,
450	8,
451	4,
452	7,
453	6,
454	1,
455	5,
456	15,
457	11,
458	9,
459	14,
460	3,
461	12,
462	13,
463	0,
464	},
465	[]const u8{
466	0,
467	1,
468	2,
469	3,
470	4,
471	5,
472	6,
473	7,
474	8,
475	9,
476	10,
477	11,
478	12,
479	13,
480	14,
481	15,
482	},
483	[]const u8{
484	14,
485	10,
486	4,
487	8,
488	9,
489	15,
490	13,
491	6,
492	1,
493	12,
494	0,
495	2,
496	11,
497	7,
498	5,
499	3,
500	},
501	};	297	};
502		298
503	h: [8]u64,	299	h: [8]u64,
...	@@ -514,7 +310,7 @@ fn Blake2b(comptime out_len: usize) type {	...	@@ -514,7 +310,7 @@ fn Blake2b(comptime out_len: usize) type {
514	return s;	310	return s;
515	}	311	}
516		312
517	pub fn reset(d: &Self) void {	313	pub fn reset(d: *Self) void {
518	mem.copy(u64, d.h[0..], iv[0..]);	314	mem.copy(u64, d.h[0..], iv[0..]);
519		315
520	// No key plus default parameters	316	// No key plus default parameters
...	@@ -529,7 +325,7 @@ fn Blake2b(comptime out_len: usize) type {	...	@@ -529,7 +325,7 @@ fn Blake2b(comptime out_len: usize) type {
529	d.final(out);	325	d.final(out);
530	}	326	}
531		327
532	pub fn update(d: &Self, b: []const u8) void {	328	pub fn update(d: *Self, b: []const u8) void {
533	var off: usize = 0;	329	var off: usize = 0;
534		330
535	// Partial buffer exists from previous update. Copy into buffer then hash.	331	// Partial buffer exists from previous update. Copy into buffer then hash.
...	@@ -544,7 +340,7 @@ fn Blake2b(comptime out_len: usize) type {	...	@@ -544,7 +340,7 @@ fn Blake2b(comptime out_len: usize) type {
544	// Full middle blocks.	340	// Full middle blocks.
545	while (off + 128 <= b.len) : (off += 128) {	341	while (off + 128 <= b.len) : (off += 128) {
546	d.t += 128;	342	d.t += 128;
547	d.round(b[off..off + 128], false);	343	d.round(b[off .. off + 128], false);
548	}	344	}
549		345
550	// Copy any remainder for next pass.	346	// Copy any remainder for next pass.
...	@@ -552,26 +348,26 @@ fn Blake2b(comptime out_len: usize) type {	...	@@ -552,26 +348,26 @@ fn Blake2b(comptime out_len: usize) type {
552	d.buf_len += u8(b[off..].len);	348	d.buf_len += u8(b[off..].len);
553	}	349	}
554		350
555	pub fn final(d: &Self, out: []u8) void {	351	pub fn final(d: *Self, out: []u8) void {
556	mem.set(u8, d.buf[d.buf_len..], 0);	352	mem.set(u8, d.buf[d.buf_len..], 0);
557	d.t += d.buf_len;	353	d.t += d.buf_len;
558	d.round(d.buf[0..], true);	354	d.round(d.buf[0..], true);
559		355
560	const rr = d.h[0..out_len / 64];	356	const rr = d.h[0 .. out_len / 64];
561		357
562	for (rr) \|s, j\| {	358	for (rr) \|s, j\| {
563	mem.writeInt(out[8 * j..8 * j + 8], s, builtin.Endian.Little);	359	mem.writeInt(out[8 * j .. 8 * j + 8], s, builtin.Endian.Little);
564	}	360	}
565	}	361	}
566		362
567	fn round(d: &Self, b: []const u8, last: bool) void {	363	fn round(d: *Self, b: []const u8, last: bool) void {
568	debug.assert(b.len == 128);	364	debug.assert(b.len == 128);
569		365
570	var m: [16]u64 = undefined;	366	var m: [16]u64 = undefined;
571	var v: [16]u64 = undefined;	367	var v: [16]u64 = undefined;
572		368
573	for (m) \|*r, i\| {	369	for (m) \|*r, i\| {
574	r.* = mem.readIntLE(u64, b[8 * i..8 * i + 8]);	370	r.* = mem.readIntLE(u64, b[8 * i .. 8 * i + 8]);
575	}	371	}
576		372
577	var k: usize = 0;	373	var k: usize = 0;

std/crypto/md5.zig+6-6

...	@@ -44,7 +44,7 @@ pub const Md5 = struct {	...	@@ -44,7 +44,7 @@ pub const Md5 = struct {
44	return d;	44	return d;
45	}	45	}
46		46
47	pub fn reset(d: &Self) void {	47	pub fn reset(d: *Self) void {
48	d.s[0] = 0x67452301;	48	d.s[0] = 0x67452301;
49	d.s[1] = 0xEFCDAB89;	49	d.s[1] = 0xEFCDAB89;
50	d.s[2] = 0x98BADCFE;	50	d.s[2] = 0x98BADCFE;
...	@@ -59,7 +59,7 @@ pub const Md5 = struct {	...	@@ -59,7 +59,7 @@ pub const Md5 = struct {
59	d.final(out);	59	d.final(out);
60	}	60	}
61		61
62	pub fn update(d: &Self, b: []const u8) void {	62	pub fn update(d: *Self, b: []const u8) void {
63	var off: usize = 0;	63	var off: usize = 0;
64		64
65	// Partial buffer exists from previous update. Copy into buffer then hash.	65	// Partial buffer exists from previous update. Copy into buffer then hash.
...	@@ -73,7 +73,7 @@ pub const Md5 = struct {	...	@@ -73,7 +73,7 @@ pub const Md5 = struct {
73		73
74	// Full middle blocks.	74	// Full middle blocks.
75	while (off + 64 <= b.len) : (off += 64) {	75	while (off + 64 <= b.len) : (off += 64) {
76	d.round(b[off..off + 64]);	76	d.round(b[off .. off + 64]);
77	}	77	}
78		78
79	// Copy any remainder for next pass.	79	// Copy any remainder for next pass.
...	@@ -84,7 +84,7 @@ pub const Md5 = struct {	...	@@ -84,7 +84,7 @@ pub const Md5 = struct {
84	d.total_len +%= b.len;	84	d.total_len +%= b.len;
85	}	85	}
86		86
87	pub fn final(d: &Self, out: []u8) void {	87	pub fn final(d: *Self, out: []u8) void {
88	debug.assert(out.len >= 16);	88	debug.assert(out.len >= 16);
89		89
90	// The buffer here will never be completely full.	90	// The buffer here will never be completely full.
...	@@ -112,11 +112,11 @@ pub const Md5 = struct {	...	@@ -112,11 +112,11 @@ pub const Md5 = struct {
112	d.round(d.buf[0..]);	112	d.round(d.buf[0..]);
113		113
114	for (d.s) \|s, j\| {	114	for (d.s) \|s, j\| {
115	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Little);	115	mem.writeInt(out[4 * j .. 4 * j + 4], s, builtin.Endian.Little);
116	}	116	}
117	}	117	}
118		118
119	fn round(d: &Self, b: []const u8) void {	119	fn round(d: *Self, b: []const u8) void {
120	debug.assert(b.len == 64);	120	debug.assert(b.len == 64);
121		121
122	var s: [16]u32 = undefined;	122	var s: [16]u32 = undefined;

std/crypto/sha1.zig+6-6

...	@@ -43,7 +43,7 @@ pub const Sha1 = struct {	...	@@ -43,7 +43,7 @@ pub const Sha1 = struct {
43	return d;	43	return d;
44	}	44	}
45		45
46	pub fn reset(d: &Self) void {	46	pub fn reset(d: *Self) void {
47	d.s[0] = 0x67452301;	47	d.s[0] = 0x67452301;
48	d.s[1] = 0xEFCDAB89;	48	d.s[1] = 0xEFCDAB89;
49	d.s[2] = 0x98BADCFE;	49	d.s[2] = 0x98BADCFE;
...	@@ -59,7 +59,7 @@ pub const Sha1 = struct {	...	@@ -59,7 +59,7 @@ pub const Sha1 = struct {
59	d.final(out);	59	d.final(out);
60	}	60	}
61		61
62	pub fn update(d: &Self, b: []const u8) void {	62	pub fn update(d: *Self, b: []const u8) void {
63	var off: usize = 0;	63	var off: usize = 0;
64		64
65	// Partial buffer exists from previous update. Copy into buffer then hash.	65	// Partial buffer exists from previous update. Copy into buffer then hash.
...	@@ -73,7 +73,7 @@ pub const Sha1 = struct {	...	@@ -73,7 +73,7 @@ pub const Sha1 = struct {
73		73
74	// Full middle blocks.	74	// Full middle blocks.
75	while (off + 64 <= b.len) : (off += 64) {	75	while (off + 64 <= b.len) : (off += 64) {
76	d.round(b[off..off + 64]);	76	d.round(b[off .. off + 64]);
77	}	77	}
78		78
79	// Copy any remainder for next pass.	79	// Copy any remainder for next pass.
...	@@ -83,7 +83,7 @@ pub const Sha1 = struct {	...	@@ -83,7 +83,7 @@ pub const Sha1 = struct {
83	d.total_len += b.len;	83	d.total_len += b.len;
84	}	84	}
85		85
86	pub fn final(d: &Self, out: []u8) void {	86	pub fn final(d: *Self, out: []u8) void {
87	debug.assert(out.len >= 20);	87	debug.assert(out.len >= 20);
88		88
89	// The buffer here will never be completely full.	89	// The buffer here will never be completely full.
...	@@ -111,11 +111,11 @@ pub const Sha1 = struct {	...	@@ -111,11 +111,11 @@ pub const Sha1 = struct {
111	d.round(d.buf[0..]);	111	d.round(d.buf[0..]);
112		112
113	for (d.s) \|s, j\| {	113	for (d.s) \|s, j\| {
114	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Big);	114	mem.writeInt(out[4 * j .. 4 * j + 4], s, builtin.Endian.Big);
115	}	115	}
116	}	116	}
117		117
118	fn round(d: &Self, b: []const u8) void {	118	fn round(d: *Self, b: []const u8) void {
119	debug.assert(b.len == 64);	119	debug.assert(b.len == 64);
120		120
121	var s: [16]u32 = undefined;	121	var s: [16]u32 = undefined;

std/crypto/sha2.zig+14-14

...	@@ -93,7 +93,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {	...	@@ -93,7 +93,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {
93	return d;	93	return d;
94	}	94	}
95		95
96	pub fn reset(d: &Self) void {	96	pub fn reset(d: *Self) void {
97	d.s[0] = params.iv0;	97	d.s[0] = params.iv0;
98	d.s[1] = params.iv1;	98	d.s[1] = params.iv1;
99	d.s[2] = params.iv2;	99	d.s[2] = params.iv2;
...	@@ -112,7 +112,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {	...	@@ -112,7 +112,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {
112	d.final(out);	112	d.final(out);
113	}	113	}
114		114
115	pub fn update(d: &Self, b: []const u8) void {	115	pub fn update(d: *Self, b: []const u8) void {
116	var off: usize = 0;	116	var off: usize = 0;
117		117
118	// Partial buffer exists from previous update. Copy into buffer then hash.	118	// Partial buffer exists from previous update. Copy into buffer then hash.
...	@@ -126,7 +126,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {	...	@@ -126,7 +126,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {
126		126
127	// Full middle blocks.	127	// Full middle blocks.
128	while (off + 64 <= b.len) : (off += 64) {	128	while (off + 64 <= b.len) : (off += 64) {
129	d.round(b[off..off + 64]);	129	d.round(b[off .. off + 64]);
130	}	130	}
131		131
132	// Copy any remainder for next pass.	132	// Copy any remainder for next pass.
...	@@ -136,7 +136,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {	...	@@ -136,7 +136,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {
136	d.total_len += b.len;	136	d.total_len += b.len;
137	}	137	}
138		138
139	pub fn final(d: &Self, out: []u8) void {	139	pub fn final(d: *Self, out: []u8) void {
140	debug.assert(out.len >= params.out_len / 8);	140	debug.assert(out.len >= params.out_len / 8);
141		141
142	// The buffer here will never be completely full.	142	// The buffer here will never be completely full.
...	@@ -164,14 +164,14 @@ fn Sha2_32(comptime params: Sha2Params32) type {	...	@@ -164,14 +164,14 @@ fn Sha2_32(comptime params: Sha2Params32) type {
164	d.round(d.buf[0..]);	164	d.round(d.buf[0..]);
165		165
166	// May truncate for possible 224 output	166	// May truncate for possible 224 output
167	const rr = d.s[0..params.out_len / 32];	167	const rr = d.s[0 .. params.out_len / 32];
168		168
169	for (rr) \|s, j\| {	169	for (rr) \|s, j\| {
170	mem.writeInt(out[4 * j..4 * j + 4], s, builtin.Endian.Big);	170	mem.writeInt(out[4 * j .. 4 * j + 4], s, builtin.Endian.Big);
171	}	171	}
172	}	172	}
173		173
174	fn round(d: &Self, b: []const u8) void {	174	fn round(d: *Self, b: []const u8) void {
175	debug.assert(b.len == 64);	175	debug.assert(b.len == 64);
176		176
177	var s: [64]u32 = undefined;	177	var s: [64]u32 = undefined;
...	@@ -434,7 +434,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {	...	@@ -434,7 +434,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {
434	return d;	434	return d;
435	}	435	}
436		436
437	pub fn reset(d: &Self) void {	437	pub fn reset(d: *Self) void {
438	d.s[0] = params.iv0;	438	d.s[0] = params.iv0;
439	d.s[1] = params.iv1;	439	d.s[1] = params.iv1;
440	d.s[2] = params.iv2;	440	d.s[2] = params.iv2;
...	@@ -453,7 +453,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {	...	@@ -453,7 +453,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {
453	d.final(out);	453	d.final(out);
454	}	454	}
455		455
456	pub fn update(d: &Self, b: []const u8) void {	456	pub fn update(d: *Self, b: []const u8) void {
457	var off: usize = 0;	457	var off: usize = 0;
458		458
459	// Partial buffer exists from previous update. Copy into buffer then hash.	459	// Partial buffer exists from previous update. Copy into buffer then hash.
...	@@ -467,7 +467,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {	...	@@ -467,7 +467,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {
467		467
468	// Full middle blocks.	468	// Full middle blocks.
469	while (off + 128 <= b.len) : (off += 128) {	469	while (off + 128 <= b.len) : (off += 128) {
470	d.round(b[off..off + 128]);	470	d.round(b[off .. off + 128]);
471	}	471	}
472		472
473	// Copy any remainder for next pass.	473	// Copy any remainder for next pass.
...	@@ -477,7 +477,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {	...	@@ -477,7 +477,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {
477	d.total_len += b.len;	477	d.total_len += b.len;
478	}	478	}
479		479
480	pub fn final(d: &Self, out: []u8) void {	480	pub fn final(d: *Self, out: []u8) void {
481	debug.assert(out.len >= params.out_len / 8);	481	debug.assert(out.len >= params.out_len / 8);
482		482
483	// The buffer here will never be completely full.	483	// The buffer here will never be completely full.
...	@@ -505,14 +505,14 @@ fn Sha2_64(comptime params: Sha2Params64) type {	...	@@ -505,14 +505,14 @@ fn Sha2_64(comptime params: Sha2Params64) type {
505	d.round(d.buf[0..]);	505	d.round(d.buf[0..]);
506		506
507	// May truncate for possible 384 output	507	// May truncate for possible 384 output
508	const rr = d.s[0..params.out_len / 64];	508	const rr = d.s[0 .. params.out_len / 64];
509		509
510	for (rr) \|s, j\| {	510	for (rr) \|s, j\| {
511	mem.writeInt(out[8 * j..8 * j + 8], s, builtin.Endian.Big);	511	mem.writeInt(out[8 * j .. 8 * j + 8], s, builtin.Endian.Big);
512	}	512	}
513	}	513	}
514		514
515	fn round(d: &Self, b: []const u8) void {	515	fn round(d: *Self, b: []const u8) void {
516	debug.assert(b.len == 128);	516	debug.assert(b.len == 128);
517		517
518	var s: [80]u64 = undefined;	518	var s: [80]u64 = undefined;

std/crypto/sha3.zig+7-7

...	@@ -26,7 +26,7 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {	...	@@ -26,7 +26,7 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {
26	return d;	26	return d;
27	}	27	}
28		28
29	pub fn reset(d: &Self) void {	29	pub fn reset(d: *Self) void {
30	mem.set(u8, d.s[0..], 0);	30	mem.set(u8, d.s[0..], 0);
31	d.offset = 0;	31	d.offset = 0;
32	d.rate = 200 - (bits / 4);	32	d.rate = 200 - (bits / 4);
...	@@ -38,7 +38,7 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {	...	@@ -38,7 +38,7 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {
38	d.final(out);	38	d.final(out);
39	}	39	}
40		40
41	pub fn update(d: &Self, b: []const u8) void {	41	pub fn update(d: *Self, b: []const u8) void {
42	var ip: usize = 0;	42	var ip: usize = 0;
43	var len = b.len;	43	var len = b.len;
44	var rate = d.rate - d.offset;	44	var rate = d.rate - d.offset;
...	@@ -46,7 +46,7 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {	...	@@ -46,7 +46,7 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {
46		46
47	// absorb	47	// absorb
48	while (len >= rate) {	48	while (len >= rate) {
49	for (d.s[offset..offset + rate]) \|*r, i\|	49	for (d.s[offset .. offset + rate]) \|*r, i\|
50	r.* ^= b[ip..][i];	50	r.* ^= b[ip..][i];
51		51
52	keccak_f(1600, d.s[0..]);	52	keccak_f(1600, d.s[0..]);
...	@@ -57,13 +57,13 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {	...	@@ -57,13 +57,13 @@ fn Keccak(comptime bits: usize, comptime delim: u8) type {
57	offset = 0;	57	offset = 0;
58	}	58	}
59		59
60	for (d.s[offset..offset + len]) \|*r, i\|	60	for (d.s[offset .. offset + len]) \|*r, i\|
61	r.* ^= b[ip..][i];	61	r.* ^= b[ip..][i];
62		62
63	d.offset = offset + len;	63	d.offset = offset + len;
64	}	64	}
65		65
66	pub fn final(d: &Self, out: []u8) void {	66	pub fn final(d: *Self, out: []u8) void {
67	// padding	67	// padding
68	d.s[d.offset] ^= delim;	68	d.s[d.offset] ^= delim;
69	d.s[d.rate - 1] ^= 0x80;	69	d.s[d.rate - 1] ^= 0x80;
...	@@ -193,7 +193,7 @@ fn keccak_f(comptime F: usize, d: []u8) void {	...	@@ -193,7 +193,7 @@ fn keccak_f(comptime F: usize, d: []u8) void {
193	var c = []const u64{0} ** 5;	193	var c = []const u64{0} ** 5;
194		194
195	for (s) \|*r, i\| {	195	for (s) \|*r, i\| {
196	r.* = mem.readIntLE(u64, d[8 * i..8 * i + 8]);	196	r.* = mem.readIntLE(u64, d[8 * i .. 8 * i + 8]);
197	}	197	}
198		198
199	comptime var x: usize = 0;	199	comptime var x: usize = 0;
...	@@ -240,7 +240,7 @@ fn keccak_f(comptime F: usize, d: []u8) void {	...	@@ -240,7 +240,7 @@ fn keccak_f(comptime F: usize, d: []u8) void {
240	}	240	}
241		241
242	for (s) \|r, i\| {	242	for (s) \|r, i\| {
243	mem.writeInt(d[8 * i..8 * i + 8], r, builtin.Endian.Little);	243	mem.writeInt(d[8 * i .. 8 * i + 8], r, builtin.Endian.Little);
244	}	244	}
245	}	245	}
246		246

std/crypto/test.zig+1-1

...	@@ -14,7 +14,7 @@ pub fn assertEqualHash(comptime Hasher: var, comptime expected: []const u8, inpu	...	@@ -14,7 +14,7 @@ pub fn assertEqualHash(comptime Hasher: var, comptime expected: []const u8, inpu
14	pub fn assertEqual(comptime expected: []const u8, input: []const u8) void {	14	pub fn assertEqual(comptime expected: []const u8, input: []const u8) void {
15	var expected_bytes: [expected.len / 2]u8 = undefined;	15	var expected_bytes: [expected.len / 2]u8 = undefined;
16	for (expected_bytes) \|*r, i\| {	16	for (expected_bytes) \|*r, i\| {
17	r.* = fmt.parseInt(u8, expected[2 * i..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	debug.assert(mem.eql(u8, expected_bytes, input));	20	debug.assert(mem.eql(u8, expected_bytes, input));

std/crypto/throughput_test.zig+2-2

...	@@ -15,8 +15,8 @@ const BytesToHash = 1024 * MiB;	...	@@ -15,8 +15,8 @@ const BytesToHash = 1024 * MiB;
15		15
16	pub fn main() !void {	16	pub fn main() !void {
17	var stdout_file = try std.io.getStdOut();	17	var stdout_file = try std.io.getStdOut();
18	var stdout_out_stream = std.io.FileOutStream.init(&stdout_file);	18	var stdout_out_stream = std.io.FileOutStream.init(*stdout_file);
19	const stdout = &stdout_out_stream.stream;	19	const stdout = *stdout_out_stream.stream;
20		20
21	var block: [HashFunction.block_size]u8 = undefined;	21	var block: [HashFunction.block_size]u8 = undefined;
22	std.mem.set(u8, block[0..], 0);	22	std.mem.set(u8, block[0..], 0);

std/cstr.zig+14-14

...	@@ -9,13 +9,13 @@ pub const line_sep = switch (builtin.os) {	...	@@ -9,13 +9,13 @@ pub const line_sep = switch (builtin.os) {
9	else => "\n",	9	else => "\n",
10	};	10	};
11		11
12	pub fn len(ptr: &const u8) usize {	12	pub fn len(ptr: [*]const u8) usize {
13	var count: usize = 0;	13	var count: usize = 0;
14	while (ptr[count] != 0) : (count += 1) {}	14	while (ptr[count] != 0) : (count += 1) {}
15	return count;	15	return count;
16	}	16	}
17		17
18	pub fn cmp(a: &const u8, b: &const u8) i8 {	18	pub fn cmp(a: []const u8, b: []const u8) i8 {
19	var index: usize = 0;	19	var index: usize = 0;
20	while (a[index] == b[index] and a[index] != 0) : (index += 1) {}	20	while (a[index] == b[index] and a[index] != 0) : (index += 1) {}
21	if (a[index] > b[index]) {	21	if (a[index] > b[index]) {
...	@@ -27,11 +27,11 @@ pub fn cmp(a: &const u8, b: &const u8) i8 {	...	@@ -27,11 +27,11 @@ pub fn cmp(a: &const u8, b: &const u8) i8 {
27	}	27	}
28	}	28	}
29		29
30	pub fn toSliceConst(str: &const u8) []const u8 {	30	pub fn toSliceConst(str: [*]const u8) []const u8 {
31	return str[0..len(str)];	31	return str[0..len(str)];
32	}	32	}
33		33
34	pub fn toSlice(str: &u8) []u8 {	34	pub fn toSlice(str: [*]u8) []u8 {
35	return str[0..len(str)];	35	return str[0..len(str)];
36	}	36	}
37		37
...	@@ -47,7 +47,7 @@ fn testCStrFnsImpl() void {	...	@@ -47,7 +47,7 @@ fn testCStrFnsImpl() void {
47		47
48	/// Returns a mutable slice with 1 more byte of length which is a null byte.	48	/// Returns a mutable slice with 1 more byte of length which is a null byte.
49	/// Caller owns the returned memory.	49	/// Caller owns the returned memory.
50	pub fn addNullByte(allocator: &mem.Allocator, slice: []const u8) ![]u8 {	50	pub fn addNullByte(allocator: *mem.Allocator, slice: []const u8) ![]u8 {
51	const result = try allocator.alloc(u8, slice.len + 1);	51	const result = try allocator.alloc(u8, slice.len + 1);
52	mem.copy(u8, result, slice);	52	mem.copy(u8, result, slice);
53	result[slice.len] = 0;	53	result[slice.len] = 0;
...	@@ -55,13 +55,13 @@ pub fn addNullByte(allocator: &mem.Allocator, slice: []const u8) ![]u8 {	...	@@ -55,13 +55,13 @@ pub fn addNullByte(allocator: &mem.Allocator, slice: []const u8) ![]u8 {
55	}	55	}
56		56
57	pub const NullTerminated2DArray = struct {	57	pub const NullTerminated2DArray = struct {
58	allocator: &mem.Allocator,	58	allocator: *mem.Allocator,
59	byte_count: usize,	59	byte_count: usize,
60	ptr: ?&?&u8,	60	ptr: ?[]?[]u8,
61		61
62	/// Takes N lists of strings, concatenates the lists together, and adds a null terminator	62	/// Takes N lists of strings, concatenates the lists together, and adds a null terminator
63	/// Caller must deinit result	63	/// Caller must deinit result
64	pub fn fromSlices(allocator: &mem.Allocator, slices: []const []const []const u8) !NullTerminated2DArray {	64	pub fn fromSlices(allocator: *mem.Allocator, slices: []const []const []const u8) !NullTerminated2DArray {
65	var new_len: usize = 1; // 1 for the list null	65	var new_len: usize = 1; // 1 for the list null
66	var byte_count: usize = 0;	66	var byte_count: usize = 0;
67	for (slices) \|slice\| {	67	for (slices) \|slice\| {
...	@@ -75,16 +75,16 @@ pub const NullTerminated2DArray = struct {	...	@@ -75,16 +75,16 @@ pub const NullTerminated2DArray = struct {
75	const index_size = @sizeOf(usize) * new_len; // size of the ptrs	75	const index_size = @sizeOf(usize) * new_len; // size of the ptrs
76	byte_count += index_size;	76	byte_count += index_size;
77		77
78	const buf = try allocator.alignedAlloc(u8, @alignOf(?&u8), byte_count);	78	const buf = try allocator.alignedAlloc(u8, @alignOf(?*u8), byte_count);
79	errdefer allocator.free(buf);	79	errdefer allocator.free(buf);
80		80
81	var write_index = index_size;	81	var write_index = index_size;
82	const index_buf = ([]?&u8)(buf);	82	const index_buf = ([]?[*]u8)(buf);
83		83
84	var i: usize = 0;	84	var i: usize = 0;
85	for (slices) \|slice\| {	85	for (slices) \|slice\| {
86	for (slice) \|inner\| {	86	for (slice) \|inner\| {
87	index_buf[i] = &buf[write_index];	87	index_buf[i] = buf.ptr + write_index;
88	i += 1;	88	i += 1;
89	mem.copy(u8, buf[write_index..], inner);	89	mem.copy(u8, buf[write_index..], inner);
90	write_index += inner.len;	90	write_index += inner.len;
...	@@ -97,12 +97,12 @@ pub const NullTerminated2DArray = struct {	...	@@ -97,12 +97,12 @@ pub const NullTerminated2DArray = struct {
97	return NullTerminated2DArray{	97	return NullTerminated2DArray{
98	.allocator = allocator,	98	.allocator = allocator,
99	.byte_count = byte_count,	99	.byte_count = byte_count,
100	.ptr = @ptrCast(?&?&u8, buf.ptr),	100	.ptr = @ptrCast(?[]?[]u8, buf.ptr),
101	};	101	};
102	}	102	}
103		103
104	pub fn deinit(self: &NullTerminated2DArray) void {	104	pub fn deinit(self: *NullTerminated2DArray) void {
105	const buf = @ptrCast(&u8, self.ptr);	105	const buf = @ptrCast([*]u8, self.ptr);
106	self.allocator.free(buf[0..self.byte_count]);	106	self.allocator.free(buf[0..self.byte_count]);
107	}	107	}
108	};	108	};

std/debug/failing_allocator.zig+5-5

...	@@ -7,12 +7,12 @@ pub const FailingAllocator = struct {	...	@@ -7,12 +7,12 @@ pub const FailingAllocator = struct {
7	allocator: mem.Allocator,	7	allocator: mem.Allocator,
8	index: usize,	8	index: usize,
9	fail_index: usize,	9	fail_index: usize,
10	internal_allocator: &mem.Allocator,	10	internal_allocator: *mem.Allocator,
11	allocated_bytes: usize,	11	allocated_bytes: usize,
12	freed_bytes: usize,	12	freed_bytes: usize,
13	deallocations: usize,	13	deallocations: usize,
14		14
15	pub fn init(allocator: &mem.Allocator, fail_index: usize) FailingAllocator {	15	pub fn init(allocator: *mem.Allocator, fail_index: usize) FailingAllocator {
16	return FailingAllocator{	16	return FailingAllocator{
17	.internal_allocator = allocator,	17	.internal_allocator = allocator,
18	.fail_index = fail_index,	18	.fail_index = fail_index,
...	@@ -28,7 +28,7 @@ pub const FailingAllocator = struct {	...	@@ -28,7 +28,7 @@ pub const FailingAllocator = struct {
28	};	28	};
29	}	29	}
30		30
31	fn alloc(allocator: &mem.Allocator, n: usize, alignment: u29) ![]u8 {	31	fn alloc(allocator: *mem.Allocator, n: usize, alignment: u29) ![]u8 {
32	const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);	32	const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);
33	if (self.index == self.fail_index) {	33	if (self.index == self.fail_index) {
34	return error.OutOfMemory;	34	return error.OutOfMemory;
...	@@ -39,7 +39,7 @@ pub const FailingAllocator = struct {	...	@@ -39,7 +39,7 @@ pub const FailingAllocator = struct {
39	return result;	39	return result;
40	}	40	}
41		41
42	fn realloc(allocator: &mem.Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {	42	fn realloc(allocator: *mem.Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
43	const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);	43	const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);
44	if (new_size <= old_mem.len) {	44	if (new_size <= old_mem.len) {
45	self.freed_bytes += old_mem.len - new_size;	45	self.freed_bytes += old_mem.len - new_size;
...	@@ -55,7 +55,7 @@ pub const FailingAllocator = struct {	...	@@ -55,7 +55,7 @@ pub const FailingAllocator = struct {
55	return result;	55	return result;
56	}	56	}
57		57
58	fn free(allocator: &mem.Allocator, bytes: []u8) void {	58	fn free(allocator: *mem.Allocator, bytes: []u8) void {
59	const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);	59	const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);
60	self.freed_bytes += bytes.len;	60	self.freed_bytes += bytes.len;
61	self.deallocations += 1;	61	self.deallocations += 1;

std/debug/index.zig+53-53

...	@@ -16,12 +16,12 @@ pub const FailingAllocator = @import("failing_allocator.zig").FailingAllocator;	...	@@ -16,12 +16,12 @@ pub const FailingAllocator = @import("failing_allocator.zig").FailingAllocator;
16	/// TODO atomic/multithread support	16	/// TODO atomic/multithread support
17	var stderr_file: os.File = undefined;	17	var stderr_file: os.File = undefined;
18	var stderr_file_out_stream: io.FileOutStream = undefined;	18	var stderr_file_out_stream: io.FileOutStream = undefined;
19	var stderr_stream: ?&io.OutStream(io.FileOutStream.Error) = null;	19	var stderr_stream: ?*io.OutStream(io.FileOutStream.Error) = null;
20	pub fn warn(comptime fmt: []const u8, args: ...) void {	20	pub fn warn(comptime fmt: []const u8, args: ...) void {
21	const stderr = getStderrStream() catch return;	21	const stderr = getStderrStream() catch return;
22	stderr.print(fmt, args) catch return;	22	stderr.print(fmt, args) catch return;
23	}	23	}
24	fn getStderrStream() !&io.OutStream(io.FileOutStream.Error) {	24	fn getStderrStream() !*io.OutStream(io.FileOutStream.Error) {
25	if (stderr_stream) \|st\| {	25	if (stderr_stream) \|st\| {
26	return st;	26	return st;
27	} else {	27	} else {
...	@@ -33,8 +33,8 @@ fn getStderrStream() !&io.OutStream(io.FileOutStream.Error) {	...	@@ -33,8 +33,8 @@ fn getStderrStream() !&io.OutStream(io.FileOutStream.Error) {
33	}	33	}
34	}	34	}
35		35
36	var self_debug_info: ?&ElfStackTrace = null;	36	var self_debug_info: ?*ElfStackTrace = null;
37	pub fn getSelfDebugInfo() !&ElfStackTrace {	37	pub fn getSelfDebugInfo() !*ElfStackTrace {
38	if (self_debug_info) \|info\| {	38	if (self_debug_info) \|info\| {
39	return info;	39	return info;
40	} else {	40	} else {
...	@@ -58,7 +58,7 @@ pub fn dumpCurrentStackTrace(start_addr: ?usize) void {	...	@@ -58,7 +58,7 @@ pub fn dumpCurrentStackTrace(start_addr: ?usize) void {
58	}	58	}
59		59
60	/// Tries to print a stack trace to stderr, unbuffered, and ignores any error returned.	60	/// Tries to print a stack trace to stderr, unbuffered, and ignores any error returned.
61	pub fn dumpStackTrace(stack_trace: &const builtin.StackTrace) void {	61	pub fn dumpStackTrace(stack_trace: *const builtin.StackTrace) void {
62	const stderr = getStderrStream() catch return;	62	const stderr = getStderrStream() catch return;
63	const debug_info = getSelfDebugInfo() catch \|err\| {	63	const debug_info = getSelfDebugInfo() catch \|err\| {
64	stderr.print("Unable to dump stack trace: Unable to open debug info: {}\n", @errorName(err)) catch return;	64	stderr.print("Unable to dump stack trace: Unable to open debug info: {}\n", @errorName(err)) catch return;
...	@@ -104,7 +104,7 @@ pub fn panic(comptime format: []const u8, args: ...) noreturn {	...	@@ -104,7 +104,7 @@ pub fn panic(comptime format: []const u8, args: ...) noreturn {
104		104
105	var panicking: u8 = 0; // TODO make this a bool	105	var panicking: u8 = 0; // TODO make this a bool
106		106
107	pub fn panicExtra(trace: ?&const builtin.StackTrace, first_trace_addr: ?usize, comptime format: []const u8, args: ...) noreturn {	107	pub fn panicExtra(trace: ?*const builtin.StackTrace, first_trace_addr: ?usize, comptime format: []const u8, args: ...) noreturn {
108	@setCold(true);	108	@setCold(true);
109		109
110	if (@atomicRmw(u8, &panicking, builtin.AtomicRmwOp.Xchg, 1, builtin.AtomicOrder.SeqCst) == 1) {	110	if (@atomicRmw(u8, &panicking, builtin.AtomicRmwOp.Xchg, 1, builtin.AtomicOrder.SeqCst) == 1) {
...	@@ -130,7 +130,7 @@ const WHITE = "\x1b[37;1m";	...	@@ -130,7 +130,7 @@ const WHITE = "\x1b[37;1m";
130	const DIM = "\x1b[2m";	130	const DIM = "\x1b[2m";
131	const RESET = "\x1b[0m";	131	const RESET = "\x1b[0m";
132		132
133	pub fn writeStackTrace(stack_trace: &const builtin.StackTrace, out_stream: var, allocator: &mem.Allocator, debug_info: &ElfStackTrace, tty_color: bool) !void {	133	pub fn writeStackTrace(stack_trace: const builtin.StackTrace, out_stream: var, allocator: mem.Allocator, debug_info: *ElfStackTrace, tty_color: bool) !void {
134	var frame_index: usize = undefined;	134	var frame_index: usize = undefined;
135	var frames_left: usize = undefined;	135	var frames_left: usize = undefined;
136	if (stack_trace.index < stack_trace.instruction_addresses.len) {	136	if (stack_trace.index < stack_trace.instruction_addresses.len) {
...	@@ -150,7 +150,7 @@ pub fn writeStackTrace(stack_trace: &const builtin.StackTrace, out_stream: var,	...	@@ -150,7 +150,7 @@ pub fn writeStackTrace(stack_trace: &const builtin.StackTrace, out_stream: var,
150	}	150	}
151	}	151	}
152		152
153	pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator, debug_info: &ElfStackTrace, tty_color: bool, start_addr: ?usize) !void {	153	pub fn writeCurrentStackTrace(out_stream: var, allocator: mem.Allocator, debug_info: ElfStackTrace, tty_color: bool, start_addr: ?usize) !void {
154	const AddressState = union(enum) {	154	const AddressState = union(enum) {
155	NotLookingForStartAddress,	155	NotLookingForStartAddress,
156	LookingForStartAddress: usize,	156	LookingForStartAddress: usize,
...	@@ -166,8 +166,8 @@ pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator, debug_	...	@@ -166,8 +166,8 @@ pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator, debug_
166	}	166	}
167		167
168	var fp = @ptrToInt(@frameAddress());	168	var fp = @ptrToInt(@frameAddress());
169	while (fp != 0) : (fp = @intToPtr(&const usize, fp).*) {	169	while (fp != 0) : (fp = @intToPtr(const usize, fp).) {
170	const return_address = @intToPtr(&const usize, fp + @sizeOf(usize)).*;	170	const return_address = @intToPtr(const usize, fp + @sizeOf(usize)).;
171		171
172	switch (addr_state) {	172	switch (addr_state) {
173	AddressState.NotLookingForStartAddress => {},	173	AddressState.NotLookingForStartAddress => {},
...	@@ -183,7 +183,7 @@ pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator, debug_	...	@@ -183,7 +183,7 @@ pub fn writeCurrentStackTrace(out_stream: var, allocator: &mem.Allocator, debug_
183	}	183	}
184	}	184	}
185		185
186	fn printSourceAtAddress(debug_info: &ElfStackTrace, out_stream: var, address: usize) !void {	186	fn printSourceAtAddress(debug_info: *ElfStackTrace, out_stream: var, address: usize) !void {
187	const ptr_hex = "0x{x}";	187	const ptr_hex = "0x{x}";
188		188
189	switch (builtin.os) {	189	switch (builtin.os) {
...	@@ -236,7 +236,7 @@ fn printSourceAtAddress(debug_info: &ElfStackTrace, out_stream: var, address: us	...	@@ -236,7 +236,7 @@ fn printSourceAtAddress(debug_info: &ElfStackTrace, out_stream: var, address: us
236	}	236	}
237	}	237	}
238		238
239	pub fn openSelfDebugInfo(allocator: &mem.Allocator) !&ElfStackTrace {	239	pub fn openSelfDebugInfo(allocator: mem.Allocator) !ElfStackTrace {
240	switch (builtin.object_format) {	240	switch (builtin.object_format) {
241	builtin.ObjectFormat.elf => {	241	builtin.ObjectFormat.elf => {
242	const st = try allocator.create(ElfStackTrace);	242	const st = try allocator.create(ElfStackTrace);
...	@@ -289,7 +289,7 @@ pub fn openSelfDebugInfo(allocator: &mem.Allocator) !&ElfStackTrace {	...	@@ -289,7 +289,7 @@ pub fn openSelfDebugInfo(allocator: &mem.Allocator) !&ElfStackTrace {
289	}	289	}
290	}	290	}
291		291
292	fn printLineFromFile(allocator: &mem.Allocator, out_stream: var, line_info: &const LineInfo) !void {	292	fn printLineFromFile(allocator: mem.Allocator, out_stream: var, line_info: const LineInfo) !void {
293	var f = try os.File.openRead(allocator, line_info.file_name);	293	var f = try os.File.openRead(allocator, line_info.file_name);
294	defer f.close();	294	defer f.close();
295	// TODO fstat and make sure that the file has the correct size	295	// TODO fstat and make sure that the file has the correct size
...	@@ -325,32 +325,32 @@ pub const ElfStackTrace = switch (builtin.os) {	...	@@ -325,32 +325,32 @@ pub const ElfStackTrace = switch (builtin.os) {
325	builtin.Os.macosx => struct {	325	builtin.Os.macosx => struct {
326	symbol_table: macho.SymbolTable,	326	symbol_table: macho.SymbolTable,
327		327
328	pub fn close(self: &ElfStackTrace) void {	328	pub fn close(self: *ElfStackTrace) void {
329	self.symbol_table.deinit();	329	self.symbol_table.deinit();
330	}	330	}
331	},	331	},
332	else => struct {	332	else => struct {
333	self_exe_file: os.File,	333	self_exe_file: os.File,
334	elf: elf.Elf,	334	elf: elf.Elf,
335	debug_info: &elf.SectionHeader,	335	debug_info: *elf.SectionHeader,
336	debug_abbrev: &elf.SectionHeader,	336	debug_abbrev: *elf.SectionHeader,
337	debug_str: &elf.SectionHeader,	337	debug_str: *elf.SectionHeader,
338	debug_line: &elf.SectionHeader,	338	debug_line: *elf.SectionHeader,
339	debug_ranges: ?&elf.SectionHeader,	339	debug_ranges: ?*elf.SectionHeader,
340	abbrev_table_list: ArrayList(AbbrevTableHeader),	340	abbrev_table_list: ArrayList(AbbrevTableHeader),
341	compile_unit_list: ArrayList(CompileUnit),	341	compile_unit_list: ArrayList(CompileUnit),
342		342
343	pub fn allocator(self: &const ElfStackTrace) &mem.Allocator {	343	pub fn allocator(self: const ElfStackTrace) mem.Allocator {
344	return self.abbrev_table_list.allocator;	344	return self.abbrev_table_list.allocator;
345	}	345	}
346		346
347	pub fn readString(self: &ElfStackTrace) ![]u8 {	347	pub fn readString(self: *ElfStackTrace) ![]u8 {
348	var in_file_stream = io.FileInStream.init(&self.self_exe_file);	348	var in_file_stream = io.FileInStream.init(&self.self_exe_file);
349	const in_stream = &in_file_stream.stream;	349	const in_stream = &in_file_stream.stream;
350	return readStringRaw(self.allocator(), in_stream);	350	return readStringRaw(self.allocator(), in_stream);
351	}	351	}
352		352
353	pub fn close(self: &ElfStackTrace) void {	353	pub fn close(self: *ElfStackTrace) void {
354	self.self_exe_file.close();	354	self.self_exe_file.close();
355	self.elf.close();	355	self.elf.close();
356	}	356	}
...	@@ -365,7 +365,7 @@ const PcRange = struct {	...	@@ -365,7 +365,7 @@ const PcRange = struct {
365	const CompileUnit = struct {	365	const CompileUnit = struct {
366	version: u16,	366	version: u16,
367	is_64: bool,	367	is_64: bool,
368	die: &Die,	368	die: *Die,
369	index: usize,	369	index: usize,
370	pc_range: ?PcRange,	370	pc_range: ?PcRange,
371	};	371	};
...	@@ -408,7 +408,7 @@ const Constant = struct {	...	@@ -408,7 +408,7 @@ const Constant = struct {
408	payload: []u8,	408	payload: []u8,
409	signed: bool,	409	signed: bool,
410		410
411	fn asUnsignedLe(self: &const Constant) !u64 {	411	fn asUnsignedLe(self: *const Constant) !u64 {
412	if (self.payload.len > @sizeOf(u64)) return error.InvalidDebugInfo;	412	if (self.payload.len > @sizeOf(u64)) return error.InvalidDebugInfo;
413	if (self.signed) return error.InvalidDebugInfo;	413	if (self.signed) return error.InvalidDebugInfo;
414	return mem.readInt(self.payload, u64, builtin.Endian.Little);	414	return mem.readInt(self.payload, u64, builtin.Endian.Little);
...	@@ -425,14 +425,14 @@ const Die = struct {	...	@@ -425,14 +425,14 @@ const Die = struct {
425	value: FormValue,	425	value: FormValue,
426	};	426	};
427		427
428	fn getAttr(self: &const Die, id: u64) ?&const FormValue {	428	fn getAttr(self: const Die, id: u64) ?const FormValue {
429	for (self.attrs.toSliceConst()) \|*attr\| {	429	for (self.attrs.toSliceConst()) \|*attr\| {
430	if (attr.id == id) return &attr.value;	430	if (attr.id == id) return &attr.value;
431	}	431	}
432	return null;	432	return null;
433	}	433	}
434		434
435	fn getAttrAddr(self: &const Die, id: u64) !u64 {	435	fn getAttrAddr(self: *const Die, id: u64) !u64 {
436	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;	436	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
437	return switch (form_value.*) {	437	return switch (form_value.*) {
438	FormValue.Address => \|value\| value,	438	FormValue.Address => \|value\| value,
...	@@ -440,7 +440,7 @@ const Die = struct {	...	@@ -440,7 +440,7 @@ const Die = struct {
440	};	440	};
441	}	441	}
442		442
443	fn getAttrSecOffset(self: &const Die, id: u64) !u64 {	443	fn getAttrSecOffset(self: *const Die, id: u64) !u64 {
444	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;	444	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
445	return switch (form_value.*) {	445	return switch (form_value.*) {
446	FormValue.Const => \|value\| value.asUnsignedLe(),	446	FormValue.Const => \|value\| value.asUnsignedLe(),
...	@@ -449,7 +449,7 @@ const Die = struct {	...	@@ -449,7 +449,7 @@ const Die = struct {
449	};	449	};
450	}	450	}
451		451
452	fn getAttrUnsignedLe(self: &const Die, id: u64) !u64 {	452	fn getAttrUnsignedLe(self: *const Die, id: u64) !u64 {
453	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;	453	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
454	return switch (form_value.*) {	454	return switch (form_value.*) {
455	FormValue.Const => \|value\| value.asUnsignedLe(),	455	FormValue.Const => \|value\| value.asUnsignedLe(),
...	@@ -457,7 +457,7 @@ const Die = struct {	...	@@ -457,7 +457,7 @@ const Die = struct {
457	};	457	};
458	}	458	}
459		459
460	fn getAttrString(self: &const Die, st: &ElfStackTrace, id: u64) ![]u8 {	460	fn getAttrString(self: const Die, st: ElfStackTrace, id: u64) ![]u8 {
461	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;	461	const form_value = self.getAttr(id) ?? return error.MissingDebugInfo;
462	return switch (form_value.*) {	462	return switch (form_value.*) {
463	FormValue.String => \|value\| value,	463	FormValue.String => \|value\| value,
...	@@ -478,9 +478,9 @@ const LineInfo = struct {	...	@@ -478,9 +478,9 @@ const LineInfo = struct {
478	line: usize,	478	line: usize,
479	column: usize,	479	column: usize,
480	file_name: []u8,	480	file_name: []u8,
481	allocator: &mem.Allocator,	481	allocator: *mem.Allocator,
482		482
483	fn deinit(self: &const LineInfo) void {	483	fn deinit(self: *const LineInfo) void {
484	self.allocator.free(self.file_name);	484	self.allocator.free(self.file_name);
485	}	485	}
486	};	486	};
...	@@ -496,7 +496,7 @@ const LineNumberProgram = struct {	...	@@ -496,7 +496,7 @@ const LineNumberProgram = struct {
496		496
497	target_address: usize,	497	target_address: usize,
498	include_dirs: []const []const u8,	498	include_dirs: []const []const u8,
499	file_entries: &ArrayList(FileEntry),	499	file_entries: *ArrayList(FileEntry),
500		500
501	prev_address: usize,	501	prev_address: usize,
502	prev_file: usize,	502	prev_file: usize,
...	@@ -506,7 +506,7 @@ const LineNumberProgram = struct {	...	@@ -506,7 +506,7 @@ const LineNumberProgram = struct {
506	prev_basic_block: bool,	506	prev_basic_block: bool,
507	prev_end_sequence: bool,	507	prev_end_sequence: bool,
508		508
509	pub fn init(is_stmt: bool, include_dirs: []const []const u8, file_entries: &ArrayList(FileEntry), target_address: usize) LineNumberProgram {	509	pub fn init(is_stmt: bool, include_dirs: []const []const u8, file_entries: *ArrayList(FileEntry), target_address: usize) LineNumberProgram {
510	return LineNumberProgram{	510	return LineNumberProgram{
511	.address = 0,	511	.address = 0,
512	.file = 1,	512	.file = 1,
...	@@ -528,7 +528,7 @@ const LineNumberProgram = struct {	...	@@ -528,7 +528,7 @@ const LineNumberProgram = struct {
528	};	528	};
529	}	529	}
530		530
531	pub fn checkLineMatch(self: &LineNumberProgram) !?LineInfo {	531	pub fn checkLineMatch(self: *LineNumberProgram) !?LineInfo {
532	if (self.target_address >= self.prev_address and self.target_address < self.address) {	532	if (self.target_address >= self.prev_address and self.target_address < self.address) {
533	const file_entry = if (self.prev_file == 0) {	533	const file_entry = if (self.prev_file == 0) {
534	return error.MissingDebugInfo;	534	return error.MissingDebugInfo;
...	@@ -562,7 +562,7 @@ const LineNumberProgram = struct {	...	@@ -562,7 +562,7 @@ const LineNumberProgram = struct {
562	}	562	}
563	};	563	};
564		564
565	fn readStringRaw(allocator: &mem.Allocator, in_stream: var) ![]u8 {	565	fn readStringRaw(allocator: *mem.Allocator, in_stream: var) ![]u8 {
566	var buf = ArrayList(u8).init(allocator);	566	var buf = ArrayList(u8).init(allocator);
567	while (true) {	567	while (true) {
568	const byte = try in_stream.readByte();	568	const byte = try in_stream.readByte();
...	@@ -572,30 +572,30 @@ fn readStringRaw(allocator: &mem.Allocator, in_stream: var) ![]u8 {	...	@@ -572,30 +572,30 @@ fn readStringRaw(allocator: &mem.Allocator, in_stream: var) ![]u8 {
572	return buf.toSlice();	572	return buf.toSlice();
573	}	573	}
574		574
575	fn getString(st: &ElfStackTrace, offset: u64) ![]u8 {	575	fn getString(st: *ElfStackTrace, offset: u64) ![]u8 {
576	const pos = st.debug_str.offset + offset;	576	const pos = st.debug_str.offset + offset;
577	try st.self_exe_file.seekTo(pos);	577	try st.self_exe_file.seekTo(pos);
578	return st.readString();	578	return st.readString();
579	}	579	}
580		580
581	fn readAllocBytes(allocator: &mem.Allocator, in_stream: var, size: usize) ![]u8 {	581	fn readAllocBytes(allocator: *mem.Allocator, in_stream: var, size: usize) ![]u8 {
582	const buf = try allocator.alloc(u8, size);	582	const buf = try allocator.alloc(u8, size);
583	errdefer allocator.free(buf);	583	errdefer allocator.free(buf);
584	if ((try in_stream.read(buf)) < size) return error.EndOfFile;	584	if ((try in_stream.read(buf)) < size) return error.EndOfFile;
585	return buf;	585	return buf;
586	}	586	}
587		587
588	fn parseFormValueBlockLen(allocator: &mem.Allocator, in_stream: var, size: usize) !FormValue {	588	fn parseFormValueBlockLen(allocator: *mem.Allocator, in_stream: var, size: usize) !FormValue {
589	const buf = try readAllocBytes(allocator, in_stream, size);	589	const buf = try readAllocBytes(allocator, in_stream, size);
590	return FormValue{ .Block = buf };	590	return FormValue{ .Block = buf };
591	}	591	}
592		592
593	fn parseFormValueBlock(allocator: &mem.Allocator, in_stream: var, size: usize) !FormValue {	593	fn parseFormValueBlock(allocator: *mem.Allocator, in_stream: var, size: usize) !FormValue {
594	const block_len = try in_stream.readVarInt(builtin.Endian.Little, usize, size);	594	const block_len = try in_stream.readVarInt(builtin.Endian.Little, usize, size);
595	return parseFormValueBlockLen(allocator, in_stream, block_len);	595	return parseFormValueBlockLen(allocator, in_stream, block_len);
596	}	596	}
597		597
598	fn parseFormValueConstant(allocator: &mem.Allocator, in_stream: var, signed: bool, size: usize) !FormValue {	598	fn parseFormValueConstant(allocator: *mem.Allocator, in_stream: var, signed: bool, size: usize) !FormValue {
599	return FormValue{	599	return FormValue{
600	.Const = Constant{	600	.Const = Constant{
601	.signed = signed,	601	.signed = signed,
...	@@ -612,12 +612,12 @@ fn parseFormValueTargetAddrSize(in_stream: var) !u64 {	...	@@ -612,12 +612,12 @@ fn parseFormValueTargetAddrSize(in_stream: var) !u64 {
612	return if (@sizeOf(usize) == 4) u64(try in_stream.readIntLe(u32)) else if (@sizeOf(usize) == 8) try in_stream.readIntLe(u64) 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;
613	}	613	}
614		614
615	fn parseFormValueRefLen(allocator: &mem.Allocator, in_stream: var, size: usize) !FormValue {	615	fn parseFormValueRefLen(allocator: *mem.Allocator, in_stream: var, size: usize) !FormValue {
616	const buf = try readAllocBytes(allocator, in_stream, size);	616	const buf = try readAllocBytes(allocator, in_stream, size);
617	return FormValue{ .Ref = buf };	617	return FormValue{ .Ref = buf };
618	}	618	}
619		619
620	fn parseFormValueRef(allocator: &mem.Allocator, in_stream: var, comptime T: type) !FormValue {	620	fn parseFormValueRef(allocator: *mem.Allocator, in_stream: var, comptime T: type) !FormValue {
621	const block_len = try in_stream.readIntLe(T);	621	const block_len = try in_stream.readIntLe(T);
622	return parseFormValueRefLen(allocator, in_stream, block_len);	622	return parseFormValueRefLen(allocator, in_stream, block_len);
623	}	623	}
...	@@ -632,7 +632,7 @@ const ParseFormValueError = error{	...	@@ -632,7 +632,7 @@ const ParseFormValueError = error{
632	OutOfMemory,	632	OutOfMemory,
633	};	633	};
634		634
635	fn parseFormValue(allocator: &mem.Allocator, in_stream: var, form_id: u64, is_64: bool) ParseFormValueError!FormValue {	635	fn parseFormValue(allocator: *mem.Allocator, in_stream: var, form_id: u64, is_64: bool) ParseFormValueError!FormValue {
636	return switch (form_id) {	636	return switch (form_id) {
637	DW.FORM_addr => FormValue{ .Address = try parseFormValueTargetAddrSize(in_stream) },	637	DW.FORM_addr => FormValue{ .Address = try parseFormValueTargetAddrSize(in_stream) },
638	DW.FORM_block1 => parseFormValueBlock(allocator, in_stream, 1),	638	DW.FORM_block1 => parseFormValueBlock(allocator, in_stream, 1),
...	@@ -682,7 +682,7 @@ fn parseFormValue(allocator: &mem.Allocator, in_stream: var, form_id: u64, is_64	...	@@ -682,7 +682,7 @@ fn parseFormValue(allocator: &mem.Allocator, in_stream: var, form_id: u64, is_64
682	};	682	};
683	}	683	}
684		684
685	fn parseAbbrevTable(st: &ElfStackTrace) !AbbrevTable {	685	fn parseAbbrevTable(st: *ElfStackTrace) !AbbrevTable {
686	const in_file = &st.self_exe_file;	686	const in_file = &st.self_exe_file;
687	var in_file_stream = io.FileInStream.init(in_file);	687	var in_file_stream = io.FileInStream.init(in_file);
688	const in_stream = &in_file_stream.stream;	688	const in_stream = &in_file_stream.stream;
...	@@ -712,7 +712,7 @@ fn parseAbbrevTable(st: &ElfStackTrace) !AbbrevTable {	...	@@ -712,7 +712,7 @@ fn parseAbbrevTable(st: &ElfStackTrace) !AbbrevTable {
712		712
713	/// Gets an already existing AbbrevTable given the abbrev_offset, or if not found,	713	/// Gets an already existing AbbrevTable given the abbrev_offset, or if not found,
714	/// seeks in the stream and parses it.	714	/// seeks in the stream and parses it.
715	fn getAbbrevTable(st: &ElfStackTrace, abbrev_offset: u64) !&const AbbrevTable {	715	fn getAbbrevTable(st: ElfStackTrace, abbrev_offset: u64) !const AbbrevTable {
716	for (st.abbrev_table_list.toSlice()) \|*header\| {	716	for (st.abbrev_table_list.toSlice()) \|*header\| {
717	if (header.offset == abbrev_offset) {	717	if (header.offset == abbrev_offset) {
718	return &header.table;	718	return &header.table;
...	@@ -726,14 +726,14 @@ fn getAbbrevTable(st: &ElfStackTrace, abbrev_offset: u64) !&const AbbrevTable {	...	@@ -726,14 +726,14 @@ fn getAbbrevTable(st: &ElfStackTrace, abbrev_offset: u64) !&const AbbrevTable {
726	return &st.abbrev_table_list.items[st.abbrev_table_list.len - 1].table;	726	return &st.abbrev_table_list.items[st.abbrev_table_list.len - 1].table;
727	}	727	}
728		728
729	fn getAbbrevTableEntry(abbrev_table: &const AbbrevTable, abbrev_code: u64) ?&const AbbrevTableEntry {	729	fn getAbbrevTableEntry(abbrev_table: const AbbrevTable, abbrev_code: u64) ?const AbbrevTableEntry {
730	for (abbrev_table.toSliceConst()) \|*table_entry\| {	730	for (abbrev_table.toSliceConst()) \|*table_entry\| {
731	if (table_entry.abbrev_code == abbrev_code) return table_entry;	731	if (table_entry.abbrev_code == abbrev_code) return table_entry;
732	}	732	}
733	return null;	733	return null;
734	}	734	}
735		735
736	fn parseDie(st: &ElfStackTrace, abbrev_table: &const AbbrevTable, is_64: bool) !Die {	736	fn parseDie(st: ElfStackTrace, abbrev_table: const AbbrevTable, is_64: bool) !Die {
737	const in_file = &st.self_exe_file;	737	const in_file = &st.self_exe_file;
738	var in_file_stream = io.FileInStream.init(in_file);	738	var in_file_stream = io.FileInStream.init(in_file);
739	const in_stream = &in_file_stream.stream;	739	const in_stream = &in_file_stream.stream;
...	@@ -755,7 +755,7 @@ fn parseDie(st: &ElfStackTrace, abbrev_table: &const AbbrevTable, is_64: bool) !	...	@@ -755,7 +755,7 @@ fn parseDie(st: &ElfStackTrace, abbrev_table: &const AbbrevTable, is_64: bool) !
755	return result;	755	return result;
756	}	756	}
757		757
758	fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, target_address: usize) !LineInfo {	758	fn getLineNumberInfo(st: ElfStackTrace, compile_unit: const CompileUnit, target_address: usize) !LineInfo {
759	const compile_unit_cwd = try compile_unit.die.getAttrString(st, DW.AT_comp_dir);	759	const compile_unit_cwd = try compile_unit.die.getAttrString(st, DW.AT_comp_dir);
760		760
761	const in_file = &st.self_exe_file;	761	const in_file = &st.self_exe_file;
...	@@ -934,7 +934,7 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe	...	@@ -934,7 +934,7 @@ fn getLineNumberInfo(st: &ElfStackTrace, compile_unit: &const CompileUnit, targe
934	return error.MissingDebugInfo;	934	return error.MissingDebugInfo;
935	}	935	}
936		936
937	fn scanAllCompileUnits(st: &ElfStackTrace) !void {	937	fn scanAllCompileUnits(st: *ElfStackTrace) !void {
938	const debug_info_end = st.debug_info.offset + st.debug_info.size;	938	const debug_info_end = st.debug_info.offset + st.debug_info.size;
939	var this_unit_offset = st.debug_info.offset;	939	var this_unit_offset = st.debug_info.offset;
940	var cu_index: usize = 0;	940	var cu_index: usize = 0;
...	@@ -1005,7 +1005,7 @@ fn scanAllCompileUnits(st: &ElfStackTrace) !void {	...	@@ -1005,7 +1005,7 @@ fn scanAllCompileUnits(st: &ElfStackTrace) !void {
1005	}	1005	}
1006	}	1006	}
1007		1007
1008	fn findCompileUnit(st: &ElfStackTrace, target_address: u64) !&const CompileUnit {	1008	fn findCompileUnit(st: ElfStackTrace, target_address: u64) !const CompileUnit {
1009	var in_file_stream = io.FileInStream.init(&st.self_exe_file);	1009	var in_file_stream = io.FileInStream.init(&st.self_exe_file);
1010	const in_stream = &in_file_stream.stream;	1010	const in_stream = &in_file_stream.stream;
1011	for (st.compile_unit_list.toSlice()) \|*compile_unit\| {	1011	for (st.compile_unit_list.toSlice()) \|*compile_unit\| {
...	@@ -1039,7 +1039,7 @@ fn findCompileUnit(st: &ElfStackTrace, target_address: u64) !&const CompileUnit	...	@@ -1039,7 +1039,7 @@ fn findCompileUnit(st: &ElfStackTrace, target_address: u64) !&const CompileUnit
1039	return error.MissingDebugInfo;	1039	return error.MissingDebugInfo;
1040	}	1040	}
1041		1041
1042	fn readInitialLength(comptime E: type, in_stream: &io.InStream(E), is_64: &bool) !u64 {	1042	fn readInitialLength(comptime E: type, in_stream: io.InStream(E), is_64: bool) !u64 {
1043	const first_32_bits = try in_stream.readIntLe(u32);	1043	const first_32_bits = try in_stream.readIntLe(u32);
1044	is_64.* = (first_32_bits == 0xffffffff);	1044	is_64.* = (first_32_bits == 0xffffffff);
1045	if (is_64.*) {	1045	if (is_64.*) {
...	@@ -1096,10 +1096,10 @@ var global_fixed_allocator = std.heap.FixedBufferAllocator.init(global_allocator	...	@@ -1096,10 +1096,10 @@ var global_fixed_allocator = std.heap.FixedBufferAllocator.init(global_allocator
1096	var global_allocator_mem: [100 * 1024]u8 = undefined;	1096	var global_allocator_mem: [100 * 1024]u8 = undefined;
1097		1097
1098	// TODO make thread safe	1098	// TODO make thread safe
1099	var debug_info_allocator: ?&mem.Allocator = null;	1099	var debug_info_allocator: ?*mem.Allocator = null;
1100	var debug_info_direct_allocator: std.heap.DirectAllocator = undefined;	1100	var debug_info_direct_allocator: std.heap.DirectAllocator = undefined;
1101	var debug_info_arena_allocator: std.heap.ArenaAllocator = undefined;	1101	var debug_info_arena_allocator: std.heap.ArenaAllocator = undefined;
1102	fn getDebugInfoAllocator() &mem.Allocator {	1102	fn getDebugInfoAllocator() *mem.Allocator {
1103	if (debug_info_allocator) \|a\| return a;	1103	if (debug_info_allocator) \|a\| return a;
1104		1104
1105	debug_info_direct_allocator = std.heap.DirectAllocator.init();	1105	debug_info_direct_allocator = std.heap.DirectAllocator.init();

std/elf.zig+9-9

...	@@ -338,7 +338,7 @@ pub const SectionHeader = struct {	...	@@ -338,7 +338,7 @@ pub const SectionHeader = struct {
338	};	338	};
339		339
340	pub const Elf = struct {	340	pub const Elf = struct {
341	in_file: &os.File,	341	in_file: *os.File,
342	auto_close_stream: bool,	342	auto_close_stream: bool,
343	is_64: bool,	343	is_64: bool,
344	endian: builtin.Endian,	344	endian: builtin.Endian,
...	@@ -348,20 +348,20 @@ pub const Elf = struct {	...	@@ -348,20 +348,20 @@ pub const Elf = struct {
348	program_header_offset: u64,	348	program_header_offset: u64,
349	section_header_offset: u64,	349	section_header_offset: u64,
350	string_section_index: u64,	350	string_section_index: u64,
351	string_section: &SectionHeader,	351	string_section: *SectionHeader,
352	section_headers: []SectionHeader,	352	section_headers: []SectionHeader,
353	allocator: &mem.Allocator,	353	allocator: *mem.Allocator,
354	prealloc_file: os.File,	354	prealloc_file: os.File,
355		355
356	/// Call close when done.	356	/// Call close when done.
357	pub fn openPath(elf: &Elf, allocator: &mem.Allocator, path: []const u8) !void {	357	pub fn openPath(elf: Elf, allocator: mem.Allocator, path: []const u8) !void {
358	try elf.prealloc_file.open(path);	358	try elf.prealloc_file.open(path);
359	try elf.openFile(allocator, &elf.prealloc_file);	359	try elf.openFile(allocator, *elf.prealloc_file);
360	elf.auto_close_stream = true;	360	elf.auto_close_stream = true;
361	}	361	}
362		362
363	/// Call close when done.	363	/// Call close when done.
364	pub fn openFile(elf: &Elf, allocator: &mem.Allocator, file: &os.File) !void {	364	pub fn openFile(elf: Elf, allocator: mem.Allocator, file: *os.File) !void {
365	elf.allocator = allocator;	365	elf.allocator = allocator;
366	elf.in_file = file;	366	elf.in_file = file;
367	elf.auto_close_stream = false;	367	elf.auto_close_stream = false;
...	@@ -503,13 +503,13 @@ pub const Elf = struct {	...	@@ -503,13 +503,13 @@ pub const Elf = struct {
503	}	503	}
504	}	504	}
505		505
506	pub fn close(elf: &Elf) void {	506	pub fn close(elf: *Elf) void {
507	elf.allocator.free(elf.section_headers);	507	elf.allocator.free(elf.section_headers);
508		508
509	if (elf.auto_close_stream) elf.in_file.close();	509	if (elf.auto_close_stream) elf.in_file.close();
510	}	510	}
511		511
512	pub fn findSection(elf: &Elf, name: []const u8) !?&SectionHeader {	512	pub fn findSection(elf: Elf, name: []const u8) !?SectionHeader {
513	var file_stream = io.FileInStream.init(elf.in_file);	513	var file_stream = io.FileInStream.init(elf.in_file);
514	const in = &file_stream.stream;	514	const in = &file_stream.stream;
515		515
...	@@ -533,7 +533,7 @@ pub const Elf = struct {	...	@@ -533,7 +533,7 @@ pub const Elf = struct {
533	return null;	533	return null;
534	}	534	}
535		535
536	pub fn seekToSection(elf: &Elf, elf_section: &SectionHeader) !void {	536	pub fn seekToSection(elf: Elf, elf_section: SectionHeader) !void {
537	try elf.in_file.seekTo(elf_section.offset);	537	try elf.in_file.seekTo(elf_section.offset);
538	}	538	}
539	};	539	};

std/event.zig+17-17

...	@@ -6,9 +6,9 @@ const mem = std.mem;	...	@@ -6,9 +6,9 @@ const mem = std.mem;
6	const posix = std.os.posix;	6	const posix = std.os.posix;
7		7
8	pub const TcpServer = struct {	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	loop: &Loop,	11	loop: *Loop,
12	sockfd: i32,	12	sockfd: i32,
13	accept_coro: ?promise,	13	accept_coro: ?promise,
14	listen_address: std.net.Address,	14	listen_address: std.net.Address,
...	@@ -17,7 +17,7 @@ pub const TcpServer = struct {	...	@@ -17,7 +17,7 @@ pub const TcpServer = struct {
17		17
18	const PromiseNode = std.LinkedList(promise).Node;	18	const PromiseNode = std.LinkedList(promise).Node;
19		19
20	pub fn init(loop: &Loop) !TcpServer {	20	pub fn init(loop: *Loop) !TcpServer {
21	const sockfd = try std.os.posixSocket(posix.AF_INET, posix.SOCK_STREAM \| posix.SOCK_CLOEXEC \| posix.SOCK_NONBLOCK, 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);
22	errdefer std.os.close(sockfd);	22	errdefer std.os.close(sockfd);
23		23
...	@@ -32,7 +32,7 @@ pub const TcpServer = struct {	...	@@ -32,7 +32,7 @@ pub const TcpServer = struct {
32	};	32	};
33	}	33	}
34		34
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 {	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 {
36	self.handleRequestFn = handleRequestFn;	36	self.handleRequestFn = handleRequestFn;
37		37
38	try std.os.posixBind(self.sockfd, &address.os_addr);	38	try std.os.posixBind(self.sockfd, &address.os_addr);
...	@@ -46,13 +46,13 @@ pub const TcpServer = struct {	...	@@ -46,13 +46,13 @@ pub const TcpServer = struct {
46	errdefer self.loop.removeFd(self.sockfd);	46	errdefer self.loop.removeFd(self.sockfd);
47	}	47	}
48		48
49	pub fn deinit(self: &TcpServer) void {	49	pub fn deinit(self: *TcpServer) void {
50	self.loop.removeFd(self.sockfd);	50	self.loop.removeFd(self.sockfd);
51	if (self.accept_coro) \|accept_coro\| cancel accept_coro;	51	if (self.accept_coro) \|accept_coro\| cancel accept_coro;
52	std.os.close(self.sockfd);	52	std.os.close(self.sockfd);
53	}	53	}
54		54
55	pub async fn handler(self: &TcpServer) void {	55	pub async fn handler(self: *TcpServer) void {
56	while (true) {	56	while (true) {
57	var accepted_addr: std.net.Address = undefined;	57	var accepted_addr: std.net.Address = undefined;
58	if (std.os.posixAccept(self.sockfd, &accepted_addr.os_addr, posix.SOCK_NONBLOCK \| posix.SOCK_CLOEXEC)) \|accepted_fd\| {	58	if (std.os.posixAccept(self.sockfd, &accepted_addr.os_addr, posix.SOCK_NONBLOCK \| posix.SOCK_CLOEXEC)) \|accepted_fd\| {
...	@@ -92,11 +92,11 @@ pub const TcpServer = struct {	...	@@ -92,11 +92,11 @@ pub const TcpServer = struct {
92	};	92	};
93		93
94	pub const Loop = struct {	94	pub const Loop = struct {
95	allocator: &mem.Allocator,	95	allocator: *mem.Allocator,
96	epollfd: i32,	96	epollfd: i32,
97	keep_running: bool,	97	keep_running: bool,
98		98
99	fn init(allocator: &mem.Allocator) !Loop {	99	fn init(allocator: *mem.Allocator) !Loop {
100	const epollfd = try std.os.linuxEpollCreate(std.os.linux.EPOLL_CLOEXEC);	100	const epollfd = try std.os.linuxEpollCreate(std.os.linux.EPOLL_CLOEXEC);
101	return Loop{	101	return Loop{
102	.keep_running = true,	102	.keep_running = true,
...	@@ -105,7 +105,7 @@ pub const Loop = struct {	...	@@ -105,7 +105,7 @@ pub const Loop = struct {
105	};	105	};
106	}	106	}
107		107
108	pub fn addFd(self: &Loop, fd: i32, prom: promise) !void {	108	pub fn addFd(self: *Loop, fd: i32, prom: promise) !void {
109	var ev = std.os.linux.epoll_event{	109	var ev = std.os.linux.epoll_event{
110	.events = std.os.linux.EPOLLIN \| std.os.linux.EPOLLOUT \| std.os.linux.EPOLLET,	110	.events = std.os.linux.EPOLLIN \| std.os.linux.EPOLLOUT \| std.os.linux.EPOLLET,
111	.data = std.os.linux.epoll_data{ .ptr = @ptrToInt(prom) },	111	.data = std.os.linux.epoll_data{ .ptr = @ptrToInt(prom) },
...	@@ -113,23 +113,23 @@ pub const Loop = struct {	...	@@ -113,23 +113,23 @@ pub const Loop = struct {
113	try std.os.linuxEpollCtl(self.epollfd, std.os.linux.EPOLL_CTL_ADD, fd, &ev);	113	try std.os.linuxEpollCtl(self.epollfd, std.os.linux.EPOLL_CTL_ADD, fd, &ev);
114	}	114	}
115		115
116	pub fn removeFd(self: &Loop, fd: i32) void {	116	pub fn removeFd(self: *Loop, fd: i32) void {
117	std.os.linuxEpollCtl(self.epollfd, std.os.linux.EPOLL_CTL_DEL, fd, undefined) catch {};	117	std.os.linuxEpollCtl(self.epollfd, std.os.linux.EPOLL_CTL_DEL, fd, undefined) catch {};
118	}	118	}
119	async fn waitFd(self: &Loop, fd: i32) !void {	119	async fn waitFd(self: *Loop, fd: i32) !void {
120	defer self.removeFd(fd);	120	defer self.removeFd(fd);
121	suspend \|p\| {	121	suspend \|p\| {
122	try self.addFd(fd, p);	122	try self.addFd(fd, p);
123	}	123	}
124	}	124	}
125		125
126	pub fn stop(self: &Loop) void {	126	pub fn stop(self: *Loop) void {
127	// TODO make atomic	127	// TODO make atomic
128	self.keep_running = false;	128	self.keep_running = false;
129	// TODO activate an fd in the epoll set	129	// TODO activate an fd in the epoll set
130	}	130	}
131		131
132	pub fn run(self: &Loop) void {	132	pub fn run(self: *Loop) void {
133	while (self.keep_running) {	133	while (self.keep_running) {
134	var events: [16]std.os.linux.epoll_event = undefined;	134	var events: [16]std.os.linux.epoll_event = undefined;
135	const count = std.os.linuxEpollWait(self.epollfd, events[0..], -1);	135	const count = std.os.linuxEpollWait(self.epollfd, events[0..], -1);
...	@@ -141,7 +141,7 @@ pub const Loop = struct {	...	@@ -141,7 +141,7 @@ pub const Loop = struct {
141	}	141	}
142	};	142	};
143		143
144	pub async fn connect(loop: &Loop, _address: &const std.net.Address) !std.os.File {	144	pub async fn connect(loop: Loop, _address: const std.net.Address) !std.os.File {
145	var address = _address.*; // TODO https://github.com/ziglang/zig/issues/733	145	var address = _address.*; // TODO https://github.com/ziglang/zig/issues/733
146		146
147	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,7 +163,7 @@ test "listen on a port, send bytes, receive bytes" {	...	@@ -163,7 +163,7 @@ test "listen on a port, send bytes, receive bytes" {
163	tcp_server: TcpServer,	163	tcp_server: TcpServer,
164		164
165	const Self = this;	165	const Self = this;
166	async<&mem.Allocator> fn handler(tcp_server: &TcpServer, _addr: &const std.net.Address, _socket: &const std.os.File) void {	166	async<mem.Allocator> fn handler(tcp_server: TcpServer, _addr: const std.net.Address, _socket: const std.os.File) void {
167	const self = @fieldParentPtr(Self, "tcp_server", tcp_server);	167	const self = @fieldParentPtr(Self, "tcp_server", tcp_server);
168	var socket = _socket.*; // TODO https://github.com/ziglang/zig/issues/733	168	var socket = _socket.*; // TODO https://github.com/ziglang/zig/issues/733
169	defer socket.close();	169	defer socket.close();
...	@@ -177,7 +177,7 @@ test "listen on a port, send bytes, receive bytes" {	...	@@ -177,7 +177,7 @@ test "listen on a port, send bytes, receive bytes" {
177	cancel p;	177	cancel p;
178	}	178	}
179	}	179	}
180	async fn errorableHandler(self: &Self, _addr: &const std.net.Address, _socket: &const std.os.File) !void {	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	181	const addr = _addr.*; // TODO https://github.com/ziglang/zig/issues/733
182	var socket = _socket.*; // TODO https://github.com/ziglang/zig/issues/733	182	var socket = _socket.*; // TODO https://github.com/ziglang/zig/issues/733
183		183
...	@@ -199,7 +199,7 @@ test "listen on a port, send bytes, receive bytes" {	...	@@ -199,7 +199,7 @@ test "listen on a port, send bytes, receive bytes" {
199	defer cancel p;	199	defer cancel p;
200	loop.run();	200	loop.run();
201	}	201	}
202	async fn doAsyncTest(loop: &Loop, address: &const std.net.Address) void {	202	async fn doAsyncTest(loop: Loop, address: const std.net.Address) void {
203	errdefer @panic("test failure");	203	errdefer @panic("test failure");
204		204
205	var socket_file = try await try async event.connect(loop, address);	205	var socket_file = try await try async event.connect(loop, address);

std/fmt/errol/index.zig+10-11

...	@@ -21,7 +21,7 @@ pub const RoundMode = enum {	...	@@ -21,7 +21,7 @@ pub const RoundMode = enum {
21		21
22	/// Round a FloatDecimal as returned by errol3 to the specified fractional precision.	22	/// Round a FloatDecimal as returned by errol3 to the specified fractional precision.
23	/// All digits after the specified precision should be considered invalid.	23	/// All digits after the specified precision should be considered invalid.
24	pub fn roundToPrecision(float_decimal: &FloatDecimal, precision: usize, mode: RoundMode) void {	24	pub fn roundToPrecision(float_decimal: *FloatDecimal, precision: usize, mode: RoundMode) void {
25	// The round digit refers to the index which we should look at to determine	25	// The round digit refers to the index which we should look at to determine
26	// whether we need to round to match the specified precision.	26	// whether we need to round to match the specified precision.
27	var round_digit: usize = 0;	27	var round_digit: usize = 0;
...	@@ -59,8 +59,8 @@ pub fn roundToPrecision(float_decimal: &FloatDecimal, precision: usize, mode: Ro	...	@@ -59,8 +59,8 @@ pub fn roundToPrecision(float_decimal: &FloatDecimal, precision: usize, mode: Ro
59	float_decimal.exp += 1;	59	float_decimal.exp += 1;
60		60
61	// Re-size the buffer to use the reserved leading byte.	61	// Re-size the buffer to use the reserved leading byte.
62	const one_before = @intToPtr(&u8, @ptrToInt(&float_decimal.digits[0]) - 1);	62	const one_before = @intToPtr(*u8, @ptrToInt(&float_decimal.digits[0]) - 1);
63	float_decimal.digits = one_before[0..float_decimal.digits.len + 1];	63	float_decimal.digits = one_before[0 .. float_decimal.digits.len + 1];
64	float_decimal.digits[0] = '1';	64	float_decimal.digits[0] = '1';
65	return;	65	return;
66	}	66	}
...	@@ -84,7 +84,7 @@ pub fn errol3(value: f64, buffer: []u8) FloatDecimal {	...	@@ -84,7 +84,7 @@ pub fn errol3(value: f64, buffer: []u8) FloatDecimal {
84	const i = tableLowerBound(bits);	84	const i = tableLowerBound(bits);
85	if (i < enum3.len and enum3[i] == bits) {	85	if (i < enum3.len and enum3[i] == bits) {
86	const data = enum3_data[i];	86	const data = enum3_data[i];
87	const digits = buffer[1..data.str.len + 1];	87	const digits = buffer[1 .. data.str.len + 1];
88	mem.copy(u8, digits, data.str);	88	mem.copy(u8, digits, data.str);
89	return FloatDecimal{	89	return FloatDecimal{
90	.digits = digits,	90	.digits = digits,
...	@@ -98,7 +98,6 @@ pub fn errol3(value: f64, buffer: []u8) FloatDecimal {	...	@@ -98,7 +98,6 @@ pub fn errol3(value: f64, buffer: []u8) FloatDecimal {
98	/// Uncorrected Errol3 double to ASCII conversion.	98	/// Uncorrected Errol3 double to ASCII conversion.
99	fn errol3u(val: f64, buffer: []u8) FloatDecimal {	99	fn errol3u(val: f64, buffer: []u8) FloatDecimal {
100	// check if in integer or fixed range	100	// check if in integer or fixed range
101
102	if (val > 9.007199254740992e15 and val < 3.40282366920938e+38) {	101	if (val > 9.007199254740992e15 and val < 3.40282366920938e+38) {
103	return errolInt(val, buffer);	102	return errolInt(val, buffer);
104	} else if (val >= 16.0 and val < 9.007199254740992e15) {	103	} else if (val >= 16.0 and val < 9.007199254740992e15) {
...	@@ -218,7 +217,7 @@ fn tableLowerBound(k: u64) usize {	...	@@ -218,7 +217,7 @@ fn tableLowerBound(k: u64) usize {
218	/// @in: The HP number.	217	/// @in: The HP number.
219	/// @val: The double.	218	/// @val: The double.
220	/// &returns: The HP number.	219	/// &returns: The HP number.
221	fn hpProd(in: &const HP, val: f64) HP {	220	fn hpProd(in: *const HP, val: f64) HP {
222	var hi: f64 = undefined;	221	var hi: f64 = undefined;
223	var lo: f64 = undefined;	222	var lo: f64 = undefined;
224	split(in.val, &hi, &lo);	223	split(in.val, &hi, &lo);
...	@@ -240,7 +239,7 @@ fn hpProd(in: &const HP, val: f64) HP {	...	@@ -240,7 +239,7 @@ fn hpProd(in: &const HP, val: f64) HP {
240	/// @val: The double.	239	/// @val: The double.
241	/// @hi: The high bits.	240	/// @hi: The high bits.
242	/// @lo: The low bits.	241	/// @lo: The low bits.
243	fn split(val: f64, hi: &f64, lo: &f64) void {	242	fn split(val: f64, hi: f64, lo: f64) void {
244	hi.* = gethi(val);	243	hi.* = gethi(val);
245	lo.* = val - hi.*;	244	lo.* = val - hi.*;
246	}	245	}
...	@@ -253,7 +252,7 @@ fn gethi(in: f64) f64 {	...	@@ -253,7 +252,7 @@ fn gethi(in: f64) f64 {
253		252
254	/// Normalize the number by factoring in the error.	253	/// Normalize the number by factoring in the error.
255	/// @hp: The float pair.	254	/// @hp: The float pair.
256	fn hpNormalize(hp: &HP) void {	255	fn hpNormalize(hp: *HP) void {
257	// Required to avoid segfaults causing buffer overrun during errol3 digit output termination.	256	// Required to avoid segfaults causing buffer overrun during errol3 digit output termination.
258	@setFloatMode(this, @import("builtin").FloatMode.Strict);	257	@setFloatMode(this, @import("builtin").FloatMode.Strict);
259		258
...	@@ -265,7 +264,7 @@ fn hpNormalize(hp: &HP) void {	...	@@ -265,7 +264,7 @@ fn hpNormalize(hp: &HP) void {
265		264
266	/// Divide the high-precision number by ten.	265	/// Divide the high-precision number by ten.
267	/// @hp: The high-precision number	266	/// @hp: The high-precision number
268	fn hpDiv10(hp: &HP) void {	267	fn hpDiv10(hp: *HP) void {
269	var val = hp.val;	268	var val = hp.val;
270		269
271	hp.val /= 10.0;	270	hp.val /= 10.0;
...	@@ -281,7 +280,7 @@ fn hpDiv10(hp: &HP) void {	...	@@ -281,7 +280,7 @@ fn hpDiv10(hp: &HP) void {
281		280
282	/// Multiply the high-precision number by ten.	281	/// Multiply the high-precision number by ten.
283	/// @hp: The high-precision number	282	/// @hp: The high-precision number
284	fn hpMul10(hp: &HP) void {	283	fn hpMul10(hp: *HP) void {
285	const val = hp.val;	284	const val = hp.val;
286		285
287	hp.val *= 10.0;	286	hp.val *= 10.0;
...	@@ -420,7 +419,7 @@ fn fpprev(val: f64) f64 {	...	@@ -420,7 +419,7 @@ fn fpprev(val: f64) f64 {
420	return @bitCast(f64, @bitCast(u64, val) -% 1);	419	return @bitCast(f64, @bitCast(u64, val) -% 1);
421	}	420	}
422		421
423	pub const c_digits_lut = []u8 {	422	pub const c_digits_lut = []u8{
424	'0', '0', '0', '1', '0', '2', '0', '3', '0', '4', '0', '5', '0', '6',	423	'0', '0', '0', '1', '0', '2', '0', '3', '0', '4', '0', '5', '0', '6',
425	'0', '7', '0', '8', '0', '9', '1', '0', '1', '1', '1', '2', '1', '3',	424	'0', '7', '0', '8', '0', '9', '1', '0', '1', '1', '1', '2', '1', '3',
426	'1', '4', '1', '5', '1', '6', '1', '7', '1', '8', '1', '9', '2', '0',	425	'1', '4', '1', '5', '1', '6', '1', '7', '1', '8', '1', '9', '2', '0',

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

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

std/fmt/index.zig+53-47

...	@@ -11,7 +11,7 @@ const max_int_digits = 65;	...	@@ -11,7 +11,7 @@ const max_int_digits = 65;
11	/// Renders fmt string with args, calling output with slices of bytes.	11	/// Renders fmt string with args, calling output with slices of bytes.
12	/// If `output` returns an error, the error is returned from `format` and	12	/// If `output` returns an error, the error is returned from `format` and
13	/// `output` is not called again.	13	/// `output` is not called again.
14	pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void, comptime fmt: []const u8, args: ...) Errors!void {	14	pub fn format(context: var, comptime Errors: type, output: fn (@typeOf(context), []const u8) Errors!void, comptime fmt: []const u8, args: ...) Errors!void {
15	const State = enum {	15	const State = enum {
16	Start,	16	Start,
17	OpenBrace,	17	OpenBrace,
...	@@ -107,7 +107,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -107,7 +107,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
107	'}' => {	107	'}' => {
108	return output(context, args[next_arg]);	108	return output(context, args[next_arg]);
109	},	109	},
110	'0' ... '9' => {	110	'0'...'9' => {
111	width_start = i;	111	width_start = i;
112	state = State.BufWidth;	112	state = State.BufWidth;
113	},	113	},
...	@@ -127,7 +127,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -127,7 +127,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
127	state = State.Start;	127	state = State.Start;
128	start_index = i + 1;	128	start_index = i + 1;
129	},	129	},
130	'0' ... '9' => {	130	'0'...'9' => {
131	width_start = i;	131	width_start = i;
132	state = State.IntegerWidth;	132	state = State.IntegerWidth;
133	},	133	},
...	@@ -141,7 +141,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -141,7 +141,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
141	state = State.Start;	141	state = State.Start;
142	start_index = i + 1;	142	start_index = i + 1;
143	},	143	},
144	'0' ... '9' => {},	144	'0'...'9' => {},
145	else => @compileError("Unexpected character in format string: " ++ []u8{c}),	145	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
146	},	146	},
147	State.FloatScientific => switch (c) {	147	State.FloatScientific => switch (c) {
...	@@ -151,7 +151,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -151,7 +151,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
151	state = State.Start;	151	state = State.Start;
152	start_index = i + 1;	152	start_index = i + 1;
153	},	153	},
154	'0' ... '9' => {	154	'0'...'9' => {
155	width_start = i;	155	width_start = i;
156	state = State.FloatScientificWidth;	156	state = State.FloatScientificWidth;
157	},	157	},
...	@@ -165,7 +165,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -165,7 +165,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
165	state = State.Start;	165	state = State.Start;
166	start_index = i + 1;	166	start_index = i + 1;
167	},	167	},
168	'0' ... '9' => {},	168	'0'...'9' => {},
169	else => @compileError("Unexpected character in format string: " ++ []u8{c}),	169	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
170	},	170	},
171	State.Float => switch (c) {	171	State.Float => switch (c) {
...	@@ -175,7 +175,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -175,7 +175,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
175	state = State.Start;	175	state = State.Start;
176	start_index = i + 1;	176	start_index = i + 1;
177	},	177	},
178	'0' ... '9' => {	178	'0'...'9' => {
179	width_start = i;	179	width_start = i;
180	state = State.FloatWidth;	180	state = State.FloatWidth;
181	},	181	},
...	@@ -189,7 +189,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -189,7 +189,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
189	state = State.Start;	189	state = State.Start;
190	start_index = i + 1;	190	start_index = i + 1;
191	},	191	},
192	'0' ... '9' => {},	192	'0'...'9' => {},
193	else => @compileError("Unexpected character in format string: " ++ []u8{c}),	193	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
194	},	194	},
195	State.BufWidth => switch (c) {	195	State.BufWidth => switch (c) {
...	@@ -200,7 +200,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -200,7 +200,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
200	state = State.Start;	200	state = State.Start;
201	start_index = i + 1;	201	start_index = i + 1;
202	},	202	},
203	'0' ... '9' => {},	203	'0'...'9' => {},
204	else => @compileError("Unexpected character in format string: " ++ []u8{c}),	204	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
205	},	205	},
206	State.Character => switch (c) {	206	State.Character => switch (c) {
...	@@ -223,7 +223,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -223,7 +223,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
223	radix = 1024;	223	radix = 1024;
224	state = State.BytesBase;	224	state = State.BytesBase;
225	},	225	},
226	'0' ... '9' => {	226	'0'...'9' => {
227	width_start = i;	227	width_start = i;
228	state = State.BytesWidth;	228	state = State.BytesWidth;
229	},	229	},
...	@@ -236,7 +236,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -236,7 +236,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
236	state = State.Start;	236	state = State.Start;
237	start_index = i + 1;	237	start_index = i + 1;
238	},	238	},
239	'0' ... '9' => {	239	'0'...'9' => {
240	width_start = i;	240	width_start = i;
241	state = State.BytesWidth;	241	state = State.BytesWidth;
242	},	242	},
...	@@ -250,7 +250,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -250,7 +250,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
250	state = State.Start;	250	state = State.Start;
251	start_index = i + 1;	251	start_index = i + 1;
252	},	252	},
253	'0' ... '9' => {},	253	'0'...'9' => {},
254	else => @compileError("Unexpected character in format string: " ++ []u8{c}),	254	else => @compileError("Unexpected character in format string: " ++ []u8{c}),
255	},	255	},
256	}	256	}
...	@@ -268,7 +268,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),	...	@@ -268,7 +268,7 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
268	}	268	}
269	}	269	}
270		270
271	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 {
272	const T = @typeOf(value);	272	const T = @typeOf(value);
273	switch (@typeId(T)) {	273	switch (@typeId(T)) {
274	builtin.TypeId.Int => {	274	builtin.TypeId.Int => {
...	@@ -317,11 +317,11 @@ pub fn formatValue(value: var, context: var, comptime Errors: type, output: fn(@	...	@@ -317,11 +317,11 @@ pub fn formatValue(value: var, context: var, comptime Errors: type, output: fn(@
317	}	317	}
318	}	318	}
319		319
320	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 {
321	return output(context, (&c)[0..1]);	321	return output(context, (&c)[0..1]);
322	}	322	}
323		323
324	pub fn formatBuf(buf: []const u8, width: usize, context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8) Errors!void) Errors!void {	324	pub fn formatBuf(buf: []const u8, width: usize, context: var, comptime Errors: type, output: fn (@typeOf(context), []const u8) Errors!void) Errors!void {
325	try output(context, buf);	325	try output(context, buf);
326		326
327	var leftover_padding = if (width > buf.len) (width - buf.len) else return;	327	var leftover_padding = if (width > buf.len) (width - buf.len) else return;
...	@@ -334,7 +334,7 @@ pub fn formatBuf(buf: []const u8, width: usize, context: var, comptime Errors: t	...	@@ -334,7 +334,7 @@ pub fn formatBuf(buf: []const u8, width: usize, context: var, comptime Errors: t
334	// Print a float in scientific notation to the specified precision. Null uses full precision.	334	// Print a float in scientific notation to the specified precision. Null uses full precision.
335	// It should be the case that every full precision, printed value can be re-parsed back to the	335	// It should be the case that every full precision, printed value can be re-parsed back to the
336	// same type unambiguously.	336	// same type unambiguously.
337	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 {
338	var x = f64(value);	338	var x = f64(value);
339		339
340	// Errol doesn't handle these special cases.	340	// Errol doesn't handle these special cases.
...	@@ -423,7 +423,7 @@ pub fn formatFloatScientific(value: var, maybe_precision: ?usize, context: var,	...	@@ -423,7 +423,7 @@ pub fn formatFloatScientific(value: var, maybe_precision: ?usize, context: var,
423		423
424	// Print a float of the format x.yyyyy where the number of y is specified by the precision argument.	424	// Print a float of the format x.yyyyy where the number of y is specified by the precision argument.
425	// By default floats are printed at full precision (no rounding).	425	// By default floats are printed at full precision (no rounding).
426	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 {
427	var x = f64(value);	427	var x = f64(value);
428		428
429	// Errol doesn't handle these special cases.	429	// Errol doesn't handle these special cases.
...	@@ -512,7 +512,7 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com	...	@@ -512,7 +512,7 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com
512	// Remaining fractional portion, zero-padding if insufficient.	512	// Remaining fractional portion, zero-padding if insufficient.
513	debug.assert(precision >= printed);	513	debug.assert(precision >= printed);
514	if (num_digits_whole_no_pad + precision - printed < float_decimal.digits.len) {	514	if (num_digits_whole_no_pad + precision - printed < float_decimal.digits.len) {
515	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]);
516	return;	516	return;
517	} else {	517	} else {
518	try output(context, float_decimal.digits[num_digits_whole_no_pad..]);	518	try output(context, float_decimal.digits[num_digits_whole_no_pad..]);
...	@@ -562,9 +562,14 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com	...	@@ -562,9 +562,14 @@ pub fn formatFloatDecimal(value: var, maybe_precision: ?usize, context: var, com
562	}	562	}
563	}	563	}
564		564
565	pub fn formatBytes(value: var, width: ?usize, comptime radix: usize,	565	pub fn formatBytes(
566	context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void	566	value: var,
567	{	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 {
568	if (value == 0) {	573	if (value == 0) {
569	return output(context, "0B");	574	return output(context, "0B");
570	}	575	}
...	@@ -585,16 +590,22 @@ pub fn formatBytes(value: var, width: ?usize, comptime radix: usize,	...	@@ -585,16 +590,22 @@ pub fn formatBytes(value: var, width: ?usize, comptime radix: usize,
585	}	590	}
586		591
587	const buf = switch (radix) {	592	const buf = switch (radix) {
588	1000 => []u8 { suffix, 'B' },	593	1000 => []u8{ suffix, 'B' },
589	1024 => []u8 { suffix, 'i', 'B' },	594	1024 => []u8{ suffix, 'i', 'B' },
590	else => unreachable,	595	else => unreachable,
591	};	596	};
592	return output(context, buf);	597	return output(context, buf);
593	}	598	}
594		599
595	pub fn formatInt(value: var, base: u8, uppercase: bool, width: usize,	600	pub fn formatInt(
596	context: var, comptime Errors: type, output: fn(@typeOf(context), []const u8)Errors!void) Errors!void	601	value: var,
597	{	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 {
598	if (@typeOf(value).is_signed) {	609	if (@typeOf(value).is_signed) {
599	return formatIntSigned(value, base, uppercase, width, context, Errors, output);	610	return formatIntSigned(value, base, uppercase, width, context, Errors, output);
600	} else {	611	} else {
...	@@ -602,7 +613,7 @@ pub fn formatInt(value: var, base: u8, uppercase: bool, width: usize,	...	@@ -602,7 +613,7 @@ pub fn formatInt(value: var, base: u8, uppercase: bool, width: usize,
602	}	613	}
603	}	614	}
604		615
605	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 {	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 {
606	const uint = @IntType(false, @typeOf(value).bit_count);	617	const uint = @IntType(false, @typeOf(value).bit_count);
607	if (value < 0) {	618	if (value < 0) {
608	const minus_sign: u8 = '-';	619	const minus_sign: u8 = '-';
...	@@ -621,7 +632,7 @@ fn formatIntSigned(value: var, base: u8, uppercase: bool, width: usize, context:	...	@@ -621,7 +632,7 @@ fn formatIntSigned(value: var, base: u8, uppercase: bool, width: usize, context:
621	}	632	}
622	}	633	}
623		634
624	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 {	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 {
625	// max_int_digits accounts for the minus sign. when printing an unsigned	636	// max_int_digits accounts for the minus sign. when printing an unsigned
626	// number we don't need to do that.	637	// number we don't need to do that.
627	var buf: [max_int_digits - 1]u8 = undefined;	638	var buf: [max_int_digits - 1]u8 = undefined;
...	@@ -650,7 +661,7 @@ fn formatIntUnsigned(value: var, base: u8, uppercase: bool, width: usize, contex	...	@@ -650,7 +661,7 @@ fn formatIntUnsigned(value: var, base: u8, uppercase: bool, width: usize, contex
650	mem.set(u8, buf[0..index], '0');	661	mem.set(u8, buf[0..index], '0');
651	return output(context, buf);	662	return output(context, buf);
652	} else {	663	} else {
653	const padded_buf = buf[index - padding..];	664	const padded_buf = buf[index - padding ..];
654	mem.set(u8, padded_buf[0..padding], '0');	665	mem.set(u8, padded_buf[0..padding], '0');
655	return output(context, padded_buf);	666	return output(context, padded_buf);
656	}	667	}
...	@@ -668,7 +679,7 @@ const FormatIntBuf = struct {	...	@@ -668,7 +679,7 @@ const FormatIntBuf = struct {
668	out_buf: []u8,	679	out_buf: []u8,
669	index: usize,	680	index: usize,
670	};	681	};
671	fn formatIntCallback(context: &FormatIntBuf, bytes: []const u8) (error{}!void) {	682	fn formatIntCallback(context: *FormatIntBuf, bytes: []const u8) (error{}!void) {
672	mem.copy(u8, context.out_buf[context.index..], bytes);	683	mem.copy(u8, context.out_buf[context.index..], bytes);
673	context.index += bytes.len;	684	context.index += bytes.len;
674	}	685	}
...	@@ -717,9 +728,9 @@ pub fn parseUnsigned(comptime T: type, buf: []const u8, radix: u8) ParseUnsigned	...	@@ -717,9 +728,9 @@ pub fn parseUnsigned(comptime T: type, buf: []const u8, radix: u8) ParseUnsigned
717		728
718	pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {	729	pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {
719	const value = switch (c) {	730	const value = switch (c) {
720	'0' ... '9' => c - '0',	731	'0'...'9' => c - '0',
721	'A' ... 'Z' => c - 'A' + 10,	732	'A'...'Z' => c - 'A' + 10,
722	'a' ... 'z' => c - 'a' + 10,	733	'a'...'z' => c - 'a' + 10,
723	else => return error.InvalidCharacter,	734	else => return error.InvalidCharacter,
724	};	735	};
725		736
...	@@ -730,8 +741,8 @@ pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {	...	@@ -730,8 +741,8 @@ pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {
730		741
731	fn digitToChar(digit: u8, uppercase: bool) u8 {	742	fn digitToChar(digit: u8, uppercase: bool) u8 {
732	return switch (digit) {	743	return switch (digit) {
733	0 ... 9 => digit + '0',	744	0...9 => digit + '0',
734	10 ... 35 => digit + ((if (uppercase) u8('A') else u8('a')) - 10),	745	10...35 => digit + ((if (uppercase) u8('A') else u8('a')) - 10),
735	else => unreachable,	746	else => unreachable,
736	};	747	};
737	}	748	}
...	@@ -740,7 +751,7 @@ const BufPrintContext = struct {	...	@@ -740,7 +751,7 @@ const BufPrintContext = struct {
740	remaining: []u8,	751	remaining: []u8,
741	};	752	};
742		753
743	fn bufPrintWrite(context: &BufPrintContext, bytes: []const u8) !void {	754	fn bufPrintWrite(context: *BufPrintContext, bytes: []const u8) !void {
744	if (context.remaining.len < bytes.len) return error.BufferTooSmall;	755	if (context.remaining.len < bytes.len) return error.BufferTooSmall;
745	mem.copy(u8, context.remaining, bytes);	756	mem.copy(u8, context.remaining, bytes);
746	context.remaining = context.remaining[bytes.len..];	757	context.remaining = context.remaining[bytes.len..];
...	@@ -749,18 +760,17 @@ fn bufPrintWrite(context: &BufPrintContext, bytes: []const u8) !void {	...	@@ -749,18 +760,17 @@ fn bufPrintWrite(context: &BufPrintContext, bytes: []const u8) !void {
749	pub fn bufPrint(buf: []u8, comptime fmt: []const u8, args: ...) ![]u8 {	760	pub fn bufPrint(buf: []u8, comptime fmt: []const u8, args: ...) ![]u8 {
750	var context = BufPrintContext{ .remaining = buf };	761	var context = BufPrintContext{ .remaining = buf };
751	try format(&context, error{BufferTooSmall}, bufPrintWrite, fmt, args);	762	try format(&context, error{BufferTooSmall}, bufPrintWrite, fmt, args);
752	return buf[0..buf.len - context.remaining.len];	763	return buf[0 .. buf.len - context.remaining.len];
753	}	764	}
754		765
755	pub fn allocPrint(allocator: &mem.Allocator, comptime fmt: []const u8, args: ...) ![]u8 {	766	pub fn allocPrint(allocator: *mem.Allocator, comptime fmt: []const u8, args: ...) ![]u8 {
756	var size: usize = 0;	767	var size: usize = 0;
757	format(&size, error{}, countSize, fmt, args) catch \|err\| switch (err) {	768	format(&size, error{}, countSize, fmt, args) catch \|err\| switch (err) {};
758	};
759	const buf = try allocator.alloc(u8, size);	769	const buf = try allocator.alloc(u8, size);
760	return bufPrint(buf, fmt, args);	770	return bufPrint(buf, fmt, args);
761	}	771	}
762		772
763	fn countSize(size: &usize, bytes: []const u8) (error{}!void) {	773	fn countSize(size: *usize, bytes: []const u8) (error{}!void) {
764	size.* += bytes.len;	774	size.* += bytes.len;
765	}	775	}
766		776
...	@@ -1043,8 +1053,7 @@ test "fmt.format" {	...	@@ -1043,8 +1053,7 @@ test "fmt.format" {
1043	fn testFmt(expected: []const u8, comptime template: []const u8, args: ...) !void {	1053	fn testFmt(expected: []const u8, comptime template: []const u8, args: ...) !void {
1044	var buf: [100]u8 = undefined;	1054	var buf: [100]u8 = undefined;
1045	const result = try bufPrint(buf[0..], template, args);	1055	const result = try bufPrint(buf[0..], template, args);
1046	if (mem.eql(u8, result, expected))	1056	if (mem.eql(u8, result, expected)) return;
1047	return;
1048		1057
1049	std.debug.warn("\n====== expected this output: =========\n");	1058	std.debug.warn("\n====== expected this output: =========\n");
1050	std.debug.warn("{}", expected);	1059	std.debug.warn("{}", expected);
...	@@ -1082,10 +1091,7 @@ test "fmt.trim" {	...	@@ -1082,10 +1091,7 @@ test "fmt.trim" {
1082		1091
1083	pub fn isWhiteSpace(byte: u8) bool {	1092	pub fn isWhiteSpace(byte: u8) bool {
1084	return switch (byte) {	1093	return switch (byte) {
1085	' ',	1094	' ', '\t', '\n', '\r' => true,
1086	'\t',
1087	'\n',
1088	'\r' => true,
1089	else => false,	1095	else => false,
1090	};	1096	};
1091	}	1097	}

std/hash/adler.zig+8-13

 @@ -13,14 +13,12 @@ pub const Adler32 = struct {
     adler: u32,
     pub fn init() Adler32 {
-        return Adler32 {
+        return Adler32{ .adler = 1 };
-            .adler = 1,
-        };
     }
     // This fast variant is taken from zlib. It reduces the required modulos and unrolls longer
     // buffer inputs and should be much quicker.
-    pub fn update(self: &Adler32, input: []const u8) void {
+    pub fn update(self: *Adler32, input: []const u8) void {
         var s1 = self.adler & 0xffff;
         var s2 = (self.adler >> 16) & 0xffff;
 @@ -33,8 +31,7 @@ pub const Adler32 = struct {
             if (s2 >= base) {
                 s2 -= base;
             }
-        }
+        } else if (input.len < 16) {
-        else if (input.len < 16) {
             for (input) |b| {
                 s1 +%= b;
                 s2 +%= s1;
 @@ -44,8 +41,7 @@ pub const Adler32 = struct {
             }
             s2 %= base;
-        }
+        } else {
-        else {
             var i: usize = 0;
             while (i + nmax <= input.len) : (i += nmax) {
                 const n = nmax / 16; // note: 16 | nmax
 @@ -81,7 +77,7 @@ pub const Adler32 = struct {
         self.adler = s1 | (s2 << 16);
     }
-    pub fn final(self: &Adler32) u32 {
+    pub fn final(self: *Adler32) u32 {
         return self.adler;
     }
 @@ -98,15 +94,14 @@ test "adler32 sanity" {
 }
 test "adler32 long" {
-    const long1 = []u8 {1} ** 1024;
+    const long1 = []u8{1} ** 1024;
     debug.assert(Adler32.hash(long1[0..]) == 0x06780401);
-    const long2 = []u8 {1} ** 1025;
+    const long2 = []u8{1} ** 1025;
     debug.assert(Adler32.hash(long2[0..]) == 0x0a7a0402);
 }
 test "adler32 very long" {
-    const long = []u8 {1} ** 5553;
+    const long = []u8{1} ** 5553;
     debug.assert(Adler32.hash(long[0..]) == 0x707f15b2);
 }

std/hash/crc.zig+7-8

...	@@ -58,10 +58,10 @@ pub fn Crc32WithPoly(comptime poly: u32) type {	...	@@ -58,10 +58,10 @@ pub fn Crc32WithPoly(comptime poly: u32) type {
58	return Self{ .crc = 0xffffffff };	58	return Self{ .crc = 0xffffffff };
59	}	59	}
60		60
61	pub fn update(self: &Self, input: []const u8) void {	61	pub fn update(self: *Self, input: []const u8) void {
62	var i: usize = 0;	62	var i: usize = 0;
63	while (i + 8 <= input.len) : (i += 8) {	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	// Unrolling this way gives ~50Mb/s increase	66	// Unrolling this way gives ~50Mb/s increase
67	self.crc ^= (u32(p[0]) << 0);	67	self.crc ^= (u32(p[0]) << 0);
...	@@ -69,7 +69,6 @@ pub fn Crc32WithPoly(comptime poly: u32) type {	...	@@ -69,7 +69,6 @@ pub fn Crc32WithPoly(comptime poly: u32) type {
69	self.crc ^= (u32(p[2]) << 16);	69	self.crc ^= (u32(p[2]) << 16);
70	self.crc ^= (u32(p[3]) << 24);	70	self.crc ^= (u32(p[3]) << 24);
71		71
72
73	self.crc =	72	self.crc =
74	lookup_tables[0][p[7]] ^	73	lookup_tables[0][p[7]] ^
75	lookup_tables[1][p[6]] ^	74	lookup_tables[1][p[6]] ^
...	@@ -77,8 +76,8 @@ pub fn Crc32WithPoly(comptime poly: u32) type {	...	@@ -77,8 +76,8 @@ pub fn Crc32WithPoly(comptime poly: u32) type {
77	lookup_tables[3][p[4]] ^	76	lookup_tables[3][p[4]] ^
78	lookup_tables[4][@truncate(u8, self.crc >> 24)] ^	77	lookup_tables[4][@truncate(u8, self.crc >> 24)] ^
79	lookup_tables[5][@truncate(u8, self.crc >> 16)] ^	78	lookup_tables[5][@truncate(u8, self.crc >> 16)] ^
80	lookup_tables[6][@truncate(u8, self.crc >> 8)] ^	79	lookup_tables[6][@truncate(u8, self.crc >> 8)] ^
81	lookup_tables[7][@truncate(u8, self.crc >> 0)];	80	lookup_tables[7][@truncate(u8, self.crc >> 0)];
82	}	81	}
83		82
84	while (i < input.len) : (i += 1) {	83	while (i < input.len) : (i += 1) {
...	@@ -87,7 +86,7 @@ pub fn Crc32WithPoly(comptime poly: u32) type {	...	@@ -87,7 +86,7 @@ pub fn Crc32WithPoly(comptime poly: u32) type {
87	}	86	}
88	}	87	}
89		88
90	pub fn final(self: &Self) u32 {	89	pub fn final(self: *Self) u32 {
91	return ~self.crc;	90	return ~self.crc;
92	}	91	}
93		92
...	@@ -144,14 +143,14 @@ pub fn Crc32SmallWithPoly(comptime poly: u32) type {	...	@@ -144,14 +143,14 @@ pub fn Crc32SmallWithPoly(comptime poly: u32) type {
144	return Self{ .crc = 0xffffffff };	143	return Self{ .crc = 0xffffffff };
145	}	144	}
146		145
147	pub fn update(self: &Self, input: []const u8) void {	146	pub fn update(self: *Self, input: []const u8) void {
148	for (input) \|b\| {	147	for (input) \|b\| {
149	self.crc = lookup_table[@truncate(u4, self.crc ^ (b >> 0))] ^ (self.crc >> 4);	148	self.crc = lookup_table[@truncate(u4, self.crc ^ (b >> 0))] ^ (self.crc >> 4);
150	self.crc = lookup_table[@truncate(u4, self.crc ^ (b >> 4))] ^ (self.crc >> 4);	149	self.crc = lookup_table[@truncate(u4, self.crc ^ (b >> 4))] ^ (self.crc >> 4);
151	}	150	}
152	}	151	}
153		152
154	pub fn final(self: &Self) u32 {	153	pub fn final(self: *Self) u32 {
155	return ~self.crc;	154	return ~self.crc;
156	}	155	}
157		156

std/hash/fnv.zig+4-6

 @@ -7,7 +7,7 @@
 const std = @import("../index.zig");
 const debug = std.debug;
-pub const Fnv1a_32 = Fnv1a(u32, 0x01000193 , 0x811c9dc5);
+pub const Fnv1a_32 = Fnv1a(u32, 0x01000193, 0x811c9dc5);
 pub const Fnv1a_64 = Fnv1a(u64, 0x100000001b3, 0xcbf29ce484222325);
 pub const Fnv1a_128 = Fnv1a(u128, 0x1000000000000000000013b, 0x6c62272e07bb014262b821756295c58d);
 @@ -18,19 +18,17 @@ fn Fnv1a(comptime T: type, comptime prime: T, comptime offset: T) type {
         value: T,
         pub fn init() Self {
-            return Self {
+            return Self{ .value = offset };
-                .value = offset,
-            };
         }
-        pub fn update(self: &Self, input: []const u8) void {
+        pub fn update(self: *Self, input: []const u8) void {
             for (input) |b| {
                 self.value ^= b;
                 self.value *%= prime;
             }
         }
-        pub fn final(self: &Self) T {
+        pub fn final(self: *Self) T {
             return self.value;
         }

std/hash/siphash.zig+8-8

...	@@ -45,7 +45,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -45,7 +45,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
45	const k0 = mem.readInt(key[0..8], u64, Endian.Little);	45	const k0 = mem.readInt(key[0..8], u64, Endian.Little);
46	const k1 = mem.readInt(key[8..16], u64, Endian.Little);	46	const k1 = mem.readInt(key[8..16], u64, Endian.Little);
47		47
48	var d = Self {	48	var d = Self{
49	.v0 = k0 ^ 0x736f6d6570736575,	49	.v0 = k0 ^ 0x736f6d6570736575,
50	.v1 = k1 ^ 0x646f72616e646f6d,	50	.v1 = k1 ^ 0x646f72616e646f6d,
51	.v2 = k0 ^ 0x6c7967656e657261,	51	.v2 = k0 ^ 0x6c7967656e657261,
...	@@ -63,7 +63,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -63,7 +63,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
63	return d;	63	return d;
64	}	64	}
65		65
66	pub fn update(d: &Self, b: []const u8) void {	66	pub fn update(d: *Self, b: []const u8) void {
67	var off: usize = 0;	67	var off: usize = 0;
68		68
69	// Partial from previous.	69	// Partial from previous.
...	@@ -76,7 +76,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -76,7 +76,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
76		76
77	// Full middle blocks.	77	// Full middle blocks.
78	while (off + 8 <= b.len) : (off += 8) {	78	while (off + 8 <= b.len) : (off += 8) {
79	d.round(b[off..off + 8]);	79	d.round(b[off .. off + 8]);
80	}	80	}
81		81
82	// Remainder for next pass.	82	// Remainder for next pass.
...	@@ -85,7 +85,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -85,7 +85,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
85	d.msg_len +%= @truncate(u8, b.len);	85	d.msg_len +%= @truncate(u8, b.len);
86	}	86	}
87		87
88	pub fn final(d: &Self) T {	88	pub fn final(d: *Self) T {
89	// Padding	89	// Padding
90	mem.set(u8, d.buf[d.buf_len..], 0);	90	mem.set(u8, d.buf[d.buf_len..], 0);
91	d.buf[7] = d.msg_len;	91	d.buf[7] = d.msg_len;
...	@@ -118,7 +118,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -118,7 +118,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
118	return (u128(b2) << 64) \| b1;	118	return (u128(b2) << 64) \| b1;
119	}	119	}
120		120
121	fn round(d: &Self, b: []const u8) void {	121	fn round(d: *Self, b: []const u8) void {
122	debug.assert(b.len == 8);	122	debug.assert(b.len == 8);
123		123
124	const m = mem.readInt(b[0..], u64, Endian.Little);	124	const m = mem.readInt(b[0..], u64, Endian.Little);
...	@@ -132,7 +132,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -132,7 +132,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
132	d.v0 ^= m;	132	d.v0 ^= m;
133	}	133	}
134		134
135	fn sipRound(d: &Self) void {	135	fn sipRound(d: *Self) void {
136	d.v0 +%= d.v1;	136	d.v0 +%= d.v1;
137	d.v1 = math.rotl(u64, d.v1, u64(13));	137	d.v1 = math.rotl(u64, d.v1, u64(13));
138	d.v1 ^= d.v0;	138	d.v1 ^= d.v0;
...	@@ -162,7 +162,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -162,7 +162,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
162	const test_key = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f";	162	const test_key = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f";
163		163
164	test "siphash64-2-4 sanity" {	164	test "siphash64-2-4 sanity" {
165	const vectors = [][]const u8 {	165	const vectors = [][]const u8{
166	"\x31\x0e\x0e\xdd\x47\xdb\x6f\x72", // ""	166	"\x31\x0e\x0e\xdd\x47\xdb\x6f\x72", // ""
167	"\xfd\x67\xdc\x93\xc5\x39\xf8\x74", // "\x00"	167	"\xfd\x67\xdc\x93\xc5\x39\xf8\x74", // "\x00"
168	"\x5a\x4f\xa9\xd9\x09\x80\x6c\x0d", // "\x00\x01" ... etc	168	"\x5a\x4f\xa9\xd9\x09\x80\x6c\x0d", // "\x00\x01" ... etc
...	@@ -241,7 +241,7 @@ test "siphash64-2-4 sanity" {	...	@@ -241,7 +241,7 @@ test "siphash64-2-4 sanity" {
241	}	241	}
242		242
243	test "siphash128-2-4 sanity" {	243	test "siphash128-2-4 sanity" {
244	const vectors = [][]const u8 {	244	const vectors = [][]const u8{
245	"\xa3\x81\x7f\x04\xba\x25\xa8\xe6\x6d\xf6\x72\x14\xc7\x55\x02\x93",	245	"\xa3\x81\x7f\x04\xba\x25\xa8\xe6\x6d\xf6\x72\x14\xc7\x55\x02\x93",
246	"\xda\x87\xc1\xd8\x6b\x99\xaf\x44\x34\x76\x59\x11\x9b\x22\xfc\x45",	246	"\xda\x87\xc1\xd8\x6b\x99\xaf\x44\x34\x76\x59\x11\x9b\x22\xfc\x45",
247	"\x81\x77\x22\x8d\xa4\xa4\x5d\xc7\xfc\xa3\x8b\xde\xf6\x0a\xff\xe4",	247	"\x81\x77\x22\x8d\xa4\xa4\x5d\xc7\xfc\xa3\x8b\xde\xf6\x0a\xff\xe4",

std/hash_map.zig+19-19

...	@@ -9,12 +9,12 @@ const builtin = @import("builtin");	...	@@ -9,12 +9,12 @@ const builtin = @import("builtin");
9	const want_modification_safety = builtin.mode != builtin.Mode.ReleaseFast;	9	const want_modification_safety = builtin.mode != builtin.Mode.ReleaseFast;
10	const debug_u32 = if (want_modification_safety) u32 else void;	10	const debug_u32 = if (want_modification_safety) u32 else void;
11		11
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 {	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 {
13	return struct {	13	return struct {
14	entries: []Entry,	14	entries: []Entry,
15	size: usize,	15	size: usize,
16	max_distance_from_start_index: usize,	16	max_distance_from_start_index: usize,
17	allocator: &Allocator,	17	allocator: *Allocator,
18	// this is used to detect bugs where a hashtable is edited while an iterator is running.	18	// this is used to detect bugs where a hashtable is edited while an iterator is running.
19	modification_count: debug_u32,	19	modification_count: debug_u32,
20		20
...	@@ -28,7 +28,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -28,7 +28,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
28	};	28	};
29		29
30	pub const Iterator = struct {	30	pub const Iterator = struct {
31	hm: &const Self,	31	hm: *const Self,
32	// how many items have we returned	32	// how many items have we returned
33	count: usize,	33	count: usize,
34	// iterator through the entry array	34	// iterator through the entry array
...	@@ -36,7 +36,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -36,7 +36,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
36	// used to detect concurrent modification	36	// used to detect concurrent modification
37	initial_modification_count: debug_u32,	37	initial_modification_count: debug_u32,
38		38
39	pub fn next(it: &Iterator) ?&Entry {	39	pub fn next(it: Iterator) ?Entry {
40	if (want_modification_safety) {	40	if (want_modification_safety) {
41	assert(it.initial_modification_count == it.hm.modification_count); // concurrent modification	41	assert(it.initial_modification_count == it.hm.modification_count); // concurrent modification
42	}	42	}
...	@@ -53,7 +53,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -53,7 +53,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
53	}	53	}
54		54
55	// Reset the iterator to the initial index	55	// Reset the iterator to the initial index
56	pub fn reset(it: &Iterator) void {	56	pub fn reset(it: *Iterator) void {
57	it.count = 0;	57	it.count = 0;
58	it.index = 0;	58	it.index = 0;
59	// Resetting the modification count too	59	// Resetting the modification count too
...	@@ -61,7 +61,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -61,7 +61,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
61	}	61	}
62	};	62	};
63		63
64	pub fn init(allocator: &Allocator) Self {	64	pub fn init(allocator: *Allocator) Self {
65	return Self{	65	return Self{
66	.entries = []Entry{},	66	.entries = []Entry{},
67	.allocator = allocator,	67	.allocator = allocator,
...	@@ -71,11 +71,11 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -71,11 +71,11 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
71	};	71	};
72	}	72	}
73		73
74	pub fn deinit(hm: &const Self) void {	74	pub fn deinit(hm: *const Self) void {
75	hm.allocator.free(hm.entries);	75	hm.allocator.free(hm.entries);
76	}	76	}
77		77
78	pub fn clear(hm: &Self) void {	78	pub fn clear(hm: *Self) void {
79	for (hm.entries) \|*entry\| {	79	for (hm.entries) \|*entry\| {
80	entry.used = false;	80	entry.used = false;
81	}	81	}
...	@@ -84,12 +84,12 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -84,12 +84,12 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
84	hm.incrementModificationCount();	84	hm.incrementModificationCount();
85	}	85	}
86		86
87	pub fn count(hm: &const Self) usize {	87	pub fn count(hm: *const Self) usize {
88	return hm.size;	88	return hm.size;
89	}	89	}
90		90
91	/// Returns the value that was already there.	91	/// Returns the value that was already there.
92	pub fn put(hm: &Self, key: K, value: &const V) !?V {	92	pub fn put(hm: Self, key: K, value: const V) !?V {
93	if (hm.entries.len == 0) {	93	if (hm.entries.len == 0) {
94	try hm.initCapacity(16);	94	try hm.initCapacity(16);
95	}	95	}
...	@@ -111,18 +111,18 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -111,18 +111,18 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
111	return hm.internalPut(key, value);	111	return hm.internalPut(key, value);
112	}	112	}
113		113
114	pub fn get(hm: &const Self, key: K) ?&Entry {	114	pub fn get(hm: const Self, key: K) ?Entry {
115	if (hm.entries.len == 0) {	115	if (hm.entries.len == 0) {
116	return null;	116	return null;
117	}	117	}
118	return hm.internalGet(key);	118	return hm.internalGet(key);
119	}	119	}
120		120
121	pub fn contains(hm: &const Self, key: K) bool {	121	pub fn contains(hm: *const Self, key: K) bool {
122	return hm.get(key) != null;	122	return hm.get(key) != null;
123	}	123	}
124		124
125	pub fn remove(hm: &Self, key: K) ?&Entry {	125	pub fn remove(hm: Self, key: K) ?Entry {
126	if (hm.entries.len == 0) return null;	126	if (hm.entries.len == 0) return null;
127	hm.incrementModificationCount();	127	hm.incrementModificationCount();
128	const start_index = hm.keyToIndex(key);	128	const start_index = hm.keyToIndex(key);
...	@@ -154,7 +154,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -154,7 +154,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
154	return null;	154	return null;
155	}	155	}
156		156
157	pub fn iterator(hm: &const Self) Iterator {	157	pub fn iterator(hm: *const Self) Iterator {
158	return Iterator{	158	return Iterator{
159	.hm = hm,	159	.hm = hm,
160	.count = 0,	160	.count = 0,
...	@@ -163,7 +163,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -163,7 +163,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
163	};	163	};
164	}	164	}
165		165
166	fn initCapacity(hm: &Self, capacity: usize) !void {	166	fn initCapacity(hm: *Self, capacity: usize) !void {
167	hm.entries = try hm.allocator.alloc(Entry, capacity);	167	hm.entries = try hm.allocator.alloc(Entry, capacity);
168	hm.size = 0;	168	hm.size = 0;
169	hm.max_distance_from_start_index = 0;	169	hm.max_distance_from_start_index = 0;
...	@@ -172,14 +172,14 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -172,14 +172,14 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
172	}	172	}
173	}	173	}
174		174
175	fn incrementModificationCount(hm: &Self) void {	175	fn incrementModificationCount(hm: *Self) void {
176	if (want_modification_safety) {	176	if (want_modification_safety) {
177	hm.modification_count +%= 1;	177	hm.modification_count +%= 1;
178	}	178	}
179	}	179	}
180		180
181	/// Returns the value that was already there.	181	/// Returns the value that was already there.
182	fn internalPut(hm: &Self, orig_key: K, orig_value: &const V) ?V {	182	fn internalPut(hm: Self, orig_key: K, orig_value: const V) ?V {
183	var key = orig_key;	183	var key = orig_key;
184	var value = orig_value.*;	184	var value = orig_value.*;
185	const start_index = hm.keyToIndex(key);	185	const start_index = hm.keyToIndex(key);
...	@@ -231,7 +231,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -231,7 +231,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
231	unreachable; // put into a full map	231	unreachable; // put into a full map
232	}	232	}
233		233
234	fn internalGet(hm: &const Self, key: K) ?&Entry {	234	fn internalGet(hm: const Self, key: K) ?Entry {
235	const start_index = hm.keyToIndex(key);	235	const start_index = hm.keyToIndex(key);
236	{	236	{
237	var roll_over: usize = 0;	237	var roll_over: usize = 0;
...	@@ -246,7 +246,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32	...	@@ -246,7 +246,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn(key: K) u32
246	return null;	246	return null;
247	}	247	}
248		248
249	fn keyToIndex(hm: &const Self, key: K) usize {	249	fn keyToIndex(hm: *const Self, key: K) usize {
250	return usize(hash(key)) % hm.entries.len;	250	return usize(hash(key)) % hm.entries.len;
251	}	251	}
252	};	252	};

std/heap.zig+46-52

 @@ -16,15 +16,15 @@ var c_allocator_state = Allocator{
     .freeFn = cFree,
 };
-fn cAlloc(self: &Allocator, n: usize, alignment: u29) ![]u8 {
+fn cAlloc(self: *Allocator, n: usize, alignment: u29) ![]u8 {
     assert(alignment <= @alignOf(c_longdouble));
-    return if (c.malloc(n)) |buf| @ptrCast(&u8, buf)[0..n] else error.OutOfMemory;
+    return if (c.malloc(n)) |buf| @ptrCast([*]u8, buf)[0..n] else error.OutOfMemory;
 }
-fn cRealloc(self: &Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
+fn cRealloc(self: *Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
-    const old_ptr = @ptrCast(&c_void, old_mem.ptr);
+    const old_ptr = @ptrCast([*]c_void, old_mem.ptr);
     if (c.realloc(old_ptr, new_size)) |buf| {
-        return @ptrCast(&u8, buf)[0..new_size];
+        return @ptrCast(*u8, buf)[0..new_size];
     } else if (new_size <= old_mem.len) {
         return old_mem[0..new_size];
     } else {
 @@ -32,8 +32,8 @@ fn cRealloc(self: &Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![
     }
 }
-fn cFree(self: &Allocator, old_mem: []u8) void {
+fn cFree(self: *Allocator, old_mem: []u8) void {
-    const old_ptr = @ptrCast(&c_void, old_mem.ptr);
+    const old_ptr = @ptrCast([*]c_void, old_mem.ptr);
     c.free(old_ptr);
 }
 @@ -55,7 +55,7 @@ pub const DirectAllocator = struct {
         };
     }
-    pub fn deinit(self: &DirectAllocator) void {
+    pub fn deinit(self: *DirectAllocator) void {
         switch (builtin.os) {
             Os.windows => if (self.heap_handle) |heap_handle| {
                 _ = os.windows.HeapDestroy(heap_handle);
 @@ -64,19 +64,17 @@ pub const DirectAllocator = struct {
         }
     }
-    fn alloc(allocator: &Allocator, n: usize, alignment: u29) ![]u8 {
+    fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
         const self = @fieldParentPtr(DirectAllocator, "allocator", allocator);
         switch (builtin.os) {
-            Os.linux,
+            Os.linux, Os.macosx, Os.ios => {
-            Os.macosx,
-            Os.ios => {
                 const p = os.posix;
                 const alloc_size = if (alignment <= os.page_size) n else n + alignment;
                 const addr = p.mmap(null, alloc_size, p.PROT_READ | p.PROT_WRITE, p.MAP_PRIVATE | p.MAP_ANONYMOUS, -1, 0);
                 if (addr == p.MAP_FAILED) return error.OutOfMemory;
-                if (alloc_size == n) return @intToPtr(&u8, addr)[0..n];
+                if (alloc_size == n) return @intToPtr([*]u8, addr)[0..n];
                 var aligned_addr = addr & ~usize(alignment - 1);
                 aligned_addr += alignment;
 @@ -95,7 +93,7 @@ pub const DirectAllocator = struct {
                 //It is impossible that there is an unoccupied page at the top of our
                 //  mmap.
-                return @intToPtr(&u8, aligned_addr)[0..n];
+                return @intToPtr([*]u8, aligned_addr)[0..n];
             },
             Os.windows => {
                 const amt = n + alignment + @sizeOf(usize);
 @@ -110,20 +108,18 @@ pub const DirectAllocator = struct {
                 const march_forward_bytes = if (rem == 0) 0 else (alignment - rem);
                 const adjusted_addr = root_addr + march_forward_bytes;
                 const record_addr = adjusted_addr + n;
-                @intToPtr(&align(1) usize, record_addr).* = root_addr;
+                @intToPtr(*align(1) usize, record_addr).* = root_addr;
-                return @intToPtr(&u8, adjusted_addr)[0..n];
+                return @intToPtr([*]u8, adjusted_addr)[0..n];
             },
             else => @compileError("Unsupported OS"),
         }
     }
-    fn realloc(allocator: &Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
+    fn realloc(allocator: *Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
         const self = @fieldParentPtr(DirectAllocator, "allocator", allocator);
         switch (builtin.os) {
-            Os.linux,
+            Os.linux, Os.macosx, Os.ios => {
-            Os.macosx,
-            Os.ios => {
                 if (new_size <= old_mem.len) {
                     const base_addr = @ptrToInt(old_mem.ptr);
                     const old_addr_end = base_addr + old_mem.len;
 @@ -143,13 +139,13 @@ pub const DirectAllocator = struct {
             Os.windows => {
                 const old_adjusted_addr = @ptrToInt(old_mem.ptr);
                 const old_record_addr = old_adjusted_addr + old_mem.len;
-                const root_addr = @intToPtr(&align(1) usize, old_record_addr).*;
+                const root_addr = @intToPtr(*align(1) usize, old_record_addr).*;
-                const old_ptr = @intToPtr(os.windows.LPVOID, root_addr);
+                const old_ptr = @intToPtr([*]c_void, root_addr);
                 const amt = new_size + alignment + @sizeOf(usize);
                 const new_ptr = os.windows.HeapReAlloc(??self.heap_handle, 0, old_ptr, amt) ?? blk: {
                     if (new_size > old_mem.len) return error.OutOfMemory;
                     const new_record_addr = old_record_addr - new_size + old_mem.len;
-                    @intToPtr(&align(1) usize, new_record_addr).* = root_addr;
+                    @intToPtr(*align(1) usize, new_record_addr).* = root_addr;
                     return old_mem[0..new_size];
                 };
                 const offset = old_adjusted_addr - root_addr;
 @@ -157,26 +153,24 @@ pub const DirectAllocator = struct {
                 const new_adjusted_addr = new_root_addr + offset;
                 assert(new_adjusted_addr % alignment == 0);
                 const new_record_addr = new_adjusted_addr + new_size;
-                @intToPtr(&align(1) usize, new_record_addr).* = new_root_addr;
+                @intToPtr(*align(1) usize, new_record_addr).* = new_root_addr;
-                return @intToPtr(&u8, new_adjusted_addr)[0..new_size];
+                return @intToPtr([*]u8, new_adjusted_addr)[0..new_size];
             },
             else => @compileError("Unsupported OS"),
         }
     }
-    fn free(allocator: &Allocator, bytes: []u8) void {
+    fn free(allocator: *Allocator, bytes: []u8) void {
         const self = @fieldParentPtr(DirectAllocator, "allocator", allocator);
         switch (builtin.os) {
-            Os.linux,
+            Os.linux, Os.macosx, Os.ios => {
-            Os.macosx,
-            Os.ios => {
                 _ = os.posix.munmap(@ptrToInt(bytes.ptr), bytes.len);
             },
             Os.windows => {
                 const record_addr = @ptrToInt(bytes.ptr) + bytes.len;
-                const root_addr = @intToPtr(&align(1) usize, record_addr).*;
+                const root_addr = @intToPtr(*align(1) usize, record_addr).*;
-                const ptr = @intToPtr(os.windows.LPVOID, root_addr);
+                const ptr = @intToPtr([*]c_void, root_addr);
                 _ = os.windows.HeapFree(??self.heap_handle, 0, ptr);
             },
             else => @compileError("Unsupported OS"),
 @@ -189,13 +183,13 @@ pub const DirectAllocator = struct {
 pub const ArenaAllocator = struct {
     pub allocator: Allocator,
-    child_allocator: &Allocator,
+    child_allocator: *Allocator,
     buffer_list: std.LinkedList([]u8),
     end_index: usize,
     const BufNode = std.LinkedList([]u8).Node;
-    pub fn init(child_allocator: &Allocator) ArenaAllocator {
+    pub fn init(child_allocator: *Allocator) ArenaAllocator {
         return ArenaAllocator{
             .allocator = Allocator{
                 .allocFn = alloc,
 @@ -208,7 +202,7 @@ pub const ArenaAllocator = struct {
         };
     }
-    pub fn deinit(self: &ArenaAllocator) void {
+    pub fn deinit(self: *ArenaAllocator) void {
         var it = self.buffer_list.first;
         while (it) |node| {
             // this has to occur before the free because the free frees node
 @@ -218,7 +212,7 @@ pub const ArenaAllocator = struct {
         }
     }
-    fn createNode(self: &ArenaAllocator, prev_len: usize, minimum_size: usize) !&BufNode {
+    fn createNode(self: *ArenaAllocator, prev_len: usize, minimum_size: usize) !*BufNode {
         const actual_min_size = minimum_size + @sizeOf(BufNode);
         var len = prev_len;
         while (true) {
 @@ -239,7 +233,7 @@ pub const ArenaAllocator = struct {
         return buf_node;
     }
-    fn alloc(allocator: &Allocator, n: usize, alignment: u29) ![]u8 {
+    fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
         const self = @fieldParentPtr(ArenaAllocator, "allocator", allocator);
         var cur_node = if (self.buffer_list.last) |last_node| last_node else try self.createNode(0, n + alignment);
 @@ -260,7 +254,7 @@ pub const ArenaAllocator = struct {
         }
     }
-    fn realloc(allocator: &Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
+    fn realloc(allocator: *Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
         if (new_size <= old_mem.len) {
             return old_mem[0..new_size];
         } else {
 @@ -270,7 +264,7 @@ pub const ArenaAllocator = struct {
         }
     }
-    fn free(allocator: &Allocator, bytes: []u8) void {}
+    fn free(allocator: *Allocator, bytes: []u8) void {}
 };
 pub const FixedBufferAllocator = struct {
 @@ -290,7 +284,7 @@ pub const FixedBufferAllocator = struct {
         };
     }
-    fn alloc(allocator: &Allocator, n: usize, alignment: u29) ![]u8 {
+    fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
         const self = @fieldParentPtr(FixedBufferAllocator, "allocator", allocator);
         const addr = @ptrToInt(self.buffer.ptr) + self.end_index;
         const rem = @rem(addr, alignment);
 @@ -306,7 +300,7 @@ pub const FixedBufferAllocator = struct {
         return result;
     }
-    fn realloc(allocator: &Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
+    fn realloc(allocator: *Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
         if (new_size <= old_mem.len) {
             return old_mem[0..new_size];
         } else {
 @@ -316,7 +310,7 @@ pub const FixedBufferAllocator = struct {
         }
     }
-    fn free(allocator: &Allocator, bytes: []u8) void {}
+    fn free(allocator: *Allocator, bytes: []u8) void {}
 };
 /// lock free
 @@ -337,7 +331,7 @@ pub const ThreadSafeFixedBufferAllocator = struct {
         };
     }
-    fn alloc(allocator: &Allocator, n: usize, alignment: u29) ![]u8 {
+    fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
         const self = @fieldParentPtr(ThreadSafeFixedBufferAllocator, "allocator", allocator);
         var end_index = @atomicLoad(usize, &self.end_index, builtin.AtomicOrder.SeqCst);
         while (true) {
 @@ -353,7 +347,7 @@ pub const ThreadSafeFixedBufferAllocator = struct {
         }
     }
-    fn realloc(allocator: &Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
+    fn realloc(allocator: *Allocator, old_mem: []u8, new_size: usize, alignment: u29) ![]u8 {
         if (new_size <= old_mem.len) {
             return old_mem[0..new_size];
         } else {
 @@ -363,7 +357,7 @@ pub const ThreadSafeFixedBufferAllocator = struct {
         }
     }
-    fn free(allocator: &Allocator, bytes: []u8) void {}
+    fn free(allocator: *Allocator, bytes: []u8) void {}
 };
 test "c_allocator" {
 @@ -409,8 +403,8 @@ test "ThreadSafeFixedBufferAllocator" {
     try testAllocatorLargeAlignment(&fixed_buffer_allocator.allocator);
 }
-fn testAllocator(allocator: &mem.Allocator) !void {
+fn testAllocator(allocator: *mem.Allocator) !void {
-    var slice = try allocator.alloc(&i32, 100);
+    var slice = try allocator.alloc(*i32, 100);
     for (slice) |*item, i| {
         item.* = try allocator.create(i32);
 @@ -421,16 +415,16 @@ fn testAllocator(allocator: &mem.Allocator) !void {
         allocator.destroy(item);
     }
-    slice = try allocator.realloc(&i32, slice, 20000);
+    slice = try allocator.realloc(*i32, slice, 20000);
-    slice = try allocator.realloc(&i32, slice, 50);
+    slice = try allocator.realloc(*i32, slice, 50);
-    slice = try allocator.realloc(&i32, slice, 25);
+    slice = try allocator.realloc(*i32, slice, 25);
-    slice = try allocator.realloc(&i32, slice, 10);
+    slice = try allocator.realloc(*i32, slice, 10);
     allocator.free(slice);
 }
-fn testAllocatorLargeAlignment(allocator: &mem.Allocator) mem.Allocator.Error!void {
+fn testAllocatorLargeAlignment(allocator: *mem.Allocator) mem.Allocator.Error!void {
     //Maybe a platform's page_size is actually the same as or
     //  very near usize?
     if (os.page_size << 2 > @maxValue(usize)) return;

std/io.zig+41-41

...	@@ -34,20 +34,20 @@ pub fn getStdIn() GetStdIoErrs!File {	...	@@ -34,20 +34,20 @@ pub fn getStdIn() GetStdIoErrs!File {
34		34
35	/// Implementation of InStream trait for File	35	/// Implementation of InStream trait for File
36	pub const FileInStream = struct {	36	pub const FileInStream = struct {
37	file: &File,	37	file: *File,
38	stream: Stream,	38	stream: Stream,
39		39
40	pub const Error = @typeOf(File.read).ReturnType.ErrorSet;	40	pub const Error = @typeOf(File.read).ReturnType.ErrorSet;
41	pub const Stream = InStream(Error);	41	pub const Stream = InStream(Error);
42		42
43	pub fn init(file: &File) FileInStream {	43	pub fn init(file: *File) FileInStream {
44	return FileInStream{	44	return FileInStream{
45	.file = file,	45	.file = file,
46	.stream = Stream{ .readFn = readFn },	46	.stream = Stream{ .readFn = readFn },
47	};	47	};
48	}	48	}
49		49
50	fn readFn(in_stream: &Stream, buffer: []u8) Error!usize {	50	fn readFn(in_stream: *Stream, buffer: []u8) Error!usize {
51	const self = @fieldParentPtr(FileInStream, "stream", in_stream);	51	const self = @fieldParentPtr(FileInStream, "stream", in_stream);
52	return self.file.read(buffer);	52	return self.file.read(buffer);
53	}	53	}
...	@@ -55,20 +55,20 @@ pub const FileInStream = struct {	...	@@ -55,20 +55,20 @@ pub const FileInStream = struct {
55		55
56	/// Implementation of OutStream trait for File	56	/// Implementation of OutStream trait for File
57	pub const FileOutStream = struct {	57	pub const FileOutStream = struct {
58	file: &File,	58	file: *File,
59	stream: Stream,	59	stream: Stream,
60		60
61	pub const Error = File.WriteError;	61	pub const Error = File.WriteError;
62	pub const Stream = OutStream(Error);	62	pub const Stream = OutStream(Error);
63		63
64	pub fn init(file: &File) FileOutStream {	64	pub fn init(file: *File) FileOutStream {
65	return FileOutStream{	65	return FileOutStream{
66	.file = file,	66	.file = file,
67	.stream = Stream{ .writeFn = writeFn },	67	.stream = Stream{ .writeFn = writeFn },
68	};	68	};
69	}	69	}
70		70
71	fn writeFn(out_stream: &Stream, bytes: []const u8) !void {	71	fn writeFn(out_stream: *Stream, bytes: []const u8) !void {
72	const self = @fieldParentPtr(FileOutStream, "stream", out_stream);	72	const self = @fieldParentPtr(FileOutStream, "stream", out_stream);
73	return self.file.write(bytes);	73	return self.file.write(bytes);
74	}	74	}
...	@@ -82,12 +82,12 @@ pub fn InStream(comptime ReadError: type) type {	...	@@ -82,12 +82,12 @@ pub fn InStream(comptime ReadError: type) type {
82	/// Return the number of bytes read. If the number read is smaller than buf.len, it	82	/// Return the number of bytes read. If the number read is smaller than buf.len, it
83	/// means the stream reached the end. Reaching the end of a stream is not an error	83	/// means the stream reached the end. Reaching the end of a stream is not an error
84	/// condition.	84	/// condition.
85	readFn: fn(self: &Self, buffer: []u8) Error!usize,	85	readFn: fn (self: *Self, buffer: []u8) Error!usize,
86		86
87	/// Replaces `buffer` contents by reading from the stream until it is finished.	87	/// Replaces `buffer` contents by reading from the stream until it is finished.
88	/// If `buffer.len()` would exceed `max_size`, `error.StreamTooLong` is returned and	88	/// If `buffer.len()` would exceed `max_size`, `error.StreamTooLong` is returned and
89	/// the contents read from the stream are lost.	89	/// the contents read from the stream are lost.
90	pub fn readAllBuffer(self: &Self, buffer: &Buffer, max_size: usize) !void {	90	pub fn readAllBuffer(self: Self, buffer: Buffer, max_size: usize) !void {
91	try buffer.resize(0);	91	try buffer.resize(0);
92		92
93	var actual_buf_len: usize = 0;	93	var actual_buf_len: usize = 0;
...	@@ -111,7 +111,7 @@ pub fn InStream(comptime ReadError: type) type {	...	@@ -111,7 +111,7 @@ pub fn InStream(comptime ReadError: type) type {
111	/// memory would be greater than `max_size`, returns `error.StreamTooLong`.	111	/// memory would be greater than `max_size`, returns `error.StreamTooLong`.
112	/// Caller owns returned memory.	112	/// Caller owns returned memory.
113	/// If this function returns an error, the contents from the stream read so far are lost.	113	/// If this function returns an error, the contents from the stream read so far are lost.
114	pub fn readAllAlloc(self: &Self, allocator: &mem.Allocator, max_size: usize) ![]u8 {	114	pub fn readAllAlloc(self: Self, allocator: mem.Allocator, max_size: usize) ![]u8 {
115	var buf = Buffer.initNull(allocator);	115	var buf = Buffer.initNull(allocator);
116	defer buf.deinit();	116	defer buf.deinit();
117		117
...	@@ -123,7 +123,7 @@ pub fn InStream(comptime ReadError: type) type {	...	@@ -123,7 +123,7 @@ pub fn InStream(comptime ReadError: type) type {
123	/// Does not include the delimiter in the result.	123	/// Does not include the delimiter in the result.
124	/// If `buffer.len()` would exceed `max_size`, `error.StreamTooLong` is returned and the contents	124	/// If `buffer.len()` would exceed `max_size`, `error.StreamTooLong` is returned and the contents
125	/// read from the stream so far are lost.	125	/// read from the stream so far are lost.
126	pub fn readUntilDelimiterBuffer(self: &Self, buffer: &Buffer, delimiter: u8, max_size: usize) !void {	126	pub fn readUntilDelimiterBuffer(self: Self, buffer: Buffer, delimiter: u8, max_size: usize) !void {
127	try buffer.resize(0);	127	try buffer.resize(0);
128		128
129	while (true) {	129	while (true) {
...	@@ -145,7 +145,7 @@ pub fn InStream(comptime ReadError: type) type {	...	@@ -145,7 +145,7 @@ pub fn InStream(comptime ReadError: type) type {
145	/// memory would be greater than `max_size`, returns `error.StreamTooLong`.	145	/// memory would be greater than `max_size`, returns `error.StreamTooLong`.
146	/// Caller owns returned memory.	146	/// Caller owns returned memory.
147	/// If this function returns an error, the contents from the stream read so far are lost.	147	/// If this function returns an error, the contents from the stream read so far are lost.
148	pub fn readUntilDelimiterAlloc(self: &Self, allocator: &mem.Allocator, delimiter: u8, max_size: usize) ![]u8 {	148	pub fn readUntilDelimiterAlloc(self: Self, allocator: mem.Allocator, delimiter: u8, max_size: usize) ![]u8 {
149	var buf = Buffer.initNull(allocator);	149	var buf = Buffer.initNull(allocator);
150	defer buf.deinit();	150	defer buf.deinit();
151		151
...	@@ -156,43 +156,43 @@ pub fn InStream(comptime ReadError: type) type {	...	@@ -156,43 +156,43 @@ pub fn InStream(comptime ReadError: type) type {
156	/// Returns the number of bytes read. If the number read is smaller than buf.len, it	156	/// Returns the number of bytes read. If the number read is smaller than buf.len, it
157	/// means the stream reached the end. Reaching the end of a stream is not an error	157	/// means the stream reached the end. Reaching the end of a stream is not an error
158	/// condition.	158	/// condition.
159	pub fn read(self: &Self, buffer: []u8) !usize {	159	pub fn read(self: *Self, buffer: []u8) !usize {
160	return self.readFn(self, buffer);	160	return self.readFn(self, buffer);
161	}	161	}
162		162
163	/// Same as `read` but end of stream returns `error.EndOfStream`.	163	/// Same as `read` but end of stream returns `error.EndOfStream`.
164	pub fn readNoEof(self: &Self, buf: []u8) !void {	164	pub fn readNoEof(self: *Self, buf: []u8) !void {
165	const amt_read = try self.read(buf);	165	const amt_read = try self.read(buf);
166	if (amt_read < buf.len) return error.EndOfStream;	166	if (amt_read < buf.len) return error.EndOfStream;
167	}	167	}
168		168
169	/// Reads 1 byte from the stream or returns `error.EndOfStream`.	169	/// Reads 1 byte from the stream or returns `error.EndOfStream`.
170	pub fn readByte(self: &Self) !u8 {	170	pub fn readByte(self: *Self) !u8 {
171	var result: [1]u8 = undefined;	171	var result: [1]u8 = undefined;
172	try self.readNoEof(result[0..]);	172	try self.readNoEof(result[0..]);
173	return result[0];	173	return result[0];
174	}	174	}
175		175
176	/// Same as `readByte` except the returned byte is signed.	176	/// Same as `readByte` except the returned byte is signed.
177	pub fn readByteSigned(self: &Self) !i8 {	177	pub fn readByteSigned(self: *Self) !i8 {
178	return @bitCast(i8, try self.readByte());	178	return @bitCast(i8, try self.readByte());
179	}	179	}
180		180
181	pub fn readIntLe(self: &Self, comptime T: type) !T {	181	pub fn readIntLe(self: *Self, comptime T: type) !T {
182	return self.readInt(builtin.Endian.Little, T);	182	return self.readInt(builtin.Endian.Little, T);
183	}	183	}
184		184
185	pub fn readIntBe(self: &Self, comptime T: type) !T {	185	pub fn readIntBe(self: *Self, comptime T: type) !T {
186	return self.readInt(builtin.Endian.Big, T);	186	return self.readInt(builtin.Endian.Big, T);
187	}	187	}
188		188
189	pub fn readInt(self: &Self, endian: builtin.Endian, comptime T: type) !T {	189	pub fn readInt(self: *Self, endian: builtin.Endian, comptime T: type) !T {
190	var bytes: [@sizeOf(T)]u8 = undefined;	190	var bytes: [@sizeOf(T)]u8 = undefined;
191	try self.readNoEof(bytes[0..]);	191	try self.readNoEof(bytes[0..]);
192	return mem.readInt(bytes, T, endian);	192	return mem.readInt(bytes, T, endian);
193	}	193	}
194		194
195	pub fn readVarInt(self: &Self, endian: builtin.Endian, comptime T: type, size: usize) !T {	195	pub fn readVarInt(self: *Self, endian: builtin.Endian, comptime T: type, size: usize) !T {
196	assert(size <= @sizeOf(T));	196	assert(size <= @sizeOf(T));
197	assert(size <= 8);	197	assert(size <= 8);
198	var input_buf: [8]u8 = undefined;	198	var input_buf: [8]u8 = undefined;
...	@@ -208,22 +208,22 @@ pub fn OutStream(comptime WriteError: type) type {	...	@@ -208,22 +208,22 @@ pub fn OutStream(comptime WriteError: type) type {
208	const Self = this;	208	const Self = this;
209	pub const Error = WriteError;	209	pub const Error = WriteError;
210		210
211	writeFn: fn(self: &Self, bytes: []const u8) Error!void,	211	writeFn: fn (self: *Self, bytes: []const u8) Error!void,
212		212
213	pub fn print(self: &Self, comptime format: []const u8, args: ...) !void {	213	pub fn print(self: *Self, comptime format: []const u8, args: ...) !void {
214	return std.fmt.format(self, Error, self.writeFn, format, args);	214	return std.fmt.format(self, Error, self.writeFn, format, args);
215	}	215	}
216		216
217	pub fn write(self: &Self, bytes: []const u8) !void {	217	pub fn write(self: *Self, bytes: []const u8) !void {
218	return self.writeFn(self, bytes);	218	return self.writeFn(self, bytes);
219	}	219	}
220		220
221	pub fn writeByte(self: &Self, byte: u8) !void {	221	pub fn writeByte(self: *Self, byte: u8) !void {
222	const slice = (&byte)[0..1];	222	const slice = (&byte)[0..1];
223	return self.writeFn(self, slice);	223	return self.writeFn(self, slice);
224	}	224	}
225		225
226	pub fn writeByteNTimes(self: &Self, byte: u8, n: usize) !void {	226	pub fn writeByteNTimes(self: *Self, byte: u8, n: usize) !void {
227	const slice = (&byte)[0..1];	227	const slice = (&byte)[0..1];
228	var i: usize = 0;	228	var i: usize = 0;
229	while (i < n) : (i += 1) {	229	while (i < n) : (i += 1) {
...	@@ -234,14 +234,14 @@ pub fn OutStream(comptime WriteError: type) type {	...	@@ -234,14 +234,14 @@ pub fn OutStream(comptime WriteError: type) type {
234	}	234	}
235		235
236	/// `path` needs to be copied in memory to add a null terminating byte, hence the allocator.	236	/// `path` needs to be copied in memory to add a null terminating byte, hence the allocator.
237	pub fn writeFile(allocator: &mem.Allocator, path: []const u8, data: []const u8) !void {	237	pub fn writeFile(allocator: *mem.Allocator, path: []const u8, data: []const u8) !void {
238	var file = try File.openWrite(allocator, path);	238	var file = try File.openWrite(allocator, path);
239	defer file.close();	239	defer file.close();
240	try file.write(data);	240	try file.write(data);
241	}	241	}
242		242
243	/// On success, caller owns returned buffer.	243	/// On success, caller owns returned buffer.
244	pub fn readFileAlloc(allocator: &mem.Allocator, path: []const u8) ![]u8 {	244	pub fn readFileAlloc(allocator: *mem.Allocator, path: []const u8) ![]u8 {
245	var file = try File.openRead(allocator, path);	245	var file = try File.openRead(allocator, path);
246	defer file.close();	246	defer file.close();
247		247
...	@@ -265,13 +265,13 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)	...	@@ -265,13 +265,13 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)
265		265
266	pub stream: Stream,	266	pub stream: Stream,
267		267
268	unbuffered_in_stream: &Stream,	268	unbuffered_in_stream: *Stream,
269		269
270	buffer: [buffer_size]u8,	270	buffer: [buffer_size]u8,
271	start_index: usize,	271	start_index: usize,
272	end_index: usize,	272	end_index: usize,
273		273
274	pub fn init(unbuffered_in_stream: &Stream) Self {	274	pub fn init(unbuffered_in_stream: *Stream) Self {
275	return Self{	275	return Self{
276	.unbuffered_in_stream = unbuffered_in_stream,	276	.unbuffered_in_stream = unbuffered_in_stream,
277	.buffer = undefined,	277	.buffer = undefined,
...	@@ -287,7 +287,7 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)	...	@@ -287,7 +287,7 @@ pub fn BufferedInStreamCustom(comptime buffer_size: usize, comptime Error: type)
287	};	287	};
288	}	288	}
289		289
290	fn readFn(in_stream: &Stream, dest: []u8) !usize {	290	fn readFn(in_stream: *Stream, dest: []u8) !usize {
291	const self = @fieldParentPtr(Self, "stream", in_stream);	291	const self = @fieldParentPtr(Self, "stream", in_stream);
292		292
293	var dest_index: usize = 0;	293	var dest_index: usize = 0;
...	@@ -338,12 +338,12 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr	...	@@ -338,12 +338,12 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr
338		338
339	pub stream: Stream,	339	pub stream: Stream,
340		340
341	unbuffered_out_stream: &Stream,	341	unbuffered_out_stream: *Stream,
342		342
343	buffer: [buffer_size]u8,	343	buffer: [buffer_size]u8,
344	index: usize,	344	index: usize,
345		345
346	pub fn init(unbuffered_out_stream: &Stream) Self {	346	pub fn init(unbuffered_out_stream: *Stream) Self {
347	return Self{	347	return Self{
348	.unbuffered_out_stream = unbuffered_out_stream,	348	.unbuffered_out_stream = unbuffered_out_stream,
349	.buffer = undefined,	349	.buffer = undefined,
...	@@ -352,12 +352,12 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr	...	@@ -352,12 +352,12 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr
352	};	352	};
353	}	353	}
354		354
355	pub fn flush(self: &Self) !void {	355	pub fn flush(self: *Self) !void {
356	try self.unbuffered_out_stream.write(self.buffer[0..self.index]);	356	try self.unbuffered_out_stream.write(self.buffer[0..self.index]);
357	self.index = 0;	357	self.index = 0;
358	}	358	}
359		359
360	fn writeFn(out_stream: &Stream, bytes: []const u8) !void {	360	fn writeFn(out_stream: *Stream, bytes: []const u8) !void {
361	const self = @fieldParentPtr(Self, "stream", out_stream);	361	const self = @fieldParentPtr(Self, "stream", out_stream);
362		362
363	if (bytes.len >= self.buffer.len) {	363	if (bytes.len >= self.buffer.len) {
...	@@ -369,7 +369,7 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr	...	@@ -369,7 +369,7 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr
369	while (src_index < bytes.len) {	369	while (src_index < bytes.len) {
370	const dest_space_left = self.buffer.len - self.index;	370	const dest_space_left = self.buffer.len - self.index;
371	const copy_amt = math.min(dest_space_left, bytes.len - src_index);	371	const copy_amt = math.min(dest_space_left, bytes.len - src_index);
372	mem.copy(u8, self.buffer[self.index..], bytes[src_index..src_index + copy_amt]);	372	mem.copy(u8, self.buffer[self.index..], bytes[src_index .. src_index + copy_amt]);
373	self.index += copy_amt;	373	self.index += copy_amt;
374	assert(self.index <= self.buffer.len);	374	assert(self.index <= self.buffer.len);
375	if (self.index == self.buffer.len) {	375	if (self.index == self.buffer.len) {
...	@@ -383,20 +383,20 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr	...	@@ -383,20 +383,20 @@ pub fn BufferedOutStreamCustom(comptime buffer_size: usize, comptime OutStreamEr
383		383
384	/// Implementation of OutStream trait for Buffer	384	/// Implementation of OutStream trait for Buffer
385	pub const BufferOutStream = struct {	385	pub const BufferOutStream = struct {
386	buffer: &Buffer,	386	buffer: *Buffer,
387	stream: Stream,	387	stream: Stream,
388		388
389	pub const Error = error{OutOfMemory};	389	pub const Error = error{OutOfMemory};
390	pub const Stream = OutStream(Error);	390	pub const Stream = OutStream(Error);
391		391
392	pub fn init(buffer: &Buffer) BufferOutStream {	392	pub fn init(buffer: *Buffer) BufferOutStream {
393	return BufferOutStream{	393	return BufferOutStream{
394	.buffer = buffer,	394	.buffer = buffer,
395	.stream = Stream{ .writeFn = writeFn },	395	.stream = Stream{ .writeFn = writeFn },
396	};	396	};
397	}	397	}
398		398
399	fn writeFn(out_stream: &Stream, bytes: []const u8) !void {	399	fn writeFn(out_stream: *Stream, bytes: []const u8) !void {
400	const self = @fieldParentPtr(BufferOutStream, "stream", out_stream);	400	const self = @fieldParentPtr(BufferOutStream, "stream", out_stream);
401	return self.buffer.append(bytes);	401	return self.buffer.append(bytes);
402	}	402	}
...	@@ -407,7 +407,7 @@ pub const BufferedAtomicFile = struct {	...	@@ -407,7 +407,7 @@ pub const BufferedAtomicFile = struct {
407	file_stream: FileOutStream,	407	file_stream: FileOutStream,
408	buffered_stream: BufferedOutStream(FileOutStream.Error),	408	buffered_stream: BufferedOutStream(FileOutStream.Error),
409		409
410	pub fn create(allocator: &mem.Allocator, dest_path: []const u8) !&BufferedAtomicFile {	410	pub fn create(allocator: mem.Allocator, dest_path: []const u8) !BufferedAtomicFile {
411	// TODO with well defined copy elision we don't need this allocation	411	// TODO with well defined copy elision we don't need this allocation
412	var self = try allocator.create(BufferedAtomicFile);	412	var self = try allocator.create(BufferedAtomicFile);
413	errdefer allocator.destroy(self);	413	errdefer allocator.destroy(self);
...	@@ -427,18 +427,18 @@ pub const BufferedAtomicFile = struct {	...	@@ -427,18 +427,18 @@ pub const BufferedAtomicFile = struct {
427	}	427	}
428		428
429	/// always call destroy, even after successful finish()	429	/// always call destroy, even after successful finish()
430	pub fn destroy(self: &BufferedAtomicFile) void {	430	pub fn destroy(self: *BufferedAtomicFile) void {
431	const allocator = self.atomic_file.allocator;	431	const allocator = self.atomic_file.allocator;
432	self.atomic_file.deinit();	432	self.atomic_file.deinit();
433	allocator.destroy(self);	433	allocator.destroy(self);
434	}	434	}
435		435
436	pub fn finish(self: &BufferedAtomicFile) !void {	436	pub fn finish(self: *BufferedAtomicFile) !void {
437	try self.buffered_stream.flush();	437	try self.buffered_stream.flush();
438	try self.atomic_file.finish();	438	try self.atomic_file.finish();
439	}	439	}
440		440
441	pub fn stream(self: &BufferedAtomicFile) &OutStream(FileOutStream.Error) {	441	pub fn stream(self: BufferedAtomicFile) OutStream(FileOutStream.Error) {
442	return &self.buffered_stream.stream;	442	return &self.buffered_stream.stream;
443	}	443	}
444	};	444	};

std/io_test.zig+1-1

...	@@ -41,7 +41,7 @@ test "write a file, read it, then delete it" {	...	@@ -41,7 +41,7 @@ test "write a file, read it, then delete it" {
41	defer allocator.free(contents);	41	defer allocator.free(contents);
42		42
43	assert(mem.eql(u8, contents[0.."begin".len], "begin"));	43	assert(mem.eql(u8, contents[0.."begin".len], "begin"));
44	assert(mem.eql(u8, contents["begin".len..contents.len - "end".len], data));	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	try os.deleteFile(allocator, tmp_file_name);	47	try os.deleteFile(allocator, tmp_file_name);

std/json.zig+52-94

 @@ -10,7 +10,7 @@ const u256 = @IntType(false, 256);
 // A single token slice into the parent string.
 //
-// Use `token.slice()` on the inptu at the current position to get the current slice.
+// Use `token.slice()` on the input at the current position to get the current slice.
 pub const Token = struct {
     id: Id,
     // How many bytes do we skip before counting
 @@ -76,8 +76,8 @@ pub const Token = struct {
     }
     // Slice into the underlying input string.
-    pub fn slice(self: &const Token, input: []const u8, i: usize) []const u8 {
+    pub fn slice(self: *const Token, input: []const u8, i: usize) []const u8 {
-        return input[i + self.offset - self.count..i + self.offset];
+        return input[i + self.offset - self.count .. i + self.offset];
     }
 };
 @@ -115,7 +115,7 @@ pub const StreamingJsonParser = struct {
         return p;
     }
-    pub fn reset(p: &StreamingJsonParser) void {
+    pub fn reset(p: *StreamingJsonParser) void {
         p.state = State.TopLevelBegin;
         p.count = 0;
         // Set before ever read in main transition function
 @@ -205,7 +205,7 @@ pub const StreamingJsonParser = struct {
     // tokens. token2 is always null if token1 is null.
     //
     // There is currently no error recovery on a bad stream.
-    pub fn feed(p: &StreamingJsonParser, c: u8, token1: &?Token, token2: &?Token) Error!void {
+    pub fn feed(p: *StreamingJsonParser, c: u8, token1: *?Token, token2: *?Token) Error!void {
         token1.* = null;
         token2.* = null;
         p.count += 1;
 @@ -217,7 +217,7 @@ pub const StreamingJsonParser = struct {
     }
     // Perform a single transition on the state machine and return any possible token.
-    fn transition(p: &StreamingJsonParser, c: u8, token: &?Token) Error!bool {
+    fn transition(p: *StreamingJsonParser, c: u8, token: *?Token) Error!bool {
         switch (p.state) {
             State.TopLevelBegin => switch (c) {
                 '{' => {
 @@ -252,7 +252,7 @@ pub const StreamingJsonParser = struct {
                     p.after_value_state = State.TopLevelEnd;
                     p.count = 0;
                 },
-                '1' ... '9' => {
+                '1'...'9' => {
                     p.number_is_integer = true;
                     p.state = State.NumberMaybeDigitOrDotOrExponent;
                     p.after_value_state = State.TopLevelEnd;
 @@ -281,10 +281,7 @@ pub const StreamingJsonParser = struct {
                     p.after_value_state = State.TopLevelEnd;
                     p.count = 0;
                 },
-                0x09,
+                0x09, 0x0A, 0x0D, 0x20 => {
-                0x0A,
-                0x0D,
-                0x20 => {
                     // whitespace
                 },
                 else => {
 @@ -293,10 +290,7 @@ pub const StreamingJsonParser = struct {
             },
             State.TopLevelEnd => switch (c) {
-                0x09,
+                0x09, 0x0A, 0x0D, 0x20 => {
-                0x0A,
-                0x0D,
-                0x20 => {
                     // whitespace
                 },
                 else => {
 @@ -392,7 +386,7 @@ pub const StreamingJsonParser = struct {
                     p.state = State.NumberMaybeDotOrExponent;
                     p.count = 0;
                 },
-                '1' ... '9' => {
+                '1'...'9' => {
                     p.state = State.NumberMaybeDigitOrDotOrExponent;
                     p.count = 0;
                 },
 @@ -412,10 +406,7 @@ pub const StreamingJsonParser = struct {
                     p.state = State.NullLiteral1;
                     p.count = 0;
                 },
-                0x09,
+                0x09, 0x0A, 0x0D, 0x20 => {
-                0x0A,
-                0x0D,
-                0x20 => {
                     // whitespace
                 },
                 else => {
 @@ -461,7 +452,7 @@ pub const StreamingJsonParser = struct {
                     p.state = State.NumberMaybeDotOrExponent;
                     p.count = 0;
                 },
-                '1' ... '9' => {
+                '1'...'9' => {
                     p.state = State.NumberMaybeDigitOrDotOrExponent;
                     p.count = 0;
                 },
 @@ -481,10 +472,7 @@ pub const StreamingJsonParser = struct {
                     p.state = State.NullLiteral1;
                     p.count = 0;
                 },
-                0x09,
+                0x09, 0x0A, 0x0D, 0x20 => {
-                0x0A,
-                0x0D,
-                0x20 => {
                     // whitespace
                 },
                 else => {
 @@ -533,10 +521,7 @@ pub const StreamingJsonParser = struct {
                     token.* = Token.initMarker(Token.Id.ObjectEnd);
                 },
-                0x09,
+                0x09, 0x0A, 0x0D, 0x20 => {
-                0x0A,
-                0x0D,
-                0x20 => {
                     // whitespace
                 },
                 else => {
 @@ -549,10 +534,7 @@ pub const StreamingJsonParser = struct {
                     p.state = State.ValueBegin;
                     p.after_string_state = State.ValueEnd;
                 },
-                0x09,
+                0x09, 0x0A, 0x0D, 0x20 => {
-                0x0A,
-                0x0D,
-                0x20 => {
                     // whitespace
                 },
                 else => {
 @@ -561,7 +543,7 @@ pub const StreamingJsonParser = struct {
             },
             State.String => switch (c) {
-                0x00 ... 0x1F => {
+                0x00...0x1F => {
                     return error.InvalidControlCharacter;
                 },
                 '"' => {
 @@ -576,19 +558,16 @@ pub const StreamingJsonParser = struct {
                 '\\' => {
                     p.state = State.StringEscapeCharacter;
                 },
-                0x20,
+                0x20, 0x21, 0x23...0x5B, 0x5D...0x7F => {
-                0x21,
-                0x23 ... 0x5B,
-                0x5D ... 0x7F => {
                     // non-control ascii
                 },
-                0xC0 ... 0xDF => {
+                0xC0...0xDF => {
                     p.state = State.StringUtf8Byte1;
                 },
-                0xE0 ... 0xEF => {
+                0xE0...0xEF => {
                     p.state = State.StringUtf8Byte2;
                 },
-                0xF0 ... 0xFF => {
+                0xF0...0xFF => {
                     p.state = State.StringUtf8Byte3;
                 },
                 else => {
 @@ -620,14 +599,7 @@ pub const StreamingJsonParser = struct {
                 // The current JSONTestSuite tests rely on both of this behaviour being present
                 // however, so we default to the status quo where both are accepted until this
                 // is further clarified.
-                '"',
+                '"', '\\', '/', 'b', 'f', 'n', 'r', 't' => {
-                '\\',
-                '/',
-                'b',
-                'f',
-                'n',
-                'r',
-                't' => {
                     p.string_has_escape = true;
                     p.state = State.String;
                 },
 @@ -641,36 +613,28 @@ pub const StreamingJsonParser = struct {
             },
             State.StringEscapeHexUnicode4 => switch (c) {
-                '0' ... '9',
+                '0'...'9', 'A'...'F', 'a'...'f' => {
-                'A' ... 'F',
-                'a' ... 'f' => {
                     p.state = State.StringEscapeHexUnicode3;
                 },
                 else => return error.InvalidUnicodeHexSymbol,
             },
             State.StringEscapeHexUnicode3 => switch (c) {
-                '0' ... '9',
+                '0'...'9', 'A'...'F', 'a'...'f' => {
-                'A' ... 'F',
-                'a' ... 'f' => {
                     p.state = State.StringEscapeHexUnicode2;
                 },
                 else => return error.InvalidUnicodeHexSymbol,
             },
             State.StringEscapeHexUnicode2 => switch (c) {
-                '0' ... '9',
+                '0'...'9', 'A'...'F', 'a'...'f' => {
-                'A' ... 'F',
-                'a' ... 'f' => {
                     p.state = State.StringEscapeHexUnicode1;
                 },
                 else => return error.InvalidUnicodeHexSymbol,
             },
             State.StringEscapeHexUnicode1 => switch (c) {
-                '0' ... '9',
+                '0'...'9', 'A'...'F', 'a'...'f' => {
-                'A' ... 'F',
-                'a' ... 'f' => {
                     p.state = State.String;
                 },
                 else => return error.InvalidUnicodeHexSymbol,
 @@ -682,7 +646,7 @@ pub const StreamingJsonParser = struct {
                     '0' => {
                         p.state = State.NumberMaybeDotOrExponent;
                     },
-                    '1' ... '9' => {
+                    '1'...'9' => {
                         p.state = State.NumberMaybeDigitOrDotOrExponent;
                     },
                     else => {
 @@ -698,8 +662,7 @@ pub const StreamingJsonParser = struct {
                         p.number_is_integer = false;
                         p.state = State.NumberFractionalRequired;
                     },
-                    'e',
+                    'e', 'E' => {
-                    'E' => {
                         p.number_is_integer = false;
                         p.state = State.NumberExponent;
                     },
 @@ -718,12 +681,11 @@ pub const StreamingJsonParser = struct {
                         p.number_is_integer = false;
                         p.state = State.NumberFractionalRequired;
                     },
-                    'e',
+                    'e', 'E' => {
-                    'E' => {
                         p.number_is_integer = false;
                         p.state = State.NumberExponent;
                     },
-                    '0' ... '9' => {
+                    '0'...'9' => {
                         // another digit
                     },
                     else => {
 @@ -737,7 +699,7 @@ pub const StreamingJsonParser = struct {
             State.NumberFractionalRequired => {
                 p.complete = p.after_value_state == State.TopLevelEnd;
                 switch (c) {
-                    '0' ... '9' => {
+                    '0'...'9' => {
                         p.state = State.NumberFractional;
                     },
                     else => {
 @@ -749,11 +711,10 @@ pub const StreamingJsonParser = struct {
             State.NumberFractional => {
                 p.complete = p.after_value_state == State.TopLevelEnd;
                 switch (c) {
-                    '0' ... '9' => {
+                    '0'...'9' => {
                         // another digit
                     },
-                    'e',
+                    'e', 'E' => {
-                    'E' => {
                         p.number_is_integer = false;
                         p.state = State.NumberExponent;
                     },
 @@ -768,8 +729,7 @@ pub const StreamingJsonParser = struct {
             State.NumberMaybeExponent => {
                 p.complete = p.after_value_state == State.TopLevelEnd;
                 switch (c) {
-                    'e',
+                    'e', 'E' => {
-                    'E' => {
                         p.number_is_integer = false;
                         p.state = State.NumberExponent;
                     },
 @@ -782,12 +742,11 @@ pub const StreamingJsonParser = struct {
             },
             State.NumberExponent => switch (c) {
-                '-',
+                '-', '+' => {
-                '+' => {
                     p.complete = false;
                     p.state = State.NumberExponentDigitsRequired;
                 },
-                '0' ... '9' => {
+                '0'...'9' => {
                     p.complete = p.after_value_state == State.TopLevelEnd;
                     p.state = State.NumberExponentDigits;
                 },
 @@ -797,7 +756,7 @@ pub const StreamingJsonParser = struct {
             },
             State.NumberExponentDigitsRequired => switch (c) {
-                '0' ... '9' => {
+                '0'...'9' => {
                     p.complete = p.after_value_state == State.TopLevelEnd;
                     p.state = State.NumberExponentDigits;
                 },
 @@ -809,7 +768,7 @@ pub const StreamingJsonParser = struct {
             State.NumberExponentDigits => {
                 p.complete = p.after_value_state == State.TopLevelEnd;
                 switch (c) {
-                    '0' ... '9' => {
+                    '0'...'9' => {
                         // another digit
                     },
                     else => {
 @@ -902,7 +861,7 @@ pub fn validate(s: []const u8) bool {
         var token1: ?Token = undefined;
         var token2: ?Token = undefined;
-        p.feed(c, &token1, &token2) catch |err| {
+        p.feed(c, *token1, *token2) catch |err| {
             return false;
         };
     }
 @@ -919,7 +878,7 @@ pub const ValueTree = struct {
     arena: ArenaAllocator,
     root: Value,
-    pub fn deinit(self: &ValueTree) void {
+    pub fn deinit(self: *ValueTree) void {
         self.arena.deinit();
     }
 };
 @@ -935,7 +894,7 @@ pub const Value = union(enum) {
     Array: ArrayList(Value),
     Object: ObjectMap,
-    pub fn dump(self: &const Value) void {
+    pub fn dump(self: *const Value) void {
         switch (self.*) {
             Value.Null => {
                 std.debug.warn("null");
 @@ -982,7 +941,7 @@ pub const Value = union(enum) {
         }
     }
-    pub fn dumpIndent(self: &const Value, indent: usize) void {
+    pub fn dumpIndent(self: *const Value, indent: usize) void {
         if (indent == 0) {
             self.dump();
         } else {
 @@ -990,7 +949,7 @@ pub const Value = union(enum) {
         }
     }
-    fn dumpIndentLevel(self: &const Value, indent: usize, level: usize) void {
+    fn dumpIndentLevel(self: *const Value, indent: usize, level: usize) void {
         switch (self.*) {
             Value.Null => {
                 std.debug.warn("null");
 @@ -1054,7 +1013,7 @@ pub const Value = union(enum) {
 // A non-stream JSON parser which constructs a tree of Value's.
 pub const JsonParser = struct {
-    allocator: &Allocator,
+    allocator: *Allocator,
     state: State,
     copy_strings: bool,
     // Stores parent nodes and un-combined Values.
 @@ -1067,7 +1026,7 @@ pub const JsonParser = struct {
         Simple,
     };
-    pub fn init(allocator: &Allocator, copy_strings: bool) JsonParser {
+    pub fn init(allocator: *Allocator, copy_strings: bool) JsonParser {
         return JsonParser{
             .allocator = allocator,
             .state = State.Simple,
 @@ -1076,16 +1035,16 @@ pub const JsonParser = struct {
         };
     }
-    pub fn deinit(p: &JsonParser) void {
+    pub fn deinit(p: *JsonParser) void {
         p.stack.deinit();
     }
-    pub fn reset(p: &JsonParser) void {
+    pub fn reset(p: *JsonParser) void {
         p.state = State.Simple;
         p.stack.shrink(0);
     }
-    pub fn parse(p: &JsonParser, input: []const u8) !ValueTree {
+    pub fn parse(p: *JsonParser, input: []const u8) !ValueTree {
         var mp = StreamingJsonParser.init();
         var arena = ArenaAllocator.init(p.allocator);
 @@ -1131,7 +1090,7 @@ pub const JsonParser = struct {
     // Even though p.allocator exists, we take an explicit allocator so that allocation state
     // can be cleaned up on error correctly during a `parse` on call.
-    fn transition(p: &JsonParser, allocator: &Allocator, input: []const u8, i: usize, token: &const Token) !void {
+    fn transition(p: *JsonParser, allocator: *Allocator, input: []const u8, i: usize, token: *const Token) !void {
         switch (p.state) {
             State.ObjectKey => switch (token.id) {
                 Token.Id.ObjectEnd => {
 @@ -1257,15 +1216,14 @@ pub const JsonParser = struct {
                 Token.Id.Null => {
                     try p.stack.append(Value.Null);
                 },
-                Token.Id.ObjectEnd,
+                Token.Id.ObjectEnd, Token.Id.ArrayEnd => {
-                Token.Id.ArrayEnd => {
                     unreachable;
                 },
             },
         }
     }
-    fn pushToParent(p: &JsonParser, value: &const Value) !void {
+    fn pushToParent(p: *JsonParser, value: *const Value) !void {
         switch (p.stack.at(p.stack.len - 1)) {
             // Object Parent -> [ ..., object, <key>, value ]
             Value.String => |key| {
 @@ -1286,14 +1244,14 @@ pub const JsonParser = struct {
         }
     }
-    fn parseString(p: &JsonParser, allocator: &Allocator, token: &const Token, input: []const u8, i: usize) !Value {
+    fn parseString(p: *JsonParser, allocator: *Allocator, token: *const Token, input: []const u8, i: usize) !Value {
         // TODO: We don't strictly have to copy values which do not contain any escape
         // characters if flagged with the option.
         const slice = token.slice(input, i);
         return Value{ .String = try mem.dupe(p.allocator, u8, slice) };
     }
-    fn parseNumber(p: &JsonParser, token: &const Token, input: []const u8, i: usize) !Value {
+    fn parseNumber(p: *JsonParser, token: *const Token, input: []const u8, i: usize) !Value {
         return if (token.number_is_integer)
             Value{ .Integer = try std.fmt.parseInt(i64, token.slice(input, i), 10) }
         else

std/json_test.zig+9-27

...	@@ -81,9 +81,7 @@ test "y_array_with_several_null" {	...	@@ -81,9 +81,7 @@ test "y_array_with_several_null" {
81	}	81	}
82		82
83	test "y_array_with_trailing_space" {	83	test "y_array_with_trailing_space" {
84	ok(	84	ok("[2] ");
85	"[2] "
86	);
87	}	85	}
88		86
89	test "y_number_0e+1" {	87	test "y_number_0e+1" {
...	@@ -579,9 +577,7 @@ test "y_structure_true_in_array" {	...	@@ -579,9 +577,7 @@ test "y_structure_true_in_array" {
579	}	577	}
580		578
581	test "y_structure_whitespace_array" {	579	test "y_structure_whitespace_array" {
582	ok(	580	ok(" [] ");
583	" [] "
584	);
585	}	581	}
586		582
587	////////////////////////////////////////////////////////////////////////////////////////////////////	583	////////////////////////////////////////////////////////////////////////////////////////////////////
...	@@ -696,7 +692,6 @@ test "n_array_newlines_unclosed" {	...	@@ -696,7 +692,6 @@ test "n_array_newlines_unclosed" {
696	);	692	);
697	}	693	}
698		694
699
700	test "n_array_number_and_comma" {	695	test "n_array_number_and_comma" {
701	err(	696	err(
702	\\[1,]	697	\\[1,]
...	@@ -971,7 +966,6 @@ test "n_number_invalid-utf-8-in-int" {	...	@@ -971,7 +966,6 @@ test "n_number_invalid-utf-8-in-int" {
971	);	966	);
972	}	967	}
973		968
974
975	test "n_number_++" {	969	test "n_number_++" {
976	err(	970	err(
977	\\[++1234]	971	\\[++1234]
...	@@ -1228,7 +1222,7 @@ test "n_object_unterminated-value" {	...	@@ -1228,7 +1222,7 @@ test "n_object_unterminated-value" {
1228	err(	1222	err(
1229	\\{"a":"a	1223	\\{"a":"a
1230	);	1224	);
1231	}	1225	}
1232		1226
1233	test "n_object_with_single_string" {	1227	test "n_object_with_single_string" {
1234	err(	1228	err(
...	@@ -1243,9 +1237,7 @@ test "n_object_with_trailing_garbage" {	...	@@ -1243,9 +1237,7 @@ test "n_object_with_trailing_garbage" {
1243	}	1237	}
1244		1238
1245	test "n_single_space" {	1239	test "n_single_space" {
1246	err(	1240	err(" ");
1247	" "
1248	);
1249	}	1241	}
1250		1242
1251	test "n_string_1_surrogate_then_escape" {	1243	test "n_string_1_surrogate_then_escape" {
...	@@ -1279,9 +1271,7 @@ test "n_string_accentuated_char_no_quotes" {	...	@@ -1279,9 +1271,7 @@ test "n_string_accentuated_char_no_quotes" {
1279	}	1271	}
1280		1272
1281	test "n_string_backslash_00" {	1273	test "n_string_backslash_00" {
1282	err(	1274	err("[\"\x00\"]");
1283	\\["\"]
1284	);
1285	}	1275	}
1286		1276
1287	test "n_string_escaped_backslash_bad" {	1277	test "n_string_escaped_backslash_bad" {
...	@@ -1291,9 +1281,7 @@ test "n_string_escaped_backslash_bad" {	...	@@ -1291,9 +1281,7 @@ test "n_string_escaped_backslash_bad" {
1291	}	1281	}
1292		1282
1293	test "n_string_escaped_ctrl_char_tab" {	1283	test "n_string_escaped_ctrl_char_tab" {
1294	err(	1284	err("\x5b\x22\x5c\x09\x22\x5d");
1295	\\["\ "]
1296	);
1297	}	1285	}
1298		1286
1299	test "n_string_escaped_emoji" {	1287	test "n_string_escaped_emoji" {
...	@@ -1416,9 +1404,7 @@ test "n_string_with_trailing_garbage" {	...	@@ -1416,9 +1404,7 @@ test "n_string_with_trailing_garbage" {
1416	}	1404	}
1417		1405
1418	test "n_structure_100000_opening_arrays" {	1406	test "n_structure_100000_opening_arrays" {
1419	err(	1407	err("[" ** 100000);
1420	"[" ** 100000
1421	);
1422	}	1408	}
1423		1409
1424	test "n_structure_angle_bracket_." {	1410	test "n_structure_angle_bracket_." {
...	@@ -1558,9 +1544,7 @@ test "n_structure_open_array_comma" {	...	@@ -1558,9 +1544,7 @@ test "n_structure_open_array_comma" {
1558	}	1544	}
1559		1545
1560	test "n_structure_open_array_object" {	1546	test "n_structure_open_array_object" {
1561	err(	1547	err("[{\"\":" ** 50000);
1562	"[{\"\":" ** 50000
1563	);
1564	}	1548	}
1565		1549
1566	test "n_structure_open_array_open_object" {	1550	test "n_structure_open_array_open_object" {
...	@@ -1900,9 +1884,7 @@ test "i_string_UTF8_surrogate_U+D800" {	...	@@ -1900,9 +1884,7 @@ test "i_string_UTF8_surrogate_U+D800" {
1900	}	1884	}
1901		1885
1902	test "i_structure_500_nested_arrays" {	1886	test "i_structure_500_nested_arrays" {
1903	any(	1887	any(("[" 500) ++ ("]" 500));
1904	("[" 500) ++ ("]" 500)
1905	);
1906	}	1888	}
1907		1889
1908	test "i_structure_UTF-8_BOM_empty_object" {	1890	test "i_structure_UTF-8_BOM_empty_object" {

std/linked_list.zig+16-16

...	@@ -21,11 +21,11 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -21,11 +21,11 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
21		21
22	/// Node inside the linked list wrapping the actual data.	22	/// Node inside the linked list wrapping the actual data.
23	pub const Node = struct {	23	pub const Node = struct {
24	prev: ?&Node,	24	prev: ?*Node,
25	next: ?&Node,	25	next: ?*Node,
26	data: T,	26	data: T,
27		27
28	pub fn init(value: &const T) Node {	28	pub fn init(value: *const T) Node {
29	return Node{	29	return Node{
30	.prev = null,	30	.prev = null,
31	.next = null,	31	.next = null,
...	@@ -38,14 +38,14 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -38,14 +38,14 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
38	return Node.init({});	38	return Node.init({});
39	}	39	}
40		40
41	pub fn toData(node: &Node) &ParentType {	41	pub fn toData(node: Node) ParentType {
42	comptime assert(isIntrusive());	42	comptime assert(isIntrusive());
43	return @fieldParentPtr(ParentType, field_name, node);	43	return @fieldParentPtr(ParentType, field_name, node);
44	}	44	}
45	};	45	};
46		46
47	first: ?&Node,	47	first: ?*Node,
48	last: ?&Node,	48	last: ?*Node,
49	len: usize,	49	len: usize,
50		50
51	/// Initialize a linked list.	51	/// Initialize a linked list.
...	@@ -69,7 +69,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -69,7 +69,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
69	/// Arguments:	69	/// Arguments:
70	/// node: Pointer to a node in the list.	70	/// node: Pointer to a node in the list.
71	/// new_node: Pointer to the new node to insert.	71	/// new_node: Pointer to the new node to insert.
72	pub fn insertAfter(list: &Self, node: &Node, new_node: &Node) void {	72	pub fn insertAfter(list: Self, node: Node, new_node: *Node) void {
73	new_node.prev = node;	73	new_node.prev = node;
74	if (node.next) \|next_node\| {	74	if (node.next) \|next_node\| {
75	// Intermediate node.	75	// Intermediate node.
...	@@ -90,7 +90,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -90,7 +90,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
90	/// Arguments:	90	/// Arguments:
91	/// node: Pointer to a node in the list.	91	/// node: Pointer to a node in the list.
92	/// new_node: Pointer to the new node to insert.	92	/// new_node: Pointer to the new node to insert.
93	pub fn insertBefore(list: &Self, node: &Node, new_node: &Node) void {	93	pub fn insertBefore(list: Self, node: Node, new_node: *Node) void {
94	new_node.next = node;	94	new_node.next = node;
95	if (node.prev) \|prev_node\| {	95	if (node.prev) \|prev_node\| {
96	// Intermediate node.	96	// Intermediate node.
...	@@ -110,7 +110,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -110,7 +110,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
110	///	110	///
111	/// Arguments:	111	/// Arguments:
112	/// new_node: Pointer to the new node to insert.	112	/// new_node: Pointer to the new node to insert.
113	pub fn append(list: &Self, new_node: &Node) void {	113	pub fn append(list: Self, new_node: Node) void {
114	if (list.last) \|last\| {	114	if (list.last) \|last\| {
115	// Insert after last.	115	// Insert after last.
116	list.insertAfter(last, new_node);	116	list.insertAfter(last, new_node);
...	@@ -124,7 +124,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -124,7 +124,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
124	///	124	///
125	/// Arguments:	125	/// Arguments:
126	/// new_node: Pointer to the new node to insert.	126	/// new_node: Pointer to the new node to insert.
127	pub fn prepend(list: &Self, new_node: &Node) void {	127	pub fn prepend(list: Self, new_node: Node) void {
128	if (list.first) \|first\| {	128	if (list.first) \|first\| {
129	// Insert before first.	129	// Insert before first.
130	list.insertBefore(first, new_node);	130	list.insertBefore(first, new_node);
...	@@ -143,7 +143,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -143,7 +143,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
143	///	143	///
144	/// Arguments:	144	/// Arguments:
145	/// node: Pointer to the node to be removed.	145	/// node: Pointer to the node to be removed.
146	pub fn remove(list: &Self, node: &Node) void {	146	pub fn remove(list: Self, node: Node) void {
147	if (node.prev) \|prev_node\| {	147	if (node.prev) \|prev_node\| {
148	// Intermediate node.	148	// Intermediate node.
149	prev_node.next = node.next;	149	prev_node.next = node.next;
...	@@ -168,7 +168,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -168,7 +168,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
168	///	168	///
169	/// Returns:	169	/// Returns:
170	/// A pointer to the last node in the list.	170	/// A pointer to the last node in the list.
171	pub fn pop(list: &Self) ?&Node {	171	pub fn pop(list: Self) ?Node {
172	const last = list.last ?? return null;	172	const last = list.last ?? return null;
173	list.remove(last);	173	list.remove(last);
174	return last;	174	return last;
...	@@ -178,7 +178,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -178,7 +178,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
178	///	178	///
179	/// Returns:	179	/// Returns:
180	/// A pointer to the first node in the list.	180	/// A pointer to the first node in the list.
181	pub fn popFirst(list: &Self) ?&Node {	181	pub fn popFirst(list: Self) ?Node {
182	const first = list.first ?? return null;	182	const first = list.first ?? return null;
183	list.remove(first);	183	list.remove(first);
184	return first;	184	return first;
...	@@ -191,7 +191,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -191,7 +191,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
191	///	191	///
192	/// Returns:	192	/// Returns:
193	/// A pointer to the new node.	193	/// A pointer to the new node.
194	pub fn allocateNode(list: &Self, allocator: &Allocator) !&Node {	194	pub fn allocateNode(list: Self, allocator: Allocator) !*Node {
195	comptime assert(!isIntrusive());	195	comptime assert(!isIntrusive());
196	return allocator.create(Node);	196	return allocator.create(Node);
197	}	197	}
...	@@ -201,7 +201,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -201,7 +201,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
201	/// Arguments:	201	/// Arguments:
202	/// node: Pointer to the node to deallocate.	202	/// node: Pointer to the node to deallocate.
203	/// allocator: Dynamic memory allocator.	203	/// allocator: Dynamic memory allocator.
204	pub fn destroyNode(list: &Self, node: &Node, allocator: &Allocator) void {	204	pub fn destroyNode(list: Self, node: Node, allocator: *Allocator) void {
205	comptime assert(!isIntrusive());	205	comptime assert(!isIntrusive());
206	allocator.destroy(node);	206	allocator.destroy(node);
207	}	207	}
...	@@ -214,7 +214,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na	...	@@ -214,7 +214,7 @@ fn BaseLinkedList(comptime T: type, comptime ParentType: type, comptime field_na
214	///	214	///
215	/// Returns:	215	/// Returns:
216	/// A pointer to the new node.	216	/// A pointer to the new node.
217	pub fn createNode(list: &Self, data: &const T, allocator: &Allocator) !&Node {	217	pub fn createNode(list: Self, data: const T, allocator: Allocator) !Node {
218	comptime assert(!isIntrusive());	218	comptime assert(!isIntrusive());
219	var node = try list.allocateNode(allocator);	219	var node = try list.allocateNode(allocator);
220	node.* = Node.init(data);	220	node.* = Node.init(data);

std/macho.zig+19-17

 @@ -42,13 +42,13 @@ pub const Symbol = struct {
     name: []const u8,
     address: u64,
-    fn addressLessThan(lhs: &const Symbol, rhs: &const Symbol) bool {
+    fn addressLessThan(lhs: *const Symbol, rhs: *const Symbol) bool {
         return lhs.address < rhs.address;
     }
 };
 pub const SymbolTable = struct {
-    allocator: &mem.Allocator,
+    allocator: *mem.Allocator,
     symbols: []const Symbol,
     strings: []const u8,
 @@ -56,17 +56,17 @@ pub const SymbolTable = struct {
     // Ideally we'd use _mh_execute_header because it's always at 0x100000000
     // in the image but as it's located in a different section than executable
     // code, its displacement is different.
-    pub fn deinit(self: &SymbolTable) void {
+    pub fn deinit(self: *SymbolTable) void {
         self.allocator.free(self.symbols);
-        self.symbols = []const Symbol {};
+        self.symbols = []const Symbol{};
         self.allocator.free(self.strings);
-        self.strings = []const u8 {};
+        self.strings = []const u8{};
     }
-    pub fn search(self: &const SymbolTable, address: usize) ?&const Symbol {
+    pub fn search(self: *const SymbolTable, address: usize) ?*const Symbol {
         var min: usize = 0;
-        var max: usize = self.symbols.len - 1;  // Exclude sentinel.
+        var max: usize = self.symbols.len - 1; // Exclude sentinel.
         while (min < max) {
             const mid = min + (max - min) / 2;
             const curr = &self.symbols[mid];
 @@ -83,7 +83,7 @@ pub const SymbolTable = struct {
     }
 };
-pub fn loadSymbols(allocator: &mem.Allocator, in: &io.FileInStream) !SymbolTable {
+pub fn loadSymbols(allocator: *mem.Allocator, in: *io.FileInStream) !SymbolTable {
     var file = in.file;
     try file.seekTo(0);
 @@ -118,10 +118,11 @@ pub fn loadSymbols(allocator: &mem.Allocator, in: &io.FileInStream) !SymbolTable
     try in.stream.readNoEof(strings);
     var nsyms: usize = 0;
-    for (syms) |sym| if (isSymbol(sym)) nsyms += 1;
+    for (syms) |sym|
+        if (isSymbol(sym)) nsyms += 1;
     if (nsyms == 0) return error.MissingDebugInfo;
-    var symbols = try allocator.alloc(Symbol, nsyms + 1);  // Room for sentinel.
+    var symbols = try allocator.alloc(Symbol, nsyms + 1); // Room for sentinel.
     errdefer allocator.free(symbols);
     var pie_slide: usize = 0;
 @@ -132,7 +133,7 @@ pub fn loadSymbols(allocator: &mem.Allocator, in: &io.FileInStream) !SymbolTable
         const end = ??mem.indexOfScalarPos(u8, strings, start, 0);
         const name = strings[start..end];
         const address = sym.n_value;
-        symbols[nsym] = Symbol { .name = name, .address = address };
+        symbols[nsym] = Symbol{ .name = name, .address = address };
         nsym += 1;
         if (is_pie and mem.eql(u8, name, "_SymbolTable_deinit")) {
             pie_slide = @ptrToInt(SymbolTable.deinit) - address;
 @@ -145,26 +146,27 @@ pub fn loadSymbols(allocator: &mem.Allocator, in: &io.FileInStream) !SymbolTable
     // Insert the sentinel.  Since we don't know where the last function ends,
     // we arbitrarily limit it to the start address + 4 KB.
     const top = symbols[nsyms - 1].address + 4096;
-    symbols[nsyms] = Symbol { .name = "", .address = top };
+    symbols[nsyms] = Symbol{ .name = "", .address = top };
     if (pie_slide != 0) {
-        for (symbols) |*symbol| symbol.address += pie_slide;
+        for (symbols) |*symbol|
+            symbol.address += pie_slide;
     }
-    return SymbolTable {
+    return SymbolTable{
         .allocator = allocator,
         .symbols = symbols,
         .strings = strings,
     };
 }
-fn readNoEof(in: &io.FileInStream, comptime T: type, result: []T) !void {
+fn readNoEof(in: *io.FileInStream, comptime T: type, result: []T) !void {
     return in.stream.readNoEof(([]u8)(result));
 }
-fn readOneNoEof(in: &io.FileInStream, comptime T: type, result: &T) !void {
+fn readOneNoEof(in: *io.FileInStream, comptime T: type, result: *T) !void {
     return readNoEof(in, T, result[0..1]);
 }
-fn isSymbol(sym: &const Nlist64) bool {
+fn isSymbol(sym: *const Nlist64) bool {
     return sym.n_value != 0 and sym.n_desc == 0;
 }

std/math/atan.zig+15-17

 @@ -17,25 +17,25 @@ pub fn atan(x: var) @typeOf(x) {
 }
 fn atan32(x_: f32) f32 {
-    const atanhi = []const f32 {
+    const atanhi = []const f32{
         4.6364760399e-01, // atan(0.5)hi
         7.8539812565e-01, // atan(1.0)hi
         9.8279368877e-01, // atan(1.5)hi
         1.5707962513e+00, // atan(inf)hi
     };
-    const atanlo = []const f32 {
+    const atanlo = []const f32{
         5.0121582440e-09, // atan(0.5)lo
         3.7748947079e-08, // atan(1.0)lo
         3.4473217170e-08, // atan(1.5)lo
         7.5497894159e-08, // atan(inf)lo
     };
-    const aT = []const f32 {
+    const aT = []const f32{
         3.3333328366e-01,
-       -1.9999158382e-01,
+        -1.9999158382e-01,
         1.4253635705e-01,
-       -1.0648017377e-01,
+        -1.0648017377e-01,
         6.1687607318e-02,
     };
 @@ -80,8 +80,7 @@ fn atan32(x_: f32) f32 {
                 id = 1;
                 x = (x - 1.0) / (x + 1.0);
             }
-        }
+        } else {
-        else {
             // |x| < 2.4375
             if (ix < 0x401C0000) {
                 id = 2;
 @@ -109,31 +108,31 @@ fn atan32(x_: f32) f32 {
 }
 fn atan64(x_: f64) f64 {
-    const atanhi = []const f64 {
+    const atanhi = []const f64{
         4.63647609000806093515e-01, // atan(0.5)hi
         7.85398163397448278999e-01, // atan(1.0)hi
         9.82793723247329054082e-01, // atan(1.5)hi
         1.57079632679489655800e+00, // atan(inf)hi
     };
-    const atanlo = []const f64 {
+    const atanlo = []const f64{
         2.26987774529616870924e-17, // atan(0.5)lo
         3.06161699786838301793e-17, // atan(1.0)lo
         1.39033110312309984516e-17, // atan(1.5)lo
         6.12323399573676603587e-17, // atan(inf)lo
     };
-    const aT = []const f64 {
+    const aT = []const f64{
         3.33333333333329318027e-01,
-       -1.99999999998764832476e-01,
+        -1.99999999998764832476e-01,
         1.42857142725034663711e-01,
-       -1.11111104054623557880e-01,
+        -1.11111104054623557880e-01,
         9.09088713343650656196e-02,
-       -7.69187620504482999495e-02,
+        -7.69187620504482999495e-02,
         6.66107313738753120669e-02,
-       -5.83357013379057348645e-02,
+        -5.83357013379057348645e-02,
         4.97687799461593236017e-02,
-       -3.65315727442169155270e-02,
+        -3.65315727442169155270e-02,
         1.62858201153657823623e-02,
     };
 @@ -179,8 +178,7 @@ fn atan64(x_: f64) f64 {
                 id = 1;
                 x = (x - 1.0) / (x + 1.0);
             }
-        }
+        } else {
-        else {
             // |x| < 2.4375
             if (ix < 0x40038000) {
                 id = 2;

std/math/atan2.zig+2-4

...	@@ -53,8 +53,7 @@ fn atan2_32(y: f32, x: f32) f32 {	...	@@ -53,8 +53,7 @@ fn atan2_32(y: f32, x: f32) f32 {
53		53
54	if (iy == 0) {	54	if (iy == 0) {
55	switch (m) {	55	switch (m) {
56	0,	56	0, 1 => return y, // atan(+-0, +...)
57	1 => return y, // atan(+-0, +...)
58	2 => return pi, // atan(+0, -...)	57	2 => return pi, // atan(+0, -...)
59	3 => return -pi, // atan(-0, -...)	58	3 => return -pi, // atan(-0, -...)
60	else => unreachable,	59	else => unreachable,
...	@@ -144,8 +143,7 @@ fn atan2_64(y: f64, x: f64) f64 {	...	@@ -144,8 +143,7 @@ fn atan2_64(y: f64, x: f64) f64 {
144		143
145	if (iy \| ly == 0) {	144	if (iy \| ly == 0) {
146	switch (m) {	145	switch (m) {
147	0,	146	0, 1 => return y, // atan(+-0, +...)
148	1 => return y, // atan(+-0, +...)
149	2 => return pi, // atan(+0, -...)	147	2 => return pi, // atan(+0, -...)
150	3 => return -pi, // atan(-0, -...)	148	3 => return -pi, // atan(-0, -...)
151	else => unreachable,	149	else => unreachable,

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

...	@@ -29,7 +29,7 @@ fn redupif32(x: f32) f32 {	...	@@ -29,7 +29,7 @@ fn redupif32(x: f32) f32 {
29	return ((x - u * DP1) - u * DP2) - t * DP3;	29	return ((x - u * DP1) - u * DP2) - t * DP3;
30	}	30	}
31		31
32	fn atan32(z: &const Complex(f32)) Complex(f32) {	32	fn atan32(z: *const Complex(f32)) Complex(f32) {
33	const maxnum = 1.0e38;	33	const maxnum = 1.0e38;
34		34
35	const x = z.re;	35	const x = z.re;
...	@@ -78,7 +78,7 @@ fn redupif64(x: f64) f64 {	...	@@ -78,7 +78,7 @@ fn redupif64(x: f64) f64 {
78	return ((x - u * DP1) - u * DP2) - t * DP3;	78	return ((x - u * DP1) - u * DP2) - t * DP3;
79	}	79	}
80		80
81	fn atan64(z: &const Complex(f64)) Complex(f64) {	81	fn atan64(z: *const Complex(f64)) Complex(f64) {
82	const maxnum = 1.0e308;	82	const maxnum = 1.0e308;
83		83
84	const x = z.re;	84	const x = z.re;

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

...	@@ -15,7 +15,7 @@ pub fn cosh(z: var) Complex(@typeOf(z.re)) {	...	@@ -15,7 +15,7 @@ pub fn cosh(z: var) Complex(@typeOf(z.re)) {
15	};	15	};
16	}	16	}
17		17
18	fn cosh32(z: &const Complex(f32)) Complex(f32) {	18	fn cosh32(z: *const Complex(f32)) Complex(f32) {
19	const x = z.re;	19	const x = z.re;
20	const y = z.im;	20	const y = z.im;
21		21
...	@@ -78,7 +78,7 @@ fn cosh32(z: &const Complex(f32)) Complex(f32) {	...	@@ -78,7 +78,7 @@ fn cosh32(z: &const Complex(f32)) Complex(f32) {
78	return Complex(f32).new((x * x) * (y - y), (x + x) * (y - y));	78	return Complex(f32).new((x * x) * (y - y), (x + x) * (y - y));
79	}	79	}
80		80
81	fn cosh64(z: &const Complex(f64)) Complex(f64) {	81	fn cosh64(z: *const Complex(f64)) Complex(f64) {
82	const x = z.re;	82	const x = z.re;
83	const y = z.im;	83	const y = z.im;
84		84

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

...	@@ -16,7 +16,7 @@ pub fn exp(z: var) Complex(@typeOf(z.re)) {	...	@@ -16,7 +16,7 @@ pub fn exp(z: var) Complex(@typeOf(z.re)) {
16	};	16	};
17	}	17	}
18		18
19	fn exp32(z: &const Complex(f32)) Complex(f32) {	19	fn exp32(z: *const Complex(f32)) Complex(f32) {
20	@setFloatMode(this, @import("builtin").FloatMode.Strict);	20	@setFloatMode(this, @import("builtin").FloatMode.Strict);
21		21
22	const exp_overflow = 0x42b17218; // max_exp * ln2 ~= 88.72283955	22	const exp_overflow = 0x42b17218; // max_exp * ln2 ~= 88.72283955
...	@@ -63,7 +63,7 @@ fn exp32(z: &const Complex(f32)) Complex(f32) {	...	@@ -63,7 +63,7 @@ fn exp32(z: &const Complex(f32)) Complex(f32) {
63	}	63	}
64	}	64	}
65		65
66	fn exp64(z: &const Complex(f64)) Complex(f64) {	66	fn exp64(z: *const Complex(f64)) Complex(f64) {
67	const exp_overflow = 0x40862e42; // high bits of max_exp * ln2 ~= 710	67	const exp_overflow = 0x40862e42; // high bits of max_exp * ln2 ~= 710
68	const cexp_overflow = 0x4096b8e4; // (max_exp - min_denorm_exp) * ln2	68	const cexp_overflow = 0x4096b8e4; // (max_exp - min_denorm_exp) * ln2
69		69

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

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

std/math/complex/ldexp.zig+4-4

std/math/complex/pow.zig+1-1

...	@@ -4,7 +4,7 @@ const math = std.math;	...	@@ -4,7 +4,7 @@ const math = std.math;
4	const cmath = math.complex;	4	const cmath = math.complex;
5	const Complex = cmath.Complex;	5	const Complex = cmath.Complex;
6		6
7	pub fn pow(comptime T: type, z: &const T, c: &const T) T {	7	pub fn pow(comptime T: type, z: const T, c: const T) T {
8	const p = cmath.log(z);	8	const p = cmath.log(z);
9	const q = c.mul(p);	9	const q = c.mul(p);
10	return cmath.exp(q);	10	return cmath.exp(q);

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

...	@@ -15,7 +15,7 @@ pub fn sinh(z: var) Complex(@typeOf(z.re)) {	...	@@ -15,7 +15,7 @@ pub fn sinh(z: var) Complex(@typeOf(z.re)) {
15	};	15	};
16	}	16	}
17		17
18	fn sinh32(z: &const Complex(f32)) Complex(f32) {	18	fn sinh32(z: *const Complex(f32)) Complex(f32) {
19	const x = z.re;	19	const x = z.re;
20	const y = z.im;	20	const y = z.im;
21		21
...	@@ -78,7 +78,7 @@ fn sinh32(z: &const Complex(f32)) Complex(f32) {	...	@@ -78,7 +78,7 @@ fn sinh32(z: &const Complex(f32)) Complex(f32) {
78	return Complex(f32).new((x * x) * (y - y), (x + x) * (y - y));	78	return Complex(f32).new((x * x) * (y - y), (x + x) * (y - y));
79	}	79	}
80		80
81	fn sinh64(z: &const Complex(f64)) Complex(f64) {	81	fn sinh64(z: *const Complex(f64)) Complex(f64) {
82	const x = z.re;	82	const x = z.re;
83	const y = z.im;	83	const y = z.im;
84		84

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

...	@@ -15,7 +15,7 @@ pub fn sqrt(z: var) Complex(@typeOf(z.re)) {	...	@@ -15,7 +15,7 @@ pub fn sqrt(z: var) Complex(@typeOf(z.re)) {
15	};	15	};
16	}	16	}
17		17
18	fn sqrt32(z: &const Complex(f32)) Complex(f32) {	18	fn sqrt32(z: *const Complex(f32)) Complex(f32) {
19	const x = z.re;	19	const x = z.re;
20	const y = z.im;	20	const y = z.im;
21		21
...	@@ -57,7 +57,7 @@ fn sqrt32(z: &const Complex(f32)) Complex(f32) {	...	@@ -57,7 +57,7 @@ fn sqrt32(z: &const Complex(f32)) Complex(f32) {
57	}	57	}
58	}	58	}
59		59
60	fn sqrt64(z: &const Complex(f64)) Complex(f64) {	60	fn sqrt64(z: *const Complex(f64)) Complex(f64) {
61	// may encounter overflow for im,re >= DBL_MAX / (1 + sqrt(2))	61	// may encounter overflow for im,re >= DBL_MAX / (1 + sqrt(2))
62	const threshold = 0x1.a827999fcef32p+1022;	62	const threshold = 0x1.a827999fcef32p+1022;
63		63

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

...	@@ -13,7 +13,7 @@ pub fn tanh(z: var) Complex(@typeOf(z.re)) {	...	@@ -13,7 +13,7 @@ pub fn tanh(z: var) Complex(@typeOf(z.re)) {
13	};	13	};
14	}	14	}
15		15
16	fn tanh32(z: &const Complex(f32)) Complex(f32) {	16	fn tanh32(z: *const Complex(f32)) Complex(f32) {
17	const x = z.re;	17	const x = z.re;
18	const y = z.im;	18	const y = z.im;
19		19
...	@@ -51,7 +51,7 @@ fn tanh32(z: &const Complex(f32)) Complex(f32) {	...	@@ -51,7 +51,7 @@ fn tanh32(z: &const Complex(f32)) Complex(f32) {
51	return Complex(f32).new((beta * rho * s) / den, t / den);	51	return Complex(f32).new((beta * rho * s) / den, t / den);
52	}	52	}
53		53
54	fn tanh64(z: &const Complex(f64)) Complex(f64) {	54	fn tanh64(z: *const Complex(f64)) Complex(f64) {
55	const x = z.re;	55	const x = z.re;
56	const y = z.im;	56	const y = z.im;
57		57
...	@@ -98,7 +98,7 @@ test "complex.ctanh32" {	...	@@ -98,7 +98,7 @@ test "complex.ctanh32" {
98	const a = Complex(f32).new(5, 3);	98	const a = Complex(f32).new(5, 3);
99	const c = tanh(a);	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	debug.assert(math.approxEq(f32, c.im, -0.000025, epsilon));	102	debug.assert(math.approxEq(f32, c.im, -0.000025, epsilon));
103	}	103	}
104		104
...	@@ -106,6 +106,6 @@ test "complex.ctanh64" {	...	@@ -106,6 +106,6 @@ test "complex.ctanh64" {
106	const a = Complex(f64).new(5, 3);	106	const a = Complex(f64).new(5, 3);
107	const c = tanh(a);	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	debug.assert(math.approxEq(f64, c.im, -0.000025, epsilon));	110	debug.assert(math.approxEq(f64, c.im, -0.000025, epsilon));
111	}	111	}

std/math/exp.zig+13-17

 @@ -20,10 +20,10 @@ pub fn exp(x: var) @typeOf(x) {
 fn exp32(x_: f32) f32 {
     @setFloatMode(this, builtin.FloatMode.Strict);
-    const half = []f32 { 0.5, -0.5 };
+    const half = []f32{ 0.5, -0.5 };
     const ln2hi = 6.9314575195e-1;
     const ln2lo = 1.4286067653e-6;
-    const invln2  = 1.4426950216e+0;
+    const invln2 = 1.4426950216e+0;
     const P1 = 1.6666625440e-1;
     const P2 = -2.7667332906e-3;
 @@ -47,7 +47,7 @@ fn exp32(x_: f32) f32 {
             return x * 0x1.0p127;
         }
         if (sign != 0) {
-            math.forceEval(-0x1.0p-149 / x);   // overflow
+            math.forceEval(-0x1.0p-149 / x); // overflow
             // x <= -103.972084
             if (hx >= 0x42CFF1B5) {
                 return 0;
 @@ -64,8 +64,7 @@ fn exp32(x_: f32) f32 {
         // |x| > 1.5 * ln2
         if (hx > 0x3F851592) {
             k = i32(invln2 * x + half[usize(sign)]);
-        }
+        } else {
-        else {
             k = 1 - sign - sign;
         }
 @@ -79,8 +78,7 @@ fn exp32(x_: f32) f32 {
         k = 0;
         hi = x;
         lo = 0;
-    }
+    } else {
-    else {
         math.forceEval(0x1.0p127 + x); // inexact
         return 1 + x;
     }
 @@ -99,15 +97,15 @@ fn exp32(x_: f32) f32 {
 fn exp64(x_: f64) f64 {
     @setFloatMode(this, builtin.FloatMode.Strict);
-    const half = []const f64 { 0.5, -0.5 };
+    const half = []const f64{ 0.5, -0.5 };
     const ln2hi: f64 = 6.93147180369123816490e-01;
     const ln2lo: f64 = 1.90821492927058770002e-10;
     const invln2: f64 = 1.44269504088896338700e+00;
-    const P1: f64   =  1.66666666666666019037e-01;
+    const P1: f64 = 1.66666666666666019037e-01;
-    const P2: f64   = -2.77777777770155933842e-03;
+    const P2: f64 = -2.77777777770155933842e-03;
-    const P3: f64   =  6.61375632143793436117e-05;
+    const P3: f64 = 6.61375632143793436117e-05;
-    const P4: f64   = -1.65339022054652515390e-06;
+    const P4: f64 = -1.65339022054652515390e-06;
-    const P5: f64   =  4.13813679705723846039e-08;
+    const P5: f64 = 4.13813679705723846039e-08;
     var x = x_;
     var ux = @bitCast(u64, x);
 @@ -151,8 +149,7 @@ fn exp64(x_: f64) f64 {
         // |x| >= 1.5 * ln2
         if (hx > 0x3FF0A2B2) {
             k = i32(invln2 * x + half[usize(sign)]);
-        }
+        } else {
-        else {
             k = 1 - sign - sign;
         }
 @@ -166,8 +163,7 @@ fn exp64(x_: f64) f64 {
         k = 0;
         hi = x;
         lo = 0;
-    }
+    } else {
-    else {
         // inexact if x != 0
         // math.forceEval(0x1.0p1023 + x);
         return 1 + x;

std/math/exp2.zig+140-140

std/math/expm1.zig+11-13

 @@ -21,11 +21,11 @@ pub fn expm1(x: var) @typeOf(x) {
 fn expm1_32(x_: f32) f32 {
     @setFloatMode(this, builtin.FloatMode.Strict);
     const o_threshold: f32 = 8.8721679688e+01;
-    const ln2_hi: f32      = 6.9313812256e-01;
+    const ln2_hi: f32 = 6.9313812256e-01;
-    const ln2_lo: f32      = 9.0580006145e-06;
+    const ln2_lo: f32 = 9.0580006145e-06;
-    const invln2: f32      = 1.4426950216e+00;
+    const invln2: f32 = 1.4426950216e+00;
     const Q1: f32 = -3.3333212137e-2;
-    const Q2: f32 =  1.5807170421e-3;
+    const Q2: f32 = 1.5807170421e-3;
     var x = x_;
     const ux = @bitCast(u32, x);
 @@ -93,8 +93,7 @@ fn expm1_32(x_: f32) f32 {
             math.forceEval(x * x);
         }
         return x;
-    }
+    } else {
-    else {
         k = 0;
     }
 @@ -148,13 +147,13 @@ fn expm1_32(x_: f32) f32 {
 fn expm1_64(x_: f64) f64 {
     @setFloatMode(this, builtin.FloatMode.Strict);
     const o_threshold: f64 = 7.09782712893383973096e+02;
-    const ln2_hi: f64      = 6.93147180369123816490e-01;
+    const ln2_hi: f64 = 6.93147180369123816490e-01;
-    const ln2_lo: f64      = 1.90821492927058770002e-10;
+    const ln2_lo: f64 = 1.90821492927058770002e-10;
-    const invln2: f64      = 1.44269504088896338700e+00;
+    const invln2: f64 = 1.44269504088896338700e+00;
     const Q1: f64 = -3.33333333333331316428e-02;
-    const Q2: f64 =  1.58730158725481460165e-03;
+    const Q2: f64 = 1.58730158725481460165e-03;
     const Q3: f64 = -7.93650757867487942473e-05;
-    const Q4: f64 =  4.00821782732936239552e-06;
+    const Q4: f64 = 4.00821782732936239552e-06;
     const Q5: f64 = -2.01099218183624371326e-07;
     var x = x_;
 @@ -223,8 +222,7 @@ fn expm1_64(x_: f64) f64 {
             math.forceEval(f32(x));
         }
         return x;
-    }
+    } else {
-    else {
         k = 0;
     }

std/math/hypot.zig+1-1

...	@@ -52,7 +52,7 @@ fn hypot32(x: f32, y: f32) f32 {	...	@@ -52,7 +52,7 @@ fn hypot32(x: f32, y: f32) f32 {
52	return z * math.sqrt(f32(f64(x) * x + f64(y) * y));	52	return z * math.sqrt(f32(f64(x) * x + f64(y) * y));
53	}	53	}
54		54
55	fn sq(hi: &f64, lo: &f64, x: f64) void {	55	fn sq(hi: f64, lo: f64, x: f64) void {
56	const split: f64 = 0x1.0p27 + 1.0;	56	const split: f64 = 0x1.0p27 + 1.0;
57	const xc = x * split;	57	const xc = x * split;
58	const xh = x - xc + xc;	58	const xh = x - xc + xc;

std/math/index.zig+3-3

...	@@ -46,12 +46,12 @@ pub fn forceEval(value: var) void {	...	@@ -46,12 +46,12 @@ pub fn forceEval(value: var) void {
46	switch (T) {	46	switch (T) {
47	f32 => {	47	f32 => {
48	var x: f32 = undefined;	48	var x: f32 = undefined;
49	const p = @ptrCast(&volatile f32, &x);	49	const p = @ptrCast(*volatile f32, &x);
50	p.* = x;	50	p.* = x;
51	},	51	},
52	f64 => {	52	f64 => {
53	var x: f64 = undefined;	53	var x: f64 = undefined;
54	const p = @ptrCast(&volatile f64, &x);	54	const p = @ptrCast(*volatile f64, &x);
55	p.* = x;	55	p.* = x;
56	},	56	},
57	else => {	57	else => {
...	@@ -501,7 +501,7 @@ test "math.negateCast" {	...	@@ -501,7 +501,7 @@ test "math.negateCast" {
501	if (negateCast(u32(@maxValue(i32) + 10))) \|_\| unreachable else \|err\| assert(err == error.Overflow);	501	if (negateCast(u32(@maxValue(i32) + 10))) \|_\| unreachable else \|err\| assert(err == error.Overflow);
502	}	502	}
503		503
504	/// 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,
505	/// return an error.	505	/// return an error.
506	pub fn cast(comptime T: type, x: var) (error{Overflow}!T) {	506	pub fn cast(comptime T: type, x: var) (error{Overflow}!T) {
507	comptime assert(@typeId(T) == builtin.TypeId.Int); // must pass an integer	507	comptime assert(@typeId(T) == builtin.TypeId.Int); // must pass an integer

std/math/log1p.zig+1-2

...	@@ -143,8 +143,7 @@ fn log1p_64(x: f64) f64 {	...	@@ -143,8 +143,7 @@ fn log1p_64(x: f64) f64 {
143	c = 0;	143	c = 0;
144	f = x;	144	f = x;
145	}	145	}
146	}	146	} else if (hx >= 0x7FF00000) {
147	else if (hx >= 0x7FF00000) {
148	return x;	147	return x;
149	}	148	}
150		149

std/math/pow.zig-1

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

std/mem.zig+27-27

...	@@ -13,7 +13,7 @@ pub const Allocator = struct {	...	@@ -13,7 +13,7 @@ pub const Allocator = struct {
13	/// The returned newly allocated memory is undefined.	13	/// The returned newly allocated memory is undefined.
14	/// `alignment` is guaranteed to be >= 1	14	/// `alignment` is guaranteed to be >= 1
15	/// `alignment` is guaranteed to be a power of 2	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	/// If `new_byte_count > old_mem.len`:	18	/// If `new_byte_count > old_mem.len`:
19	/// * `old_mem.len` is the same as what was returned from allocFn or reallocFn.	19	/// * `old_mem.len` is the same as what was returned from allocFn or reallocFn.
...	@@ -26,22 +26,22 @@ pub const Allocator = struct {	...	@@ -26,22 +26,22 @@ pub const Allocator = struct {
26	/// The returned newly allocated memory is undefined.	26	/// The returned newly allocated memory is undefined.
27	/// `alignment` is guaranteed to be >= 1	27	/// `alignment` is guaranteed to be >= 1
28	/// `alignment` is guaranteed to be a power of 2	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	/// Guaranteed: `old_mem.len` is the same as what was returned from `allocFn` or `reallocFn`	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	fn create(self: &Allocator, comptime T: type) !&T {	34	fn create(self: Allocator, comptime T: type) !T {
35	if (@sizeOf(T) == 0) return &{};	35	if (@sizeOf(T) == 0) return *{};
36	const slice = try self.alloc(T, 1);	36	const slice = try self.alloc(T, 1);
37	return &slice[0];	37	return &slice[0];
38	}	38	}
39		39
40	// TODO once #733 is solved, this will replace create	40	// TODO once #733 is solved, this will replace create
41	fn construct(self: &Allocator, init: var) t: {	41	fn construct(self: *Allocator, init: var) t: {
42	// TODO this is a workaround for type getting parsed as Error!&const T	42	// TODO this is a workaround for type getting parsed as Error!&const T
43	const T = @typeOf(init).Child;	43	const T = @typeOf(init).Child;
44	break :t Error!&T;	44	break :t Error!*T;
45	} {	45	} {
46	const T = @typeOf(init).Child;	46	const T = @typeOf(init).Child;
47	if (@sizeOf(T) == 0) return &{};	47	if (@sizeOf(T) == 0) return &{};
...	@@ -51,17 +51,17 @@ pub const Allocator = struct {	...	@@ -51,17 +51,17 @@ pub const Allocator = struct {
51	return ptr;	51	return ptr;
52	}	52	}
53		53
54	fn destroy(self: &Allocator, ptr: var) void {	54	fn destroy(self: *Allocator, ptr: var) void {
55	self.free(ptr[0..1]);	55	self.free(ptr[0..1]);
56	}	56	}
57		57
58	fn alloc(self: &Allocator, comptime T: type, n: usize) ![]T {	58	fn alloc(self: *Allocator, comptime T: type, n: usize) ![]T {
59	return self.alignedAlloc(T, @alignOf(T), n);	59	return self.alignedAlloc(T, @alignOf(T), n);
60	}	60	}
61		61
62	fn alignedAlloc(self: &Allocator, comptime T: type, comptime alignment: u29, n: usize) ![]align(alignment) T {	62	fn alignedAlloc(self: *Allocator, comptime T: type, comptime alignment: u29, n: usize) ![]align(alignment) T {
63	if (n == 0) {	63	if (n == 0) {
64	return (&align(alignment) T)(undefined)[0..0];	64	return (*align(alignment) T)(undefined)[0..0];
65	}	65	}
66	const byte_count = math.mul(usize, @sizeOf(T), n) catch return Error.OutOfMemory;	66	const byte_count = math.mul(usize, @sizeOf(T), n) catch return Error.OutOfMemory;
67	const byte_slice = try self.allocFn(self, byte_count, alignment);	67	const byte_slice = try self.allocFn(self, byte_count, alignment);
...	@@ -73,17 +73,17 @@ pub const Allocator = struct {	...	@@ -73,17 +73,17 @@ pub const Allocator = struct {
73	return ([]align(alignment) T)(@alignCast(alignment, byte_slice));	73	return ([]align(alignment) T)(@alignCast(alignment, byte_slice));
74	}	74	}
75		75
76	fn realloc(self: &Allocator, comptime T: type, old_mem: []T, n: usize) ![]T {	76	fn realloc(self: *Allocator, comptime T: type, old_mem: []T, n: usize) ![]T {
77	return self.alignedRealloc(T, @alignOf(T), @alignCast(@alignOf(T), old_mem), n);	77	return self.alignedRealloc(T, @alignOf(T), @alignCast(@alignOf(T), old_mem), n);
78	}	78	}
79		79
80	fn alignedRealloc(self: &Allocator, comptime T: type, comptime alignment: u29, old_mem: []align(alignment) T, n: usize) ![]align(alignment) T {	80	fn alignedRealloc(self: *Allocator, comptime T: type, comptime alignment: u29, old_mem: []align(alignment) T, n: usize) ![]align(alignment) T {
81	if (old_mem.len == 0) {	81	if (old_mem.len == 0) {
82	return self.alloc(T, n);	82	return self.alloc(T, n);
83	}	83	}
84	if (n == 0) {	84	if (n == 0) {
85	self.free(old_mem);	85	self.free(old_mem);
86	return (&align(alignment) T)(undefined)[0..0];	86	return (*align(alignment) T)(undefined)[0..0];
87	}	87	}
88		88
89	const old_byte_slice = ([]u8)(old_mem);	89	const old_byte_slice = ([]u8)(old_mem);
...	@@ -102,11 +102,11 @@ pub const Allocator = struct {	...	@@ -102,11 +102,11 @@ pub const Allocator = struct {
102	/// Reallocate, but `n` must be less than or equal to `old_mem.len`.	102	/// Reallocate, but `n` must be less than or equal to `old_mem.len`.
103	/// Unlike `realloc`, this function cannot fail.	103	/// Unlike `realloc`, this function cannot fail.
104	/// Shrinking to 0 is the same as calling `free`.	104	/// Shrinking to 0 is the same as calling `free`.
105	fn shrink(self: &Allocator, comptime T: type, old_mem: []T, n: usize) []T {	105	fn shrink(self: *Allocator, comptime T: type, old_mem: []T, n: usize) []T {
106	return self.alignedShrink(T, @alignOf(T), @alignCast(@alignOf(T), old_mem), n);	106	return self.alignedShrink(T, @alignOf(T), @alignCast(@alignOf(T), old_mem), n);
107	}	107	}
108		108
109	fn alignedShrink(self: &Allocator, comptime T: type, comptime alignment: u29, old_mem: []align(alignment) T, n: usize) []align(alignment) T {	109	fn alignedShrink(self: *Allocator, comptime T: type, comptime alignment: u29, old_mem: []align(alignment) T, n: usize) []align(alignment) T {
110	if (n == 0) {	110	if (n == 0) {
111	self.free(old_mem);	111	self.free(old_mem);
112	return old_mem[0..0];	112	return old_mem[0..0];
...	@@ -123,10 +123,10 @@ pub const Allocator = struct {	...	@@ -123,10 +123,10 @@ pub const Allocator = struct {
123	return ([]align(alignment) T)(@alignCast(alignment, byte_slice));	123	return ([]align(alignment) T)(@alignCast(alignment, byte_slice));
124	}	124	}
125		125
126	fn free(self: &Allocator, memory: var) void {	126	fn free(self: *Allocator, memory: var) void {
127	const bytes = ([]const u8)(memory);	127	const bytes = ([]const u8)(memory);
128	if (bytes.len == 0) return;	128	if (bytes.len == 0) return;
129	const non_const_ptr = @intToPtr(&u8, @ptrToInt(bytes.ptr));	129	const non_const_ptr = @intToPtr(*u8, @ptrToInt(bytes.ptr));
130	self.freeFn(self, non_const_ptr[0..bytes.len]);	130	self.freeFn(self, non_const_ptr[0..bytes.len]);
131	}	131	}
132	};	132	};
...	@@ -186,7 +186,7 @@ pub fn allEqual(comptime T: type, slice: []const T, scalar: T) bool {	...	@@ -186,7 +186,7 @@ pub fn allEqual(comptime T: type, slice: []const T, scalar: T) bool {
186	}	186	}
187		187
188	/// Copies ::m to newly allocated memory. Caller is responsible to free it.	188	/// Copies ::m to newly allocated memory. Caller is responsible to free it.
189	pub fn dupe(allocator: &Allocator, comptime T: type, m: []const T) ![]T {	189	pub fn dupe(allocator: *Allocator, comptime T: type, m: []const T) ![]T {
190	const new_buf = try allocator.alloc(T, m.len);	190	const new_buf = try allocator.alloc(T, m.len);
191	copy(T, new_buf, m);	191	copy(T, new_buf, m);
192	return new_buf;	192	return new_buf;
...	@@ -282,7 +282,7 @@ pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?us	...	@@ -282,7 +282,7 @@ pub fn lastIndexOf(comptime T: type, haystack: []const T, needle: []const T) ?us
282		282
283	var i: usize = haystack.len - needle.len;	283	var i: usize = haystack.len - needle.len;
284	while (true) : (i -= 1) {	284	while (true) : (i -= 1) {
285	if (mem.eql(T, haystack[i..i + needle.len], needle)) return i;	285	if (mem.eql(T, haystack[i .. i + needle.len], needle)) return i;
286	if (i == 0) return null;	286	if (i == 0) return null;
287	}	287	}
288	}	288	}
...	@@ -294,7 +294,7 @@ pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, nee	...	@@ -294,7 +294,7 @@ pub fn indexOfPos(comptime T: type, haystack: []const T, start_index: usize, nee
294	var i: usize = start_index;	294	var i: usize = start_index;
295	const end = haystack.len - needle.len;	295	const end = haystack.len - needle.len;
296	while (i <= end) : (i += 1) {	296	while (i <= end) : (i += 1) {
297	if (eql(T, haystack[i..i + needle.len], needle)) return i;	297	if (eql(T, haystack[i .. i + needle.len], needle)) return i;
298	}	298	}
299	return null;	299	return null;
300	}	300	}
...	@@ -444,7 +444,7 @@ test "mem.startsWith" {	...	@@ -444,7 +444,7 @@ test "mem.startsWith" {
444	}	444	}
445		445
446	pub fn endsWith(comptime T: type, haystack: []const T, needle: []const T) bool {	446	pub fn endsWith(comptime T: type, haystack: []const T, needle: []const T) bool {
447	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);
448	}	448	}
449		449
450	test "mem.endsWith" {	450	test "mem.endsWith" {
...	@@ -457,7 +457,7 @@ pub const SplitIterator = struct {	...	@@ -457,7 +457,7 @@ pub const SplitIterator = struct {
457	split_bytes: []const u8,	457	split_bytes: []const u8,
458	index: usize,	458	index: usize,
459		459
460	pub fn next(self: &SplitIterator) ?[]const u8 {	460	pub fn next(self: *SplitIterator) ?[]const u8 {
461	// move to beginning of token	461	// move to beginning of token
462	while (self.index < self.buffer.len and self.isSplitByte(self.buffer[self.index])) : (self.index += 1) {}	462	while (self.index < self.buffer.len and self.isSplitByte(self.buffer[self.index])) : (self.index += 1) {}
463	const start = self.index;	463	const start = self.index;
...	@@ -473,14 +473,14 @@ pub const SplitIterator = struct {	...	@@ -473,14 +473,14 @@ pub const SplitIterator = struct {
473	}	473	}
474		474
475	/// Returns a slice of the remaining bytes. Does not affect iterator state.	475	/// Returns a slice of the remaining bytes. Does not affect iterator state.
476	pub fn rest(self: &const SplitIterator) []const u8 {	476	pub fn rest(self: *const SplitIterator) []const u8 {
477	// move to beginning of token	477	// move to beginning of token
478	var index: usize = self.index;	478	var index: usize = self.index;
479	while (index < self.buffer.len and self.isSplitByte(self.buffer[index])) : (index += 1) {}	479	while (index < self.buffer.len and self.isSplitByte(self.buffer[index])) : (index += 1) {}
480	return self.buffer[index..];	480	return self.buffer[index..];
481	}	481	}
482		482
483	fn isSplitByte(self: &const SplitIterator, byte: u8) bool {	483	fn isSplitByte(self: *const SplitIterator, byte: u8) bool {
484	for (self.split_bytes) \|split_byte\| {	484	for (self.split_bytes) \|split_byte\| {
485	if (byte == split_byte) {	485	if (byte == split_byte) {
486	return true;	486	return true;
...	@@ -492,7 +492,7 @@ pub const SplitIterator = struct {	...	@@ -492,7 +492,7 @@ pub const SplitIterator = struct {
492		492
493	/// Naively combines a series of strings with a separator.	493	/// Naively combines a series of strings with a separator.
494	/// Allocates memory for the result, which must be freed by the caller.	494	/// Allocates memory for the result, which must be freed by the caller.
495	pub fn join(allocator: &Allocator, sep: u8, strings: ...) ![]u8 {	495	pub fn join(allocator: *Allocator, sep: u8, strings: ...) ![]u8 {
496	comptime assert(strings.len >= 1);	496	comptime assert(strings.len >= 1);
497	var total_strings_len: usize = strings.len; // 1 sep per string	497	var total_strings_len: usize = strings.len; // 1 sep per string
498	{	498	{
...	@@ -649,7 +649,7 @@ test "mem.max" {	...	@@ -649,7 +649,7 @@ test "mem.max" {
649	assert(max(u8, "abcdefg") == 'g');	649	assert(max(u8, "abcdefg") == 'g');
650	}	650	}
651		651
652	pub fn swap(comptime T: type, a: &T, b: &T) void {	652	pub fn swap(comptime T: type, a: T, b: T) void {
653	const tmp = a.*;	653	const tmp = a.*;
654	a.* = b.*;	654	a.* = b.*;
655	b.* = tmp;	655	b.* = tmp;

std/net.zig+23-17

...	@@ -19,36 +19,42 @@ pub const Address = struct {	...	@@ -19,36 +19,42 @@ pub const Address = struct {
19	os_addr: OsAddress,	19	os_addr: OsAddress,
20		20
21	pub fn initIp4(ip4: u32, port: u16) Address {	21	pub fn initIp4(ip4: u32, port: u16) Address {
22	return Address{ .os_addr = posix.sockaddr{ .in = posix.sockaddr_in{	22	return Address{
23	.family = posix.AF_INET,	23	.os_addr = posix.sockaddr{
24	.port = std.mem.endianSwapIfLe(u16, port),	24	.in = posix.sockaddr_in{
25	.addr = ip4,	25	.family = posix.AF_INET,
26	.zero = []u8{0} ** 8,	26	.port = std.mem.endianSwapIfLe(u16, port),
27	} } };	27	.addr = ip4,
		28	.zero = []u8{0} ** 8,
		29	},
		30	},
		31	};
28	}	32	}
29		33
30	pub fn initIp6(ip6: &const Ip6Addr, port: u16) Address {	34	pub fn initIp6(ip6: *const Ip6Addr, port: u16) Address {
31	return Address{	35	return Address{
32	.family = posix.AF_INET6,	36	.family = posix.AF_INET6,
33	.os_addr = posix.sockaddr{ .in6 = posix.sockaddr_in6{	37	.os_addr = posix.sockaddr{
34	.family = posix.AF_INET6,	38	.in6 = posix.sockaddr_in6{
35	.port = std.mem.endianSwapIfLe(u16, port),	39	.family = posix.AF_INET6,
36	.flowinfo = 0,	40	.port = std.mem.endianSwapIfLe(u16, port),
37	.addr = ip6.addr,	41	.flowinfo = 0,
38	.scope_id = ip6.scope_id,	42	.addr = ip6.addr,
39	} },	43	.scope_id = ip6.scope_id,
		44	},
		45	},
40	};	46	};
41	}	47	}
42		48
43	pub fn initPosix(addr: &const posix.sockaddr) Address {	49	pub fn initPosix(addr: *const posix.sockaddr) Address {
44	return Address{ .os_addr = addr.* };	50	return Address{ .os_addr = addr.* };
45	}	51	}
46		52
47	pub fn format(self: &const Address, out_stream: var) !void {	53	pub fn format(self: *const Address, out_stream: var) !void {
48	switch (self.os_addr.in.family) {	54	switch (self.os_addr.in.family) {
49	posix.AF_INET => {	55	posix.AF_INET => {
50	const native_endian_port = std.mem.endianSwapIfLe(u16, self.os_addr.in.port);	56	const native_endian_port = std.mem.endianSwapIfLe(u16, self.os_addr.in.port);
51	const bytes = ([]const u8)((&self.os_addr.in.addr)[0..1]);	57	const bytes = ([]const u8)((*self.os_addr.in.addr)[0..1]);
52	try out_stream.print("{}.{}.{}.{}:{}", bytes[0], bytes[1], bytes[2], bytes[3], native_endian_port);	58	try out_stream.print("{}.{}.{}.{}:{}", bytes[0], bytes[1], bytes[2], bytes[3], native_endian_port);
53	},	59	},
54	posix.AF_INET6 => {	60	posix.AF_INET6 => {

std/os/child_process.zig+33-38

...	@@ -20,7 +20,7 @@ pub const ChildProcess = struct {	...	@@ -20,7 +20,7 @@ pub const ChildProcess = struct {
20	pub handle: if (is_windows) windows.HANDLE else void,	20	pub handle: if (is_windows) windows.HANDLE else void,
21	pub thread_handle: if (is_windows) windows.HANDLE else void,	21	pub thread_handle: if (is_windows) windows.HANDLE else void,
22		22
23	pub allocator: &mem.Allocator,	23	pub allocator: *mem.Allocator,
24		24
25	pub stdin: ?os.File,	25	pub stdin: ?os.File,
26	pub stdout: ?os.File,	26	pub stdout: ?os.File,
...	@@ -31,7 +31,7 @@ pub const ChildProcess = struct {	...	@@ -31,7 +31,7 @@ pub const ChildProcess = struct {
31	pub argv: []const []const u8,	31	pub argv: []const []const u8,
32		32
33	/// Leave as null to use the current env map using the supplied allocator.	33	/// Leave as null to use the current env map using the supplied allocator.
34	pub env_map: ?&const BufMap,	34	pub env_map: ?*const BufMap,
35		35
36	pub stdin_behavior: StdIo,	36	pub stdin_behavior: StdIo,
37	pub stdout_behavior: StdIo,	37	pub stdout_behavior: StdIo,
...	@@ -47,7 +47,7 @@ pub const ChildProcess = struct {	...	@@ -47,7 +47,7 @@ pub const ChildProcess = struct {
47	pub cwd: ?[]const u8,	47	pub cwd: ?[]const u8,
48		48
49	err_pipe: if (is_windows) void else [2]i32,	49	err_pipe: if (is_windows) void else [2]i32,
50	llnode: if (is_windows) void else LinkedList(&ChildProcess).Node,	50	llnode: if (is_windows) void else LinkedList(*ChildProcess).Node,
51		51
52	pub const SpawnError = error{	52	pub const SpawnError = error{
53	ProcessFdQuotaExceeded,	53	ProcessFdQuotaExceeded,
...	@@ -84,7 +84,7 @@ pub const ChildProcess = struct {	...	@@ -84,7 +84,7 @@ pub const ChildProcess = struct {
84		84
85	/// First argument in argv is the executable.	85	/// First argument in argv is the executable.
86	/// On success must call deinit.	86	/// On success must call deinit.
87	pub fn init(argv: []const []const u8, allocator: &mem.Allocator) !&ChildProcess {	87	pub fn init(argv: []const []const u8, allocator: mem.Allocator) !ChildProcess {
88	const child = try allocator.create(ChildProcess);	88	const child = try allocator.create(ChildProcess);
89	errdefer allocator.destroy(child);	89	errdefer allocator.destroy(child);
90		90
...	@@ -114,14 +114,14 @@ pub const ChildProcess = struct {	...	@@ -114,14 +114,14 @@ pub const ChildProcess = struct {
114	return child;	114	return child;
115	}	115	}
116		116
117	pub fn setUserName(self: &ChildProcess, name: []const u8) !void {	117	pub fn setUserName(self: *ChildProcess, name: []const u8) !void {
118	const user_info = try os.getUserInfo(name);	118	const user_info = try os.getUserInfo(name);
119	self.uid = user_info.uid;	119	self.uid = user_info.uid;
120	self.gid = user_info.gid;	120	self.gid = user_info.gid;
121	}	121	}
122		122
123	/// On success must call `kill` or `wait`.	123	/// On success must call `kill` or `wait`.
124	pub fn spawn(self: &ChildProcess) !void {	124	pub fn spawn(self: *ChildProcess) !void {
125	if (is_windows) {	125	if (is_windows) {
126	return self.spawnWindows();	126	return self.spawnWindows();
127	} else {	127	} else {
...	@@ -129,13 +129,13 @@ pub const ChildProcess = struct {	...	@@ -129,13 +129,13 @@ pub const ChildProcess = struct {
129	}	129	}
130	}	130	}
131		131
132	pub fn spawnAndWait(self: &ChildProcess) !Term {	132	pub fn spawnAndWait(self: *ChildProcess) !Term {
133	try self.spawn();	133	try self.spawn();
134	return self.wait();	134	return self.wait();
135	}	135	}
136		136
137	/// Forcibly terminates child process and then cleans up all resources.	137	/// Forcibly terminates child process and then cleans up all resources.
138	pub fn kill(self: &ChildProcess) !Term {	138	pub fn kill(self: *ChildProcess) !Term {
139	if (is_windows) {	139	if (is_windows) {
140	return self.killWindows(1);	140	return self.killWindows(1);
141	} else {	141	} else {
...	@@ -143,7 +143,7 @@ pub const ChildProcess = struct {	...	@@ -143,7 +143,7 @@ pub const ChildProcess = struct {
143	}	143	}
144	}	144	}
145		145
146	pub fn killWindows(self: &ChildProcess, exit_code: windows.UINT) !Term {	146	pub fn killWindows(self: *ChildProcess, exit_code: windows.UINT) !Term {
147	if (self.term) \|term\| {	147	if (self.term) \|term\| {
148	self.cleanupStreams();	148	self.cleanupStreams();
149	return term;	149	return term;
...	@@ -159,7 +159,7 @@ pub const ChildProcess = struct {	...	@@ -159,7 +159,7 @@ pub const ChildProcess = struct {
159	return ??self.term;	159	return ??self.term;
160	}	160	}
161		161
162	pub fn killPosix(self: &ChildProcess) !Term {	162	pub fn killPosix(self: *ChildProcess) !Term {
163	if (self.term) \|term\| {	163	if (self.term) \|term\| {
164	self.cleanupStreams();	164	self.cleanupStreams();
165	return term;	165	return term;
...	@@ -179,7 +179,7 @@ pub const ChildProcess = struct {	...	@@ -179,7 +179,7 @@ pub const ChildProcess = struct {
179	}	179	}
180		180
181	/// Blocks until child process terminates and then cleans up all resources.	181	/// Blocks until child process terminates and then cleans up all resources.
182	pub fn wait(self: &ChildProcess) !Term {	182	pub fn wait(self: *ChildProcess) !Term {
183	if (is_windows) {	183	if (is_windows) {
184	return self.waitWindows();	184	return self.waitWindows();
185	} else {	185	} else {
...	@@ -195,7 +195,7 @@ pub const ChildProcess = struct {	...	@@ -195,7 +195,7 @@ pub const ChildProcess = struct {
195		195
196	/// Spawns a child process, waits for it, collecting stdout and stderr, and then returns.	196	/// Spawns a child process, waits for it, collecting stdout and stderr, and then returns.
197	/// If it succeeds, the caller owns result.stdout and result.stderr memory.	197	/// If it succeeds, the caller owns result.stdout and result.stderr memory.
198	pub fn exec(allocator: &mem.Allocator, argv: []const []const u8, cwd: ?[]const u8, env_map: ?&const BufMap, max_output_size: usize) !ExecResult {	198	pub fn exec(allocator: mem.Allocator, argv: []const []const u8, cwd: ?[]const u8, env_map: ?const BufMap, max_output_size: usize) !ExecResult {
199	const child = try ChildProcess.init(argv, allocator);	199	const child = try ChildProcess.init(argv, allocator);
200	defer child.deinit();	200	defer child.deinit();
201		201
...	@@ -225,7 +225,7 @@ pub const ChildProcess = struct {	...	@@ -225,7 +225,7 @@ pub const ChildProcess = struct {
225	};	225	};
226	}	226	}
227		227
228	fn waitWindows(self: &ChildProcess) !Term {	228	fn waitWindows(self: *ChildProcess) !Term {
229	if (self.term) \|term\| {	229	if (self.term) \|term\| {
230	self.cleanupStreams();	230	self.cleanupStreams();
231	return term;	231	return term;
...	@@ -235,7 +235,7 @@ pub const ChildProcess = struct {	...	@@ -235,7 +235,7 @@ pub const ChildProcess = struct {
235	return ??self.term;	235	return ??self.term;
236	}	236	}
237		237
238	fn waitPosix(self: &ChildProcess) !Term {	238	fn waitPosix(self: *ChildProcess) !Term {
239	if (self.term) \|term\| {	239	if (self.term) \|term\| {
240	self.cleanupStreams();	240	self.cleanupStreams();
241	return term;	241	return term;
...	@@ -245,11 +245,11 @@ pub const ChildProcess = struct {	...	@@ -245,11 +245,11 @@ pub const ChildProcess = struct {
245	return ??self.term;	245	return ??self.term;
246	}	246	}
247		247
248	pub fn deinit(self: &ChildProcess) void {	248	pub fn deinit(self: *ChildProcess) void {
249	self.allocator.destroy(self);	249	self.allocator.destroy(self);
250	}	250	}
251		251
252	fn waitUnwrappedWindows(self: &ChildProcess) !void {	252	fn waitUnwrappedWindows(self: *ChildProcess) !void {
253	const result = os.windowsWaitSingle(self.handle, windows.INFINITE);	253	const result = os.windowsWaitSingle(self.handle, windows.INFINITE);
254		254
255	self.term = (SpawnError!Term)(x: {	255	self.term = (SpawnError!Term)(x: {
...	@@ -267,7 +267,7 @@ pub const ChildProcess = struct {	...	@@ -267,7 +267,7 @@ pub const ChildProcess = struct {
267	return result;	267	return result;
268	}	268	}
269		269
270	fn waitUnwrapped(self: &ChildProcess) void {	270	fn waitUnwrapped(self: *ChildProcess) void {
271	var status: i32 = undefined;	271	var status: i32 = undefined;
272	while (true) {	272	while (true) {
273	const err = posix.getErrno(posix.waitpid(self.pid, &status, 0));	273	const err = posix.getErrno(posix.waitpid(self.pid, &status, 0));
...	@@ -283,11 +283,11 @@ pub const ChildProcess = struct {	...	@@ -283,11 +283,11 @@ pub const ChildProcess = struct {
283	}	283	}
284	}	284	}
285		285
286	fn handleWaitResult(self: &ChildProcess, status: i32) void {	286	fn handleWaitResult(self: *ChildProcess, status: i32) void {
287	self.term = self.cleanupAfterWait(status);	287	self.term = self.cleanupAfterWait(status);
288	}	288	}
289		289
290	fn cleanupStreams(self: &ChildProcess) void {	290	fn cleanupStreams(self: *ChildProcess) void {
291	if (self.stdin) \|*stdin\| {	291	if (self.stdin) \|*stdin\| {
292	stdin.close();	292	stdin.close();
293	self.stdin = null;	293	self.stdin = null;
...	@@ -302,7 +302,7 @@ pub const ChildProcess = struct {	...	@@ -302,7 +302,7 @@ pub const ChildProcess = struct {
302	}	302	}
303	}	303	}
304		304
305	fn cleanupAfterWait(self: &ChildProcess, status: i32) !Term {	305	fn cleanupAfterWait(self: *ChildProcess, status: i32) !Term {
306	defer {	306	defer {
307	os.close(self.err_pipe[0]);	307	os.close(self.err_pipe[0]);
308	os.close(self.err_pipe[1]);	308	os.close(self.err_pipe[1]);
...	@@ -335,7 +335,7 @@ pub const ChildProcess = struct {	...	@@ -335,7 +335,7 @@ pub const ChildProcess = struct {
335	Term{ .Unknown = status };	335	Term{ .Unknown = status };
336	}	336	}
337		337
338	fn spawnPosix(self: &ChildProcess) !void {	338	fn spawnPosix(self: *ChildProcess) !void {
339	const stdin_pipe = if (self.stdin_behavior == StdIo.Pipe) try makePipe() else undefined;	339	const stdin_pipe = if (self.stdin_behavior == StdIo.Pipe) try makePipe() else undefined;
340	errdefer if (self.stdin_behavior == StdIo.Pipe) {	340	errdefer if (self.stdin_behavior == StdIo.Pipe) {
341	destroyPipe(stdin_pipe);	341	destroyPipe(stdin_pipe);
...	@@ -387,15 +387,12 @@ pub const ChildProcess = struct {	...	@@ -387,15 +387,12 @@ pub const ChildProcess = struct {
387	const pid_err = posix.getErrno(pid_result);	387	const pid_err = posix.getErrno(pid_result);
388	if (pid_err > 0) {	388	if (pid_err > 0) {
389	return switch (pid_err) {	389	return switch (pid_err) {
390	posix.EAGAIN,	390	posix.EAGAIN, posix.ENOMEM, posix.ENOSYS => error.SystemResources,
391	posix.ENOMEM,
392	posix.ENOSYS => error.SystemResources,
393	else => os.unexpectedErrorPosix(pid_err),	391	else => os.unexpectedErrorPosix(pid_err),
394	};	392	};
395	}	393	}
396	if (pid_result == 0) {	394	if (pid_result == 0) {
397	// we are the child	395	// we are the child
398
399	setUpChildIo(self.stdin_behavior, stdin_pipe[0], posix.STDIN_FILENO, dev_null_fd) catch \|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);
400	setUpChildIo(self.stdout_behavior, stdout_pipe[1], posix.STDOUT_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);
401	setUpChildIo(self.stderr_behavior, stderr_pipe[1], posix.STDERR_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);
...	@@ -435,7 +432,7 @@ pub const ChildProcess = struct {	...	@@ -435,7 +432,7 @@ pub const ChildProcess = struct {
435		432
436	self.pid = pid;	433	self.pid = pid;
437	self.err_pipe = err_pipe;	434	self.err_pipe = err_pipe;
438	self.llnode = LinkedList(&ChildProcess).Node.init(self);	435	self.llnode = LinkedList(*ChildProcess).Node.init(self);
439	self.term = null;	436	self.term = null;
440		437
441	if (self.stdin_behavior == StdIo.Pipe) {	438	if (self.stdin_behavior == StdIo.Pipe) {
...	@@ -449,7 +446,7 @@ pub const ChildProcess = struct {	...	@@ -449,7 +446,7 @@ pub const ChildProcess = struct {
449	}	446	}
450	}	447	}
451		448
452	fn spawnWindows(self: &ChildProcess) !void {	449	fn spawnWindows(self: *ChildProcess) !void {
453	const saAttr = windows.SECURITY_ATTRIBUTES{	450	const saAttr = windows.SECURITY_ATTRIBUTES{
454	.nLength = @sizeOf(windows.SECURITY_ATTRIBUTES),	451	.nLength = @sizeOf(windows.SECURITY_ATTRIBUTES),
455	.bInheritHandle = windows.TRUE,	452	.bInheritHandle = windows.TRUE,
...	@@ -642,12 +639,11 @@ pub const ChildProcess = struct {	...	@@ -642,12 +639,11 @@ pub const ChildProcess = struct {
642	}	639	}
643	};	640	};
644		641
645	fn windowsCreateProcess(app_name: &u8, cmd_line: &u8, envp_ptr: ?&u8, cwd_ptr: ?&u8, lpStartupInfo: &windows.STARTUPINFOA, lpProcessInformation: &windows.PROCESS_INFORMATION) !void {	642	fn windowsCreateProcess(app_name: []u8, cmd_line: []u8, envp_ptr: ?[]u8, cwd_ptr: ?[]u8, lpStartupInfo: windows.STARTUPINFOA, lpProcessInformation: windows.PROCESS_INFORMATION) !void {
646	if (windows.CreateProcessA(app_name, cmd_line, null, null, windows.TRUE, 0, @ptrCast(?&c_void, envp_ptr), cwd_ptr, lpStartupInfo, lpProcessInformation) == 0) {	643	if (windows.CreateProcessA(app_name, cmd_line, null, null, windows.TRUE, 0, @ptrCast(?*c_void, envp_ptr), cwd_ptr, lpStartupInfo, lpProcessInformation) == 0) {
647	const err = windows.GetLastError();	644	const err = windows.GetLastError();
648	return switch (err) {	645	return switch (err) {
649	windows.ERROR.FILE_NOT_FOUND,	646	windows.ERROR.FILE_NOT_FOUND, windows.ERROR.PATH_NOT_FOUND => error.FileNotFound,
650	windows.ERROR.PATH_NOT_FOUND => error.FileNotFound,
651	windows.ERROR.INVALID_PARAMETER => unreachable,	647	windows.ERROR.INVALID_PARAMETER => unreachable,
652	windows.ERROR.INVALID_NAME => error.InvalidName,	648	windows.ERROR.INVALID_NAME => error.InvalidName,
653	else => os.unexpectedErrorWindows(err),	649	else => os.unexpectedErrorWindows(err),
...	@@ -657,7 +653,7 @@ fn windowsCreateProcess(app_name: &u8, cmd_line: &u8, envp_ptr: ?&u8, cwd_ptr: ?	...	@@ -657,7 +653,7 @@ fn windowsCreateProcess(app_name: &u8, cmd_line: &u8, envp_ptr: ?&u8, cwd_ptr: ?
657		653
658	/// Caller must dealloc.	654	/// Caller must dealloc.
659	/// Guarantees a null byte at result[result.len].	655	/// Guarantees a null byte at result[result.len].
660	fn windowsCreateCommandLine(allocator: &mem.Allocator, argv: []const []const u8) ![]u8 {	656	fn windowsCreateCommandLine(allocator: *mem.Allocator, argv: []const []const u8) ![]u8 {
661	var buf = try Buffer.initSize(allocator, 0);	657	var buf = try Buffer.initSize(allocator, 0);
662	defer buf.deinit();	658	defer buf.deinit();
663		659
...	@@ -702,7 +698,7 @@ fn windowsDestroyPipe(rd: ?windows.HANDLE, wr: ?windows.HANDLE) void {	...	@@ -702,7 +698,7 @@ fn windowsDestroyPipe(rd: ?windows.HANDLE, wr: ?windows.HANDLE) void {
702	// a namespace field lookup	698	// a namespace field lookup
703	const SECURITY_ATTRIBUTES = windows.SECURITY_ATTRIBUTES;	699	const SECURITY_ATTRIBUTES = windows.SECURITY_ATTRIBUTES;
704		700
705	fn windowsMakePipe(rd: &windows.HANDLE, wr: &windows.HANDLE, sattr: &const SECURITY_ATTRIBUTES) !void {	701	fn windowsMakePipe(rd: windows.HANDLE, wr: windows.HANDLE, sattr: *const SECURITY_ATTRIBUTES) !void {
706	if (windows.CreatePipe(rd, wr, sattr, 0) == 0) {	702	if (windows.CreatePipe(rd, wr, sattr, 0) == 0) {
707	const err = windows.GetLastError();	703	const err = windows.GetLastError();
708	return switch (err) {	704	return switch (err) {
...	@@ -720,7 +716,7 @@ fn windowsSetHandleInfo(h: windows.HANDLE, mask: windows.DWORD, flags: windows.D	...	@@ -720,7 +716,7 @@ fn windowsSetHandleInfo(h: windows.HANDLE, mask: windows.DWORD, flags: windows.D
720	}	716	}
721	}	717	}
722		718
723	fn windowsMakePipeIn(rd: &?windows.HANDLE, wr: &?windows.HANDLE, sattr: &const SECURITY_ATTRIBUTES) !void {	719	fn windowsMakePipeIn(rd: ?windows.HANDLE, wr: ?windows.HANDLE, sattr: *const SECURITY_ATTRIBUTES) !void {
724	var rd_h: windows.HANDLE = undefined;	720	var rd_h: windows.HANDLE = undefined;
725	var wr_h: windows.HANDLE = undefined;	721	var wr_h: windows.HANDLE = undefined;
726	try windowsMakePipe(&rd_h, &wr_h, sattr);	722	try windowsMakePipe(&rd_h, &wr_h, sattr);
...	@@ -730,7 +726,7 @@ fn windowsMakePipeIn(rd: &?windows.HANDLE, wr: &?windows.HANDLE, sattr: &const S	...	@@ -730,7 +726,7 @@ fn windowsMakePipeIn(rd: &?windows.HANDLE, wr: &?windows.HANDLE, sattr: &const S
730	wr.* = wr_h;	726	wr.* = wr_h;
731	}	727	}
732		728
733	fn windowsMakePipeOut(rd: &?windows.HANDLE, wr: &?windows.HANDLE, sattr: &const SECURITY_ATTRIBUTES) !void {	729	fn windowsMakePipeOut(rd: ?windows.HANDLE, wr: ?windows.HANDLE, sattr: *const SECURITY_ATTRIBUTES) !void {
734	var rd_h: windows.HANDLE = undefined;	730	var rd_h: windows.HANDLE = undefined;
735	var wr_h: windows.HANDLE = undefined;	731	var wr_h: windows.HANDLE = undefined;
736	try windowsMakePipe(&rd_h, &wr_h, sattr);	732	try windowsMakePipe(&rd_h, &wr_h, sattr);
...	@@ -745,15 +741,14 @@ fn makePipe() ![2]i32 {	...	@@ -745,15 +741,14 @@ fn makePipe() ![2]i32 {
745	const err = posix.getErrno(posix.pipe(&fds));	741	const err = posix.getErrno(posix.pipe(&fds));
746	if (err > 0) {	742	if (err > 0) {
747	return switch (err) {	743	return switch (err) {
748	posix.EMFILE,	744	posix.EMFILE, posix.ENFILE => error.SystemResources,
749	posix.ENFILE => error.SystemResources,
750	else => os.unexpectedErrorPosix(err),	745	else => os.unexpectedErrorPosix(err),
751	};	746	};
752	}	747	}
753	return fds;	748	return fds;
754	}	749	}
755		750
756	fn destroyPipe(pipe: &const [2]i32) void {	751	fn destroyPipe(pipe: *const [2]i32) void {
757	os.close((pipe.*)[0]);	752	os.close((pipe.*)[0]);
758	os.close((pipe.*)[1]);	753	os.close((pipe.*)[1]);
759	}	754	}

std/os/darwin.zig+102-35

 @@ -12,52 +12,71 @@ pub const STDERR_FILENO = 2;
 /// [MC2] no permissions
 pub const PROT_NONE = 0x00;
 /// [MC2] pages can be read
 pub const PROT_READ = 0x01;
 /// [MC2] pages can be written
 pub const PROT_WRITE = 0x02;
 /// [MC2] pages can be executed
 pub const PROT_EXEC = 0x04;
 /// allocated from memory, swap space
 pub const MAP_ANONYMOUS = 0x1000;
 /// map from file (default)
 pub const MAP_FILE = 0x0000;
 /// interpret addr exactly
 pub const MAP_FIXED = 0x0010;
 /// region may contain semaphores
 pub const MAP_HASSEMAPHORE = 0x0200;
 /// changes are private
 pub const MAP_PRIVATE = 0x0002;
 /// share changes
 pub const MAP_SHARED = 0x0001;
 /// don't cache pages for this mapping
 pub const MAP_NOCACHE = 0x0400;
 /// don't reserve needed swap area
 pub const MAP_NORESERVE = 0x0040;
 pub const MAP_FAILED = @maxValue(usize);
 /// [XSI] no hang in wait/no child to reap
 pub const WNOHANG = 0x00000001;
 /// [XSI] notify on stop, untraced child
 pub const WUNTRACED = 0x00000002;
 /// take signal on signal stack
 pub const SA_ONSTACK = 0x0001;
 /// restart system on signal return
 pub const SA_RESTART = 0x0002;
 /// reset to SIG_DFL when taking signal
 pub const SA_RESETHAND = 0x0004;
 /// do not generate SIGCHLD on child stop
 pub const SA_NOCLDSTOP = 0x0008;
 /// don't mask the signal we're delivering
 pub const SA_NODEFER = 0x0010;
 /// don't keep zombies around
 pub const SA_NOCLDWAIT = 0x0020;
 /// signal handler with SA_SIGINFO args
 pub const SA_SIGINFO = 0x0040;
 /// do not bounce off kernel's sigtramp
 pub const SA_USERTRAMP = 0x0100;
 /// signal handler with SA_SIGINFO args with 64bit   regs information
 pub const SA_64REGSET = 0x0200;
 @@ -71,30 +90,43 @@ pub const R_OK = 4;
 /// open for reading only
 pub const O_RDONLY = 0x0000;
 /// open for writing only
 pub const O_WRONLY = 0x0001;
 /// open for reading and writing
 pub const O_RDWR = 0x0002;
 /// do not block on open or for data to become available
 pub const O_NONBLOCK = 0x0004;
 /// append on each write
 pub const O_APPEND = 0x0008;
 /// create file if it does not exist
 pub const O_CREAT = 0x0200;
 /// truncate size to 0
 pub const O_TRUNC = 0x0400;
 /// error if O_CREAT and the file exists
 pub const O_EXCL = 0x0800;
 /// atomically obtain a shared lock
 pub const O_SHLOCK = 0x0010;
 /// atomically obtain an exclusive lock
 pub const O_EXLOCK = 0x0020;
 /// do not follow symlinks
 pub const O_NOFOLLOW = 0x0100;
 /// allow open of symlinks
 pub const O_SYMLINK = 0x200000;
 /// descriptor requested for event notifications only
 pub const O_EVTONLY = 0x8000;
 /// mark as close-on-exec
 pub const O_CLOEXEC = 0x1000000;
 @@ -126,75 +158,109 @@ pub const DT_WHT = 14;
 /// block specified signal set
 pub const SIG_BLOCK = 1;
 /// unblock specified signal set
 pub const SIG_UNBLOCK = 2;
 /// set specified signal set
 pub const SIG_SETMASK = 3;
 /// hangup
 pub const SIGHUP = 1;
 /// interrupt
 pub const SIGINT = 2;
 /// quit
 pub const SIGQUIT = 3;
 /// illegal instruction (not reset when caught)
 pub const SIGILL = 4;
 /// trace trap (not reset when caught)
 pub const SIGTRAP = 5;
 /// abort()
 pub const SIGABRT = 6;
 /// pollable event ([XSR] generated, not supported)
 pub const SIGPOLL = 7;
 /// compatibility
 pub const SIGIOT = SIGABRT;
 /// EMT instruction
 pub const SIGEMT = 7;
 /// floating point exception
 pub const SIGFPE = 8;
 /// kill (cannot be caught or ignored)
 pub const SIGKILL = 9;
 /// bus error
 pub const SIGBUS = 10;
 /// segmentation violation
 pub const SIGSEGV = 11;
 /// bad argument to system call
 pub const SIGSYS = 12;
 /// write on a pipe with no one to read it
 pub const SIGPIPE = 13;
 /// alarm clock
 pub const SIGALRM = 14;
 /// software termination signal from kill
 pub const SIGTERM = 15;
 /// urgent condition on IO channel
 pub const SIGURG = 16;
 /// sendable stop signal not from tty
 pub const SIGSTOP = 17;
 /// stop signal from tty
 pub const SIGTSTP = 18;
 /// continue a stopped process
 pub const SIGCONT = 19;
 /// to parent on child stop or exit
 pub const SIGCHLD = 20;
 /// to readers pgrp upon background tty read
 pub const SIGTTIN = 21;
 /// like TTIN for output if (tp->t_local&LTOSTOP)
 pub const SIGTTOU = 22;
 /// input/output possible signal
 pub const SIGIO = 23;
 /// exceeded CPU time limit
 pub const SIGXCPU = 24;
 /// exceeded file size limit
 pub const SIGXFSZ = 25;
 /// virtual time alarm
 pub const SIGVTALRM = 26;
 /// profiling time alarm
 pub const SIGPROF = 27;
 /// window size changes
 pub const SIGWINCH = 28;
 /// information request
 pub const SIGINFO = 29;
 /// user defined signal 1
 pub const SIGUSR1 = 30;
 /// user defined signal 2
 pub const SIGUSR2 = 31;
 @@ -243,7 +309,7 @@ pub fn isatty(fd: i32) bool {
     return c.isatty(fd) != 0;
 }
-pub fn fstat(fd: i32, buf: &c.Stat) usize {
+pub fn fstat(fd: i32, buf: *c.Stat) usize {
     return errnoWrap(c.@"fstat$INODE64"(fd, buf));
 }
 @@ -251,7 +317,8 @@ pub fn lseek(fd: i32, offset: isize, whence: c_int) usize {
     return errnoWrap(c.lseek(fd, offset, whence));
 }
-pub fn open(path: &const u8, flags: u32, mode: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265 on the whole file
+pub fn open(path: [*]const u8, flags: u32, mode: usize) usize {
     return errnoWrap(c.open(path, @bitCast(c_int, flags), mode));
 }
 @@ -259,79 +326,79 @@ pub fn raise(sig: i32) usize {
     return errnoWrap(c.raise(sig));
 }
-pub fn read(fd: i32, buf: &u8, nbyte: usize) usize {
+pub fn read(fd: i32, buf: [*]u8, nbyte: usize) usize {
-    return errnoWrap(c.read(fd, @ptrCast(&c_void, buf), nbyte));
+    return errnoWrap(c.read(fd, @ptrCast([*]c_void, buf), nbyte));
 }
-pub fn stat(noalias path: &const u8, noalias buf: &stat) usize {
+pub fn stat(noalias path: [*]const u8, noalias buf: *stat) usize {
     return errnoWrap(c.stat(path, buf));
 }
-pub fn write(fd: i32, buf: &const u8, nbyte: usize) usize {
+pub fn write(fd: i32, buf: [*]const u8, nbyte: usize) usize {
-    return errnoWrap(c.write(fd, @ptrCast(&const c_void, buf), nbyte));
+    return errnoWrap(c.write(fd, @ptrCast([*]const c_void, buf), nbyte));
 }
-pub fn mmap(address: ?&u8, length: usize, prot: usize, flags: u32, fd: i32, offset: isize) usize {
+pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, offset: isize) usize {
-    const ptr_result = c.mmap(@ptrCast(&c_void, address), length, @bitCast(c_int, c_uint(prot)), @bitCast(c_int, c_uint(flags)), fd, offset);
+    const ptr_result = c.mmap(@ptrCast([*]c_void, address), length, @bitCast(c_int, c_uint(prot)), @bitCast(c_int, c_uint(flags)), fd, offset);
     const isize_result = @bitCast(isize, @ptrToInt(ptr_result));
     return errnoWrap(isize_result);
 }
 pub fn munmap(address: usize, length: usize) usize {
-    return errnoWrap(c.munmap(@intToPtr(&c_void, address), length));
+    return errnoWrap(c.munmap(@intToPtr([*]c_void, address), length));
 }
-pub fn unlink(path: &const u8) usize {
+pub fn unlink(path: [*]const u8) usize {
     return errnoWrap(c.unlink(path));
 }
-pub fn getcwd(buf: &u8, size: usize) usize {
+pub fn getcwd(buf: [*]u8, size: usize) usize {
     return if (c.getcwd(buf, size) == null) @bitCast(usize, -isize(c._errno().*)) else 0;
 }
-pub fn waitpid(pid: i32, status: &i32, options: u32) usize {
+pub fn waitpid(pid: i32, status: *i32, options: u32) usize {
     comptime assert(i32.bit_count == c_int.bit_count);
-    return errnoWrap(c.waitpid(pid, @ptrCast(&c_int, status), @bitCast(c_int, options)));
+    return errnoWrap(c.waitpid(pid, @ptrCast(*c_int, status), @bitCast(c_int, options)));
 }
 pub fn fork() usize {
     return errnoWrap(c.fork());
 }
-pub fn access(path: &const u8, mode: u32) usize {
+pub fn access(path: [*]const u8, mode: u32) usize {
     return errnoWrap(c.access(path, mode));
 }
-pub fn pipe(fds: &[2]i32) usize {
+pub fn pipe(fds: *[2]i32) usize {
     comptime assert(i32.bit_count == c_int.bit_count);
-    return errnoWrap(c.pipe(@ptrCast(&c_int, fds)));
+    return errnoWrap(c.pipe(@ptrCast(*[2]c_int, fds)));
 }
-pub fn getdirentries64(fd: i32, buf_ptr: &u8, buf_len: usize, basep: &i64) usize {
+pub fn getdirentries64(fd: i32, buf_ptr: [*]u8, buf_len: usize, basep: *i64) usize {
     return errnoWrap(@bitCast(isize, c.__getdirentries64(fd, buf_ptr, buf_len, basep)));
 }
-pub fn mkdir(path: &const u8, mode: u32) usize {
+pub fn mkdir(path: [*]const u8, mode: u32) usize {
     return errnoWrap(c.mkdir(path, mode));
 }
-pub fn symlink(existing: &const u8, new: &const u8) usize {
+pub fn symlink(existing: [*]const u8, new: [*]const u8) usize {
     return errnoWrap(c.symlink(existing, new));
 }
-pub fn rename(old: &const u8, new: &const u8) usize {
+pub fn rename(old: [*]const u8, new: [*]const u8) usize {
     return errnoWrap(c.rename(old, new));
 }
-pub fn rmdir(path: &const u8) usize {
+pub fn rmdir(path: [*]const u8) usize {
     return errnoWrap(c.rmdir(path));
 }
-pub fn chdir(path: &const u8) usize {
+pub fn chdir(path: [*]const u8) usize {
     return errnoWrap(c.chdir(path));
 }
-pub fn execve(path: &const u8, argv: &const ?&const u8, envp: &const ?&const u8) usize {
+pub fn execve(path: [*]const u8, argv: [*]const ?[*]const u8, envp: [*]const ?[*]const u8) usize {
     return errnoWrap(c.execve(path, argv, envp));
 }
 @@ -339,19 +406,19 @@ pub fn dup2(old: i32, new: i32) usize {
     return errnoWrap(c.dup2(old, new));
 }
-pub fn readlink(noalias path: &const u8, noalias buf_ptr: &u8, buf_len: usize) usize {
+pub fn readlink(noalias path: [*]const u8, noalias buf_ptr: [*]u8, buf_len: usize) usize {
     return errnoWrap(c.readlink(path, buf_ptr, buf_len));
 }
-pub fn gettimeofday(tv: ?&timeval, tz: ?&timezone) usize {
+pub fn gettimeofday(tv: ?*timeval, tz: ?*timezone) usize {
     return errnoWrap(c.gettimeofday(tv, tz));
 }
-pub fn nanosleep(req: &const timespec, rem: ?&timespec) usize {
+pub fn nanosleep(req: *const timespec, rem: ?*timespec) usize {
     return errnoWrap(c.nanosleep(req, rem));
 }
-pub fn realpath(noalias filename: &const u8, noalias resolved_name: &u8) usize {
+pub fn realpath(noalias filename: [*]const u8, noalias resolved_name: [*]u8) usize {
     return if (c.realpath(filename, resolved_name) == null) @bitCast(usize, -isize(c._errno().*)) else 0;
 }
 @@ -363,26 +430,26 @@ pub fn setregid(rgid: u32, egid: u32) usize {
     return errnoWrap(c.setregid(rgid, egid));
 }
-pub fn sigprocmask(flags: u32, noalias set: &const sigset_t, noalias oldset: ?&sigset_t) usize {
+pub fn sigprocmask(flags: u32, noalias set: *const sigset_t, noalias oldset: ?*sigset_t) usize {
     return errnoWrap(c.sigprocmask(@bitCast(c_int, flags), set, oldset));
 }
-pub fn sigaction(sig: u5, noalias act: &const Sigaction, noalias oact: ?&Sigaction) usize {
+pub fn sigaction(sig: u5, noalias act: *const Sigaction, noalias oact: ?*Sigaction) usize {
     assert(sig != SIGKILL);
     assert(sig != SIGSTOP);
     var cact = c.Sigaction{
-        .handler = @ptrCast(extern fn(c_int) void, act.handler),
+        .handler = @ptrCast(extern fn (c_int) void, act.handler),
         .sa_flags = @bitCast(c_int, act.flags),
         .sa_mask = act.mask,
     };
     var coact: c.Sigaction = undefined;
-    const result = errnoWrap(c.sigaction(sig, &cact, &coact));
+    const result = errnoWrap(c.sigaction(sig, *cact, *coact));
     if (result != 0) {
         return result;
     }
     if (oact) |old| {
         old.* = Sigaction{
-            .handler = @ptrCast(extern fn(i32) void, coact.handler),
+            .handler = @ptrCast(extern fn (i32) void, coact.handler),
             .flags = @bitCast(u32, coact.sa_flags),
             .mask = coact.sa_mask,
         };
 @@ -402,12 +469,12 @@ pub const sockaddr = c.sockaddr;
 /// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
 pub const Sigaction = struct {
-    handler: extern fn(i32) void,
+    handler: extern fn (i32) void,
     mask: sigset_t,
     flags: u32,
 };
-pub fn sigaddset(set: &sigset_t, signo: u5) void {
+pub fn sigaddset(set: *sigset_t, signo: u5) void {
     set.* |= u32(1) << (signo - 1);
 }

std/os/darwin_errno.zig+294-108

...	@@ -1,142 +1,328 @@	...	@@ -1,142 +1,328 @@
		1	/// Operation not permitted
		2	pub const EPERM = 1;
1		3
2	pub const EPERM = 1; /// Operation not permitted	4	/// No such file or directory
3	pub const ENOENT = 2; /// No such file or directory	5	pub const ENOENT = 2;
4	pub const ESRCH = 3; /// No such process	6
5	pub const EINTR = 4; /// Interrupted system call	7	/// No such process
6	pub const EIO = 5; /// Input/output error	8	pub const ESRCH = 3;
7	pub const ENXIO = 6; /// Device not configured	9
8	pub const E2BIG = 7; /// Argument list too long	10	/// Interrupted system call
9	pub const ENOEXEC = 8; /// Exec format error	11	pub const EINTR = 4;
10	pub const EBADF = 9; /// Bad file descriptor	12
11	pub const ECHILD = 10; /// No child processes	13	/// Input/output error
12	pub const EDEADLK = 11; /// Resource deadlock avoided	14	pub const EIO = 5;
13		15
14	pub const ENOMEM = 12; /// Cannot allocate memory	16	/// Device not configured
15	pub const EACCES = 13; /// Permission denied	17	pub const ENXIO = 6;
16	pub const EFAULT = 14; /// Bad address	18
17	pub const ENOTBLK = 15; /// Block device required	19	/// Argument list too long
18	pub const EBUSY = 16; /// Device / Resource busy	20	pub const E2BIG = 7;
19	pub const EEXIST = 17; /// File exists	21
20	pub const EXDEV = 18; /// Cross-device link	22	/// Exec format error
21	pub const ENODEV = 19; /// Operation not supported by device	23	pub const ENOEXEC = 8;
22	pub const ENOTDIR = 20; /// Not a directory	24
23	pub const EISDIR = 21; /// Is a directory	25	/// Bad file descriptor
24	pub const EINVAL = 22; /// Invalid argument	26	pub const EBADF = 9;
25	pub const ENFILE = 23; /// Too many open files in system	27
26	pub const EMFILE = 24; /// Too many open files	28	/// No child processes
27	pub const ENOTTY = 25; /// Inappropriate ioctl for device	29	pub const ECHILD = 10;
28	pub const ETXTBSY = 26; /// Text file busy	30
29	pub const EFBIG = 27; /// File too large	31	/// Resource deadlock avoided
30	pub const ENOSPC = 28; /// No space left on device	32	pub const EDEADLK = 11;
31	pub const ESPIPE = 29; /// Illegal seek	33
32	pub const EROFS = 30; /// Read-only file system	34	/// Cannot allocate memory
33	pub const EMLINK = 31; /// Too many links	35	pub const ENOMEM = 12;
34	pub const EPIPE = 32; /// Broken pipe	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	// math software	95	// math software
37	pub const EDOM = 33; /// Numerical argument out of domain	96	pub const EPIPE = 32;
38	pub const ERANGE = 34; /// Result too large	97
		98	/// Numerical argument out of domain
		99	pub const EDOM = 33;
		100	/// Result too large
39		101
40	// non-blocking and interrupt i/o	102	// non-blocking and interrupt i/o
41	pub const EAGAIN = 35; /// Resource temporarily unavailable	103	pub const ERANGE = 34;
42	pub const EWOULDBLOCK = EAGAIN; /// Operation would block	104
43	pub const EINPROGRESS = 36; /// Operation now in progress	105	/// Resource temporarily unavailable
44	pub const EALREADY = 37; /// Operation already in progress	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	// ipc/network software -- argument errors	115	// ipc/network software -- argument errors
47	pub const ENOTSOCK = 38; /// Socket operation on non-socket	116	pub const EALREADY = 37;
48	pub const EDESTADDRREQ = 39; /// Destination address required	117
49	pub const EMSGSIZE = 40; /// Message too long	118	/// Socket operation on non-socket
50	pub const EPROTOTYPE = 41; /// Protocol wrong type for socket	119	pub const ENOTSOCK = 38;
51	pub const ENOPROTOOPT = 42; /// Protocol not available	120
52	pub const EPROTONOSUPPORT = 43; /// Protocol not supported	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	145	/// Address family not supported by protocol family
59	pub const EAFNOSUPPORT = 47; /// Address family not supported by protocol family	146	pub const EAFNOSUPPORT = 47;
60	pub const EADDRINUSE = 48; /// Address already in use	147
61	pub const EADDRNOTAVAIL = 49; /// Can't assign requested address	148	/// Address already in use
		149	pub const EADDRINUSE = 48;
		150	/// Can't assign requested address
62		151
63	// ipc/network software -- operational errors	152	// ipc/network software -- operational errors
64	pub const ENETDOWN = 50; /// Network is down	153	pub const EADDRNOTAVAIL = 49;
65	pub const ENETUNREACH = 51; /// Network is unreachable	154
66	pub const ENETRESET = 52; /// Network dropped connection on reset	155	/// Network is down
67	pub const ECONNABORTED = 53; /// Software caused connection abort	156	pub const ENETDOWN = 50;
68	pub const ECONNRESET = 54; /// Connection reset by peer	157
69	pub const ENOBUFS = 55; /// No buffer space available	158	/// Network is unreachable
70	pub const EISCONN = 56; /// Socket is already connected	159	pub const ENETUNREACH = 51;
71	pub const ENOTCONN = 57; /// Socket is not connected	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	182	/// Too many references: can't splice
74	pub const ETOOMANYREFS = 59; /// Too many references: can't splice	183	pub const ETOOMANYREFS = 59;
75		184
76	pub const ETIMEDOUT = 60; /// Operation timed out	185	/// Operation timed out
77	pub const ECONNREFUSED = 61; /// Connection refused	186	pub const ETIMEDOUT = 60;
78		187
79	pub const ELOOP = 62; /// Too many levels of symbolic links	188	/// Connection refused
80	pub const ENAMETOOLONG = 63; /// File name too long	189	pub const ECONNREFUSED = 61;
81		190
82	pub const EHOSTDOWN = 64; /// Host is down	191	/// Too many levels of symbolic links
83	pub const EHOSTUNREACH = 65; /// No route to host	192	pub const ELOOP = 62;
84	pub const ENOTEMPTY = 66; /// Directory not empty	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	// quotas & mush	204	// quotas & mush
87	pub const EPROCLIM = 67; /// Too many processes	205	pub const ENOTEMPTY = 66;
88	pub const EUSERS = 68; /// Too many users	206
89	pub const EDQUOT = 69; /// Disc quota exceeded	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	// Network File System	214	// Network File System
92	pub const ESTALE = 70; /// Stale NFS file handle	215	pub const EDQUOT = 69;
93	pub const EREMOTE = 71; /// Too many levels of remote in path	216
94	pub const EBADRPC = 72; /// RPC struct is bad	217	/// Stale NFS file handle
95	pub const ERPCMISMATCH = 73; /// RPC version wrong	218	pub const ESTALE = 70;
96	pub const EPROGUNAVAIL = 74; /// RPC prog. not avail	219
97	pub const EPROGMISMATCH = 75; /// Program version wrong	220	/// Too many levels of remote in path
98	pub const EPROCUNAVAIL = 76; /// Bad procedure for program	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	232	/// Program version wrong
101	pub const ENOSYS = 78; /// Function not implemented	233	pub const EPROGMISMATCH = 75;
102		234
103	pub const EFTYPE = 79; /// Inappropriate file type or format	235	/// Bad procedure for program
104	pub const EAUTH = 80; /// Authentication error	236	pub const EPROCUNAVAIL = 76;
105	pub const ENEEDAUTH = 81; /// Need authenticator	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	// Intelligent device errors	251	// Intelligent device errors
108	pub const EPWROFF = 82; /// Device power is off	252	pub const ENEEDAUTH = 81;
109	pub const EDEVERR = 83; /// Device error, e.g. paper out	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	// Program loading errors	261	// Program loading errors
114	pub const EBADEXEC = 85; /// Bad executable	262	pub const EOVERFLOW = 84;
115	pub const EBADARCH = 86; /// Bad CPU type in executable	263
116	pub const ESHLIBVERS = 87; /// Shared library version mismatch	264	/// Bad executable
117	pub const EBADMACHO = 88; /// Malformed Macho file	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	312	/// STREAM ioctl timeout
122	pub const ENOMSG = 91; /// No message of desired type	313	pub const ETIME = 101;
123	pub const EILSEQ = 92; /// Illegal byte sequence
124	pub const ENOATTR = 93; /// Attribute not found
125		314
126	pub const EBADMSG = 94; /// Bad message	315	/// No such policy registered
127	pub const EMULTIHOP = 95; /// Reserved	316	pub const ENOPOLICY = 103;
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
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	321	/// Previous owner died
138	pub const EOWNERDEAD = 105; /// Previous owner died	322	pub const EOWNERDEAD = 105;
139		323
140	pub const EQFULL = 106; /// Interface output queue is full	324	/// Interface output queue is full
141	pub const ELAST = 106; /// Must be equal largest errno	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 @@
 /// Epoch reference times in terms of their difference from
 ///   posix epoch in seconds.
-pub const posix       = 0;                //Jan 01, 1970 AD
+pub const posix = 0; //Jan 01, 1970 AD
-pub const dos         = 315532800;        //Jan 01, 1980 AD
+pub const dos = 315532800; //Jan 01, 1980 AD
-pub const ios         = 978307200;        //Jan 01, 2001 AD
+pub const ios = 978307200; //Jan 01, 2001 AD
-pub const openvms     = -3506716800;      //Nov 17, 1858 AD
+pub const openvms = -3506716800; //Nov 17, 1858 AD
-pub const zos         = -2208988800;      //Jan 01, 1900 AD
+pub const zos = -2208988800; //Jan 01, 1900 AD
-pub const windows     = -11644473600;     //Jan 01, 1601 AD
+pub const windows = -11644473600; //Jan 01, 1601 AD
-pub const amiga       = 252460800;        //Jan 01, 1978 AD
+pub const amiga = 252460800; //Jan 01, 1978 AD
-pub const pickos      = -63244800;        //Dec 31, 1967 AD
+pub const pickos = -63244800; //Dec 31, 1967 AD
-pub const gps         = 315964800;        //Jan 06, 1980 AD
+pub const gps = 315964800; //Jan 06, 1980 AD
-pub const clr         = -62135769600;      //Jan 01, 0001 AD
+pub const clr = -62135769600; //Jan 01, 0001 AD
-pub const unix      = posix;
-pub const android   = posix;
-pub const os2       = dos;
-pub const bios      = dos;
-pub const vfat      = dos;
-pub const ntfs      = windows;
-pub const ntp       = zos;
-pub const jbase     = pickos;
-pub const aros      = amiga;
-pub const morphos   = amiga;
-pub const brew      = gps;
-pub const atsc      = gps;
-pub const go        = clr;
+pub const unix = posix;
+pub const android = posix;
+pub const os2 = dos;
+pub const bios = dos;
+pub const vfat = dos;
+pub const ntfs = windows;
+pub const ntp = zos;
+pub const jbase = pickos;
+pub const aros = amiga;
+pub const morphos = amiga;
+pub const brew = gps;
+pub const atsc = gps;
+pub const go = clr;

std/os/file.zig+52-41

 @@ -19,14 +19,20 @@ pub const File = struct {
     /// `path` needs to be copied in memory to add a null terminating byte, hence the allocator.
     /// Call close to clean up.
-    pub fn openRead(allocator: &mem.Allocator, path: []const u8) OpenError!File {
+    pub fn openRead(allocator: *mem.Allocator, path: []const u8) OpenError!File {
         if (is_posix) {
-            const flags = posix.O_LARGEFILE|posix.O_RDONLY;
+            const flags = posix.O_LARGEFILE | posix.O_RDONLY;
             const fd = try os.posixOpen(allocator, path, flags, 0);
             return openHandle(fd);
         } else if (is_windows) {
-            const handle = try os.windowsOpen(allocator, path, windows.GENERIC_READ, windows.FILE_SHARE_READ,
+            const handle = try os.windowsOpen(
-                windows.OPEN_EXISTING, windows.FILE_ATTRIBUTE_NORMAL);
+                allocator,
+                path,
+                windows.GENERIC_READ,
+                windows.FILE_SHARE_READ,
+                windows.OPEN_EXISTING,
+                windows.FILE_ATTRIBUTE_NORMAL,
+            );
             return openHandle(handle);
         } else {
             @compileError("TODO implement openRead for this OS");
 @@ -34,58 +40,63 @@ pub const File = struct {
     }
     /// Calls `openWriteMode` with os.default_file_mode for the mode.
-    pub fn openWrite(allocator: &mem.Allocator, path: []const u8) OpenError!File {
+    pub fn openWrite(allocator: *mem.Allocator, path: []const u8) OpenError!File {
         return openWriteMode(allocator, path, os.default_file_mode);
     }
     /// If the path does not exist it will be created.
     /// If a file already exists in the destination it will be truncated.
     /// `path` needs to be copied in memory to add a null terminating byte, hence the allocator.
     /// Call close to clean up.
-    pub fn openWriteMode(allocator: &mem.Allocator, path: []const u8, file_mode: os.FileMode) OpenError!File {
+    pub fn openWriteMode(allocator: *mem.Allocator, path: []const u8, file_mode: os.FileMode) OpenError!File {
         if (is_posix) {
-            const flags = posix.O_LARGEFILE|posix.O_WRONLY|posix.O_CREAT|posix.O_CLOEXEC|posix.O_TRUNC;
+            const flags = posix.O_LARGEFILE | posix.O_WRONLY | posix.O_CREAT | posix.O_CLOEXEC | posix.O_TRUNC;
             const fd = try os.posixOpen(allocator, path, flags, file_mode);
             return openHandle(fd);
         } else if (is_windows) {
-            const handle = try os.windowsOpen(allocator, path, windows.GENERIC_WRITE,
+            const handle = try os.windowsOpen(
-                windows.FILE_SHARE_WRITE|windows.FILE_SHARE_READ|windows.FILE_SHARE_DELETE,
+                allocator,
-                windows.CREATE_ALWAYS, windows.FILE_ATTRIBUTE_NORMAL);
+                path,
+                windows.GENERIC_WRITE,
+                windows.FILE_SHARE_WRITE | windows.FILE_SHARE_READ | windows.FILE_SHARE_DELETE,
+                windows.CREATE_ALWAYS,
+                windows.FILE_ATTRIBUTE_NORMAL,
+            );
             return openHandle(handle);
         } else {
             @compileError("TODO implement openWriteMode for this OS");
         }
     }
     /// If the path does not exist it will be created.
     /// If a file already exists in the destination this returns OpenError.PathAlreadyExists
     /// `path` needs to be copied in memory to add a null terminating byte, hence the allocator.
     /// Call close to clean up.
-    pub fn openWriteNoClobber(allocator: &mem.Allocator, path: []const u8, file_mode: os.FileMode) OpenError!File {
+    pub fn openWriteNoClobber(allocator: *mem.Allocator, path: []const u8, file_mode: os.FileMode) OpenError!File {
         if (is_posix) {
-            const flags = posix.O_LARGEFILE|posix.O_WRONLY|posix.O_CREAT|posix.O_CLOEXEC|posix.O_EXCL;
+            const flags = posix.O_LARGEFILE | posix.O_WRONLY | posix.O_CREAT | posix.O_CLOEXEC | posix.O_EXCL;
             const fd = try os.posixOpen(allocator, path, flags, file_mode);
             return openHandle(fd);
         } else if (is_windows) {
-            const handle = try os.windowsOpen(allocator, path, windows.GENERIC_WRITE,
+            const handle = try os.windowsOpen(
-                windows.FILE_SHARE_WRITE|windows.FILE_SHARE_READ|windows.FILE_SHARE_DELETE,
+                allocator,
-                windows.CREATE_NEW, windows.FILE_ATTRIBUTE_NORMAL);
+                path,
+                windows.GENERIC_WRITE,
+                windows.FILE_SHARE_WRITE | windows.FILE_SHARE_READ | windows.FILE_SHARE_DELETE,
+                windows.CREATE_NEW,
+                windows.FILE_ATTRIBUTE_NORMAL,
+            );
             return openHandle(handle);
         } else {
             @compileError("TODO implement openWriteMode for this OS");
         }
     }
     pub fn openHandle(handle: os.FileHandle) File {
-        return File {
+        return File{ .handle = handle };
-            .handle = handle,
-        };
     }
-    pub fn access(allocator: &mem.Allocator, path: []const u8, file_mode: os.FileMode) !bool {
+    pub fn access(allocator: *mem.Allocator, path: []const u8, file_mode: os.FileMode) !bool {
         const path_with_null = try std.cstr.addNullByte(allocator, path);
         defer allocator.free(path_with_null);
 @@ -129,17 +140,17 @@ pub const File = struct {
     /// Upon success, the stream is in an uninitialized state. To continue using it,
     /// you must use the open() function.
-    pub fn close(self: &File) void {
+    pub fn close(self: *File) void {
         os.close(self.handle);
         self.handle = undefined;
     }
     /// Calls `os.isTty` on `self.handle`.
-    pub fn isTty(self: &File) bool {
+    pub fn isTty(self: *File) bool {
         return os.isTty(self.handle);
     }
-    pub fn seekForward(self: &File, amount: isize) !void {
+    pub fn seekForward(self: *File, amount: isize) !void {
         switch (builtin.os) {
             Os.linux, Os.macosx, Os.ios => {
                 const result = posix.lseek(self.handle, amount, posix.SEEK_CUR);
 @@ -168,7 +179,7 @@ pub const File = struct {
         }
     }
-    pub fn seekTo(self: &File, pos: usize) !void {
+    pub fn seekTo(self: *File, pos: usize) !void {
         switch (builtin.os) {
             Os.linux, Os.macosx, Os.ios => {
                 const ipos = try math.cast(isize, pos);
 @@ -199,7 +210,7 @@ pub const File = struct {
         }
     }
-    pub fn getPos(self: &File) !usize {
+    pub fn getPos(self: *File) !usize {
         switch (builtin.os) {
             Os.linux, Os.macosx, Os.ios => {
                 const result = posix.lseek(self.handle, 0, posix.SEEK_CUR);
 @@ -217,8 +228,8 @@ pub const File = struct {
                 return result;
             },
             Os.windows => {
-                var pos : windows.LARGE_INTEGER = undefined;
+                var pos: windows.LARGE_INTEGER = undefined;
-                if (windows.SetFilePointerEx(self.handle, 0, &pos, windows.FILE_CURRENT) == 0) {
+                if (windows.SetFilePointerEx(self.handle, 0, *pos, windows.FILE_CURRENT) == 0) {
                     const err = windows.GetLastError();
                     return switch (err) {
                         windows.ERROR.INVALID_PARAMETER => error.BadFd,
 @@ -239,7 +250,7 @@ pub const File = struct {
         }
     }
-    pub fn getEndPos(self: &File) !usize {
+    pub fn getEndPos(self: *File) !usize {
         if (is_posix) {
             var stat: posix.Stat = undefined;
             const err = posix.getErrno(posix.fstat(self.handle, &stat));
 @@ -268,13 +279,13 @@ pub const File = struct {
         }
     }
-    pub const ModeError = error {
+    pub const ModeError = error{
         BadFd,
         SystemResources,
         Unexpected,
     };
-    fn mode(self: &File) ModeError!os.FileMode {
+    fn mode(self: *File) ModeError!os.FileMode {
         if (is_posix) {
             var stat: posix.Stat = undefined;
             const err = posix.getErrno(posix.fstat(self.handle, &stat));
 @@ -296,22 +307,22 @@ pub const File = struct {
         }
     }
-    pub const ReadError = error {};
+    pub const ReadError = error{};
-    pub fn read(self: &File, buffer: []u8) !usize {
+    pub fn read(self: *File, buffer: []u8) !usize {
         if (is_posix) {
             var index: usize = 0;
             while (index < buffer.len) {
-                const amt_read = posix.read(self.handle, &buffer[index], buffer.len - index);
+                const amt_read = posix.read(self.handle, buffer.ptr + index, buffer.len - index);
                 const read_err = posix.getErrno(amt_read);
                 if (read_err > 0) {
                     switch (read_err) {
-                        posix.EINTR  => continue,
+                        posix.EINTR => continue,
                         posix.EINVAL => unreachable,
                         posix.EFAULT => unreachable,
-                        posix.EBADF  => return error.BadFd,
+                        posix.EBADF => return error.BadFd,
-                        posix.EIO    => return error.Io,
+                        posix.EIO => return error.Io,
-                        else          => return os.unexpectedErrorPosix(read_err),
+                        else => return os.unexpectedErrorPosix(read_err),
                     }
                 }
                 if (amt_read == 0) return index;
 @@ -323,7 +334,7 @@ pub const File = struct {
             while (index < buffer.len) {
                 const want_read_count = windows.DWORD(math.min(windows.DWORD(@maxValue(windows.DWORD)), buffer.len - index));
                 var amt_read: windows.DWORD = undefined;
-                if (windows.ReadFile(self.handle, @ptrCast(&c_void, &buffer[index]), want_read_count, &amt_read, null) == 0) {
+                if (windows.ReadFile(self.handle, @ptrCast([*]c_void, buffer.ptr + index), want_read_count, &amt_read, null) == 0) {
                     const err = windows.GetLastError();
                     return switch (err) {
                         windows.ERROR.OPERATION_ABORTED => continue,
 @@ -342,7 +353,7 @@ pub const File = struct {
     pub const WriteError = os.WindowsWriteError || os.PosixWriteError;
-    fn write(self: &File, bytes: []const u8) WriteError!void {
+    fn write(self: *File, bytes: []const u8) WriteError!void {
         if (is_posix) {
             try os.posixWrite(self.handle, bytes);
         } else if (is_windows) {

std/os/get_user_id.zig+7-7

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

std/os/index.zig+176-253

...	@@ -3,8 +3,7 @@ const builtin = @import("builtin");	...	@@ -3,8 +3,7 @@ const builtin = @import("builtin");
3	const Os = builtin.Os;	3	const Os = builtin.Os;
4	const is_windows = builtin.os == Os.windows;	4	const is_windows = builtin.os == Os.windows;
5	const is_posix = switch (builtin.os) {	5	const is_posix = switch (builtin.os) {
6	builtin.Os.linux,	6	builtin.Os.linux, builtin.Os.macosx => true,
7	builtin.Os.macosx => true,
8	else => false,	7	else => false,
9	};	8	};
10	const os = this;	9	const os = this;
...	@@ -27,8 +26,7 @@ pub const linux = @import("linux/index.zig");	...	@@ -27,8 +26,7 @@ pub const linux = @import("linux/index.zig");
27	pub const zen = @import("zen.zig");	26	pub const zen = @import("zen.zig");
28	pub const posix = switch (builtin.os) {	27	pub const posix = switch (builtin.os) {
29	Os.linux => linux,	28	Os.linux => linux,
30	Os.macosx,	29	Os.macosx, Os.ios => darwin,
31	Os.ios => darwin,
32	Os.zen => zen,	30	Os.zen => zen,
33	else => @compileError("Unsupported OS"),	31	else => @compileError("Unsupported OS"),
34	};	32	};
...	@@ -112,8 +110,7 @@ pub fn getRandomBytes(buf: []u8) !void {	...	@@ -112,8 +110,7 @@ pub fn getRandomBytes(buf: []u8) !void {
112	}	110	}
113	return;	111	return;
114	},	112	},
115	Os.macosx,	113	Os.macosx, Os.ios => {
116	Os.ios => {
117	const fd = try posixOpenC(c"/dev/urandom", posix.O_RDONLY \| posix.O_CLOEXEC, 0);	114	const fd = try posixOpenC(c"/dev/urandom", posix.O_RDONLY \| posix.O_CLOEXEC, 0);
118	defer close(fd);	115	defer close(fd);
119		116
...	@@ -137,20 +134,7 @@ pub fn getRandomBytes(buf: []u8) !void {	...	@@ -137,20 +134,7 @@ pub fn getRandomBytes(buf: []u8) !void {
137	}	134	}
138	},	135	},
139	Os.zen => {	136	Os.zen => {
140	const randomness = []u8{	137	const randomness = []u8{ 42, 1, 7, 12, 22, 17, 99, 16, 26, 87, 41, 45 };
141	42,
142	1,
143	7,
144	12,
145	22,
146	17,
147	99,
148	16,
149	26,
150	87,
151	41,
152	45,
153	};
154	var i: usize = 0;	138	var i: usize = 0;
155	while (i < buf.len) : (i += 1) {	139	while (i < buf.len) : (i += 1) {
156	if (i > randomness.len) return error.Unknown;	140	if (i > randomness.len) return error.Unknown;
...	@@ -175,9 +159,7 @@ pub fn abort() noreturn {	...	@@ -175,9 +159,7 @@ pub fn abort() noreturn {
175	c.abort();	159	c.abort();
176	}	160	}
177	switch (builtin.os) {	161	switch (builtin.os) {
178	Os.linux,	162	Os.linux, Os.macosx, Os.ios => {
179	Os.macosx,
180	Os.ios => {
181	_ = posix.raise(posix.SIGABRT);	163	_ = posix.raise(posix.SIGABRT);
182	_ = posix.raise(posix.SIGKILL);	164	_ = posix.raise(posix.SIGKILL);
183	while (true) {}	165	while (true) {}
...	@@ -199,9 +181,7 @@ pub fn exit(status: u8) noreturn {	...	@@ -199,9 +181,7 @@ pub fn exit(status: u8) noreturn {
199	c.exit(status);	181	c.exit(status);
200	}	182	}
201	switch (builtin.os) {	183	switch (builtin.os) {
202	Os.linux,	184	Os.linux, Os.macosx, Os.ios => {
203	Os.macosx,
204	Os.ios => {
205	posix.exit(status);	185	posix.exit(status);
206	},	186	},
207	Os.windows => {	187	Os.windows => {
...	@@ -245,19 +225,17 @@ pub fn posixRead(fd: i32, buf: []u8) !void {	...	@@ -245,19 +225,17 @@ pub fn posixRead(fd: i32, buf: []u8) !void {
245	var index: usize = 0;	225	var index: usize = 0;
246	while (index < buf.len) {	226	while (index < buf.len) {
247	const want_to_read = math.min(buf.len - index, usize(max_buf_len));	227	const want_to_read = math.min(buf.len - index, usize(max_buf_len));
248	const rc = posix.read(fd, &buf[index], want_to_read);	228	const rc = posix.read(fd, buf.ptr + index, want_to_read);
249	const err = posix.getErrno(rc);	229	const err = posix.getErrno(rc);
250	if (err > 0) {	230	if (err > 0) {
251	return switch (err) {	231	return switch (err) {
252	posix.EINTR => continue,	232	posix.EINTR => continue,
253	posix.EINVAL,	233	posix.EINVAL, posix.EFAULT => unreachable,
254	posix.EFAULT => unreachable,
255	posix.EAGAIN => error.WouldBlock,	234	posix.EAGAIN => error.WouldBlock,
256	posix.EBADF => error.FileClosed,	235	posix.EBADF => error.FileClosed,
257	posix.EIO => error.InputOutput,	236	posix.EIO => error.InputOutput,
258	posix.EISDIR => error.IsDir,	237	posix.EISDIR => error.IsDir,
259	posix.ENOBUFS,	238	posix.ENOBUFS, posix.ENOMEM => error.SystemResources,
260	posix.ENOMEM => error.SystemResources,
261	else => unexpectedErrorPosix(err),	239	else => unexpectedErrorPosix(err),
262	};	240	};
263	}	241	}
...	@@ -287,13 +265,12 @@ pub fn posixWrite(fd: i32, bytes: []const u8) !void {	...	@@ -287,13 +265,12 @@ pub fn posixWrite(fd: i32, bytes: []const u8) !void {
287	var index: usize = 0;	265	var index: usize = 0;
288	while (index < bytes.len) {	266	while (index < bytes.len) {
289	const amt_to_write = math.min(bytes.len - index, usize(max_bytes_len));	267	const amt_to_write = math.min(bytes.len - index, usize(max_bytes_len));
290	const rc = posix.write(fd, &bytes[index], amt_to_write);	268	const rc = posix.write(fd, bytes.ptr + index, amt_to_write);
291	const write_err = posix.getErrno(rc);	269	const write_err = posix.getErrno(rc);
292	if (write_err > 0) {	270	if (write_err > 0) {
293	return switch (write_err) {	271	return switch (write_err) {
294	posix.EINTR => continue,	272	posix.EINTR => continue,
295	posix.EINVAL,	273	posix.EINVAL, posix.EFAULT => unreachable,
296	posix.EFAULT => unreachable,
297	posix.EAGAIN => PosixWriteError.WouldBlock,	274	posix.EAGAIN => PosixWriteError.WouldBlock,
298	posix.EBADF => PosixWriteError.FileClosed,	275	posix.EBADF => PosixWriteError.FileClosed,
299	posix.EDESTADDRREQ => PosixWriteError.DestinationAddressRequired,	276	posix.EDESTADDRREQ => PosixWriteError.DestinationAddressRequired,
...	@@ -331,14 +308,15 @@ pub const PosixOpenError = error{	...	@@ -331,14 +308,15 @@ pub const PosixOpenError = error{
331	/// ::file_path needs to be copied in memory to add a null terminating byte.	308	/// ::file_path needs to be copied in memory to add a null terminating byte.
332	/// Calls POSIX open, keeps trying if it gets interrupted, and translates	309	/// Calls POSIX open, keeps trying if it gets interrupted, and translates
333	/// the return value into zig errors.	310	/// the return value into zig errors.
334	pub fn posixOpen(allocator: &Allocator, file_path: []const u8, flags: u32, perm: usize) PosixOpenError!i32 {	311	pub fn posixOpen(allocator: *Allocator, file_path: []const u8, flags: u32, perm: usize) PosixOpenError!i32 {
335	const path_with_null = try cstr.addNullByte(allocator, file_path);	312	const path_with_null = try cstr.addNullByte(allocator, file_path);
336	defer allocator.free(path_with_null);	313	defer allocator.free(path_with_null);
337		314
338	return posixOpenC(path_with_null.ptr, flags, perm);	315	return posixOpenC(path_with_null.ptr, flags, perm);
339	}	316	}
340		317
341	pub fn posixOpenC(file_path: &const u8, flags: u32, perm: usize) !i32 {	318	// TODO https://github.com/ziglang/zig/issues/265
		319	pub fn posixOpenC(file_path: [*]const u8, flags: u32, perm: usize) !i32 {
342	while (true) {	320	while (true) {
343	const result = posix.open(file_path, flags, perm);	321	const result = posix.open(file_path, flags, perm);
344	const err = posix.getErrno(result);	322	const err = posix.getErrno(result);
...	@@ -349,8 +327,7 @@ pub fn posixOpenC(file_path: &const u8, flags: u32, perm: usize) !i32 {	...	@@ -349,8 +327,7 @@ pub fn posixOpenC(file_path: &const u8, flags: u32, perm: usize) !i32 {
349	posix.EFAULT => unreachable,	327	posix.EFAULT => unreachable,
350	posix.EINVAL => unreachable,	328	posix.EINVAL => unreachable,
351	posix.EACCES => return PosixOpenError.AccessDenied,	329	posix.EACCES => return PosixOpenError.AccessDenied,
352	posix.EFBIG,	330	posix.EFBIG, posix.EOVERFLOW => return PosixOpenError.FileTooBig,
353	posix.EOVERFLOW => return PosixOpenError.FileTooBig,
354	posix.EISDIR => return PosixOpenError.IsDir,	331	posix.EISDIR => return PosixOpenError.IsDir,
355	posix.ELOOP => return PosixOpenError.SymLinkLoop,	332	posix.ELOOP => return PosixOpenError.SymLinkLoop,
356	posix.EMFILE => return PosixOpenError.ProcessFdQuotaExceeded,	333	posix.EMFILE => return PosixOpenError.ProcessFdQuotaExceeded,
...	@@ -375,8 +352,7 @@ pub fn posixDup2(old_fd: i32, new_fd: i32) !void {	...	@@ -375,8 +352,7 @@ pub fn posixDup2(old_fd: i32, new_fd: i32) !void {
375	const err = posix.getErrno(posix.dup2(old_fd, new_fd));	352	const err = posix.getErrno(posix.dup2(old_fd, new_fd));
376	if (err > 0) {	353	if (err > 0) {
377	return switch (err) {	354	return switch (err) {
378	posix.EBUSY,	355	posix.EBUSY, posix.EINTR => continue,
379	posix.EINTR => continue,
380	posix.EMFILE => error.ProcessFdQuotaExceeded,	356	posix.EMFILE => error.ProcessFdQuotaExceeded,
381	posix.EINVAL => unreachable,	357	posix.EINVAL => unreachable,
382	else => unexpectedErrorPosix(err),	358	else => unexpectedErrorPosix(err),
...	@@ -386,19 +362,19 @@ pub fn posixDup2(old_fd: i32, new_fd: i32) !void {	...	@@ -386,19 +362,19 @@ pub fn posixDup2(old_fd: i32, new_fd: i32) !void {
386	}	362	}
387	}	363	}
388		364
389	pub fn createNullDelimitedEnvMap(allocator: &Allocator, env_map: &const BufMap) ![]?&u8 {	365	pub fn createNullDelimitedEnvMap(allocator: Allocator, env_map: const BufMap) ![]?[*]u8 {
390	const envp_count = env_map.count();	366	const envp_count = env_map.count();
391	const envp_buf = try allocator.alloc(?&u8, envp_count + 1);	367	const envp_buf = try allocator.alloc(?[*]u8, envp_count + 1);
392	mem.set(?&u8, envp_buf, null);	368	mem.set(?[*]u8, envp_buf, null);
393	errdefer freeNullDelimitedEnvMap(allocator, envp_buf);	369	errdefer freeNullDelimitedEnvMap(allocator, envp_buf);
394	{	370	{
395	var it = env_map.iterator();	371	var it = env_map.iterator();
396	var i: usize = 0;	372	var i: usize = 0;
397	while (it.next()) \|pair\| : (i += 1) {	373	while (it.next()) \|pair\| : (i += 1) {
398	const env_buf = try allocator.alloc(u8, pair.key.len + pair.value.len + 2);	374	const env_buf = try allocator.alloc(u8, pair.key.len + pair.value.len + 2);
399	@memcpy(&env_buf[0], pair.key.ptr, pair.key.len);	375	@memcpy(env_buf.ptr, pair.key.ptr, pair.key.len);
400	env_buf[pair.key.len] = '=';	376	env_buf[pair.key.len] = '=';
401	@memcpy(&env_buf[pair.key.len + 1], pair.value.ptr, pair.value.len);	377	@memcpy(env_buf.ptr + pair.key.len + 1, pair.value.ptr, pair.value.len);
402	env_buf[env_buf.len - 1] = 0;	378	env_buf[env_buf.len - 1] = 0;
403		379
404	envp_buf[i] = env_buf.ptr;	380	envp_buf[i] = env_buf.ptr;
...	@@ -409,9 +385,9 @@ pub fn createNullDelimitedEnvMap(allocator: &Allocator, env_map: &const BufMap)	...	@@ -409,9 +385,9 @@ pub fn createNullDelimitedEnvMap(allocator: &Allocator, env_map: &const BufMap)
409	return envp_buf;	385	return envp_buf;
410	}	386	}
411		387
412	pub fn freeNullDelimitedEnvMap(allocator: &Allocator, envp_buf: []?&u8) void {	388	pub fn freeNullDelimitedEnvMap(allocator: Allocator, envp_buf: []?[]u8) void {
413	for (envp_buf) \|env\| {	389	for (envp_buf) \|env\| {
414	const env_buf = if (env) \|ptr\| ptr[0..cstr.len(ptr) + 1] else break;	390	const env_buf = if (env) \|ptr\| ptr[0 .. cstr.len(ptr) + 1] else break;
415	allocator.free(env_buf);	391	allocator.free(env_buf);
416	}	392	}
417	allocator.free(envp_buf);	393	allocator.free(envp_buf);
...	@@ -422,9 +398,9 @@ pub fn freeNullDelimitedEnvMap(allocator: &Allocator, envp_buf: []?&u8) void {	...	@@ -422,9 +398,9 @@ pub fn freeNullDelimitedEnvMap(allocator: &Allocator, envp_buf: []?&u8) void {
422	/// pointers after the args and after the environment variables.	398	/// pointers after the args and after the environment variables.
423	/// `argv[0]` is the executable path.	399	/// `argv[0]` is the executable path.
424	/// This function also uses the PATH environment variable to get the full path to the executable.	400	/// This function also uses the PATH environment variable to get the full path to the executable.
425	pub fn posixExecve(argv: []const []const u8, env_map: &const BufMap, allocator: &Allocator) !void {	401	pub fn posixExecve(argv: []const []const u8, env_map: const BufMap, allocator: Allocator) !void {
426	const argv_buf = try allocator.alloc(?&u8, argv.len + 1);	402	const argv_buf = try allocator.alloc(?[*]u8, argv.len + 1);
427	mem.set(?&u8, argv_buf, null);	403	mem.set(?[*]u8, argv_buf, null);
428	defer {	404	defer {
429	for (argv_buf) \|arg\| {	405	for (argv_buf) \|arg\| {
430	const arg_buf = if (arg) \|ptr\| cstr.toSlice(ptr) else break;	406	const arg_buf = if (arg) \|ptr\| cstr.toSlice(ptr) else break;
...	@@ -434,7 +410,7 @@ pub fn posixExecve(argv: []const []const u8, env_map: &const BufMap, allocator:	...	@@ -434,7 +410,7 @@ pub fn posixExecve(argv: []const []const u8, env_map: &const BufMap, allocator:
434	}	410	}
435	for (argv) \|arg, i\| {	411	for (argv) \|arg, i\| {
436	const arg_buf = try allocator.alloc(u8, arg.len + 1);	412	const arg_buf = try allocator.alloc(u8, arg.len + 1);
437	@memcpy(&arg_buf[0], arg.ptr, arg.len);	413	@memcpy(arg_buf.ptr, arg.ptr, arg.len);
438	arg_buf[arg.len] = 0;	414	arg_buf[arg.len] = 0;
439		415
440	argv_buf[i] = arg_buf.ptr;	416	argv_buf[i] = arg_buf.ptr;
...	@@ -461,7 +437,7 @@ pub fn posixExecve(argv: []const []const u8, env_map: &const BufMap, allocator:	...	@@ -461,7 +437,7 @@ pub fn posixExecve(argv: []const []const u8, env_map: &const BufMap, allocator:
461	while (it.next()) \|search_path\| {	437	while (it.next()) \|search_path\| {
462	mem.copy(u8, path_buf, search_path);	438	mem.copy(u8, path_buf, search_path);
463	path_buf[search_path.len] = '/';	439	path_buf[search_path.len] = '/';
464	mem.copy(u8, path_buf[search_path.len + 1..], exe_path);	440	mem.copy(u8, path_buf[search_path.len + 1 ..], exe_path);
465	path_buf[search_path.len + exe_path.len + 1] = 0;	441	path_buf[search_path.len + exe_path.len + 1] = 0;
466	err = posix.getErrno(posix.execve(path_buf.ptr, argv_buf.ptr, envp_buf.ptr));	442	err = posix.getErrno(posix.execve(path_buf.ptr, argv_buf.ptr, envp_buf.ptr));
467	assert(err > 0);	443	assert(err > 0);
...	@@ -493,17 +469,10 @@ fn posixExecveErrnoToErr(err: usize) PosixExecveError {	...	@@ -493,17 +469,10 @@ fn posixExecveErrnoToErr(err: usize) PosixExecveError {
493	assert(err > 0);	469	assert(err > 0);
494	return switch (err) {	470	return switch (err) {
495	posix.EFAULT => unreachable,	471	posix.EFAULT => unreachable,
496	posix.E2BIG,	472	posix.E2BIG, posix.EMFILE, posix.ENAMETOOLONG, posix.ENFILE, posix.ENOMEM => error.SystemResources,
497	posix.EMFILE,	473	posix.EACCES, posix.EPERM => error.AccessDenied,
498	posix.ENAMETOOLONG,	474	posix.EINVAL, posix.ENOEXEC => error.InvalidExe,
499	posix.ENFILE,	475	posix.EIO, posix.ELOOP => error.FileSystem,
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,
507	posix.EISDIR => error.IsDir,	476	posix.EISDIR => error.IsDir,
508	posix.ENOENT => error.FileNotFound,	477	posix.ENOENT => error.FileNotFound,
509	posix.ENOTDIR => error.NotDir,	478	posix.ENOTDIR => error.NotDir,
...	@@ -513,10 +482,10 @@ fn posixExecveErrnoToErr(err: usize) PosixExecveError {	...	@@ -513,10 +482,10 @@ fn posixExecveErrnoToErr(err: usize) PosixExecveError {
513	}	482	}
514		483
515	pub var linux_aux_raw = []usize{0} ** 38;	484	pub var linux_aux_raw = []usize{0} ** 38;
516	pub var posix_environ_raw: []&u8 = undefined;	485	pub var posix_environ_raw: [][*]u8 = undefined;
517		486
518	/// Caller must free result when done.	487	/// Caller must free result when done.
519	pub fn getEnvMap(allocator: &Allocator) !BufMap {	488	pub fn getEnvMap(allocator: *Allocator) !BufMap {
520	var result = BufMap.init(allocator);	489	var result = BufMap.init(allocator);
521	errdefer result.deinit();	490	errdefer result.deinit();
522		491
...	@@ -551,7 +520,7 @@ pub fn getEnvMap(allocator: &Allocator) !BufMap {	...	@@ -551,7 +520,7 @@ pub fn getEnvMap(allocator: &Allocator) !BufMap {
551		520
552	var end_i: usize = line_i;	521	var end_i: usize = line_i;
553	while (ptr[end_i] != 0) : (end_i += 1) {}	522	while (ptr[end_i] != 0) : (end_i += 1) {}
554	const value = ptr[line_i + 1..end_i];	523	const value = ptr[line_i + 1 .. end_i];
555		524
556	try result.set(key, value);	525	try result.set(key, value);
557	}	526	}
...	@@ -568,7 +537,7 @@ pub fn getEnvPosix(key: []const u8) ?[]const u8 {	...	@@ -568,7 +537,7 @@ pub fn getEnvPosix(key: []const u8) ?[]const u8 {
568		537
569	var end_i: usize = line_i;	538	var end_i: usize = line_i;
570	while (ptr[end_i] != 0) : (end_i += 1) {}	539	while (ptr[end_i] != 0) : (end_i += 1) {}
571	const this_value = ptr[line_i + 1..end_i];	540	const this_value = ptr[line_i + 1 .. end_i];
572		541
573	return this_value;	542	return this_value;
574	}	543	}
...	@@ -576,7 +545,7 @@ pub fn getEnvPosix(key: []const u8) ?[]const u8 {	...	@@ -576,7 +545,7 @@ pub fn getEnvPosix(key: []const u8) ?[]const u8 {
576	}	545	}
577		546
578	/// Caller must free returned memory.	547	/// Caller must free returned memory.
579	pub fn getEnvVarOwned(allocator: &mem.Allocator, key: []const u8) ![]u8 {	548	pub fn getEnvVarOwned(allocator: *mem.Allocator, key: []const u8) ![]u8 {
580	if (is_windows) {	549	if (is_windows) {
581	const key_with_null = try cstr.addNullByte(allocator, key);	550	const key_with_null = try cstr.addNullByte(allocator, key);
582	defer allocator.free(key_with_null);	551	defer allocator.free(key_with_null);
...	@@ -610,7 +579,7 @@ pub fn getEnvVarOwned(allocator: &mem.Allocator, key: []const u8) ![]u8 {	...	@@ -610,7 +579,7 @@ pub fn getEnvVarOwned(allocator: &mem.Allocator, key: []const u8) ![]u8 {
610	}	579	}
611		580
612	/// Caller must free the returned memory.	581	/// Caller must free the returned memory.
613	pub fn getCwd(allocator: &Allocator) ![]u8 {	582	pub fn getCwd(allocator: *Allocator) ![]u8 {
614	switch (builtin.os) {	583	switch (builtin.os) {
615	Os.windows => {	584	Os.windows => {
616	var buf = try allocator.alloc(u8, 256);	585	var buf = try allocator.alloc(u8, 256);
...	@@ -659,7 +628,7 @@ test "os.getCwd" {	...	@@ -659,7 +628,7 @@ test "os.getCwd" {
659		628
660	pub const SymLinkError = PosixSymLinkError \|\| WindowsSymLinkError;	629	pub const SymLinkError = PosixSymLinkError \|\| WindowsSymLinkError;
661		630
662	pub fn symLink(allocator: &Allocator, existing_path: []const u8, new_path: []const u8) SymLinkError!void {	631	pub fn symLink(allocator: *Allocator, existing_path: []const u8, new_path: []const u8) SymLinkError!void {
663	if (is_windows) {	632	if (is_windows) {
664	return symLinkWindows(allocator, existing_path, new_path);	633	return symLinkWindows(allocator, existing_path, new_path);
665	} else {	634	} else {
...	@@ -672,7 +641,7 @@ pub const WindowsSymLinkError = error{	...	@@ -672,7 +641,7 @@ pub const WindowsSymLinkError = error{
672	Unexpected,	641	Unexpected,
673	};	642	};
674		643
675	pub fn symLinkWindows(allocator: &Allocator, existing_path: []const u8, new_path: []const u8) WindowsSymLinkError!void {	644	pub fn symLinkWindows(allocator: *Allocator, existing_path: []const u8, new_path: []const u8) WindowsSymLinkError!void {
676	const existing_with_null = try cstr.addNullByte(allocator, existing_path);	645	const existing_with_null = try cstr.addNullByte(allocator, existing_path);
677	defer allocator.free(existing_with_null);	646	defer allocator.free(existing_with_null);
678	const new_with_null = try cstr.addNullByte(allocator, new_path);	647	const new_with_null = try cstr.addNullByte(allocator, new_path);
...	@@ -702,7 +671,7 @@ pub const PosixSymLinkError = error{	...	@@ -702,7 +671,7 @@ pub const PosixSymLinkError = error{
702	Unexpected,	671	Unexpected,
703	};	672	};
704		673
705	pub fn symLinkPosix(allocator: &Allocator, existing_path: []const u8, new_path: []const u8) PosixSymLinkError!void {	674	pub fn symLinkPosix(allocator: *Allocator, existing_path: []const u8, new_path: []const u8) PosixSymLinkError!void {
706	const full_buf = try allocator.alloc(u8, existing_path.len + new_path.len + 2);	675	const full_buf = try allocator.alloc(u8, existing_path.len + new_path.len + 2);
707	defer allocator.free(full_buf);	676	defer allocator.free(full_buf);
708		677
...	@@ -710,17 +679,15 @@ pub fn symLinkPosix(allocator: &Allocator, existing_path: []const u8, new_path:	...	@@ -710,17 +679,15 @@ pub fn symLinkPosix(allocator: &Allocator, existing_path: []const u8, new_path:
710	mem.copy(u8, existing_buf, existing_path);	679	mem.copy(u8, existing_buf, existing_path);
711	existing_buf[existing_path.len] = 0;	680	existing_buf[existing_path.len] = 0;
712		681
713	const new_buf = full_buf[existing_path.len + 1..];	682	const new_buf = full_buf[existing_path.len + 1 ..];
714	mem.copy(u8, new_buf, new_path);	683	mem.copy(u8, new_buf, new_path);
715	new_buf[new_path.len] = 0;	684	new_buf[new_path.len] = 0;
716		685
717	const err = posix.getErrno(posix.symlink(existing_buf.ptr, new_buf.ptr));	686	const err = posix.getErrno(posix.symlink(existing_buf.ptr, new_buf.ptr));
718	if (err > 0) {	687	if (err > 0) {
719	return switch (err) {	688	return switch (err) {
720	posix.EFAULT,	689	posix.EFAULT, posix.EINVAL => unreachable,
721	posix.EINVAL => unreachable,	690	posix.EACCES, posix.EPERM => error.AccessDenied,
722	posix.EACCES,
723	posix.EPERM => error.AccessDenied,
724	posix.EDQUOT => error.DiskQuota,	691	posix.EDQUOT => error.DiskQuota,
725	posix.EEXIST => error.PathAlreadyExists,	692	posix.EEXIST => error.PathAlreadyExists,
726	posix.EIO => error.FileSystem,	693	posix.EIO => error.FileSystem,
...	@@ -739,7 +706,7 @@ pub fn symLinkPosix(allocator: &Allocator, existing_path: []const u8, new_path:	...	@@ -739,7 +706,7 @@ pub fn symLinkPosix(allocator: &Allocator, existing_path: []const u8, new_path:
739	// here we replace the standard +/ with -_ so that it can be used in a file name	706	// here we replace the standard +/ with -_ so that it can be used in a file name
740	const b64_fs_encoder = base64.Base64Encoder.init("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_", base64.standard_pad_char);	707	const b64_fs_encoder = base64.Base64Encoder.init("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_", base64.standard_pad_char);
741		708
742	pub fn atomicSymLink(allocator: &Allocator, existing_path: []const u8, new_path: []const u8) !void {	709	pub fn atomicSymLink(allocator: *Allocator, existing_path: []const u8, new_path: []const u8) !void {
743	if (symLink(allocator, existing_path, new_path)) {	710	if (symLink(allocator, existing_path, new_path)) {
744	return;	711	return;
745	} else \|err\| switch (err) {	712	} else \|err\| switch (err) {
...	@@ -756,7 +723,7 @@ pub fn atomicSymLink(allocator: &Allocator, existing_path: []const u8, new_path:	...	@@ -756,7 +723,7 @@ pub fn atomicSymLink(allocator: &Allocator, existing_path: []const u8, new_path:
756	tmp_path[dirname.len] = os.path.sep;	723	tmp_path[dirname.len] = os.path.sep;
757	while (true) {	724	while (true) {
758	try getRandomBytes(rand_buf[0..]);	725	try getRandomBytes(rand_buf[0..]);
759	b64_fs_encoder.encode(tmp_path[dirname.len + 1..], rand_buf);	726	b64_fs_encoder.encode(tmp_path[dirname.len + 1 ..], rand_buf);
760		727
761	if (symLink(allocator, existing_path, tmp_path)) {	728	if (symLink(allocator, existing_path, tmp_path)) {
762	return rename(allocator, tmp_path, new_path);	729	return rename(allocator, tmp_path, new_path);
...	@@ -767,7 +734,7 @@ pub fn atomicSymLink(allocator: &Allocator, existing_path: []const u8, new_path:	...	@@ -767,7 +734,7 @@ pub fn atomicSymLink(allocator: &Allocator, existing_path: []const u8, new_path:
767	}	734	}
768	}	735	}
769		736
770	pub fn deleteFile(allocator: &Allocator, file_path: []const u8) !void {	737	pub fn deleteFile(allocator: *Allocator, file_path: []const u8) !void {
771	if (builtin.os == Os.windows) {	738	if (builtin.os == Os.windows) {
772	return deleteFileWindows(allocator, file_path);	739	return deleteFileWindows(allocator, file_path);
773	} else {	740	} else {
...	@@ -775,7 +742,7 @@ pub fn deleteFile(allocator: &Allocator, file_path: []const u8) !void {	...	@@ -775,7 +742,7 @@ pub fn deleteFile(allocator: &Allocator, file_path: []const u8) !void {
775	}	742	}
776	}	743	}
777		744
778	pub fn deleteFileWindows(allocator: &Allocator, file_path: []const u8) !void {	745	pub fn deleteFileWindows(allocator: *Allocator, file_path: []const u8) !void {
779	const buf = try allocator.alloc(u8, file_path.len + 1);	746	const buf = try allocator.alloc(u8, file_path.len + 1);
780	defer allocator.free(buf);	747	defer allocator.free(buf);
781		748
...	@@ -787,14 +754,13 @@ pub fn deleteFileWindows(allocator: &Allocator, file_path: []const u8) !void {	...	@@ -787,14 +754,13 @@ pub fn deleteFileWindows(allocator: &Allocator, file_path: []const u8) !void {
787	return switch (err) {	754	return switch (err) {
788	windows.ERROR.FILE_NOT_FOUND => error.FileNotFound,	755	windows.ERROR.FILE_NOT_FOUND => error.FileNotFound,
789	windows.ERROR.ACCESS_DENIED => error.AccessDenied,	756	windows.ERROR.ACCESS_DENIED => error.AccessDenied,
790	windows.ERROR.FILENAME_EXCED_RANGE,	757	windows.ERROR.FILENAME_EXCED_RANGE, windows.ERROR.INVALID_PARAMETER => error.NameTooLong,
791	windows.ERROR.INVALID_PARAMETER => error.NameTooLong,
792	else => unexpectedErrorWindows(err),	758	else => unexpectedErrorWindows(err),
793	};	759	};
794	}	760	}
795	}	761	}
796		762
797	pub fn deleteFilePosix(allocator: &Allocator, file_path: []const u8) !void {	763	pub fn deleteFilePosix(allocator: *Allocator, file_path: []const u8) !void {
798	const buf = try allocator.alloc(u8, file_path.len + 1);	764	const buf = try allocator.alloc(u8, file_path.len + 1);
799	defer allocator.free(buf);	765	defer allocator.free(buf);
800		766
...	@@ -804,11 +770,9 @@ pub fn deleteFilePosix(allocator: &Allocator, file_path: []const u8) !void {	...	@@ -804,11 +770,9 @@ pub fn deleteFilePosix(allocator: &Allocator, file_path: []const u8) !void {
804	const err = posix.getErrno(posix.unlink(buf.ptr));	770	const err = posix.getErrno(posix.unlink(buf.ptr));
805	if (err > 0) {	771	if (err > 0) {
806	return switch (err) {	772	return switch (err) {
807	posix.EACCES,	773	posix.EACCES, posix.EPERM => error.AccessDenied,
808	posix.EPERM => error.AccessDenied,
809	posix.EBUSY => error.FileBusy,	774	posix.EBUSY => error.FileBusy,
810	posix.EFAULT,	775	posix.EFAULT, posix.EINVAL => unreachable,
811	posix.EINVAL => unreachable,
812	posix.EIO => error.FileSystem,	776	posix.EIO => error.FileSystem,
813	posix.EISDIR => error.IsDir,	777	posix.EISDIR => error.IsDir,
814	posix.ELOOP => error.SymLinkLoop,	778	posix.ELOOP => error.SymLinkLoop,
...	@@ -827,7 +791,7 @@ pub fn deleteFilePosix(allocator: &Allocator, file_path: []const u8) !void {	...	@@ -827,7 +791,7 @@ pub fn deleteFilePosix(allocator: &Allocator, file_path: []const u8) !void {
827	/// there is a possibility of power loss or application termination leaving temporary files present	791	/// there is a possibility of power loss or application termination leaving temporary files present
828	/// in the same directory as dest_path.	792	/// in the same directory as dest_path.
829	/// Destination file will have the same mode as the source file.	793	/// Destination file will have the same mode as the source file.
830	pub fn copyFile(allocator: &Allocator, source_path: []const u8, dest_path: []const u8) !void {	794	pub fn copyFile(allocator: *Allocator, source_path: []const u8, dest_path: []const u8) !void {
831	var in_file = try os.File.openRead(allocator, source_path);	795	var in_file = try os.File.openRead(allocator, source_path);
832	defer in_file.close();	796	defer in_file.close();
833		797
...	@@ -849,7 +813,7 @@ pub fn copyFile(allocator: &Allocator, source_path: []const u8, dest_path: []con	...	@@ -849,7 +813,7 @@ pub fn copyFile(allocator: &Allocator, source_path: []const u8, dest_path: []con
849	/// Guaranteed to be atomic. However until https://patchwork.kernel.org/patch/9636735/ is	813	/// Guaranteed to be atomic. However until https://patchwork.kernel.org/patch/9636735/ is
850	/// merged and readily available,	814	/// merged and readily available,
851	/// there is a possibility of power loss or application termination leaving temporary files present	815	/// there is a possibility of power loss or application termination leaving temporary files present
852	pub fn copyFileMode(allocator: &Allocator, source_path: []const u8, dest_path: []const u8, mode: FileMode) !void {	816	pub fn copyFileMode(allocator: *Allocator, source_path: []const u8, dest_path: []const u8, mode: FileMode) !void {
853	var in_file = try os.File.openRead(allocator, source_path);	817	var in_file = try os.File.openRead(allocator, source_path);
854	defer in_file.close();	818	defer in_file.close();
855		819
...	@@ -867,7 +831,7 @@ pub fn copyFileMode(allocator: &Allocator, source_path: []const u8, dest_path: [	...	@@ -867,7 +831,7 @@ pub fn copyFileMode(allocator: &Allocator, source_path: []const u8, dest_path: [
867	}	831	}
868		832
869	pub const AtomicFile = struct {	833	pub const AtomicFile = struct {
870	allocator: &Allocator,	834	allocator: *Allocator,
871	file: os.File,	835	file: os.File,
872	tmp_path: []u8,	836	tmp_path: []u8,
873	dest_path: []const u8,	837	dest_path: []const u8,
...	@@ -875,18 +839,24 @@ pub const AtomicFile = struct {	...	@@ -875,18 +839,24 @@ pub const AtomicFile = struct {
875		839
876	/// dest_path must remain valid for the lifetime of AtomicFile	840	/// dest_path must remain valid for the lifetime of AtomicFile
877	/// call finish to atomically replace dest_path with contents	841	/// call finish to atomically replace dest_path with contents
878	pub fn init(allocator: &Allocator, dest_path: []const u8, mode: FileMode) !AtomicFile {	842	pub fn init(allocator: *Allocator, dest_path: []const u8, mode: FileMode) !AtomicFile {
879	const dirname = os.path.dirname(dest_path);	843	const dirname = os.path.dirname(dest_path);
880		844
881	var rand_buf: [12]u8 = undefined;	845	var rand_buf: [12]u8 = undefined;
882	const tmp_path = try allocator.alloc(u8, dirname.len + 1 + base64.Base64Encoder.calcSize(rand_buf.len));	846
		847	const dirname_component_len = if (dirname.len == 0) 0 else dirname.len + 1;
		848	const tmp_path = try allocator.alloc(u8, dirname_component_len +
		849	base64.Base64Encoder.calcSize(rand_buf.len));
883	errdefer allocator.free(tmp_path);	850	errdefer allocator.free(tmp_path);
884	mem.copy(u8, tmp_path[0..], dirname);	851
885	tmp_path[dirname.len] = os.path.sep;	852	if (dirname.len != 0) {
		853	mem.copy(u8, tmp_path[0..], dirname);
		854	tmp_path[dirname.len] = os.path.sep;
		855	}
886		856
887	while (true) {	857	while (true) {
888	try getRandomBytes(rand_buf[0..]);	858	try getRandomBytes(rand_buf[0..]);
889	b64_fs_encoder.encode(tmp_path[dirname.len + 1..], rand_buf);	859	b64_fs_encoder.encode(tmp_path[dirname_component_len..], rand_buf);
890		860
891	const file = os.File.openWriteNoClobber(allocator, tmp_path, mode) catch \|err\| switch (err) {	861	const file = os.File.openWriteNoClobber(allocator, tmp_path, mode) catch \|err\| switch (err) {
892	error.PathAlreadyExists => continue,	862	error.PathAlreadyExists => continue,
...	@@ -906,7 +876,7 @@ pub const AtomicFile = struct {	...	@@ -906,7 +876,7 @@ pub const AtomicFile = struct {
906	}	876	}
907		877
908	/// always call deinit, even after successful finish()	878	/// always call deinit, even after successful finish()
909	pub fn deinit(self: &AtomicFile) void {	879	pub fn deinit(self: *AtomicFile) void {
910	if (!self.finished) {	880	if (!self.finished) {
911	self.file.close();	881	self.file.close();
912	deleteFile(self.allocator, self.tmp_path) catch {};	882	deleteFile(self.allocator, self.tmp_path) catch {};
...	@@ -915,7 +885,7 @@ pub const AtomicFile = struct {	...	@@ -915,7 +885,7 @@ pub const AtomicFile = struct {
915	}	885	}
916	}	886	}
917		887
918	pub fn finish(self: &AtomicFile) !void {	888	pub fn finish(self: *AtomicFile) !void {
919	assert(!self.finished);	889	assert(!self.finished);
920	self.file.close();	890	self.file.close();
921	try rename(self.allocator, self.tmp_path, self.dest_path);	891	try rename(self.allocator, self.tmp_path, self.dest_path);
...	@@ -924,7 +894,7 @@ pub const AtomicFile = struct {	...	@@ -924,7 +894,7 @@ pub const AtomicFile = struct {
924	}	894	}
925	};	895	};
926		896
927	pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8) !void {	897	pub fn rename(allocator: *Allocator, old_path: []const u8, new_path: []const u8) !void {
928	const full_buf = try allocator.alloc(u8, old_path.len + new_path.len + 2);	898	const full_buf = try allocator.alloc(u8, old_path.len + new_path.len + 2);
929	defer allocator.free(full_buf);	899	defer allocator.free(full_buf);
930		900
...	@@ -932,7 +902,7 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)	...	@@ -932,7 +902,7 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)
932	mem.copy(u8, old_buf, old_path);	902	mem.copy(u8, old_buf, old_path);
933	old_buf[old_path.len] = 0;	903	old_buf[old_path.len] = 0;
934		904
935	const new_buf = full_buf[old_path.len + 1..];	905	const new_buf = full_buf[old_path.len + 1 ..];
936	mem.copy(u8, new_buf, new_path);	906	mem.copy(u8, new_buf, new_path);
937	new_buf[new_path.len] = 0;	907	new_buf[new_path.len] = 0;
938		908
...	@@ -948,12 +918,10 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)	...	@@ -948,12 +918,10 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)
948	const err = posix.getErrno(posix.rename(old_buf.ptr, new_buf.ptr));	918	const err = posix.getErrno(posix.rename(old_buf.ptr, new_buf.ptr));
949	if (err > 0) {	919	if (err > 0) {
950	return switch (err) {	920	return switch (err) {
951	posix.EACCES,	921	posix.EACCES, posix.EPERM => error.AccessDenied,
952	posix.EPERM => error.AccessDenied,
953	posix.EBUSY => error.FileBusy,	922	posix.EBUSY => error.FileBusy,
954	posix.EDQUOT => error.DiskQuota,	923	posix.EDQUOT => error.DiskQuota,
955	posix.EFAULT,	924	posix.EFAULT, posix.EINVAL => unreachable,
956	posix.EINVAL => unreachable,
957	posix.EISDIR => error.IsDir,	925	posix.EISDIR => error.IsDir,
958	posix.ELOOP => error.SymLinkLoop,	926	posix.ELOOP => error.SymLinkLoop,
959	posix.EMLINK => error.LinkQuotaExceeded,	927	posix.EMLINK => error.LinkQuotaExceeded,
...	@@ -962,8 +930,7 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)	...	@@ -962,8 +930,7 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)
962	posix.ENOTDIR => error.NotDir,	930	posix.ENOTDIR => error.NotDir,
963	posix.ENOMEM => error.SystemResources,	931	posix.ENOMEM => error.SystemResources,
964	posix.ENOSPC => error.NoSpaceLeft,	932	posix.ENOSPC => error.NoSpaceLeft,
965	posix.EEXIST,	933	posix.EEXIST, posix.ENOTEMPTY => error.PathAlreadyExists,
966	posix.ENOTEMPTY => error.PathAlreadyExists,
967	posix.EROFS => error.ReadOnlyFileSystem,	934	posix.EROFS => error.ReadOnlyFileSystem,
968	posix.EXDEV => error.RenameAcrossMountPoints,	935	posix.EXDEV => error.RenameAcrossMountPoints,
969	else => unexpectedErrorPosix(err),	936	else => unexpectedErrorPosix(err),
...	@@ -972,7 +939,7 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)	...	@@ -972,7 +939,7 @@ pub fn rename(allocator: &Allocator, old_path: []const u8, new_path: []const u8)
972	}	939	}
973	}	940	}
974		941
975	pub fn makeDir(allocator: &Allocator, dir_path: []const u8) !void {	942	pub fn makeDir(allocator: *Allocator, dir_path: []const u8) !void {
976	if (is_windows) {	943	if (is_windows) {
977	return makeDirWindows(allocator, dir_path);	944	return makeDirWindows(allocator, dir_path);
978	} else {	945	} else {
...	@@ -980,7 +947,7 @@ pub fn makeDir(allocator: &Allocator, dir_path: []const u8) !void {	...	@@ -980,7 +947,7 @@ pub fn makeDir(allocator: &Allocator, dir_path: []const u8) !void {
980	}	947	}
981	}	948	}
982		949
983	pub fn makeDirWindows(allocator: &Allocator, dir_path: []const u8) !void {	950	pub fn makeDirWindows(allocator: *Allocator, dir_path: []const u8) !void {
984	const path_buf = try cstr.addNullByte(allocator, dir_path);	951	const path_buf = try cstr.addNullByte(allocator, dir_path);
985	defer allocator.free(path_buf);	952	defer allocator.free(path_buf);
986		953
...	@@ -994,15 +961,14 @@ pub fn makeDirWindows(allocator: &Allocator, dir_path: []const u8) !void {	...	@@ -994,15 +961,14 @@ pub fn makeDirWindows(allocator: &Allocator, dir_path: []const u8) !void {
994	}	961	}
995	}	962	}
996		963
997	pub fn makeDirPosix(allocator: &Allocator, dir_path: []const u8) !void {	964	pub fn makeDirPosix(allocator: *Allocator, dir_path: []const u8) !void {
998	const path_buf = try cstr.addNullByte(allocator, dir_path);	965	const path_buf = try cstr.addNullByte(allocator, dir_path);
999	defer allocator.free(path_buf);	966	defer allocator.free(path_buf);
1000		967
1001	const err = posix.getErrno(posix.mkdir(path_buf.ptr, 0o755));	968	const err = posix.getErrno(posix.mkdir(path_buf.ptr, 0o755));
1002	if (err > 0) {	969	if (err > 0) {
1003	return switch (err) {	970	return switch (err) {
1004	posix.EACCES,	971	posix.EACCES, posix.EPERM => error.AccessDenied,
1005	posix.EPERM => error.AccessDenied,
1006	posix.EDQUOT => error.DiskQuota,	972	posix.EDQUOT => error.DiskQuota,
1007	posix.EEXIST => error.PathAlreadyExists,	973	posix.EEXIST => error.PathAlreadyExists,
1008	posix.EFAULT => unreachable,	974	posix.EFAULT => unreachable,
...	@@ -1021,7 +987,7 @@ pub fn makeDirPosix(allocator: &Allocator, dir_path: []const u8) !void {	...	@@ -1021,7 +987,7 @@ pub fn makeDirPosix(allocator: &Allocator, dir_path: []const u8) !void {
1021		987
1022	/// Calls makeDir recursively to make an entire path. Returns success if the path	988	/// Calls makeDir recursively to make an entire path. Returns success if the path
1023	/// already exists and is a directory.	989	/// already exists and is a directory.
1024	pub fn makePath(allocator: &Allocator, full_path: []const u8) !void {	990	pub fn makePath(allocator: *Allocator, full_path: []const u8) !void {
1025	const resolved_path = try path.resolve(allocator, full_path);	991	const resolved_path = try path.resolve(allocator, full_path);
1026	defer allocator.free(resolved_path);	992	defer allocator.free(resolved_path);
1027		993
...	@@ -1055,7 +1021,7 @@ pub fn makePath(allocator: &Allocator, full_path: []const u8) !void {	...	@@ -1055,7 +1021,7 @@ pub fn makePath(allocator: &Allocator, full_path: []const u8) !void {
1055		1021
1056	/// Returns ::error.DirNotEmpty if the directory is not empty.	1022	/// Returns ::error.DirNotEmpty if the directory is not empty.
1057	/// To delete a directory recursively, see ::deleteTree	1023	/// To delete a directory recursively, see ::deleteTree
1058	pub fn deleteDir(allocator: &Allocator, dir_path: []const u8) !void {	1024	pub fn deleteDir(allocator: *Allocator, dir_path: []const u8) !void {
1059	const path_buf = try allocator.alloc(u8, dir_path.len + 1);	1025	const path_buf = try allocator.alloc(u8, dir_path.len + 1);
1060	defer allocator.free(path_buf);	1026	defer allocator.free(path_buf);
1061		1027
...	@@ -1065,18 +1031,15 @@ pub fn deleteDir(allocator: &Allocator, dir_path: []const u8) !void {	...	@@ -1065,18 +1031,15 @@ pub fn deleteDir(allocator: &Allocator, dir_path: []const u8) !void {
1065	const err = posix.getErrno(posix.rmdir(path_buf.ptr));	1031	const err = posix.getErrno(posix.rmdir(path_buf.ptr));
1066	if (err > 0) {	1032	if (err > 0) {
1067	return switch (err) {	1033	return switch (err) {
1068	posix.EACCES,	1034	posix.EACCES, posix.EPERM => error.AccessDenied,
1069	posix.EPERM => error.AccessDenied,
1070	posix.EBUSY => error.FileBusy,	1035	posix.EBUSY => error.FileBusy,
1071	posix.EFAULT,	1036	posix.EFAULT, posix.EINVAL => unreachable,
1072	posix.EINVAL => unreachable,
1073	posix.ELOOP => error.SymLinkLoop,	1037	posix.ELOOP => error.SymLinkLoop,
1074	posix.ENAMETOOLONG => error.NameTooLong,	1038	posix.ENAMETOOLONG => error.NameTooLong,
1075	posix.ENOENT => error.FileNotFound,	1039	posix.ENOENT => error.FileNotFound,
1076	posix.ENOMEM => error.SystemResources,	1040	posix.ENOMEM => error.SystemResources,
1077	posix.ENOTDIR => error.NotDir,	1041	posix.ENOTDIR => error.NotDir,
1078	posix.EEXIST,	1042	posix.EEXIST, posix.ENOTEMPTY => error.DirNotEmpty,
1079	posix.ENOTEMPTY => error.DirNotEmpty,
1080	posix.EROFS => error.ReadOnlyFileSystem,	1043	posix.EROFS => error.ReadOnlyFileSystem,
1081	else => unexpectedErrorPosix(err),	1044	else => unexpectedErrorPosix(err),
1082	};	1045	};
...	@@ -1109,7 +1072,7 @@ const DeleteTreeError = error{	...	@@ -1109,7 +1072,7 @@ const DeleteTreeError = error{
1109	DirNotEmpty,	1072	DirNotEmpty,
1110	Unexpected,	1073	Unexpected,
1111	};	1074	};
1112	pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!void {	1075	pub fn deleteTree(allocator: *Allocator, full_path: []const u8) DeleteTreeError!void {
1113	start_over: while (true) {	1076	start_over: while (true) {
1114	var got_access_denied = false;	1077	var got_access_denied = false;
1115	// First, try deleting the item as a file. This way we don't follow sym links.	1078	// First, try deleting the item as a file. This way we don't follow sym links.
...	@@ -1128,7 +1091,8 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!	...	@@ -1128,7 +1091,8 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!
1128	error.NotDir,	1091	error.NotDir,
1129	error.FileSystem,	1092	error.FileSystem,
1130	error.FileBusy,	1093	error.FileBusy,
1131	error.Unexpected => return err,	1094	error.Unexpected,
		1095	=> return err,
1132	}	1096	}
1133	{	1097	{
1134	var dir = Dir.open(allocator, full_path) catch \|err\| switch (err) {	1098	var dir = Dir.open(allocator, full_path) catch \|err\| switch (err) {
...	@@ -1152,7 +1116,8 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!	...	@@ -1152,7 +1116,8 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!
1152	error.SystemResources,	1116	error.SystemResources,
1153	error.NoSpaceLeft,	1117	error.NoSpaceLeft,
1154	error.PathAlreadyExists,	1118	error.PathAlreadyExists,
1155	error.Unexpected => return err,	1119	error.Unexpected,
		1120	=> return err,
1156	};	1121	};
1157	defer dir.close();	1122	defer dir.close();
1158		1123
...	@@ -1164,7 +1129,7 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!	...	@@ -1164,7 +1129,7 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!
1164	const full_entry_path = full_entry_buf.toSlice();	1129	const full_entry_path = full_entry_buf.toSlice();
1165	mem.copy(u8, full_entry_path, full_path);	1130	mem.copy(u8, full_entry_path, full_path);
1166	full_entry_path[full_path.len] = '/';	1131	full_entry_path[full_path.len] = '/';
1167	mem.copy(u8, full_entry_path[full_path.len + 1..], entry.name);	1132	mem.copy(u8, full_entry_path[full_path.len + 1 ..], entry.name);
1168		1133
1169	try deleteTree(allocator, full_entry_path);	1134	try deleteTree(allocator, full_entry_path);
1170	}	1135	}
...	@@ -1176,14 +1141,13 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!	...	@@ -1176,14 +1141,13 @@ pub fn deleteTree(allocator: &Allocator, full_path: []const u8) DeleteTreeError!
1176	pub const Dir = struct {	1141	pub const Dir = struct {
1177	fd: i32,	1142	fd: i32,
1178	darwin_seek: darwin_seek_t,	1143	darwin_seek: darwin_seek_t,
1179	allocator: &Allocator,	1144	allocator: *Allocator,
1180	buf: []u8,	1145	buf: []u8,
1181	index: usize,	1146	index: usize,
1182	end_index: usize,	1147	end_index: usize,
1183		1148
1184	const darwin_seek_t = switch (builtin.os) {	1149	const darwin_seek_t = switch (builtin.os) {
1185	Os.macosx,	1150	Os.macosx, Os.ios => i64,
1186	Os.ios => i64,
1187	else => void,	1151	else => void,
1188	};	1152	};
1189		1153
...	@@ -1204,17 +1168,20 @@ pub const Dir = struct {	...	@@ -1204,17 +1168,20 @@ pub const Dir = struct {
1204	};	1168	};
1205	};	1169	};
1206		1170
1207	pub fn open(allocator: &Allocator, dir_path: []const u8) !Dir {	1171	pub fn open(allocator: *Allocator, dir_path: []const u8) !Dir {
1208	const fd = switch (builtin.os) {	1172	const fd = switch (builtin.os) {
1209	Os.windows => @compileError("TODO support Dir.open for windows"),	1173	Os.windows => @compileError("TODO support Dir.open for windows"),
1210	Os.linux => try posixOpen(allocator, dir_path, posix.O_RDONLY \| posix.O_DIRECTORY \| posix.O_CLOEXEC, 0),	1174	Os.linux => try posixOpen(allocator, dir_path, posix.O_RDONLY \| posix.O_DIRECTORY \| posix.O_CLOEXEC, 0),
1211	Os.macosx,	1175	Os.macosx, Os.ios => try posixOpen(
1212	Os.ios => try posixOpen(allocator, dir_path, posix.O_RDONLY \| posix.O_NONBLOCK \| posix.O_DIRECTORY \| posix.O_CLOEXEC, 0),	1176	allocator,
		1177	dir_path,
		1178	posix.O_RDONLY \| posix.O_NONBLOCK \| posix.O_DIRECTORY \| posix.O_CLOEXEC,
		1179	0,
		1180	),
1213	else => @compileError("Dir.open is not supported for this platform"),	1181	else => @compileError("Dir.open is not supported for this platform"),
1214	};	1182	};
1215	const darwin_seek_init = switch (builtin.os) {	1183	const darwin_seek_init = switch (builtin.os) {
1216	Os.macosx,	1184	Os.macosx, Os.ios => 0,
1217	Os.ios => 0,
1218	else => {},	1185	else => {},
1219	};	1186	};
1220	return Dir{	1187	return Dir{
...	@@ -1227,24 +1194,23 @@ pub const Dir = struct {	...	@@ -1227,24 +1194,23 @@ pub const Dir = struct {
1227	};	1194	};
1228	}	1195	}
1229		1196
1230	pub fn close(self: &Dir) void {	1197	pub fn close(self: *Dir) void {
1231	self.allocator.free(self.buf);	1198	self.allocator.free(self.buf);
1232	os.close(self.fd);	1199	os.close(self.fd);
1233	}	1200	}
1234		1201
1235	/// Memory such as file names referenced in this returned entry becomes invalid	1202	/// Memory such as file names referenced in this returned entry becomes invalid
1236	/// with subsequent calls to next, as well as when this ::Dir is deinitialized.	1203	/// with subsequent calls to next, as well as when this ::Dir is deinitialized.
1237	pub fn next(self: &Dir) !?Entry {	1204	pub fn next(self: *Dir) !?Entry {
1238	switch (builtin.os) {	1205	switch (builtin.os) {
1239	Os.linux => return self.nextLinux(),	1206	Os.linux => return self.nextLinux(),
1240	Os.macosx,	1207	Os.macosx, Os.ios => return self.nextDarwin(),
1241	Os.ios => return self.nextDarwin(),
1242	Os.windows => return self.nextWindows(),	1208	Os.windows => return self.nextWindows(),
1243	else => @compileError("Dir.next not supported on " ++ @tagName(builtin.os)),	1209	else => @compileError("Dir.next not supported on " ++ @tagName(builtin.os)),
1244	}	1210	}
1245	}	1211	}
1246		1212
1247	fn nextDarwin(self: &Dir) !?Entry {	1213	fn nextDarwin(self: *Dir) !?Entry {
1248	start_over: while (true) {	1214	start_over: while (true) {
1249	if (self.index >= self.end_index) {	1215	if (self.index >= self.end_index) {
1250	if (self.buf.len == 0) {	1216	if (self.buf.len == 0) {
...	@@ -1256,9 +1222,7 @@ pub const Dir = struct {	...	@@ -1256,9 +1222,7 @@ pub const Dir = struct {
1256	const err = posix.getErrno(result);	1222	const err = posix.getErrno(result);
1257	if (err > 0) {	1223	if (err > 0) {
1258	switch (err) {	1224	switch (err) {
1259	posix.EBADF,	1225	posix.EBADF, posix.EFAULT, posix.ENOTDIR => unreachable,
1260	posix.EFAULT,
1261	posix.ENOTDIR => unreachable,
1262	posix.EINVAL => {	1226	posix.EINVAL => {
1263	self.buf = try self.allocator.realloc(u8, self.buf, self.buf.len * 2);	1227	self.buf = try self.allocator.realloc(u8, self.buf, self.buf.len * 2);
1264	continue;	1228	continue;
...	@@ -1272,7 +1236,7 @@ pub const Dir = struct {	...	@@ -1272,7 +1236,7 @@ pub const Dir = struct {
1272	break;	1236	break;
1273	}	1237	}
1274	}	1238	}
1275	const darwin_entry = @ptrCast(&align(1) posix.dirent, &self.buf[self.index]);	1239	const darwin_entry = @ptrCast(*align(1) posix.dirent, &self.buf[self.index]);
1276	const next_index = self.index + darwin_entry.d_reclen;	1240	const next_index = self.index + darwin_entry.d_reclen;
1277	self.index = next_index;	1241	self.index = next_index;
1278		1242
...	@@ -1301,11 +1265,11 @@ pub const Dir = struct {	...	@@ -1301,11 +1265,11 @@ pub const Dir = struct {
1301	}	1265	}
1302	}	1266	}
1303		1267
1304	fn nextWindows(self: &Dir) !?Entry {	1268	fn nextWindows(self: *Dir) !?Entry {
1305	@compileError("TODO support Dir.next for windows");	1269	@compileError("TODO support Dir.next for windows");
1306	}	1270	}
1307		1271
1308	fn nextLinux(self: &Dir) !?Entry {	1272	fn nextLinux(self: *Dir) !?Entry {
1309	start_over: while (true) {	1273	start_over: while (true) {
1310	if (self.index >= self.end_index) {	1274	if (self.index >= self.end_index) {
1311	if (self.buf.len == 0) {	1275	if (self.buf.len == 0) {
...	@@ -1317,9 +1281,7 @@ pub const Dir = struct {	...	@@ -1317,9 +1281,7 @@ pub const Dir = struct {
1317	const err = posix.getErrno(result);	1281	const err = posix.getErrno(result);
1318	if (err > 0) {	1282	if (err > 0) {
1319	switch (err) {	1283	switch (err) {
1320	posix.EBADF,	1284	posix.EBADF, posix.EFAULT, posix.ENOTDIR => unreachable,
1321	posix.EFAULT,
1322	posix.ENOTDIR => unreachable,
1323	posix.EINVAL => {	1285	posix.EINVAL => {
1324	self.buf = try self.allocator.realloc(u8, self.buf, self.buf.len * 2);	1286	self.buf = try self.allocator.realloc(u8, self.buf, self.buf.len * 2);
1325	continue;	1287	continue;
...	@@ -1333,11 +1295,11 @@ pub const Dir = struct {	...	@@ -1333,11 +1295,11 @@ pub const Dir = struct {
1333	break;	1295	break;
1334	}	1296	}
1335	}	1297	}
1336	const linux_entry = @ptrCast(&align(1) posix.dirent, &self.buf[self.index]);	1298	const linux_entry = @ptrCast(*align(1) posix.dirent, &self.buf[self.index]);
1337	const next_index = self.index + linux_entry.d_reclen;	1299	const next_index = self.index + linux_entry.d_reclen;
1338	self.index = next_index;	1300	self.index = next_index;
1339		1301
1340	const name = cstr.toSlice(&linux_entry.d_name);	1302	const name = cstr.toSlice(@ptrCast([*]u8, &linux_entry.d_name));
1341		1303
1342	// skip . and .. entries	1304	// skip . and .. entries
1343	if (mem.eql(u8, name, ".") or mem.eql(u8, name, "..")) {	1305	if (mem.eql(u8, name, ".") or mem.eql(u8, name, "..")) {
...	@@ -1363,7 +1325,7 @@ pub const Dir = struct {	...	@@ -1363,7 +1325,7 @@ pub const Dir = struct {
1363	}	1325	}
1364	};	1326	};
1365		1327
1366	pub fn changeCurDir(allocator: &Allocator, dir_path: []const u8) !void {	1328	pub fn changeCurDir(allocator: *Allocator, dir_path: []const u8) !void {
1367	const path_buf = try allocator.alloc(u8, dir_path.len + 1);	1329	const path_buf = try allocator.alloc(u8, dir_path.len + 1);
1368	defer allocator.free(path_buf);	1330	defer allocator.free(path_buf);
1369		1331
...	@@ -1387,7 +1349,7 @@ pub fn changeCurDir(allocator: &Allocator, dir_path: []const u8) !void {	...	@@ -1387,7 +1349,7 @@ pub fn changeCurDir(allocator: &Allocator, dir_path: []const u8) !void {
1387	}	1349	}
1388		1350
1389	/// Read value of a symbolic link.	1351	/// Read value of a symbolic link.
1390	pub fn readLink(allocator: &Allocator, pathname: []const u8) ![]u8 {	1352	pub fn readLink(allocator: *Allocator, pathname: []const u8) ![]u8 {
1391	const path_buf = try allocator.alloc(u8, pathname.len + 1);	1353	const path_buf = try allocator.alloc(u8, pathname.len + 1);
1392	defer allocator.free(path_buf);	1354	defer allocator.free(path_buf);
1393		1355
...	@@ -1402,8 +1364,7 @@ pub fn readLink(allocator: &Allocator, pathname: []const u8) ![]u8 {	...	@@ -1402,8 +1364,7 @@ pub fn readLink(allocator: &Allocator, pathname: []const u8) ![]u8 {
1402	if (err > 0) {	1364	if (err > 0) {
1403	return switch (err) {	1365	return switch (err) {
1404	posix.EACCES => error.AccessDenied,	1366	posix.EACCES => error.AccessDenied,
1405	posix.EFAULT,	1367	posix.EFAULT, posix.EINVAL => unreachable,
1406	posix.EINVAL => unreachable,
1407	posix.EIO => error.FileSystem,	1368	posix.EIO => error.FileSystem,
1408	posix.ELOOP => error.SymLinkLoop,	1369	posix.ELOOP => error.SymLinkLoop,
1409	posix.ENAMETOOLONG => error.NameTooLong,	1370	posix.ENAMETOOLONG => error.NameTooLong,
...	@@ -1495,7 +1456,7 @@ pub const ArgIteratorPosix = struct {	...	@@ -1495,7 +1456,7 @@ pub const ArgIteratorPosix = struct {
1495	};	1456	};
1496	}	1457	}
1497		1458
1498	pub fn next(self: &ArgIteratorPosix) ?[]const u8 {	1459	pub fn next(self: *ArgIteratorPosix) ?[]const u8 {
1499	if (self.index == self.count) return null;	1460	if (self.index == self.count) return null;
1500		1461
1501	const s = raw[self.index];	1462	const s = raw[self.index];
...	@@ -1503,7 +1464,7 @@ pub const ArgIteratorPosix = struct {	...	@@ -1503,7 +1464,7 @@ pub const ArgIteratorPosix = struct {
1503	return cstr.toSlice(s);	1464	return cstr.toSlice(s);
1504	}	1465	}
1505		1466
1506	pub fn skip(self: &ArgIteratorPosix) bool {	1467	pub fn skip(self: *ArgIteratorPosix) bool {
1507	if (self.index == self.count) return false;	1468	if (self.index == self.count) return false;
1508		1469
1509	self.index += 1;	1470	self.index += 1;
...	@@ -1512,12 +1473,12 @@ pub const ArgIteratorPosix = struct {	...	@@ -1512,12 +1473,12 @@ pub const ArgIteratorPosix = struct {
1512		1473
1513	/// This is marked as public but actually it's only meant to be used	1474	/// This is marked as public but actually it's only meant to be used
1514	/// internally by zig's startup code.	1475	/// internally by zig's startup code.
1515	pub var raw: []&u8 = undefined;	1476	pub var raw: [][*]u8 = undefined;
1516	};	1477	};
1517		1478
1518	pub const ArgIteratorWindows = struct {	1479	pub const ArgIteratorWindows = struct {
1519	index: usize,	1480	index: usize,
1520	cmd_line: &const u8,	1481	cmd_line: [*]const u8,
1521	in_quote: bool,	1482	in_quote: bool,
1522	quote_count: usize,	1483	quote_count: usize,
1523	seen_quote_count: usize,	1484	seen_quote_count: usize,
...	@@ -1528,7 +1489,7 @@ pub const ArgIteratorWindows = struct {	...	@@ -1528,7 +1489,7 @@ pub const ArgIteratorWindows = struct {
1528	return initWithCmdLine(windows.GetCommandLineA());	1489	return initWithCmdLine(windows.GetCommandLineA());
1529	}	1490	}
1530		1491
1531	pub fn initWithCmdLine(cmd_line: &const u8) ArgIteratorWindows {	1492	pub fn initWithCmdLine(cmd_line: [*]const u8) ArgIteratorWindows {
1532	return ArgIteratorWindows{	1493	return ArgIteratorWindows{
1533	.index = 0,	1494	.index = 0,
1534	.cmd_line = cmd_line,	1495	.cmd_line = cmd_line,
...	@@ -1539,14 +1500,13 @@ pub const ArgIteratorWindows = struct {	...	@@ -1539,14 +1500,13 @@ pub const ArgIteratorWindows = struct {
1539	}	1500	}
1540		1501
1541	/// You must free the returned memory when done.	1502	/// You must free the returned memory when done.
1542	pub fn next(self: &ArgIteratorWindows, allocator: &Allocator) ?(NextError![]u8) {	1503	pub fn next(self: ArgIteratorWindows, allocator: Allocator) ?(NextError![]u8) {
1543	// march forward over whitespace	1504	// march forward over whitespace
1544	while (true) : (self.index += 1) {	1505	while (true) : (self.index += 1) {
1545	const byte = self.cmd_line[self.index];	1506	const byte = self.cmd_line[self.index];
1546	switch (byte) {	1507	switch (byte) {
1547	0 => return null,	1508	0 => return null,
1548	' ',	1509	' ', '\t' => continue,
1549	'\t' => continue,
1550	else => break,	1510	else => break,
1551	}	1511	}
1552	}	1512	}
...	@@ -1554,14 +1514,13 @@ pub const ArgIteratorWindows = struct {	...	@@ -1554,14 +1514,13 @@ pub const ArgIteratorWindows = struct {
1554	return self.internalNext(allocator);	1514	return self.internalNext(allocator);
1555	}	1515	}
1556		1516
1557	pub fn skip(self: &ArgIteratorWindows) bool {	1517	pub fn skip(self: *ArgIteratorWindows) bool {
1558	// march forward over whitespace	1518	// march forward over whitespace
1559	while (true) : (self.index += 1) {	1519	while (true) : (self.index += 1) {
1560	const byte = self.cmd_line[self.index];	1520	const byte = self.cmd_line[self.index];
1561	switch (byte) {	1521	switch (byte) {
1562	0 => return false,	1522	0 => return false,
1563	' ',	1523	' ', '\t' => continue,
1564	'\t' => continue,
1565	else => break,	1524	else => break,
1566	}	1525	}
1567	}	1526	}
...	@@ -1580,8 +1539,7 @@ pub const ArgIteratorWindows = struct {	...	@@ -1580,8 +1539,7 @@ pub const ArgIteratorWindows = struct {
1580	'\\' => {	1539	'\\' => {
1581	backslash_count += 1;	1540	backslash_count += 1;
1582	},	1541	},
1583	' ',	1542	' ', '\t' => {
1584	'\t' => {
1585	if (self.seen_quote_count % 2 == 0 or self.seen_quote_count == self.quote_count) {	1543	if (self.seen_quote_count % 2 == 0 or self.seen_quote_count == self.quote_count) {
1586	return true;	1544	return true;
1587	}	1545	}
...	@@ -1595,7 +1553,7 @@ pub const ArgIteratorWindows = struct {	...	@@ -1595,7 +1553,7 @@ pub const ArgIteratorWindows = struct {
1595	}	1553	}
1596	}	1554	}
1597		1555
1598	fn internalNext(self: &ArgIteratorWindows, allocator: &Allocator) NextError![]u8 {	1556	fn internalNext(self: ArgIteratorWindows, allocator: Allocator) NextError![]u8 {
1599	var buf = try Buffer.initSize(allocator, 0);	1557	var buf = try Buffer.initSize(allocator, 0);
1600	defer buf.deinit();	1558	defer buf.deinit();
1601		1559
...	@@ -1621,8 +1579,7 @@ pub const ArgIteratorWindows = struct {	...	@@ -1621,8 +1579,7 @@ pub const ArgIteratorWindows = struct {
1621	'\\' => {	1579	'\\' => {
1622	backslash_count += 1;	1580	backslash_count += 1;
1623	},	1581	},
1624	' ',	1582	' ', '\t' => {
1625	'\t' => {
1626	try self.emitBackslashes(&buf, backslash_count);	1583	try self.emitBackslashes(&buf, backslash_count);
1627	backslash_count = 0;	1584	backslash_count = 0;
1628	if (self.seen_quote_count % 2 == 1 and self.seen_quote_count != self.quote_count) {	1585	if (self.seen_quote_count % 2 == 1 and self.seen_quote_count != self.quote_count) {
...	@@ -1640,14 +1597,14 @@ pub const ArgIteratorWindows = struct {	...	@@ -1640,14 +1597,14 @@ pub const ArgIteratorWindows = struct {
1640	}	1597	}
1641	}	1598	}
1642		1599
1643	fn emitBackslashes(self: &ArgIteratorWindows, buf: &Buffer, emit_count: usize) !void {	1600	fn emitBackslashes(self: ArgIteratorWindows, buf: Buffer, emit_count: usize) !void {
1644	var i: usize = 0;	1601	var i: usize = 0;
1645	while (i < emit_count) : (i += 1) {	1602	while (i < emit_count) : (i += 1) {
1646	try buf.appendByte('\\');	1603	try buf.appendByte('\\');
1647	}	1604	}
1648	}	1605	}
1649		1606
1650	fn countQuotes(cmd_line: &const u8) usize {	1607	fn countQuotes(cmd_line: [*]const u8) usize {
1651	var result: usize = 0;	1608	var result: usize = 0;
1652	var backslash_count: usize = 0;	1609	var backslash_count: usize = 0;
1653	var index: usize = 0;	1610	var index: usize = 0;
...	@@ -1680,7 +1637,7 @@ pub const ArgIterator = struct {	...	@@ -1680,7 +1637,7 @@ pub const ArgIterator = struct {
1680	pub const NextError = ArgIteratorWindows.NextError;	1637	pub const NextError = ArgIteratorWindows.NextError;
1681		1638
1682	/// You must free the returned memory when done.	1639	/// You must free the returned memory when done.
1683	pub fn next(self: &ArgIterator, allocator: &Allocator) ?(NextError![]u8) {	1640	pub fn next(self: ArgIterator, allocator: Allocator) ?(NextError![]u8) {
1684	if (builtin.os == Os.windows) {	1641	if (builtin.os == Os.windows) {
1685	return self.inner.next(allocator);	1642	return self.inner.next(allocator);
1686	} else {	1643	} else {
...	@@ -1689,13 +1646,13 @@ pub const ArgIterator = struct {	...	@@ -1689,13 +1646,13 @@ pub const ArgIterator = struct {
1689	}	1646	}
1690		1647
1691	/// If you only are targeting posix you can call this and not need an allocator.	1648	/// If you only are targeting posix you can call this and not need an allocator.
1692	pub fn nextPosix(self: &ArgIterator) ?[]const u8 {	1649	pub fn nextPosix(self: *ArgIterator) ?[]const u8 {
1693	return self.inner.next();	1650	return self.inner.next();
1694	}	1651	}
1695		1652
1696	/// Parse past 1 argument without capturing it.	1653	/// Parse past 1 argument without capturing it.
1697	/// Returns `true` if skipped an arg, `false` if we are at the end.	1654	/// Returns `true` if skipped an arg, `false` if we are at the end.
1698	pub fn skip(self: &ArgIterator) bool {	1655	pub fn skip(self: *ArgIterator) bool {
1699	return self.inner.skip();	1656	return self.inner.skip();
1700	}	1657	}
1701	};	1658	};
...	@@ -1705,7 +1662,7 @@ pub fn args() ArgIterator {	...	@@ -1705,7 +1662,7 @@ pub fn args() ArgIterator {
1705	}	1662	}
1706		1663
1707	/// Caller must call freeArgs on result.	1664	/// Caller must call freeArgs on result.
1708	pub fn argsAlloc(allocator: &mem.Allocator) ![]const []u8 {	1665	pub fn argsAlloc(allocator: *mem.Allocator) ![]const []u8 {
1709	// TODO refactor to only make 1 allocation.	1666	// TODO refactor to only make 1 allocation.
1710	var it = args();	1667	var it = args();
1711	var contents = try Buffer.initSize(allocator, 0);	1668	var contents = try Buffer.initSize(allocator, 0);
...	@@ -1742,50 +1699,23 @@ pub fn argsAlloc(allocator: &mem.Allocator) ![]const []u8 {	...	@@ -1742,50 +1699,23 @@ pub fn argsAlloc(allocator: &mem.Allocator) ![]const []u8 {
1742	return result_slice_list;	1699	return result_slice_list;
1743	}	1700	}
1744		1701
1745	pub fn argsFree(allocator: &mem.Allocator, args_alloc: []const []u8) void {	1702	pub fn argsFree(allocator: *mem.Allocator, args_alloc: []const []u8) void {
1746	var total_bytes: usize = 0;	1703	var total_bytes: usize = 0;
1747	for (args_alloc) \|arg\| {	1704	for (args_alloc) \|arg\| {
1748	total_bytes += @sizeOf([]u8) + arg.len;	1705	total_bytes += @sizeOf([]u8) + arg.len;
1749	}	1706	}
1750	const unaligned_allocated_buf = @ptrCast(&const u8, args_alloc.ptr)[0..total_bytes];	1707	const unaligned_allocated_buf = @ptrCast(*const u8, args_alloc.ptr)[0..total_bytes];
1751	const aligned_allocated_buf = @alignCast(@alignOf([]u8), unaligned_allocated_buf);	1708	const aligned_allocated_buf = @alignCast(@alignOf([]u8), unaligned_allocated_buf);
1752	return allocator.free(aligned_allocated_buf);	1709	return allocator.free(aligned_allocated_buf);
1753	}	1710	}
1754		1711
1755	test "windows arg parsing" {	1712	test "windows arg parsing" {
1756	testWindowsCmdLine(c"a b\tc d", [][]const u8{	1713	testWindowsCmdLine(c"a b\tc d", [][]const u8{ "a", "b", "c", "d" });
1757	"a",	1714	testWindowsCmdLine(c"\"abc\" d e", [][]const u8{ "abc", "d", "e" });
1758	"b",	1715	testWindowsCmdLine(c"a\\\\\\b d\"e f\"g h", [][]const u8{ "a\\\\\\b", "de fg", "h" });
1759	"c",	1716	testWindowsCmdLine(c"a\\\\\\\"b c d", [][]const u8{ "a\\\"b", "c", "d" });
1760	"d",	1717	testWindowsCmdLine(c"a\\\\\\\\\"b c\" d e", [][]const u8{ "a\\\\b c", "d", "e" });
1761	});	1718	testWindowsCmdLine(c"a b\tc \"d f", [][]const u8{ "a", "b", "c", "\"d", "f" });
1762	testWindowsCmdLine(c"\"abc\" d e", [][]const u8{
1763	"abc",
1764	"d",
1765	"e",
1766	});
1767	testWindowsCmdLine(c"a\\\\\\b d\"e f\"g h", [][]const u8{
1768	"a\\\\\\b",
1769	"de fg",
1770	"h",
1771	});
1772	testWindowsCmdLine(c"a\\\\\\\"b c d", [][]const u8{
1773	"a\\\"b",
1774	"c",
1775	"d",
1776	});
1777	testWindowsCmdLine(c"a\\\\\\\\\"b c\" d e", [][]const u8{
1778	"a\\\\b c",
1779	"d",
1780	"e",
1781	});
1782	testWindowsCmdLine(c"a b\tc \"d f", [][]const u8{
1783	"a",
1784	"b",
1785	"c",
1786	"\"d",
1787	"f",
1788	});
1789		1719
1790	testWindowsCmdLine(c"\".\\..\\zig-cache\\build\" \"bin\\zig.exe\" \".\\..\" \".\\..\\zig-cache\" \"--help\"", [][]const u8{	1720	testWindowsCmdLine(c"\".\\..\\zig-cache\\build\" \"bin\\zig.exe\" \".\\..\" \".\\..\\zig-cache\" \"--help\"", [][]const u8{
1791	".\\..\\zig-cache\\build",	1721	".\\..\\zig-cache\\build",
...	@@ -1796,7 +1726,7 @@ test "windows arg parsing" {	...	@@ -1796,7 +1726,7 @@ test "windows arg parsing" {
1796	});	1726	});
1797	}	1727	}
1798		1728
1799	fn testWindowsCmdLine(input_cmd_line: &const u8, expected_args: []const []const u8) void {	1729	fn testWindowsCmdLine(input_cmd_line: [*]const u8, expected_args: []const []const u8) void {
1800	var it = ArgIteratorWindows.initWithCmdLine(input_cmd_line);	1730	var it = ArgIteratorWindows.initWithCmdLine(input_cmd_line);
1801	for (expected_args) \|expected_arg\| {	1731	for (expected_args) \|expected_arg\| {
1802	const arg = ??it.next(debug.global_allocator) catch unreachable;	1732	const arg = ??it.next(debug.global_allocator) catch unreachable;
...	@@ -1840,8 +1770,7 @@ pub fn openSelfExe() !os.File {	...	@@ -1840,8 +1770,7 @@ pub fn openSelfExe() !os.File {
1840	var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);	1770	var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
1841	return os.File.openRead(&fixed_allocator.allocator, proc_file_path);	1771	return os.File.openRead(&fixed_allocator.allocator, proc_file_path);
1842	},	1772	},
1843	Os.macosx,	1773	Os.macosx, Os.ios => {
1844	Os.ios => {
1845	var fixed_buffer_mem: [darwin.PATH_MAX * 2]u8 = undefined;	1774	var fixed_buffer_mem: [darwin.PATH_MAX * 2]u8 = undefined;
1846	var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);	1775	var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
1847	const self_exe_path = try selfExePath(&fixed_allocator.allocator);	1776	const self_exe_path = try selfExePath(&fixed_allocator.allocator);
...	@@ -1853,9 +1782,7 @@ pub fn openSelfExe() !os.File {	...	@@ -1853,9 +1782,7 @@ pub fn openSelfExe() !os.File {
1853		1782
1854	test "openSelfExe" {	1783	test "openSelfExe" {
1855	switch (builtin.os) {	1784	switch (builtin.os) {
1856	Os.linux,	1785	Os.linux, Os.macosx, Os.ios => (try openSelfExe()).close(),
1857	Os.macosx,
1858	Os.ios => (try openSelfExe()).close(),
1859	else => return, // Unsupported OS.	1786	else => return, // Unsupported OS.
1860	}	1787	}
1861	}	1788	}
...	@@ -1866,7 +1793,7 @@ test "openSelfExe" {	...	@@ -1866,7 +1793,7 @@ test "openSelfExe" {
1866	/// This function may return an error if the current executable	1793	/// This function may return an error if the current executable
1867	/// was deleted after spawning.	1794	/// was deleted after spawning.
1868	/// Caller owns returned memory.	1795	/// Caller owns returned memory.
1869	pub fn selfExePath(allocator: &mem.Allocator) ![]u8 {	1796	pub fn selfExePath(allocator: *mem.Allocator) ![]u8 {
1870	switch (builtin.os) {	1797	switch (builtin.os) {
1871	Os.linux => {	1798	Os.linux => {
1872	// If the currently executing binary has been deleted,	1799	// If the currently executing binary has been deleted,
...	@@ -1893,8 +1820,7 @@ pub fn selfExePath(allocator: &mem.Allocator) ![]u8 {	...	@@ -1893,8 +1820,7 @@ pub fn selfExePath(allocator: &mem.Allocator) ![]u8 {
1893	try out_path.resize(new_len);	1820	try out_path.resize(new_len);
1894	}	1821	}
1895	},	1822	},
1896	Os.macosx,	1823	Os.macosx, Os.ios => {
1897	Os.ios => {
1898	var u32_len: u32 = 0;	1824	var u32_len: u32 = 0;
1899	const ret1 = c._NSGetExecutablePath(undefined, &u32_len);	1825	const ret1 = c._NSGetExecutablePath(undefined, &u32_len);
1900	assert(ret1 != 0);	1826	assert(ret1 != 0);
...	@@ -1910,7 +1836,7 @@ pub fn selfExePath(allocator: &mem.Allocator) ![]u8 {	...	@@ -1910,7 +1836,7 @@ pub fn selfExePath(allocator: &mem.Allocator) ![]u8 {
1910		1836
1911	/// Get the directory path that contains the current executable.	1837	/// Get the directory path that contains the current executable.
1912	/// Caller owns returned memory.	1838	/// Caller owns returned memory.
1913	pub fn selfExeDirPath(allocator: &mem.Allocator) ![]u8 {	1839	pub fn selfExeDirPath(allocator: *mem.Allocator) ![]u8 {
1914	switch (builtin.os) {	1840	switch (builtin.os) {
1915	Os.linux => {	1841	Os.linux => {
1916	// If the currently executing binary has been deleted,	1842	// If the currently executing binary has been deleted,
...	@@ -1922,9 +1848,7 @@ pub fn selfExeDirPath(allocator: &mem.Allocator) ![]u8 {	...	@@ -1922,9 +1848,7 @@ pub fn selfExeDirPath(allocator: &mem.Allocator) ![]u8 {
1922	const dir = path.dirname(full_exe_path);	1848	const dir = path.dirname(full_exe_path);
1923	return allocator.shrink(u8, full_exe_path, dir.len);	1849	return allocator.shrink(u8, full_exe_path, dir.len);
1924	},	1850	},
1925	Os.windows,	1851	Os.windows, Os.macosx, Os.ios => {
1926	Os.macosx,
1927	Os.ios => {
1928	const self_exe_path = try selfExePath(allocator);	1852	const self_exe_path = try selfExePath(allocator);
1929	errdefer allocator.free(self_exe_path);	1853	errdefer allocator.free(self_exe_path);
1930	const dirname = os.path.dirname(self_exe_path);	1854	const dirname = os.path.dirname(self_exe_path);
...	@@ -1981,8 +1905,7 @@ pub fn posixSocket(domain: u32, socket_type: u32, protocol: u32) !i32 {	...	@@ -1981,8 +1905,7 @@ pub fn posixSocket(domain: u32, socket_type: u32, protocol: u32) !i32 {
1981	posix.EINVAL => return PosixSocketError.ProtocolFamilyNotAvailable,	1905	posix.EINVAL => return PosixSocketError.ProtocolFamilyNotAvailable,
1982	posix.EMFILE => return PosixSocketError.ProcessFdQuotaExceeded,	1906	posix.EMFILE => return PosixSocketError.ProcessFdQuotaExceeded,
1983	posix.ENFILE => return PosixSocketError.SystemFdQuotaExceeded,	1907	posix.ENFILE => return PosixSocketError.SystemFdQuotaExceeded,
1984	posix.ENOBUFS,	1908	posix.ENOBUFS, posix.ENOMEM => return PosixSocketError.SystemResources,
1985	posix.ENOMEM => return PosixSocketError.SystemResources,
1986	posix.EPROTONOSUPPORT => return PosixSocketError.ProtocolNotSupported,	1909	posix.EPROTONOSUPPORT => return PosixSocketError.ProtocolNotSupported,
1987	else => return unexpectedErrorPosix(err),	1910	else => return unexpectedErrorPosix(err),
1988	}	1911	}
...	@@ -1990,7 +1913,7 @@ pub fn posixSocket(domain: u32, socket_type: u32, protocol: u32) !i32 {	...	@@ -1990,7 +1913,7 @@ pub fn posixSocket(domain: u32, socket_type: u32, protocol: u32) !i32 {
1990		1913
1991	pub const PosixBindError = error{	1914	pub const PosixBindError = error{
1992	/// The address is protected, and the user is not the superuser.	1915	/// The address is protected, and the user is not the superuser.
1993	/// For UNIX domain sockets: Search permission is denied on a component	1916	/// For UNIX domain sockets: Search permission is denied on a component
1994	/// of the path prefix.	1917	/// of the path prefix.
1995	AccessDenied,	1918	AccessDenied,
1996		1919
...	@@ -2039,7 +1962,7 @@ pub const PosixBindError = error{	...	@@ -2039,7 +1962,7 @@ pub const PosixBindError = error{
2039	};	1962	};
2040		1963
2041	/// addr is `&const T` where T is one of the sockaddr	1964	/// addr is `&const T` where T is one of the sockaddr
2042	pub fn posixBind(fd: i32, addr: &const posix.sockaddr) PosixBindError!void {	1965	pub fn posixBind(fd: i32, addr: *const posix.sockaddr) PosixBindError!void {
2043	const rc = posix.bind(fd, addr, @sizeOf(posix.sockaddr));	1966	const rc = posix.bind(fd, addr, @sizeOf(posix.sockaddr));
2044	const err = posix.getErrno(rc);	1967	const err = posix.getErrno(rc);
2045	switch (err) {	1968	switch (err) {
...	@@ -2134,7 +2057,7 @@ pub const PosixAcceptError = error{	...	@@ -2134,7 +2057,7 @@ pub const PosixAcceptError = error{
2134	Unexpected,	2057	Unexpected,
2135	};	2058	};
2136		2059
2137	pub fn posixAccept(fd: i32, addr: &posix.sockaddr, flags: u32) PosixAcceptError!i32 {	2060	pub fn posixAccept(fd: i32, addr: *posix.sockaddr, flags: u32) PosixAcceptError!i32 {
2138	while (true) {	2061	while (true) {
2139	var sockaddr_size = u32(@sizeOf(posix.sockaddr));	2062	var sockaddr_size = u32(@sizeOf(posix.sockaddr));
2140	const rc = posix.accept4(fd, addr, &sockaddr_size, flags);	2063	const rc = posix.accept4(fd, addr, &sockaddr_size, flags);
...	@@ -2151,8 +2074,7 @@ pub fn posixAccept(fd: i32, addr: &posix.sockaddr, flags: u32) PosixAcceptError!	...	@@ -2151,8 +2074,7 @@ pub fn posixAccept(fd: i32, addr: &posix.sockaddr, flags: u32) PosixAcceptError!
2151	posix.EINVAL => return PosixAcceptError.InvalidSyscall,	2074	posix.EINVAL => return PosixAcceptError.InvalidSyscall,
2152	posix.EMFILE => return PosixAcceptError.ProcessFdQuotaExceeded,	2075	posix.EMFILE => return PosixAcceptError.ProcessFdQuotaExceeded,
2153	posix.ENFILE => return PosixAcceptError.SystemFdQuotaExceeded,	2076	posix.ENFILE => return PosixAcceptError.SystemFdQuotaExceeded,
2154	posix.ENOBUFS,	2077	posix.ENOBUFS, posix.ENOMEM => return PosixAcceptError.SystemResources,
2155	posix.ENOMEM => return PosixAcceptError.SystemResources,
2156	posix.ENOTSOCK => return PosixAcceptError.FileDescriptorNotASocket,	2078	posix.ENOTSOCK => return PosixAcceptError.FileDescriptorNotASocket,
2157	posix.EOPNOTSUPP => return PosixAcceptError.OperationNotSupported,	2079	posix.EOPNOTSUPP => return PosixAcceptError.OperationNotSupported,
2158	posix.EPROTO => return PosixAcceptError.ProtocolFailure,	2080	posix.EPROTO => return PosixAcceptError.ProtocolFailure,
...	@@ -2234,7 +2156,7 @@ pub const LinuxEpollCtlError = error{	...	@@ -2234,7 +2156,7 @@ pub const LinuxEpollCtlError = error{
2234	Unexpected,	2156	Unexpected,
2235	};	2157	};
2236		2158
2237	pub fn linuxEpollCtl(epfd: i32, op: u32, fd: i32, event: &linux.epoll_event) LinuxEpollCtlError!void {	2159	pub fn linuxEpollCtl(epfd: i32, op: u32, fd: i32, event: *linux.epoll_event) LinuxEpollCtlError!void {
2238	const rc = posix.epoll_ctl(epfd, op, fd, event);	2160	const rc = posix.epoll_ctl(epfd, op, fd, event);
2239	const err = posix.getErrno(rc);	2161	const err = posix.getErrno(rc);
2240	switch (err) {	2162	switch (err) {
...	@@ -2327,7 +2249,7 @@ pub const PosixConnectError = error{	...	@@ -2327,7 +2249,7 @@ pub const PosixConnectError = error{
2327	Unexpected,	2249	Unexpected,
2328	};	2250	};
2329		2251
2330	pub fn posixConnect(sockfd: i32, sockaddr: &const posix.sockaddr) PosixConnectError!void {	2252	pub fn posixConnect(sockfd: i32, sockaddr: *const posix.sockaddr) PosixConnectError!void {
2331	while (true) {	2253	while (true) {
2332	const rc = posix.connect(sockfd, sockaddr, @sizeOf(posix.sockaddr));	2254	const rc = posix.connect(sockfd, sockaddr, @sizeOf(posix.sockaddr));
2333	const err = posix.getErrno(rc);	2255	const err = posix.getErrno(rc);
...	@@ -2358,13 +2280,12 @@ pub fn posixConnect(sockfd: i32, sockaddr: &const posix.sockaddr) PosixConnectEr	...	@@ -2358,13 +2280,12 @@ pub fn posixConnect(sockfd: i32, sockaddr: &const posix.sockaddr) PosixConnectEr
2358		2280
2359	/// Same as posixConnect except it is for blocking socket file descriptors.	2281	/// Same as posixConnect except it is for blocking socket file descriptors.
2360	/// It expects to receive EINPROGRESS.	2282	/// It expects to receive EINPROGRESS.
2361	pub fn posixConnectAsync(sockfd: i32, sockaddr: &const posix.sockaddr) PosixConnectError!void {	2283	pub fn posixConnectAsync(sockfd: i32, sockaddr: *const posix.sockaddr) PosixConnectError!void {
2362	while (true) {	2284	while (true) {
2363	const rc = posix.connect(sockfd, sockaddr, @sizeOf(posix.sockaddr));	2285	const rc = posix.connect(sockfd, sockaddr, @sizeOf(posix.sockaddr));
2364	const err = posix.getErrno(rc);	2286	const err = posix.getErrno(rc);
2365	switch (err) {	2287	switch (err) {
2366	0,	2288	0, posix.EINPROGRESS => return,
2367	posix.EINPROGRESS => return,
2368	else => return unexpectedErrorPosix(err),	2289	else => return unexpectedErrorPosix(err),
2369		2290
2370	posix.EACCES => return PosixConnectError.PermissionDenied,	2291	posix.EACCES => return PosixConnectError.PermissionDenied,
...	@@ -2390,7 +2311,7 @@ pub fn posixConnectAsync(sockfd: i32, sockaddr: &const posix.sockaddr) PosixConn	...	@@ -2390,7 +2311,7 @@ pub fn posixConnectAsync(sockfd: i32, sockaddr: &const posix.sockaddr) PosixConn
2390	pub fn posixGetSockOptConnectError(sockfd: i32) PosixConnectError!void {	2311	pub fn posixGetSockOptConnectError(sockfd: i32) PosixConnectError!void {
2391	var err_code: i32 = undefined;	2312	var err_code: i32 = undefined;
2392	var size: u32 = @sizeOf(i32);	2313	var size: u32 = @sizeOf(i32);
2393	const rc = posix.getsockopt(sockfd, posix.SOL_SOCKET, posix.SO_ERROR, @ptrCast(&u8, &err_code), &size);	2314	const rc = posix.getsockopt(sockfd, posix.SOL_SOCKET, posix.SO_ERROR, @ptrCast([*]u8, &err_code), &size);
2394	assert(size == 4);	2315	assert(size == 4);
2395	const err = posix.getErrno(rc);	2316	const err = posix.getErrno(rc);
2396	switch (err) {	2317	switch (err) {
...	@@ -2416,7 +2337,7 @@ pub fn posixGetSockOptConnectError(sockfd: i32) PosixConnectError!void {	...	@@ -2416,7 +2337,7 @@ pub fn posixGetSockOptConnectError(sockfd: i32) PosixConnectError!void {
2416	},	2337	},
2417	else => return unexpectedErrorPosix(err),	2338	else => return unexpectedErrorPosix(err),
2418	posix.EBADF => unreachable, // The argument sockfd is not a valid file descriptor.	2339	posix.EBADF => unreachable, // The argument sockfd is not a valid file descriptor.
2419	posix.EFAULT => unreachable, // The address pointed to by optval or optlen is not in a valid part of the process address space.	2340	posix.EFAULT => unreachable, // The address pointed to by optval or optlen is not in a valid part of the process address space.
2420	posix.EINVAL => unreachable,	2341	posix.EINVAL => unreachable,
2421	posix.ENOPROTOOPT => unreachable, // The option is unknown at the level indicated.	2342	posix.ENOPROTOOPT => unreachable, // The option is unknown at the level indicated.
2422	posix.ENOTSOCK => unreachable, // The file descriptor sockfd does not refer to a socket.	2343	posix.ENOTSOCK => unreachable, // The file descriptor sockfd does not refer to a socket.
...	@@ -2427,11 +2348,13 @@ pub const Thread = struct {	...	@@ -2427,11 +2348,13 @@ pub const Thread = struct {
2427	data: Data,	2348	data: Data,
2428		2349
2429	pub const use_pthreads = is_posix and builtin.link_libc;	2350	pub const use_pthreads = is_posix and builtin.link_libc;
2430	const Data = if (use_pthreads) struct {	2351	const Data = if (use_pthreads)
2431	handle: c.pthread_t,	2352	struct {
2432	stack_addr: usize,	2353	handle: c.pthread_t,
2433	stack_len: usize,	2354	stack_addr: usize,
2434	} else switch (builtin.os) {	2355	stack_len: usize,
		2356	}
		2357	else switch (builtin.os) {
2435	builtin.Os.linux => struct {	2358	builtin.Os.linux => struct {
2436	pid: i32,	2359	pid: i32,
2437	stack_addr: usize,	2360	stack_addr: usize,
...	@@ -2439,13 +2362,13 @@ pub const Thread = struct {	...	@@ -2439,13 +2362,13 @@ pub const Thread = struct {
2439	},	2362	},
2440	builtin.Os.windows => struct {	2363	builtin.Os.windows => struct {
2441	handle: windows.HANDLE,	2364	handle: windows.HANDLE,
2442	alloc_start: &c_void,	2365	alloc_start: [*]c_void,
2443	heap_handle: windows.HANDLE,	2366	heap_handle: windows.HANDLE,
2444	},	2367	},
2445	else => @compileError("Unsupported OS"),	2368	else => @compileError("Unsupported OS"),
2446	};	2369	};
2447		2370
2448	pub fn wait(self: &const Thread) void {	2371	pub fn wait(self: *const Thread) void {
2449	if (use_pthreads) {	2372	if (use_pthreads) {
2450	const err = c.pthread_join(self.data.handle, null);	2373	const err = c.pthread_join(self.data.handle, null);
2451	switch (err) {	2374	switch (err) {
...	@@ -2511,7 +2434,7 @@ pub const SpawnThreadError = error{	...	@@ -2511,7 +2434,7 @@ pub const SpawnThreadError = error{
2511	/// fn startFn(@typeOf(context)) T	2434	/// fn startFn(@typeOf(context)) T
2512	/// where T is u8, noreturn, void, or !void	2435	/// where T is u8, noreturn, void, or !void
2513	/// caller must call wait on the returned thread	2436	/// caller must call wait on the returned thread
2514	pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread {	2437	pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!*Thread {
2515	// TODO compile-time call graph analysis to determine stack upper bound	2438	// TODO compile-time call graph analysis to determine stack upper bound
2516	// https://github.com/ziglang/zig/issues/157	2439	// https://github.com/ziglang/zig/issues/157
2517	const default_stack_size = 8 * 1024 * 1024;	2440	const default_stack_size = 8 * 1024 * 1024;
...	@@ -2529,7 +2452,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread	...	@@ -2529,7 +2452,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2529	if (@sizeOf(Context) == 0) {	2452	if (@sizeOf(Context) == 0) {
2530	return startFn({});	2453	return startFn({});
2531	} else {	2454	} else {
2532	return startFn(@ptrCast(&Context, @alignCast(@alignOf(Context), arg)).*);	2455	return startFn(@ptrCast(Context, @alignCast(@alignOf(Context), arg)).);
2533	}	2456	}
2534	}	2457	}
2535	};	2458	};
...	@@ -2538,13 +2461,13 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread	...	@@ -2538,13 +2461,13 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2538	const byte_count = @alignOf(WinThread.OuterContext) + @sizeOf(WinThread.OuterContext);	2461	const byte_count = @alignOf(WinThread.OuterContext) + @sizeOf(WinThread.OuterContext);
2539	const bytes_ptr = windows.HeapAlloc(heap_handle, 0, byte_count) ?? return SpawnThreadError.OutOfMemory;	2462	const bytes_ptr = windows.HeapAlloc(heap_handle, 0, byte_count) ?? return SpawnThreadError.OutOfMemory;
2540	errdefer assert(windows.HeapFree(heap_handle, 0, bytes_ptr) != 0);	2463	errdefer assert(windows.HeapFree(heap_handle, 0, bytes_ptr) != 0);
2541	const bytes = @ptrCast(&u8, bytes_ptr)[0..byte_count];	2464	const bytes = @ptrCast([*]u8, bytes_ptr)[0..byte_count];
2542	const outer_context = std.heap.FixedBufferAllocator.init(bytes).allocator.create(WinThread.OuterContext) catch unreachable;	2465	const outer_context = std.heap.FixedBufferAllocator.init(bytes).allocator.create(WinThread.OuterContext) catch unreachable;
2543	outer_context.inner = context;	2466	outer_context.inner = context;
2544	outer_context.thread.data.heap_handle = heap_handle;	2467	outer_context.thread.data.heap_handle = heap_handle;
2545	outer_context.thread.data.alloc_start = bytes_ptr;	2468	outer_context.thread.data.alloc_start = bytes_ptr;
2546		2469
2547	const parameter = if (@sizeOf(Context) == 0) null else @ptrCast(&c_void, &outer_context.inner);	2470	const parameter = if (@sizeOf(Context) == 0) null else @ptrCast(*c_void, &outer_context.inner);
2548	outer_context.thread.data.handle = windows.CreateThread(null, default_stack_size, WinThread.threadMain, parameter, 0, null) ?? {	2471	outer_context.thread.data.handle = windows.CreateThread(null, default_stack_size, WinThread.threadMain, parameter, 0, null) ?? {
2549	const err = windows.GetLastError();	2472	const err = windows.GetLastError();
2550	return switch (err) {	2473	return switch (err) {
...	@@ -2559,15 +2482,15 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread	...	@@ -2559,15 +2482,15 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2559	if (@sizeOf(Context) == 0) {	2482	if (@sizeOf(Context) == 0) {
2560	return startFn({});	2483	return startFn({});
2561	} else {	2484	} else {
2562	return startFn(@intToPtr(&const Context, ctx_addr).*);	2485	return startFn(@intToPtr(const Context, ctx_addr).);
2563	}	2486	}
2564	}	2487	}
2565	extern fn posixThreadMain(ctx: ?&c_void) ?&c_void {	2488	extern fn posixThreadMain(ctx: ?c_void) ?c_void {
2566	if (@sizeOf(Context) == 0) {	2489	if (@sizeOf(Context) == 0) {
2567	_ = startFn({});	2490	_ = startFn({});
2568	return null;	2491	return null;
2569	} else {	2492	} else {
2570	_ = startFn(@ptrCast(&const Context, @alignCast(@alignOf(Context), ctx)).*);	2493	_ = startFn(@ptrCast(const Context, @alignCast(@alignOf(Context), ctx)).);
2571	return null;	2494	return null;
2572	}	2495	}
2573	}	2496	}
...	@@ -2586,7 +2509,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread	...	@@ -2586,7 +2509,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2586	stack_end -= @sizeOf(Context);	2509	stack_end -= @sizeOf(Context);
2587	stack_end -= stack_end % @alignOf(Context);	2510	stack_end -= stack_end % @alignOf(Context);
2588	assert(stack_end >= stack_addr);	2511	assert(stack_end >= stack_addr);
2589	const context_ptr = @alignCast(@alignOf(Context), @intToPtr(&Context, stack_end));	2512	const context_ptr = @alignCast(@alignOf(Context), @intToPtr(*Context, stack_end));
2590	context_ptr.* = context;	2513	context_ptr.* = context;
2591	arg = stack_end;	2514	arg = stack_end;
2592	}	2515	}
...	@@ -2594,7 +2517,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread	...	@@ -2594,7 +2517,7 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2594	stack_end -= @sizeOf(Thread);	2517	stack_end -= @sizeOf(Thread);
2595	stack_end -= stack_end % @alignOf(Thread);	2518	stack_end -= stack_end % @alignOf(Thread);
2596	assert(stack_end >= stack_addr);	2519	assert(stack_end >= stack_addr);
2597	const thread_ptr = @alignCast(@alignOf(Thread), @intToPtr(&Thread, stack_end));	2520	const thread_ptr = @alignCast(@alignOf(Thread), @intToPtr(*Thread, stack_end));
2598		2521
2599	thread_ptr.data.stack_addr = stack_addr;	2522	thread_ptr.data.stack_addr = stack_addr;
2600	thread_ptr.data.stack_len = mmap_len;	2523	thread_ptr.data.stack_len = mmap_len;
...	@@ -2610,9 +2533,9 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread	...	@@ -2610,9 +2533,9 @@ pub fn spawnThread(context: var, comptime startFn: var) SpawnThreadError!&Thread
2610		2533
2611	// align to page	2534	// align to page
2612	stack_end -= stack_end % os.page_size;	2535	stack_end -= stack_end % os.page_size;
2613	assert(c.pthread_attr_setstack(&attr, @intToPtr(&c_void, stack_addr), stack_end - stack_addr) == 0);	2536	assert(c.pthread_attr_setstack(&attr, @intToPtr([*]c_void, stack_addr), stack_end - stack_addr) == 0);
2614		2537
2615	const err = c.pthread_create(&thread_ptr.data.handle, &attr, MainFuncs.posixThreadMain, @intToPtr(&c_void, arg));	2538	const err = c.pthread_create(&thread_ptr.data.handle, &attr, MainFuncs.posixThreadMain, @intToPtr(*c_void, arg));
2616	switch (err) {	2539	switch (err) {
2617	0 => return thread_ptr,	2540	0 => return thread_ptr,
2618	posix.EAGAIN => return SpawnThreadError.SystemResources,	2541	posix.EAGAIN => return SpawnThreadError.SystemResources,

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

...	@@ -1,146 +1,427 @@	...	@@ -1,146 +1,427 @@
1	pub const EPERM = 1; /// Operation not permitted	1	/// Operation not permitted
2	pub const ENOENT = 2; /// No such file or directory	2	pub const EPERM = 1;
3	pub const ESRCH = 3; /// No such process	3
4	pub const EINTR = 4; /// Interrupted system call	4	/// No such file or directory
5	pub const EIO = 5; /// I/O error	5	pub const ENOENT = 2;
6	pub const ENXIO = 6; /// No such device or address	6
7	pub const E2BIG = 7; /// Arg list too long	7	/// No such process
8	pub const ENOEXEC = 8; /// Exec format error	8	pub const ESRCH = 3;
9	pub const EBADF = 9; /// Bad file number	9
10	pub const ECHILD = 10; /// No child processes	10	/// Interrupted system call
11	pub const EAGAIN = 11; /// Try again	11	pub const EINTR = 4;
12	pub const ENOMEM = 12; /// Out of memory	12
13	pub const EACCES = 13; /// Permission denied	13	/// I/O error
14	pub const EFAULT = 14; /// Bad address	14	pub const EIO = 5;
15	pub const ENOTBLK = 15; /// Block device required	15
16	pub const EBUSY = 16; /// Device or resource busy	16	/// No such device or address
17	pub const EEXIST = 17; /// File exists	17	pub const ENXIO = 6;
18	pub const EXDEV = 18; /// Cross-device link	18
19	pub const ENODEV = 19; /// No such device	19	/// Arg list too long
20	pub const ENOTDIR = 20; /// Not a directory	20	pub const E2BIG = 7;
21	pub const EISDIR = 21; /// Is a directory	21
22	pub const EINVAL = 22; /// Invalid argument	22	/// Exec format error
23	pub const ENFILE = 23; /// File table overflow	23	pub const ENOEXEC = 8;
24	pub const EMFILE = 24; /// Too many open files	24
25	pub const ENOTTY = 25; /// Not a typewriter	25	/// Bad file number
26	pub const ETXTBSY = 26; /// Text file busy	26	pub const EBADF = 9;
27	pub const EFBIG = 27; /// File too large	27
28	pub const ENOSPC = 28; /// No space left on device	28	/// No child processes
29	pub const ESPIPE = 29; /// Illegal seek	29	pub const ECHILD = 10;
30	pub const EROFS = 30; /// Read-only file system	30
31	pub const EMLINK = 31; /// Too many links	31	/// Try again
32	pub const EPIPE = 32; /// Broken pipe	32	pub const EAGAIN = 11;
33	pub const EDOM = 33; /// Math argument out of domain of func	33
34	pub const ERANGE = 34; /// Math result not representable	34	/// Out of memory
35	pub const EDEADLK = 35; /// Resource deadlock would occur	35	pub const ENOMEM = 12;
36	pub const ENAMETOOLONG = 36; /// File name too long	36
37	pub const ENOLCK = 37; /// No record locks available	37	/// Permission denied
38	pub const ENOSYS = 38; /// Function not implemented	38	pub const EACCES = 13;
39	pub const ENOTEMPTY = 39; /// Directory not empty	39
40	pub const ELOOP = 40; /// Too many symbolic links encountered	40	/// Bad address
41	pub const EWOULDBLOCK = EAGAIN; /// Operation would block	41	pub const EFAULT = 14;
42	pub const ENOMSG = 42; /// No message of desired type	42
43	pub const EIDRM = 43; /// Identifier removed	43	/// Block device required
44	pub const ECHRNG = 44; /// Channel number out of range	44	pub const ENOTBLK = 15;
45	pub const EL2NSYNC = 45; /// Level 2 not synchronized	45
46	pub const EL3HLT = 46; /// Level 3 halted	46	/// Device or resource busy
47	pub const EL3RST = 47; /// Level 3 reset	47	pub const EBUSY = 16;
48	pub const ELNRNG = 48; /// Link number out of range	48
49	pub const EUNATCH = 49; /// Protocol driver not attached	49	/// File exists
50	pub const ENOCSI = 50; /// No CSI structure available	50	pub const EEXIST = 17;
51	pub const EL2HLT = 51; /// Level 2 halted	51
52	pub const EBADE = 52; /// Invalid exchange	52	/// Cross-device link
53	pub const EBADR = 53; /// Invalid request descriptor	53	pub const EXDEV = 18;
54	pub const EXFULL = 54; /// Exchange full	54
55	pub const ENOANO = 55; /// No anode	55	/// No such device
56	pub const EBADRQC = 56; /// Invalid request code	56	pub const ENODEV = 19;
57	pub const EBADSLT = 57; /// Invalid slot	57
58		58	/// Not a directory
59	pub const EBFONT = 59; /// Bad font file format	59	pub const ENOTDIR = 20;
60	pub const ENOSTR = 60; /// Device not a stream	60
61	pub const ENODATA = 61; /// No data available	61	/// Is a directory
62	pub const ETIME = 62; /// Timer expired	62	pub const EISDIR = 21;
63	pub const ENOSR = 63; /// Out of streams resources	63
64	pub const ENONET = 64; /// Machine is not on the network	64	/// Invalid argument
65	pub const ENOPKG = 65; /// Package not installed	65	pub const EINVAL = 22;
66	pub const EREMOTE = 66; /// Object is remote	66
67	pub const ENOLINK = 67; /// Link has been severed	67	/// File table overflow
68	pub const EADV = 68; /// Advertise error	68	pub const ENFILE = 23;
69	pub const ESRMNT = 69; /// Srmount error	69
70	pub const ECOMM = 70; /// Communication error on send	70	/// Too many open files
71	pub const EPROTO = 71; /// Protocol error	71	pub const EMFILE = 24;
72	pub const EMULTIHOP = 72; /// Multihop attempted	72
73	pub const EDOTDOT = 73; /// RFS specific error	73	/// Not a typewriter
74	pub const EBADMSG = 74; /// Not a data message	74	pub const ENOTTY = 25;
75	pub const EOVERFLOW = 75; /// Value too large for defined data type	75
76	pub const ENOTUNIQ = 76; /// Name not unique on network	76	/// Text file busy
77	pub const EBADFD = 77; /// File descriptor in bad state	77	pub const ETXTBSY = 26;
78	pub const EREMCHG = 78; /// Remote address changed	78
79	pub const ELIBACC = 79; /// Can not access a needed shared library	79	/// File too large
80	pub const ELIBBAD = 80; /// Accessing a corrupted shared library	80	pub const EFBIG = 27;
81	pub const ELIBSCN = 81; /// .lib section in a.out corrupted	81
82	pub const ELIBMAX = 82; /// Attempting to link in too many shared libraries	82	/// No space left on device
83	pub const ELIBEXEC = 83; /// Cannot exec a shared library directly	83	pub const ENOSPC = 28;
84	pub const EILSEQ = 84; /// Illegal byte sequence	84
85	pub const ERESTART = 85; /// Interrupted system call should be restarted	85	/// Illegal seek
86	pub const ESTRPIPE = 86; /// Streams pipe error	86	pub const ESPIPE = 29;
87	pub const EUSERS = 87; /// Too many users	87
88	pub const ENOTSOCK = 88; /// Socket operation on non-socket	88	/// Read-only file system
89	pub const EDESTADDRREQ = 89; /// Destination address required	89	pub const EROFS = 30;
90	pub const EMSGSIZE = 90; /// Message too long	90
91	pub const EPROTOTYPE = 91; /// Protocol wrong type for socket	91	/// Too many links
92	pub const ENOPROTOOPT = 92; /// Protocol not available	92	pub const EMLINK = 31;
93	pub const EPROTONOSUPPORT = 93; /// Protocol not supported	93
94	pub const ESOCKTNOSUPPORT = 94; /// Socket type not supported	94	/// Broken pipe
95	pub const EOPNOTSUPP = 95; /// Operation not supported on transport endpoint	95	pub const EPIPE = 32;
96	pub const EPFNOSUPPORT = 96; /// Protocol family not supported	96
97	pub const EAFNOSUPPORT = 97; /// Address family not supported by protocol	97	/// Math argument out of domain of func
98	pub const EADDRINUSE = 98; /// Address already in use	98	pub const EDOM = 33;
99	pub const EADDRNOTAVAIL = 99; /// Cannot assign requested address	99
100	pub const ENETDOWN = 100; /// Network is down	100	/// Math result not representable
101	pub const ENETUNREACH = 101; /// Network is unreachable	101	pub const ERANGE = 34;
102	pub const ENETRESET = 102; /// Network dropped connection because of reset	102
103	pub const ECONNABORTED = 103; /// Software caused connection abort	103	/// Resource deadlock would occur
104	pub const ECONNRESET = 104; /// Connection reset by peer	104	pub const EDEADLK = 35;
105	pub const ENOBUFS = 105; /// No buffer space available	105
106	pub const EISCONN = 106; /// Transport endpoint is already connected	106	/// File name too long
107	pub const ENOTCONN = 107; /// Transport endpoint is not connected	107	pub const ENAMETOOLONG = 36;
108	pub const ESHUTDOWN = 108; /// Cannot send after transport endpoint shutdown	108
109	pub const ETOOMANYREFS = 109; /// Too many references: cannot splice	109	/// No record locks available
110	pub const ETIMEDOUT = 110; /// Connection timed out	110	pub const ENOLCK = 37;
111	pub const ECONNREFUSED = 111; /// Connection refused	111
112	pub const EHOSTDOWN = 112; /// Host is down	112	/// Function not implemented
113	pub const EHOSTUNREACH = 113; /// No route to host	113	pub const ENOSYS = 38;
114	pub const EALREADY = 114; /// Operation already in progress	114
115	pub const EINPROGRESS = 115; /// Operation now in progress	115	/// Directory not empty
116	pub const ESTALE = 116; /// Stale NFS file handle	116	pub const ENOTEMPTY = 39;
117	pub const EUCLEAN = 117; /// Structure needs cleaning	117
118	pub const ENOTNAM = 118; /// Not a XENIX named type file	118	/// Too many symbolic links encountered
119	pub const ENAVAIL = 119; /// No XENIX semaphores available	119	pub const ELOOP = 40;
120	pub const EISNAM = 120; /// Is a named type file	120
121	pub const EREMOTEIO = 121; /// Remote I/O error	121	/// Operation would block
122	pub const EDQUOT = 122; /// Quota exceeded	122	pub const EWOULDBLOCK = EAGAIN;
123		123
124	pub const ENOMEDIUM = 123; /// No medium found	124	/// No message of desired type
125	pub const EMEDIUMTYPE = 124; /// Wrong medium 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	// nameserver query return codes	370	// nameserver query return codes
128	pub const ENSROK = 0; /// DNS server returned answer with no data	371
129	pub const ENSRNODATA = 160; /// DNS server returned answer with no data	372	/// DNS server returned answer with no data
130	pub const ENSRFORMERR = 161; /// DNS server claims query was misformatted	373	pub const ENSROK = 0;
131	pub const ENSRSERVFAIL = 162; /// DNS server returned general failure	374
132	pub const ENSRNOTFOUND = 163; /// Domain name not found	375	/// DNS server returned answer with no data
133	pub const ENSRNOTIMP = 164; /// DNS server does not implement requested operation	376	pub const ENSRNODATA = 160;
134	pub const ENSRREFUSED = 165; /// DNS server refused query	377
135	pub const ENSRBADQUERY = 166; /// Misformatted DNS query	378	/// DNS server claims query was misformatted
136	pub const ENSRBADNAME = 167; /// Misformatted domain name	379	pub const ENSRFORMERR = 161;
137	pub const ENSRBADFAMILY = 168; /// Unsupported address family	380
138	pub const ENSRBADRESP = 169; /// Misformatted DNS reply	381	/// DNS server returned general failure
139	pub const ENSRCONNREFUSED = 170; /// Could not contact DNS servers	382	pub const ENSRSERVFAIL = 162;
140	pub const ENSRTIMEOUT = 171; /// Timeout while contacting DNS servers	383
141	pub const ENSROF = 172; /// End of file	384	/// Domain name not found
142	pub const ENSRFILE = 173; /// Error reading file	385	pub const ENSRNOTFOUND = 163;
143	pub const ENSRNOMEM = 174; /// Out of memory	386
144	pub const ENSRDESTRUCTION = 175; /// Application terminated lookup	387	/// DNS server does not implement requested operation
145	pub const ENSRQUERYDOMAINTOOLONG = 176; /// Domain name is too long	388	pub const ENSRNOTIMP = 164;
146	pub const ENSRCNAMELOOP = 177; /// Domain name is too long	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+123-95

 @@ -665,15 +665,18 @@ pub fn dup2(old: i32, new: i32) usize {
     return syscall2(SYS_dup2, usize(old), usize(new));
 }
-pub fn chdir(path: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn chdir(path: [*]const u8) usize {
     return syscall1(SYS_chdir, @ptrToInt(path));
 }
-pub fn chroot(path: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn chroot(path: [*]const u8) usize {
     return syscall1(SYS_chroot, @ptrToInt(path));
 }
-pub fn execve(path: &const u8, argv: &const ?&const u8, envp: &const ?&const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn execve(path: [*]const u8, argv: [*]const ?[*]const u8, envp: [*]const ?[*]const u8) usize {
     return syscall3(SYS_execve, @ptrToInt(path), @ptrToInt(argv), @ptrToInt(envp));
 }
 @@ -681,15 +684,15 @@ pub fn fork() usize {
     return syscall0(SYS_fork);
 }
-pub fn futex_wait(uaddr: usize, futex_op: u32, val: i32, timeout: ?&timespec) usize {
+pub fn futex_wait(uaddr: usize, futex_op: u32, val: i32, timeout: ?*timespec) usize {
     return syscall4(SYS_futex, uaddr, futex_op, @bitCast(u32, val), @ptrToInt(timeout));
 }
-pub fn getcwd(buf: &u8, size: usize) usize {
+pub fn getcwd(buf: [*]u8, size: usize) usize {
     return syscall2(SYS_getcwd, @ptrToInt(buf), size);
 }
-pub fn getdents(fd: i32, dirp: &u8, count: usize) usize {
+pub fn getdents(fd: i32, dirp: [*]u8, count: usize) usize {
     return syscall3(SYS_getdents, usize(fd), @ptrToInt(dirp), count);
 }
 @@ -698,27 +701,32 @@ pub fn isatty(fd: i32) bool {
     return syscall3(SYS_ioctl, usize(fd), TIOCGWINSZ, @ptrToInt(&wsz)) == 0;
 }
-pub fn readlink(noalias path: &const u8, noalias buf_ptr: &u8, buf_len: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn readlink(noalias path: [*]const u8, noalias buf_ptr: [*]u8, buf_len: usize) usize {
     return syscall3(SYS_readlink, @ptrToInt(path), @ptrToInt(buf_ptr), buf_len);
 }
-pub fn mkdir(path: &const u8, mode: u32) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn mkdir(path: [*]const u8, mode: u32) usize {
     return syscall2(SYS_mkdir, @ptrToInt(path), mode);
 }
-pub fn mount(special: &const u8, dir: &const u8, fstype: &const u8, flags: usize, data: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn mount(special: [*]const u8, dir: [*]const u8, fstype: [*]const u8, flags: usize, data: usize) usize {
     return syscall5(SYS_mount, @ptrToInt(special), @ptrToInt(dir), @ptrToInt(fstype), flags, data);
 }
-pub fn umount(special: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn umount(special: [*]const u8) usize {
     return syscall2(SYS_umount2, @ptrToInt(special), 0);
 }
-pub fn umount2(special: &const u8, flags: u32) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn umount2(special: [*]const u8, flags: u32) usize {
     return syscall2(SYS_umount2, @ptrToInt(special), flags);
 }
-pub fn mmap(address: ?&u8, length: usize, prot: usize, flags: u32, fd: i32, offset: isize) usize {
+pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, offset: isize) usize {
     return syscall6(SYS_mmap, @ptrToInt(address), length, prot, flags, usize(fd), @bitCast(usize, offset));
 }
 @@ -726,60 +734,67 @@ pub fn munmap(address: usize, length: usize) usize {
     return syscall2(SYS_munmap, address, length);
 }
-pub fn read(fd: i32, buf: &u8, count: usize) usize {
+pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
     return syscall3(SYS_read, usize(fd), @ptrToInt(buf), count);
 }
-pub fn rmdir(path: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn rmdir(path: [*]const u8) usize {
     return syscall1(SYS_rmdir, @ptrToInt(path));
 }
-pub fn symlink(existing: &const u8, new: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn symlink(existing: [*]const u8, new: [*]const u8) usize {
     return syscall2(SYS_symlink, @ptrToInt(existing), @ptrToInt(new));
 }
-pub fn pread(fd: i32, buf: &u8, count: usize, offset: usize) usize {
+pub fn pread(fd: i32, buf: [*]u8, count: usize, offset: usize) usize {
     return syscall4(SYS_pread, usize(fd), @ptrToInt(buf), count, offset);
 }
-pub fn access(path: &const u8, mode: u32) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn access(path: [*]const u8, mode: u32) usize {
     return syscall2(SYS_access, @ptrToInt(path), mode);
 }
-pub fn pipe(fd: &[2]i32) usize {
+pub fn pipe(fd: *[2]i32) usize {
     return pipe2(fd, 0);
 }
-pub fn pipe2(fd: &[2]i32, flags: usize) usize {
+pub fn pipe2(fd: *[2]i32, flags: usize) usize {
     return syscall2(SYS_pipe2, @ptrToInt(fd), flags);
 }
-pub fn write(fd: i32, buf: &const u8, count: usize) usize {
+pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {
     return syscall3(SYS_write, usize(fd), @ptrToInt(buf), count);
 }
-pub fn pwrite(fd: i32, buf: &const u8, count: usize, offset: usize) usize {
+pub fn pwrite(fd: i32, buf: [*]const u8, count: usize, offset: usize) usize {
     return syscall4(SYS_pwrite, usize(fd), @ptrToInt(buf), count, offset);
 }
-pub fn rename(old: &const u8, new: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn rename(old: [*]const u8, new: [*]const u8) usize {
     return syscall2(SYS_rename, @ptrToInt(old), @ptrToInt(new));
 }
-pub fn open(path: &const u8, flags: u32, perm: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn open(path: [*]const u8, flags: u32, perm: usize) usize {
     return syscall3(SYS_open, @ptrToInt(path), flags, perm);
 }
-pub fn create(path: &const u8, perm: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn create(path: [*]const u8, perm: usize) usize {
     return syscall2(SYS_creat, @ptrToInt(path), perm);
 }
-pub fn openat(dirfd: i32, path: &const u8, flags: usize, mode: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn openat(dirfd: i32, path: [*]const u8, flags: usize, mode: usize) usize {
     return syscall4(SYS_openat, usize(dirfd), @ptrToInt(path), flags, mode);
 }
 /// See also `clone` (from the arch-specific include)
-pub fn clone5(flags: usize, child_stack_ptr: usize, parent_tid: &i32, child_tid: &i32, newtls: usize) usize {
+pub fn clone5(flags: usize, child_stack_ptr: usize, parent_tid: *i32, child_tid: *i32, newtls: usize) usize {
     return syscall5(SYS_clone, flags, child_stack_ptr, @ptrToInt(parent_tid), @ptrToInt(child_tid), newtls);
 }
 @@ -801,7 +816,7 @@ pub fn exit(status: i32) noreturn {
     unreachable;
 }
-pub fn getrandom(buf: &u8, count: usize, flags: u32) usize {
+pub fn getrandom(buf: [*]u8, count: usize, flags: u32) usize {
     return syscall3(SYS_getrandom, @ptrToInt(buf), count, usize(flags));
 }
 @@ -809,22 +824,22 @@ pub fn kill(pid: i32, sig: i32) usize {
     return syscall2(SYS_kill, @bitCast(usize, isize(pid)), usize(sig));
 }
-pub fn unlink(path: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn unlink(path: [*]const u8) usize {
     return syscall1(SYS_unlink, @ptrToInt(path));
 }
-pub fn waitpid(pid: i32, status: &i32, options: i32) usize {
+pub fn waitpid(pid: i32, status: *i32, options: i32) usize {
     return syscall4(SYS_wait4, @bitCast(usize, isize(pid)), @ptrToInt(status), @bitCast(usize, isize(options)), 0);
 }
-pub fn clock_gettime(clk_id: i32, tp: &timespec) usize {
+pub fn clock_gettime(clk_id: i32, tp: *timespec) usize {
     if (VDSO_CGT_SYM.len != 0) {
         const f = @atomicLoad(@typeOf(init_vdso_clock_gettime), &vdso_clock_gettime, builtin.AtomicOrder.Unordered);
         if (@ptrToInt(f) != 0) {
             const rc = f(clk_id, tp);
             switch (rc) {
-                0,
+                0, @bitCast(usize, isize(-EINVAL)) => return rc,
-                @bitCast(usize, isize(-EINVAL)) => return rc,
                 else => {},
             }
         }
 @@ -832,7 +847,7 @@ pub fn clock_gettime(clk_id: i32, tp: &timespec) usize {
     return syscall2(SYS_clock_gettime, @bitCast(usize, isize(clk_id)), @ptrToInt(tp));
 }
 var vdso_clock_gettime = init_vdso_clock_gettime;
-extern fn init_vdso_clock_gettime(clk: i32, ts: &timespec) usize {
+extern fn init_vdso_clock_gettime(clk: i32, ts: *timespec) usize {
     const addr = vdso.lookup(VDSO_CGT_VER, VDSO_CGT_SYM);
     var f = @intToPtr(@typeOf(init_vdso_clock_gettime), addr);
     _ = @cmpxchgStrong(@typeOf(init_vdso_clock_gettime), &vdso_clock_gettime, init_vdso_clock_gettime, f, builtin.AtomicOrder.Monotonic, builtin.AtomicOrder.Monotonic);
 @@ -840,23 +855,23 @@ extern fn init_vdso_clock_gettime(clk: i32, ts: &timespec) usize {
     return f(clk, ts);
 }
-pub fn clock_getres(clk_id: i32, tp: &timespec) usize {
+pub fn clock_getres(clk_id: i32, tp: *timespec) usize {
     return syscall2(SYS_clock_getres, @bitCast(usize, isize(clk_id)), @ptrToInt(tp));
 }
-pub fn clock_settime(clk_id: i32, tp: &const timespec) usize {
+pub fn clock_settime(clk_id: i32, tp: *const timespec) usize {
     return syscall2(SYS_clock_settime, @bitCast(usize, isize(clk_id)), @ptrToInt(tp));
 }
-pub fn gettimeofday(tv: &timeval, tz: &timezone) usize {
+pub fn gettimeofday(tv: *timeval, tz: *timezone) usize {
     return syscall2(SYS_gettimeofday, @ptrToInt(tv), @ptrToInt(tz));
 }
-pub fn settimeofday(tv: &const timeval, tz: &const timezone) usize {
+pub fn settimeofday(tv: *const timeval, tz: *const timezone) usize {
     return syscall2(SYS_settimeofday, @ptrToInt(tv), @ptrToInt(tz));
 }
-pub fn nanosleep(req: &const timespec, rem: ?&timespec) usize {
+pub fn nanosleep(req: *const timespec, rem: ?*timespec) usize {
     return syscall2(SYS_nanosleep, @ptrToInt(req), @ptrToInt(rem));
 }
 @@ -900,11 +915,11 @@ pub fn setegid(egid: u32) usize {
     return syscall1(SYS_setegid, egid);
 }
-pub fn getresuid(ruid: &u32, euid: &u32, suid: &u32) usize {
+pub fn getresuid(ruid: *u32, euid: *u32, suid: *u32) usize {
     return syscall3(SYS_getresuid, @ptrToInt(ruid), @ptrToInt(euid), @ptrToInt(suid));
 }
-pub fn getresgid(rgid: &u32, egid: &u32, sgid: &u32) usize {
+pub fn getresgid(rgid: *u32, egid: *u32, sgid: *u32) usize {
     return syscall3(SYS_getresgid, @ptrToInt(rgid), @ptrToInt(egid), @ptrToInt(sgid));
 }
 @@ -916,11 +931,11 @@ pub fn setresgid(rgid: u32, egid: u32, sgid: u32) usize {
     return syscall3(SYS_setresgid, rgid, egid, sgid);
 }
-pub fn getgroups(size: usize, list: &u32) usize {
+pub fn getgroups(size: usize, list: *u32) usize {
     return syscall2(SYS_getgroups, size, @ptrToInt(list));
 }
-pub fn setgroups(size: usize, list: &const u32) usize {
+pub fn setgroups(size: usize, list: *const u32) usize {
     return syscall2(SYS_setgroups, size, @ptrToInt(list));
 }
 @@ -928,11 +943,11 @@ pub fn getpid() i32 {
     return @bitCast(i32, u32(syscall0(SYS_getpid)));
 }
-pub fn sigprocmask(flags: u32, noalias set: &const sigset_t, noalias oldset: ?&sigset_t) usize {
+pub fn sigprocmask(flags: u32, noalias set: *const sigset_t, noalias oldset: ?*sigset_t) usize {
     return syscall4(SYS_rt_sigprocmask, flags, @ptrToInt(set), @ptrToInt(oldset), NSIG / 8);
 }
-pub fn sigaction(sig: u6, noalias act: &const Sigaction, noalias oact: ?&Sigaction) usize {
+pub fn sigaction(sig: u6, noalias act: *const Sigaction, noalias oact: ?*Sigaction) usize {
     assert(sig >= 1);
     assert(sig != SIGKILL);
     assert(sig != SIGSTOP);
 @@ -940,10 +955,10 @@ pub fn sigaction(sig: u6, noalias act: &const Sigaction, noalias oact: ?&Sigacti
         .handler = act.handler,
         .flags = act.flags | SA_RESTORER,
         .mask = undefined,
-        .restorer = @ptrCast(extern fn() void, restore_rt),
+        .restorer = @ptrCast(extern fn () void, restore_rt),
     };
     var ksa_old: k_sigaction = undefined;
-    @memcpy(@ptrCast(&u8, &ksa.mask), @ptrCast(&const u8, &act.mask), 8);
+    @memcpy(@ptrCast([*]u8, &ksa.mask), @ptrCast([*]const u8, &act.mask), 8);
     const result = syscall4(SYS_rt_sigaction, sig, @ptrToInt(&ksa), @ptrToInt(&ksa_old), @sizeOf(@typeOf(ksa.mask)));
     const err = getErrno(result);
     if (err != 0) {
 @@ -952,7 +967,7 @@ pub fn sigaction(sig: u6, noalias act: &const Sigaction, noalias oact: ?&Sigacti
     if (oact) |old| {
         old.handler = ksa_old.handler;
         old.flags = @truncate(u32, ksa_old.flags);
-        @memcpy(@ptrCast(&u8, &old.mask), @ptrCast(&const u8, &ksa_old.mask), @sizeOf(@typeOf(ksa_old.mask)));
+        @memcpy(@ptrCast([*]u8, &old.mask), @ptrCast([*]const u8, &ksa_old.mask), @sizeOf(@typeOf(ksa_old.mask)));
     }
     return 0;
 }
 @@ -963,22 +978,22 @@ const all_mask = []usize{@maxValue(usize)};
 const app_mask = []usize{0xfffffffc7fffffff};
 const k_sigaction = extern struct {
-    handler: extern fn(i32) void,
+    handler: extern fn (i32) void,
     flags: usize,
-    restorer: extern fn() void,
+    restorer: extern fn () void,
     mask: [2]u32,
 };
 /// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
 pub const Sigaction = struct {
-    handler: extern fn(i32) void,
+    handler: extern fn (i32) void,
     mask: sigset_t,
     flags: u32,
 };
-pub const SIG_ERR = @intToPtr(extern fn(i32) void, @maxValue(usize));
+pub const SIG_ERR = @intToPtr(extern fn (i32) void, @maxValue(usize));
-pub const SIG_DFL = @intToPtr(extern fn(i32) void, 0);
+pub const SIG_DFL = @intToPtr(extern fn (i32) void, 0);
-pub const SIG_IGN = @intToPtr(extern fn(i32) void, 1);
+pub const SIG_IGN = @intToPtr(extern fn (i32) void, 1);
 pub const empty_sigset = []usize{0} ** sigset_t.len;
 pub fn raise(sig: i32) usize {
 @@ -990,24 +1005,24 @@ pub fn raise(sig: i32) usize {
     return ret;
 }
-fn blockAllSignals(set: &sigset_t) void {
+fn blockAllSignals(set: *sigset_t) void {
     _ = syscall4(SYS_rt_sigprocmask, SIG_BLOCK, @ptrToInt(&all_mask), @ptrToInt(set), NSIG / 8);
 }
-fn blockAppSignals(set: &sigset_t) void {
+fn blockAppSignals(set: *sigset_t) void {
     _ = syscall4(SYS_rt_sigprocmask, SIG_BLOCK, @ptrToInt(&app_mask), @ptrToInt(set), NSIG / 8);
 }
-fn restoreSignals(set: &sigset_t) void {
+fn restoreSignals(set: *sigset_t) void {
     _ = syscall4(SYS_rt_sigprocmask, SIG_SETMASK, @ptrToInt(set), 0, NSIG / 8);
 }
-pub fn sigaddset(set: &sigset_t, sig: u6) void {
+pub fn sigaddset(set: *sigset_t, sig: u6) void {
     const s = sig - 1;
     (set.*)[usize(s) / usize.bit_count] |= usize(1) << (s & (usize.bit_count - 1));
 }
-pub fn sigismember(set: &const sigset_t, sig: u6) bool {
+pub fn sigismember(set: *const sigset_t, sig: u6) bool {
     const s = sig - 1;
     return ((set.*)[usize(s) / usize.bit_count] & (usize(1) << (s & (usize.bit_count - 1)))) != 0;
 }
 @@ -1037,15 +1052,15 @@ pub const sockaddr_in6 = extern struct {
 };
 pub const iovec = extern struct {
-    iov_base: &u8,
+    iov_base: [*]u8,
     iov_len: usize,
 };
-pub fn getsockname(fd: i32, noalias addr: &sockaddr, noalias len: &socklen_t) usize {
+pub fn getsockname(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
     return syscall3(SYS_getsockname, usize(fd), @ptrToInt(addr), @ptrToInt(len));
 }
-pub fn getpeername(fd: i32, noalias addr: &sockaddr, noalias len: &socklen_t) usize {
+pub fn getpeername(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
     return syscall3(SYS_getpeername, usize(fd), @ptrToInt(addr), @ptrToInt(len));
 }
 @@ -1053,27 +1068,27 @@ pub fn socket(domain: u32, socket_type: u32, protocol: u32) usize {
     return syscall3(SYS_socket, domain, socket_type, protocol);
 }
-pub fn setsockopt(fd: i32, level: u32, optname: u32, optval: &const u8, optlen: socklen_t) usize {
+pub fn setsockopt(fd: i32, level: u32, optname: u32, optval: [*]const u8, optlen: socklen_t) usize {
     return syscall5(SYS_setsockopt, usize(fd), level, optname, usize(optval), @ptrToInt(optlen));
 }
-pub fn getsockopt(fd: i32, level: u32, optname: u32, noalias optval: &u8, noalias optlen: &socklen_t) usize {
+pub fn getsockopt(fd: i32, level: u32, optname: u32, noalias optval: [*]u8, noalias optlen: *socklen_t) usize {
     return syscall5(SYS_getsockopt, usize(fd), level, optname, @ptrToInt(optval), @ptrToInt(optlen));
 }
-pub fn sendmsg(fd: i32, msg: &const msghdr, flags: u32) usize {
+pub fn sendmsg(fd: i32, msg: *const msghdr, flags: u32) usize {
     return syscall3(SYS_sendmsg, usize(fd), @ptrToInt(msg), flags);
 }
-pub fn connect(fd: i32, addr: &const sockaddr, len: socklen_t) usize {
+pub fn connect(fd: i32, addr: *const sockaddr, len: socklen_t) usize {
     return syscall3(SYS_connect, usize(fd), @ptrToInt(addr), usize(len));
 }
-pub fn recvmsg(fd: i32, msg: &msghdr, flags: u32) usize {
+pub fn recvmsg(fd: i32, msg: *msghdr, flags: u32) usize {
     return syscall3(SYS_recvmsg, usize(fd), @ptrToInt(msg), flags);
 }
-pub fn recvfrom(fd: i32, noalias buf: &u8, len: usize, flags: u32, noalias addr: ?&sockaddr, noalias alen: ?&socklen_t) usize {
+pub fn recvfrom(fd: i32, noalias buf: [*]u8, len: usize, flags: u32, noalias addr: ?*sockaddr, noalias alen: ?*socklen_t) usize {
     return syscall6(SYS_recvfrom, usize(fd), @ptrToInt(buf), len, flags, @ptrToInt(addr), @ptrToInt(alen));
 }
 @@ -1081,7 +1096,7 @@ pub fn shutdown(fd: i32, how: i32) usize {
     return syscall2(SYS_shutdown, usize(fd), usize(how));
 }
-pub fn bind(fd: i32, addr: &const sockaddr, len: socklen_t) usize {
+pub fn bind(fd: i32, addr: *const sockaddr, len: socklen_t) usize {
     return syscall3(SYS_bind, usize(fd), @ptrToInt(addr), usize(len));
 }
 @@ -1089,79 +1104,92 @@ pub fn listen(fd: i32, backlog: u32) usize {
     return syscall2(SYS_listen, usize(fd), backlog);
 }
-pub fn sendto(fd: i32, buf: &const u8, len: usize, flags: u32, addr: ?&const sockaddr, alen: socklen_t) usize {
+pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const sockaddr, alen: socklen_t) usize {
     return syscall6(SYS_sendto, usize(fd), @ptrToInt(buf), len, flags, @ptrToInt(addr), usize(alen));
 }
 pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
-    return syscall4(SYS_socketpair, usize(domain), usize(socket_type), usize(protocol), @ptrToInt(&fd[0]));
+    return syscall4(SYS_socketpair, usize(domain), usize(socket_type), usize(protocol), @ptrToInt(*fd[0]));
 }
-pub fn accept(fd: i32, noalias addr: &sockaddr, noalias len: &socklen_t) usize {
+pub fn accept(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
     return accept4(fd, addr, len, 0);
 }
-pub fn accept4(fd: i32, noalias addr: &sockaddr, noalias len: &socklen_t, flags: u32) usize {
+pub fn accept4(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t, flags: u32) usize {
     return syscall4(SYS_accept4, usize(fd), @ptrToInt(addr), @ptrToInt(len), flags);
 }
-pub fn fstat(fd: i32, stat_buf: &Stat) usize {
+pub fn fstat(fd: i32, stat_buf: *Stat) usize {
     return syscall2(SYS_fstat, usize(fd), @ptrToInt(stat_buf));
 }
-pub fn stat(pathname: &const u8, statbuf: &Stat) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn stat(pathname: [*]const u8, statbuf: *Stat) usize {
     return syscall2(SYS_stat, @ptrToInt(pathname), @ptrToInt(statbuf));
 }
-pub fn lstat(pathname: &const u8, statbuf: &Stat) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn lstat(pathname: [*]const u8, statbuf: *Stat) usize {
     return syscall2(SYS_lstat, @ptrToInt(pathname), @ptrToInt(statbuf));
 }
-pub fn listxattr(path: &const u8, list: &u8, size: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn listxattr(path: [*]const u8, list: [*]u8, size: usize) usize {
     return syscall3(SYS_listxattr, @ptrToInt(path), @ptrToInt(list), size);
 }
-pub fn llistxattr(path: &const u8, list: &u8, size: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn llistxattr(path: [*]const u8, list: [*]u8, size: usize) usize {
     return syscall3(SYS_llistxattr, @ptrToInt(path), @ptrToInt(list), size);
 }
-pub fn flistxattr(fd: usize, list: &u8, size: usize) usize {
+pub fn flistxattr(fd: usize, list: [*]u8, size: usize) usize {
     return syscall3(SYS_flistxattr, fd, @ptrToInt(list), size);
 }
-pub fn getxattr(path: &const u8, name: &const u8, value: &void, size: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn getxattr(path: [*]const u8, name: [*]const u8, value: [*]u8, size: usize) usize {
     return syscall4(SYS_getxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);
 }
-pub fn lgetxattr(path: &const u8, name: &const u8, value: &void, size: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn lgetxattr(path: [*]const u8, name: [*]const u8, value: [*]u8, size: usize) usize {
     return syscall4(SYS_lgetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size);
 }
-pub fn fgetxattr(fd: usize, name: &const u8, value: &void, size: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn fgetxattr(fd: usize, name: [*]const u8, value: [*]u8, size: usize) usize {
     return syscall4(SYS_lgetxattr, fd, @ptrToInt(name), @ptrToInt(value), size);
 }
-pub fn setxattr(path: &const u8, name: &const u8, value: &const void, size: usize, flags: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn setxattr(path: [*]const u8, name: [*]const u8, value: *const void, size: usize, flags: usize) usize {
     return syscall5(SYS_setxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
 }
-pub fn lsetxattr(path: &const u8, name: &const u8, value: &const void, size: usize, flags: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn lsetxattr(path: [*]const u8, name: [*]const u8, value: *const void, size: usize, flags: usize) usize {
     return syscall5(SYS_lsetxattr, @ptrToInt(path), @ptrToInt(name), @ptrToInt(value), size, flags);
 }
-pub fn fsetxattr(fd: usize, name: &const u8, value: &const void, size: usize, flags: usize) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn fsetxattr(fd: usize, name: [*]const u8, value: *const void, size: usize, flags: usize) usize {
     return syscall5(SYS_fsetxattr, fd, @ptrToInt(name), @ptrToInt(value), size, flags);
 }
-pub fn removexattr(path: &const u8, name: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn removexattr(path: [*]const u8, name: [*]const u8) usize {
     return syscall2(SYS_removexattr, @ptrToInt(path), @ptrToInt(name));
 }
-pub fn lremovexattr(path: &const u8, name: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn lremovexattr(path: [*]const u8, name: [*]const u8) usize {
     return syscall2(SYS_lremovexattr, @ptrToInt(path), @ptrToInt(name));
 }
-pub fn fremovexattr(fd: usize, name: &const u8) usize {
+// TODO https://github.com/ziglang/zig/issues/265
+pub fn fremovexattr(fd: usize, name: [*]const u8) usize {
     return syscall2(SYS_fremovexattr, fd, @ptrToInt(name));
 }
 @@ -1185,11 +1213,11 @@ pub fn epoll_create1(flags: usize) usize {
     return syscall1(SYS_epoll_create1, flags);
 }
-pub fn epoll_ctl(epoll_fd: i32, op: u32, fd: i32, ev: &epoll_event) usize {
+pub fn epoll_ctl(epoll_fd: i32, op: u32, fd: i32, ev: *epoll_event) usize {
     return syscall4(SYS_epoll_ctl, usize(epoll_fd), usize(op), usize(fd), @ptrToInt(ev));
 }
-pub fn epoll_wait(epoll_fd: i32, events: &epoll_event, maxevents: u32, timeout: i32) usize {
+pub fn epoll_wait(epoll_fd: i32, events: [*]epoll_event, maxevents: u32, timeout: i32) usize {
     return syscall4(SYS_epoll_wait, usize(epoll_fd), @ptrToInt(events), usize(maxevents), usize(timeout));
 }
 @@ -1202,11 +1230,11 @@ pub const itimerspec = extern struct {
     it_value: timespec,
 };
-pub fn timerfd_gettime(fd: i32, curr_value: &itimerspec) usize {
+pub fn timerfd_gettime(fd: i32, curr_value: *itimerspec) usize {
     return syscall2(SYS_timerfd_gettime, usize(fd), @ptrToInt(curr_value));
 }
-pub fn timerfd_settime(fd: i32, flags: u32, new_value: &const itimerspec, old_value: ?&itimerspec) usize {
+pub fn timerfd_settime(fd: i32, flags: u32, new_value: *const itimerspec, old_value: ?*itimerspec) usize {
     return syscall4(SYS_timerfd_settime, usize(fd), usize(flags), @ptrToInt(new_value), @ptrToInt(old_value));
 }
 @@ -1301,8 +1329,8 @@ pub fn CAP_TO_INDEX(cap: u8) u8 {
 }
 pub const cap_t = extern struct {
-    hdrp: &cap_user_header_t,
+    hdrp: *cap_user_header_t,
-    datap: &cap_user_data_t,
+    datap: *cap_user_data_t,
 };
 pub const cap_user_header_t = extern struct {
 @@ -1320,11 +1348,11 @@ pub fn unshare(flags: usize) usize {
     return syscall1(SYS_unshare, usize(flags));
 }
-pub fn capget(hdrp: &cap_user_header_t, datap: &cap_user_data_t) usize {
+pub fn capget(hdrp: *cap_user_header_t, datap: *cap_user_data_t) usize {
     return syscall2(SYS_capget, @ptrToInt(hdrp), @ptrToInt(datap));
 }
-pub fn capset(hdrp: &cap_user_header_t, datap: &const cap_user_data_t) usize {
+pub fn capset(hdrp: *cap_user_header_t, datap: *const cap_user_data_t) usize {
     return syscall2(SYS_capset, @ptrToInt(hdrp), @ptrToInt(datap));
 }

std/os/linux/test.zig+8-7

 @@ -11,22 +11,22 @@ test "timer" {
     const timer_fd = linux.timerfd_create(linux.CLOCK_MONOTONIC, 0);
     assert(linux.getErrno(timer_fd) == 0);
-    const time_interval = linux.timespec {
+    const time_interval = linux.timespec{
         .tv_sec = 0,
-        .tv_nsec = 2000000
+        .tv_nsec = 2000000,
     };
-    const new_time = linux.itimerspec {
+    const new_time = linux.itimerspec{
         .it_interval = time_interval,
-        .it_value = time_interval
+        .it_value = time_interval,
     };
     err = linux.timerfd_settime(i32(timer_fd), 0, &new_time, null);
     assert(err == 0);
-    var event = linux.epoll_event {
+    var event = linux.epoll_event{
         .events = linux.EPOLLIN | linux.EPOLLOUT | linux.EPOLLET,
-        .data = linux.epoll_data { .ptr = 0 },
+        .data = linux.epoll_data{ .ptr = 0 },
     };
     err = linux.epoll_ctl(i32(epoll_fd), linux.EPOLL_CTL_ADD, i32(timer_fd), &event);
 @@ -35,5 +35,6 @@ test "timer" {
     const events_one: linux.epoll_event = undefined;
     var events = []linux.epoll_event{events_one} ** 8;
-    err = linux.epoll_wait(i32(epoll_fd), &events[0], 8, -1);
+    // TODO implicit cast from *[N]T to [*]T
+    err = linux.epoll_wait(i32(epoll_fd), @ptrCast([*]linux.epoll_event, &events), 8, -1);
 }

std/os/linux/vdso.zig+30-28

...	@@ -8,19 +8,22 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {	...	@@ -8,19 +8,22 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
8	const vdso_addr = std.os.linux_aux_raw[std.elf.AT_SYSINFO_EHDR];	8	const vdso_addr = std.os.linux_aux_raw[std.elf.AT_SYSINFO_EHDR];
9	if (vdso_addr == 0) return 0;	9	if (vdso_addr == 0) return 0;
10		10
11	const eh = @intToPtr(&elf.Ehdr, vdso_addr);	11	const eh = @intToPtr(*elf.Ehdr, vdso_addr);
12	var ph_addr: usize = vdso_addr + eh.e_phoff;	12	var ph_addr: usize = vdso_addr + eh.e_phoff;
13	const ph = @intToPtr(&elf.Phdr, ph_addr);	13	const ph = @intToPtr(*elf.Phdr, ph_addr);
14		14
15	var maybe_dynv: ?&usize = null;	15	var maybe_dynv: ?[*]usize = null;
16	var base: usize = @maxValue(usize);	16	var base: usize = @maxValue(usize);
17	{	17	{
18	var i: usize = 0;	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	const this_ph = @intToPtr(&elf.Phdr, ph_addr);	20	i += 1;
		21	ph_addr += eh.e_phentsize;
		22	}) {
		23	const this_ph = @intToPtr(*elf.Phdr, ph_addr);
21	switch (this_ph.p_type) {	24	switch (this_ph.p_type) {
22	elf.PT_LOAD => base = vdso_addr + this_ph.p_offset - this_ph.p_vaddr,	25	elf.PT_LOAD => base = vdso_addr + this_ph.p_offset - this_ph.p_vaddr,
23	elf.PT_DYNAMIC => maybe_dynv = @intToPtr(&usize, vdso_addr + this_ph.p_offset),	26	elf.PT_DYNAMIC => maybe_dynv = @intToPtr([*]usize, vdso_addr + this_ph.p_offset),
24	else => {},	27	else => {},
25	}	28	}
26	}	29	}
...	@@ -28,22 +31,22 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {	...	@@ -28,22 +31,22 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
28	const dynv = maybe_dynv ?? return 0;	31	const dynv = maybe_dynv ?? return 0;
29	if (base == @maxValue(usize)) return 0;	32	if (base == @maxValue(usize)) return 0;
30		33
31	var maybe_strings: ?&u8 = null;	34	var maybe_strings: ?[*]u8 = null;
32	var maybe_syms: ?&elf.Sym = null;	35	var maybe_syms: ?[*]elf.Sym = null;
33	var maybe_hashtab: ?&linux.Elf_Symndx = null;	36	var maybe_hashtab: ?[*]linux.Elf_Symndx = null;
34	var maybe_versym: ?&u16 = null;	37	var maybe_versym: ?[*]u16 = null;
35	var maybe_verdef: ?&elf.Verdef = null;	38	var maybe_verdef: ?*elf.Verdef = null;
36		39
37	{	40	{
38	var i: usize = 0;	41	var i: usize = 0;
39	while (dynv[i] != 0) : (i += 2) {	42	while (dynv[i] != 0) : (i += 2) {
40	const p = base + dynv[i + 1];	43	const p = base + dynv[i + 1];
41	switch (dynv[i]) {	44	switch (dynv[i]) {
42	elf.DT_STRTAB => maybe_strings = @intToPtr(&u8, p),	45	elf.DT_STRTAB => maybe_strings = @intToPtr([*]u8, p),
43	elf.DT_SYMTAB => maybe_syms = @intToPtr(&elf.Sym, p),	46	elf.DT_SYMTAB => maybe_syms = @intToPtr([*]elf.Sym, p),
44	elf.DT_HASH => maybe_hashtab = @intToPtr(&linux.Elf_Symndx, p),	47	elf.DT_HASH => maybe_hashtab = @intToPtr([*]linux.Elf_Symndx, p),
45	elf.DT_VERSYM => maybe_versym = @intToPtr(&u16, p),	48	elf.DT_VERSYM => maybe_versym = @intToPtr([*]u16, p),
46	elf.DT_VERDEF => maybe_verdef = @intToPtr(&elf.Verdef, p),	49	elf.DT_VERDEF => maybe_verdef = @intToPtr(*elf.Verdef, p),
47	else => {},	50	else => {},
48	}	51	}
49	}	52	}
...	@@ -54,16 +57,15 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {	...	@@ -54,16 +57,15 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
54	const hashtab = maybe_hashtab ?? return 0;	57	const hashtab = maybe_hashtab ?? return 0;
55	if (maybe_verdef == null) maybe_versym = null;	58	if (maybe_verdef == null) maybe_versym = null;
56		59
57		60	const OK_TYPES = (1 << elf.STT_NOTYPE \| 1 << elf.STT_OBJECT \| 1 << elf.STT_FUNC \| 1 << elf.STT_COMMON);
58	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);
59	const OK_BINDS = (1<<elf.STB_GLOBAL \| 1<<elf.STB_WEAK \| 1<<elf.STB_GNU_UNIQUE);
60		62
61	var i: usize = 0;	63	var i: usize = 0;
62	while (i < hashtab[1]) : (i += 1) {	64	while (i < hashtab[1]) : (i += 1) {
63	if (0==(u32(1)<<u5(syms[i].st_info&0xf) & OK_TYPES)) continue;	65	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;	66	if (0 == (u32(1) << u5(syms[i].st_info >> 4) & OK_BINDS)) continue;
65	if (0==syms[i].st_shndx) continue;	67	if (0 == syms[i].st_shndx) continue;
66	if (!mem.eql(u8, name, cstr.toSliceConst(&strings[syms[i].st_name]))) continue;	68	if (!mem.eql(u8, name, cstr.toSliceConst(strings + syms[i].st_name))) continue;
67	if (maybe_versym) \|versym\| {	69	if (maybe_versym) \|versym\| {
68	if (!checkver(??maybe_verdef, versym[i], vername, strings))	70	if (!checkver(??maybe_verdef, versym[i], vername, strings))
69	continue;	71	continue;
...	@@ -74,16 +76,16 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {	...	@@ -74,16 +76,16 @@ pub fn lookup(vername: []const u8, name: []const u8) usize {
74	return 0;	76	return 0;
75	}	77	}
76		78
77	fn checkver(def_arg: &elf.Verdef, vsym_arg: i32, vername: []const u8, strings: &u8) bool {	79	fn checkver(def_arg: elf.Verdef, vsym_arg: i32, vername: []const u8, strings: []u8) bool {
78	var def = def_arg;	80	var def = def_arg;
79	const vsym = @bitCast(u32, vsym_arg) & 0x7fff;	81	const vsym = @bitCast(u32, vsym_arg) & 0x7fff;
80	while (true) {	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	break;	84	break;
83	if (def.vd_next == 0)	85	if (def.vd_next == 0)
84	return false;	86	return false;
85	def = @intToPtr(&elf.Verdef, @ptrToInt(def) + def.vd_next);	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	return mem.eql(u8, vername, cstr.toSliceConst(&strings[aux.vda_name]));	90	return mem.eql(u8, vername, cstr.toSliceConst(strings + aux.vda_name));
89	}	91	}

std/os/linux/x86_64.zig+67-55

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

std/os/path.zig+57-66

std/os/test.zig+1-1

...	@@ -63,7 +63,7 @@ fn start1(ctx: void) u8 {	...	@@ -63,7 +63,7 @@ fn start1(ctx: void) u8 {
63	return 0;	63	return 0;
64	}	64	}
65		65
66	fn start2(ctx: &i32) u8 {	66	fn start2(ctx: *i32) u8 {
67	_ = @atomicRmw(i32, ctx, AtomicRmwOp.Add, 1, AtomicOrder.SeqCst);	67	_ = @atomicRmw(i32, ctx, AtomicRmwOp.Add, 1, AtomicOrder.SeqCst);
68	return 0;	68	return 0;
69	}	69	}

std/os/time.zig+33-40

 @@ -27,7 +27,7 @@ pub fn sleep(seconds: usize, nanoseconds: usize) void {
 const u63 = @IntType(false, 63);
 pub fn posixSleep(seconds: u63, nanoseconds: u63) void {
-    var req = posix.timespec {
+    var req = posix.timespec{
         .tv_sec = seconds,
         .tv_nsec = nanoseconds,
     };
 @@ -71,7 +71,7 @@ fn milliTimestampWindows() u64 {
     var ft: i64 = undefined;
     windows.GetSystemTimeAsFileTime(&ft);
     const hns_per_ms = (ns_per_s / 100) / ms_per_s;
-    const epoch_adj =  epoch.windows * ms_per_s;
+    const epoch_adj = epoch.windows * ms_per_s;
     return u64(@divFloor(ft, hns_per_ms) + epoch_adj);
 }
 @@ -83,7 +83,7 @@ fn milliTimestampDarwin() u64 {
     debug.assert(err == 0);
     const sec_ms = u64(tv.tv_sec) * ms_per_s;
     const usec_ms = @divFloor(u64(tv.tv_usec), us_per_s / ms_per_s);
-    return  u64(sec_ms) + u64(usec_ms);
+    return u64(sec_ms) + u64(usec_ms);
 }
 fn milliTimestampPosix() u64 {
 @@ -110,17 +110,16 @@ pub const s_per_hour = s_per_min * 60;
 pub const s_per_day = s_per_hour * 24;
 pub const s_per_week = s_per_day * 7;
 /// A monotonic high-performance timer.
 /// Timer.start() must be called to initialize the struct, which captures
 ///   the counter frequency on windows and darwin, records the resolution,
 ///   and gives the user an oportunity to check for the existnece of
 ///   monotonic clocks without forcing them to check for error on each read.
 /// .resolution is in nanoseconds on all platforms but .start_time's meaning
 ///   depends on the OS. On Windows and Darwin it is a hardware counter
 ///   value that requires calculation to convert to a meaninful unit.
 pub const Timer = struct {
     //if we used resolution's value when performing the
     //  performance counter calc on windows/darwin, it would
     //  be less precise
 @@ -131,10 +130,9 @@ pub const Timer = struct {
     },
     resolution: u64,
     start_time: u64,
     //At some point we may change our minds on RAW, but for now we're
     //  sticking with posix standard MONOTONIC. For more information, see:
     //  https://github.com/ziglang/zig/pull/933
     //
     //const monotonic_clock_id = switch(builtin.os) {
 @@ -142,20 +140,21 @@ pub const Timer = struct {
     //    else => posix.CLOCK_MONOTONIC,
     //};
     const monotonic_clock_id = posix.CLOCK_MONOTONIC;
     /// Initialize the timer structure.
     //This gives us an oportunity to grab the counter frequency in windows.
     //On Windows: QueryPerformanceCounter will succeed on anything >= XP/2000.
     //On Posix: CLOCK_MONOTONIC will only fail if the monotonic counter is not
     //  supported, or if the timespec pointer is out of bounds, which should be
     //  impossible here barring cosmic rays or other such occurances of
     //  incredibly bad luck.
     //On Darwin: This cannot fail, as far as I am able to tell.
-    const TimerError = error{TimerUnsupported, Unexpected};
+    const TimerError = error{
+        TimerUnsupported,
+        Unexpected,
+    };
     pub fn start() TimerError!Timer {
         var self: Timer = undefined;
         switch (builtin.os) {
             Os.windows => {
                 var freq: i64 = undefined;
 @@ -163,7 +162,7 @@ pub const Timer = struct {
                 if (err == windows.FALSE) return error.TimerUnsupported;
                 self.frequency = u64(freq);
                 self.resolution = @divFloor(ns_per_s, self.frequency);
                 var start_time: i64 = undefined;
                 err = windows.QueryPerformanceCounter(&start_time);
                 debug.assert(err != windows.FALSE);
 @@ -171,9 +170,9 @@ pub const Timer = struct {
             },
             Os.linux => {
                 //On Linux, seccomp can do arbitrary things to our ability to call
                 //  syscalls, including return any errno value it wants and
                 //  inconsistently throwing errors. Since we can't account for
                 //  abuses of seccomp in a reasonable way, we'll assume that if
                 //  seccomp is going to block us it will at least do so consistently
                 var ts: posix.timespec = undefined;
                 var result = posix.clock_getres(monotonic_clock_id, &ts);
 @@ -184,7 +183,7 @@ pub const Timer = struct {
                     else => return std.os.unexpectedErrorPosix(errno),
                 }
                 self.resolution = u64(ts.tv_sec) * u64(ns_per_s) + u64(ts.tv_nsec);
                 result = posix.clock_gettime(monotonic_clock_id, &ts);
                 errno = posix.getErrno(result);
                 if (errno != 0) return std.os.unexpectedErrorPosix(errno);
 @@ -199,9 +198,9 @@ pub const Timer = struct {
         }
         return self;
     }
     /// Reads the timer value since start or the last reset in nanoseconds
-    pub fn read(self: &Timer) u64 {
+    pub fn read(self: *Timer) u64 {
         var clock = clockNative() - self.start_time;
         return switch (builtin.os) {
             Os.windows => @divFloor(clock * ns_per_s, self.frequency),
 @@ -210,40 +209,38 @@ pub const Timer = struct {
             else => @compileError("Unsupported OS"),
         };
     }
     /// Resets the timer value to 0/now.
-    pub fn reset(self: &Timer) void
+    pub fn reset(self: *Timer) void {
-    {
         self.start_time = clockNative();
     }
     /// Returns the current value of the timer in nanoseconds, then resets it
-    pub fn lap(self: &Timer) u64 {
+    pub fn lap(self: *Timer) u64 {
         var now = clockNative();
         var lap_time = self.read();
         self.start_time = now;
         return lap_time;
     }
     const clockNative = switch (builtin.os) {
         Os.windows => clockWindows,
         Os.linux => clockLinux,
         Os.macosx, Os.ios => clockDarwin,
         else => @compileError("Unsupported OS"),
     };
     fn clockWindows() u64 {
         var result: i64 = undefined;
         var err = windows.QueryPerformanceCounter(&result);
         debug.assert(err != windows.FALSE);
         return u64(result);
     }
     fn clockDarwin() u64 {
         return darwin.mach_absolute_time();
     }
     fn clockLinux() u64 {
         var ts: posix.timespec = undefined;
         var result = posix.clock_gettime(monotonic_clock_id, &ts);
 @@ -252,10 +249,6 @@ pub const Timer = struct {
     }
 };
 test "os.time.sleep" {
     sleep(0, 1);
 }
 @@ -263,7 +256,7 @@ test "os.time.sleep" {
 test "os.time.timestamp" {
     const ns_per_ms = (ns_per_s / ms_per_s);
     const margin = 50;
     const time_0 = milliTimestamp();
     sleep(0, ns_per_ms);
     const time_1 = milliTimestamp();
 @@ -274,15 +267,15 @@ test "os.time.timestamp" {
 test "os.time.Timer" {
     const ns_per_ms = (ns_per_s / ms_per_s);
     const margin = ns_per_ms * 50;
     var timer = try Timer.start();
     sleep(0, 10 * ns_per_ms);
     const time_0 = timer.read();
     debug.assert(time_0 > 0 and time_0 < margin);
     const time_1 = timer.lap();
     debug.assert(time_1 >= time_0);
     timer.reset();
     debug.assert(timer.read() < time_1);
 }

std/os/windows/error.zig+1188

std/os/windows/index.zig+146-98

...	@@ -1,33 +1,59 @@	...	@@ -1,33 +1,59 @@
1	pub const ERROR = @import("error.zig");	1	pub const ERROR = @import("error.zig");
2		2
3	pub extern "advapi32" stdcallcc fn CryptAcquireContextA(phProv: &HCRYPTPROV, pszContainer: ?LPCSTR,	3	pub extern "advapi32" stdcallcc fn CryptAcquireContextA(
4	pszProvider: ?LPCSTR, dwProvType: DWORD, dwFlags: DWORD) BOOL;	4	phProv: *HCRYPTPROV,
		5	pszContainer: ?LPCSTR,
		6	pszProvider: ?LPCSTR,
		7	dwProvType: DWORD,
		8	dwFlags: DWORD,
		9	) BOOL;
5		10
6	pub extern "advapi32" stdcallcc fn CryptReleaseContext(hProv: HCRYPTPROV, dwFlags: DWORD) BOOL;	11	pub extern "advapi32" stdcallcc fn CryptReleaseContext(hProv: HCRYPTPROV, dwFlags: DWORD) BOOL;
7		12
8	pub extern "advapi32" stdcallcc fn CryptGenRandom(hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: &BYTE) BOOL;	13	pub extern "advapi32" stdcallcc fn CryptGenRandom(hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: [*]BYTE) BOOL;
9
10		14
11	pub extern "kernel32" stdcallcc fn CloseHandle(hObject: HANDLE) BOOL;	15	pub extern "kernel32" stdcallcc fn CloseHandle(hObject: HANDLE) BOOL;
12		16
13	pub extern "kernel32" stdcallcc fn CreateDirectoryA(lpPathName: LPCSTR,	17	pub extern "kernel32" stdcallcc fn CreateDirectoryA(
14	lpSecurityAttributes: ?&SECURITY_ATTRIBUTES) BOOL;	18	lpPathName: LPCSTR,
15		19	lpSecurityAttributes: ?*SECURITY_ATTRIBUTES,
16	pub extern "kernel32" stdcallcc fn CreateFileA(lpFileName: LPCSTR, dwDesiredAccess: DWORD,	20	) BOOL;
17	dwShareMode: DWORD, lpSecurityAttributes: ?LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,	21
18	dwFlagsAndAttributes: DWORD, hTemplateFile: ?HANDLE) HANDLE;	22	pub extern "kernel32" stdcallcc fn CreateFileA(
19		23	lpFileName: LPCSTR,
20	pub extern "kernel32" stdcallcc fn CreatePipe(hReadPipe: &HANDLE, hWritePipe: &HANDLE,	24	dwDesiredAccess: DWORD,
21	lpPipeAttributes: &const SECURITY_ATTRIBUTES, nSize: DWORD) BOOL;	25	dwShareMode: DWORD,
22		26	lpSecurityAttributes: ?LPSECURITY_ATTRIBUTES,
23	pub extern "kernel32" stdcallcc fn CreateProcessA(lpApplicationName: ?LPCSTR, lpCommandLine: LPSTR,	27	dwCreationDisposition: DWORD,
24	lpProcessAttributes: ?&SECURITY_ATTRIBUTES, lpThreadAttributes: ?&SECURITY_ATTRIBUTES, bInheritHandles: BOOL,	28	dwFlagsAndAttributes: DWORD,
25	dwCreationFlags: DWORD, lpEnvironment: ?&c_void, lpCurrentDirectory: ?LPCSTR, lpStartupInfo: &STARTUPINFOA,	29	hTemplateFile: ?HANDLE,
26	lpProcessInformation: &PROCESS_INFORMATION) BOOL;	30	) HANDLE;
27		31
28	pub extern "kernel32" stdcallcc fn CreateSymbolicLinkA(lpSymlinkFileName: LPCSTR, lpTargetFileName: LPCSTR,	32	pub extern "kernel32" stdcallcc fn CreatePipe(
29	dwFlags: DWORD) BOOLEAN;	33	hReadPipe: *HANDLE,
30		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	pub extern "kernel32" stdcallcc fn CreateThread(lpThreadAttributes: ?LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T, lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: ?LPVOID, dwCreationFlags: DWORD, lpThreadId: ?LPDWORD) ?HANDLE;	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
...	@@ -35,66 +61,84 @@ pub extern "kernel32" stdcallcc fn DeleteFileA(lpFileName: LPCSTR) BOOL;	...	@@ -35,66 +61,84 @@ pub extern "kernel32" stdcallcc fn DeleteFileA(lpFileName: LPCSTR) BOOL;
35		61
36	pub extern "kernel32" stdcallcc fn ExitProcess(exit_code: UINT) noreturn;	62	pub extern "kernel32" stdcallcc fn ExitProcess(exit_code: UINT) noreturn;
37		63
38	pub extern "kernel32" stdcallcc fn FreeEnvironmentStringsA(penv: LPCH) BOOL;	64	pub extern "kernel32" stdcallcc fn FreeEnvironmentStringsA(penv: [*]u8) BOOL;
39		65
40	pub extern "kernel32" stdcallcc fn GetCommandLineA() LPSTR;	66	pub extern "kernel32" stdcallcc fn GetCommandLineA() LPSTR;
41		67
42	pub extern "kernel32" stdcallcc fn GetConsoleMode(in_hConsoleHandle: HANDLE, out_lpMode: &DWORD) BOOL;	68	pub extern "kernel32" stdcallcc fn GetConsoleMode(in_hConsoleHandle: HANDLE, out_lpMode: *DWORD) BOOL;
43		69
44	pub extern "kernel32" stdcallcc fn GetCurrentDirectoryA(nBufferLength: WORD, lpBuffer: ?LPSTR) DWORD;	70	pub extern "kernel32" stdcallcc fn GetCurrentDirectoryA(nBufferLength: WORD, lpBuffer: ?LPSTR) DWORD;
45		71
46	pub extern "kernel32" stdcallcc fn GetEnvironmentStringsA() ?LPCH;	72	pub extern "kernel32" stdcallcc fn GetEnvironmentStringsA() ?[*]u8;
47		73
48	pub extern "kernel32" stdcallcc fn GetEnvironmentVariableA(lpName: LPCSTR, lpBuffer: LPSTR, nSize: DWORD) DWORD;	74	pub extern "kernel32" stdcallcc fn GetEnvironmentVariableA(lpName: LPCSTR, lpBuffer: LPSTR, nSize: DWORD) DWORD;
49		75
50	pub extern "kernel32" stdcallcc fn GetExitCodeProcess(hProcess: HANDLE, lpExitCode: &DWORD) BOOL;	76	pub extern "kernel32" stdcallcc fn GetExitCodeProcess(hProcess: HANDLE, lpExitCode: *DWORD) BOOL;
51		77
52	pub extern "kernel32" stdcallcc fn GetFileSizeEx(hFile: HANDLE, lpFileSize: &LARGE_INTEGER) BOOL;	78	pub extern "kernel32" stdcallcc fn GetFileSizeEx(hFile: HANDLE, lpFileSize: *LARGE_INTEGER) BOOL;
53		79
54	pub extern "kernel32" stdcallcc fn GetModuleFileNameA(hModule: ?HMODULE, lpFilename: LPSTR, nSize: DWORD) DWORD;	80	pub extern "kernel32" stdcallcc fn GetModuleFileNameA(hModule: ?HMODULE, lpFilename: LPSTR, nSize: DWORD) DWORD;
55		81
56	pub extern "kernel32" stdcallcc fn GetLastError() DWORD;	82	pub extern "kernel32" stdcallcc fn GetLastError() DWORD;
57		83
58	pub extern "kernel32" stdcallcc fn GetFileInformationByHandleEx(in_hFile: HANDLE,	84	pub extern "kernel32" stdcallcc fn GetFileInformationByHandleEx(
59	in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, out_lpFileInformation: &c_void,	85	in_hFile: HANDLE,
60	in_dwBufferSize: DWORD) BOOL;	86	in_FileInformationClass: FILE_INFO_BY_HANDLE_CLASS,
61		87	out_lpFileInformation: *c_void,
62	pub extern "kernel32" stdcallcc fn GetFinalPathNameByHandleA(hFile: HANDLE, lpszFilePath: LPSTR,	88	in_dwBufferSize: DWORD,
63	cchFilePath: DWORD, dwFlags: DWORD) 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	pub extern "kernel32" stdcallcc fn GetProcessHeap() ?HANDLE;	98	pub extern "kernel32" stdcallcc fn GetProcessHeap() ?HANDLE;
66		99
67	pub extern "kernel32" stdcallcc fn GetSystemTimeAsFileTime(?&FILETIME) void;	100	pub extern "kernel32" stdcallcc fn GetSystemTimeAsFileTime(?*FILETIME) void;
68		101
69	pub extern "kernel32" stdcallcc fn HeapCreate(flOptions: DWORD, dwInitialSize: SIZE_T, dwMaximumSize: SIZE_T) ?HANDLE;	102	pub extern "kernel32" stdcallcc fn HeapCreate(flOptions: DWORD, dwInitialSize: SIZE_T, dwMaximumSize: SIZE_T) ?HANDLE;
70	pub extern "kernel32" stdcallcc fn HeapDestroy(hHeap: HANDLE) BOOL;	103	pub extern "kernel32" stdcallcc fn HeapDestroy(hHeap: HANDLE) BOOL;
71	pub extern "kernel32" stdcallcc fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: &c_void, dwBytes: SIZE_T) ?&c_void;	104	pub extern "kernel32" stdcallcc fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: []c_void, dwBytes: SIZE_T) ?[]c_void;
72	pub extern "kernel32" stdcallcc fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: &const c_void) SIZE_T;	105	pub extern "kernel32" stdcallcc fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: [*]const c_void) SIZE_T;
73	pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: &const c_void) BOOL;	106	pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: [*]const c_void) BOOL;
74	pub extern "kernel32" stdcallcc fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) SIZE_T;	107	pub extern "kernel32" stdcallcc fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) SIZE_T;
75	pub extern "kernel32" stdcallcc fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) BOOL;	108	pub extern "kernel32" stdcallcc fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) BOOL;
76		109
77	pub extern "kernel32" stdcallcc fn GetStdHandle(in_nStdHandle: DWORD) ?HANDLE;	110	pub extern "kernel32" stdcallcc fn GetStdHandle(in_nStdHandle: DWORD) ?HANDLE;
78		111
79	pub extern "kernel32" stdcallcc fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) ?&c_void;	112	pub extern "kernel32" stdcallcc fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) ?[*]c_void;
80		113
81	pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: &c_void) BOOL;	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,	116	pub extern "kernel32" stdcallcc fn MoveFileExA(
84	dwFlags: DWORD) BOOL;	117	lpExistingFileName: LPCSTR,
85		118	lpNewFileName: LPCSTR,
86	pub extern "kernel32" stdcallcc fn QueryPerformanceCounter(lpPerformanceCount: &LARGE_INTEGER) BOOL;	119	dwFlags: DWORD,
		120	) BOOL;
87		121
88	pub extern "kernel32" stdcallcc fn QueryPerformanceFrequency(lpFrequency: &LARGE_INTEGER) BOOL;	122	pub extern "kernel32" stdcallcc fn QueryPerformanceCounter(lpPerformanceCount: *LARGE_INTEGER) BOOL;
89		123
90	pub extern "kernel32" stdcallcc fn PathFileExists(pszPath: ?LPCTSTR) BOOL;	124	pub extern "kernel32" stdcallcc fn QueryPerformanceFrequency(lpFrequency: *LARGE_INTEGER) BOOL;
91		125
92	pub extern "kernel32" stdcallcc fn ReadFile(in_hFile: HANDLE, out_lpBuffer: &c_void,	126	pub extern "kernel32" stdcallcc fn PathFileExists(pszPath: ?LPCTSTR) BOOL;
93	in_nNumberOfBytesToRead: DWORD, out_lpNumberOfBytesRead: &DWORD,
94	in_out_lpOverlapped: ?&OVERLAPPED) BOOL;
95		127
96	pub extern "kernel32" stdcallcc fn SetFilePointerEx(in_fFile: HANDLE, in_liDistanceToMove: LARGE_INTEGER,	128	pub extern "kernel32" stdcallcc fn ReadFile(
97	out_opt_ldNewFilePointer: ?&LARGE_INTEGER, in_dwMoveMethod: DWORD) BOOL;	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	pub extern "kernel32" stdcallcc fn SetHandleInformation(hObject: HANDLE, dwMask: DWORD, dwFlags: DWORD) BOOL;	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,14 +148,18 @@ pub extern "kernel32" stdcallcc fn TerminateProcess(hProcess: HANDLE, uExitCode:
104		148
105	pub extern "kernel32" stdcallcc fn WaitForSingleObject(hHandle: HANDLE, dwMilliseconds: DWORD) DWORD;	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,	151	pub extern "kernel32" stdcallcc fn WriteFile(
108	in_nNumberOfBytesToWrite: DWORD, out_lpNumberOfBytesWritten: ?&DWORD,	152	in_hFile: HANDLE,
109	in_out_lpOverlapped: ?&OVERLAPPED) BOOL;	153	in_lpBuffer: [*]const c_void,
		154	in_nNumberOfBytesToWrite: DWORD,
		155	out_lpNumberOfBytesWritten: ?*DWORD,
		156	in_out_lpOverlapped: ?*OVERLAPPED,
		157	) BOOL;
110		158
111	//TODO: call unicode versions instead of relying on ANSI code page	159	//TODO: call unicode versions instead of relying on ANSI code page
112	pub extern "kernel32" stdcallcc fn LoadLibraryA(lpLibFileName: LPCSTR) ?HMODULE;	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	pub extern "user32" stdcallcc fn MessageBoxA(hWnd: ?HANDLE, lpText: ?LPCTSTR, lpCaption: ?LPCTSTR, uType: UINT) c_int;	164	pub extern "user32" stdcallcc fn MessageBoxA(hWnd: ?HANDLE, lpText: ?LPCTSTR, lpCaption: ?LPCTSTR, uType: UINT) c_int;
117		165
...	@@ -123,23 +171,23 @@ pub const BYTE = u8;	...	@@ -123,23 +171,23 @@ pub const BYTE = u8;
123	pub const CHAR = u8;	171	pub const CHAR = u8;
124	pub const DWORD = u32;	172	pub const DWORD = u32;
125	pub const FLOAT = f32;	173	pub const FLOAT = f32;
126	pub const HANDLE = &c_void;	174	pub const HANDLE = *c_void;
127	pub const HCRYPTPROV = ULONG_PTR;	175	pub const HCRYPTPROV = ULONG_PTR;
128	pub const HINSTANCE = &@OpaqueType();	176	pub const HINSTANCE = *@OpaqueType();
129	pub const HMODULE = &@OpaqueType();	177	pub const HMODULE = *@OpaqueType();
130	pub const INT = c_int;	178	pub const INT = c_int;
131	pub const LPBYTE = &BYTE;	179	pub const LPBYTE = *BYTE;
132	pub const LPCH = &CHAR;	180	pub const LPCH = *CHAR;
133	pub const LPCSTR = &const CHAR;	181	pub const LPCSTR = [*]const CHAR;
134	pub const LPCTSTR = &const TCHAR;	182	pub const LPCTSTR = [*]const TCHAR;
135	pub const LPCVOID = &const c_void;	183	pub const LPCVOID = *const c_void;
136	pub const LPDWORD = &DWORD;	184	pub const LPDWORD = *DWORD;
137	pub const LPSTR = &CHAR;	185	pub const LPSTR = [*]CHAR;
138	pub const LPTSTR = if (UNICODE) LPWSTR else LPSTR;	186	pub const LPTSTR = if (UNICODE) LPWSTR else LPSTR;
139	pub const LPVOID = &c_void;	187	pub const LPVOID = *c_void;
140	pub const LPWSTR = &WCHAR;	188	pub const LPWSTR = [*]WCHAR;
141	pub const PVOID = &c_void;	189	pub const PVOID = *c_void;
142	pub const PWSTR = &WCHAR;	190	pub const PWSTR = [*]WCHAR;
143	pub const SIZE_T = usize;	191	pub const SIZE_T = usize;
144	pub const TCHAR = if (UNICODE) WCHAR else u8;	192	pub const TCHAR = if (UNICODE) WCHAR else u8;
145	pub const UINT = c_uint;	193	pub const UINT = c_uint;
...	@@ -170,63 +218,64 @@ pub const OVERLAPPED = extern struct {	...	@@ -170,63 +218,64 @@ pub const OVERLAPPED = extern struct {
170	Pointer: PVOID,	218	Pointer: PVOID,
171	hEvent: HANDLE,	219	hEvent: HANDLE,
172	};	220	};
173	pub const LPOVERLAPPED = &OVERLAPPED;	221	pub const LPOVERLAPPED = *OVERLAPPED;
174		222
175	pub const MAX_PATH = 260;	223	pub const MAX_PATH = 260;
176		224
177	// TODO issue #305	225	// TODO issue #305
178	pub const FILE_INFO_BY_HANDLE_CLASS = u32;	226	pub const FILE_INFO_BY_HANDLE_CLASS = u32;
179	pub const FileBasicInfo = 0;	227	pub const FileBasicInfo = 0;
180	pub const FileStandardInfo = 1;	228	pub const FileStandardInfo = 1;
181	pub const FileNameInfo = 2;	229	pub const FileNameInfo = 2;
182	pub const FileRenameInfo = 3;	230	pub const FileRenameInfo = 3;
183	pub const FileDispositionInfo = 4;	231	pub const FileDispositionInfo = 4;
184	pub const FileAllocationInfo = 5;	232	pub const FileAllocationInfo = 5;
185	pub const FileEndOfFileInfo = 6;	233	pub const FileEndOfFileInfo = 6;
186	pub const FileStreamInfo = 7;	234	pub const FileStreamInfo = 7;
187	pub const FileCompressionInfo = 8;	235	pub const FileCompressionInfo = 8;
188	pub const FileAttributeTagInfo = 9;	236	pub const FileAttributeTagInfo = 9;
189	pub const FileIdBothDirectoryInfo = 10;	237	pub const FileIdBothDirectoryInfo = 10;
190	pub const FileIdBothDirectoryRestartInfo = 11;	238	pub const FileIdBothDirectoryRestartInfo = 11;
191	pub const FileIoPriorityHintInfo = 12;	239	pub const FileIoPriorityHintInfo = 12;
192	pub const FileRemoteProtocolInfo = 13;	240	pub const FileRemoteProtocolInfo = 13;
193	pub const FileFullDirectoryInfo = 14;	241	pub const FileFullDirectoryInfo = 14;
194	pub const FileFullDirectoryRestartInfo = 15;	242	pub const FileFullDirectoryRestartInfo = 15;
195	pub const FileStorageInfo = 16;	243	pub const FileStorageInfo = 16;
196	pub const FileAlignmentInfo = 17;	244	pub const FileAlignmentInfo = 17;
197	pub const FileIdInfo = 18;	245	pub const FileIdInfo = 18;
198	pub const FileIdExtdDirectoryInfo = 19;	246	pub const FileIdExtdDirectoryInfo = 19;
199	pub const FileIdExtdDirectoryRestartInfo = 20;	247	pub const FileIdExtdDirectoryRestartInfo = 20;
200		248
201	pub const FILE_NAME_INFO = extern struct {	249	pub const FILE_NAME_INFO = extern struct {
202	FileNameLength: DWORD,	250	FileNameLength: DWORD,
203	FileName: [1]WCHAR,	251	FileName: [1]WCHAR,
204	};	252	};
205		253
206
207	/// Return the normalized drive name. This is the default.	254	/// Return the normalized drive name. This is the default.
208	pub const FILE_NAME_NORMALIZED = 0x0;	255	pub const FILE_NAME_NORMALIZED = 0x0;
		256
209	/// Return the opened file name (not normalized).	257	/// Return the opened file name (not normalized).
210	pub const FILE_NAME_OPENED = 0x8;	258	pub const FILE_NAME_OPENED = 0x8;
211		259
212	/// Return the path with the drive letter. This is the default.	260	/// Return the path with the drive letter. This is the default.
213	pub const VOLUME_NAME_DOS = 0x0;	261	pub const VOLUME_NAME_DOS = 0x0;
		262
214	/// Return the path with a volume GUID path instead of the drive name.	263	/// Return the path with a volume GUID path instead of the drive name.
215	pub const VOLUME_NAME_GUID = 0x1;	264	pub const VOLUME_NAME_GUID = 0x1;
		265
216	/// Return the path with no drive information.	266	/// Return the path with no drive information.
217	pub const VOLUME_NAME_NONE = 0x4;	267	pub const VOLUME_NAME_NONE = 0x4;
		268
218	/// Return the path with the volume device path.	269	/// Return the path with the volume device path.
219	pub const VOLUME_NAME_NT = 0x2;	270	pub const VOLUME_NAME_NT = 0x2;
220		271
221
222	pub const SECURITY_ATTRIBUTES = extern struct {	272	pub const SECURITY_ATTRIBUTES = extern struct {
223	nLength: DWORD,	273	nLength: DWORD,
224	lpSecurityDescriptor: ?&c_void,	274	lpSecurityDescriptor: ?*c_void,
225	bInheritHandle: BOOL,	275	bInheritHandle: BOOL,
226	};	276	};
227	pub const PSECURITY_ATTRIBUTES = &SECURITY_ATTRIBUTES;	277	pub const PSECURITY_ATTRIBUTES = *SECURITY_ATTRIBUTES;
228	pub const LPSECURITY_ATTRIBUTES = &SECURITY_ATTRIBUTES;	278	pub const LPSECURITY_ATTRIBUTES = *SECURITY_ATTRIBUTES;
229
230		279
231	pub const GENERIC_READ = 0x80000000;	280	pub const GENERIC_READ = 0x80000000;
232	pub const GENERIC_WRITE = 0x40000000;	281	pub const GENERIC_WRITE = 0x40000000;
...	@@ -243,7 +292,6 @@ pub const OPEN_ALWAYS = 4;	...	@@ -243,7 +292,6 @@ pub const OPEN_ALWAYS = 4;
243	pub const OPEN_EXISTING = 3;	292	pub const OPEN_EXISTING = 3;
244	pub const TRUNCATE_EXISTING = 5;	293	pub const TRUNCATE_EXISTING = 5;
245		294
246
247	pub const FILE_ATTRIBUTE_ARCHIVE = 0x20;	295	pub const FILE_ATTRIBUTE_ARCHIVE = 0x20;
248	pub const FILE_ATTRIBUTE_ENCRYPTED = 0x4000;	296	pub const FILE_ATTRIBUTE_ENCRYPTED = 0x4000;
249	pub const FILE_ATTRIBUTE_HIDDEN = 0x2;	297	pub const FILE_ATTRIBUTE_HIDDEN = 0x2;
...	@@ -321,7 +369,7 @@ pub const HEAP_CREATE_ENABLE_EXECUTE = 0x00040000;	...	@@ -321,7 +369,7 @@ pub const HEAP_CREATE_ENABLE_EXECUTE = 0x00040000;
321	pub const HEAP_GENERATE_EXCEPTIONS = 0x00000004;	369	pub const HEAP_GENERATE_EXCEPTIONS = 0x00000004;
322	pub const HEAP_NO_SERIALIZE = 0x00000001;	370	pub const HEAP_NO_SERIALIZE = 0x00000001;
323		371
324	pub const PTHREAD_START_ROUTINE = extern fn(LPVOID) DWORD;	372	pub const PTHREAD_START_ROUTINE = extern fn (LPVOID) DWORD;
325	pub const LPTHREAD_START_ROUTINE = PTHREAD_START_ROUTINE;	373	pub const LPTHREAD_START_ROUTINE = PTHREAD_START_ROUTINE;
326		374
327	test "import" {	375	test "import" {

std/os/windows/util.zig+23-24

 @@ -7,7 +7,7 @@ const mem = std.mem;
 const BufMap = std.BufMap;
 const cstr = std.cstr;
-pub const WaitError = error {
+pub const WaitError = error{
     WaitAbandoned,
     WaitTimeOut,
     Unexpected,
 @@ -33,7 +33,7 @@ pub fn windowsClose(handle: windows.HANDLE) void {
     assert(windows.CloseHandle(handle) != 0);
 }
-pub const WriteError = error {
+pub const WriteError = error{
     SystemResources,
     OperationAborted,
     IoPending,
 @@ -42,7 +42,7 @@ pub const WriteError = error {
 };
 pub fn windowsWrite(handle: windows.HANDLE, bytes: []const u8) WriteError!void {
-    if (windows.WriteFile(handle, @ptrCast(&const c_void, bytes.ptr), u32(bytes.len), null, null) == 0) {
+    if (windows.WriteFile(handle, @ptrCast([*]const c_void, bytes.ptr), u32(bytes.len), null, null) == 0) {
         const err = windows.GetLastError();
         return switch (err) {
             windows.ERROR.INVALID_USER_BUFFER => WriteError.SystemResources,
 @@ -68,20 +68,18 @@ pub fn windowsIsCygwinPty(handle: windows.HANDLE) bool {
     const size = @sizeOf(windows.FILE_NAME_INFO);
     var name_info_bytes align(@alignOf(windows.FILE_NAME_INFO)) = []u8{0} ** (size + windows.MAX_PATH);
-    if (windows.GetFileInformationByHandleEx(handle, windows.FileNameInfo,
+    if (windows.GetFileInformationByHandleEx(handle, windows.FileNameInfo, @ptrCast(*c_void, &name_info_bytes[0]), u32(name_info_bytes.len)) == 0) {
-        @ptrCast(&c_void, &name_info_bytes[0]), u32(name_info_bytes.len)) == 0)
-    {
         return true;
     }
-    const name_info = @ptrCast(&const windows.FILE_NAME_INFO, &name_info_bytes[0]);
+    const name_info = @ptrCast(*const windows.FILE_NAME_INFO, &name_info_bytes[0]);
-    const name_bytes = name_info_bytes[size..size + usize(name_info.FileNameLength)];
+    const name_bytes = name_info_bytes[size .. size + usize(name_info.FileNameLength)];
-    const name_wide  = ([]u16)(name_bytes);
+    const name_wide = ([]u16)(name_bytes);
-    return mem.indexOf(u16, name_wide, []u16{'m','s','y','s','-'}) != null or
+    return mem.indexOf(u16, name_wide, []u16{ 'm', 's', 'y', 's', '-' }) != null or
-           mem.indexOf(u16, name_wide, []u16{'-','p','t','y'}) != null;
+        mem.indexOf(u16, name_wide, []u16{ '-', 'p', 't', 'y' }) != null;
 }
-pub const OpenError = error {
+pub const OpenError = error{
     SharingViolation,
     PathAlreadyExists,
     FileNotFound,
 @@ -92,15 +90,18 @@ pub const OpenError = error {
 };
 /// `file_path` needs to be copied in memory to add a null terminating byte, hence the allocator.
-pub fn windowsOpen(allocator: &mem.Allocator, file_path: []const u8, desired_access: windows.DWORD, share_mode: windows.DWORD,
+pub fn windowsOpen(
-    creation_disposition: windows.DWORD, flags_and_attrs: windows.DWORD)
+    allocator: *mem.Allocator,
-    OpenError!windows.HANDLE
+    file_path: []const u8,
-{
+    desired_access: windows.DWORD,
+    share_mode: windows.DWORD,
+    creation_disposition: windows.DWORD,
+    flags_and_attrs: windows.DWORD,
+) OpenError!windows.HANDLE {
     const path_with_null = try cstr.addNullByte(allocator, file_path);
     defer allocator.free(path_with_null);
-    const result = windows.CreateFileA(path_with_null.ptr, desired_access, share_mode, null, creation_disposition,
+    const result = windows.CreateFileA(path_with_null.ptr, desired_access, share_mode, null, creation_disposition, flags_and_attrs, null);
-        flags_and_attrs, null);
     if (result == windows.INVALID_HANDLE_VALUE) {
         const err = windows.GetLastError();
 @@ -118,7 +119,7 @@ pub fn windowsOpen(allocator: &mem.Allocator, file_path: []const u8, desired_acc
 }
 /// Caller must free result.
-pub fn createWindowsEnvBlock(allocator: &mem.Allocator, env_map: &const BufMap) ![]u8 {
+pub fn createWindowsEnvBlock(allocator: *mem.Allocator, env_map: *const BufMap) ![]u8 {
     // count bytes needed
     const bytes_needed = x: {
         var bytes_needed: usize = 1; // 1 for the final null byte
 @@ -149,25 +150,23 @@ pub fn createWindowsEnvBlock(allocator: &mem.Allocator, env_map: &const BufMap)
     return result;
 }
-pub fn windowsLoadDll(allocator: &mem.Allocator, dll_path: []const u8) !windows.HMODULE {
+pub fn windowsLoadDll(allocator: *mem.Allocator, dll_path: []const u8) !windows.HMODULE {
     const padded_buff = try cstr.addNullByte(allocator, dll_path);
     defer allocator.free(padded_buff);
     return windows.LoadLibraryA(padded_buff.ptr) ?? error.DllNotFound;
 }
 pub fn windowsUnloadDll(hModule: windows.HMODULE) void {
-    assert(windows.FreeLibrary(hModule)!= 0);
+    assert(windows.FreeLibrary(hModule) != 0);
 }
 test "InvalidDll" {
     if (builtin.os != builtin.Os.windows) return;
     const DllName = "asdf.dll";
     const allocator = std.debug.global_allocator;
-    const handle = os.windowsLoadDll(allocator, DllName) catch  |err| {
+    const handle = os.windowsLoadDll(allocator, DllName) catch |err| {
         assert(err == error.DllNotFound);
         return;
     };
 }

std/os/zen.zig+86-72

 @@ -3,35 +3,35 @@
 //////////////////////////
 pub const Message = struct {
-    sender:   MailboxId,
+    sender: MailboxId,
     receiver: MailboxId,
-    type:     usize,
+    type: usize,
-    payload:  usize,
+    payload: usize,
-    pub fn from(mailbox_id: &const MailboxId) Message {
+    pub fn from(mailbox_id: *const MailboxId) Message {
-        return Message {
+        return Message{
-            .sender   = MailboxId.Undefined,
+            .sender = MailboxId.Undefined,
             .receiver = *mailbox_id,
-            .type     = 0,
+            .type = 0,
-            .payload  = 0,
+            .payload = 0,
         };
     }
-    pub fn to(mailbox_id: &const MailboxId, msg_type: usize) Message {
+    pub fn to(mailbox_id: *const MailboxId, msg_type: usize) Message {
-        return Message {
+        return Message{
-            .sender   = MailboxId.This,
+            .sender = MailboxId.This,
             .receiver = *mailbox_id,
-            .type     = msg_type,
+            .type = msg_type,
-            .payload  = 0,
+            .payload = 0,
         };
     }
-    pub fn withData(mailbox_id: &const MailboxId, msg_type: usize, payload: usize) Message {
+    pub fn withData(mailbox_id: *const MailboxId, msg_type: usize, payload: usize) Message {
-        return Message {
+        return Message{
-            .sender   = MailboxId.This,
+            .sender = MailboxId.This,
             .receiver = *mailbox_id,
-            .type     = msg_type,
+            .type = msg_type,
-            .payload  = payload,
+            .payload = payload,
         };
     }
 };
 @@ -40,27 +40,25 @@ pub const MailboxId = union(enum) {
     Undefined,
     This,
     Kernel,
-    Port:   u16,
+    Port: u16,
     Thread: u16,
 };
 //////////////////////////////////////
 ////  Ports reserved for servers  ////
 //////////////////////////////////////
 pub const Server = struct {
-    pub const Keyboard = MailboxId { .Port = 0 };
+    pub const Keyboard = MailboxId{ .Port = 0 };
-    pub const Terminal = MailboxId { .Port = 1 };
+    pub const Terminal = MailboxId{ .Port = 1 };
 };
 ////////////////////////
 ////  POSIX things  ////
 ////////////////////////
 // Standard streams.
-pub const  STDIN_FILENO = 0;
+pub const STDIN_FILENO = 0;
 pub const STDOUT_FILENO = 1;
 pub const STDERR_FILENO = 2;
 @@ -69,7 +67,7 @@ pub const getErrno = @import("linux/index.zig").getErrno;
 use @import("linux/errno.zig");
 // TODO: implement this correctly.
-pub fn read(fd: i32, buf: &u8, count: usize) usize {
+pub fn read(fd: i32, buf: *u8, count: usize) usize {
     switch (fd) {
         STDIN_FILENO => {
             var i: usize = 0;
 @@ -77,7 +75,7 @@ pub fn read(fd: i32, buf: &u8, count: usize) usize {
                 send(Message.to(Server.Keyboard, 0));
                 var message = Message.from(MailboxId.This);
-                receive(&message);
+                receive(*message);
                 buf[i] = u8(message.payload);
             }
 @@ -88,7 +86,7 @@ pub fn read(fd: i32, buf: &u8, count: usize) usize {
 }
 // TODO: implement this correctly.
-pub fn write(fd: i32, buf: &const u8, count: usize) usize {
+pub fn write(fd: i32, buf: *const u8, count: usize) usize {
     switch (fd) {
         STDOUT_FILENO, STDERR_FILENO => {
             var i: usize = 0;
 @@ -101,26 +99,24 @@ pub fn write(fd: i32, buf: &const u8, count: usize) usize {
     return count;
 }
 ///////////////////////////
 ////  Syscall numbers  ////
 ///////////////////////////
 pub const Syscall = enum(usize) {
-    exit          = 0,
+    exit = 0,
-    createPort    = 1,
+    createPort = 1,
-    send          = 2,
+    send = 2,
-    receive       = 3,
+    receive = 3,
-    subscribeIRQ  = 4,
+    subscribeIRQ = 4,
-    inb           = 5,
+    inb = 5,
-    map           = 6,
+    map = 6,
-    createThread  = 7,
+    createThread = 7,
     createProcess = 8,
-    wait          = 9,
+    wait = 9,
-    portReady     = 10,
+    portReady = 10,
 };
 ////////////////////
 ////  Syscalls  ////
 ////////////////////
 @@ -130,22 +126,22 @@ pub fn exit(status: i32) noreturn {
     unreachable;
 }
-pub fn createPort(mailbox_id: &const MailboxId) void {
+pub fn createPort(mailbox_id: *const MailboxId) void {
     _ = switch (*mailbox_id) {
         MailboxId.Port => |id| syscall1(Syscall.createPort, id),
         else => unreachable,
     };
 }
-pub fn send(message: &const Message) void {
+pub fn send(message: *const Message) void {
     _ = syscall1(Syscall.send, @ptrToInt(message));
 }
-pub fn receive(destination: &Message) void {
+pub fn receive(destination: *Message) void {
     _ = syscall1(Syscall.receive, @ptrToInt(destination));
 }
-pub fn subscribeIRQ(irq: u8, mailbox_id: &const MailboxId) void {
+pub fn subscribeIRQ(irq: u8, mailbox_id: *const MailboxId) void {
     _ = syscall2(Syscall.subscribeIRQ, irq, @ptrToInt(mailbox_id));
 }
 @@ -157,7 +153,7 @@ pub fn map(v_addr: usize, p_addr: usize, size: usize, writable: bool) bool {
     return syscall4(Syscall.map, v_addr, p_addr, size, usize(writable)) != 0;
 }
-pub fn createThread(function: fn()void) u16 {
+pub fn createThread(function: fn () void) u16 {
     return u16(syscall1(Syscall.createThread, @ptrToInt(function)));
 }
 @@ -180,66 +176,84 @@ pub fn portReady(port: u16) bool {
 inline fn syscall0(number: Syscall) usize {
     return asm volatile ("int $0x80"
         : [ret] "={eax}" (-> usize)
-        : [number] "{eax}" (number));
+        : [number] "{eax}" (number)
+    );
 }
 inline fn syscall1(number: Syscall, arg1: usize) usize {
     return asm volatile ("int $0x80"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
-            [arg1] "{ecx}" (arg1));
+          [arg1] "{ecx}" (arg1)
+    );
 }
 inline fn syscall2(number: Syscall, arg1: usize, arg2: usize) usize {
     return asm volatile ("int $0x80"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
-            [arg1] "{ecx}" (arg1),
+          [arg1] "{ecx}" (arg1),
-            [arg2] "{edx}" (arg2));
+          [arg2] "{edx}" (arg2)
+    );
 }
 inline fn syscall3(number: Syscall, arg1: usize, arg2: usize, arg3: usize) usize {
     return asm volatile ("int $0x80"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
-            [arg1] "{ecx}" (arg1),
+          [arg1] "{ecx}" (arg1),
-            [arg2] "{edx}" (arg2),
+          [arg2] "{edx}" (arg2),
-            [arg3] "{ebx}" (arg3));
+          [arg3] "{ebx}" (arg3)
+    );
 }
 inline fn syscall4(number: Syscall, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
     return asm volatile ("int $0x80"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
-            [arg1] "{ecx}" (arg1),
+          [arg1] "{ecx}" (arg1),
-            [arg2] "{edx}" (arg2),
+          [arg2] "{edx}" (arg2),
-            [arg3] "{ebx}" (arg3),
+          [arg3] "{ebx}" (arg3),
-            [arg4] "{esi}" (arg4));
+          [arg4] "{esi}" (arg4)
+    );
 }
-inline fn syscall5(number: Syscall, arg1: usize, arg2: usize, arg3: usize,
+inline fn syscall5(
-    arg4: usize, arg5: usize) usize
+    number: Syscall,
-{
+    arg1: usize,
+    arg2: usize,
+    arg3: usize,
+    arg4: usize,
+    arg5: usize,
+) usize {
     return asm volatile ("int $0x80"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
-            [arg1] "{ecx}" (arg1),
+          [arg1] "{ecx}" (arg1),
-            [arg2] "{edx}" (arg2),
+          [arg2] "{edx}" (arg2),
-            [arg3] "{ebx}" (arg3),
+          [arg3] "{ebx}" (arg3),
-            [arg4] "{esi}" (arg4),
+          [arg4] "{esi}" (arg4),
-            [arg5] "{edi}" (arg5));
+          [arg5] "{edi}" (arg5)
+    );
 }
-inline fn syscall6(number: Syscall, arg1: usize, arg2: usize, arg3: usize,
+inline fn syscall6(
-    arg4: usize, arg5: usize, arg6: usize) usize
+    number: Syscall,
-{
+    arg1: usize,
+    arg2: usize,
+    arg3: usize,
+    arg4: usize,
+    arg5: usize,
+    arg6: usize,
+) usize {
     return asm volatile ("int $0x80"
         : [ret] "={eax}" (-> usize)
         : [number] "{eax}" (number),
-            [arg1] "{ecx}" (arg1),
+          [arg1] "{ecx}" (arg1),
-            [arg2] "{edx}" (arg2),
+          [arg2] "{edx}" (arg2),
-            [arg3] "{ebx}" (arg3),
+          [arg3] "{ebx}" (arg3),
-            [arg4] "{esi}" (arg4),
+          [arg4] "{esi}" (arg4),
-            [arg5] "{edi}" (arg5),
+          [arg5] "{edi}" (arg5),
-            [arg6] "{ebp}" (arg6));
+          [arg6] "{ebp}" (arg6)
+    );
 }

std/rand/index.zig+77-61

 @@ -28,15 +28,15 @@ pub const DefaultPrng = Xoroshiro128;
 pub const DefaultCsprng = Isaac64;
 pub const Random = struct {
-    fillFn: fn(r: &Random, buf: []u8) void,
+    fillFn: fn (r: *Random, buf: []u8) void,
     /// Read random bytes into the specified buffer until fill.
-    pub fn bytes(r: &Random, buf: []u8) void {
+    pub fn bytes(r: *Random, buf: []u8) void {
         r.fillFn(r, buf);
     }
     /// Return a random integer/boolean type.
-    pub fn scalar(r: &Random, comptime T: type) T {
+    pub fn scalar(r: *Random, comptime T: type) T {
         var rand_bytes: [@sizeOf(T)]u8 = undefined;
         r.bytes(rand_bytes[0..]);
 @@ -50,7 +50,7 @@ pub const Random = struct {
     /// Get a random unsigned integer with even distribution between `start`
     /// inclusive and `end` exclusive.
-    pub fn range(r: &Random, comptime T: type, start: T, end: T) T {
+    pub fn range(r: *Random, comptime T: type, start: T, end: T) T {
         assert(start <= end);
         if (T.is_signed) {
             const uint = @IntType(false, T.bit_count);
 @@ -69,7 +69,7 @@ pub const Random = struct {
                     break :x start;
                 } else x: {
                     // Can't overflow because the range is over signed ints
-                   break :x math.negateCast(value - end_uint) catch unreachable;
+                    break :x math.negateCast(value - end_uint) catch unreachable;
                 };
                 return result;
             } else {
 @@ -92,7 +92,7 @@ pub const Random = struct {
     }
     /// Return a floating point value evenly distributed in the range [0, 1).
-    pub fn float(r: &Random, comptime T: type) T {
+    pub fn float(r: *Random, comptime T: type) T {
         // Generate a uniform value between [1, 2) and scale down to [0, 1).
         // Note: The lowest mantissa bit is always set to 0 so we only use half the available range.
         switch (T) {
 @@ -113,7 +113,7 @@ pub const Random = struct {
     /// Return a floating point value normally distributed with mean = 0, stddev = 1.
     ///
     /// To use different parameters, use: floatNorm(...) * desiredStddev + desiredMean.
-    pub fn floatNorm(r: &Random, comptime T: type) T {
+    pub fn floatNorm(r: *Random, comptime T: type) T {
         const value = ziggurat.next_f64(r, ziggurat.NormDist);
         switch (T) {
             f32 => return f32(value),
 @@ -125,7 +125,7 @@ pub const Random = struct {
     /// Return an exponentially distributed float with a rate parameter of 1.
     ///
     /// To use a different rate parameter, use: floatExp(...) / desiredRate.
-    pub fn floatExp(r: &Random, comptime T: type) T {
+    pub fn floatExp(r: *Random, comptime T: type) T {
         const value = ziggurat.next_f64(r, ziggurat.ExpDist);
         switch (T) {
             f32 => return f32(value),
 @@ -135,7 +135,7 @@ pub const Random = struct {
     }
     /// Shuffle a slice into a random order.
-    pub fn shuffle(r: &Random, comptime T: type, buf: []T) void {
+    pub fn shuffle(r: *Random, comptime T: type, buf: []T) void {
         if (buf.len < 2) {
             return;
         }
 @@ -156,10 +156,10 @@ const SplitMix64 = struct {
     s: u64,
     pub fn init(seed: u64) SplitMix64 {
-        return SplitMix64 { .s = seed };
+        return SplitMix64{ .s = seed };
     }
-    pub fn next(self: &SplitMix64) u64 {
+    pub fn next(self: *SplitMix64) u64 {
         self.s +%= 0x9e3779b97f4a7c15;
         var z = self.s;
 @@ -172,7 +172,7 @@ const SplitMix64 = struct {
 test "splitmix64 sequence" {
     var r = SplitMix64.init(0xaeecf86f7878dd75);
-    const seq = []const u64 {
+    const seq = []const u64{
         0x5dbd39db0178eb44,
         0xa9900fb66b397da3,
         0x5c1a28b1aeebcf5c,
 @@ -198,8 +198,8 @@ pub const Pcg = struct {
     i: u64,
     pub fn init(init_s: u64) Pcg {
-        var pcg = Pcg {
+        var pcg = Pcg{
-            .random = Random { .fillFn = fill },
+            .random = Random{ .fillFn = fill },
             .s = undefined,
             .i = undefined,
         };
 @@ -208,7 +208,7 @@ pub const Pcg = struct {
         return pcg;
     }
-    fn next(self: &Pcg) u32 {
+    fn next(self: *Pcg) u32 {
         const l = self.s;
         self.s = l *% default_multiplier +% (self.i | 1);
 @@ -218,13 +218,13 @@ pub const Pcg = struct {
         return (xor_s >> u5(rot)) | (xor_s << u5((0 -% rot) & 31));
     }
-    fn seed(self: &Pcg, init_s: u64) void {
+    fn seed(self: *Pcg, init_s: u64) void {
         // Pcg requires 128-bits of seed.
         var gen = SplitMix64.init(init_s);
         self.seedTwo(gen.next(), gen.next());
     }
-    fn seedTwo(self: &Pcg, init_s: u64, init_i: u64) void {
+    fn seedTwo(self: *Pcg, init_s: u64, init_i: u64) void {
         self.s = 0;
         self.i = (init_s << 1) | 1;
         self.s = self.s *% default_multiplier +% self.i;
 @@ -232,7 +232,7 @@ pub const Pcg = struct {
         self.s = self.s *% default_multiplier +% self.i;
     }
-    fn fill(r: &Random, buf: []u8) void {
+    fn fill(r: *Random, buf: []u8) void {
         const self = @fieldParentPtr(Pcg, "random", r);
         var i: usize = 0;
 @@ -265,7 +265,7 @@ test "pcg sequence" {
     const s1: u64 = 0x84e9c579ef59bbf7;
     r.seedTwo(s0, s1);
-    const seq = []const u32 {
+    const seq = []const u32{
         2881561918,
         3063928540,
         1199791034,
 @@ -288,8 +288,8 @@ pub const Xoroshiro128 = struct {
     s: [2]u64,
     pub fn init(init_s: u64) Xoroshiro128 {
-        var x = Xoroshiro128 {
+        var x = Xoroshiro128{
-            .random = Random { .fillFn = fill },
+            .random = Random{ .fillFn = fill },
             .s = undefined,
         };
 @@ -297,7 +297,7 @@ pub const Xoroshiro128 = struct {
         return x;
     }
-    fn next(self: &Xoroshiro128) u64 {
+    fn next(self: *Xoroshiro128) u64 {
         const s0 = self.s[0];
         var s1 = self.s[1];
         const r = s0 +% s1;
 @@ -310,13 +310,13 @@ pub const Xoroshiro128 = struct {
     }
     // Skip 2^64 places ahead in the sequence
-    fn jump(self: &Xoroshiro128) void {
+    fn jump(self: *Xoroshiro128) void {
         var s0: u64 = 0;
         var s1: u64 = 0;
-        const table = []const u64 {
+        const table = []const u64{
             0xbeac0467eba5facb,
-            0xd86b048b86aa9922
+            0xd86b048b86aa9922,
         };
         inline for (table) |entry| {
 @@ -334,7 +334,7 @@ pub const Xoroshiro128 = struct {
         self.s[1] = s1;
     }
-    fn seed(self: &Xoroshiro128, init_s: u64) void {
+    fn seed(self: *Xoroshiro128, init_s: u64) void {
         // Xoroshiro requires 128-bits of seed.
         var gen = SplitMix64.init(init_s);
 @@ -342,7 +342,7 @@ pub const Xoroshiro128 = struct {
         self.s[1] = gen.next();
     }
-    fn fill(r: &Random, buf: []u8) void {
+    fn fill(r: *Random, buf: []u8) void {
         const self = @fieldParentPtr(Xoroshiro128, "random", r);
         var i: usize = 0;
 @@ -374,7 +374,7 @@ test "xoroshiro sequence" {
     r.s[0] = 0xaeecf86f7878dd75;
     r.s[1] = 0x01cd153642e72622;
-    const seq1 = []const u64 {
+    const seq1 = []const u64{
         0xb0ba0da5bb600397,
         0x18a08afde614dccc,
         0xa2635b956a31b929,
 @@ -387,10 +387,9 @@ test "xoroshiro sequence" {
         std.debug.assert(s == r.next());
     }
     r.jump();
-    const seq2 = []const u64 {
+    const seq2 = []const u64{
         0x95344a13556d3e22,
         0xb4fb32dafa4d00df,
         0xb2011d9ccdcfe2dd,
 @@ -421,8 +420,8 @@ pub const Isaac64 = struct {
     i: usize,
     pub fn init(init_s: u64) Isaac64 {
-        var isaac = Isaac64 {
+        var isaac = Isaac64{
-            .random = Random { .fillFn = fill },
+            .random = Random{ .fillFn = fill },
             .r = undefined,
             .m = undefined,
             .a = undefined,
 @@ -436,7 +435,7 @@ pub const Isaac64 = struct {
         return isaac;
     }
-    fn step(self: &Isaac64, mix: u64, base: usize, comptime m1: usize, comptime m2: usize) void {
+    fn step(self: *Isaac64, mix: u64, base: usize, comptime m1: usize, comptime m2: usize) void {
         const x = self.m[base + m1];
         self.a = mix +% self.m[base + m2];
 @@ -447,7 +446,7 @@ pub const Isaac64 = struct {
         self.r[self.r.len - 1 - base - m1] = self.b;
     }
-    fn refill(self: &Isaac64) void {
+    fn refill(self: *Isaac64) void {
         const midpoint = self.r.len / 2;
         self.c +%= 1;
 @@ -456,27 +455,27 @@ pub const Isaac64 = struct {
         {
             var i: usize = 0;
             while (i < midpoint) : (i += 4) {
-                self.step( ~(self.a ^ (self.a << 21)), i + 0, 0, midpoint);
+                self.step(~(self.a ^ (self.a << 21)), i + 0, 0, midpoint);
-                self.step(   self.a ^ (self.a >>  5) , i + 1, 0, midpoint);
+                self.step(self.a ^ (self.a >> 5), i + 1, 0, midpoint);
-                self.step(   self.a ^ (self.a << 12) , i + 2, 0, midpoint);
+                self.step(self.a ^ (self.a << 12), i + 2, 0, midpoint);
-                self.step(   self.a ^ (self.a >> 33) , i + 3, 0, midpoint);
+                self.step(self.a ^ (self.a >> 33), i + 3, 0, midpoint);
             }
         }
         {
             var i: usize = 0;
             while (i < midpoint) : (i += 4) {
-                self.step( ~(self.a ^ (self.a << 21)), i + 0, midpoint, 0);
+                self.step(~(self.a ^ (self.a << 21)), i + 0, midpoint, 0);
-                self.step(   self.a ^ (self.a >>  5) , i + 1, midpoint, 0);
+                self.step(self.a ^ (self.a >> 5), i + 1, midpoint, 0);
-                self.step(   self.a ^ (self.a << 12) , i + 2, midpoint, 0);
+                self.step(self.a ^ (self.a << 12), i + 2, midpoint, 0);
-                self.step(   self.a ^ (self.a >> 33) , i + 3, midpoint, 0);
+                self.step(self.a ^ (self.a >> 33), i + 3, midpoint, 0);
             }
         }
         self.i = 0;
     }
-    fn next(self: &Isaac64) u64 {
+    fn next(self: *Isaac64) u64 {
         if (self.i >= self.r.len) {
             self.refill();
         }
 @@ -486,14 +485,14 @@ pub const Isaac64 = struct {
         return value;
     }
-    fn seed(self: &Isaac64, init_s: u64, comptime rounds: usize) void {
+    fn seed(self: *Isaac64, init_s: u64, comptime rounds: usize) void {
         // We ignore the multi-pass requirement since we don't currently expose full access to
         // seeding the self.m array completely.
         mem.set(u64, self.m[0..], 0);
         self.m[0] = init_s;
         // prescrambled golden ratio constants
-        var a = []const u64 {
+        var a = []const u64{
             0x647c4677a2884b7c,
             0xb9f8b322c73ac862,
             0x8c0ea5053d4712a0,
 @@ -513,14 +512,30 @@ pub const Isaac64 = struct {
                     a[x1] +%= self.m[j + x1];
                 }
-                a[0] -%= a[4]; a[5] ^= a[7] >>  9; a[7] +%= a[0];
+                a[0] -%= a[4];
-                a[1] -%= a[5]; a[6] ^= a[0] <<  9; a[0] +%= a[1];
+                a[5] ^= a[7] >> 9;
-                a[2] -%= a[6]; a[7] ^= a[1] >> 23; a[1] +%= a[2];
+                a[7] +%= a[0];
-                a[3] -%= a[7]; a[0] ^= a[2] << 15; a[2] +%= a[3];
+                a[1] -%= a[5];
-                a[4] -%= a[0]; a[1] ^= a[3] >> 14; a[3] +%= a[4];
+                a[6] ^= a[0] << 9;
-                a[5] -%= a[1]; a[2] ^= a[4] << 20; a[4] +%= a[5];
+                a[0] +%= a[1];
-                a[6] -%= a[2]; a[3] ^= a[5] >> 17; a[5] +%= a[6];
+                a[2] -%= a[6];
-                a[7] -%= a[3]; a[4] ^= a[6] << 14; a[6] +%= a[7];
+                a[7] ^= a[1] >> 23;
+                a[1] +%= a[2];
+                a[3] -%= a[7];
+                a[0] ^= a[2] << 15;
+                a[2] +%= a[3];
+                a[4] -%= a[0];
+                a[1] ^= a[3] >> 14;
+                a[3] +%= a[4];
+                a[5] -%= a[1];
+                a[2] ^= a[4] << 20;
+                a[4] +%= a[5];
+                a[6] -%= a[2];
+                a[3] ^= a[5] >> 17;
+                a[5] +%= a[6];
+                a[7] -%= a[3];
+                a[4] ^= a[6] << 14;
+                a[6] +%= a[7];
                 comptime var x2: usize = 0;
                 inline while (x2 < 8) : (x2 += 1) {
 @@ -533,10 +548,10 @@ pub const Isaac64 = struct {
         self.a = 0;
         self.b = 0;
         self.c = 0;
-        self.i = self.r.len;    // trigger refill on first value
+        self.i = self.r.len; // trigger refill on first value
     }
-    fn fill(r: &Random, buf: []u8) void {
+    fn fill(r: *Random, buf: []u8) void {
         const self = @fieldParentPtr(Isaac64, "random", r);
         var i: usize = 0;
 @@ -567,7 +582,7 @@ test "isaac64 sequence" {
     var r = Isaac64.init(0);
     // from reference implementation
-    const seq = []const u64 {
+    const seq = []const u64{
         0xf67dfba498e4937c,
         0x84a5066a9204f380,
         0xfee34bd5f5514dbb,
 @@ -609,7 +624,7 @@ test "Random float" {
 test "Random scalar" {
     var prng = DefaultPrng.init(0);
-    const s = prng .random.scalar(u64);
+    const s = prng.random.scalar(u64);
 }
 test "Random bytes" {
 @@ -621,8 +636,8 @@ test "Random bytes" {
 test "Random shuffle" {
     var prng = DefaultPrng.init(0);
-    var seq = []const u8 { 0, 1, 2, 3, 4 };
+    var seq = []const u8{ 0, 1, 2, 3, 4 };
-    var seen = []bool {false} ** 5;
+    var seen = []bool{false} ** 5;
     var i: usize = 0;
     while (i < 1000) : (i += 1) {
 @@ -639,7 +654,8 @@ test "Random shuffle" {
 fn sumArray(s: []const u8) u32 {
     var r: u32 = 0;
-    for (s) |e| r += e;
+    for (s) |e|
+        r += e;
     return r;
 }
 @@ -650,7 +666,7 @@ test "Random range" {
     testRange(&prng.random, 10, 14);
 }
-fn testRange(r: &Random, start: i32, end: i32) void {
+fn testRange(r: *Random, start: i32, end: i32) void {
     const count = usize(end - start);
     var values_buffer = []bool{false} ** 20;
     const values = values_buffer[0..count];

std/rand/ziggurat.zig+27-11

 @@ -12,7 +12,7 @@ const std = @import("../index.zig");
 const math = std.math;
 const Random = std.rand.Random;
-pub fn next_f64(random: &Random, comptime tables: &const ZigTable) f64 {
+pub fn next_f64(random: *Random, comptime tables: *const ZigTable) f64 {
     while (true) {
         // We manually construct a float from parts as we can avoid an extra random lookup here by
         // using the unused exponent for the lookup table entry.
 @@ -56,16 +56,22 @@ pub const ZigTable = struct {
     f: [257]f64,
     // probability density function used as a fallback
-    pdf: fn(f64) f64,
+    pdf: fn (f64) f64,
     // whether the distribution is symmetric
     is_symmetric: bool,
     // fallback calculation in the case we are in the 0 block
-    zero_case: fn(&Random, f64) f64,
+    zero_case: fn (*Random, f64) f64,
 };
 // zigNorInit
-fn ZigTableGen(comptime is_symmetric: bool, comptime r: f64, comptime v: f64, comptime f: fn(f64) f64,
+fn ZigTableGen(
-       comptime f_inv: fn(f64) f64, comptime zero_case: fn(&Random, f64) f64) ZigTable {
+    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 {
     var tables: ZigTable = undefined;
     tables.is_symmetric = is_symmetric;
 @@ -98,9 +104,13 @@ pub const NormDist = blk: {
 const norm_r = 3.6541528853610088;
 const norm_v = 0.00492867323399;
-fn norm_f(x: f64) f64 { return math.exp(-x * x / 2.0); }
+fn norm_f(x: f64) f64 {
-fn norm_f_inv(y: f64) f64 { return math.sqrt(-2.0 * math.ln(y)); }
+    return math.exp(-x * x / 2.0);
-fn norm_zero_case(random: &Random, u: f64) f64 {
+}
+fn norm_f_inv(y: f64) f64 {
+    return math.sqrt(-2.0 * math.ln(y));
+}
+fn norm_zero_case(random: *Random, u: f64) f64 {
     var x: f64 = 1;
     var y: f64 = 0;
 @@ -133,9 +143,15 @@ pub const ExpDist = blk: {
 const exp_r = 7.69711747013104972;
 const exp_v = 0.0039496598225815571993;
-fn exp_f(x: f64) f64 { return math.exp(-x); }
+fn exp_f(x: f64) f64 {
-fn exp_f_inv(y: f64) f64 { return -math.ln(y); }
+    return math.exp(-x);
-fn exp_zero_case(random: &Random, _: f64) f64 { return exp_r - math.ln(random.float(f64)); }
+}
+fn exp_f_inv(y: f64) f64 {
+    return -math.ln(y);
+}
+fn exp_zero_case(random: *Random, _: f64) f64 {
+    return exp_r - math.ln(random.float(f64));
+}
 test "ziggurant exp dist sanity" {
     var prng = std.rand.DefaultPrng.init(0);

std/segmented_list.zig+30-30

...	@@ -5,7 +5,7 @@ const Allocator = std.mem.Allocator;	...	@@ -5,7 +5,7 @@ const Allocator = std.mem.Allocator;
5	// Imagine that `fn at(self: &Self, index: usize) &T` is a customer asking for a box	5	// Imagine that `fn at(self: &Self, index: usize) &T` is a customer asking for a box
6	// from a warehouse, based on a flat array, boxes ordered from 0 to N - 1.	6	// from a warehouse, based on a flat array, boxes ordered from 0 to N - 1.
7	// But the warehouse actually stores boxes in shelves of increasing powers of 2 sizes.	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	// and box index within that shelf. Illustration:	9	// and box index within that shelf. Illustration:
10	//	10	//
11	// customer indexes:	11	// customer indexes:
...	@@ -37,14 +37,14 @@ const Allocator = std.mem.Allocator;	...	@@ -37,14 +37,14 @@ const Allocator = std.mem.Allocator;
37	// Now we complicate it a little bit further by adding a preallocated shelf, which must be	37	// Now we complicate it a little bit further by adding a preallocated shelf, which must be
38	// a power of 2:	38	// a power of 2:
39	// prealloc=4	39	// prealloc=4
40	//	40	//
41	// customer indexes:	41	// customer indexes:
42	// prealloc: 0 1 2 3	42	// prealloc: 0 1 2 3
43	// shelf 0: 4 5 6 7 8 9 10 11	43	// shelf 0: 4 5 6 7 8 9 10 11
44	// shelf 1: 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27	44	// shelf 1: 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
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	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	// warehouse indexes:	48	// warehouse indexes:
49	// prealloc: 0 1 2 3	49	// prealloc: 0 1 2 3
50	// shelf 0: 0 1 2 3 4 5 6 7	50	// shelf 0: 0 1 2 3 4 5 6 7
...	@@ -87,49 +87,49 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -87,49 +87,49 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
87	const ShelfIndex = std.math.Log2Int(usize);	87	const ShelfIndex = std.math.Log2Int(usize);
88		88
89	prealloc_segment: [prealloc_item_count]T,	89	prealloc_segment: [prealloc_item_count]T,
90	dynamic_segments: []&T,	90	dynamic_segments: [][*]T,
91	allocator: &Allocator,	91	allocator: *Allocator,
92	len: usize,	92	len: usize,
93		93
94	pub const prealloc_count = prealloc_item_count;	94	pub const prealloc_count = prealloc_item_count;
95		95
96	/// Deinitialize with `deinit`	96	/// Deinitialize with `deinit`
97	pub fn init(allocator: &Allocator) Self {	97	pub fn init(allocator: *Allocator) Self {
98	return Self{	98	return Self{
99	.allocator = allocator,	99	.allocator = allocator,
100	.len = 0,	100	.len = 0,
101	.prealloc_segment = undefined,	101	.prealloc_segment = undefined,
102	.dynamic_segments = []&T{},	102	.dynamic_segments = [][*]T{},
103	};	103	};
104	}	104	}
105		105
106	pub fn deinit(self: &Self) void {	106	pub fn deinit(self: *Self) void {
107	self.freeShelves(ShelfIndex(self.dynamic_segments.len), 0);	107	self.freeShelves(ShelfIndex(self.dynamic_segments.len), 0);
108	self.allocator.free(self.dynamic_segments);	108	self.allocator.free(self.dynamic_segments);
109	self.* = undefined;	109	self.* = undefined;
110	}	110	}
111		111
112	pub fn at(self: &Self, i: usize) &T {	112	pub fn at(self: Self, i: usize) T {
113	assert(i < self.len);	113	assert(i < self.len);
114	return self.uncheckedAt(i);	114	return self.uncheckedAt(i);
115	}	115	}
116		116
117	pub fn count(self: &const Self) usize {	117	pub fn count(self: *const Self) usize {
118	return self.len;	118	return self.len;
119	}	119	}
120		120
121	pub fn push(self: &Self, item: &const T) !void {	121	pub fn push(self: Self, item: const T) !void {
122	const new_item_ptr = try self.addOne();	122	const new_item_ptr = try self.addOne();
123	new_item_ptr.* = item.*;	123	new_item_ptr.* = item.*;
124	}	124	}
125		125
126	pub fn pushMany(self: &Self, items: []const T) !void {	126	pub fn pushMany(self: *Self, items: []const T) !void {
127	for (items) \|item\| {	127	for (items) \|item\| {
128	try self.push(item);	128	try self.push(item);
129	}	129	}
130	}	130	}
131		131
132	pub fn pop(self: &Self) ?T {	132	pub fn pop(self: *Self) ?T {
133	if (self.len == 0) return null;	133	if (self.len == 0) return null;
134		134
135	const index = self.len - 1;	135	const index = self.len - 1;
...	@@ -138,7 +138,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -138,7 +138,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
138	return result;	138	return result;
139	}	139	}
140		140
141	pub fn addOne(self: &Self) !&T {	141	pub fn addOne(self: Self) !T {
142	const new_length = self.len + 1;	142	const new_length = self.len + 1;
143	try self.growCapacity(new_length);	143	try self.growCapacity(new_length);
144	const result = self.uncheckedAt(self.len);	144	const result = self.uncheckedAt(self.len);
...	@@ -147,7 +147,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -147,7 +147,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
147	}	147	}
148		148
149	/// Grows or shrinks capacity to match usage.	149	/// Grows or shrinks capacity to match usage.
150	pub fn setCapacity(self: &Self, new_capacity: usize) !void {	150	pub fn setCapacity(self: *Self, new_capacity: usize) !void {
151	if (new_capacity <= usize(1) << (prealloc_exp + self.dynamic_segments.len)) {	151	if (new_capacity <= usize(1) << (prealloc_exp + self.dynamic_segments.len)) {
152	return self.shrinkCapacity(new_capacity);	152	return self.shrinkCapacity(new_capacity);
153	} else {	153	} else {
...	@@ -156,15 +156,15 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -156,15 +156,15 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
156	}	156	}
157		157
158	/// Only grows capacity, or retains current capacity	158	/// Only grows capacity, or retains current capacity
159	pub fn growCapacity(self: &Self, new_capacity: usize) !void {	159	pub fn growCapacity(self: *Self, new_capacity: usize) !void {
160	const new_cap_shelf_count = shelfCount(new_capacity);	160	const new_cap_shelf_count = shelfCount(new_capacity);
161	const old_shelf_count = ShelfIndex(self.dynamic_segments.len);	161	const old_shelf_count = ShelfIndex(self.dynamic_segments.len);
162	if (new_cap_shelf_count > old_shelf_count) {	162	if (new_cap_shelf_count > old_shelf_count) {
163	self.dynamic_segments = try self.allocator.realloc(&T, self.dynamic_segments, new_cap_shelf_count);	163	self.dynamic_segments = try self.allocator.realloc([*]T, self.dynamic_segments, new_cap_shelf_count);
164	var i = old_shelf_count;	164	var i = old_shelf_count;
165	errdefer {	165	errdefer {
166	self.freeShelves(i, old_shelf_count);	166	self.freeShelves(i, old_shelf_count);
167	self.dynamic_segments = self.allocator.shrink(&T, self.dynamic_segments, old_shelf_count);	167	self.dynamic_segments = self.allocator.shrink([*]T, self.dynamic_segments, old_shelf_count);
168	}	168	}
169	while (i < new_cap_shelf_count) : (i += 1) {	169	while (i < new_cap_shelf_count) : (i += 1) {
170	self.dynamic_segments[i] = (try self.allocator.alloc(T, shelfSize(i))).ptr;	170	self.dynamic_segments[i] = (try self.allocator.alloc(T, shelfSize(i))).ptr;
...	@@ -173,12 +173,12 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -173,12 +173,12 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
173	}	173	}
174		174
175	/// Only shrinks capacity or retains current capacity	175	/// Only shrinks capacity or retains current capacity
176	pub fn shrinkCapacity(self: &Self, new_capacity: usize) void {	176	pub fn shrinkCapacity(self: *Self, new_capacity: usize) void {
177	if (new_capacity <= prealloc_item_count) {	177	if (new_capacity <= prealloc_item_count) {
178	const len = ShelfIndex(self.dynamic_segments.len);	178	const len = ShelfIndex(self.dynamic_segments.len);
179	self.freeShelves(len, 0);	179	self.freeShelves(len, 0);
180	self.allocator.free(self.dynamic_segments);	180	self.allocator.free(self.dynamic_segments);
181	self.dynamic_segments = []&T{};	181	self.dynamic_segments = [][*]T{};
182	return;	182	return;
183	}	183	}
184		184
...	@@ -190,10 +190,10 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -190,10 +190,10 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
190	}	190	}
191		191
192	self.freeShelves(old_shelf_count, new_cap_shelf_count);	192	self.freeShelves(old_shelf_count, new_cap_shelf_count);
193	self.dynamic_segments = self.allocator.shrink(&T, self.dynamic_segments, new_cap_shelf_count);	193	self.dynamic_segments = self.allocator.shrink([*]T, self.dynamic_segments, new_cap_shelf_count);
194	}	194	}
195		195
196	pub fn uncheckedAt(self: &Self, index: usize) &T {	196	pub fn uncheckedAt(self: Self, index: usize) T {
197	if (index < prealloc_item_count) {	197	if (index < prealloc_item_count) {
198	return &self.prealloc_segment[index];	198	return &self.prealloc_segment[index];
199	}	199	}
...	@@ -230,7 +230,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -230,7 +230,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
230	return list_index + prealloc_item_count - (usize(1) << ((prealloc_exp + 1) + shelf_index));	230	return list_index + prealloc_item_count - (usize(1) << ((prealloc_exp + 1) + shelf_index));
231	}	231	}
232		232
233	fn freeShelves(self: &Self, from_count: ShelfIndex, to_count: ShelfIndex) void {	233	fn freeShelves(self: *Self, from_count: ShelfIndex, to_count: ShelfIndex) void {
234	var i = from_count;	234	var i = from_count;
235	while (i != to_count) {	235	while (i != to_count) {
236	i -= 1;	236	i -= 1;
...	@@ -239,13 +239,13 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -239,13 +239,13 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
239	}	239	}
240		240
241	pub const Iterator = struct {	241	pub const Iterator = struct {
242	list: &Self,	242	list: *Self,
243	index: usize,	243	index: usize,
244	box_index: usize,	244	box_index: usize,
245	shelf_index: ShelfIndex,	245	shelf_index: ShelfIndex,
246	shelf_size: usize,	246	shelf_size: usize,
247		247
248	pub fn next(it: &Iterator) ?&T {	248	pub fn next(it: Iterator) ?T {
249	if (it.index >= it.list.len) return null;	249	if (it.index >= it.list.len) return null;
250	if (it.index < prealloc_item_count) {	250	if (it.index < prealloc_item_count) {
251	const ptr = &it.list.prealloc_segment[it.index];	251	const ptr = &it.list.prealloc_segment[it.index];
...	@@ -269,7 +269,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -269,7 +269,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
269	return ptr;	269	return ptr;
270	}	270	}
271		271
272	pub fn prev(it: &Iterator) ?&T {	272	pub fn prev(it: Iterator) ?T {
273	if (it.index == 0) return null;	273	if (it.index == 0) return null;
274		274
275	it.index -= 1;	275	it.index -= 1;
...	@@ -286,7 +286,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -286,7 +286,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
286	return &it.list.dynamic_segments[it.shelf_index][it.box_index];	286	return &it.list.dynamic_segments[it.shelf_index][it.box_index];
287	}	287	}
288		288
289	pub fn peek(it: &Iterator) ?&T {	289	pub fn peek(it: Iterator) ?T {
290	if (it.index >= it.list.len)	290	if (it.index >= it.list.len)
291	return null;	291	return null;
292	if (it.index < prealloc_item_count)	292	if (it.index < prealloc_item_count)
...	@@ -295,7 +295,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -295,7 +295,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
295	return &it.list.dynamic_segments[it.shelf_index][it.box_index];	295	return &it.list.dynamic_segments[it.shelf_index][it.box_index];
296	}	296	}
297		297
298	pub fn set(it: &Iterator, index: usize) void {	298	pub fn set(it: *Iterator, index: usize) void {
299	it.index = index;	299	it.index = index;
300	if (index < prealloc_item_count) return;	300	if (index < prealloc_item_count) return;
301	it.shelf_index = shelfIndex(index);	301	it.shelf_index = shelfIndex(index);
...	@@ -304,7 +304,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type	...	@@ -304,7 +304,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
304	}	304	}
305	};	305	};
306		306
307	pub fn iterator(self: &Self, start_index: usize) Iterator {	307	pub fn iterator(self: *Self, start_index: usize) Iterator {
308	var it = Iterator{	308	var it = Iterator{
309	.list = self,	309	.list = self,
310	.index = undefined,	310	.index = undefined,
...	@@ -331,7 +331,7 @@ test "std.SegmentedList" {	...	@@ -331,7 +331,7 @@ test "std.SegmentedList" {
331	try testSegmentedList(16, a);	331	try testSegmentedList(16, a);
332	}	332	}
333		333
334	fn testSegmentedList(comptime prealloc: usize, allocator: &Allocator) !void {	334	fn testSegmentedList(comptime prealloc: usize, allocator: *Allocator) !void {
335	var list = SegmentedList(i32, prealloc).init(allocator);	335	var list = SegmentedList(i32, prealloc).init(allocator);
336	defer list.deinit();	336	defer list.deinit();
337		337

std/sort.zig+33-34

std/special/bootstrap.zig+16-10

...	@@ -5,7 +5,7 @@ const root = @import("@root");	...	@@ -5,7 +5,7 @@ const root = @import("@root");
5	const std = @import("std");	5	const std = @import("std");
6	const builtin = @import("builtin");	6	const builtin = @import("builtin");
7		7
8	var argc_ptr: &usize = undefined;	8	var argc_ptr: [*]usize = undefined;
9		9
10	comptime {	10	comptime {
11	const strong_linkage = builtin.GlobalLinkage.Strong;	11	const strong_linkage = builtin.GlobalLinkage.Strong;
...	@@ -27,10 +27,14 @@ extern fn zen_start() noreturn {	...	@@ -27,10 +27,14 @@ extern fn zen_start() noreturn {
27	nakedcc fn _start() noreturn {	27	nakedcc fn _start() noreturn {
28	switch (builtin.arch) {	28	switch (builtin.arch) {
29	builtin.Arch.x86_64 => {	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	builtin.Arch.i386 => {	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	else => @compileError("unsupported arch"),	39	else => @compileError("unsupported arch"),
36	}	40	}
...	@@ -45,15 +49,17 @@ extern fn WinMainCRTStartup() noreturn {	...	@@ -45,15 +49,17 @@ extern fn WinMainCRTStartup() noreturn {
45	std.os.windows.ExitProcess(callMain());	49	std.os.windows.ExitProcess(callMain());
46	}	50	}
47		51
		52	// TODO https://github.com/ziglang/zig/issues/265
48	fn posixCallMainAndExit() noreturn {	53	fn posixCallMainAndExit() noreturn {
49	const argc = argc_ptr.*;	54	const argc = argc_ptr.*;
50	const argv = @ptrCast(&&u8, &argc_ptr[1]);	55	const argv = @ptrCast([][]u8, argc_ptr + 1);
51	const envp_nullable = @ptrCast(&?&u8, &argv[argc + 1]);	56
		57	const envp_nullable = @ptrCast([]?[]u8, argv + argc + 1);
52	var envp_count: usize = 0;	58	var envp_count: usize = 0;
53	while (envp_nullable[envp_count]) \|_\| : (envp_count += 1) {}	59	while (envp_nullable[envp_count]) \|_\| : (envp_count += 1) {}
54	const envp = @ptrCast(&&u8, envp_nullable)[0..envp_count];	60	const envp = @ptrCast([][]u8, envp_nullable)[0..envp_count];
55	if (builtin.os == builtin.Os.linux) {	61	if (builtin.os == builtin.Os.linux) {
56	const auxv = &@ptrCast(&usize, envp.ptr)[envp_count + 1];	62	const auxv = @ptrCast([*]usize, envp.ptr + envp_count + 1);
57	var i: usize = 0;	63	var i: usize = 0;
58	while (auxv[i] != 0) : (i += 2) {	64	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];	65	if (auxv[i] < std.os.linux_aux_raw.len) std.os.linux_aux_raw[auxv[i]] = auxv[i + 1];
...	@@ -64,16 +70,16 @@ fn posixCallMainAndExit() noreturn {	...	@@ -64,16 +70,16 @@ fn posixCallMainAndExit() noreturn {
64	std.os.posix.exit(callMainWithArgs(argc, argv, envp));	70	std.os.posix.exit(callMainWithArgs(argc, argv, envp));
65	}	71	}
66		72
67	fn callMainWithArgs(argc: usize, argv: &&u8, envp: []&u8) u8 {	73	fn callMainWithArgs(argc: usize, argv: [][]u8, envp: [][*]u8) u8 {
68	std.os.ArgIteratorPosix.raw = argv[0..argc];	74	std.os.ArgIteratorPosix.raw = argv[0..argc];
69	std.os.posix_environ_raw = envp;	75	std.os.posix_environ_raw = envp;
70	return callMain();	76	return callMain();
71	}	77	}
72		78
73	extern fn main(c_argc: i32, c_argv: &&u8, c_envp: &?&u8) i32 {	79	extern fn main(c_argc: i32, c_argv: [][]u8, c_envp: []?[]u8) i32 {
74	var env_count: usize = 0;	80	var env_count: usize = 0;
75	while (c_envp[env_count] != null) : (env_count += 1) {}	81	while (c_envp[env_count] != null) : (env_count += 1) {}
76	const envp = @ptrCast(&&u8, c_envp)[0..env_count];	82	const envp = @ptrCast([][]u8, c_envp)[0..env_count];
77	return callMainWithArgs(usize(c_argc), c_argv, envp);	83	return callMainWithArgs(usize(c_argc), c_argv, envp);
78	}	84	}
79		85

std/special/bootstrap_lib.zig+5-3

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

std/special/build_file_template.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	const mode = b.standardReleaseOptions();	4	const mode = b.standardReleaseOptions();
5	const exe = b.addExecutable("YOUR_NAME_HERE", "src/main.zig");	5	const exe = b.addExecutable("YOUR_NAME_HERE", "src/main.zig");
6	exe.setBuildMode(mode);	6	exe.setBuildMode(mode);

std/special/build_runner.zig+6-8

std/special/builtin.zig+45-23

 @@ -5,7 +5,7 @@ const builtin = @import("builtin");
 // Avoid dragging in the runtime safety mechanisms into this .o file,
 // unless we're trying to test this file.
-pub fn panic(msg: []const u8, error_return_trace: ?&builtin.StackTrace) noreturn {
+pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn {
     if (builtin.is_test) {
         @setCold(true);
         @import("std").debug.panic("{}", msg);
 @@ -14,7 +14,7 @@ pub fn panic(msg: []const u8, error_return_trace: ?&builtin.StackTrace) noreturn
     }
 }
-export fn memset(dest: ?&u8, c: u8, n: usize) ?&u8 {
+export fn memset(dest: ?[*]u8, c: u8, n: usize) ?[*]u8 {
     @setRuntimeSafety(false);
     var index: usize = 0;
 @@ -24,7 +24,7 @@ export fn memset(dest: ?&u8, c: u8, n: usize) ?&u8 {
     return dest;
 }
-export fn memcpy(noalias dest: ?&u8, noalias src: ?&const u8, n: usize) ?&u8 {
+export fn memcpy(noalias dest: ?[*]u8, noalias src: ?[*]const u8, n: usize) ?[*]u8 {
     @setRuntimeSafety(false);
     var index: usize = 0;
 @@ -34,7 +34,7 @@ export fn memcpy(noalias dest: ?&u8, noalias src: ?&const u8, n: usize) ?&u8 {
     return dest;
 }
-export fn memmove(dest: ?&u8, src: ?&const u8, n: usize) ?&u8 {
+export fn memmove(dest: ?[*]u8, src: ?[*]const u8, n: usize) ?[*]u8 {
     @setRuntimeSafety(false);
     if (@ptrToInt(dest) < @ptrToInt(src)) {
 @@ -56,7 +56,8 @@ export fn memmove(dest: ?&u8, src: ?&const u8, n: usize) ?&u8 {
 comptime {
     if (builtin.mode != builtin.Mode.ReleaseFast and
         builtin.mode != builtin.Mode.ReleaseSmall and
-        builtin.os != builtin.Os.windows) {
+        builtin.os != builtin.Os.windows)
+    {
         @export("__stack_chk_fail", __stack_chk_fail, builtin.GlobalLinkage.Strong);
     }
     if (builtin.os == builtin.Os.linux and builtin.arch == builtin.Arch.x86_64) {
 @@ -101,15 +102,27 @@ nakedcc fn clone() void {
 const math = @import("../math/index.zig");
-export fn fmodf(x: f32, y: f32) f32 { return generic_fmod(f32, x, y); }
+export fn fmodf(x: f32, y: f32) f32 {
-export fn fmod(x: f64, y: f64) f64 { return generic_fmod(f64, x, y); }
+    return generic_fmod(f32, x, y);
+}
+export fn fmod(x: f64, y: f64) f64 {
+    return generic_fmod(f64, x, y);
+}
 // TODO add intrinsics for these (and probably the double version too)
 // and have the math stuff use the intrinsic. same as @mod and @rem
-export fn floorf(x: f32) f32 { return math.floor(x); }
+export fn floorf(x: f32) f32 {
-export fn ceilf(x: f32) f32 { return math.ceil(x); }
+    return math.floor(x);
-export fn floor(x: f64) f64 { return math.floor(x); }
+}
-export fn ceil(x: f64) f64 { return math.ceil(x); }
+export fn ceilf(x: f32) f32 {
+    return math.ceil(x);
+}
+export fn floor(x: f64) f64 {
+    return math.floor(x);
+}
+export fn ceil(x: f64) f64 {
+    return math.ceil(x);
+}
 fn generic_fmod(comptime T: type, x: T, y: T) T {
     @setRuntimeSafety(false);
 @@ -139,7 +152,10 @@ fn generic_fmod(comptime T: type, x: T, y: T) T {
     // normalize x and y
     if (ex == 0) {
         i = ux << exp_bits;
-        while (i >> bits_minus_1 == 0) : (b: {ex -= 1; break :b i <<= 1;}) {}
+        while (i >> bits_minus_1 == 0) : (b: {
+            ex -= 1;
+            i <<= 1;
+        }) {}
         ux <<= log2uint(@bitCast(u32, -ex + 1));
     } else {
         ux &= @maxValue(uint) >> exp_bits;
 @@ -147,7 +163,10 @@ fn generic_fmod(comptime T: type, x: T, y: T) T {
     }
     if (ey == 0) {
         i = uy << exp_bits;
-        while (i >> bits_minus_1 == 0) : (b: {ey -= 1; break :b i <<= 1;}) {}
+        while (i >> bits_minus_1 == 0) : (b: {
+            ey -= 1;
+            i <<= 1;
+        }) {}
         uy <<= log2uint(@bitCast(u32, -ey + 1));
     } else {
         uy &= @maxValue(uint) >> exp_bits;
 @@ -170,7 +189,10 @@ fn generic_fmod(comptime T: type, x: T, y: T) T {
             return 0 * x;
         ux = i;
     }
-    while (ux >> digits == 0) : (b: {ux <<= 1; break :b ex -= 1;}) {}
+    while (ux >> digits == 0) : (b: {
+        ux <<= 1;
+        ex -= 1;
+    }) {}
     // scale result up
     if (ex > 0) {
 @@ -300,7 +322,7 @@ export fn sqrt(x: f64) f64 {
     // rounding direction
     if (ix0 | ix1 != 0) {
-        var z = 1.0 - tiny;   // raise inexact
+        var z = 1.0 - tiny; // raise inexact
         if (z >= 1.0) {
             z = 1.0 + tiny;
             if (q1 == 0xFFFFFFFF) {
 @@ -338,13 +360,13 @@ export fn sqrtf(x: f32) f32 {
     var ix: i32 = @bitCast(i32, x);
     if ((ix & 0x7F800000) == 0x7F800000) {
-        return x * x + x;   // sqrt(nan) = nan, sqrt(+inf) = +inf, sqrt(-inf) = snan
+        return x * x + x; // sqrt(nan) = nan, sqrt(+inf) = +inf, sqrt(-inf) = snan
     }
     // zero
     if (ix <= 0) {
         if (ix & ~sign == 0) {
-            return x;       // sqrt (+-0) = +-0
+            return x; // sqrt (+-0) = +-0
         }
         if (ix < 0) {
             return math.snan(f32);
 @@ -362,20 +384,20 @@ export fn sqrtf(x: f32) f32 {
         m -= i - 1;
     }
-    m -= 127;               // unbias exponent
+    m -= 127; // unbias exponent
     ix = (ix & 0x007FFFFF) | 0x00800000;
-    if (m & 1 != 0) {       // odd m, double x to even
+    if (m & 1 != 0) { // odd m, double x to even
         ix += ix;
     }
-    m >>= 1;                // m = [m / 2]
+    m >>= 1; // m = [m / 2]
     // sqrt(x) bit by bit
     ix += ix;
-    var q: i32 = 0;              // q = sqrt(x)
+    var q: i32 = 0; // q = sqrt(x)
     var s: i32 = 0;
-    var r: i32 = 0x01000000;     // r = moving bit right -> left
+    var r: i32 = 0x01000000; // r = moving bit right -> left
     while (r != 0) {
         const t = s + r;
 @@ -390,7 +412,7 @@ export fn sqrtf(x: f32) f32 {
     // floating add to find rounding direction
     if (ix != 0) {
-        var z = 1.0 - tiny;     // inexact
+        var z = 1.0 - tiny; // inexact
         if (z >= 1.0) {
             z = 1.0 + tiny;
             if (z > 1.0) {

std/special/compiler_rt/comparetf2.zig+25-32

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

std/special/compiler_rt/fixunsdfti_test.zig-1

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

std/special/compiler_rt/index.zig+11-7

...	@@ -78,7 +78,7 @@ const __udivmoddi4 = @import("udivmoddi4.zig").__udivmoddi4;	...	@@ -78,7 +78,7 @@ const __udivmoddi4 = @import("udivmoddi4.zig").__udivmoddi4;
78		78
79	// Avoid dragging in the runtime safety mechanisms into this .o file,	79	// Avoid dragging in the runtime safety mechanisms into this .o file,
80	// unless we're trying to test this file.	80	// unless we're trying to test this file.
81	pub fn panic(msg: []const u8, error_return_trace: ?&builtin.StackTrace) noreturn {	81	pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn {
82	@setCold(true);	82	@setCold(true);
83	if (is_test) {	83	if (is_test) {
84	std.debug.panic("{}", msg);	84	std.debug.panic("{}", msg);
...	@@ -92,10 +92,10 @@ pub fn setXmm0(comptime T: type, value: T) void {	...	@@ -92,10 +92,10 @@ pub fn setXmm0(comptime T: type, value: T) void {
92	const aligned_value: T align(16) = value;	92	const aligned_value: T align(16) = value;
93	asm volatile (	93	asm volatile (
94	\\movaps (%[ptr]), %%xmm0	94	\\movaps (%[ptr]), %%xmm0
95		95	:
96	:
97	: [ptr] "r" (&aligned_value)	96	: [ptr] "r" (&aligned_value)
98	: "xmm0");	97	: "xmm0"
		98	);
99	}	99	}
100		100
101	extern fn __udivdi3(a: u64, b: u64) u64 {	101	extern fn __udivdi3(a: u64, b: u64) u64 {
...	@@ -159,7 +159,8 @@ fn isArmArch() bool {	...	@@ -159,7 +159,8 @@ fn isArmArch() bool {
159	builtin.Arch.armebv6t2,	159	builtin.Arch.armebv6t2,
160	builtin.Arch.armebv5,	160	builtin.Arch.armebv5,
161	builtin.Arch.armebv5te,	161	builtin.Arch.armebv5te,
162	builtin.Arch.armebv4t => true,	162	builtin.Arch.armebv4t,
		163	=> true,
163	else => false,	164	else => false,
164	};	165	};
165	}	166	}
...	@@ -174,7 +175,10 @@ nakedcc fn __aeabi_uidivmod() void {	...	@@ -174,7 +175,10 @@ nakedcc fn __aeabi_uidivmod() void {
174	\\ ldr r1, [sp]	175	\\ ldr r1, [sp]
175	\\ add sp, sp, #4	176	\\ add sp, sp, #4
176	\\ pop { pc }	177	\\ pop { pc }
177	::: "r2", "r1");	178	:
		179	:
		180	: "r2", "r1"
		181	);
178	}	182	}
179		183
180	// _chkstk (_alloca) routine - probe stack between %esp and (%esp-%eax) in 4k increments,	184	// _chkstk (_alloca) routine - probe stack between %esp and (%esp-%eax) in 4k increments,
...	@@ -280,7 +284,7 @@ nakedcc fn ___chkstk_ms() align(4) void {	...	@@ -280,7 +284,7 @@ nakedcc fn ___chkstk_ms() align(4) void {
280	);	284	);
281	}	285	}
282		286
283	extern fn __udivmodsi4(a: u32, b: u32, rem: &u32) u32 {	287	extern fn __udivmodsi4(a: u32, b: u32, rem: *u32) u32 {
284	@setRuntimeSafety(is_test);	288	@setRuntimeSafety(is_test);
285		289
286	const d = __udivsi3(a, b);	290	const d = __udivsi3(a, b);

std/special/compiler_rt/udivmod.zig+9-9

...	@@ -7,15 +7,15 @@ const low = switch (builtin.endian) {	...	@@ -7,15 +7,15 @@ const low = switch (builtin.endian) {
7	};	7	};
8	const high = 1 - low;	8	const high = 1 - low;
9		9
10	pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem: ?&DoubleInt) DoubleInt {	10	pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem: ?*DoubleInt) DoubleInt {
11	@setRuntimeSafety(is_test);	11	@setRuntimeSafety(is_test);
12		12
13	const SingleInt = @IntType(false, @divExact(DoubleInt.bit_count, 2));	13	const SingleInt = @IntType(false, @divExact(DoubleInt.bit_count, 2));
14	const SignedDoubleInt = @IntType(true, DoubleInt.bit_count);	14	const SignedDoubleInt = @IntType(true, DoubleInt.bit_count);
15	const Log2SingleInt = @import("std").math.Log2Int(SingleInt);	15	const Log2SingleInt = @import("std").math.Log2Int(SingleInt);
16		16
17	const n = @ptrCast(&const [2]SingleInt, &a).*; // 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	18	const d = @ptrCast(const [2]SingleInt, &b).; // TODO issue #421
19	var q: [2]SingleInt = undefined;	19	var q: [2]SingleInt = undefined;
20	var r: [2]SingleInt = undefined;	20	var r: [2]SingleInt = undefined;
21	var sr: c_uint = undefined;	21	var sr: c_uint = undefined;
...	@@ -57,7 +57,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:	...	@@ -57,7 +57,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
57	if (maybe_rem) \|rem\| {	57	if (maybe_rem) \|rem\| {
58	r[high] = n[high] % d[high];	58	r[high] = n[high] % d[high];
59	r[low] = 0;	59	r[low] = 0;
60	rem.* = @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]).*; // TODO issue #421	60	rem.* = @ptrCast(align(@alignOf(SingleInt)) DoubleInt, &r[0]).; // TODO issue #421
61	}	61	}
62	return n[high] / d[high];	62	return n[high] / d[high];
63	}	63	}
...	@@ -69,7 +69,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:	...	@@ -69,7 +69,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
69	if (maybe_rem) \|rem\| {	69	if (maybe_rem) \|rem\| {
70	r[low] = n[low];	70	r[low] = n[low];
71	r[high] = n[high] & (d[high] - 1);	71	r[high] = n[high] & (d[high] - 1);
72	rem.* = @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &r[0]).*; // TODO issue #421	72	rem.* = @ptrCast(align(@alignOf(SingleInt)) DoubleInt, &r[0]).; // TODO issue #421
73	}	73	}
74	return n[high] >> Log2SingleInt(@ctz(d[high]));	74	return n[high] >> Log2SingleInt(@ctz(d[high]));
75	}	75	}
...	@@ -109,7 +109,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:	...	@@ -109,7 +109,7 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
109	sr = @ctz(d[low]);	109	sr = @ctz(d[low]);
110	q[high] = n[high] >> Log2SingleInt(sr);	110	q[high] = n[high] >> Log2SingleInt(sr);
111	q[low] = (n[high] << Log2SingleInt(SingleInt.bit_count - sr)) \| (n[low] >> Log2SingleInt(sr));	111	q[low] = (n[high] << Log2SingleInt(SingleInt.bit_count - sr)) \| (n[low] >> Log2SingleInt(sr));
112	return @ptrCast(&align(@alignOf(SingleInt)) DoubleInt, &q[0]).*; // TODO issue #421	112	return @ptrCast(align(@alignOf(SingleInt)) DoubleInt, &q[0]).; // TODO issue #421
113	}	113	}
114	// K X	114	// K X
115	// ---	115	// ---
...	@@ -183,13 +183,13 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:	...	@@ -183,13 +183,13 @@ pub fn udivmod(comptime DoubleInt: type, a: DoubleInt, b: DoubleInt, maybe_rem:
183	// r.all -= b;	183	// r.all -= b;
184	// carry = 1;	184	// carry = 1;
185	// }	185	// }
186	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
187	const s: SignedDoubleInt = SignedDoubleInt(b -% r_all -% 1) >> (DoubleInt.bit_count - 1);	187	const s: SignedDoubleInt = SignedDoubleInt(b -% r_all -% 1) >> (DoubleInt.bit_count - 1);
188	carry = u32(s & 1);	188	carry = u32(s & 1);
189	r_all -= b & @bitCast(DoubleInt, s);	189	r_all -= b & @bitCast(DoubleInt, s);
190	r = @ptrCast(&[2]SingleInt, &r_all).*; // TODO issue #421	190	r = @ptrCast([2]SingleInt, &r_all).; // TODO issue #421
191	}	191	}
192	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
193	if (maybe_rem) \|rem\| {	193	if (maybe_rem) \|rem\| {
194	rem.* = r_all;	194	rem.* = r_all;
195	}	195	}

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

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const udivmod = @import("udivmod.zig").udivmod;	1	const udivmod = @import("udivmod.zig").udivmod;
2	const builtin = @import("builtin");	2	const builtin = @import("builtin");
3		3
4	pub extern fn __udivmoddi4(a: u64, b: u64, maybe_rem: ?&u64) u64 {	4	pub extern fn __udivmoddi4(a: u64, b: u64, maybe_rem: ?*u64) u64 {
5	@setRuntimeSafety(builtin.is_test);	5	@setRuntimeSafety(builtin.is_test);
6	return udivmod(u64, a, b, maybe_rem);	6	return udivmod(u64, a, b, maybe_rem);
7	}	7	}

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

...	@@ -2,12 +2,12 @@ const udivmod = @import("udivmod.zig").udivmod;	...	@@ -2,12 +2,12 @@ const udivmod = @import("udivmod.zig").udivmod;
2	const builtin = @import("builtin");	2	const builtin = @import("builtin");
3	const compiler_rt = @import("index.zig");	3	const compiler_rt = @import("index.zig");
4		4
5	pub extern fn __udivmodti4(a: u128, b: u128, maybe_rem: ?&u128) u128 {	5	pub extern fn __udivmodti4(a: u128, b: u128, maybe_rem: ?*u128) u128 {
6	@setRuntimeSafety(builtin.is_test);	6	@setRuntimeSafety(builtin.is_test);
7	return udivmod(u128, a, b, maybe_rem);	7	return udivmod(u128, a, b, maybe_rem);
8	}	8	}
9		9
10	pub extern fn __udivmodti4_windows_x86_64(a: &const u128, b: &const u128, maybe_rem: ?&u128) void {	10	pub extern fn __udivmodti4_windows_x86_64(a: const u128, b: const u128, maybe_rem: ?*u128) void {
11	@setRuntimeSafety(builtin.is_test);	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	}

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

...	@@ -6,7 +6,7 @@ pub extern fn __udivti3(a: u128, b: u128) u128 {	...	@@ -6,7 +6,7 @@ pub extern fn __udivti3(a: u128, b: u128) u128 {
6	return udivmodti4.__udivmodti4(a, b, null);	6	return udivmodti4.__udivmodti4(a, b, null);
7	}	7	}
8		8
9	pub extern fn __udivti3_windows_x86_64(a: &const u128, b: &const u128) void {	9	pub extern fn __udivti3_windows_x86_64(a: const u128, b: const u128) void {
10	@setRuntimeSafety(builtin.is_test);	10	@setRuntimeSafety(builtin.is_test);
11	udivmodti4.__udivmodti4_windows_x86_64(a, b, null);	11	udivmodti4.__udivmodti4_windows_x86_64(a, b, null);
12	}	12	}

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

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

std/special/panic.zig+1-1

...	@@ -6,7 +6,7 @@	...	@@ -6,7 +6,7 @@
6	const builtin = @import("builtin");	6	const builtin = @import("builtin");
7	const std = @import("std");	7	const std = @import("std");
8		8
9	pub fn panic(msg: []const u8, error_return_trace: ?&builtin.StackTrace) noreturn {	9	pub fn panic(msg: []const u8, error_return_trace: ?*builtin.StackTrace) noreturn {
10	@setCold(true);	10	@setCold(true);
11	switch (builtin.os) {	11	switch (builtin.os) {
12	// TODO: fix panic in zen.	12	// TODO: fix panic in zen.

std/unicode.zig+16-12

 @@ -58,6 +58,7 @@ pub fn utf8Encode(c: u32, out: []u8) !u3 {
 }
 const Utf8DecodeError = Utf8Decode2Error || Utf8Decode3Error || Utf8Decode4Error;
 /// Decodes the UTF-8 codepoint encoded in the given slice of bytes.
 /// bytes.len must be equal to utf8ByteSequenceLength(bytes[0]) catch unreachable.
 /// If you already know the length at comptime, you can call one of
 @@ -150,7 +151,9 @@ pub fn utf8ValidateSlice(s: []const u8) bool {
                 return false;
             }
-            if (utf8Decode(s[i..i+cp_len])) |_| {} else |_| { return false; }
+            if (utf8Decode(s[i .. i + cp_len])) |_| {} else |_| {
+                return false;
+            }
             i += cp_len;
         } else |err| {
             return false;
 @@ -179,9 +182,7 @@ pub const Utf8View = struct {
     }
     pub fn initUnchecked(s: []const u8) Utf8View {
-        return Utf8View {
+        return Utf8View{ .bytes = s };
-            .bytes = s,
-        };
     }
     pub fn initComptime(comptime s: []const u8) Utf8View {
 @@ -191,12 +192,12 @@ pub const Utf8View = struct {
             error.InvalidUtf8 => {
                 @compileError("invalid utf8");
                 unreachable;
-            }
+            },
         }
     }
-    pub fn iterator(s: &const Utf8View) Utf8Iterator {
+    pub fn iterator(s: *const Utf8View) Utf8Iterator {
-        return Utf8Iterator {
+        return Utf8Iterator{
             .bytes = s.bytes,
             .i = 0,
         };
 @@ -207,7 +208,7 @@ const Utf8Iterator = struct {
     bytes: []const u8,
     i: usize,
-    pub fn nextCodepointSlice(it: &Utf8Iterator) ?[]const u8 {
+    pub fn nextCodepointSlice(it: *Utf8Iterator) ?[]const u8 {
         if (it.i >= it.bytes.len) {
             return null;
         }
 @@ -215,10 +216,10 @@ const Utf8Iterator = struct {
         const cp_len = utf8ByteSequenceLength(it.bytes[it.i]) catch unreachable;
         it.i += cp_len;
-        return it.bytes[it.i-cp_len..it.i];
+        return it.bytes[it.i - cp_len .. it.i];
     }
-    pub fn nextCodepoint(it: &Utf8Iterator) ?u32 {
+    pub fn nextCodepoint(it: *Utf8Iterator) ?u32 {
         const slice = it.nextCodepointSlice() ?? return null;
         switch (slice.len) {
 @@ -304,9 +305,12 @@ test "utf8 view bad" {
 fn testUtf8ViewBad() void {
     // Compile-time error.
     // const s3 = Utf8View.initComptime("\xfe\xf2");
     const s = Utf8View.init("hel\xadlo");
-    if (s) |_| { unreachable; } else |err| { debug.assert(err == error.InvalidUtf8); }
+    if (s) |_| {
+        unreachable;
+    } else |err| {
+        debug.assert(err == error.InvalidUtf8);
+    }
 }
 test "utf8 view ok" {

std/zig/ast.zig+298-293

 @@ -9,26 +9,26 @@ pub const TokenIndex = usize;
 pub const Tree = struct {
     source: []const u8,
     tokens: TokenList,
-    root_node: &Node.Root,
+    root_node: *Node.Root,
     arena_allocator: std.heap.ArenaAllocator,
     errors: ErrorList,
     pub const TokenList = SegmentedList(Token, 64);
     pub const ErrorList = SegmentedList(Error, 0);
-    pub fn deinit(self: &Tree) void {
+    pub fn deinit(self: *Tree) void {
         self.arena_allocator.deinit();
     }
-    pub fn renderError(self: &Tree, parse_error: &Error, stream: var) !void {
+    pub fn renderError(self: *Tree, parse_error: *Error, stream: var) !void {
         return parse_error.render(&self.tokens, stream);
     }
-    pub fn tokenSlice(self: &Tree, token_index: TokenIndex) []const u8 {
+    pub fn tokenSlice(self: *Tree, token_index: TokenIndex) []const u8 {
         return self.tokenSlicePtr(self.tokens.at(token_index));
     }
-    pub fn tokenSlicePtr(self: &Tree, token: &const Token) []const u8 {
+    pub fn tokenSlicePtr(self: *Tree, token: *const Token) []const u8 {
         return self.source[token.start..token.end];
     }
 @@ -39,7 +39,7 @@ pub const Tree = struct {
         line_end: usize,
     };
-    pub fn tokenLocationPtr(self: &Tree, start_index: usize, token: &const Token) Location {
+    pub fn tokenLocationPtr(self: *Tree, start_index: usize, token: *const Token) Location {
         var loc = Location{
             .line = 0,
             .column = 0,
 @@ -64,24 +64,24 @@ pub const Tree = struct {
         return loc;
     }
-    pub fn tokenLocation(self: &Tree, start_index: usize, token_index: TokenIndex) Location {
+    pub fn tokenLocation(self: *Tree, start_index: usize, token_index: TokenIndex) Location {
         return self.tokenLocationPtr(start_index, self.tokens.at(token_index));
     }
-    pub fn tokensOnSameLine(self: &Tree, token1_index: TokenIndex, token2_index: TokenIndex) bool {
+    pub fn tokensOnSameLine(self: *Tree, token1_index: TokenIndex, token2_index: TokenIndex) bool {
         return self.tokensOnSameLinePtr(self.tokens.at(token1_index), self.tokens.at(token2_index));
     }
-    pub fn tokensOnSameLinePtr(self: &Tree, token1: &const Token, token2: &const Token) bool {
+    pub fn tokensOnSameLinePtr(self: *Tree, token1: *const Token, token2: *const Token) bool {
         return mem.indexOfScalar(u8, self.source[token1.end..token2.start], '\n') == null;
     }
-    pub fn dump(self: &Tree) void {
+    pub fn dump(self: *Tree) void {
         self.root_node.base.dump(0);
     }
     /// Skips over comments
-    pub fn prevToken(self: &Tree, token_index: TokenIndex) TokenIndex {
+    pub fn prevToken(self: *Tree, token_index: TokenIndex) TokenIndex {
         var index = token_index - 1;
         while (self.tokens.at(index).id == Token.Id.LineComment) {
             index -= 1;
 @@ -90,7 +90,7 @@ pub const Tree = struct {
     }
     /// Skips over comments
-    pub fn nextToken(self: &Tree, token_index: TokenIndex) TokenIndex {
+    pub fn nextToken(self: *Tree, token_index: TokenIndex) TokenIndex {
         var index = token_index + 1;
         while (self.tokens.at(index).id == Token.Id.LineComment) {
             index += 1;
 @@ -120,7 +120,7 @@ pub const Error = union(enum) {
     ExpectedToken: ExpectedToken,
     ExpectedCommaOrEnd: ExpectedCommaOrEnd,
-    pub fn render(self: &Error, tokens: &Tree.TokenList, stream: var) !void {
+    pub fn render(self: *const Error, tokens: *Tree.TokenList, stream: var) !void {
         switch (self.*) {
             // TODO https://github.com/ziglang/zig/issues/683
             @TagType(Error).InvalidToken => |*x| return x.render(tokens, stream),
 @@ -145,7 +145,7 @@ pub const Error = union(enum) {
         }
     }
-    pub fn loc(self: &Error) TokenIndex {
+    pub fn loc(self: *const Error) TokenIndex {
         switch (self.*) {
             // TODO https://github.com/ziglang/zig/issues/683
             @TagType(Error).InvalidToken => |x| return x.token,
 @@ -188,17 +188,17 @@ pub const Error = union(enum) {
     pub const ExtraVolatileQualifier = SimpleError("Extra volatile qualifier");
     pub const ExpectedCall = struct {
-        node: &Node,
+        node: *Node,
-        pub fn render(self: &ExpectedCall, tokens: &Tree.TokenList, stream: var) !void {
+        pub fn render(self: *const ExpectedCall, tokens: *Tree.TokenList, stream: var) !void {
             return stream.print("expected " ++ @tagName(@TagType(Node.SuffixOp.Op).Call) ++ ", found {}", @tagName(self.node.id));
         }
     };
     pub const ExpectedCallOrFnProto = struct {
-        node: &Node,
+        node: *Node,
-        pub fn render(self: &ExpectedCallOrFnProto, tokens: &Tree.TokenList, stream: var) !void {
+        pub fn render(self: *const ExpectedCallOrFnProto, tokens: *Tree.TokenList, stream: var) !void {
             return stream.print("expected " ++ @tagName(@TagType(Node.SuffixOp.Op).Call) ++ " or " ++ @tagName(Node.Id.FnProto) ++ ", found {}", @tagName(self.node.id));
         }
     };
 @@ -207,7 +207,7 @@ pub const Error = union(enum) {
         token: TokenIndex,
         expected_id: @TagType(Token.Id),
-        pub fn render(self: &ExpectedToken, tokens: &Tree.TokenList, stream: var) !void {
+        pub fn render(self: *const ExpectedToken, tokens: *Tree.TokenList, stream: var) !void {
             const token_name = @tagName(tokens.at(self.token).id);
             return stream.print("expected {}, found {}", @tagName(self.expected_id), token_name);
         }
 @@ -217,7 +217,7 @@ pub const Error = union(enum) {
         token: TokenIndex,
         end_id: @TagType(Token.Id),
-        pub fn render(self: &ExpectedCommaOrEnd, tokens: &Tree.TokenList, stream: var) !void {
+        pub fn render(self: *const ExpectedCommaOrEnd, tokens: *Tree.TokenList, stream: var) !void {
             const token_name = @tagName(tokens.at(self.token).id);
             return stream.print("expected ',' or {}, found {}", @tagName(self.end_id), token_name);
         }
 @@ -229,7 +229,7 @@ pub const Error = union(enum) {
             token: TokenIndex,
-            pub fn render(self: &ThisError, tokens: &Tree.TokenList, stream: var) !void {
+            pub fn render(self: *const ThisError, tokens: *Tree.TokenList, stream: var) !void {
                 const token_name = @tagName(tokens.at(self.token).id);
                 return stream.print(msg, token_name);
             }
 @@ -242,7 +242,7 @@ pub const Error = union(enum) {
             token: TokenIndex,
-            pub fn render(self: &ThisError, tokens: &Tree.TokenList, stream: var) !void {
+            pub fn render(self: *const ThisError, tokens: *Tree.TokenList, stream: var) !void {
                 return stream.write(msg);
             }
         };
 @@ -320,14 +320,14 @@ pub const Node = struct {
         FieldInitializer,
     };
-    pub fn cast(base: &Node, comptime T: type) ?&T {
+    pub fn cast(base: *Node, comptime T: type) ?*T {
         if (base.id == comptime typeToId(T)) {
             return @fieldParentPtr(T, "base", base);
         }
         return null;
     }
-    pub fn iterate(base: &Node, index: usize) ?&Node {
+    pub fn iterate(base: *Node, index: usize) ?*Node {
         comptime var i = 0;
         inline while (i < @memberCount(Id)) : (i += 1) {
             if (base.id == @field(Id, @memberName(Id, i))) {
 @@ -338,7 +338,7 @@ pub const Node = struct {
         unreachable;
     }
-    pub fn firstToken(base: &Node) TokenIndex {
+    pub fn firstToken(base: *Node) TokenIndex {
         comptime var i = 0;
         inline while (i < @memberCount(Id)) : (i += 1) {
             if (base.id == @field(Id, @memberName(Id, i))) {
 @@ -349,7 +349,7 @@ pub const Node = struct {
         unreachable;
     }
-    pub fn lastToken(base: &Node) TokenIndex {
+    pub fn lastToken(base: *Node) TokenIndex {
         comptime var i = 0;
         inline while (i < @memberCount(Id)) : (i += 1) {
             if (base.id == @field(Id, @memberName(Id, i))) {
 @@ -370,7 +370,7 @@ pub const Node = struct {
         unreachable;
     }
-    pub fn requireSemiColon(base: &const Node) bool {
+    pub fn requireSemiColon(base: *const Node) bool {
         var n = base;
         while (true) {
             switch (n.id) {
 @@ -388,7 +388,8 @@ pub const Node = struct {
                 Id.SwitchElse,
                 Id.FieldInitializer,
                 Id.DocComment,
-                Id.TestDecl => return false,
+                Id.TestDecl,
+                => return false,
                 Id.While => {
                     const while_node = @fieldParentPtr(While, "base", n);
                     if (while_node.@"else") |@"else"| {
 @@ -442,7 +443,7 @@ pub const Node = struct {
         }
     }
-    pub fn dump(self: &Node, indent: usize) void {
+    pub fn dump(self: *Node, indent: usize) void {
         {
             var i: usize = 0;
             while (i < indent) : (i += 1) {
 @@ -459,44 +460,44 @@ pub const Node = struct {
     pub const Root = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         decls: DeclList,
         eof_token: TokenIndex,
-        pub const DeclList = SegmentedList(&Node, 4);
+        pub const DeclList = SegmentedList(*Node, 4);
-        pub fn iterate(self: &Root, index: usize) ?&Node {
+        pub fn iterate(self: *Root, index: usize) ?*Node {
             if (index < self.decls.len) {
                 return self.decls.at(index).*;
             }
             return null;
         }
-        pub fn firstToken(self: &Root) TokenIndex {
+        pub fn firstToken(self: *Root) TokenIndex {
             return if (self.decls.len == 0) self.eof_token else (self.decls.at(0).*).firstToken();
         }
-        pub fn lastToken(self: &Root) TokenIndex {
+        pub fn lastToken(self: *Root) TokenIndex {
             return if (self.decls.len == 0) self.eof_token else (self.decls.at(self.decls.len - 1).*).lastToken();
         }
     };
     pub const VarDecl = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         visib_token: ?TokenIndex,
         name_token: TokenIndex,
         eq_token: TokenIndex,
         mut_token: TokenIndex,
         comptime_token: ?TokenIndex,
         extern_export_token: ?TokenIndex,
-        lib_name: ?&Node,
+        lib_name: ?*Node,
-        type_node: ?&Node,
+        type_node: ?*Node,
-        align_node: ?&Node,
+        align_node: ?*Node,
-        init_node: ?&Node,
+        init_node: ?*Node,
         semicolon_token: TokenIndex,
-        pub fn iterate(self: &VarDecl, index: usize) ?&Node {
+        pub fn iterate(self: *VarDecl, index: usize) ?*Node {
             var i = index;
             if (self.type_node) |type_node| {
 @@ -517,7 +518,7 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &VarDecl) TokenIndex {
+        pub fn firstToken(self: *VarDecl) TokenIndex {
             if (self.visib_token) |visib_token| return visib_token;
             if (self.comptime_token) |comptime_token| return comptime_token;
             if (self.extern_export_token) |extern_export_token| return extern_export_token;
 @@ -525,20 +526,20 @@ pub const Node = struct {
             return self.mut_token;
         }
-        pub fn lastToken(self: &VarDecl) TokenIndex {
+        pub fn lastToken(self: *VarDecl) TokenIndex {
             return self.semicolon_token;
         }
     };
     pub const Use = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         visib_token: ?TokenIndex,
         use_token: TokenIndex,
-        expr: &Node,
+        expr: *Node,
         semicolon_token: TokenIndex,
-        pub fn iterate(self: &Use, index: usize) ?&Node {
+        pub fn iterate(self: *Use, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.expr;
 @@ -547,12 +548,12 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Use) TokenIndex {
+        pub fn firstToken(self: *Use) TokenIndex {
             if (self.visib_token) |visib_token| return visib_token;
             return self.use_token;
         }
-        pub fn lastToken(self: &Use) TokenIndex {
+        pub fn lastToken(self: *Use) TokenIndex {
             return self.semicolon_token;
         }
     };
 @@ -563,9 +564,9 @@ pub const Node = struct {
         decls: DeclList,
         rbrace_token: TokenIndex,
-        pub const DeclList = SegmentedList(&Node, 2);
+        pub const DeclList = SegmentedList(*Node, 2);
-        pub fn iterate(self: &ErrorSetDecl, index: usize) ?&Node {
+        pub fn iterate(self: *ErrorSetDecl, index: usize) ?*Node {
             var i = index;
             if (i < self.decls.len) return self.decls.at(i).*;
 @@ -574,11 +575,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &ErrorSetDecl) TokenIndex {
+        pub fn firstToken(self: *ErrorSetDecl) TokenIndex {
             return self.error_token;
         }
-        pub fn lastToken(self: &ErrorSetDecl) TokenIndex {
+        pub fn lastToken(self: *ErrorSetDecl) TokenIndex {
             return self.rbrace_token;
         }
     };
 @@ -596,11 +597,11 @@ pub const Node = struct {
         const InitArg = union(enum) {
             None,
-            Enum: ?&Node,
+            Enum: ?*Node,
-            Type: &Node,
+            Type: *Node,
         };
-        pub fn iterate(self: &ContainerDecl, index: usize) ?&Node {
+        pub fn iterate(self: *ContainerDecl, index: usize) ?*Node {
             var i = index;
             switch (self.init_arg_expr) {
 @@ -608,8 +609,7 @@ pub const Node = struct {
                     if (i < 1) return t;
                     i -= 1;
                 },
-                InitArg.None,
+                InitArg.None, InitArg.Enum => {},
-                InitArg.Enum => {},
             }
             if (i < self.fields_and_decls.len) return self.fields_and_decls.at(i).*;
 @@ -618,26 +618,26 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &ContainerDecl) TokenIndex {
+        pub fn firstToken(self: *ContainerDecl) TokenIndex {
             if (self.layout_token) |layout_token| {
                 return layout_token;
             }
             return self.kind_token;
         }
-        pub fn lastToken(self: &ContainerDecl) TokenIndex {
+        pub fn lastToken(self: *ContainerDecl) TokenIndex {
             return self.rbrace_token;
         }
     };
     pub const StructField = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         visib_token: ?TokenIndex,
         name_token: TokenIndex,
-        type_expr: &Node,
+        type_expr: *Node,
-        pub fn iterate(self: &StructField, index: usize) ?&Node {
+        pub fn iterate(self: *StructField, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.type_expr;
 @@ -646,24 +646,24 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &StructField) TokenIndex {
+        pub fn firstToken(self: *StructField) TokenIndex {
             if (self.visib_token) |visib_token| return visib_token;
             return self.name_token;
         }
-        pub fn lastToken(self: &StructField) TokenIndex {
+        pub fn lastToken(self: *StructField) TokenIndex {
             return self.type_expr.lastToken();
         }
     };
     pub const UnionTag = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         name_token: TokenIndex,
-        type_expr: ?&Node,
+        type_expr: ?*Node,
-        value_expr: ?&Node,
+        value_expr: ?*Node,
-        pub fn iterate(self: &UnionTag, index: usize) ?&Node {
+        pub fn iterate(self: *UnionTag, index: usize) ?*Node {
             var i = index;
             if (self.type_expr) |type_expr| {
 @@ -679,11 +679,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &UnionTag) TokenIndex {
+        pub fn firstToken(self: *UnionTag) TokenIndex {
             return self.name_token;
         }
-        pub fn lastToken(self: &UnionTag) TokenIndex {
+        pub fn lastToken(self: *UnionTag) TokenIndex {
             if (self.value_expr) |value_expr| {
                 return value_expr.lastToken();
             }
 @@ -697,11 +697,11 @@ pub const Node = struct {
     pub const EnumTag = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         name_token: TokenIndex,
-        value: ?&Node,
+        value: ?*Node,
-        pub fn iterate(self: &EnumTag, index: usize) ?&Node {
+        pub fn iterate(self: *EnumTag, index: usize) ?*Node {
             var i = index;
             if (self.value) |value| {
 @@ -712,11 +712,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &EnumTag) TokenIndex {
+        pub fn firstToken(self: *EnumTag) TokenIndex {
             return self.name_token;
         }
-        pub fn lastToken(self: &EnumTag) TokenIndex {
+        pub fn lastToken(self: *EnumTag) TokenIndex {
             if (self.value) |value| {
                 return value.lastToken();
             }
 @@ -727,25 +727,25 @@ pub const Node = struct {
     pub const ErrorTag = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         name_token: TokenIndex,
-        pub fn iterate(self: &ErrorTag, index: usize) ?&Node {
+        pub fn iterate(self: *ErrorTag, index: usize) ?*Node {
             var i = index;
             if (self.doc_comments) |comments| {
-                if (i < 1) return &comments.base;
+                if (i < 1) return *comments.base;
                 i -= 1;
             }
             return null;
         }
-        pub fn firstToken(self: &ErrorTag) TokenIndex {
+        pub fn firstToken(self: *ErrorTag) TokenIndex {
             return self.name_token;
         }
-        pub fn lastToken(self: &ErrorTag) TokenIndex {
+        pub fn lastToken(self: *ErrorTag) TokenIndex {
             return self.name_token;
         }
     };
 @@ -754,15 +754,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &Identifier, index: usize) ?&Node {
+        pub fn iterate(self: *Identifier, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &Identifier) TokenIndex {
+        pub fn firstToken(self: *Identifier) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &Identifier) TokenIndex {
+        pub fn lastToken(self: *Identifier) TokenIndex {
             return self.token;
         }
     };
 @@ -770,10 +770,10 @@ pub const Node = struct {
     pub const AsyncAttribute = struct {
         base: Node,
         async_token: TokenIndex,
-        allocator_type: ?&Node,
+        allocator_type: ?*Node,
         rangle_bracket: ?TokenIndex,
-        pub fn iterate(self: &AsyncAttribute, index: usize) ?&Node {
+        pub fn iterate(self: *AsyncAttribute, index: usize) ?*Node {
             var i = index;
             if (self.allocator_type) |allocator_type| {
 @@ -784,11 +784,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &AsyncAttribute) TokenIndex {
+        pub fn firstToken(self: *AsyncAttribute) TokenIndex {
             return self.async_token;
         }
-        pub fn lastToken(self: &AsyncAttribute) TokenIndex {
+        pub fn lastToken(self: *AsyncAttribute) TokenIndex {
             if (self.rangle_bracket) |rangle_bracket| {
                 return rangle_bracket;
             }
 @@ -799,7 +799,7 @@ pub const Node = struct {
     pub const FnProto = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         visib_token: ?TokenIndex,
         fn_token: TokenIndex,
         name_token: ?TokenIndex,
 @@ -808,19 +808,19 @@ pub const Node = struct {
         var_args_token: ?TokenIndex,
         extern_export_inline_token: ?TokenIndex,
         cc_token: ?TokenIndex,
-        async_attr: ?&AsyncAttribute,
+        async_attr: ?*AsyncAttribute,
-        body_node: ?&Node,
+        body_node: ?*Node,
-        lib_name: ?&Node, // populated if this is an extern declaration
+        lib_name: ?*Node, // populated if this is an extern declaration
-        align_expr: ?&Node, // populated if align(A) is present
+        align_expr: ?*Node, // populated if align(A) is present
-        pub const ParamList = SegmentedList(&Node, 2);
+        pub const ParamList = SegmentedList(*Node, 2);
         pub const ReturnType = union(enum) {
-            Explicit: &Node,
+            Explicit: *Node,
-            InferErrorSet: &Node,
+            InferErrorSet: *Node,
         };
-        pub fn iterate(self: &FnProto, index: usize) ?&Node {
+        pub fn iterate(self: *FnProto, index: usize) ?*Node {
             var i = index;
             if (self.lib_name) |lib_name| {
 @@ -856,7 +856,7 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &FnProto) TokenIndex {
+        pub fn firstToken(self: *FnProto) TokenIndex {
             if (self.visib_token) |visib_token| return visib_token;
             if (self.extern_export_inline_token) |extern_export_inline_token| return extern_export_inline_token;
             assert(self.lib_name == null);
 @@ -864,7 +864,7 @@ pub const Node = struct {
             return self.fn_token;
         }
-        pub fn lastToken(self: &FnProto) TokenIndex {
+        pub fn lastToken(self: *FnProto) TokenIndex {
             if (self.body_node) |body_node| return body_node.lastToken();
             switch (self.return_type) {
                 // TODO allow this and next prong to share bodies since the types are the same
 @@ -881,10 +881,10 @@ pub const Node = struct {
         pub const Result = struct {
             arrow_token: TokenIndex,
-            return_type: &Node,
+            return_type: *Node,
         };
-        pub fn iterate(self: &PromiseType, index: usize) ?&Node {
+        pub fn iterate(self: *PromiseType, index: usize) ?*Node {
             var i = index;
             if (self.result) |result| {
 @@ -895,11 +895,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &PromiseType) TokenIndex {
+        pub fn firstToken(self: *PromiseType) TokenIndex {
             return self.promise_token;
         }
-        pub fn lastToken(self: &PromiseType) TokenIndex {
+        pub fn lastToken(self: *PromiseType) TokenIndex {
             if (self.result) |result| return result.return_type.lastToken();
             return self.promise_token;
         }
 @@ -910,10 +910,10 @@ pub const Node = struct {
         comptime_token: ?TokenIndex,
         noalias_token: ?TokenIndex,
         name_token: ?TokenIndex,
-        type_node: &Node,
+        type_node: *Node,
         var_args_token: ?TokenIndex,
-        pub fn iterate(self: &ParamDecl, index: usize) ?&Node {
+        pub fn iterate(self: *ParamDecl, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.type_node;
 @@ -922,14 +922,14 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &ParamDecl) TokenIndex {
+        pub fn firstToken(self: *ParamDecl) TokenIndex {
             if (self.comptime_token) |comptime_token| return comptime_token;
             if (self.noalias_token) |noalias_token| return noalias_token;
             if (self.name_token) |name_token| return name_token;
             return self.type_node.firstToken();
         }
-        pub fn lastToken(self: &ParamDecl) TokenIndex {
+        pub fn lastToken(self: *ParamDecl) TokenIndex {
             if (self.var_args_token) |var_args_token| return var_args_token;
             return self.type_node.lastToken();
         }
 @@ -944,7 +944,7 @@ pub const Node = struct {
         pub const StatementList = Root.DeclList;
-        pub fn iterate(self: &Block, index: usize) ?&Node {
+        pub fn iterate(self: *Block, index: usize) ?*Node {
             var i = index;
             if (i < self.statements.len) return self.statements.at(i).*;
 @@ -953,7 +953,7 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Block) TokenIndex {
+        pub fn firstToken(self: *Block) TokenIndex {
             if (self.label) |label| {
                 return label;
             }
 @@ -961,7 +961,7 @@ pub const Node = struct {
             return self.lbrace;
         }
-        pub fn lastToken(self: &Block) TokenIndex {
+        pub fn lastToken(self: *Block) TokenIndex {
             return self.rbrace;
         }
     };
 @@ -970,14 +970,14 @@ pub const Node = struct {
         base: Node,
         defer_token: TokenIndex,
         kind: Kind,
-        expr: &Node,
+        expr: *Node,
         const Kind = enum {
             Error,
             Unconditional,
         };
-        pub fn iterate(self: &Defer, index: usize) ?&Node {
+        pub fn iterate(self: *Defer, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.expr;
 @@ -986,22 +986,22 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Defer) TokenIndex {
+        pub fn firstToken(self: *Defer) TokenIndex {
             return self.defer_token;
         }
-        pub fn lastToken(self: &Defer) TokenIndex {
+        pub fn lastToken(self: *Defer) TokenIndex {
             return self.expr.lastToken();
         }
     };
     pub const Comptime = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         comptime_token: TokenIndex,
-        expr: &Node,
+        expr: *Node,
-        pub fn iterate(self: &Comptime, index: usize) ?&Node {
+        pub fn iterate(self: *Comptime, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.expr;
 @@ -1010,11 +1010,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Comptime) TokenIndex {
+        pub fn firstToken(self: *Comptime) TokenIndex {
             return self.comptime_token;
         }
-        pub fn lastToken(self: &Comptime) TokenIndex {
+        pub fn lastToken(self: *Comptime) TokenIndex {
             return self.expr.lastToken();
         }
     };
 @@ -1022,10 +1022,10 @@ pub const Node = struct {
     pub const Payload = struct {
         base: Node,
         lpipe: TokenIndex,
-        error_symbol: &Node,
+        error_symbol: *Node,
         rpipe: TokenIndex,
-        pub fn iterate(self: &Payload, index: usize) ?&Node {
+        pub fn iterate(self: *Payload, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.error_symbol;
 @@ -1034,11 +1034,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Payload) TokenIndex {
+        pub fn firstToken(self: *Payload) TokenIndex {
             return self.lpipe;
         }
-        pub fn lastToken(self: &Payload) TokenIndex {
+        pub fn lastToken(self: *Payload) TokenIndex {
             return self.rpipe;
         }
     };
 @@ -1047,10 +1047,10 @@ pub const Node = struct {
         base: Node,
         lpipe: TokenIndex,
         ptr_token: ?TokenIndex,
-        value_symbol: &Node,
+        value_symbol: *Node,
         rpipe: TokenIndex,
-        pub fn iterate(self: &PointerPayload, index: usize) ?&Node {
+        pub fn iterate(self: *PointerPayload, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.value_symbol;
 @@ -1059,11 +1059,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &PointerPayload) TokenIndex {
+        pub fn firstToken(self: *PointerPayload) TokenIndex {
             return self.lpipe;
         }
-        pub fn lastToken(self: &PointerPayload) TokenIndex {
+        pub fn lastToken(self: *PointerPayload) TokenIndex {
             return self.rpipe;
         }
     };
 @@ -1072,11 +1072,11 @@ pub const Node = struct {
         base: Node,
         lpipe: TokenIndex,
         ptr_token: ?TokenIndex,
-        value_symbol: &Node,
+        value_symbol: *Node,
-        index_symbol: ?&Node,
+        index_symbol: ?*Node,
         rpipe: TokenIndex,
-        pub fn iterate(self: &PointerIndexPayload, index: usize) ?&Node {
+        pub fn iterate(self: *PointerIndexPayload, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.value_symbol;
 @@ -1090,11 +1090,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &PointerIndexPayload) TokenIndex {
+        pub fn firstToken(self: *PointerIndexPayload) TokenIndex {
             return self.lpipe;
         }
-        pub fn lastToken(self: &PointerIndexPayload) TokenIndex {
+        pub fn lastToken(self: *PointerIndexPayload) TokenIndex {
             return self.rpipe;
         }
     };
 @@ -1102,10 +1102,10 @@ pub const Node = struct {
     pub const Else = struct {
         base: Node,
         else_token: TokenIndex,
-        payload: ?&Node,
+        payload: ?*Node,
-        body: &Node,
+        body: *Node,
-        pub fn iterate(self: &Else, index: usize) ?&Node {
+        pub fn iterate(self: *Else, index: usize) ?*Node {
             var i = index;
             if (self.payload) |payload| {
 @@ -1119,11 +1119,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Else) TokenIndex {
+        pub fn firstToken(self: *Else) TokenIndex {
             return self.else_token;
         }
-        pub fn lastToken(self: &Else) TokenIndex {
+        pub fn lastToken(self: *Else) TokenIndex {
             return self.body.lastToken();
         }
     };
 @@ -1131,15 +1131,15 @@ pub const Node = struct {
     pub const Switch = struct {
         base: Node,
         switch_token: TokenIndex,
-        expr: &Node,
+        expr: *Node,
         /// these must be SwitchCase nodes
         cases: CaseList,
         rbrace: TokenIndex,
-        pub const CaseList = SegmentedList(&Node, 2);
+        pub const CaseList = SegmentedList(*Node, 2);
-        pub fn iterate(self: &Switch, index: usize) ?&Node {
+        pub fn iterate(self: *Switch, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.expr;
 @@ -1151,11 +1151,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Switch) TokenIndex {
+        pub fn firstToken(self: *Switch) TokenIndex {
             return self.switch_token;
         }
-        pub fn lastToken(self: &Switch) TokenIndex {
+        pub fn lastToken(self: *Switch) TokenIndex {
             return self.rbrace;
         }
     };
 @@ -1164,12 +1164,12 @@ pub const Node = struct {
         base: Node,
         items: ItemList,
         arrow_token: TokenIndex,
-        payload: ?&Node,
+        payload: ?*Node,
-        expr: &Node,
+        expr: *Node,
-        pub const ItemList = SegmentedList(&Node, 1);
+        pub const ItemList = SegmentedList(*Node, 1);
-        pub fn iterate(self: &SwitchCase, index: usize) ?&Node {
+        pub fn iterate(self: *SwitchCase, index: usize) ?*Node {
             var i = index;
             if (i < self.items.len) return self.items.at(i).*;
 @@ -1186,11 +1186,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &SwitchCase) TokenIndex {
+        pub fn firstToken(self: *SwitchCase) TokenIndex {
             return (self.items.at(0).*).firstToken();
         }
-        pub fn lastToken(self: &SwitchCase) TokenIndex {
+        pub fn lastToken(self: *SwitchCase) TokenIndex {
             return self.expr.lastToken();
         }
     };
 @@ -1199,15 +1199,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &SwitchElse, index: usize) ?&Node {
+        pub fn iterate(self: *SwitchElse, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &SwitchElse) TokenIndex {
+        pub fn firstToken(self: *SwitchElse) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &SwitchElse) TokenIndex {
+        pub fn lastToken(self: *SwitchElse) TokenIndex {
             return self.token;
         }
     };
 @@ -1217,13 +1217,13 @@ pub const Node = struct {
         label: ?TokenIndex,
         inline_token: ?TokenIndex,
         while_token: TokenIndex,
-        condition: &Node,
+        condition: *Node,
-        payload: ?&Node,
+        payload: ?*Node,
-        continue_expr: ?&Node,
+        continue_expr: ?*Node,
-        body: &Node,
+        body: *Node,
-        @"else": ?&Else,
+        @"else": ?*Else,
-        pub fn iterate(self: &While, index: usize) ?&Node {
+        pub fn iterate(self: *While, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.condition;
 @@ -1243,14 +1243,14 @@ pub const Node = struct {
             i -= 1;
             if (self.@"else") |@"else"| {
-                if (i < 1) return &@"else".base;
+                if (i < 1) return *@"else".base;
                 i -= 1;
             }
             return null;
         }
-        pub fn firstToken(self: &While) TokenIndex {
+        pub fn firstToken(self: *While) TokenIndex {
             if (self.label) |label| {
                 return label;
             }
 @@ -1262,7 +1262,7 @@ pub const Node = struct {
             return self.while_token;
         }
-        pub fn lastToken(self: &While) TokenIndex {
+        pub fn lastToken(self: *While) TokenIndex {
             if (self.@"else") |@"else"| {
                 return @"else".body.lastToken();
             }
 @@ -1276,12 +1276,12 @@ pub const Node = struct {
         label: ?TokenIndex,
         inline_token: ?TokenIndex,
         for_token: TokenIndex,
-        array_expr: &Node,
+        array_expr: *Node,
-        payload: ?&Node,
+        payload: ?*Node,
-        body: &Node,
+        body: *Node,
-        @"else": ?&Else,
+        @"else": ?*Else,
-        pub fn iterate(self: &For, index: usize) ?&Node {
+        pub fn iterate(self: *For, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.array_expr;
 @@ -1296,14 +1296,14 @@ pub const Node = struct {
             i -= 1;
             if (self.@"else") |@"else"| {
-                if (i < 1) return &@"else".base;
+                if (i < 1) return *@"else".base;
                 i -= 1;
             }
             return null;
         }
-        pub fn firstToken(self: &For) TokenIndex {
+        pub fn firstToken(self: *For) TokenIndex {
             if (self.label) |label| {
                 return label;
             }
 @@ -1315,7 +1315,7 @@ pub const Node = struct {
             return self.for_token;
         }
-        pub fn lastToken(self: &For) TokenIndex {
+        pub fn lastToken(self: *For) TokenIndex {
             if (self.@"else") |@"else"| {
                 return @"else".body.lastToken();
             }
 @@ -1327,12 +1327,12 @@ pub const Node = struct {
     pub const If = struct {
         base: Node,
         if_token: TokenIndex,
-        condition: &Node,
+        condition: *Node,
-        payload: ?&Node,
+        payload: ?*Node,
-        body: &Node,
+        body: *Node,
-        @"else": ?&Else,
+        @"else": ?*Else,
-        pub fn iterate(self: &If, index: usize) ?&Node {
+        pub fn iterate(self: *If, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.condition;
 @@ -1347,18 +1347,18 @@ pub const Node = struct {
             i -= 1;
             if (self.@"else") |@"else"| {
-                if (i < 1) return &@"else".base;
+                if (i < 1) return *@"else".base;
                 i -= 1;
             }
             return null;
         }
-        pub fn firstToken(self: &If) TokenIndex {
+        pub fn firstToken(self: *If) TokenIndex {
             return self.if_token;
         }
-        pub fn lastToken(self: &If) TokenIndex {
+        pub fn lastToken(self: *If) TokenIndex {
             if (self.@"else") |@"else"| {
                 return @"else".body.lastToken();
             }
 @@ -1370,9 +1370,9 @@ pub const Node = struct {
     pub const InfixOp = struct {
         base: Node,
         op_token: TokenIndex,
-        lhs: &Node,
+        lhs: *Node,
         op: Op,
-        rhs: &Node,
+        rhs: *Node,
         pub const Op = union(enum) {
             Add,
 @@ -1401,7 +1401,7 @@ pub const Node = struct {
             BitXor,
             BoolAnd,
             BoolOr,
-            Catch: ?&Node,
+            Catch: ?*Node,
             Div,
             EqualEqual,
             ErrorUnion,
 @@ -1420,7 +1420,7 @@ pub const Node = struct {
             UnwrapMaybe,
         };
-        pub fn iterate(self: &InfixOp, index: usize) ?&Node {
+        pub fn iterate(self: *InfixOp, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.lhs;
 @@ -1475,7 +1475,8 @@ pub const Node = struct {
                 Op.Range,
                 Op.Sub,
                 Op.SubWrap,
-                Op.UnwrapMaybe => {},
+                Op.UnwrapMaybe,
+                => {},
             }
             if (i < 1) return self.rhs;
 @@ -1484,11 +1485,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &InfixOp) TokenIndex {
+        pub fn firstToken(self: *InfixOp) TokenIndex {
             return self.lhs.firstToken();
         }
-        pub fn lastToken(self: &InfixOp) TokenIndex {
+        pub fn lastToken(self: *InfixOp) TokenIndex {
             return self.rhs.lastToken();
         }
     };
 @@ -1497,42 +1498,42 @@ pub const Node = struct {
         base: Node,
         op_token: TokenIndex,
         op: Op,
-        rhs: &Node,
+        rhs: *Node,
         pub const Op = union(enum) {
-            AddrOf: AddrOfInfo,
+            AddressOf,
-            ArrayType: &Node,
+            ArrayType: *Node,
             Await,
             BitNot,
             BoolNot,
             Cancel,
-            PointerType,
             MaybeType,
             Negation,
             NegationWrap,
             Resume,
-            SliceType: AddrOfInfo,
+            PtrType: PtrInfo,
+            SliceType: PtrInfo,
             Try,
             UnwrapMaybe,
         };
-        pub const AddrOfInfo = struct {
+        pub const PtrInfo = struct {
             align_info: ?Align,
             const_token: ?TokenIndex,
             volatile_token: ?TokenIndex,
             pub const Align = struct {
-                node: &Node,
+                node: *Node,
                 bit_range: ?BitRange,
                 pub const BitRange = struct {
-                    start: &Node,
+                    start: *Node,
-                    end: &Node,
+                    end: *Node,
                 };
             };
         };
-        pub fn iterate(self: &PrefixOp, index: usize) ?&Node {
+        pub fn iterate(self: *PrefixOp, index: usize) ?*Node {
             var i = index;
             switch (self.op) {
 @@ -1572,11 +1573,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &PrefixOp) TokenIndex {
+        pub fn firstToken(self: *PrefixOp) TokenIndex {
             return self.op_token;
         }
-        pub fn lastToken(self: &PrefixOp) TokenIndex {
+        pub fn lastToken(self: *PrefixOp) TokenIndex {
             return self.rhs.lastToken();
         }
     };
 @@ -1585,9 +1586,9 @@ pub const Node = struct {
         base: Node,
         period_token: TokenIndex,
         name_token: TokenIndex,
-        expr: &Node,
+        expr: *Node,
-        pub fn iterate(self: &FieldInitializer, index: usize) ?&Node {
+        pub fn iterate(self: *FieldInitializer, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.expr;
 @@ -1596,45 +1597,45 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &FieldInitializer) TokenIndex {
+        pub fn firstToken(self: *FieldInitializer) TokenIndex {
             return self.period_token;
         }
-        pub fn lastToken(self: &FieldInitializer) TokenIndex {
+        pub fn lastToken(self: *FieldInitializer) TokenIndex {
             return self.expr.lastToken();
         }
     };
     pub const SuffixOp = struct {
         base: Node,
-        lhs: &Node,
+        lhs: *Node,
         op: Op,
         rtoken: TokenIndex,
         pub const Op = union(enum) {
             Call: Call,
-            ArrayAccess: &Node,
+            ArrayAccess: *Node,
             Slice: Slice,
             ArrayInitializer: InitList,
             StructInitializer: InitList,
             Deref,
-            pub const InitList = SegmentedList(&Node, 2);
+            pub const InitList = SegmentedList(*Node, 2);
             pub const Call = struct {
                 params: ParamList,
-                async_attr: ?&AsyncAttribute,
+                async_attr: ?*AsyncAttribute,
-                pub const ParamList = SegmentedList(&Node, 2);
+                pub const ParamList = SegmentedList(*Node, 2);
             };
             pub const Slice = struct {
-                start: &Node,
+                start: *Node,
-                end: ?&Node,
+                end: ?*Node,
             };
         };
-        pub fn iterate(self: &SuffixOp, index: usize) ?&Node {
+        pub fn iterate(self: *SuffixOp, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.lhs;
 @@ -1672,11 +1673,15 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &SuffixOp) TokenIndex {
+        pub fn firstToken(self: *SuffixOp) TokenIndex {
+            switch (self.op) {
+                @TagType(Op).Call => |*call_info| if (call_info.async_attr) |async_attr| return async_attr.firstToken(),
+                else => {},
+            }
             return self.lhs.firstToken();
         }
-        pub fn lastToken(self: &SuffixOp) TokenIndex {
+        pub fn lastToken(self: *SuffixOp) TokenIndex {
             return self.rtoken;
         }
     };
 @@ -1684,10 +1689,10 @@ pub const Node = struct {
     pub const GroupedExpression = struct {
         base: Node,
         lparen: TokenIndex,
-        expr: &Node,
+        expr: *Node,
         rparen: TokenIndex,
-        pub fn iterate(self: &GroupedExpression, index: usize) ?&Node {
+        pub fn iterate(self: *GroupedExpression, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.expr;
 @@ -1696,11 +1701,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &GroupedExpression) TokenIndex {
+        pub fn firstToken(self: *GroupedExpression) TokenIndex {
             return self.lparen;
         }
-        pub fn lastToken(self: &GroupedExpression) TokenIndex {
+        pub fn lastToken(self: *GroupedExpression) TokenIndex {
             return self.rparen;
         }
     };
 @@ -1709,15 +1714,15 @@ pub const Node = struct {
         base: Node,
         ltoken: TokenIndex,
         kind: Kind,
-        rhs: ?&Node,
+        rhs: ?*Node,
         const Kind = union(enum) {
-            Break: ?&Node,
+            Break: ?*Node,
-            Continue: ?&Node,
+            Continue: ?*Node,
             Return,
         };
-        pub fn iterate(self: &ControlFlowExpression, index: usize) ?&Node {
+        pub fn iterate(self: *ControlFlowExpression, index: usize) ?*Node {
             var i = index;
             switch (self.kind) {
 @@ -1744,11 +1749,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &ControlFlowExpression) TokenIndex {
+        pub fn firstToken(self: *ControlFlowExpression) TokenIndex {
             return self.ltoken;
         }
-        pub fn lastToken(self: &ControlFlowExpression) TokenIndex {
+        pub fn lastToken(self: *ControlFlowExpression) TokenIndex {
             if (self.rhs) |rhs| {
                 return rhs.lastToken();
             }
 @@ -1775,10 +1780,10 @@ pub const Node = struct {
         base: Node,
         label: ?TokenIndex,
         suspend_token: TokenIndex,
-        payload: ?&Node,
+        payload: ?*Node,
-        body: ?&Node,
+        body: ?*Node,
-        pub fn iterate(self: &Suspend, index: usize) ?&Node {
+        pub fn iterate(self: *Suspend, index: usize) ?*Node {
             var i = index;
             if (self.payload) |payload| {
 @@ -1794,12 +1799,12 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &Suspend) TokenIndex {
+        pub fn firstToken(self: *Suspend) TokenIndex {
             if (self.label) |label| return label;
             return self.suspend_token;
         }
-        pub fn lastToken(self: &Suspend) TokenIndex {
+        pub fn lastToken(self: *Suspend) TokenIndex {
             if (self.body) |body| {
                 return body.lastToken();
             }
 @@ -1816,15 +1821,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &IntegerLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *IntegerLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &IntegerLiteral) TokenIndex {
+        pub fn firstToken(self: *IntegerLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &IntegerLiteral) TokenIndex {
+        pub fn lastToken(self: *IntegerLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1833,15 +1838,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &FloatLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *FloatLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &FloatLiteral) TokenIndex {
+        pub fn firstToken(self: *FloatLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &FloatLiteral) TokenIndex {
+        pub fn lastToken(self: *FloatLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1852,9 +1857,9 @@ pub const Node = struct {
         params: ParamList,
         rparen_token: TokenIndex,
-        pub const ParamList = SegmentedList(&Node, 2);
+        pub const ParamList = SegmentedList(*Node, 2);
-        pub fn iterate(self: &BuiltinCall, index: usize) ?&Node {
+        pub fn iterate(self: *BuiltinCall, index: usize) ?*Node {
             var i = index;
             if (i < self.params.len) return self.params.at(i).*;
 @@ -1863,11 +1868,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &BuiltinCall) TokenIndex {
+        pub fn firstToken(self: *BuiltinCall) TokenIndex {
             return self.builtin_token;
         }
-        pub fn lastToken(self: &BuiltinCall) TokenIndex {
+        pub fn lastToken(self: *BuiltinCall) TokenIndex {
             return self.rparen_token;
         }
     };
 @@ -1876,15 +1881,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &StringLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *StringLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &StringLiteral) TokenIndex {
+        pub fn firstToken(self: *StringLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &StringLiteral) TokenIndex {
+        pub fn lastToken(self: *StringLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1895,15 +1900,15 @@ pub const Node = struct {
         pub const LineList = SegmentedList(TokenIndex, 4);
-        pub fn iterate(self: &MultilineStringLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *MultilineStringLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &MultilineStringLiteral) TokenIndex {
+        pub fn firstToken(self: *MultilineStringLiteral) TokenIndex {
             return self.lines.at(0).*;
         }
-        pub fn lastToken(self: &MultilineStringLiteral) TokenIndex {
+        pub fn lastToken(self: *MultilineStringLiteral) TokenIndex {
             return self.lines.at(self.lines.len - 1).*;
         }
     };
 @@ -1912,15 +1917,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &CharLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *CharLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &CharLiteral) TokenIndex {
+        pub fn firstToken(self: *CharLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &CharLiteral) TokenIndex {
+        pub fn lastToken(self: *CharLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1929,15 +1934,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &BoolLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *BoolLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &BoolLiteral) TokenIndex {
+        pub fn firstToken(self: *BoolLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &BoolLiteral) TokenIndex {
+        pub fn lastToken(self: *BoolLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1946,15 +1951,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &NullLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *NullLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &NullLiteral) TokenIndex {
+        pub fn firstToken(self: *NullLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &NullLiteral) TokenIndex {
+        pub fn lastToken(self: *NullLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1963,15 +1968,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &UndefinedLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *UndefinedLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &UndefinedLiteral) TokenIndex {
+        pub fn firstToken(self: *UndefinedLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &UndefinedLiteral) TokenIndex {
+        pub fn lastToken(self: *UndefinedLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1980,15 +1985,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &ThisLiteral, index: usize) ?&Node {
+        pub fn iterate(self: *ThisLiteral, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &ThisLiteral) TokenIndex {
+        pub fn firstToken(self: *ThisLiteral) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &ThisLiteral) TokenIndex {
+        pub fn lastToken(self: *ThisLiteral) TokenIndex {
             return self.token;
         }
     };
 @@ -1996,17 +2001,17 @@ pub const Node = struct {
     pub const AsmOutput = struct {
         base: Node,
         lbracket: TokenIndex,
-        symbolic_name: &Node,
+        symbolic_name: *Node,
-        constraint: &Node,
+        constraint: *Node,
         kind: Kind,
         rparen: TokenIndex,
         const Kind = union(enum) {
-            Variable: &Identifier,
+            Variable: *Identifier,
-            Return: &Node,
+            Return: *Node,
         };
-        pub fn iterate(self: &AsmOutput, index: usize) ?&Node {
+        pub fn iterate(self: *AsmOutput, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.symbolic_name;
 @@ -2017,7 +2022,7 @@ pub const Node = struct {
             switch (self.kind) {
                 Kind.Variable => |variable_name| {
-                    if (i < 1) return &variable_name.base;
+                    if (i < 1) return *variable_name.base;
                     i -= 1;
                 },
                 Kind.Return => |return_type| {
 @@ -2029,11 +2034,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &AsmOutput) TokenIndex {
+        pub fn firstToken(self: *AsmOutput) TokenIndex {
             return self.lbracket;
         }
-        pub fn lastToken(self: &AsmOutput) TokenIndex {
+        pub fn lastToken(self: *AsmOutput) TokenIndex {
             return self.rparen;
         }
     };
 @@ -2041,12 +2046,12 @@ pub const Node = struct {
     pub const AsmInput = struct {
         base: Node,
         lbracket: TokenIndex,
-        symbolic_name: &Node,
+        symbolic_name: *Node,
-        constraint: &Node,
+        constraint: *Node,
-        expr: &Node,
+        expr: *Node,
         rparen: TokenIndex,
-        pub fn iterate(self: &AsmInput, index: usize) ?&Node {
+        pub fn iterate(self: *AsmInput, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.symbolic_name;
 @@ -2061,11 +2066,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &AsmInput) TokenIndex {
+        pub fn firstToken(self: *AsmInput) TokenIndex {
             return self.lbracket;
         }
-        pub fn lastToken(self: &AsmInput) TokenIndex {
+        pub fn lastToken(self: *AsmInput) TokenIndex {
             return self.rparen;
         }
     };
 @@ -2074,33 +2079,33 @@ pub const Node = struct {
         base: Node,
         asm_token: TokenIndex,
         volatile_token: ?TokenIndex,
-        template: &Node,
+        template: *Node,
         outputs: OutputList,
         inputs: InputList,
         clobbers: ClobberList,
         rparen: TokenIndex,
-        const OutputList = SegmentedList(&AsmOutput, 2);
+        const OutputList = SegmentedList(*AsmOutput, 2);
-        const InputList = SegmentedList(&AsmInput, 2);
+        const InputList = SegmentedList(*AsmInput, 2);
         const ClobberList = SegmentedList(TokenIndex, 2);
-        pub fn iterate(self: &Asm, index: usize) ?&Node {
+        pub fn iterate(self: *Asm, index: usize) ?*Node {
             var i = index;
-            if (i < self.outputs.len) return &(self.outputs.at(index).*).base;
+            if (i < self.outputs.len) return *(self.outputs.at(index).*).base;
             i -= self.outputs.len;
-            if (i < self.inputs.len) return &(self.inputs.at(index).*).base;
+            if (i < self.inputs.len) return *(self.inputs.at(index).*).base;
             i -= self.inputs.len;
             return null;
         }
-        pub fn firstToken(self: &Asm) TokenIndex {
+        pub fn firstToken(self: *Asm) TokenIndex {
             return self.asm_token;
         }
-        pub fn lastToken(self: &Asm) TokenIndex {
+        pub fn lastToken(self: *Asm) TokenIndex {
             return self.rparen;
         }
     };
 @@ -2109,15 +2114,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &Unreachable, index: usize) ?&Node {
+        pub fn iterate(self: *Unreachable, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &Unreachable) TokenIndex {
+        pub fn firstToken(self: *Unreachable) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &Unreachable) TokenIndex {
+        pub fn lastToken(self: *Unreachable) TokenIndex {
             return self.token;
         }
     };
 @@ -2126,15 +2131,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &ErrorType, index: usize) ?&Node {
+        pub fn iterate(self: *ErrorType, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &ErrorType) TokenIndex {
+        pub fn firstToken(self: *ErrorType) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &ErrorType) TokenIndex {
+        pub fn lastToken(self: *ErrorType) TokenIndex {
             return self.token;
         }
     };
 @@ -2143,15 +2148,15 @@ pub const Node = struct {
         base: Node,
         token: TokenIndex,
-        pub fn iterate(self: &VarType, index: usize) ?&Node {
+        pub fn iterate(self: *VarType, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &VarType) TokenIndex {
+        pub fn firstToken(self: *VarType) TokenIndex {
             return self.token;
         }
-        pub fn lastToken(self: &VarType) TokenIndex {
+        pub fn lastToken(self: *VarType) TokenIndex {
             return self.token;
         }
     };
 @@ -2162,27 +2167,27 @@ pub const Node = struct {
         pub const LineList = SegmentedList(TokenIndex, 4);
-        pub fn iterate(self: &DocComment, index: usize) ?&Node {
+        pub fn iterate(self: *DocComment, index: usize) ?*Node {
             return null;
         }
-        pub fn firstToken(self: &DocComment) TokenIndex {
+        pub fn firstToken(self: *DocComment) TokenIndex {
             return self.lines.at(0).*;
         }
-        pub fn lastToken(self: &DocComment) TokenIndex {
+        pub fn lastToken(self: *DocComment) TokenIndex {
             return self.lines.at(self.lines.len - 1).*;
         }
     };
     pub const TestDecl = struct {
         base: Node,
-        doc_comments: ?&DocComment,
+        doc_comments: ?*DocComment,
         test_token: TokenIndex,
-        name: &Node,
+        name: *Node,
-        body_node: &Node,
+        body_node: *Node,
-        pub fn iterate(self: &TestDecl, index: usize) ?&Node {
+        pub fn iterate(self: *TestDecl, index: usize) ?*Node {
             var i = index;
             if (i < 1) return self.body_node;
 @@ -2191,11 +2196,11 @@ pub const Node = struct {
             return null;
         }
-        pub fn firstToken(self: &TestDecl) TokenIndex {
+        pub fn firstToken(self: *TestDecl) TokenIndex {
             return self.test_token;
         }
-        pub fn lastToken(self: &TestDecl) TokenIndex {
+        pub fn lastToken(self: *TestDecl) TokenIndex {
             return self.body_node.lastToken();
         }
     };

std/zig/bench.zig+3-3

...	@@ -24,15 +24,15 @@ pub fn main() !void {	...	@@ -24,15 +24,15 @@ pub fn main() !void {
24	const mb_per_sec = bytes_per_sec / (1024 * 1024);	24	const mb_per_sec = bytes_per_sec / (1024 * 1024);
25		25
26	var stdout_file = try std.io.getStdOut();	26	var stdout_file = try std.io.getStdOut();
27	const stdout = &std.io.FileOutStream.init(&stdout_file).stream;	27	const stdout = std.io.FileOutStream.init(stdout_file).stream;
28	try stdout.print("{.3} MB/s, {} KB used \n", mb_per_sec, memory_used / 1024);	28	try stdout.print("{.3} MB/s, {} KB used \n", mb_per_sec, memory_used / 1024);
29	}	29	}
30		30
31	fn testOnce() usize {	31	fn testOnce() usize {
32	var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);	32	var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
33	var allocator = &fixed_buf_alloc.allocator;	33	var allocator = *fixed_buf_alloc.allocator;
34	var tokenizer = Tokenizer.init(source);	34	var tokenizer = Tokenizer.init(source);
35	var parser = Parser.init(&tokenizer, allocator, "(memory buffer)");	35	var parser = Parser.init(*tokenizer, allocator, "(memory buffer)");
36	_ = parser.parse() catch @panic("parse failure");	36	_ = parser.parse() catch @panic("parse failure");
37	return fixed_buf_alloc.end_index;	37	return fixed_buf_alloc.end_index;
38	}	38	}

std/zig/parse.zig+610-485

 @@ -9,7 +9,7 @@ const Error = ast.Error;
 /// Result should be freed with tree.deinit() when there are
 /// no more references to any of the tokens or nodes.
-pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
+pub fn parse(allocator: *mem.Allocator, source: []const u8) !ast.Tree {
     var tree_arena = std.heap.ArenaAllocator.init(allocator);
     errdefer tree_arena.deinit();
 @@ -81,10 +81,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         });
                         try root_node.decls.push(&test_node.base);
                         try stack.append(State{ .Block = block });
-                        try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                        try stack.append(State{
-                            .id = Token.Id.LBrace,
+                            .ExpectTokenSave = ExpectTokenSave{
-                            .ptr = &block.lbrace,
+                                .id = Token.Id.LBrace,
-                        } });
+                                .ptr = &block.lbrace,
+                            },
+                        });
                         try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &test_node.name } });
                         continue;
                     },
 @@ -95,13 +97,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     },
                     Token.Id.Keyword_pub => {
                         stack.append(State.TopLevel) catch unreachable;
-                        try stack.append(State{ .TopLevelExtern = TopLevelDeclCtx{
+                        try stack.append(State{
-                            .decls = &root_node.decls,
+                            .TopLevelExtern = TopLevelDeclCtx{
-                            .visib_token = token_index,
+                                .decls = &root_node.decls,
-                            .extern_export_inline_token = null,
+                                .visib_token = token_index,
-                            .lib_name = null,
+                                .extern_export_inline_token = null,
-                            .comments = comments,
+                                .lib_name = null,
-                        } });
+                                .comments = comments,
+                            },
+                        });
                         continue;
                     },
                     Token.Id.Keyword_comptime => {
 @@ -122,22 +126,26 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         stack.append(State.TopLevel) catch unreachable;
                         try stack.append(State{ .Block = block });
-                        try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                        try stack.append(State{
-                            .id = Token.Id.LBrace,
+                            .ExpectTokenSave = ExpectTokenSave{
-                            .ptr = &block.lbrace,
+                                .id = Token.Id.LBrace,
-                        } });
+                                .ptr = &block.lbrace,
+                            },
+                        });
                         continue;
                     },
                     else => {
                         prevToken(&tok_it, &tree);
                         stack.append(State.TopLevel) catch unreachable;
-                        try stack.append(State{ .TopLevelExtern = TopLevelDeclCtx{
+                        try stack.append(State{
-                            .decls = &root_node.decls,
+                            .TopLevelExtern = TopLevelDeclCtx{
-                            .visib_token = null,
+                                .decls = &root_node.decls,
-                            .extern_export_inline_token = null,
+                                .visib_token = null,
-                            .lib_name = null,
+                                .extern_export_inline_token = null,
-                            .comments = comments,
+                                .lib_name = null,
-                        } });
+                                .comments = comments,
+                            },
+                        });
                         continue;
                     },
                 }
 @@ -147,31 +155,34 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_index = token.index;
                 const token_ptr = token.ptr;
                 switch (token_ptr.id) {
-                    Token.Id.Keyword_export,
+                    Token.Id.Keyword_export, Token.Id.Keyword_inline => {
-                    Token.Id.Keyword_inline => {
+                        stack.append(State{
-                        stack.append(State{ .TopLevelDecl = TopLevelDeclCtx{
+                            .TopLevelDecl = TopLevelDeclCtx{
-                            .decls = ctx.decls,
+                                .decls = ctx.decls,
-                            .visib_token = ctx.visib_token,
+                                .visib_token = ctx.visib_token,
-                            .extern_export_inline_token = AnnotatedToken{
+                                .extern_export_inline_token = AnnotatedToken{
-                                .index = token_index,
+                                    .index = token_index,
-                                .ptr = token_ptr,
+                                    .ptr = token_ptr,
+                                },
+                                .lib_name = null,
+                                .comments = ctx.comments,
                             },
-                            .lib_name = null,
+                        }) catch unreachable;
-                            .comments = ctx.comments,
-                        } }) catch unreachable;
                         continue;
                     },
                     Token.Id.Keyword_extern => {
-                        stack.append(State{ .TopLevelLibname = TopLevelDeclCtx{
+                        stack.append(State{
-                            .decls = ctx.decls,
+                            .TopLevelLibname = TopLevelDeclCtx{
-                            .visib_token = ctx.visib_token,
+                                .decls = ctx.decls,
-                            .extern_export_inline_token = AnnotatedToken{
+                                .visib_token = ctx.visib_token,
-                                .index = token_index,
+                                .extern_export_inline_token = AnnotatedToken{
-                                .ptr = token_ptr,
+                                    .index = token_index,
+                                    .ptr = token_ptr,
+                                },
+                                .lib_name = null,
+                                .comments = ctx.comments,
                             },
-                            .lib_name = null,
+                        }) catch unreachable;
-                            .comments = ctx.comments,
-                        } }) catch unreachable;
                         continue;
                     },
                     else => {
 @@ -192,13 +203,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     };
                 };
-                stack.append(State{ .TopLevelDecl = TopLevelDeclCtx{
+                stack.append(State{
-                    .decls = ctx.decls,
+                    .TopLevelDecl = TopLevelDeclCtx{
-                    .visib_token = ctx.visib_token,
+                        .decls = ctx.decls,
-                    .extern_export_inline_token = ctx.extern_export_inline_token,
+                        .visib_token = ctx.visib_token,
-                    .lib_name = lib_name,
+                        .extern_export_inline_token = ctx.extern_export_inline_token,
-                    .comments = ctx.comments,
+                        .lib_name = lib_name,
-                } }) catch unreachable;
+                        .comments = ctx.comments,
+                    },
+                }) catch unreachable;
                 continue;
             },
             State.TopLevelDecl => |ctx| {
 @@ -222,15 +235,16 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         });
                         try ctx.decls.push(&node.base);
-                        stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                        stack.append(State{
-                            .id = Token.Id.Semicolon,
+                            .ExpectTokenSave = ExpectTokenSave{
-                            .ptr = &node.semicolon_token,
+                                .id = Token.Id.Semicolon,
-                        } }) catch unreachable;
+                                .ptr = &node.semicolon_token,
+                            },
+                        }) catch unreachable;
                         try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
                         continue;
                     },
-                    Token.Id.Keyword_var,
+                    Token.Id.Keyword_var, Token.Id.Keyword_const => {
-                    Token.Id.Keyword_const => {
                         if (ctx.extern_export_inline_token) |annotated_token| {
                             if (annotated_token.ptr.id == Token.Id.Keyword_inline) {
                                 ((try tree.errors.addOne())).* = Error{ .InvalidToken = Error.InvalidToken{ .token = annotated_token.index } };
 @@ -238,21 +252,20 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                             }
                         }
-                        try stack.append(State{ .VarDecl = VarDeclCtx{
+                        try stack.append(State{
-                            .comments = ctx.comments,
+                            .VarDecl = VarDeclCtx{
-                            .visib_token = ctx.visib_token,
+                                .comments = ctx.comments,
-                            .lib_name = ctx.lib_name,
+                                .visib_token = ctx.visib_token,
-                            .comptime_token = null,
+                                .lib_name = ctx.lib_name,
-                            .extern_export_token = if (ctx.extern_export_inline_token) |at| at.index else null,
+                                .comptime_token = null,
-                            .mut_token = token_index,
+                                .extern_export_token = if (ctx.extern_export_inline_token) |at| at.index else null,
-                            .list = ctx.decls,
+                                .mut_token = token_index,
-                        } });
+                                .list = ctx.decls,
+                            },
+                        });
                         continue;
                     },
-                    Token.Id.Keyword_fn,
+                    Token.Id.Keyword_fn, Token.Id.Keyword_nakedcc, Token.Id.Keyword_stdcallcc, Token.Id.Keyword_async => {
-                    Token.Id.Keyword_nakedcc,
-                    Token.Id.Keyword_stdcallcc,
-                    Token.Id.Keyword_async => {
                         const fn_proto = try arena.construct(ast.Node.FnProto{
                             .base = ast.Node{ .id = ast.Node.Id.FnProto },
                             .doc_comments = ctx.comments,
 @@ -274,13 +287,14 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         try stack.append(State{ .FnProto = fn_proto });
                         switch (token_ptr.id) {
-                            Token.Id.Keyword_nakedcc,
+                            Token.Id.Keyword_nakedcc, Token.Id.Keyword_stdcallcc => {
-                            Token.Id.Keyword_stdcallcc => {
                                 fn_proto.cc_token = token_index;
-                                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                                try stack.append(State{
-                                    .id = Token.Id.Keyword_fn,
+                                    .ExpectTokenSave = ExpectTokenSave{
-                                    .ptr = &fn_proto.fn_token,
+                                        .id = Token.Id.Keyword_fn,
-                                } });
+                                        .ptr = &fn_proto.fn_token,
+                                    },
+                                });
                                 continue;
                             },
                             Token.Id.Keyword_async => {
 @@ -292,10 +306,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                                 });
                                 fn_proto.async_attr = async_node;
-                                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                                try stack.append(State{
-                                    .id = Token.Id.Keyword_fn,
+                                    .ExpectTokenSave = ExpectTokenSave{
-                                    .ptr = &fn_proto.fn_token,
+                                        .id = Token.Id.Keyword_fn,
-                                } });
+                                        .ptr = &fn_proto.fn_token,
+                                    },
+                                });
                                 try stack.append(State{ .AsyncAllocator = async_node });
                                 continue;
                             },
 @@ -331,13 +347,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 }
                 stack.append(State{ .ContainerDecl = ctx.container_decl }) catch unreachable;
-                try stack.append(State{ .TopLevelExtern = TopLevelDeclCtx{
+                try stack.append(State{
-                    .decls = &ctx.container_decl.fields_and_decls,
+                    .TopLevelExtern = TopLevelDeclCtx{
-                    .visib_token = ctx.visib_token,
+                        .decls = &ctx.container_decl.fields_and_decls,
-                    .extern_export_inline_token = null,
+                        .visib_token = ctx.visib_token,
-                    .lib_name = null,
+                        .extern_export_inline_token = null,
-                    .comments = ctx.comments,
+                        .lib_name = null,
-                } });
+                        .comments = ctx.comments,
+                    },
+                });
                 continue;
             },
 @@ -361,9 +379,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     .base = ast.Node{ .id = ast.Node.Id.ContainerDecl },
                     .layout_token = ctx.layout_token,
                     .kind_token = switch (token_ptr.id) {
-                        Token.Id.Keyword_struct,
+                        Token.Id.Keyword_struct, Token.Id.Keyword_union, Token.Id.Keyword_enum => token_index,
-                        Token.Id.Keyword_union,
-                        Token.Id.Keyword_enum => token_index,
                         else => {
                             ((try tree.errors.addOne())).* = Error{ .ExpectedAggregateKw = Error.ExpectedAggregateKw{ .token = token_index } };
                             return tree;
 @@ -377,10 +393,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 ctx.opt_ctx.store(&node.base);
                 stack.append(State{ .ContainerDecl = node }) catch unreachable;
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.LBrace,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &node.lbrace_token,
+                        .id = Token.Id.LBrace,
-                } });
+                        .ptr = &node.lbrace_token,
+                    },
+                });
                 try stack.append(State{ .ContainerInitArgStart = node });
                 continue;
             },
 @@ -481,35 +499,41 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     Token.Id.Keyword_pub => {
                         switch (tree.tokens.at(container_decl.kind_token).id) {
                             Token.Id.Keyword_struct => {
-                                try stack.append(State{ .TopLevelExternOrField = TopLevelExternOrFieldCtx{
+                                try stack.append(State{
-                                    .visib_token = token_index,
+                                    .TopLevelExternOrField = TopLevelExternOrFieldCtx{
-                                    .container_decl = container_decl,
+                                        .visib_token = token_index,
-                                    .comments = comments,
+                                        .container_decl = container_decl,
-                                } });
+                                        .comments = comments,
+                                    },
+                                });
                                 continue;
                             },
                             else => {
                                 stack.append(State{ .ContainerDecl = container_decl }) catch unreachable;
-                                try stack.append(State{ .TopLevelExtern = TopLevelDeclCtx{
+                                try stack.append(State{
-                                    .decls = &container_decl.fields_and_decls,
+                                    .TopLevelExtern = TopLevelDeclCtx{
-                                    .visib_token = token_index,
+                                        .decls = &container_decl.fields_and_decls,
-                                    .extern_export_inline_token = null,
+                                        .visib_token = token_index,
-                                    .lib_name = null,
+                                        .extern_export_inline_token = null,
-                                    .comments = comments,
+                                        .lib_name = null,
-                                } });
+                                        .comments = comments,
+                                    },
+                                });
                                 continue;
                             },
                         }
                     },
                     Token.Id.Keyword_export => {
                         stack.append(State{ .ContainerDecl = container_decl }) catch unreachable;
-                        try stack.append(State{ .TopLevelExtern = TopLevelDeclCtx{
+                        try stack.append(State{
-                            .decls = &container_decl.fields_and_decls,
+                            .TopLevelExtern = TopLevelDeclCtx{
-                            .visib_token = token_index,
+                                .decls = &container_decl.fields_and_decls,
-                            .extern_export_inline_token = null,
+                                .visib_token = token_index,
-                            .lib_name = null,
+                                .extern_export_inline_token = null,
-                            .comments = comments,
+                                .lib_name = null,
-                        } });
+                                .comments = comments,
+                            },
+                        });
                         continue;
                     },
                     Token.Id.RBrace => {
 @@ -523,13 +547,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     else => {
                         prevToken(&tok_it, &tree);
                         stack.append(State{ .ContainerDecl = container_decl }) catch unreachable;
-                        try stack.append(State{ .TopLevelExtern = TopLevelDeclCtx{
+                        try stack.append(State{
-                            .decls = &container_decl.fields_and_decls,
+                            .TopLevelExtern = TopLevelDeclCtx{
-                            .visib_token = null,
+                                .decls = &container_decl.fields_and_decls,
-                            .extern_export_inline_token = null,
+                                .visib_token = null,
-                            .lib_name = null,
+                                .extern_export_inline_token = null,
-                            .comments = comments,
+                                .lib_name = null,
-                        } });
+                                .comments = comments,
+                            },
+                        });
                         continue;
                     },
                 }
 @@ -557,10 +583,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 try stack.append(State{ .VarDeclAlign = var_decl });
                 try stack.append(State{ .TypeExprBegin = OptionalCtx{ .RequiredNull = &var_decl.type_node } });
                 try stack.append(State{ .IfToken = Token.Id.Colon });
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.Identifier,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &var_decl.name_token,
+                        .id = Token.Id.Identifier,
-                } });
+                        .ptr = &var_decl.name_token,
+                    },
+                });
                 continue;
             },
             State.VarDeclAlign => |var_decl| {
 @@ -605,10 +633,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const semicolon_token = nextToken(&tok_it, &tree);
                 if (semicolon_token.ptr.id != Token.Id.Semicolon) {
-                    ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                    ((try tree.errors.addOne())).* = Error{
-                        .token = semicolon_token.index,
+                        .ExpectedToken = Error.ExpectedToken{
-                        .expected_id = Token.Id.Semicolon,
+                            .token = semicolon_token.index,
-                    } };
+                            .expected_id = Token.Id.Semicolon,
+                        },
+                    };
                     return tree;
                 }
 @@ -713,10 +743,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 });
                 try fn_proto.params.push(&param_decl.base);
-                stack.append(State{ .ParamDeclEnd = ParamDeclEndCtx{
+                stack.append(State{
-                    .param_decl = param_decl,
+                    .ParamDeclEnd = ParamDeclEndCtx{
-                    .fn_proto = fn_proto,
+                        .param_decl = param_decl,
-                } }) catch unreachable;
+                        .fn_proto = fn_proto,
+                    },
+                }) catch unreachable;
                 try stack.append(State{ .ParamDeclName = param_decl });
                 try stack.append(State{ .ParamDeclAliasOrComptime = param_decl });
                 continue;
 @@ -769,10 +801,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
             State.MaybeLabeledExpression => |ctx| {
                 if (eatToken(&tok_it, &tree, Token.Id.Colon)) |_| {
-                    stack.append(State{ .LabeledExpression = LabelCtx{
+                    stack.append(State{
-                        .label = ctx.label,
+                        .LabeledExpression = LabelCtx{
-                        .opt_ctx = ctx.opt_ctx,
+                            .label = ctx.label,
-                    } }) catch unreachable;
+                            .opt_ctx = ctx.opt_ctx,
+                        },
+                    }) catch unreachable;
                     continue;
                 }
 @@ -797,21 +831,25 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         continue;
                     },
                     Token.Id.Keyword_while => {
-                        stack.append(State{ .While = LoopCtx{
+                        stack.append(State{
-                            .label = ctx.label,
+                            .While = LoopCtx{
-                            .inline_token = null,
+                                .label = ctx.label,
-                            .loop_token = token_index,
+                                .inline_token = null,
-                            .opt_ctx = ctx.opt_ctx.toRequired(),
+                                .loop_token = token_index,
-                        } }) catch unreachable;
+                                .opt_ctx = ctx.opt_ctx.toRequired(),
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     Token.Id.Keyword_for => {
-                        stack.append(State{ .For = LoopCtx{
+                        stack.append(State{
-                            .label = ctx.label,
+                            .For = LoopCtx{
-                            .inline_token = null,
+                                .label = ctx.label,
-                            .loop_token = token_index,
+                                .inline_token = null,
-                            .opt_ctx = ctx.opt_ctx.toRequired(),
+                                .loop_token = token_index,
-                        } }) catch unreachable;
+                                .opt_ctx = ctx.opt_ctx.toRequired(),
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     Token.Id.Keyword_suspend => {
 @@ -828,11 +866,13 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         continue;
                     },
                     Token.Id.Keyword_inline => {
-                        stack.append(State{ .Inline = InlineCtx{
+                        stack.append(State{
-                            .label = ctx.label,
+                            .Inline = InlineCtx{
-                            .inline_token = token_index,
+                                .label = ctx.label,
-                            .opt_ctx = ctx.opt_ctx.toRequired(),
+                                .inline_token = token_index,
-                        } }) catch unreachable;
+                                .opt_ctx = ctx.opt_ctx.toRequired(),
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     else => {
 @@ -852,21 +892,25 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_ptr = token.ptr;
                 switch (token_ptr.id) {
                     Token.Id.Keyword_while => {
-                        stack.append(State{ .While = LoopCtx{
+                        stack.append(State{
-                            .inline_token = ctx.inline_token,
+                            .While = LoopCtx{
-                            .label = ctx.label,
+                                .inline_token = ctx.inline_token,
-                            .loop_token = token_index,
+                                .label = ctx.label,
-                            .opt_ctx = ctx.opt_ctx.toRequired(),
+                                .loop_token = token_index,
-                        } }) catch unreachable;
+                                .opt_ctx = ctx.opt_ctx.toRequired(),
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     Token.Id.Keyword_for => {
-                        stack.append(State{ .For = LoopCtx{
+                        stack.append(State{
-                            .inline_token = ctx.inline_token,
+                            .For = LoopCtx{
-                            .label = ctx.label,
+                                .inline_token = ctx.inline_token,
-                            .loop_token = token_index,
+                                .label = ctx.label,
-                            .opt_ctx = ctx.opt_ctx.toRequired(),
+                                .loop_token = token_index,
-                        } }) catch unreachable;
+                                .opt_ctx = ctx.opt_ctx.toRequired(),
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     else => {
 @@ -971,27 +1015,29 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_ptr = token.ptr;
                 switch (token_ptr.id) {
                     Token.Id.Keyword_comptime => {
-                        stack.append(State{ .ComptimeStatement = ComptimeStatementCtx{
+                        stack.append(State{
-                            .comptime_token = token_index,
+                            .ComptimeStatement = ComptimeStatementCtx{
-                            .block = block,
+                                .comptime_token = token_index,
-                        } }) catch unreachable;
+                                .block = block,
-                        continue;
+                            },
-                    },
+                        }) catch unreachable;
-                    Token.Id.Keyword_var,
+                        continue;
-                    Token.Id.Keyword_const => {
+                    },
-                        stack.append(State{ .VarDecl = VarDeclCtx{
+                    Token.Id.Keyword_var, Token.Id.Keyword_const => {
-                            .comments = null,
+                        stack.append(State{
-                            .visib_token = null,
+                            .VarDecl = VarDeclCtx{
-                            .comptime_token = null,
+                                .comments = null,
-                            .extern_export_token = null,
+                                .visib_token = null,
-                            .lib_name = null,
+                                .comptime_token = null,
-                            .mut_token = token_index,
+                                .extern_export_token = null,
-                            .list = &block.statements,
+                                .lib_name = null,
-                        } }) catch unreachable;
+                                .mut_token = token_index,
+                                .list = &block.statements,
+                            },
+                        }) catch unreachable;
                         continue;
                     },
-                    Token.Id.Keyword_defer,
+                    Token.Id.Keyword_defer, Token.Id.Keyword_errdefer => {
-                    Token.Id.Keyword_errdefer => {
                         const node = try arena.construct(ast.Node.Defer{
                             .base = ast.Node{ .id = ast.Node.Id.Defer },
                             .defer_token = token_index,
 @@ -1036,17 +1082,18 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_index = token.index;
                 const token_ptr = token.ptr;
                 switch (token_ptr.id) {
-                    Token.Id.Keyword_var,
+                    Token.Id.Keyword_var, Token.Id.Keyword_const => {
-                    Token.Id.Keyword_const => {
+                        stack.append(State{
-                        stack.append(State{ .VarDecl = VarDeclCtx{
+                            .VarDecl = VarDeclCtx{
-                            .comments = null,
+                                .comments = null,
-                            .visib_token = null,
+                                .visib_token = null,
-                            .comptime_token = ctx.comptime_token,
+                                .comptime_token = ctx.comptime_token,
-                            .extern_export_token = null,
+                                .extern_export_token = null,
-                            .lib_name = null,
+                                .lib_name = null,
-                            .mut_token = token_index,
+                                .mut_token = token_index,
-                            .list = &ctx.block.statements,
+                                .list = &ctx.block.statements,
-                        } }) catch unreachable;
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     else => {
 @@ -1089,10 +1136,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 stack.append(State{ .AsmOutputItems = items }) catch unreachable;
                 try stack.append(State{ .IfToken = Token.Id.Comma });
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.RParen,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &node.rparen,
+                        .id = Token.Id.RParen,
-                } });
+                        .ptr = &node.rparen,
+                    },
+                });
                 try stack.append(State{ .AsmOutputReturnOrType = node });
                 try stack.append(State{ .ExpectToken = Token.Id.LParen });
                 try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &node.constraint } });
 @@ -1141,10 +1190,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 stack.append(State{ .AsmInputItems = items }) catch unreachable;
                 try stack.append(State{ .IfToken = Token.Id.Comma });
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.RParen,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &node.rparen,
+                        .id = Token.Id.RParen,
-                } });
+                        .ptr = &node.rparen,
+                    },
+                });
                 try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
                 try stack.append(State{ .ExpectToken = Token.Id.LParen });
                 try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &node.constraint } });
 @@ -1203,14 +1254,18 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 stack.append(State{ .FieldInitListCommaOrEnd = list_state }) catch unreachable;
                 try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
                 try stack.append(State{ .ExpectToken = Token.Id.Equal });
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.Identifier,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &node.name_token,
+                        .id = Token.Id.Identifier,
-                } });
+                        .ptr = &node.name_token,
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                    },
-                    .id = Token.Id.Period,
+                });
-                    .ptr = &node.period_token,
+                try stack.append(State{
-                } });
+                    .ExpectTokenSave = ExpectTokenSave{
+                        .id = Token.Id.Period,
+                        .ptr = &node.period_token,
+                    },
+                });
                 continue;
             },
             State.FieldInitListCommaOrEnd => |list_state| {
 @@ -1320,10 +1375,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     });
                     try switch_case.items.push(&else_node.base);
-                    try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                    try stack.append(State{
-                        .id = Token.Id.EqualAngleBracketRight,
+                        .ExpectTokenSave = ExpectTokenSave{
-                        .ptr = &switch_case.arrow_token,
+                            .id = Token.Id.EqualAngleBracketRight,
-                    } });
+                            .ptr = &switch_case.arrow_token,
+                        },
+                    });
                     continue;
                 } else {
                     prevToken(&tok_it, &tree);
 @@ -1374,10 +1431,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 }
                 async_node.rangle_bracket = TokenIndex(0);
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.AngleBracketRight,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &??async_node.rangle_bracket,
+                        .id = Token.Id.AngleBracketRight,
-                } });
+                        .ptr = &??async_node.rangle_bracket,
+                    },
+                });
                 try stack.append(State{ .TypeExprBegin = OptionalCtx{ .RequiredNull = &async_node.allocator_type } });
                 continue;
             },
 @@ -1430,10 +1489,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     continue;
                 }
-                stack.append(State{ .ContainerKind = ContainerKindCtx{
+                stack.append(State{
-                    .opt_ctx = ctx.opt_ctx,
+                    .ContainerKind = ContainerKindCtx{
-                    .layout_token = ctx.extern_token,
+                        .opt_ctx = ctx.opt_ctx,
-                } }) catch unreachable;
+                        .layout_token = ctx.extern_token,
+                    },
+                }) catch unreachable;
                 continue;
             },
             State.SliceOrArrayAccess => |node| {
 @@ -1443,15 +1504,19 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 switch (token_ptr.id) {
                     Token.Id.Ellipsis2 => {
                         const start = node.op.ArrayAccess;
-                        node.op = ast.Node.SuffixOp.Op{ .Slice = ast.Node.SuffixOp.Op.Slice{
+                        node.op = ast.Node.SuffixOp.Op{
-                            .start = start,
+                            .Slice = ast.Node.SuffixOp.Op.Slice{
-                            .end = null,
+                                .start = start,
-                        } };
+                                .end = null,
+                            },
+                        };
-                        stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                        stack.append(State{
-                            .id = Token.Id.RBracket,
+                            .ExpectTokenSave = ExpectTokenSave{
-                            .ptr = &node.rtoken,
+                                .id = Token.Id.RBracket,
-                        } }) catch unreachable;
+                                .ptr = &node.rtoken,
+                            },
+                        }) catch unreachable;
                         try stack.append(State{ .Expression = OptionalCtx{ .Optional = &node.op.Slice.end } });
                         continue;
                     },
 @@ -1467,13 +1532,15 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
             },
             State.SliceOrArrayType => |node| {
                 if (eatToken(&tok_it, &tree, Token.Id.RBracket)) |_| {
-                    node.op = ast.Node.PrefixOp.Op{ .SliceType = ast.Node.PrefixOp.AddrOfInfo{
+                    node.op = ast.Node.PrefixOp.Op{
-                        .align_info = null,
+                        .SliceType = ast.Node.PrefixOp.PtrInfo{
-                        .const_token = null,
+                            .align_info = null,
-                        .volatile_token = null,
+                            .const_token = null,
-                    } };
+                            .volatile_token = null,
+                        },
+                    };
                     stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &node.rhs } }) catch unreachable;
-                    try stack.append(State{ .AddrOfModifiers = &node.op.SliceType });
+                    try stack.append(State{ .PtrTypeModifiers = &node.op.SliceType });
                     continue;
                 }
 @@ -1484,7 +1551,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 continue;
             },
-            State.AddrOfModifiers => |addr_of_info| {
+            State.PtrTypeModifiers => |addr_of_info| {
                 const token = nextToken(&tok_it, &tree);
                 const token_index = token.index;
                 const token_ptr = token.ptr;
 @@ -1495,7 +1562,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                             ((try tree.errors.addOne())).* = Error{ .ExtraAlignQualifier = Error.ExtraAlignQualifier{ .token = token_index } };
                             return tree;
                         }
-                        addr_of_info.align_info = ast.Node.PrefixOp.AddrOfInfo.Align {
+                        addr_of_info.align_info = ast.Node.PrefixOp.PtrInfo.Align{
                             .node = undefined,
                             .bit_range = null,
                         };
 @@ -1536,7 +1603,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token = nextToken(&tok_it, &tree);
                 switch (token.ptr.id) {
                     Token.Id.Colon => {
-                        align_info.bit_range = ast.Node.PrefixOp.AddrOfInfo.Align.BitRange(undefined);
+                        align_info.bit_range = ast.Node.PrefixOp.PtrInfo.Align.BitRange(undefined);
                         const bit_range = &??align_info.bit_range;
                         try stack.append(State{ .ExpectToken = Token.Id.RParen });
 @@ -1548,9 +1615,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     Token.Id.RParen => continue,
                     else => {
                         (try tree.errors.addOne()).* = Error{
-                            .ExpectedColonOrRParen = Error.ExpectedColonOrRParen{
+                            .ExpectedColonOrRParen = Error.ExpectedColonOrRParen{ .token = token.index },
-                                .token = token.index,
-                            }
                         };
                         return tree;
                     },
 @@ -1563,10 +1628,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_ptr = token.ptr;
                 if (token_ptr.id != Token.Id.Pipe) {
                     if (opt_ctx != OptionalCtx.Optional) {
-                        ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                        ((try tree.errors.addOne())).* = Error{
-                            .token = token_index,
+                            .ExpectedToken = Error.ExpectedToken{
-                            .expected_id = Token.Id.Pipe,
+                                .token = token_index,
-                        } };
+                                .expected_id = Token.Id.Pipe,
+                            },
+                        };
                         return tree;
                     }
 @@ -1582,10 +1649,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 });
                 opt_ctx.store(&node.base);
-                stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                stack.append(State{
-                    .id = Token.Id.Pipe,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &node.rpipe,
+                        .id = Token.Id.Pipe,
-                } }) catch unreachable;
+                        .ptr = &node.rpipe,
+                    },
+                }) catch unreachable;
                 try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.error_symbol } });
                 continue;
             },
 @@ -1595,10 +1664,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_ptr = token.ptr;
                 if (token_ptr.id != Token.Id.Pipe) {
                     if (opt_ctx != OptionalCtx.Optional) {
-                        ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                        ((try tree.errors.addOne())).* = Error{
-                            .token = token_index,
+                            .ExpectedToken = Error.ExpectedToken{
-                            .expected_id = Token.Id.Pipe,
+                                .token = token_index,
-                        } };
+                                .expected_id = Token.Id.Pipe,
+                            },
+                        };
                         return tree;
                     }
 @@ -1615,15 +1686,19 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 });
                 opt_ctx.store(&node.base);
-                try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.Pipe,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &node.rpipe,
+                        .id = Token.Id.Pipe,
-                } });
+                        .ptr = &node.rpipe,
+                    },
+                });
                 try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.value_symbol } });
-                try stack.append(State{ .OptionalTokenSave = OptionalTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.Asterisk,
+                    .OptionalTokenSave = OptionalTokenSave{
-                    .ptr = &node.ptr_token,
+                        .id = Token.Id.Asterisk,
-                } });
+                        .ptr = &node.ptr_token,
+                    },
+                });
                 continue;
             },
             State.PointerIndexPayload => |opt_ctx| {
 @@ -1632,10 +1707,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_ptr = token.ptr;
                 if (token_ptr.id != Token.Id.Pipe) {
                     if (opt_ctx != OptionalCtx.Optional) {
-                        ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                        ((try tree.errors.addOne())).* = Error{
-                            .token = token_index,
+                            .ExpectedToken = Error.ExpectedToken{
-                            .expected_id = Token.Id.Pipe,
+                                .token = token_index,
-                        } };
+                                .expected_id = Token.Id.Pipe,
+                            },
+                        };
                         return tree;
                     }
 @@ -1653,17 +1730,21 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 });
                 opt_ctx.store(&node.base);
-                stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                stack.append(State{
-                    .id = Token.Id.Pipe,
+                    .ExpectTokenSave = ExpectTokenSave{
-                    .ptr = &node.rpipe,
+                        .id = Token.Id.Pipe,
-                } }) catch unreachable;
+                        .ptr = &node.rpipe,
+                    },
+                }) catch unreachable;
                 try stack.append(State{ .Identifier = OptionalCtx{ .RequiredNull = &node.index_symbol } });
                 try stack.append(State{ .IfToken = Token.Id.Comma });
                 try stack.append(State{ .Identifier = OptionalCtx{ .Required = &node.value_symbol } });
-                try stack.append(State{ .OptionalTokenSave = OptionalTokenSave{
+                try stack.append(State{
-                    .id = Token.Id.Asterisk,
+                    .OptionalTokenSave = OptionalTokenSave{
-                    .ptr = &node.ptr_token,
+                        .id = Token.Id.Asterisk,
-                } });
+                        .ptr = &node.ptr_token,
+                    },
+                });
                 continue;
             },
 @@ -1672,9 +1753,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_index = token.index;
                 const token_ptr = token.ptr;
                 switch (token_ptr.id) {
-                    Token.Id.Keyword_return,
+                    Token.Id.Keyword_return, Token.Id.Keyword_break, Token.Id.Keyword_continue => {
-                    Token.Id.Keyword_break,
-                    Token.Id.Keyword_continue => {
                         const node = try arena.construct(ast.Node.ControlFlowExpression{
                             .base = ast.Node{ .id = ast.Node.Id.ControlFlowExpression },
                             .ltoken = token_index,
 @@ -1703,9 +1782,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         }
                         continue;
                     },
-                    Token.Id.Keyword_try,
+                    Token.Id.Keyword_try, Token.Id.Keyword_cancel, Token.Id.Keyword_resume => {
-                    Token.Id.Keyword_cancel,
-                    Token.Id.Keyword_resume => {
                         const node = try arena.construct(ast.Node.PrefixOp{
                             .base = ast.Node{ .id = ast.Node.Id.PrefixOp },
                             .op_token = token_index,
 @@ -2078,10 +2155,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     stack.append(State{ .CurlySuffixExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
                     try stack.append(State{ .IfToken = Token.Id.LBrace });
-                    try stack.append(State{ .FieldInitListItemOrEnd = ListSave(@typeOf(node.op.StructInitializer)){
+                    try stack.append(State{
-                        .list = &node.op.StructInitializer,
+                        .FieldInitListItemOrEnd = ListSave(@typeOf(node.op.StructInitializer)){
-                        .ptr = &node.rtoken,
+                            .list = &node.op.StructInitializer,
-                    } });
+                            .ptr = &node.rtoken,
+                        },
+                    });
                     continue;
                 }
 @@ -2094,11 +2173,13 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 opt_ctx.store(&node.base);
                 stack.append(State{ .CurlySuffixExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
                 try stack.append(State{ .IfToken = Token.Id.LBrace });
-                try stack.append(State{ .ExprListItemOrEnd = ExprListCtx{
+                try stack.append(State{
-                    .list = &node.op.ArrayInitializer,
+                    .ExprListItemOrEnd = ExprListCtx{
-                    .end = Token.Id.RBrace,
+                        .list = &node.op.ArrayInitializer,
-                    .ptr = &node.rtoken,
+                        .end = Token.Id.RBrace,
-                } });
+                        .ptr = &node.rtoken,
+                    },
+                });
                 continue;
             },
 @@ -2139,7 +2220,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     });
                     opt_ctx.store(&node.base);
-                    // Treat '**' token as two derefs
+                    // Treat '**' token as two pointer types
                     if (token_ptr.id == Token.Id.AsteriskAsterisk) {
                         const child = try arena.construct(ast.Node.PrefixOp{
                             .base = ast.Node{ .id = ast.Node.Id.PrefixOp },
 @@ -2152,8 +2233,8 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     }
                     stack.append(State{ .TypeExprBegin = OptionalCtx{ .Required = &node.rhs } }) catch unreachable;
-                    if (node.op == ast.Node.PrefixOp.Op.AddrOf) {
+                    if (node.op == ast.Node.PrefixOp.Op.PtrType) {
-                        try stack.append(State{ .AddrOfModifiers = &node.op.AddrOf });
+                        try stack.append(State{ .PtrTypeModifiers = &node.op.PtrType });
                     }
                     continue;
                 } else {
 @@ -2171,10 +2252,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         .allocator_type = null,
                         .rangle_bracket = null,
                     });
-                    stack.append(State{ .AsyncEnd = AsyncEndCtx{
+                    stack.append(State{
-                        .ctx = opt_ctx,
+                        .AsyncEnd = AsyncEndCtx{
-                        .attribute = async_node,
+                            .ctx = opt_ctx,
-                    } }) catch unreachable;
+                            .attribute = async_node,
+                        },
+                    }) catch unreachable;
                     try stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() });
                     try stack.append(State{ .PrimaryExpression = opt_ctx.toRequired() });
                     try stack.append(State{ .AsyncAllocator = async_node });
 @@ -2197,20 +2280,24 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         const node = try arena.construct(ast.Node.SuffixOp{
                             .base = ast.Node{ .id = ast.Node.Id.SuffixOp },
                             .lhs = lhs,
-                            .op = ast.Node.SuffixOp.Op{ .Call = ast.Node.SuffixOp.Op.Call{
+                            .op = ast.Node.SuffixOp.Op{
-                                .params = ast.Node.SuffixOp.Op.Call.ParamList.init(arena),
+                                .Call = ast.Node.SuffixOp.Op.Call{
-                                .async_attr = null,
+                                    .params = ast.Node.SuffixOp.Op.Call.ParamList.init(arena),
-                            } },
+                                    .async_attr = null,
+                                },
+                            },
                             .rtoken = undefined,
                         });
                         opt_ctx.store(&node.base);
                         stack.append(State{ .SuffixOpExpressionEnd = opt_ctx.toRequired() }) catch unreachable;
-                        try stack.append(State{ .ExprListItemOrEnd = ExprListCtx{
+                        try stack.append(State{
-                            .list = &node.op.Call.params,
+                            .ExprListItemOrEnd = ExprListCtx{
-                            .end = Token.Id.RParen,
+                                .list = &node.op.Call.params,
-                            .ptr = &node.rtoken,
+                                .end = Token.Id.RParen,
-                        } });
+                                .ptr = &node.rtoken,
+                            },
+                        });
                         continue;
                     },
                     Token.Id.LBracket => {
 @@ -2278,8 +2365,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         _ = try createToCtxLiteral(arena, opt_ctx, ast.Node.UndefinedLiteral, token.index);
                         continue;
                     },
-                    Token.Id.Keyword_true,
+                    Token.Id.Keyword_true, Token.Id.Keyword_false => {
-                    Token.Id.Keyword_false => {
                         _ = try createToCtxLiteral(arena, opt_ctx, ast.Node.BoolLiteral, token.index);
                         continue;
                     },
 @@ -2321,8 +2407,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         try stack.append(State{ .Expression = OptionalCtx{ .Required = return_type_ptr } });
                         continue;
                     },
-                    Token.Id.StringLiteral,
+                    Token.Id.StringLiteral, Token.Id.MultilineStringLiteralLine => {
-                    Token.Id.MultilineStringLiteralLine => {
                         opt_ctx.store((try parseStringLiteral(arena, &tok_it, token.ptr, token.index, &tree)) ?? unreachable);
                         continue;
                     },
 @@ -2335,10 +2420,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         });
                         opt_ctx.store(&node.base);
-                        stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                        stack.append(State{
-                            .id = Token.Id.RParen,
+                            .ExpectTokenSave = ExpectTokenSave{
-                            .ptr = &node.rparen,
+                                .id = Token.Id.RParen,
-                        } }) catch unreachable;
+                                .ptr = &node.rparen,
+                            },
+                        }) catch unreachable;
                         try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
                         continue;
                     },
 @@ -2351,11 +2438,13 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         });
                         opt_ctx.store(&node.base);
-                        stack.append(State{ .ExprListItemOrEnd = ExprListCtx{
+                        stack.append(State{
-                            .list = &node.params,
+                            .ExprListItemOrEnd = ExprListCtx{
-                            .end = Token.Id.RParen,
+                                .list = &node.params,
-                            .ptr = &node.rparen_token,
+                                .end = Token.Id.RParen,
-                        } }) catch unreachable;
+                                .ptr = &node.rparen_token,
+                            },
+                        }) catch unreachable;
                         try stack.append(State{ .ExpectToken = Token.Id.LParen });
                         continue;
                     },
 @@ -2372,42 +2461,50 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         continue;
                     },
                     Token.Id.Keyword_error => {
-                        stack.append(State{ .ErrorTypeOrSetDecl = ErrorTypeOrSetDeclCtx{
+                        stack.append(State{
-                            .error_token = token.index,
+                            .ErrorTypeOrSetDecl = ErrorTypeOrSetDeclCtx{
-                            .opt_ctx = opt_ctx,
+                                .error_token = token.index,
-                        } }) catch unreachable;
+                                .opt_ctx = opt_ctx,
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     Token.Id.Keyword_packed => {
-                        stack.append(State{ .ContainerKind = ContainerKindCtx{
+                        stack.append(State{
-                            .opt_ctx = opt_ctx,
+                            .ContainerKind = ContainerKindCtx{
-                            .layout_token = token.index,
+                                .opt_ctx = opt_ctx,
-                        } }) catch unreachable;
+                                .layout_token = token.index,
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     Token.Id.Keyword_extern => {
-                        stack.append(State{ .ExternType = ExternTypeCtx{
+                        stack.append(State{
-                            .opt_ctx = opt_ctx,
+                            .ExternType = ExternTypeCtx{
-                            .extern_token = token.index,
+                                .opt_ctx = opt_ctx,
-                            .comments = null,
+                                .extern_token = token.index,
-                        } }) catch unreachable;
+                                .comments = null,
+                            },
+                        }) catch unreachable;
                         continue;
                     },
-                    Token.Id.Keyword_struct,
+                    Token.Id.Keyword_struct, Token.Id.Keyword_union, Token.Id.Keyword_enum => {
-                    Token.Id.Keyword_union,
-                    Token.Id.Keyword_enum => {
                         prevToken(&tok_it, &tree);
-                        stack.append(State{ .ContainerKind = ContainerKindCtx{
+                        stack.append(State{
-                            .opt_ctx = opt_ctx,
+                            .ContainerKind = ContainerKindCtx{
-                            .layout_token = null,
+                                .opt_ctx = opt_ctx,
-                        } }) catch unreachable;
+                                .layout_token = null,
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     Token.Id.Identifier => {
-                        stack.append(State{ .MaybeLabeledExpression = MaybeLabeledExpressionCtx{
+                        stack.append(State{
-                            .label = token.index,
+                            .MaybeLabeledExpression = MaybeLabeledExpressionCtx{
-                            .opt_ctx = opt_ctx,
+                                .label = token.index,
-                        } }) catch unreachable;
+                                .opt_ctx = opt_ctx,
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     Token.Id.Keyword_fn => {
 @@ -2431,8 +2528,7 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         stack.append(State{ .FnProto = fn_proto }) catch unreachable;
                         continue;
                     },
-                    Token.Id.Keyword_nakedcc,
+                    Token.Id.Keyword_nakedcc, Token.Id.Keyword_stdcallcc => {
-                    Token.Id.Keyword_stdcallcc => {
                         const fn_proto = try arena.construct(ast.Node.FnProto{
                             .base = ast.Node{ .id = ast.Node.Id.FnProto },
                             .doc_comments = null,
 @@ -2451,10 +2547,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         });
                         opt_ctx.store(&fn_proto.base);
                         stack.append(State{ .FnProto = fn_proto }) catch unreachable;
-                        try stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                        try stack.append(State{
-                            .id = Token.Id.Keyword_fn,
+                            .ExpectTokenSave = ExpectTokenSave{
-                            .ptr = &fn_proto.fn_token,
+                                .id = Token.Id.Keyword_fn,
-                        } });
+                                .ptr = &fn_proto.fn_token,
+                            },
+                        });
                         continue;
                     },
                     Token.Id.Keyword_asm => {
 @@ -2470,10 +2568,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         });
                         opt_ctx.store(&node.base);
-                        stack.append(State{ .ExpectTokenSave = ExpectTokenSave{
+                        stack.append(State{
-                            .id = Token.Id.RParen,
+                            .ExpectTokenSave = ExpectTokenSave{
-                            .ptr = &node.rparen,
+                                .id = Token.Id.RParen,
-                        } }) catch unreachable;
+                                .ptr = &node.rparen,
+                            },
+                        }) catch unreachable;
                         try stack.append(State{ .AsmClobberItems = &node.clobbers });
                         try stack.append(State{ .IfToken = Token.Id.Colon });
                         try stack.append(State{ .AsmInputItems = &node.inputs });
 @@ -2482,17 +2582,21 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                         try stack.append(State{ .IfToken = Token.Id.Colon });
                         try stack.append(State{ .StringLiteral = OptionalCtx{ .Required = &node.template } });
                         try stack.append(State{ .ExpectToken = Token.Id.LParen });
-                        try stack.append(State{ .OptionalTokenSave = OptionalTokenSave{
+                        try stack.append(State{
-                            .id = Token.Id.Keyword_volatile,
+                            .OptionalTokenSave = OptionalTokenSave{
-                            .ptr = &node.volatile_token,
+                                .id = Token.Id.Keyword_volatile,
-                        } });
+                                .ptr = &node.volatile_token,
+                            },
+                        });
                     },
                     Token.Id.Keyword_inline => {
-                        stack.append(State{ .Inline = InlineCtx{
+                        stack.append(State{
-                            .label = null,
+                            .Inline = InlineCtx{
-                            .inline_token = token.index,
+                                .label = null,
-                            .opt_ctx = opt_ctx,
+                                .inline_token = token.index,
-                        } }) catch unreachable;
+                                .opt_ctx = opt_ctx,
+                            },
+                        }) catch unreachable;
                         continue;
                     },
                     else => {
 @@ -2522,10 +2626,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 });
                 ctx.opt_ctx.store(&node.base);
-                stack.append(State{ .ErrorTagListItemOrEnd = ListSave(@typeOf(node.decls)){
+                stack.append(State{
-                    .list = &node.decls,
+                    .ErrorTagListItemOrEnd = ListSave(@typeOf(node.decls)){
-                    .ptr = &node.rbrace_token,
+                        .list = &node.decls,
-                } }) catch unreachable;
+                        .ptr = &node.rbrace_token,
+                    },
+                }) catch unreachable;
                 continue;
             },
             State.StringLiteral => |opt_ctx| {
 @@ -2553,10 +2659,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                     const token = nextToken(&tok_it, &tree);
                     const token_index = token.index;
                     const token_ptr = token.ptr;
-                    ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                    ((try tree.errors.addOne())).* = Error{
-                        .token = token_index,
+                        .ExpectedToken = Error.ExpectedToken{
-                        .expected_id = Token.Id.Identifier,
+                            .token = token_index,
-                    } };
+                            .expected_id = Token.Id.Identifier,
+                        },
+                    };
                     return tree;
                 }
             },
 @@ -2567,10 +2675,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const ident_token_index = ident_token.index;
                 const ident_token_ptr = ident_token.ptr;
                 if (ident_token_ptr.id != Token.Id.Identifier) {
-                    ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                    ((try tree.errors.addOne())).* = Error{
-                        .token = ident_token_index,
+                        .ExpectedToken = Error.ExpectedToken{
-                        .expected_id = Token.Id.Identifier,
+                            .token = ident_token_index,
-                    } };
+                            .expected_id = Token.Id.Identifier,
+                        },
+                    };
                     return tree;
                 }
 @@ -2588,10 +2698,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_index = token.index;
                 const token_ptr = token.ptr;
                 if (token_ptr.id != token_id) {
-                    ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                    ((try tree.errors.addOne())).* = Error{
-                        .token = token_index,
+                        .ExpectedToken = Error.ExpectedToken{
-                        .expected_id = token_id,
+                            .token = token_index,
-                    } };
+                            .expected_id = token_id,
+                        },
+                    };
                     return tree;
                 }
                 continue;
 @@ -2601,10 +2713,12 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
                 const token_index = token.index;
                 const token_ptr = token.ptr;
                 if (token_ptr.id != expect_token_save.id) {
-                    ((try tree.errors.addOne())).* = Error{ .ExpectedToken = Error.ExpectedToken{
+                    ((try tree.errors.addOne())).* = Error{
-                        .token = token_index,
+                        .ExpectedToken = Error.ExpectedToken{
-                        .expected_id = expect_token_save.id,
+                            .token = token_index,
-                    } };
+                            .expected_id = expect_token_save.id,
+                        },
+                    };
                     return tree;
                 }
                 expect_token_save.ptr.* = token_index;
 @@ -2640,16 +2754,16 @@ pub fn parse(allocator: &mem.Allocator, source: []const u8) !ast.Tree {
 }
 const AnnotatedToken = struct {
-    ptr: &Token,
+    ptr: *Token,
     index: TokenIndex,
 };
 const TopLevelDeclCtx = struct {
-    decls: &ast.Node.Root.DeclList,
+    decls: *ast.Node.Root.DeclList,
     visib_token: ?TokenIndex,
     extern_export_inline_token: ?AnnotatedToken,
-    lib_name: ?&ast.Node,
+    lib_name: ?*ast.Node,
-    comments: ?&ast.Node.DocComment,
+    comments: ?*ast.Node.DocComment,
 };
 const VarDeclCtx = struct {
 @@ -2657,21 +2771,21 @@ const VarDeclCtx = struct {
     visib_token: ?TokenIndex,
     comptime_token: ?TokenIndex,
     extern_export_token: ?TokenIndex,
-    lib_name: ?&ast.Node,
+    lib_name: ?*ast.Node,
-    list: &ast.Node.Root.DeclList,
+    list: *ast.Node.Root.DeclList,
-    comments: ?&ast.Node.DocComment,
+    comments: ?*ast.Node.DocComment,
 };
 const TopLevelExternOrFieldCtx = struct {
     visib_token: TokenIndex,
-    container_decl: &ast.Node.ContainerDecl,
+    container_decl: *ast.Node.ContainerDecl,
-    comments: ?&ast.Node.DocComment,
+    comments: ?*ast.Node.DocComment,
 };
 const ExternTypeCtx = struct {
     opt_ctx: OptionalCtx,
     extern_token: TokenIndex,
-    comments: ?&ast.Node.DocComment,
+    comments: ?*ast.Node.DocComment,
 };
 const ContainerKindCtx = struct {
 @@ -2681,24 +2795,24 @@ const ContainerKindCtx = struct {
 const ExpectTokenSave = struct {
     id: @TagType(Token.Id),
-    ptr: &TokenIndex,
+    ptr: *TokenIndex,
 };
 const OptionalTokenSave = struct {
     id: @TagType(Token.Id),
-    ptr: &?TokenIndex,
+    ptr: *?TokenIndex,
 };
 const ExprListCtx = struct {
-    list: &ast.Node.SuffixOp.Op.InitList,
+    list: *ast.Node.SuffixOp.Op.InitList,
     end: Token.Id,
-    ptr: &TokenIndex,
+    ptr: *TokenIndex,
 };
 fn ListSave(comptime List: type) type {
     return struct {
-        list: &List,
+        list: *List,
-        ptr: &TokenIndex,
+        ptr: *TokenIndex,
     };
 }
 @@ -2727,7 +2841,7 @@ const LoopCtx = struct {
 const AsyncEndCtx = struct {
     ctx: OptionalCtx,
-    attribute: &ast.Node.AsyncAttribute,
+    attribute: *ast.Node.AsyncAttribute,
 };
 const ErrorTypeOrSetDeclCtx = struct {
 @@ -2736,21 +2850,21 @@ const ErrorTypeOrSetDeclCtx = struct {
 };
 const ParamDeclEndCtx = struct {
-    fn_proto: &ast.Node.FnProto,
+    fn_proto: *ast.Node.FnProto,
-    param_decl: &ast.Node.ParamDecl,
+    param_decl: *ast.Node.ParamDecl,
 };
 const ComptimeStatementCtx = struct {
     comptime_token: TokenIndex,
-    block: &ast.Node.Block,
+    block: *ast.Node.Block,
 };
 const OptionalCtx = union(enum) {
-    Optional: &?&ast.Node,
+    Optional: *?*ast.Node,
-    RequiredNull: &?&ast.Node,
+    RequiredNull: *?*ast.Node,
-    Required: &&ast.Node,
+    Required: **ast.Node,
-    pub fn store(self: &const OptionalCtx, value: &ast.Node) void {
+    pub fn store(self: *const OptionalCtx, value: *ast.Node) void {
         switch (self.*) {
             OptionalCtx.Optional => |ptr| ptr.* = value,
             OptionalCtx.RequiredNull => |ptr| ptr.* = value,
 @@ -2758,7 +2872,7 @@ const OptionalCtx = union(enum) {
         }
     }
-    pub fn get(self: &const OptionalCtx) ?&ast.Node {
+    pub fn get(self: *const OptionalCtx) ?*ast.Node {
         switch (self.*) {
             OptionalCtx.Optional => |ptr| return ptr.*,
             OptionalCtx.RequiredNull => |ptr| return ??ptr.*,
 @@ -2766,7 +2880,7 @@ const OptionalCtx = union(enum) {
         }
     }
-    pub fn toRequired(self: &const OptionalCtx) OptionalCtx {
+    pub fn toRequired(self: *const OptionalCtx) OptionalCtx {
         switch (self.*) {
             OptionalCtx.Optional => |ptr| {
                 return OptionalCtx{ .RequiredNull = ptr };
 @@ -2778,8 +2892,8 @@ const OptionalCtx = union(enum) {
 };
 const AddCommentsCtx = struct {
-    node_ptr: &&ast.Node,
+    node_ptr: **ast.Node,
-    comments: ?&ast.Node.DocComment,
+    comments: ?*ast.Node.DocComment,
 };
 const State = union(enum) {
 @@ -2790,67 +2904,67 @@ const State = union(enum) {
     TopLevelExternOrField: TopLevelExternOrFieldCtx,
     ContainerKind: ContainerKindCtx,
-    ContainerInitArgStart: &ast.Node.ContainerDecl,
+    ContainerInitArgStart: *ast.Node.ContainerDecl,
-    ContainerInitArg: &ast.Node.ContainerDecl,
+    ContainerInitArg: *ast.Node.ContainerDecl,
-    ContainerDecl: &ast.Node.ContainerDecl,
+    ContainerDecl: *ast.Node.ContainerDecl,
     VarDecl: VarDeclCtx,
-    VarDeclAlign: &ast.Node.VarDecl,
+    VarDeclAlign: *ast.Node.VarDecl,
-    VarDeclEq: &ast.Node.VarDecl,
+    VarDeclEq: *ast.Node.VarDecl,
-    VarDeclSemiColon: &ast.Node.VarDecl,
+    VarDeclSemiColon: *ast.Node.VarDecl,
-    FnDef: &ast.Node.FnProto,
+    FnDef: *ast.Node.FnProto,
-    FnProto: &ast.Node.FnProto,
+    FnProto: *ast.Node.FnProto,
-    FnProtoAlign: &ast.Node.FnProto,
+    FnProtoAlign: *ast.Node.FnProto,
-    FnProtoReturnType: &ast.Node.FnProto,
+    FnProtoReturnType: *ast.Node.FnProto,
-    ParamDecl: &ast.Node.FnProto,
+    ParamDecl: *ast.Node.FnProto,
-    ParamDeclAliasOrComptime: &ast.Node.ParamDecl,
+    ParamDeclAliasOrComptime: *ast.Node.ParamDecl,
-    ParamDeclName: &ast.Node.ParamDecl,
+    ParamDeclName: *ast.Node.ParamDecl,
     ParamDeclEnd: ParamDeclEndCtx,
-    ParamDeclComma: &ast.Node.FnProto,
+    ParamDeclComma: *ast.Node.FnProto,
     MaybeLabeledExpression: MaybeLabeledExpressionCtx,
     LabeledExpression: LabelCtx,
     Inline: InlineCtx,
     While: LoopCtx,
-    WhileContinueExpr: &?&ast.Node,
+    WhileContinueExpr: *?*ast.Node,
     For: LoopCtx,
-    Else: &?&ast.Node.Else,
+    Else: *?*ast.Node.Else,
-    Block: &ast.Node.Block,
+    Block: *ast.Node.Block,
-    Statement: &ast.Node.Block,
+    Statement: *ast.Node.Block,
     ComptimeStatement: ComptimeStatementCtx,
-    Semicolon: &&ast.Node,
+    Semicolon: **ast.Node,
-    AsmOutputItems: &ast.Node.Asm.OutputList,
+    AsmOutputItems: *ast.Node.Asm.OutputList,
-    AsmOutputReturnOrType: &ast.Node.AsmOutput,
+    AsmOutputReturnOrType: *ast.Node.AsmOutput,
-    AsmInputItems: &ast.Node.Asm.InputList,
+    AsmInputItems: *ast.Node.Asm.InputList,
-    AsmClobberItems: &ast.Node.Asm.ClobberList,
+    AsmClobberItems: *ast.Node.Asm.ClobberList,
     ExprListItemOrEnd: ExprListCtx,
     ExprListCommaOrEnd: ExprListCtx,
     FieldInitListItemOrEnd: ListSave(ast.Node.SuffixOp.Op.InitList),
     FieldInitListCommaOrEnd: ListSave(ast.Node.SuffixOp.Op.InitList),
-    FieldListCommaOrEnd: &ast.Node.ContainerDecl,
+    FieldListCommaOrEnd: *ast.Node.ContainerDecl,
     FieldInitValue: OptionalCtx,
     ErrorTagListItemOrEnd: ListSave(ast.Node.ErrorSetDecl.DeclList),
     ErrorTagListCommaOrEnd: ListSave(ast.Node.ErrorSetDecl.DeclList),
     SwitchCaseOrEnd: ListSave(ast.Node.Switch.CaseList),
     SwitchCaseCommaOrEnd: ListSave(ast.Node.Switch.CaseList),
-    SwitchCaseFirstItem: &ast.Node.SwitchCase,
+    SwitchCaseFirstItem: *ast.Node.SwitchCase,
-    SwitchCaseItemCommaOrEnd: &ast.Node.SwitchCase,
+    SwitchCaseItemCommaOrEnd: *ast.Node.SwitchCase,
-    SwitchCaseItemOrEnd: &ast.Node.SwitchCase,
+    SwitchCaseItemOrEnd: *ast.Node.SwitchCase,
-    SuspendBody: &ast.Node.Suspend,
+    SuspendBody: *ast.Node.Suspend,
-    AsyncAllocator: &ast.Node.AsyncAttribute,
+    AsyncAllocator: *ast.Node.AsyncAttribute,
     AsyncEnd: AsyncEndCtx,
     ExternType: ExternTypeCtx,
-    SliceOrArrayAccess: &ast.Node.SuffixOp,
+    SliceOrArrayAccess: *ast.Node.SuffixOp,
-    SliceOrArrayType: &ast.Node.PrefixOp,
+    SliceOrArrayType: *ast.Node.PrefixOp,
-    AddrOfModifiers: &ast.Node.PrefixOp.AddrOfInfo,
+    PtrTypeModifiers: *ast.Node.PrefixOp.PtrInfo,
-    AlignBitRange: &ast.Node.PrefixOp.AddrOfInfo.Align,
+    AlignBitRange: *ast.Node.PrefixOp.PtrInfo.Align,
     Payload: OptionalCtx,
     PointerPayload: OptionalCtx,
 @@ -2893,7 +3007,7 @@ const State = union(enum) {
     ErrorTypeOrSetDecl: ErrorTypeOrSetDeclCtx,
     StringLiteral: OptionalCtx,
     Identifier: OptionalCtx,
-    ErrorTag: &&ast.Node,
+    ErrorTag: **ast.Node,
     IfToken: @TagType(Token.Id),
     IfTokenSave: ExpectTokenSave,
 @@ -2902,7 +3016,7 @@ const State = union(enum) {
     OptionalTokenSave: OptionalTokenSave,
 };
-fn pushDocComment(arena: &mem.Allocator, line_comment: TokenIndex, result: &?&ast.Node.DocComment) !void {
+fn pushDocComment(arena: *mem.Allocator, line_comment: TokenIndex, result: *?*ast.Node.DocComment) !void {
     const node = blk: {
         if (result.*) |comment_node| {
             break :blk comment_node;
 @@ -2918,8 +3032,8 @@ fn pushDocComment(arena: &mem.Allocator, line_comment: TokenIndex, result: &?&as
     try node.lines.push(line_comment);
 }
-fn eatDocComments(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) !?&ast.Node.DocComment {
+fn eatDocComments(arena: *mem.Allocator, tok_it: *ast.Tree.TokenList.Iterator, tree: *ast.Tree) !?*ast.Node.DocComment {
-    var result: ?&ast.Node.DocComment = null;
+    var result: ?*ast.Node.DocComment = null;
     while (true) {
         if (eatToken(tok_it, tree, Token.Id.DocComment)) |line_comment| {
             try pushDocComment(arena, line_comment, &result);
 @@ -2930,7 +3044,7 @@ fn eatDocComments(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator, t
     return result;
 }
-fn parseStringLiteral(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterator, token_ptr: &const Token, token_index: TokenIndex, tree: &ast.Tree) !?&ast.Node {
+fn parseStringLiteral(arena: *mem.Allocator, tok_it: *ast.Tree.TokenList.Iterator, token_ptr: *const Token, token_index: TokenIndex, tree: *ast.Tree) !?*ast.Node {
     switch (token_ptr.id) {
         Token.Id.StringLiteral => {
             return &(try createLiteral(arena, ast.Node.StringLiteral, token_index)).base;
 @@ -2957,11 +3071,11 @@ fn parseStringLiteral(arena: &mem.Allocator, tok_it: &ast.Tree.TokenList.Iterato
         },
         // TODO: We shouldn't need a cast, but:
         // zig: /home/jc/Documents/zig/src/ir.cpp:7962: TypeTableEntry* ir_resolve_peer_types(IrAnalyze*, AstNode*, IrInstruction**, size_t): Assertion `err_set_type != nullptr' failed.
-        else => return (?&ast.Node)(null),
+        else => return (?*ast.Node)(null),
     }
 }
-fn parseBlockExpr(stack: &std.ArrayList(State), arena: &mem.Allocator, ctx: &const OptionalCtx, token_ptr: &const Token, token_index: TokenIndex) !bool {
+fn parseBlockExpr(stack: *std.ArrayList(State), arena: *mem.Allocator, ctx: *const OptionalCtx, token_ptr: *const Token, token_index: TokenIndex) !bool {
     switch (token_ptr.id) {
         Token.Id.Keyword_suspend => {
             const node = try arena.construct(ast.Node.Suspend{
 @@ -2997,21 +3111,25 @@ fn parseBlockExpr(stack: &std.ArrayList(State), arena: &mem.Allocator, ctx: &con
             return true;
         },
         Token.Id.Keyword_while => {
-            stack.append(State{ .While = LoopCtx{
+            stack.append(State{
-                .label = null,
+                .While = LoopCtx{
-                .inline_token = null,
+                    .label = null,
-                .loop_token = token_index,
+                    .inline_token = null,
-                .opt_ctx = ctx.*,
+                    .loop_token = token_index,
-            } }) catch unreachable;
+                    .opt_ctx = ctx.*,
+                },
+            }) catch unreachable;
             return true;
         },
         Token.Id.Keyword_for => {
-            stack.append(State{ .For = LoopCtx{
+            stack.append(State{
-                .label = null,
+                .For = LoopCtx{
-                .inline_token = null,
+                    .label = null,
-                .loop_token = token_index,
+                    .inline_token = null,
-                .opt_ctx = ctx.*,
+                    .loop_token = token_index,
-            } }) catch unreachable;
+                    .opt_ctx = ctx.*,
+                },
+            }) catch unreachable;
             return true;
         },
         Token.Id.Keyword_switch => {
 @@ -3024,10 +3142,12 @@ fn parseBlockExpr(stack: &std.ArrayList(State), arena: &mem.Allocator, ctx: &con
             });
             ctx.store(&node.base);
-            stack.append(State{ .SwitchCaseOrEnd = ListSave(@typeOf(node.cases)){
+            stack.append(State{
-                .list = &node.cases,
+                .SwitchCaseOrEnd = ListSave(@typeOf(node.cases)){
-                .ptr = &node.rbrace,
+                    .list = &node.cases,
-            } }) catch unreachable;
+                    .ptr = &node.rbrace,
+                },
+            }) catch unreachable;
             try stack.append(State{ .ExpectToken = Token.Id.LBrace });
             try stack.append(State{ .ExpectToken = Token.Id.RParen });
             try stack.append(State{ .Expression = OptionalCtx{ .Required = &node.expr } });
 @@ -3069,7 +3189,7 @@ const ExpectCommaOrEndResult = union(enum) {
     parse_error: Error,
 };
-fn expectCommaOrEnd(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree, end: @TagType(Token.Id)) ExpectCommaOrEndResult {
+fn expectCommaOrEnd(tok_it: *ast.Tree.TokenList.Iterator, tree: *ast.Tree, end: @TagType(Token.Id)) ExpectCommaOrEndResult {
     const token = nextToken(tok_it, tree);
     const token_index = token.index;
     const token_ptr = token.ptr;
 @@ -3080,15 +3200,19 @@ fn expectCommaOrEnd(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree, end:
                 return ExpectCommaOrEndResult{ .end_token = token_index };
             }
-            return ExpectCommaOrEndResult{ .parse_error = Error{ .ExpectedCommaOrEnd = Error.ExpectedCommaOrEnd{
+            return ExpectCommaOrEndResult{
-                .token = token_index,
+                .parse_error = Error{
-                .end_id = end,
+                    .ExpectedCommaOrEnd = Error.ExpectedCommaOrEnd{
-            } } };
+                        .token = token_index,
+                        .end_id = end,
+                    },
+                },
+            };
         },
     }
 }
-fn tokenIdToAssignment(id: &const Token.Id) ?ast.Node.InfixOp.Op {
+fn tokenIdToAssignment(id: *const Token.Id) ?ast.Node.InfixOp.Op {
     // TODO: We have to cast all cases because of this:
     // error: expected type '?InfixOp', found '?@TagType(InfixOp)'
     return switch (id.*) {
 @@ -3167,13 +3291,14 @@ fn tokenIdToPrefixOp(id: @TagType(Token.Id)) ?ast.Node.PrefixOp.Op {
         Token.Id.Tilde => ast.Node.PrefixOp.Op{ .BitNot = void{} },
         Token.Id.Minus => ast.Node.PrefixOp.Op{ .Negation = void{} },
         Token.Id.MinusPercent => ast.Node.PrefixOp.Op{ .NegationWrap = void{} },
-        Token.Id.Asterisk,
+        Token.Id.Ampersand => ast.Node.PrefixOp.Op{ .AddressOf = void{} },
-        Token.Id.AsteriskAsterisk => ast.Node.PrefixOp.Op{ .PointerType = void{} },
+        Token.Id.Asterisk, Token.Id.AsteriskAsterisk, Token.Id.BracketStarBracket => ast.Node.PrefixOp.Op{
-        Token.Id.Ampersand => ast.Node.PrefixOp.Op{ .AddrOf = ast.Node.PrefixOp.AddrOfInfo{
+            .PtrType = ast.Node.PrefixOp.PtrInfo{
-            .align_info = null,
+                .align_info = null,
-            .const_token = null,
+                .const_token = null,
-            .volatile_token = null,
+                .volatile_token = null,
-        } },
+            },
+        },
         Token.Id.QuestionMark => ast.Node.PrefixOp.Op{ .MaybeType = void{} },
         Token.Id.QuestionMarkQuestionMark => ast.Node.PrefixOp.Op{ .UnwrapMaybe = void{} },
         Token.Id.Keyword_await => ast.Node.PrefixOp.Op{ .Await = void{} },
 @@ -3182,21 +3307,21 @@ fn tokenIdToPrefixOp(id: @TagType(Token.Id)) ?ast.Node.PrefixOp.Op {
     };
 }
-fn createLiteral(arena: &mem.Allocator, comptime T: type, token_index: TokenIndex) !&T {
+fn createLiteral(arena: *mem.Allocator, comptime T: type, token_index: TokenIndex) !*T {
     return arena.construct(T{
         .base = ast.Node{ .id = ast.Node.typeToId(T) },
         .token = token_index,
     });
 }
-fn createToCtxLiteral(arena: &mem.Allocator, opt_ctx: &const OptionalCtx, comptime T: type, token_index: TokenIndex) !&T {
+fn createToCtxLiteral(arena: *mem.Allocator, opt_ctx: *const OptionalCtx, comptime T: type, token_index: TokenIndex) !*T {
     const node = try createLiteral(arena, T, token_index);
     opt_ctx.store(&node.base);
     return node;
 }
-fn eatToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree, id: @TagType(Token.Id)) ?TokenIndex {
+fn eatToken(tok_it: *ast.Tree.TokenList.Iterator, tree: *ast.Tree, id: @TagType(Token.Id)) ?TokenIndex {
     const token = ??tok_it.peek();
     if (token.id == id) {
 @@ -3206,7 +3331,7 @@ fn eatToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree, id: @TagType(
     return null;
 }
-fn nextToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) AnnotatedToken {
+fn nextToken(tok_it: *ast.Tree.TokenList.Iterator, tree: *ast.Tree) AnnotatedToken {
     const result = AnnotatedToken{
         .index = tok_it.index,
         .ptr = ??tok_it.next(),
 @@ -3220,7 +3345,7 @@ fn nextToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) AnnotatedTok
     }
 }
-fn prevToken(tok_it: &ast.Tree.TokenList.Iterator, tree: &ast.Tree) void {
+fn prevToken(tok_it: *ast.Tree.TokenList.Iterator, tree: *ast.Tree) void {
     while (true) {
         const prev_tok = tok_it.prev() ?? return;
         if (prev_tok.id == Token.Id.LineComment) continue;

std/zig/parser_test.zig+95-43

 @@ -1,3 +1,43 @@
+test "zig fmt: pointer of unknown length" {
+    try testCanonical(
+        \\fn foo(ptr: [*]u8) void {}
+        \\
+    );
+}
+test "zig fmt: spaces around slice operator" {
+    try testCanonical(
+        \\var a = b[c..d];
+        \\var a = b[c + 1 .. d];
+        \\var a = b[c + 1 ..];
+        \\var a = b[c .. d + 1];
+        \\var a = b[c.a..d.e];
+        \\
+    );
+}
+test "zig fmt: async call in if condition" {
+    try testCanonical(
+        \\comptime {
+        \\    if (async<a> b()) {
+        \\        a();
+        \\    }
+        \\}
+        \\
+    );
+}
+test "zig fmt: 2nd arg multiline string" {
+    try testCanonical(
+        \\comptime {
+        \\    cases.addAsm("hello world linux x86_64",
+        \\        \\.text
+        \\    , "Hello, world!\n");
+        \\}
+        \\
+    );
+}
 test "zig fmt: if condition wraps" {
     try testTransform(
         \\comptime {
 @@ -496,7 +536,7 @@ test "zig fmt: line comment after doc comment" {
 test "zig fmt: float literal with exponent" {
     try testCanonical(
         \\test "bit field alignment" {
-        \\    assert(@typeOf(&blah.b) == &align(1:3:6) const u3);
+        \\    assert(@typeOf(&blah.b) == *align(1:3:6) const u3);
         \\}
         \\
     );
 @@ -774,7 +814,7 @@ test "zig fmt: doc comments before struct field" {
         \\pub const Allocator = struct {
         \\    /// Allocate byte_count bytes and return them in a slice, with the
         \\    /// slice's pointer aligned at least to alignment bytes.
-        \\    allocFn: fn() void,
+        \\    allocFn: fn () void,
         \\};
         \\
     );
 @@ -999,7 +1039,7 @@ test "zig fmt: extern declaration" {
 }
 test "zig fmt: alignment" {
-        try testCanonical(
+    try testCanonical(
         \\var foo: c_int align(1);
         \\
     );
 @@ -1007,7 +1047,7 @@ test "zig fmt: alignment" {
 test "zig fmt: C main" {
     try testCanonical(
-        \\fn main(argc: c_int, argv: &&u8) c_int {
+        \\fn main(argc: c_int, argv: **u8) c_int {
         \\    const a = b;
         \\}
         \\
 @@ -1016,7 +1056,7 @@ test "zig fmt: C main" {
 test "zig fmt: return" {
     try testCanonical(
-        \\fn foo(argc: c_int, argv: &&u8) c_int {
+        \\fn foo(argc: c_int, argv: **u8) c_int {
         \\    return 0;
         \\}
         \\
 @@ -1029,26 +1069,26 @@ test "zig fmt: return" {
 test "zig fmt: pointer attributes" {
     try testCanonical(
-        \\extern fn f1(s: &align(&u8) u8) c_int;
+        \\extern fn f1(s: *align(*u8) u8) c_int;
-        \\extern fn f2(s: &&align(1) &const &volatile u8) c_int;
+        \\extern fn f2(s: **align(1) *const *volatile u8) c_int;
-        \\extern fn f3(s: &align(1) const &align(1) volatile &const volatile u8) c_int;
+        \\extern fn f3(s: *align(1) const *align(1) volatile *const volatile u8) c_int;
-        \\extern fn f4(s: &align(1) const volatile u8) c_int;
+        \\extern fn f4(s: *align(1) const volatile u8) c_int;
         \\
     );
 }
 test "zig fmt: slice attributes" {
     try testCanonical(
-        \\extern fn f1(s: &align(&u8) u8) c_int;
+        \\extern fn f1(s: *align(*u8) u8) c_int;
-        \\extern fn f2(s: &&align(1) &const &volatile u8) c_int;
+        \\extern fn f2(s: **align(1) *const *volatile u8) c_int;
-        \\extern fn f3(s: &align(1) const &align(1) volatile &const volatile u8) c_int;
+        \\extern fn f3(s: *align(1) const *align(1) volatile *const volatile u8) c_int;
-        \\extern fn f4(s: &align(1) const volatile u8) c_int;
+        \\extern fn f4(s: *align(1) const volatile u8) c_int;
         \\
     );
 }
 test "zig fmt: test declaration" {
-     try testCanonical(
+    try testCanonical(
         \\test "test name" {
         \\    const a = 1;
         \\    var b = 1;
 @@ -1179,18 +1219,18 @@ test "zig fmt: var type" {
 test "zig fmt: functions" {
     try testCanonical(
-        \\extern fn puts(s: &const u8) c_int;
+        \\extern fn puts(s: *const u8) c_int;
-        \\extern "c" fn puts(s: &const u8) c_int;
+        \\extern "c" fn puts(s: *const u8) c_int;
-        \\export fn puts(s: &const u8) c_int;
+        \\export fn puts(s: *const u8) c_int;
-        \\inline fn puts(s: &const u8) c_int;
+        \\inline fn puts(s: *const u8) c_int;
-        \\pub extern fn puts(s: &const u8) c_int;
+        \\pub extern fn puts(s: *const u8) c_int;
-        \\pub extern "c" fn puts(s: &const u8) c_int;
+        \\pub extern "c" fn puts(s: *const u8) c_int;
-        \\pub export fn puts(s: &const u8) c_int;
+        \\pub export fn puts(s: *const u8) c_int;
-        \\pub inline fn puts(s: &const u8) c_int;
+        \\pub inline fn puts(s: *const u8) c_int;
-        \\pub extern fn puts(s: &const u8) align(2 + 2) c_int;
+        \\pub extern fn puts(s: *const u8) align(2 + 2) c_int;
-        \\pub extern "c" fn puts(s: &const u8) align(2 + 2) c_int;
+        \\pub extern "c" fn puts(s: *const u8) align(2 + 2) c_int;
-        \\pub export fn puts(s: &const u8) align(2 + 2) c_int;
+        \\pub export fn puts(s: *const u8) align(2 + 2) c_int;
-        \\pub inline fn puts(s: &const u8) align(2 + 2) c_int;
+        \\pub inline fn puts(s: *const u8) align(2 + 2) c_int;
         \\
     );
 }
 @@ -1265,8 +1305,8 @@ test "zig fmt: struct declaration" {
         \\    f1: u8,
         \\    pub f3: u8,
         \\
-        \\    fn method(self: &Self) Self {
+        \\    fn method(self: *Self) Self {
-        \\        return *self;
+        \\        return self.*;
         \\    }
         \\
         \\    f2: u8,
 @@ -1290,7 +1330,7 @@ test "zig fmt: struct declaration" {
 }
 test "zig fmt: enum declaration" {
-      try testCanonical(
+    try testCanonical(
         \\const E = enum {
         \\    Ok,
         \\    SomethingElse = 0,
 @@ -1318,7 +1358,7 @@ test "zig fmt: enum declaration" {
 }
 test "zig fmt: union declaration" {
-      try testCanonical(
+    try testCanonical(
         \\const U = union {
         \\    Int: u8,
         \\    Float: f32,
 @@ -1679,10 +1719,10 @@ test "zig fmt: fn type" {
         \\    return i + 1;
         \\}
         \\
-        \\const a: fn(u8) u8 = undefined;
+        \\const a: fn (u8) u8 = undefined;
-        \\const b: extern fn(u8) u8 = undefined;
+        \\const b: extern fn (u8) u8 = undefined;
-        \\const c: nakedcc fn(u8) u8 = undefined;
+        \\const c: nakedcc fn (u8) u8 = undefined;
-        \\const ap: fn(u8) u8 = a;
+        \\const ap: fn (u8) u8 = a;
         \\
     );
 }
 @@ -1770,7 +1810,7 @@ const io = std.io;
 var fixed_buffer_mem: [100 * 1024]u8 = undefined;
-fn testParse(source: []const u8, allocator: &mem.Allocator) ![]u8 {
+fn testParse(source: []const u8, allocator: *mem.Allocator, anything_changed: *bool) ![]u8 {
     var stderr_file = try io.getStdErr();
     var stderr = &io.FileOutStream.init(&stderr_file).stream;
 @@ -1807,7 +1847,7 @@ fn testParse(source: []const u8, allocator: &mem.Allocator) ![]u8 {
     errdefer buffer.deinit();
     var buffer_out_stream = io.BufferOutStream.init(&buffer);
-    try std.zig.render(allocator, &buffer_out_stream.stream, &tree);
+    anything_changed.* = try std.zig.render(allocator, &buffer_out_stream.stream, &tree);
     return buffer.toOwnedSlice();
 }
 @@ -1816,7 +1856,8 @@ fn testTransform(source: []const u8, expected_source: []const u8) !void {
         // Try it once with unlimited memory, make sure it works
         var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
         var failing_allocator = std.debug.FailingAllocator.init(&fixed_allocator.allocator, @maxValue(usize));
-        const result_source = try testParse(source, &failing_allocator.allocator);
+        var anything_changed: bool = undefined;
+        const result_source = try testParse(source, &failing_allocator.allocator, &anything_changed);
         if (!mem.eql(u8, result_source, expected_source)) {
             warn("\n====== expected this output: =========\n");
             warn("{}", expected_source);
 @@ -1825,6 +1866,12 @@ fn testTransform(source: []const u8, expected_source: []const u8) !void {
             warn("\n======================================\n");
             return error.TestFailed;
         }
+        const changes_expected = source.ptr != expected_source.ptr;
+        if (anything_changed != changes_expected) {
+            warn("std.zig.render returned {} instead of {}\n", anything_changed, changes_expected);
+            return error.TestFailed;
+        }
+        std.debug.assert(anything_changed == changes_expected);
         failing_allocator.allocator.free(result_source);
         break :x failing_allocator.index;
     };
 @@ -1833,15 +1880,21 @@ fn testTransform(source: []const u8, expected_source: []const u8) !void {
     while (fail_index < needed_alloc_count) : (fail_index += 1) {
         var fixed_allocator = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]);
         var failing_allocator = std.debug.FailingAllocator.init(&fixed_allocator.allocator, fail_index);
-        if (testParse(source, &failing_allocator.allocator)) |_| {
+        var anything_changed: bool = undefined;
+        if (testParse(source, &failing_allocator.allocator, &anything_changed)) |_| {
             return error.NondeterministicMemoryUsage;
         } else |err| switch (err) {
             error.OutOfMemory => {
                 if (failing_allocator.allocated_bytes != failing_allocator.freed_bytes) {
-                    warn("\nfail_index: {}/{}\nallocated bytes: {}\nfreed bytes: {}\nallocations: {}\ndeallocations: {}\n",
+                    warn(
-                        fail_index, needed_alloc_count,
+                        "\nfail_index: {}/{}\nallocated bytes: {}\nfreed bytes: {}\nallocations: {}\ndeallocations: {}\n",
-                        failing_allocator.allocated_bytes, failing_allocator.freed_bytes,
+                        fail_index,
-                        failing_allocator.index, failing_allocator.deallocations);
+                        needed_alloc_count,
+                        failing_allocator.allocated_bytes,
+                        failing_allocator.freed_bytes,
+                        failing_allocator.index,
+                        failing_allocator.deallocations,
+                    );
                     return error.MemoryLeakDetected;
                 }
             },
 @@ -1854,4 +1907,3 @@ fn testTransform(source: []const u8, expected_source: []const u8) !void {
 fn testCanonical(source: []const u8) !void {
     return testTransform(source, source);
 }

std/zig/render.zig+161-35

 @@ -12,9 +12,61 @@ pub const Error = error{
     OutOfMemory,
 };
-pub fn render(allocator: &mem.Allocator, stream: var, tree: &ast.Tree) (@typeOf(stream).Child.Error || Error)!void {
+/// Returns whether anything changed
+pub fn render(allocator: *mem.Allocator, stream: var, tree: *ast.Tree) (@typeOf(stream).Child.Error || Error)!bool {
     comptime assert(@typeId(@typeOf(stream)) == builtin.TypeId.Pointer);
+    var anything_changed: bool = false;
+    // make a passthrough stream that checks whether something changed
+    const MyStream = struct {
+        const MyStream = this;
+        const StreamError = @typeOf(stream).Child.Error;
+        const Stream = std.io.OutStream(StreamError);
+        anything_changed_ptr: *bool,
+        child_stream: @typeOf(stream),
+        stream: Stream,
+        source_index: usize,
+        source: []const u8,
+        fn write(iface_stream: *Stream, bytes: []const u8) StreamError!void {
+            const self = @fieldParentPtr(MyStream, "stream", iface_stream);
+            if (!self.anything_changed_ptr.*) {
+                const end = self.source_index + bytes.len;
+                if (end > self.source.len) {
+                    self.anything_changed_ptr.* = true;
+                } else {
+                    const src_slice = self.source[self.source_index..end];
+                    self.source_index += bytes.len;
+                    if (!mem.eql(u8, bytes, src_slice)) {
+                        self.anything_changed_ptr.* = true;
+                    }
+                }
+            }
+            try self.child_stream.write(bytes);
+        }
+    };
+    var my_stream = MyStream{
+        .stream = MyStream.Stream{ .writeFn = MyStream.write },
+        .child_stream = stream,
+        .anything_changed_ptr = &anything_changed,
+        .source_index = 0,
+        .source = tree.source,
+    };
+    try renderRoot(allocator, &my_stream.stream, tree);
+    return anything_changed;
+}
+fn renderRoot(
+    allocator: *mem.Allocator,
+    stream: var,
+    tree: *ast.Tree,
+) (@typeOf(stream).Child.Error || Error)!void {
     // render all the line comments at the beginning of the file
     var tok_it = tree.tokens.iterator(0);
     while (tok_it.next()) |token| {
 @@ -38,7 +90,7 @@ pub fn render(allocator: &mem.Allocator, stream: var, tree: &ast.Tree) (@typeOf(
     }
 }
-fn renderExtraNewline(tree: &ast.Tree, stream: var, start_col: &usize, node: &ast.Node) !void {
+fn renderExtraNewline(tree: *ast.Tree, stream: var, start_col: *usize, node: *ast.Node) !void {
     const first_token = node.firstToken();
     var prev_token = first_token;
     while (tree.tokens.at(prev_token - 1).id == Token.Id.DocComment) {
 @@ -52,7 +104,7 @@ fn renderExtraNewline(tree: &ast.Tree, stream: var, start_col: &usize, node: &as
     }
 }
-fn renderTopLevelDecl(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, indent: usize, start_col: &usize, decl: &ast.Node) (@typeOf(stream).Child.Error || Error)!void {
+fn renderTopLevelDecl(allocator: *mem.Allocator, stream: var, tree: *ast.Tree, indent: usize, start_col: *usize, decl: *ast.Node) (@typeOf(stream).Child.Error || Error)!void {
     switch (decl.id) {
         ast.Node.Id.FnProto => {
             const fn_proto = @fieldParentPtr(ast.Node.FnProto, "base", decl);
 @@ -161,7 +213,15 @@ fn renderTopLevelDecl(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, i
     }
 }
-fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, indent: usize, start_col: &usize, base: &ast.Node, space: Space,) (@typeOf(stream).Child.Error || Error)!void {
+fn renderExpression(
+    allocator: *mem.Allocator,
+    stream: var,
+    tree: *ast.Tree,
+    indent: usize,
+    start_col: *usize,
+    base: *ast.Node,
+    space: Space,
+) (@typeOf(stream).Child.Error || Error)!void {
     switch (base.id) {
         ast.Node.Id.Identifier => {
             const identifier = @fieldParentPtr(ast.Node.Identifier, "base", base);
 @@ -213,13 +273,13 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
             const async_attr = @fieldParentPtr(ast.Node.AsyncAttribute, "base", base);
             if (async_attr.allocator_type) |allocator_type| {
-                try renderToken(tree, stream, async_attr.async_token, indent, start_col, Space.None);
+                try renderToken(tree, stream, async_attr.async_token, indent, start_col, Space.None); // async
-                try renderToken(tree, stream, tree.nextToken(async_attr.async_token), indent, start_col, Space.None);
+                try renderToken(tree, stream, tree.nextToken(async_attr.async_token), indent, start_col, Space.None); // <
-                try renderExpression(allocator, stream, tree, indent, start_col, allocator_type, Space.None);
+                try renderExpression(allocator, stream, tree, indent, start_col, allocator_type, Space.None); // allocator
-                return renderToken(tree, stream, tree.nextToken(allocator_type.lastToken()), indent, start_col, space);
+                return renderToken(tree, stream, tree.nextToken(allocator_type.lastToken()), indent, start_col, space); // >
             } else {
-                return renderToken(tree, stream, async_attr.async_token, indent, start_col, space);
+                return renderToken(tree, stream, async_attr.async_token, indent, start_col, space); // async
             }
         },
 @@ -259,8 +319,7 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
             try renderExpression(allocator, stream, tree, indent, start_col, infix_op_node.lhs, op_space);
             const after_op_space = blk: {
-                const loc = tree.tokenLocation(tree.tokens.at(infix_op_node.op_token).end,
+                const loc = tree.tokenLocation(tree.tokens.at(infix_op_node.op_token).end, tree.nextToken(infix_op_node.op_token));
-                    tree.nextToken(infix_op_node.op_token));
                 break :blk if (loc.line == 0) op_space else Space.Newline;
             };
 @@ -284,9 +343,13 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
             const prefix_op_node = @fieldParentPtr(ast.Node.PrefixOp, "base", base);
             switch (prefix_op_node.op) {
-                ast.Node.PrefixOp.Op.AddrOf => |addr_of_info| {
+                ast.Node.PrefixOp.Op.PtrType => |ptr_info| {
-                    try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None); // &
+                    const star_offset = switch (tree.tokens.at(prefix_op_node.op_token).id) {
-                    if (addr_of_info.align_info) |align_info| {
+                        Token.Id.AsteriskAsterisk => usize(1),
+                        else => usize(0),
+                    };
+                    try renderTokenOffset(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None, star_offset); // *
+                    if (ptr_info.align_info) |align_info| {
                         const lparen_token = tree.prevToken(align_info.node.firstToken());
                         const align_token = tree.prevToken(lparen_token);
 @@ -311,19 +374,19 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
                             try renderToken(tree, stream, rparen_token, indent, start_col, Space.Space); // )
                         }
                     }
-                    if (addr_of_info.const_token) |const_token| {
+                    if (ptr_info.const_token) |const_token| {
                         try renderToken(tree, stream, const_token, indent, start_col, Space.Space); // const
                     }
-                    if (addr_of_info.volatile_token) |volatile_token| {
+                    if (ptr_info.volatile_token) |volatile_token| {
                         try renderToken(tree, stream, volatile_token, indent, start_col, Space.Space); // volatile
                     }
                 },
-                ast.Node.PrefixOp.Op.SliceType => |addr_of_info| {
+                ast.Node.PrefixOp.Op.SliceType => |ptr_info| {
                     try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None); // [
                     try renderToken(tree, stream, tree.nextToken(prefix_op_node.op_token), indent, start_col, Space.None); // ]
-                    if (addr_of_info.align_info) |align_info| {
+                    if (ptr_info.align_info) |align_info| {
                         const lparen_token = tree.prevToken(align_info.node.firstToken());
                         const align_token = tree.prevToken(lparen_token);
 @@ -348,10 +411,10 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
                             try renderToken(tree, stream, rparen_token, indent, start_col, Space.Space); // )
                         }
                     }
-                    if (addr_of_info.const_token) |const_token| {
+                    if (ptr_info.const_token) |const_token| {
                         try renderToken(tree, stream, const_token, indent, start_col, Space.Space);
                     }
-                    if (addr_of_info.volatile_token) |volatile_token| {
+                    if (ptr_info.volatile_token) |volatile_token| {
                         try renderToken(tree, stream, volatile_token, indent, start_col, Space.Space);
                     }
                 },
 @@ -367,14 +430,16 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
                 ast.Node.PrefixOp.Op.NegationWrap,
                 ast.Node.PrefixOp.Op.UnwrapMaybe,
                 ast.Node.PrefixOp.Op.MaybeType,
-                ast.Node.PrefixOp.Op.PointerType => {
+                ast.Node.PrefixOp.Op.AddressOf,
+                => {
                     try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.None);
                 },
                 ast.Node.PrefixOp.Op.Try,
                 ast.Node.PrefixOp.Op.Await,
                 ast.Node.PrefixOp.Op.Cancel,
-                ast.Node.PrefixOp.Op.Resume => {
+                ast.Node.PrefixOp.Op.Resume,
+                => {
                     try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.Space);
                 },
             }
 @@ -469,9 +534,14 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
                     const lbracket = tree.prevToken(range.start.firstToken());
                     const dotdot = tree.nextToken(range.start.lastToken());
+                    const after_start_space_bool = nodeCausesSliceOpSpace(range.start) or
+                        (if (range.end) |end| nodeCausesSliceOpSpace(end) else false);
+                    const after_start_space = if (after_start_space_bool) Space.Space else Space.None;
+                    const after_op_space = if (range.end != null) after_start_space else Space.None;
                     try renderToken(tree, stream, lbracket, indent, start_col, Space.None); // [
-                    try renderExpression(allocator, stream, tree, indent, start_col, range.start, Space.None);
+                    try renderExpression(allocator, stream, tree, indent, start_col, range.start, after_start_space);
-                    try renderToken(tree, stream, dotdot, indent, start_col, Space.None); // ..
+                    try renderToken(tree, stream, dotdot, indent, start_col, after_op_space); // ..
                     if (range.end) |end| {
                         try renderExpression(allocator, stream, tree, indent, start_col, end, Space.None);
                     }
 @@ -993,7 +1063,7 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
                 try renderToken(tree, stream, name_token, indent, start_col, Space.None); // name
                 break :blk tree.nextToken(name_token);
             } else blk: {
-                try renderToken(tree, stream, fn_proto.fn_token, indent, start_col, Space.None); // fn
+                try renderToken(tree, stream, fn_proto.fn_token, indent, start_col, Space.Space); // fn
                 break :blk tree.nextToken(fn_proto.fn_token);
             };
 @@ -1568,13 +1638,19 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
         ast.Node.Id.VarDecl,
         ast.Node.Id.Use,
         ast.Node.Id.TestDecl,
-        ast.Node.Id.ParamDecl => unreachable,
+        ast.Node.Id.ParamDecl,
+        => unreachable,
     }
 }
-fn renderVarDecl(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, indent: usize, start_col: &usize,
+fn renderVarDecl(
-    var_decl: &ast.Node.VarDecl,) (@typeOf(stream).Child.Error || Error)!void
+    allocator: *mem.Allocator,
-{
+    stream: var,
+    tree: *ast.Tree,
+    indent: usize,
+    start_col: *usize,
+    var_decl: *ast.Node.VarDecl,
+) (@typeOf(stream).Child.Error || Error)!void {
     if (var_decl.visib_token) |visib_token| {
         try renderToken(tree, stream, visib_token, indent, start_col, Space.Space); // pub
     }
 @@ -1623,7 +1699,15 @@ fn renderVarDecl(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, indent
     try renderToken(tree, stream, var_decl.semicolon_token, indent, start_col, Space.Newline);
 }
-fn renderParamDecl(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, indent: usize, start_col: &usize, base: &ast.Node, space: Space,) (@typeOf(stream).Child.Error || Error)!void {
+fn renderParamDecl(
+    allocator: *mem.Allocator,
+    stream: var,
+    tree: *ast.Tree,
+    indent: usize,
+    start_col: *usize,
+    base: *ast.Node,
+    space: Space,
+) (@typeOf(stream).Child.Error || Error)!void {
     const param_decl = @fieldParentPtr(ast.Node.ParamDecl, "base", base);
     if (param_decl.comptime_token) |comptime_token| {
 @@ -1643,7 +1727,14 @@ fn renderParamDecl(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, inde
     }
 }
-fn renderStatement(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, indent: usize, start_col: &usize, base: &ast.Node,) (@typeOf(stream).Child.Error || Error)!void {
+fn renderStatement(
+    allocator: *mem.Allocator,
+    stream: var,
+    tree: *ast.Tree,
+    indent: usize,
+    start_col: *usize,
+    base: *ast.Node,
+) (@typeOf(stream).Child.Error || Error)!void {
     switch (base.id) {
         ast.Node.Id.VarDecl => {
             const var_decl = @fieldParentPtr(ast.Node.VarDecl, "base", base);
 @@ -1674,7 +1765,15 @@ const Space = enum {
     BlockStart,
 };
-fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent: usize, start_col: &usize, space: Space) (@typeOf(stream).Child.Error || Error)!void {
+fn renderTokenOffset(
+    tree: *ast.Tree,
+    stream: var,
+    token_index: ast.TokenIndex,
+    indent: usize,
+    start_col: *usize,
+    space: Space,
+    token_skip_bytes: usize,
+) (@typeOf(stream).Child.Error || Error)!void {
     if (space == Space.BlockStart) {
         if (start_col.* < indent + indent_delta)
             return renderToken(tree, stream, token_index, indent, start_col, Space.Space);
 @@ -1685,7 +1784,7 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
     }
     var token = tree.tokens.at(token_index);
-    try stream.write(mem.trimRight(u8, tree.tokenSlicePtr(token), " "));
+    try stream.write(mem.trimRight(u8, tree.tokenSlicePtr(token)[token_skip_bytes..], " "));
     if (space == Space.NoComment)
         return;
 @@ -1733,6 +1832,8 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
                 }
             },
             Space.Space, Space.SpaceOrOutdent => {
+                if (next_token.id == Token.Id.MultilineStringLiteralLine)
+                    return;
                 try stream.writeByte(' ');
                 return;
             },
 @@ -1838,7 +1939,24 @@ fn renderToken(tree: &ast.Tree, stream: var, token_index: ast.TokenIndex, indent
     }
 }
-fn renderDocComments(tree: &ast.Tree, stream: var, node: var, indent: usize, start_col: &usize,) (@typeOf(stream).Child.Error || Error)!void {
+fn renderToken(
+    tree: *ast.Tree,
+    stream: var,
+    token_index: ast.TokenIndex,
+    indent: usize,
+    start_col: *usize,
+    space: Space,
+) (@typeOf(stream).Child.Error || Error)!void {
+    return renderTokenOffset(tree, stream, token_index, indent, start_col, space, 0);
+}
+fn renderDocComments(
+    tree: *ast.Tree,
+    stream: var,
+    node: var,
+    indent: usize,
+    start_col: *usize,
+) (@typeOf(stream).Child.Error || Error)!void {
     const comment = node.doc_comments ?? return;
     var it = comment.lines.iterator(0);
     const first_token = node.firstToken();
 @@ -1854,7 +1972,7 @@ fn renderDocComments(tree: &ast.Tree, stream: var, node: var, indent: usize, sta
     }
 }
-fn nodeIsBlock(base: &const ast.Node) bool {
+fn nodeIsBlock(base: *const ast.Node) bool {
     return switch (base.id) {
         ast.Node.Id.Block,
         ast.Node.Id.If,
 @@ -1865,3 +1983,11 @@ fn nodeIsBlock(base: &const ast.Node) bool {
         else => false,
     };
 }
+fn nodeCausesSliceOpSpace(base: *ast.Node) bool {
+    const infix_op = base.cast(ast.Node.InfixOp) ?? return false;
+    return switch (infix_op.op) {
+        ast.Node.InfixOp.Op.Period => false,
+        else => true,
+    };
+}

std/zig/tokenizer.zig+144-108

 @@ -11,55 +11,55 @@ pub const Token = struct {
         id: Id,
     };
-    pub const keywords = []Keyword {
+    pub const keywords = []Keyword{
-        Keyword{.bytes="align", .id = Id.Keyword_align},
+        Keyword{ .bytes = "align", .id = Id.Keyword_align },
-        Keyword{.bytes="and", .id = Id.Keyword_and},
+        Keyword{ .bytes = "and", .id = Id.Keyword_and },
-        Keyword{.bytes="asm", .id = Id.Keyword_asm},
+        Keyword{ .bytes = "asm", .id = Id.Keyword_asm },
-        Keyword{.bytes="async", .id = Id.Keyword_async},
+        Keyword{ .bytes = "async", .id = Id.Keyword_async },
-        Keyword{.bytes="await", .id = Id.Keyword_await},
+        Keyword{ .bytes = "await", .id = Id.Keyword_await },
-        Keyword{.bytes="break", .id = Id.Keyword_break},
+        Keyword{ .bytes = "break", .id = Id.Keyword_break },
-        Keyword{.bytes="catch", .id = Id.Keyword_catch},
+        Keyword{ .bytes = "catch", .id = Id.Keyword_catch },
-        Keyword{.bytes="cancel", .id = Id.Keyword_cancel},
+        Keyword{ .bytes = "cancel", .id = Id.Keyword_cancel },
-        Keyword{.bytes="comptime", .id = Id.Keyword_comptime},
+        Keyword{ .bytes = "comptime", .id = Id.Keyword_comptime },
-        Keyword{.bytes="const", .id = Id.Keyword_const},
+        Keyword{ .bytes = "const", .id = Id.Keyword_const },
-        Keyword{.bytes="continue", .id = Id.Keyword_continue},
+        Keyword{ .bytes = "continue", .id = Id.Keyword_continue },
-        Keyword{.bytes="defer", .id = Id.Keyword_defer},
+        Keyword{ .bytes = "defer", .id = Id.Keyword_defer },
-        Keyword{.bytes="else", .id = Id.Keyword_else},
+        Keyword{ .bytes = "else", .id = Id.Keyword_else },
-        Keyword{.bytes="enum", .id = Id.Keyword_enum},
+        Keyword{ .bytes = "enum", .id = Id.Keyword_enum },
-        Keyword{.bytes="errdefer", .id = Id.Keyword_errdefer},
+        Keyword{ .bytes = "errdefer", .id = Id.Keyword_errdefer },
-        Keyword{.bytes="error", .id = Id.Keyword_error},
+        Keyword{ .bytes = "error", .id = Id.Keyword_error },
-        Keyword{.bytes="export", .id = Id.Keyword_export},
+        Keyword{ .bytes = "export", .id = Id.Keyword_export },
-        Keyword{.bytes="extern", .id = Id.Keyword_extern},
+        Keyword{ .bytes = "extern", .id = Id.Keyword_extern },
-        Keyword{.bytes="false", .id = Id.Keyword_false},
+        Keyword{ .bytes = "false", .id = Id.Keyword_false },
-        Keyword{.bytes="fn", .id = Id.Keyword_fn},
+        Keyword{ .bytes = "fn", .id = Id.Keyword_fn },
-        Keyword{.bytes="for", .id = Id.Keyword_for},
+        Keyword{ .bytes = "for", .id = Id.Keyword_for },
-        Keyword{.bytes="if", .id = Id.Keyword_if},
+        Keyword{ .bytes = "if", .id = Id.Keyword_if },
-        Keyword{.bytes="inline", .id = Id.Keyword_inline},
+        Keyword{ .bytes = "inline", .id = Id.Keyword_inline },
-        Keyword{.bytes="nakedcc", .id = Id.Keyword_nakedcc},
+        Keyword{ .bytes = "nakedcc", .id = Id.Keyword_nakedcc },
-        Keyword{.bytes="noalias", .id = Id.Keyword_noalias},
+        Keyword{ .bytes = "noalias", .id = Id.Keyword_noalias },
-        Keyword{.bytes="null", .id = Id.Keyword_null},
+        Keyword{ .bytes = "null", .id = Id.Keyword_null },
-        Keyword{.bytes="or", .id = Id.Keyword_or},
+        Keyword{ .bytes = "or", .id = Id.Keyword_or },
-        Keyword{.bytes="packed", .id = Id.Keyword_packed},
+        Keyword{ .bytes = "packed", .id = Id.Keyword_packed },
-        Keyword{.bytes="promise", .id = Id.Keyword_promise},
+        Keyword{ .bytes = "promise", .id = Id.Keyword_promise },
-        Keyword{.bytes="pub", .id = Id.Keyword_pub},
+        Keyword{ .bytes = "pub", .id = Id.Keyword_pub },
-        Keyword{.bytes="resume", .id = Id.Keyword_resume},
+        Keyword{ .bytes = "resume", .id = Id.Keyword_resume },
-        Keyword{.bytes="return", .id = Id.Keyword_return},
+        Keyword{ .bytes = "return", .id = Id.Keyword_return },
-        Keyword{.bytes="section", .id = Id.Keyword_section},
+        Keyword{ .bytes = "section", .id = Id.Keyword_section },
-        Keyword{.bytes="stdcallcc", .id = Id.Keyword_stdcallcc},
+        Keyword{ .bytes = "stdcallcc", .id = Id.Keyword_stdcallcc },
-        Keyword{.bytes="struct", .id = Id.Keyword_struct},
+        Keyword{ .bytes = "struct", .id = Id.Keyword_struct },
-        Keyword{.bytes="suspend", .id = Id.Keyword_suspend},
+        Keyword{ .bytes = "suspend", .id = Id.Keyword_suspend },
-        Keyword{.bytes="switch", .id = Id.Keyword_switch},
+        Keyword{ .bytes = "switch", .id = Id.Keyword_switch },
-        Keyword{.bytes="test", .id = Id.Keyword_test},
+        Keyword{ .bytes = "test", .id = Id.Keyword_test },
-        Keyword{.bytes="this", .id = Id.Keyword_this},
+        Keyword{ .bytes = "this", .id = Id.Keyword_this },
-        Keyword{.bytes="true", .id = Id.Keyword_true},
+        Keyword{ .bytes = "true", .id = Id.Keyword_true },
-        Keyword{.bytes="try", .id = Id.Keyword_try},
+        Keyword{ .bytes = "try", .id = Id.Keyword_try },
-        Keyword{.bytes="undefined", .id = Id.Keyword_undefined},
+        Keyword{ .bytes = "undefined", .id = Id.Keyword_undefined },
-        Keyword{.bytes="union", .id = Id.Keyword_union},
+        Keyword{ .bytes = "union", .id = Id.Keyword_union },
-        Keyword{.bytes="unreachable", .id = Id.Keyword_unreachable},
+        Keyword{ .bytes = "unreachable", .id = Id.Keyword_unreachable },
-        Keyword{.bytes="use", .id = Id.Keyword_use},
+        Keyword{ .bytes = "use", .id = Id.Keyword_use },
-        Keyword{.bytes="var", .id = Id.Keyword_var},
+        Keyword{ .bytes = "var", .id = Id.Keyword_var },
-        Keyword{.bytes="volatile", .id = Id.Keyword_volatile},
+        Keyword{ .bytes = "volatile", .id = Id.Keyword_volatile },
-        Keyword{.bytes="while", .id = Id.Keyword_while},
+        Keyword{ .bytes = "while", .id = Id.Keyword_while },
     };
     // TODO perfect hash at comptime
 @@ -72,7 +72,10 @@ pub const Token = struct {
         return null;
     }
-    const StrLitKind = enum {Normal, C};
+    const StrLitKind = enum {
+        Normal,
+        C,
+    };
     pub const Id = union(enum) {
         Invalid,
 @@ -140,6 +143,7 @@ pub const Token = struct {
         FloatLiteral,
         LineComment,
         DocComment,
+        BracketStarBracket,
         Keyword_align,
         Keyword_and,
         Keyword_asm,
 @@ -197,12 +201,12 @@ pub const Tokenizer = struct {
     pending_invalid_token: ?Token,
     /// For debugging purposes
-    pub fn dump(self: &Tokenizer, token: &const Token) void {
+    pub fn dump(self: *Tokenizer, token: *const Token) void {
         std.debug.warn("{} \"{}\"\n", @tagName(token.id), self.buffer[token.start..token.end]);
     }
     pub fn init(buffer: []const u8) Tokenizer {
-        return Tokenizer {
+        return Tokenizer{
             .buffer = buffer,
             .index = 0,
             .pending_invalid_token = null,
 @@ -260,16 +264,18 @@ pub const Tokenizer = struct {
         Period,
         Period2,
         SawAtSign,
+        LBracket,
+        LBracketStar,
     };
-    pub fn next(self: &Tokenizer) Token {
+    pub fn next(self: *Tokenizer) Token {
         if (self.pending_invalid_token) |token| {
             self.pending_invalid_token = null;
             return token;
         }
         const start_index = self.index;
         var state = State.Start;
-        var result = Token {
+        var result = Token{
             .id = Token.Id.Eof,
             .start = self.index,
             .end = undefined,
 @@ -290,7 +296,7 @@ pub const Tokenizer = struct {
                     },
                     '"' => {
                         state = State.StringLiteral;
-                        result.id = Token.Id { .StringLiteral = Token.StrLitKind.Normal };
+                        result.id = Token.Id{ .StringLiteral = Token.StrLitKind.Normal };
                     },
                     '\'' => {
                         state = State.CharLiteral;
 @@ -322,9 +328,7 @@ pub const Tokenizer = struct {
                         break;
                     },
                     '[' => {
-                        result.id = Token.Id.LBracket;
+                        state = State.LBracket;
-                        self.index += 1;
-                        break;
                     },
                     ']' => {
                         result.id = Token.Id.RBracket;
 @@ -369,7 +373,7 @@ pub const Tokenizer = struct {
                     },
                     '\\' => {
                         state = State.Backslash;
-                        result.id = Token.Id { .MultilineStringLiteralLine = Token.StrLitKind.Normal };
+                        result.id = Token.Id{ .MultilineStringLiteralLine = Token.StrLitKind.Normal };
                     },
                     '{' => {
                         result.id = Token.Id.LBrace;
 @@ -426,6 +430,28 @@ pub const Tokenizer = struct {
                     },
                 },
+                State.LBracket => switch (c) {
+                    '*' => {
+                        state = State.LBracketStar;
+                    },
+                    else => {
+                        result.id = Token.Id.LBracket;
+                        break;
+                    },
+                },
+                State.LBracketStar => switch (c) {
+                    ']' => {
+                        result.id = Token.Id.BracketStarBracket;
+                        self.index += 1;
+                        break;
+                    },
+                    else => {
+                        result.id = Token.Id.Invalid;
+                        break;
+                    },
+                },
                 State.Ampersand => switch (c) {
                     '=' => {
                         result.id = Token.Id.AmpersandEqual;
 @@ -455,7 +481,7 @@ pub const Tokenizer = struct {
                     else => {
                         result.id = Token.Id.Asterisk;
                         break;
-                    }
+                    },
                 },
                 State.AsteriskPercent => switch (c) {
 @@ -467,7 +493,7 @@ pub const Tokenizer = struct {
                     else => {
                         result.id = Token.Id.AsteriskPercent;
                         break;
-                    }
+                    },
                 },
                 State.QuestionMark => switch (c) {
 @@ -535,7 +561,7 @@ pub const Tokenizer = struct {
                     else => {
                         result.id = Token.Id.Caret;
                         break;
-                    }
+                    },
                 },
                 State.Identifier => switch (c) {
 @@ -560,11 +586,11 @@ pub const Tokenizer = struct {
                 State.C => switch (c) {
                     '\\' => {
                         state = State.Backslash;
-                        result.id = Token.Id { .MultilineStringLiteralLine = Token.StrLitKind.C };
+                        result.id = Token.Id{ .MultilineStringLiteralLine = Token.StrLitKind.C };
                     },
                     '"' => {
                         state = State.StringLiteral;
-                        result.id = Token.Id { .StringLiteral = Token.StrLitKind.C };
+                        result.id = Token.Id{ .StringLiteral = Token.StrLitKind.C };
                     },
                     'a'...'z', 'A'...'Z', '_', '0'...'9' => {
                         state = State.Identifier;
 @@ -605,7 +631,7 @@ pub const Tokenizer = struct {
                         }
                         state = State.CharLiteralEnd;
-                    }
+                    },
                 },
                 State.CharLiteralBackslash => switch (c) {
 @@ -736,7 +762,7 @@ pub const Tokenizer = struct {
                     else => {
                         result.id = Token.Id.MinusPercent;
                         break;
-                    }
+                    },
                 },
                 State.AngleBracketLeft => switch (c) {
 @@ -944,7 +970,7 @@ pub const Tokenizer = struct {
                         // reinterpret as a normal exponent number
                         self.index -= 1;
                         state = State.FloatExponentNumber;
-                    }
+                    },
                 },
                 State.FloatExponentUnsignedHex => switch (c) {
                     '+', '-' => {
 @@ -954,7 +980,7 @@ pub const Tokenizer = struct {
                         // reinterpret as a normal exponent number
                         self.index -= 1;
                         state = State.FloatExponentNumberHex;
-                    }
+                    },
                 },
                 State.FloatExponentNumber => switch (c) {
                     '0'...'9' => {},
 @@ -978,15 +1004,15 @@ pub const Tokenizer = struct {
                 State.FloatExponentNumberHex,
                 State.StringLiteral, // find this error later
                 State.MultilineStringLiteralLine,
-                State.Builtin => {},
+                State.Builtin,
+                => {},
                 State.Identifier => {
                     if (Token.getKeyword(self.buffer[result.start..self.index])) |id| {
                         result.id = id;
                     }
                 },
-                State.LineCommentStart,
+                State.LineCommentStart, State.LineComment => {
-                State.LineComment => {
                     result.id = Token.Id.LineComment;
                 },
                 State.DocComment, State.DocCommentStart => {
 @@ -1004,7 +1030,9 @@ pub const Tokenizer = struct {
                 State.CharLiteralEscape1,
                 State.CharLiteralEscape2,
                 State.CharLiteralEnd,
-                State.StringLiteralBackslash => {
+                State.StringLiteralBackslash,
+                State.LBracketStar,
+                => {
                     result.id = Token.Id.Invalid;
                 },
 @@ -1020,6 +1048,9 @@ pub const Tokenizer = struct {
                 State.Slash => {
                     result.id = Token.Id.Slash;
                 },
+                State.LBracket => {
+                    result.id = Token.Id.LBracket;
+                },
                 State.Zero => {
                     result.id = Token.Id.IntegerLiteral;
                 },
 @@ -1085,18 +1116,18 @@ pub const Tokenizer = struct {
         return result;
     }
-    fn checkLiteralCharacter(self: &Tokenizer) void {
+    fn checkLiteralCharacter(self: *Tokenizer) void {
         if (self.pending_invalid_token != null) return;
         const invalid_length = self.getInvalidCharacterLength();
         if (invalid_length == 0) return;
-        self.pending_invalid_token = Token {
+        self.pending_invalid_token = Token{
             .id = Token.Id.Invalid,
             .start = self.index,
             .end = self.index + invalid_length,
         };
     }
-    fn getInvalidCharacterLength(self: &Tokenizer) u3 {
+    fn getInvalidCharacterLength(self: *Tokenizer) u3 {
         const c0 = self.buffer[self.index];
         if (c0 < 0x80) {
             if (c0 < 0x20 or c0 == 0x7f) {
 @@ -1112,7 +1143,7 @@ pub const Tokenizer = struct {
             if (self.index + length > self.buffer.len) {
                 return u3(self.buffer.len - self.index);
             }
-            const bytes = self.buffer[self.index..self.index + length];
+            const bytes = self.buffer[self.index .. self.index + length];
             switch (length) {
                 2 => {
                     const value = std.unicode.utf8Decode2(bytes) catch return length;
 @@ -1134,23 +1165,27 @@ pub const Tokenizer = struct {
     }
 };
 test "tokenizer" {
-    testTokenize("test", []Token.Id {
+    testTokenize("test", []Token.Id{Token.Id.Keyword_test});
-        Token.Id.Keyword_test,
+}
+test "tokenizer - unknown length pointer" {
+    testTokenize(
+        \\[*]u8
+    , []Token.Id{
+        Token.Id.BracketStarBracket,
+        Token.Id.Identifier,
     });
 }
 test "tokenizer - char literal with hex escape" {
-    testTokenize( \\'\x1b'
+    testTokenize(
-    , []Token.Id {
+        \\'\x1b'
-        Token.Id.CharLiteral,
+    , []Token.Id{Token.Id.CharLiteral});
-    });
 }
 test "tokenizer - float literal e exponent" {
-    testTokenize("a = 4.94065645841246544177e-324;\n", []Token.Id {
+    testTokenize("a = 4.94065645841246544177e-324;\n", []Token.Id{
         Token.Id.Identifier,
         Token.Id.Equal,
         Token.Id.FloatLiteral,
 @@ -1159,7 +1194,7 @@ test "tokenizer - float literal e exponent" {
 }
 test "tokenizer - float literal p exponent" {
-    testTokenize("a = 0x1.a827999fcef32p+1022;\n", []Token.Id {
+    testTokenize("a = 0x1.a827999fcef32p+1022;\n", []Token.Id{
         Token.Id.Identifier,
         Token.Id.Equal,
         Token.Id.FloatLiteral,
 @@ -1168,31 +1203,31 @@ test "tokenizer - float literal p exponent" {
 }
 test "tokenizer - chars" {
-    testTokenize("'c'", []Token.Id {Token.Id.CharLiteral});
+    testTokenize("'c'", []Token.Id{Token.Id.CharLiteral});
 }
 test "tokenizer - invalid token characters" {
     testTokenize("#", []Token.Id{Token.Id.Invalid});
     testTokenize("`", []Token.Id{Token.Id.Invalid});
-    testTokenize("'c", []Token.Id {Token.Id.Invalid});
+    testTokenize("'c", []Token.Id{Token.Id.Invalid});
-    testTokenize("'", []Token.Id {Token.Id.Invalid});
+    testTokenize("'", []Token.Id{Token.Id.Invalid});
-    testTokenize("''", []Token.Id {Token.Id.Invalid, Token.Id.Invalid});
+    testTokenize("''", []Token.Id{ Token.Id.Invalid, Token.Id.Invalid });
 }
 test "tokenizer - invalid literal/comment characters" {
-    testTokenize("\"\x00\"", []Token.Id {
+    testTokenize("\"\x00\"", []Token.Id{
-        Token.Id { .StringLiteral = Token.StrLitKind.Normal },
+        Token.Id{ .StringLiteral = Token.StrLitKind.Normal },
         Token.Id.Invalid,
     });
-    testTokenize("//\x00", []Token.Id {
+    testTokenize("//\x00", []Token.Id{
         Token.Id.LineComment,
         Token.Id.Invalid,
     });
-    testTokenize("//\x1f", []Token.Id {
+    testTokenize("//\x1f", []Token.Id{
         Token.Id.LineComment,
         Token.Id.Invalid,
     });
-    testTokenize("//\x7f", []Token.Id {
+    testTokenize("//\x7f", []Token.Id{
         Token.Id.LineComment,
         Token.Id.Invalid,
     });
 @@ -1261,18 +1296,16 @@ test "tokenizer - illegal unicode codepoints" {
 test "tokenizer - string identifier and builtin fns" {
     testTokenize(
         \\const @"if" = @import("std");
-    ,
+    , []Token.Id{
-        []Token.Id{
+        Token.Id.Keyword_const,
-            Token.Id.Keyword_const,
+        Token.Id.Identifier,
-            Token.Id.Identifier,
+        Token.Id.Equal,
-            Token.Id.Equal,
+        Token.Id.Builtin,
-            Token.Id.Builtin,
+        Token.Id.LParen,
-            Token.Id.LParen,
+        Token.Id{ .StringLiteral = Token.StrLitKind.Normal },
-            Token.Id {.StringLiteral = Token.StrLitKind.Normal},
+        Token.Id.RParen,
-            Token.Id.RParen,
+        Token.Id.Semicolon,
-            Token.Id.Semicolon,
+    });
-        }
-    );
 }
 test "tokenizer - pipe and then invalid" {
 @@ -1314,7 +1347,10 @@ fn testTokenize(source: []const u8, expected_tokens: []const Token.Id) void {
         }
         switch (expected_token_id) {
             Token.Id.StringLiteral => |expected_kind| {
-                std.debug.assert(expected_kind == switch (token.id) { Token.Id.StringLiteral => |kind| kind, else => unreachable });
+                std.debug.assert(expected_kind == switch (token.id) {
+                    Token.Id.StringLiteral => |kind| kind,
+                    else => unreachable,
+                });
             },
             else => {},
         }

test/assemble_and_link.zig+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const builtin = @import("builtin");	1	const builtin = @import("builtin");
2	const tests = @import("tests.zig");	2	const tests = @import("tests.zig");
3		3
4	pub fn addCases(cases: &tests.CompareOutputContext) void {	4	pub fn addCases(cases: *tests.CompareOutputContext) void {
5	if (builtin.os == builtin.Os.linux and builtin.arch == builtin.Arch.x86_64) {	5	if (builtin.os == builtin.Os.linux and builtin.arch == builtin.Arch.x86_64) {
6	cases.addAsm("hello world linux x86_64",	6	cases.addAsm("hello world linux x86_64",
7	\\.text	7	\\.text

test/build_examples.zig+1-1

...	@@ -2,7 +2,7 @@ const tests = @import("tests.zig");	...	@@ -2,7 +2,7 @@ const tests = @import("tests.zig");
2	const builtin = @import("builtin");	2	const builtin = @import("builtin");
3	const is_windows = builtin.os == builtin.Os.windows;	3	const is_windows = builtin.os == builtin.Os.windows;
4		4
5	pub fn addCases(cases: &tests.BuildExamplesContext) void {	5	pub fn addCases(cases: *tests.BuildExamplesContext) void {
6	cases.add("example/hello_world/hello.zig");	6	cases.add("example/hello_world/hello.zig");
7	cases.addC("example/hello_world/hello_libc.zig");	7	cases.addC("example/hello_world/hello_libc.zig");
8	cases.add("example/cat/main.zig");	8	cases.add("example/cat/main.zig");

test/cases/align.zig+44-57

 @@ -5,7 +5,7 @@ var foo: u8 align(4) = 100;
 test "global variable alignment" {
     assert(@typeOf(&foo).alignment == 4);
-    assert(@typeOf(&foo) == &align(4) u8);
+    assert(@typeOf(&foo) == *align(4) u8);
     const slice = (&foo)[0..1];
     assert(@typeOf(slice) == []align(4) u8);
 }
 @@ -18,8 +18,8 @@ fn noop4() align(4) void {}
 test "function alignment" {
     assert(derp() == 1234);
-    assert(@typeOf(noop1) == fn() align(1) void);
+    assert(@typeOf(noop1) == fn () align(1) void);
-    assert(@typeOf(noop4) == fn() align(4) void);
+    assert(@typeOf(noop4) == fn () align(4) void);
     noop1();
     noop4();
 }
 @@ -30,7 +30,7 @@ var baz: packed struct {
 } = undefined;
 test "packed struct alignment" {
-    assert(@typeOf(&baz.b) == &align(1) u32);
+    assert(@typeOf(&baz.b) == *align(1) u32);
 }
 const blah: packed struct {
 @@ -40,11 +40,11 @@ const blah: packed struct {
 } = undefined;
 test "bit field alignment" {
-    assert(@typeOf(&blah.b) == &align(1:3:6) const u3);
+    assert(@typeOf(&blah.b) == *align(1:3:6) const u3);
 }
 test "default alignment allows unspecified in type syntax" {
-    assert(&u32 == &align(@alignOf(u32)) u32);
+    assert(*u32 == *align(@alignOf(u32)) u32);
 }
 test "implicitly decreasing pointer alignment" {
 @@ -53,7 +53,7 @@ test "implicitly decreasing pointer alignment" {
     assert(addUnaligned(&a, &b) == 7);
 }
-fn addUnaligned(a: &align(1) const u32, b: &align(1) const u32) u32 {
+fn addUnaligned(a: *align(1) const u32, b: *align(1) const u32) u32 {
     return a.* + b.*;
 }
 @@ -70,13 +70,13 @@ test "specifying alignment allows pointer cast" {
     testBytesAlign(0x33);
 }
 fn testBytesAlign(b: u8) void {
-    var bytes align(4) = []u8 {
+    var bytes align(4) = []u8{
         b,
         b,
         b,
         b,
     };
-    const ptr = @ptrCast(&u32, &bytes[0]);
+    const ptr = @ptrCast(*u32, &bytes[0]);
     assert(ptr.* == 0x33333333);
 }
 @@ -84,7 +84,7 @@ test "specifying alignment allows slice cast" {
     testBytesAlignSlice(0x33);
 }
 fn testBytesAlignSlice(b: u8) void {
-    var bytes align(4) = []u8 {
+    var bytes align(4) = []u8{
         b,
         b,
         b,
 @@ -99,15 +99,15 @@ test "@alignCast pointers" {
     expectsOnly1(&x);
     assert(x == 2);
 }
-fn expectsOnly1(x: &align(1) u32) void {
+fn expectsOnly1(x: *align(1) u32) void {
     expects4(@alignCast(4, x));
 }
-fn expects4(x: &align(4) u32) void {
+fn expects4(x: *align(4) u32) void {
     x.* += 1;
 }
 test "@alignCast slices" {
-    var array align(4) = []u32 {
+    var array align(4) = []u32{
         1,
         1,
     };
 @@ -127,7 +127,7 @@ test "implicitly decreasing fn alignment" {
     testImplicitlyDecreaseFnAlign(alignedBig, 5678);
 }
-fn testImplicitlyDecreaseFnAlign(ptr: fn() align(1) i32, answer: i32) void {
+fn testImplicitlyDecreaseFnAlign(ptr: fn () align(1) i32, answer: i32) void {
     assert(ptr() == answer);
 }
 @@ -141,10 +141,10 @@ fn alignedBig() align(16) i32 {
 test "@alignCast functions" {
     assert(fnExpectsOnly1(simple4) == 0x19);
 }
-fn fnExpectsOnly1(ptr: fn() align(1) i32) i32 {
+fn fnExpectsOnly1(ptr: fn () align(1) i32) i32 {
     return fnExpects4(@alignCast(4, ptr));
 }
-fn fnExpects4(ptr: fn() align(4) i32) i32 {
+fn fnExpects4(ptr: fn () align(4) i32) i32 {
     return ptr();
 }
 fn simple4() align(4) i32 {
 @@ -163,58 +163,45 @@ fn whyWouldYouEverDoThis(comptime align_bytes: u8) align(align_bytes) u8 {
 test "@ptrCast preserves alignment of bigger source" {
     var x: u32 align(16) = 1234;
-    const ptr = @ptrCast(&u8, &x);
+    const ptr = @ptrCast(*u8, &x);
-    assert(@typeOf(ptr) == &align(16) u8);
+    assert(@typeOf(ptr) == *align(16) u8);
 }
-test "compile-time known array index has best alignment possible" {
+test "runtime known array index has best alignment possible" {
     // take full advantage of over-alignment
-    var array align(4) = []u8 {
+    var array align(4) = []u8{ 1, 2, 3, 4 };
-        1,
+    assert(@typeOf(&array[0]) == *align(4) u8);
-        2,
+    assert(@typeOf(&array[1]) == *u8);
-        3,
+    assert(@typeOf(&array[2]) == *align(2) u8);
-        4,
+    assert(@typeOf(&array[3]) == *u8);
-    };
-    assert(@typeOf(&array[0]) == &align(4) u8);
-    assert(@typeOf(&array[1]) == &u8);
-    assert(@typeOf(&array[2]) == &align(2) u8);
-    assert(@typeOf(&array[3]) == &u8);
     // because align is too small but we still figure out to use 2
-    var bigger align(2) = []u64 {
+    var bigger align(2) = []u64{ 1, 2, 3, 4 };
-        1,
+    assert(@typeOf(&bigger[0]) == *align(2) u64);
-        2,
+    assert(@typeOf(&bigger[1]) == *align(2) u64);
-        3,
+    assert(@typeOf(&bigger[2]) == *align(2) u64);
-        4,
+    assert(@typeOf(&bigger[3]) == *align(2) u64);
-    };
-    assert(@typeOf(&bigger[0]) == &align(2) u64);
-    assert(@typeOf(&bigger[1]) == &align(2) u64);
-    assert(@typeOf(&bigger[2]) == &align(2) u64);
-    assert(@typeOf(&bigger[3]) == &align(2) u64);
     // because pointer is align 2 and u32 align % 2 == 0 we can assume align 2
-    var smaller align(2) = []u32 {
+    var smaller align(2) = []u32{ 1, 2, 3, 4 };
-        1,
+    comptime assert(@typeOf(smaller[0..]) == []align(2) u32);
-        2,
+    comptime assert(@typeOf(smaller[0..].ptr) == [*]align(2) u32);
-        3,
+    testIndex(smaller[0..].ptr, 0, *align(2) u32);
-        4,
+    testIndex(smaller[0..].ptr, 1, *align(2) u32);
-    };
+    testIndex(smaller[0..].ptr, 2, *align(2) u32);
-    testIndex(&smaller[0], 0, &align(2) u32);
+    testIndex(smaller[0..].ptr, 3, *align(2) u32);
-    testIndex(&smaller[0], 1, &align(2) u32);
-    testIndex(&smaller[0], 2, &align(2) u32);
-    testIndex(&smaller[0], 3, &align(2) u32);
     // has to use ABI alignment because index known at runtime only
-    testIndex2(&array[0], 0, &u8);
+    testIndex2(array[0..].ptr, 0, *u8);
-    testIndex2(&array[0], 1, &u8);
+    testIndex2(array[0..].ptr, 1, *u8);
-    testIndex2(&array[0], 2, &u8);
+    testIndex2(array[0..].ptr, 2, *u8);
-    testIndex2(&array[0], 3, &u8);
+    testIndex2(array[0..].ptr, 3, *u8);
 }
-fn testIndex(smaller: &align(2) u32, index: usize, comptime T: type) void {
+fn testIndex(smaller: [*]align(2) u32, index: usize, comptime T: type) void {
-    assert(@typeOf(&smaller[index]) == T);
+    comptime assert(@typeOf(&smaller[index]) == T);
 }
-fn testIndex2(ptr: &align(4) u8, index: usize, comptime T: type) void {
+fn testIndex2(ptr: [*]align(4) u8, index: usize, comptime T: type) void {
-    assert(@typeOf(&ptr[index]) == T);
+    comptime assert(@typeOf(&ptr[index]) == T);
 }
 test "alignstack" {

test/cases/array.zig+5-7

...	@@ -34,7 +34,7 @@ test "void arrays" {	...	@@ -34,7 +34,7 @@ test "void arrays" {
34	}	34	}
35		35
36	test "array literal" {	36	test "array literal" {
37	const hex_mult = []u16 {	37	const hex_mult = []u16{
38	4096,	38	4096,
39	256,	39	256,
40	16,	40	16,
...	@@ -54,7 +54,7 @@ test "array dot len const expr" {	...	@@ -54,7 +54,7 @@ test "array dot len const expr" {
54	const ArrayDotLenConstExpr = struct {	54	const ArrayDotLenConstExpr = struct {
55	y: [some_array.len]u8,	55	y: [some_array.len]u8,
56	};	56	};
57	const some_array = []u8 {	57	const some_array = []u8{
58	0,	58	0,
59	1,	59	1,
60	2,	60	2,
...	@@ -62,7 +62,7 @@ const some_array = []u8 {	...	@@ -62,7 +62,7 @@ const some_array = []u8 {
62	};	62	};
63		63
64	test "nested arrays" {	64	test "nested arrays" {
65	const array_of_strings = [][]const u8 {	65	const array_of_strings = [][]const u8{
66	"hello",	66	"hello",
67	"this",	67	"this",
68	"is",	68	"is",
...	@@ -86,9 +86,7 @@ const Str = struct {	...	@@ -86,9 +86,7 @@ const Str = struct {
86	a: []Sub,	86	a: []Sub,
87	};	87	};
88	test "set global var array via slice embedded in struct" {	88	test "set global var array via slice embedded in struct" {
89	var s = Str {	89	var s = Str{ .a = s_array[0..] };
90	.a = s_array[0..],
91	};
92		90
93	s.a[0].b = 1;	91	s.a[0].b = 1;
94	s.a[1].b = 2;	92	s.a[1].b = 2;
...	@@ -100,7 +98,7 @@ test "set global var array via slice embedded in struct" {	...	@@ -100,7 +98,7 @@ test "set global var array via slice embedded in struct" {
100	}	98	}
101		99
102	test "array literal with specified size" {	100	test "array literal with specified size" {
103	var array = [2]u8 {	101	var array = [2]u8{
104	1,	102	1,
105	2,	103	2,
106	};	104	};

test/cases/atomics.zig+6-6

...	@@ -34,7 +34,7 @@ test "atomicrmw and atomicload" {	...	@@ -34,7 +34,7 @@ test "atomicrmw and atomicload" {
34	testAtomicLoad(&data);	34	testAtomicLoad(&data);
35	}	35	}
36		36
37	fn testAtomicRmw(ptr: &u8) void {	37	fn testAtomicRmw(ptr: *u8) void {
38	const prev_value = @atomicRmw(u8, ptr, AtomicRmwOp.Xchg, 42, AtomicOrder.SeqCst);	38	const prev_value = @atomicRmw(u8, ptr, AtomicRmwOp.Xchg, 42, AtomicOrder.SeqCst);
39	assert(prev_value == 200);	39	assert(prev_value == 200);
40	comptime {	40	comptime {
...	@@ -45,7 +45,7 @@ fn testAtomicRmw(ptr: &u8) void {	...	@@ -45,7 +45,7 @@ fn testAtomicRmw(ptr: &u8) void {
45	}	45	}
46	}	46	}
47		47
48	fn testAtomicLoad(ptr: &u8) void {	48	fn testAtomicLoad(ptr: *u8) void {
49	const x = @atomicLoad(u8, ptr, AtomicOrder.SeqCst);	49	const x = @atomicLoad(u8, ptr, AtomicOrder.SeqCst);
50	assert(x == 42);	50	assert(x == 42);
51	}	51	}
...	@@ -54,18 +54,18 @@ test "cmpxchg with ptr" {	...	@@ -54,18 +54,18 @@ test "cmpxchg with ptr" {
54	var data1: i32 = 1234;	54	var data1: i32 = 1234;
55	var data2: i32 = 5678;	55	var data2: i32 = 5678;
56	var data3: i32 = 9101;	56	var data3: i32 = 9101;
57	var x: &i32 = &data1;	57	var x: *i32 = &data1;
58	if (@cmpxchgWeak(&i32, &x, &data2, &data3, AtomicOrder.SeqCst, AtomicOrder.SeqCst)) \|x1\| {	58	if (@cmpxchgWeak(*i32, &x, &data2, &data3, AtomicOrder.SeqCst, AtomicOrder.SeqCst)) \|x1\| {
59	assert(x1 == &data1);	59	assert(x1 == &data1);
60	} else {	60	} else {
61	@panic("cmpxchg should have failed");	61	@panic("cmpxchg should have failed");
62	}	62	}
63		63
64	while (@cmpxchgWeak(&i32, &x, &data1, &data3, AtomicOrder.SeqCst, AtomicOrder.SeqCst)) \|x1\| {	64	while (@cmpxchgWeak(*i32, &x, &data1, &data3, AtomicOrder.SeqCst, AtomicOrder.SeqCst)) \|x1\| {
65	assert(x1 == &data1);	65	assert(x1 == &data1);
66	}	66	}
67	assert(x == &data3);	67	assert(x == &data3);
68		68
69	assert(@cmpxchgStrong(&i32, &x, &data3, &data2, AtomicOrder.SeqCst, AtomicOrder.SeqCst) == null);	69	assert(@cmpxchgStrong(*i32, &x, &data3, &data2, AtomicOrder.SeqCst, AtomicOrder.SeqCst) == null);
70	assert(x == &data2);	70	assert(x == &data2);
71	}	71	}

test/cases/bugs/394.zig+2-4

 @@ -10,11 +10,9 @@ const S = struct {
 const assert = @import("std").debug.assert;
 test "bug 394 fixed" {
-    const x = S {
+    const x = S{
         .x = 3,
-        .y = E {
+        .y = E{ .B = 1 },
-            .B = 1,
-        },
     };
     assert(x.x == 3);
 }

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

...	@@ -3,10 +3,10 @@ const other_file = @import("655_other_file.zig");	...	@@ -3,10 +3,10 @@ const other_file = @import("655_other_file.zig");
3		3
4	test "function with &const parameter with type dereferenced by namespace" {	4	test "function with &const parameter with type dereferenced by namespace" {
5	const x: other_file.Integer = 1234;	5	const x: other_file.Integer = 1234;
6	comptime std.debug.assert(@typeOf(&x) == &const other_file.Integer);	6	comptime std.debug.assert(@typeOf(&x) == *const other_file.Integer);
7	foo(x);	7	foo(x);
8	}	8	}
9		9
10	fn foo(x: &const other_file.Integer) void {	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+2-4

 @@ -14,10 +14,8 @@ test "nullable if after an if in a switch prong of a switch with 2 prongs in an
 }
 fn foo(a: bool, b: bool) void {
-    var prefix_op = PrefixOp {
+    var prefix_op = PrefixOp{
-        .AddrOf = Value {
+        .AddrOf = Value{ .align_expr = 1234 },
-            .align_expr = 1234,
-        },
     };
     if (a) {} else {
         switch (prefix_op) {

test/cases/bugs/828.zig+5-9

 @@ -1,27 +1,23 @@
 const CountBy = struct {
     a: usize,
-    const One = CountBy {
+    const One = CountBy{ .a = 1 };
-        .a = 1,
-    };
-    pub fn counter(self: &const CountBy) Counter {
+    pub fn counter(self: *const CountBy) Counter {
-        return Counter {
+        return Counter{ .i = 0 };
-            .i = 0,
-        };
     }
 };
 const Counter = struct {
     i: usize,
-    pub fn count(self: &Counter) bool {
+    pub fn count(self: *Counter) bool {
         self.i += 1;
         return self.i <= 10;
     }
 };
-fn constCount(comptime cb: &const CountBy, comptime unused: u32) void {
+fn constCount(comptime cb: *const CountBy, comptime unused: u32) void {
     comptime {
         var cnt = cb.counter();
         if (cnt.i != 0) @compileError("Counter instance reused!");

test/cases/bugs/920.zig+4-4

...	@@ -7,12 +7,12 @@ const ZigTable = struct {	...	@@ -7,12 +7,12 @@ const ZigTable = struct {
7	x: [257]f64,	7	x: [257]f64,
8	f: [257]f64,	8	f: [257]f64,
9		9
10	pdf: fn(f64) f64,	10	pdf: fn (f64) f64,
11	is_symmetric: bool,	11	is_symmetric: bool,
12	zero_case: fn(&Random, f64) f64,	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, 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 {
16	var tables: ZigTable = undefined;	16	var tables: ZigTable = undefined;
17		17
18	tables.is_symmetric = is_symmetric;	18	tables.is_symmetric = is_symmetric;
...	@@ -45,7 +45,7 @@ fn norm_f(x: f64) f64 {	...	@@ -45,7 +45,7 @@ fn norm_f(x: f64) f64 {
45	fn norm_f_inv(y: f64) f64 {	45	fn norm_f_inv(y: f64) f64 {
46	return math.sqrt(-2.0 * math.ln(y));	46	return math.sqrt(-2.0 * math.ln(y));
47	}	47	}
48	fn norm_zero_case(random: &Random, u: f64) f64 {	48	fn norm_zero_case(random: *Random, u: f64) f64 {
49	return 0.0;	49	return 0.0;
50	}	50	}
51		51

test/cases/cast.zig+29-44

 @@ -3,20 +3,20 @@ const mem = @import("std").mem;
 test "int to ptr cast" {
     const x = usize(13);
-    const y = @intToPtr(&u8, x);
+    const y = @intToPtr(*u8, x);
     const z = @ptrToInt(y);
     assert(z == 13);
 }
 test "integer literal to pointer cast" {
-    const vga_mem = @intToPtr(&u16, 0xB8000);
+    const vga_mem = @intToPtr(*u16, 0xB8000);
     assert(@ptrToInt(vga_mem) == 0xB8000);
 }
 test "pointer reinterpret const float to int" {
     const float: f64 = 5.99999999999994648725e-01;
     const float_ptr = &float;
-    const int_ptr = @ptrCast(&const i32, float_ptr);
+    const int_ptr = @ptrCast(*const i32, float_ptr);
     const int_val = int_ptr.*;
     assert(int_val == 858993411);
 }
 @@ -28,32 +28,26 @@ test "implicitly cast a pointer to a const pointer of it" {
     assert(x == 2);
 }
-fn funcWithConstPtrPtr(x: &const &i32) void {
+fn funcWithConstPtrPtr(x: *const *i32) void {
     x.*.* += 1;
 }
 test "implicitly cast a container to a const pointer of it" {
-    const z = Struct(void) {
+    const z = Struct(void){ .x = void{} };
-        .x = void{},
-    };
     assert(0 == @sizeOf(@typeOf(z)));
     assert(void{} == Struct(void).pointer(z).x);
     assert(void{} == Struct(void).pointer(&z).x);
     assert(void{} == Struct(void).maybePointer(z).x);
     assert(void{} == Struct(void).maybePointer(&z).x);
     assert(void{} == Struct(void).maybePointer(null).x);
-    const s = Struct(u8) {
+    const s = Struct(u8){ .x = 42 };
-        .x = 42,
-    };
     assert(0 != @sizeOf(@typeOf(s)));
     assert(42 == Struct(u8).pointer(s).x);
     assert(42 == Struct(u8).pointer(&s).x);
     assert(42 == Struct(u8).maybePointer(s).x);
     assert(42 == Struct(u8).maybePointer(&s).x);
     assert(0 == Struct(u8).maybePointer(null).x);
-    const u = Union {
+    const u = Union{ .x = 42 };
-        .x = 42,
-    };
     assert(42 == Union.pointer(u).x);
     assert(42 == Union.pointer(&u).x);
     assert(42 == Union.maybePointer(u).x);
 @@ -72,14 +66,12 @@ fn Struct(comptime T: type) type {
         const Self = this;
         x: T,
-        fn pointer(self: &const Self) Self {
+        fn pointer(self: *const Self) Self {
             return self.*;
         }
-        fn maybePointer(self: ?&const Self) Self {
+        fn maybePointer(self: ?*const Self) Self {
-            const none = Self {
+            const none = Self{ .x = if (T == void) void{} else 0 };
-                .x = if (T == void) void{} else 0,
-            };
             return (self ?? &none).*;
         }
     };
 @@ -88,14 +80,12 @@ fn Struct(comptime T: type) type {
 const Union = union {
     x: u8,
-    fn pointer(self: &const Union) Union {
+    fn pointer(self: *const Union) Union {
         return self.*;
     }
-    fn maybePointer(self: ?&const Union) Union {
+    fn maybePointer(self: ?*const Union) Union {
-        const none = Union {
+        const none = Union{ .x = 0 };
-            .x = 0,
-        };
         return (self ?? &none).*;
     }
 };
 @@ -104,11 +94,11 @@ const Enum = enum {
     None,
     Some,
-    fn pointer(self: &const Enum) Enum {
+    fn pointer(self: *const Enum) Enum {
         return self.*;
     }
-    fn maybePointer(self: ?&const Enum) Enum {
+    fn maybePointer(self: ?*const Enum) Enum {
         return (self ?? &Enum.None).*;
     }
 };
 @@ -117,22 +107,20 @@ test "implicitly cast indirect pointer to maybe-indirect pointer" {
     const S = struct {
         const Self = this;
         x: u8,
-        fn constConst(p: &const &const Self) u8 {
+        fn constConst(p: *const *const Self) u8 {
             return (p.*).x;
         }
-        fn maybeConstConst(p: ?&const &const Self) u8 {
+        fn maybeConstConst(p: ?*const *const Self) u8 {
             return ((??p).*).x;
         }
-        fn constConstConst(p: &const &const &const Self) u8 {
+        fn constConstConst(p: *const *const *const Self) u8 {
             return (p.*.*).x;
         }
-        fn maybeConstConstConst(p: ?&const &const &const Self) u8 {
+        fn maybeConstConstConst(p: ?*const *const *const Self) u8 {
             return ((??p).*.*).x;
         }
     };
-    const s = S {
+    const s = S{ .x = 42 };
-        .x = 42,
-    };
     const p = &s;
     const q = &p;
     const r = &q;
 @@ -178,12 +166,12 @@ fn testPeerResolveArrayConstSlice(b: bool) void {
 }
 test "integer literal to &const int" {
-    const x: &const i32 = 3;
+    const x: *const i32 = 3;
     assert(x.* == 3);
 }
 test "string literal to &const []const u8" {
-    const x: &const []const u8 = "hello";
+    const x: *const []const u8 = "hello";
     assert(mem.eql(u8, x.*, "hello"));
 }
 @@ -202,9 +190,7 @@ fn castToMaybeTypeError(z: i32) void {
     const f = z;
     const g: error!?i32 = f;
-    const a = A {
+    const a = A{ .a = z };
-        .a = z,
-    };
     const b: error!?A = a;
     assert((??(b catch unreachable)).a == 1);
 }
 @@ -223,11 +209,11 @@ test "return null from fn() error!?&T" {
     const b = returnNullLitFromMaybeTypeErrorRef();
     assert((try a) == null and (try b) == null);
 }
-fn returnNullFromMaybeTypeErrorRef() error!?&A {
+fn returnNullFromMaybeTypeErrorRef() error!?*A {
-    const a: ?&A = null;
+    const a: ?*A = null;
     return a;
 }
-fn returnNullLitFromMaybeTypeErrorRef() error!?&A {
+fn returnNullLitFromMaybeTypeErrorRef() error!?*A {
     return null;
 }
 @@ -326,7 +312,7 @@ test "implicit cast from &const [N]T to []const T" {
 fn testCastConstArrayRefToConstSlice() void {
     const blah = "aoeu";
     const const_array_ref = &blah;
-    assert(@typeOf(const_array_ref) == &const [4]u8);
+    assert(@typeOf(const_array_ref) == *const [4]u8);
     const slice: []const u8 = const_array_ref;
     assert(mem.eql(u8, slice, "aoeu"));
 }
 @@ -336,14 +322,13 @@ test "var args implicitly casts by value arg to const ref" {
 }
 fn foo(args: ...) void {
-    assert(@typeOf(args[0]) == &const [5]u8);
+    assert(@typeOf(args[0]) == *const [5]u8);
 }
 test "peer type resolution: error and [N]T" {
     // TODO: implicit error!T to error!U where T can implicitly cast to U
     //assert(mem.eql(u8, try testPeerErrorAndArray(0), "OK"));
     //comptime assert(mem.eql(u8, try testPeerErrorAndArray(0), "OK"));
     assert(mem.eql(u8, try testPeerErrorAndArray2(1), "OKK"));
     comptime assert(mem.eql(u8, try testPeerErrorAndArray2(1), "OKK"));
 }
 @@ -387,7 +372,7 @@ fn cast128Float(x: u128) f128 {
 }
 test "const slice widen cast" {
-    const bytes align(4) = []u8 {
+    const bytes align(4) = []u8{
         0x12,
         0x12,
         0x12,

test/cases/const_slice_child.zig+5-4

 @@ -1,15 +1,16 @@
 const debug = @import("std").debug;
 const assert = debug.assert;
-var argv: &const &const u8 = undefined;
+var argv: [*]const [*]const u8 = undefined;
 test "const slice child" {
-    const strs = ([]&const u8) {
+    const strs = ([][*]const u8){
         c"one",
         c"two",
         c"three",
     };
-    argv = &strs[0];
+    // TODO this should implicitly cast
+    argv = @ptrCast([*]const [*]const u8, &strs);
     bar(strs.len);
 }
 @@ -29,7 +30,7 @@ fn bar(argc: usize) void {
     foo(args);
 }
-fn strlen(ptr: &const u8) usize {
+fn strlen(ptr: [*]const u8) usize {
     var count: usize = 0;
     while (ptr[count] != 0) : (count += 1) {}
     return count;

test/cases/coroutines.zig+7-22

...	@@ -10,7 +10,6 @@ test "create a coroutine and cancel it" {	...	@@ -10,7 +10,6 @@ test "create a coroutine and cancel it" {
10	cancel p;	10	cancel p;
11	assert(x == 2);	11	assert(x == 2);
12	}	12	}
13
14	async fn simpleAsyncFn() void {	13	async fn simpleAsyncFn() void {
15	x += 1;	14	x += 1;
16	suspend;	15	suspend;
...	@@ -28,7 +27,6 @@ test "coroutine suspend, resume, cancel" {	...	@@ -28,7 +27,6 @@ test "coroutine suspend, resume, cancel" {
28		27
29	assert(std.mem.eql(u8, points, "abcdefg"));	28	assert(std.mem.eql(u8, points, "abcdefg"));
30	}	29	}
31
32	async fn testAsyncSeq() void {	30	async fn testAsyncSeq() void {
33	defer seq('e');	31	defer seq('e');
34		32
...	@@ -36,7 +34,7 @@ async fn testAsyncSeq() void {	...	@@ -36,7 +34,7 @@ async fn testAsyncSeq() void {
36	suspend;	34	suspend;
37	seq('d');	35	seq('d');
38	}	36	}
39	var points = []u8 {0} ** "abcdefg".len;	37	var points = []u8{0} ** "abcdefg".len;
40	var index: usize = 0;	38	var index: usize = 0;
41		39
42	fn seq(c: u8) void {	40	fn seq(c: u8) void {
...	@@ -54,7 +52,6 @@ test "coroutine suspend with block" {	...	@@ -54,7 +52,6 @@ test "coroutine suspend with block" {
54		52
55	var a_promise: promise = undefined;	53	var a_promise: promise = undefined;
56	var result = false;	54	var result = false;
57
58	async fn testSuspendBlock() void {	55	async fn testSuspendBlock() void {
59	suspend \|p\| {	56	suspend \|p\| {
60	comptime assert(@typeOf(p) == promise->void);	57	comptime assert(@typeOf(p) == promise->void);
...	@@ -75,7 +72,6 @@ test "coroutine await" {	...	@@ -75,7 +72,6 @@ test "coroutine await" {
75	assert(await_final_result == 1234);	72	assert(await_final_result == 1234);
76	assert(std.mem.eql(u8, await_points, "abcdefghi"));	73	assert(std.mem.eql(u8, await_points, "abcdefghi"));
77	}	74	}
78
79	async fn await_amain() void {	75	async fn await_amain() void {
80	await_seq('b');	76	await_seq('b');
81	const p = async await_another() catch unreachable;	77	const p = async await_another() catch unreachable;
...	@@ -83,7 +79,6 @@ async fn await_amain() void {	...	@@ -83,7 +79,6 @@ async fn await_amain() void {
83	await_final_result = await p;	79	await_final_result = await p;
84	await_seq('h');	80	await_seq('h');
85	}	81	}
86
87	async fn await_another() i32 {	82	async fn await_another() i32 {
88	await_seq('c');	83	await_seq('c');
89	suspend \|p\| {	84	suspend \|p\| {
...	@@ -94,7 +89,7 @@ async fn await_another() i32 {	...	@@ -94,7 +89,7 @@ async fn await_another() i32 {
94	return 1234;	89	return 1234;
95	}	90	}
96		91
97	var await_points = []u8 {0} ** "abcdefghi".len;	92	var await_points = []u8{0} ** "abcdefghi".len;
98	var await_seq_index: usize = 0;	93	var await_seq_index: usize = 0;
99		94
100	fn await_seq(c: u8) void {	95	fn await_seq(c: u8) void {
...	@@ -111,7 +106,6 @@ test "coroutine await early return" {	...	@@ -111,7 +106,6 @@ test "coroutine await early return" {
111	assert(early_final_result == 1234);	106	assert(early_final_result == 1234);
112	assert(std.mem.eql(u8, early_points, "abcdef"));	107	assert(std.mem.eql(u8, early_points, "abcdef"));
113	}	108	}
114
115	async fn early_amain() void {	109	async fn early_amain() void {
116	early_seq('b');	110	early_seq('b');
117	const p = async early_another() catch unreachable;	111	const p = async early_another() catch unreachable;
...	@@ -119,13 +113,12 @@ async fn early_amain() void {	...	@@ -119,13 +113,12 @@ async fn early_amain() void {
119	early_final_result = await p;	113	early_final_result = await p;
120	early_seq('e');	114	early_seq('e');
121	}	115	}
122
123	async fn early_another() i32 {	116	async fn early_another() i32 {
124	early_seq('c');	117	early_seq('c');
125	return 1234;	118	return 1234;
126	}	119	}
127		120
128	var early_points = []u8 {0} ** "abcdef".len;	121	var early_points = []u8{0} ** "abcdef".len;
129	var early_seq_index: usize = 0;	122	var early_seq_index: usize = 0;
130		123
131	fn early_seq(c: u8) void {	124	fn early_seq(c: u8) void {
...	@@ -141,7 +134,6 @@ test "coro allocation failure" {	...	@@ -141,7 +134,6 @@ test "coro allocation failure" {
141	error.OutOfMemory => {},	134	error.OutOfMemory => {},
142	}	135	}
143	}	136	}
144
145	async fn asyncFuncThatNeverGetsRun() void {	137	async fn asyncFuncThatNeverGetsRun() void {
146	@panic("coro frame allocation should fail");	138	@panic("coro frame allocation should fail");
147	}	139	}
...	@@ -162,18 +154,15 @@ test "async function with dot syntax" {	...	@@ -162,18 +154,15 @@ test "async function with dot syntax" {
162	test "async fn pointer in a struct field" {	154	test "async fn pointer in a struct field" {
163	var data: i32 = 1;	155	var data: i32 = 1;
164	const Foo = struct {	156	const Foo = struct {
165	bar: async<&std.mem.Allocator> fn(&i32) void,	157	bar: async<std.mem.Allocator> fn (i32) void,
166	};
167	var foo = Foo {
168	.bar = simpleAsyncFn2,
169	};	158	};
		159	var foo = Foo{ .bar = simpleAsyncFn2 };
170	const p = (async<std.debug.global_allocator> foo.bar(&data)) catch unreachable;	160	const p = (async<std.debug.global_allocator> foo.bar(&data)) catch unreachable;
171	assert(data == 2);	161	assert(data == 2);
172	cancel p;	162	cancel p;
173	assert(data == 4);	163	assert(data == 4);
174	}	164	}
175		165	async<std.mem.Allocator> fn simpleAsyncFn2(y: i32) void {
176	async<&std.mem.Allocator> fn simpleAsyncFn2(y: &i32) void {
177	defer y.* += 2;	166	defer y.* += 2;
178	y.* += 1;	167	y.* += 1;
179	suspend;	168	suspend;
...	@@ -184,7 +173,6 @@ test "async fn with inferred error set" {	...	@@ -184,7 +173,6 @@ test "async fn with inferred error set" {
184	resume p;	173	resume p;
185	cancel p;	174	cancel p;
186	}	175	}
187
188	async fn failing() !void {	176	async fn failing() !void {
189	suspend;	177	suspend;
190	return error.Fail;	178	return error.Fail;
...	@@ -208,12 +196,10 @@ test "error return trace across suspend points - async return" {	...	@@ -208,12 +196,10 @@ test "error return trace across suspend points - async return" {
208	fn nonFailing() (promise->error!void) {	196	fn nonFailing() (promise->error!void) {
209	return async<std.debug.global_allocator> suspendThenFail() catch unreachable;	197	return async<std.debug.global_allocator> suspendThenFail() catch unreachable;
210	}	198	}
211
212	async fn suspendThenFail() error!void {	199	async fn suspendThenFail() error!void {
213	suspend;	200	suspend;
214	return error.Fail;	201	return error.Fail;
215	}	202	}
216
217	async fn printTrace(p: promise->error!void) void {	203	async fn printTrace(p: promise->error!void) void {
218	(await p) catch \|e\| {	204	(await p) catch \|e\| {
219	std.debug.assert(e == error.Fail);	205	std.debug.assert(e == error.Fail);
...	@@ -234,8 +220,7 @@ test "break from suspend" {	...	@@ -234,8 +220,7 @@ test "break from suspend" {
234	cancel p;	220	cancel p;
235	std.debug.assert(my_result == 2);	221	std.debug.assert(my_result == 2);
236	}	222	}
237		223	async fn testBreakFromSuspend(my_result: *i32) void {
238	async fn testBreakFromSuspend(my_result: &i32) void {
239	s: suspend \|p\| {	224	s: suspend \|p\| {
240	break :s;	225	break :s;
241	}	226	}

test/cases/enum.zig+12-20

 @@ -2,11 +2,9 @@ const assert = @import("std").debug.assert;
 const mem = @import("std").mem;
 test "enum type" {
-    const foo1 = Foo {
+    const foo1 = Foo{ .One = 13 };
-        .One = 13,
+    const foo2 = Foo{
-    };
+        .Two = Point{
-    const foo2 = Foo {
-        .Two = Point {
             .x = 1234,
             .y = 5678,
         },
 @@ -48,30 +46,24 @@ const Bar = enum {
 };
 fn returnAnInt(x: i32) Foo {
-    return Foo {
+    return Foo{ .One = x };
-        .One = x,
-    };
 }
 test "constant enum with payload" {
-    var empty = AnEnumWithPayload {
+    var empty = AnEnumWithPayload{ .Empty = {} };
-        .Empty = {},
+    var full = AnEnumWithPayload{ .Full = 13 };
-    };
-    var full = AnEnumWithPayload {
-        .Full = 13,
-    };
     shouldBeEmpty(empty);
     shouldBeNotEmpty(full);
 }
-fn shouldBeEmpty(x: &const AnEnumWithPayload) void {
+fn shouldBeEmpty(x: *const AnEnumWithPayload) void {
     switch (x.*) {
         AnEnumWithPayload.Empty => {},
         else => unreachable,
     }
 }
-fn shouldBeNotEmpty(x: &const AnEnumWithPayload) void {
+fn shouldBeNotEmpty(x: *const AnEnumWithPayload) void {
     switch (x.*) {
         AnEnumWithPayload.Empty => unreachable,
         else => {},
 @@ -737,7 +729,7 @@ const BitFieldOfEnums = packed struct {
     c: C,
 };
-const bit_field_1 = BitFieldOfEnums {
+const bit_field_1 = BitFieldOfEnums{
     .a = A.Two,
     .b = B.Three3,
     .c = C.Four4,
 @@ -758,15 +750,15 @@ test "bit field access with enum fields" {
     assert(data.b == B.Four3);
 }
-fn getA(data: &const BitFieldOfEnums) A {
+fn getA(data: *const BitFieldOfEnums) A {
     return data.a;
 }
-fn getB(data: &const BitFieldOfEnums) B {
+fn getB(data: *const BitFieldOfEnums) B {
     return data.b;
 }
-fn getC(data: &const BitFieldOfEnums) C {
+fn getC(data: *const BitFieldOfEnums) C {
     return data.c;
 }

test/cases/enum_with_members.zig+3-7

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

test/cases/error.zig+11-13

 @@ -92,7 +92,7 @@ test "error set type " {
     comptime testErrorSetType();
 }
-const MyErrSet = error {
+const MyErrSet = error{
     OutOfMemory,
     FileNotFound,
 };
 @@ -114,11 +114,11 @@ test "explicit error set cast" {
     comptime testExplicitErrorSetCast(Set1.A);
 }
-const Set1 = error {
+const Set1 = error{
     A,
     B,
 };
-const Set2 = error {
+const Set2 = error{
     A,
     C,
 };
 @@ -134,8 +134,7 @@ test "comptime test error for empty error set" {
     comptime testComptimeTestErrorEmptySet(1234);
 }
-const EmptyErrorSet = error {
+const EmptyErrorSet = error{};
-};
 fn testComptimeTestErrorEmptySet(x: EmptyErrorSet!i32) void {
     if (x) |v| assert(v == 1234) else |err| @compileError("bad");
 @@ -151,9 +150,10 @@ test "comptime err to int of error set with only 1 possible value" {
     testErrToIntWithOnePossibleValue(error.A, u32(error.A));
     comptime testErrToIntWithOnePossibleValue(error.A, u32(error.A));
 }
-fn testErrToIntWithOnePossibleValue(x: error {
+fn testErrToIntWithOnePossibleValue(
-    A,
+    x: error{A},
-}, comptime value: u32) void {
+    comptime value: u32,
+) void {
     if (u32(x) != value) {
         @compileError("bad");
     }
 @@ -193,20 +193,18 @@ fn entry() void {
     foo2(bar2);
 }
-fn foo2(f: fn() error!void) void {
+fn foo2(f: fn () error!void) void {
     const x = f();
 }
-fn bar2() (error {
+fn bar2() (error{}!void) {}
-}!void) {}
 test "error: Zero sized error set returned with value payload crash" {
     _ = foo3(0);
     _ = comptime foo3(0);
 }
-const Error = error {
+const Error = error{};
-};
 fn foo3(b: usize) Error!usize {
     return b;
 }

test/cases/eval.zig+62-38

 @@ -72,12 +72,12 @@ const Point = struct {
     x: i32,
     y: i32,
 };
-const static_point_list = []Point {
+const static_point_list = []Point{
     makePoint(1, 2),
     makePoint(3, 4),
 };
 fn makePoint(x: i32, y: i32) Point {
-    return Point {
+    return Point{
         .x = x,
         .y = y,
     };
 @@ -92,13 +92,11 @@ pub const Vec3 = struct {
     data: [3]f32,
 };
 pub fn vec3(x: f32, y: f32, z: f32) Vec3 {
-    return Vec3 {
+    return Vec3{ .data = []f32{
-        .data = []f32 {
+        x,
-            x,
+        y,
-            y,
+        z,
-            z,
+    } };
-        },
-    };
 }
 test "constant expressions" {
 @@ -117,22 +115,22 @@ const Vertex = struct {
     g: f32,
     b: f32,
 };
-const vertices = []Vertex {
+const vertices = []Vertex{
-    Vertex {
+    Vertex{
         .x = -0.6,
         .y = -0.4,
         .r = 1.0,
         .g = 0.0,
         .b = 0.0,
     },
-    Vertex {
+    Vertex{
         .x = 0.6,
         .y = -0.4,
         .r = 0.0,
         .g = 1.0,
         .b = 0.0,
     },
-    Vertex {
+    Vertex{
         .x = 0.0,
         .y = 0.6,
         .r = 0.0,
 @@ -149,7 +147,7 @@ const StInitStrFoo = struct {
     x: i32,
     y: bool,
 };
-var st_init_str_foo = StInitStrFoo {
+var st_init_str_foo = StInitStrFoo{
     .x = 13,
     .y = true,
 };
 @@ -158,7 +156,7 @@ test "statically initalized array literal" {
     const y: [4]u8 = st_init_arr_lit_x;
     assert(y[3] == 4);
 }
-const st_init_arr_lit_x = []u8 {
+const st_init_arr_lit_x = []u8{
     1,
     2,
     3,
 @@ -217,19 +215,19 @@ test "inlined block and runtime block phi" {
 const CmdFn = struct {
     name: []const u8,
-    func: fn(i32) i32,
+    func: fn (i32) i32,
 };
-const cmd_fns = []CmdFn {
+const cmd_fns = []CmdFn{
-    CmdFn {
+    CmdFn{
         .name = "one",
         .func = one,
     },
-    CmdFn {
+    CmdFn{
         .name = "two",
         .func = two,
     },
-    CmdFn {
+    CmdFn{
         .name = "three",
         .func = three,
     },
 @@ -284,14 +282,12 @@ fn fnWithFloatMode() f32 {
 const SimpleStruct = struct {
     field: i32,
-    fn method(self: &const SimpleStruct) i32 {
+    fn method(self: *const SimpleStruct) i32 {
         return self.field + 3;
     }
 };
-var simple_struct = SimpleStruct {
+var simple_struct = SimpleStruct{ .field = 1234 };
-    .field = 1234,
-};
 const bound_fn = simple_struct.method;
 @@ -341,9 +337,7 @@ const Foo = struct {
     name: []const u8,
 };
-var foo_contents = Foo {
+var foo_contents = Foo{ .name = "a" };
-    .name = "a",
-};
 const foo_ref = &foo_contents;
 test "create global array with for loop" {
 @@ -373,7 +367,7 @@ test "const global shares pointer with other same one" {
     assertEqualPtrs(&hi1[0], &hi2[0]);
     comptime assert(&hi1[0] == &hi2[0]);
 }
-fn assertEqualPtrs(ptr1: &const u8, ptr2: &const u8) void {
+fn assertEqualPtrs(ptr1: *const u8, ptr2: *const u8) void {
     assert(ptr1 == ptr2);
 }
 @@ -424,9 +418,9 @@ test "string literal used as comptime slice is memoized" {
 }
 test "comptime slice of undefined pointer of length 0" {
-    const slice1 = (&i32)(undefined)[0..0];
+    const slice1 = (*i32)(undefined)[0..0];
     assert(slice1.len == 0);
-    const slice2 = (&i32)(undefined)[100..100];
+    const slice2 = (*i32)(undefined)[100..100];
     assert(slice2.len == 0);
 }
 @@ -478,7 +472,7 @@ test "comptime function with mutable pointer is not memoized" {
     }
 }
-fn increment(value: &i32) void {
+fn increment(value: *i32) void {
     value.* += 1;
 }
 @@ -523,15 +517,13 @@ test "comptime slice of pointer preserves comptime var" {
 const SingleFieldStruct = struct {
     x: i32,
-    fn read_x(self: &const SingleFieldStruct) i32 {
+    fn read_x(self: *const SingleFieldStruct) i32 {
         return self.x;
     }
 };
 test "const ptr to comptime mutable data is not memoized" {
     comptime {
-        var foo = SingleFieldStruct {
+        var foo = SingleFieldStruct{ .x = 1 };
-            .x = 1,
-        };
         assert(foo.read_x() == 1);
         foo.x = 2;
         assert(foo.read_x() == 2);
 @@ -574,9 +566,7 @@ pub const Info = struct {
     version: u8,
 };
-pub const diamond_info = Info {
+pub const diamond_info = Info{ .version = 0 };
-    .version = 0,
-};
 test "comptime modification of const struct field" {
     comptime {
 @@ -586,3 +576,37 @@ test "comptime modification of const struct field" {
         assert(res.version == 1);
     }
 }
+test "pointer to type" {
+    comptime {
+        var T: type = i32;
+        assert(T == i32);
+        var ptr = &T;
+        assert(@typeOf(ptr) == *type);
+        ptr.* = f32;
+        assert(T == f32);
+        assert(*T == *f32);
+    }
+}
+test "slice of type" {
+    comptime {
+        var types_array = []type{ i32, f64, type };
+        for (types_array) |T, i| {
+            switch (i) {
+                0 => assert(T == i32),
+                1 => assert(T == f64),
+                2 => assert(T == type),
+                else => unreachable,
+            }
+        }
+        for (types_array[0..]) |T, i| {
+            switch (i) {
+                0 => assert(T == i32),
+                1 => assert(T == f64),
+                2 => assert(T == type),
+                else => unreachable,
+            }
+        }
+    }
+}

test/cases/field_parent_ptr.zig+3-3

...	@@ -17,14 +17,14 @@ const Foo = struct {	...	@@ -17,14 +17,14 @@ const Foo = struct {
17	d: i32,	17	d: i32,
18	};	18	};
19		19
20	const foo = Foo {	20	const foo = Foo{
21	.a = true,	21	.a = true,
22	.b = 0.123,	22	.b = 0.123,
23	.c = 1234,	23	.c = 1234,
24	.d = -10,	24	.d = -10,
25	};	25	};
26		26
27	fn testParentFieldPtr(c: &const i32) void {	27	fn testParentFieldPtr(c: *const i32) void {
28	assert(c == &foo.c);	28	assert(c == &foo.c);
29		29
30	const base = @fieldParentPtr(Foo, "c", c);	30	const base = @fieldParentPtr(Foo, "c", c);
...	@@ -32,7 +32,7 @@ fn testParentFieldPtr(c: &const i32) void {	...	@@ -32,7 +32,7 @@ fn testParentFieldPtr(c: &const i32) void {
32	assert(&base.c == c);	32	assert(&base.c == c);
33	}	33	}
34		34
35	fn testParentFieldPtrFirst(a: &const bool) void {	35	fn testParentFieldPtrFirst(a: *const bool) void {
36	assert(a == &foo.a);	36	assert(a == &foo.a);
37		37
38	const base = @fieldParentPtr(Foo, "a", a);	38	const base = @fieldParentPtr(Foo, "a", a);

test/cases/fn.zig+2-2

...	@@ -66,14 +66,14 @@ test "implicit cast function unreachable return" {	...	@@ -66,14 +66,14 @@ test "implicit cast function unreachable return" {
66	wantsFnWithVoid(fnWithUnreachable);	66	wantsFnWithVoid(fnWithUnreachable);
67	}	67	}
68		68
69	fn wantsFnWithVoid(f: fn() void) void {}	69	fn wantsFnWithVoid(f: fn () void) void {}
70		70
71	fn fnWithUnreachable() noreturn {	71	fn fnWithUnreachable() noreturn {
72	unreachable;	72	unreachable;
73	}	73	}
74		74
75	test "function pointers" {	75	test "function pointers" {
76	const fns = []@typeOf(fn1) {	76	const fns = []@typeOf(fn1){
77	fn1,	77	fn1,
78	fn2,	78	fn2,
79	fn3,	79	fn3,

test/cases/fn_in_struct_in_comptime.zig+3-3

...	@@ -1,9 +1,9 @@	...	@@ -1,9 +1,9 @@
1	const assert = @import("std").debug.assert;	1	const assert = @import("std").debug.assert;
2		2
3	fn get_foo() fn(&u8)usize {	3	fn get_foo() fn (*u8) usize {
4	comptime {	4	comptime {
5	return struct {	5	return struct {
6	fn func(ptr: &u8) usize {	6	fn func(ptr: *u8) usize {
7	var u = @ptrToInt(ptr);	7	var u = @ptrToInt(ptr);
8	return u;	8	return u;
9	}	9	}
...	@@ -13,5 +13,5 @@ fn get_foo() fn(&u8)usize {	...	@@ -13,5 +13,5 @@ fn get_foo() fn(&u8)usize {
13		13
14	test "define a function in an anonymous struct in comptime" {	14	test "define a function in an anonymous struct in comptime" {
15	const foo = get_foo();	15	const foo = get_foo();
16	assert(foo(@intToPtr(&u8, 12345)) == 12345);	16	assert(foo(@intToPtr(*u8, 12345)) == 12345);
17	}	17	}

test/cases/for.zig+3-25

...	@@ -3,7 +3,7 @@ const assert = std.debug.assert;	...	@@ -3,7 +3,7 @@ const assert = std.debug.assert;
3	const mem = std.mem;	3	const mem = std.mem;
4		4
5	test "continue in for loop" {	5	test "continue in for loop" {
6	const array = []i32 {	6	const array = []i32{
7	1,	7	1,
8	2,	8	2,
9	3,	9	3,
...	@@ -35,34 +35,12 @@ fn mangleString(s: []u8) void {	...	@@ -35,34 +35,12 @@ fn mangleString(s: []u8) void {
35	}	35	}
36		36
37	test "basic for loop" {	37	test "basic for loop" {
38	const expected_result = []u8 {	38	const expected_result = []u8{ 9, 8, 7, 6, 0, 1, 2, 3, 9, 8, 7, 6, 0, 1, 2, 3 };
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	};
56		39
57	var buffer: [expected_result.len]u8 = undefined;	40	var buffer: [expected_result.len]u8 = undefined;
58	var buf_index: usize = 0;	41	var buf_index: usize = 0;
59		42
60	const array = []u8 {	43	const array = []u8{ 9, 8, 7, 6 };
61	9,
62	8,
63	7,
64	6,
65	};
66	for (array) \|item\| {	44	for (array) \|item\| {
67	buffer[buf_index] = item;	45	buffer[buf_index] = item;
68	buf_index += 1;	46	buf_index += 1;

test/cases/generics.zig+9-9

...	@@ -81,11 +81,11 @@ test "function with return type type" {	...	@@ -81,11 +81,11 @@ test "function with return type type" {
81	}	81	}
82		82
83	test "generic struct" {	83	test "generic struct" {
84	var a1 = GenNode(i32) {	84	var a1 = GenNode(i32){
85	.value = 13,	85	.value = 13,
86	.next = null,	86	.next = null,
87	};	87	};
88	var b1 = GenNode(bool) {	88	var b1 = GenNode(bool){
89	.value = true,	89	.value = true,
90	.next = null,	90	.next = null,
91	};	91	};
...	@@ -96,8 +96,8 @@ test "generic struct" {	...	@@ -96,8 +96,8 @@ test "generic struct" {
96	fn GenNode(comptime T: type) type {	96	fn GenNode(comptime T: type) type {
97	return struct {	97	return struct {
98	value: T,	98	value: T,
99	next: ?&GenNode(T),	99	next: ?*GenNode(T),
100	fn getVal(n: &const GenNode(T)) T {	100	fn getVal(n: *const GenNode(T)) T {
101	return n.value;	101	return n.value;
102	}	102	}
103	};	103	};
...	@@ -120,20 +120,20 @@ fn aGenericFn(comptime T: type, comptime a: T, b: T) T {	...	@@ -120,20 +120,20 @@ fn aGenericFn(comptime T: type, comptime a: T, b: T) T {
120	}	120	}
121		121
122	test "generic fn with implicit cast" {	122	test "generic fn with implicit cast" {
123	assert(getFirstByte(u8, []u8 {13}) == 13);	123	assert(getFirstByte(u8, []u8{13}) == 13);
124	assert(getFirstByte(u16, []u16 {	124	assert(getFirstByte(u16, []u16{
125	0,	125	0,
126	13,	126	13,
127	}) == 0);	127	}) == 0);
128	}	128	}
129	fn getByte(ptr: ?&const u8) u8 {	129	fn getByte(ptr: ?*const u8) u8 {
130	return (??ptr).*;	130	return (??ptr).*;
131	}	131	}
132	fn getFirstByte(comptime T: type, mem: []const T) u8 {	132	fn getFirstByte(comptime T: type, mem: []const T) u8 {
133	return getByte(@ptrCast(&const u8, &mem[0]));	133	return getByte(@ptrCast(*const u8, &mem[0]));
134	}	134	}
135		135
136	const foos = []fn(var) bool {	136	const foos = []fn (var) bool{
137	foo1,	137	foo1,
138	foo2,	138	foo2,
139	};	139	};

test/cases/incomplete_struct_param_tld.zig+5-7

 @@ -11,21 +11,19 @@ const B = struct {
 const C = struct {
     x: i32,
-    fn d(c: &const C) i32 {
+    fn d(c: *const C) i32 {
         return c.x;
     }
 };
-fn foo(a: &const A) i32 {
+fn foo(a: *const A) i32 {
     return a.b.c.d();
 }
 test "incomplete struct param top level declaration" {
-    const a = A {
+    const a = A{
-        .b = B {
+        .b = B{
-            .c = C {
+            .c = C{ .x = 13 },
-                .x = 13,
-            },
         },
     };
     assert(foo(a) == 13);

test/cases/math.zig+28-10

 @@ -28,13 +28,27 @@ fn testDivision() void {
     assert(divTrunc(f32, -5.0, 3.0) == -1.0);
     comptime {
-        assert(1194735857077236777412821811143690633098347576 % 508740759824825164163191790951174292733114988 == 177254337427586449086438229241342047632117600);
+        assert(
-        assert(@rem(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -177254337427586449086438229241342047632117600);
+            1194735857077236777412821811143690633098347576 % 508740759824825164163191790951174292733114988 == 177254337427586449086438229241342047632117600,
-        assert(1194735857077236777412821811143690633098347576 / 508740759824825164163191790951174292733114988 == 2);
+        );
-        assert(@divTrunc(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -2);
+        assert(
-        assert(@divTrunc(1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == -2);
+            @rem(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -177254337427586449086438229241342047632117600,
-        assert(@divTrunc(-1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == 2);
+        );
-        assert(4126227191251978491697987544882340798050766755606969681711 % 10 == 1);
+        assert(
+            1194735857077236777412821811143690633098347576 / 508740759824825164163191790951174292733114988 == 2,
+        );
+        assert(
+            @divTrunc(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -2,
+        );
+        assert(
+            @divTrunc(1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == -2,
+        );
+        assert(
+            @divTrunc(-1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == 2,
+        );
+        assert(
+            4126227191251978491697987544882340798050766755606969681711 % 10 == 1,
+        );
     }
 }
 fn div(comptime T: type, a: T, b: T) T {
 @@ -197,7 +211,7 @@ fn test_u64_div() void {
     assert(result.remainder == 100663296);
 }
 fn divWithResult(a: u64, b: u64) DivResult {
-    return DivResult {
+    return DivResult{
         .quotient = a / b,
         .remainder = a % b,
     };
 @@ -324,8 +338,12 @@ test "big number addition" {
 test "big number multiplication" {
     comptime {
-        assert(45960427431263824329884196484953148229 * 128339149605334697009938835852565949723 == 5898522172026096622534201617172456926982464453350084962781392314016180490567);
+        assert(
-        assert(594491908217841670578297176641415611445982232488944558774612 * 390603545391089362063884922208143568023166603618446395589768 == 232210647056203049913662402532976186578842425262306016094292237500303028346593132411865381225871291702600263463125370016);
+            45960427431263824329884196484953148229 * 128339149605334697009938835852565949723 == 5898522172026096622534201617172456926982464453350084962781392314016180490567,
+        );
+        assert(
+            594491908217841670578297176641415611445982232488944558774612 * 390603545391089362063884922208143568023166603618446395589768 == 232210647056203049913662402532976186578842425262306016094292237500303028346593132411865381225871291702600263463125370016,
+        );
     }
 }

test/cases/misc.zig+47-56

 @@ -171,8 +171,8 @@ test "memcpy and memset intrinsics" {
     var foo: [20]u8 = undefined;
     var bar: [20]u8 = undefined;
-    @memset(&foo[0], 'A', foo.len);
+    @memset(foo[0..].ptr, 'A', foo.len);
-    @memcpy(&bar[0], &foo[0], bar.len);
+    @memcpy(bar[0..].ptr, foo[0..].ptr, bar.len);
     if (bar[11] != 'A') unreachable;
 }
 @@ -194,7 +194,7 @@ test "slicing" {
     if (slice.len != 5) unreachable;
     const ptr = &slice[0];
-    if (ptr[0] != 1234) unreachable;
+    if (ptr.* != 1234) unreachable;
     var slice_rest = array[10..];
     if (slice_rest.len != 10) unreachable;
 @@ -232,7 +232,7 @@ test "string escapes" {
 }
 test "multiline string" {
     const s1 =
         \\one
         \\two)
         \\three
 @@ -242,7 +242,7 @@ test "multiline string" {
 }
 test "multiline C string" {
     const s1 =
         c\\one
         c\\two)
         c\\three
 @@ -252,20 +252,20 @@ test "multiline C string" {
 }
 test "type equality" {
-    assert(&const u8 != &u8);
+    assert(*const u8 != *u8);
 }
 const global_a: i32 = 1234;
-const global_b: &const i32 = &global_a;
+const global_b: *const i32 = &global_a;
-const global_c: &const f32 = @ptrCast(&const f32, global_b);
+const global_c: *const f32 = @ptrCast(*const f32, global_b);
 test "compile time global reinterpret" {
-    const d = @ptrCast(&const i32, global_c);
+    const d = @ptrCast(*const i32, global_c);
     assert(d.* == 1234);
 }
 test "explicit cast maybe pointers" {
-    const a: ?&i32 = undefined;
+    const a: ?*i32 = undefined;
-    const b: ?&f32 = @ptrCast(?&f32, a);
+    const b: ?*f32 = @ptrCast(?*f32, a);
 }
 test "generic malloc free" {
 @@ -274,7 +274,7 @@ test "generic malloc free" {
 }
 var some_mem: [100]u8 = undefined;
 fn memAlloc(comptime T: type, n: usize) error![]T {
-    return @ptrCast(&T, &some_mem[0])[0..n];
+    return @ptrCast(*T, &some_mem[0])[0..n];
 }
 fn memFree(comptime T: type, memory: []T) void {}
 @@ -350,16 +350,14 @@ const Test3Point = struct {
     x: i32,
     y: i32,
 };
-const test3_foo = Test3Foo {
+const test3_foo = Test3Foo{
-    .Three = Test3Point {
+    .Three = Test3Point{
         .x = 3,
         .y = 4,
     },
 };
-const test3_bar = Test3Foo {
+const test3_bar = Test3Foo{ .Two = 13 };
-    .Two = 13,
+fn test3_1(f: *const Test3Foo) void {
-};
-fn test3_1(f: &const Test3Foo) void {
     switch (f.*) {
         Test3Foo.Three => |pt| {
             assert(pt.x == 3);
 @@ -368,7 +366,7 @@ fn test3_1(f: &const Test3Foo) void {
         else => unreachable,
     }
 }
-fn test3_2(f: &const Test3Foo) void {
+fn test3_2(f: *const Test3Foo) void {
     switch (f.*) {
         Test3Foo.Two => |x| {
             assert(x == 13);
 @@ -395,7 +393,7 @@ test "pointer comparison" {
     const b = &a;
     assert(ptrEql(b, b));
 }
-fn ptrEql(a: &const []const u8, b: &const []const u8) bool {
+fn ptrEql(a: *const []const u8, b: *const []const u8) bool {
     return a == b;
 }
 @@ -417,7 +415,7 @@ test "C string concatenation" {
 test "cast slice to u8 slice" {
     assert(@sizeOf(i32) == 4);
-    var big_thing_array = []i32 {
+    var big_thing_array = []i32{
         1,
         2,
         3,
 @@ -448,26 +446,27 @@ fn testPointerToVoidReturnType() error!void {
     return a.*;
 }
 const test_pointer_to_void_return_type_x = void{};
-fn testPointerToVoidReturnType2() &const void {
+fn testPointerToVoidReturnType2() *const void {
     return &test_pointer_to_void_return_type_x;
 }
 test "non const ptr to aliased type" {
     const int = i32;
-    assert(?&int == ?&i32);
+    assert(?*int == ?*i32);
 }
 test "array 2D const double ptr" {
-    const rect_2d_vertexes = [][1]f32 {
+    const rect_2d_vertexes = [][1]f32{
-        []f32 {1.0},
+        []f32{1.0},
-        []f32 {2.0},
+        []f32{2.0},
     };
     testArray2DConstDoublePtr(&rect_2d_vertexes[0][0]);
 }
-fn testArray2DConstDoublePtr(ptr: &const f32) void {
+fn testArray2DConstDoublePtr(ptr: *const f32) void {
-    assert(ptr[0] == 1.0);
+    const ptr2 = @ptrCast([*]const f32, ptr);
-    assert(ptr[1] == 2.0);
+    assert(ptr2[0] == 1.0);
+    assert(ptr2[1] == 2.0);
 }
 const Tid = builtin.TypeId;
 @@ -499,7 +498,7 @@ test "@typeId" {
         assert(@typeId(u64) == Tid.Int);
         assert(@typeId(f32) == Tid.Float);
         assert(@typeId(f64) == Tid.Float);
-        assert(@typeId(&f32) == Tid.Pointer);
+        assert(@typeId(*f32) == Tid.Pointer);
         assert(@typeId([2]u8) == Tid.Array);
         assert(@typeId(AStruct) == Tid.Struct);
         assert(@typeId(@typeOf(1)) == Tid.IntLiteral);
 @@ -513,7 +512,7 @@ test "@typeId" {
         assert(@typeId(@typeOf(AUnionEnum.One)) == Tid.Enum);
         assert(@typeId(AUnionEnum) == Tid.Union);
         assert(@typeId(AUnion) == Tid.Union);
-        assert(@typeId(fn() void) == Tid.Fn);
+        assert(@typeId(fn () void) == Tid.Fn);
         assert(@typeId(@typeOf(builtin)) == Tid.Namespace);
         assert(@typeId(@typeOf(x: {
             break :x this;
 @@ -542,7 +541,7 @@ test "@typeName" {
     };
     comptime {
         assert(mem.eql(u8, @typeName(i64), "i64"));
-        assert(mem.eql(u8, @typeName(&usize), "&usize"));
+        assert(mem.eql(u8, @typeName(*usize), "*usize"));
         // https://github.com/ziglang/zig/issues/675
         assert(mem.eql(u8, @typeName(TypeFromFn(u8)), "TypeFromFn(u8)"));
         assert(mem.eql(u8, @typeName(Struct), "Struct"));
 @@ -557,7 +556,7 @@ fn TypeFromFn(comptime T: type) type {
 test "volatile load and store" {
     var number: i32 = 1234;
-    const ptr = (&volatile i32)(&number);
+    const ptr = (*volatile i32)(&number);
     ptr.* += 1;
     assert(ptr.* == 1235);
 }
 @@ -565,7 +564,7 @@ test "volatile load and store" {
 test "slice string literal has type []const u8" {
     comptime {
         assert(@typeOf("aoeu"[0..]) == []const u8);
-        const array = []i32 {
+        const array = []i32{
             1,
             2,
             3,
 @@ -581,40 +580,36 @@ test "global variable initialized to global variable array element" {
 const GDTEntry = struct {
     field: i32,
 };
-var gdt = []GDTEntry {
+var gdt = []GDTEntry{
-    GDTEntry {
+    GDTEntry{ .field = 1 },
-        .field = 1,
+    GDTEntry{ .field = 2 },
-    },
-    GDTEntry {
-        .field = 2,
-    },
 };
 var global_ptr = &gdt[0];
 // can't really run this test but we can make sure it has no compile error
 // and generates code
-const vram = @intToPtr(&volatile u8, 0x20000000)[0..0x8000];
+const vram = @intToPtr(*volatile u8, 0x20000000)[0..0x8000];
 export fn writeToVRam() void {
     vram[0] = 'X';
 }
 test "pointer child field" {
-    assert((&u32).Child == u32);
+    assert((*u32).Child == u32);
 }
 const OpaqueA = @OpaqueType();
 const OpaqueB = @OpaqueType();
 test "@OpaqueType" {
-    assert(&OpaqueA != &OpaqueB);
+    assert(*OpaqueA != *OpaqueB);
     assert(mem.eql(u8, @typeName(OpaqueA), "OpaqueA"));
     assert(mem.eql(u8, @typeName(OpaqueB), "OpaqueB"));
 }
 test "variable is allowed to be a pointer to an opaque type" {
     var x: i32 = 1234;
-    _ = hereIsAnOpaqueType(@ptrCast(&OpaqueA, &x));
+    _ = hereIsAnOpaqueType(@ptrCast(*OpaqueA, &x));
 }
-fn hereIsAnOpaqueType(ptr: &OpaqueA) &OpaqueA {
+fn hereIsAnOpaqueType(ptr: *OpaqueA) *OpaqueA {
     var a = ptr;
     return a;
 }
 @@ -648,9 +643,7 @@ fn testStructInFn() void {
         kind: BlockKind,
     };
-    var block = Block {
+    var block = Block{ .kind = 1234 };
-        .kind = 1234,
-    };
     block.kind += 1;
 @@ -694,15 +687,13 @@ const PackedEnum = packed enum {
 };
 test "packed struct, enum, union parameters in extern function" {
-    testPackedStuff(PackedStruct {
+    testPackedStuff(PackedStruct{
         .a = 1,
         .b = 2,
-    }, PackedUnion {
+    }, PackedUnion{ .a = 1 }, PackedEnum.A);
-        .a = 1,
-    }, PackedEnum.A);
 }
-export fn testPackedStuff(a: &const PackedStruct, b: &const PackedUnion, c: PackedEnum) void {}
+export fn testPackedStuff(a: *const PackedStruct, b: *const PackedUnion, c: PackedEnum) void {}
 test "slicing zero length array" {
     const s1 = ""[0..];
 @@ -713,8 +704,8 @@ test "slicing zero length array" {
     assert(mem.eql(u32, s2, []u32{}));
 }
-const addr1 = @ptrCast(&const u8, emptyFn);
+const addr1 = @ptrCast(*const u8, emptyFn);
 test "comptime cast fn to ptr" {
-    const addr2 = @ptrCast(&const u8, emptyFn);
+    const addr2 = @ptrCast(*const u8, emptyFn);
     comptime assert(addr1 == addr2);
 }

test/cases/null.zig+3-5

 @@ -58,14 +58,14 @@ fn foo(x: ?i32) ?bool {
 }
 test "if var maybe pointer" {
-    assert(shouldBeAPlus1(Particle {
+    assert(shouldBeAPlus1(Particle{
         .a = 14,
         .b = 1,
         .c = 1,
         .d = 1,
     }) == 15);
 }
-fn shouldBeAPlus1(p: &const Particle) u64 {
+fn shouldBeAPlus1(p: *const Particle) u64 {
     var maybe_particle: ?Particle = p.*;
     if (maybe_particle) |*particle| {
         particle.a += 1;
 @@ -92,9 +92,7 @@ test "null literal outside function" {
 const SillyStruct = struct {
     context: ?i32,
 };
-const here_is_a_null_literal = SillyStruct {
+const here_is_a_null_literal = SillyStruct{ .context = null };
-    .context = null,
-};
 test "test null runtime" {
     testTestNullRuntime(null);

test/cases/pointers.zig+30

...	@@ -12,3 +12,33 @@ fn testDerefPtr() void {	...	@@ -12,3 +12,33 @@ fn testDerefPtr() void {
12	y.* += 1;	12	y.* += 1;
13	assert(x == 1235);	13	assert(x == 1235);
14	}	14	}
		15
		16	test "pointer arithmetic" {
		17	var ptr = c"abcd";
		18
		19	assert(ptr[0] == 'a');
		20	ptr += 1;
		21	assert(ptr[0] == 'b');
		22	ptr += 1;
		23	assert(ptr[0] == 'c');
		24	ptr += 1;
		25	assert(ptr[0] == 'd');
		26	ptr += 1;
		27	assert(ptr[0] == 0);
		28	ptr -= 1;
		29	assert(ptr[0] == 'd');
		30	ptr -= 1;
		31	assert(ptr[0] == 'c');
		32	ptr -= 1;
		33	assert(ptr[0] == 'b');
		34	ptr -= 1;
		35	assert(ptr[0] == 'a');
		36	}
		37
		38	test "double pointer parsing" {
		39	comptime assert(PtrOf(PtrOf(i32)) == **i32);
		40	}
		41
		42	fn PtrOf(comptime T: type) type {
		43	return *T;
		44	}

test/cases/reflection.zig+2-2

...	@@ -5,7 +5,7 @@ const reflection = this;	...	@@ -5,7 +5,7 @@ const reflection = this;
5	test "reflection: array, pointer, nullable, error union type child" {	5	test "reflection: array, pointer, nullable, error union type child" {
6	comptime {	6	comptime {
7	assert(([10]u8).Child == u8);	7	assert(([10]u8).Child == u8);
8	assert((&u8).Child == u8);	8	assert((*u8).Child == u8);
9	assert((error!u8).Payload == u8);	9	assert((error!u8).Payload == u8);
10	assert((?u8).Child == u8);	10	assert((?u8).Child == u8);
11	}	11	}
...	@@ -59,7 +59,7 @@ test "reflection: enum member types and names" {	...	@@ -59,7 +59,7 @@ test "reflection: enum member types and names" {
59	}	59	}
60		60
61	test "reflection: @field" {	61	test "reflection: @field" {
62	var f = Foo {	62	var f = Foo{
63	.one = 42,	63	.one = 42,
64	.two = true,	64	.two = true,
65	.three = void{},	65	.three = void{},

test/cases/slice.zig+2-2

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const assert = @import("std").debug.assert;	1	const assert = @import("std").debug.assert;
2	const mem = @import("std").mem;	2	const mem = @import("std").mem;
3		3
4	const x = @intToPtr(&i32, 0x1000)[0..0x500];	4	const x = @intToPtr(*i32, 0x1000)[0..0x500];
5	const y = x[0x100..];	5	const y = x[0x100..];
6	test "compile time slice of pointer to hard coded address" {	6	test "compile time slice of pointer to hard coded address" {
7	assert(@ptrToInt(x.ptr) == 0x1000);	7	assert(@ptrToInt(x.ptr) == 0x1000);
...	@@ -18,7 +18,7 @@ test "slice child property" {	...	@@ -18,7 +18,7 @@ test "slice child property" {
18	}	18	}
19		19
20	test "runtime safety lets us slice from len..len" {	20	test "runtime safety lets us slice from len..len" {
21	var an_array = []u8 {	21	var an_array = []u8{
22	1,	22	1,
23	2,	23	2,
24	3,	24	3,

test/cases/struct.zig+31-41

 @@ -27,7 +27,7 @@ test "invake static method in global scope" {
 }
 test "void struct fields" {
-    const foo = VoidStructFieldsFoo {
+    const foo = VoidStructFieldsFoo{
         .a = void{},
         .b = 1,
         .c = void{},
 @@ -43,7 +43,7 @@ const VoidStructFieldsFoo = struct {
 test "structs" {
     var foo: StructFoo = undefined;
-    @memset(@ptrCast(&u8, &foo), 0, @sizeOf(StructFoo));
+    @memset(@ptrCast([*]u8, &foo), 0, @sizeOf(StructFoo));
     foo.a += 1;
     foo.b = foo.a == 1;
     testFoo(foo);
 @@ -55,16 +55,16 @@ const StructFoo = struct {
     b: bool,
     c: f32,
 };
-fn testFoo(foo: &const StructFoo) void {
+fn testFoo(foo: *const StructFoo) void {
     assert(foo.b);
 }
-fn testMutation(foo: &StructFoo) void {
+fn testMutation(foo: *StructFoo) void {
     foo.c = 100;
 }
 const Node = struct {
     val: Val,
-    next: &Node,
+    next: *Node,
 };
 const Val = struct {
 @@ -96,62 +96,52 @@ test "struct byval assign" {
 }
 fn structInitializer() void {
-    const val = Val {
+    const val = Val{ .x = 42 };
-        .x = 42,
-    };
     assert(val.x == 42);
 }
 test "fn call of struct field" {
-    assert(callStructField(Foo {
+    assert(callStructField(Foo{ .ptr = aFunc }) == 13);
-        .ptr = aFunc,
-    }) == 13);
 }
 const Foo = struct {
-    ptr: fn() i32,
+    ptr: fn () i32,
 };
 fn aFunc() i32 {
     return 13;
 }
-fn callStructField(foo: &const Foo) i32 {
+fn callStructField(foo: *const Foo) i32 {
     return foo.ptr();
 }
 test "store member function in variable" {
-    const instance = MemberFnTestFoo {
+    const instance = MemberFnTestFoo{ .x = 1234 };
-        .x = 1234,
-    };
     const memberFn = MemberFnTestFoo.member;
     const result = memberFn(instance);
     assert(result == 1234);
 }
 const MemberFnTestFoo = struct {
     x: i32,
-    fn member(foo: &const MemberFnTestFoo) i32 {
+    fn member(foo: *const MemberFnTestFoo) i32 {
         return foo.x;
     }
 };
 test "call member function directly" {
-    const instance = MemberFnTestFoo {
+    const instance = MemberFnTestFoo{ .x = 1234 };
-        .x = 1234,
-    };
     const result = MemberFnTestFoo.member(instance);
     assert(result == 1234);
 }
 test "member functions" {
-    const r = MemberFnRand {
+    const r = MemberFnRand{ .seed = 1234 };
-        .seed = 1234,
-    };
     assert(r.getSeed() == 1234);
 }
 const MemberFnRand = struct {
     seed: u32,
-    pub fn getSeed(r: &const MemberFnRand) u32 {
+    pub fn getSeed(r: *const MemberFnRand) u32 {
         return r.seed;
     }
 };
 @@ -165,7 +155,7 @@ const Bar = struct {
     y: i32,
 };
 fn makeBar(x: i32, y: i32) Bar {
-    return Bar {
+    return Bar{
         .x = x,
         .y = y,
     };
 @@ -176,7 +166,7 @@ test "empty struct method call" {
     assert(es.method() == 1234);
 }
 const EmptyStruct = struct {
-    fn method(es: &const EmptyStruct) i32 {
+    fn method(es: *const EmptyStruct) i32 {
         return 1234;
     }
 };
 @@ -190,7 +180,7 @@ fn testReturnEmptyStructFromFn() EmptyStruct2 {
 }
 test "pass slice of empty struct to fn" {
-    assert(testPassSliceOfEmptyStructToFn([]EmptyStruct2 {EmptyStruct2{}}) == 1);
+    assert(testPassSliceOfEmptyStructToFn([]EmptyStruct2{EmptyStruct2{}}) == 1);
 }
 fn testPassSliceOfEmptyStructToFn(slice: []const EmptyStruct2) usize {
     return slice.len;
 @@ -202,7 +192,7 @@ const APackedStruct = packed struct {
 };
 test "packed struct" {
-    var foo = APackedStruct {
+    var foo = APackedStruct{
         .x = 1,
         .y = 2,
     };
 @@ -217,7 +207,7 @@ const BitField1 = packed struct {
     c: u2,
 };
-const bit_field_1 = BitField1 {
+const bit_field_1 = BitField1{
     .a = 1,
     .b = 2,
     .c = 3,
 @@ -238,15 +228,15 @@ test "bit field access" {
     assert(data.b == 3);
 }
-fn getA(data: &const BitField1) u3 {
+fn getA(data: *const BitField1) u3 {
     return data.a;
 }
-fn getB(data: &const BitField1) u3 {
+fn getB(data: *const BitField1) u3 {
     return data.b;
 }
-fn getC(data: &const BitField1) u2 {
+fn getC(data: *const BitField1) u2 {
     return data.c;
 }
 @@ -267,7 +257,7 @@ test "packed struct 24bits" {
         assert(@sizeOf(Foo96Bits) == 12);
     }
-    var value = Foo96Bits {
+    var value = Foo96Bits{
         .a = 0,
         .b = 0,
         .c = 0,
 @@ -310,9 +300,9 @@ test "packed array 24bits" {
         assert(@sizeOf(FooArray24Bits) == 2 + 2 * 3 + 2);
     }
-    var bytes = []u8 {0} ** (@sizeOf(FooArray24Bits) + 1);
+    var bytes = []u8{0} ** (@sizeOf(FooArray24Bits) + 1);
     bytes[bytes.len - 1] = 0xaa;
-    const ptr = &([]FooArray24Bits)(bytes[0..bytes.len - 1])[0];
+    const ptr = &([]FooArray24Bits)(bytes[0 .. bytes.len - 1])[0];
     assert(ptr.a == 0);
     assert(ptr.b[0].field == 0);
     assert(ptr.b[1].field == 0);
 @@ -360,7 +350,7 @@ test "aligned array of packed struct" {
         assert(@sizeOf(FooArrayOfAligned) == 2 * 2);
     }
-    var bytes = []u8 {0xbb} ** @sizeOf(FooArrayOfAligned);
+    var bytes = []u8{0xbb} ** @sizeOf(FooArrayOfAligned);
     const ptr = &([]FooArrayOfAligned)(bytes[0..bytes.len])[0];
     assert(ptr.a[0].a == 0xbb);
 @@ -370,11 +360,11 @@ test "aligned array of packed struct" {
 }
 test "runtime struct initialization of bitfield" {
-    const s1 = Nibbles {
+    const s1 = Nibbles{
         .x = x1,
         .y = x1,
     };
-    const s2 = Nibbles {
+    const s2 = Nibbles{
         .x = u4(x2),
         .y = u4(x2),
     };
 @@ -406,8 +396,8 @@ const Bitfields = packed struct {
 test "native bit field understands endianness" {
     var all: u64 = 0x7765443322221111;
     var bytes: [8]u8 = undefined;
-    @memcpy(&bytes[0], @ptrCast(&u8, &all), 8);
+    @memcpy(bytes[0..].ptr, @ptrCast([*]u8, &all), 8);
-    var bitfields = @ptrCast(&Bitfields, &bytes[0]).*;
+    var bitfields = @ptrCast(*Bitfields, bytes[0..].ptr).*;
     assert(bitfields.f1 == 0x1111);
     assert(bitfields.f2 == 0x2222);
 @@ -425,7 +415,7 @@ test "align 1 field before self referential align 8 field as slice return type"
 const Expr = union(enum) {
     Literal: u8,
-    Question: &Expr,
+    Question: *Expr,
 };
 fn alloc(comptime T: type) []T {

test/cases/struct_contains_null_ptr_itself.zig+2-2

...	@@ -2,13 +2,13 @@ const std = @import("std");	...	@@ -2,13 +2,13 @@ const std = @import("std");
2	const assert = std.debug.assert;	2	const assert = std.debug.assert;
3		3
4	test "struct contains null pointer which contains original struct" {	4	test "struct contains null pointer which contains original struct" {
5	var x: ?&NodeLineComment = null;	5	var x: ?*NodeLineComment = null;
6	assert(x == null);	6	assert(x == null);
7	}	7	}
8		8
9	pub const Node = struct {	9	pub const Node = struct {
10	id: Id,	10	id: Id,
11	comment: ?&NodeLineComment,	11	comment: ?*NodeLineComment,
12		12
13	pub const Id = enum {	13	pub const Id = enum {
14	Root,	14	Root,

test/cases/struct_contains_slice_of_itself.zig+8-8

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

test/cases/switch.zig+18-38

 @@ -6,10 +6,7 @@ test "switch with numbers" {
 fn testSwitchWithNumbers(x: u32) void {
     const result = switch (x) {
-        1,
+        1, 2, 3, 4...8 => false,
-        2,
-        3,
-        4 ... 8 => false,
         13 => true,
         else => false,
     };
 @@ -25,9 +22,9 @@ test "switch with all ranges" {
 fn testSwitchWithAllRanges(x: u32, y: u32) u32 {
     return switch (x) {
-        0 ... 100 => 1,
+        0...100 => 1,
-        101 ... 200 => 2,
+        101...200 => 2,
-        201 ... 300 => 3,
+        201...300 => 3,
         else => y,
     };
 }
 @@ -37,10 +34,8 @@ test "implicit comptime switch" {
     const result = switch (x) {
         3 => 10,
         4 => 11,
-        5,
+        5, 6 => 12,
-        6 => 12,
+        7, 8 => 13,
-        7,
-        8 => 13,
         else => 14,
     };
 @@ -86,22 +81,16 @@ const SwitchStatmentFoo = enum {
 };
 test "switch prong with variable" {
-    switchProngWithVarFn(SwitchProngWithVarEnum {
+    switchProngWithVarFn(SwitchProngWithVarEnum{ .One = 13 });
-        .One = 13,
+    switchProngWithVarFn(SwitchProngWithVarEnum{ .Two = 13.0 });
-    });
+    switchProngWithVarFn(SwitchProngWithVarEnum{ .Meh = {} });
-    switchProngWithVarFn(SwitchProngWithVarEnum {
-        .Two = 13.0,
-    });
-    switchProngWithVarFn(SwitchProngWithVarEnum {
-        .Meh = {},
-    });
 }
 const SwitchProngWithVarEnum = union(enum) {
     One: i32,
     Two: f32,
     Meh: void,
 };
-fn switchProngWithVarFn(a: &const SwitchProngWithVarEnum) void {
+fn switchProngWithVarFn(a: *const SwitchProngWithVarEnum) void {
     switch (a.*) {
         SwitchProngWithVarEnum.One => |x| {
             assert(x == 13);
 @@ -121,9 +110,7 @@ test "switch on enum using pointer capture" {
 }
 fn testSwitchEnumPtrCapture() void {
-    var value = SwitchProngWithVarEnum {
+    var value = SwitchProngWithVarEnum{ .One = 1234 };
-        .One = 1234,
-    };
     switch (value) {
         SwitchProngWithVarEnum.One => |*x| x.* += 1,
         else => unreachable,
 @@ -136,12 +123,8 @@ fn testSwitchEnumPtrCapture() void {
 test "switch with multiple expressions" {
     const x = switch (returnsFive()) {
-        1,
+        1, 2, 3 => 1,
-        2,
+        4, 5, 6 => 2,
-        3 => 1,
-        4,
-        5,
-        6 => 2,
         else => i32(3),
     };
     assert(x == 2);
 @@ -156,9 +139,7 @@ const Number = union(enum) {
     Three: f32,
 };
-const number = Number {
+const number = Number{ .Three = 1.23 };
-    .Three = 1.23,
-};
 fn returnsFalse() bool {
     switch (number) {
 @@ -212,12 +193,11 @@ fn testSwitchHandleAllCasesExhaustive(x: u2) u2 {
 fn testSwitchHandleAllCasesRange(x: u8) u8 {
     return switch (x) {
-        0 ... 100 => u8(0),
+        0...100 => u8(0),
-        101 ... 200 => 1,
+        101...200 => 1,
-        201,
+        201, 203 => 2,
-        203 => 2,
         202 => 4,
-        204 ... 255 => 3,
+        204...255 => 3,
     };
 }

test/cases/switch_prong_err_enum.zig+1-3

 @@ -14,9 +14,7 @@ const FormValue = union(enum) {
 fn doThing(form_id: u64) error!FormValue {
     return switch (form_id) {
-        17 => FormValue {
+        17 => FormValue{ .Address = try readOnce() },
-            .Address = try readOnce(),
-        },
         else => error.InvalidDebugInfo,
     };
 }

test/cases/switch_prong_implicit_cast.zig+2-6

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

test/cases/this.zig+2-2

...	@@ -8,7 +8,7 @@ fn Point(comptime T: type) type {	...	@@ -8,7 +8,7 @@ fn Point(comptime T: type) type {
8	x: T,	8	x: T,
9	y: T,	9	y: T,
10		10
11	fn addOne(self: &Self) void {	11	fn addOne(self: *Self) void {
12	self.x += 1;	12	self.x += 1;
13	self.y += 1;	13	self.y += 1;
14	}	14	}
...	@@ -29,7 +29,7 @@ test "this refer to module call private fn" {	...	@@ -29,7 +29,7 @@ test "this refer to module call private fn" {
29	}	29	}
30		30
31	test "this refer to container" {	31	test "this refer to container" {
32	var pt = Point(i32) {	32	var pt = Point(i32){
33	.x = 12,	33	.x = 12,
34	.y = 34,	34	.y = 34,
35	};	35	};

test/cases/try.zig+1-2

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

test/cases/type_info.zig+16-9

 @@ -37,7 +37,7 @@ test "type info: pointer type info" {
 }
 fn testPointer() void {
-    const u32_ptr_info = @typeInfo(&u32);
+    const u32_ptr_info = @typeInfo(*u32);
     assert(TypeId(u32_ptr_info) == TypeId.Pointer);
     assert(u32_ptr_info.Pointer.is_const == false);
     assert(u32_ptr_info.Pointer.is_volatile == false);
 @@ -103,7 +103,7 @@ test "type info: error set, error union info" {
 }
 fn testErrorSet() void {
-    const TestErrorSet = error {
+    const TestErrorSet = error{
         First,
         Second,
         Third,
 @@ -169,14 +169,14 @@ fn testUnion() void {
     assert(notag_union_info.Union.fields[1].field_type == u32);
     const TestExternUnion = extern union {
-        foo: &c_void,
+        foo: *c_void,
     };
     const extern_union_info = @typeInfo(TestExternUnion);
     assert(extern_union_info.Union.layout == TypeInfo.ContainerLayout.Extern);
     assert(extern_union_info.Union.tag_type == @typeOf(undefined));
     assert(extern_union_info.Union.fields[0].enum_field == null);
-    assert(extern_union_info.Union.fields[0].field_type == &c_void);
+    assert(extern_union_info.Union.fields[0].field_type == *c_void);
 }
 test "type info: struct info" {
 @@ -190,13 +190,13 @@ fn testStruct() void {
     assert(struct_info.Struct.layout == TypeInfo.ContainerLayout.Packed);
     assert(struct_info.Struct.fields.len == 3);
     assert(struct_info.Struct.fields[1].offset == null);
-    assert(struct_info.Struct.fields[2].field_type == &TestStruct);
+    assert(struct_info.Struct.fields[2].field_type == *TestStruct);
     assert(struct_info.Struct.defs.len == 2);
     assert(struct_info.Struct.defs[0].is_pub);
     assert(!struct_info.Struct.defs[0].data.Fn.is_extern);
     assert(struct_info.Struct.defs[0].data.Fn.lib_name == null);
     assert(struct_info.Struct.defs[0].data.Fn.return_type == void);
-    assert(struct_info.Struct.defs[0].data.Fn.fn_type == fn(&const TestStruct)void);
+    assert(struct_info.Struct.defs[0].data.Fn.fn_type == fn (*const TestStruct) void);
 }
 const TestStruct = packed struct {
 @@ -204,9 +204,9 @@ const TestStruct = packed struct {
     fieldA: usize,
     fieldB: void,
-    fieldC: &Self,
+    fieldC: *Self,
-    pub fn foo(self: &const Self) void {}
+    pub fn foo(self: *const Self) void {}
 };
 test "type info: function type info" {
 @@ -227,9 +227,16 @@ fn testFunction() void {
     const test_instance: TestStruct = undefined;
     const bound_fn_info = @typeInfo(@typeOf(test_instance.foo));
     assert(TypeId(bound_fn_info) == TypeId.BoundFn);
-    assert(bound_fn_info.BoundFn.args[0].arg_type == &const TestStruct);
+    assert(bound_fn_info.BoundFn.args[0].arg_type == *const TestStruct);
 }
 fn foo(comptime a: usize, b: bool, args: ...) usize {
     return 0;
 }
+test "typeInfo with comptime parameter in struct fn def" {
+    const S = struct {
+        pub fn func(comptime x: f32) void {}
+    };
+    comptime var info = @typeInfo(S);
+}

test/cases/undefined.zig+2-2

...	@@ -27,12 +27,12 @@ test "init static array to undefined" {	...	@@ -27,12 +27,12 @@ test "init static array to undefined" {
27	const Foo = struct {	27	const Foo = struct {
28	x: i32,	28	x: i32,
29		29
30	fn setFooXMethod(foo: &Foo) void {	30	fn setFooXMethod(foo: *Foo) void {
31	foo.x = 3;	31	foo.x = 3;
32	}	32	}
33	};	33	};
34		34
35	fn setFooX(foo: &Foo) void {	35	fn setFooX(foo: *Foo) void {
36	foo.x = 2;	36	foo.x = 2;
37	}	37	}
38		38

test/cases/union.zig+10-11

...	@@ -50,10 +50,10 @@ test "basic unions" {	...	@@ -50,10 +50,10 @@ test "basic unions" {
50		50
51	test "comptime union field access" {	51	test "comptime union field access" {
52	comptime {	52	comptime {
53	var foo = Foo { .int = 0 };	53	var foo = Foo{ .int = 0 };
54	assert(foo.int == 0);	54	assert(foo.int == 0);
55		55
56	foo = Foo { .float = 42.42 };	56	foo = Foo{ .float = 42.42 };
57	assert(foo.float == 42.42);	57	assert(foo.float == 42.42);
58	}	58	}
59	}	59	}
...	@@ -68,11 +68,11 @@ test "init union with runtime value" {	...	@@ -68,11 +68,11 @@ test "init union with runtime value" {
68	assert(foo.int == 42);	68	assert(foo.int == 42);
69	}	69	}
70		70
71	fn setFloat(foo: &Foo, x: f64) void {	71	fn setFloat(foo: *Foo, x: f64) void {
72	foo.* = Foo{ .float = x };	72	foo.* = Foo{ .float = x };
73	}	73	}
74		74
75	fn setInt(foo: &Foo, x: i32) void {	75	fn setInt(foo: *Foo, x: i32) void {
76	foo.* = Foo{ .int = x };	76	foo.* = Foo{ .int = x };
77	}	77	}
78		78
...	@@ -108,7 +108,7 @@ fn doTest() void {	...	@@ -108,7 +108,7 @@ fn doTest() void {
108	assert(bar(Payload{ .A = 1234 }) == -10);	108	assert(bar(Payload{ .A = 1234 }) == -10);
109	}	109	}
110		110
111	fn bar(value: &const Payload) i32 {	111	fn bar(value: *const Payload) i32 {
112	assert(Letter(value.*) == Letter.A);	112	assert(Letter(value.*) == Letter.A);
113	return switch (value.*) {	113	return switch (value.*) {
114	Payload.A => \|x\| return x - 1244,	114	Payload.A => \|x\| return x - 1244,
...	@@ -147,7 +147,7 @@ test "union(enum(u32)) with specified and unspecified tag values" {	...	@@ -147,7 +147,7 @@ test "union(enum(u32)) with specified and unspecified tag values" {
147	comptime testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2{ .C = 123 });	147	comptime testEnumWithSpecifiedAndUnspecifiedTagValues(MultipleChoice2{ .C = 123 });
148	}	148	}
149		149
150	fn testEnumWithSpecifiedAndUnspecifiedTagValues(x: &const MultipleChoice2) void {	150	fn testEnumWithSpecifiedAndUnspecifiedTagValues(x: *const MultipleChoice2) void {
151	assert(u32(@TagType(MultipleChoice2)(x.*)) == 60);	151	assert(u32(@TagType(MultipleChoice2)(x.*)) == 60);
152	assert(1123 == switch (x.*) {	152	assert(1123 == switch (x.*) {
153	MultipleChoice2.A => 1,	153	MultipleChoice2.A => 1,
...	@@ -163,7 +163,7 @@ fn testEnumWithSpecifiedAndUnspecifiedTagValues(x: &const MultipleChoice2) void	...	@@ -163,7 +163,7 @@ fn testEnumWithSpecifiedAndUnspecifiedTagValues(x: &const MultipleChoice2) void
163	}	163	}
164		164
165	const ExternPtrOrInt = extern union {	165	const ExternPtrOrInt = extern union {
166	ptr: &u8,	166	ptr: *u8,
167	int: u64,	167	int: u64,
168	};	168	};
169	test "extern union size" {	169	test "extern union size" {
...	@@ -171,7 +171,7 @@ test "extern union size" {	...	@@ -171,7 +171,7 @@ test "extern union size" {
171	}	171	}
172		172
173	const PackedPtrOrInt = packed union {	173	const PackedPtrOrInt = packed union {
174	ptr: &u8,	174	ptr: *u8,
175	int: u64,	175	int: u64,
176	};	176	};
177	test "extern union size" {	177	test "extern union size" {
...	@@ -206,7 +206,7 @@ test "cast union to tag type of union" {	...	@@ -206,7 +206,7 @@ test "cast union to tag type of union" {
206	comptime testCastUnionToTagType(TheUnion{ .B = 1234 });	206	comptime testCastUnionToTagType(TheUnion{ .B = 1234 });
207	}	207	}
208		208
209	fn testCastUnionToTagType(x: &const TheUnion) void {	209	fn testCastUnionToTagType(x: *const TheUnion) void {
210	assert(TheTag(x.*) == TheTag.B);	210	assert(TheTag(x.*) == TheTag.B);
211	}	211	}
212		212
...	@@ -243,7 +243,7 @@ const TheUnion2 = union(enum) {	...	@@ -243,7 +243,7 @@ const TheUnion2 = union(enum) {
243	Item2: i32,	243	Item2: i32,
244	};	244	};
245		245
246	fn assertIsTheUnion2Item1(value: &const TheUnion2) void {	246	fn assertIsTheUnion2Item1(value: *const TheUnion2) void {
247	assert(value.* == TheUnion2.Item1);	247	assert(value.* == TheUnion2.Item1);
248	}	248	}
249		249
...	@@ -286,7 +286,6 @@ const PartialInstWithPayload = union(enum) {	...	@@ -286,7 +286,6 @@ const PartialInstWithPayload = union(enum) {
286	Compiled: i32,	286	Compiled: i32,
287	};	287	};
288		288
289
290	test "access a member of tagged union with conflicting enum tag name" {	289	test "access a member of tagged union with conflicting enum tag name" {
291	const Bar = union(enum) {	290	const Bar = union(enum) {
292	A: A,	291	A: A,

test/cases/var_args.zig+1-1

...	@@ -58,7 +58,7 @@ fn extraFn(extra: u32, args: ...) usize {	...	@@ -58,7 +58,7 @@ fn extraFn(extra: u32, args: ...) usize {
58	return args.len;	58	return args.len;
59	}	59	}
60		60
61	const foos = []fn(...) bool {	61	const foos = []fn (...) bool{
62	foo1,	62	foo1,
63	foo2,	63	foo2,
64	};	64	};

test/cases/void.zig+1-1

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

test/cases/while.zig+2-2

...	@@ -151,7 +151,7 @@ test "while on nullable with else result follow break prong" {	...	@@ -151,7 +151,7 @@ test "while on nullable with else result follow break prong" {
151	test "while on error union with else result follow else prong" {	151	test "while on error union with else result follow else prong" {
152	const result = while (returnError()) \|value\| {	152	const result = while (returnError()) \|value\| {
153	break value;	153	break value;
154	} else\|err\|	154	} else \|err\|
155	i32(2);	155	i32(2);
156	assert(result == 2);	156	assert(result == 2);
157	}	157	}
...	@@ -159,7 +159,7 @@ test "while on error union with else result follow else prong" {	...	@@ -159,7 +159,7 @@ test "while on error union with else result follow else prong" {
159	test "while on error union with else result follow break prong" {	159	test "while on error union with else result follow break prong" {
160	const result = while (returnSuccess(10)) \|value\| {	160	const result = while (returnSuccess(10)) \|value\| {
161	break value;	161	break value;
162	} else\|err\|	162	} else \|err\|
163	i32(2);	163	i32(2);
164	assert(result == 10);	164	assert(result == 10);
165	}	165	}

test/compare_output.zig+13-13

...	@@ -3,10 +3,10 @@ const std = @import("std");	...	@@ -3,10 +3,10 @@ const std = @import("std");
3	const os = std.os;	3	const os = std.os;
4	const tests = @import("tests.zig");	4	const tests = @import("tests.zig");
5		5
6	pub fn addCases(cases: &tests.CompareOutputContext) void {	6	pub fn addCases(cases: *tests.CompareOutputContext) void {
7	cases.addC("hello world with libc",	7	cases.addC("hello world with libc",
8	\\const c = @cImport(@cInclude("stdio.h"));	8	\\const c = @cImport(@cInclude("stdio.h"));
9	\\export fn main(argc: c_int, argv: &&u8) c_int {	9	\\export fn main(argc: c_int, argv: [][]u8) c_int {
10	\\ _ = c.puts(c"Hello, world!");	10	\\ _ = c.puts(c"Hello, world!");
11	\\ return 0;	11	\\ return 0;
12	\\}	12	\\}
...	@@ -139,7 +139,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -139,7 +139,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
139	\\ @cInclude("stdio.h");	139	\\ @cInclude("stdio.h");
140	\\});	140	\\});
141	\\	141	\\
142	\\export fn main(argc: c_int, argv: &&u8) c_int {	142	\\export fn main(argc: c_int, argv: [][]u8) c_int {
143	\\ if (is_windows) {	143	\\ if (is_windows) {
144	\\ // we want actual \n, not \r\n	144	\\ // we want actual \n, not \r\n
145	\\ _ = c._setmode(1, c._O_BINARY);	145	\\ _ = c._setmode(1, c._O_BINARY);
...	@@ -284,9 +284,9 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -284,9 +284,9 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
284	cases.addC("expose function pointer to C land",	284	cases.addC("expose function pointer to C land",
285	\\const c = @cImport(@cInclude("stdlib.h"));	285	\\const c = @cImport(@cInclude("stdlib.h"));
286	\\	286	\\
287	\\export fn compare_fn(a: ?&const c_void, b: ?&const c_void) c_int {	287	\\export fn compare_fn(a: ?[]const c_void, b: ?[]const c_void) c_int {
288	\\ const a_int = @ptrCast(&align(1) const i32, a ?? unreachable);	288	\\ const a_int = @ptrCast(*const i32, @alignCast(@alignOf(i32), a));
289	\\ const b_int = @ptrCast(&align(1) const i32, b ?? unreachable);	289	\\ const b_int = @ptrCast(*const i32, @alignCast(@alignOf(i32), b));
290	\\ if (a_int.* < b_int.*) {	290	\\ if (a_int.* < b_int.*) {
291	\\ return -1;	291	\\ return -1;
292	\\ } else if (a_int.* > b_int.*) {	292	\\ } else if (a_int.* > b_int.*) {
...	@@ -297,9 +297,9 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -297,9 +297,9 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
297	\\}	297	\\}
298	\\	298	\\
299	\\export fn main() c_int {	299	\\export fn main() c_int {
300	\\ var array = []u32 { 1, 7, 3, 2, 0, 9, 4, 8, 6, 5 };	300	\\ var array = []u32{ 1, 7, 3, 2, 0, 9, 4, 8, 6, 5 };
301	\\	301	\\
302	\\ c.qsort(@ptrCast(&c_void, &array[0]), c_ulong(array.len), @sizeOf(i32), compare_fn);	302	\\ c.qsort(@ptrCast(?[*]c_void, array[0..].ptr), c_ulong(array.len), @sizeOf(i32), compare_fn);
303	\\	303	\\
304	\\ for (array) \|item, i\| {	304	\\ for (array) \|item, i\| {
305	\\ if (item != i) {	305	\\ if (item != i) {
...	@@ -324,7 +324,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -324,7 +324,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
324	\\ @cInclude("stdio.h");	324	\\ @cInclude("stdio.h");
325	\\});	325	\\});
326	\\	326	\\
327	\\export fn main(argc: c_int, argv: &&u8) c_int {	327	\\export fn main(argc: c_int, argv: [][]u8) c_int {
328	\\ if (is_windows) {	328	\\ if (is_windows) {
329	\\ // we want actual \n, not \r\n	329	\\ // we want actual \n, not \r\n
330	\\ _ = c._setmode(1, c._O_BINARY);	330	\\ _ = c._setmode(1, c._O_BINARY);
...	@@ -344,13 +344,13 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -344,13 +344,13 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
344	\\const Foo = struct {	344	\\const Foo = struct {
345	\\ field1: Bar,	345	\\ field1: Bar,
346	\\	346	\\
347	\\ fn method(a: &const Foo) bool { return true; }	347	\\ fn method(a: *const Foo) bool { return true; }
348	\\};	348	\\};
349	\\	349	\\
350	\\const Bar = struct {	350	\\const Bar = struct {
351	\\ field2: i32,	351	\\ field2: i32,
352	\\	352	\\
353	\\ fn method(b: &const Bar) bool { return true; }	353	\\ fn method(b: *const Bar) bool { return true; }
354	\\};	354	\\};
355	\\	355	\\
356	\\pub fn main() void {	356	\\pub fn main() void {
...	@@ -475,7 +475,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -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	"first arg",	479	"first arg",
480	"'a' 'b' \\",	480	"'a' 'b' \\",
481	"bare",	481	"bare",
...	@@ -516,7 +516,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -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	"first arg",	520	"first arg",
521	"'a' 'b' \\",	521	"'a' 'b' \\",
522	"bare",	522	"bare",

test/compile_errors.zig+1572-762

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

test/gen_h.zig+3-4

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const tests = @import("tests.zig");	1	const tests = @import("tests.zig");
2		2
3	pub fn addCases(cases: &tests.GenHContext) void {	3	pub fn addCases(cases: *tests.GenHContext) void {
4	cases.add("declare enum",	4	cases.add("declare enum",
5	\\const Foo = extern enum { A, B, C };	5	\\const Foo = extern enum { A, B, C };
6	\\export fn entry(foo: Foo) void { }	6	\\export fn entry(foo: Foo) void { }
...	@@ -54,7 +54,7 @@ pub fn addCases(cases: &tests.GenHContext) void {	...	@@ -54,7 +54,7 @@ pub fn addCases(cases: &tests.GenHContext) void {
54	cases.add("declare opaque type",	54	cases.add("declare opaque type",
55	\\export const Foo = @OpaqueType();	55	\\export const Foo = @OpaqueType();
56	\\	56	\\
57	\\export fn entry(foo: ?&Foo) void { }	57	\\export fn entry(foo: ?*Foo) void { }
58	,	58	,
59	\\struct Foo;	59	\\struct Foo;
60	\\	60	\\
...	@@ -64,7 +64,7 @@ pub fn addCases(cases: &tests.GenHContext) void {	...	@@ -64,7 +64,7 @@ pub fn addCases(cases: &tests.GenHContext) void {
64	cases.add("array field-type",	64	cases.add("array field-type",
65	\\const Foo = extern struct {	65	\\const Foo = extern struct {
66	\\ A: [2]i32,	66	\\ A: [2]i32,
67	\\ B: [4]&u32,	67	\\ B: [4]*u32,
68	\\};	68	\\};
69	\\export fn entry(foo: Foo, bar: [3]u8) void { }	69	\\export fn entry(foo: Foo, bar: [3]u8) void { }
70	,	70	,
...	@@ -76,5 +76,4 @@ pub fn addCases(cases: &tests.GenHContext) void {	...	@@ -76,5 +76,4 @@ pub fn addCases(cases: &tests.GenHContext) void {
76	\\TEST_EXPORT void entry(struct Foo foo, uint8_t bar[]);	76	\\TEST_EXPORT void entry(struct Foo foo, uint8_t bar[]);
77	\\	77	\\
78	);	78	);
79
80	}	79	}

test/runtime_safety.zig+24-24

test/standalone/brace_expansion/build.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	const main = b.addTest("main.zig");	4	const main = b.addTest("main.zig");
5	main.setBuildMode(b.standardReleaseOptions());	5	main.setBuildMode(b.standardReleaseOptions());
6		6

test/standalone/brace_expansion/main.zig+8-13

...	@@ -14,7 +14,7 @@ const Token = union(enum) {	...	@@ -14,7 +14,7 @@ const Token = union(enum) {
14	Eof,	14	Eof,
15	};	15	};
16		16
17	var global_allocator: &mem.Allocator = undefined;	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	const State = enum {	20	const State = enum {
...	@@ -29,8 +29,7 @@ fn tokenize(input: []const u8) !ArrayList(Token) {	...	@@ -29,8 +29,7 @@ fn tokenize(input: []const u8) !ArrayList(Token) {
29	for (input) \|b, i\| {	29	for (input) \|b, i\| {
30	switch (state) {	30	switch (state) {
31	State.Start => switch (b) {	31	State.Start => switch (b) {
32	'a' ... 'z',	32	'a'...'z', 'A'...'Z' => {
33	'A' ... 'Z' => {
34	state = State.Word;	33	state = State.Word;
35	tok_begin = i;	34	tok_begin = i;
36	},	35	},
...	@@ -40,11 +39,8 @@ fn tokenize(input: []const u8) !ArrayList(Token) {	...	@@ -40,11 +39,8 @@ fn tokenize(input: []const u8) !ArrayList(Token) {
40	else => return error.InvalidInput,	39	else => return error.InvalidInput,
41	},	40	},
42	State.Word => switch (b) {	41	State.Word => switch (b) {
43	'a' ... 'z',	42	'a'...'z', 'A'...'Z' => {},
44	'A' ... 'Z' => {},	43	'{', '}', ',' => {
45	'{',
46	'}',
47	',' => {
48	try token_list.append(Token{ .Word = input[tok_begin..i] });	44	try token_list.append(Token{ .Word = input[tok_begin..i] });
49	switch (b) {	45	switch (b) {
50	'{' => try token_list.append(Token.OpenBrace),	46	'{' => try token_list.append(Token.OpenBrace),
...	@@ -77,7 +73,7 @@ const ParseError = error{	...	@@ -77,7 +73,7 @@ const ParseError = error{
77	OutOfMemory,	73	OutOfMemory,
78	};	74	};
79		75
80	fn parse(tokens: &const ArrayList(Token), token_index: &usize) ParseError!Node {	76	fn parse(tokens: const ArrayList(Token), token_index: usize) ParseError!Node {
81	const first_token = tokens.items[token_index.*];	77	const first_token = tokens.items[token_index.*];
82	token_index.* += 1;	78	token_index.* += 1;
83		79
...	@@ -103,8 +99,7 @@ fn parse(tokens: &const ArrayList(Token), token_index: &usize) ParseError!Node {	...	@@ -103,8 +99,7 @@ fn parse(tokens: &const ArrayList(Token), token_index: &usize) ParseError!Node {
103	};	99	};
104		100
105	switch (tokens.items[token_index.*]) {	101	switch (tokens.items[token_index.*]) {
106	Token.Word,	102	Token.Word, Token.OpenBrace => {
107	Token.OpenBrace => {
108	const pair = try global_allocator.alloc(Node, 2);	103	const pair = try global_allocator.alloc(Node, 2);
109	pair[0] = result_node;	104	pair[0] = result_node;
110	pair[1] = try parse(tokens, token_index);	105	pair[1] = try parse(tokens, token_index);
...	@@ -114,7 +109,7 @@ fn parse(tokens: &const ArrayList(Token), token_index: &usize) ParseError!Node {	...	@@ -114,7 +109,7 @@ fn parse(tokens: &const ArrayList(Token), token_index: &usize) ParseError!Node {
114	}	109	}
115	}	110	}
116		111
117	fn expandString(input: []const u8, output: &Buffer) !void {	112	fn expandString(input: []const u8, output: *Buffer) !void {
118	const tokens = try tokenize(input);	113	const tokens = try tokenize(input);
119	if (tokens.len == 1) {	114	if (tokens.len == 1) {
120	return output.resize(0);	115	return output.resize(0);
...	@@ -144,7 +139,7 @@ fn expandString(input: []const u8, output: &Buffer) !void {	...	@@ -144,7 +139,7 @@ fn expandString(input: []const u8, output: &Buffer) !void {
144		139
145	const ExpandNodeError = error{OutOfMemory};	140	const ExpandNodeError = error{OutOfMemory};
146		141
147	fn expandNode(node: &const Node, output: &ArrayList(Buffer)) ExpandNodeError!void {	142	fn expandNode(node: const Node, output: ArrayList(Buffer)) ExpandNodeError!void {
148	assert(output.len == 0);	143	assert(output.len == 0);
149	switch (node.*) {	144	switch (node.*) {
150	Node.Scalar => \|scalar\| {	145	Node.Scalar => \|scalar\| {

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

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	const obj = b.addObject("test", "test.zig");	4	const obj = b.addObject("test", "test.zig");
5		5
6	const test_step = b.step("test", "Test the program");	6	const test_step = b.step("test", "Test the program");

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

...	@@ -1,5 +1,8 @@	...	@@ -1,5 +1,8 @@
1	const StackTrace = @import("builtin").StackTrace;	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	fn bar() error!void {}	7	fn bar() error!void {}
5		8

test/standalone/issue_794/build.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	const test_artifact = b.addTest("main.zig");	4	const test_artifact = b.addTest("main.zig");
5	test_artifact.addIncludeDir("a_directory");	5	test_artifact.addIncludeDir("a_directory");
6		6

test/standalone/pkg_import/build.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	const exe = b.addExecutable("test", "test.zig");	4	const exe = b.addExecutable("test", "test.zig");
5	exe.addPackagePath("my_pkg", "pkg.zig");	5	exe.addPackagePath("my_pkg", "pkg.zig");
6		6

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

...	@@ -1 +1,3 @@	...	@@ -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/build.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: &Builder) void {	3	pub fn build(b: *Builder) void {
4	b.addCIncludePath(".");	4	b.addCIncludePath(".");
5		5
6	const main = b.addTest("main.zig");	6	const main = b.addTest("main.zig");

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

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

test/tests.zig+68-68

...	@@ -47,7 +47,7 @@ const test_targets = []TestTarget{	...	@@ -47,7 +47,7 @@ const test_targets = []TestTarget{
47		47
48	const max_stdout_size = 1 * 1024 * 1024; // 1 MB	48	const max_stdout_size = 1 * 1024 * 1024; // 1 MB
49		49
50	pub fn addCompareOutputTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	50	pub fn addCompareOutputTests(b: build.Builder, test_filter: ?[]const u8) build.Step {
51	const cases = b.allocator.create(CompareOutputContext) catch unreachable;	51	const cases = b.allocator.create(CompareOutputContext) catch unreachable;
52	cases.* = CompareOutputContext{	52	cases.* = CompareOutputContext{
53	.b = b,	53	.b = b,
...	@@ -61,7 +61,7 @@ pub fn addCompareOutputTests(b: &build.Builder, test_filter: ?[]const u8) &build	...	@@ -61,7 +61,7 @@ pub fn addCompareOutputTests(b: &build.Builder, test_filter: ?[]const u8) &build
61	return cases.step;	61	return cases.step;
62	}	62	}
63		63
64	pub fn addRuntimeSafetyTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	64	pub fn addRuntimeSafetyTests(b: build.Builder, test_filter: ?[]const u8) build.Step {
65	const cases = b.allocator.create(CompareOutputContext) catch unreachable;	65	const cases = b.allocator.create(CompareOutputContext) catch unreachable;
66	cases.* = CompareOutputContext{	66	cases.* = CompareOutputContext{
67	.b = b,	67	.b = b,
...	@@ -75,7 +75,7 @@ pub fn addRuntimeSafetyTests(b: &build.Builder, test_filter: ?[]const u8) &build	...	@@ -75,7 +75,7 @@ pub fn addRuntimeSafetyTests(b: &build.Builder, test_filter: ?[]const u8) &build
75	return cases.step;	75	return cases.step;
76	}	76	}
77		77
78	pub fn addCompileErrorTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	78	pub fn addCompileErrorTests(b: build.Builder, test_filter: ?[]const u8) build.Step {
79	const cases = b.allocator.create(CompileErrorContext) catch unreachable;	79	const cases = b.allocator.create(CompileErrorContext) catch unreachable;
80	cases.* = CompileErrorContext{	80	cases.* = CompileErrorContext{
81	.b = b,	81	.b = b,
...	@@ -89,7 +89,7 @@ pub fn addCompileErrorTests(b: &build.Builder, test_filter: ?[]const u8) &build.	...	@@ -89,7 +89,7 @@ pub fn addCompileErrorTests(b: &build.Builder, test_filter: ?[]const u8) &build.
89	return cases.step;	89	return cases.step;
90	}	90	}
91		91
92	pub fn addBuildExampleTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	92	pub fn addBuildExampleTests(b: build.Builder, test_filter: ?[]const u8) build.Step {
93	const cases = b.allocator.create(BuildExamplesContext) catch unreachable;	93	const cases = b.allocator.create(BuildExamplesContext) catch unreachable;
94	cases.* = BuildExamplesContext{	94	cases.* = BuildExamplesContext{
95	.b = b,	95	.b = b,
...	@@ -103,7 +103,7 @@ pub fn addBuildExampleTests(b: &build.Builder, test_filter: ?[]const u8) &build.	...	@@ -103,7 +103,7 @@ pub fn addBuildExampleTests(b: &build.Builder, test_filter: ?[]const u8) &build.
103	return cases.step;	103	return cases.step;
104	}	104	}
105		105
106	pub fn addAssembleAndLinkTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	106	pub fn addAssembleAndLinkTests(b: build.Builder, test_filter: ?[]const u8) build.Step {
107	const cases = b.allocator.create(CompareOutputContext) catch unreachable;	107	const cases = b.allocator.create(CompareOutputContext) catch unreachable;
108	cases.* = CompareOutputContext{	108	cases.* = CompareOutputContext{
109	.b = b,	109	.b = b,
...	@@ -117,7 +117,7 @@ pub fn addAssembleAndLinkTests(b: &build.Builder, test_filter: ?[]const u8) &bui	...	@@ -117,7 +117,7 @@ pub fn addAssembleAndLinkTests(b: &build.Builder, test_filter: ?[]const u8) &bui
117	return cases.step;	117	return cases.step;
118	}	118	}
119		119
120	pub fn addTranslateCTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	120	pub fn addTranslateCTests(b: build.Builder, test_filter: ?[]const u8) build.Step {
121	const cases = b.allocator.create(TranslateCContext) catch unreachable;	121	const cases = b.allocator.create(TranslateCContext) catch unreachable;
122	cases.* = TranslateCContext{	122	cases.* = TranslateCContext{
123	.b = b,	123	.b = b,
...	@@ -131,7 +131,7 @@ pub fn addTranslateCTests(b: &build.Builder, test_filter: ?[]const u8) &build.St	...	@@ -131,7 +131,7 @@ pub fn addTranslateCTests(b: &build.Builder, test_filter: ?[]const u8) &build.St
131	return cases.step;	131	return cases.step;
132	}	132	}
133		133
134	pub fn addGenHTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	134	pub fn addGenHTests(b: build.Builder, test_filter: ?[]const u8) build.Step {
135	const cases = b.allocator.create(GenHContext) catch unreachable;	135	const cases = b.allocator.create(GenHContext) catch unreachable;
136	cases.* = GenHContext{	136	cases.* = GenHContext{
137	.b = b,	137	.b = b,
...	@@ -145,7 +145,7 @@ pub fn addGenHTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {	...	@@ -145,7 +145,7 @@ pub fn addGenHTests(b: &build.Builder, test_filter: ?[]const u8) &build.Step {
145	return cases.step;	145	return cases.step;
146	}	146	}
147		147
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 {	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 {
149	const step = b.step(b.fmt("test-{}", name), desc);	149	const step = b.step(b.fmt("test-{}", name), desc);
150	for (test_targets) \|test_target\| {	150	for (test_targets) \|test_target\| {
151	const is_native = (test_target.os == builtin.os and test_target.arch == builtin.arch);	151	const is_native = (test_target.os == builtin.os and test_target.arch == builtin.arch);
...	@@ -193,8 +193,8 @@ pub fn addPkgTests(b: &build.Builder, test_filter: ?[]const u8, root_src: []cons	...	@@ -193,8 +193,8 @@ pub fn addPkgTests(b: &build.Builder, test_filter: ?[]const u8, root_src: []cons
193	}	193	}
194		194
195	pub const CompareOutputContext = struct {	195	pub const CompareOutputContext = struct {
196	b: &build.Builder,	196	b: *build.Builder,
197	step: &build.Step,	197	step: *build.Step,
198	test_index: usize,	198	test_index: usize,
199	test_filter: ?[]const u8,	199	test_filter: ?[]const u8,
200		200
...	@@ -217,28 +217,28 @@ pub const CompareOutputContext = struct {	...	@@ -217,28 +217,28 @@ pub const CompareOutputContext = struct {
217	source: []const u8,	217	source: []const u8,
218	};	218	};
219		219
220	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {	220	pub fn addSourceFile(self: *TestCase, filename: []const u8, source: []const u8) void {
221	self.sources.append(SourceFile{	221	self.sources.append(SourceFile{
222	.filename = filename,	222	.filename = filename,
223	.source = source,	223	.source = source,
224	}) catch unreachable;	224	}) catch unreachable;
225	}	225	}
226		226
227	pub fn setCommandLineArgs(self: &TestCase, args: []const []const u8) void {	227	pub fn setCommandLineArgs(self: *TestCase, args: []const []const u8) void {
228	self.cli_args = args;	228	self.cli_args = args;
229	}	229	}
230	};	230	};
231		231
232	const RunCompareOutputStep = struct {	232	const RunCompareOutputStep = struct {
233	step: build.Step,	233	step: build.Step,
234	context: &CompareOutputContext,	234	context: *CompareOutputContext,
235	exe_path: []const u8,	235	exe_path: []const u8,
236	name: []const u8,	236	name: []const u8,
237	expected_output: []const u8,	237	expected_output: []const u8,
238	test_index: usize,	238	test_index: usize,
239	cli_args: []const []const u8,	239	cli_args: []const []const u8,
240		240
241	pub fn create(context: &CompareOutputContext, exe_path: []const u8, name: []const u8, expected_output: []const u8, cli_args: []const []const u8) &RunCompareOutputStep {	241	pub fn create(context: CompareOutputContext, exe_path: []const u8, name: []const u8, expected_output: []const u8, cli_args: []const []const u8) RunCompareOutputStep {
242	const allocator = context.b.allocator;	242	const allocator = context.b.allocator;
243	const ptr = allocator.create(RunCompareOutputStep) catch unreachable;	243	const ptr = allocator.create(RunCompareOutputStep) catch unreachable;
244	ptr.* = RunCompareOutputStep{	244	ptr.* = RunCompareOutputStep{
...	@@ -254,7 +254,7 @@ pub const CompareOutputContext = struct {	...	@@ -254,7 +254,7 @@ pub const CompareOutputContext = struct {
254	return ptr;	254	return ptr;
255	}	255	}
256		256
257	fn make(step: &build.Step) !void {	257	fn make(step: *build.Step) !void {
258	const self = @fieldParentPtr(RunCompareOutputStep, "step", step);	258	const self = @fieldParentPtr(RunCompareOutputStep, "step", step);
259	const b = self.context.b;	259	const b = self.context.b;
260		260
...	@@ -321,12 +321,12 @@ pub const CompareOutputContext = struct {	...	@@ -321,12 +321,12 @@ pub const CompareOutputContext = struct {
321		321
322	const RuntimeSafetyRunStep = struct {	322	const RuntimeSafetyRunStep = struct {
323	step: build.Step,	323	step: build.Step,
324	context: &CompareOutputContext,	324	context: *CompareOutputContext,
325	exe_path: []const u8,	325	exe_path: []const u8,
326	name: []const u8,	326	name: []const u8,
327	test_index: usize,	327	test_index: usize,
328		328
329	pub fn create(context: &CompareOutputContext, exe_path: []const u8, name: []const u8) &RuntimeSafetyRunStep {	329	pub fn create(context: CompareOutputContext, exe_path: []const u8, name: []const u8) RuntimeSafetyRunStep {
330	const allocator = context.b.allocator;	330	const allocator = context.b.allocator;
331	const ptr = allocator.create(RuntimeSafetyRunStep) catch unreachable;	331	const ptr = allocator.create(RuntimeSafetyRunStep) catch unreachable;
332	ptr.* = RuntimeSafetyRunStep{	332	ptr.* = RuntimeSafetyRunStep{
...	@@ -340,7 +340,7 @@ pub const CompareOutputContext = struct {	...	@@ -340,7 +340,7 @@ pub const CompareOutputContext = struct {
340	return ptr;	340	return ptr;
341	}	341	}
342		342
343	fn make(step: &build.Step) !void {	343	fn make(step: *build.Step) !void {
344	const self = @fieldParentPtr(RuntimeSafetyRunStep, "step", step);	344	const self = @fieldParentPtr(RuntimeSafetyRunStep, "step", step);
345	const b = self.context.b;	345	const b = self.context.b;
346		346
...	@@ -382,7 +382,7 @@ pub const CompareOutputContext = struct {	...	@@ -382,7 +382,7 @@ pub const CompareOutputContext = struct {
382	}	382	}
383	};	383	};
384		384
385	pub fn createExtra(self: &CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8, special: Special) 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	var tc = TestCase{
387	.name = name,	387	.name = name,
388	.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),	388	.sources = ArrayList(TestCase.SourceFile).init(self.b.allocator),
...	@@ -396,32 +396,32 @@ pub const CompareOutputContext = struct {	...	@@ -396,32 +396,32 @@ pub const CompareOutputContext = struct {
396	return tc;	396	return tc;
397	}	397	}
398		398
399	pub fn create(self: &CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) TestCase {	399	pub fn create(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) TestCase {
400	return createExtra(self, name, source, expected_output, Special.None);	400	return createExtra(self, name, source, expected_output, Special.None);
401	}	401	}
402		402
403	pub fn addC(self: &CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {	403	pub fn addC(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {
404	var tc = self.create(name, source, expected_output);	404	var tc = self.create(name, source, expected_output);
405	tc.link_libc = true;	405	tc.link_libc = true;
406	self.addCase(tc);	406	self.addCase(tc);
407	}	407	}
408		408
409	pub fn add(self: &CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {	409	pub fn add(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {
410	const tc = self.create(name, source, expected_output);	410	const tc = self.create(name, source, expected_output);
411	self.addCase(tc);	411	self.addCase(tc);
412	}	412	}
413		413
414	pub fn addAsm(self: &CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {	414	pub fn addAsm(self: *CompareOutputContext, name: []const u8, source: []const u8, expected_output: []const u8) void {
415	const tc = self.createExtra(name, source, expected_output, Special.Asm);	415	const tc = self.createExtra(name, source, expected_output, Special.Asm);
416	self.addCase(tc);	416	self.addCase(tc);
417	}	417	}
418		418
419	pub fn addRuntimeSafety(self: &CompareOutputContext, name: []const u8, source: []const u8) void {	419	pub fn addRuntimeSafety(self: *CompareOutputContext, name: []const u8, source: []const u8) void {
420	const tc = self.createExtra(name, source, undefined, Special.RuntimeSafety);	420	const tc = self.createExtra(name, source, undefined, Special.RuntimeSafety);
421	self.addCase(tc);	421	self.addCase(tc);
422	}	422	}
423		423
424	pub fn addCase(self: &CompareOutputContext, case: &const TestCase) void {	424	pub fn addCase(self: CompareOutputContext, case: const TestCase) void {
425	const b = self.b;	425	const b = self.b;
426		426
427	const root_src = os.path.join(b.allocator, b.cache_root, case.sources.items[0].filename) catch unreachable;	427	const root_src = os.path.join(b.allocator, b.cache_root, case.sources.items[0].filename) catch unreachable;
...	@@ -504,8 +504,8 @@ pub const CompareOutputContext = struct {	...	@@ -504,8 +504,8 @@ pub const CompareOutputContext = struct {
504	};	504	};
505		505
506	pub const CompileErrorContext = struct {	506	pub const CompileErrorContext = struct {
507	b: &build.Builder,	507	b: *build.Builder,
508	step: &build.Step,	508	step: *build.Step,
509	test_index: usize,	509	test_index: usize,
510	test_filter: ?[]const u8,	510	test_filter: ?[]const u8,
511		511
...	@@ -521,27 +521,27 @@ pub const CompileErrorContext = struct {	...	@@ -521,27 +521,27 @@ pub const CompileErrorContext = struct {
521	source: []const u8,	521	source: []const u8,
522	};	522	};
523		523
524	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {	524	pub fn addSourceFile(self: *TestCase, filename: []const u8, source: []const u8) void {
525	self.sources.append(SourceFile{	525	self.sources.append(SourceFile{
526	.filename = filename,	526	.filename = filename,
527	.source = source,	527	.source = source,
528	}) catch unreachable;	528	}) catch unreachable;
529	}	529	}
530		530
531	pub fn addExpectedError(self: &TestCase, text: []const u8) void {	531	pub fn addExpectedError(self: *TestCase, text: []const u8) void {
532	self.expected_errors.append(text) catch unreachable;	532	self.expected_errors.append(text) catch unreachable;
533	}	533	}
534	};	534	};
535		535
536	const CompileCmpOutputStep = struct {	536	const CompileCmpOutputStep = struct {
537	step: build.Step,	537	step: build.Step,
538	context: &CompileErrorContext,	538	context: *CompileErrorContext,
539	name: []const u8,	539	name: []const u8,
540	test_index: usize,	540	test_index: usize,
541	case: &const TestCase,	541	case: *const TestCase,
542	build_mode: Mode,	542	build_mode: Mode,
543		543
544	pub fn create(context: &CompileErrorContext, name: []const u8, case: &const TestCase, build_mode: Mode) &CompileCmpOutputStep {	544	pub fn create(context: CompileErrorContext, name: []const u8, case: const TestCase, build_mode: Mode) *CompileCmpOutputStep {
545	const allocator = context.b.allocator;	545	const allocator = context.b.allocator;
546	const ptr = allocator.create(CompileCmpOutputStep) catch unreachable;	546	const ptr = allocator.create(CompileCmpOutputStep) catch unreachable;
547	ptr.* = CompileCmpOutputStep{	547	ptr.* = CompileCmpOutputStep{
...	@@ -556,7 +556,7 @@ pub const CompileErrorContext = struct {	...	@@ -556,7 +556,7 @@ pub const CompileErrorContext = struct {
556	return ptr;	556	return ptr;
557	}	557	}
558		558
559	fn make(step: &build.Step) !void {	559	fn make(step: *build.Step) !void {
560	const self = @fieldParentPtr(CompileCmpOutputStep, "step", step);	560	const self = @fieldParentPtr(CompileCmpOutputStep, "step", step);
561	const b = self.context.b;	561	const b = self.context.b;
562		562
...	@@ -661,7 +661,7 @@ pub const CompileErrorContext = struct {	...	@@ -661,7 +661,7 @@ pub const CompileErrorContext = struct {
661	warn("\n");	661	warn("\n");
662	}	662	}
663		663
664	pub fn create(self: &CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) &TestCase {	664	pub fn create(self: CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) TestCase {
665	const tc = self.b.allocator.create(TestCase) catch unreachable;	665	const tc = self.b.allocator.create(TestCase) catch unreachable;
666	tc.* = TestCase{	666	tc.* = TestCase{
667	.name = name,	667	.name = name,
...	@@ -678,24 +678,24 @@ pub const CompileErrorContext = struct {	...	@@ -678,24 +678,24 @@ pub const CompileErrorContext = struct {
678	return tc;	678	return tc;
679	}	679	}
680		680
681	pub fn addC(self: &CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) void {	681	pub fn addC(self: *CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) void {
682	var tc = self.create(name, source, expected_lines);	682	var tc = self.create(name, source, expected_lines);
683	tc.link_libc = true;	683	tc.link_libc = true;
684	self.addCase(tc);	684	self.addCase(tc);
685	}	685	}
686		686
687	pub fn addExe(self: &CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) void {	687	pub fn addExe(self: *CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) void {
688	var tc = self.create(name, source, expected_lines);	688	var tc = self.create(name, source, expected_lines);
689	tc.is_exe = true;	689	tc.is_exe = true;
690	self.addCase(tc);	690	self.addCase(tc);
691	}	691	}
692		692
693	pub fn add(self: &CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) void {	693	pub fn add(self: *CompileErrorContext, name: []const u8, source: []const u8, expected_lines: ...) void {
694	const tc = self.create(name, source, expected_lines);	694	const tc = self.create(name, source, expected_lines);
695	self.addCase(tc);	695	self.addCase(tc);
696	}	696	}
697		697
698	pub fn addCase(self: &CompileErrorContext, case: &const TestCase) void {	698	pub fn addCase(self: CompileErrorContext, case: const TestCase) void {
699	const b = self.b;	699	const b = self.b;
700		700
701	for ([]Mode{	701	for ([]Mode{
...	@@ -720,20 +720,20 @@ pub const CompileErrorContext = struct {	...	@@ -720,20 +720,20 @@ pub const CompileErrorContext = struct {
720	};	720	};
721		721
722	pub const BuildExamplesContext = struct {	722	pub const BuildExamplesContext = struct {
723	b: &build.Builder,	723	b: *build.Builder,
724	step: &build.Step,	724	step: *build.Step,
725	test_index: usize,	725	test_index: usize,
726	test_filter: ?[]const u8,	726	test_filter: ?[]const u8,
727		727
728	pub fn addC(self: &BuildExamplesContext, root_src: []const u8) void {	728	pub fn addC(self: *BuildExamplesContext, root_src: []const u8) void {
729	self.addAllArgs(root_src, true);	729	self.addAllArgs(root_src, true);
730	}	730	}
731		731
732	pub fn add(self: &BuildExamplesContext, root_src: []const u8) void {	732	pub fn add(self: *BuildExamplesContext, root_src: []const u8) void {
733	self.addAllArgs(root_src, false);	733	self.addAllArgs(root_src, false);
734	}	734	}
735		735
736	pub fn addBuildFile(self: &BuildExamplesContext, build_file: []const u8) void {	736	pub fn addBuildFile(self: *BuildExamplesContext, build_file: []const u8) void {
737	const b = self.b;	737	const b = self.b;
738		738
739	const annotated_case_name = b.fmt("build {} (Debug)", build_file);	739	const annotated_case_name = b.fmt("build {} (Debug)", build_file);
...	@@ -763,7 +763,7 @@ pub const BuildExamplesContext = struct {	...	@@ -763,7 +763,7 @@ pub const BuildExamplesContext = struct {
763	self.step.dependOn(&log_step.step);	763	self.step.dependOn(&log_step.step);
764	}	764	}
765		765
766	pub fn addAllArgs(self: &BuildExamplesContext, root_src: []const u8, link_libc: bool) void {	766	pub fn addAllArgs(self: *BuildExamplesContext, root_src: []const u8, link_libc: bool) void {
767	const b = self.b;	767	const b = self.b;
768		768
769	for ([]Mode{	769	for ([]Mode{
...	@@ -792,8 +792,8 @@ pub const BuildExamplesContext = struct {	...	@@ -792,8 +792,8 @@ pub const BuildExamplesContext = struct {
792	};	792	};
793		793
794	pub const TranslateCContext = struct {	794	pub const TranslateCContext = struct {
795	b: &build.Builder,	795	b: *build.Builder,
796	step: &build.Step,	796	step: *build.Step,
797	test_index: usize,	797	test_index: usize,
798	test_filter: ?[]const u8,	798	test_filter: ?[]const u8,
799		799
...	@@ -808,26 +808,26 @@ pub const TranslateCContext = struct {	...	@@ -808,26 +808,26 @@ pub const TranslateCContext = struct {
808	source: []const u8,	808	source: []const u8,
809	};	809	};
810		810
811	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {	811	pub fn addSourceFile(self: *TestCase, filename: []const u8, source: []const u8) void {
812	self.sources.append(SourceFile{	812	self.sources.append(SourceFile{
813	.filename = filename,	813	.filename = filename,
814	.source = source,	814	.source = source,
815	}) catch unreachable;	815	}) catch unreachable;
816	}	816	}
817		817
818	pub fn addExpectedLine(self: &TestCase, text: []const u8) void {	818	pub fn addExpectedLine(self: *TestCase, text: []const u8) void {
819	self.expected_lines.append(text) catch unreachable;	819	self.expected_lines.append(text) catch unreachable;
820	}	820	}
821	};	821	};
822		822
823	const TranslateCCmpOutputStep = struct {	823	const TranslateCCmpOutputStep = struct {
824	step: build.Step,	824	step: build.Step,
825	context: &TranslateCContext,	825	context: *TranslateCContext,
826	name: []const u8,	826	name: []const u8,
827	test_index: usize,	827	test_index: usize,
828	case: &const TestCase,	828	case: *const TestCase,
829		829
830	pub fn create(context: &TranslateCContext, name: []const u8, case: &const TestCase) &TranslateCCmpOutputStep {	830	pub fn create(context: TranslateCContext, name: []const u8, case: const TestCase) *TranslateCCmpOutputStep {
831	const allocator = context.b.allocator;	831	const allocator = context.b.allocator;
832	const ptr = allocator.create(TranslateCCmpOutputStep) catch unreachable;	832	const ptr = allocator.create(TranslateCCmpOutputStep) catch unreachable;
833	ptr.* = TranslateCCmpOutputStep{	833	ptr.* = TranslateCCmpOutputStep{
...	@@ -841,7 +841,7 @@ pub const TranslateCContext = struct {	...	@@ -841,7 +841,7 @@ pub const TranslateCContext = struct {
841	return ptr;	841	return ptr;
842	}	842	}
843		843
844	fn make(step: &build.Step) !void {	844	fn make(step: *build.Step) !void {
845	const self = @fieldParentPtr(TranslateCCmpOutputStep, "step", step);	845	const self = @fieldParentPtr(TranslateCCmpOutputStep, "step", step);
846	const b = self.context.b;	846	const b = self.context.b;
847		847
...	@@ -935,7 +935,7 @@ pub const TranslateCContext = struct {	...	@@ -935,7 +935,7 @@ pub const TranslateCContext = struct {
935	warn("\n");	935	warn("\n");
936	}	936	}
937		937
938	pub fn create(self: &TranslateCContext, allow_warnings: bool, filename: []const u8, name: []const u8, source: []const u8, expected_lines: ...) &TestCase {	938	pub fn create(self: TranslateCContext, allow_warnings: bool, filename: []const u8, name: []const u8, source: []const u8, expected_lines: ...) TestCase {
939	const tc = self.b.allocator.create(TestCase) catch unreachable;	939	const tc = self.b.allocator.create(TestCase) catch unreachable;
940	tc.* = TestCase{	940	tc.* = TestCase{
941	.name = name,	941	.name = name,
...	@@ -951,22 +951,22 @@ pub const TranslateCContext = struct {	...	@@ -951,22 +951,22 @@ pub const TranslateCContext = struct {
951	return tc;	951	return tc;
952	}	952	}
953		953
954	pub fn add(self: &TranslateCContext, name: []const u8, source: []const u8, expected_lines: ...) void {	954	pub fn add(self: *TranslateCContext, name: []const u8, source: []const u8, expected_lines: ...) void {
955	const tc = self.create(false, "source.h", name, source, expected_lines);	955	const tc = self.create(false, "source.h", name, source, expected_lines);
956	self.addCase(tc);	956	self.addCase(tc);
957	}	957	}
958		958
959	pub fn addC(self: &TranslateCContext, name: []const u8, source: []const u8, expected_lines: ...) void {	959	pub fn addC(self: *TranslateCContext, name: []const u8, source: []const u8, expected_lines: ...) void {
960	const tc = self.create(false, "source.c", name, source, expected_lines);	960	const tc = self.create(false, "source.c", name, source, expected_lines);
961	self.addCase(tc);	961	self.addCase(tc);
962	}	962	}
963		963
964	pub fn addAllowWarnings(self: &TranslateCContext, name: []const u8, source: []const u8, expected_lines: ...) void {	964	pub fn addAllowWarnings(self: *TranslateCContext, name: []const u8, source: []const u8, expected_lines: ...) void {
965	const tc = self.create(true, "source.h", name, source, expected_lines);	965	const tc = self.create(true, "source.h", name, source, expected_lines);
966	self.addCase(tc);	966	self.addCase(tc);
967	}	967	}
968		968
969	pub fn addCase(self: &TranslateCContext, case: &const TestCase) void {	969	pub fn addCase(self: TranslateCContext, case: const TestCase) void {
970	const b = self.b;	970	const b = self.b;
971		971
972	const annotated_case_name = fmt.allocPrint(self.b.allocator, "translate-c {}", case.name) catch unreachable;	972	const annotated_case_name = fmt.allocPrint(self.b.allocator, "translate-c {}", case.name) catch unreachable;
...	@@ -986,8 +986,8 @@ pub const TranslateCContext = struct {	...	@@ -986,8 +986,8 @@ pub const TranslateCContext = struct {
986	};	986	};
987		987
988	pub const GenHContext = struct {	988	pub const GenHContext = struct {
989	b: &build.Builder,	989	b: *build.Builder,
990	step: &build.Step,	990	step: *build.Step,
991	test_index: usize,	991	test_index: usize,
992	test_filter: ?[]const u8,	992	test_filter: ?[]const u8,
993		993
...	@@ -1001,27 +1001,27 @@ pub const GenHContext = struct {	...	@@ -1001,27 +1001,27 @@ pub const GenHContext = struct {
1001	source: []const u8,	1001	source: []const u8,
1002	};	1002	};
1003		1003
1004	pub fn addSourceFile(self: &TestCase, filename: []const u8, source: []const u8) void {	1004	pub fn addSourceFile(self: *TestCase, filename: []const u8, source: []const u8) void {
1005	self.sources.append(SourceFile{	1005	self.sources.append(SourceFile{
1006	.filename = filename,	1006	.filename = filename,
1007	.source = source,	1007	.source = source,
1008	}) catch unreachable;	1008	}) catch unreachable;
1009	}	1009	}
1010		1010
1011	pub fn addExpectedLine(self: &TestCase, text: []const u8) void {	1011	pub fn addExpectedLine(self: *TestCase, text: []const u8) void {
1012	self.expected_lines.append(text) catch unreachable;	1012	self.expected_lines.append(text) catch unreachable;
1013	}	1013	}
1014	};	1014	};
1015		1015
1016	const GenHCmpOutputStep = struct {	1016	const GenHCmpOutputStep = struct {
1017	step: build.Step,	1017	step: build.Step,
1018	context: &GenHContext,	1018	context: *GenHContext,
1019	h_path: []const u8,	1019	h_path: []const u8,
1020	name: []const u8,	1020	name: []const u8,
1021	test_index: usize,	1021	test_index: usize,
1022	case: &const TestCase,	1022	case: *const TestCase,
1023		1023
1024	pub fn create(context: &GenHContext, h_path: []const u8, name: []const u8, case: &const TestCase) &GenHCmpOutputStep {	1024	pub fn create(context: GenHContext, h_path: []const u8, name: []const u8, case: const TestCase) *GenHCmpOutputStep {
1025	const allocator = context.b.allocator;	1025	const allocator = context.b.allocator;
1026	const ptr = allocator.create(GenHCmpOutputStep) catch unreachable;	1026	const ptr = allocator.create(GenHCmpOutputStep) catch unreachable;
1027	ptr.* = GenHCmpOutputStep{	1027	ptr.* = GenHCmpOutputStep{
...	@@ -1036,7 +1036,7 @@ pub const GenHContext = struct {	...	@@ -1036,7 +1036,7 @@ pub const GenHContext = struct {
1036	return ptr;	1036	return ptr;
1037	}	1037	}
1038		1038
1039	fn make(step: &build.Step) !void {	1039	fn make(step: *build.Step) !void {
1040	const self = @fieldParentPtr(GenHCmpOutputStep, "step", step);	1040	const self = @fieldParentPtr(GenHCmpOutputStep, "step", step);
1041	const b = self.context.b;	1041	const b = self.context.b;
1042		1042
...	@@ -1069,7 +1069,7 @@ pub const GenHContext = struct {	...	@@ -1069,7 +1069,7 @@ pub const GenHContext = struct {
1069	warn("\n");	1069	warn("\n");
1070	}	1070	}
1071		1071
1072	pub fn create(self: &GenHContext, filename: []const u8, name: []const u8, source: []const u8, expected_lines: ...) &TestCase {	1072	pub fn create(self: GenHContext, filename: []const u8, name: []const u8, source: []const u8, expected_lines: ...) TestCase {
1073	const tc = self.b.allocator.create(TestCase) catch unreachable;	1073	const tc = self.b.allocator.create(TestCase) catch unreachable;
1074	tc.* = TestCase{	1074	tc.* = TestCase{
1075	.name = name,	1075	.name = name,
...	@@ -1084,12 +1084,12 @@ pub const GenHContext = struct {	...	@@ -1084,12 +1084,12 @@ pub const GenHContext = struct {
1084	return tc;	1084	return tc;
1085	}	1085	}
1086		1086
1087	pub fn add(self: &GenHContext, name: []const u8, source: []const u8, expected_lines: ...) void {	1087	pub fn add(self: *GenHContext, name: []const u8, source: []const u8, expected_lines: ...) void {
1088	const tc = self.create("test.zig", name, source, expected_lines);	1088	const tc = self.create("test.zig", name, source, expected_lines);
1089	self.addCase(tc);	1089	self.addCase(tc);
1090	}	1090	}
1091		1091
1092	pub fn addCase(self: &GenHContext, case: &const TestCase) void {	1092	pub fn addCase(self: GenHContext, case: const TestCase) void {
1093	const b = self.b;	1093	const b = self.b;
1094	const root_src = os.path.join(b.allocator, b.cache_root, case.sources.items[0].filename) catch unreachable;	1094	const root_src = os.path.join(b.allocator, b.cache_root, case.sources.items[0].filename) catch unreachable;
1095		1095

test/translate_c.zig+53-54

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	const tests = @import("tests.zig");	1	const tests = @import("tests.zig");
2		2
3	pub fn addCases(cases: &tests.TranslateCContext) void {	3	pub fn addCases(cases: *tests.TranslateCContext) void {
4	cases.add("double define struct",	4	cases.add("double define struct",
5	\\typedef struct Bar Bar;	5	\\typedef struct Bar Bar;
6	\\typedef struct Foo Foo;	6	\\typedef struct Foo Foo;
...	@@ -14,11 +14,11 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -14,11 +14,11 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
14	\\};	14	\\};
15	,	15	,
16	\\pub const struct_Foo = extern struct {	16	\\pub const struct_Foo = extern struct {
17	\\ a: ?&Foo,	17	\\ a: ?[*]Foo,
18	\\};	18	\\};
19	\\pub const Foo = struct_Foo;	19	\\pub const Foo = struct_Foo;
20	\\pub const struct_Bar = extern struct {	20	\\pub const struct_Bar = extern struct {
21	\\ a: ?&Foo,	21	\\ a: ?[*]Foo,
22	\\};	22	\\};
23	);	23	);
24		24
...	@@ -99,7 +99,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -99,7 +99,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
99	cases.add("restrict -> noalias",	99	cases.add("restrict -> noalias",
100	\\void foo(void restrict bar, void restrict);	100	\\void foo(void restrict bar, void restrict);
101	,	101	,
102	\\pub extern fn foo(noalias bar: ?&c_void, noalias arg1: ?&c_void) void;	102	\\pub extern fn foo(noalias bar: ?[]c_void, noalias arg1: ?[]c_void) void;
103	);	103	);
104		104
105	cases.add("simple struct",	105	cases.add("simple struct",
...	@@ -110,7 +110,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -110,7 +110,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
110	,	110	,
111	\\const struct_Foo = extern struct {	111	\\const struct_Foo = extern struct {
112	\\ x: c_int,	112	\\ x: c_int,
113	\\ y: ?&u8,	113	\\ y: ?[*]u8,
114	\\};	114	\\};
115	,	115	,
116	\\pub const Foo = struct_Foo;	116	\\pub const Foo = struct_Foo;
...	@@ -141,7 +141,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -141,7 +141,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
141	,	141	,
142	\\pub const BarB = enum_Bar.B;	142	\\pub const BarB = enum_Bar.B;
143	,	143	,
144	\\pub extern fn func(a: ?&struct_Foo, b: ?&(?&enum_Bar)) void;	144	\\pub extern fn func(a: ?[]struct_Foo, b: ?[](?[*]enum_Bar)) void;
145	,	145	,
146	\\pub const Foo = struct_Foo;	146	\\pub const Foo = struct_Foo;
147	,	147	,
...	@@ -151,7 +151,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -151,7 +151,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
151	cases.add("constant size array",	151	cases.add("constant size array",
152	\\void func(int array[20]);	152	\\void func(int array[20]);
153	,	153	,
154	\\pub extern fn func(array: ?&c_int) void;	154	\\pub extern fn func(array: ?[*]c_int) void;
155	);	155	);
156		156
157	cases.add("self referential struct with function pointer",	157	cases.add("self referential struct with function pointer",
...	@@ -160,7 +160,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -160,7 +160,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
160	\\};	160	\\};
161	,	161	,
162	\\pub const struct_Foo = extern struct {	162	\\pub const struct_Foo = extern struct {
163	\\ derp: ?extern fn(?&struct_Foo) void,	163	\\ derp: ?extern fn(?[*]struct_Foo) void,
164	\\};	164	\\};
165	,	165	,
166	\\pub const Foo = struct_Foo;	166	\\pub const Foo = struct_Foo;
...	@@ -172,7 +172,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -172,7 +172,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
172	,	172	,
173	\\pub const struct_Foo = @OpaqueType();	173	\\pub const struct_Foo = @OpaqueType();
174	,	174	,
175	\\pub extern fn some_func(foo: ?&struct_Foo, x: c_int) ?&struct_Foo;	175	\\pub extern fn some_func(foo: ?[]struct_Foo, x: c_int) ?[]struct_Foo;
176	,	176	,
177	\\pub const Foo = struct_Foo;	177	\\pub const Foo = struct_Foo;
178	);	178	);
...	@@ -219,11 +219,11 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -219,11 +219,11 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
219	\\};	219	\\};
220	,	220	,
221	\\pub const struct_Bar = extern struct {	221	\\pub const struct_Bar = extern struct {
222	\\ next: ?&struct_Foo,	222	\\ next: ?[*]struct_Foo,
223	\\};	223	\\};
224	,	224	,
225	\\pub const struct_Foo = extern struct {	225	\\pub const struct_Foo = extern struct {
226	\\ next: ?&struct_Bar,	226	\\ next: ?[*]struct_Bar,
227	\\};	227	\\};
228	);	228	);
229		229
...	@@ -233,7 +233,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -233,7 +233,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
233	,	233	,
234	\\pub const Foo = c_void;	234	\\pub const Foo = c_void;
235	,	235	,
236	\\pub extern fn fun(a: ?&Foo) Foo;	236	\\pub extern fn fun(a: ?[*]Foo) Foo;
237	);	237	);
238		238
239	cases.add("generate inline func for #define global extern fn",	239	cases.add("generate inline func for #define global extern fn",
...	@@ -505,7 +505,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -505,7 +505,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
505	\\ return 6;	505	\\ return 6;
506	\\}	506	\\}
507	,	507	,
508	\\pub export fn and_or_none_bool(a: c_int, b: f32, c: ?&c_void) c_int {	508	\\pub export fn and_or_none_bool(a: c_int, b: f32, c: ?[*]c_void) c_int {
509	\\ if ((a != 0) and (b != 0)) return 0;	509	\\ if ((a != 0) and (b != 0)) return 0;
510	\\ if ((b != 0) and (c != null)) return 1;	510	\\ if ((b != 0) and (c != null)) return 1;
511	\\ if ((a != 0) and (c != null)) return 2;	511	\\ if ((a != 0) and (c != null)) return 2;
...	@@ -607,7 +607,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -607,7 +607,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
607	\\pub const struct_Foo = extern struct {	607	\\pub const struct_Foo = extern struct {
608	\\ field: c_int,	608	\\ field: c_int,
609	\\};	609	\\};
610	\\pub export fn read_field(foo: ?&struct_Foo) c_int {	610	\\pub export fn read_field(foo: ?[*]struct_Foo) c_int {
611	\\ return (??foo).field;	611	\\ return (??foo).field;
612	\\}	612	\\}
613	);	613	);
...	@@ -638,7 +638,6 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -638,7 +638,6 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
638	\\}	638	\\}
639	);	639	);
640		640
641
642	cases.addC("c style cast",	641	cases.addC("c style cast",
643	\\int float_to_int(float a) {	642	\\int float_to_int(float a) {
644	\\ return (int)a;	643	\\ return (int)a;
...	@@ -654,8 +653,8 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -654,8 +653,8 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
654	\\ return x;	653	\\ return x;
655	\\}	654	\\}
656	,	655	,
657	\\pub export fn foo(x: ?&c_ushort) ?&c_void {	656	\\pub export fn foo(x: ?[]c_ushort) ?[]c_void {
658	\\ return @ptrCast(?&c_void, x);	657	\\ return @ptrCast(?[*]c_void, x);
659	\\}	658	\\}
660	);	659	);
661		660
...	@@ -675,7 +674,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -675,7 +674,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
675	\\ return 0;	674	\\ return 0;
676	\\}	675	\\}
677	,	676	,
678	\\pub export fn foo() ?&c_int {	677	\\pub export fn foo() ?[*]c_int {
679	\\ return null;	678	\\ return null;
680	\\}	679	\\}
681	);	680	);
...	@@ -984,7 +983,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -984,7 +983,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
984	\\ *x = 1;	983	\\ *x = 1;
985	\\}	984	\\}
986	,	985	,
987	\\pub export fn foo(x: ?&c_int) void {	986	\\pub export fn foo(x: ?[*]c_int) void {
988	\\ (??x).* = 1;	987	\\ (??x).* = 1;
989	\\}	988	\\}
990	);	989	);
...	@@ -1012,7 +1011,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1012,7 +1011,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1012	,	1011	,
1013	\\pub fn foo() c_int {	1012	\\pub fn foo() c_int {
1014	\\ var x: c_int = 1234;	1013	\\ var x: c_int = 1234;
1015	\\ var ptr: ?&c_int = &x;	1014	\\ var ptr: ?[*]c_int = &x;
1016	\\ return (??ptr).*;	1015	\\ return (??ptr).*;
1017	\\}	1016	\\}
1018	);	1017	);
...	@@ -1022,7 +1021,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1022,7 +1021,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1022	\\ return "bar";	1021	\\ return "bar";
1023	\\}	1022	\\}
1024	,	1023	,
1025	\\pub fn foo() ?&const u8 {	1024	\\pub fn foo() ?[*]const u8 {
1026	\\ return c"bar";	1025	\\ return c"bar";
1027	\\}	1026	\\}
1028	);	1027	);
...	@@ -1151,8 +1150,8 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1151,8 +1150,8 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1151	\\ return (float *)a;	1150	\\ return (float *)a;
1152	\\}	1151	\\}
1153	,	1152	,
1154	\\fn ptrcast(a: ?&c_int) ?&f32 {	1153	\\fn ptrcast(a: ?[]c_int) ?[]f32 {
1155	\\ return @ptrCast(?&f32, a);	1154	\\ return @ptrCast(?[*]f32, a);
1156	\\}	1155	\\}
1157	);	1156	);
1158		1157
...	@@ -1174,7 +1173,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1174,7 +1173,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1174	\\ return !c;	1173	\\ return !c;
1175	\\}	1174	\\}
1176	,	1175	,
1177	\\pub fn foo(a: c_int, b: f32, c: ?&c_void) c_int {	1176	\\pub fn foo(a: c_int, b: f32, c: ?[*]c_void) c_int {
1178	\\ return !(a == 0);	1177	\\ return !(a == 0);
1179	\\ return !(a != 0);	1178	\\ return !(a != 0);
1180	\\ return !(b != 0);	1179	\\ return !(b != 0);
...	@@ -1195,7 +1194,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1195,7 +1194,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1195	cases.add("const ptr initializer",	1194	cases.add("const ptr initializer",
1196	\\static const char *v0 = "0.0.0";	1195	\\static const char *v0 = "0.0.0";
1197	,	1196	,
1198	\\pub var v0: ?&const u8 = c"0.0.0";	1197	\\pub var v0: ?[*]const u8 = c"0.0.0";
1199	);	1198	);
1200		1199
1201	cases.add("static incomplete array inside function",	1200	cases.add("static incomplete array inside function",
...	@@ -1204,14 +1203,14 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1204,14 +1203,14 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1204	\\}	1203	\\}
1205	,	1204	,
1206	\\pub fn foo() void {	1205	\\pub fn foo() void {
1207	\\ const v2: &const u8 = c"2.2.2";	1206	\\ const v2: [*]const u8 = c"2.2.2";
1208	\\}	1207	\\}
1209	);	1208	);
1210		1209
1211	cases.add("macro pointer cast",	1210	cases.add("macro pointer cast",
1212	\\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE)	1211	\\#define NRF_GPIO ((NRF_GPIO_Type *) NRF_GPIO_BASE)
1213	,	1212	,
1214	\\pub const NRF_GPIO = if (@typeId(@typeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Pointer) @ptrCast(&NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeId(@typeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Int) @intToPtr(&NRF_GPIO_Type, NRF_GPIO_BASE) else (&NRF_GPIO_Type)(NRF_GPIO_BASE);	1213	\\pub const NRF_GPIO = if (@typeId(@typeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Pointer) @ptrCast([]NRF_GPIO_Type, NRF_GPIO_BASE) else if (@typeId(@typeOf(NRF_GPIO_BASE)) == @import("builtin").TypeId.Int) @intToPtr([]NRF_GPIO_Type, NRF_GPIO_BASE) else ([*]NRF_GPIO_Type)(NRF_GPIO_BASE);
1215	);	1214	);
1216		1215
1217	cases.add("if on none bool",	1216	cases.add("if on none bool",
...	@@ -1232,7 +1231,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1232,7 +1231,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1232	\\ B,	1231	\\ B,
1233	\\ C,	1232	\\ C,
1234	\\};	1233	\\};
1235	\\pub fn if_none_bool(a: c_int, b: f32, c: ?&c_void, d: enum_SomeEnum) c_int {	1234	\\pub fn if_none_bool(a: c_int, b: f32, c: ?[*]c_void, d: enum_SomeEnum) c_int {
1236	\\ if (a != 0) return 0;	1235	\\ if (a != 0) return 0;
1237	\\ if (b != 0) return 1;	1236	\\ if (b != 0) return 1;
1238	\\ if (c != null) return 2;	1237	\\ if (c != null) return 2;
...	@@ -1249,7 +1248,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1249,7 +1248,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1249	\\ return 3;	1248	\\ return 3;
1250	\\}	1249	\\}
1251	,	1250	,
1252	\\pub fn while_none_bool(a: c_int, b: f32, c: ?&c_void) c_int {	1251	\\pub fn while_none_bool(a: c_int, b: f32, c: ?[*]c_void) c_int {
1253	\\ while (a != 0) return 0;	1252	\\ while (a != 0) return 0;
1254	\\ while (b != 0) return 1;	1253	\\ while (b != 0) return 1;
1255	\\ while (c != null) return 2;	1254	\\ while (c != null) return 2;
...	@@ -1265,7 +1264,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -1265,7 +1264,7 @@ pub fn addCases(cases: &tests.TranslateCContext) void {
1265	\\ return 3;	1264	\\ return 3;
1266	\\}	1265	\\}
1267	,	1266	,
1268	\\pub fn for_none_bool(a: c_int, b: f32, c: ?&c_void) c_int {	1267	\\pub fn for_none_bool(a: c_int, b: f32, c: ?[*]c_void) c_int {
1269	\\ while (a != 0) return 0;	1268	\\ while (a != 0) return 0;
1270	\\ while (b != 0) return 1;	1269	\\ while (b != 0) return 1;
1271	\\ while (c != null) return 2;	1270	\\ while (c != null) return 2;
...	@@ -1289,29 +1288,29 @@ pub fn addCases(cases: &tests.TranslateCContext) void {	...	@@ -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 {	1291	\\pub fn switch_fn(i: c_int) c_int {
1293	\\ var res: c_int = 0;	1292	\\ var res: c_int = 0;
1294	\\ __switch: {	1293	\\ __switch: {
1295	\\ __case_2: {	1294	\\ __case_2: {
1296	\\ __default: {	1295	\\ __default: {
1297	\\ __case_1: {	1296	\\ __case_1: {
1298	\\ __case_0: {	1297	\\ __case_0: {
1299	\\ switch (i) {	1298	\\ switch (i) {
1300	\\ 0 => break :__case_0,	1299	\\ 0 => break :__case_0,
1301	\\ 1 => break :__case_1,	1300	\\ 1 => break :__case_1,
1302	\\ else => break :__default,	1301	\\ else => break :__default,
1303	\\ 2 => break :__case_2,	1302	\\ 2 => break :__case_2,
1304	\\ }	1303	\\ }
1305	\\ }	1304	\\ }
1306	\\ res = 1;	1305	\\ res = 1;
1307	\\ }	1306	\\ }
1308	\\ res = 2;	1307	\\ res = 2;
1309	\\ }	1308	\\ }
1310	\\ res = (3 * i);	1309	\\ res = (3 * i);
1311	\\ break :__switch;	1310	\\ break :__switch;
1312	\\ }	1311	\\ }
1313	\\ res = 5;	1312	\\ res = 5;
1314	\\ }	1313	\\ }
1315	\\}	1314	\\}
1316	);	1315	);
1317	}	1316	}

author	Andrew Kelley <andrew@ziglang.org> 2018-06-04 02:58:55-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-06-04 02:58:55-04:00
log	58ce79f9352a6139c873df6d99d1531101350e9f
tree	227df3571b4ac48afc38777902251647870c5e1b
parent	cb042c8343eb94a8d149fe1f5d69aa2746aa85d0
parent	96164ce61377b36bcaf0c4087ca9b1ab822b9457

...	@@ -10,7 +10,7 @@ const ArrayList = std.ArrayList;	...	@@ -10,7 +10,7 @@ const ArrayList = std.ArrayList;
10	const Buffer = std.Buffer;	10	const Buffer = std.Buffer;
11	const io = std.io;	11	const io = std.io;
12		12
13	pub fn build(b: &Builder) !void {	13	pub fn build(b: *Builder) !void {
14	const mode = b.standardReleaseOptions();	14	const mode = b.standardReleaseOptions();
15		15
16	var docgen_exe = b.addExecutable("docgen", "doc/docgen.zig");	16	var docgen_exe = b.addExecutable("docgen", "doc/docgen.zig");
...	@@ -132,7 +132,7 @@ pub fn build(b: &Builder) !void {	...	@@ -132,7 +132,7 @@ pub fn build(b: &Builder) !void {
132	test_step.dependOn(tests.addGenHTests(b, test_filter));	132	test_step.dependOn(tests.addGenHTests(b, test_filter));
133	}	133	}
134		134
135	fn dependOnLib(lib_exe_obj: &std.build.LibExeObjStep, dep: &const LibraryDep) void {	135	fn dependOnLib(lib_exe_obj: std.build.LibExeObjStep, dep: const LibraryDep) void {
136	for (dep.libdirs.toSliceConst()) \|lib_dir\| {	136	for (dep.libdirs.toSliceConst()) \|lib_dir\| {
137	lib_exe_obj.addLibPath(lib_dir);	137	lib_exe_obj.addLibPath(lib_dir);
138	}	138	}
...	@@ -147,7 +147,7 @@ fn dependOnLib(lib_exe_obj: &std.build.LibExeObjStep, dep: &const LibraryDep) vo	...	@@ -147,7 +147,7 @@ fn dependOnLib(lib_exe_obj: &std.build.LibExeObjStep, dep: &const LibraryDep) vo
147	}	147	}
148	}	148	}
149		149
150	fn addCppLib(b: &Builder, lib_exe_obj: &std.build.LibExeObjStep, cmake_binary_dir: []const u8, lib_name: []const u8) void {	150	fn addCppLib(b: Builder, lib_exe_obj: std.build.LibExeObjStep, cmake_binary_dir: []const u8, lib_name: []const u8) void {
151	const lib_prefix = if (lib_exe_obj.target.isWindows()) "" else "lib";	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", 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);
153	}	153	}
...	@@ -159,7 +159,7 @@ const LibraryDep = struct {	...	@@ -159,7 +159,7 @@ const LibraryDep = struct {
159	includes: ArrayList([]const u8),	159	includes: ArrayList([]const u8),
160	};	160	};
161		161
162	fn findLLVM(b: &Builder, llvm_config_exe: []const u8) !LibraryDep {	162	fn findLLVM(b: *Builder, llvm_config_exe: []const u8) !LibraryDep {
163	const libs_output = try b.exec([][]const u8{	163	const libs_output = try b.exec([][]const u8{
164	llvm_config_exe,	164	llvm_config_exe,
165	"--libs",	165	"--libs",
...	@@ -217,7 +217,7 @@ fn findLLVM(b: &Builder, llvm_config_exe: []const u8) !LibraryDep {	...	@@ -217,7 +217,7 @@ fn findLLVM(b: &Builder, llvm_config_exe: []const u8) !LibraryDep {
217	return result;	217	return result;
218	}	218	}
219		219
220	pub fn installStdLib(b: &Builder, stdlib_files: []const u8) void {	220	pub fn installStdLib(b: *Builder, stdlib_files: []const u8) void {
221	var it = mem.split(stdlib_files, ";");	221	var it = mem.split(stdlib_files, ";");
222	while (it.next()) \|stdlib_file\| {	222	while (it.next()) \|stdlib_file\| {
223	const src_path = os.path.join(b.allocator, "std", stdlib_file) catch unreachable;	223	const src_path = os.path.join(b.allocator, "std", stdlib_file) catch unreachable;
...	@@ -226,7 +226,7 @@ pub fn installStdLib(b: &Builder, stdlib_files: []const u8) void {	...	@@ -226,7 +226,7 @@ pub fn installStdLib(b: &Builder, stdlib_files: []const u8) void {
226	}	226	}
227	}	227	}
228		228
229	pub fn installCHeaders(b: &Builder, c_header_files: []const u8) void {	229	pub fn installCHeaders(b: *Builder, c_header_files: []const u8) void {
230	var it = mem.split(c_header_files, ";");	230	var it = mem.split(c_header_files, ";");
231	while (it.next()) \|c_header_file\| {	231	while (it.next()) \|c_header_file\| {
232	const src_path = os.path.join(b.allocator, "c_headers", c_header_file) catch unreachable;	232	const src_path = os.path.join(b.allocator, "c_headers", c_header_file) catch unreachable;
...	@@ -235,7 +235,7 @@ pub fn installCHeaders(b: &Builder, c_header_files: []const u8) void {	...	@@ -235,7 +235,7 @@ pub fn installCHeaders(b: &Builder, c_header_files: []const u8) void {
235	}	235	}
236	}	236	}
237		237
238	fn nextValue(index: &usize, build_info: []const u8) []const u8 {	238	fn nextValue(index: *usize, build_info: []const u8) []const u8 {
239	const start = index.*;	239	const start = index.*;
240	while (true) : (index.* += 1) {	240	while (true) : (index.* += 1) {
241	switch (build_info[index.*]) {	241	switch (build_info[index.*]) {

...	@@ -25,6 +25,7 @@ static void resolve_struct_type(CodeGen g, TypeTableEntry struct_type);	...	@@ -25,6 +25,7 @@ static void resolve_struct_type(CodeGen g, TypeTableEntry struct_type);
25	static void resolve_struct_zero_bits(CodeGen g, TypeTableEntry struct_type);	25	static void resolve_struct_zero_bits(CodeGen g, TypeTableEntry struct_type);
26	static void resolve_enum_zero_bits(CodeGen g, TypeTableEntry enum_type);	26	static void resolve_enum_zero_bits(CodeGen g, TypeTableEntry enum_type);
27	static void resolve_union_zero_bits(CodeGen g, TypeTableEntry union_type);	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	ErrorMsg add_node_error(CodeGen g, AstNode node, Buf msg) {	30	ErrorMsg add_node_error(CodeGen g, AstNode node, Buf msg) {
30	if (node->owner->c_import_node != nullptr) {	31	if (node->owner->c_import_node != nullptr) {
...	@@ -380,14 +381,14 @@ TypeTableEntry get_promise_type(CodeGen g, TypeTableEntry *result_type) {	...	@@ -380,14 +381,14 @@ TypeTableEntry get_promise_type(CodeGen g, TypeTableEntry *result_type) {
380	}	381	}
381		382
382	TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type, bool is_const,	383	TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type, bool is_const,
383	bool is_volatile, uint32_t byte_alignment, uint32_t bit_offset, uint32_t unaligned_bit_count)	384	bool is_volatile, PtrLen ptr_len, uint32_t byte_alignment, uint32_t bit_offset, uint32_t unaligned_bit_count)
384	{	385	{
385	assert(!type_is_invalid(child_type));	386	assert(!type_is_invalid(child_type));
386		387
387	TypeId type_id = {};	388	TypeId type_id = {};
388	TypeTableEntry **parent_pointer = nullptr;	389	TypeTableEntry **parent_pointer = nullptr;
389	uint32_t abi_alignment = get_abi_alignment(g, child_type);	390	uint32_t abi_alignment = get_abi_alignment(g, child_type);
390	if (unaligned_bit_count != 0 \|\| is_volatile \|\| byte_alignment != abi_alignment) {	391	if (unaligned_bit_count != 0 \|\| is_volatile \|\| byte_alignment != abi_alignment \|\| ptr_len != PtrLenSingle) {
391	type_id.id = TypeTableEntryIdPointer;	392	type_id.id = TypeTableEntryIdPointer;
392	type_id.data.pointer.child_type = child_type;	393	type_id.data.pointer.child_type = child_type;
393	type_id.data.pointer.is_const = is_const;	394	type_id.data.pointer.is_const = is_const;
...	@@ -395,6 +396,7 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type	...	@@ -395,6 +396,7 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type
395	type_id.data.pointer.alignment = byte_alignment;	396	type_id.data.pointer.alignment = byte_alignment;
396	type_id.data.pointer.bit_offset = bit_offset;	397	type_id.data.pointer.bit_offset = bit_offset;
397	type_id.data.pointer.unaligned_bit_count = unaligned_bit_count;	398	type_id.data.pointer.unaligned_bit_count = unaligned_bit_count;
		399	type_id.data.pointer.ptr_len = ptr_len;
398		400
399	auto existing_entry = g->type_table.maybe_get(type_id);	401	auto existing_entry = g->type_table.maybe_get(type_id);
400	if (existing_entry)	402	if (existing_entry)
...	@@ -413,16 +415,17 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type	...	@@ -413,16 +415,17 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type
413	TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdPointer);	415	TypeTableEntry *entry = new_type_table_entry(TypeTableEntryIdPointer);
414	entry->is_copyable = true;	416	entry->is_copyable = true;
415		417
		418	const char star_str = ptr_len == PtrLenSingle ? "" : "[*]";
416	const char *const_str = is_const ? "const " : "";	419	const char *const_str = is_const ? "const " : "";
417	const char *volatile_str = is_volatile ? "volatile " : "";	420	const char *volatile_str = is_volatile ? "volatile " : "";
418	buf_resize(&entry->name, 0);	421	buf_resize(&entry->name, 0);
419	if (unaligned_bit_count == 0 && byte_alignment == abi_alignment) {	422	if (unaligned_bit_count == 0 && byte_alignment == abi_alignment) {
420	buf_appendf(&entry->name, "&%s%s%s", const_str, volatile_str, buf_ptr(&child_type->name));	423	buf_appendf(&entry->name, "%s%s%s%s", star_str, const_str, volatile_str, buf_ptr(&child_type->name));
421	} else if (unaligned_bit_count == 0) {	424	} else if (unaligned_bit_count == 0) {
422	buf_appendf(&entry->name, "&align(%" PRIu32 ") %s%s%s", byte_alignment,	425	buf_appendf(&entry->name, "%salign(%" PRIu32 ") %s%s%s", star_str, byte_alignment,
423	const_str, volatile_str, buf_ptr(&child_type->name));	426	const_str, volatile_str, buf_ptr(&child_type->name));
424	} else {	427	} else {
425	buf_appendf(&entry->name, "&align(%" PRIu32 ":%" PRIu32 ":%" PRIu32 ") %s%s%s", byte_alignment,	428	buf_appendf(&entry->name, "%salign(%" PRIu32 ":%" PRIu32 ":%" PRIu32 ") %s%s%s", star_str, byte_alignment,
426	bit_offset, bit_offset + unaligned_bit_count, const_str, volatile_str, buf_ptr(&child_type->name));	429	bit_offset, bit_offset + unaligned_bit_count, const_str, volatile_str, buf_ptr(&child_type->name));
427	}	430	}
428		431
...	@@ -432,7 +435,9 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type	...	@@ -432,7 +435,9 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type
432		435
433	if (!entry->zero_bits) {	436	if (!entry->zero_bits) {
434	assert(byte_alignment > 0);	437	assert(byte_alignment > 0);
435	if (is_const \|\| is_volatile \|\| unaligned_bit_count != 0 \|\| byte_alignment != abi_alignment) {	438	if (is_const \|\| is_volatile \|\| unaligned_bit_count != 0 \|\| byte_alignment != abi_alignment \|\|
		439	ptr_len != PtrLenSingle)
		440	{
436	TypeTableEntry *peer_type = get_pointer_to_type(g, child_type, false);	441	TypeTableEntry *peer_type = get_pointer_to_type(g, child_type, false);
437	entry->type_ref = peer_type->type_ref;	442	entry->type_ref = peer_type->type_ref;
438	entry->di_type = peer_type->di_type;	443	entry->di_type = peer_type->di_type;
...	@@ -450,6 +455,7 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type	...	@@ -450,6 +455,7 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type
450	entry->di_type = g->builtin_types.entry_void->di_type;	455	entry->di_type = g->builtin_types.entry_void->di_type;
451	}	456	}
452		457
		458	entry->data.pointer.ptr_len = ptr_len;
453	entry->data.pointer.child_type = child_type;	459	entry->data.pointer.child_type = child_type;
454	entry->data.pointer.is_const = is_const;	460	entry->data.pointer.is_const = is_const;
455	entry->data.pointer.is_volatile = is_volatile;	461	entry->data.pointer.is_volatile = is_volatile;
...	@@ -466,7 +472,8 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type	...	@@ -466,7 +472,8 @@ TypeTableEntry get_pointer_to_type_extra(CodeGen g, TypeTableEntry *child_type
466	}	472	}
467		473
468	TypeTableEntry get_pointer_to_type(CodeGen g, TypeTableEntry *child_type, bool is_const) {	474	TypeTableEntry get_pointer_to_type(CodeGen g, TypeTableEntry *child_type, bool is_const) {
469	return get_pointer_to_type_extra(g, child_type, is_const, false, get_abi_alignment(g, child_type), 0, 0);	475	return get_pointer_to_type_extra(g, child_type, is_const, false, PtrLenSingle,
		476	get_abi_alignment(g, child_type), 0, 0);
470	}	477	}
471		478
472	TypeTableEntry get_promise_frame_type(CodeGen g, TypeTableEntry *return_type) {	479	TypeTableEntry get_promise_frame_type(CodeGen g, TypeTableEntry *return_type) {
...	@@ -756,6 +763,7 @@ static void slice_type_common_init(CodeGen g, TypeTableEntry pointer_type, Typ	...	@@ -756,6 +763,7 @@ static void slice_type_common_init(CodeGen g, TypeTableEntry pointer_type, Typ
756		763
757	TypeTableEntry get_slice_type(CodeGen g, TypeTableEntry *ptr_type) {	764	TypeTableEntry get_slice_type(CodeGen g, TypeTableEntry *ptr_type) {
758	assert(ptr_type->id == TypeTableEntryIdPointer);	765	assert(ptr_type->id == TypeTableEntryIdPointer);
		766	assert(ptr_type->data.pointer.ptr_len == PtrLenUnknown);
759		767
760	TypeTableEntry **parent_pointer = &ptr_type->data.pointer.slice_parent;	768	TypeTableEntry **parent_pointer = &ptr_type->data.pointer.slice_parent;
761	if (*parent_pointer) {	769	if (*parent_pointer) {
...	@@ -767,14 +775,16 @@ TypeTableEntry get_slice_type(CodeGen g, TypeTableEntry *ptr_type) {	...	@@ -767,14 +775,16 @@ TypeTableEntry get_slice_type(CodeGen g, TypeTableEntry *ptr_type) {
767		775
768	// replace the & with [] to go from a ptr type name to a slice type name	776	// replace the & with [] to go from a ptr type name to a slice type name
769	buf_resize(&entry->name, 0);	777	buf_resize(&entry->name, 0);
770	buf_appendf(&entry->name, "[]%s", buf_ptr(&ptr_type->name) + 1);	778	size_t name_offset = (ptr_type->data.pointer.ptr_len == PtrLenSingle) ? 1 : 3;
		779	buf_appendf(&entry->name, "[]%s", buf_ptr(&ptr_type->name) + name_offset);
771		780
772	TypeTableEntry *child_type = ptr_type->data.pointer.child_type;	781	TypeTableEntry *child_type = ptr_type->data.pointer.child_type;
773	uint32_t abi_alignment;	782	uint32_t abi_alignment = get_abi_alignment(g, child_type);
774	if (ptr_type->data.pointer.is_const \|\| ptr_type->data.pointer.is_volatile \|\|	783	if (ptr_type->data.pointer.is_const \|\| ptr_type->data.pointer.is_volatile \|\|
775	ptr_type->data.pointer.alignment != (abi_alignment = get_abi_alignment(g, child_type)))	784	ptr_type->data.pointer.alignment != abi_alignment)
776	{	785	{
777	TypeTableEntry *peer_ptr_type = get_pointer_to_type(g, child_type, false);	786	TypeTableEntry *peer_ptr_type = get_pointer_to_type_extra(g, child_type, false, false,
		787	PtrLenUnknown, abi_alignment, 0, 0);
778	TypeTableEntry *peer_slice_type = get_slice_type(g, peer_ptr_type);	788	TypeTableEntry *peer_slice_type = get_slice_type(g, peer_ptr_type);
779		789
780	slice_type_common_init(g, ptr_type, entry);	790	slice_type_common_init(g, ptr_type, entry);
...	@@ -798,9 +808,11 @@ TypeTableEntry get_slice_type(CodeGen g, TypeTableEntry *ptr_type) {	...	@@ -798,9 +808,11 @@ TypeTableEntry get_slice_type(CodeGen g, TypeTableEntry *ptr_type) {
798	if (child_ptr_type->data.pointer.is_const \|\| child_ptr_type->data.pointer.is_volatile \|\|	808	if (child_ptr_type->data.pointer.is_const \|\| child_ptr_type->data.pointer.is_volatile \|\|
799	child_ptr_type->data.pointer.alignment != get_abi_alignment(g, grand_child_type))	809	child_ptr_type->data.pointer.alignment != get_abi_alignment(g, grand_child_type))
800	{	810	{
801	TypeTableEntry *bland_child_ptr_type = get_pointer_to_type(g, grand_child_type, false);	811	TypeTableEntry *bland_child_ptr_type = get_pointer_to_type_extra(g, grand_child_type, false, false,
		812	PtrLenUnknown, get_abi_alignment(g, grand_child_type), 0, 0);
802	TypeTableEntry *bland_child_slice = get_slice_type(g, bland_child_ptr_type);	813	TypeTableEntry *bland_child_slice = get_slice_type(g, bland_child_ptr_type);
803	TypeTableEntry *peer_ptr_type = get_pointer_to_type(g, bland_child_slice, false);	814	TypeTableEntry *peer_ptr_type = get_pointer_to_type_extra(g, bland_child_slice, false, false,
		815	PtrLenUnknown, get_abi_alignment(g, bland_child_slice), 0, 0);
804	TypeTableEntry *peer_slice_type = get_slice_type(g, peer_ptr_type);	816	TypeTableEntry *peer_slice_type = get_slice_type(g, peer_ptr_type);
805		817
806	entry->type_ref = peer_slice_type->type_ref;	818	entry->type_ref = peer_slice_type->type_ref;
...	@@ -1283,7 +1295,8 @@ static bool analyze_const_align(CodeGen g, Scope scope, AstNode *node, uint32_	...	@@ -1283,7 +1295,8 @@ static bool analyze_const_align(CodeGen g, Scope scope, AstNode *node, uint32_
1283	}	1295	}
1284		1296
1285	static bool analyze_const_string(CodeGen g, Scope scope, AstNode node, Buf *out_buffer) {	1297	static bool analyze_const_string(CodeGen g, Scope scope, AstNode node, Buf *out_buffer) {
1286	TypeTableEntry *ptr_type = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	1298	TypeTableEntry *ptr_type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		1299	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
1287	TypeTableEntry *str_type = get_slice_type(g, ptr_type);	1300	TypeTableEntry *str_type = get_slice_type(g, ptr_type);
1288	IrInstruction *instr = analyze_const_value(g, scope, node, str_type, nullptr);	1301	IrInstruction *instr = analyze_const_value(g, scope, node, str_type, nullptr);
1289	if (type_is_invalid(instr->value.type))	1302	if (type_is_invalid(instr->value.type))
...	@@ -2953,7 +2966,8 @@ static void typecheck_panic_fn(CodeGen g, FnTableEntry panic_fn) {	...	@@ -2953,7 +2966,8 @@ static void typecheck_panic_fn(CodeGen g, FnTableEntry panic_fn) {
2953	if (fn_type_id->param_count != 2) {	2966	if (fn_type_id->param_count != 2) {
2954	return wrong_panic_prototype(g, proto_node, fn_type);	2967	return wrong_panic_prototype(g, proto_node, fn_type);
2955	}	2968	}
2956	TypeTableEntry *const_u8_ptr = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	2969	TypeTableEntry *const_u8_ptr = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		2970	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
2957	TypeTableEntry *const_u8_slice = get_slice_type(g, const_u8_ptr);	2971	TypeTableEntry *const_u8_slice = get_slice_type(g, const_u8_ptr);
2958	if (fn_type_id->param_info[0].type != const_u8_slice) {	2972	if (fn_type_id->param_info[0].type != const_u8_slice) {
2959	return wrong_panic_prototype(g, proto_node, fn_type);	2973	return wrong_panic_prototype(g, proto_node, fn_type);
...	@@ -3269,7 +3283,7 @@ void scan_decls(CodeGen g, ScopeDecls decls_scope, AstNode *node) {	...	@@ -3269,7 +3283,7 @@ void scan_decls(CodeGen g, ScopeDecls decls_scope, AstNode *node) {
3269	case NodeTypeThisLiteral:	3283	case NodeTypeThisLiteral:
3270	case NodeTypeSymbol:	3284	case NodeTypeSymbol:
3271	case NodeTypePrefixOpExpr:	3285	case NodeTypePrefixOpExpr:
3272	case NodeTypeAddrOfExpr:	3286	case NodeTypePointerType:
3273	case NodeTypeIfBoolExpr:	3287	case NodeTypeIfBoolExpr:
3274	case NodeTypeWhileExpr:	3288	case NodeTypeWhileExpr:
3275	case NodeTypeForExpr:	3289	case NodeTypeForExpr:
...	@@ -3880,7 +3894,7 @@ static void define_local_param_variables(CodeGen g, FnTableEntry fn_table_entr	...	@@ -3880,7 +3894,7 @@ static void define_local_param_variables(CodeGen g, FnTableEntry fn_table_entr
3880	}	3894	}
3881	}	3895	}
3882		3896
3883	static bool analyze_resolve_inferred_error_set(CodeGen g, TypeTableEntry err_set_type, AstNode *source_node) {	3897	bool resolve_inferred_error_set(CodeGen g, TypeTableEntry err_set_type, AstNode *source_node) {
3884	FnTableEntry *infer_fn = err_set_type->data.error_set.infer_fn;	3898	FnTableEntry *infer_fn = err_set_type->data.error_set.infer_fn;
3885	if (infer_fn != nullptr) {	3899	if (infer_fn != nullptr) {
3886	if (infer_fn->anal_state == FnAnalStateInvalid) {	3900	if (infer_fn->anal_state == FnAnalStateInvalid) {
...	@@ -3932,7 +3946,7 @@ void analyze_fn_ir(CodeGen g, FnTableEntry fn_table_entry, AstNode *return_typ	...	@@ -3932,7 +3946,7 @@ void analyze_fn_ir(CodeGen g, FnTableEntry fn_table_entry, AstNode *return_typ
3932	}	3946	}
3933		3947
3934	if (inferred_err_set_type->data.error_set.infer_fn != nullptr) {	3948	if (inferred_err_set_type->data.error_set.infer_fn != nullptr) {
3935	if (!analyze_resolve_inferred_error_set(g, inferred_err_set_type, return_type_node)) {	3949	if (!resolve_inferred_error_set(g, inferred_err_set_type, return_type_node)) {
3936	fn_table_entry->anal_state = FnAnalStateInvalid;	3950	fn_table_entry->anal_state = FnAnalStateInvalid;
3937	return;	3951	return;
3938	}	3952	}
...	@@ -3962,7 +3976,7 @@ void analyze_fn_ir(CodeGen g, FnTableEntry fn_table_entry, AstNode *return_typ	...	@@ -3962,7 +3976,7 @@ void analyze_fn_ir(CodeGen g, FnTableEntry fn_table_entry, AstNode *return_typ
3962	fn_table_entry->anal_state = FnAnalStateComplete;	3976	fn_table_entry->anal_state = FnAnalStateComplete;
3963	}	3977	}
3964		3978
3965	void analyze_fn_body(CodeGen g, FnTableEntry fn_table_entry) {	3979	static void analyze_fn_body(CodeGen g, FnTableEntry fn_table_entry) {
3966	assert(fn_table_entry->anal_state != FnAnalStateProbing);	3980	assert(fn_table_entry->anal_state != FnAnalStateProbing);
3967	if (fn_table_entry->anal_state != FnAnalStateReady)	3981	if (fn_table_entry->anal_state != FnAnalStateReady)
3968	return;	3982	return;
...	@@ -4993,7 +5007,9 @@ void init_const_c_str_lit(CodeGen g, ConstExprValue const_val, Buf *str) {	...	@@ -4993,7 +5007,9 @@ void init_const_c_str_lit(CodeGen g, ConstExprValue const_val, Buf *str) {
4993		5007
4994	// then make the pointer point to it	5008	// then make the pointer point to it
4995	const_val->special = ConstValSpecialStatic;	5009	const_val->special = ConstValSpecialStatic;
4996	const_val->type = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	5010	// TODO make this `[]null u8` instead of `[]u8`
		5011	const_val->type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		5012	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
4997	const_val->data.x_ptr.special = ConstPtrSpecialBaseArray;	5013	const_val->data.x_ptr.special = ConstPtrSpecialBaseArray;
4998	const_val->data.x_ptr.data.base_array.array_val = array_val;	5014	const_val->data.x_ptr.data.base_array.array_val = array_val;
4999	const_val->data.x_ptr.data.base_array.elem_index = 0;	5015	const_val->data.x_ptr.data.base_array.elem_index = 0;
...	@@ -5134,7 +5150,9 @@ void init_const_slice(CodeGen g, ConstExprValue const_val, ConstExprValue *arr	...	@@ -5134,7 +5150,9 @@ void init_const_slice(CodeGen g, ConstExprValue const_val, ConstExprValue *arr
5134	{	5150	{
5135	assert(array_val->type->id == TypeTableEntryIdArray);	5151	assert(array_val->type->id == TypeTableEntryIdArray);
5136		5152
5137	TypeTableEntry *ptr_type = get_pointer_to_type(g, array_val->type->data.array.child_type, is_const);	5153	TypeTableEntry *ptr_type = get_pointer_to_type_extra(g, array_val->type->data.array.child_type,
		5154	is_const, false, PtrLenUnknown, get_abi_alignment(g, array_val->type->data.array.child_type),
		5155	0, 0);
5138		5156
5139	const_val->special = ConstValSpecialStatic;	5157	const_val->special = ConstValSpecialStatic;
5140	const_val->type = get_slice_type(g, ptr_type);	5158	const_val->type = get_slice_type(g, ptr_type);
...	@@ -5758,6 +5776,7 @@ uint32_t type_id_hash(TypeId x) {	...	@@ -5758,6 +5776,7 @@ uint32_t type_id_hash(TypeId x) {
5758	return hash_ptr(x.data.error_union.err_set_type) ^ hash_ptr(x.data.error_union.payload_type);	5776	return hash_ptr(x.data.error_union.err_set_type) ^ hash_ptr(x.data.error_union.payload_type);
5759	case TypeTableEntryIdPointer:	5777	case TypeTableEntryIdPointer:
5760	return hash_ptr(x.data.pointer.child_type) +	5778	return hash_ptr(x.data.pointer.child_type) +
		5779	((x.data.pointer.ptr_len == PtrLenSingle) ? (uint32_t)1120226602 : (uint32_t)3200913342) +
5761	(x.data.pointer.is_const ? (uint32_t)2749109194 : (uint32_t)4047371087) +	5780	(x.data.pointer.is_const ? (uint32_t)2749109194 : (uint32_t)4047371087) +
5762	(x.data.pointer.is_volatile ? (uint32_t)536730450 : (uint32_t)1685612214) +	5781	(x.data.pointer.is_volatile ? (uint32_t)536730450 : (uint32_t)1685612214) +
5763	(((uint32_t)x.data.pointer.alignment) ^ (uint32_t)0x777fbe0e) +	5782	(((uint32_t)x.data.pointer.alignment) ^ (uint32_t)0x777fbe0e) +
...	@@ -5806,6 +5825,7 @@ bool type_id_eql(TypeId a, TypeId b) {	...	@@ -5806,6 +5825,7 @@ bool type_id_eql(TypeId a, TypeId b) {
5806		5825
5807	case TypeTableEntryIdPointer:	5826	case TypeTableEntryIdPointer:
5808	return a.data.pointer.child_type == b.data.pointer.child_type &&	5827	return a.data.pointer.child_type == b.data.pointer.child_type &&
		5828	a.data.pointer.ptr_len == b.data.pointer.ptr_len &&
5809	a.data.pointer.is_const == b.data.pointer.is_const &&	5829	a.data.pointer.is_const == b.data.pointer.is_const &&
5810	a.data.pointer.is_volatile == b.data.pointer.is_volatile &&	5830	a.data.pointer.is_volatile == b.data.pointer.is_volatile &&
5811	a.data.pointer.alignment == b.data.pointer.alignment &&	5831	a.data.pointer.alignment == b.data.pointer.alignment &&

...	@@ -897,7 +897,8 @@ static LLVMValueRef get_panic_msg_ptr_val(CodeGen *g, PanicMsgId msg_id) {	...	@@ -897,7 +897,8 @@ static LLVMValueRef get_panic_msg_ptr_val(CodeGen *g, PanicMsgId msg_id) {
897	assert(val->global_refs->llvm_global);	897	assert(val->global_refs->llvm_global);
898	}	898	}
899		899
900	TypeTableEntry *u8_ptr_type = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	900	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		901	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
901	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);	902	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);
902	return LLVMConstBitCast(val->global_refs->llvm_global, LLVMPointerType(str_type->type_ref, 0));	903	return LLVMConstBitCast(val->global_refs->llvm_global, LLVMPointerType(str_type->type_ref, 0));
903	}	904	}
...	@@ -1446,7 +1447,8 @@ static LLVMValueRef get_safety_crash_err_fn(CodeGen *g) {	...	@@ -1446,7 +1447,8 @@ static LLVMValueRef get_safety_crash_err_fn(CodeGen *g) {
1446	LLVMValueRef full_buf_ptr = LLVMConstInBoundsGEP(global_array, full_buf_ptr_indices, 2);	1447	LLVMValueRef full_buf_ptr = LLVMConstInBoundsGEP(global_array, full_buf_ptr_indices, 2);
1447		1448
1448		1449
1449	TypeTableEntry *u8_ptr_type = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	1450	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		1451	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
1450	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);	1452	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);
1451	LLVMValueRef global_slice_fields[] = {	1453	LLVMValueRef global_slice_fields[] = {
1452	full_buf_ptr,	1454	full_buf_ptr,
...	@@ -2179,9 +2181,13 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,	...	@@ -2179,9 +2181,13 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,
2179	IrInstruction *op2 = bin_op_instruction->op2;	2181	IrInstruction *op2 = bin_op_instruction->op2;
2180		2182
2181	assert(op1->value.type == op2->value.type \|\| op_id == IrBinOpBitShiftLeftLossy \|\|	2183	assert(op1->value.type == op2->value.type \|\| op_id == IrBinOpBitShiftLeftLossy \|\|
2182	op_id == IrBinOpBitShiftLeftExact \|\| op_id == IrBinOpBitShiftRightLossy \|\|	2184	op_id == IrBinOpBitShiftLeftExact \|\| op_id == IrBinOpBitShiftRightLossy \|\|
2183	op_id == IrBinOpBitShiftRightExact \|\|	2185	op_id == IrBinOpBitShiftRightExact \|\|
2184	(op1->value.type->id == TypeTableEntryIdErrorSet && op2->value.type->id == TypeTableEntryIdErrorSet));	2186	(op1->value.type->id == TypeTableEntryIdErrorSet && op2->value.type->id == TypeTableEntryIdErrorSet) \|\|
		2187	(op1->value.type->id == TypeTableEntryIdPointer &&
		2188	(op_id == IrBinOpAdd \|\| op_id == IrBinOpSub) &&
		2189	op1->value.type->data.pointer.ptr_len == PtrLenUnknown)
		2190	);
2185	TypeTableEntry *type_entry = op1->value.type;	2191	TypeTableEntry *type_entry = op1->value.type;
2186		2192
2187	bool want_runtime_safety = bin_op_instruction->safety_check_on &&	2193	bool want_runtime_safety = bin_op_instruction->safety_check_on &&
...	@@ -2189,6 +2195,8 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,	...	@@ -2189,6 +2195,8 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,
2189		2195
2190	LLVMValueRef op1_value = ir_llvm_value(g, op1);	2196	LLVMValueRef op1_value = ir_llvm_value(g, op1);
2191	LLVMValueRef op2_value = ir_llvm_value(g, op2);	2197	LLVMValueRef op2_value = ir_llvm_value(g, op2);
		2198
		2199
2192	switch (op_id) {	2200	switch (op_id) {
2193	case IrBinOpInvalid:	2201	case IrBinOpInvalid:
2194	case IrBinOpArrayCat:	2202	case IrBinOpArrayCat:
...	@@ -2227,7 +2235,11 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,	...	@@ -2227,7 +2235,11 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,
2227	}	2235	}
2228	case IrBinOpAdd:	2236	case IrBinOpAdd:
2229	case IrBinOpAddWrap:	2237	case IrBinOpAddWrap:
2230	if (type_entry->id == TypeTableEntryIdFloat) {	2238	if (type_entry->id == TypeTableEntryIdPointer) {
		2239	assert(type_entry->data.pointer.ptr_len == PtrLenUnknown);
		2240	// TODO runtime safety
		2241	return LLVMBuildInBoundsGEP(g->builder, op1_value, &op2_value, 1, "");
		2242	} else if (type_entry->id == TypeTableEntryIdFloat) {
2231	ZigLLVMSetFastMath(g->builder, ir_want_fast_math(g, &bin_op_instruction->base));	2243	ZigLLVMSetFastMath(g->builder, ir_want_fast_math(g, &bin_op_instruction->base));
2232	return LLVMBuildFAdd(g->builder, op1_value, op2_value, "");	2244	return LLVMBuildFAdd(g->builder, op1_value, op2_value, "");
2233	} else if (type_entry->id == TypeTableEntryIdInt) {	2245	} else if (type_entry->id == TypeTableEntryIdInt) {
...	@@ -2290,7 +2302,12 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,	...	@@ -2290,7 +2302,12 @@ static LLVMValueRef ir_render_bin_op(CodeGen g, IrExecutable executable,
2290	}	2302	}
2291	case IrBinOpSub:	2303	case IrBinOpSub:
2292	case IrBinOpSubWrap:	2304	case IrBinOpSubWrap:
2293	if (type_entry->id == TypeTableEntryIdFloat) {	2305	if (type_entry->id == TypeTableEntryIdPointer) {
		2306	assert(type_entry->data.pointer.ptr_len == PtrLenUnknown);
		2307	// TODO runtime safety
		2308	LLVMValueRef subscript_value = LLVMBuildNeg(g->builder, op2_value, "");
		2309	return LLVMBuildInBoundsGEP(g->builder, op1_value, &subscript_value, 1, "");
		2310	} else if (type_entry->id == TypeTableEntryIdFloat) {
2294	ZigLLVMSetFastMath(g->builder, ir_want_fast_math(g, &bin_op_instruction->base));	2311	ZigLLVMSetFastMath(g->builder, ir_want_fast_math(g, &bin_op_instruction->base));
2295	return LLVMBuildFSub(g->builder, op1_value, op2_value, "");	2312	return LLVMBuildFSub(g->builder, op1_value, op2_value, "");
2296	} else if (type_entry->id == TypeTableEntryIdInt) {	2313	} else if (type_entry->id == TypeTableEntryIdInt) {
...	@@ -2718,7 +2735,7 @@ static LLVMValueRef ir_render_decl_var(CodeGen g, IrExecutable executable,	...	@@ -2718,7 +2735,7 @@ static LLVMValueRef ir_render_decl_var(CodeGen g, IrExecutable executable,
2718	if (have_init_expr) {	2735	if (have_init_expr) {
2719	assert(var->value->type == init_value->value.type);	2736	assert(var->value->type == init_value->value.type);
2720	TypeTableEntry *var_ptr_type = get_pointer_to_type_extra(g, var->value->type, false, false,	2737	TypeTableEntry *var_ptr_type = get_pointer_to_type_extra(g, var->value->type, false, false,
2721	var->align_bytes, 0, 0);	2738	PtrLenSingle, var->align_bytes, 0, 0);
2722	gen_assign_raw(g, var->value_ref, var_ptr_type, ir_llvm_value(g, init_value));	2739	gen_assign_raw(g, var->value_ref, var_ptr_type, ir_llvm_value(g, init_value));
2723	} else {	2740	} else {
2724	bool want_safe = ir_want_runtime_safety(g, &decl_var_instruction->base);	2741	bool want_safe = ir_want_runtime_safety(g, &decl_var_instruction->base);
...	@@ -4087,7 +4104,7 @@ static LLVMValueRef ir_render_struct_init(CodeGen g, IrExecutable executable,	...	@@ -4087,7 +4104,7 @@ static LLVMValueRef ir_render_struct_init(CodeGen g, IrExecutable executable,
4087	uint32_t field_align_bytes = get_abi_alignment(g, type_struct_field->type_entry);	4104	uint32_t field_align_bytes = get_abi_alignment(g, type_struct_field->type_entry);
4088		4105
4089	TypeTableEntry *ptr_type = get_pointer_to_type_extra(g, type_struct_field->type_entry,	4106	TypeTableEntry *ptr_type = get_pointer_to_type_extra(g, type_struct_field->type_entry,
4090	false, false, field_align_bytes,	4107	false, false, PtrLenSingle, field_align_bytes,
4091	(uint32_t)type_struct_field->packed_bits_offset, (uint32_t)type_struct_field->unaligned_bit_count);	4108	(uint32_t)type_struct_field->packed_bits_offset, (uint32_t)type_struct_field->unaligned_bit_count);
4092		4109
4093	gen_assign_raw(g, field_ptr, ptr_type, value);	4110	gen_assign_raw(g, field_ptr, ptr_type, value);
...	@@ -4103,7 +4120,7 @@ static LLVMValueRef ir_render_union_init(CodeGen g, IrExecutable executable, I	...	@@ -4103,7 +4120,7 @@ static LLVMValueRef ir_render_union_init(CodeGen g, IrExecutable executable, I
4103		4120
4104	uint32_t field_align_bytes = get_abi_alignment(g, type_union_field->type_entry);	4121	uint32_t field_align_bytes = get_abi_alignment(g, type_union_field->type_entry);
4105	TypeTableEntry *ptr_type = get_pointer_to_type_extra(g, type_union_field->type_entry,	4122	TypeTableEntry *ptr_type = get_pointer_to_type_extra(g, type_union_field->type_entry,
4106	false, false, field_align_bytes,	4123	false, false, PtrLenSingle, field_align_bytes,
4107	0, 0);	4124	0, 0);
4108		4125
4109	LLVMValueRef uncasted_union_ptr;	4126	LLVMValueRef uncasted_union_ptr;
...	@@ -4350,7 +4367,8 @@ static LLVMValueRef get_coro_alloc_helper_fn_val(CodeGen *g, LLVMTypeRef alloc_f	...	@@ -4350,7 +4367,8 @@ static LLVMValueRef get_coro_alloc_helper_fn_val(CodeGen *g, LLVMTypeRef alloc_f
4350		4367
4351	LLVMPositionBuilderAtEnd(g->builder, ok_block);	4368	LLVMPositionBuilderAtEnd(g->builder, ok_block);
4352	LLVMValueRef payload_ptr = LLVMBuildStructGEP(g->builder, sret_ptr, err_union_payload_index, "");	4369	LLVMValueRef payload_ptr = LLVMBuildStructGEP(g->builder, sret_ptr, err_union_payload_index, "");
4353	TypeTableEntry *u8_ptr_type = get_pointer_to_type(g, g->builtin_types.entry_u8, false);	4370	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, false, false,
		4371	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
4354	TypeTableEntry *slice_type = get_slice_type(g, u8_ptr_type);	4372	TypeTableEntry *slice_type = get_slice_type(g, u8_ptr_type);
4355	size_t ptr_field_index = slice_type->data.structure.fields[slice_ptr_index].gen_index;	4373	size_t ptr_field_index = slice_type->data.structure.fields[slice_ptr_index].gen_index;
4356	LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, payload_ptr, ptr_field_index, "");	4374	LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, payload_ptr, ptr_field_index, "");
...	@@ -4515,7 +4533,7 @@ static LLVMValueRef ir_render_instruction(CodeGen g, IrExecutable executable,	...	@@ -4515,7 +4533,7 @@ static LLVMValueRef ir_render_instruction(CodeGen g, IrExecutable executable,
4515	case IrInstructionIdTypeInfo:	4533	case IrInstructionIdTypeInfo:
4516	case IrInstructionIdTypeId:	4534	case IrInstructionIdTypeId:
4517	case IrInstructionIdSetEvalBranchQuota:	4535	case IrInstructionIdSetEvalBranchQuota:
4518	case IrInstructionIdPtrTypeOf:	4536	case IrInstructionIdPtrType:
4519	case IrInstructionIdOpaqueType:	4537	case IrInstructionIdOpaqueType:
4520	case IrInstructionIdSetAlignStack:	4538	case IrInstructionIdSetAlignStack:
4521	case IrInstructionIdArgType:	4539	case IrInstructionIdArgType:
...	@@ -5292,7 +5310,8 @@ static void generate_error_name_table(CodeGen *g) {	...	@@ -5292,7 +5310,8 @@ static void generate_error_name_table(CodeGen *g) {
5292		5310
5293	assert(g->errors_by_index.length > 0);	5311	assert(g->errors_by_index.length > 0);
5294		5312
5295	TypeTableEntry *u8_ptr_type = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	5313	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		5314	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
5296	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);	5315	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);
5297		5316
5298	LLVMValueRef *values = allocate<LLVMValueRef>(g->errors_by_index.length);	5317	LLVMValueRef *values = allocate<LLVMValueRef>(g->errors_by_index.length);
...	@@ -5330,7 +5349,8 @@ static void generate_error_name_table(CodeGen *g) {	...	@@ -5330,7 +5349,8 @@ static void generate_error_name_table(CodeGen *g) {
5330	}	5349	}
5331		5350
5332	static void generate_enum_name_tables(CodeGen *g) {	5351	static void generate_enum_name_tables(CodeGen *g) {
5333	TypeTableEntry *u8_ptr_type = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	5352	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		5353	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
5334	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);	5354	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);
5335		5355
5336	TypeTableEntry *usize = g->builtin_types.entry_usize;	5356	TypeTableEntry *usize = g->builtin_types.entry_usize;
...	@@ -6784,7 +6804,8 @@ static void create_test_compile_var_and_add_test_runner(CodeGen *g) {	...	@@ -6784,7 +6804,8 @@ static void create_test_compile_var_and_add_test_runner(CodeGen *g) {
6784	exit(0);	6804	exit(0);
6785	}	6805	}
6786		6806
6787	TypeTableEntry *u8_ptr_type = get_pointer_to_type(g, g->builtin_types.entry_u8, true);	6807	TypeTableEntry *u8_ptr_type = get_pointer_to_type_extra(g, g->builtin_types.entry_u8, true, false,
		6808	PtrLenUnknown, get_abi_alignment(g, g->builtin_types.entry_u8), 0, 0);
6788	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);	6809	TypeTableEntry *str_type = get_slice_type(g, u8_ptr_type);
6789	TypeTableEntry *fn_type = get_test_fn_type(g);	6810	TypeTableEntry *fn_type = get_test_fn_type(g);
6790		6811

...	@@ -276,11 +276,18 @@ static AstNode maybe_suppress_result(Context c, ResultUsed result_used, AstNod	...	@@ -276,11 +276,18 @@ static AstNode maybe_suppress_result(Context c, ResultUsed result_used, AstNod
276	node);	276	node);
277	}	277	}
278		278
279	static AstNode trans_create_node_addr_of(Context c, bool is_const, bool is_volatile, AstNode *child_node) {	279	static AstNode trans_create_node_ptr_type(Context c, bool is_const, bool is_volatile, AstNode *child_node) {
280	AstNode *node = trans_create_node(c, NodeTypeAddrOfExpr);	280	AstNode *node = trans_create_node(c, NodeTypePointerType);
281	node->data.addr_of_expr.is_const = is_const;	281	node->data.pointer_type.is_const = is_const;
282	node->data.addr_of_expr.is_volatile = is_volatile;	282	node->data.pointer_type.is_volatile = is_volatile;
283	node->data.addr_of_expr.op_expr = child_node;	283	node->data.pointer_type.op_expr = child_node;
		284	return node;
		285	}
		286
		287	static AstNode trans_create_node_addr_of(Context c, AstNode *child_node) {
		288	AstNode *node = trans_create_node(c, NodeTypePrefixOpExpr);
		289	node->data.prefix_op_expr.prefix_op = PrefixOpAddrOf;
		290	node->data.prefix_op_expr.primary_expr = child_node;
284	return node;	291	return node;
285	}	292	}
286		293
...	@@ -849,7 +856,7 @@ static AstNode trans_type(Context c, const Type *ty, const SourceLocation &sou	...	@@ -849,7 +856,7 @@ static AstNode trans_type(Context c, const Type *ty, const SourceLocation &sou
849	return trans_create_node_prefix_op(c, PrefixOpMaybe, child_node);	856	return trans_create_node_prefix_op(c, PrefixOpMaybe, child_node);
850	}	857	}
851		858
852	AstNode *pointer_node = trans_create_node_addr_of(c, child_qt.isConstQualified(),	859	AstNode *pointer_node = trans_create_node_ptr_type(c, child_qt.isConstQualified(),
853	child_qt.isVolatileQualified(), child_node);	860	child_qt.isVolatileQualified(), child_node);
854	return trans_create_node_prefix_op(c, PrefixOpMaybe, pointer_node);	861	return trans_create_node_prefix_op(c, PrefixOpMaybe, pointer_node);
855	}	862	}
...	@@ -1034,7 +1041,7 @@ static AstNode trans_type(Context c, const Type *ty, const SourceLocation &sou	...	@@ -1034,7 +1041,7 @@ static AstNode trans_type(Context c, const Type *ty, const SourceLocation &sou
1034	emit_warning(c, source_loc, "unresolved array element type");	1041	emit_warning(c, source_loc, "unresolved array element type");
1035	return nullptr;	1042	return nullptr;
1036	}	1043	}
1037	AstNode *pointer_node = trans_create_node_addr_of(c, child_qt.isConstQualified(),	1044	AstNode *pointer_node = trans_create_node_ptr_type(c, child_qt.isConstQualified(),
1038	child_qt.isVolatileQualified(), child_type_node);	1045	child_qt.isVolatileQualified(), child_type_node);
1039	return pointer_node;	1046	return pointer_node;
1040	}	1047	}
...	@@ -1403,7 +1410,7 @@ static AstNode trans_create_compound_assign_shift(Context c, ResultUsed result	...	@@ -1403,7 +1410,7 @@ static AstNode trans_create_compound_assign_shift(Context c, ResultUsed result
1403	// const _ref = &lhs;	1410	// const _ref = &lhs;
1404	AstNode *lhs = trans_expr(c, ResultUsedYes, &child_scope->base, stmt->getLHS(), TransLValue);	1411	AstNode *lhs = trans_expr(c, ResultUsedYes, &child_scope->base, stmt->getLHS(), TransLValue);
1405	if (lhs == nullptr) return nullptr;	1412	if (lhs == nullptr) return nullptr;
1406	AstNode *addr_of_lhs = trans_create_node_addr_of(c, false, false, lhs);	1413	AstNode *addr_of_lhs = trans_create_node_addr_of(c, lhs);
1407	// TODO: avoid name collisions with generated variable names	1414	// TODO: avoid name collisions with generated variable names
1408	Buf* tmp_var_name = buf_create_from_str("_ref");	1415	Buf* tmp_var_name = buf_create_from_str("_ref");
1409	AstNode *tmp_var_decl = trans_create_node_var_decl_local(c, true, tmp_var_name, nullptr, addr_of_lhs);	1416	AstNode *tmp_var_decl = trans_create_node_var_decl_local(c, true, tmp_var_name, nullptr, addr_of_lhs);
...	@@ -1477,7 +1484,7 @@ static AstNode trans_create_compound_assign(Context c, ResultUsed result_used,	...	@@ -1477,7 +1484,7 @@ static AstNode trans_create_compound_assign(Context c, ResultUsed result_used,
1477	// const _ref = &lhs;	1484	// const _ref = &lhs;
1478	AstNode *lhs = trans_expr(c, ResultUsedYes, &child_scope->base, stmt->getLHS(), TransLValue);	1485	AstNode *lhs = trans_expr(c, ResultUsedYes, &child_scope->base, stmt->getLHS(), TransLValue);
1479	if (lhs == nullptr) return nullptr;	1486	if (lhs == nullptr) return nullptr;
1480	AstNode *addr_of_lhs = trans_create_node_addr_of(c, false, false, lhs);	1487	AstNode *addr_of_lhs = trans_create_node_addr_of(c, lhs);
1481	// TODO: avoid name collisions with generated variable names	1488	// TODO: avoid name collisions with generated variable names
1482	Buf* tmp_var_name = buf_create_from_str("_ref");	1489	Buf* tmp_var_name = buf_create_from_str("_ref");
1483	AstNode *tmp_var_decl = trans_create_node_var_decl_local(c, true, tmp_var_name, nullptr, addr_of_lhs);	1490	AstNode *tmp_var_decl = trans_create_node_var_decl_local(c, true, tmp_var_name, nullptr, addr_of_lhs);
...	@@ -1814,7 +1821,7 @@ static AstNode trans_create_post_crement(Context c, ResultUsed result_used, Tr	...	@@ -1814,7 +1821,7 @@ static AstNode trans_create_post_crement(Context c, ResultUsed result_used, Tr
1814	// const _ref = &expr;	1821	// const _ref = &expr;
1815	AstNode *expr = trans_expr(c, ResultUsedYes, &child_scope->base, op_expr, TransLValue);	1822	AstNode *expr = trans_expr(c, ResultUsedYes, &child_scope->base, op_expr, TransLValue);
1816	if (expr == nullptr) return nullptr;	1823	if (expr == nullptr) return nullptr;
1817	AstNode *addr_of_expr = trans_create_node_addr_of(c, false, false, expr);	1824	AstNode *addr_of_expr = trans_create_node_addr_of(c, expr);
1818	// TODO: avoid name collisions with generated variable names	1825	// TODO: avoid name collisions with generated variable names
1819	Buf* ref_var_name = buf_create_from_str("_ref");	1826	Buf* ref_var_name = buf_create_from_str("_ref");
1820	AstNode *ref_var_decl = trans_create_node_var_decl_local(c, true, ref_var_name, nullptr, addr_of_expr);	1827	AstNode *ref_var_decl = trans_create_node_var_decl_local(c, true, ref_var_name, nullptr, addr_of_expr);
...	@@ -1869,7 +1876,7 @@ static AstNode trans_create_pre_crement(Context c, ResultUsed result_used, Tra	...	@@ -1869,7 +1876,7 @@ static AstNode trans_create_pre_crement(Context c, ResultUsed result_used, Tra
1869	// const _ref = &expr;	1876	// const _ref = &expr;
1870	AstNode *expr = trans_expr(c, ResultUsedYes, &child_scope->base, op_expr, TransLValue);	1877	AstNode *expr = trans_expr(c, ResultUsedYes, &child_scope->base, op_expr, TransLValue);
1871	if (expr == nullptr) return nullptr;	1878	if (expr == nullptr) return nullptr;
1872	AstNode *addr_of_expr = trans_create_node_addr_of(c, false, false, expr);	1879	AstNode *addr_of_expr = trans_create_node_addr_of(c, expr);
1873	// TODO: avoid name collisions with generated variable names	1880	// TODO: avoid name collisions with generated variable names
1874	Buf* ref_var_name = buf_create_from_str("_ref");	1881	Buf* ref_var_name = buf_create_from_str("_ref");
1875	AstNode *ref_var_decl = trans_create_node_var_decl_local(c, true, ref_var_name, nullptr, addr_of_expr);	1882	AstNode *ref_var_decl = trans_create_node_var_decl_local(c, true, ref_var_name, nullptr, addr_of_expr);
...	@@ -1918,7 +1925,7 @@ static AstNode trans_unary_operator(Context c, ResultUsed result_used, TransSc	...	@@ -1918,7 +1925,7 @@ static AstNode trans_unary_operator(Context c, ResultUsed result_used, TransSc
1918	AstNode *value_node = trans_expr(c, result_used, scope, stmt->getSubExpr(), TransLValue);	1925	AstNode *value_node = trans_expr(c, result_used, scope, stmt->getSubExpr(), TransLValue);
1919	if (value_node == nullptr)	1926	if (value_node == nullptr)
1920	return value_node;	1927	return value_node;
1921	return trans_create_node_addr_of(c, false, false, value_node);	1928	return trans_create_node_addr_of(c, value_node);
1922	}	1929	}
1923	case UO_Deref:	1930	case UO_Deref:
1924	{	1931	{
...	@@ -4443,7 +4450,7 @@ static AstNode parse_ctok_suffix_op_expr(Context c, CTokenize ctok, size_t t	...	@@ -4443,7 +4450,7 @@ static AstNode parse_ctok_suffix_op_expr(Context c, CTokenize ctok, size_t t
4443	} else if (first_tok->id == CTokIdAsterisk) {	4450	} else if (first_tok->id == CTokIdAsterisk) {
4444	*tok_i += 1;	4451	*tok_i += 1;
4445		4452
4446	node = trans_create_node_addr_of(c, false, false, node);	4453	node = trans_create_node_ptr_type(c, false, false, node);
4447	} else {	4454	} else {
4448	return node;	4455	return node;
4449	}	4456	}

...	@@ -32,7 +32,7 @@ pub const Base64Encoder = struct {	...	@@ -32,7 +32,7 @@ pub const Base64Encoder = struct {
32	}	32	}
33		33
34	/// dest.len must be what you get from ::calcSize.	34	/// dest.len must be what you get from ::calcSize.
35	pub fn encode(encoder: &const Base64Encoder, dest: []u8, source: []const u8) void {	35	pub fn encode(encoder: *const Base64Encoder, dest: []u8, source: []const u8) void {
36	assert(dest.len == Base64Encoder.calcSize(source.len));	36	assert(dest.len == Base64Encoder.calcSize(source.len));
37		37
38	var i: usize = 0;	38	var i: usize = 0;
...	@@ -81,6 +81,7 @@ pub const Base64Decoder = struct {	...	@@ -81,6 +81,7 @@ pub const Base64Decoder = struct {
81	/// e.g. 'A' => 0.	81	/// e.g. 'A' => 0.
82	/// undefined for any value not in the 64 alphabet chars.	82	/// undefined for any value not in the 64 alphabet chars.
83	char_to_index: [256]u8,	83	char_to_index: [256]u8,
		84
84	/// true only for the 64 chars in the alphabet, not the pad char.	85	/// true only for the 64 chars in the alphabet, not the pad char.
85	char_in_alphabet: [256]bool,	86	char_in_alphabet: [256]bool,
86	pad_char: u8,	87	pad_char: u8,
...	@@ -106,7 +107,7 @@ pub const Base64Decoder = struct {	...	@@ -106,7 +107,7 @@ pub const Base64Decoder = struct {
106	}	107	}
107		108
108	/// If the encoded buffer is detected to be invalid, returns error.InvalidPadding.	109	/// If the encoded buffer is detected to be invalid, returns error.InvalidPadding.
109	pub fn calcSize(decoder: &const Base64Decoder, source: []const u8) !usize {	110	pub fn calcSize(decoder: *const Base64Decoder, source: []const u8) !usize {
110	if (source.len % 4 != 0) return error.InvalidPadding;	111	if (source.len % 4 != 0) return error.InvalidPadding;
111	return calcDecodedSizeExactUnsafe(source, decoder.pad_char);	112	return calcDecodedSizeExactUnsafe(source, decoder.pad_char);
112	}	113	}
...	@@ -114,7 +115,7 @@ pub const Base64Decoder = struct {	...	@@ -114,7 +115,7 @@ pub const Base64Decoder = struct {
114	/// dest.len must be what you get from ::calcSize.	115	/// dest.len must be what you get from ::calcSize.
115	/// invalid characters result in error.InvalidCharacter.	116	/// invalid characters result in error.InvalidCharacter.
116	/// invalid padding results in error.InvalidPadding.	117	/// invalid padding results in error.InvalidPadding.
117	pub fn decode(decoder: &const Base64Decoder, dest: []u8, source: []const u8) !void {	118	pub fn decode(decoder: *const Base64Decoder, dest: []u8, source: []const u8) !void {
118	assert(dest.len == (decoder.calcSize(source) catch unreachable));	119	assert(dest.len == (decoder.calcSize(source) catch unreachable));
119	assert(source.len % 4 == 0);	120	assert(source.len % 4 == 0);
120		121
...	@@ -180,7 +181,7 @@ pub const Base64DecoderWithIgnore = struct {	...	@@ -180,7 +181,7 @@ pub const Base64DecoderWithIgnore = struct {
180	/// Invalid padding results in error.InvalidPadding.	181	/// Invalid padding results in error.InvalidPadding.
181	/// Decoding more data than can fit in dest results in error.OutputTooSmall. See also ::calcSizeUpperBound.	182	/// Decoding more data than can fit in dest results in error.OutputTooSmall. See also ::calcSizeUpperBound.
182	/// Returns the number of bytes writen to dest.	183	/// Returns the number of bytes writen to dest.
183	pub fn decode(decoder_with_ignore: &const Base64DecoderWithIgnore, dest: []u8, source: []const u8) !usize {	184	pub fn decode(decoder_with_ignore: *const Base64DecoderWithIgnore, dest: []u8, source: []const u8) !usize {
184	const decoder = &decoder_with_ignore.decoder;	185	const decoder = &decoder_with_ignore.decoder;
185		186
186	var src_cursor: usize = 0;	187	var src_cursor: usize = 0;
...	@@ -289,13 +290,13 @@ pub const Base64DecoderUnsafe = struct {	...	@@ -289,13 +290,13 @@ pub const Base64DecoderUnsafe = struct {
289	}	290	}
290		291
291	/// The source buffer must be valid.	292	/// The source buffer must be valid.
292	pub fn calcSize(decoder: &const Base64DecoderUnsafe, source: []const u8) usize {	293	pub fn calcSize(decoder: *const Base64DecoderUnsafe, source: []const u8) usize {
293	return calcDecodedSizeExactUnsafe(source, decoder.pad_char);	294	return calcDecodedSizeExactUnsafe(source, decoder.pad_char);
294	}	295	}
295		296
296	/// dest.len must be what you get from ::calcDecodedSizeExactUnsafe.	297	/// dest.len must be what you get from ::calcDecodedSizeExactUnsafe.
297	/// invalid characters or padding will result in undefined values.	298	/// invalid characters or padding will result in undefined values.
298	pub fn decode(decoder: &const Base64DecoderUnsafe, dest: []u8, source: []const u8) void {	299	pub fn decode(decoder: *const Base64DecoderUnsafe, dest: []u8, source: []const u8) void {
299	assert(dest.len == decoder.calcSize(source));	300	assert(dest.len == decoder.calcSize(source));
300		301
301	var src_index: usize = 0;	302	var src_index: usize = 0;
...	@@ -449,7 +450,7 @@ fn testError(encoded: []const u8, expected_err: error) !void {	...	@@ -449,7 +450,7 @@ fn testError(encoded: []const u8, expected_err: error) !void {
449	fn testOutputTooSmallError(encoded: []const u8) !void {	450	fn testOutputTooSmallError(encoded: []const u8) !void {
450	const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(standard_alphabet_chars, standard_pad_char, " ");	451	const standard_decoder_ignore_space = Base64DecoderWithIgnore.init(standard_alphabet_chars, standard_pad_char, " ");
451	var buffer: [0x100]u8 = undefined;	452	var buffer: [0x100]u8 = undefined;
452	var decoded = buffer[0..calcDecodedSizeExactUnsafe(encoded, standard_pad_char) - 1];	453	var decoded = buffer[0 .. calcDecodedSizeExactUnsafe(encoded, standard_pad_char) - 1];
453	if (standard_decoder_ignore_space.decode(decoded, encoded)) \|_\| {	454	if (standard_decoder_ignore_space.decode(decoded, encoded)) \|_\| {
454	return error.ExpectedError;	455	return error.ExpectedError;
455	} else \|err\| if (err != error.OutputTooSmall) return err;	456	} else \|err\| if (err != error.OutputTooSmall) return err;

...	@@ -14,7 +14,7 @@ pub fn ldexp_cexp(z: var, expt: i32) Complex(@typeOf(z.re)) {	...	@@ -14,7 +14,7 @@ pub fn ldexp_cexp(z: var, expt: i32) Complex(@typeOf(z.re)) {
14	};	14	};
15	}	15	}
16		16
17	fn frexp_exp32(x: f32, expt: &i32) f32 {	17	fn frexp_exp32(x: f32, expt: *i32) f32 {
18	const k = 235; // reduction constant	18	const k = 235; // reduction constant
19	const kln2 = 162.88958740; // k * ln2	19	const kln2 = 162.88958740; // k * ln2
20		20
...	@@ -24,7 +24,7 @@ fn frexp_exp32(x: f32, expt: &i32) f32 {	...	@@ -24,7 +24,7 @@ fn frexp_exp32(x: f32, expt: &i32) f32 {
24	return @bitCast(f32, (hx & 0x7fffff) \| ((0x7f + 127) << 23));	24	return @bitCast(f32, (hx & 0x7fffff) \| ((0x7f + 127) << 23));
25	}	25	}
26		26
27	fn ldexp_cexp32(z: &const Complex(f32), expt: i32) Complex(f32) {	27	fn ldexp_cexp32(z: *const Complex(f32), expt: i32) Complex(f32) {
28	var ex_expt: i32 = undefined;	28	var ex_expt: i32 = undefined;
29	const exp_x = frexp_exp32(z.re, &ex_expt);	29	const exp_x = frexp_exp32(z.re, &ex_expt);
30	const exptf = expt + ex_expt;	30	const exptf = expt + ex_expt;
...	@@ -38,7 +38,7 @@ fn ldexp_cexp32(z: &const Complex(f32), expt: i32) Complex(f32) {	...	@@ -38,7 +38,7 @@ fn ldexp_cexp32(z: &const Complex(f32), expt: i32) Complex(f32) {
38	return Complex(f32).new(math.cos(z.im) * exp_x * scale1 * scale2, math.sin(z.im) * exp_x * scale1 * scale2);	38	return Complex(f32).new(math.cos(z.im) * exp_x * scale1 * scale2, math.sin(z.im) * exp_x * scale1 * scale2);
39	}	39	}
40		40
41	fn frexp_exp64(x: f64, expt: &i32) f64 {	41	fn frexp_exp64(x: f64, expt: *i32) f64 {
42	const k = 1799; // reduction constant	42	const k = 1799; // reduction constant
43	const kln2 = 1246.97177782734161156; // k * ln2	43	const kln2 = 1246.97177782734161156; // k * ln2
44		44
...	@@ -54,7 +54,7 @@ fn frexp_exp64(x: f64, expt: &i32) f64 {	...	@@ -54,7 +54,7 @@ fn frexp_exp64(x: f64, expt: &i32) f64 {
54	return @bitCast(f64, (u64(high_word) << 32) \| lx);	54	return @bitCast(f64, (u64(high_word) << 32) \| lx);
55	}	55	}
56		56
57	fn ldexp_cexp64(z: &const Complex(f64), expt: i32) Complex(f64) {	57	fn ldexp_cexp64(z: *const Complex(f64), expt: i32) Complex(f64) {
58	var ex_expt: i32 = undefined;	58	var ex_expt: i32 = undefined;
59	const exp_x = frexp_exp64(z.re, &ex_expt);	59	const exp_x = frexp_exp64(z.re, &ex_expt);
60	const exptf = i64(expt + ex_expt);	60	const exptf = i64(expt + ex_expt);

...	@@ -24,7 +24,6 @@ pub fn main() !void {	...	@@ -24,7 +24,6 @@ pub fn main() !void {
24		24
25	const allocator = &arena.allocator;	25	const allocator = &arena.allocator;
26		26
27
28	// skip my own exe name	27	// skip my own exe name
29	_ = arg_it.skip();	28	_ = arg_it.skip();
30		29
...	@@ -72,7 +71,7 @@ pub fn main() !void {	...	@@ -72,7 +71,7 @@ pub fn main() !void {
72	}	71	}
73	if (mem.indexOfScalar(u8, option_contents, '=')) \|name_end\| {	72	if (mem.indexOfScalar(u8, option_contents, '=')) \|name_end\| {
74	const option_name = option_contents[0..name_end];	73	const option_name = option_contents[0..name_end];
75	const option_value = option_contents[name_end + 1..];	74	const option_value = option_contents[name_end + 1 ..];
76	if (builder.addUserInputOption(option_name, option_value))	75	if (builder.addUserInputOption(option_name, option_value))
77	return usageAndErr(&builder, false, try stderr_stream);	76	return usageAndErr(&builder, false, try stderr_stream);
78	} else {	77	} else {
...	@@ -130,7 +129,7 @@ pub fn main() !void {	...	@@ -130,7 +129,7 @@ pub fn main() !void {
130	};	129	};
131	}	130	}
132		131
133	fn runBuild(builder: &Builder) error!void {	132	fn runBuild(builder: *Builder) error!void {
134	switch (@typeId(@typeOf(root.build).ReturnType)) {	133	switch (@typeId(@typeOf(root.build).ReturnType)) {
135	builtin.TypeId.Void => root.build(builder),	134	builtin.TypeId.Void => root.build(builder),
136	builtin.TypeId.ErrorUnion => try root.build(builder),	135	builtin.TypeId.ErrorUnion => try root.build(builder),
...	@@ -138,7 +137,7 @@ fn runBuild(builder: &Builder) error!void {	...	@@ -138,7 +137,7 @@ fn runBuild(builder: &Builder) error!void {
138	}	137	}
139	}	138	}
140		139
141	fn usage(builder: &Builder, already_ran_build: bool, out_stream: var) !void {	140	fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void {
142	// run the build script to collect the options	141	// run the build script to collect the options
143	if (!already_ran_build) {	142	if (!already_ran_build) {
144	builder.setInstallPrefix(null);	143	builder.setInstallPrefix(null);
...	@@ -175,8 +174,7 @@ fn usage(builder: &Builder, already_ran_build: bool, out_stream: var) !void {	...	@@ -175,8 +174,7 @@ fn usage(builder: &Builder, already_ran_build: bool, out_stream: var) !void {
175	try out_stream.print(" (none)\n");	174	try out_stream.print(" (none)\n");
176	} else {	175	} else {
177	for (builder.available_options_list.toSliceConst()) \|option\| {	176	for (builder.available_options_list.toSliceConst()) \|option\| {
178	const name = try fmt.allocPrint(allocator,	177	const name = try fmt.allocPrint(allocator, " -D{}=[{}]", option.name, Builder.typeIdName(option.type_id));
179	" -D{}=[{}]", option.name, Builder.typeIdName(option.type_id));
180	defer allocator.free(name);	178	defer allocator.free(name);
181	try out_stream.print("{s24} {}\n", name, option.description);	179	try out_stream.print("{s24} {}\n", name, option.description);
182	}	180	}
...	@@ -197,12 +195,12 @@ fn usage(builder: &Builder, already_ran_build: bool, out_stream: var) !void {	...	@@ -197,12 +195,12 @@ fn usage(builder: &Builder, already_ran_build: bool, out_stream: var) !void {
197	);	195	);
198	}	196	}
199		197
200	fn usageAndErr(builder: &Builder, already_ran_build: bool, out_stream: var) error {	198	fn usageAndErr(builder: *Builder, already_ran_build: bool, out_stream: var) error {
201	usage(builder, already_ran_build, out_stream) catch {};	199	usage(builder, already_ran_build, out_stream) catch {};
202	return error.InvalidArgs;	200	return error.InvalidArgs;
203	}	201	}
204		202
205	const UnwrapArgError = error {OutOfMemory};	203	const UnwrapArgError = error{OutOfMemory};
206		204
207	fn unwrapArg(arg: UnwrapArgError![]u8) UnwrapArgError![]u8 {	205	fn unwrapArg(arg: UnwrapArgError![]u8) UnwrapArgError![]u8 {
208	return arg catch \|err\| {	206	return arg catch \|err\| {

...	@@ -1,8 +1,8 @@	...	@@ -1,8 +1,8 @@
1	const tests = @import("tests.zig");	1	const tests = @import("tests.zig");
2		2
3	pub fn addCases(cases: &tests.CompareOutputContext) void {	3	pub fn addCases(cases: *tests.CompareOutputContext) void {
4	cases.addRuntimeSafety("calling panic",	4	cases.addRuntimeSafety("calling panic",
5	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	5	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
6	\\ @import("std").os.exit(126);	6	\\ @import("std").os.exit(126);
7	\\}	7	\\}
8	\\pub fn main() void {	8	\\pub fn main() void {
...	@@ -11,7 +11,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -11,7 +11,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
11	);	11	);
12		12
13	cases.addRuntimeSafety("out of bounds slice access",	13	cases.addRuntimeSafety("out of bounds slice access",
14	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	14	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
15	\\ @import("std").os.exit(126);	15	\\ @import("std").os.exit(126);
16	\\}	16	\\}
17	\\pub fn main() void {	17	\\pub fn main() void {
...	@@ -25,7 +25,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -25,7 +25,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
25	);	25	);
26		26
27	cases.addRuntimeSafety("integer addition overflow",	27	cases.addRuntimeSafety("integer addition overflow",
28	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	28	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
29	\\ @import("std").os.exit(126);	29	\\ @import("std").os.exit(126);
30	\\}	30	\\}
31	\\pub fn main() !void {	31	\\pub fn main() !void {
...	@@ -38,7 +38,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -38,7 +38,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
38	);	38	);
39		39
40	cases.addRuntimeSafety("integer subtraction overflow",	40	cases.addRuntimeSafety("integer subtraction overflow",
41	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	41	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
42	\\ @import("std").os.exit(126);	42	\\ @import("std").os.exit(126);
43	\\}	43	\\}
44	\\pub fn main() !void {	44	\\pub fn main() !void {
...	@@ -51,7 +51,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -51,7 +51,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
51	);	51	);
52		52
53	cases.addRuntimeSafety("integer multiplication overflow",	53	cases.addRuntimeSafety("integer multiplication overflow",
54	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	54	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
55	\\ @import("std").os.exit(126);	55	\\ @import("std").os.exit(126);
56	\\}	56	\\}
57	\\pub fn main() !void {	57	\\pub fn main() !void {
...	@@ -64,7 +64,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -64,7 +64,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
64	);	64	);
65		65
66	cases.addRuntimeSafety("integer negation overflow",	66	cases.addRuntimeSafety("integer negation overflow",
67	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	67	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
68	\\ @import("std").os.exit(126);	68	\\ @import("std").os.exit(126);
69	\\}	69	\\}
70	\\pub fn main() !void {	70	\\pub fn main() !void {
...	@@ -77,7 +77,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -77,7 +77,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
77	);	77	);
78		78
79	cases.addRuntimeSafety("signed integer division overflow",	79	cases.addRuntimeSafety("signed integer division overflow",
80	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	80	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
81	\\ @import("std").os.exit(126);	81	\\ @import("std").os.exit(126);
82	\\}	82	\\}
83	\\pub fn main() !void {	83	\\pub fn main() !void {
...	@@ -90,7 +90,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -90,7 +90,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
90	);	90	);
91		91
92	cases.addRuntimeSafety("signed shift left overflow",	92	cases.addRuntimeSafety("signed shift left overflow",
93	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	93	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
94	\\ @import("std").os.exit(126);	94	\\ @import("std").os.exit(126);
95	\\}	95	\\}
96	\\pub fn main() !void {	96	\\pub fn main() !void {
...	@@ -103,7 +103,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -103,7 +103,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
103	);	103	);
104		104
105	cases.addRuntimeSafety("unsigned shift left overflow",	105	cases.addRuntimeSafety("unsigned shift left overflow",
106	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	106	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
107	\\ @import("std").os.exit(126);	107	\\ @import("std").os.exit(126);
108	\\}	108	\\}
109	\\pub fn main() !void {	109	\\pub fn main() !void {
...	@@ -116,7 +116,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -116,7 +116,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
116	);	116	);
117		117
118	cases.addRuntimeSafety("signed shift right overflow",	118	cases.addRuntimeSafety("signed shift right overflow",
119	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	119	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
120	\\ @import("std").os.exit(126);	120	\\ @import("std").os.exit(126);
121	\\}	121	\\}
122	\\pub fn main() !void {	122	\\pub fn main() !void {
...	@@ -129,7 +129,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -129,7 +129,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
129	);	129	);
130		130
131	cases.addRuntimeSafety("unsigned shift right overflow",	131	cases.addRuntimeSafety("unsigned shift right overflow",
132	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	132	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
133	\\ @import("std").os.exit(126);	133	\\ @import("std").os.exit(126);
134	\\}	134	\\}
135	\\pub fn main() !void {	135	\\pub fn main() !void {
...	@@ -142,7 +142,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -142,7 +142,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
142	);	142	);
143		143
144	cases.addRuntimeSafety("integer division by zero",	144	cases.addRuntimeSafety("integer division by zero",
145	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	145	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
146	\\ @import("std").os.exit(126);	146	\\ @import("std").os.exit(126);
147	\\}	147	\\}
148	\\pub fn main() void {	148	\\pub fn main() void {
...	@@ -154,7 +154,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -154,7 +154,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
154	);	154	);
155		155
156	cases.addRuntimeSafety("exact division failure",	156	cases.addRuntimeSafety("exact division failure",
157	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	157	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
158	\\ @import("std").os.exit(126);	158	\\ @import("std").os.exit(126);
159	\\}	159	\\}
160	\\pub fn main() !void {	160	\\pub fn main() !void {
...	@@ -167,7 +167,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -167,7 +167,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
167	);	167	);
168		168
169	cases.addRuntimeSafety("cast []u8 to bigger slice of wrong size",	169	cases.addRuntimeSafety("cast []u8 to bigger slice of wrong size",
170	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	170	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
171	\\ @import("std").os.exit(126);	171	\\ @import("std").os.exit(126);
172	\\}	172	\\}
173	\\pub fn main() !void {	173	\\pub fn main() !void {
...	@@ -180,7 +180,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -180,7 +180,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
180	);	180	);
181		181
182	cases.addRuntimeSafety("value does not fit in shortening cast",	182	cases.addRuntimeSafety("value does not fit in shortening cast",
183	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	183	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
184	\\ @import("std").os.exit(126);	184	\\ @import("std").os.exit(126);
185	\\}	185	\\}
186	\\pub fn main() !void {	186	\\pub fn main() !void {
...	@@ -193,7 +193,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -193,7 +193,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
193	);	193	);
194		194
195	cases.addRuntimeSafety("signed integer not fitting in cast to unsigned integer",	195	cases.addRuntimeSafety("signed integer not fitting in cast to unsigned integer",
196	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	196	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
197	\\ @import("std").os.exit(126);	197	\\ @import("std").os.exit(126);
198	\\}	198	\\}
199	\\pub fn main() !void {	199	\\pub fn main() !void {
...	@@ -206,7 +206,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -206,7 +206,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
206	);	206	);
207		207
208	cases.addRuntimeSafety("unwrap error",	208	cases.addRuntimeSafety("unwrap error",
209	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	209	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
210	\\ if (@import("std").mem.eql(u8, message, "attempt to unwrap error: Whatever")) {	210	\\ if (@import("std").mem.eql(u8, message, "attempt to unwrap error: Whatever")) {
211	\\ @import("std").os.exit(126); // good	211	\\ @import("std").os.exit(126); // good
212	\\ }	212	\\ }
...	@@ -221,7 +221,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -221,7 +221,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
221	);	221	);
222		222
223	cases.addRuntimeSafety("cast integer to global error and no code matches",	223	cases.addRuntimeSafety("cast integer to global error and no code matches",
224	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	224	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
225	\\ @import("std").os.exit(126);	225	\\ @import("std").os.exit(126);
226	\\}	226	\\}
227	\\pub fn main() void {	227	\\pub fn main() void {
...	@@ -233,7 +233,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -233,7 +233,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
233	);	233	);
234		234
235	cases.addRuntimeSafety("cast integer to non-global error set and no match",	235	cases.addRuntimeSafety("cast integer to non-global error set and no match",
236	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	236	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
237	\\ @import("std").os.exit(126);	237	\\ @import("std").os.exit(126);
238	\\}	238	\\}
239	\\const Set1 = error{A, B};	239	\\const Set1 = error{A, B};
...	@@ -247,7 +247,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -247,7 +247,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
247	);	247	);
248		248
249	cases.addRuntimeSafety("@alignCast misaligned",	249	cases.addRuntimeSafety("@alignCast misaligned",
250	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	250	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
251	\\ @import("std").os.exit(126);	251	\\ @import("std").os.exit(126);
252	\\}	252	\\}
253	\\pub fn main() !void {	253	\\pub fn main() !void {
...	@@ -263,7 +263,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -263,7 +263,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
263	);	263	);
264		264
265	cases.addRuntimeSafety("bad union field access",	265	cases.addRuntimeSafety("bad union field access",
266	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	266	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
267	\\ @import("std").os.exit(126);	267	\\ @import("std").os.exit(126);
268	\\}	268	\\}
269	\\	269	\\
...	@@ -277,7 +277,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -277,7 +277,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
277	\\ bar(&f);	277	\\ bar(&f);
278	\\}	278	\\}
279	\\	279	\\
280	\\fn bar(f: &Foo) void {	280	\\fn bar(f: *Foo) void {
281	\\ f.float = 12.34;	281	\\ f.float = 12.34;
282	\\}	282	\\}
283	);	283	);
...	@@ -287,7 +287,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {	...	@@ -287,7 +287,7 @@ pub fn addCases(cases: &tests.CompareOutputContext) void {
287	cases.addRuntimeSafety("error return trace across suspend points",	287	cases.addRuntimeSafety("error return trace across suspend points",
288	\\const std = @import("std");	288	\\const std = @import("std");
289	\\	289	\\
290	\\pub fn panic(message: []const u8, stack_trace: ?&@import("builtin").StackTrace) noreturn {	290	\\pub fn panic(message: []const u8, stack_trace: ?*@import("builtin").StackTrace) noreturn {
291	\\ std.os.exit(126);	291	\\ std.os.exit(126);
292	\\}	292	\\}
293	\\	293	\\

Merge remote-tracking branch 'origin/master' into llvm7