Variable arguments last to counted or each loops.

Always put the variables arguments last when the loop is a counted loop or an each loop. Closes #193.
bigeasy · Feb 23, 2014 · efb9ea3 · efb9ea3
1 parent eea8823
commit efb9ea3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -209,7 +209,11 @@ function cadence () {
                 callback.steps.unshift(function () {
                     var vargs = __slice.call(arguments)
                     if (whilst()) {
-                        step().apply(this, [null].concat(each ? [counter[count]] : vargs).concat([count]))
+                        if (counter) {
+                            step().apply(this, [].concat.apply([null], [ each ? counter[count] : [], count, vargs ]))
+                        } else {
+                            step().apply(this, [null].concat(vargs).concat([ count ]))
+                        }
                     } else if (gather) {
                         var release = createHandler(frame, false, [0])
                         step.apply(this, [null].concat(vargs))

diff --git a/release.md b/release.md
@@ -0,0 +1,3 @@
+### Issue by Issue
+
+ * Variable arguments last to counted or each loops. #193.
diff --git a/t/cadence/loop.t.js b/t/cadence/loop.t.js
@@ -64,7 +64,7 @@ require('proof')(19, function (step, equal, deepEqual) {
 
     cadence(function (step) {
         var outer = { count: 0, flag: true }
-        step(function (flag, count) {
+        step(function (count, flag) {
             equal(flag, outer.flag, 'got flag in counted loop ' + (count + 1))
             equal(count, outer.count++, 'got count in counted loop' + (count + 1))
             outer.flag = false