Base `status -b` off the parser execution stack

Instead of globally marking the state as "in block" when evaluating
blocks/functions, update the "in block" status when pushing/popping
blocks on the parser stack.

Fixes #1729.

On a side note, `status -b` is actually pretty useless, because it
always returns 0 inside of a function (even without this patch).

1 files changed, 19 insertions, 0 deletions

diff --git a/parser.cpp b/parser.cpp
index 3740f1fb..be7e494a 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -278,6 +278,12 @@ void parser_t::push_block(block_t *new_current)
 
     this->block_stack.push_back(new_current);
 
+    // Types TOP and SUBST are not considered blocks for the purposes of `status -b`
+    if (type != TOP && type != SUBST)
+    {
+        is_block = 1;
+    }
+
     if ((new_current->type() != FUNCTION_DEF) &&
             (new_current->type() != FAKE) &&
             (new_current->type() != TOP))
@@ -305,6 +311,19 @@ void parser_t::pop_block()
         env_pop();
 
     delete old;
+
+    // Figure out if `status -b` should consider us to be in a block now
+    int new_is_block=0;
+    for (std::vector<block_t*>::const_iterator it = block_stack.begin(), end = block_stack.end(); it != end; ++it)
+    {
+        const enum block_type_t type = (*it)->type();
+        if (type != TOP && type != SUBST)
+        {
+            new_is_block = 1;
+            break;
+        }
+    }
+    is_block = new_is_block;
 }
 
 void parser_t::pop_block(const block_t *expected)