Fixed for loops with variable declarator list

fuzzie360 · fuzzie360 · commit 737e7335bfec · 2016-02-08T23:57:23.000+08:00
diff --git a/demo/gpu-demo.js b/demo/gpu-demo.js
@@ -65,8 +65,8 @@ console.log("startup code", [set_a, set_b]);
 function benchmarkCode(mode) {
 	var runFunction = gpu.createKernel(function(a, b) {
 		var res = 0.0;
-		var i = 0.0;
-		for(i = 0.0; i < 500000; ++i) {
+		
+		for(var i = 0.0; i < 500000; i++) {
 			res += Math.sqrt( a[this.thread.x] * b[this.thread.x] );
 		}
 		 
@@ -86,13 +86,13 @@ function runBenchmark() {
 	$(".cpu_result_gpu").removeClass("alert-success").addClass("alert-warning").html("GPU: Running ... ");
 	var gpuTime = bench(function(){
 		benchmarkCode('gpu');
-	}, 10, [], this);
+	}, 1, [], this);
 	$(".cpu_result_gpu").removeClass("alert-warning").addClass("alert-success").html("GPU: "+gpuTime+" ms");
 	
 	$(".cpu_result_cpu").removeClass("alert-success").addClass("alert-warning").html("CPU: Running ... ");
 	cpuTime = bench(function(){
 		benchmarkCode('cpu');
-	}, 10, [], this);
+	}, 1, [], this);
 	$(".cpu_result_cpu").removeClass("alert-warning").addClass("alert-success").html("CPU: "+cpuTime+" ms");
 	
 	$(".cpu_result_ovl").removeClass("alert-warning").addClass("alert-success").html("Percentage Gain: "+Math.round(cpuTime/gpuTime*100)+"%");
diff --git a/src/backend/glsl.js b/src/backend/glsl.js
@@ -377,6 +377,13 @@
 			if(ast === null) {
 				throw ast_errorOutput("NULL ast", ast, stateParam);
 			} else {
+				if (Array.isArray(ast)) {
+					for (var i=0; i<ast.length; i++) {
+						ast_generic(ast[i], retArr, stateParam);
+					}
+					return retArr;
+				}
+				
 				switch(ast.type) {
 					case "FunctionExpression":
 						return ast_FunctionExpression(ast, retArr, stateParam);
diff --git a/test/src/basic_for_loop.js b/test/src/basic_for_loop.js
@@ -2,8 +2,7 @@ function basic_for_loop_test( assert, mode ) {
 	var gpu = new GPU();
 	var f = gpu.createKernel(function(a, b) {
 		var x = 0.0;
-		var i = 0.0;
-		for(i = 0.0; i<10.0; ++i) {
+		for(var i = 0.0; i<10.0; i++) {
 			x = x + 1.0;
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@ function basic_for_loop_test( assert, mode ) {`
`2`	`2`	`var gpu = new GPU();`
`3`	`3`	`var f = gpu.createKernel(function(a, b) {`
`4`	`4`	`var x = 0.0;`
`5`		`- var i = 0.0;`
`6`		`- for(i = 0.0; i<10.0; ++i) {`
	`5`	`+ for(var i = 0.0; i<10.0; i++) {`
`7`	`6`	`x = x + 1.0;`
`8`	`7`	`}`
`9`	`8`