moved loop() over to saw.nest

Author: James Halliday

index.js

@@ -95,22 +95,19 @@ exports.stream = function (em, eventName) {
             next();
         };
 
-        self.loop = function loop (cb) {
+        self.loop = function (cb) {
             var end = false;
 
-            var s = Chainsaw.saw(builder, {});
-            s.on('end', function () {
-                if (!end) self.loop(cb)
-            });
-            
-            var r = builder.call(s.handlers, s);
-            if (r !== undefined) s.handlers = r;
-            
-            var ch = s.chain();
-            ch.vars = vars.store;
-            cb.call(ch, function () {
-                end = true;
-                next();
+            saw.nest(false, function loop () {
+                this.vars = vars.store;
+                cb.call(this, function () {
+                    end = true;
+                    next();
+                }, vars.store);
+                this.tap(function () {
+                    if (end) saw.next()
+                    else loop.call(this)
+                });
             }, vars.store);
         };
 

package.json

@@ -21,7 +21,7 @@
         "url" : "http://substack.net"
     },
     "dependencies" : {
-        "chainsaw" : ">=0.0.4",
+        "chainsaw" : ">=0.0.7",
         "put" : ">=0.0.1",
         "buffers" : ">=0.0.1"
     },

test/binary.js

@@ -360,13 +360,13 @@ exports.loop = function () {
     }, 500);
 
     Binary.stream(em)
-        .loop(function (end) {
-            var vars_ = this.vars;
+        .loop(function (end, vars) {
+            assert.ok(vars === this.vars);
             this
                 .word16lu('a')
                 .word8u('b')
                 .word8s('c')
-                .tap(function (vars) {
+                .tap(function (vars_) {
                     assert.ok(vars === vars_);
                     times ++;
                     if (vars.c < 0) end();