passing modume names to all ast blocks

Author: ppaska

src/evaluator/evaluator.ts

@@ -49,7 +49,7 @@ export class Evaluator {
                 if (err instanceof JspyEvalError) {
                     throw err;
                 } else {
-                    const loc = node.loc ? node.loc : [0, 0]
+                    const loc = node.loc ? node.loc : [0, 0];
                     throw new JspyEvalError(ast.name, loc[0], loc[1], err.message || err)
                 }
             }
@@ -131,9 +131,9 @@ export class Evaluator {
         if (node.type === 'if') {
             const ifNode = node as IfNode;
             if (this.evalNode(ifNode.conditionNode, blockContext)) {
-                this.evalBlock({ type: 'if', body: ifNode.ifBody } as AstBlock, blockContext);
+                this.evalBlock({ name: blockContext.moduleName, type: 'if', body: ifNode.ifBody } as AstBlock, blockContext);
             } else if (ifNode.elseBody) {
-                this.evalBlock({ type: 'if', body: ifNode.elseBody } as AstBlock, blockContext);
+                this.evalBlock({ name: blockContext.moduleName, type: 'if', body: ifNode.elseBody } as AstBlock, blockContext);
             }
 
             return;
@@ -166,7 +166,7 @@ export class Evaluator {
 
             for (let item of array) {
                 blockContext.blockScope.set(forNode.itemVarName, item);
-                this.evalBlock({ type: 'for', body: forNode.body } as AstBlock, blockContext);
+                this.evalBlock({ name: blockContext.moduleName, type: 'for', body: forNode.body } as AstBlock, blockContext);
                 if (blockContext.continueCalled) { blockContext.continueCalled = false; }
                 if (blockContext.breakCalled) { break; }
             }
@@ -178,7 +178,7 @@ export class Evaluator {
             const whileNode = node as WhileNode;
 
             while (this.evalNode(whileNode.condition, blockContext)) {
-                this.evalBlock({ type: 'while', body: whileNode.body } as AstBlock, blockContext);
+                this.evalBlock({ name: blockContext.moduleName, type: 'while', body: whileNode.body } as AstBlock, blockContext);
 
                 if (blockContext.continueCalled) { blockContext.continueCalled = false; }
                 if (blockContext.breakCalled) { break; }

src/evaluator/evaluatorAsync.ts

@@ -138,9 +138,9 @@ export class EvaluatorAsync {
         if (node.type === 'if') {
             const ifNode = node as IfNode;
             if (await this.evalNodeAsync(ifNode.conditionNode, blockContext)) {
-                await this.evalBlockAsync({ type: 'if', body: ifNode.ifBody } as AstBlock, blockContext);
+                await this.evalBlockAsync({ name: blockContext.moduleName, type: 'if', body: ifNode.ifBody } as AstBlock, blockContext);
             } else if (ifNode.elseBody) {
-                await this.evalBlockAsync({ type: 'if', body: ifNode.elseBody } as AstBlock, blockContext);
+                await this.evalBlockAsync({ name: blockContext.moduleName, type: 'if', body: ifNode.elseBody } as AstBlock, blockContext);
             }
 
             return;
@@ -173,7 +173,7 @@ export class EvaluatorAsync {
 
             for (let item of array) {
                 blockContext.blockScope.set(forNode.itemVarName, item);
-                await this.evalBlockAsync({ type: 'for', body: forNode.body } as AstBlock, blockContext);
+                await this.evalBlockAsync({ name: blockContext.moduleName, type: 'for', body: forNode.body } as AstBlock, blockContext);
                 if (blockContext.continueCalled) { blockContext.continueCalled = false; }
                 if (blockContext.breakCalled) { break; }
             }
@@ -185,7 +185,7 @@ export class EvaluatorAsync {
             const whileNode = node as WhileNode;
 
             while (await this.evalNodeAsync(whileNode.condition, blockContext)) {
-                await this.evalBlockAsync({ type: 'while', body: whileNode.body } as AstBlock, blockContext);
+                await this.evalBlockAsync({ name: blockContext.moduleName, type: 'while', body: whileNode.body } as AstBlock, blockContext);
 
                 if (blockContext.continueCalled) { blockContext.continueCalled = false; }
                 if (blockContext.breakCalled) { break; }