motiejus/zig
1
Fork 0
Code Releases Activity

clean up analysis of {blocks}

Browse Source 
* Don't insert void statements all over the place. {} now stays as
  {} instead of {{}}, and {;} becomes {} instead of {{};{}}.
* Ensure final statement is always the return value statement, or
  the block is empty. This means {label:} becomes {label:{}}.
This commit is contained in:
Josh Wolfe
2017-03-31 08:41:00 -07:00
parent d5a6cdb03f
commit 36a015741d
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/parser.cpp
View File

@@ -2094,16 +2094,14 @@ static AstNode *ast_parse_block(ParseContext *pc, size_t *token_index, bool mand
AstNode *node = ast_create_node(pc, NodeTypeBlock, last_token);
// {} -> {void}
// {;} -> {void;void}
// {2} -> {2}
// {2;} -> {2;void}
// {;2} -> {void;2}
for (;;) {
AstNode *statement_node = ast_parse_label(pc, token_index, false);
bool need_implicit_final_void_statement = false;
bool semicolon_expected;
if (statement_node) {
semicolon_expected = false;
// if a label is the last thing in a block, add a void statement.
need_implicit_final_void_statement = true;
} else {
statement_node = ast_parse_variable_declaration_expr(pc, token_index, false, VisibModPrivate);
if (!statement_node) {
@@ -2117,17 +2115,23 @@ static AstNode *ast_parse_block(ParseContext *pc, size_t *token_index, bool mand
if (!statement_node) {
statement_node = ast_parse_non_block_expr(pc, token_index, false);
if (!statement_node) {
statement_node = ast_create_void_expr(pc, last_token);
// final semicolon means add a void statement.
need_implicit_final_void_statement = true;
}
}
}
}
node->data.block.statements.append(statement_node);
if (statement_node)
node->data.block.statements.append(statement_node);
last_token = &pc->tokens->at(*token_index);
if (last_token->id == TokenIdRBrace) {
*token_index += 1;
if (node->data.block.statements.length > 0 && need_implicit_final_void_statement) {
node->data.block.statements.append(ast_create_void_expr(pc, last_token));
}
return node;
} else if (!semicolon_expected) {
continue;