More inheritance functionality.

Aaron Leung · Aaron Leung · commit 46fd6b347bba · 2012-05-29T13:33:30.000-07:00
diff --git a/eval_apply.cpp b/eval_apply.cpp
@@ -603,22 +603,75 @@ namespace Sass {
       Node extender(pending[i].second[2]);
       Node ruleset_to_extend(pending[i].first);
       Node selector_to_extend(ruleset_to_extend[2]);
-      if (extender.type() == Node::simple_selector) {
-        cerr << "EXTENDING " << selector_to_extend.to_string() << " WITH " << extender.to_string() << endl;
-        if (selector_to_extend.type() == Node::selector_group) {
-          selector_to_extend << extender;
-        }
-        else {
-          Node new_group(new_Node(Node::selector_group, selector_to_extend.path(), selector_to_extend.line(), 2));
-          new_group << selector_to_extend << extender;
-          ruleset_to_extend[2] = new_group;
-        }
-      }
-      else {
+      switch (extender.type())
+      {
+        case Node::simple_selector:
+        case Node::simple_selector_sequence:
+        case Node::selector: {
+          cerr << "EXTENDING " << selector_to_extend.to_string() << " WITH " << extender.to_string() << endl;
+          if (selector_to_extend.type() == Node::selector_group) {
+            selector_to_extend << extender;
+          }
+          else {
+            Node new_group(new_Node(Node::selector_group, selector_to_extend.path(), selector_to_extend.line(), 2));
+            new_group << selector_to_extend << extender;
+            ruleset_to_extend[2] = new_group;
+          }
+        } break;
+
+        // case Node::selector: {
+        //   cerr << "EXTENDING " << selector_to_extend.to_string() << " WITH " << extender.to_string() << endl;
+        //   if (selector_to_extend.type() == Node::selector_group) {
+        //     selector_to_extend << selector_base(extender);
+        //   }
+        //   else {
+        //     Node new_group(new_Node(Node::selector_group, selector_to_extend.path(), selector_to_extend.line(), 2));
+        //     new_group << selector_to_extend << selector_base(extender);
+        //     ruleset_to_extend[2] = new_group; 
+        //   }
+        // } break;
+
+        default: {
         // handle the other cases later
+        }
       }
     }
+  }
+
+  // Helper for extracting the prefix/context of a selector.
 
+  Node selector_prefix(Node sel, Node_Factory& new_Node)
+  {
+    switch (sel.type())
+    {
+      case Node::selector: {
+        Node pre(new_Node(Node::selector, sel.path(), sel.line(), sel.size() - 1));
+        for (size_t i = 0, S = sel.size() - 1; i < S; ++i) {
+          pre << sel[i];
+        }
+        return pre;
+      } break;
+
+      default: {
+        return new_Node(Node::selector, sel.path(), sel.line(), 0);
+      } break;
+    }
+  }
+
+  // Helper for extracting the base (i.e., rightmost component) of a selector.
+
+  Node selector_base(Node sel)
+  {
+    switch (sel.type())
+    {
+      case Node::selector: {
+        return sel.back();
+      } break;
+
+      default: {
+        return sel;
+      } break;
+    }
   }
 
 }
diff --git a/eval_apply.hpp b/eval_apply.hpp
@@ -20,4 +20,6 @@ namespace Sass {
   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&);
+  Node selector_prefix(Node sel, Node_Factory& new_Node);
+  Node selector_base(Node sel);
 }
diff --git a/node.hpp b/node.hpp
@@ -325,14 +325,14 @@ namespace Sass {
   inline bool Node::has_expansions() const { return ip_->has_expansions; }
   inline bool Node::has_backref() const    { return ip_->has_backref; }
   inline bool Node::from_variable() const  { return ip_->from_variable; }
-  inline bool& Node::should_eval() const    { return ip_->should_eval; }
-  inline bool& Node::is_unquoted() const    { return ip_->is_unquoted; }
+  inline bool& Node::should_eval() const   { return ip_->should_eval; }
+  inline bool& Node::is_unquoted() const   { return ip_->is_unquoted; }
   inline bool Node::is_numeric() const     { return ip_->is_numeric(); }
   
-  inline string& Node::path() const        { return ip_->path; }
-  inline size_t  Node::line() const { return ip_->line; }
-  inline size_t  Node::size() const        { return ip_->size(); }
-  inline bool    Node::empty() const       { return ip_->empty(); }
+  inline string& Node::path() const  { return ip_->path; }
+  inline size_t  Node::line() const  { return ip_->line; }
+  inline size_t  Node::size() const  { return ip_->size(); }
+  inline bool    Node::empty() const { return ip_->empty(); }
   
   inline Node& Node::at(size_t i) const         { return ip_->at(i); }
   inline Node& Node::back() const               { return ip_->back(); }
@@ -366,7 +366,7 @@ namespace Sass {
 
   inline bool   Node::boolean_value() const { return ip_->boolean_value(); }
   inline double Node::numeric_value() const { return ip_->numeric_value(); }
-  inline Token   Node::token() const        { return ip_->value.token; }
-  inline Token   Node::unit() const         { return ip_->unit(); }
+  inline Token  Node::token() const         { return ip_->value.token; }
+  inline Token  Node::unit() const          { return ip_->unit(); }
 
 }
diff --git a/sass_interface.cpp b/sass_interface.cpp
@@ -47,10 +47,6 @@ extern "C" {
          doc.context);
     extend_selectors(doc.context.pending_extensions, doc.context.new_Node);
     string output(doc.emit_css(static_cast<Document::CSS_Style>(style)));
-    for (size_t i = 0; i < doc.context.pending_extensions.size(); ++i) {
-      cerr << "EXTENDING " << doc.context.pending_extensions[i].first[2].to_string()
-           << " WITH " << doc.context.pending_extensions[i].second[2].to_string() << endl;
-    }
     char* c_output = (char*) malloc(output.size() + 1);
     strcpy(c_output, output.c_str());
     return c_output;

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,6 @@ namespace Sass {`
`20`	`20`	`Node expand_selector(Node sel, Node pre, Node_Factory& new_Node);`
`21`	`21`	`Node expand_backref(Node sel, Node pre);`
`22`	`22`	`void extend_selectors(vector<pair<Node, Node> >&, Node_Factory&);`
	`23`	`+ Node selector_prefix(Node sel, Node_Factory& new_Node);`
	`24`	`+ Node selector_base(Node sel);`
`23`	`25`	`}`