From ec33e5a638b816ab0ba1e4dd3f9433dbb71d7e53 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Sat, 6 Feb 2016 00:56:01 -0700
Subject: simple unconditional defer support

See #110
---
 src/parser.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/parser.cpp')

diff --git a/src/parser.cpp b/src/parser.cpp
index 8be98e6e29..13b260a659 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1651,7 +1651,7 @@ static AstNode *ast_parse_return_or_defer_expr(ParseContext *pc, int *token_inde
             *token_index += 2;
         } else if (next_token->id == TokenIdKeywordDefer) {
             kind = ReturnKindError;
-            node_type = NodeTypeDeferExpr;
+            node_type = NodeTypeDefer;
             *token_index += 2;
         } else {
             return nullptr;
@@ -1664,7 +1664,7 @@ static AstNode *ast_parse_return_or_defer_expr(ParseContext *pc, int *token_inde
             *token_index += 2;
         } else if (next_token->id == TokenIdKeywordDefer) {
             kind = ReturnKindMaybe;
-            node_type = NodeTypeDeferExpr;
+            node_type = NodeTypeDefer;
             *token_index += 2;
         } else {
             return nullptr;
@@ -1675,7 +1675,7 @@ static AstNode *ast_parse_return_or_defer_expr(ParseContext *pc, int *token_inde
         *token_index += 1;
     } else if (token->id == TokenIdKeywordDefer) {
         kind = ReturnKindUnconditional;
-        node_type = NodeTypeDeferExpr;
+        node_type = NodeTypeDefer;
         *token_index += 1;
     } else {
         return nullptr;
@@ -2703,8 +2703,8 @@ void normalize_parent_ptrs(AstNode *node) {
         case NodeTypeReturnExpr:
             set_field(&node->data.return_expr.expr);
             break;
-        case NodeTypeDeferExpr:
-            set_field(&node->data.defer_expr.expr);
+        case NodeTypeDefer:
+            set_field(&node->data.defer.expr);
             break;
         case NodeTypeVariableDeclaration:
             set_list_fields(node->data.variable_declaration.directives);
-- 
cgit v1.2.3