Merge pull request #369 from wonja/bem_selectors

Fixes Sass 3.3 BEM-style selector syntax support #319

Author: Aaron Leung

parser.cpp

@@ -411,14 +411,23 @@ namespace Sass {
   Compound_Selector* Parser::parse_simple_selector_sequence()
   {
     Compound_Selector* seq = new (ctx.mem) Compound_Selector(path, source_position);
-    // check for backref or type selector, which are only allowed at the front
+    bool sawsomething = false;
     if (lex< exactly<'&'> >()) {
+      // if you see a &
       (*seq) << new (ctx.mem) Selector_Reference(path, source_position);
+      sawsomething = true;
+      // if you see a space after a &, then you're done
+      if(lex< spaces >()) {
+        return seq;
+      }
     }
-    else if (lex< sequence< negate< functional >, alternatives< type_selector, universal, string_constant, dimension, percentage, number > > >()) {
+    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;
     }
-    else {
+    if (!sawsomething) {
+      // don't blindly do this if you saw a & or selector
       (*seq) << parse_simple_selector();
     }