Merge pull request #1472 from mgreter/bugfix/hex-color-parsing

Improve hex color parsing with trailing hyphen

Author: xzyfer

src/parser.cpp

@@ -1423,9 +1423,12 @@ namespace Sass {
     { return new (ctx.mem) Textual(pstate, Textual::PERCENTAGE, lexed); }
 
     // match hex number first because 0x000 looks like a number followed by an indentifier
-    if (lex< alternatives< hex, hex0 > >())
+    if (lex< sequence < alternatives< hex, hex0 >, negate < exactly<'-'> > > >())
     { return new (ctx.mem) Textual(pstate, Textual::HEX, lexed); }
 
+    if (lex< sequence < exactly <'#'>, identifier > >())
+    { return new (ctx.mem) String_Quoted(pstate, lexed); }
+
     // also handle the 10em- foo special case
     if (lex< sequence< dimension, optional< sequence< exactly<'-'>, negate< digit > > > > >())
     { return new (ctx.mem) Textual(pstate, Textual::DIMENSION, lexed); }
@@ -1641,9 +1644,12 @@ namespace Sass {
         (*schema) <<  new (ctx.mem) Textual(pstate, Textual::NUMBER, lexed);
       }
       // lex hex color value
-      else if (lex< hex >()) {
+      else if (lex< sequence < hex, negate < exactly < '-' > > > >()) {
         (*schema) << new (ctx.mem) Textual(pstate, Textual::HEX, lexed);
       }
+      else if (lex< sequence < exactly <'#'>, identifier > >()) {
+        (*schema) << new (ctx.mem) String_Quoted(pstate, lexed);
+      }
       // lex a value in parentheses
       else if (peek< parenthese_scope >()) {
         (*schema) << parse_factor();