introduce from keyword

Author: rbri

src/main/javacc/CSS3Parser.jj

@@ -169,6 +169,7 @@ TOKEN_MGR_DECLS :
 
 | < INHERIT: "inherit" >
 | < NONE: "none" >
+| < FROM: "from" >
 
 // ident        -?{nmstart}{nmchar}*
 // {ident}         {return IDENT;}
@@ -1623,6 +1624,7 @@ LexicalUnit term(LexicalUnit prev) :
         | t = <INHERIT>         { value = LexicalUnitImpl.createInherit(prev); }
         | t = <ONLY>            { value = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
         | t = <NONE>            { value = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
+        | t = <FROM>            { value = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
     )
         {
             if (locator == null)
@@ -2331,6 +2333,7 @@ Token ident() :
             t = <INHERIT>
             | t = <ONLY>
             | t = <NONE>
+            | t = <FROM>
         )
         {
             Token ident = new Token(IDENT, unescape(t.image, false));

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

@@ -112,6 +112,7 @@ public void selector() throws Exception {
         selectorType(".inherit", SelectorType.ELEMENT_NODE_SELECTOR);
         selectorType(".only", SelectorType.ELEMENT_NODE_SELECTOR);
         selectorType(".none", SelectorType.ELEMENT_NODE_SELECTOR);
+        selectorType(".from", SelectorType.ELEMENT_NODE_SELECTOR);
     }
 
     /**
@@ -232,6 +233,7 @@ public void condition() throws Exception {
         conditionType(".inherit", ConditionType.CLASS_CONDITION);
         conditionType(".only", ConditionType.CLASS_CONDITION);
         conditionType(".none", ConditionType.CLASS_CONDITION);
+        conditionType(".from", ConditionType.CLASS_CONDITION);
     }
 
     /**
@@ -2449,15 +2451,15 @@ public void malformedDeclaration() throws Exception {
         assertEquals(7, errorHandler.getErrorCount());
         final String expected = "Error in declaration. (Invalid token \"}\". Was expecting one of: <S>, \":\".)"
                 + " Error in declaration. (Invalid token \";\". Was expecting one of: <S>, \":\".)"
-                + " Error in expression. (Invalid token \"}\". Was expecting one of: <S>, \"only\", <NUMBER>, \"inherit\", \"none\", "
+                + " Error in expression. (Invalid token \"}\". Was expecting one of: <S>, \"only\", <NUMBER>, \"inherit\", \"none\", \"from\", "
                         + "<IDENT>, <STRING>, \"-\", \"+\", <HASH>, <EMS>, <REM>, <EXS>, <CH>, "
                         + "<VW>, <VH>, <VMIN>, <VMAX>, "
                         + "<LENGTH_PX>, <LENGTH_CM>, <LENGTH_MM>, <LENGTH_IN>, <LENGTH_PT>, <LENGTH_PC>, <LENGTH_Q>, "
                         + "<ANGLE_DEG>, <ANGLE_RAD>, <ANGLE_GRAD>, <ANGLE_TURN>, "
                         + "<TIME_MS>, <TIME_S>, <FREQ_HZ>, <FREQ_KHZ>, <RESOLUTION_DPI>, <RESOLUTION_DPCM>, <PERCENTAGE>, "
                         + "<DIMENSION>, <UNICODE_RANGE>, <URI>, <FUNCTION_CALC>, <FUNCTION_VAR>, "
                         + "<FUNCTION_RGB>, <FUNCTION_HSL>, <FUNCTION_HWB>, <FUNCTION_LAB>, <FUNCTION_LCH>, <FUNCTION>, \"progid:\".)"
-                + " Error in expression. (Invalid token \";\". Was expecting one of: <S>, \"only\", <NUMBER>, \"inherit\", \"none\", "
+                + " Error in expression. (Invalid token \";\". Was expecting one of: <S>, \"only\", <NUMBER>, \"inherit\", \"none\", \"from\", "
                         + "<IDENT>, <STRING>, \"-\", \"+\", <HASH>, <EMS>, <REM>, <EXS>, <CH>, "
                         + "<VW>, <VH>, <VMIN>, <VMAX>, "
                         + "<LENGTH_PX>, <LENGTH_CM>, <LENGTH_MM>, <LENGTH_IN>, <LENGTH_PT>, <LENGTH_PC>, <LENGTH_Q>, "
@@ -2710,7 +2712,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\", <IDENT>,"
+                + "(Invalid token \"<EOF>\". Was expecting one of: <S>, \"only\", \"inherit\", \"none\", \"from\", <IDENT>,"
                 + " \"}\", \";\", \"*\", <CUSTOM_PROPERTY_NAME>.)";
         assertEquals(expected, errorHandler.getErrorMessage());
         assertEquals("1", errorHandler.getErrorLines());
@@ -2755,7 +2757,7 @@ public void unexpectedEndOfString() throws Exception {
 
         assertEquals(1, errorHandler.getErrorCount());
         final String expected = "Error in expression. "
-                + "(Invalid token \"\\'\". Was expecting one of: <S>, \"only\", <NUMBER>, \"inherit\", \"none\", "
+                + "(Invalid token \"\\'\". Was expecting one of: <S>, \"only\", <NUMBER>, \"inherit\", \"none\", \"from\", "
                         + "<IDENT>, <STRING>, \"-\", \"+\", <HASH>, <EMS>, <REM>, <EXS>, <CH>, "
                         + "<VW>, <VH>, <VMIN>, <VMAX>, "
                         + "<LENGTH_PX>, <LENGTH_CM>, <LENGTH_MM>, <LENGTH_IN>, <LENGTH_PT>, <LENGTH_PC>, <LENGTH_Q>, "