Implement callbacked break up.

Closes #197.
bigeasy · Feb 26, 2014 · 38aaaf6 · 38aaaf6
1 parent 92d1ef8
commit 38aaaf6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 31 deletions.
diff --git a/index.js b/index.js
@@ -103,18 +103,7 @@ function cadence () {
 
         if (vargs[0] != null) {
             if (vargs[0].invoke === invoke) {
-                var iterator = frame
-                var label = vargs.shift()
-                while (iterator.args) {
-                    if (iterator.args[0].steps[0] === label.step) {
-                        iterator.args[1] = 1
-                        iterator.args[2].callbacks = frame.callbacks
-                        if (!vargs.length) return true
-                        return createHandler(frame, false, vargs)
-                    }
-                    iterator.args[1] = iterator.args[0].steps.length
-                    iterator = iterator.caller
-                }
+                frame.callbacks[0].results[0].push(vargs.shift())
             }
 
             if (vargs[0] === -1) {
@@ -431,6 +420,7 @@ function cadence () {
         frames[0].args = [ cadence, index + 1, frames[0], denouement ]
 
         hold = step()
+        var results = frames[0].callbacks[0].results[0] = [ null, invoke ]
         try {
             result = cadence.steps[index].apply(this, vargs)
         } catch (errors) {
@@ -446,7 +436,7 @@ function cadence () {
             frames[0].called = frames[0].count - 1
         }
         frames.shift()
-        hold.apply(this, [ null, invoke ].concat(result === void(0) ? vargs : [ result ]))
+        hold.apply(this, results.concat([ result === void(0) ? vargs : result ]))
     }
 
     return execute

diff --git a/release.md b/release.md
@@ -1,5 +1,6 @@
 ### Issue by Issue
 
+ * Implement callbacked break up. #197.
  * Implement break up. #196.
  * Remove `Label` class. #195.
  * Implement jump out. #194.

diff --git a/t/cadence/loop.t.js b/t/cadence/loop.t.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-require('proof')(21, function (step, equal, deepEqual) {
+require('proof')(20, function (step, equal, deepEqual) {
     var fs = require('fs')
     var cadence = require('../..')
 
@@ -114,27 +114,12 @@ require('proof')(21, function (step, equal, deepEqual) {
 
     cadence(function (step) {
         var count = 0
-        var retry = step([function (retry) {
-            if (retry) count++
-            if (count != 10) throw new Error
-            else step(null, 10)
-        }, function () {
-            step()(null, true)
-            step(retry)
-        }])(1)
-    })(function (error, result) {
-        if (error) throw error
-        equal(result, 10, 'loop continue')
-    })
-
-    cadence(function (step) {
-        var count = 0
-        var retry = step([function (retry) {
+        var retry = step([function (_, retry) {
             if (retry) count++
             if (count != 10) throw new Error
             else step(null, 10)
         }, function () {
-            step(retry, 1)(null, true)
+            step(retry(), 1)(null, true)
         }])(1)
     })(function (error, result) {
         if (error) throw error