Merge pull request #1118 from mgreter/bugfix/issue_1115

Fix interpolation edge cases with escapes

Author: mgreter

debugger.hpp

@@ -344,7 +344,8 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [name: " << block->name() << "] ";
     cerr << " [type: " << (block->type() == Sass::Definition::Type::MIXIN ? "Mixin " : "Function ") << "] ";
-    cerr << " [signature: " << block->signature() << "] ";
+    // this seems to lead to segfaults some times?
+    // cerr << " [signature: " << block->signature() << "] ";
     cerr << " [native: " << block->native_function() << "] ";
     cerr << " " << block->tabs() << endl;
     debug_ast(block->parameters(), ind + " params: ", env);

eval.cpp

@@ -882,6 +882,9 @@ namespace Sass {
   {
     string acc;
     for (size_t i = 0, L = s->length(); i < L; ++i) {
+      if (String_Quoted* str_quoted = dynamic_cast<String_Quoted*>((*s)[i])) {
+        if (!str_quoted->is_delayed()) str_quoted->value(string_eval_escapes(str_quoted->value()));
+      }
       acc += interpolation((*s)[i]);
     }
     String_Quoted* str = new (ctx.mem) String_Quoted(s->pstate(), acc);

parser.cpp

@@ -1619,8 +1619,9 @@ namespace Sass {
   {
     lex< identifier >();
     string name(lexed);
+    ParserState call_pos = pstate;
     Arguments* args = parse_arguments(name == "url");
-    return new (ctx.mem) Function_Call(pstate, name, args);
+    return new (ctx.mem) Function_Call(call_pos, name, args);
   }
 
   Function_Call_Schema* Parser::parse_function_call_schema()

util.cpp

@@ -44,6 +44,59 @@ namespace Sass {
     return atof(str);
   }
 
+  string string_eval_escapes(const string& s)
+  {
+
+    string out("");
+    bool esc = false;
+    for (size_t i = 0, L = s.length(); i < L; ++i) {
+      if(s[i] == '\\' && esc == false) {
+        esc = true;
+
+        // escape length
+        size_t len = 1;
+
+        // parse as many sequence chars as possible
+        // ToDo: Check if ruby aborts after possible max
+        while (i + len < L && s[i + len] && isxdigit(s[i + len])) ++ len;
+
+        // hex string?
+        if (len > 1) {
+
+          // convert the extracted hex string to code point value
+          // ToDo: Maybe we could do this without creating a substring
+          uint32_t cp = strtol(s.substr (i + 1, len - 1).c_str(), nullptr, 16);
+
+          if (cp == 0) cp = 0xFFFD;
+
+          // assert invalid code points
+          if (cp >= 1) {
+
+            // use a very simple approach to convert via utf8 lib
+            // maybe there is a more elegant way; maybe we shoud
+            // convert the whole output from string to a stream!?
+            // allocate memory for utf8 char and convert to utf8
+            unsigned char u[5] = {0,0,0,0,0}; utf8::append(cp, u);
+            for(size_t m = 0; u[m] && m < 5; m++) out.push_back(u[m]);
+
+            // skip some more chars?
+            i += len - 1; esc = false;
+            if (cp == 10) out += ' ';
+
+          }
+
+        }
+
+      }
+      else {
+        out += s[i];
+        esc = false;
+      }
+    }
+    return out;
+
+  }
+
   // double escape every escape sequences
   // escape unescaped quotes and backslashes
   string string_escape(const string& str)

util.hpp

@@ -12,6 +12,7 @@ namespace Sass {
   double sass_atof(const char* str);
   string string_escape(const string& str);
   string string_unescape(const string& str);
+  string string_eval_escapes(const string& str);
   string read_css_string(const string& str);
   string evacuate_quotes(const string& str);
   string evacuate_escapes(const string& str);