circuitscript 0.0.28 → 0.0.31

package/dist/cjs/visitor.js

@@ -9,6 +9,8 @@ const types_js_1 = require("./objects/types.js");
 const globals_js_1 = require("./globals.js");
 const draw_symbols_js_1 = require("./draw_symbols.js");
 const BaseVisitor_js_1 = require("./BaseVisitor.js");
+const utils_js_1 = require("./utils.js");
+const helpers_js_1 = require("./helpers.js");
 class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     constructor() {
         super(...arguments);
@@ -150,7 +152,8 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 arrange, display, type, width, copy,
                 angle, followWireOrientation
             };
-            this.setResult(ctx, this.getExecutor().createComponent(instanceName, pins, params, props));
+            const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
+            this.setResult(ctx, createdComponent);
         };
         this.visitCreate_graphic_expr = (ctx) => {
             const commands = ctx.graphic_expr().reduce((accum, item) => {
@@ -196,8 +199,82 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.visit(ctxParameters);
                 parameters = this.getResult(ctxParameters);
             }
+            if (commandName === 'label') {
+                parameters.forEach(item => {
+                    if (item[0] == 'keyword' && item[1] === 'portType') {
+                        if (item[2] === 'in') {
+                            item[2] = 'input';
+                        }
+                        else if (item[2] === 'out') {
+                            item[2] = 'output';
+                        }
+                    }
+                });
+            }
             this.setResult(ctx, [commandName, parameters]);
         };
+        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 => {
+                return !(item instanceof ParamDefinition_js_1.PinBlankValue);
+            });
+            const nameToPinId = new Map();
+            const tmpPorts = allPorts.map((portName, index) => {
+                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 (item instanceof ParamDefinition_js_1.PinBlankValue) {
+                    return item;
+                }
+                else {
+                    return nameToPinId.get(item);
+                }
+            });
+            const arrangeRightItems = rightPorts.map(item => {
+                if (item instanceof ParamDefinition_js_1.PinBlankValue) {
+                    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 width = properties.has('width') ?
+                properties.get('width') : null;
+            const blankParams = [];
+            const props = {
+                arrange, width
+            };
+            const moduleInstanceName = this.getExecutor().getUniqueInstanceName('');
+            const createdComponent = this.getExecutor().createComponent(moduleInstanceName, tmpPorts, blankParams, props);
+            createdComponent.typeProp = '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);
+                }
+            }
+            this.setResult(ctx, createdComponent);
+        };
+        this.visitProperty_block_expr = (ctx) => {
+            const tmpCtx = ctx.property_key_expr();
+            this.visit(tmpCtx);
+            const keyName = this.getResult(tmpCtx);
+            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();
@@ -275,6 +352,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 && component.copyProp) {
                 component = this.getExecutor().copyComponent(component);
             }
+            if (component instanceof types_js_1.DeclaredReference
+                && component.found
+                && component.trailers
+                && component.trailers.length > 0
+                && component.trailers[0] === 'contains') {
+                component = component.value;
+                this.placeModuleContains(component);
+            }
             if (component && component instanceof ClassComponent_js_1.ClassComponent) {
                 const modifiers = ctx.component_modifier_expr();
                 modifiers.forEach(modifier => {
@@ -333,7 +418,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 pinValue = this.getResult(ctxPinSelectExpr);
             }
             else {
-                pinValue = component.getDefaultPin();
+                if (component instanceof ClassComponent_js_1.ClassComponent) {
+                    pinValue = component.getDefaultPin();
+                }
+                else {
+                    const undeclaredRef = component;
+                    throw 'Invalid component: ' + undeclaredRef.reference.name;
+                }
             }
             this.setResult(ctx, [component, pinValue]);
         };
@@ -365,6 +456,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             let value;
             const ctxCreateComponentExpr = ctx.create_component_expr();
             const ctxCreateGraphicExpr = ctx.create_graphic_expr();
+            const ctxCreateModuleExpr = ctx.create_module_expr();
             if (ctxCreateComponentExpr) {
                 this.visit(ctxCreateComponentExpr);
                 value = this.getResult(ctxCreateComponentExpr);
@@ -373,6 +465,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.visit(ctxCreateGraphicExpr);
                 value = this.getResult(ctxCreateGraphicExpr);
             }
+            else if (ctxCreateModuleExpr) {
+                this.visit(ctxCreateModuleExpr);
+                value = this.getResult(ctxCreateModuleExpr);
+            }
             else {
                 throw "Invalid data expression";
             }
@@ -541,13 +637,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
         };
         this.visitAt_block_pin_expression_complex = (ctx) => {
-            ctx.expression().forEach(item => {
-                this.visit(item);
-            });
+            this.visit(ctx.expressions_block());
         };
         this.visitWire_expr_direction_only = (ctx) => {
             const value = ctx.ID().getText();
-            if (value === 'auto' || value === 'auto_') {
+            if (value === globals_js_1.WireAutoDirection.Auto || value === globals_js_1.WireAutoDirection.Auto_) {
                 this.setResult(ctx, [value]);
             }
             else {
@@ -568,7 +662,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     useValue = this.getResult(ctxDataExpr);
                 }
                 if (useValue !== null) {
-                    this.setResult(ctx, [direction, useValue]);
+                    this.setResult(ctx, [direction, new helpers_js_1.UnitDimension(useValue)]);
                     return;
                 }
             }
@@ -602,9 +696,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const propertyName = ctx.ID().getText();
             this.getExecutor().setProperty('..' + propertyName, result);
         };
+        this.visitExpressions_block = (ctx) => {
+            this.runExpressions(this.getExecutor(), ctx.expression());
+        };
         this.visitFrame_expr = (ctx) => {
             const frameId = this.getExecutor().enterFrame();
-            this.runExpressions(this.getExecutor(), ctx.expression());
+            this.visit(ctx.expressions_block());
             this.getExecutor().exitFrame(frameId);
         };
         this.visitNet_namespace_expr = (ctx) => {
@@ -635,7 +732,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.visit(ctxDataExpr);
             const result = this.getResult(ctxDataExpr);
             if (result) {
-                this.runExpressions(this.getExecutor(), ctx.expression());
+                this.visit(ctx.expressions_block());
             }
             else {
                 const ctxInnerIfExprs = ctx.if_inner_expr();
@@ -662,7 +759,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.visit(ctxDataExpr);
             const result = this.getResult(ctxDataExpr);
             if (result) {
-                this.runExpressions(this.getExecutor(), ctx.expression());
+                this.visit(ctx.expressions_block());
             }
             this.setResult(ctx, result);
         };
@@ -674,6 +771,55 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             PinTypes_js_1.PinTypes.Power,
         ];
     }
+    expandModuleContains(component, netNamespace) {
+        this.getExecutor().log('expanding module `contains`');
+        const executionStack = this.executionStack;
+        const resolveNet = this.createNetResolver(executionStack);
+        const executionContextName = this.getExecutor().namespace + "_"
+            + component.instanceName
+            + '_' + component.moduleCounter;
+        const tmpNamespace = this.getNetNamespace(netNamespace, "+/" + component.instanceName + "_" + component.moduleCounter);
+        const newExecutor = this.enterNewChildContext(executionStack, this.getExecutor(), executionContextName, { netNamespace: tmpNamespace }, [], []);
+        component.moduleCounter += 1;
+        newExecutor.resolveNet = resolveNet;
+        this.visit(component.moduleContainsExpressions);
+        const executionContext = executionStack.pop();
+        component.moduleExecutionContext = executionContext;
+        component.moduleExecutionContextName = executionContextName;
+        this.linkModuleSymbolWithContains(component, executionContext);
+    }
+    linkModuleSymbolWithContains(moduleComponent, executionContext) {
+        this.log('link module symbol');
+        const modulePinMapping = new Map();
+        moduleComponent.pins.forEach(pin => {
+            const pinName = pin.name;
+            modulePinMapping.set(pinName, pin.id);
+        });
+        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');
+                const modulePinId = modulePinMapping.get(portName);
+                pinIdToPortMap.set(modulePinId, component);
+                const portType = (0, utils_js_1.getPortType)(component);
+                const tmpPin = moduleComponent.pins.get(modulePinId);
+                tmpPin.pinType = portType;
+            }
+        }
+    }
+    placeModuleContains(moduleComponent) {
+        if (moduleComponent.typeProp === 'module'
+            && moduleComponent.moduleContainsExpressions) {
+            this.log('place module `contains`');
+            this.getExecutor().mergeScope(moduleComponent.moduleExecutionContext.scope, moduleComponent.moduleExecutionContextName);
+            this.log('connect module ports');
+            for (const [pinId, portComponent] of moduleComponent.modulePinIdToPortMap) {
+                this.getExecutor().atComponent(moduleComponent, pinId);
+                this.getExecutor().toComponent(portComponent, 1);
+            }
+        }
+    }
     parseCreateComponentPins(pinData) {
         const pins = [];
         if (typeof pinData === 'number') {
@@ -718,6 +864,26 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         }
         return pins;
     }
+    parseCreateModulePorts(portsDefinition) {
+        let leftItems = [];
+        let rightItems = [];
+        if (portsDefinition.has('left')) {
+            leftItems = portsDefinition.get('left');
+            if (!Array.isArray(leftItems)) {
+                leftItems = [leftItems];
+            }
+        }
+        if (portsDefinition.has('right')) {
+            rightItems = portsDefinition.get('right');
+            if (!Array.isArray(rightItems)) {
+                rightItems = [rightItems];
+            }
+        }
+        return {
+            left: leftItems,
+            right: rightItems
+        };
+    }
     parseCreateComponentParams(params) {
         const result = [];
         if (params) {

package/dist/esm/BaseVisitor.mjs

@@ -282,7 +282,12 @@ export class BaseVisitor extends CircuitScriptVisitor {
                     value = reference;
                 }
                 else {
-                    value = reference.value;
+                    if (reference.trailers && reference.trailers.length > 0) {
+                        value = reference;
+                    }
+                    else {
+                        value = reference.value;
+                    }
                 }
             }
         }