intoduced dashed idents to cope with color-mix() custom-color-space

Author: ylafon

org/w3c/css/parser/analyzer/CssParser.jj

@@ -70,6 +70,7 @@ import org.w3c.css.values.CssCalc;
 import org.w3c.css.values.CssCheckableValue;
 import org.w3c.css.values.CssColor;
 import org.w3c.css.values.CssComparator;
+import org.w3c.css.values.CssDashedIdent;
 import org.w3c.css.values.CssEnv;
 import org.w3c.css.values.CssExpression;
 import org.w3c.css.values.CssFlexibleLength;
@@ -3267,7 +3268,7 @@ void term(CssExpression exp) :
         | func=function() { setValue(func, exp, operator, null, FUNCTION); }
         | n=<STRING> { setValue(new CssString(), exp, operator, n, STRING); }
         | n=<DIV>  { setValue(new CssSwitch(), exp, operator, n, DIV); }
-        | ( n=<RBRACKET> | n=<LBRACKET> ) {  setValue(new CssBracket(), exp, operator, n, RBRACKET); }
+        | ( n=<RBRACKET> | n=<LBRACKET> ) { setValue(new CssBracket(), exp, operator, n, RBRACKET); }
         | n=ident() {
 	/*
 	 * Common error :
@@ -3291,6 +3292,7 @@ void term(CssExpression exp) :
 		setValue(new CssIdent(), exp, operator, n, IDENT);
 	    }
         }
+        | n=<CUSTOM_PROPERTY_NAME> { setValue(new CssDashedIdent(), exp, operator, n, CUSTOM_PROPERTY_NAME); }
         | hashident(exp)
         | n=<URL> { 
 	    CssURL _u = new CssURL();

org/w3c/css/values/CssDashedIdent.java

@@ -0,0 +1,121 @@
+//
+// @author Yves Lafon
+//
+// (c) COPYRIGHT W3C 2026.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.values;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+
+public class CssDashedIdent extends CssValue implements Comparable<CssDashedIdent> {
+
+    /**
+     * Get a cached CssIdent, useful for common values like "inherit"
+     *
+     * @param name, the ident name
+     * @return a CssIdent
+     */
+
+
+    public static final int type = CssTypes.CSS_DASHED_IDENT;
+
+    public int compareTo(CssDashedIdent other) {
+        int hash, ohash;
+        hash = hashCode();
+        ohash = other.hashCode();
+        if (hash == ohash) {
+            return 0;
+        }
+        return (hash < ohash) ? 1 : -1;
+    }
+
+    private int hashcode = 0;
+
+    public final int getType() {
+        return type;
+    }
+
+    /**
+     * Create a new CssDashedIdent
+     */
+    public CssDashedIdent() {
+    }
+
+    /**
+     * Create a new CssIdent
+     *
+     * @param s The identificator
+     */
+    public CssDashedIdent(String s) {
+        value = s;
+    }
+
+    /**
+     * Set the value of this ident.
+     *
+     * @param s  the string representation of the identificator.
+     * @param ac For errors and warnings reports.
+     */
+    public void set(String s, ApplContext ac) {
+        value = s;
+        hashcode = 0;
+    }
+
+    /**
+     * Returns the internal value.
+     */
+    public Object get() {
+        return value;
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value;
+    }
+
+    /**
+     * Compares two values for equality.
+     *
+     * @param value The other value.
+     */
+    public boolean equals(Object value) {
+        return ((value instanceof CssDashedIdent) && (value.hashCode() == hashCode()));
+    }
+
+    /**
+     * Compares two values for equality.
+     *
+     * @param value The other value.
+     * @return true is the two values are matching
+     */
+    public boolean equals(CssDashedIdent value) {
+        return (value.hashCode() == hashCode());
+    }
+
+    /**
+     * Returns a hashcode for this ident.
+     */
+    public int hashCode() {
+        // we cache, as we use toLowerCase and don't store the resulting string
+        if (hashcode == 0) {
+            hashcode = value.toLowerCase().hashCode();
+        }
+        return hashcode;
+    }
+
+    /**
+     * Does this value contain a "\9" CSS declaration hack?
+     */
+    public boolean hasBackslash9Hack() {
+        return value.endsWith("\\9");
+    }
+
+    private String value;
+
+    public CssDashedIdent getDashedHashIdent() throws InvalidParamException {
+        return this;
+    }
+}

org/w3c/css/values/CssTypes.java

@@ -38,6 +38,7 @@ public class CssTypes {
     public static final int CSS_VARIABLE = 25;
     public static final int CSS_VARIABLE_DEFINITION = 26;
     public static final int CSS_ENV = 27;
+    public static final int CSS_DASHED_IDENT = 28;
 
     // not really a property value
     public static final int CSS_ANPLUSB = 48;

org/w3c/css/values/color/ColorMix.java

@@ -155,6 +155,16 @@ public static CssValue parseColorInterpolationMethod(ApplContext ac, CssExpressi
         exp.next();
         val = exp.getValue();
         op = exp.getOperator();
+        if (val.getType() == CssTypes.CSS_DASHED_IDENT) {
+            // TODO check it is a declared value
+            values.add(val);
+            exp.next();
+            if (!exp.end()) {
+                throw new InvalidParamException("unrecognize", ac);
+            }
+            return new CssValueList(values);
+        }
+        // else it should be a specific IDENT
         if (val.getType() != CssTypes.CSS_IDENT) {
             throw new InvalidParamException("value",
                     val.toString(), caller, ac);
@@ -210,14 +220,6 @@ public static CssValue parseColorInterpolationMethod(ApplContext ac, CssExpressi
             throw new InvalidParamException("value",
                     val.toString(), caller, ac);
         }
-        if (id.toString().startsWith("--")) {
-            // TODO check it is a declared value
-            values.add(val);
-            if (!exp.end()) {
-                throw new InvalidParamException("unrecognize", ac);
-            }
-            return new CssValueList(values);
-        }
         throw new InvalidParamException("unrecognize", ac);
     }