use ident() at more places

rbri · rbri · commit 3086b94e6cb9 · 2025-01-05T18:55:46.000+01:00
diff --git a/src/main/javacc/CSS3Parser.jj b/src/main/javacc/CSS3Parser.jj
@@ -1241,7 +1241,7 @@ ElementSelector elementName() :
 {
     try
     {
-        t = <IDENT>
+        t = ident()
         {
             return new ElementSelector(unescape(t.image, false), createLocator(t));
         }
@@ -1281,7 +1281,7 @@ Condition attrib(boolean pseudoElementFound) :
         ( <S> )*
         { if (pseudoElementFound) { throw generateParseException(); } }
 
-        t = <IDENT> { name = unescape(t.image, false); }
+        t = ident() { name = unescape(t.image, false); }
         ( <S> )*
         (
             (
@@ -1300,15 +1300,15 @@ Condition attrib(boolean pseudoElementFound) :
             ( <S> )*
             (
                 (
-                    t = <IDENT> { value = unescape(t.image, false); }
+                    t = ident() { value = unescape(t.image, false); }
                     |
                     t = <STRING> { value = unescape(t.image, false); }
                 )
 
                 ( <S> )*
             )
             (
-                t = <IDENT> { insensitive = handleCaseInSensitive(t); }
+                t = ident() { insensitive = handleCaseInSensitive(t); }
                 ( <S> )*
             )?
         )?
diff --git a/src/test/java/org/htmlunit/cssparser/parser/CSS3ParserTest.java b/src/test/java/org/htmlunit/cssparser/parser/CSS3ParserTest.java
@@ -4091,8 +4091,8 @@ public void invalid_not() throws Exception {
 //                "Error in pseudo class or element. (Invalid token \"p\". Was expecting one of: <S>, \")\".)");
 
         checkErrorSelector("input:not()",
-                "Error in simple selector. (Invalid token \")\"."
-                + " Was expecting one of: <S>, <IDENT>, \".\", \":\", \"*\", \"[\", <HASH>.)");
+                "Error in simple selector. (Invalid token \")\". "
+                + "Was expecting one of: <S>, \"only\", \"inherit\", \"none\", \"from\", <IDENT>, \".\", \":\", \"*\", \"[\", <HASH>.)");
 
 //        checkErrorSelector("input:not(*.home)",
 //                "Error in pseudo class or element. (Invalid token \".\"."

Original file line number	Diff line number	Diff line change
`@@ -1241,7 +1241,7 @@ ElementSelector elementName() :`
`1241`	`1241`	`{`
`1242`	`1242`	`try`
`1243`	`1243`	`{`
`1244`		`- t = <IDENT>`
	`1244`	`+ t = ident()`
`1245`	`1245`	`{`
`1246`	`1246`	`return new ElementSelector(unescape(t.image, false), createLocator(t));`
`1247`	`1247`	`}`
`@@ -1281,7 +1281,7 @@ Condition attrib(boolean pseudoElementFound) :`
`1281`	`1281`	`( <S> )*`
`1282`	`1282`	`{ if (pseudoElementFound) { throw generateParseException(); } }`
`1283`	`1283`
`1284`		`- t = <IDENT> { name = unescape(t.image, false); }`
	`1284`	`+ t = ident() { name = unescape(t.image, false); }`
`1285`	`1285`	`( <S> )*`
`1286`	`1286`	`(`
`1287`	`1287`	`(`
`@@ -1300,15 +1300,15 @@ Condition attrib(boolean pseudoElementFound) :`
`1300`	`1300`	`( <S> )*`
`1301`	`1301`	`(`
`1302`	`1302`	`(`
`1303`		`- t = <IDENT> { value = unescape(t.image, false); }`
	`1303`	`+ t = ident() { value = unescape(t.image, false); }`
`1304`	`1304`	`\|`
`1305`	`1305`	`t = <STRING> { value = unescape(t.image, false); }`
`1306`	`1306`	`)`
`1307`	`1307`
`1308`	`1308`	`( <S> )*`
`1309`	`1309`	`)`
`1310`	`1310`	`(`
`1311`		`- t = <IDENT> { insensitive = handleCaseInSensitive(t); }`
	`1311`	`+ t = ident() { insensitive = handleCaseInSensitive(t); }`
`1312`	`1312`	`( <S> )*`
`1313`	`1313`	`)?`
`1314`	`1314`	`)?`