circuitscript 0.1.13 → 0.1.14

package/dist/cjs/BaseVisitor.js

@@ -48,7 +48,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             }
             const result = this.runExpressions(this.getExecutor(), ctx.expression());
             this.setResult(ctx, result);
-            this.getExecutor().closeAllBlocks();
+            this.getExecutor().closeOpenPathBlocks();
             this.log('===', 'end', '===');
         };
         this.visitAssignment_expr = (ctx) => {
@@ -669,7 +669,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         const executionLevel = currentExecutionContext.executionLevel;
         const executionContextNamespace = currentExecutionContext.namespace
             + executionContextName + ".";
-        const newExecutor = new execute_js_1.ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.indentLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, currentExecutionContext.warnings, parentContext);
+        const newExecutor = new execute_js_1.ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.scopeLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, currentExecutionContext.warnings, parentContext);
         executionStack.push(newExecutor);
         this.setupDefinedParameters(funcDefinedParameters, passedInParameters, newExecutor);
         return newExecutor;

package/dist/cjs/execute.js

@@ -15,7 +15,7 @@ const helpers_js_1 = require("./helpers.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const utils_js_1 = require("./utils.js");
 class ExecutionContext {
-    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, warnings, parent) {
+    constructor(name, namespace, netNamespace, executionLevel = 0, scopeLevel = 0, silent = false, logger, warnings, parent) {
         this.tmpPointId = 0;
         this.resolveNet = null;
         this.stopFurtherExpressions = false;
@@ -30,10 +30,10 @@ class ExecutionContext {
         this.executionLevel = executionLevel;
         this.logger = logger;
         this.scope = ExecutionScope_js_1.ExecutionScope.create();
-        this.scope.indentLevel = indentLevel;
+        this.scope.scopeLevel = scopeLevel;
         this.setupRoot();
         this.silent = silent;
-        this.log('create new execution context', this.namespace, this.name, this.scope.indentLevel);
+        this.log('create new execution context', this.namespace, this.name, this.scope.scopeLevel);
         this.parentContext = parent;
         this.warnings = warnings;
     }
@@ -45,8 +45,8 @@ class ExecutionContext {
         });
     }
     log(...params) {
-        const indentOutput = ''.padStart(this.scope.indentLevel * 4, '    ');
-        const indentLevelText = this.scope.indentLevel
+        const indentOutput = ''.padStart(this.scope.scopeLevel * 4, '    ');
+        const indentLevelText = this.scope.scopeLevel
             .toString()
             .padStart(3, ' ');
         const args = ['[' + indentLevelText + ']', indentOutput, ...params];
@@ -398,7 +398,7 @@ class ExecutionContext {
             this.addPoint(`${globals_js_1.Delimiter1}${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
         }
-        this.scope.blockStack.set(this.scope.indentLevel, {
+        this.scope.blockStack.set(this.scope.scopeLevel, {
             start_point: [
                 this.scope.currentComponent,
                 this.scope.currentPin,
@@ -411,8 +411,11 @@ class ExecutionContext {
         });
         this.log('enter blocks');
     }
-    exitBlocks() {
-        const stackRef = this.scope.blockStack.get(this.scope.indentLevel);
+    exitBlocks(scopeLevel = null) {
+        if (scopeLevel === null) {
+            scopeLevel = this.scope.scopeLevel;
+        }
+        const stackRef = this.scope.blockStack.get(scopeLevel);
         const { type: blockType } = stackRef;
         if (blockType === globals_js_1.BlockTypes.Join || blockType === globals_js_1.BlockTypes.Parallel) {
             const { end_point: finalPoint } = stackRef;
@@ -429,16 +432,18 @@ class ExecutionContext {
             const { start_point: [component, pin,] } = stackRef;
             this.atComponent(component, pin, { addSequence: true });
         }
-        this.scope.blockStack.delete(this.scope.indentLevel);
+        this.scope.blockStack.delete(scopeLevel);
         this.log('exit blocks');
     }
-    closeAllBlocks() {
-        if (this.scope.blockStack.has(this.scope.indentLevel)) {
+    closeOpenPathBlocks() {
+        const scope = this.scope;
+        const scopeLevel = scope.scopeLevel;
+        if (scope.blockStack.has(scopeLevel)) {
             this.exitBlocks();
         }
     }
     enterBlock(blockIndex) {
-        const stackRef = this.scope.blockStack.get(this.scope.indentLevel);
+        const stackRef = this.scope.blockStack.get(this.scope.scopeLevel);
         const { type: blockType } = stackRef;
         const blockTypeName = (0, utils_js_1.getBlockTypeString)(blockType);
         stackRef.inner_blocks.set(blockIndex, {
@@ -454,10 +459,10 @@ class ExecutionContext {
             this.atComponent(component, pin, { addSequence: true });
         }
         this.log(`enter inner block of type (${blockTypeName}) >>>`);
-        this.scope.indentLevel += 1;
+        this.scope.scopeLevel += 1;
     }
     exitBlock(blockIndex) {
-        const stackRef = this.scope.blockStack.get(this.scope.indentLevel - 1);
+        const stackRef = this.scope.blockStack.get(this.scope.scopeLevel - 1);
         const { type: blockType } = stackRef;
         const blockIndexRef = stackRef.inner_blocks.get(blockIndex);
         blockIndexRef.last_net = [
@@ -465,7 +470,7 @@ class ExecutionContext {
             this.scope.currentPin,
             this.scope.currentWireId
         ];
-        this.scope.indentLevel -= 1;
+        this.scope.scopeLevel -= 1;
         this.log('exit inner block <<<');
         if (blockType === globals_js_1.BlockTypes.Branch) {
             const { start_point: [component, pin, wireId] } = stackRef;
@@ -506,8 +511,8 @@ class ExecutionContext {
     }
     getPointBlockLocation() {
         this.log('get block point');
-        for (let i = 0; i < this.scope.indentLevel; i++) {
-            const stackRef = this.scope.blockStack.get(this.scope.indentLevel - 1 - i);
+        for (let i = 0; i < this.scope.scopeLevel; i++) {
+            const stackRef = this.scope.blockStack.get(this.scope.scopeLevel - 1 - i);
             const { start_point } = stackRef;
             const component = start_point[0];
             if (component.instanceName.startsWith(`${globals_js_1.Delimiter1}point.`)) {

package/dist/cjs/objects/ExecutionScope.js

@@ -15,7 +15,7 @@ class ExecutionScope {
         this.breakStack = [];
         this.wires = [];
         this.frames = [];
-        this.indentLevel = 0;
+        this.scopeLevel = 0;
         this.netCounter = 1;
         this.unnamedCounter = 1;
         this.currentComponent = null;

package/dist/cjs/visitor.js

@@ -104,17 +104,17 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
             const scope = this.getScope();
             const executor = this.getExecutor();
-            const indentLevel = scope.indentLevel;
-            if (scope.blockStack.has(indentLevel)) {
-                const blockStackEntry = scope.blockStack.get(indentLevel);
+            const scopeLevel = scope.scopeLevel;
+            if (scope.blockStack.has(scopeLevel)) {
+                const blockStackEntry = scope.blockStack.get(scopeLevel);
                 if (blockStackEntry.type !== blockType) {
                     executor.exitBlocks();
                 }
             }
-            if (!scope.blockStack.has(indentLevel)) {
+            if (!scope.blockStack.has(scopeLevel)) {
                 executor.enterBlocks(blockType);
             }
-            const blockStackEntry = scope.blockStack.get(indentLevel);
+            const blockStackEntry = scope.blockStack.get(scopeLevel);
             const { current_index } = blockStackEntry;
             executor.enterBlock(current_index);
             this.visit(ctx.expressions_block());
@@ -122,12 +122,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             blockStackEntry.current_index++;
         };
         this.visitGraph_expressions = (ctx) => {
+            this.getExecutor().log('graph expressions', this.getScope().scopeLevel);
             if (ctx.path_block() === null) {
-                const scope = this.getScope();
-                const indentLevel = scope.indentLevel;
-                if (scope.blockStack.has(indentLevel)) {
-                    this.getExecutor().exitBlocks();
-                }
+                this.getExecutor().closeOpenPathBlocks();
             }
             const ctxPathBlock = ctx.path_block();
             const ctxNotPathBlock = ctx.graph_linear_expression();
@@ -818,9 +815,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, result);
         };
         this.visitAt_block_pin_expr = (ctx) => {
-            const atPin = this.visitResult(ctx.pin_select_expr2());
             const executor = this.getExecutor();
             const [currentComponent, currentPin] = executor.getCurrentPoint();
+            executor.closeOpenPathBlocks();
+            const atPin = this.visitResult(ctx.pin_select_expr2());
             executor.atComponent(currentComponent, atPin, {
                 addSequence: true
             });
@@ -841,11 +839,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             executor.log('entering at block');
             this.visit(ctx.at_component_expr());
             const [currentComponent, currentPin] = executor.getCurrentPoint();
-            executor.scope.indentLevel += 1;
+            executor.scope.scopeLevel += 1;
             ctx.at_block_expressions().forEach(expression => {
                 this.visit(expression);
             });
-            executor.scope.indentLevel -= 1;
+            executor.scope.scopeLevel -= 1;
             executor.scope.setCurrent(currentComponent, currentPin);
             executor.log('leaving at block');
         };

package/dist/esm/BaseVisitor.js

@@ -127,7 +127,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         }
         const result = this.runExpressions(this.getExecutor(), ctx.expression());
         this.setResult(ctx, result);
-        this.getExecutor().closeAllBlocks();
+        this.getExecutor().closeOpenPathBlocks();
         this.log('===', 'end', '===');
     };
     visitAssignment_expr = (ctx) => {
@@ -670,7 +670,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         const executionLevel = currentExecutionContext.executionLevel;
         const executionContextNamespace = currentExecutionContext.namespace
             + executionContextName + ".";
-        const newExecutor = new ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.indentLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, currentExecutionContext.warnings, parentContext);
+        const newExecutor = new ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.scopeLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, currentExecutionContext.warnings, parentContext);
         executionStack.push(newExecutor);
         this.setupDefinedParameters(funcDefinedParameters, passedInParameters, newExecutor);
         return newExecutor;

package/dist/esm/execute.js

@@ -28,17 +28,17 @@ export class ExecutionContext {
     parentContext;
     componentAngleFollowsWire = true;
     warnings = [];
-    constructor(name, namespace, netNamespace, executionLevel = 0, indentLevel = 0, silent = false, logger, warnings, parent) {
+    constructor(name, namespace, netNamespace, executionLevel = 0, scopeLevel = 0, silent = false, logger, warnings, parent) {
         this.name = name;
         this.namespace = namespace;
         this.netNamespace = netNamespace;
         this.executionLevel = executionLevel;
         this.logger = logger;
         this.scope = ExecutionScope.create();
-        this.scope.indentLevel = indentLevel;
+        this.scope.scopeLevel = scopeLevel;
         this.setupRoot();
         this.silent = silent;
-        this.log('create new execution context', this.namespace, this.name, this.scope.indentLevel);
+        this.log('create new execution context', this.namespace, this.name, this.scope.scopeLevel);
         this.parentContext = parent;
         this.warnings = warnings;
     }
@@ -50,8 +50,8 @@ export class ExecutionContext {
         });
     }
     log(...params) {
-        const indentOutput = ''.padStart(this.scope.indentLevel * 4, '    ');
-        const indentLevelText = this.scope.indentLevel
+        const indentOutput = ''.padStart(this.scope.scopeLevel * 4, '    ');
+        const indentLevelText = this.scope.scopeLevel
             .toString()
             .padStart(3, ' ');
         const args = ['[' + indentLevelText + ']', indentOutput, ...params];
@@ -403,7 +403,7 @@ export class ExecutionContext {
             this.addPoint(`${Delimiter1}${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
         }
-        this.scope.blockStack.set(this.scope.indentLevel, {
+        this.scope.blockStack.set(this.scope.scopeLevel, {
             start_point: [
                 this.scope.currentComponent,
                 this.scope.currentPin,
@@ -416,8 +416,11 @@ export class ExecutionContext {
         });
         this.log('enter blocks');
     }
-    exitBlocks() {
-        const stackRef = this.scope.blockStack.get(this.scope.indentLevel);
+    exitBlocks(scopeLevel = null) {
+        if (scopeLevel === null) {
+            scopeLevel = this.scope.scopeLevel;
+        }
+        const stackRef = this.scope.blockStack.get(scopeLevel);
         const { type: blockType } = stackRef;
         if (blockType === BlockTypes.Join || blockType === BlockTypes.Parallel) {
             const { end_point: finalPoint } = stackRef;
@@ -434,16 +437,18 @@ export class ExecutionContext {
             const { start_point: [component, pin,] } = stackRef;
             this.atComponent(component, pin, { addSequence: true });
         }
-        this.scope.blockStack.delete(this.scope.indentLevel);
+        this.scope.blockStack.delete(scopeLevel);
         this.log('exit blocks');
     }
-    closeAllBlocks() {
-        if (this.scope.blockStack.has(this.scope.indentLevel)) {
+    closeOpenPathBlocks() {
+        const scope = this.scope;
+        const scopeLevel = scope.scopeLevel;
+        if (scope.blockStack.has(scopeLevel)) {
             this.exitBlocks();
         }
     }
     enterBlock(blockIndex) {
-        const stackRef = this.scope.blockStack.get(this.scope.indentLevel);
+        const stackRef = this.scope.blockStack.get(this.scope.scopeLevel);
         const { type: blockType } = stackRef;
         const blockTypeName = getBlockTypeString(blockType);
         stackRef.inner_blocks.set(blockIndex, {
@@ -459,10 +464,10 @@ export class ExecutionContext {
             this.atComponent(component, pin, { addSequence: true });
         }
         this.log(`enter inner block of type (${blockTypeName}) >>>`);
-        this.scope.indentLevel += 1;
+        this.scope.scopeLevel += 1;
     }
     exitBlock(blockIndex) {
-        const stackRef = this.scope.blockStack.get(this.scope.indentLevel - 1);
+        const stackRef = this.scope.blockStack.get(this.scope.scopeLevel - 1);
         const { type: blockType } = stackRef;
         const blockIndexRef = stackRef.inner_blocks.get(blockIndex);
         blockIndexRef.last_net = [
@@ -470,7 +475,7 @@ export class ExecutionContext {
             this.scope.currentPin,
             this.scope.currentWireId
         ];
-        this.scope.indentLevel -= 1;
+        this.scope.scopeLevel -= 1;
         this.log('exit inner block <<<');
         if (blockType === BlockTypes.Branch) {
             const { start_point: [component, pin, wireId] } = stackRef;
@@ -511,8 +516,8 @@ export class ExecutionContext {
     }
     getPointBlockLocation() {
         this.log('get block point');
-        for (let i = 0; i < this.scope.indentLevel; i++) {
-            const stackRef = this.scope.blockStack.get(this.scope.indentLevel - 1 - i);
+        for (let i = 0; i < this.scope.scopeLevel; i++) {
+            const stackRef = this.scope.blockStack.get(this.scope.scopeLevel - 1 - i);
             const { start_point } = stackRef;
             const component = start_point[0];
             if (component.instanceName.startsWith(`${Delimiter1}point.`)) {

package/dist/esm/objects/ExecutionScope.js

@@ -12,7 +12,7 @@ export class ExecutionScope {
     breakStack = [];
     wires = [];
     frames = [];
-    indentLevel = 0;
+    scopeLevel = 0;
     netCounter = 1;
     unnamedCounter = 1;
     currentComponent = null;

package/dist/esm/visitor.js

@@ -99,17 +99,17 @@ export class ParserVisitor extends BaseVisitor {
         }
         const scope = this.getScope();
         const executor = this.getExecutor();
-        const indentLevel = scope.indentLevel;
-        if (scope.blockStack.has(indentLevel)) {
-            const blockStackEntry = scope.blockStack.get(indentLevel);
+        const scopeLevel = scope.scopeLevel;
+        if (scope.blockStack.has(scopeLevel)) {
+            const blockStackEntry = scope.blockStack.get(scopeLevel);
             if (blockStackEntry.type !== blockType) {
                 executor.exitBlocks();
             }
         }
-        if (!scope.blockStack.has(indentLevel)) {
+        if (!scope.blockStack.has(scopeLevel)) {
             executor.enterBlocks(blockType);
         }
-        const blockStackEntry = scope.blockStack.get(indentLevel);
+        const blockStackEntry = scope.blockStack.get(scopeLevel);
         const { current_index } = blockStackEntry;
         executor.enterBlock(current_index);
         this.visit(ctx.expressions_block());
@@ -117,12 +117,9 @@ export class ParserVisitor extends BaseVisitor {
         blockStackEntry.current_index++;
     };
     visitGraph_expressions = (ctx) => {
+        this.getExecutor().log('graph expressions', this.getScope().scopeLevel);
         if (ctx.path_block() === null) {
-            const scope = this.getScope();
-            const indentLevel = scope.indentLevel;
-            if (scope.blockStack.has(indentLevel)) {
-                this.getExecutor().exitBlocks();
-            }
+            this.getExecutor().closeOpenPathBlocks();
         }
         const ctxPathBlock = ctx.path_block();
         const ctxNotPathBlock = ctx.graph_linear_expression();
@@ -863,9 +860,10 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, result);
     };
     visitAt_block_pin_expr = (ctx) => {
-        const atPin = this.visitResult(ctx.pin_select_expr2());
         const executor = this.getExecutor();
         const [currentComponent, currentPin] = executor.getCurrentPoint();
+        executor.closeOpenPathBlocks();
+        const atPin = this.visitResult(ctx.pin_select_expr2());
         executor.atComponent(currentComponent, atPin, {
             addSequence: true
         });
@@ -886,11 +884,11 @@ export class ParserVisitor extends BaseVisitor {
         executor.log('entering at block');
         this.visit(ctx.at_component_expr());
         const [currentComponent, currentPin] = executor.getCurrentPoint();
-        executor.scope.indentLevel += 1;
+        executor.scope.scopeLevel += 1;
         ctx.at_block_expressions().forEach(expression => {
             this.visit(expression);
         });
-        executor.scope.indentLevel -= 1;
+        executor.scope.scopeLevel -= 1;
         executor.scope.setCurrent(currentComponent, currentPin);
         executor.log('leaving at block');
     };

package/dist/types/execute.d.ts

@@ -30,7 +30,7 @@ export declare class ExecutionContext {
     parentContext: ExecutionContext;
     componentAngleFollowsWire: boolean;
     warnings: ExecutionWarning[];
-    constructor(name: string, namespace: string, netNamespace: string, executionLevel: number | undefined, indentLevel: number | undefined, silent: boolean | undefined, logger: Logger, warnings: ExecutionWarning[], parent: ExecutionContext);
+    constructor(name: string, namespace: string, netNamespace: string, executionLevel: number | undefined, scopeLevel: number | undefined, silent: boolean | undefined, logger: Logger, warnings: ExecutionWarning[], parent: ExecutionContext);
     logWarning(message: string, context?: ParserRuleContext, fileName?: string): void;
     log(...params: any[]): void;
     private setupRoot;
@@ -61,8 +61,8 @@ export declare class ExecutionContext {
     }): ComponentPin;
     copyComponent(component: ClassComponent): ClassComponent;
     enterBlocks(blockType: BlockTypes): void;
-    exitBlocks(): void;
-    closeAllBlocks(): void;
+    exitBlocks(scopeLevel?: number | null): void;
+    closeOpenPathBlocks(): void;
     enterBlock(blockIndex: number): void;
     exitBlock(blockIndex: number): void;
     atPointBlock(): void;

package/dist/types/objects/ExecutionScope.d.ts

@@ -23,7 +23,7 @@ export declare class ExecutionScope {
     breakStack: ParserRuleContext[];
     wires: Wire[];
     frames: Frame[];
-    indentLevel: number;
+    scopeLevel: number;
     netCounter: number;
     unnamedCounter: number;
     currentComponent: ClassComponent | null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.1.13",
+    "version": "0.1.14",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {