fixed issue with fallback value not being parsed, fixed toString extra space, check that the fallback value is compatible with its type definition

Author: ylafon

org/w3c/css/util/Messages.properties.en

@@ -421,4 +421,5 @@ error.operandnumber: One operand must be a number
 error.divisortype: The divisor must be a number
 error.incompatibletypes: The types are incompatible
 error.invalidtype: Invalid type: %s
+error.typevaluemismatch: The value %s is incompatible with its type definition <%s>
 

org/w3c/css/util/Messages.properties.fr

@@ -445,3 +445,4 @@ error.operandnumber: Au moins une opérande doit être un nombre
 error.divisortype: Le diviseur doit être un nombre
 error.incompatibletypes: Les types ne sont pas compatibles
 error.invalidtype: Type invalide: %s
+error.typevaluemismatch: La valeur %s est incompatible avec sa définition de type <%s>

org/w3c/css/values/CssAttr.java

@@ -136,6 +136,31 @@ public void setValue(CssExpression exp, ApplContext ac)
 							val.toString(), "attr()", ac);
 				case COMMA:
 					fallback_value = val;
+					// we should have a computed_type by then.
+					// let's check the value.
+					if (fallback_value.getType() != computed_type) {
+						// deal with percentage and numbers
+						int fb_type = fallback_value.getType();
+						// only 0 can be something else than a plain number.
+						if (fb_type == CssTypes.CSS_NUMBER) {
+							// TODO check if zero in CssCheckableValue
+							if (true /*fallback_value.getCheckableValue().isZero()(*/) {
+								break;
+							}
+						}
+						if (fb_type == CssTypes.CSS_PERCENTAGE) {
+							if ((computed_type == CssTypes.CSS_LENGTH) ||
+									(computed_type == CssTypes.CSS_ANGLE) ||
+									(computed_type == CssTypes.CSS_FREQUENCY) ||
+									(computed_type == CssTypes.CSS_NUMBER) ||
+									(computed_type == CssTypes.CSS_TIME)) {
+								break;
+							}
+						}
+						// else, invalid type
+						throw new InvalidParamException("typevaluemismatch",
+								fallback_value, value_type, ac);
+					}
 					break;
 				default:
 					throw new InvalidParamException("operator",
@@ -145,7 +170,6 @@ public void setValue(CssExpression exp, ApplContext ac)
 			op = exp.getOperator();
 			exp.next();
 		}
-		// TODO do type checking between the fallback value and the type
 	}
 
 	private int _checkType(CssIdent ident)
@@ -175,7 +199,7 @@ public String toString() {
 				sb.append(' ').append(value_type);
 			}
 			if (fallback_value != null) {
-				sb.append(" , ").append(fallback_value);
+				sb.append(", ").append(fallback_value);
 			}
 			sb.append(')');
 			_ts = sb.toString();