circuitscript 0.1.11 → 0.1.12

package/dist/cjs/visitor.js

@@ -7,9 +7,10 @@ const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 const PinTypes_js_1 = require("./objects/PinTypes.js");
 const types_js_1 = require("./objects/types.js");
 const globals_js_1 = require("./globals.js");
+const utils_js_1 = require("./utils.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const BaseVisitor_js_1 = require("./BaseVisitor.js");
-const utils_js_1 = require("./utils.js");
+const utils_js_2 = require("./utils.js");
 const helpers_js_1 = require("./helpers.js");
 const Frame_js_1 = require("./objects/Frame.js");
 class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
@@ -31,7 +32,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 value = result;
             }
             else {
-                throw new utils_js_1.RuntimeExecutionError("Invalid value for pin", ctx);
+                throw new utils_js_2.RuntimeExecutionError("Invalid value for pin", ctx);
             }
             this.setResult(ctx, value);
         };
@@ -55,7 +56,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     });
                 }
                 catch (err) {
-                    throw new utils_js_1.RuntimeExecutionError(err.message, ctx);
+                    throw new utils_js_2.RuntimeExecutionError(err.message, ctx);
                 }
             });
             return this.getExecutor().getCurrentPoint();
@@ -87,39 +88,55 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
             this.setResult(ctx, componentPin);
         };
-        this.visitPath_blocks = (ctx) => {
-            const blocks = ctx.path_block_inner();
-            let blockIndex = 0;
+        this.visitPath_block = (ctx) => {
             let blockType = globals_js_1.BlockTypes.Branch;
-            let prevBlockType = null;
-            blocks.forEach((block, index) => {
-                if (block.Branch()) {
-                    blockType = globals_js_1.BlockTypes.Branch;
-                }
-                else if (block.Join()) {
-                    blockType = globals_js_1.BlockTypes.Join;
-                }
-                else if (block.Parallel()) {
-                    blockType = globals_js_1.BlockTypes.Parallel;
-                }
-                else if (block.Point()) {
-                    blockType = globals_js_1.BlockTypes.Point;
+            if (ctx.Branch()) {
+                blockType = globals_js_1.BlockTypes.Branch;
+            }
+            else if (ctx.Join()) {
+                blockType = globals_js_1.BlockTypes.Join;
+            }
+            else if (ctx.Parallel()) {
+                blockType = globals_js_1.BlockTypes.Parallel;
+            }
+            else if (ctx.Point()) {
+                blockType = globals_js_1.BlockTypes.Point;
+            }
+            const scope = this.getScope();
+            const executor = this.getExecutor();
+            const indentLevel = scope.indentLevel;
+            if (scope.blockStack.has(indentLevel)) {
+                const blockStackEntry = scope.blockStack.get(indentLevel);
+                if (blockStackEntry.type !== blockType) {
+                    executor.exitBlocks();
                 }
-                if (prevBlockType !== blockType) {
-                    if (index > 0) {
-                        this.getExecutor().exitBlocks();
-                    }
-                    this.getExecutor().enterBlocks(blockType);
-                    blockIndex = 0;
+            }
+            if (!scope.blockStack.has(indentLevel)) {
+                executor.enterBlocks(blockType);
+            }
+            const blockStackEntry = scope.blockStack.get(indentLevel);
+            const { current_index } = blockStackEntry;
+            executor.enterBlock(current_index);
+            this.visit(ctx.expressions_block());
+            executor.exitBlock(current_index);
+            blockStackEntry.current_index++;
+        };
+        this.visitGraph_expressions = (ctx) => {
+            if (ctx.path_block() === null) {
+                const scope = this.getScope();
+                const indentLevel = scope.indentLevel;
+                if (scope.blockStack.has(indentLevel)) {
+                    this.getExecutor().exitBlocks();
                 }
-                this.getExecutor().enterBlock(blockIndex);
-                this.visit(block);
-                this.getExecutor().exitBlock(blockIndex);
-                blockIndex += 1;
-                prevBlockType = blockType;
-            });
-            this.getExecutor().exitBlocks();
-            return this.getExecutor().getCurrentPoint();
+            }
+            const ctxPathBlock = ctx.path_block();
+            const ctxNotPathBlock = ctx.graph_linear_expression();
+            if (ctxPathBlock) {
+                this.visit(ctxPathBlock);
+            }
+            if (ctxNotPathBlock) {
+                this.visit(ctxNotPathBlock);
+            }
         };
         this.visitCreate_component_expr = (ctx) => {
             const scope = this.getScope();
@@ -155,13 +172,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                             break;
                         case 'display':
                             if (didDefineArrangeProp) {
-                                throw new utils_js_1.RuntimeExecutionError("arrange property has already been defined", ctx);
+                                throw new utils_js_2.RuntimeExecutionError("arrange property has already been defined", ctx);
                             }
                             didDefineDisplayProp = true;
                             break;
                         case 'arrange':
                             if (didDefineDisplayProp) {
-                                throw new utils_js_1.RuntimeExecutionError("display property already defined", ctx);
+                                throw new utils_js_2.RuntimeExecutionError("display property already defined", ctx);
                             }
                             didDefineArrangeProp = true;
                             break;
@@ -182,7 +199,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                                 this.validateBoolean(value, ctx);
                             }
                             else {
-                                throw new utils_js_1.RuntimeExecutionError("Invalid value for 'copy' property", ctx);
+                                throw new utils_js_2.RuntimeExecutionError("Invalid value for 'copy' property", ctx);
                             }
                             break;
                     }
@@ -192,7 +209,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     if (keyName === 'arrange') {
                         const [sideKeyCtx, sideKeyName] = path[1];
                         if (globals_js_1.ValidPinSides.indexOf(sideKeyName) === -1) {
-                            throw new utils_js_1.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx);
+                            throw new utils_js_2.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx);
                         }
                         else {
                             if (path.length === 2 && value instanceof ParamDefinition_js_1.NumericValue) {
@@ -203,12 +220,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                                     const goodBlank = value.length === 1 &&
                                         value[0] instanceof ParamDefinition_js_1.NumericValue;
                                     if (!goodBlank) {
-                                        throw new utils_js_1.RuntimeExecutionError(`Invalid blank specifier`, ctx);
+                                        throw new utils_js_2.RuntimeExecutionError(`Invalid blank specifier`, ctx);
                                     }
                                 }
                                 else {
                                     if (!(value instanceof ParamDefinition_js_1.NumericValue)) {
-                                        throw new utils_js_1.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
+                                        throw new utils_js_2.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
                                     }
                                     else {
                                         checkPinExistsAndNotDuplicated(value.toNumber(), ctx);
@@ -237,7 +254,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                             if (value.length === 2) {
                                 const [pinType,] = value;
                                 if (pinType instanceof types_js_1.UndeclaredReference) {
-                                    throw new utils_js_1.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx);
+                                    throw new utils_js_2.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx);
                                 }
                             }
                         }
@@ -298,7 +315,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             if (ctxId !== null) {
                 const varName = ctxId.getText();
                 paramIds.push(varName);
-                this.getScope().variables.set(varName, {});
+                this.getScope().setVariable(varName, {});
             }
             const executor = this.getExecutor();
             const stack = [...this.executionStack];
@@ -308,7 +325,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     variables.forEach((value, key) => {
                         obj[key] = value;
                     });
-                    executor.scope.variables.set(paramIds[0], obj);
+                    executor.scope.setVariable(paramIds[0], obj);
                 }
                 const currentStack = this.executionStack.splice(0);
                 this.executionStack.push(...stack);
@@ -389,7 +406,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitGraphicForExpr = (ctx) => {
             const forVariableNames = ctx.ID().map(item => item.getText());
-            const listItems = this.visitResult(ctx.data_expr());
+            const listItems = (0, utils_js_1.prepareValue)(this.visitResult(ctx.data_expr()));
             let keepLooping = true;
             let counter = 0;
             let allCommands = [];
@@ -400,7 +417,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         useValueArray = [useValueArray];
                     }
                     useValueArray.forEach((value, index) => {
-                        this.getScope().variables.set(forVariableNames[index], value);
+                        this.getScope().setVariable(forVariableNames[index], value);
                     });
                     const commands = this.visitResult(ctx.graphic_expressions_block());
                     allCommands = allCommands.concat(commands);
@@ -531,6 +548,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const ctxAssignmentExpr = ctx.assignment_expr();
             if (ctxDataExpr) {
                 component = this.visitResult(ctxDataExpr);
+                component = (0, utils_js_1.prepareValue)(component);
                 componentCtx = ctxDataExpr;
                 if (component === null || component === undefined) {
                     this.throwWithContext(ctxDataExpr, "Could not find component: " + ctxDataExpr.getText());
@@ -822,15 +840,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const executor = this.getExecutor();
             executor.log('entering at block');
             this.visit(ctx.at_component_expr());
-            const currentComponent = executor.scope.currentComponent;
-            const currentPin = executor.scope.currentPin;
+            const [currentComponent, currentPin] = executor.getCurrentPoint();
             executor.scope.indentLevel += 1;
             ctx.at_block_expressions().forEach(expression => {
                 this.visit(expression);
             });
             executor.scope.indentLevel -= 1;
-            executor.scope.currentComponent = currentComponent;
-            executor.scope.currentPin = currentPin;
+            executor.scope.setCurrent(currentComponent, currentPin);
             executor.log('leaving at block');
         };
         this.visitAt_block_pin_expression_simple = (ctx) => {
@@ -893,7 +909,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     pointValue = resultValue;
                 }
                 else {
-                    throw new utils_js_1.RuntimeExecutionError('Invalid value for point');
+                    throw new utils_js_2.RuntimeExecutionError('Invalid value for point');
                 }
             }
             else if (ID) {
@@ -1012,7 +1028,8 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitFor_expr = (ctx) => {
             this.log('in for loop');
             const forVariableNames = ctx.ID().map(item => item.getText());
-            const listItems = this.visitResult(ctx.data_expr());
+            let listItems = this.visitResult(ctx.data_expr());
+            listItems = (0, utils_js_1.prepareValue)(listItems);
             this.getExecutor().addBreakContext(ctx);
             let keepLooping = true;
             let counter = 0;
@@ -1023,7 +1040,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         useValueArray = [useValueArray];
                     }
                     useValueArray.forEach((value, index) => {
-                        this.getScope().variables.set(forVariableNames[index], value);
+                        this.getScope().setVariable(forVariableNames[index], value);
                     });
                     this.visit(ctx.expressions_block());
                     keepLooping = true;
@@ -1088,7 +1105,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 const portName = component.parameters.get(globals_js_1.ParamKeys.net_name);
                 const modulePinId = modulePinMapping.get(portName);
                 pinIdToPortMap.set(modulePinId, component);
-                const portType = (0, utils_js_1.getPortType)(component);
+                const portType = (0, utils_js_2.getPortType)(component);
                 const tmpPin = moduleComponent.pins.get(modulePinId);
                 tmpPin.pinType = portType;
             }

package/dist/esm/BaseVisitor.js

@@ -6,8 +6,9 @@ import { Logger } from "./logger.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { NumberOperator, NumericValue, PercentageValue } from "./objects/ParamDefinition.js";
 import { PinTypes } from "./objects/PinTypes.js";
-import { Direction, UndeclaredReference } from "./objects/types.js";
-import { DoubleDelimiter1, GlobalDocumentName, ReferenceTypes } from './globals.js';
+import { Direction, AnyReference, UndeclaredReference } from "./objects/types.js";
+import { ComponentTypes, DoubleDelimiter1, GlobalDocumentName, ReferenceTypes } from './globals.js';
+import { isReference, prepareValue } from "./utils.js";
 import { linkBuiltInMethods } from './builtinMethods.js';
 import { resolveToNumericValue, RuntimeExecutionError, throwWithContext } from './utils.js';
 import { SequenceAction } from './objects/ExecutionScope.js';
@@ -47,7 +48,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         scope.sequence.push([
             SequenceAction.At, scope.componentRoot, scope.currentPin
         ]);
-        scope.variables.set(GlobalDocumentName, {});
+        scope.setVariable(GlobalDocumentName, {});
         this.setupBuiltInFunctions(this.startingContext);
         this.executionStack = [this.startingContext];
         this.startingContext.resolveNet =
@@ -127,37 +128,61 @@ export class BaseVisitor extends CircuitScriptVisitor {
         }
         const result = this.runExpressions(this.getExecutor(), ctx.expression());
         this.setResult(ctx, result);
+        this.getExecutor().closeAllBlocks();
         this.log('===', 'end', '===');
     };
     visitAssignment_expr = (ctx) => {
-        const reference = this.getReference(ctx.atom_expr());
+        const ctxAtom = ctx.atom_expr();
+        const ctxFuncCall = ctx.function_call_expr();
+        let leftSideReference;
+        if (ctxAtom) {
+            leftSideReference = this.getReference(ctx.atom_expr());
+        }
+        else if (ctxFuncCall) {
+            leftSideReference = this.visitResult(ctxFuncCall);
+        }
         const ctxDataExpr = ctx.data_expr();
-        this.visit(ctxDataExpr);
-        const value = this.getResult(ctxDataExpr);
-        const trailers = reference.trailers ?? [];
+        const dataValue = this.visitResult(ctxDataExpr);
+        const rhsValue = prepareValue(dataValue);
+        const trailers = leftSideReference.trailers ?? [];
+        const sequenceParts = [];
         if (trailers.length === 0) {
-            if (value instanceof ClassComponent) {
-                const variables = this.getExecutor().scope.variables;
-                variables.set(reference.name, value);
-                this.getExecutor().scope.sequence.push([SequenceAction.Assign, reference.name, value]);
-                this.log2(`assigned '${reference.name}' to ClassComponent`);
+            if (rhsValue instanceof ClassComponent) {
+                this.getScope().setVariable(leftSideReference.name, rhsValue);
+                sequenceParts.push(...['instance', leftSideReference.name, rhsValue]);
+                this.log2(`assigned '${leftSideReference.name}' to ClassComponent`);
             }
             else {
-                this.getExecutor().scope.variables.set(reference.name, value);
-                this.log2(`assigned variable ${reference.name} to ${value}`);
+                this.getScope().setVariable(leftSideReference.name, rhsValue);
+                this.log2(`assigned variable ${leftSideReference.name} to ${rhsValue}`);
+                sequenceParts.push(...['variable', leftSideReference.name, rhsValue]);
             }
         }
         else {
-            if (reference.parentValue instanceof ClassComponent) {
-                this.setInstanceParam(reference.parentValue, trailers, value);
-                this.log2(`assigned component param ${reference.parentValue} trailers: ${trailers} value: ${value}`);
+            if (leftSideReference.parentValue instanceof ClassComponent) {
+                this.setInstanceParam(leftSideReference.parentValue, trailers, rhsValue);
+                this.log2(`assigned component param ${leftSideReference.parentValue} trailers: ${trailers} value: ${rhsValue}`);
+                sequenceParts.push(...['instance', [leftSideReference.parentValue, trailers], rhsValue]);
+                if (leftSideReference.parentValue.typeProp === ComponentTypes.net) {
+                    const net = this.getScope().getNet(leftSideReference.parentValue, 1);
+                    if (net) {
+                        const trailerValue = trailers.join(".");
+                        net.params.set(trailerValue, rhsValue);
+                    }
+                }
             }
-            else if (reference.parentValue instanceof Object) {
-                reference.parentValue[trailers.join('.')] = value;
-                this.log2(`assigned object ${reference.parentValue} trailers: ${trailers} value: ${value}`);
+            else if (leftSideReference.parentValue instanceof Object) {
+                leftSideReference.parentValue[trailers.join('.')] = rhsValue;
+                this.log2(`assigned object ${leftSideReference.parentValue} trailers: ${trailers} value: ${rhsValue}`);
+                sequenceParts.push(...['variable', [leftSideReference.parentValue, trailers], rhsValue]);
             }
         }
-        this.setResult(ctx, value);
+        if (sequenceParts.length > 0) {
+            this.getScope().sequence.push([
+                SequenceAction.Assign, ...sequenceParts
+            ]);
+        }
+        this.setResult(ctx, rhsValue);
     };
     visitOperator_assignment_expr = (ctx) => {
         const reference = this.getReference(ctx.atom_expr());
@@ -204,7 +229,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
             this.throwWithContext(ctx, 'Operator assignment failed: could not perform operator');
         }
         if (trailers.length === 0) {
-            this.getExecutor().scope.variables.set(reference.name, newValue);
+            this.getExecutor().scope.setVariable(reference.name, newValue);
         }
         else {
             if (reference.value instanceof ClassComponent) {
@@ -221,8 +246,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         if (atomStr.indexOf('(') !== -1 || atomStr.indexOf(')') !== -1) {
             this.throwWithContext(ctx, "Invalid assignment expression!");
         }
-        this.visit(ctx);
-        const reference = this.getResult(ctx);
+        const reference = this.visitResult(ctx);
         const { trailers = [] } = reference;
         const undefinedParentWithTrailers = trailers.length > 0
             && reference.parentValue === undefined;
@@ -245,11 +269,11 @@ export class BaseVisitor extends CircuitScriptVisitor {
             }
         }
         if (this.pinTypesList.indexOf(atomId) !== -1) {
-            currentReference = {
+            currentReference = new AnyReference({
                 found: true,
                 value: atomId,
                 type: ReferenceTypes.pinType,
-            };
+            });
         }
         else {
             currentReference = executor.resolveVariable(this.executionStack, atomId, idTrailers);
@@ -266,9 +290,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         this.setResult(ctx, currentReference);
     };
     visitFunctionCallExpr = (ctx) => {
-        const tmpCtx = ctx.function_call_expr();
-        this.visit(tmpCtx);
-        const result = this.getResult(tmpCtx);
+        const result = this.visitResult(ctx.function_call_expr());
         this.setResult(ctx, result);
     };
     visitFunction_call_expr = (ctx) => {
@@ -298,12 +320,18 @@ export class BaseVisitor extends CircuitScriptVisitor {
                     const useNetNamespace = this.getNetNamespace(executor.netNamespace, passedNetNamespace);
                     try {
                         const [, functionResult] = executor.callFunction(currentReference.name, parameters, this.executionStack, useNetNamespace);
-                        currentReference = {
-                            found: true,
-                            value: functionResult,
-                            type: (functionResult instanceof ClassComponent) ?
-                                'instance' : 'value',
-                        };
+                        if (isReference(functionResult)) {
+                            currentReference = functionResult;
+                        }
+                        else {
+                            currentReference = new AnyReference({
+                                found: true,
+                                value: functionResult,
+                                trailers: [],
+                                type: (functionResult instanceof ClassComponent) ?
+                                    ReferenceTypes.instance : ReferenceTypes.value,
+                            });
+                        }
                     }
                     catch (err) {
                         this.throwWithContext(ctx, err);
@@ -314,7 +342,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 }
             });
         }
-        this.setResult(ctx, currentReference.value);
+        this.setResult(ctx, currentReference);
     };
     visitValue_expr = (ctx) => {
         const sign = ctx.Minus() ? -1 : 1;
@@ -412,13 +440,11 @@ export class BaseVisitor extends CircuitScriptVisitor {
         const keywordAssignmentExpressions = ctx.keyword_assignment_expr();
         const returnList = [];
         dataExpressions.forEach((item, index) => {
-            this.visit(item);
-            const value = this.getResult(item);
+            const value = this.visitResult(item);
             returnList.push(['position', index, value]);
         });
         keywordAssignmentExpressions.forEach((item) => {
-            this.visit(item);
-            const [key, value] = this.getResult(item);
+            const [key, value] = this.visitResult(item);
             returnList.push(['keyword', key, value]);
         });
         this.setResult(ctx, returnList);
@@ -556,12 +582,13 @@ export class BaseVisitor extends CircuitScriptVisitor {
             const tmpFuncArg = funcDefinedParameters[i];
             if (i < passedInParameters.length) {
                 const tmpPassedInArgs = passedInParameters[i];
+                const argValue = prepareValue(tmpPassedInArgs[2]);
                 if (tmpPassedInArgs[0] === 'position') {
                     const variableName = tmpFuncArg[0];
                     executor.log('set variable in scope, var name: ', variableName);
-                    executor.scope.variables.set(variableName, tmpPassedInArgs[2]);
-                    if (tmpPassedInArgs[2] instanceof ClassComponent) {
-                        const component = tmpPassedInArgs[2];
+                    executor.scope.setVariable(variableName, argValue);
+                    if (argValue instanceof ClassComponent) {
+                        const component = argValue;
                         for (const [pinNumber, net] of component.pinNets) {
                             executor.scope.setNet(component, pinNumber, net);
                         }
@@ -570,14 +597,14 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 else if (tmpPassedInArgs[0] === 'keyword') {
                     const variableName = tmpPassedInArgs[1];
                     executor.log('set variable in scope, var name: ', variableName);
-                    executor.scope.variables.set(variableName, tmpPassedInArgs[2]);
+                    executor.scope.setVariable(variableName, argValue);
                 }
             }
             else if (tmpFuncArg.length === 3) {
                 const variableName = tmpFuncArg[0];
                 const defaultValue = tmpFuncArg[2];
                 executor.log('set variable in scope, var name: ', variableName);
-                executor.scope.variables.set(variableName, defaultValue);
+                executor.scope.setVariable(variableName, defaultValue);
             }
             else {
                 throw `Invalid arguments got: ` + passedInParameters;