circuitscript 0.0.25 → 0.0.26

package/dist/cjs/draw_symbols.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SymbolDrawingCommands = exports.SymbolDrawing = exports.SymbolCustom = exports.PlaceHolderCommands = exports.SymbolPlaceholder = exports.SymbolText = exports.SymbolPointHidden = exports.SymbolFactory = exports.SymbolGraphic = void 0;
 const globals_js_1 = require("./globals.js");
 const geometry_js_1 = require("./geometry.js");
+const PinTypes_js_1 = require("./objects/PinTypes.js");
 const defaultSymbolLineWidth = 2;
 class SymbolGraphic {
     constructor() {
@@ -353,6 +354,11 @@ class SymbolPlaceholder extends SymbolGraphic {
             displayPinId = false;
         }
         let pinNameParam = null;
+        let pinType = PinTypes_js_1.PinTypes.Any;
+        if (positionParams[1].type && positionParams[1].type === globals_js_1.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/cjs/execute.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPortSide = exports.isNetOnlyComponent = exports.isLabelComponent = exports.isNetComponent = exports.ExecutionContext = void 0;
+exports.getPortSide = exports.ExecutionContext = void 0;
 const globals_js_1 = require("./globals.js");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
@@ -140,12 +140,18 @@ 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(globals_js_1.ParamKeys.__is_net)) {
+        if (component.typeProp === globals_js_1.ComponentTypes.net
+            || component.typeProp === globals_js_1.ComponentTypes.label) {
             const netName = paramsMap.get(globals_js_1.ParamKeys.net_name);
             const priority = paramsMap.get(globals_js_1.ParamKeys.priority);
             const result = this.resolveNet(netName, this.netNamespace);
@@ -161,12 +167,7 @@ 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);
@@ -183,6 +184,10 @@ class ExecutionContext {
     }
     printPoint(extra = '') {
         let netName = globals_js_1.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)
@@ -279,22 +284,22 @@ 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 === globals_js_1.BlockTypes.Point) {
@@ -561,7 +566,8 @@ class ExecutionContext {
             }
             else if (action === ExecutionScope_js_1.SequenceAction.At || action === ExecutionScope_js_1.SequenceAction.To) {
                 const tmpComponent = sequenceAction[1];
-                if (isNetComponent(tmpComponent) && tmpComponent.parameters.get(globals_js_1.ParamKeys.net_name) === 'gnd') {
+                if (tmpComponent.typeProp === globals_js_1.ComponentTypes.net
+                    && tmpComponent.parameters.get(globals_js_1.ParamKeys.net_name) === 'gnd') {
                     tmpComponent._copyID = gndCopyIdOffset + incrementGndLinkId;
                     incrementGndLinkId += 1;
                 }
@@ -703,18 +709,6 @@ function isWireSegmentsEndAuto(segments) {
     }
     return false;
 }
-function isNetComponent(component) {
-    return component.parameters.has(globals_js_1.ParamKeys.__is_net);
-}
-exports.isNetComponent = isNetComponent;
-function isLabelComponent(component) {
-    return component.parameters.has(globals_js_1.ParamKeys.__is_label);
-}
-exports.isLabelComponent = isLabelComponent;
-function isNetOnlyComponent(component) {
-    return isNetComponent(component) && !isLabelComponent(component);
-}
-exports.isNetOnlyComponent = isNetOnlyComponent;
 function getPortSide(pins, arrangeProps) {
     const result = [];
     if (arrangeProps === null) {

package/dist/cjs/export.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateKiCADNetList = void 0;
+exports.SExpObject = exports._id = exports.IdObject = exports.printTree = exports.generateKiCADNetList = void 0;
 const globals_js_1 = require("./globals.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 function generateKiCADNetList(netlist) {
     const componentsList = [];
     const nets = {};
+    const missingFootprints = [];
     netlist.forEach(entry => {
         const { instance, pins } = entry;
         if (instance.assignedRefDes !== null) {
@@ -25,7 +26,10 @@ 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) {
@@ -66,18 +70,22 @@ 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
+    };
 }
 exports.generateKiCADNetList = generateKiCADNetList;
 function printTree(tree, level = 0) {
@@ -99,6 +107,7 @@ function printTree(tree, level = 0) {
     }
     return "(" + output.join(" ") + ")";
 }
+exports.printTree = printTree;
 function Id(name) {
     return new IdObject(name);
 }
@@ -107,3 +116,80 @@ class IdObject {
         this.keyName = keyName;
     }
 }
+exports.IdObject = IdObject;
+function _id(key) {
+    return new IdObject(key);
+}
+exports._id = _id;
+class SExpObject {
+    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));
+    }
+}
+exports.SExpObject = SExpObject;

package/dist/cjs/globals.js

@@ -13,8 +13,6 @@ var GlobalNames;
 exports.NoNetText = 'NO_NET';
 var ParamKeys;
 (function (ParamKeys) {
-    ParamKeys["__is_net"] = "__is_net";
-    ParamKeys["__is_label"] = "__is_label";
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
 })(ParamKeys || (exports.ParamKeys = ParamKeys = {}));
@@ -50,6 +48,7 @@ var ReferenceTypes;
     ReferenceTypes["value"] = "value";
     ReferenceTypes["variable"] = "variable";
     ReferenceTypes["instance"] = "instance";
+    ReferenceTypes["pinType"] = "pinType";
 })(ReferenceTypes || (exports.ReferenceTypes = ReferenceTypes = {}));
 var BlockTypes;
 (function (BlockTypes) {

package/dist/cjs/helpers.js

@@ -188,8 +188,11 @@ function renderScript(scriptData, outputPath, options) {
         console.log('Error during annotation: ', err);
     }
     if (kicadNetlistPath) {
-        const kicadNetList = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
-        (0, fs_1.writeFileSync)(kicadNetlistPath, kicadNetList);
+        const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
+        missingFootprints.forEach(entry => {
+            console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
+        });
+        (0, fs_1.writeFileSync)(kicadNetlistPath, (0, export_js_1.printTree)(kicadNetList));
         console.log('Generated KiCad netlist file');
     }
     const { sequence, nets } = visitor.getGraph();

package/dist/cjs/main.js

@@ -17,9 +17,9 @@ async function main() {
     commander_1.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')
@@ -34,8 +34,8 @@ async function main() {
     }
     commander_1.program.parse();
     const options = commander_1.program.opts();
+    const args = commander_1.program.args;
     const watchFileChanges = options.watch;
-    const outputPath = options.output ?? null;
     const dumpNets = options.dumpNets;
     const dumpData = options.dumpData;
     const kicadNetlist = options.kicadNetlist;
@@ -44,18 +44,26 @@ async function main() {
         console.log('watching for file changes...');
     }
     await (0, sizing_js_1.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 = (0, fs_1.readFileSync)(inputFilePath, { encoding: 'utf-8' });
         if (currentDirectory === null) {
             currentDirectory = path_1.default.dirname(inputFilePath);
         }
     }
+    else if (options.input) {
+        scriptData = options.input;
+    }
+    else {
+        console.log("Error: No input provided");
+        return;
+    }
     const scriptOptions = {
         currentDirectory,
         defaultLibsPath,
@@ -64,6 +72,10 @@ async function main() {
         kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
     };
+    let outputPath = null;
+    if (args.length > 0 && args[1]) {
+        outputPath = args[1];
+    }
     const output = (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
     if (outputPath === null && output) {
         console.log(output);

package/dist/cjs/objects/ClassComponent.js

@@ -16,6 +16,7 @@ class ClassComponent {
         this.displayProp = null;
         this.widthProp = null;
         this.typeProp = null;
+        this.copyProp = false;
         this.styles = {};
         this.assignedRefDes = null;
         this.instanceName = instanceName;

package/dist/cjs/render.js

@@ -40,7 +40,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 === globals_js_1.ComponentTypes.net) {
                 extra.net_name = item.component.parameters.get(globals_js_1.ParamKeys.net_name);
             }
             else if (item.component.parameters.has('value')) {

package/dist/cjs/visitor.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VisitorExecutionException = exports.ParserVisitor = void 0;
-const execute_js_1 = require("./execute.js");
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const PinDefinition_js_1 = require("./objects/PinDefinition.js");
@@ -34,7 +33,6 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.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);
@@ -140,6 +138,8 @@ class ParserVisitor extends BaseVisitor_js_1.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 = {
@@ -147,11 +147,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 display,
                 type,
                 width,
+                copy
             };
             this.setResult(ctx, this.getExecutor().createComponent(instanceName, pins, params, props));
         };
         this.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();
@@ -171,7 +172,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             drawing.source = ctx.getText();
             this.setResult(ctx, drawing);
         };
-        this.visitSub_expr = (ctx) => {
+        this.visitGraphic_expr = (ctx) => {
             let commandName = null;
             const command = ctx._command;
             if (command) {
@@ -253,14 +254,9 @@ class ParserVisitor extends BaseVisitor_js_1.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_js_1.ClassComponent
-                && (0, execute_js_1.isNetOnlyComponent)(component)) {
-                component = this.getExecutor().cloneComponent(component);
+            if (component instanceof ClassComponent_js_1.ClassComponent
+                && component.copyProp) {
+                component = this.getExecutor().copyComponent(component);
             }
             if (component && component instanceof ClassComponent_js_1.ClassComponent) {
                 const modifiers = ctx.component_modifier_expr();
@@ -358,6 +354,41 @@ class ParserVisitor extends BaseVisitor_js_1.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);
+        };
+        this.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);
         };
         this.visitMultiplyExpr = (ctx) => {
@@ -560,6 +591,42 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             }
             this.setResult(ctx, (hasPlus ? "+" : "") + netNamespace);
         };
+        this.visitIf_expr = (ctx) => {
+            const ctxDataExpr = ctx.data_expr();
+            this.visit(ctxDataExpr);
+            const result = this.getResult(ctxDataExpr);
+            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);
+                    }
+                }
+            }
+        };
+        this.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);
+        };
         this.pinTypes = [
             PinTypes_js_1.PinTypes.Any,
             PinTypes_js_1.PinTypes.IO,
@@ -588,8 +655,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 }
                 if (Array.isArray(pinDef)) {
                     const firstValue = pinDef[0];
-                    if (this.pinTypes.indexOf(firstValue) !== -1) {
-                        pinType = firstValue;
+                    if (firstValue.type
+                        && firstValue.type === globals_js_1.ReferenceTypes.pinType
+                        && this.pinTypes.indexOf(firstValue.value) !== -1) {
+                        pinType = firstValue.value;
                         pinName = pinDef[1];
                         if (pinDef.length > 2) {
                             altPinNames = pinDef.slice(2);

package/dist/esm/BaseVisitor.mjs

@@ -8,6 +8,7 @@ import { ClassComponent } from "./objects/ClassComponent";
 import { NumericValue, PercentageValue, PinBlankValue } from "./objects/ParamDefinition";
 import { PinTypes } from "./objects/PinTypes";
 import { UndeclaredReference } from "./objects/types";
+import { ReferenceTypes } from './globals';
 export class BaseVisitor extends CircuitScriptVisitor {
     indentLevel = 0;
     startingContext;
@@ -138,7 +139,8 @@ export class BaseVisitor extends CircuitScriptVisitor {
         if (this.pinTypesList.indexOf(atomId) !== -1) {
             currentReference = {
                 found: true,
-                value: atomId
+                value: atomId,
+                type: ReferenceTypes.pinType,
             };
         }
         else {
@@ -275,7 +277,12 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 value = new UndeclaredReference(reference);
             }
             else {
-                value = reference.value;
+                if (reference.type && reference.type === ReferenceTypes.pinType) {
+                    value = reference;
+                }
+                else {
+                    value = reference.value;
+                }
             }
         }
         this.setResult(ctx, value);
@@ -340,15 +347,6 @@ export class BaseVisitor extends CircuitScriptVisitor {
     getResult(ctx) {
         return this.resultData.get(ctx);
     }
-    setParam(ctx, value) {
-        this.paramData.set(ctx, value);
-    }
-    getParam(ctx) {
-        return this.paramData.get(ctx);
-    }
-    hasParam(ctx) {
-        return this.paramData.has(ctx);
-    }
     handleImportFile(name, throwErrors = true) {
         let hasError = false;
         let hasParseError = false;

package/dist/esm/SemanticTokenVisitor.mjs

@@ -39,8 +39,8 @@ export class SemanticTokensVisitor extends BaseVisitor {
     };
     visitCreate_graphic_expr = (ctx) => {
         this.addSemanticToken(ctx.Create(), ['defaultLibrary'], 'function');
-        ctx.sub_expr().forEach(sub_expr => {
-            this.visit(sub_expr);
+        ctx.graphic_expr().forEach(graphic_expr => {
+            this.visit(graphic_expr);
         });
     };
     visitProperty_key_expr = (ctx) => {
@@ -61,7 +61,7 @@ export class SemanticTokensVisitor extends BaseVisitor {
             this.addSemanticToken(useValue, [], 'property');
         }
     };
-    visitSub_expr = (ctx) => {
+    visitGraphic_expr = (ctx) => {
         let useValue = null;
         const ctxId = ctx.ID();
         const ctxPin = ctx.Pin();