Merge branch 'xzyfer-fix/issue_510't push origin master

Hampton Catlin · Hampton Catlin · commit 675460fc60e8 · 2014-10-12T09:58:10.000-04:00
diff --git a/functions.cpp b/functions.cpp
@@ -1246,14 +1246,19 @@ namespace Sass {
       return result;
     }
 
-    Signature map_remove_sig = "map-remove($map, $key)";
+    Signature map_remove_sig = "map-remove($map, $keys...)";
     BUILT_IN(map_remove)
     {
+      bool remove;
       Map* m = ARGM("$map", Map, ctx);
-      Expression* v = ARG("$key", Expression);
+      List* arglist = ARG("$keys", List);
       Map* result = new (ctx.mem) Map(path, position, 1);
       for (size_t i = 0, L = m->length(); i < L; ++i) {
-        if (!eq((*m)[i]->key(), v, ctx)) *result << (*m)[i];
+        remove = false;
+        for (size_t j = 0, K = arglist->length(); j < K && !remove; ++j) {
+          remove = eq((*m)[i]->key(), arglist->value_at_index(j), ctx);
+        }
+        if (!remove) *result << (*m)[i];
       }
       return result;
     }

Original file line number	Diff line number	Diff line change
`@@ -1246,14 +1246,19 @@ namespace Sass {`
`1246`	`1246`	`return result;`
`1247`	`1247`	`}`
`1248`	`1248`
`1249`		`- Signature map_remove_sig = "map-remove($map, $key)";`
	`1249`	`+ Signature map_remove_sig = "map-remove($map, $keys...)";`
`1250`	`1250`	`BUILT_IN(map_remove)`
`1251`	`1251`	`{`
	`1252`	`+ bool remove;`
`1252`	`1253`	`Map* m = ARGM("$map", Map, ctx);`
`1253`		`- Expression* v = ARG("$key", Expression);`
	`1254`	`+ List* arglist = ARG("$keys", List);`
`1254`	`1255`	`Map* result = new (ctx.mem) Map(path, position, 1);`
`1255`	`1256`	`for (size_t i = 0, L = m->length(); i < L; ++i) {`
`1256`		`- if (!eq((m)[i]->key(), v, ctx)) result << (*m)[i];`
	`1257`	`+ remove = false;`
	`1258`	`+ for (size_t j = 0, K = arglist->length(); j < K && !remove; ++j) {`
	`1259`	`+ remove = eq((*m)[i]->key(), arglist->value_at_index(j), ctx);`
	`1260`	`+ }`
	`1261`	`+ if (!remove) result << (m)[i];`
`1257`	`1262`	`}`
`1258`	`1263`	`return result;`
`1259`	`1264`	`}`