and is also a valid identifier (css-class name)

Author: rbri

src/main/javacc/CSS3Parser.jj

@@ -2757,6 +2757,7 @@ Token ident() :
     |
         (
             t = <INHERIT>
+            | t = <AND>
             | t = <ONLY>
             | t = <NONE>
             | t = <FROM>

src/test/java/org/htmlunit/cssparser/parser/CSS3ParserRealWorldTest.java

@@ -384,8 +384,8 @@ public void semantic_2_5_0() throws Exception {
                 + "only screen and (min-width: 768px) and (max-width: 991px);"
                 + "only screen and (min-width: 992px);"
                 + "only screen and (min-width: 992px) and (max-width: 1199px);";
-        realWorld("realworld/semantic_2_5_0.css", 5486, 10068, media, 7, 4);
-        realWorld("realworld/semantic_2_5_0.min.css", 5486, 10068, media, 7, 4);
+        realWorld("realworld/semantic_2_5_0.css", 5490, 10072, media, 3, 0);
+        realWorld("realworld/semantic_2_5_0.min.css", 5490, 10072, media, 3, 0);
     }
 
     /**

src/test/java/org/htmlunit/cssparser/parser/CSS3ParserTest.java

@@ -109,6 +109,7 @@ public void selector() throws Exception {
         selectorType(".only", SelectorType.ELEMENT_NODE_SELECTOR);
         selectorType(".none", SelectorType.ELEMENT_NODE_SELECTOR);
         selectorType(".from", SelectorType.ELEMENT_NODE_SELECTOR);
+        selectorType(".and", SelectorType.ELEMENT_NODE_SELECTOR);
     }
 
     /**
@@ -230,6 +231,7 @@ public void condition() throws Exception {
         conditionType(".only", ConditionType.CLASS_CONDITION);
         conditionType(".none", ConditionType.CLASS_CONDITION);
         conditionType(".from", ConditionType.CLASS_CONDITION);
+        conditionType(".and", ConditionType.CLASS_CONDITION);
     }
 
     /**
@@ -1854,7 +1856,7 @@ public void unexpectedEndOfPageRule() throws Exception {
 
         assertEquals(1, errorHandler.getErrorCount());
         final String expected = "Error in @page rule. "
-                + "(Invalid token \"<EOF>\". Was expecting one of: <S>, \"only\", \"inherit\", \"none\", \"from\", <IDENT>,"
+                + "(Invalid token \"<EOF>\". Was expecting one of: <S>, \"and\", \"only\", \"inherit\", \"none\", \"from\", <IDENT>,"
                 + " \"}\", \";\", \"*\", <CUSTOM_PROPERTY_NAME>.)";
         assertEquals(expected, errorHandler.getErrorMessage());
         assertEquals("1", errorHandler.getErrorLines());
@@ -3234,7 +3236,7 @@ public void invalid_not() throws Exception {
 
         checkErrorSelector("input:not()",
                 "Error in simple selector. (Invalid token \")\". "
-                + "Was expecting one of: <S>, \"only\", \"inherit\", \"none\", \"from\", <IDENT>, \".\", \":\", \"*\", \"[\", <HASH>.)");
+                + "Was expecting one of: <S>, \"and\", \"only\", \"inherit\", \"none\", \"from\", <IDENT>, \".\", \":\", \"*\", \"[\", <HASH>.)");
 
 //        checkErrorSelector("input:not(*.home)",
 //                "Error in pseudo class or element. (Invalid token \".\"."
@@ -3282,7 +3284,7 @@ public void pseudoElementsErrors() throws Exception {
                 "Duplicate pseudo class \":foo(ab)\" or pseudo class \":foo(ab)\" not at end.");
         checkErrorSelector("input:before:",
                 "Error in pseudo class or element. (Invalid token \"<EOF>\". "
-                + "Was expecting one of: \"only\", \"inherit\", \"none\", \"from\", <IDENT>, "
+                + "Was expecting one of: \"and\", \"only\", \"inherit\", \"none\", \"from\", <IDENT>, "
                 + "\":\", <FUNCTION_NOT>, <FUNCTION_LANG>, <FUNCTION>.)");
 
         // pseudo element not at end