issue #254 - esprima generators transform is ready

Sage · Mar 6, 2015 · 9822e63 · 9822e63
1 parent 583eca0
commit 9822e63
Show file tree

Hide file tree

Showing 3 changed files with 201 additions and 201 deletions.
diff --git a/lib/fibers/transform-esprima.js b/lib/fibers/transform-esprima.js
@@ -559,9 +559,9 @@ function transform(source, options) {
 				catchup(expr.range[1]);
 				buffer.add("," + idx + ")(");
 				// process arguments to avoid 'invalid usage of callback' error
-				skipTo(args[0].range[0]);
 				for (var ii = 0; ii < args.length; ++ii) {
-					catchup(args[ii].range[0]);
+					skipTo(args[ii].range[0]);
+					if (ii > 0) buffer.add(', ');
 					if (ii !== idx) {
 						walk(args[ii]);
 						catchup(args[ii].range[1]);
@@ -593,7 +593,7 @@ function transform(source, options) {
 			if (operator === '!' || operator === 'void') {
 				if (argument.type === 'Identifier' && argument.name === callback) {
 					catchup(this.range[0]);
-					buffer.add(this.operator === '!' ? 'false' : 'null');
+					buffer.add(operator === '!' ? 'false' : 'null');
 					skipTo(this.range[1]);
 				} else {
 					walk(argument);

diff --git a/lib/fibers/walker-esprima.js b/lib/fibers/walker-esprima.js
@@ -120,9 +120,9 @@ function Walker(visitors) {
 
 			case 'ForStatement':
 				if (visitors[type]) {
-					visitors[type].call(node, node.setup, node.test, node.update, node.body);
+					visitors[type].call(node, node.init, node.test, node.update, node.body);
 				} else {
-					node.setup && walk(node.setup);
+					node.init && walk(node.init);
 					node.test && walk(node.test);
 					node.update && walk(node.update);
 					walk(node.body);