diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-06-26 18:29:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 18:29:19 -0400 |
| commit | 01ff0d4d629c3800ebac68edfd91edb570aeaa59 (patch) | |
| tree | fc1bdbf059e9bf9e99b212aae3056ed0e87e7e77 /src/parser.cpp | |
| parent | 07c0d484eec327ca3bd1e3ce081c1ced230536a9 (diff) | |
| parent | 517bdea7549453d958c31cf2af5dc298ea5508a9 (diff) | |
| download | zig-01ff0d4d629c3800ebac68edfd91edb570aeaa59.tar.gz zig-01ff0d4d629c3800ebac68edfd91edb570aeaa59.zip | |
Merge pull request #2602 from ziglang/copy-elision-3
result location mechanism (part of no-copy semantics)
Diffstat (limited to 'src/parser.cpp')
| -rw-r--r-- | src/parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index 33f8836ef3..f35e54f6de 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -344,7 +344,7 @@ static AstNode *ast_parse_bin_op_expr( op->data.bin_op_expr.op1 = left; op->data.bin_op_expr.op2 = right; break; - case NodeTypeUnwrapErrorExpr: + case NodeTypeCatchExpr: op->data.unwrap_err_expr.op1 = left; op->data.unwrap_err_expr.op2 = right; break; @@ -2404,7 +2404,7 @@ static AstNode *ast_parse_bitwise_op(ParseContext *pc) { Token *catch_token = eat_token_if(pc, TokenIdKeywordCatch); if (catch_token != nullptr) { Token *payload = ast_parse_payload(pc); - AstNode *res = ast_create_node(pc, NodeTypeUnwrapErrorExpr, catch_token); + AstNode *res = ast_create_node(pc, NodeTypeCatchExpr, catch_token); if (payload != nullptr) res->data.unwrap_err_expr.symbol = token_symbol(pc, payload); @@ -2897,7 +2897,7 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont visit_field(&node->data.bin_op_expr.op1, visit, context); visit_field(&node->data.bin_op_expr.op2, visit, context); break; - case NodeTypeUnwrapErrorExpr: + case NodeTypeCatchExpr: visit_field(&node->data.unwrap_err_expr.op1, visit, context); visit_field(&node->data.unwrap_err_expr.symbol, visit, context); visit_field(&node->data.unwrap_err_expr.op2, visit, context); |