Merge pull request #1354 from mgreter/feature/interpolate-ns-in-ref-comb

Fix parsing for interpolated reference combinator

Author: mgreter

parser.cpp

@@ -739,7 +739,7 @@ namespace Sass {
     else if (lex< sequence < exactly<'/'>, negate < exactly < '*' > > > >()) {
       // comments are allowed, but not spaces?
       combinator = Complex_Selector::REFERENCE;
-      if (!lex < identifier >()) return 0; // ToDo: error msg?
+      if (!lex < re_reference_combinator >()) return 0;
       reference = new (ctx.mem) String_Quoted(pstate, lexed);
       if (!lex < exactly < '/' > >()) return 0; // ToDo: error msg?
     }
@@ -851,7 +851,7 @@ namespace Sass {
     else if (lex< quoted_string >()) {
       return new (ctx.mem) Type_Selector(pstate, unquote(lexed));
     }
-    else if (lex< alternatives < variable, number, re_reference_selector > >()) {
+    else if (lex< alternatives < variable, number, static_reference_combinator > >()) {
       return new (ctx.mem) Type_Selector(pstate, lexed);
     }
     else if (peek< pseudo_not >()) {
@@ -2146,8 +2146,8 @@ namespace Sass {
             // consume whitespace and comments
             spaces, block_comment, line_comment,
             // match `/deep/` selector (pass-trough)
-            // there is no functionality for it yet
-            re_reference_selector,
+            // match reference /\/[^\/]+\//;
+            schema_reference_combinator,
             // match selector ops /[*&%,()\[\]]/
             class_char < selector_lookahead_ops >,
             // match selector combinators /[>+~]/

prelexer.cpp

@@ -214,8 +214,56 @@ namespace Sass {
       return sequence<exactly<'@'>, identifier>(src);
     }
 
-    const char* re_reference_selector(const char* src) {
-      return sequence < exactly <'/'>, identifier, exactly <'/'> >(src);
+    const char* re_reference_combinator(const char* src) {
+      return sequence <
+        optional <
+          sequence <
+            zero_plus <
+              exactly <'-'>
+            >,
+            identifier,
+            exactly <'|'>
+          >
+        >,
+        zero_plus <
+          exactly <'-'>
+        >,
+        identifier
+      >(src);
+    }
+
+    const char* static_reference_combinator(const char* src) {
+      return sequence <
+        exactly <'/'>,
+        re_reference_combinator,
+        exactly <'/'>
+      >(src);
+    }
+
+    const char* schema_reference_combinator(const char* src) {
+      return sequence <
+        exactly <'/'>,
+        optional <
+          sequence <
+            zero_plus <
+              exactly <'-'>
+            >,
+            alternatives <
+              identifier,
+              interpolant
+            >,
+            exactly <'|'>
+          >
+        >,
+        zero_plus <
+          exactly <'-'>
+        >,
+        alternatives <
+          identifier,
+          interpolant
+        >,
+        exactly <'/'>
+      > (src);
     }
 
     const char* kwd_import(const char* src) {
@@ -754,6 +802,8 @@ namespace Sass {
                            static_string,
                            percentage,
                            hex,
+                           exactly<'|'>,
+                           // exactly<'+'>,
                            number,
                            sequence< exactly<'!'>, word<important_kwd> >
                           >(src);

prelexer.hpp

@@ -197,7 +197,9 @@ namespace Sass {
     const char* identifier_alnum(const char* src);
     const char* identifier_alnums(const char* src);
     // Match reference selector.
-    const char* re_reference_selector(const char* src);
+    const char* re_reference_combinator(const char* src);
+    const char* static_reference_combinator(const char* src);
+    const char* schema_reference_combinator(const char* src);
 
     // Match interpolant schemas
     const char* identifier_schema(const char* src);