Working on more inheritance stuff.

eval_apply.hpp

@@ -20,7 +20,7 @@ namespace Sass {
   Node apply_function(const Function& f, const Node args, Node prefix, Environment& env, map<pair<string, size_t>, Function>& f_env, Node_Factory& new_Node, Context& ctx);
   Node expand_selector(Node sel, Node pre, Node_Factory& new_Node);
   Node expand_backref(Node sel, Node pre);
-  void extend_selectors(vector<pair<Node, Node> >&, Node_Factory&);
+  void extend_selectors(vector<pair<Node, Node> >&, multimap<Node, Node>&, Node_Factory&);
   Node generate_extension(Node extendee, Node extender, Node_Factory& new_Node);
 
   Node selector_prefix(Node sel, Node_Factory& new_Node);

node.hpp

@@ -204,7 +204,8 @@ namespace Sass {
     Token  token() const;
     Token  unit() const;
 
-    bool is_null_ptr() const;
+    bool is_null_ptr() const { return !ip_; }
+    bool is(Node n) const { return ip_ == n.ip_; }
 
     void flatten();
     
@@ -407,6 +408,4 @@ namespace Sass {
   inline Token  Node::token() const         { return ip_->value.token; }
   inline Token  Node::unit() const          { return ip_->unit(); }
 
-  inline bool Node::is_null_ptr() const { return !ip_; }
-
 }

sass_interface.cpp

@@ -45,7 +45,7 @@ extern "C" {
          doc.context.function_env,
          doc.context.new_Node,
          doc.context);
-    extend_selectors(doc.context.pending_extensions, doc.context.new_Node);
+    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);
     strcpy(c_output, output.c_str());