Change If class to inherit from Has_Block

Author: mgreter

ast.hpp

@@ -578,13 +578,12 @@ namespace Sass {
   ////////////////////////////////////
   // The Sass `@if` control directive.
   ////////////////////////////////////
-  class If : public Statement {
+  class If : public Has_Block {
     ADD_PROPERTY(Expression*, predicate)
-    ADD_PROPERTY(Block*, consequent)
     ADD_PROPERTY(Block*, alternative)
   public:
     If(ParserState pstate, Expression* pred, Block* con, Block* alt = 0)
-    : Statement(pstate), predicate_(pred), consequent_(con), alternative_(alt)
+    : Has_Block(pstate, con), predicate_(pred), alternative_(alt)
     { }
     ATTACH_OPERATIONS()
   };

debugger.hpp

@@ -283,7 +283,7 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " " << block->tabs() << endl;
     debug_ast(block->predicate(), ind + " = ");
-    debug_ast(block->consequent(), ind + " <>");
+    debug_ast(block->block(), ind + " <>");
     debug_ast(block->alternative(), ind + " ><");
   } else if (dynamic_cast<Return*>(node)) {
     Return* block = dynamic_cast<Return*>(node);

eval.cpp

@@ -142,7 +142,7 @@ namespace Sass {
     Env env(exp.environment());
     exp.env_stack.push_back(&env);
     if (*i->predicate()->perform(this)) {
-      rv = i->consequent()->perform(this);
+      rv = i->block()->perform(this);
     }
     else {
       Block* alt = i->alternative();

functions.cpp

@@ -1584,8 +1584,6 @@ namespace Sass {
         if (inspect.empty() && parentheses) inspect = "()";
         ctx.output_style = old_style;
         return new (ctx.mem) String_Quoted(pstate, inspect);
-
-
       }
       // return v;
     }

inspect.cpp

@@ -242,7 +242,7 @@ namespace Sass {
     append_token("@if", cond);
     append_mandatory_space();
     cond->predicate()->perform(this);
-    cond->consequent()->perform(this);
+    cond->block()->perform(this);
     if (cond->alternative()) {
       append_optional_linefeed();
       append_indentation();

parser.cpp

@@ -1753,7 +1753,7 @@ namespace Sass {
     ParserState if_source_position = pstate;
     Expression* predicate = parse_list();
     predicate->is_delayed(false);
-    Block* consequent = parse_block();
+    Block* block = parse_block();
     Block* alternative = 0;
 
     if (lex< elseif_directive >()) {
@@ -1763,7 +1763,7 @@ namespace Sass {
     else if (lex< kwd_else_directive >()) {
       alternative = parse_block();
     }
-    return new (ctx.mem) If(if_source_position, predicate, consequent, alternative);
+    return new (ctx.mem) If(if_source_position, predicate, block, alternative);
   }
 
   For* Parser::parse_for_directive()