Fixes stylus#698: incorrect function call within for with named argument

tonistiigi · May 28, 2012 · c40251a · c40251a
1 parent 76e3d3b
commit c40251a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/lib/visitor/evaluator.js b/lib/visitor/evaluator.js
@@ -326,9 +326,11 @@ Evaluator.prototype.visitCall = function(call){
 
   // Evaluate arguments
   this.return++;
-  var args = this.visit(call.args);
-  for (var key in call.args.map) {
-    call.args.map[key] = this.visit(call.args.map[key]);
+  var args = this.visit(call.args)
+    , mapCopy = {};
+  for (var key in args.map) {
+    mapCopy[key] = args.map[key];
+    args.map[key] = this.visit(mapCopy[key].clone());
   }
   this.return--;
 
@@ -342,6 +344,9 @@ Evaluator.prototype.visitCall = function(call){
     ret = this.invokeFunction(fn, args);
   }
 
+  for (key in mapCopy) {
+    args.map[key] = mapCopy[key];
+  }
   this.calling.pop();
   this.ignoreColors = false;
   return ret;

diff --git a/test/cases/for.css b/test/cases/for.css
@@ -36,6 +36,11 @@ body foo {
 body foo {
   bar: 3;
 }
+body {
+  bar: 1;
+  bar: 2;
+  bar: 3;
+}
 body foo bar {
   baz: 1;
 }

diff --git a/test/cases/for.styl b/test/cases/for.styl
@@ -29,6 +29,13 @@ body
   for n in 1 2 3
     foo
       bar n
+
+func(num)
+  return num
+
+body
+  for n in 1 2 3
+    bar func(num: n)
 
 test(args...)
   foo