Commit 8354bde2 by Aaron Leung

Undoing some experimental stuff.

parent edead4ca
...@@ -647,12 +647,12 @@ namespace Sass { ...@@ -647,12 +647,12 @@ namespace Sass {
// Resolve selector extensions. // Resolve selector extensions.
void extend_selectors(vector<pair<Node, Node> >& pending, multimap<Node, Node> extensions, Node_Factory& new_Node) void extend_selectors(vector<pair<Node, Node> >& pending, Node_Factory& new_Node)
{ {
for (size_t i = 0, S = pending.size(); i < S; ++i) { for (size_t i = 0, S = pending.size(); i < S; ++i) {
Node extender(pending[i].second[2]); Node extender(pending[i].second[2]);
Node ruleset_to_extend(pending[i].first); Node ruleset_to_extend(pending[i].first);
Node selectors_to_extend(ruleset_to_extend[2]); Node selector_to_extend(ruleset_to_extend[2]);
// if (selectors_to_extend.type() != Node::selector_group) { // if (selectors_to_extend.type() != Node::selector_group) {
// Node ext(generate_extension(selectors_to_extend, extender, new_Node)); // Node ext(generate_extension(selectors_to_extend, extender, new_Node));
...@@ -793,7 +793,7 @@ namespace Sass { ...@@ -793,7 +793,7 @@ namespace Sass {
} break; } break;
} }
} }
return pair<Node, Node>(Node(), Node()); return Node();
} }
// Helpers for extracting subsets of selectors // Helpers for extracting subsets of selectors
......
...@@ -20,7 +20,7 @@ namespace Sass { ...@@ -20,7 +20,7 @@ namespace Sass {
Node expand_selector(Node sel, Node pre, Node_Factory& new_Node); Node expand_selector(Node sel, Node pre, Node_Factory& new_Node);
Node expand_backref(Node sel, Node pre); Node expand_backref(Node sel, Node pre);
void extend_selectors(vector<pair<Node, Node> >&, Node_Factory&); void extend_selectors(vector<pair<Node, Node> >&, Node_Factory&);
pair<Node, Node> generate_extension(Node extendee, Node extender, Node_Factory& new_Node); Node generate_extension(Node extendee, Node extender, Node_Factory& new_Node);
Node selector_prefix(Node sel, Node_Factory& new_Node); Node selector_prefix(Node sel, Node_Factory& new_Node);
Node selector_base(Node sel); Node selector_base(Node sel);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment