circuitscript 0.0.25 → 0.0.26

package/dist/esm/antlr/CircuitScriptVisitor.mjs

@@ -31,6 +31,7 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitFunctionCallExpr;
     visitAdditionExpr;
     visitMultiplyExpr;
+    visitLogicalOperatorExpr;
     visitDataExpr;
     visitUnaryOperatorExpr;
     visitValueAtomExpr;
@@ -49,7 +50,7 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitFunction_return_expr;
     visitCreate_component_expr;
     visitCreate_graphic_expr;
-    visitSub_expr;
+    visitGraphic_expr;
     visitProperty_expr;
     visitProperty_key_expr;
     visitNested_properties;
@@ -61,4 +62,7 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitPoint_expr;
     visitImport_expr;
     visitFrame_expr;
+    visitIf_expr;
+    visitIf_inner_expr;
+    visitElse_expr;
 }

package/dist/esm/draw_symbols.mjs

@@ -1,5 +1,6 @@
-import { SymbolPinSide, defaultFont } from "./globals.mjs";
+import { ReferenceTypes, SymbolPinSide, defaultFont } from "./globals.mjs";
 import { Geometry, GeometryProp, HorizontalAlign, Label, VerticalAlign } from "./geometry.mjs";
+import { PinTypes } from "./objects/PinTypes.mjs";
 const defaultSymbolLineWidth = 2;
 export class SymbolGraphic {
     drawPortsName = true;
@@ -348,6 +349,11 @@ export class SymbolPlaceholder extends SymbolGraphic {
             displayPinId = false;
         }
         let pinNameParam = null;
+        let pinType = PinTypes.Any;
+        if (positionParams[1].type && positionParams[1].type === ReferenceTypes.pinType) {
+            pinType = positionParams[1].value;
+            positionParams = [positionParams[0], ...positionParams.slice(2)];
+        }
         if (typeof positionParams[1] === 'string') {
             pinNameParam = positionParams[1];
             positionParams = [positionParams[0], ...positionParams.slice(2)];

package/dist/esm/execute.mjs

@@ -144,12 +144,18 @@ export class ExecutionContext {
         pins.forEach((pin) => {
             component.pins.set(pin.id, pin);
         });
+        component.arrangeProps = props.arrange ?? null;
+        component.displayProp = props.display ?? null;
+        component.widthProp = props.width ?? null;
+        component.typeProp = props.type ?? null;
+        component.copyProp = props.copy ?? false;
         const paramsMap = new Map();
         params.forEach((param) => {
             component.parameters.set(param.paramName, param.paramValue);
             paramsMap.set(param.paramName, param.paramValue);
         });
-        if (paramsMap.has(ParamKeys.__is_net)) {
+        if (component.typeProp === ComponentTypes.net
+            || component.typeProp === ComponentTypes.label) {
             const netName = paramsMap.get(ParamKeys.net_name);
             const priority = paramsMap.get(ParamKeys.priority);
             const result = this.resolveNet(netName, this.netNamespace);
@@ -165,12 +171,7 @@ export class ExecutionContext {
             this.scope.setNet(component, 1, tmpNet);
             this.log('set net', netName, 'component', component);
         }
-        const { arrange = null } = props;
-        component.arrangeProps = arrange;
-        component.displayProp = props.display ?? null;
-        component.widthProp = props.width ?? null;
-        component.typeProp = props.type ?? null;
-        const portSides = getPortSide(component.pins, arrange);
+        const portSides = getPortSide(component.pins, component.arrangeProps);
         portSides.forEach(({ pinId, side, position }) => {
             if (component.pins.has(pinId)) {
                 const tmpPin = component.pins.get(pinId);
@@ -187,6 +188,10 @@ export class ExecutionContext {
     }
     printPoint(extra = '') {
         let netName = NoNetText;
+        if (this.scope.currentComponent === null || this.scope.currentPin === null) {
+            this.log((extra !== '' ? (extra + ' ') : '') + 'point is null');
+            return;
+        }
         if (this.scope.hasNet(this.scope.currentComponent, this.scope.currentPin)) {
             netName = this.scope
                 .getNet(this.scope.currentComponent, this.scope.currentPin)
@@ -283,22 +288,22 @@ export class ExecutionContext {
         this.printPoint();
         return this.getCurrentPoint();
     }
-    cloneComponent(component) {
-        let clonedComponent = null;
+    copyComponent(component) {
+        let componentCopy = null;
         if (!this.scope.copyIDs.has(component.instanceName)) {
             this.scope.copyIDs.set(component.instanceName, 0);
         }
         const idNum = this.scope.copyIDs.get(component.instanceName);
-        clonedComponent = component.clone();
-        clonedComponent._copyID = idNum;
-        clonedComponent._copyFrom = component;
+        componentCopy = component.clone();
+        componentCopy._copyID = idNum;
+        componentCopy._copyFrom = component;
         this.scope.copyIDs.set(component.instanceName, idNum + 1);
         const cloneInstanceName = component.instanceName + ':' + idNum;
-        this.scope.instances.set(cloneInstanceName, clonedComponent);
-        clonedComponent.instanceName = cloneInstanceName;
-        this.linkComponentPinNet(component, 1, clonedComponent, 1);
+        this.scope.instances.set(cloneInstanceName, componentCopy);
+        componentCopy.instanceName = cloneInstanceName;
+        this.linkComponentPinNet(component, 1, componentCopy, 1);
         this.log('created clone of net component:', cloneInstanceName);
-        return clonedComponent;
+        return componentCopy;
     }
     enterBlocks(blockType) {
         if (blockType === BlockTypes.Point) {
@@ -565,7 +570,8 @@ export class ExecutionContext {
             }
             else if (action === SequenceAction.At || action === SequenceAction.To) {
                 const tmpComponent = sequenceAction[1];
-                if (isNetComponent(tmpComponent) && tmpComponent.parameters.get(ParamKeys.net_name) === 'gnd') {
+                if (tmpComponent.typeProp === ComponentTypes.net
+                    && tmpComponent.parameters.get(ParamKeys.net_name) === 'gnd') {
                     tmpComponent._copyID = gndCopyIdOffset + incrementGndLinkId;
                     incrementGndLinkId += 1;
                 }
@@ -706,15 +712,6 @@ function isWireSegmentsEndAuto(segments) {
     }
     return false;
 }
-export function isNetComponent(component) {
-    return component.parameters.has(ParamKeys.__is_net);
-}
-export function isLabelComponent(component) {
-    return component.parameters.has(ParamKeys.__is_label);
-}
-export function isNetOnlyComponent(component) {
-    return isNetComponent(component) && !isLabelComponent(component);
-}
 export function getPortSide(pins, arrangeProps) {
     const result = [];
     if (arrangeProps === null) {

package/dist/esm/export.mjs

@@ -3,6 +3,7 @@ import { NumericValue } from "./objects/ParamDefinition.mjs";
 export function generateKiCADNetList(netlist) {
     const componentsList = [];
     const nets = {};
+    const missingFootprints = [];
     netlist.forEach(entry => {
         const { instance, pins } = entry;
         if (instance.assignedRefDes !== null) {
@@ -22,7 +23,10 @@ export function generateKiCADNetList(netlist) {
                     instance.parameters.get('footprint')]);
             }
             else {
-                console.log(instance.assignedRefDes, instance.instanceName, 'does not have footprint');
+                missingFootprints.push({
+                    refdes: instance.assignedRefDes,
+                    instanceName: instance.instanceName
+                });
             }
             componentsList.push(instanceDetails);
             for (const key in pins) {
@@ -63,20 +67,24 @@ export function generateKiCADNetList(netlist) {
         ]);
         counter++;
     }
+    const dateString = new Date().toISOString().slice(0, 10);
     const tree = [
         Id("export"),
         [Id("version"), "E"],
         [Id("design"),
-            [Id("source"), "/somefile"],
-            [Id("date"), "2023-11-19"],
+            [Id("source"), "/unknown-file"],
+            [Id("date"), dateString],
             [Id("tool"), "circuitscript-to-kicad"]
         ],
         [Id('components'), ...componentsList],
         [Id('nets'), ...netItems]
     ];
-    return printTree(tree);
+    return {
+        tree,
+        missingFootprints
+    };
 }
-function printTree(tree, level = 0) {
+export function printTree(tree, level = 0) {
     const output = [];
     if (!Array.isArray(tree)) {
         return "\"" + tree + "\"";
@@ -98,9 +106,84 @@ function printTree(tree, level = 0) {
 function Id(name) {
     return new IdObject(name);
 }
-class IdObject {
+export class IdObject {
     keyName;
     constructor(keyName) {
         this.keyName = keyName;
     }
 }
+export function _id(key) {
+    return new IdObject(key);
+}
+export class SExpObject {
+    object;
+    constructor(object) {
+        this.object = object;
+    }
+    getKey(object = null) {
+        object = object ?? this.object;
+        return object[0];
+    }
+    getValue(object = null) {
+        object = object ?? this.object;
+        return object.slice(1);
+    }
+    getJSON(object = null) {
+        object = object ?? this.object;
+        if (!Array.isArray(object)) {
+            return object;
+        }
+        const properties = {};
+        const keyName = object[0].keyName;
+        if (object.length === 2) {
+            properties[keyName] = this.getJSON(object[1]);
+        }
+        else {
+            const innerProps = {};
+            this.getValue(object).forEach(item => {
+                const tmpValue = this.getJSON(item);
+                if (typeof tmpValue === "object") {
+                    for (const key in tmpValue) {
+                        if (innerProps[key]) {
+                            if (!Array.isArray(innerProps[key])) {
+                                innerProps[key] = [innerProps[key]];
+                            }
+                            innerProps[key].push(tmpValue[key]);
+                        }
+                        else {
+                            innerProps[key] = tmpValue[key];
+                        }
+                    }
+                }
+                else {
+                    innerProps[item[0].keyName] = tmpValue;
+                }
+            });
+            properties[keyName] = innerProps;
+        }
+        return properties;
+    }
+    getWithId(id, object = null) {
+        object = object ?? this.object;
+        let result = null;
+        const key = object[0];
+        if (key.keyName === id) {
+            return object;
+        }
+        else {
+            this.getValue(object).some(item => {
+                if (Array.isArray(item)) {
+                    result = this.getWithId(id, item);
+                    if (result !== null) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+        }
+        return result;
+    }
+    print() {
+        console.log(printTree(this.object));
+    }
+}

package/dist/esm/globals.mjs

@@ -10,8 +10,6 @@ export var GlobalNames;
 export const NoNetText = 'NO_NET';
 export var ParamKeys;
 (function (ParamKeys) {
-    ParamKeys["__is_net"] = "__is_net";
-    ParamKeys["__is_label"] = "__is_label";
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
 })(ParamKeys || (ParamKeys = {}));
@@ -47,6 +45,7 @@ export var ReferenceTypes;
     ReferenceTypes["value"] = "value";
     ReferenceTypes["variable"] = "variable";
     ReferenceTypes["instance"] = "instance";
+    ReferenceTypes["pinType"] = "pinType";
 })(ReferenceTypes || (ReferenceTypes = {}));
 export var BlockTypes;
 (function (BlockTypes) {

package/dist/esm/helpers.mjs

@@ -1,5 +1,5 @@
 import { readFileSync, writeFileSync } from "fs";
-import { generateKiCADNetList } from "./export.mjs";
+import { generateKiCADNetList, printTree } from "./export.mjs";
 import { LayoutEngine } from "./layout.mjs";
 import { SequenceAction } from "./objects/ExecutionScope.mjs";
 import { parseFileWithVisitor } from "./parser.mjs";
@@ -177,8 +177,11 @@ export function renderScript(scriptData, outputPath, options) {
         console.log('Error during annotation: ', err);
     }
     if (kicadNetlistPath) {
-        const kicadNetList = generateKiCADNetList(visitor.getNetList());
-        writeFileSync(kicadNetlistPath, kicadNetList);
+        const { tree: kicadNetList, missingFootprints } = generateKiCADNetList(visitor.getNetList());
+        missingFootprints.forEach(entry => {
+            console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
+        });
+        writeFileSync(kicadNetlistPath, printTree(kicadNetList));
         console.log('Generated KiCad netlist file');
     }
     const { sequence, nets } = visitor.getGraph();

package/dist/esm/main.mjs

@@ -12,9 +12,9 @@ export default async function main() {
     program
         .description('generate graphical output from circuitscript files')
         .version(version)
+        .argument('[input path]', 'Input path')
+        .argument('[output path]', 'Output path')
         .option('-i, --input text <input text>', 'Input text directly')
-        .option('-f, --input-file <path>', 'Input file')
-        .option('-o, --output <path>', 'Output path')
         .option('-c, --current-directory <path>', 'Set current directory')
         .option('-k, --kicad-netlist <filename>', 'Create KiCad netlist')
         .option('-w, --watch', 'Watch for file changes')
@@ -29,8 +29,8 @@ export default async function main() {
     }
     program.parse();
     const options = program.opts();
+    const args = program.args;
     const watchFileChanges = options.watch;
-    const outputPath = options.output ?? null;
     const dumpNets = options.dumpNets;
     const dumpData = options.dumpData;
     const kicadNetlist = options.kicadNetlist;
@@ -39,18 +39,26 @@ export default async function main() {
         console.log('watching for file changes...');
     }
     await prepareSVGEnvironment(fontsPath);
-    let inputFilePath = null;
-    let scriptData;
-    if (options.input) {
-        scriptData = options.input;
+    let inputFilePath = "";
+    if (args.length > 2) {
+        console.log("Error: Extra arguments passed");
+        return;
     }
-    else {
-        inputFilePath = options.inputFile;
+    let scriptData;
+    if (args.length > 0 && args[0]) {
+        inputFilePath = args[0];
         scriptData = readFileSync(inputFilePath, { encoding: 'utf-8' });
         if (currentDirectory === null) {
             currentDirectory = path.dirname(inputFilePath);
         }
     }
+    else if (options.input) {
+        scriptData = options.input;
+    }
+    else {
+        console.log("Error: No input provided");
+        return;
+    }
     const scriptOptions = {
         currentDirectory,
         defaultLibsPath,
@@ -59,6 +67,10 @@ export default async function main() {
         kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
     };
+    let outputPath = null;
+    if (args.length > 0 && args[1]) {
+        outputPath = args[1];
+    }
     const output = renderScript(scriptData, outputPath, scriptOptions);
     if (outputPath === null && output) {
         console.log(output);

package/dist/esm/objects/ClassComponent.mjs

@@ -17,6 +17,7 @@ export class ClassComponent {
     displayProp = null;
     widthProp = null;
     typeProp = null;
+    copyProp = false;
     styles = {};
     assignedRefDes = null;
     constructor(instanceName, numPins, className) {

package/dist/esm/render.mjs

@@ -1,7 +1,7 @@
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
 import { RenderFrameType, getBounds } from "./layout.mjs";
 import { applyFontsToSVG, getCreateSVGWindow } from './sizing.mjs';
-import { ParamKeys, bodyColor, junctionColor, junctionSize, wireColor } from './globals.mjs';
+import { ComponentTypes, ParamKeys, bodyColor, junctionColor, junctionSize, wireColor } from './globals.mjs';
 import { NumericValue } from './objects/ParamDefinition.mjs';
 import { getBoundsSize } from './utils.mjs';
 export function generateSVG2(graph) {
@@ -36,7 +36,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         const { symbol = null } = item;
         if (symbol !== null && symbol) {
             const extra = {};
-            if (item.component.parameters.has('__is_net')) {
+            if (item.component.typeProp === ComponentTypes.net) {
                 extra.net_name = item.component.parameters.get(ParamKeys.net_name);
             }
             else if (item.component.parameters.has('value')) {

package/dist/esm/visitor.mjs

@@ -1,10 +1,9 @@
-import { isNetOnlyComponent } from './execute.mjs';
 import { ClassComponent } from './objects/ClassComponent.mjs';
 import { NumericValue, ParamDefinition, } from './objects/ParamDefinition.mjs';
 import { PinDefinition, PinIdType } from './objects/PinDefinition.mjs';
 import { PinTypes } from './objects/PinTypes.mjs';
 import { UndeclaredReference } from './objects/types.mjs';
-import { BlockTypes, ComponentTypes, NoNetText } from './globals.mjs';
+import { BlockTypes, ComponentTypes, NoNetText, ReferenceTypes } from './globals.mjs';
 import { SymbolDrawingCommands } from './draw_symbols.mjs';
 import { BaseVisitor } from './BaseVisitor.mjs';
 export class ParserVisitor extends BaseVisitor {
@@ -29,7 +28,6 @@ export class ParserVisitor extends BaseVisitor {
     };
     visitAdd_component_expr = (ctx) => {
         const ctxDataWithAssignmentExpr = ctx.data_expr_with_assignment();
-        this.setParam(ctxDataWithAssignmentExpr, { clone: false });
         this.visit(ctxDataWithAssignmentExpr);
         const [component, pinValue] = this.getResult(ctxDataWithAssignmentExpr);
         return this.getExecutor().addComponentExisting(component, pinValue);
@@ -135,6 +133,8 @@ export class ParserVisitor extends BaseVisitor {
             properties.get('display') : null;
         const type = properties.has('type') ?
             properties.get('type') : null;
+        const copy = properties.has('copy') ?
+            properties.get('copy') : false;
         const width = properties.has('width') ?
             properties.get('width') : null;
         const props = {
@@ -142,11 +142,12 @@ export class ParserVisitor extends BaseVisitor {
             display,
             type,
             width,
+            copy
         };
         this.setResult(ctx, this.getExecutor().createComponent(instanceName, pins, params, props));
     };
     visitCreate_graphic_expr = (ctx) => {
-        const commands = ctx.sub_expr().reduce((accum, item) => {
+        const commands = ctx.graphic_expr().reduce((accum, item) => {
             this.visit(item);
             const [commandName, parameters] = this.getResult(item);
             const keywordParams = new Map();
@@ -166,7 +167,7 @@ export class ParserVisitor extends BaseVisitor {
         drawing.source = ctx.getText();
         this.setResult(ctx, drawing);
     };
-    visitSub_expr = (ctx) => {
+    visitGraphic_expr = (ctx) => {
         let commandName = null;
         const command = ctx._command;
         if (command) {
@@ -248,14 +249,9 @@ export class ParserVisitor extends BaseVisitor {
             this.visit(ctxAssignmentExpr);
             component = this.getResult(ctxAssignmentExpr);
         }
-        let allowClone = true;
-        if (this.hasParam(ctx)) {
-            const { clone } = this.getParam(ctx);
-            allowClone = clone;
-        }
-        if (allowClone && component instanceof ClassComponent
-            && isNetOnlyComponent(component)) {
-            component = this.getExecutor().cloneComponent(component);
+        if (component instanceof ClassComponent
+            && component.copyProp) {
+            component = this.getExecutor().copyComponent(component);
         }
         if (component && component instanceof ClassComponent) {
             const modifiers = ctx.component_modifier_expr();
@@ -353,6 +349,41 @@ export class ParserVisitor extends BaseVisitor {
         else if (binaryOperatorType.NotEquals()) {
             result = value1 != value2;
         }
+        else if (binaryOperatorType.GreaterThan()) {
+            result = value1 > value2;
+        }
+        else if (binaryOperatorType.GreatOrEqualThan()) {
+            result = value1 >= value2;
+        }
+        else if (binaryOperatorType.LessThan()) {
+            result = value1 < value2;
+        }
+        else if (binaryOperatorType.LessOrEqualThan()) {
+            result = value1 <= value2;
+        }
+        this.setResult(ctx, result);
+    };
+    visitLogicalOperatorExpr = (ctx) => {
+        const ctx0 = ctx.data_expr(0);
+        const ctx1 = ctx.data_expr(1);
+        this.visit(ctx0);
+        const value1 = this.getResult(ctx0);
+        let value2 = false;
+        let skipNext = false;
+        if (ctx.LogicalOr() && value1) {
+            skipNext = true;
+        }
+        if (!skipNext) {
+            this.visit(ctx1);
+            value2 = this.getResult(ctx1);
+        }
+        let result = null;
+        if (ctx.LogicalAnd()) {
+            result = value1 && value2;
+        }
+        else if (ctx.LogicalOr()) {
+            result = value1 || value2;
+        }
         this.setResult(ctx, result);
     };
     visitMultiplyExpr = (ctx) => {
@@ -555,6 +586,42 @@ 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) {
+            this.runExpressions(this.getExecutor(), ctx.expression());
+        }
+        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);
+                if (innerResult) {
+                    innerIfWasTrue = true;
+                    break;
+                }
+            }
+            if (!innerIfWasTrue) {
+                const elseCtx = ctx.else_expr();
+                if (elseCtx) {
+                    this.visit(elseCtx);
+                }
+            }
+        }
+    };
+    visitIf_inner_expr = (ctx) => {
+        const ctxDataExpr = ctx.data_expr();
+        this.visit(ctxDataExpr);
+        const result = this.getResult(ctxDataExpr);
+        if (result) {
+            this.runExpressions(this.getExecutor(), ctx.expression());
+        }
+        this.setResult(ctx, result);
+    };
     pinTypes = [
         PinTypes.Any,
         PinTypes.IO,
@@ -582,8 +649,10 @@ export class ParserVisitor extends BaseVisitor {
                 }
                 if (Array.isArray(pinDef)) {
                     const firstValue = pinDef[0];
-                    if (this.pinTypes.indexOf(firstValue) !== -1) {
-                        pinType = firstValue;
+                    if (firstValue.type
+                        && firstValue.type === ReferenceTypes.pinType
+                        && this.pinTypes.indexOf(firstValue.value) !== -1) {
+                        pinType = firstValue.value;
                         pinName = pinDef[1];
                         if (pinDef.length > 2) {
                             altPinNames = pinDef.slice(2);

package/dist/types/BaseVisitor.d.ts

@@ -50,9 +50,6 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | Refe
     visitBreak_keyword: (ctx: Break_keywordContext) => void;
     protected setResult(ctx: ParserRuleContext, value: any): void;
     protected getResult(ctx: ParserRuleContext): any;
-    protected setParam(ctx: ParserRuleContext, value: any): void;
-    protected getParam(ctx: ParserRuleContext): any;
-    protected hasParam(ctx: ParserRuleContext): boolean;
     protected handleImportFile(name: string, throwErrors?: boolean): {
         hasError: boolean;
         hasParseError: boolean;

package/dist/types/SemanticTokenVisitor.d.ts

@@ -1,6 +1,6 @@
 import { TerminalNode, Token } from "antlr4ng";
 import { CircuitScriptLexer } from "./antlr/CircuitScriptLexer";
-import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Atom_exprContext, Property_key_exprContext, Sub_exprContext, ValueAtomExprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, Function_call_exprContext } from "./antlr/CircuitScriptParser";
+import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Atom_exprContext, Property_key_exprContext, ValueAtomExprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, Function_call_exprContext, Graphic_exprContext } from "./antlr/CircuitScriptParser";
 import { BaseVisitor, OnErrorCallback } from "./BaseVisitor";
 export declare class SemanticTokensVisitor extends BaseVisitor {
     parsedTokens: IParsedToken[];
@@ -14,7 +14,7 @@ export declare class SemanticTokensVisitor extends BaseVisitor {
     visitCreate_component_expr: (ctx: Create_component_exprContext) => void;
     visitCreate_graphic_expr: (ctx: Create_graphic_exprContext) => void;
     visitProperty_key_expr: (ctx: Property_key_exprContext) => void;
-    visitSub_expr: (ctx: Sub_exprContext) => void;
+    visitGraphic_expr: (ctx: Graphic_exprContext) => void;
     visitValueAtomExpr: (ctx: ValueAtomExprContext) => void;
     visitAssignment_expr: (ctx: Assignment_exprContext) => void;
     visitAtom_expr: (ctx: Atom_exprContext) => void;

package/dist/types/antlr/CircuitScriptLexer.d.ts

@@ -24,28 +24,35 @@ export declare class CircuitScriptLexer extends antlr.Lexer {
     static readonly Define = 22;
     static readonly Import = 23;
     static readonly If = 24;
-    static readonly Not = 25;
-    static readonly Frame = 26;
-    static readonly Equals = 27;
-    static readonly NotEquals = 28;
-    static readonly Addition = 29;
-    static readonly Minus = 30;
-    static readonly Divide = 31;
-    static readonly Multiply = 32;
-    static readonly OPEN_PAREN = 33;
-    static readonly CLOSE_PAREN = 34;
-    static readonly NOT_CONNECTED = 35;
-    static readonly BOOLEAN_VALUE = 36;
-    static readonly ID = 37;
-    static readonly INTEGER_VALUE = 38;
-    static readonly DECIMAL_VALUE = 39;
-    static readonly NUMERIC_VALUE = 40;
-    static readonly STRING_VALUE = 41;
-    static readonly PERCENTAGE_VALUE = 42;
-    static readonly ALPHA_NUMERIC = 43;
-    static readonly WS = 44;
-    static readonly NEWLINE = 45;
-    static readonly COMMENT = 46;
+    static readonly Else = 25;
+    static readonly Not = 26;
+    static readonly Frame = 27;
+    static readonly Equals = 28;
+    static readonly NotEquals = 29;
+    static readonly GreaterThan = 30;
+    static readonly GreatOrEqualThan = 31;
+    static readonly LessThan = 32;
+    static readonly LessOrEqualThan = 33;
+    static readonly LogicalAnd = 34;
+    static readonly LogicalOr = 35;
+    static readonly Addition = 36;
+    static readonly Minus = 37;
+    static readonly Divide = 38;
+    static readonly Multiply = 39;
+    static readonly OPEN_PAREN = 40;
+    static readonly CLOSE_PAREN = 41;
+    static readonly NOT_CONNECTED = 42;
+    static readonly BOOLEAN_VALUE = 43;
+    static readonly ID = 44;
+    static readonly INTEGER_VALUE = 45;
+    static readonly DECIMAL_VALUE = 46;
+    static readonly NUMERIC_VALUE = 47;
+    static readonly STRING_VALUE = 48;
+    static readonly PERCENTAGE_VALUE = 49;
+    static readonly ALPHA_NUMERIC = 50;
+    static readonly WS = 51;
+    static readonly NEWLINE = 52;
+    static readonly COMMENT = 53;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];