fixes leafo#412 - parsing multiple assignment flags

robocoder · robocoder · commit b1905524a27f · 2016-02-11T00:40:00.000-05:00
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1460,9 +1460,9 @@ protected function compileChild($child, OutputBlock $out)
                 list(, $name, $value) = $child;
 
                 if ($name[0] === Type::T_VARIABLE) {
-                    $flag = isset($child[3]) ? $child[3] : null;
-                    $isDefault = $flag === '!default';
-                    $isGlobal = $flag === '!global';
+                    $flags = isset($child[3]) ? $child[3] : [];
+                    $isDefault = in_array('!default', $flags);
+                    $isGlobal = in_array('!global', $flags);
 
                     if ($isGlobal) {
                         $this->set($name[1], $this->reduce($value), false, $this->rootEnv);
diff --git a/src/Parser.php b/src/Parser.php
@@ -617,8 +617,8 @@ protected function parseChunk()
             $this->end()
         ) {
             // check for '!flag'
-            $assignmentFlag = $this->stripAssignmentFlag($value);
-            $this->append([Type::T_ASSIGN, $name, $value, $assignmentFlag], $s);
+            $assignmentFlags = $this->stripAssignmentFlags($value);
+            $this->append([Type::T_ASSIGN, $name, $value, $assignmentFlags], $s);
 
             return true;
         }
@@ -2287,25 +2287,28 @@ protected function end()
      *
      * @param array $value
      *
-     * @return string
+     * @return array
      */
-    protected function stripAssignmentFlag(&$value)
+    protected function stripAssignmentFlags(&$value)
     {
-        $token = &$value;
+        $flags = [];
 
         for ($token = &$value; $token[0] === Type::T_LIST && ($s = count($token[2])); $token = &$lastNode) {
-            $lastNode = &$token[2][$s - 1];
-
-            if ($lastNode[0] === Type::T_KEYWORD && in_array($lastNode[1], ['!default', '!global'])) {
+            for ($lastNode = &$token[2][$s - 1];
+                $lastNode[0] === Type::T_KEYWORD && in_array($lastNode[1], ['!default', '!global']);
+                $lastNode = $node
+            ) {
                 array_pop($token[2]);
 
+                $node = end($token[2]);
+
                 $token = $this->flattenList($token);
 
-                return $lastNode[1];
+                $flags[] = $lastNode[1];
             }
         }
 
-        return false;
+        return $flags;
     }
 
     /**
diff --git a/tests/inputs/variables.scss b/tests/inputs/variables.scss
@@ -80,3 +80,10 @@ body
 {
 	color: $цвет;
 }
+
+$test: 12 !default !global;
+
+*   {
+    // Expected: 12
+    data: $test;
+}
diff --git a/tests/outputs/variables.css b/tests/outputs/variables.css
@@ -34,3 +34,6 @@ A {
 
 body {
   color: #000; }
+
+* {
+  data: 12; }
diff --git a/tests/outputs_numbered/variables.css b/tests/outputs_numbered/variables.css
@@ -37,3 +37,6 @@ A {
 /* line 79, inputs/variables.scss */
 body {
   color: #000; }
+/* line 86, inputs/variables.scss */
+* {
+  data: 12; }

Original file line number	Diff line number	Diff line change
`@@ -80,3 +80,10 @@ body`
`80`	`80`	`{`
`81`	`81`	`color: $цвет;`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+$test: 12 !default !global;`
	`85`	`+`
	`86`	`+* {`
	`87`	`+ // Expected: 12`
	`88`	`+ data: $test;`
	`89`	`+}`