Merge pull request #785 from xzyfer/fix/map-list-coersion

Maps in each with one vairable should coerce into a list
sass · Dec 29, 2014 · 3b0feb9 · 3b0feb9
2 parents b3ff547 + a0e3382
commit 3b0feb9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/eval.cpp b/eval.cpp
@@ -141,8 +141,18 @@ namespace Sass {
 
     if (map) {
       for (auto key : map->keys()) {
-        (*env)[variables[0]] = key;
-        (*env)[variables[1]] = map->at(key);
+        Expression* value = map->at(key);
+
+        if (variables.size() == 1) {
+          List* variable = new (ctx.mem) List(map->path(), map->position(), 2, List::SPACE);
+          *variable << key;
+          *variable << value;
+          (*env)[variables[0]] = variable;
+        } else {
+          (*env)[variables[0]] = key;
+          (*env)[variables[1]] = value;
+        }
+
         val = body->perform(this);
         if (val) break;
       }

diff --git a/expand.cpp b/expand.cpp
@@ -272,8 +272,18 @@ namespace Sass {
 
     if (map) {
       for (auto key : map->keys()) {
-        (*env)[variables[0]] = key->perform(eval->with(env, backtrace));
-        (*env)[variables[1]] = map->at(key)->perform(eval->with(env, backtrace));
+        Expression* k = key->perform(eval->with(env, backtrace));
+        Expression* v = map->at(key)->perform(eval->with(env, backtrace));
+
+        if (variables.size() == 1) {
+          List* variable = new (ctx.mem) List(map->path(), map->position(), 2, List::SPACE);
+          *variable << k;
+          *variable << v;
+          (*env)[variables[0]] = variable;
+        } else {
+          (*env)[variables[0]] = k;
+          (*env)[variables[1]] = v;
+        }
         append_block(body);
       }
     }