circuitscript 0.5.1 → 0.5.3

package/dist/cjs/BaseVisitor.js

@@ -7,6 +7,7 @@ const CircuitScriptParserVisitor_js_1 = require("./antlr/CircuitScriptParserVisi
 const execute_js_1 = require("./execute.js");
 const logger_js_1 = require("./logger.js");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
+const Net_js_1 = require("./objects/Net.js");
 const NumericValue_js_1 = require("./objects/NumericValue.js");
 const PercentageValue_js_1 = require("./objects/PercentageValue.js");
 const types_js_1 = require("./objects/types.js");
@@ -15,12 +16,12 @@ 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");
-const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 const hash_js_1 = require("./cache/hash.js");
 const storage_js_1 = require("./cache/storage.js");
 const serializer_js_1 = require("./cache/serializer.js");
 const deserializer_js_1 = require("./cache/deserializer.js");
 const importResolver_js_1 = require("./importResolver.js");
+const Frame_js_1 = require("./objects/Frame.js");
 class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVisitor {
     constructor(silent = false, onErrorHandler = null, environment) {
         super();
@@ -93,20 +94,7 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
                 currentReference = executor.resolveVariable(this.executionStack, atomId);
                 this.log('reference:', currentReference.name, 'found:', currentReference.found);
             }
-            if (currentReference !== undefined && currentReference.found) {
-                ctx.trailer().forEach(ctxTrailer => {
-                    this.setResult(ctxTrailer, {
-                        reference: currentReference,
-                        netNamespace: passedNetNamespace
-                    });
-                    currentReference = this.visitResult(ctxTrailer);
-                });
-            }
-            else {
-                if (ctx.trailer().length > 0 && ctx.trailer(0).LParen()) {
-                    this.throwWithContext(ctx, `Function not found: ${ctx.getText()}`);
-                }
-            }
+            currentReference = this.resolveTrailersForReference(currentReference, passedNetNamespace, ctx);
             let resultValue = currentReference;
             if (!keepReference) {
                 if (currentReference.type !== globals_js_1.ReferenceTypes.pinType) {
@@ -154,68 +142,18 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
             this.setResult(ctx, nextReference);
         };
         this.visitAssignment_expr = (ctx) => {
+            const lhsCtx = ctx.callable_expr();
+            this.setResult(lhsCtx, { keepReference: true });
+            const leftSideReference = this.visitResult(lhsCtx);
             if (ctx.Assign()) {
-                const lhsCtx = ctx.callable_expr();
-                this.setResult(lhsCtx, { keepReference: true });
-                const leftSideReference = this.visitResult(lhsCtx);
                 const rhsCtx = ctx.data_expr();
                 const rhsCtxResult = this.visitResult(rhsCtx);
+                const sequenceParts = [];
                 if ((0, utils_js_1.isReference)(rhsCtxResult) && !rhsCtxResult.found) {
                     this.throwWithContext(rhsCtx, rhsCtx.getText() + ' is not defined');
                 }
                 const rhsValue = (0, utils_js_1.unwrapValue)(rhsCtxResult);
-                const { trailers = [] } = leftSideReference;
-                const sequenceParts = [];
-                if (trailers.length === 0) {
-                    this.getScope().setVariable(leftSideReference.name, rhsValue);
-                    let itemType = '';
-                    if (rhsValue instanceof ClassComponent_js_1.ClassComponent) {
-                        itemType = globals_js_1.ReferenceTypes.instance;
-                        this.log2(`assigned '${leftSideReference.name}' to ClassComponent`);
-                    }
-                    else {
-                        itemType = globals_js_1.ReferenceTypes.variable;
-                        this.getScope().setVariable(leftSideReference.name, rhsValue);
-                        this.log2(`assigned variable ${leftSideReference.name} to ${rhsValue}`);
-                    }
-                    sequenceParts.push(...[itemType, leftSideReference.name, rhsValue]);
-                }
-                else {
-                    if (leftSideReference.rootValue instanceof ClassComponent_js_1.ClassComponent) {
-                        this.setInstanceParam(leftSideReference.rootValue, trailers, rhsValue);
-                        this.log2(`assigned component param ${leftSideReference.rootValue} trailers: ${trailers} value: ${rhsValue}`);
-                        sequenceParts.push(...['instance', [leftSideReference.rootValue, trailers], rhsValue]);
-                        if (leftSideReference.rootValue.typeProp === globals_js_1.ComponentTypes.net) {
-                            const net = this.getScope().getNet(leftSideReference.rootValue, new PinDefinition_js_1.PinId(1));
-                            if (net) {
-                                const trailerValue = trailers.join(".");
-                                net.params.set(trailerValue, rhsValue);
-                            }
-                        }
-                    }
-                    else if (leftSideReference.rootValue instanceof Object) {
-                        if (Array.isArray(trailers[0]) && trailers[0][0] === globals_js_1.TrailerArrayIndex) {
-                            if (Array.isArray(leftSideReference.rootValue)) {
-                                const arrayIndexValue = trailers[0][1];
-                                leftSideReference.rootValue[arrayIndexValue] = rhsValue;
-                                this.log2(`assigned array index ${leftSideReference.rootValue} index: ${arrayIndexValue} value: ${rhsValue}`);
-                            }
-                            else {
-                                this.throwWithContext(lhsCtx, "Invalid array");
-                            }
-                        }
-                        else {
-                            let expandedValue = leftSideReference.rootValue;
-                            trailers.slice(0, -1).forEach(trailer => {
-                                expandedValue = expandedValue[trailer];
-                            });
-                            const lastTrailer = trailers.slice(-1)[0];
-                            expandedValue[lastTrailer] = rhsValue;
-                            this.log2(`assigned object ${leftSideReference.rootValue} trailers: ${trailers} value: ${rhsValue}`);
-                        }
-                        sequenceParts.push(...['variable', [leftSideReference.rootValue, trailers], rhsValue]);
-                    }
-                }
+                this.assignValueToReference(sequenceParts, leftSideReference, lhsCtx, rhsValue);
                 if (sequenceParts.length > 0) {
                     this.getScope().sequence.push([
                         ExecutionScope_js_1.SequenceAction.Assign, ...sequenceParts
@@ -224,24 +162,21 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
                 this.setResult(ctx, rhsValue);
             }
             else {
-                const ctxCallable = ctx.callable_expr();
-                this.setResult(ctxCallable, { keepReference: true });
-                const reference = this.visitResult(ctx.callable_expr());
                 const value = this.visitResult(ctx.data_expr());
-                if (!reference.found) {
-                    this.throwWithContext(ctx, 'Undefined reference: ' + reference.name);
+                if (!leftSideReference.found) {
+                    this.throwWithContext(ctx, 'Undefined reference: ' + leftSideReference.name);
                 }
-                const trailers = reference.trailers ?? [];
+                const trailers = leftSideReference.trailers ?? [];
                 let currentValue = null;
                 if (trailers.length === 0) {
-                    currentValue = this.getExecutor().scope.variables.get(reference.name);
+                    currentValue = this.getExecutor().scope.variables.get(leftSideReference.name);
                 }
                 else {
-                    if (reference.value instanceof ClassComponent_js_1.ClassComponent) {
-                        currentValue = this.getInstanceParam(reference.value, trailers);
+                    if (leftSideReference.value instanceof ClassComponent_js_1.ClassComponent) {
+                        currentValue = this.getInstanceParam(leftSideReference.value, trailers);
                     }
-                    else if (reference.value instanceof Object) {
-                        currentValue = reference.value[trailers.join('.')];
+                    else if (leftSideReference.value instanceof Object) {
+                        currentValue = leftSideReference.value[trailers.join('.')];
                     }
                 }
                 if (currentValue === null) {
@@ -267,79 +202,10 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
                 else {
                     this.throwWithContext(ctx, 'Operator assignment failed: could not perform operator');
                 }
-                if (trailers.length === 0) {
-                    this.getExecutor().scope.setVariable(reference.name, newValue);
-                }
-                else {
-                    if (reference.value instanceof ClassComponent_js_1.ClassComponent) {
-                        this.setInstanceParam(reference.value, trailers, newValue);
-                    }
-                    else if (reference.value instanceof Object) {
-                        reference.value[trailers.join('.')] = newValue;
-                    }
-                }
+                this.assignValueToReference([], leftSideReference, lhsCtx, newValue);
                 this.setResult(ctx, newValue);
             }
         };
-        this.visitTrailer_expr2 = (ctx) => {
-            const reference = this.getResult(ctx);
-            const ctxID = ctx.ID();
-            const ctxDataExpr = ctx.data_expr();
-            const useValue = reference.value;
-            let nextReference;
-            if (ctxID) {
-                reference.trailers.push(ctxID.getText());
-                const useRootValue = reference.rootValue ?? reference.value;
-                const useTrailerIndex = reference.trailerIndex ?? 0;
-                nextReference = this.getExecutor().resolveTrailers(reference.type, useRootValue, reference.trailers);
-                nextReference.name =
-                    [reference.name,
-                        ...reference.trailers.slice(useTrailerIndex)].join('.');
-            }
-            else if (ctxDataExpr) {
-                const arrayIndex = this.visitResult(ctxDataExpr);
-                if (arrayIndex instanceof NumericValue_js_1.NumericValue) {
-                    const arrayIndexValue = arrayIndex.toNumber();
-                    const foundValue = useValue[arrayIndexValue];
-                    const refType = foundValue instanceof ClassComponent_js_1.ClassComponent
-                        ? globals_js_1.ReferenceTypes.instance : globals_js_1.ReferenceTypes.variable;
-                    nextReference = new types_js_1.AnyReference({
-                        found: true,
-                        type: refType,
-                        value: foundValue,
-                        trailers: [[globals_js_1.TrailerArrayIndex, arrayIndexValue]],
-                        rootValue: useValue
-                    });
-                }
-            }
-            this.setResult(ctx, nextReference);
-        };
-        this.visitAtom_expr = (ctx) => {
-            const executor = this.getExecutor();
-            const firstId = ctx.ID(0);
-            const atomId = firstId.getText();
-            let currentReference;
-            if (globals_js_1.PinTypesList.indexOf(atomId) !== -1) {
-                currentReference = new types_js_1.AnyReference({
-                    found: true,
-                    value: atomId,
-                    type: globals_js_1.ReferenceTypes.pinType,
-                });
-            }
-            else {
-                this.log('resolve variable ctx: ' + ctx.getText(), 'atomId', atomId);
-                currentReference = executor.resolveVariable(this.executionStack, atomId);
-                this.log('reference:', currentReference.name, 'found:', currentReference.found);
-            }
-            if (currentReference !== undefined && currentReference.found) {
-                ctx.trailer_expr2().forEach(ctxTrailer => {
-                    this.setResult(ctxTrailer, currentReference);
-                    currentReference = this.visitResult(ctxTrailer);
-                });
-            }
-            this.setResult(ctx, currentReference);
-            this.log2('atom resolved: ' + ctx.getText() + ' -> ' + currentReference);
-        };
         this.visitValue_expr = (ctx) => {
             const sign = ctx.Minus() ? -1 : 1;
             const ctxIntegerValue = ctx.INTEGER_VALUE();
@@ -634,6 +500,72 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
             }
         }
     }
+    resolveTrailersForReference(reference, passedNetNamespace, ctx) {
+        if (reference !== undefined && reference.found) {
+            ctx.trailer().forEach(ctxTrailer => {
+                this.setResult(ctxTrailer, {
+                    reference: reference,
+                    netNamespace: passedNetNamespace
+                });
+                reference = this.visitResult(ctxTrailer);
+            });
+        }
+        else {
+            if (ctx.trailer().length > 0 && ctx.trailer(0).LParen()) {
+                this.throwWithContext(ctx, `Function not found: ${ctx.getText()}`);
+            }
+        }
+        return reference;
+    }
+    assignValueToReference(sequenceParts, leftSideReference, lhsCtx, rhsValue) {
+        const { trailers = [] } = leftSideReference;
+        if (trailers.length === 0) {
+            this.getScope().setVariable(leftSideReference.name, rhsValue);
+            let itemType = '';
+            if (rhsValue instanceof ClassComponent_js_1.ClassComponent) {
+                itemType = globals_js_1.ReferenceTypes.instance;
+                this.log2(`assigned '${leftSideReference.name}' to ClassComponent`);
+            }
+            else {
+                itemType = globals_js_1.ReferenceTypes.variable;
+                this.getScope().setVariable(leftSideReference.name, rhsValue);
+                this.log2(`assigned variable ${leftSideReference.name} to ${rhsValue}`);
+            }
+            sequenceParts.push(...[itemType, leftSideReference.name, rhsValue]);
+        }
+        else {
+            if (leftSideReference.rootValue instanceof ClassComponent_js_1.ClassComponent) {
+                this.setInstanceParam(leftSideReference.rootValue, trailers, rhsValue);
+                this.log2(`assigned component param ${leftSideReference.rootValue} trailers: ${trailers} value: ${rhsValue}`);
+                sequenceParts.push(...['instance', [leftSideReference.rootValue, trailers], rhsValue]);
+            }
+            else if (leftSideReference.rootValue instanceof Frame_js_1.Frame) {
+                leftSideReference.rootValue.parameters.set(trailers[0], rhsValue);
+            }
+            else if (leftSideReference.rootValue instanceof Object) {
+                if (Array.isArray(trailers[0]) && trailers[0][0] === globals_js_1.TrailerArrayIndex) {
+                    if (Array.isArray(leftSideReference.rootValue)) {
+                        const arrayIndexValue = trailers[0][1];
+                        leftSideReference.rootValue[arrayIndexValue] = rhsValue;
+                        this.log2(`assigned array index ${leftSideReference.rootValue} index: ${arrayIndexValue} value: ${rhsValue}`);
+                    }
+                    else {
+                        this.throwWithContext(lhsCtx, "Invalid array");
+                    }
+                }
+                else {
+                    let expandedValue = leftSideReference.rootValue;
+                    trailers.slice(0, -1).forEach(trailer => {
+                        expandedValue = expandedValue[trailer];
+                    });
+                    const lastTrailer = trailers.slice(-1)[0];
+                    expandedValue[lastTrailer] = rhsValue;
+                    this.log2(`assigned object ${leftSideReference.rootValue} trailers: ${trailers} value: ${rhsValue}`);
+                }
+                sequenceParts.push(...['variable', [leftSideReference.rootValue, trailers], rhsValue]);
+            }
+        }
+    }
     getReference(ctx) {
         const atomStr = ctx.getText();
         if (atomStr.indexOf('(') !== -1 || atomStr.indexOf(')') !== -1) {
@@ -1048,9 +980,40 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
         return result;
     }
     setInstanceParam(object, trailers, value) {
-        const paramName = trailers[0];
-        object.setParam(paramName, value);
-        this.log2(`set instance ${object.instanceName} param ${paramName} to ${value}`);
+        if (trailers.length === 1) {
+            const paramName = trailers[0];
+            if (paramName === globals_js_1.ParamKeys.flipX || paramName == globals_js_1.ParamKeys.flipY) {
+                if (typeof value === "boolean") {
+                    value = value ? (0, NumericValue_js_1.numeric)(1) : (0, NumericValue_js_1.numeric)(0);
+                }
+            }
+            object.setParam(paramName, value);
+            const unitModifiers = [
+                globals_js_1.ParamKeys.angle,
+                globals_js_1.ParamKeys.flip,
+                globals_js_1.ParamKeys.flipX,
+                globals_js_1.ParamKeys.flipY,
+            ];
+            if (unitModifiers.indexOf(paramName) !== -1) {
+                object.getUnit().setParam(paramName, value);
+            }
+            this.log2(`set instance ${object.instanceName} param ${paramName} to ${value}`);
+        }
+        else {
+            let reference = null;
+            for (let i = 0; i < trailers.length; i++) {
+                const trailer = trailers[i];
+                if (i === 0) {
+                    reference = object.getParam(trailer);
+                }
+                else {
+                    if (reference instanceof Net_js_1.Net) {
+                        const remainingTrailers = trailers.slice(i);
+                        reference.params.set(remainingTrailers.join("."), value);
+                    }
+                }
+            }
+        }
     }
     getInstanceParam(object, trailers) {
         const paramName = trailers[0];