mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 04:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.zig.parser: Redid parsing of error set delc

Browse Source 
related: #909
This commit is contained in:
Jimmi Holst Christensen 2018-04-11 13:05:42 +02:00
parent 5f3ec023cd
commit 6fb5ab1b52
1 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
std/zig/parser.zig
View File

@ -177,6 +177,8 @@ pub const Parser = struct {
FieldInitListItemOrEnd: ListSave(&ast.NodeFieldInitializer),
FieldInitListCommaOrEnd: ListSave(&ast.NodeFieldInitializer),
FieldListCommaOrEnd: &ast.NodeContainerDecl,
IdentifierListItemOrEnd: ListSave(&ast.NodeIdentifier),
IdentifierListCommaOrEnd: ListSave(&ast.NodeIdentifier),
SwitchCaseOrEnd: ListSave(&ast.NodeSwitchCase),
SuspendBody: &ast.NodeSuspend,
AsyncEnd: AsyncEndCtx,
@ -1683,11 +1685,8 @@ pub const Parser = struct {
},
Token.Id.Keyword_error => {
const next = self.getNextToken();
if (next.id != Token.Id.LBrace) {
if (self.eatToken(Token.Id.LBrace) == null) {
dest_ptr.store(&(try self.createLiteral(arena, ast.NodeErrorType, token)).base);
self.putBackToken(next);
continue;
}
@ -1700,43 +1699,12 @@ pub const Parser = struct {
}
);
while (true) {
const t = self.getNextToken();
switch (t.id) {
Token.Id.RBrace => {
node.rbrace_token = t;
break;
},
Token.Id.Identifier => {
try node.decls.append(
try self.createLiteral(arena, ast.NodeIdentifier, t)
);
},
else => {
try self.parseError(&stack, token, "expected {} or {}, found {}",
@tagName(Token.Id.RBrace),
@tagName(Token.Id.Identifier),
@tagName(token.id));
continue;
}
stack.append(State {
.IdentifierListItemOrEnd = ListSave(&ast.NodeIdentifier) {
.list = &node.decls,
.ptr = &node.rbrace_token,
}
const t2 = self.getNextToken();
switch (t2.id) {
Token.Id.RBrace => {
node.rbrace_token = t;
break;
},
Token.Id.Comma => continue,
else => {
try self.parseError(&stack, token, "expected {} or {}, found {}",
@tagName(Token.Id.RBrace),
@tagName(Token.Id.Comma),
@tagName(token.id));
continue;
}
}
}
}) catch unreachable;
continue;
},
Token.Id.Keyword_packed => {
@ -2082,6 +2050,24 @@ pub const Parser = struct {
});
},
State.IdentifierListItemOrEnd => |list_state| {
if (self.eatToken(Token.Id.RBrace)) |rbrace| {
*list_state.ptr = rbrace;
continue;
}
const node = try self.createLiteral(arena, ast.NodeIdentifier, Token(undefined));
try list_state.list.append(node);
stack.append(State { .IdentifierListCommaOrEnd = list_state }) catch unreachable;
try stack.append(State {
.ExpectTokenSave = ExpectTokenSave {
.id = Token.Id.Identifier,
.ptr = &node.token,
}
});
},
State.SwitchCaseOrEnd => |list_state| {
if (self.eatToken(Token.Id.RBrace)) |rbrace| {
*list_state.ptr = rbrace;
@ -2139,6 +2125,11 @@ pub const Parser = struct {
continue;
},
State.IdentifierListCommaOrEnd => |list_state| {
try self.commaOrEnd(&stack, Token.Id.RBrace, list_state.ptr, State { .IdentifierListItemOrEnd = list_state });
continue;
},
State.SwitchCaseCommaOrEnd => |list_state| {
try self.commaOrEnd(&stack, Token.Id.RBrace, list_state.ptr, State { .SwitchCaseOrEnd = list_state });
continue;