Fix url parsing with trailing spaces in url

Re-factoring in lexer to make args more consistent.
Added loosely match that can be preceded by spaces.

constants.cpp

@@ -138,7 +138,7 @@ namespace Sass {
     extern const char arglist_name[]    = "arglist";
 
     // constants for uri parsing (RFC 3986 Appendix A.)
-    extern const char uri_chars[]  = ":/?!$%&#@[]{}'\"*+-._=";
+    extern const char uri_chars[]  = ":;/?!$%&#@[]{}'\"*+-.,_=";
 
     // some specific constant character classes
     // they must be static to be useable by lexer

lexer.hpp

@@ -77,19 +77,19 @@ namespace Sass {
 
     // Match a single character literal.
     // Regex equivalent: /(?:literal)/
-    template <char pre>
+    template <char chr>
     const char* exactly(const char* src) {
-      return *src == pre ? src + 1 : 0;
+      return *src == chr ? src + 1 : 0;
     }
 
     // Match a string constant.
     // Regex equivalent: /[axy]/
-    template <const char* prefix>
+    template <const char* str>
     const char* exactly(const char* src) {
-      if (prefix == 0) return 0;
-      const char* pre = prefix;
+      if (str == 0) return 0;
+      const char* pre = str;
       if (src == 0) return 0;
-      // there is a small chance that the search prefix
+      // there is a small chance that the search string
       // is longer than the rest of the string to look at
       while (*pre && *src == *pre) {
         ++src, ++pre;
@@ -117,9 +117,9 @@ namespace Sass {
 
     // Match all except the supplied one.
     // Regex equivalent: /[^x]/
-    template <const char c>
+    template <const char chr>
     const char* any_char_but(const char* src) {
-      return (*src && *src != c) ? src + 1 : 0;
+      return (*src && *src != chr) ? src + 1 : 0;
     }
 
     // Succeeds if the matcher fails.
@@ -210,14 +210,29 @@ namespace Sass {
 
     // Match with word boundary rule.
     // Regex equivalent: /(?:$mx)\b/
-    template <const char* mx>
+    template <const char* str>
     const char* word(const char* src) {
       return sequence <
-               exactly < mx >,
+               exactly < str >,
                word_boundary
              >(src);
     }
 
+    template <char chr>
+    const char* loosely(const char* src) {
+      return sequence <
+               optional_spaces,
+               exactly < chr >
+             >(src);
+    }
+    template <const char* str>
+    const char* loosely(const char* src) {
+      return sequence <
+               optional_spaces,
+               exactly < str >
+             >(src);
+    }
+
   }
 }
 

parser.cpp

@@ -382,7 +382,7 @@ namespace Sass {
 
     Argument* arg;
     // some urls can look like line comments (parse literally - chunk would not work)
-    if (has_url && lex< sequence < uri_value, lookahead < exactly<')'> > > >(false)) {
+    if (has_url && lex< sequence < uri_value, lookahead < loosely<')'> > > >(false)) {
       String* the_url = parse_interpolated_chunk(lexed);
       arg = new (ctx.mem) Argument(the_url->pstate(), the_url);
     }