diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-03 20:53:53 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-03 20:53:53 -0500 |
| commit | 8eae4a096752b7e477d16ee0c5fd40d8871e973a (patch) | |
| tree | 3cdbfaeb3c53eaf551ab59bd508edbb4c2bddc5d /src/parser.cpp | |
| parent | 1d77f8db289e6eefce827fe37d27e72b68362943 (diff) | |
| parent | 5a800db48cde943a7fd80fdbfb42bc69a325ca76 (diff) | |
| download | zig-8eae4a096752b7e477d16ee0c5fd40d8871e973a.tar.gz zig-8eae4a096752b7e477d16ee0c5fd40d8871e973a.zip | |
Merge branch 'master' into llvm6
Diffstat (limited to 'src/parser.cpp')
| -rw-r--r-- | src/parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index d069a23c5f..6ee3b877ad 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -2552,7 +2552,7 @@ static AstNode *ast_parse_container_decl(ParseContext *pc, size_t *token_index, Token *eq_token = &pc->tokens->at(*token_index); if (eq_token->id == TokenIdEq) { *token_index += 1; - field_node->data.struct_field.value = ast_parse_prefix_op_expr(pc, token_index, true); + field_node->data.struct_field.value = ast_parse_expression(pc, token_index, true); } Token *next_token = &pc->tokens->at(*token_index); |