Merge pull request #370 from wonja/bem_selectors

allowing arbitrary hyphens at the beginning of BEM selectors #319

Author: Aaron Leung

parser.cpp

@@ -421,7 +421,10 @@ namespace Sass {
         return seq;
       }
     }
-    if (lex< sequence< negate< functional >, alternatives< type_selector, universal, string_constant, dimension, percentage, number > > >()) {
+    if (sawsomething && lex< sequence< negate< functional >, alternatives< hyphens_and_identifier, universal, string_constant, dimension, percentage, number > > >()) {
+      // saw an ampersand, then allow type selectors with arbitrary number of hyphens at the beginning
+      (*seq) << new (ctx.mem) Type_Selector(path, source_position, lexed);
+    } else if (lex< sequence< negate< functional >, alternatives< type_selector, universal, string_constant, dimension, percentage, number > > >()) {
       // if you see a type selector
       (*seq) << new (ctx.mem) Type_Selector(path, source_position, lexed);
       sawsomething = true;
@@ -1484,6 +1487,7 @@ namespace Sass {
     bool saw_interpolant = false;
 
     while ((q = peek< identifier >(p))                             ||
+           (q = peek< hyphens_and_identifier >(p))                 ||
            (q = peek< type_selector >(p))                          ||
            (q = peek< id_name >(p))                                ||
            (q = peek< class_name >(p))                             ||

prelexer.cpp

@@ -245,6 +245,9 @@ namespace Sass {
     const char* type_selector(const char* src) {
       return sequence< optional<namespace_prefix>, identifier>(src);
     }
+    const char* hyphens_and_identifier(const char* src) {
+      return sequence< zero_plus< exactly< '-' > >, identifier >(src);
+    }
     const char* universal(const char* src) {
       return sequence< optional<namespace_prefix>, exactly<'*'> >(src);
     }

prelexer.hpp

@@ -369,6 +369,7 @@ namespace Sass {
     // Match CSS type selectors
     const char* namespace_prefix(const char* src);
     const char* type_selector(const char* src);
+    const char* hyphens_and_identifier(const char* src);
     const char* universal(const char* src);
     // Match CSS id names.
     const char* id_name(const char* src);