zig fmt: same-line comment on comptime expression

andrewrk · andrewrk · commit eef21df94fed · 2018-05-04T16:46:35.000-04:00
diff --git a/std/zig/parser.zig b/std/zig/parser.zig
@@ -1382,9 +1382,10 @@ pub const Parser = struct {
                         else => {
                             self.putBackToken(token);
                             self.putBackToken(ctx.comptime_token);
-                            const statememt = try ctx.block.statements.addOne();
-                            stack.append(State { .Semicolon = statememt }) catch unreachable;
-                            try stack.append(State { .Expression = OptionalCtx { .Required = statememt } });
+                            const statement = try ctx.block.statements.addOne();
+                            stack.append(State { .LookForSameLineComment = statement }) catch unreachable;
+                            try stack.append(State { .Semicolon = statement });
+                            try stack.append(State { .Expression = OptionalCtx { .Required = statement } });
                             continue;
                         }
                     }
diff --git a/std/zig/parser_test.zig b/std/zig/parser_test.zig
@@ -6,16 +6,14 @@
 // format(&size, error{}, countSize, fmt, args) catch |err| switch (err) {};
 
 
-//TODO
-//test "zig fmt: same-line comptime" {
-//    try testCanonical(
-//        \\test "" {
-//        \\    comptime assert(@typeId(T) == builtin.TypeId.Int); // must pass an integer to absInt
-//        \\}
-//        \\
-//    );
-//}
-
+test "zig fmt: same-line comment on comptime expression" {
+    try testCanonical(
+        \\test "" {
+        \\    comptime assert(@typeId(T) == builtin.TypeId.Int); // must pass an integer to absInt
+        \\}
+        \\
+    );
+}
 
 test "zig fmt: float literal with exponent" {
     try testCanonical(

Original file line number	Diff line number	Diff line change
`@@ -1382,9 +1382,10 @@ pub const Parser = struct {`
`1382`	`1382`	`else => {`
`1383`	`1383`	`self.putBackToken(token);`
`1384`	`1384`	`self.putBackToken(ctx.comptime_token);`
`1385`		`- const statememt = try ctx.block.statements.addOne();`
`1386`		`- stack.append(State { .Semicolon = statememt }) catch unreachable;`
`1387`		`- try stack.append(State { .Expression = OptionalCtx { .Required = statememt } });`
	`1385`	`+ const statement = try ctx.block.statements.addOne();`
	`1386`	`+ stack.append(State { .LookForSameLineComment = statement }) catch unreachable;`
	`1387`	`+ try stack.append(State { .Semicolon = statement });`
	`1388`	`+ try stack.append(State { .Expression = OptionalCtx { .Required = statement } });`
`1388`	`1389`	`continue;`
`1389`	`1390`	`}`
`1390`	`1391`	`}`