Commit 7a238d10 by Aaron Leung

Couple of fixes.

parent 2e2d97a8
...@@ -107,8 +107,8 @@ namespace Sass { ...@@ -107,8 +107,8 @@ namespace Sass {
// } // }
// expand the body with the newly expanded selector as the prefix // expand the body with the newly expanded selector as the prefix
cerr << "ORIGINAL SELECTOR:\t" << expr[2].to_string() << endl; // cerr << "ORIGINAL SELECTOR:\t" << expr[2].to_string() << endl;
cerr << "NORMALIZED SELECTOR:\t" << normalize_selector(expr[2], new_Node).to_string() << endl << endl; // cerr << "NORMALIZED SELECTOR:\t" << normalize_selector(expr[2], new_Node).to_string() << endl << endl;
expand(expr[1], expr.back(), env, f_env, new_Node, ctx); expand(expr[1], expr.back(), env, f_env, new_Node, ctx);
} break; } break;
......
...@@ -61,7 +61,6 @@ namespace Sass { ...@@ -61,7 +61,6 @@ namespace Sass {
string Node::unquote() const string Node::unquote() const
{ {
Type t = type();
switch (type()) switch (type())
{ {
case string_constant: case string_constant:
...@@ -196,7 +195,8 @@ namespace Sass { ...@@ -196,7 +195,8 @@ namespace Sass {
} }
// comparing identifiers and strings (treat them as comparable) // comparing identifiers and strings (treat them as comparable)
else if (is_string() && rhs.is_string()) { else if ((is_string() && rhs.is_string()) ||
(lhs_type == value && rhs_type == value)) {
return unquote() < rhs.unquote(); return unquote() < rhs.unquote();
} }
...@@ -225,7 +225,7 @@ namespace Sass { ...@@ -225,7 +225,7 @@ namespace Sass {
case simple_selector_sequence: case simple_selector_sequence:
case attribute_selector: case attribute_selector:
case functional_pseudo: case functional_pseudo:
case pseudo_not: { case pseudo_negation: {
return lexicographical_compare(begin(), end(), rhs.begin(), rhs.end()); return lexicographical_compare(begin(), end(), rhs.begin(), rhs.end());
} break; } break;
......
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