circuitscript 0.1.12 → 0.1.13

package/dist/cjs/BaseVisitor.js

@@ -25,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,
@@ -54,17 +53,17 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         };
         this.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 = (0, utils_js_1.prepareValue)(dataValue);
+            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) {
@@ -107,9 +106,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         };
         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);
             }
@@ -201,55 +198,13 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             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);
-                            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(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);
         };
         this.visitValue_expr = (ctx) => {
             const sign = ctx.Minus() ? -1 : 1;
@@ -299,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);
                 }
@@ -369,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();
@@ -495,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);
     }
@@ -581,7 +586,7 @@ 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]);
+                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);