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

allow implicit semicolon after defer {}

Browse Source
This commit is contained in:
Josh Wolfe 2017-04-02 13:01:23 -07:00
parent 136a9a9d6b
commit e3c796258c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/parser.cpp
View File

@ -1856,7 +1856,7 @@ static AstNode *ast_parse_switch_expr(ParseContext *pc, size_t *token_index, boo
}
}
static bool block_expr_has_block_body(AstNode *node) {
static bool statement_has_block_body(AstNode *node) {
switch (node->type) {
case NodeTypeIfBoolExpr:
if (node->data.if_bool_expr.else_node)
@ -1879,6 +1879,8 @@ static bool block_expr_has_block_body(AstNode *node) {
return true;
case NodeTypeCompTime:
return node->data.comptime_expr.expr->type == NodeTypeBlock;
case NodeTypeDefer:
return node->data.defer.expr->type == NodeTypeBlock;
default:
zig_unreachable();
}
@ -2123,18 +2125,16 @@ static AstNode *ast_parse_block(ParseContext *pc, size_t *token_index, bool mand
statement_node = ast_parse_variable_declaration_expr(pc, token_index, false, VisibModPrivate);
if (!statement_node) {
statement_node = ast_parse_defer_expr(pc, token_index);
if (!statement_node) {
if (!statement_node)
statement_node = ast_parse_block_expr(pc, token_index, false);
if (statement_node) {
if (block_expr_has_block_body(statement_node)) {
semicolon_expected = false;
}
} else {
statement_node = ast_parse_expression(pc, token_index, false);
if (!statement_node) {
// final semicolon means add a void statement.
need_implicit_final_void_statement = true;
}
if (statement_node) {
if (statement_has_block_body(statement_node))
semicolon_expected = false;
} else {
statement_node = ast_parse_expression(pc, token_index, false);
if (!statement_node) {
// final semicolon means add a void statement.
need_implicit_final_void_statement = true;
}
}
}