diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-01-25 11:51:41 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-01-25 11:51:41 -0500 |
| commit | 47be64af5add5c146541c16dbb043ddf97f97d34 (patch) | |
| tree | 3fabcb50c94b254a71cdbf009f29ad1ece6b1f67 /src/ast_render.cpp | |
| parent | 4556f448060b19492d7b104ff01585241ba9c256 (diff) | |
| parent | f7670882aff5fb3a943057edd9da34d053b5fe59 (diff) | |
| download | zig-47be64af5add5c146541c16dbb043ddf97f97d34.tar.gz zig-47be64af5add5c146541c16dbb043ddf97f97d34.zip | |
Merge remote-tracking branch 'origin/master' into llvm6
Diffstat (limited to 'src/ast_render.cpp')
| -rw-r--r-- | src/ast_render.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ast_render.cpp b/src/ast_render.cpp index abe880941c..79cbc1b49a 100644 --- a/src/ast_render.cpp +++ b/src/ast_render.cpp @@ -92,7 +92,7 @@ static const char *return_string(ReturnKind kind) { static const char *defer_string(ReturnKind kind) { switch (kind) { case ReturnKindUnconditional: return "defer"; - case ReturnKindError: return "%defer"; + case ReturnKindError: return "errdefer"; } zig_unreachable(); } @@ -450,10 +450,9 @@ static void render_node_extra(AstRender *ar, AstNode *node, bool grouped) { } AstNode *return_type_node = node->data.fn_proto.return_type; - if (return_type_node != nullptr) { - fprintf(ar->f, " -> "); - render_node_grouped(ar, return_type_node); - } + assert(return_type_node != nullptr); + fprintf(ar->f, " "); + render_node_grouped(ar, return_type_node); break; } case NodeTypeFnDef: |