Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std.zig.parser unified code for rendering and parsing semicolon in statements

master
Jimmi Holst Christensen 2018-04-09 11:17:57 +02:00
parent e260c8ca63
commit e24409ebe0
1 changed files with 40 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
std/zig/parser.zig
View File

@ -2053,7 +2053,18 @@ pub const Parser = struct {
State.Semicolon => |node_ptr| {
const node = *node_ptr;
switch (node.id) {
if (requireSemiColon(node)) {
_ = (try self.eatToken(&stack, Token.Id.Semicolon)) ?? continue;
}
}
}
}
}
fn requireSemiColon(node: &const ast.Node) bool {
var n = node;
while (true) {
switch (n.id) {
ast.Node.Id.Root,
ast.Node.Id.StructField,
ast.Node.Id.UnionTag,
@ -2066,27 +2077,21 @@ pub const Parser = struct {
ast.Node.Id.SwitchElse,
ast.Node.Id.FieldInitializer,
ast.Node.Id.LineComment,
ast.Node.Id.TestDecl => continue,
ast.Node.Id.TestDecl => return false,
ast.Node.Id.While => {
const while_node = @fieldParentPtr(ast.NodeWhile, "base", node);
const while_node = @fieldParentPtr(ast.NodeWhile, "base", n);
if (while_node.@"else") |@"else"| {
stack.append(State { .Semicolon = &@"else".base }) catch unreachable;
n = @"else".base;
continue;
}
stack.append(State { .Semicolon = &while_node.body }) catch unreachable;
continue;
n = while_node.body;
},
ast.Node.Id.Else => {
const else_node = @fieldParentPtr(ast.NodeElse, "base", node);
stack.append(State { .Semicolon = &else_node.body }) catch unreachable;
continue;
const else_node = @fieldParentPtr(ast.NodeElse, "base", n);
n = else_node.body;
},
else => {
_ = (try self.eatToken(&stack, Token.Id.Semicolon)) ?? continue;
}
}
}
else => return true,
}
}
}
@ -2559,7 +2564,6 @@ pub const Parser = struct {
Expression: &ast.Node,
VarDecl: &ast.NodeVarDecl,
Statement: &ast.Node,
Semicolon: &ast.Node,
FieldInitializer: &ast.NodeFieldInitializer,
PrintIndent,
Indent: usize,
@ -3344,44 +3348,11 @@ pub const Parser = struct {
try stack.append(RenderState { .VarDecl = var_decl});
},
else => {
try stack.append(RenderState { .Semicolon = base });
try stack.append(RenderState { .Expression = base });
},
}
},
RenderState.Semicolon => |base| {
switch (base.id) {
ast.Node.Id.Root,
ast.Node.Id.StructField,
ast.Node.Id.UnionTag,
ast.Node.Id.EnumTag,
ast.Node.Id.ParamDecl,
ast.Node.Id.Block,
ast.Node.Id.Payload,
ast.Node.Id.Switch,
ast.Node.Id.SwitchCase,
ast.Node.Id.SwitchElse,
ast.Node.Id.FieldInitializer,
ast.Node.Id.LineComment,
ast.Node.Id.TestDecl => {},
ast.Node.Id.While => {
const while_node = @fieldParentPtr(ast.NodeWhile, "base", base);
if (while_node.@"else") |@"else"| {
stack.append(RenderState { .Semicolon = &@"else".base }) catch unreachable;
continue;
}
stack.append(RenderState { .Semicolon = while_node.body }) catch unreachable;
continue;
},
ast.Node.Id.Else => {
const else_node = @fieldParentPtr(ast.NodeElse, "base", base);
stack.append(RenderState { .Semicolon = else_node.body }) catch unreachable;
continue;
},
else => {
if (requireSemiColon(base)) {
try stack.append(RenderState { .Text = ";" });
}
try stack.append(RenderState { .Expression = base });
},
}
},
RenderState.Indent => |new_indent| indent = new_indent,