aboutsummaryrefslogtreecommitdiffhomepage
path: root/parser.h
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-09-01 12:29:00 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-09-01 12:29:00 -0700
commitff124465fdfe39096ad14226a6c8aaa08d17bc7f (patch)
tree54ed0d09a3b7b5cc4da6b112500037a3c2b4243e /parser.h
parentde5223db66ba36001020f7b3c2acda4303b927b3 (diff)
Clean up some warnings and some unused if-related code
Diffstat (limited to 'parser.h')
-rw-r--r--parser.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/parser.h b/parser.h
index 31f08b7b..de59a0d1 100644
--- a/parser.h
+++ b/parser.h
@@ -140,19 +140,11 @@ struct block_t
struct if_block_t : public block_t
{
- bool if_expr_evaluated; // whether the clause of the if statement has been tested
+ bool if_expr_evaluated; // whether we've evaluated the if expression
+ bool is_elseif_entry; // whether we're at the beginning of an active branch (IF or ELSEIF)
bool any_branch_taken; // whether the clause of the if statement or any elseif has been found to be true
- bool is_elseif_entry; // whether we're the first command in an elseif.
bool else_evaluated; // whether we've encountered a terminal else block
- enum {
- if_state_if,
- if_state_elseif,
- if_state_else
- } if_state;
-
- bool has_reached_else() const { return if_state == if_state_else; }
-
if_block_t();
};