Commit 515d4920e79ca3c631f243f6a1d7fb6b48aa91cd | zig

author	Isaac Freund <mail@isaacfreund.com> 2021-02-10 19:19:58+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-02-10 11:53:53-08:00
log	515d4920e79ca3c631f243f6a1d7fb6b48aa91cd
tree	ccfabf7bdf13af646ea5fd9e1d9340a109ecd1b1
parent	5df7fc36c6e5d7caf7b5b5437bf40fec77a2b971

2 files changed, 32 insertions(+), 2 deletions(-)

lib/std/zig/ast.zig+5-2

 @@ -796,8 +796,11 @@ pub const Tree = struct {
             .StructInitOne,
             => {
                 end_offset += 1; // rbrace
-                n = datas[n].rhs;
+                if (datas[n].rhs == 0) {
-                assert(n != 0);
+                    return main_tokens[n] + end_offset;
+                } else {
+                    n = datas[n].rhs;
+                }
             },
             .SliceOpen,
             .CallOneComma,

lib/std/zig/parser_test.zig+27

...	@@ -464,6 +464,15 @@ test "zig fmt: anon literal in array" {	...	@@ -464,6 +464,15 @@ test "zig fmt: anon literal in array" {
464	// );	464	// );
465	//}	465	//}
466		466
		467	test "zig fmt: anon struct literal 0 element" {
		468	try testCanonical(
		469	\\test {
		470	\\ const x = .{};
		471	\\}
		472	\\
		473	);
		474	}
		475
467	test "zig fmt: anon struct literal 1 element" {	476	test "zig fmt: anon struct literal 1 element" {
468	try testCanonical(	477	try testCanonical(
469	\\test {	478	\\test {
...	@@ -527,6 +536,15 @@ test "zig fmt: anon struct literal 3 element comma" {	...	@@ -527,6 +536,15 @@ test "zig fmt: anon struct literal 3 element comma" {
527	);	536	);
528	}	537	}
529		538
		539	test "zig fmt: struct literal 0 element" {
		540	try testCanonical(
		541	\\test {
		542	\\ const x = X{};
		543	\\}
		544	\\
		545	);
		546	}
		547
530	test "zig fmt: struct literal 1 element" {	548	test "zig fmt: struct literal 1 element" {
531	try testCanonical(	549	try testCanonical(
532	\\test {	550	\\test {
...	@@ -653,6 +671,15 @@ test "zig fmt: anon list literal 3 element comma" {	...	@@ -653,6 +671,15 @@ test "zig fmt: anon list literal 3 element comma" {
653	);	671	);
654	}	672	}
655		673
		674	test "zig fmt: array literal 0 element" {
		675	try testCanonical(
		676	\\test {
		677	\\ const x = [_]u32{};
		678	\\}
		679	\\
		680	);
		681	}
		682
656	test "zig fmt: array literal 1 element" {	683	test "zig fmt: array literal 1 element" {
657	try testCanonical(	684	try testCanonical(
658	\\test {	685	\\test {