Merge pull request #1837 from mgreter/bugfix/each-parent-selector-list

Fix iterating over parent selector list with `@each`
sass · Jan 9, 2016 · 92ddab3 · 92ddab3
2 parents a227315 + 490cd67
commit 92ddab3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/eval.cpp b/src/eval.cpp
@@ -217,7 +217,7 @@ namespace Sass {
     Expression* expr = e->list()->perform(this);
     Env env(environment(), true);
     exp.env_stack.push_back(&env);
-    List* list = 0;
+    Vectorized<Expression*>* list = 0;
     Map* map = 0;
     if (expr->concrete_type() == Expression::MAP) {
       map = static_cast<Map*>(expr);
@@ -252,6 +252,9 @@ namespace Sass {
       }
     }
     else {
+      if (list->length() == 1 && dynamic_cast<Selector_List*>(list)) {
+        list = dynamic_cast<Vectorized<Expression*>*>(list);
+      }
       for (size_t i = 0, L = list->length(); i < L; ++i) {
         Expression* e = (*list)[i];
         // unwrap value if the expression is an argument

diff --git a/src/expand.cpp b/src/expand.cpp
@@ -442,7 +442,7 @@ namespace Sass {
   {
     std::vector<std::string> variables(e->variables());
     Expression* expr = e->list()->perform(&eval);
-    List* list = 0;
+    Vectorized<Expression*>* list = 0;
     Map* map = 0;
     if (expr->concrete_type() == Expression::MAP) {
       map = static_cast<Map*>(expr);
@@ -478,6 +478,9 @@ namespace Sass {
     }
     else {
       // bool arglist = list->is_arglist();
+      if (list->length() == 1 && dynamic_cast<Selector_List*>(list)) {
+        list = dynamic_cast<Vectorized<Expression*>*>(list);
+      }
       for (size_t i = 0, L = list->length(); i < L; ++i) {
         Expression* e = (*list)[i];
         // unwrap value if the expression is an argument