@for with units; fixes #548

leafo · Feb 6, 2018 · d380170 · d380170 · groovenectar · Jun 20, 2018
1 parent 593b929
commit d380170
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1772,9 +1772,18 @@ protected function compileChild($child, OutputBlock $out)
                 list(, $for) = $child;
 
                 $start = $this->reduce($for->start, true);
+                $end   = $this->reduce($for->end, true);
+
+                if ( ! ($start[2] == $end[2] || $end->unitless())) {
+                    $this->throwError('Incompatible units: "%s" and "%s".', $start->unitStr(), $end->unitStr());
+
+                    break;
+                }
+
+                $unit  = $start[2];
                 $start = $start[1];
-                $end = $this->reduce($for->end, true);
-                $end = $end[1];
+                $end   = $end[1];
+
                 $d = $start < $end ? 1 : -1;
 
                 for (;;) {
@@ -1784,7 +1793,7 @@ protected function compileChild($child, OutputBlock $out)
                         break;
                     }
 
-                    $this->set($for->var, new Node\Number($start, ''));
+                    $this->set($for->var, new Node\Number($start, $unit));
                     $start += $d;
 
                     $ret = $this->compileChildren($for->children, $out);