circuitscript 0.1.15 → 0.1.17

package/dist/esm/antlr/CircuitScriptVisitor.js

@@ -32,6 +32,7 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitProperty_set_expr;
     visitDouble_dot_property_set_expr;
     visitArrayExpr;
+    visitArrayIndexExpr;
     visitFunctionCallExpr;
     visitAdditionExpr;
     visitMultiplyExpr;
@@ -49,6 +50,7 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitFunction_args_expr;
     visitAtom_expr;
     visitTrailer_expr;
+    visitTrailer_expr2;
     visitFunction_call_expr;
     visitNet_namespace_expr;
     visitFunction_return_expr;

package/dist/esm/builtinMethods.js

@@ -1,5 +1,6 @@
 import Big from "big.js";
 import { numeric, NumericValue } from "./objects/ParamDefinition.js";
+import { CFunctionEntry } from "./objects/types.js";
 import { unwrapValue, resolveToNumericValue, RuntimeExecutionError } from "./utils.js";
 const builtInMethods = [
     ['enumerate', enumerate],
@@ -144,8 +145,17 @@ function toString(obj) {
     else if (obj instanceof NumericValue) {
         return obj.toBigNumber().toString();
     }
+    else if (obj instanceof CFunctionEntry) {
+        return obj.toString();
+    }
     else {
-        if (obj.toDisplayString) {
+        if (obj === undefined) {
+            return 'undefined';
+        }
+        else if (obj === null) {
+            return 'null';
+        }
+        else if (obj.toDisplayString) {
             return obj.toDisplayString();
         }
         else if (obj.toString) {

package/dist/esm/draw_symbols.js

@@ -5,6 +5,7 @@ import { PinTypes } from "./objects/PinTypes.js";
 import { roundValue, RuntimeExecutionError, throwWithContext } from "./utils.js";
 import { DeclaredReference, UndeclaredReference } from "./objects/types.js";
 import { numeric, NumericValue } from "./objects/ParamDefinition.js";
+import { PinId } from "./objects/PinDefinition.js";
 export class SymbolGraphic {
     drawPortsName = true;
     displayBounds = false;
@@ -560,6 +561,12 @@ export class SymbolPlaceholder extends SymbolGraphic {
                 milsToMM(endY)
             ];
         }
+        if (positionParams[0] instanceof NumericValue) {
+            positionParams[0] = new PinId(positionParams[0].toNumber());
+        }
+        else if (typeof positionParams[0] === 'number' || typeof positionParams[0] === 'string') {
+            positionParams[0] = new PinId(positionParams[0]);
+        }
         drawing.addPinMM(...positionParams, lineColor);
         const lastAddedPin = this.drawing.pins[this.drawing.pins.length - 1];
         const [pinId, , angle] = lastAddedPin;
@@ -604,7 +611,8 @@ export class SymbolPlaceholder extends SymbolGraphic {
                 vanchor: VerticalAlign.Middle,
                 textColor: pinNameColor,
             });
-            displayPinId && drawing.addLabel(endX.add(pinIdOffsetX), endY.add(pinIdOffsetY), pinId.toDisplayString(), {
+            const pinDisplayText = pinId.toString();
+            displayPinId && drawing.addLabel(endX.add(pinIdOffsetX), endY.add(pinIdOffsetY), pinDisplayText, {
                 fontSize: numeric(defaultPinIdTextSize),
                 anchor: pinIdAlignment,
                 vanchor: pinIdVAlignment,
@@ -704,7 +712,7 @@ export class SymbolCustom extends SymbolGraphic {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addLabel(leftPinStart.add(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Left,
@@ -721,7 +729,7 @@ export class SymbolCustom extends SymbolGraphic {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addLabel(rightPinStart.sub(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Right,
@@ -738,7 +746,7 @@ export class SymbolCustom extends SymbolGraphic {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
             drawing.addLabel(pinX, topPinStart.add(milsToMM(20)), pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Right,
@@ -757,7 +765,7 @@ export class SymbolCustom extends SymbolGraphic {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), pinX, bottomPinStart.add(this.pinLength), pinX, bottomPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, bottomPinStart.add(this.pinLength), pinX, bottomPinStart, defaultLineColor);
             drawing.addLabel(pinX, bottomPinStart.sub(milsToMM(20)), pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Left,
@@ -839,7 +847,7 @@ export class SymbolCustomModule extends SymbolCustom {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addModulePort(leftPinStart, pinY, this.portWidth, this.portHeight, pin.pinType);
             drawing.addLabel(leftPinStart.add(this.portWidth).add(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(40),
@@ -851,7 +859,7 @@ export class SymbolCustomModule extends SymbolCustom {
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
+            drawing.addPinMM(pin.pinId, rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addModulePort(rightPinStart, pinY, this.portWidth, this.portHeight, pin.pinType, -1);
             drawing.addLabel(rightPinStart.sub(this.portWidth).sub(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(40),
@@ -863,7 +871,7 @@ export class SymbolCustomModule extends SymbolCustom {
         topPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
             drawing.addModulePort(pinX, topPinStart, this.portWidth, this.portHeight, pin.pinType, 1, 90);
             drawing.addLabel(pinX, topPinStart.add(this.portWidth).add(milsToMM(20)), pin.text, {
                 fontSize: numeric(40),
@@ -876,7 +884,7 @@ export class SymbolCustomModule extends SymbolCustom {
         bottomPins.forEach(pin => {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
-            drawing.addPinMM(numeric(pin.pinId), pinX, bottomPinStart, pinX, bottomPinStart.sub(this.pinLength), defaultLineColor);
+            drawing.addPinMM(pin.pinId, pinX, bottomPinStart, pinX, bottomPinStart.sub(this.pinLength), defaultLineColor);
             drawing.addModulePort(pinX, bottomPinStart, this.portWidth, this.portHeight, pin.pinType, 1, -90);
             drawing.addLabel(pinX, bottomPinStart.sub(this.portWidth).sub(milsToMM(20)), pin.text, {
                 fontSize: numeric(40),
@@ -912,13 +920,6 @@ export class SymbolDrawing {
         this.items.push(Geometry.segment([startX, startY], [endX, endY]));
         return this;
     }
-    addPin(pinId, startX, startY, endX, endY, lineColor) {
-        startX = milsToMM(startX);
-        startY = milsToMM(startY);
-        endX = milsToMM(endX);
-        endY = milsToMM(endY);
-        return this.addPinMM(pinId, startX, startY, endX, endY, lineColor);
-    }
     addPinMM(pinId, startXMM, startYMM, endXMM, endYMM, lineColor) {
         let angle = 0;
         const tmpStartXMM = startXMM.toNumber();
@@ -1221,7 +1222,7 @@ export class SymbolDrawing {
     }
     getPinPosition(pinId) {
         const pin = this.pins.find(item => {
-            return item[0].toNumber() === pinId;
+            return item[0].equals(pinId);
         });
         if (pin) {
             const [, feature, angle] = pin;

package/dist/esm/execute.js

@@ -3,8 +3,8 @@ import { ClassComponent, ModuleComponent } from './objects/ClassComponent.js';
 import { ActiveObject, ExecutionScope, FrameAction, SequenceAction } from './objects/ExecutionScope.js';
 import { Net } from './objects/Net.js';
 import { numeric, NumericValue } from './objects/ParamDefinition.js';
-import { PortSide } from './objects/PinDefinition.js';
-import { AnyReference, DeclaredReference, Direction } from './objects/types.js';
+import { PinId, PortSide } from './objects/PinDefinition.js';
+import { AnyReference, CFunctionEntry, DeclaredReference, Direction } from './objects/types.js';
 import { Wire } from './objects/Wire.js';
 import { Frame } from './objects/Frame.js';
 import { CalculatePinPositions } from './layout.js';
@@ -24,7 +24,7 @@ export class ExecutionContext {
     returnValue = null;
     silent = false;
     logger;
-    __functionCache = {};
+    __functionCache = new Map();
     parentContext;
     componentAngleFollowsWire = true;
     warnings = [];
@@ -151,7 +151,7 @@ export class ExecutionContext {
             const tmpArrangeRight = [];
             pins.forEach((pin, index) => {
                 const useArray = (index % 2 === 0) ? tmpArrangeLeft : tmpArrangeRight;
-                useArray.push(numeric(pin.id));
+                useArray.push(pin.id);
             });
             const arrangeProp = new Map([
                 [SymbolPinSide.Left, tmpArrangeLeft],
@@ -161,11 +161,9 @@ export class ExecutionContext {
         }
         if (props.arrange !== null) {
             component.arrangeProps = this.removeArrangePropDuplicates(props.arrange);
-            const arrangePropPins = this.getArrangePropPins(component.arrangeProps).map(item => {
-                return item.toNumber();
-            });
+            const arrangePropPins = this.getArrangePropPins(component.arrangeProps);
             pins.forEach(pin => {
-                if (arrangePropPins.indexOf(pin.id) === -1) {
+                if (arrangePropPins.find(id => id.equals(pin.id)) === undefined) {
                     this.logWarning(`Pin ${pin.id} is not specified in arrange property`);
                 }
             });
@@ -182,6 +180,7 @@ export class ExecutionContext {
         });
         if (component.typeProp === ComponentTypes.net) {
             const netName = paramsMap.get(ParamKeys.net_name);
+            const netType = paramsMap.get(ParamKeys.net_type);
             let priority = 0;
             if (paramsMap.has(ParamKeys.priority)) {
                 priority = paramsMap.get(ParamKeys.priority).toNumber();
@@ -193,21 +192,26 @@ export class ExecutionContext {
                 this.log('net found', tmpNet.namespace, tmpNet.name);
             }
             else {
-                tmpNet = new Net(this.netNamespace, netName, priority);
+                tmpNet = new Net(this.netNamespace, netName, priority, netType);
                 this.log('net not found, added net instance', tmpNet.namespace, tmpNet.name);
             }
-            const defaultPin = 1;
+            const defaultPin = new PinId(1);
             this.scope.setNet(component, defaultPin, tmpNet);
             this.log('set net', netName, 'component', component, defaultPin);
         }
         const { pins: pinSides, maxPositions } = getPortSide(component.pins, component.arrangeProps);
         component.pinsMaxPositions = maxPositions;
+        const pinIdKeys = Array.from(component.pins.keys());
         pinSides.forEach(({ pinId, side, position }) => {
-            if (component.pins.has(pinId)) {
-                const tmpPin = component.pins.get(pinId);
+            const matchedPinId = pinIdKeys.find(id => id.equals(pinId));
+            if (matchedPinId) {
+                const tmpPin = component.pins.get(matchedPinId);
                 tmpPin.side = side;
                 tmpPin.position = position;
             }
+            else {
+                throw 'Not found!';
+            }
         });
         this.scope.instances.set(instanceName, component);
         const pinsOutput = pins.map((pin) => {
@@ -230,15 +234,32 @@ export class ExecutionContext {
             if (!Array.isArray(items)) {
                 items = [items];
             }
+            items = items.map(item => {
+                if (item instanceof NumericValue) {
+                    item = item.toNumber();
+                }
+                if (item instanceof PinId) {
+                    return item;
+                }
+                else if (PinId.isPinIdType(item)) {
+                    return new PinId(item);
+                }
+                return item;
+            });
+            arrangeProp.set(side, items);
+            if (!Array.isArray(items)) {
+                items = [items];
+            }
             const uniqueItems = [];
             items.forEach(item => {
-                if (item instanceof NumericValue) {
-                    if (seenIds.indexOf(item.toNumber()) === -1) {
-                        seenIds.push(item.toNumber());
+                if (item instanceof PinId) {
+                    const found = seenIds.find(id => id.equals(item));
+                    if (!found) {
+                        seenIds.push(item);
                         uniqueItems.push(item);
                     }
                     else {
-                        this.logWarning(`Pin ${item.toNumber()} specified more than once in arrange property`);
+                        this.logWarning(`Pin ${item.toString()} specified more than once in arrange property`);
                     }
                 }
                 else {
@@ -261,7 +282,7 @@ export class ExecutionContext {
             const items = arrangeProps.get(side);
             if (items) {
                 items.forEach(item => {
-                    if (item instanceof NumericValue) {
+                    if (item instanceof PinId) {
                         pins.push(item);
                     }
                 });
@@ -383,7 +404,7 @@ export class ExecutionContext {
         const cloneInstanceName = component.instanceName + ':' + idNum;
         this.scope.instances.set(cloneInstanceName, componentCopy);
         componentCopy.instanceName = cloneInstanceName;
-        const defaultPin = 1;
+        const defaultPin = new PinId(1);
         if (this.scope.getNet(component, defaultPin) === null) {
             const foundNet = this.resolveComponentPinNet(component, defaultPin);
             if (foundNet !== null) {
@@ -538,9 +559,9 @@ export class ExecutionContext {
     getBreakContext() {
         return this.scope.breakStack[this.scope.breakStack.length - 1];
     }
-    createFunction(functionName, __runFunc) {
-        this.scope.functions.set(functionName, __runFunc);
-        this.__functionCache[functionName] = __runFunc;
+    createFunction(functionName, __runFunc, source, uniqueId) {
+        this.scope.functions.set(functionName, new CFunctionEntry(functionName, __runFunc, source, uniqueId));
+        this.__functionCache.set(functionName, __runFunc);
         this.log(`defined new function '${functionName}'`);
     }
     hasFunction(functionName) {
@@ -602,19 +623,24 @@ export class ExecutionContext {
             else if (type === ReferenceTypes.instance) {
                 const tmpComponent = parentValue;
                 if (tmpComponent.typeProp === ComponentTypes.net) {
-                    const usedNet = this.scope.getNet(tmpComponent, 1);
+                    const usedNet = this.scope.getNet(tmpComponent, new PinId(1));
                     if (usedNet) {
                         const trailerValue = trailers.join(".");
                         useValue = usedNet.params.get(trailerValue) ?? null;
                     }
                 }
                 else {
-                    useValue = parentValue.parameters.get(trailersPath);
+                    useValue = parentValue
+                        .parameters.get(trailersPath);
                 }
             }
         }
+        let found = false;
+        if (parentValue !== undefined && useValue !== undefined) {
+            found = true;
+        }
         return new AnyReference({
-            found: true,
+            found,
             type: type,
             parentValue,
             trailers,
@@ -623,26 +649,28 @@ export class ExecutionContext {
     }
     callFunction(functionName, functionParams, executionStack, netNamespace) {
         let __runFunc = null;
-        if (this.__functionCache[functionName] === undefined) {
+        if (!this.__functionCache.has(functionName)) {
             if (this.hasFunction(functionName)) {
-                __runFunc = this.getFunction(functionName);
+                const entry = this.getFunction(functionName);
+                __runFunc = entry.execute;
             }
             if (__runFunc === null) {
                 this.log(`searching for function ${functionName} in upper context`);
                 const tmpResolveResult = this.resolveVariable(executionStack, functionName);
                 if (tmpResolveResult.found) {
-                    __runFunc = tmpResolveResult.value;
+                    const entry = tmpResolveResult.value;
+                    __runFunc = entry.execute;
                 }
                 else {
                     throw `Invalid function ${functionName}`;
                 }
             }
             this.log('save function to cache:', functionName);
-            this.__functionCache[functionName] = __runFunc;
+            this.__functionCache.set(functionName, __runFunc);
         }
         else {
             this.log('found function in cache:', functionName);
-            __runFunc = this.__functionCache[functionName];
+            __runFunc = this.__functionCache.get(functionName);
         }
         if (__runFunc !== null) {
             this.log(`call function '${functionName}'`);
@@ -689,7 +717,7 @@ export class ExecutionContext {
         const linkRootComponent = true;
         const tmpRoot = childScope.componentRoot;
         if (linkRootComponent) {
-            const netConnectedToRoot = childScope.getNet(tmpRoot, 1);
+            const netConnectedToRoot = childScope.getNet(tmpRoot, new PinId(1));
             if (netConnectedToRoot !== null) {
                 let currentNet = this.scope.getNet(currentComponent, currentPin);
                 if (currentNet === null) {
@@ -1036,10 +1064,9 @@ export function getPortSide(pins, arrangeProps) {
                     position += item[0].toNumber();
                 }
                 else {
-                    const itemValue = item.toNumber();
-                    if (existingPinIds.indexOf(itemValue) !== -1) {
+                    if (existingPinIds.find(id => id.equals(item))) {
                         result.push({
-                            pinId: itemValue,
+                            pinId: item,
                             side: useSide,
                             position,
                             order: counter

package/dist/esm/globals.js

@@ -12,6 +12,7 @@ export var ParamKeys;
 (function (ParamKeys) {
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
+    ParamKeys["net_type"] = "net_type";
     ParamKeys["flip"] = "flip";
     ParamKeys["flipX"] = "flipX";
     ParamKeys["flipY"] = "flipY";
@@ -92,6 +93,7 @@ export var ReferenceTypes;
     ReferenceTypes["variable"] = "variable";
     ReferenceTypes["instance"] = "instance";
     ReferenceTypes["pinType"] = "pinType";
+    ReferenceTypes["unknown"] = "unknown";
 })(ReferenceTypes || (ReferenceTypes = {}));
 export var BlockTypes;
 (function (BlockTypes) {
@@ -123,3 +125,4 @@ export const RenderFlags = {
     ShowLabelOrigin: false,
 };
 export const SymbolValidatorContext = '_sym';
+export const TrailerArrayIndex = 'index';