Merge pull request #1466 from mgreter/bugfix/url-keyword

Enable url parsing for `url-prefix` keyword

Author: xzyfer

src/ast.hpp

@@ -1337,7 +1337,7 @@ namespace Sass {
   public:
     String_Schema(ParserState pstate, size_t size = 0, bool has_interpolants = false)
     : String(pstate), Vectorized<Expression*>(size), has_interpolants_(has_interpolants), hash_(0)
-    { }
+    { concrete_type(STRING); }
     std::string type() { return "string"; }
     static std::string type_name() { return "string"; }
 

src/functions.cpp

@@ -1447,11 +1447,7 @@ namespace Sass {
     BUILT_IN(type_of)
     {
       Expression* v = ARG("$value", Expression);
-      if (v->concrete_type() == Expression::STRING) {
-        To_String to_string(&ctx);
-        std::string str(v->perform(&to_string));
-      }
-      return new (ctx.mem) String_Quoted(pstate, ARG("$value", Expression)->type());
+      return new (ctx.mem) String_Quoted(pstate, v->type());
     }
 
     Signature unit_sig = "unit($number)";

src/parser.cpp

@@ -1731,7 +1731,8 @@ namespace Sass {
     std::string name(lexed);
 
     ParserState call_pos = pstate;
-    Arguments* args = parse_arguments(name == "url");
+    bool expect_url = name == "url" || name == "url-prefix";
+    Arguments* args = parse_arguments(expect_url);
     return new (ctx.mem) Function_Call(call_pos, name, args);
   }