mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-15 18:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig fmt: support labeled suspend

Browse Source
This commit is contained in:
Andrew Kelley 2018-04-30 17:30:57 -04:00
parent 37d3ef2835
commit 7dc8d433ab
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
std/zig/ast.zig
View File

@ -1371,6 +1371,7 @@ pub const Node = struct {
pub const Suspend = struct {
base: Node,
label: ?Token,
suspend_token: Token,
payload: ?&Node,
body: ?&Node,
@ -1392,6 +1393,7 @@ pub const Node = struct {
}
pub fn firstToken(self: &Suspend) Token {
if (self.label) |label| return label;
return self.suspend_token;
}

21
std/zig/parser.zig
View File

@ -1093,6 +1093,23 @@ pub const Parser = struct {
}) catch unreachable;
continue;
},
Token.Id.Keyword_suspend => {
const node = try arena.construct(ast.Node.Suspend {
.base = ast.Node {
.id = ast.Node.Id.Suspend,
.doc_comments = null,
.same_line_comment = null,
},
.label = ctx.label,
.suspend_token = token,
.payload = null,
.body = null,
});
ctx.opt_ctx.store(&node.base);
stack.append(State { .SuspendBody = node }) catch unreachable;
try stack.append(State { .Payload = OptionalCtx { .Optional = &node.payload } });
continue;
},
Token.Id.Keyword_inline => {
stack.append(State {
.Inline = InlineCtx {
@ -3046,6 +3063,7 @@ pub const Parser = struct {
const node = try self.createToCtxNode(arena, ctx, ast.Node.Suspend,
ast.Node.Suspend {
.base = undefined,
.label = null,
.suspend_token = *token,
.payload = null,
.body = null,
@ -3655,6 +3673,9 @@ pub const Parser = struct {
},
ast.Node.Id.Suspend => {
const suspend_node = @fieldParentPtr(ast.Node.Suspend, "base", base);
if (suspend_node.label) |label| {
try stream.print("{}: ", self.tokenizer.getTokenSlice(label));
}
try stream.print("{}", self.tokenizer.getTokenSlice(suspend_node.suspend_token));
if (suspend_node.body) |body| {

11
std/zig/parser_test.zig
View File

@ -1,3 +1,14 @@
test "zig fmt: labeled suspend" {
try testCanonical(
\\fn foo() void {
\\ s: suspend |p| {
\\ break :s;
\\ }
\\}
\\
);
}
test "zig fmt: comments before error set decl" {
try testCanonical(
\\const UnexpectedError = error {