circuitscript 0.1.12 → 0.1.13

package/dist/cjs/builtinMethods.js

@@ -22,8 +22,7 @@ function linkBuiltInMethods(context, visitor) {
     context.createFunction('print', (params) => {
         const args = getPositionParams(params);
         const items = args.map(item => {
-            const value = (0, utils_js_1.prepareValue)(item);
-            return toString(value);
+            return toString((0, utils_js_1.unwrapValue)(item));
         });
         if (visitor.printToConsole) {
             console.log('::', ...items);
@@ -85,7 +84,7 @@ function toMils(value) {
     return (0, utils_js_1.resolveToNumericValue)(bigValue);
 }
 function objectLength(obj) {
-    obj = (0, utils_js_1.prepareValue)(obj);
+    obj = (0, utils_js_1.unwrapValue)(obj);
     if (Array.isArray(obj)) {
         return (0, ParamDefinition_js_1.numeric)(obj.length);
     }
@@ -116,6 +115,9 @@ function arrayGet(arrayObject, index) {
     else {
         useValue = index;
     }
+    if (isNaN(useValue)) {
+        throw new utils_js_1.RuntimeExecutionError("Invalid index for arrayGet");
+    }
     return arrayObject[useValue];
 }
 function arraySet(arrayObject, index, setValue) {

package/dist/cjs/execute.js

@@ -557,38 +557,18 @@ class ExecutionContext {
                 if (isVariable || isComponentInstance) {
                     const scopeList = isVariable ? context.scope.variables
                         : context.scope.instances;
-                    let parentValue = undefined;
-                    let useValue = scopeList.get(idName);
-                    if (trailers.length > 0) {
-                        parentValue = useValue;
-                        const trailersPath = trailers.join(".");
-                        if (!isComponentInstance && (parentValue instanceof ClassComponent_js_1.ClassComponent)) {
-                            isComponentInstance = true;
-                            isVariable = false;
-                        }
-                        if (isVariable) {
-                            useValue = parentValue[trailersPath];
-                        }
-                        else if (isComponentInstance) {
-                            const tmpComponent = parentValue;
-                            if (tmpComponent.typeProp === globals_js_1.ComponentTypes.net) {
-                                const usedNet = this.scope.getNet(tmpComponent, 1);
-                                if (usedNet) {
-                                    const trailerValue = trailers.join(".");
-                                    useValue = usedNet.params.get(trailerValue) ?? null;
-                                }
-                            }
-                            else {
-                                useValue = parentValue.parameters.get(trailersPath);
-                            }
-                        }
+                    const useValue = scopeList.get(idName);
+                    if (!isComponentInstance && (useValue instanceof ClassComponent_js_1.ClassComponent)) {
+                        isComponentInstance = true;
+                        isVariable = false;
                     }
+                    const tmpReference = this.resolveTrailers(isVariable ? globals_js_1.ReferenceTypes.variable : globals_js_1.ReferenceTypes.instance, useValue, trailers);
                     return new types_js_1.DeclaredReference({
                         type: isVariable ? globals_js_1.ReferenceTypes.variable
                             : globals_js_1.ReferenceTypes.instance,
-                        found: (useValue !== undefined),
-                        parentValue,
-                        value: useValue,
+                        found: (tmpReference.value !== undefined),
+                        parentValue: tmpReference.parentValue,
+                        value: tmpReference.value,
                         name: idName,
                         trailers,
                     });
@@ -600,6 +580,37 @@ class ExecutionContext {
             name: idName,
         });
     }
+    resolveTrailers(type, item, trailers = []) {
+        let parentValue;
+        let useValue = item;
+        if (trailers.length > 0) {
+            parentValue = useValue;
+            const trailersPath = trailers.join(".");
+            if (type === globals_js_1.ReferenceTypes.variable) {
+                useValue = parentValue[trailersPath];
+            }
+            else if (type === globals_js_1.ReferenceTypes.instance) {
+                const tmpComponent = parentValue;
+                if (tmpComponent.typeProp === globals_js_1.ComponentTypes.net) {
+                    const usedNet = this.scope.getNet(tmpComponent, 1);
+                    if (usedNet) {
+                        const trailerValue = trailers.join(".");
+                        useValue = usedNet.params.get(trailerValue) ?? null;
+                    }
+                }
+                else {
+                    useValue = parentValue.parameters.get(trailersPath);
+                }
+            }
+        }
+        return new types_js_1.AnyReference({
+            found: true,
+            type: type,
+            parentValue,
+            trailers,
+            value: useValue,
+        });
+    }
     callFunction(functionName, functionParams, executionStack, netNamespace) {
         let __runFunc = null;
         if (this.__functionCache[functionName] === undefined) {

package/dist/cjs/helpers.js

@@ -194,14 +194,6 @@ async function renderScript(scriptData, outputPath, options) {
     };
     visitor.log('reading file');
     visitor.log('done reading file');
-    const { tree, parser, parserTimeTaken, lexerTimeTaken } = await (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
-    (0, utils_js_1.printWarnings)(visitor.getWarnings());
-    showStats && console.log('Lexing took:', lexerTimeTaken);
-    showStats && console.log('Parsing took:', parserTimeTaken);
-    if (dumpNets) {
-        const nets = visitor.dumpNets();
-        nets.forEach(item => console.log(item.join(" | ")));
-    }
     const dumpDirectory = environment.getRelativeToModule('/dump/');
     if (dumpData) {
         console.log('Dump data to:', dumpDirectory);
@@ -209,8 +201,19 @@ async function renderScript(scriptData, outputPath, options) {
             (0, fs_1.mkdirSync)(dumpDirectory);
         }
     }
+    const { tree, parser, parserTimeTaken, lexerTimeTaken, throwError } = await (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
+    (0, utils_js_1.printWarnings)(visitor.getWarnings());
+    showStats && console.log('Lexing took:', lexerTimeTaken);
+    showStats && console.log('Parsing took:', parserTimeTaken);
+    if (dumpNets) {
+        const nets = visitor.dumpNets();
+        nets.forEach(item => console.log(item.join(" | ")));
+    }
     dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
     dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
+    if (throwError) {
+        throw throwError;
+    }
     let svgOutput = "";
     if (errors.length === 0) {
         const { frameComponent } = visitor.applySheetFrameComponent();

package/dist/cjs/parser.js

@@ -21,6 +21,7 @@ async function parseFileWithVisitor(visitor, data) {
     parser.removeErrorListeners();
     parser.addErrorListener(parserErrorListener);
     const tree = parser.script();
+    let throwError;
     try {
         await visitor.visitAsync(tree);
     }
@@ -30,7 +31,7 @@ async function parseFileWithVisitor(visitor, data) {
                 visitor.onErrorHandler(error.message, null, error);
             }
             else {
-                throw error;
+                throwError = error;
             }
         }
     }
@@ -41,6 +42,7 @@ async function parseFileWithVisitor(visitor, data) {
         hasError: false,
         parserTimeTaken,
         lexerTimeTaken,
+        throwError
     };
 }
 exports.parseFileWithVisitor = parseFileWithVisitor;

package/dist/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isReference = exports.prepareValue = exports.printWarnings = exports.RenderError = exports.RuntimeExecutionError = exports.ParseError = exports.ParseSyntaxError = exports.getLinePositionAsString = exports.BaseError = exports.getBlockTypeString = exports.generateDebugSequenceAction = exports.sequenceActionString = exports.areasOverlap = exports.isPointWithinArea = exports.resolveToNumericValue = exports.getNumberExponentialText = exports.getNumberExponential = exports.combineMaps = exports.throwWithTokenRange = exports.throwWithToken = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
+exports.isReference = exports.unwrapValue = exports.printWarnings = exports.RenderError = exports.RuntimeExecutionError = exports.ParseError = exports.ParseSyntaxError = exports.getLinePositionAsString = exports.BaseError = exports.getBlockTypeString = exports.generateDebugSequenceAction = exports.sequenceActionString = exports.areasOverlap = exports.isPointWithinArea = exports.resolveToNumericValue = exports.getNumberExponentialText = exports.getNumberExponential = exports.combineMaps = exports.throwWithTokenRange = exports.throwWithToken = exports.throwWithContext = exports.roundValue = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
 const big_js_1 = require("big.js");
 const antlr4ng_1 = require("antlr4ng");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
@@ -359,7 +359,7 @@ function printWarnings(warnings) {
     });
 }
 exports.printWarnings = printWarnings;
-function prepareValue(value) {
+function unwrapValue(value) {
     if (isReference(value)) {
         return value.value;
     }
@@ -367,7 +367,7 @@ function prepareValue(value) {
         return value;
     }
 }
-exports.prepareValue = prepareValue;
+exports.unwrapValue = unwrapValue;
 function isReference(value) {
     return (value instanceof types_js_1.AnyReference ||
         value instanceof types_js_1.DeclaredReference);

package/dist/cjs/visitor.js

@@ -406,7 +406,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitGraphicForExpr = (ctx) => {
             const forVariableNames = ctx.ID().map(item => item.getText());
-            const listItems = (0, utils_js_1.prepareValue)(this.visitResult(ctx.data_expr()));
+            const listItems = (0, utils_js_1.unwrapValue)(this.visitResult(ctx.data_expr()));
             let keepLooping = true;
             let counter = 0;
             let allCommands = [];
@@ -548,7 +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);
+                component = (0, utils_js_1.unwrapValue)(component);
                 componentCtx = ctxDataExpr;
                 if (component === null || component === undefined) {
                     this.throwWithContext(ctxDataExpr, "Could not find component: " + ctxDataExpr.getText());
@@ -1029,7 +1029,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.log('in for loop');
             const forVariableNames = ctx.ID().map(item => item.getText());
             let listItems = this.visitResult(ctx.data_expr());
-            listItems = (0, utils_js_1.prepareValue)(listItems);
+            listItems = (0, utils_js_1.unwrapValue)(listItems);
             this.getExecutor().addBreakContext(ctx);
             let keepLooping = true;
             let counter = 0;

package/dist/esm/BaseVisitor.js

@@ -8,7 +8,7 @@ import { NumberOperator, NumericValue, PercentageValue } from "./objects/ParamDe
 import { PinTypes } from "./objects/PinTypes.js";
 import { Direction, AnyReference, UndeclaredReference } from "./objects/types.js";
 import { ComponentTypes, DoubleDelimiter1, GlobalDocumentName, ReferenceTypes } from './globals.js';
-import { isReference, prepareValue } from "./utils.js";
+import { isReference, unwrapValue as unwrapValue } from "./utils.js";
 import { linkBuiltInMethods } from './builtinMethods.js';
 import { resolveToNumericValue, RuntimeExecutionError, throwWithContext } from './utils.js';
 import { SequenceAction } from './objects/ExecutionScope.js';
@@ -23,7 +23,6 @@ export class BaseVisitor extends CircuitScriptVisitor {
     acceptedDirections = [Direction.Up, Direction.Down,
         Direction.Right, Direction.Left];
     resultData = new Map;
-    paramData = new Map;
     pinTypesList = [
         PinTypes.Any,
         PinTypes.Input,
@@ -133,17 +132,17 @@ export class BaseVisitor extends CircuitScriptVisitor {
     };
     visitAssignment_expr = (ctx) => {
         const ctxAtom = ctx.atom_expr();
-        const ctxFuncCall = ctx.function_call_expr();
+        const ctxFuncCallRef = ctx.function_call_expr();
         let leftSideReference;
         if (ctxAtom) {
             leftSideReference = this.getReference(ctx.atom_expr());
         }
-        else if (ctxFuncCall) {
-            leftSideReference = this.visitResult(ctxFuncCall);
+        else if (ctxFuncCallRef) {
+            this.setResult(ctxFuncCallRef, { keepReference: true });
+            leftSideReference = this.visitResult(ctxFuncCallRef);
         }
-        const ctxDataExpr = ctx.data_expr();
-        const dataValue = this.visitResult(ctxDataExpr);
-        const rhsValue = prepareValue(dataValue);
+        const rhsCtxResult = this.visitResult(ctx.data_expr());
+        const rhsValue = unwrapValue(rhsCtxResult);
         const trailers = leftSideReference.trailers ?? [];
         const sequenceParts = [];
         if (trailers.length === 0) {
@@ -186,9 +185,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
     };
     visitOperator_assignment_expr = (ctx) => {
         const reference = this.getReference(ctx.atom_expr());
-        const ctxDataExpr = ctx.data_expr();
-        this.visit(ctxDataExpr);
-        const value = this.getResult(ctxDataExpr);
+        const value = this.visitResult(ctx.data_expr());
         if (!reference.found) {
             this.throwWithContext(ctx, 'Undefined reference: ' + reference.name);
         }
@@ -294,13 +291,21 @@ export class BaseVisitor extends CircuitScriptVisitor {
         this.setResult(ctx, result);
     };
     visitFunction_call_expr = (ctx) => {
+        const ctxParams = this.getResult(ctx);
+        const { keepReference = false } = ctxParams ?? {};
+        this.handleFunctionCall(ctx);
+        if (!keepReference) {
+            const functionResultReference = this.getResult(ctx);
+            this.setResult(ctx, functionResultReference.value);
+        }
+    };
+    handleFunctionCall(ctx) {
         const executor = this.getExecutor();
         const atomId = ctx.ID().getText();
         let passedNetNamespace = null;
         const netNameSpaceExpr = ctx.net_namespace_expr();
         if (netNameSpaceExpr) {
-            this.visit(netNameSpaceExpr);
-            passedNetNamespace = this.getResult(netNameSpaceExpr);
+            passedNetNamespace = this.visitResult(netNameSpaceExpr);
         }
         let currentReference = executor.resolveVariable(this.executionStack, atomId);
         if (ctx.trailer_expr().length > 0) {
@@ -309,13 +314,11 @@ export class BaseVisitor extends CircuitScriptVisitor {
             }
             currentReference.trailers = [];
             ctx.trailer_expr().forEach(item => {
-                const itemValue = item.getText();
                 if (item.OPEN_PAREN() && item.CLOSE_PAREN()) {
                     let parameters = [];
                     const ctxParameters = item.parameters();
                     if (ctxParameters) {
-                        this.visit(ctxParameters);
-                        parameters = this.getResult(ctxParameters);
+                        parameters = this.visitResult(ctxParameters);
                     }
                     const useNetNamespace = this.getNetNamespace(executor.netNamespace, passedNetNamespace);
                     try {
@@ -338,12 +341,15 @@ export class BaseVisitor extends CircuitScriptVisitor {
                     }
                 }
                 else {
-                    currentReference.trailers.push(itemValue);
+                    currentReference.trailers.push(item.ID().getText());
+                    currentReference = this.getExecutor().resolveTrailers(currentReference.type, (currentReference.parentValue !== undefined)
+                        ? currentReference.parentValue
+                        : currentReference.value, currentReference.trailers);
                 }
             });
         }
         this.setResult(ctx, currentReference);
-    };
+    }
     visitValue_expr = (ctx) => {
         const sign = ctx.Minus() ? -1 : 1;
         const ctxIntegerValue = ctx.INTEGER_VALUE();
@@ -392,12 +398,10 @@ export class BaseVisitor extends CircuitScriptVisitor {
         const ctxValueExpr = ctx.value_expr();
         const ctxAtomExpr = ctx.atom_expr();
         if (ctxValueExpr) {
-            this.visit(ctxValueExpr);
-            value = this.getResult(ctxValueExpr);
+            value = this.visitResult(ctxValueExpr);
         }
         else if (ctxAtomExpr) {
-            this.visit(ctxAtomExpr);
-            const reference = this.getResult(ctxAtomExpr);
+            const reference = this.visitResult(ctxAtomExpr);
             if (!reference.found) {
                 value = new UndeclaredReference(reference);
             }
@@ -462,33 +466,34 @@ export class BaseVisitor extends CircuitScriptVisitor {
         executor.returnValue = returnValue;
         this.setResult(ctx, returnValue);
     };
-    visitBreak_keyword = (ctx) => {
-        const breakContext = this.getExecutor().getBreakContext();
-        const currentResult = this.getResult(breakContext) ?? {};
-        this.setResult(breakContext, {
-            ...currentResult,
-            breakSignal: true
-        });
-    };
-    visitContinue_keyword = (ctx) => {
-        const breakContext = this.getExecutor().getBreakContext();
-        const currentResult = this.getResult(breakContext) ?? {};
-        this.setResult(breakContext, {
-            ...currentResult,
-            breakSignal: true,
-            continueSignal: true,
-        });
+    visitFlow_expressions = (ctx) => {
+        if (ctx.if_expr()) {
+            this.visit(ctx.if_expr());
+        }
+        else if (ctx.while_expr()) {
+            this.visit(ctx.while_expr());
+        }
+        else if (ctx.for_expr()) {
+            this.visit(ctx.for_expr());
+        }
+        else if (ctx.Break() || ctx.Continue()) {
+            const breakContext = this.getExecutor().getBreakContext();
+            const currentResult = this.getResult(breakContext) ?? {};
+            this.setResult(breakContext, {
+                ...currentResult,
+                breakSignal: true,
+                continueSignal: ctx.Continue() ? true : false
+            });
+        }
     };
     visitArray_expr = (ctx) => {
         const array = ctx.data_expr().map(item => {
-            this.visit(item);
-            return this.getResult(item);
+            return this.visitResult(item);
         });
         this.setResult(ctx, array);
     };
     visitArrayExpr = (ctx) => {
-        this.visit(ctx.array_expr());
-        this.setResult(ctx, this.getResult(ctx.array_expr()));
+        this.setResult(ctx, this.visitResult(ctx.array_expr()));
     };
     setResult(ctx, value) {
         this.resultData.set(ctx, value);
@@ -582,7 +587,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
             const tmpFuncArg = funcDefinedParameters[i];
             if (i < passedInParameters.length) {
                 const tmpPassedInArgs = passedInParameters[i];
-                const argValue = prepareValue(tmpPassedInArgs[2]);
+                const argValue = unwrapValue(tmpPassedInArgs[2]);
                 if (tmpPassedInArgs[0] === 'position') {
                     const variableName = tmpFuncArg[0];
                     executor.log('set variable in scope, var name: ', variableName);