Correctly handle interpolants in url() strings

Author: xzyfer

src/constants.cpp

@@ -79,6 +79,7 @@ namespace Sass {
     extern const char only_kwd[]         = "only";
     extern const char rgb_kwd[]          = "rgb(";
     extern const char url_kwd[]          = "url(";
+    // extern const char url_prefix_kwd[]   = "url-prefix(";
     extern const char important_kwd[]    = "important";
     extern const char pseudo_not_kwd[]   = ":not(";
     extern const char even_kwd[]         = "even";

src/constants.hpp

@@ -80,6 +80,7 @@ namespace Sass {
     extern const char only_kwd[];
     extern const char rgb_kwd[];
     extern const char url_kwd[];
+    // extern const char url_prefix_kwd[];
     extern const char image_url_kwd[];
     extern const char important_kwd[];
     extern const char pseudo_not_kwd[];

src/parser.cpp

@@ -1405,7 +1405,7 @@ namespace Sass {
       }
       return string;
     }
-    else if (peek< real_uri_value >()) {
+    else if (peek< sequence< uri_prefix, W, real_uri_value > >()) {
       return parse_url_function_string();
     }
     else if (peek< re_functional >()) {
@@ -1790,8 +1790,28 @@ namespace Sass {
 
   String* Parser::parse_url_function_string()
   {
-    lex< real_uri_value >();
-    return SASS_MEMORY_NEW(ctx.mem, String_Constant, pstate, lexed);
+    const char* p = position;
+
+    lex< uri_prefix >();
+    std::string prefix = lexed;
+
+    lex< real_uri_value >(false);
+    std::string uri = lexed;
+
+    if (peek< exactly< hash_lbrace > >()) {
+      const char* pp = position;
+      // TODO: error checking for unclosed interpolants
+      while (peek< exactly< hash_lbrace > >(pp)) {
+        pp = sequence< interpolant, real_uri_value >(pp);
+      }
+      position = peek< real_uri_suffix >(pp);
+      return parse_interpolated_chunk(Token(p, position));
+    } else {
+      lex< real_uri_suffix >();
+      std::string res = prefix + Util::rtrim(uri) + lexed.to_string();
+      return SASS_MEMORY_NEW(ctx.mem, String_Constant, pstate, res);
+    }
+
   }
 
   Function_Call* Parser::parse_function_call()

src/prelexer.cpp

@@ -951,23 +951,31 @@ namespace Sass {
     }
 
 
+    // const char* real_uri_prefix(const char* src) {
+    //   return alternatives<
+    //     exactly< url_kwd >,
+    //     exactly< url_prefix_kwd >
+    //   >(src);
+    // }
+
+    const char* real_uri_suffix(const char* src) {
+      return sequence< W, exactly< ')' > >(src);
+    }
+
     const char* real_uri_value(const char* src) {
       return
       sequence<
-        exactly< url_kwd >,
-        W,
-        zero_plus< alternatives<
-          class_char< real_uri_chars >,
-          uri_character,
-          NONASCII,
-          ESCAPE
-        > >,
-        alternatives<
-          sequence<
-            W,
-            exactly< ')' >
+        non_greedy<
+          alternatives<
+            class_char< real_uri_chars >,
+            uri_character,
+            NONASCII,
+            ESCAPE
           >,
-          exactly< hash_lbrace >
+          alternatives<
+            real_uri_suffix,
+            exactly< hash_lbrace >
+          >
         >
       >
       (src);

src/prelexer.hpp

@@ -347,6 +347,8 @@ namespace Sass {
     const char* UUNICODE(const char* src);
     const char* NONASCII(const char* src);
     const char* ESCAPE(const char* src);
+    const char* real_uri_suffix(const char* src);
+    // const char* real_uri_prefix(const char* src);
     const char* real_uri_value(const char* src);
 
     // Path matching functions.

src/util.cpp

@@ -529,6 +529,15 @@ namespace Sass {
   namespace Util {
     using std::string;
 
+    std::string rtrim(const std::string &str) {
+      std::string trimmed = str;
+      size_t pos_ws = trimmed.find_last_not_of(" \t\n\v\f\r");
+      if (pos_ws != std::string::npos)
+      { trimmed.erase(pos_ws + 1); }
+      else { trimmed.clear(); }
+      return trimmed;
+    }
+
     std::string normalize_underscores(const std::string& str) {
       std::string normalized = str;
       for(size_t i = 0, L = normalized.length(); i < L; ++i) {

src/util.hpp

@@ -36,6 +36,8 @@ namespace Sass {
 
   namespace Util {
 
+    std::string rtrim(const std::string& str);
+
     std::string normalize_underscores(const std::string& str);
     std::string normalize_decimals(const std::string& str);
     std::string normalize_sixtuplet(const std::string& col);