fix types for number operators leafo#195 leafo#143 thanks @andrewtch

leafo · leafo · commit 18cd933978a9 · 2012-02-21T19:36:22.000-08:00
diff --git a/lessc.inc.php b/lessc.inc.php
@@ -1958,11 +1958,8 @@ function op_color_color($op, $left, $right) {
 
 	// operator on two numbers
 	function op_number_number($op, $left, $right) {
-		if ($right[0] == '%') $right[1] /= 100;
-
-		// figure out type
-		if ($right[0] == 'number' || $right[0] == '%') $type = $left[0];
-		else $type = $right[0];
+		$type = is_null($left) ? "number" : $left[0];
+		if ($type == "number") $type = $right[0];
 
 		$value = 0;
 		switch ($op) {
diff --git a/tests/inputs/math.less b/tests/inputs/math.less
@@ -94,3 +94,23 @@
 	margin: 4 * (5 + 5) / 2 - (@var * 2);
 }
 
+.percents {
+	color: 100 * 10%;
+	color: 10% * 100;
+	color: 10% * 10%;
+
+	color: 100px * 10%; // lessjs makes this px
+	color: 10% * 100px; // lessjs makes this %
+
+	color: 20% + 10%;
+	color: 20% - 10%;
+
+	color: 20% / 10%;
+}
+
+.misc {
+	x: 10px * 4em;
+	y: 10 * 4em;
+
+}
+
diff --git a/tests/outputs/math.css b/tests/outputs/math.css
@@ -44,4 +44,18 @@
   width:96;
   height:113;
   margin:12;
+}
+.percents {
+  color:1000%;
+  color:1000%;
+  color:100%;
+  color:1000px;
+  color:1000%;
+  color:30%;
+  color:10%;
+  color:2%;
+}
+.misc {
+  x:40px;
+  y:40em;
 }
