circuitscript 0.1.5 → 0.1.8

package/dist/cjs/visitor.js

@@ -46,9 +46,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitTo_component_expr = (ctx) => {
             ctx.component_select_expr().forEach(item => {
                 const [component, pin] = this.visitResult(item);
-                this.getExecutor().toComponent(component, pin, {
-                    addSequence: true
-                });
+                try {
+                    this.getExecutor().toComponent(component, pin, {
+                        addSequence: true
+                    });
+                }
+                catch (err) {
+                    throw new utils_js_1.RuntimeExecutionError(err.message, ctx.start, ctx.stop);
+                }
             });
             return this.getExecutor().getCurrentPoint();
         };
@@ -63,7 +68,10 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 componentPin = this.visitResult(ctxDataExprWithAssigment);
             }
             else {
-                const component = this.getExecutor().scope.currentComponent;
+                let component = this.getScope().currentComponent;
+                if (component._pointLinkComponent) {
+                    component = component._pointLinkComponent;
+                }
                 let pinId = null;
                 const ctxPinSelectExpr = ctx.pin_select_expr();
                 if (ctxPinSelectExpr) {
@@ -111,6 +119,92 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             return this.getExecutor().getCurrentPoint();
         };
         this.visitCreate_component_expr = (ctx) => {
+            const scope = this.getScope();
+            scope.setOnPropertyHandler((path, value, ctx) => {
+                if (path.length === 1) {
+                    const [, keyName] = path[0];
+                    switch (keyName) {
+                        case 'type':
+                            this.validateString(value, ctx);
+                            break;
+                        case 'angle':
+                        case 'width':
+                        case 'height':
+                            this.validateNumeric(value, ctx);
+                            break;
+                        case 'pins':
+                            if (!(value instanceof Map)) {
+                                this.validateNumeric(value, ctx);
+                            }
+                            break;
+                        case 'copy':
+                            if (value instanceof ParamDefinition_js_1.NumericValue) {
+                                this.validateNumeric(value, ctx);
+                            }
+                            else if (typeof value === 'boolean') {
+                                this.validateBoolean(value, ctx);
+                            }
+                            else {
+                                throw new utils_js_1.RuntimeExecutionError("Invalid value for 'copy' property", ctx.start, ctx.end);
+                            }
+                            break;
+                    }
+                }
+                else {
+                    const [, keyName] = path[0];
+                    if (keyName === 'arrange') {
+                        const [sideKeyCtx, sideKeyName] = path[1];
+                        if (globals_js_1.ValidPinSides.indexOf(sideKeyName) === -1) {
+                            throw new utils_js_1.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx.start, sideKeyCtx.stop);
+                        }
+                        else {
+                            if (path.length > 2 && path[2][0] === 'index') {
+                                if (Array.isArray(value)) {
+                                    const goodBlank = value.length === 1 &&
+                                        value[0] instanceof ParamDefinition_js_1.NumericValue;
+                                    if (!goodBlank) {
+                                        throw new utils_js_1.RuntimeExecutionError(`Invalid blank specifier`, ctx.start, ctx.stop);
+                                    }
+                                }
+                                else {
+                                    if (!(value instanceof ParamDefinition_js_1.NumericValue)) {
+                                        throw new utils_js_1.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx.start, ctx.stop);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else if (keyName === 'params') {
+                        const [, subKeyName] = path[1];
+                        switch (subKeyName) {
+                            case 'mpn':
+                            case 'refdes':
+                            case 'footprint':
+                                this.validateString(value, ctx);
+                                break;
+                            case 'place':
+                                this.validateBoolean(value, ctx);
+                                break;
+                        }
+                    }
+                    else if (keyName === 'pins') {
+                        if (path.length === 2) {
+                            if (value.length === 2) {
+                                const [pinType,] = value;
+                                if (pinType instanceof types_js_1.UndeclaredReference) {
+                                    throw new utils_js_1.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx.start, ctx.end);
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+            scope.enterContext(ctx);
+            ctx.property_expr().forEach(item => {
+                this.visitResult(item);
+            });
+            scope.exitContext();
+            scope.popOnPropertyHandler();
             const properties = this.getPropertyExprList(ctx.property_expr());
             const pins = this.parseCreateComponentPins(properties.get('pins'));
             let instanceName = this.getExecutor().getUniqueInstanceName();
@@ -145,8 +239,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 arrange, display, type, width, height, copy,
                 angle, followWireOrientation
             };
-            const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
-            this.setResult(ctx, createdComponent);
+            try {
+                const createdComponent = this.getExecutor().createComponent(instanceName, pins, params, props);
+                this.setResult(ctx, createdComponent);
+            }
+            catch (error) {
+                this.throwWithContext(ctx, error.message);
+            }
         };
         this.visitCreate_graphic_expr = (ctx) => {
             const ctxId = ctx.ID();
@@ -154,7 +253,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             if (ctxId !== null) {
                 const varName = ctxId.getText();
                 paramIds.push(varName);
-                this.getExecutor().scope.variables.set(varName, {});
+                this.getScope().variables.set(varName, {});
             }
             const executor = this.getExecutor();
             const stack = [...this.executionStack];
@@ -256,7 +355,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         useValueArray = [useValueArray];
                     }
                     useValueArray.forEach((value, index) => {
-                        this.getExecutor().scope.variables.set(forVariableNames[index], value);
+                        this.getScope().variables.set(forVariableNames[index], value);
                     });
                     const commands = this.visitResult(ctx.graphic_expressions_block());
                     allCommands = allCommands.concat(commands);
@@ -315,8 +414,16 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, [keyName, expressionsBlock]);
         };
         this.visitProperty_expr = (ctx) => {
-            const keyName = this.visitResult(ctx.property_key_expr());
-            const value = this.visitResult(ctx.property_value_expr());
+            const ctxKey = ctx.property_key_expr();
+            const ctxValue = ctx.property_value_expr();
+            const scope = this.getScope();
+            this.getScope().enterContext(ctxKey);
+            this.getScope().enterContext(ctxValue);
+            const keyName = this.visitResult(ctxKey);
+            const value = this.visitResult(ctxValue);
+            scope.triggerPropertyHandler(value, ctxValue);
+            this.getScope().exitContext();
+            this.getScope().exitContext();
             if (value instanceof types_js_1.UndeclaredReference && (value.reference.parentValue === undefined
                 && value.reference.value === undefined)) {
                 throw value.throwMessage();
@@ -326,15 +433,21 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, map);
         };
         this.visitSingle_line_property = (ctx) => {
+            this.getScope().enterContext(ctx);
             let value;
             if (ctx.data_expr().length === 1) {
                 value = this.visitResult(ctx.data_expr(0));
             }
             else {
-                value = ctx.data_expr().map(item => {
-                    return this.visitResult(item);
+                value = ctx.data_expr().map((item, index) => {
+                    this.getScope().enterContext(index);
+                    const result = this.visitResult(item);
+                    this.getScope().triggerPropertyHandler(result, item);
+                    this.getScope().exitContext();
+                    return result;
                 });
             }
+            this.getScope().exitContext();
             this.setResult(ctx, value);
         };
         this.visitNested_properties_inner = (ctx) => {
@@ -707,6 +820,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 }
                 else if (ctxDataExpr) {
                     useValue = this.visitResult(ctxDataExpr);
+                    if (useValue instanceof ParamDefinition_js_1.NumericValue) {
+                        useValue = useValue.toNumber();
+                    }
                 }
                 if (useValue !== null) {
                     this.setResult(ctx, [direction, new helpers_js_1.UnitDimension(useValue)]);
@@ -848,7 +964,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         useValueArray = [useValueArray];
                     }
                     useValueArray.forEach((value, index) => {
-                        this.getExecutor().scope.variables.set(forVariableNames[index], value);
+                        this.getScope().variables.set(forVariableNames[index], value);
                     });
                     this.visit(ctx.expressions_block());
                     keepLooping = true;
@@ -1043,32 +1159,32 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         return result;
     }
     printNets() {
-        this.getExecutor().scope.printNets();
+        this.getScope().printNets();
     }
     dumpNets() {
-        return this.getExecutor().scope.dumpNets();
+        return this.getScope().dumpNets();
     }
     dumpUniqueNets() {
-        const nets = this.getExecutor().scope.getNets();
+        const nets = this.getScope().getNets();
         return nets.reduce((accum, [, , net]) => {
             accum.push(net);
             return accum;
         }, []);
     }
     dumpVariables() {
-        return this.getExecutor().scope.variables;
+        return this.getScope().variables;
     }
     dumpInstances() {
-        return this.getExecutor().scope.instances;
+        return this.getScope().instances;
     }
     dump2() {
-        const instances = this.getExecutor().scope.instances;
+        const instances = this.getScope().instances;
         const items = [];
         for (const [instanceName, instance] of instances) {
             if (instance.assignedRefDes === null) {
                 continue;
             }
-            const pinNets = this.resolveNets(this.getExecutor().scope, instance);
+            const pinNets = this.resolveNets(this.getScope(), instance);
             const componentItem = {
                 name: instanceName,
                 refdes: instance.assignedRefDes,
@@ -1083,9 +1199,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     }
     getNetList() {
         const netlist = [];
-        const instances = this.getExecutor().scope.instances;
+        const instances = this.getScope().instances;
         for (const [instanceName, instance] of instances) {
-            const pinNets = this.resolveNets(this.getExecutor().scope, instance);
+            const pinNets = this.resolveNets(this.getScope(), instance);
             const componentItem = {
                 instanceName,
                 instance,
@@ -1116,7 +1232,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
     annotateComponents() {
         this.log('===== annotate components =====');
         const annotater = new ComponentAnnotater();
-        const instances = this.getExecutor().scope.instances;
+        const instances = this.getScope().instances;
         const toAnnotate = [];
         for (const [, instance] of instances) {
             if (instance.typeProp === globals_js_1.ComponentTypes.net
@@ -1153,7 +1269,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.log('');
     }
     applySheetFrameComponent() {
-        const baseScope = this.getExecutor().scope;
+        const baseScope = this.getScope();
         const document = baseScope.variables.get(globals_js_1.GlobalDocumentName);
         let frameComponent = null;
         if (document && document[Frame_js_1.FrameParamKeys.SheetType]) {

package/dist/esm/{BaseVisitor.mjs → BaseVisitor.js}

@@ -1,26 +1,22 @@
-import { readFileSync } from 'fs';
-import { join } from 'path';
 import { Big } from 'big.js';
-import { ExpressionContext } from "./antlr/CircuitScriptParser";
-import { CircuitScriptVisitor } from "./antlr/CircuitScriptVisitor";
-import { ExecutionContext } from "./execute";
-import { Logger } from "./logger";
-import { ClassComponent } from "./objects/ClassComponent";
-import { NumberOperator, NumericValue, PercentageValue } from "./objects/ParamDefinition";
-import { PinTypes } from "./objects/PinTypes";
-import { Direction, UndeclaredReference } from "./objects/types";
-import { DoubleDelimiter1, GlobalDocumentName, ReferenceTypes } from './globals';
-import { linkBuiltInMethods } from './builtinMethods';
-import { resolveToNumericValue, throwWithContext } from './utils';
-import { SequenceAction } from './objects/ExecutionScope';
+import { ExpressionContext } from "./antlr/CircuitScriptParser.js";
+import { CircuitScriptVisitor } from "./antlr/CircuitScriptVisitor.js";
+import { ExecutionContext } from "./execute.js";
+import { Logger } from "./logger.js";
+import { ClassComponent } from "./objects/ClassComponent.js";
+import { NumberOperator, NumericValue, PercentageValue } from "./objects/ParamDefinition.js";
+import { PinTypes } from "./objects/PinTypes.js";
+import { Direction, UndeclaredReference } from "./objects/types.js";
+import { DoubleDelimiter1, GlobalDocumentName, ReferenceTypes } from './globals.js';
+import { linkBuiltInMethods } from './builtinMethods.js';
+import { resolveToNumericValue, RuntimeExecutionError, throwWithContext } from './utils.js';
+import { SequenceAction } from './objects/ExecutionScope.js';
 export class BaseVisitor extends CircuitScriptVisitor {
     indentLevel = 0;
     startingContext;
     executionStack;
     silent = false;
     logger;
-    currentDirectory;
-    defaultLibsPath;
     printStream = [];
     printToConsole = true;
     acceptedDirections = [Direction.Up, Direction.Down,
@@ -34,14 +30,17 @@ export class BaseVisitor extends CircuitScriptVisitor {
         PinTypes.IO,
         PinTypes.Power,
     ];
-    onErrorCallbackHandler = null;
-    onImportFile = (visitor, filePath) => {
+    onErrorHandler = null;
+    environment;
+    importedFiles = [];
+    onImportFile = async (visitor, filePath, fileData, onErrorHandler) => {
         throw "Import file not implemented";
     };
-    constructor(silent = false, onErrorHandler = null, currentDirectory, defaultLibsPath) {
+    constructor(silent = false, onErrorHandler = null, environment) {
         super();
         this.logger = new Logger();
-        this.onErrorCallbackHandler = onErrorHandler;
+        this.onErrorHandler = onErrorHandler;
+        this.environment = environment;
         this.startingContext = new ExecutionContext(DoubleDelimiter1, `${DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, null);
         const scope = this.startingContext.scope;
         scope.sequence.push([
@@ -55,12 +54,16 @@ export class BaseVisitor extends CircuitScriptVisitor {
         this.startingContext.resolveComponentPinNet =
             this.createComponentPinNetResolver(this.executionStack);
         this.silent = silent;
-        this.currentDirectory = currentDirectory;
-        this.defaultLibsPath = defaultLibsPath;
     }
     getExecutor() {
         return this.executionStack[this.executionStack.length - 1];
     }
+    getScope() {
+        return this.getExecutor().scope;
+    }
+    getRootExecutor() {
+        return this.executionStack[0];
+    }
     setupBuiltInFunctions(context) {
         linkBuiltInMethods(context, this);
     }
@@ -109,11 +112,21 @@ export class BaseVisitor extends CircuitScriptVisitor {
     log2(message) {
         this.getExecutor().log(message);
     }
-    visitScript = (ctx) => {
+    async visitAsync(ctx) {
+        const result = await ctx.accept(this);
+        return result;
+    }
+    visitScript = async (ctx) => {
         this.log('===', 'start', '===');
-        const result = this.visitChildren(ctx);
+        const imports = ctx.import_expr();
+        for (let i = 0; i < imports.length; i++) {
+            const ctxImport = imports[i];
+            const ID = ctxImport.ID().toString();
+            await this.handleImportFile(ID, true, ctxImport);
+        }
+        const result = this.runExpressions(this.getExecutor(), ctx.expression());
+        this.setResult(ctx, result);
         this.log('===', 'end', '===');
-        return result;
     };
     visitAssignment_expr = (ctx) => {
         const reference = this.getReference(ctx.atom_expr());
@@ -385,10 +398,10 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 const tmpCtx = defaultValuesProvided[index - boundary];
                 this.visit(tmpCtx);
                 const defaultValue = this.getResult(tmpCtx);
-                return [idText, defaultValue];
+                return [idText, tmpCtx.start, defaultValue];
             }
             else {
-                return [idText];
+                return [idText, id.getSymbol()];
             }
         });
         this.setResult(ctx, result);
@@ -410,10 +423,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         this.setResult(ctx, returnList);
     };
     visitImport_expr = (ctx) => {
-        const ID = ctx.ID().toString();
-        this.log('import', ID);
-        this.handleImportFile(ID, true, ctx);
-        this.log('done import', ID);
+        throw new RuntimeExecutionError("Cannot parse imports here", ctx.start, ctx.stop);
     };
     visitFunction_return_expr = (ctx) => {
         const executor = this.getExecutor();
@@ -463,15 +473,24 @@ export class BaseVisitor extends CircuitScriptVisitor {
         this.visit(ctx);
         return this.getResult(ctx);
     }
-    handleImportFile(name, throwErrors = true, ctx = null) {
+    async handleImportFile(name, throwErrors = true, ctx = null) {
+        name = name.trim();
+        const importAlready = this.importedFiles.find(item => {
+            return item.id === name;
+        });
+        if (importAlready) {
+            return importAlready;
+        }
         let hasError = false;
         let hasParseError = false;
         let pathExists = false;
-        const tmpFilePath = join(this.currentDirectory, name + ".cst");
+        const tmpFilePath = this.environment.getRelativeToModule(name + ".cst");
         this.log('importing path:', tmpFilePath);
         let fileData = null;
+        let filePathUsed = null;
         try {
-            fileData = readFileSync(tmpFilePath, { encoding: 'utf8' });
+            filePathUsed = tmpFilePath;
+            fileData = await this.environment.readFile(tmpFilePath, { encoding: 'utf8' });
             pathExists = true;
         }
         catch (err) {
@@ -479,8 +498,9 @@ export class BaseVisitor extends CircuitScriptVisitor {
         }
         if (!pathExists) {
             try {
-                const tmpFilePath2 = join(this.defaultLibsPath, name + ".cst");
-                fileData = readFileSync(tmpFilePath2, { encoding: 'utf8' });
+                const tmpFilePath2 = this.environment.getRelativeToDefaultLibs(name + ".cst");
+                filePathUsed = tmpFilePath2;
+                fileData = await this.environment.readFile(tmpFilePath2, { encoding: 'utf8' });
                 pathExists = true;
             }
             catch (err) {
@@ -490,31 +510,39 @@ export class BaseVisitor extends CircuitScriptVisitor {
         try {
             if (pathExists) {
                 this.log('done reading imported file data');
-                const importResult = this.onImportFile(this, fileData, this.onErrorCallbackHandler);
+                const importResult = await this.onImportFile(this, filePathUsed, fileData, this.onErrorHandler);
                 hasError = importResult.hasError;
                 hasParseError = importResult.hasParseError;
             }
         }
         catch (err) {
-            this.log('Failed to import file: ', err.message);
+            if (ctx != null) {
+                throw new RuntimeExecutionError("An error occurred while importing file", ctx.start, ctx.stop);
+            }
+            else {
+                this.log('An error occurred while importing file:', err.message);
+            }
         }
         let errorMessage = null;
         if (throwErrors && (hasError || hasParseError || !pathExists)) {
             if (!pathExists) {
-                errorMessage = `File does not exist: ${name}`;
+                errorMessage = `File does not exist: ${name} (${filePathUsed})`;
             }
             else {
                 errorMessage = `Failed to import: ${name}`;
             }
         }
         if (errorMessage !== null && ctx) {
-            this.throwWithContext(ctx, errorMessage);
+            throw new RuntimeExecutionError(errorMessage, ctx.start, ctx.end);
         }
-        return {
+        const newImportedFile = {
+            id: name.trim(),
             hasError,
             hasParseError,
             pathExists,
         };
+        this.importedFiles.push(newImportedFile);
+        return newImportedFile;
     }
     visitRoundedBracketsExpr = (ctx) => {
         const ctxDataExpr = ctx.data_expr();
@@ -544,9 +572,9 @@ export class BaseVisitor extends CircuitScriptVisitor {
                     executor.scope.variables.set(variableName, tmpPassedInArgs[2]);
                 }
             }
-            else if (tmpFuncArg.length === 2) {
+            else if (tmpFuncArg.length === 3) {
                 const variableName = tmpFuncArg[0];
-                const defaultValue = tmpFuncArg[1];
+                const defaultValue = tmpFuncArg[2];
                 executor.log('set variable in scope, var name: ', variableName);
                 executor.scope.variables.set(variableName, defaultValue);
             }
@@ -617,7 +645,32 @@ export class BaseVisitor extends CircuitScriptVisitor {
     prepareStringValue(value) {
         return value.slice(1, value.length - 1);
     }
-    throwWithContext(context, message) {
-        throwWithContext(context, message);
+    throwWithContext(context, messageOrError) {
+        throwWithContext(context, messageOrError);
+    }
+    validateType(value, context, validateFunction, expectedType) {
+        if (value === undefined) {
+            return false;
+        }
+        const result = validateFunction(value);
+        if (!result) {
+            throw new RuntimeExecutionError(`Invalid ${expectedType}`, context.start, context.stop);
+        }
+        return result;
+    }
+    validateString(value, context) {
+        this.validateType(value, context, (val) => {
+            return typeof val === 'string';
+        }, 'string');
+    }
+    validateBoolean(value, context) {
+        this.validateType(value, context, (val) => {
+            return typeof val === 'boolean';
+        }, 'boolean');
+    }
+    validateNumeric(value, context) {
+        this.validateType(value, context, (val) => {
+            return (val instanceof NumericValue);
+        }, 'numeric value');
     }
 }

package/dist/esm/{SemanticTokenVisitor.mjs → SemanticTokenVisitor.js}

@@ -1,12 +1,14 @@
-import { Assignment_exprContext } from "./antlr/CircuitScriptParser";
-import { BaseVisitor } from "./BaseVisitor";
+import { Assignment_exprContext } from "./antlr/CircuitScriptParser.js";
+import { BaseVisitor } from "./BaseVisitor.js";
+import { buildInMethodNamesList } from "./builtinMethods.js";
+import { SymbolValidatorContext } from "./globals.js";
 export class SemanticTokensVisitor extends BaseVisitor {
     parsedTokens = [];
     lexer;
     script;
     semanticTokens = new Map();
-    constructor(silent = false, onErrorHandler = null, currentDirectory, defaultsLibsPath, lexer, script) {
-        super(silent, onErrorHandler, currentDirectory, defaultsLibsPath);
+    constructor(silent = false, onErrorHandler = null, environment, lexer, script) {
+        super(silent, onErrorHandler, environment);
         this.lexer = lexer;
         this.script = script;
     }
@@ -17,7 +19,11 @@ export class SemanticTokensVisitor extends BaseVisitor {
         });
     };
     visitFunction_call_expr = (ctx) => {
-        this.addSemanticToken(ctx.ID(), [], 'function');
+        const modifiers = [];
+        if (buildInMethodNamesList.indexOf(ctx.ID().getText()) !== -1) {
+            modifiers.push('defaultLibrary');
+        }
+        this.addSemanticToken(ctx.ID(), modifiers, 'function');
     };
     visitFunction_def_expr = (ctx) => {
         const functionName = ctx.ID().getText();
@@ -26,7 +32,7 @@ export class SemanticTokensVisitor extends BaseVisitor {
         if (ctxFunctionArgsExpr) {
             this.visit(ctxFunctionArgsExpr);
         }
-        const executionContextName = functionName + '_validate';
+        const executionContextName = functionName + SymbolValidatorContext;
         const newExecutor = this.enterNewChildContext(this.executionStack, this.getExecutor(), executionContextName, { netNamespace: "" }, [], []);
         this.runExpressions(newExecutor, ctx.function_expr());
         this.executionStack.pop();
@@ -39,9 +45,8 @@ export class SemanticTokensVisitor extends BaseVisitor {
     };
     visitCreate_graphic_expr = (ctx) => {
         this.addSemanticToken(ctx.Create(), ['defaultLibrary'], 'function');
-        ctx.graphic_expr().forEach(graphic_expr => {
-            this.visit(graphic_expr);
-        });
+        const graphicsExpressionsCtx = ctx.graphic_expressions_block();
+        this.visitResult(graphicsExpressionsCtx);
     };
     visitProperty_key_expr = (ctx) => {
         let useValue = null;
@@ -61,7 +66,7 @@ export class SemanticTokensVisitor extends BaseVisitor {
             this.addSemanticToken(useValue, [], 'property');
         }
     };
-    visitGraphic_expr = (ctx) => {
+    visitGraphicCommandExpr = (ctx) => {
         let useValue = null;
         const ctxId = ctx.ID();
         const ctxPin = ctx.Pin();
@@ -179,7 +184,7 @@ const languageKeywords = [
     'break', 'branch', 'create', 'component',
     'graphic', 'wire', 'pin', 'add', 'at', 'to',
     'point', 'join', 'parallel', 'return', 'def', 'import',
-    'true', 'false', 'nc', 'frame',
+    'true', 'false', 'nc', 'sheet', 'frame', 'if', 'for',
 ];
 const operatorKeywords = [
     'at', 'to', 'wire', 'add', 'frame', 'join', 'parallel', 'point'
@@ -203,6 +208,7 @@ function resolveTokenType(tokenType) {
             case 'ID':
                 return 'variable';
             case 'Define':
+            case 'BOOLEAN_VALUE':
                 return 'keyword';
             case 'COMMENT':
                 return 'comment';