Merge pull request #1003 from mgreter/bugfix/issue_978

Bugfix in interpolation and quote functions

Author: mgreter

debugger.hpp

@@ -54,6 +54,12 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
 //    Expression* expression = dynamic_cast<Expression*>(node);
 //    cerr << ind << "Expression " << expression << " " << expression->concrete_type() << endl;
 
+  } else if (dynamic_cast<Parent_Selector*>(node)) {
+    Parent_Selector* selector = dynamic_cast<Parent_Selector*>(node);
+    cerr << ind << "Parent_Selector " << selector;
+    cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">" << endl;
+    debug_ast(selector->selector(), ind + "->", env);
+
   } else if (dynamic_cast<Complex_Selector*>(node)) {
     Complex_Selector* selector = dynamic_cast<Complex_Selector*>(node);
     cerr << ind << "Complex_Selector " << selector

eval.cpp

@@ -814,6 +814,9 @@ namespace Sass {
     } else if (Parent_Selector* var = dynamic_cast<Parent_Selector*>(s)) {
       Expression* ex = var->perform(this);
       return evacuate_quotes(interpolation(ex));
+    } else if (Selector* var = dynamic_cast<Selector*>(s)) {
+      Expression* ex = var->perform(this);
+      return evacuate_quotes(interpolation(ex));
     } else {
       To_String to_string(&ctx);
       // to_string.in_decl_list = true;

output.cpp

@@ -379,7 +379,7 @@ namespace Sass {
   void Output::operator()(String_Quoted* s)
   {
     if (s->quote_mark()) {
-      append_token(quote((s->value()), s->quote_mark()), s);
+      append_token(quote(s->value(), s->quote_mark()), s);
     } else if (!in_comment) {
       append_token(string_to_output(s->value()), s);
     } else {

util.cpp

@@ -349,12 +349,12 @@ namespace Sass {
   string quote(const string& s, char q)
   {
 
-    // return an empty quoted string
-    if (s.empty()) return string(2, q ? q : '"');
-
     // autodetect with fallback to given quote
     q = detect_best_quotemark(s.c_str(), q);
 
+    // return an empty quoted string
+    if (s.empty()) return string(2, q ? q : '"');
+
     string quoted;
     quoted.reserve(s.length()+2);
     quoted.push_back(q);