circuitscript 0.1.11 → 0.1.13

package/dist/cjs/BaseVisitor.js

@@ -11,8 +11,9 @@ const ParamDefinition_js_1 = require("./objects/ParamDefinition.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 builtinMethods_js_1 = require("./builtinMethods.js");
 const utils_js_1 = require("./utils.js");
+const builtinMethods_js_1 = require("./builtinMethods.js");
+const utils_js_2 = require("./utils.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
     constructor(silent = false, onErrorHandler = null, environment) {
@@ -24,7 +25,6 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         this.acceptedDirections = [types_js_1.Direction.Up, types_js_1.Direction.Down,
             types_js_1.Direction.Right, types_js_1.Direction.Left];
         this.resultData = new Map;
-        this.paramData = new Map;
         this.pinTypesList = [
             PinTypes_js_1.PinTypes.Any,
             PinTypes_js_1.PinTypes.Input,
@@ -48,43 +48,65 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             }
             const result = this.runExpressions(this.getExecutor(), ctx.expression());
             this.setResult(ctx, result);
+            this.getExecutor().closeAllBlocks();
             this.log('===', 'end', '===');
         };
         this.visitAssignment_expr = (ctx) => {
-            const reference = this.getReference(ctx.atom_expr());
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const value = this.getResult(ctxDataExpr);
-            const trailers = reference.trailers ?? [];
+            const ctxAtom = ctx.atom_expr();
+            const ctxFuncCallRef = ctx.function_call_expr();
+            let leftSideReference;
+            if (ctxAtom) {
+                leftSideReference = this.getReference(ctx.atom_expr());
+            }
+            else if (ctxFuncCallRef) {
+                this.setResult(ctxFuncCallRef, { keepReference: true });
+                leftSideReference = this.visitResult(ctxFuncCallRef);
+            }
+            const rhsCtxResult = this.visitResult(ctx.data_expr());
+            const rhsValue = (0, utils_js_1.unwrapValue)(rhsCtxResult);
+            const trailers = leftSideReference.trailers ?? [];
+            const sequenceParts = [];
             if (trailers.length === 0) {
-                if (value instanceof ClassComponent_js_1.ClassComponent) {
-                    const variables = this.getExecutor().scope.variables;
-                    variables.set(reference.name, value);
-                    this.getExecutor().scope.sequence.push([ExecutionScope_js_1.SequenceAction.Assign, reference.name, value]);
-                    this.log2(`assigned '${reference.name}' to ClassComponent`);
+                if (rhsValue instanceof ClassComponent_js_1.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_js_1.ClassComponent) {
-                    this.setInstanceParam(reference.parentValue, trailers, value);
-                    this.log2(`assigned component param ${reference.parentValue} trailers: ${trailers} value: ${value}`);
+                if (leftSideReference.parentValue instanceof ClassComponent_js_1.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 === globals_js_1.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([
+                    ExecutionScope_js_1.SequenceAction.Assign, ...sequenceParts
+                ]);
+            }
+            this.setResult(ctx, rhsValue);
         };
         this.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);
             }
@@ -125,7 +147,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.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_js_1.ClassComponent) {
@@ -151,11 +173,11 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
                 }
             }
             if (this.pinTypesList.indexOf(atomId) !== -1) {
-                currentReference = {
+                currentReference = new types_js_1.AnyReference({
                     found: true,
                     value: atomId,
                     type: globals_js_1.ReferenceTypes.pinType,
-                };
+                });
             }
             else {
                 currentReference = executor.resolveVariable(this.executionStack, atomId, idTrailers);
@@ -172,55 +194,17 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             this.setResult(ctx, currentReference);
         };
         this.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);
         };
         this.visitFunction_call_expr = (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);
-            }
-            let currentReference = executor.resolveVariable(this.executionStack, atomId);
-            if (ctx.trailer_expr().length > 0) {
-                if (!currentReference.found) {
-                    this.throwWithContext(ctx, "Unknown function name: " + atomId);
-                }
-                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);
-                        }
-                        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_js_1.ClassComponent) ?
-                                    'instance' : 'value',
-                            };
-                        }
-                        catch (err) {
-                            this.throwWithContext(ctx, err);
-                        }
-                    }
-                    else {
-                        currentReference.trailers.push(itemValue);
-                    }
-                });
+            const ctxParams = this.getResult(ctx);
+            const { keepReference = false } = ctxParams ?? {};
+            this.handleFunctionCall(ctx);
+            if (!keepReference) {
+                const functionResultReference = this.getResult(ctx);
+                this.setResult(ctx, functionResultReference.value);
             }
-            this.setResult(ctx, currentReference.value);
         };
         this.visitValue_expr = (ctx) => {
             const sign = ctx.Minus() ? -1 : 1;
@@ -233,10 +217,10 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             let result = null;
             if (ctxIntegerValue || ctxDecimalValue || ctxNumericValue) {
                 if (ctxIntegerValue) {
-                    result = (0, utils_js_1.resolveToNumericValue)((new big_js_1.Big(ctxIntegerValue.getText())).mul(new big_js_1.Big(sign)));
+                    result = (0, utils_js_2.resolveToNumericValue)((new big_js_1.Big(ctxIntegerValue.getText())).mul(new big_js_1.Big(sign)));
                 }
                 else if (ctxDecimalValue) {
-                    result = (0, utils_js_1.resolveToNumericValue)((new big_js_1.Big(ctxDecimalValue.getText())).mul(new big_js_1.Big(sign)));
+                    result = (0, utils_js_2.resolveToNumericValue)((new big_js_1.Big(ctxDecimalValue.getText())).mul(new big_js_1.Big(sign)));
                 }
                 else if (ctxNumericValue) {
                     const textExtra = ctx.Minus() ? '-' : '';
@@ -270,12 +254,10 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.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 types_js_1.UndeclaredReference(reference);
                 }
@@ -318,19 +300,17 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.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);
         };
         this.visitImport_expr = (ctx) => {
-            throw new utils_js_1.RuntimeExecutionError("Cannot parse imports here", ctx);
+            throw new utils_js_2.RuntimeExecutionError("Cannot parse imports here", ctx);
         };
         this.visitFunction_return_expr = (ctx) => {
             const executor = this.getExecutor();
@@ -342,33 +322,34 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             executor.returnValue = returnValue;
             this.setResult(ctx, returnValue);
         };
-        this.visitBreak_keyword = (ctx) => {
-            const breakContext = this.getExecutor().getBreakContext();
-            const currentResult = this.getResult(breakContext) ?? {};
-            this.setResult(breakContext, {
-                ...currentResult,
-                breakSignal: true
-            });
-        };
-        this.visitContinue_keyword = (ctx) => {
-            const breakContext = this.getExecutor().getBreakContext();
-            const currentResult = this.getResult(breakContext) ?? {};
-            this.setResult(breakContext, {
-                ...currentResult,
-                breakSignal: true,
-                continueSignal: true,
-            });
+        this.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
+                });
+            }
         };
         this.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);
         };
         this.visitArrayExpr = (ctx) => {
-            this.visit(ctx.array_expr());
-            this.setResult(ctx, this.getResult(ctx.array_expr()));
+            this.setResult(ctx, this.visitResult(ctx.array_expr()));
         };
         this.visitRoundedBracketsExpr = (ctx) => {
             const ctxDataExpr = ctx.data_expr();
@@ -384,7 +365,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         scope.sequence.push([
             ExecutionScope_js_1.SequenceAction.At, scope.componentRoot, scope.currentPin
         ]);
-        scope.variables.set(globals_js_1.GlobalDocumentName, {});
+        scope.setVariable(globals_js_1.GlobalDocumentName, {});
         this.setupBuiltInFunctions(this.startingContext);
         this.executionStack = [this.startingContext];
         this.startingContext.resolveNet =
@@ -459,8 +440,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.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;
@@ -469,6 +449,57 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         }
         return reference;
     }
+    handleFunctionCall(ctx) {
+        const executor = this.getExecutor();
+        const atomId = ctx.ID().getText();
+        let passedNetNamespace = null;
+        const netNameSpaceExpr = ctx.net_namespace_expr();
+        if (netNameSpaceExpr) {
+            passedNetNamespace = this.visitResult(netNameSpaceExpr);
+        }
+        let currentReference = executor.resolveVariable(this.executionStack, atomId);
+        if (ctx.trailer_expr().length > 0) {
+            if (!currentReference.found) {
+                this.throwWithContext(ctx, "Unknown function name: " + atomId);
+            }
+            currentReference.trailers = [];
+            ctx.trailer_expr().forEach(item => {
+                if (item.OPEN_PAREN() && item.CLOSE_PAREN()) {
+                    let parameters = [];
+                    const ctxParameters = item.parameters();
+                    if (ctxParameters) {
+                        parameters = this.visitResult(ctxParameters);
+                    }
+                    const useNetNamespace = this.getNetNamespace(executor.netNamespace, passedNetNamespace);
+                    try {
+                        const [, functionResult] = executor.callFunction(currentReference.name, parameters, this.executionStack, useNetNamespace);
+                        if ((0, utils_js_1.isReference)(functionResult)) {
+                            currentReference = functionResult;
+                        }
+                        else {
+                            currentReference = new types_js_1.AnyReference({
+                                found: true,
+                                value: functionResult,
+                                trailers: [],
+                                type: (functionResult instanceof ClassComponent_js_1.ClassComponent) ?
+                                    globals_js_1.ReferenceTypes.instance : globals_js_1.ReferenceTypes.value,
+                            });
+                        }
+                    }
+                    catch (err) {
+                        this.throwWithContext(ctx, err);
+                    }
+                }
+                else {
+                    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);
+    }
     setResult(ctx, value) {
         this.resultData.set(ctx, value);
     }
@@ -523,7 +554,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         }
         catch (err) {
             if (ctx != null) {
-                throw new utils_js_1.RuntimeExecutionError("An error occurred while importing file", ctx);
+                throw new utils_js_2.RuntimeExecutionError("An error occurred while importing file", ctx);
             }
             else {
                 this.log('An error occurred while importing file:', err.message);
@@ -539,7 +570,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             }
         }
         if (errorMessage !== null && ctx) {
-            throw new utils_js_1.RuntimeExecutionError(errorMessage, ctx);
+            throw new utils_js_2.RuntimeExecutionError(errorMessage, ctx);
         }
         const newImportedFile = {
             id: name.trim(),
@@ -555,12 +586,13 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             const tmpFuncArg = funcDefinedParameters[i];
             if (i < passedInParameters.length) {
                 const tmpPassedInArgs = passedInParameters[i];
+                const argValue = (0, utils_js_1.unwrapValue)(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_js_1.ClassComponent) {
-                        const component = tmpPassedInArgs[2];
+                    executor.scope.setVariable(variableName, argValue);
+                    if (argValue instanceof ClassComponent_js_1.ClassComponent) {
+                        const component = argValue;
                         for (const [pinNumber, net] of component.pinNets) {
                             executor.scope.setNet(component, pinNumber, net);
                         }
@@ -569,14 +601,14 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.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;
@@ -646,7 +678,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         return value.slice(1, value.length - 1);
     }
     throwWithContext(context, messageOrError) {
-        (0, utils_js_1.throwWithContext)(context, messageOrError);
+        (0, utils_js_2.throwWithContext)(context, messageOrError);
     }
     validateType(value, context, validateFunction, expectedType) {
         if (value === undefined) {
@@ -654,7 +686,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         }
         const result = validateFunction(value);
         if (!result) {
-            throw new utils_js_1.RuntimeExecutionError(`Invalid ${expectedType}`, context);
+            throw new utils_js_2.RuntimeExecutionError(`Invalid ${expectedType}`, context);
         }
         return result;
     }