Merge pull request #779 from mgreter/fix/string-in-interpolates

Fix String_Const unquoting in interpolates
sass · Dec 27, 2014 · 5483186 · 5483186
2 parents aaf7db7 + d349d81
commit 5483186
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/inspect.cpp b/inspect.cpp
@@ -698,7 +698,7 @@ namespace Sass {
     t.reserve(s.length()-2);
     for (size_t i = 1, L = s.length()-1; i < L; ++i) {
       // if we see a quote, we need to remove the preceding backslash from t
-      if (s[i] == q) t.erase(t.length()-1);
+      if (s[i-1] == '\\' && s[i] == q) t.erase(t.length()-1);
       t.push_back(s[i]);
     }
     return t;

diff --git a/parser.cpp b/parser.cpp
@@ -35,6 +35,7 @@ namespace Sass {
     p.source   = t.begin;
     p.position = p.source;
     p.end      = t.end;
+    p.dequote  = true;
     return p;
   }
 
@@ -1209,7 +1210,7 @@ namespace Sass {
     // see if there any interpolants
     const char* p = find_first_in_interval< sequence< negate< exactly<'\\'> >, exactly<hash_lbrace> > >(chunk.begin, chunk.end);
     if (!p) {
-      String_Constant* str_node = new (ctx.mem) String_Constant(path, source_position, chunk);
+      String_Constant* str_node = new (ctx.mem) String_Constant(path, source_position, chunk, dequote);
       str_node->is_delayed(true);
       return str_node;
     }

diff --git a/parser.hpp b/parser.hpp
@@ -55,11 +55,12 @@ namespace Sass {
 
 
     Token lexed;
+    bool dequote;
 
     Parser(Context& ctx, string path, Position source_position)
     : ctx(ctx), stack(vector<Syntactic_Context>()),
       source(0), position(0), end(0), path(path), column(1), source_position(source_position)
-    { stack.push_back(nothing); }
+    { dequote = false; stack.push_back(nothing); }
 
     static Parser from_string(string src, Context& ctx, string path = "", Position source_position = Position());
     static Parser from_c_str(const char* src, Context& ctx, string path = "", Position source_position = Position());