Commit 8d03d666af1b8b14e6702c2502846e3c1a79e9da | zig

author	Josh Wolfe <thejoshwolfe@gmail.com> 2017-04-02 13:18:12-07:00
committer	Josh Wolfe <thejoshwolfe@gmail.com> 2017-04-02 13:18:12-07:00
log	8d03d666af1b8b14e6702c2502846e3c1a79e9da
tree	2b76c08c09b0ae707619bfb20449210bd45f27eb
parent	e3c796258c766d5de857ce37eeb3bdc5bb353e68

1 files changed, 5 insertions(+), 1 deletions(-)

src/parser.cpp+5-1

 @@ -2125,8 +2125,12 @@ 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) {
+                    // don't let defer be the last statement in a block
+                    need_implicit_final_void_statement = true;
+                } else {
                     statement_node = ast_parse_block_expr(pc, token_index, false);
+                }
                 if (statement_node) {
                     if (statement_has_block_body(statement_node))
                         semicolon_expected = false;