Add css_identifier prelexer (can be prefixed by hyphens)

Author: mgreter

src/parser.cpp

@@ -2160,7 +2160,7 @@ namespace Sass {
             // main selector match
             sequence <
               // allow namespace prefix
-              optional < namespace_prefix >,
+              optional < namespace_schema >,
               // modifiers prefixes
               alternatives <
                 sequence <

src/prelexer.cpp

@@ -245,23 +245,11 @@ namespace Sass {
         exactly <'/'>,
         optional <
           sequence <
-            zero_plus <
-              exactly <'-'>
-            >,
-            alternatives <
-              identifier,
-              interpolant
-            >,
+            css_ip_identifier,
             exactly <'|'>
           >
         >,
-        zero_plus <
-          exactly <'-'>
-        >,
-        alternatives <
-          identifier,
-          interpolant
-        >,
+        css_ip_identifier,
         exactly <'/'>
       > (src);
     }
@@ -388,19 +376,67 @@ namespace Sass {
       return word<null_kwd>(src);
     }
 
+    const char* css_identifier(const char* src) {
+      return sequence <
+               zero_plus <
+                 exactly <'-'>
+               >,
+               identifier
+             >(src);
+    }
+
+    const char* css_ip_identifier(const char* src) {
+      return sequence <
+               zero_plus <
+                 exactly <'-'>
+               >,
+               alternatives <
+                 identifier,
+                 interpolant
+               >
+             >(src);
+    }
+
     // Match CSS type selectors
     const char* namespace_prefix(const char* src) {
-      return sequence< optional< alternatives< identifier, exactly<'*'> > >,
-                       exactly<'|'>, negate<exactly<'='>> >(src);
+      return sequence <
+               optional <
+                 alternatives <
+                   exactly <'*'>,
+                   css_identifier
+                 >
+               >,
+               exactly <'|'>,
+               negate <
+                 exactly <'='>
+               >
+             >(src);
     }
+
+    // Match CSS type selectors
+    const char* namespace_schema(const char* src) {
+      return sequence <
+               optional <
+                 alternatives <
+                   exactly <'*'>,
+                   css_ip_identifier
+                 >
+               >,
+               exactly<'|'>,
+               negate <
+                 exactly <'='>
+               >
+             >(src);
+    }
+
     const char* hyphens_and_identifier(const char* src) {
       return sequence< zero_plus< exactly< '-' > >, identifier >(src);
     }
     const char* hyphens_and_name(const char* src) {
       return sequence< zero_plus< exactly< '-' > >, name >(src);
     }
     const char* universal(const char* src) {
-      return sequence< optional<namespace_prefix>, exactly<'*'> >(src);
+      return sequence< optional<namespace_schema>, exactly<'*'> >(src);
     }
     // Match CSS id names.
     const char* id_name(const char* src) {
@@ -412,7 +448,7 @@ namespace Sass {
     }
     // Attribute name in an attribute selector.
     const char* attribute_name(const char* src) {
-      return alternatives< sequence< optional<namespace_prefix>, identifier>,
+      return alternatives< sequence< optional<namespace_schema>, identifier>,
                            identifier >(src);
     }
     // match placeholder selectors
@@ -879,7 +915,7 @@ namespace Sass {
     }
 
     const char* type_selector(const char* src) {
-      return sequence< optional<namespace_prefix>, identifier>(src);
+      return sequence< optional<namespace_schema>, identifier>(src);
     }
     const char* re_type_selector(const char* src) {
       return alternatives< type_selector, universal, quoted_string, dimension, percentage, number, identifier_alnums >(src);

src/prelexer.hpp

@@ -254,7 +254,12 @@ namespace Sass {
     const char* re_type_selector(const char* src);
     const char* re_static_expression(const char* src);
 
+    // identifier that can start with hyphens
+    const char* css_identifier(const char* src);
+    const char* css_ip_identifier(const char* src);
+
     // Match CSS type selectors
+    const char* namespace_schema(const char* src);
     const char* namespace_prefix(const char* src);
     const char* type_selector(const char* src);
     const char* hyphens_and_identifier(const char* src);