circuitscript 0.1.4 → 0.1.7

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';