circuitscript 0.1.11 → 0.1.12

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) {
@@ -48,37 +49,61 @@ 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 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 = (0, utils_js_1.prepareValue)(dataValue);
+            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());
@@ -125,7 +150,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 +176,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,9 +197,7 @@ 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) => {
@@ -204,12 +227,18 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.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_js_1.ClassComponent) ?
-                                    'instance' : 'value',
-                            };
+                            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);
@@ -220,7 +249,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
                     }
                 });
             }
-            this.setResult(ctx, currentReference.value);
+            this.setResult(ctx, currentReference);
         };
         this.visitValue_expr = (ctx) => {
             const sign = ctx.Minus() ? -1 : 1;
@@ -233,10 +262,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() ? '-' : '';
@@ -318,19 +347,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();
@@ -384,7 +411,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 +486,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;
@@ -523,7 +549,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 +565,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 +581,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.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_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 +596,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 +673,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 +681,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;
     }