Trying a new expansion/evaluation process. Will hopefully fix some more little bugs.

document_parser.cpp

@@ -598,7 +598,7 @@ namespace Sass {
         semicolon = true;
       }
       else if (lex< extend >()) {
-        if (surrounding_ruleset.is_null_ptr()) throw_syntax_error("@extend directive may only be used within rules");
+        if (surrounding_ruleset.is_null()) throw_syntax_error("@extend directive may only be used within rules");
         Node extendee(parse_simple_selector_sequence());
         context.extensions.insert(pair<Node, Node>(extendee, surrounding_ruleset));
         context.has_extensions = true;

eval_apply.hpp

@@ -12,7 +12,8 @@
 
 namespace Sass {
   using std::map;
-  
+
+  void expand(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx, bool function_name = false);
   Node eval(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx, bool function_name = false);
   Node function_eval(string name, Node stm, Environment& bindings, Node_Factory& new_Node, Context& ctx, bool toplevel = false);
   Node reduce(Node list, size_t head, Node acc, Node_Factory& new_Node);

node.cpp

@@ -20,6 +20,7 @@ namespace Sass {
       case block:
       case expansion:
       case root:
+      case if_directive:
       case for_through_directive:
       case for_to_directive:
       case each_directive:
@@ -35,6 +36,7 @@ namespace Sass {
       {
         case expansion:
         case block:
+        case if_directive:
         case for_through_directive:
         case for_to_directive:
         case each_directive:

node.hpp

@@ -177,8 +177,8 @@ namespace Sass {
     Node(Node_Impl* ip = 0);
 
     Type type() const;
+    Type type(Type);
 
-    bool is_none() const;
     bool has_children() const;
     bool has_statements() const;
     bool has_blocks() const;
@@ -204,6 +204,7 @@ namespace Sass {
     Node& back() const;
     Node& operator[](size_t i) const;
     void  pop_back();
+    void  pop_all();
     Node& push_back(Node n);
     Node& push_front(Node n);
     Node& operator<<(Node n);
@@ -220,7 +221,7 @@ namespace Sass {
     Token  token() const;
     Token  unit() const;
 
-    bool is_null_ptr() const { return !ip_; }
+    bool is_null() const { return !ip_; }
     bool is(Node n) const { return ip_ == n.ip_; }
 
     void flatten();
@@ -413,6 +414,9 @@ namespace Sass {
     void pop_back()
     { children.pop_back(); }
 
+    void pop_all()
+    { for (size_t i = 0, S = size(); i < S; ++i) pop_back(); }
+
     bool& boolean_value()
     { return value.boolean; }
     
@@ -430,8 +434,8 @@ namespace Sass {
   inline Node::Node(Node_Impl* ip) : ip_(ip) { }
 
   inline Node::Type Node::type() const    { return ip_->type; }
+  inline Node::Type Node::type(Type t)    { return ip_->type = t; }
 
-  inline bool Node::is_none() const        { return !ip_; }
   inline bool Node::has_children() const   { return ip_->has_children; }
   inline bool Node::has_statements() const { return ip_->has_statements; }
   inline bool Node::has_blocks() const     { return ip_->has_blocks; }
@@ -457,6 +461,7 @@ namespace Sass {
   inline Node& Node::back() const               { return ip_->back(); }
   inline Node& Node::operator[](size_t i) const { return at(i); }
   inline void  Node::pop_back()                 { ip_->pop_back(); }
+  inline void  Node::pop_all()                  { ip_->pop_all(); }
   inline Node& Node::push_back(Node n)
   {
     ip_->push_back(n);

sass_interface.cpp

@@ -41,12 +41,12 @@ extern "C" {
   {
     using namespace Sass;
     doc.parse_scss();
-    eval(doc.root,
-         doc.context.new_Node(Node::none, doc.path, doc.line, 0),
-         doc.context.global_env,
-         doc.context.function_env,
-         doc.context.new_Node,
-         doc.context);
+    expand(doc.root,
+           doc.context.new_Node(Node::none, doc.path, doc.line, 0),
+           doc.context.global_env,
+           doc.context.function_env,
+           doc.context.new_Node,
+           doc.context);
     extend_selectors(doc.context.pending_extensions, doc.context.extensions, doc.context.new_Node);
     string output(doc.emit_css(static_cast<Document::CSS_Style>(style)));
     char* c_output = (char*) malloc(output.size() + 1);