W3C home > Mailing lists > Public > www-validator-cvs@w3.org > October 2012

2002/css-validator/org/w3c/css/properties/css3 CssTransform.java,1.2,1.3

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 19 Oct 2012 13:24:16 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1TPCYi-0001xZ-GJ@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv7489/css3

Modified Files:
	CssTransform.java 
Log Message:
fixes (angle can be 0, percentages in translation)

Index: CssTransform.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssTransform.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTransform.java	12 Oct 2012 20:49:00 -0000	1.2
+++ CssTransform.java	19 Oct 2012 13:24:14 -0000	1.3
@@ -189,7 +189,22 @@
 		while (!expression.end()) {
 			val = expression.getValue();
 			op = expression.getOperator();
-			if (val.getType() != type) {
+			// special case, 0 can be a length or an angle...
+			if (val.getType() == CssTypes.CSS_NUMBER) {
+				switch (type) {
+					case CssTypes.CSS_LENGTH:
+						val.getNumber().getLength();
+						break;
+					case CssTypes.CSS_ANGLE:
+						val.getNumber().getAngle();
+					case CssTypes.CSS_NUMBER:
+						break;
+					default:
+						throw new InvalidParamException("value",
+								val.toString(),
+								caller.getPropertyName(), ac);
+				}
+			} else if (val.getType() != type) {
 				throw new InvalidParamException("value",
 						val.toString(),
 						caller.getPropertyName(), ac);
@@ -211,6 +226,16 @@
 		}
 		CssValue val;
 		val = expression.getValue();
+		// special case, 0 can be a length or an angle...
+		if (val.getType() == CssTypes.CSS_NUMBER) {
+			if (type == CssTypes.CSS_LENGTH || type == CssTypes.CSS_ANGLE) {
+				// if not zero, it will fail
+				if (val.getNumber().isZero()) {
+					expression.next();
+					return;
+				}
+			}
+		}
 		if (val.getType() != type) {
 			throw new InvalidParamException("value",
 					val.toString(),
@@ -233,11 +258,16 @@
 		while (!expression.end()) {
 			val = expression.getValue();
 			op = expression.getOperator();
-			if (val.getType() != CssTypes.CSS_NUMBER &&
-					val.getType() != CssTypes.CSS_LENGTH) {
-				throw new InvalidParamException("value",
-						val.toString(),
-						caller.getPropertyName(), ac);
+			switch (val.getType()) {
+				case CssTypes.CSS_NUMBER:
+					val.getLength();
+				case CssTypes.CSS_LENGTH:
+				case CssTypes.CSS_PERCENTAGE:
+					break;
+				default:
+					throw new InvalidParamException("value",
+							val.toString(),
+							caller.getPropertyName(), ac);
 			}
 			expression.next();
 			if (!expression.end() && (op != COMMA)) {
@@ -255,11 +285,16 @@
 		}
 		CssValue val;
 		val = expression.getValue();
-		if (val.getType() != CssTypes.CSS_NUMBER &&
-				val.getType() != CssTypes.CSS_LENGTH) {
-			throw new InvalidParamException("value",
-					val.toString(),
-					caller.getPropertyName(), ac);
+		switch (val.getType()) {
+			case CssTypes.CSS_NUMBER:
+				val.getLength();
+			case CssTypes.CSS_LENGTH:
+			case CssTypes.CSS_PERCENTAGE:
+				break;
+			default:
+				throw new InvalidParamException("value",
+						val.toString(),
+						caller.getPropertyName(), ac);
 		}
 		expression.next();
 	}
@@ -278,11 +313,16 @@
 		for (int i = 0; i < 2; i++) {
 			val = expression.getValue();
 			op = expression.getOperator();
-			if (val.getType() != CssTypes.CSS_NUMBER &&
-					val.getType() != CssTypes.CSS_LENGTH) {
-				throw new InvalidParamException("value",
-						val.toString(),
-						caller.getPropertyName(), ac);
+			switch (val.getType()) {
+				case CssTypes.CSS_NUMBER:
+					val.getLength();
+				case CssTypes.CSS_LENGTH:
+				case CssTypes.CSS_PERCENTAGE:
+					break;
+				default:
+					throw new InvalidParamException("value",
+							val.toString(),
+							caller.getPropertyName(), ac);
 			}
 			expression.next();
 			if (op != COMMA) {
@@ -291,7 +331,9 @@
 			}
 		}
 		val = expression.getValue();
-		if (val.getType() != CssTypes.CSS_LENGTH) {
+		if (val.getType() == CssTypes.CSS_NUMBER) {
+			val.getLength();
+		} else if (val.getType() != CssTypes.CSS_LENGTH) {
 			throw new InvalidParamException("value",
 					val.toString(),
 					caller.getPropertyName(), ac);
Received on Friday, 19 October 2012 13:24:22 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:52 UTC