Merge pull request #1136 from xzyfer/fix/property-strings

Misc fixes for string handling regressions

Author: xzyfer

debugger.hpp

@@ -489,6 +489,7 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << " [" << prettyprint(expression->value()) << "]" <<
       (expression->is_delayed() ? " {delayed}" : "") <<
       (expression->sass_fix_1291() ? " {sass_fix_1291}" : "") <<
+      (expression->quote_mark() != 0 ? " {qm:" + string(1, expression->quote_mark()) + "}" : "") <<
       " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
   } else if (dynamic_cast<String_Schema*>(node)) {
     String_Schema* expression = dynamic_cast<String_Schema*>(node);

eval.cpp

@@ -700,7 +700,11 @@ namespace Sass {
       if (auto str = dynamic_cast<String_Quoted*>(value)) {
         value = new (ctx.mem) String_Quoted(*str);
       } else if (auto str = dynamic_cast<String_Constant*>(value)) {
-        value = new (ctx.mem) String_Constant(*str);
+        if (str->quote_mark()) {
+          value = new (ctx.mem) String_Quoted(str->pstate(), str->perform(&to_string));
+        } else {
+          value = new (ctx.mem) String_Constant(str->pstate(), unquote(str->value()));
+        }
       }
     }
     else if (value->concrete_type() == Expression::LIST) {
@@ -812,12 +816,18 @@ namespace Sass {
   string Eval::interpolation(Expression* s) {
     if (String_Quoted* str_quoted = dynamic_cast<String_Quoted*>(s)) {
       if (str_quoted->quote_mark()) {
-        return string_escape(str_quoted->value());
+        if (str_quoted->quote_mark() == '*' || str_quoted->is_delayed()) {
+          return interpolation(new (ctx.mem) String_Constant(*str_quoted));
+        } else {
+          return string_escape(quote(str_quoted->value(), str_quoted->quote_mark()));
+        }
       } else {
         return evacuate_escapes(str_quoted->value());
       }
     } else if (String_Constant* str_constant = dynamic_cast<String_Constant*>(s)) {
-      return evacuate_escapes(str_constant->value());
+      string str = str_constant->value();
+      if (!str_constant->quote_mark()) str = unquote(str);
+      return evacuate_escapes(str);
     } else if (String_Schema* str_schema = dynamic_cast<String_Schema*>(s)) {
       string res = "";
       for(auto i : str_schema->elements())

functions.cpp

@@ -771,7 +771,7 @@ namespace Sass {
         return result;
       }
       To_String to_string(&ctx);
-      return new (ctx.mem) String_Constant(pstate, string(arg->perform(&to_string)));
+      return new (ctx.mem) String_Constant(pstate, unquote(string(arg->perform(&to_string))));
     }
 
     Signature quote_sig = "quote($string)";

parser.cpp

@@ -1415,6 +1415,7 @@ namespace Sass {
     Token str(lexed);
     const char* i = str.begin;
     // see if there any interpolants
+    const char* q;
     const char* p = find_first_in_interval< exactly<hash_lbrace> >(str.begin, str.end);
     if (!p) {
       String_Constant* str_node = new (ctx.mem) String_Constant(pstate, normalize_wspace(string(str.begin, str.end)));
@@ -1424,8 +1425,16 @@ namespace Sass {
 
     String_Schema* schema = new (ctx.mem) String_Schema(pstate);
     while (i < str.end) {
+      q = find_first_in_interval< alternatives< exactly<'"'>, exactly<'\''> > >(i, str.end);
       p = find_first_in_interval< exactly<hash_lbrace> >(i, str.end);
-      if (p) {
+      if (q && (!p || p > q)) {
+        if (i < q) {
+          (*schema) << new (ctx.mem) String_Constant(pstate, string(i, q)); // accumulate the preceding segment if it's nonempty
+        }
+        (*schema) << new (ctx.mem) String_Constant(pstate, string(q, q+1)); // capture the quote mark separately
+        i = q+1;
+      }
+      else if (p) {
         if (i < p) {
           (*schema) << new (ctx.mem) String_Constant(pstate, string(i, p)); // accumulate the preceding segment if it's nonempty
         }
@@ -1499,7 +1508,7 @@ namespace Sass {
         (*schema) << new (ctx.mem) Textual(pstate, Textual::HEX, unquote(lexed));
       }
       else if (lex< quoted_string >()) {
-        (*schema) << new (ctx.mem) String_Constant(pstate, lexed);
+        (*schema) << new (ctx.mem) String_Quoted(pstate, lexed);
       }
       else if (lex< variable >()) {
         (*schema) << new (ctx.mem) Variable(pstate, Util::normalize_underscores(lexed));

util.cpp

@@ -330,12 +330,12 @@ namespace Sass {
       }
       // check for unexpected delimiter
       // be strict and throw error back
-      else if (!skipped && q == s[i]) {
-        // don't be that strict
-        return s;
-        // this basically always means an internal error and not users fault
-        error("Unescaped delimiter in string to unquote found. [" + s + "]", ParserState("[UNQUOTE]"));
-      }
+      // else if (!skipped && q == s[i]) {
+      //   // don't be that strict
+      //   return s;
+      //   // this basically always means an internal error and not users fault
+      //   error("Unescaped delimiter in string to unquote found. [" + s + "]", ParserState("[UNQUOTE]"));
+      // }
       else {
         skipped = false;
         unq.push_back(s[i]);