diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-08 10:34:45 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-08 10:34:45 -0500 |
| commit | 5a8d87f5042b5ab86de7c72df4ce84a314878e40 (patch) | |
| tree | d9a8e14011994c5ebdf4525ea5c5b647aae91a6e /src/ast_render.cpp | |
| parent | 38658a597bc22697c2038c21bdec9f04c9973eb8 (diff) | |
| parent | 598170756cd91b6f300921d256baa72141ec3098 (diff) | |
| download | zig-5a8d87f5042b5ab86de7c72df4ce84a314878e40.tar.gz zig-5a8d87f5042b5ab86de7c72df4ce84a314878e40.zip | |
Merge branch 'master' into llvm6
Diffstat (limited to 'src/ast_render.cpp')
| -rw-r--r-- | src/ast_render.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/ast_render.cpp b/src/ast_render.cpp index f0912285f0..47da6c8e2f 100644 --- a/src/ast_render.cpp +++ b/src/ast_render.cpp @@ -68,7 +68,7 @@ static const char *prefix_op_str(PrefixOp prefix_op) { case PrefixOpDereference: return "*"; case PrefixOpMaybe: return "?"; case PrefixOpError: return "%"; - case PrefixOpUnwrapError: return "%%"; + case PrefixOpUnwrapError: return "catch"; case PrefixOpUnwrapMaybe: return "??"; } zig_unreachable(); @@ -85,7 +85,7 @@ static const char *visib_mod_string(VisibMod mod) { static const char *return_string(ReturnKind kind) { switch (kind) { case ReturnKindUnconditional: return "return"; - case ReturnKindError: return "%return"; + case ReturnKindError: return "try"; } zig_unreachable(); } @@ -241,8 +241,8 @@ static const char *node_type_str(NodeType node_type) { return "ErrorType"; case NodeTypeVarLiteral: return "VarLiteral"; - case NodeTypeTryExpr: - return "TryExpr"; + case NodeTypeIfErrorExpr: + return "IfErrorExpr"; case NodeTypeTestExpr: return "TestExpr"; } @@ -872,23 +872,23 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) { fprintf(ar->f, "null"); break; } - case NodeTypeTryExpr: + case NodeTypeIfErrorExpr: { fprintf(ar->f, "if ("); - render_node_grouped(ar, node->data.try_expr.target_node); + render_node_grouped(ar, node->data.if_err_expr.target_node); fprintf(ar->f, ") "); - if (node->data.try_expr.var_symbol) { - const char *ptr_str = node->data.try_expr.var_is_ptr ? "*" : ""; - const char *var_name = buf_ptr(node->data.try_expr.var_symbol); + if (node->data.if_err_expr.var_symbol) { + const char *ptr_str = node->data.if_err_expr.var_is_ptr ? "*" : ""; + const char *var_name = buf_ptr(node->data.if_err_expr.var_symbol); fprintf(ar->f, "|%s%s| ", ptr_str, var_name); } - render_node_grouped(ar, node->data.try_expr.then_node); - if (node->data.try_expr.else_node) { + render_node_grouped(ar, node->data.if_err_expr.then_node); + if (node->data.if_err_expr.else_node) { fprintf(ar->f, " else "); - if (node->data.try_expr.err_symbol) { - fprintf(ar->f, "|%s| ", buf_ptr(node->data.try_expr.err_symbol)); + if (node->data.if_err_expr.err_symbol) { + fprintf(ar->f, "|%s| ", buf_ptr(node->data.if_err_expr.err_symbol)); } - render_node_grouped(ar, node->data.try_expr.else_node); + render_node_grouped(ar, node->data.if_err_expr.else_node); } break; } |