circuitscript 0.1.0 → 0.1.3

package/dist/cjs/visitor.js

@@ -17,9 +17,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         super(...arguments);
         this.visitKeyword_assignment_expr = (ctx) => {
             const id = ctx.ID().getText();
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const value = this.getResult(ctxDataExpr);
+            const value = this.visitResult(ctx.data_expr());
             this.setResult(ctx, [id, value]);
         };
         this.visitPin_select_expr = (ctx) => {
@@ -35,56 +33,48 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, value);
         };
         this.visitAdd_component_expr = (ctx) => {
-            const ctxDataWithAssignmentExpr = ctx.data_expr_with_assignment();
-            this.visit(ctxDataWithAssignmentExpr);
-            const [component, pinValue] = this.getResult(ctxDataWithAssignmentExpr);
+            const [component, pinValue] = this.visitResult(ctx.data_expr_with_assignment());
             this.getExecutor().addComponentExisting(component, pinValue);
         };
         this.visitAt_component_expr = (ctx) => {
-            if (ctx.Point()) {
-                this.getExecutor().atPointBlock();
-            }
-            else {
-                const ctxComponentSelectExpr = ctx.component_select_expr();
-                this.visit(ctxComponentSelectExpr);
-                const [component, pin] = this.getResult(ctxComponentSelectExpr);
-                this.getExecutor().atComponent(component, pin, {
-                    addSequence: true
-                });
-            }
+            const [component, pin] = this.visitResult(ctx.component_select_expr());
+            this.getExecutor().atComponent(component, pin, {
+                addSequence: true
+            });
             return this.getExecutor().getCurrentPoint();
         };
         this.visitTo_component_expr = (ctx) => {
-            if (ctx.Point()) {
-                this.getExecutor().toPointBlock();
-            }
-            else {
-                ctx.component_select_expr().forEach(item => {
-                    this.visit(item);
-                    const [component, pin] = this.getResult(item);
-                    this.getExecutor().toComponent(component, pin, {
-                        addSequence: true
-                    });
+            ctx.component_select_expr().forEach(item => {
+                const [component, pin] = this.visitResult(item);
+                this.getExecutor().toComponent(component, pin, {
+                    addSequence: true
                 });
-            }
+            });
             return this.getExecutor().getCurrentPoint();
         };
         this.visitComponent_select_expr = (ctx) => {
             const ctxDataExprWithAssigment = ctx.data_expr_with_assignment();
-            if (ctxDataExprWithAssigment) {
-                this.visit(ctxDataExprWithAssigment);
-                this.setResult(ctx, this.getResult(ctxDataExprWithAssigment));
+            let componentPin = null;
+            if (ctx.Point()) {
+                const [component, pin,] = this.getExecutor().getPointBlockLocation();
+                componentPin = [component, pin];
+            }
+            else if (ctxDataExprWithAssigment) {
+                componentPin = this.visitResult(ctxDataExprWithAssigment);
             }
             else {
                 const component = this.getExecutor().scope.currentComponent;
                 let pinId = null;
                 const ctxPinSelectExpr = ctx.pin_select_expr();
                 if (ctxPinSelectExpr) {
-                    this.visit(ctxPinSelectExpr);
-                    pinId = this.getResult(ctxPinSelectExpr);
+                    pinId = this.visitResult(ctxPinSelectExpr);
+                }
+                if (pinId === null) {
+                    this.throwWithContext(ctx, "Could not resolve pin");
                 }
-                this.setResult(ctx, [component, pinId]);
+                componentPin = [component, pinId];
             }
+            this.setResult(ctx, componentPin);
         };
         this.visitPath_blocks = (ctx) => {
             const blocks = ctx.path_block_inner();
@@ -123,7 +113,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitCreate_component_expr = (ctx) => {
             const properties = this.getPropertyExprList(ctx.property_expr());
             const pins = this.parseCreateComponentPins(properties.get('pins'));
-            let instanceName = this.getExecutor().getUniqueInstanceName('');
+            let instanceName = this.getExecutor().getUniqueInstanceName();
             const propParams = properties.get('params');
             const params = this.parseCreateComponentParams(propParams);
             if (params.length > 0) {
@@ -145,12 +135,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 properties.get('copy') : false;
             const width = properties.has('width') ?
                 properties.get('width') : null;
-            const angle = properties.has('angle') ?
-                properties.get('angle') : null;
+            const height = properties.has('height') ?
+                properties.get('height') : null;
+            const angle = properties.has(globals_js_1.ParamKeys.angle) ?
+                properties.get(globals_js_1.ParamKeys.angle) : null;
             const followWireOrientation = properties.has('followWireOrientation') ?
                 properties.get('followWireOrientation') : true;
             const props = {
-                arrange, display, type, width, copy,
+                arrange, display, type, width, height, copy,
                 angle, followWireOrientation
             };
             const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
@@ -177,8 +169,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 const currentStack = this.executionStack.splice(0);
                 this.executionStack.push(...stack);
                 const graphicsExpressionsCtx = ctx.graphic_expressions_block();
-                this.visit(graphicsExpressionsCtx);
-                const commands = this.getResult(graphicsExpressionsCtx);
+                const commands = this.visitResult(graphicsExpressionsCtx);
                 this.executionStack.splice(0);
                 this.executionStack.push(...currentStack);
                 return commands;
@@ -188,8 +179,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitGraphic_expressions_block = (ctx) => {
             const commands = ctx.graphic_expr().reduce((accum, item) => {
-                this.visit(item);
-                const [commandName, parameters] = this.getResult(item);
+                const [commandName, parameters] = this.visitResult(item);
                 if (commandName === draw_symbols_js_1.PlaceHolderCommands.for) {
                     accum = accum.concat(parameters);
                 }
@@ -204,7 +194,16 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         }
                         return accum;
                     }, []);
-                    accum.push([commandName, positionParams, keywordParams, item]);
+                    let useCommandName = commandName;
+                    let usePositionParams = positionParams;
+                    if (commandName === draw_symbols_js_1.PlaceHolderCommands.crect) {
+                        useCommandName = draw_symbols_js_1.PlaceHolderCommands.rect;
+                        const [centerX, centerY, width, height] = positionParams;
+                        const newX = centerX.sub(width.half());
+                        const newY = centerY.sub(height.half());
+                        usePositionParams = [newX, newY, width, height];
+                    }
+                    accum.push([useCommandName, usePositionParams, keywordParams, item]);
                 }
                 return accum;
             }, []);
@@ -222,18 +221,15 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             let parameters = [];
             const ctxNestedProperties = ctx.nested_properties_inner();
             if (ctxNestedProperties) {
-                this.visit(ctxNestedProperties);
-                const nestedKeyValues = this.getResult(ctxNestedProperties);
+                const nestedKeyValues = this.visitResult(ctxNestedProperties);
                 nestedKeyValues.forEach((value, key) => {
                     parameters.push(['keyword', key, value]);
                 });
             }
             else {
-                const ctxParameters = ctx.parameters();
-                this.visit(ctxParameters);
-                parameters = this.getResult(ctxParameters);
+                parameters = this.visitResult(ctx.parameters());
             }
-            if (commandName === 'label') {
+            if (commandName === draw_symbols_js_1.PlaceHolderCommands.label) {
                 parameters.forEach(item => {
                     if (item[0] == 'keyword' && item[1] === 'portType') {
                         if (item[2] === 'in') {
@@ -249,9 +245,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitGraphicForExpr = (ctx) => {
             const forVariableNames = ctx.ID().map(item => item.getText());
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const listItems = this.getResult(ctxDataExpr);
+            const listItems = this.visitResult(ctx.data_expr());
             let keepLooping = true;
             let counter = 0;
             let allCommands = [];
@@ -264,9 +258,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     useValueArray.forEach((value, index) => {
                         this.getExecutor().scope.variables.set(forVariableNames[index], value);
                     });
-                    const graphicsExpressionsCtx = ctx.graphic_expressions_block();
-                    this.visit(graphicsExpressionsCtx);
-                    const commands = this.getResult(graphicsExpressionsCtx);
+                    const commands = this.visitResult(ctx.graphic_expressions_block());
                     allCommands = allCommands.concat(commands);
                     counter += 1;
                 }
@@ -278,8 +270,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitCreate_module_expr = (ctx) => {
             const properties = this.getPropertyExprList(ctx.property_expr());
-            const { left: leftPorts, right: rightPorts } = this.parseCreateModulePorts(properties.get('ports'));
-            const allPorts = [...leftPorts, ...rightPorts].filter(item => {
+            const modulePorts = this.parseCreateModulePorts(properties.get('ports'));
+            const { [globals_js_1.SymbolPinSide.Left]: leftPorts, [globals_js_1.SymbolPinSide.Right]: rightPorts, [globals_js_1.SymbolPinSide.Top]: topPorts, [globals_js_1.SymbolPinSide.Bottom]: bottomPorts } = modulePorts;
+            const allPorts = [...leftPorts, ...rightPorts,
+                ...topPorts, ...bottomPorts].filter(item => {
                 return !(Array.isArray(item));
             });
             const nameToPinId = new Map();
@@ -287,64 +281,42 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 nameToPinId.set(portName, index + 1);
                 return new PinDefinition_js_1.PinDefinition(index + 1, PinDefinition_js_1.PinIdType.Int, portName, PinTypes_js_1.PinTypes.Any);
             });
-            const arrangeLeftItems = leftPorts.map(item => {
-                if (Array.isArray(item)) {
-                    return item;
-                }
-                else {
-                    return nameToPinId.get(item);
-                }
-            });
-            const arrangeRightItems = rightPorts.map(item => {
-                if (Array.isArray(item)) {
-                    return item;
-                }
-                else {
-                    return nameToPinId.get(item);
-                }
-            });
-            const arrange = new Map();
-            if (arrangeLeftItems.length > 0) {
-                arrange.set('left', arrangeLeftItems);
-            }
-            if (arrangeRightItems.length > 0) {
-                arrange.set('right', arrangeRightItems);
-            }
+            const arrange = this.getArrangePropFromModulePorts(modulePorts, nameToPinId);
             const width = properties.has('width') ?
                 properties.get('width') : null;
+            const height = properties.has('height') ?
+                properties.get('height') : null;
             const blankParams = [];
             const props = {
-                arrange, width
+                arrange, width, height,
+                copy: false,
+                followWireOrientation: true,
             };
-            const moduleInstanceName = this.getExecutor().getUniqueInstanceName('');
-            const createdComponent = this.getExecutor().createComponent(moduleInstanceName, tmpPorts, blankParams, props);
-            createdComponent.typeProp = 'module';
+            const moduleInstanceName = this.getExecutor().getUniqueInstanceName();
+            const moduleComponent = this.getExecutor().createComponent(moduleInstanceName, tmpPorts, blankParams, props, true);
+            moduleComponent.typeProp = globals_js_1.ComponentTypes.module;
             const ctxPropertyBlock = ctx.property_block_expr();
             if (ctxPropertyBlock) {
                 const [firstBlock] = ctxPropertyBlock;
-                this.visit(firstBlock);
-                const [keyName, expressionsBlock] = this.getResult(firstBlock);
+                const [keyName, expressionsBlock] = this.visitResult(firstBlock);
                 if (keyName === globals_js_1.ModuleContainsKeyword) {
-                    createdComponent.moduleContainsExpressions = expressionsBlock;
-                    this.expandModuleContains(createdComponent, this.getExecutor().netNamespace);
+                    moduleComponent.moduleContainsExpressions = expressionsBlock;
+                    this.expandModuleContains(moduleComponent, this.getExecutor().netNamespace);
                 }
             }
-            this.setResult(ctx, createdComponent);
+            if (moduleComponent.moduleContainsExpressions === undefined) {
+                throw 'Module has no `contains` block defined!';
+            }
+            this.setResult(ctx, moduleComponent);
         };
         this.visitProperty_block_expr = (ctx) => {
-            const tmpCtx = ctx.property_key_expr();
-            this.visit(tmpCtx);
-            const keyName = this.getResult(tmpCtx);
+            const keyName = this.visitResult(ctx.property_key_expr());
             const expressionsBlock = ctx.expressions_block();
             this.setResult(ctx, [keyName, expressionsBlock]);
         };
         this.visitProperty_expr = (ctx) => {
-            const ctxPropertyKeyExpr = ctx.property_key_expr();
-            const ctxPropertyValueExpr = ctx.property_value_expr();
-            this.visit(ctxPropertyKeyExpr);
-            this.visit(ctxPropertyValueExpr);
-            const keyName = this.getResult(ctxPropertyKeyExpr);
-            const value = this.getResult(ctxPropertyValueExpr);
+            const keyName = this.visitResult(ctx.property_key_expr());
+            const value = this.visitResult(ctx.property_value_expr());
             if (value instanceof types_js_1.UndeclaredReference && (value.reference.parentValue === undefined
                 && value.reference.value === undefined)) {
                 throw value.throwMessage();
@@ -356,14 +328,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitSingle_line_property = (ctx) => {
             let value;
             if (ctx.data_expr().length === 1) {
-                const ctxFirst = ctx.data_expr(0);
-                this.visit(ctxFirst);
-                value = this.getResult(ctxFirst);
+                value = this.visitResult(ctx.data_expr(0));
             }
             else {
                 value = ctx.data_expr().map(item => {
-                    this.visit(item);
-                    return this.getResult(item);
+                    return this.visitResult(item);
                 });
             }
             this.setResult(ctx, value);
@@ -371,8 +340,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitNested_properties_inner = (ctx) => {
             const result = new Map();
             ctx.property_expr().forEach((item) => {
-                this.visit(item);
-                const property = this.getResult(item);
+                const property = this.visitResult(item);
                 for (const [key, value] of property) {
                     result.set(key, value);
                 }
@@ -380,9 +348,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, result);
         };
         this.visitNested_properties = (ctx) => {
-            const ctxNested = ctx.nested_properties_inner();
-            this.visit(ctxNested);
-            this.setResult(ctx, this.getResult(ctxNested));
+            this.setResult(ctx, this.visitResult(ctx.nested_properties_inner()));
         };
         this.visitProperty_key_expr = (ctx) => {
             const ctxID = ctx.ID();
@@ -406,16 +372,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const ctxDataExpr = ctx.data_expr();
             const ctxAssignmentExpr = ctx.assignment_expr();
             if (ctxDataExpr) {
-                this.visit(ctxDataExpr);
-                component = this.getResult(ctxDataExpr);
+                component = this.visitResult(ctxDataExpr);
                 componentCtx = ctxDataExpr;
                 if (component === null || component === undefined) {
                     this.throwWithContext(ctxDataExpr, "Could not find component: " + ctxDataExpr.getText());
                 }
             }
             else if (ctxAssignmentExpr) {
-                this.visit(ctxAssignmentExpr);
-                component = this.getResult(ctxAssignmentExpr);
+                component = this.visitResult(ctxAssignmentExpr);
                 componentCtx = ctxAssignmentExpr;
             }
             if (component instanceof ClassComponent_js_1.ClassComponent
@@ -439,27 +403,25 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     const ctxID2 = modifier.ID(1);
                     let result = null;
                     if (ctxValueExpr) {
-                        this.visit(ctxValueExpr);
-                        result = this.getResult(ctxValueExpr);
+                        result = this.visitResult(ctxValueExpr);
                     }
                     else if (ctxID2) {
                         result = ctxID2.getText();
                     }
                     let shouldIgnoreWireOrientation = false;
-                    if (modifierText === 'flip') {
+                    if (modifierText === globals_js_1.ParamKeys.flip) {
                         const flipValue = result;
                         if (flipValue.indexOf('x') !== -1) {
-                            component.setParam('flipX', 1);
+                            component.setParam(globals_js_1.ParamKeys.flipX, 1);
                             shouldIgnoreWireOrientation = true;
                         }
                         if (flipValue.indexOf('y') !== -1) {
-                            component.setParam('flipY', 1);
+                            component.setParam(globals_js_1.ParamKeys.flipY, 1);
                             shouldIgnoreWireOrientation = true;
                         }
                     }
-                    else if (modifierText === 'angle') {
-                        const angleValue = Number(result);
-                        component.setParam('angle', angleValue);
+                    else if (modifierText === globals_js_1.ParamKeys.angle) {
+                        component.setParam(globals_js_1.ParamKeys.angle, result);
                         shouldIgnoreWireOrientation = true;
                     }
                     else if (modifierText === 'anchor') {
@@ -473,8 +435,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             let pinValue = null;
             const ctxPinSelectExpr = ctx.pin_select_expr();
             if (ctxPinSelectExpr) {
-                this.visit(ctxPinSelectExpr);
-                pinValue = this.getResult(ctxPinSelectExpr);
+                pinValue = this.visitResult(ctxPinSelectExpr);
             }
             else {
                 if (component instanceof ClassComponent_js_1.ClassComponent) {
@@ -488,24 +449,23 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, [component, pinValue]);
         };
         this.visitUnaryOperatorExpr = (ctx) => {
-            this.visit(ctx.data_expr());
-            let value = this.getResult(ctx.data_expr());
+            let value = this.visitResult(ctx.data_expr());
             const unaryOp = ctx.unary_operator();
             if (unaryOp) {
                 if (unaryOp.Not()) {
                     if (typeof value === "boolean") {
                         value = !value;
                     }
-                    else if (typeof value === "number") {
-                        value = (value === 0) ? false : true;
+                    else if (value instanceof ParamDefinition_js_1.NumericValue) {
+                        value = (value.toNumber() === 0) ? true : false;
                     }
                     else {
                         throw "Failed to do Not operator";
                     }
                 }
                 else if (unaryOp.Minus()) {
-                    if (typeof value === 'number') {
-                        value = -value;
+                    if (value instanceof ParamDefinition_js_1.NumericValue) {
+                        value = value.neg();
                     }
                     else {
                         throw "Failed to do Negation operator";
@@ -520,16 +480,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const ctxCreateGraphicExpr = ctx.create_graphic_expr();
             const ctxCreateModuleExpr = ctx.create_module_expr();
             if (ctxCreateComponentExpr) {
-                this.visit(ctxCreateComponentExpr);
-                value = this.getResult(ctxCreateComponentExpr);
+                value = this.visitResult(ctxCreateComponentExpr);
             }
             else if (ctxCreateGraphicExpr) {
-                this.visit(ctxCreateGraphicExpr);
-                value = this.getResult(ctxCreateGraphicExpr);
+                value = this.visitResult(ctxCreateGraphicExpr);
             }
             else if (ctxCreateModuleExpr) {
-                this.visit(ctxCreateModuleExpr);
-                value = this.getResult(ctxCreateModuleExpr);
+                value = this.visitResult(ctxCreateModuleExpr);
             }
             else {
                 throw "Invalid data expression";
@@ -539,10 +496,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitBinaryOperatorExpr = (ctx) => {
             const ctx0 = ctx.data_expr(0);
             const ctx1 = ctx.data_expr(1);
-            this.visit(ctx0);
-            this.visit(ctx1);
-            const value1 = this.getResult(ctx0);
-            const value2 = this.getResult(ctx1);
+            let value1 = this.visitResult(ctx0);
+            let value2 = this.visitResult(ctx1);
+            if (value1 instanceof ParamDefinition_js_1.NumericValue) {
+                value1 = value1.toNumber();
+            }
+            if (value2 instanceof ParamDefinition_js_1.NumericValue) {
+                value2 = value2.toNumber();
+            }
             const binaryOperatorType = ctx.binary_operator();
             let result = null;
             if (binaryOperatorType.Equals()) {
@@ -568,60 +529,87 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitLogicalOperatorExpr = (ctx) => {
             const ctx0 = ctx.data_expr(0);
             const ctx1 = ctx.data_expr(1);
-            this.visit(ctx0);
-            const value1 = this.getResult(ctx0);
+            let value1 = this.visitResult(ctx0);
+            if (value1 instanceof ParamDefinition_js_1.NumericValue) {
+                value1 = value1.toNumber();
+            }
             let value2 = false;
             let skipNext = false;
-            if (ctx.LogicalOr() && value1) {
+            const isLogicalOr = ctx.LogicalOr();
+            if (isLogicalOr && value1) {
                 skipNext = true;
             }
             if (!skipNext) {
-                this.visit(ctx1);
-                value2 = this.getResult(ctx1);
+                value2 = this.visitResult(ctx1);
+                if (value2 instanceof ParamDefinition_js_1.NumericValue) {
+                    value2 = value2.toNumber();
+                }
             }
             let result = null;
             if (ctx.LogicalAnd()) {
                 result = value1 && value2;
             }
-            else if (ctx.LogicalOr()) {
+            else if (isLogicalOr) {
                 result = value1 || value2;
             }
+            if (typeof result === "number") {
+                result = (0, ParamDefinition_js_1.numeric)(result);
+            }
             this.setResult(ctx, result);
         };
         this.visitMultiplyExpr = (ctx) => {
             const value1 = this.resolveDataExpr(ctx.data_expr(0));
             const value2 = this.resolveDataExpr(ctx.data_expr(1));
+            const operator = new ParamDefinition_js_1.NumberOperator();
+            const tmpValue1 = operator.prepare(value1);
+            const tmpValue2 = operator.prepare(value2);
             let result = null;
             if (ctx.Multiply()) {
-                result = value1 * value2;
+                result = operator.multiply(tmpValue1, tmpValue2);
             }
             else if (ctx.Divide()) {
-                result = value1 / value2;
+                result = operator.divide(tmpValue1, tmpValue2);
             }
             else if (ctx.Modulus()) {
-                result = value1 % value2;
+                result = operator.modulus(tmpValue1, tmpValue2);
             }
             this.setResult(ctx, result);
         };
         this.visitAdditionExpr = (ctx) => {
             const value1 = this.resolveDataExpr(ctx.data_expr(0));
             const value2 = this.resolveDataExpr(ctx.data_expr(1));
-            let result = null;
-            if (ctx.Addition()) {
-                result = value1 + value2;
+            if (ctx.Addition() && (typeof value1 === 'string' || typeof value2 === 'string')) {
+                let tmpValue1 = value1;
+                if (value1 instanceof ParamDefinition_js_1.NumericValue) {
+                    tmpValue1 = value1.toDisplayString();
+                }
+                let tmpValue2 = value2;
+                if (value2 instanceof ParamDefinition_js_1.NumericValue) {
+                    tmpValue2 = value2.toDisplayString();
+                }
+                const result = tmpValue1 + tmpValue2;
+                this.setResult(ctx, result);
             }
-            else if (ctx.Minus()) {
-                result = value1 - value2;
+            else {
+                const operator = new ParamDefinition_js_1.NumberOperator();
+                const tmpValue1 = operator.prepare(value1);
+                const tmpValue2 = operator.prepare(value2);
+                let result = null;
+                if (ctx.Addition()) {
+                    result = operator.addition(tmpValue1, tmpValue2);
+                }
+                else if (ctx.Minus()) {
+                    result = operator.subtraction(tmpValue1, tmpValue2);
+                }
+                this.setResult(ctx, result);
             }
-            this.setResult(ctx, result);
         };
         this.visitFunction_def_expr = (ctx) => {
             const functionName = ctx.ID().getText();
             let funcDefinedParameters = [];
             const ctxFunctionArgsExpr = ctx.function_args_expr();
             if (ctxFunctionArgsExpr) {
-                this.visit(ctxFunctionArgsExpr);
-                funcDefinedParameters = this.getResult(ctxFunctionArgsExpr);
+                funcDefinedParameters = this.visitResult(ctxFunctionArgsExpr);
             }
             const executionStack = this.executionStack;
             const functionCounter = { counter: 0 };
@@ -652,12 +640,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, result);
         };
         this.visitAt_block_pin_expr = (ctx) => {
-            const ctxPinSelectExpr2 = ctx.pin_select_expr2();
-            this.visit(ctxPinSelectExpr2);
-            const atPin = this.getResult(ctxPinSelectExpr2);
+            const atPin = this.visitResult(ctx.pin_select_expr2());
             const executor = this.getExecutor();
-            const currentComponent = executor.scope.currentComponent;
-            const currentPin = executor.scope.currentPin;
+            const [currentComponent, currentPin] = executor.getCurrentPoint();
             executor.atComponent(currentComponent, atPin, {
                 addSequence: true
             });
@@ -719,8 +704,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     useValue = Number(ctxIntegerValue);
                 }
                 else if (ctxDataExpr) {
-                    this.visit(ctxDataExpr);
-                    useValue = this.getResult(ctxDataExpr);
+                    useValue = this.visitResult(ctxDataExpr);
                 }
                 if (useValue !== null) {
                     this.setResult(ctx, [direction, new helpers_js_1.UnitDimension(useValue)]);
@@ -732,8 +716,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitWire_expr = (ctx) => {
             const wireAtomExpr = ctx.wire_atom_expr();
             const segments = wireAtomExpr.map(wireSegment => {
-                this.visit(wireSegment);
-                return this.getResult(wireSegment);
+                return this.visitResult(wireSegment);
             });
             this.getExecutor().addWire(segments);
         };
@@ -742,18 +725,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             return this.getExecutor().addPoint(ID.getText());
         };
         this.visitProperty_set_expr = (ctx) => {
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const result = this.getResult(ctxDataExpr);
-            const ctxAtomExpr = ctx.atom_expr();
-            this.visit(ctxAtomExpr);
-            const resolvedProperty = this.getResult(ctxAtomExpr);
+            const result = this.visitResult(ctx.data_expr());
+            const resolvedProperty = this.visitResult(ctx.atom_expr());
             this.getExecutor().setProperty(resolvedProperty, result);
         };
         this.visitDouble_dot_property_set_expr = (ctx) => {
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const result = this.getResult(ctxDataExpr);
+            const result = this.visitResult(ctx.data_expr());
             const propertyName = ctx.ID().getText();
             this.getExecutor().setProperty('..' + propertyName, result);
         };
@@ -775,8 +752,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const hasPlus = ctx.Addition();
             const ctxDataExpr = ctx.data_expr();
             if (ctxDataExpr) {
-                this.visit(ctxDataExpr);
-                dataValue = this.getResult(ctxDataExpr);
+                dataValue = this.visitResult(ctxDataExpr);
                 if (dataValue instanceof types_js_1.UndeclaredReference) {
                     netNamespace = "/" + dataValue.reference.name;
                 }
@@ -793,9 +769,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, (hasPlus ? "+" : "") + netNamespace);
         };
         this.visitIf_expr = (ctx) => {
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const result = this.getResult(ctxDataExpr);
+            const result = this.visitResult(ctx.data_expr());
             let resultValue = result;
             if (result instanceof types_js_1.UndeclaredReference) {
                 resultValue = false;
@@ -807,9 +781,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 const ctxInnerIfExprs = ctx.if_inner_expr();
                 let innerIfWasTrue = false;
                 for (let i = 0; i < ctxInnerIfExprs.length; i++) {
-                    const tmpCtx = ctxInnerIfExprs[i];
-                    this.visit(tmpCtx);
-                    const innerResult = this.getResult(tmpCtx);
+                    const innerResult = this.visitResult(ctxInnerIfExprs[i]);
                     if (innerResult) {
                         innerIfWasTrue = true;
                         break;
@@ -824,9 +796,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
         };
         this.visitIf_inner_expr = (ctx) => {
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const result = this.getResult(ctxDataExpr);
+            const result = this.visitResult(ctx.data_expr());
             if (result) {
                 this.visit(ctx.expressions_block());
             }
@@ -838,8 +808,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.log('enter while loop');
             this.getExecutor().addBreakContext(ctx);
             while (keepLooping) {
-                this.visit(dataExpr);
-                const result = this.getResult(dataExpr);
+                const result = this.visitResult(dataExpr);
                 if (result) {
                     this.visit(ctx.expressions_block());
                     keepLooping = true;
@@ -864,10 +833,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.log('exit while loop');
         };
         this.visitFor_expr = (ctx) => {
+            this.log('in for loop');
             const forVariableNames = ctx.ID().map(item => item.getText());
-            const ctxDataExpr = ctx.data_expr();
-            this.visit(ctxDataExpr);
-            const listItems = this.getResult(ctxDataExpr);
+            const listItems = this.visitResult(ctx.data_expr());
             this.getExecutor().addBreakContext(ctx);
             let keepLooping = true;
             let counter = 0;
@@ -884,6 +852,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     keepLooping = true;
                     const currentResult = this.getResult(ctx) ?? {};
                     const { breakSignal = false, continueSignal = false } = currentResult;
+                    this.log('condition result: ', breakSignal, continueSignal);
                     if (breakSignal && !continueSignal) {
                         keepLooping = false;
                     }
@@ -914,11 +883,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.getExecutor().log('expanding module `contains`');
         const executionStack = this.executionStack;
         const resolveNet = this.createNetResolver(executionStack);
-        const executionContextName = this.getExecutor().namespace + "_"
+        const executor = this.getExecutor();
+        const executionContextName = executor.namespace + "_"
             + component.instanceName
             + '_' + component.moduleCounter;
         const tmpNamespace = this.getNetNamespace(netNamespace, "+/" + component.instanceName + "_" + component.moduleCounter);
-        const newExecutor = this.enterNewChildContext(executionStack, this.getExecutor(), executionContextName, { netNamespace: tmpNamespace }, [], []);
+        const newExecutor = this.enterNewChildContext(executionStack, executor, executionContextName, { netNamespace: tmpNamespace }, [], []);
         component.moduleCounter += 1;
         newExecutor.resolveNet = resolveNet;
         this.visit(component.moduleContainsExpressions);
@@ -936,9 +906,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         });
         const pinIdToPortMap = new Map();
         moduleComponent.modulePinIdToPortMap = pinIdToPortMap;
-        for (const [key, component] of executionContext.scope.instances) {
-            if (component._copyID !== null && component.typeProp === 'port') {
-                const portName = component.parameters.get('net_name');
+        for (const [, component] of executionContext.scope.instances) {
+            if (component._copyID !== null && component.typeProp === globals_js_1.ComponentTypes.port) {
+                const portName = component.parameters.get(globals_js_1.ParamKeys.net_name);
                 const modulePinId = modulePinMapping.get(portName);
                 pinIdToPortMap.set(modulePinId, component);
                 const portType = (0, utils_js_1.getPortType)(component);
@@ -948,7 +918,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         }
     }
     placeModuleContains(moduleComponent) {
-        if (moduleComponent.typeProp === 'module'
+        if (moduleComponent.typeProp === globals_js_1.ComponentTypes.module
             && moduleComponent.moduleContainsExpressions) {
             this.log('place module `contains`');
             this.getExecutor().mergeScope(moduleComponent.moduleExecutionContext.scope, moduleComponent.moduleExecutionContextName);
@@ -960,8 +930,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         }
     }
     resolveDataExpr(data_expr) {
-        this.visit(data_expr);
-        const value = this.getResult(data_expr);
+        const value = this.visitResult(data_expr);
         if (value instanceof types_js_1.UndeclaredReference) {
             this.throwWithContext(data_expr, value.throwMessage());
         }
@@ -981,8 +950,8 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     }
     parseCreateComponentPins(pinData) {
         const pins = [];
-        if (typeof pinData === 'number') {
-            const lastPin = pinData;
+        if (pinData instanceof ParamDefinition_js_1.NumericValue) {
+            const lastPin = pinData.toNumber();
             for (let i = 0; i < lastPin; i++) {
                 const pinId = i + 1;
                 pins.push(new PinDefinition_js_1.PinDefinition(pinId, PinDefinition_js_1.PinIdType.Int, pinId.toString()));
@@ -1018,30 +987,49 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 else {
                     pinName = pinDef;
                 }
+                this.log('pins', pinId, pinIdType, pinName, pinType, altPinNames);
                 pins.push(new PinDefinition_js_1.PinDefinition(pinId, pinIdType, pinName, pinType, altPinNames));
             }
         }
         return pins;
     }
     parseCreateModulePorts(portsDefinition) {
-        let leftItems = [];
-        let rightItems = [];
-        if (portsDefinition.has('left')) {
-            leftItems = portsDefinition.get('left');
-            if (!Array.isArray(leftItems)) {
-                leftItems = [leftItems];
+        return {
+            left: this.getPortItems(portsDefinition, globals_js_1.SymbolPinSide.Left),
+            right: this.getPortItems(portsDefinition, globals_js_1.SymbolPinSide.Right),
+            top: this.getPortItems(portsDefinition, globals_js_1.SymbolPinSide.Top),
+            bottom: this.getPortItems(portsDefinition, globals_js_1.SymbolPinSide.Bottom),
+        };
+    }
+    getArrangePropFromModulePorts(modulePorts, nameToPinId) {
+        const keys = [globals_js_1.SymbolPinSide.Left, globals_js_1.SymbolPinSide.Right, globals_js_1.SymbolPinSide.Top, globals_js_1.SymbolPinSide.Bottom];
+        const arrangeProp = new Map();
+        keys.forEach(key => {
+            if (modulePorts[key]) {
+                const items = modulePorts[key].map(item => {
+                    if (Array.isArray(item)) {
+                        return item;
+                    }
+                    else {
+                        return (0, ParamDefinition_js_1.numeric)(nameToPinId.get(item));
+                    }
+                });
+                if (items.length > 0) {
+                    arrangeProp.set(key, items);
+                }
             }
-        }
-        if (portsDefinition.has('right')) {
-            rightItems = portsDefinition.get('right');
-            if (!Array.isArray(rightItems)) {
-                rightItems = [rightItems];
+        });
+        return arrangeProp;
+    }
+    getPortItems(portsDefinition, key) {
+        let tmpItems = [];
+        if (portsDefinition.has(key)) {
+            tmpItems = portsDefinition.get(key);
+            if (!Array.isArray(tmpItems)) {
+                tmpItems = [tmpItems];
             }
         }
-        return {
-            left: leftItems,
-            right: rightItems
-        };
+        return tmpItems;
     }
     parseCreateComponentParams(params) {
         const result = [];
@@ -1120,8 +1108,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         const nets = executor.scope.getNets();
         return {
             sequence,
-            nets,
-            components: Array.from(executor.scope.instances.values())
+            nets
         };
     }
     annotateComponents() {
@@ -1130,16 +1117,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         const instances = this.getExecutor().scope.instances;
         const toAnnotate = [];
         for (const [, instance] of instances) {
+            if (instance.typeProp === globals_js_1.ComponentTypes.net
+                || instance.typeProp == globals_js_1.ComponentTypes.graphic) {
+                continue;
+            }
             if (instance.assignedRefDes === null) {
-                if (instance.typeProp === globals_js_1.ComponentTypes.label ||
-                    instance.typeProp === globals_js_1.ComponentTypes.net ||
-                    instance.typeProp === globals_js_1.ComponentTypes.point) {
-                    continue;
-                }
-                if (instance.typeProp === null) {
-                    this.log('Instance has no type:', instance.instanceName, ' assuming connector');
-                    instance.typeProp = 'conn';
-                }
                 if (instance.parameters.has('refdes')) {
                     const refdes = instance.parameters.get('refdes');
                     if (refdes) {
@@ -1153,7 +1135,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
         }
         toAnnotate.forEach(instance => {
-            const newRefDes = annotater.getAnnotation(instance.typeProp);
+            const useTypeProp = instance.typeProp ?? 'conn';
+            instance.typeProp === null
+                && this.log('Instance has no type:', instance.instanceName, ' assuming connector');
+            const newRefDes = annotater.getAnnotation(useTypeProp);
             if (newRefDes !== null) {
                 instance.assignedRefDes = newRefDes;
                 this.log(newRefDes, '-', instance.instanceName);
@@ -1176,9 +1161,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             });
             const totalSheets = sheets.length;
             sheets.forEach((item, index) => {
-                item.parameters.set(Frame_js_1.FrameParamKeys.SheetType, frameComponent);
-                item.parameters.set(Frame_js_1.FrameParamKeys.SheetNumber, index + 1);
-                item.parameters.set(Frame_js_1.FrameParamKeys.SheetTotal, totalSheets);
+                item.parameters.set(Frame_js_1.FrameParamKeys.SheetType, frameComponent)
+                    .set(Frame_js_1.FrameParamKeys.SheetNumber, index + 1)
+                    .set(Frame_js_1.FrameParamKeys.SheetTotal, totalSheets);
             });
         }
         return {
@@ -1203,25 +1188,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         }
         return result;
     }
-    setComponentOrientation(component, pin, orientation) {
-        if (this.acceptedDirections.indexOf(orientation) !== -1) {
-            component.setParam('_addDirection', orientation);
-            component.setParam('_addPin', pin);
-        }
-        else {
-            throw "Invalid modifier for orientation";
-        }
-    }
-    setComponentFlip(component, flipValue) {
-        if (this.acceptedFlip.indexOf(flipValue) !== -1) {
-            component.setParam(flipValue, 1);
-        }
-    }
     getPropertyExprList(items) {
         const properties = new Map();
         items.forEach((item) => {
-            this.visit(item);
-            const result = this.getResult(item);
+            const result = this.visitResult(item);
             for (const [key, value] of result) {
                 properties.set(key, value);
             }
@@ -1231,14 +1201,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
 }
 exports.ParserVisitor = ParserVisitor;
 const ComponentRefDesPrefixes = {
-    'res': 'R',
-    'cap': 'C',
-    'ind': 'L',
-    'diode': 'D',
-    'conn': 'J',
-    'transistor': 'Q',
-    'relay': 'K',
-    'ic': 'U',
+    res: 'R',
+    cap: 'C',
+    ind: 'L',
+    diode: 'D',
+    conn: 'J',
+    transistor: 'Q',
+    relay: 'K',
+    ic: 'U',
     '?': '?',
 };
 class ComponentAnnotater {
@@ -1248,7 +1218,6 @@ class ComponentAnnotater {
         for (const key in ComponentRefDesPrefixes) {
             this.counter[key] = 1;
         }
-        this.counter['?'] = 1;
     }
     getAnnotation(type) {
         if (this.counter[type] === undefined && type.length <= 2) {
@@ -1266,7 +1235,7 @@ class ComponentAnnotater {
             return null;
         }
         let attempts = 100;
-        let proposedName;
+        let proposedName = "";
         while (attempts >= 0) {
             proposedName = ComponentRefDesPrefixes[type] + this.counter[type];
             this.counter[type]++;