circuitscript 0.0.38 → 0.1.2

package/dist/esm/visitor.mjs

@@ -1,9 +1,9 @@
 import { ClassComponent } from './objects/ClassComponent.mjs';
-import { NumericValue, ParamDefinition } from './objects/ParamDefinition.mjs';
+import { NumberOperator, numeric, NumericValue, ParamDefinition } from './objects/ParamDefinition.mjs';
 import { PinDefinition, PinIdType } from './objects/PinDefinition.mjs';
 import { PinTypes } from './objects/PinTypes.mjs';
 import { DeclaredReference, UndeclaredReference } from './objects/types.mjs';
-import { BlockTypes, ComponentTypes, FrameType, GlobalDocumentName, NoNetText, ReferenceTypes, WireAutoDirection } from './globals.mjs';
+import { BlockTypes, ComponentTypes, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide, WireAutoDirection } from './globals.mjs';
 import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.mjs';
 import { BaseVisitor } from './BaseVisitor.mjs';
 import { getPortType } from './utils.mjs';
@@ -12,9 +12,7 @@ import { FrameParamKeys } from './objects/Frame.mjs';
 export class ParserVisitor extends BaseVisitor {
     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]);
     };
     visitPin_select_expr = (ctx) => {
@@ -30,56 +28,48 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, value);
     };
     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);
     };
     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();
     };
     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();
     };
     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);
             }
-            this.setResult(ctx, [component, pinId]);
+            if (pinId === null) {
+                this.throwWithContext(ctx, "Could not resolve pin");
+            }
+            componentPin = [component, pinId];
         }
+        this.setResult(ctx, componentPin);
     };
     visitPath_blocks = (ctx) => {
         const blocks = ctx.path_block_inner();
@@ -118,7 +108,7 @@ export class ParserVisitor extends BaseVisitor {
     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) {
@@ -140,29 +130,51 @@ export class ParserVisitor extends 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(ParamKeys.angle) ?
+            properties.get(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);
         this.setResult(ctx, createdComponent);
     };
     visitCreate_graphic_expr = (ctx) => {
-        const graphicsExpressionsCtx = ctx.graphic_expressions_block();
-        this.visit(graphicsExpressionsCtx);
-        const commands = this.getResult(graphicsExpressionsCtx);
-        const drawing = new SymbolDrawingCommands(commands);
+        const ctxId = ctx.ID();
+        const paramIds = [];
+        if (ctxId !== null) {
+            const varName = ctxId.getText();
+            paramIds.push(varName);
+            this.getExecutor().scope.variables.set(varName, {});
+        }
+        const executor = this.getExecutor();
+        const stack = [...this.executionStack];
+        const drawing = new SymbolDrawingCommands(variables => {
+            if (variables && paramIds.length > 0) {
+                const obj = {};
+                variables.forEach((value, key) => {
+                    obj[key] = value;
+                });
+                executor.scope.variables.set(paramIds[0], obj);
+            }
+            const currentStack = this.executionStack.splice(0);
+            this.executionStack.push(...stack);
+            const graphicsExpressionsCtx = ctx.graphic_expressions_block();
+            const commands = this.visitResult(graphicsExpressionsCtx);
+            this.executionStack.splice(0);
+            this.executionStack.push(...currentStack);
+            return commands;
+        });
         drawing.source = ctx.getText();
         this.setResult(ctx, drawing);
     };
     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 === PlaceHolderCommands.for) {
                 accum = accum.concat(parameters);
             }
@@ -177,7 +189,7 @@ export class ParserVisitor extends BaseVisitor {
                     }
                     return accum;
                 }, []);
-                accum.push([commandName, positionParams, keywordParams]);
+                accum.push([commandName, positionParams, keywordParams, item]);
             }
             return accum;
         }, []);
@@ -195,18 +207,15 @@ export class ParserVisitor extends 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 === PlaceHolderCommands.label) {
             parameters.forEach(item => {
                 if (item[0] == 'keyword' && item[1] === 'portType') {
                     if (item[2] === 'in') {
@@ -222,9 +231,7 @@ export class ParserVisitor extends BaseVisitor {
     };
     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 = [];
@@ -237,9 +244,7 @@ export class ParserVisitor extends 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;
             }
@@ -251,8 +256,10 @@ export class ParserVisitor extends BaseVisitor {
     };
     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 { [SymbolPinSide.Left]: leftPorts, [SymbolPinSide.Right]: rightPorts, [SymbolPinSide.Top]: topPorts, [SymbolPinSide.Bottom]: bottomPorts } = modulePorts;
+        const allPorts = [...leftPorts, ...rightPorts,
+            ...topPorts, ...bottomPorts].filter(item => {
             return !(Array.isArray(item));
         });
         const nameToPinId = new Map();
@@ -260,65 +267,44 @@ export class ParserVisitor extends BaseVisitor {
             nameToPinId.set(portName, index + 1);
             return new PinDefinition(index + 1, PinIdType.Int, portName, 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 = ComponentTypes.module;
         const ctxPropertyBlock = ctx.property_block_expr();
         if (ctxPropertyBlock) {
             const [firstBlock] = ctxPropertyBlock;
-            this.visit(firstBlock);
-            const [keyName, expressionsBlock] = this.getResult(firstBlock);
-            if (keyName === 'contains') {
-                createdComponent.moduleContainsExpressions = expressionsBlock;
-                this.expandModuleContains(createdComponent, this.getExecutor().netNamespace);
+            const [keyName, expressionsBlock] = this.visitResult(firstBlock);
+            if (keyName === ModuleContainsKeyword) {
+                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);
     };
     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]);
     };
     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);
-        if (value instanceof UndeclaredReference) {
+        const keyName = this.visitResult(ctx.property_key_expr());
+        const value = this.visitResult(ctx.property_value_expr());
+        if (value instanceof UndeclaredReference && (value.reference.parentValue === undefined
+            && value.reference.value === undefined)) {
             throw value.throwMessage();
         }
         const map = new Map();
@@ -328,14 +314,11 @@ export class ParserVisitor extends BaseVisitor {
     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);
@@ -343,8 +326,7 @@ export class ParserVisitor extends BaseVisitor {
     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);
             }
@@ -352,9 +334,7 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, result);
     };
     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()));
     };
     visitProperty_key_expr = (ctx) => {
         const ctxID = ctx.ID();
@@ -374,30 +354,32 @@ export class ParserVisitor extends BaseVisitor {
     };
     visitData_expr_with_assignment = (ctx) => {
         let component = null;
+        let componentCtx = null;
         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) {
-                throw "Could not find component: " + ctxDataExpr.getText();
+                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
             && component.copyProp) {
             component = this.getExecutor().copyComponent(component);
         }
-        if (component instanceof DeclaredReference
-            && component.found
-            && component.trailers
-            && component.trailers.length > 0
-            && component.trailers[0] === 'contains') {
-            component = component.value;
-            this.placeModuleContains(component);
+        if (component instanceof UndeclaredReference) {
+            const { reference: { trailers = [], parentValue = null } } = component;
+            if (parentValue instanceof ClassComponent
+                && trailers.length > 0
+                && trailers[0] === ModuleContainsKeyword) {
+                component = parentValue;
+                this.placeModuleContains(component);
+            }
         }
         if (component && component instanceof ClassComponent) {
             const modifiers = ctx.component_modifier_expr();
@@ -407,43 +389,29 @@ export class ParserVisitor extends 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 === ParamKeys.flip) {
                     const flipValue = result;
                     if (flipValue.indexOf('x') !== -1) {
-                        component.setParam('flipX', 1);
+                        component.setParam(ParamKeys.flipX, 1);
                         shouldIgnoreWireOrientation = true;
                     }
                     if (flipValue.indexOf('y') !== -1) {
-                        component.setParam('flipY', 1);
+                        component.setParam(ParamKeys.flipY, 1);
                         shouldIgnoreWireOrientation = true;
                     }
                 }
-                else if (modifierText === 'angle') {
-                    const angleValue = Number(result);
-                    component.setParam('angle', angleValue);
+                else if (modifierText === ParamKeys.angle) {
+                    component.setParam(ParamKeys.angle, result);
                     shouldIgnoreWireOrientation = true;
                 }
                 else if (modifierText === 'anchor') {
-                    if (component.displayProp
-                        && component.displayProp instanceof SymbolDrawingCommands) {
-                        const commands = (component.displayProp)
-                            .getCommands();
-                        commands.forEach(command => {
-                            const positionParams = command[1];
-                            const keywordParams = command[2];
-                            if (command[0] === PlaceHolderCommands.label
-                                && positionParams[0] === 'value') {
-                                keywordParams.set('anchor', result);
-                            }
-                        });
-                    }
+                    component.setParam('anchor', result);
                 }
                 if (shouldIgnoreWireOrientation) {
                     component.useWireOrientationAngle = false;
@@ -453,8 +421,7 @@ export class ParserVisitor extends 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) {
@@ -462,7 +429,7 @@ export class ParserVisitor extends BaseVisitor {
             }
             else {
                 const undeclaredRef = component;
-                throw 'Invalid component: ' + undeclaredRef.reference.name;
+                this.throwWithContext(componentCtx, 'Invalid component: ' + undeclaredRef.reference.name);
             }
         }
         this.setResult(ctx, [component, pinValue]);
@@ -471,11 +438,12 @@ export class ParserVisitor extends 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);
@@ -493,9 +461,9 @@ export class ParserVisitor extends 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 === ComponentTypes.port) {
+                const portName = component.parameters.get(ParamKeys.net_name);
                 const modulePinId = modulePinMapping.get(portName);
                 pinIdToPortMap.set(modulePinId, component);
                 const portType = getPortType(component);
@@ -505,7 +473,7 @@ export class ParserVisitor extends BaseVisitor {
         }
     }
     placeModuleContains(moduleComponent) {
-        if (moduleComponent.typeProp === 'module'
+        if (moduleComponent.typeProp === ComponentTypes.module
             && moduleComponent.moduleContainsExpressions) {
             this.log('place module `contains`');
             this.getExecutor().mergeScope(moduleComponent.moduleExecutionContext.scope, moduleComponent.moduleExecutionContextName);
@@ -517,24 +485,23 @@ export class ParserVisitor extends BaseVisitor {
         }
     }
     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 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 NumericValue) {
+                    value = value.neg();
                 }
                 else {
                     throw "Failed to do Negation operator";
@@ -549,16 +516,13 @@ export class ParserVisitor extends 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";
@@ -568,10 +532,14 @@ export class ParserVisitor extends BaseVisitor {
     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 NumericValue) {
+            value1 = value1.toNumber();
+        }
+        if (value2 instanceof NumericValue) {
+            value2 = value2.toNumber();
+        }
         const binaryOperatorType = ctx.binary_operator();
         let result = null;
         if (binaryOperatorType.Equals()) {
@@ -597,60 +565,87 @@ export class ParserVisitor extends BaseVisitor {
     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 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 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 = numeric(result);
+        }
         this.setResult(ctx, result);
     };
     visitMultiplyExpr = (ctx) => {
         const value1 = this.resolveDataExpr(ctx.data_expr(0));
         const value2 = this.resolveDataExpr(ctx.data_expr(1));
+        const operator = new 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);
     };
     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 NumericValue) {
+                tmpValue1 = value1.toDisplayString();
+            }
+            let tmpValue2 = value2;
+            if (value2 instanceof NumericValue) {
+                tmpValue2 = value2.toDisplayString();
+            }
+            const result = tmpValue1 + tmpValue2;
+            this.setResult(ctx, result);
         }
-        else if (ctx.Minus()) {
-            result = value1 - value2;
+        else {
+            const operator = new 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);
     };
     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 };
@@ -681,12 +676,9 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, result);
     };
     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
         });
@@ -748,8 +740,7 @@ export class ParserVisitor extends 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 UnitDimension(useValue)]);
@@ -761,8 +752,7 @@ export class ParserVisitor extends BaseVisitor {
     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);
     };
@@ -771,18 +761,12 @@ export class ParserVisitor extends BaseVisitor {
         return this.getExecutor().addPoint(ID.getText());
     };
     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);
     };
     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);
     };
@@ -804,8 +788,7 @@ export class ParserVisitor extends 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 UndeclaredReference) {
                 netNamespace = "/" + dataValue.reference.name;
             }
@@ -822,19 +805,19 @@ export class ParserVisitor extends BaseVisitor {
         this.setResult(ctx, (hasPlus ? "+" : "") + netNamespace);
     };
     visitIf_expr = (ctx) => {
-        const ctxDataExpr = ctx.data_expr();
-        this.visit(ctxDataExpr);
-        const result = this.getResult(ctxDataExpr);
-        if (result) {
+        const result = this.visitResult(ctx.data_expr());
+        let resultValue = result;
+        if (result instanceof UndeclaredReference) {
+            resultValue = false;
+        }
+        if (resultValue) {
             this.visit(ctx.expressions_block());
         }
         else {
             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;
@@ -849,9 +832,7 @@ export class ParserVisitor extends BaseVisitor {
         }
     };
     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());
         }
@@ -863,8 +844,7 @@ export class ParserVisitor extends 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;
@@ -889,10 +869,9 @@ export class ParserVisitor extends BaseVisitor {
         this.log('exit while loop');
     };
     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;
@@ -909,6 +888,7 @@ export class ParserVisitor extends 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;
                 }
@@ -928,13 +908,24 @@ export class ParserVisitor extends BaseVisitor {
         this.getExecutor().popBreakContext();
     };
     resolveDataExpr(data_expr) {
-        this.visit(data_expr);
-        const value = this.getResult(data_expr);
+        const value = this.visitResult(data_expr);
         if (value instanceof UndeclaredReference) {
-            throw value.throwMessage();
+            this.throwWithContext(data_expr, value.throwMessage());
+        }
+        else if (value instanceof DeclaredReference) {
+            return this.resolveDataValue(value);
         }
         return value;
     }
+    resolveDataValue(reference) {
+        const { value } = reference;
+        if (value instanceof NumericValue) {
+            return value.toDisplayString();
+        }
+        else {
+            return value;
+        }
+    }
     pinTypes = [
         PinTypes.Any,
         PinTypes.IO,
@@ -944,8 +935,8 @@ export class ParserVisitor extends BaseVisitor {
     ];
     parseCreateComponentPins(pinData) {
         const pins = [];
-        if (typeof pinData === 'number') {
-            const lastPin = pinData;
+        if (pinData instanceof NumericValue) {
+            const lastPin = pinData.toNumber();
             for (let i = 0; i < lastPin; i++) {
                 const pinId = i + 1;
                 pins.push(new PinDefinition(pinId, PinIdType.Int, pinId.toString()));
@@ -981,30 +972,49 @@ export class ParserVisitor extends BaseVisitor {
                 else {
                     pinName = pinDef;
                 }
+                this.log('pins', pinId, pinIdType, pinName, pinType, altPinNames);
                 pins.push(new 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, SymbolPinSide.Left),
+            right: this.getPortItems(portsDefinition, SymbolPinSide.Right),
+            top: this.getPortItems(portsDefinition, SymbolPinSide.Top),
+            bottom: this.getPortItems(portsDefinition, SymbolPinSide.Bottom),
+        };
+    }
+    getArrangePropFromModulePorts(modulePorts, nameToPinId) {
+        const keys = [SymbolPinSide.Left, SymbolPinSide.Right, SymbolPinSide.Top, 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 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 = [];
@@ -1083,8 +1093,7 @@ export class ParserVisitor extends BaseVisitor {
         const nets = executor.scope.getNets();
         return {
             sequence,
-            nets,
-            components: Array.from(executor.scope.instances.values())
+            nets
         };
     }
     annotateComponents() {
@@ -1093,16 +1102,11 @@ export class ParserVisitor extends BaseVisitor {
         const instances = this.getExecutor().scope.instances;
         const toAnnotate = [];
         for (const [, instance] of instances) {
+            if (instance.typeProp === ComponentTypes.net
+                || instance.typeProp == ComponentTypes.graphic) {
+                continue;
+            }
             if (instance.assignedRefDes === null) {
-                if (instance.typeProp === ComponentTypes.label ||
-                    instance.typeProp === ComponentTypes.net ||
-                    instance.typeProp === 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) {
@@ -1116,7 +1120,10 @@ export class ParserVisitor extends 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);
@@ -1134,10 +1141,14 @@ export class ParserVisitor extends BaseVisitor {
         let frameComponent = null;
         if (document && document[FrameParamKeys.SheetType]) {
             frameComponent = document[FrameParamKeys.SheetType];
-            baseScope.frames.forEach(item => {
-                if (item.frameType === FrameType.Sheet) {
-                    item.parameters.set(FrameParamKeys.SheetType, frameComponent);
-                }
+            const sheets = baseScope.frames.filter(item => {
+                return item.frameType === FrameType.Sheet;
+            });
+            const totalSheets = sheets.length;
+            sheets.forEach((item, index) => {
+                item.parameters.set(FrameParamKeys.SheetType, frameComponent)
+                    .set(FrameParamKeys.SheetNumber, index + 1)
+                    .set(FrameParamKeys.SheetTotal, totalSheets);
             });
         }
         return {
@@ -1162,25 +1173,10 @@ export class ParserVisitor extends 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);
             }
@@ -1189,14 +1185,14 @@ export class ParserVisitor extends BaseVisitor {
     }
 }
 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 {
@@ -1206,7 +1202,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) {
@@ -1224,7 +1219,7 @@ class ComponentAnnotater {
             return null;
         }
         let attempts = 100;
-        let proposedName;
+        let proposedName = "";
         while (attempts >= 0) {
             proposedName = ComponentRefDesPrefixes[type] + this.counter[type];
             this.counter[type]++;