Recursive mixins

lessc.inc.php

@@ -647,9 +647,6 @@ protected function compileProp($prop, $block, $out) {
 					$this->zipSetArgs($mixin->args, $args);
 				}
 
-				$oldParent = $mixin->parent;
-				if ($mixin != $block) $mixin->parent = $block;
-
 				foreach ($this->sortProps($mixin->props) as $subProp) {
 					if ($suffix !== null &&
 						$subProp[0] == "assign" &&
@@ -665,8 +662,6 @@ protected function compileProp($prop, $block, $out) {
 					$this->compileProp($subProp, $mixin, $out);
 				}
 
-				$mixin->parent = $oldParent;
-
 				if ($haveArgs) $this->popEnv();
 				if ($haveScope) $this->popEnv();
 			}

tests/bootstrap.sh

@@ -6,7 +6,7 @@ echo "have git and lessc installed."
 echo ""
 
 if [ -z "$input" ]; then
-  input="bootstrap/less/bootstrap.less"
+  input="bootstrap/less/responsive.less"
 fi
 dest=$(basename "$input")
 dest="${dest%.*}"
@@ -28,7 +28,7 @@ echo ">> lessc compilation ($input)"
 lessc "$input" "tmp/$dest.lessc.css"
 
 echo ">> lessphp compilation ($input)"
-../plessc "$input" "tmp/$dest.lessphp.css"
+php ../plessc "$input" "tmp/$dest.lessphp.css"
 echo ">> Cleanup and convert"
 
 php sort.php "tmp/$dest.lessc.css" > "tmp/$dest.lessc.clean.css"

tests/inputs/recursion.less

@@ -0,0 +1,23 @@
+.set(@width) {
+    .spanX(@index)when (@index > 0) {
+        (~".span@{index}") {
+            width: @width;
+        }
+        .spanX(@index - 1);
+    }
+
+    .spanX(0) {
+    }
+
+    .row {
+        .spanX (3);
+    }
+}
+
+.set1 {
+    .set(10px);
+}
+
+.set2 {
+    .set(33px);
+}

tests/outputs/recursion.css

@@ -0,0 +1,18 @@
+.set1 .row .span3 {
+  width: 10px;
+}
+.set1 .row .span2 {
+  width: 10px;
+}
+.set1 .row .span1 {
+  width: 10px;
+}
+.set2 .row .span3 {
+  width: 33px;
+}
+.set2 .row .span2 {
+  width: 33px;
+}
+.set2 .row .span1 {
+  width: 33px;
+}

tests/sort.php

@@ -34,8 +34,9 @@ function sortKey($block) {
 	}
 
 	function sortBlock($block) {
-		usort($block->children, function($a, $b) {
-			$sort = strcmp($this->sortKey($a), $this->sortKey($b));
+		$that = $this;
+		usort($block->children, function($a, $b) use ($that) {
+			$sort = strcmp($that->sortKey($a), $that->sortKey($b));
 			if ($sort == 0) {
 				// TODO
 			}