circuitscript 0.1.4 → 0.1.7

package/dist/cjs/BaseVisitor.js

@@ -1,47 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseVisitor = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
 const big_js_1 = require("big.js");
-const CircuitScriptParser_1 = require("./antlr/CircuitScriptParser");
-const CircuitScriptVisitor_1 = require("./antlr/CircuitScriptVisitor");
-const execute_1 = require("./execute");
-const logger_1 = require("./logger");
-const ClassComponent_1 = require("./objects/ClassComponent");
-const ParamDefinition_1 = require("./objects/ParamDefinition");
-const PinTypes_1 = require("./objects/PinTypes");
-const types_1 = require("./objects/types");
-const globals_1 = require("./globals");
-const builtinMethods_1 = require("./builtinMethods");
-const utils_1 = require("./utils");
-class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
-    constructor(silent = false, onErrorHandler = null, currentDirectory, defaultLibsPath) {
+const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
+const CircuitScriptVisitor_js_1 = require("./antlr/CircuitScriptVisitor.js");
+const execute_js_1 = require("./execute.js");
+const logger_js_1 = require("./logger.js");
+const ClassComponent_js_1 = require("./objects/ClassComponent.js");
+const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const PinTypes_js_1 = require("./objects/PinTypes.js");
+const types_js_1 = require("./objects/types.js");
+const globals_js_1 = require("./globals.js");
+const builtinMethods_js_1 = require("./builtinMethods.js");
+const utils_js_1 = require("./utils.js");
+const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
+class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
+    constructor(silent = false, onErrorHandler = null, environment) {
         super();
         this.indentLevel = 0;
         this.silent = false;
         this.printStream = [];
         this.printToConsole = true;
-        this.acceptedDirections = [types_1.Direction.Up, types_1.Direction.Down,
-            types_1.Direction.Right, types_1.Direction.Left];
+        this.acceptedDirections = [types_js_1.Direction.Up, types_js_1.Direction.Down,
+            types_js_1.Direction.Right, types_js_1.Direction.Left];
         this.resultData = new Map;
         this.paramData = new Map;
         this.pinTypesList = [
-            PinTypes_1.PinTypes.Any,
-            PinTypes_1.PinTypes.Input,
-            PinTypes_1.PinTypes.Output,
-            PinTypes_1.PinTypes.IO,
-            PinTypes_1.PinTypes.Power,
+            PinTypes_js_1.PinTypes.Any,
+            PinTypes_js_1.PinTypes.Input,
+            PinTypes_js_1.PinTypes.Output,
+            PinTypes_js_1.PinTypes.IO,
+            PinTypes_js_1.PinTypes.Power,
         ];
-        this.onErrorCallbackHandler = null;
-        this.onImportFile = (visitor, filePath) => {
+        this.onErrorHandler = null;
+        this.importedFiles = [];
+        this.onImportFile = async (visitor, filePath, fileData, onErrorHandler) => {
             throw "Import file not implemented";
         };
-        this.visitScript = (ctx) => {
+        this.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;
         };
         this.visitAssignment_expr = (ctx) => {
             const reference = this.getReference(ctx.atom_expr());
@@ -50,13 +56,10 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             const value = this.getResult(ctxDataExpr);
             const trailers = reference.trailers ?? [];
             if (trailers.length === 0) {
-                if (value instanceof ClassComponent_1.ClassComponent) {
-                    const instances = this.getExecutor().scope.instances;
-                    const tmpComponent = value;
-                    const oldName = tmpComponent.instanceName;
-                    tmpComponent.instanceName = reference.name;
-                    instances.delete(oldName);
-                    instances.set(reference.name, tmpComponent);
+                if (value instanceof ClassComponent_js_1.ClassComponent) {
+                    const variables = this.getExecutor().scope.variables;
+                    variables.set(reference.name, value);
+                    this.getExecutor().scope.sequence.push([ExecutionScope_js_1.SequenceAction.Assign, reference.name, value]);
                     this.log2(`assigned '${reference.name}' to ClassComponent`);
                 }
                 else {
@@ -65,7 +68,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 }
             }
             else {
-                if (reference.parentValue instanceof ClassComponent_1.ClassComponent) {
+                if (reference.parentValue instanceof ClassComponent_js_1.ClassComponent) {
                     this.setInstanceParam(reference.parentValue, trailers, value);
                     this.log2(`assigned component param ${reference.parentValue} trailers: ${trailers} value: ${value}`);
                 }
@@ -90,7 +93,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 currentValue = this.getExecutor().scope.variables.get(reference.name);
             }
             else {
-                if (reference.value instanceof ClassComponent_1.ClassComponent) {
+                if (reference.value instanceof ClassComponent_js_1.ClassComponent) {
                     currentValue = this.getInstanceParam(reference.value, trailers);
                 }
                 else if (reference.value instanceof Object) {
@@ -101,7 +104,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 this.throwWithContext(ctx, 'Operator assignment failed: could not get value');
             }
             let newValue = 0;
-            const operator = new ParamDefinition_1.NumberOperator();
+            const operator = new ParamDefinition_js_1.NumberOperator();
             if (ctx.AdditionAssign()) {
                 newValue = operator.addition(currentValue, value);
             }
@@ -124,7 +127,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 this.getExecutor().scope.variables.set(reference.name, newValue);
             }
             else {
-                if (reference.value instanceof ClassComponent_1.ClassComponent) {
+                if (reference.value instanceof ClassComponent_js_1.ClassComponent) {
                     this.setInstanceParam(reference.value, trailers, newValue);
                 }
                 else if (reference.value instanceof Object) {
@@ -150,7 +153,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 currentReference = {
                     found: true,
                     value: atomId,
-                    type: globals_1.ReferenceTypes.pinType,
+                    type: globals_js_1.ReferenceTypes.pinType,
                 };
             }
             else {
@@ -162,8 +165,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                     executor.scope.setNet(tmpComponent, pinId, net);
                 }
             }
-            this.log2(`atomId: ${atomId} ${currentReference}`);
-            if (ctx.parent instanceof CircuitScriptParser_1.ExpressionContext && !currentReference.found) {
+            if (ctx.parent instanceof CircuitScriptParser_js_1.ExpressionContext && !currentReference.found) {
                 this.throwWithContext(ctx, "Unknown symbol: " + atomId);
             }
             this.setResult(ctx, currentReference);
@@ -204,7 +206,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                             currentReference = {
                                 found: true,
                                 value: functionResult,
-                                type: (functionResult instanceof ClassComponent_1.ClassComponent) ?
+                                type: (functionResult instanceof ClassComponent_js_1.ClassComponent) ?
                                     'instance' : 'value',
                             };
                         }
@@ -230,14 +232,14 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             let result = null;
             if (ctxIntegerValue || ctxDecimalValue || ctxNumericValue) {
                 if (ctxIntegerValue) {
-                    result = (0, utils_1.resolveToNumericValue)((new big_js_1.Big(ctxIntegerValue.getText())).mul(new big_js_1.Big(sign)));
+                    result = (0, utils_js_1.resolveToNumericValue)((new big_js_1.Big(ctxIntegerValue.getText())).mul(new big_js_1.Big(sign)));
                 }
                 else if (ctxDecimalValue) {
-                    result = (0, utils_1.resolveToNumericValue)((new big_js_1.Big(ctxDecimalValue.getText())).mul(new big_js_1.Big(sign)));
+                    result = (0, utils_js_1.resolveToNumericValue)((new big_js_1.Big(ctxDecimalValue.getText())).mul(new big_js_1.Big(sign)));
                 }
                 else if (ctxNumericValue) {
                     const textExtra = ctx.Minus() ? '-' : '';
-                    result = new ParamDefinition_1.NumericValue(textExtra + ctxNumericValue.getText());
+                    result = new ParamDefinition_js_1.NumericValue(textExtra + ctxNumericValue.getText());
                 }
             }
             else {
@@ -258,7 +260,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 result = this.prepareStringValue(ctxStringValue.getText());
             }
             else if (ctxPercentageValue) {
-                result = new ParamDefinition_1.PercentageValue(ctxPercentageValue.getText());
+                result = new ParamDefinition_js_1.PercentageValue(ctxPercentageValue.getText());
             }
             this.setResult(ctx, result);
         };
@@ -274,10 +276,10 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 this.visit(ctxAtomExpr);
                 const reference = this.getResult(ctxAtomExpr);
                 if (!reference.found) {
-                    value = new types_1.UndeclaredReference(reference);
+                    value = new types_js_1.UndeclaredReference(reference);
                 }
                 else {
-                    if (reference.type && reference.type === globals_1.ReferenceTypes.pinType) {
+                    if (reference.type && reference.type === globals_js_1.ReferenceTypes.pinType) {
                         value = reference;
                     }
                     else {
@@ -302,10 +304,10 @@ class BaseVisitor extends CircuitScriptVisitor_1.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);
@@ -327,10 +329,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             this.setResult(ctx, returnList);
         };
         this.visitImport_expr = (ctx) => {
-            const ID = ctx.ID().toString();
-            this.log('import', ID);
-            this.handleImportFile(ID, true, ctx);
-            this.log('done import', ID);
+            throw new utils_js_1.RuntimeExecutionError("Cannot parse imports here", ctx.start, ctx.stop);
         };
         this.visitFunction_return_expr = (ctx) => {
             const executor = this.getExecutor();
@@ -376,23 +375,34 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             const innerResult = this.getResult(ctxDataExpr);
             this.setResult(ctx, innerResult);
         };
-        this.logger = new logger_1.Logger();
-        this.onErrorCallbackHandler = onErrorHandler;
-        this.startingContext = new execute_1.ExecutionContext('__', '__.', '/', 0, 0, silent, this.logger, null);
-        this.startingContext.scope.variables.set(globals_1.GlobalDocumentName, {});
-        this.setupPrintFunction(this.startingContext);
+        this.logger = new logger_js_1.Logger();
+        this.onErrorHandler = onErrorHandler;
+        this.environment = environment;
+        this.startingContext = new execute_js_1.ExecutionContext(globals_js_1.DoubleDelimiter1, `${globals_js_1.DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, null);
+        const scope = this.startingContext.scope;
+        scope.sequence.push([
+            ExecutionScope_js_1.SequenceAction.At, scope.componentRoot, scope.currentPin
+        ]);
+        scope.variables.set(globals_js_1.GlobalDocumentName, {});
+        this.setupBuiltInFunctions(this.startingContext);
         this.executionStack = [this.startingContext];
         this.startingContext.resolveNet =
             this.createNetResolver(this.executionStack);
+        this.startingContext.resolveComponentPinNet =
+            this.createComponentPinNetResolver(this.executionStack);
         this.silent = silent;
-        this.currentDirectory = currentDirectory;
-        this.defaultLibsPath = defaultLibsPath;
     }
     getExecutor() {
         return this.executionStack[this.executionStack.length - 1];
     }
-    setupPrintFunction(context) {
-        (0, builtinMethods_1.linkBuiltInMethods)(context, this);
+    getScope() {
+        return this.getExecutor().scope;
+    }
+    getRootExecutor() {
+        return this.executionStack[0];
+    }
+    setupBuiltInFunctions(context) {
+        (0, builtinMethods_js_1.linkBuiltInMethods)(context, this);
     }
     createNetResolver(executionStack) {
         const resolveNet = (netName, netNamespace) => {
@@ -414,6 +424,19 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         };
         return resolveNet;
     }
+    createComponentPinNetResolver(executionStack) {
+        return (component, pin) => {
+            const reversed = [...executionStack].reverse();
+            for (let i = 0; i < reversed.length; i++) {
+                const context = reversed[i];
+                const net = context.scope.getNet(component, pin);
+                if (net !== null) {
+                    return net;
+                }
+            }
+            return null;
+        };
+    }
     log(...params) {
         const indentOutput = ''.padStart(this.indentLevel * 4, '    ');
         const indentLevelText = this.indentLevel.toString().padStart(3, ' ');
@@ -426,6 +449,10 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     log2(message) {
         this.getExecutor().log(message);
     }
+    async visitAsync(ctx) {
+        const result = await ctx.accept(this);
+        return result;
+    }
     getReference(ctx) {
         const atomStr = ctx.getText();
         if (atomStr.indexOf('(') !== -1 || atomStr.indexOf(')') !== -1) {
@@ -451,15 +478,24 @@ class BaseVisitor extends CircuitScriptVisitor_1.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 = (0, path_1.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 = (0, fs_1.readFileSync)(tmpFilePath, { encoding: 'utf8' });
+            filePathUsed = tmpFilePath;
+            fileData = await this.environment.readFile(tmpFilePath, { encoding: 'utf8' });
             pathExists = true;
         }
         catch (err) {
@@ -467,8 +503,9 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         }
         if (!pathExists) {
             try {
-                const tmpFilePath2 = (0, path_1.join)(this.defaultLibsPath, name + ".cst");
-                fileData = (0, fs_1.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) {
@@ -478,31 +515,39 @@ class BaseVisitor extends CircuitScriptVisitor_1.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 utils_js_1.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 utils_js_1.RuntimeExecutionError(errorMessage, ctx.start, ctx.end);
         }
-        return {
+        const newImportedFile = {
+            id: name.trim(),
             hasError,
             hasParseError,
             pathExists,
         };
+        this.importedFiles.push(newImportedFile);
+        return newImportedFile;
     }
     setupDefinedParameters(funcDefinedParameters, passedInParameters, executor) {
         for (let i = 0; i < funcDefinedParameters.length; i++) {
@@ -513,7 +558,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                     const variableName = tmpFuncArg[0];
                     executor.log('set variable in scope, var name: ', variableName);
                     executor.scope.variables.set(variableName, tmpPassedInArgs[2]);
-                    if (tmpPassedInArgs[2] instanceof ClassComponent_1.ClassComponent) {
+                    if (tmpPassedInArgs[2] instanceof ClassComponent_js_1.ClassComponent) {
                         const component = tmpPassedInArgs[2];
                         for (const [pinNumber, net] of component.pinNets) {
                             executor.scope.setNet(component, pinNumber, net);
@@ -526,9 +571,9 @@ class BaseVisitor extends CircuitScriptVisitor_1.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);
             }
@@ -591,8 +636,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         const executionLevel = currentExecutionContext.executionLevel;
         const executionContextNamespace = currentExecutionContext.namespace
             + executionContextName + ".";
-        const newExecutor = new execute_1.ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.indentLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, parentContext);
-        this.setupPrintFunction(newExecutor);
+        const newExecutor = new execute_js_1.ExecutionContext(executionContextName, executionContextNamespace, netNamespace, executionLevel + 1, this.getExecutor().scope.indentLevel + 1, currentExecutionContext.silent, currentExecutionContext.logger, parentContext);
         executionStack.push(newExecutor);
         this.setupDefinedParameters(funcDefinedParameters, passedInParameters, newExecutor);
         return newExecutor;
@@ -600,8 +644,33 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     prepareStringValue(value) {
         return value.slice(1, value.length - 1);
     }
-    throwWithContext(context, message) {
-        (0, utils_1.throwWithContext)(context, message);
+    throwWithContext(context, messageOrError) {
+        (0, utils_js_1.throwWithContext)(context, messageOrError);
+    }
+    validateType(value, context, validateFunction, expectedType) {
+        if (value === undefined) {
+            return false;
+        }
+        const result = validateFunction(value);
+        if (!result) {
+            throw new utils_js_1.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 ParamDefinition_js_1.NumericValue);
+        }, 'numeric value');
     }
 }
 exports.BaseVisitor = BaseVisitor;

package/dist/cjs/SemanticTokenVisitor.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareTokens = exports.SemanticTokensVisitor = void 0;
-const CircuitScriptParser_1 = require("./antlr/CircuitScriptParser");
-const BaseVisitor_1 = require("./BaseVisitor");
-class SemanticTokensVisitor extends BaseVisitor_1.BaseVisitor {
-    constructor(silent = false, onErrorHandler = null, currentDirectory, defaultsLibsPath, lexer, script) {
-        super(silent, onErrorHandler, currentDirectory, defaultsLibsPath);
+const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
+const BaseVisitor_js_1 = require("./BaseVisitor.js");
+const builtinMethods_js_1 = require("./builtinMethods.js");
+const globals_js_1 = require("./globals.js");
+class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
+    constructor(silent = false, onErrorHandler = null, environment, lexer, script) {
+        super(silent, onErrorHandler, environment);
         this.parsedTokens = [];
         this.semanticTokens = new Map();
         this.visitFunction_args_expr = (ctx) => {
@@ -15,7 +17,11 @@ class SemanticTokensVisitor extends BaseVisitor_1.BaseVisitor {
             });
         };
         this.visitFunction_call_expr = (ctx) => {
-            this.addSemanticToken(ctx.ID(), [], 'function');
+            const modifiers = [];
+            if (builtinMethods_js_1.buildInMethodNamesList.indexOf(ctx.ID().getText()) !== -1) {
+                modifiers.push('defaultLibrary');
+            }
+            this.addSemanticToken(ctx.ID(), modifiers, 'function');
         };
         this.visitFunction_def_expr = (ctx) => {
             const functionName = ctx.ID().getText();
@@ -24,7 +30,7 @@ class SemanticTokensVisitor extends BaseVisitor_1.BaseVisitor {
             if (ctxFunctionArgsExpr) {
                 this.visit(ctxFunctionArgsExpr);
             }
-            const executionContextName = functionName + '_validate';
+            const executionContextName = functionName + globals_js_1.SymbolValidatorContext;
             const newExecutor = this.enterNewChildContext(this.executionStack, this.getExecutor(), executionContextName, { netNamespace: "" }, [], []);
             this.runExpressions(newExecutor, ctx.function_expr());
             this.executionStack.pop();
@@ -37,9 +43,8 @@ class SemanticTokensVisitor extends BaseVisitor_1.BaseVisitor {
         };
         this.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);
         };
         this.visitProperty_key_expr = (ctx) => {
             let useValue = null;
@@ -59,7 +64,7 @@ class SemanticTokensVisitor extends BaseVisitor_1.BaseVisitor {
                 this.addSemanticToken(useValue, [], 'property');
             }
         };
-        this.visitGraphic_expr = (ctx) => {
+        this.visitGraphicCommandExpr = (ctx) => {
             let useValue = null;
             const ctxId = ctx.ID();
             const ctxPin = ctx.Pin();
@@ -88,7 +93,7 @@ class SemanticTokensVisitor extends BaseVisitor_1.BaseVisitor {
             this.visit(ctx.data_expr());
         };
         this.visitAtom_expr = (ctx) => {
-            if (ctx.parent instanceof CircuitScriptParser_1.Assignment_exprContext && ctx.ID(0)) {
+            if (ctx.parent instanceof CircuitScriptParser_js_1.Assignment_exprContext && ctx.ID(0)) {
                 this.addSemanticToken(ctx.ID(0), [], 'variable');
             }
         };
@@ -182,7 +187,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'
@@ -206,6 +211,7 @@ function resolveTokenType(tokenType) {
             case 'ID':
                 return 'variable';
             case 'Define':
+            case 'BOOLEAN_VALUE':
                 return 'keyword';
             case 'COMMENT':
                 return 'comment';