fixed negation bug leafo#197

leafo · leafo · commit 7140eee22bd2 · 2012-02-20T12:55:38.000-08:00
diff --git a/lessc.inc.php b/lessc.inc.php
@@ -462,9 +462,20 @@ function value(&$value) {
 
 		// see if there is a negation
 		$s = $this->seek();
-		if ($this->literal('-', false) && $this->variable($var)) {
-			$value = array('negative', array('variable', $var));
-			return true;
+		if ($this->literal('-', false)) {
+			$value = null;
+			if ($this->variable($var)) {
+				$value = array('variable', $var);
+			} elseif ($this->buffer{$this->count} == "(" && $this->expression($exp)) {
+				$value = $exp;
+			} else {
+				$this->seek($s);
+			}
+
+			if (!is_null($value)) {
+				$value = array('negative', $value);
+				return true;
+			}
 		} else {
 			$this->seek($s);
 		}
@@ -795,7 +806,7 @@ function tag(&$tag, $simple = false) {
 	function func(&$func) {
 		$s = $this->seek();
 
-		if ($this->match('(%|[\w\-_][\w\-_:\.]*)', $m) && $this->literal('(')) {
+		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
 			$fname = $m[1];
 
 			$s_pre_args = $this->seek();
diff --git a/tests/inputs/math.less b/tests/inputs/math.less
@@ -61,6 +61,15 @@
 }
 
 
+.negation {
+    hello: -(1px);
+    hello: 0-(1px);
+
+	@something: 10;
+	hello: -@something;
+}
+
+
 // and now here are the tests
 
 .test {
diff --git a/tests/outputs/math.css b/tests/outputs/math.css
@@ -25,6 +25,11 @@
   mul:50;
 }
 .keyword-names { height:"hello" 25; }
+.negation {
+  hello:-1px;
+  hello:-1px;
+  hello:-10;
+}
 .test {
   single:5;
   single:10;
