Rework the int-checking to use proper type-tainting rather than just checking at the very end. Per WG discussion, this lets us type-check for integer even when we allow things like attr(foo integer) that aren't known at parse-time.

--HG--
extra : rebase_source : 36e3ec24b70ed433dfcc24dd674ce10d06af075e

Author: tabatkins

css3-values/Overview.html

@@ -1482,17 +1482,26 @@ <h4 id=calc-type-checking><span class=secno>8.1.2. </span> Type Checking</h4>
    operators for simplicity):
 
   <ul>
-   <li>At ‘<code class=css>,</code>’, ‘<code class=css>+</code>’, or
-    ‘<code class=css>-</code>’, check that both sides have the same type;
-    resolve to that type.
-
-   <li>At ‘<code class=css>*</code>’, check that at least one side is <a
-    href="#number-value"><var>&lt;number></var></a>; resolve to the type of
-    the other side
-
-   <li>At ‘<code class=css>/</code>’, check that the right side is <a
-    href="#number-value"><var>&lt;number></var></a>; resolve to the type of
-    the left side.
+   <li> At ‘<code class=css>,</code>’, ‘<code class=css>+</code>’, or
+    ‘<code class=css>-</code>’, check that both sides have the same type,
+    or that one side is a <a href="#number-value"><var>&lt;number></var></a>
+    and the other is an <a href="#integer-value"><var>&lt;integer></var></a>.
+    If both sides are the same type, resolve to that type. If one side is a
+    <a href="#number-value"><var>&lt;number></var></a> and the other is an <a
+    href="#integer-value"><var>&lt;integer></var></a>, resolve to <a
+    href="#number-value"><var>&lt;number></var></a>.
+
+   <li> At ‘<code class=css>*</code>’, check that at least one side is <a
+    href="#number-value"><var>&lt;number></var></a>. If both sides are <a
+    href="#integer-value"><var>&lt;integer></var></a>, resolve to <a
+    href="#integer-value"><var>&lt;integer></var></a>. Otherwise, resolve to
+    the type of the other side.
+
+   <li> At ‘<code class=css>/</code>’, check that the right side is <a
+    href="#number-value"><var>&lt;number></var></a>. If the left side is <a
+    href="#integer-value"><var>&lt;integer></var></a>, resolve to <a
+    href="#number-value"><var>&lt;number></var></a>. Otherwise, resolve to
+    the type of the left side.
   </ul>
 
   <p>If an operator does not pass the above checks, the expression is
@@ -1501,11 +1510,6 @@ <h4 id=calc-type-checking><span class=secno>8.1.2. </span> Type Checking</h4>
    to zero (as purely-numeric expressions can be evaluated without any
    additional information at parse time).
 
-  <p> If the type of the result, after resolving all subexpressions, is an
-   integral <a href="#number-value"><var>&lt;number></var></a>, the
-   calc()&apos;s resolved type is <a
-   href="#integer-value"><var>&lt;integer></var></a>.
-
   <h4 id=calc-range><span class=secno>8.1.3. </span> Range Checking</h4>
 
   <p>The value resulting from an expression must be clamped to the range

css3-values/Overview.src.html

@@ -1037,14 +1037,30 @@ <h4 id='calc-type-checking'>
 	the operators for simplicity):
 
 	<ul>
-		<li>At '','', ''+'', or ''-'', check that both sides have the same type;
-		resolve to that type.</li>
+		<li>
+			At '','', ''+'', or ''-'', 
+			check that both sides have the same type,
+			or that one side is a <var>&lt;number></var> and the other is an <var>&lt;integer></var>.
+			If both sides are the same type,
+			resolve to that type.
+			If one side is a <var>&lt;number></var> and the other is an <var>&lt;integer></var>,
+			resolve to <var>&lt;number></var>.
 
-		<li>At ''*'', check that at least one side is <var>&lt;number></var>; 
-		resolve to the type of the other side</li>
+		<li>
+			At ''*'', 
+			check that at least one side is <var>&lt;number></var>.
+			If both sides are <var>&lt;integer></var>,
+			resolve to <var>&lt;integer></var>.
+			Otherwise,
+			resolve to the type of the other side.
 
-		<li>At ''/'', check that the right side is <var>&lt;number></var>;
-		resolve to the type of the left side.</li>
+		<li>
+			At ''/'', 
+			check that the right side is <var>&lt;number></var>.
+			If the left side is <var>&lt;integer></var>,
+			resolve to <var>&lt;number></var>.
+			Otherwise,
+			resolve to the type of the left side.
 	</ul>
 
 	<p>If an operator does not pass the above checks, the expression is invalid.
@@ -1053,12 +1069,6 @@ <h4 id='calc-type-checking'>
 	(as purely-numeric expressions can be evaluated without any additional 
 	information at parse time).</p>
 
-	<p>
-		If the type of the result,
-		after resolving all subexpressions,
-		is an integral <var>&lt;number></var>,
-		the calc()&apos;s resolved type is <var>&lt;integer></var>.
-
 <h4 id='calc-range'>
 Range Checking</h4>