added trace information to 'for' operation

Author: ppaska

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspython-interpreter",
-  "version": "2.0.12",
+  "version": "2.0.14",
   "description": "JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment",
   "keywords": [
     "python",

src/evaluator/evaluator.ts

@@ -67,12 +67,21 @@ export class Evaluator {
 
         const blockContext = cloneContext(context);
 
-        // set parameters into new scope, based incomming arguments        
-        for (let i = 0; i < funcDef.params?.length || 0; i++) {
-            const argValue = args?.length > i ? args[i] : null;
-            blockContext.blockScope.set(funcDef.params[i], argValue);
+
+        for (let i = 0; i < args?.length || 0; i++) {
+            if (i >= funcDef.params.length) {
+                break;
+                // throw new Error('Too many parameters provided');
+            }
+            blockContext.blockScope.set(funcDef.params[i], args[i]);
         }
 
+        // // set parameters into new scope, based incomming arguments        
+        // for (let i = 0; i < funcDef.params?.length || 0; i++) {
+        //     const argValue = args?.length > i ? args[i] : null;
+        //     blockContext.blockScope.set(funcDef.params[i], argValue);
+        // }
+
         return this.evalBlock(ast, blockContext);
     }
 
@@ -200,12 +209,22 @@ export class Evaluator {
 
             const array = this.evalNode(forNode.sourceArray, blockContext) as unknown[] | string;
 
-            for (let item of array) {
-                blockContext.blockScope.set(forNode.itemVarName, item);
-                this.evalBlock({ name: blockContext.moduleName, type: 'for', body: forNode.body } as AstBlock, blockContext);
-                if (blockContext.continueCalled) { blockContext.continueCalled = false; }
-                if (blockContext.breakCalled) { break; }
+            try {
+                for (let i = 0; i < array.length; i++) {
+                    const item = array[i];
+                    console.log('**DEBUG:', array.length, i);
+
+                    blockContext.blockScope.set(forNode.itemVarName, item);
+                    this.evalBlock({ name: blockContext.moduleName, type: 'for', body: forNode.body } as AstBlock, blockContext);
+                    if (blockContext.continueCalled) { blockContext.continueCalled = false; }
+                    if (blockContext.breakCalled) { break; }
+                }
+
+                console.log('**FOR finished.');
+            } catch (err) {
+                console.log('**FOR FAILED:', err?.message || err);
             }
+
             if (blockContext.breakCalled) { blockContext.breakCalled = false; }
             return;
         }

src/evaluator/evaluatorAsync.ts

@@ -76,12 +76,21 @@ export class EvaluatorAsync {
 
         const blockContext = cloneContext(context);
 
-        // set parameters into new scope, based incomming arguments        
-        for (let i = 0; i < funcDef.params?.length || 0; i++) {
-            const argValue = args?.length > i ? args[i] : null;
-            blockContext.blockScope.set(funcDef.params[i], argValue);
+        for (let i = 0; i < args?.length || 0; i++) {
+            if (i >= funcDef.params.length) {
+                break;
+                // throw new Error('Too many parameters provided');
+            }
+            blockContext.blockScope.set(funcDef.params[i], args[i]);
         }
 
+
+        // // set parameters into new scope, based incomming arguments        
+        // for (let i = 0; i < funcDef.params?.length || 0; i++) {
+        //     const argValue = args?.length > i ? args[i] : null;
+        //     blockContext.blockScope.set(funcDef.params[i], argValue);
+        // }
+
         return await this.evalBlockAsync(ast, blockContext);
     }
 
@@ -208,13 +217,24 @@ export class EvaluatorAsync {
             const forNode = node as ForNode;
 
             const array = await this.evalNodeAsync(forNode.sourceArray, blockContext) as unknown[] | string;
+            try {
 
-            for (let item of array) {
-                blockContext.blockScope.set(forNode.itemVarName, item);
-                await this.evalBlockAsync({ name: blockContext.moduleName, type: 'for', body: forNode.body } as AstBlock, blockContext);
-                if (blockContext.continueCalled) { blockContext.continueCalled = false; }
-                if (blockContext.breakCalled) { break; }
+                for (let i = 0; i < array.length; i++) {
+                    const item = array[i];
+                    console.log('**DEBUG:', array.length, i);
+
+                    blockContext.blockScope.set(forNode.itemVarName, item);
+                    await this.evalBlockAsync({ name: blockContext.moduleName, type: 'for', body: forNode.body } as AstBlock, blockContext);
+                    if (blockContext.continueCalled) { blockContext.continueCalled = false; }
+                    if (blockContext.breakCalled) { break; }
+                }
+
+                console.log('**FOR finished.');
+            } catch (err) {
+                console.log('**FOR FAILED:', err?.message || err);
             }
+
+
             if (blockContext.breakCalled) { blockContext.breakCalled = false; }
             return;
         }