proper check for css-wide idents (cont.)

ylafon · ylafon · commit dfa68e1d61cb · 2021-10-08T17:40:40.000+02:00
diff --git a/org/w3c/css/properties/css3/CssTabSize.java b/org/w3c/css/properties/css3/CssTabSize.java
@@ -9,6 +9,7 @@
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssCheckableValue;
 import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
 import org.w3c.css.values.CssTypes;
 import org.w3c.css.values.CssValue;
 
@@ -52,7 +53,7 @@ public CssTabSize(ApplContext ac, CssExpression expression, boolean check)
                 value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssTableLayout.java b/org/w3c/css/properties/css3/CssTableLayout.java
@@ -48,8 +48,7 @@ public CssTableLayout() {
      * Creates a new CssTableLayout
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssTableLayout(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -64,23 +63,19 @@ public CssTableLayout(ApplContext ac, CssExpression expression, boolean check)
         val = expression.getValue();
         op = expression.getOperator();
 
-        if (val.getType() == CssTypes.CSS_IDENT) {
-            CssIdent id = val.getIdent();
-            if (inherit.equals(id)) {
-                value = val;
-            } else {
-                if (getAllowedIdent(id) == null) {
-                    throw new InvalidParamException("value",
-                            val.toString(),
-                            getPropertyName(), ac);
-                }
-                value = val;
-            }
-        } else {
+        if (val.getType() != CssTypes.CSS_IDENT) {
+            throw new InvalidParamException("value",
+                    val.toString(),
+                    getPropertyName(), ac);
+        }
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
             throw new InvalidParamException("value",
                     val.toString(),
                     getPropertyName(), ac);
+
         }
+        value = val;
         expression.next();
     }
 
diff --git a/org/w3c/css/properties/css3/CssTextAlign.java b/org/w3c/css/properties/css3/CssTextAlign.java
@@ -65,16 +65,14 @@ public CssTextAlign(ApplContext ac, CssExpression expression, boolean check)
                     expression.getValue(),
                     getPropertyName(), ac);
         }
-        if (inherit.equals(val.getIdent())) {
-            value = val;
-        } else {
-            if (getAllowedIdent(val.getIdent()) == null) {
-                throw new InvalidParamException("value",
-                        expression.getValue(),
-                        getPropertyName(), ac);
-            }
-            value = val;
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+
         }
+        value = val;
         expression.next();
     }
 
diff --git a/org/w3c/css/properties/css3/CssTextAlignAll.java b/org/w3c/css/properties/css3/CssTextAlignAll.java
@@ -48,8 +48,7 @@ public CssTextAlignAll() {
      * Creates a new CssTextAlignAll
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssTextAlignAll(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -65,16 +64,14 @@ public CssTextAlignAll(ApplContext ac, CssExpression expression, boolean check)
                     expression.getValue(),
                     getPropertyName(), ac);
         }
-        if (inherit.equals(val.getIdent())) {
-            value = val;
-        } else {
-            if (getAllowedIdent(val.getIdent()) == null) {
-                throw new InvalidParamException("value",
-                        expression.getValue(),
-                        getPropertyName(), ac);
-            }
-            value = val;
+        CssIdent id = val.getIdent();
+        if (!CssIdent.isCssWide(id) && getAllowedIdent(id) == null) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
+
         }
+        value = val;
         expression.next();
     }
 
diff --git a/org/w3c/css/properties/css3/CssTextAlignLast.java b/org/w3c/css/properties/css3/CssTextAlignLast.java
@@ -50,8 +50,7 @@ public CssTextAlignLast() {
      * Creates a new CssTextAlignLast
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssTextAlignLast(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -68,16 +67,12 @@ public CssTextAlignLast(ApplContext ac, CssExpression expression, boolean check)
                     getPropertyName(), ac);
         }
         // ident, so inherit, or allowed value
-        if (inherit.equals(val.getIdent())) {
-            value = val;
-        } else {
-            if (getMatchingIdent(val.getIdent()) == null) {
-                throw new InvalidParamException("value",
-                        expression.getValue(),
-                        getPropertyName(), ac);
-            }
-            value = val;
+        if (!CssIdent.isCssWide(val.getIdent()) && getMatchingIdent(val.getIdent()) == null) {
+            throw new InvalidParamException("value",
+                    expression.getValue(),
+                    getPropertyName(), ac);
         }
+        value = val;
         expression.next();
     }
 
diff --git a/org/w3c/css/properties/css3/CssTextCombineUpright.java b/org/w3c/css/properties/css3/CssTextCombineUpright.java
@@ -76,7 +76,7 @@ public CssTextCombineUpright(ApplContext ac, CssExpression expression, boolean c
             throw new InvalidParamException("value", expression.getValue(),
                     getPropertyName(), ac);
         }
-        if (inherit.equals(val.getIdent())) {
+        if (CssIdent.isCssWide(val.getIdent())) {
             value = val;
         } else {
             value = getAllowedIdent(val.getIdent());
diff --git a/org/w3c/css/properties/css3/CssTextDecoration.java b/org/w3c/css/properties/css3/CssTextDecoration.java
@@ -99,8 +99,8 @@ public CssTextDecoration(ApplContext ac, CssExpression expression, boolean check
             } else {
                 // so we have an ident...
                 CssIdent ident = val.getIdent();
-                if (inherit.equals(ident)) {
-                    value = inherit;
+                if (CssIdent.isCssWide(ident)) {
+                    value = val;
                     if (check && expression.getCount() != 1) {
                         throw new InvalidParamException("value",
                                 val.toString(),
diff --git a/org/w3c/css/properties/css3/CssTextDecorationLine.java b/org/w3c/css/properties/css3/CssTextDecorationLine.java
@@ -100,7 +100,7 @@ public CssTextDecorationLine(ApplContext ac, CssExpression expression, boolean c
                         getPropertyName(), ac);
             }
             id = val.getIdent();
-            if (inherit.equals(id)) {
+            if (CssIdent.isCssWide(id)) {
                 if (expression.getCount() != 1) {
                     throw new InvalidParamException("value",
                             val.toString(),
diff --git a/org/w3c/css/properties/css3/CssTextDecorationSkip.java b/org/w3c/css/properties/css3/CssTextDecorationSkip.java
@@ -85,14 +85,7 @@ public CssTextDecorationSkip(ApplContext ac, CssExpression expression, boolean c
         }
 
         CssIdent ident = val.getIdent();
-        if (inherit.equals(ident)) {
-            value = val;
-            if (check && expression.getCount() != 1) {
-                throw new InvalidParamException("value",
-                        val.toString(),
-                        getPropertyName(), ac);
-            }
-        } else if (none.equals(ident)) {
+        if (CssIdent.isCssWide(ident) || none.equals(ident)) {
             value = val;
             if (check && expression.getCount() != 1) {
                 throw new InvalidParamException("value",
diff --git a/org/w3c/css/properties/css3/CssTextDecorationSkipBox.java b/org/w3c/css/properties/css3/CssTextDecorationSkipBox.java
@@ -61,7 +61,7 @@ public CssTextDecorationSkipBox(ApplContext ac, CssExpression expression, boolea
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = inherit;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssTextDecorationSkipInk.java b/org/w3c/css/properties/css3/CssTextDecorationSkipInk.java
@@ -61,7 +61,7 @@ public CssTextDecorationSkipInk(ApplContext ac, CssExpression expression, boolea
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssTextDecorationSkipInset.java b/org/w3c/css/properties/css3/CssTextDecorationSkipInset.java
@@ -61,7 +61,7 @@ public CssTextDecorationSkipInset(ApplContext ac, CssExpression expression, bool
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssTextDecorationSkipSelf.java b/org/w3c/css/properties/css3/CssTextDecorationSkipSelf.java
@@ -61,7 +61,7 @@ public CssTextDecorationSkipSelf(ApplContext ac, CssExpression expression, boole
 
         switch (val.getType()) {
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssTextDecorationSkipSpaces.java b/org/w3c/css/properties/css3/CssTextDecorationSkipSpaces.java
@@ -101,7 +101,7 @@ public CssTextDecorationSkipSpaces(ApplContext ac, CssExpression expression, boo
                         getPropertyName(), ac);
             }
             id = val.getIdent();
-            if (inherit.equals(id)) {
+            if (CssIdent.isCssWide(id)) {
                 if (expression.getCount() != 1) {
                     throw new InvalidParamException("value",
                             val.toString(),
diff --git a/org/w3c/css/properties/css3/CssTextDecorationStyle.java b/org/w3c/css/properties/css3/CssTextDecorationStyle.java
@@ -66,7 +66,7 @@ public CssTextDecorationStyle(ApplContext ac, CssExpression expression, boolean
         }
         // ident, so inherit, or allowed value
         CssIdent ident = val.getIdent();
-        if (!inherit.equals(ident) && (getMatchingIdent(ident) == null)) {
+        if (!CssIdent.isCssWide(ident) && (getMatchingIdent(ident) == null)) {
             throw new InvalidParamException("value",
                     expression.getValue(),
                     getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssTextDecorationThickness.java b/org/w3c/css/properties/css3/CssTextDecorationThickness.java
@@ -68,7 +68,7 @@ public CssTextDecorationThickness(ApplContext ac, CssExpression expression, bool
                 value = val;
                 break;
             case CssTypes.CSS_IDENT:
-                if (inherit.equals(val.getIdent())) {
+                if (CssIdent.isCssWide(val.getIdent())) {
                     value = val;
                     break;
                 }
diff --git a/org/w3c/css/properties/css3/CssTextEmphasis.java b/org/w3c/css/properties/css3/CssTextEmphasis.java
@@ -64,7 +64,7 @@ public CssTextEmphasis(ApplContext ac, CssExpression expression, boolean check)
                     break;
                 case CssTypes.CSS_IDENT:
                     CssIdent ident = val.getIdent();
-                    if (inherit.equals(ident)) {
+                    if (CssIdent.isCssWide(ident)) {
                         if (expression.getCount() > 1) {
                             throw new InvalidParamException("value", val,
                                     getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssTextEmphasisPosition.java b/org/w3c/css/properties/css3/CssTextEmphasisPosition.java
@@ -77,8 +77,7 @@ public CssTextEmphasisPosition() {
      * Creates a new CssTextEmphasisPosition
      *
      * @param expression The expression for this property
-     * @throws org.w3c.css.util.InvalidParamException
-     *          Expressions are incorrect
+     * @throws org.w3c.css.util.InvalidParamException Expressions are incorrect
      */
     public CssTextEmphasisPosition(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
@@ -103,7 +102,7 @@ public CssTextEmphasisPosition(ApplContext ac, CssExpression expression, boolean
         }
 
         CssIdent ident = val.getIdent();
-        if (inherit.equals(ident)) {
+        if (CssIdent.isCssWide(ident)) {
             value = val;
             if (check && expression.getCount() != 1) {
                 throw new InvalidParamException("value",
diff --git a/org/w3c/css/properties/css3/CssTextIndent.java b/org/w3c/css/properties/css3/CssTextIndent.java
@@ -54,6 +54,8 @@ public CssTextIndent(ApplContext ac, CssExpression expression, boolean check)
         CssValue hangVal = null;
         CssValue eachVal = null;
 
+        value = null;
+
         while (!expression.end()) {
             val = expression.getValue();
             op = expression.getOperator();
@@ -77,8 +79,8 @@ public CssTextIndent(ApplContext ac, CssExpression expression, boolean check)
                     break;
                 case CssTypes.CSS_IDENT:
                     CssIdent ident = val.getIdent();
-                    if (inherit.equals(ident)) {
-                        value = inherit;
+                    if (CssIdent.isCssWide(ident)) {
+                        value = val;
                         if (check && expression.getCount() > 1) {
                             throw new InvalidParamException("unrecognize", ac);
                         }
@@ -100,7 +102,7 @@ public CssTextIndent(ApplContext ac, CssExpression expression, boolean check)
             expression.next();
         }
         // sanity check, we must have a length or percentage
-        if (value != inherit) {
+        if (value == null) {
             if (sizeVal == null) {
                 throw new InvalidParamException("value",
                         expression.toString(), getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssTransformBox.java b/org/w3c/css/properties/css3/CssTransformBox.java
@@ -85,7 +85,7 @@ public CssTransformBox(ApplContext ac, CssExpression expression,
         }
 
         CssIdent ident = val.getIdent();
-        if (!inherit.equals(ident) && (getAllowedValue(ident) == null)) {
+        if (!CssIdent.isCssWide(ident) && (getAllowedValue(ident) == null)) {
             throw new InvalidParamException("value",
                     val.toString(),
                     getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssTransformStyle.java b/org/w3c/css/properties/css3/CssTransformStyle.java
@@ -66,7 +66,7 @@ public CssTransformStyle(ApplContext ac, CssExpression expression, boolean check
         }
         // ident, so inherit, or allowed value
         CssIdent id = val.getIdent();
-        if (!inherit.equals(id) && (getMatchingIdent(id) == null)) {
+        if (!CssIdent.isCssWide(id) && (getMatchingIdent(id) == null)) {
             throw new InvalidParamException("value",
                     expression.getValue(),
                     getPropertyName(), ac);
diff --git a/org/w3c/css/properties/css3/CssTransition.java b/org/w3c/css/properties/css3/CssTransition.java
@@ -64,12 +64,12 @@ public CssTransition(ApplContext ac, CssExpression expression, boolean check)
             val = expression.getValue();
             op = expression.getOperator();
 
-            if (inherit.equals(val)) {
+            if ((val.getType() == CssTypes.CSS_IDENT) && CssIdent.isCssWide(val.getIdent())) {
                 if (expression.getCount() > 1) {
                     throw new InvalidParamException("value", val,
                             getPropertyName(), ac);
                 }
-                value = inherit;
+                value = val;
                 expression.next();
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public CssTextCombineUpright(ApplContext ac, CssExpression expression, boolean c`
`76`	`76`	`throw new InvalidParamException("value", expression.getValue(),`
`77`	`77`	`getPropertyName(), ac);`
`78`	`78`	`}`
`79`		`- if (inherit.equals(val.getIdent())) {`
	`79`	`+ if (CssIdent.isCssWide(val.getIdent())) {`
`80`	`80`	`value = val;`
`81`	`81`	`} else {`
`82`	`82`	`value = getAllowedIdent(val.getIdent());`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public CssTextDecorationLine(ApplContext ac, CssExpression expression, boolean c`
`100`	`100`	`getPropertyName(), ac);`
`101`	`101`	`}`
`102`	`102`	`id = val.getIdent();`
`103`		`- if (inherit.equals(id)) {`
	`103`	`+ if (CssIdent.isCssWide(id)) {`
`104`	`104`	`if (expression.getCount() != 1) {`
`105`	`105`	`throw new InvalidParamException("value",`
`106`	`106`	`val.toString(),`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public CssTextDecorationSkipBox(ApplContext ac, CssExpression expression, boolea`
`61`	`61`
`62`	`62`	`switch (val.getType()) {`
`63`	`63`	`case CssTypes.CSS_IDENT:`
`64`		`- if (inherit.equals(val.getIdent())) {`
	`64`	`+ if (CssIdent.isCssWide(val.getIdent())) {`
`65`	`65`	`value = inherit;`
`66`	`66`	`break;`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public CssTextDecorationSkipSpaces(ApplContext ac, CssExpression expression, boo`
`101`	`101`	`getPropertyName(), ac);`
`102`	`102`	`}`
`103`	`103`	`id = val.getIdent();`
`104`		`- if (inherit.equals(id)) {`
	`104`	`+ if (CssIdent.isCssWide(id)) {`
`105`	`105`	`if (expression.getCount() != 1) {`
`106`	`106`	`throw new InvalidParamException("value",`
`107`	`107`	`val.toString(),`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public CssTextDecorationStyle(ApplContext ac, CssExpression expression, boolean`
`66`	`66`	`}`
`67`	`67`	`// ident, so inherit, or allowed value`
`68`	`68`	`CssIdent ident = val.getIdent();`
`69`		`- if (!inherit.equals(ident) && (getMatchingIdent(ident) == null)) {`
	`69`	`+ if (!CssIdent.isCssWide(ident) && (getMatchingIdent(ident) == null)) {`
`70`	`70`	`throw new InvalidParamException("value",`
`71`	`71`	`expression.getValue(),`
`72`	`72`	`getPropertyName(), ac);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public CssTextDecorationThickness(ApplContext ac, CssExpression expression, bool`
`68`	`68`	`value = val;`
`69`	`69`	`break;`
`70`	`70`	`case CssTypes.CSS_IDENT:`
`71`		`- if (inherit.equals(val.getIdent())) {`
	`71`	`+ if (CssIdent.isCssWide(val.getIdent())) {`
`72`	`72`	`value = val;`
`73`	`73`	`break;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public CssTransformBox(ApplContext ac, CssExpression expression,`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`CssIdent ident = val.getIdent();`
`88`		`- if (!inherit.equals(ident) && (getAllowedValue(ident) == null)) {`
	`88`	`+ if (!CssIdent.isCssWide(ident) && (getAllowedValue(ident) == null)) {`
`89`	`89`	`throw new InvalidParamException("value",`
`90`	`90`	`val.toString(),`
`91`	`91`	`getPropertyName(), ac);`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public CssTransformStyle(ApplContext ac, CssExpression expression, boolean check`
`66`	`66`	`}`
`67`	`67`	`// ident, so inherit, or allowed value`
`68`	`68`	`CssIdent id = val.getIdent();`
`69`		`- if (!inherit.equals(id) && (getMatchingIdent(id) == null)) {`
	`69`	`+ if (!CssIdent.isCssWide(id) && (getMatchingIdent(id) == null)) {`
`70`	`70`	`throw new InvalidParamException("value",`
`71`	`71`	`expression.getValue(),`
`72`	`72`	`getPropertyName(), ac);`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,12 @@ public CssTransition(ApplContext ac, CssExpression expression, boolean check)`
`64`	`64`	`val = expression.getValue();`
`65`	`65`	`op = expression.getOperator();`
`66`	`66`
`67`		`- if (inherit.equals(val)) {`
	`67`	`+ if ((val.getType() == CssTypes.CSS_IDENT) && CssIdent.isCssWide(val.getIdent())) {`
`68`	`68`	`if (expression.getCount() > 1) {`
`69`	`69`	`throw new InvalidParamException("value", val,`
`70`	`70`	`getPropertyName(), ac);`
`71`	`71`	`}`
`72`		`- value = inherit;`
	`72`	`+ value = val;`
`73`	`73`	`expression.next();`
`74`	`74`	`return;`
`75`	`75`	`}`