Merge pull request #323 from w3c/css-variable

handling definition of a variable.

Author: ylafon

org/w3c/css/parser/CssFouffa.java

@@ -21,6 +21,7 @@
 import org.w3c.css.parser.analyzer.TokenMgrError;
 import org.w3c.css.properties.PropertiesLoader;
 import org.w3c.css.properties.css.CssProperty;
+import org.w3c.css.properties.css3.CssCustomProperty;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.CssVersion;
 import org.w3c.css.util.HTTPURL;
@@ -587,29 +588,32 @@ public CssProperty handleDeclaration(String property, CssExpression expression,
         if (Util.onDebug) {
             System.err.println("Creating " + property + ": " + expression);
         }
-        if (property.startsWith("--")) {
+
+        if (property.startsWith("--") && (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0)) {
+            prop = new CssCustomProperty(ac, property, expression);
             // css variable
-        }
-        final CssValue lastValue = expression.getLastValue();
+        } else {
+            final CssValue lastValue = expression.getLastValue();
 
-        if (allowBackslash9Hack() && lastValue != null && lastValue.hasBackslash9Hack()) {
-            expression.markCssHack();
-        }
+            if (allowBackslash9Hack() && lastValue != null && lastValue.hasBackslash9Hack()) {
+                expression.markCssHack();
+            }
 
-        try {
-            prop = properties.createProperty(ac, getAtRule(), property, expression);
-        } catch (InvalidParamException e) {
-            throw e;
-        } catch (Exception e) {
-            if (Util.onDebug) {
-                e.printStackTrace();
+            try {
+                prop = properties.createProperty(ac, getAtRule(), property, expression);
+            } catch (InvalidParamException e) {
+                throw e;
+            } catch (Exception e) {
+                if (Util.onDebug) {
+                    e.printStackTrace();
+                }
+                throw new InvalidParamException(e.toString(), ac);
             }
-            throw new InvalidParamException(e.toString(), ac);
-        }
 
-        // set the importance
-        if (important) {
-            prop.setImportant();
+            // set the importance
+            if (important) {
+                prop.setImportant();
+            }
         }
         prop.setOrigin(origin);
         // set informations for errors and warnings
@@ -747,9 +751,9 @@ public void addCharSet(String charset) throws ParseException {
         if (charsetFromBOM && ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0) {
             // TODO FIXME proper execption type.
             throw new ParseException(ac.getMsg().getString("parser.charset"));
-       //     CssError cerr = new CssError(getSourceFile(), getBeginLine(),
-           //         getBeginColumn(), getEndLine(), getEndColumn(), ex);
-         //   ac.getFrame().addError(cerr);
+            //     CssError cerr = new CssError(getSourceFile(), getBeginLine(),
+            //         getBeginColumn(), getEndLine(), getEndColumn(), ex);
+            //   ac.getFrame().addError(cerr);
         } else {
             Charset originalCharset = ac.getCharsetObjForURL(getURL());
             if (originalCharset == null) {

org/w3c/css/properties/css/CssCustomProperty.java

@@ -0,0 +1,81 @@
+//
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2021.
+// Please first read the full copyright statement in file COPYRIGHT.html
+package org.w3c.css.properties.css;
+
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+
+/**
+ * @since CSS3
+ */
+public abstract class CssCustomProperty extends CssProperty {
+
+    public String variable_name = null;
+
+    /**
+     * Create a new CssCustomProperty
+     */
+    public CssCustomProperty() {
+    }
+
+    public CssCustomProperty(ApplContext ac, String variablename, CssExpression expression)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                expression.getValue().toString(),
+                getPropertyName(), ac);
+    }
+
+    public CssCustomProperty(ApplContext ac, String variablename, String unparsed_expression)
+            throws InvalidParamException {
+        throw new InvalidParamException("value",
+                unparsed_expression,
+                getPropertyName(), ac);
+    }
+
+    /**
+     * Returns the value of this property
+     */
+    public Object get() {
+        return value;
+    }
+
+    /**
+     * Returns the name of this property
+     */
+    public final String getPropertyName() {
+        return variable_name;
+    }
+
+    /**
+     * Returns true if this property is "softly" inherited
+     * e.g. his value is equals to inherit
+     */
+    public boolean isSoftlyInherited() {
+        return false;
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        return value.toString();
+    }
+
+    /**
+     * Compares two properties for equality.
+     *
+     * @param property The other property.
+     */
+    public boolean equals(CssProperty property) {
+        if (property instanceof CssCustomProperty) {
+            return value.equals(property.value);
+        }
+        return false;
+    }
+
+}
+