Fix selector parsing to allow hyphen after other tokens

Fixes sass#922
mgreter · Mar 6, 2015 · d1fa699 · d1fa699
1 parent b76ea94
commit d1fa699
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/parser.cpp b/parser.cpp
@@ -1904,6 +1904,7 @@ namespace Sass {
            (q = peek< exactly<'~'> >(p))                           ||
            (q = peek< exactly<'>'> >(p))                           ||
            (q = peek< exactly<','> >(p))                           ||
+           (saw_stuff && (q = peek< exactly<'-'> >(p)))            ||
            (q = peek< binomial >(p))                               ||
            (q = peek< sequence< optional<sign>,
                                 optional<digits>,
@@ -1927,8 +1928,8 @@ namespace Sass {
            (q = peek< sequence< pseudo_prefix, interpolant > >(p)) ||
            (q = peek< interpolant >(p))) {
       saw_stuff = true;
+      if (*(p) == '#' && *(p + 1) == '{' && *(q - 1) == '}') saw_interpolant = true;
       p = q;
-      if (*(p - 1) == '}') saw_interpolant = true;
     }
 
     Selector_Lookahead result;
@@ -1962,6 +1963,7 @@ namespace Sass {
            (q = peek< exactly<'~'> >(p))                           ||
            (q = peek< exactly<'>'> >(p))                           ||
            (q = peek< exactly<','> >(p))                           ||
+           (saw_stuff && (q = peek< exactly<'-'> >(p)))            ||
            (q = peek< binomial >(p))                               ||
            (q = peek< sequence< optional<sign>,
                                 optional<digits>,
@@ -1985,8 +1987,8 @@ namespace Sass {
            (q = peek< sequence< pseudo_prefix, interpolant > >(p)) ||
            (q = peek< interpolant >(p))                            ||
            (q = peek< optional >(p))) {
+      if (*(p) == '#' && *(p + 1) == '{' && *(q - 1) == '}') saw_interpolant = true;
       p = q;
-      if (*(p - 1) == '}') saw_interpolant = true;
       saw_stuff = true;
     }