allow expressions in @media queries

leafo · leafo · commit d729827338db · 2012-02-22T22:42:47.000-08:00
diff --git a/lessc.inc.php b/lessc.inc.php
@@ -572,12 +572,26 @@ function import(&$url, &$media) {
 	}
 
 	// a list of media types, very lenient
-	function mediaTypes(&$types) {
+	function mediaTypes(&$parts) {
+		$parts = array();
+		while ($this->to("(", $chunk, false, "[^{]")) {
+			$parts[] = array('raw', $chunk."(");
+			$s = $this->seek();
+			if ($this->keyword($name) && $this->assign() &&
+				$this->propertyValue($value))
+			{
+				$parts[] = array('assign', $name, $value);
+			} else {
+				$this->seek($s);
+			}
+		}
+
 		if ($this->to('{', $rest, true, true)) {
-			$types = trim($rest);
+			$parts[] = array('raw', $rest);
 			return true;
 		}
 
+		$parts = null;
 		return false;
 	}
 
@@ -1018,7 +1032,7 @@ function compileBlock($block, $parent_tags = null) {
 		if ($special_block) {
 			$this->indentLevel--;
 			if (isset($block->media)) {
-				echo "@media ".$block->media;
+				echo $this->compileMedia($block);
 			} elseif (isset($block->keyframes)) {
 				echo $block->tags[0]." ".
 					$this->compileValue($this->reduce($block->keyframes));
@@ -1374,6 +1388,21 @@ function compileValue($value) {
 		}
 	}
 
+	function compileMedia($block) {
+		$mediaParts = array();
+		foreach ($block->media as $part) {
+			if ($part[0] == "raw") {
+				$mediaParts[] = $part[1];
+			} elseif ($part[0] == "assign") {
+				list(, $propName, $propVal) = $part;
+				$mediaParts[] = "$propName: ".
+					$this->compileValue($this->reduce($propVal));
+			}
+		}
+
+		return "@media ".trim(implode($mediaParts));
+	}
+
 	function lib_isnumber($value) {
 		return $this->toBool(is_numeric($value[1]));
 	}
@@ -2090,8 +2119,13 @@ function preg_quote($what) {
 
 	// advance counter to next occurrence of $what
 	// $until - don't include $what in advance
+	// $allowNewline, if string, will be used as valid char set
 	function to($what, &$out, $until = false, $allowNewline = false) {
-		$validChars = $allowNewline ? "." : "[^\n]";
+		if (is_string($allowNewline)) {
+			$validChars = $allowNewline;
+		} else {
+			$validChars = $allowNewline ? "." : "[^\n]";
+		}
 		if (!$this->match('('.$validChars.'*?)'.$this->preg_quote($what), $m, !$until)) return false;
 		if ($until) $this->count -= strlen($what); // give back $what
 		$out = $m[1];
@@ -2111,7 +2145,7 @@ function match($regex, &$out, $eatWhitespace = true) {
 	// match something without consuming it
 	function peek($regex, &$out = null) {
 		$r = '/'.$regex.'/Ais';
-		$result =  preg_match($r, $this->buffer, $out, null, $this->count);
+		$result = preg_match($r, $this->buffer, $out, null, $this->count);
 		
 		return $result;
 	}
diff --git a/tests/inputs/media.less b/tests/inputs/media.less
@@ -25,3 +25,14 @@
     body { color: blue }
 }
 
+
+@media screen and (min-height: 100px + 10px) {
+	body { color: red; }
+}
+
+@cool: 100px;
+
+@media screen and (height: @cool) and (width: @cool + 10), (size: @cool + 20) {
+	body { color: red; }
+}
+
diff --git a/tests/outputs/media.css b/tests/outputs/media.css
@@ -19,4 +19,10 @@
 @media screen and (min-width: 102.5em) and (max-width: 117.9375em),
 	screen and (min-width: 150em) {
   body { color:blue; }
+}
+@media screen and (min-height: 110px) {
+  body { color:red; }
+}
+@media screen and (height: 100px) and (width: 110px), (size: 120px) {
+  body { color:red; }
 }
