From 7e3db843cd22519cdcc1befc71dc55fb76f7591e Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat, 21 Jan 2017 13:57:05 -0800
Subject: [PATCH] Remove FUNCTION_DEF_BLOCK and FAKE_BLOCK

These are old-parser block types that are no longer used.
---
 src/parser.cpp | 25 +------------------------
 src/parser.h   |  2 --
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/parser.cpp b/src/parser.cpp
index 21bd8777e..0a7c77762 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -41,9 +41,6 @@ class io_chain_t;
 /// If block description.
 #define IF_BLOCK N_(L"'if' conditional block")
 
-/// Function definition block description.
-#define FUNCTION_DEF_BLOCK N_(L"function definition block")
-
 /// Function invocation block description.
 #define FUNCTION_CALL_BLOCK N_(L"function invocation block")
 
@@ -53,9 +50,6 @@ class io_chain_t;
 /// Switch block description.
 #define SWITCH_BLOCK N_(L"'switch' block")
 
-/// Fake block description.
-#define FAKE_BLOCK N_(L"unexecutable block")
-
 /// Top block description.
 #define TOP_BLOCK N_(L"global root block")
 
@@ -89,11 +83,9 @@ static const struct block_lookup_entry block_lookup[] = {
     {WHILE, L"while", WHILE_BLOCK},
     {FOR, L"for", FOR_BLOCK},
     {IF, L"if", IF_BLOCK},
-    {FUNCTION_DEF, L"function", FUNCTION_DEF_BLOCK},
     {FUNCTION_CALL, 0, FUNCTION_CALL_BLOCK},
     {FUNCTION_CALL_NO_SHADOW, 0, FUNCTION_CALL_NO_SHADOW_BLOCK},
     {SWITCH, L"switch", SWITCH_BLOCK},
-    {FAKE, 0, FAKE_BLOCK},
     {TOP, 0, TOP_BLOCK},
     {SUBST, 0, SUBST_BLOCK},
     {BEGIN, L"begin", BEGIN_BLOCK},
@@ -161,10 +153,6 @@ void parser_t::push_block(block_t *new_current) {
         new_current->skip = 0;
     }
 
-    // Fake blocks and function definition blocks are never executed.
-    if (type == FAKE || type == FUNCTION_DEF) {
-        new_current->skip = 1;
-    }
 
     new_current->job = 0;
     new_current->loop_status = LOOP_NORMAL;
@@ -176,8 +164,7 @@ void parser_t::push_block(block_t *new_current) {
         is_block = 1;
     }
 
-    if ((new_current->type() != FUNCTION_DEF) && (new_current->type() != FAKE) &&
-        (new_current->type() != TOP)) {
+    if (new_current->type() != TOP) {
         env_push(type == FUNCTION_CALL);
         new_current->wants_pop_env = true;
     }
@@ -822,10 +809,6 @@ wcstring block_t::description() const {
             result.append(L"if");
             break;
         }
-        case FUNCTION_DEF: {
-            result.append(L"function_def");
-            break;
-        }
         case FUNCTION_CALL: {
             result.append(L"function_call");
             break;
@@ -838,10 +821,6 @@ wcstring block_t::description() const {
             result.append(L"switch");
             break;
         }
-        case FAKE: {
-            result.append(L"fake");
-            break;
-        }
         case SUBST: {
             result.append(L"substitution");
             break;
@@ -894,8 +873,6 @@ while_block_t::while_block_t() : block_t(WHILE) {}
 
 switch_block_t::switch_block_t() : block_t(SWITCH) {}
 
-fake_block_t::fake_block_t() : block_t(FAKE) {}
-
 scope_block_t::scope_block_t(block_type_t type) : block_t(type) {
     assert(type == BEGIN || type == TOP || type == SUBST);
 }
diff --git a/src/parser.h b/src/parser.h
index 301665ac1..29d7f9452 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -40,11 +40,9 @@ enum block_type_t {
     WHILE,                    /// While loop block
     FOR,                      /// For loop block
     IF,                       /// If block
-    FUNCTION_DEF,             /// Function definition block
     FUNCTION_CALL,            /// Function invocation block
     FUNCTION_CALL_NO_SHADOW,  /// Function invocation block with no variable shadowing
     SWITCH,                   /// Switch block
-    FAKE,                     /// Fake block
     SUBST,                    /// Command substitution scope
     TOP,                      /// Outermost block
     BEGIN,                    /// Unconditional block