Merge pull request #2503 from mgreter/bugfix/issue-2082

Error on quoted string in simple selector parsing

Author: mgreter

src/parser.cpp

@@ -856,9 +856,6 @@ namespace Sass {
     else if (lex< id_name >()) {
       return SASS_MEMORY_NEW(Id_Selector, pstate, lexed);
     }
-    else if (lex< quoted_string >()) {
-      return SASS_MEMORY_NEW(Element_Selector, pstate, unquote(lexed));
-    }
     else if (lex< alternatives < variable, number, static_reference_combinator > >()) {
       return SASS_MEMORY_NEW(Element_Selector, pstate, lexed);
     }
@@ -879,6 +876,9 @@ namespace Sass {
       sel->media_block(last_media_block);
       return sel;
     }
+    else {
+      css_error("Invalid CSS", " after ", ": expected selector, was ");
+    }
     // failed
     return 0;
   }

src/prelexer.cpp

@@ -1679,10 +1679,7 @@ namespace Sass {
       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);
-    }
-    const char* re_type_selector2(const char* src) {
-      return alternatives< type_selector, universal, quoted_string, dimension, percentage, number, identifier_alnums >(src);
+      return alternatives< type_selector, universal, dimension, percentage, number, identifier_alnums >(src);
     }
     const char* re_static_expression(const char* src) {
       return sequence< number, optional_spaces, exactly<'/'>, optional_spaces, number >(src);

src/prelexer.hpp

@@ -264,7 +264,6 @@ namespace Sass {
     const char* kwd_while_directive(const char* src);
 
     const char* re_nothing(const char* src);
-    const char* re_type_selector2(const char* src);
 
     const char* re_special_fun(const char* src);