allow identifier in calc

Author: rbri

src/main/javacc/CSS3Parser.jj

@@ -1761,6 +1761,7 @@ LexicalUnit calcProduct(LexicalUnit prev) :
 //
 LexicalUnit calcValue(LexicalUnit prev) :
 {
+    Token t;
     char op = ' ';
     LexicalUnit head = LexicalUnitImpl.createIdent(null, "");
 }
@@ -1773,6 +1774,7 @@ LexicalUnit calcValue(LexicalUnit prev) :
                     prev = number(prev, op)
                     | prev = dimension(prev, op)
                     | prev = percentage(prev, op)
+                    | t = ident()                  { prev = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
                 )
             )
             | prev = var(prev)
@@ -1876,6 +1878,7 @@ LexicalUnit calcNumberValue(LexicalUnit prev) :
             (
                 (op = unaryOperator() )?
                 prev = number(prev, op)
+                | t = ident()         { prev = LexicalUnitImpl.createIdent(prev, unescape(t.image, false)); }
             )
             | prev = var(prev)
             |

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

@@ -94,11 +94,12 @@ public void hslMixed() throws Exception {
      */
     @Test
     public void hslRelative() throws Exception {
-        color("foreground: hsl(from red r g b)", "foreground: hsl(from red r g b)");
+        color("foreground: hsl(from red h s l)", "foreground: hsl(from red h s l)");
         color("foreground: hsl(from red 7 11% 13%)", "foreground: hsl(from red 7 11% 13%)");
         color("foreground: hsl(from rgb(200 170 0) 7 11% 13%)", "foreground: hsl(from rgb(200 170 0) 7 11% 13%)");
         color("foreground: hsl(from var(--base-color) 7 11% 13%)", "foreground: hsl(from var(--base-color) 7 11% 13%)");
-        // color("foreground: hsl(from var(--base-color) 7 11% 13%)", "foreground: red calc(h + 7) calc(s - 11%) calc(l * 13%)");
+
+        color("foreground: red calc(h + 7) calc(s - 11%) calc(l * 13%)", "foreground: red calc(h + 7) calc(s - 11%) calc(l * 13%)");
     }
 
     /**