circuitscript 0.3.1 → 0.4.0

package/dist/libs/std.cst

@@ -4,10 +4,9 @@ def net(net_name, net_type = "any"):
     return create component:
         pins: 1
         copy: true
-        angle: -90
         display: create graphic (params):
             hline: -50, 0, 100
-            vpin: 1, 0, 50, -50, display_pin_id=false
+            vpin: 1, 0, 50, -50, display_id=false
             label: params.net_name, 0, -15, fontSize=50, anchor="middle"
         type: "net"
         params:
@@ -27,7 +26,7 @@ def label(value, anchor="left"):
         display: create graphic (params):
             textColor: "#222"
             label: params.value, 0, -10, fontSize=50, anchor=anchor
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
         type: "net"
         params:
             net_name: value
@@ -41,7 +40,7 @@ def port(value, portType="input"):
         display: create graphic (params):
             textColor: "#222"
             label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
         type: "port"
         params:
             net_name: value
@@ -56,8 +55,8 @@ def res(value):
         pins: 2
         display: create graphic (params):
             crect: 0, 0, width, height
-            hpin: 1, -width/2 - 30, 0, 30
-            hpin: 2, width/2 + 30, 0, -30
+            hpin: 1, -width/2 - 30, 0, 30, display_id=false
+            hpin: 2, width/2 + 30, 0, -30, display_id=false
             label: params.refdes, -width/2, -height/2 - 20, fontSize=50, anchor="left"
             label: params.value, 0, 0, fontSize=30, anchor="middle", vanchor="middle"
         type: "res"
@@ -73,13 +72,12 @@ def cap(value):
 
     return create component:
         pins: 2
-        angle: 90
         display: create graphic (params):
             lineWidth: 13
             hline: -width/2, 20, width
             hline: -width/2, -20, width
-            vpin: 1, 0, -100, 80
-            vpin: 2, 0, 100, -80
+            vpin: 1, 0, -100, 80, display_id=false
+            vpin: 2, 0, 100, -80, display_id=false
             label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="middle"
             label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="middle"
         type: "cap"
@@ -100,8 +98,8 @@ def ind(value):
             arc: -25, 0, 25, 180, 360
             arc: 25, 0, 25, 180, 360
             arc: 75, 0, 25, 180, 360
-            hpin: 1, -width/2 - 100, 0, 100
-            hpin: 2, width/2 + 100, 0, -100
+            hpin: 1, -width/2 - 100, 0, 100, display_id=false
+            hpin: 2, width/2 + 100, 0, -100, display_id=false
             label: (params.refdes, -width/2, -height/2 - 25 , fontSize=50, anchor="left")
             label: (params.value, 0, 50, fontSize=50, anchor="middle", vanchor="middle")
         params:
@@ -156,12 +154,11 @@ def cgnd():
     return create component:
         pins: 1
         copy: true
-        angle: 90
         display: create graphic (params):
             hline: -15, 0, 30
             hline: -10, 5, 20
             hline: -5, 10, 10
-            vpin: 1, 0, -10, 10, display_pin_id=false
+            vpin: 1, 0, -10, 10, display_id=false
             label: params.net_name, 0, 22, fontSize=50, anchor="middle"
         type: "net"
         params:
@@ -175,10 +172,9 @@ def dgnd(net_name="GND"):
     return create component:
         pins: 1
         copy: true
-        angle: 90
         display: create graphic (params):
             triangle: 0, 0, 0, height, width
-            vpin: 1, 0, -50, 50, display_pin_id=false
+            vpin: 1, 0, -50, 50, display_id=false
             label: params.net_name, 0, height + 50, fontSize=50, anchor="middle", vanchor="middle"
         type: "net"
         params:
@@ -191,7 +187,7 @@ def text(value, offsetX = 0, offsetY = 0, fontSize = 50):
         followWireOrientation: false
         type: "graphic"
         display: create graphic:
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
             text:
                 content: value
                 offset: offsetX, offsetY
@@ -205,7 +201,7 @@ def marker_point():
         display: create graphic:
             hline: -5, 0, 10
             vline: 0, -5, 10
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
 
 def arrow_point():
     return create component:
@@ -215,7 +211,7 @@ def arrow_point():
             lineWidth: 2
             path: ("M", -10, -5, "L", -5, 0, "L", -10, 5)
             path: ("M", -5, 0, "L", -20, 0)
-            hpin: 1, 0, 0, 0, display_pin_id=false
+            hpin: 1, 0, 0, 0, display_id=false
 
 def no_connect(size=20):
     return create component:
@@ -224,7 +220,7 @@ def no_connect(size=20):
         display: create graphic:
             path: "M", -size, -size, "L", size, size
             path: "M", -size, size, "L", size, -size
-            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            pin: 1, 0, 0, 0, 0, display_id=false
         params:
             no_connect: true
 

package/dist/types/BaseVisitor.d.ts

@@ -1,5 +1,5 @@
-import { Array_exprContext, ArrayExprContext, ArrayIndexExprContext, Assignment_exprContext, Atom_exprContext, ExpressionContext, Flow_expressionsContext, Function_args_exprContext, Function_call_exprContext, Function_exprContext, Function_return_exprContext, FunctionCallExprContext, Import_all_simpleContext, Import_exprContext, Import_simpleContext, Import_specificContext, Operator_assignment_exprContext, ParametersContext, RoundedBracketsExprContext, ScriptContext, Trailer_expr2Context, Value_exprContext, ValueAtomExprContext } from "./antlr/CircuitScriptParser.js";
-import { CircuitScriptVisitor } from "./antlr/CircuitScriptVisitor.js";
+import { ArrayExprContext, Assignment_exprContext, Callable_exprContext, CallableExprContext, ExpressionContext, Flow_expressionsContext, Function_args_exprContext, Function_exprContext, Function_return_exprContext, Import_exprContext, Import_simpleContext, Import_specific_or_allContext, Keyword_assignment_exprContext, ParametersContext, RoundedBracketsExprContext, ScriptContext, TrailerContext, Value_exprContext, ValueExprContext } from "./antlr/CircuitScriptParser.js";
+import { CircuitScriptParserVisitor } from "./antlr/CircuitScriptParserVisitor.js";
 import { ExecutionContext } from "./execute.js";
 import { Logger } from "./logger.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
@@ -9,9 +9,9 @@ import { CommonTokenStream, ParserRuleContext } from 'antlr4ng';
 import { ExecutionWarning } from "./utils.js";
 import { BaseError } from './utils.js';
 import { ExecutionScope } from './objects/ExecutionScope.js';
-import { NodeScriptEnvironment } from "./environment.js";
+import { NodeScriptEnvironment } from "./environment/environment.js";
 import { PinId } from './objects/PinDefinition.js';
-export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | AnyReference | any> {
+export declare class BaseVisitor extends CircuitScriptParserVisitor<ComplexType | AnyReference | any> {
     startingContext: ExecutionContext;
     executionStack: ExecutionContext[];
     filePathStack: string[];
@@ -23,12 +23,15 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | AnyR
     acceptedDirections: Direction[];
     protected resultData: Map<ParserRuleContext, any>;
     protected componentCtxLinks: Map<ParserRuleContext, ClassComponent>;
-    pinTypesList: string[];
     onErrorHandler: OnErrorHandler | null;
     environment: NodeScriptEnvironment;
     protected importedFiles: ImportLibraryFile[];
     protected warnings: ExecutionWarning[];
-    onImportFile: (visitor: BaseVisitor, filePath: string, fileData: string, onErrorHandler: OnErrorHandler) => Promise<ImportFileResult>;
+    loadedFiles: Map<string, string>;
+    enableCacheImports: boolean;
+    enableCachedImportsRead: boolean;
+    enableCachedImportsWrite: boolean;
+    onImportFile: (visitor: BaseVisitor, filePath: string, fileData: string, onErrorHandler: OnErrorHandler, fileLineOffset: number) => ImportFileResult;
     refdesFileAnnotations: Map<string, string>;
     constructor(silent: boolean | undefined, onErrorHandler: OnErrorHandler | null | undefined, environment: NodeScriptEnvironment);
     getExecutor(): ExecutionContext;
@@ -42,25 +45,26 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | AnyR
     createComponentPinNetResolver(executionStack: ExecutionContext[]): (component: ClassComponent, pin: PinId) => Net | null;
     log(...params: any[]): void;
     log2(message: string): void;
-    visitAsync(ctx: ParserRuleContext): Promise<void>;
-    visitScript: (ctx: ScriptContext) => Promise<void>;
+    resolveImportsAndLoad(inputPath: string, scriptData: string): Promise<void>;
+    visitScript: (ctx: ScriptContext) => void;
     private importCommon;
-    visitImport_simple: (ctx: Import_simpleContext) => Promise<void>;
-    visitImport_all_simple: (ctx: Import_all_simpleContext) => Promise<void>;
-    visitImport_specific: (ctx: Import_specificContext) => Promise<void>;
+    visitImport_simple: (ctx: Import_simpleContext) => void;
+    visitImport_specific_or_all: (ctx: Import_specific_or_allContext) => void;
+    visitCallableExpr: (ctx: CallableExprContext) => void;
+    visitCallable_expr: (ctx: Callable_exprContext) => void;
+    visitTrailer: (ctx: TrailerContext) => void;
     visitAssignment_expr: (ctx: Assignment_exprContext) => void;
-    visitOperator_assignment_expr: (ctx: Operator_assignment_exprContext) => void;
     private getReference;
     visitTrailer_expr2: (ctx: Trailer_expr2Context) => void;
     visitAtom_expr: (ctx: Atom_exprContext) => void;
-    visitFunctionCallExpr: (ctx: FunctionCallExprContext) => void;
-    visitFunction_call_expr: (ctx: Function_call_exprContext) => void;
     private handleFunctionCall;
     protected handleEnterContext(executor: ExecutionContext, executionStack: ExecutionContext[], contextName: string, ctx: ParserRuleContext, options: NewContextOptions, funcDefinedParameters: FunctionDefinedParameter[], passedInParameters: CallableParameter[], isBreakContext?: boolean): ExecutionContext;
     protected handlePopContext(executor: ExecutionContext, executionStack: ExecutionContext[], namespaceExtension: string, isBreakContext?: boolean): ExecutionContext;
     visitValue_expr: (ctx: Value_exprContext) => void;
-    visitValueAtomExpr: (ctx: ValueAtomExprContext) => void;
+    visitValueExpr: (ctx: ValueExprContext) => void;
+    visitAtomExpr: (ctx: AtomExprContext) => void;
     visitFunction_args_expr: (ctx: Function_args_exprContext) => void;
+    visitKeyword_assignment_expr: (ctx: Keyword_assignment_exprContext) => void;
     visitParameters: (ctx: ParametersContext) => void;
     visitImport_expr: (ctx: Import_exprContext) => void;
     visitFunction_return_expr: (ctx: Function_return_exprContext) => void;
@@ -73,9 +77,12 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | AnyR
     protected linkComponentToCtx(ctx: ParserRuleContext, instance: ClassComponent, creationFlag?: boolean): void;
     getComponentCtxLinks(): Map<ParserRuleContext, ClassComponent>;
     visitResult(ctx: ParserRuleContext): any;
-    protected handleImportFile(name: string, importHandling: ImportFunctionHandling, throwErrors?: boolean, ctx?: ParserRuleContext | null, specificImports?: string[]): Promise<ImportLibraryFile>;
-    checkLibraryHasRefdesFile(filePath: string): Promise<void>;
-    getRefdesFileAnnotation(filePath: string, startLine: number, startColumn: number, stopLine: number, stopColumn: number): string;
+    passResult(ctx: ParserRuleContext, innerCtx: ParserRuleContext): void;
+    protected handleImportFile(name: string, importHandling: ImportFunctionHandling, throwErrors?: boolean, ctx?: ParserRuleContext | null, specificImports?: string[]): ImportLibraryFile;
+    cacheLibraries(): void;
+    checkLibraryInRefdesFile(filePath: string): void;
+    getPathRefdesFile(filePath: string): string;
+    getRefdesFileAnnotationKey(filePath: string, startLine: number, startColumn: number, stopLine: number, stopColumn: number): string;
     visitRoundedBracketsExpr: (ctx: RoundedBracketsExprContext) => void;
     protected setupDefinedParameters(funcDefinedParameters: FunctionDefinedParameter[], passedInParameters: CallableParameter[], executor: ExecutionContext): void;
     protected runExpressions(executor: ExecutionContext, expressions: ExpressionContext[] | Function_exprContext[]): ComplexType;

package/dist/types/BomGeneration.d.ts

@@ -1,5 +1,5 @@
 import { ClassComponent } from "./objects/ClassComponent.js";
-import { NodeScriptEnvironment } from './environment.js';
+import { NodeScriptEnvironment } from './environment/environment.js';
 export type BomConfig = {
     columns: string[];
 };

package/dist/types/LexerDiagnosticListener.d.ts

@@ -0,0 +1,85 @@
+import { Token } from "antlr4ng";
+export interface TokenStreamEntry {
+    index: number;
+    type: string;
+    text: string;
+    line: number;
+    column: number;
+    startPos: number;
+    stopPos: number;
+    channel: number;
+    timeUs: number;
+}
+export interface LexerDiagnostics {
+    totalTokens: number;
+    totalCharactersProcessed: number;
+    totalTimeMicroseconds: number;
+    tokenTypeStats: Map<string, TokenTypeStats>;
+    averageTokenTimeUs: number;
+    slowestTokens: Array<{
+        type: string;
+        timeUs: number;
+        text: string;
+        line: number;
+        column: number;
+    }>;
+    peakCharacterPosition: number;
+    indentCount: number;
+    dedentCount: number;
+    newlineCount: number;
+    maxQueueSize: number;
+    averageQueueSize: number;
+    largeQueueLocations: Array<{
+        queueSize: number;
+        tokenIndex: number;
+        line: number;
+        column: number;
+        tokenType: string;
+        text: string;
+    }>;
+    tokenStream: TokenStreamEntry[];
+}
+export interface TokenTypeStats {
+    count: number;
+    totalTimeUs: number;
+    averageTimeUs: number;
+    totalCharacters: number;
+}
+export declare class LexerDiagnosticCollector {
+    private startTime;
+    private tokenStartTime;
+    private totalTokens;
+    private totalCharactersProcessed;
+    private tokenTypeStats;
+    private slowestTokens;
+    private peakCharacterPosition;
+    private indentCount;
+    private dedentCount;
+    private newlineCount;
+    private queueSizeSum;
+    private queueSizeCount;
+    private maxQueueSize;
+    private largeQueueLocations;
+    private tokenStream;
+    private verboseLogging;
+    private recordTokenStream;
+    private sourceText;
+    private tokenTypeNameCache;
+    private enabled;
+    constructor();
+    setEnabled(enabled: boolean): void;
+    setVerboseLogging(enabled: boolean): void;
+    setRecordTokenStream(enabled: boolean): void;
+    setSourceText(sourceText: string): void;
+    reset(): void;
+    onTokenStart(): void;
+    onTokenGenerated(token: Token, queueSize: number): void;
+    private getTokenTypeName;
+    private logToken;
+    getDiagnostics(): LexerDiagnostics;
+    printReport(): void;
+    printTokenStream(limit?: number): void;
+    printCharacterToTokenMapping(startLine?: number, endLine?: number): void;
+    printLexerOperationSummary(): void;
+    getRecommendations(): string[];
+}

package/dist/types/{ComponentAnnotater.d.ts → annotate/ComponentAnnotater.d.ts}

@@ -1,5 +1,5 @@
 import { ParserRuleContext } from 'antlr4ng';
-import { ClassComponent } from './objects/ClassComponent.js';
+import { ClassComponent } from './../objects/ClassComponent.js';
 export declare class ComponentAnnotater {
     counter: {
         [key: string]: number;

package/dist/types/annotate/DefaultPostAnnotationCallback.d.ts

@@ -0,0 +1,7 @@
+import { CommonTokenStream, ParserRuleContext } from "antlr4ng";
+import { ScriptContext } from "../antlr/CircuitScriptParser.js";
+import { NodeScriptEnvironment } from "../environment/environment.js";
+import { ScriptOptions } from "../helpers.js";
+import { ClassComponent } from "../objects/ClassComponent.js";
+import { ImportedLibrary } from "../objects/types.js";
+export declare function DefaultPostAnnotationCallback(options: ScriptOptions, scriptData: string, tree: ScriptContext, tokens: CommonTokenStream, componentLinks: Map<ParserRuleContext, ClassComponent>, importedLibraries: ImportedLibrary[], environment: NodeScriptEnvironment): Promise<void>;

package/dist/types/{RefdesAnnotationVisitor.d.ts → annotate/RefdesAnnotationVisitor.d.ts}

@@ -1,7 +1,8 @@
 import { ParserRuleContext, CommonTokenStream } from 'antlr4ng';
-import { Add_component_exprContext, At_block_headerContext, At_blockContext, At_component_exprContext, Component_select_exprContext, Frame_exprContext, Function_def_exprContext, Function_return_exprContext, ScriptContext, To_component_exprContext } from './antlr/CircuitScriptParser.js';
-import { BaseVisitor } from './BaseVisitor.js';
-import { ClassComponent } from './objects/ClassComponent.js';
+import { Add_component_exprContext, At_block_headerContext, At_blockContext, At_component_exprContext, Component_select_exprContext, Frame_exprContext, Function_def_exprContext, Function_return_exprContext, ScriptContext, To_component_exprContext, TrailerContext } from '../antlr/CircuitScriptParser.js';
+import { BaseVisitor } from '../BaseVisitor.js';
+import { ClassComponent } from '../objects/ClassComponent.js';
+import { RefdesModification } from './utils.js';
 export declare class RefdesAnnotationVisitor extends BaseVisitor {
     private sourceText;
     private tokenStream;
@@ -10,6 +11,7 @@ export declare class RefdesAnnotationVisitor extends BaseVisitor {
     debug: boolean;
     componentCtxLinks: Map<ParserRuleContext, ClassComponent>;
     constructor(silent: boolean, sourceText: string, tokenStream: CommonTokenStream, componentCtxLinks: Map<ParserRuleContext, ClassComponent>);
+    getModifications(): Map<ParserRuleContext, RefdesModification>;
     private getOriginalText;
     visitScript: (ctx: ScriptContext) => Promise<void>;
     visitAdd_component_expr: (ctx: Add_component_exprContext) => void;
@@ -23,15 +25,11 @@ export declare class RefdesAnnotationVisitor extends BaseVisitor {
     visitFrame_expr: (ctx: Frame_exprContext) => void;
     visitFunction_call_expr: (ctx: Function_call_exprContext) => void;
     visitParameters: (ctx: ParametersContext) => void;
+    visitTrailer: (ctx: TrailerContext) => void;
     addedRefdesAnnotations: string[];
     private generateRefdesAnnotationComment;
     private addRefdesAnnotationComment;
     getOutput(): string;
-    getOutputForExternalRefdesFile(): string[];
-    private generateModifiedText;
-    private buildContextTokenRanges;
-    private findContextForToken;
-    private markTokensAsProcessed;
+    getOutputForExternalRefdesFile(): Record<string, string>;
     private log;
-    private generateReplacementText;
 }

package/dist/types/annotate/utils.d.ts

@@ -0,0 +1,6 @@
+import { ParserRuleContext, Token } from 'antlr4ng';
+export declare function generateModifiedSourceText(modifications: Map<ParserRuleContext, RefdesModification>, tokens: Token[], sourceText: string, tokenStartOffset?: number): string;
+export type RefdesModification = {
+    originalText: string;
+    refdes: string[];
+};

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

@@ -1,73 +1,74 @@
 import * as antlr from "antlr4ng";
 export declare class CircuitScriptLexer extends antlr.Lexer {
-    static readonly T__0 = 1;
-    static readonly T__1 = 2;
-    static readonly T__2 = 3;
-    static readonly T__3 = 4;
-    static readonly T__4 = 5;
-    static readonly T__5 = 6;
-    static readonly T__6 = 7;
-    static readonly T__7 = 8;
-    static readonly Break = 9;
-    static readonly Branch = 10;
-    static readonly Create = 11;
-    static readonly Component = 12;
-    static readonly Graphic = 13;
-    static readonly Module = 14;
-    static readonly Wire = 15;
-    static readonly Pin = 16;
-    static readonly Add = 17;
-    static readonly At = 18;
-    static readonly To = 19;
-    static readonly Point = 20;
-    static readonly Join = 21;
-    static readonly Parallel = 22;
-    static readonly Return = 23;
-    static readonly Define = 24;
-    static readonly Import = 25;
-    static readonly From = 26;
-    static readonly For = 27;
-    static readonly In = 28;
-    static readonly While = 29;
-    static readonly Continue = 30;
-    static readonly If = 31;
-    static readonly Else = 32;
-    static readonly Not = 33;
-    static readonly Frame = 34;
-    static readonly Sheet = 35;
-    static readonly Equals = 36;
-    static readonly NotEquals = 37;
-    static readonly GreaterThan = 38;
-    static readonly GreatOrEqualThan = 39;
-    static readonly LessThan = 40;
-    static readonly LessOrEqualThan = 41;
-    static readonly LogicalAnd = 42;
-    static readonly LogicalOr = 43;
-    static readonly Addition = 44;
-    static readonly Minus = 45;
-    static readonly Divide = 46;
-    static readonly Multiply = 47;
-    static readonly Modulus = 48;
-    static readonly AdditionAssign = 49;
-    static readonly MinusAssign = 50;
-    static readonly DivideAssign = 51;
-    static readonly MultiplyAssign = 52;
-    static readonly ModulusAssign = 53;
-    static readonly ANNOTATION_START = 54;
-    static readonly OPEN_PAREN = 55;
-    static readonly CLOSE_PAREN = 56;
-    static readonly NOT_CONNECTED = 57;
-    static readonly BOOLEAN_VALUE = 58;
-    static readonly ID = 59;
-    static readonly INTEGER_VALUE = 60;
-    static readonly DECIMAL_VALUE = 61;
-    static readonly NUMERIC_VALUE = 62;
-    static readonly STRING_VALUE = 63;
-    static readonly PERCENTAGE_VALUE = 64;
-    static readonly ALPHA_NUMERIC = 65;
-    static readonly WS = 66;
-    static readonly NEWLINE = 67;
-    static readonly COMMENT = 68;
+    static readonly INDENT = 1;
+    static readonly DEDENT = 2;
+    static readonly Break = 3;
+    static readonly Branch = 4;
+    static readonly Create = 5;
+    static readonly Component = 6;
+    static readonly Graphic = 7;
+    static readonly Module = 8;
+    static readonly Wire = 9;
+    static readonly Pin = 10;
+    static readonly Add = 11;
+    static readonly At = 12;
+    static readonly To = 13;
+    static readonly Point = 14;
+    static readonly Join = 15;
+    static readonly Parallel = 16;
+    static readonly Return = 17;
+    static readonly Define = 18;
+    static readonly Import = 19;
+    static readonly From = 20;
+    static readonly For = 21;
+    static readonly In = 22;
+    static readonly While = 23;
+    static readonly Continue = 24;
+    static readonly If = 25;
+    static readonly Else = 26;
+    static readonly Not = 27;
+    static readonly Frame = 28;
+    static readonly Sheet = 29;
+    static readonly Set = 30;
+    static readonly Colon = 31;
+    static readonly Comma = 32;
+    static readonly Dot = 33;
+    static readonly DoubleDot = 34;
+    static readonly LSquare = 35;
+    static readonly RSquare = 36;
+    static readonly Assign = 37;
+    static readonly Equals = 38;
+    static readonly NotEquals = 39;
+    static readonly GreaterThan = 40;
+    static readonly GreatOrEqualThan = 41;
+    static readonly LessThan = 42;
+    static readonly LessOrEqualThan = 43;
+    static readonly LogicalAnd = 44;
+    static readonly LogicalOr = 45;
+    static readonly Addition = 46;
+    static readonly Minus = 47;
+    static readonly Divide = 48;
+    static readonly Multiply = 49;
+    static readonly Modulus = 50;
+    static readonly AdditionAssign = 51;
+    static readonly MinusAssign = 52;
+    static readonly DivideAssign = 53;
+    static readonly MultiplyAssign = 54;
+    static readonly ModulusAssign = 55;
+    static readonly NEWLINE = 56;
+    static readonly WS = 57;
+    static readonly COMMENT = 58;
+    static readonly LParen = 59;
+    static readonly RParen = 60;
+    static readonly NOT_CONNECTED = 61;
+    static readonly BOOLEAN_VALUE = 62;
+    static readonly ANNOTATION_START = 63;
+    static readonly INTEGER_VALUE = 64;
+    static readonly DECIMAL_VALUE = 65;
+    static readonly NUMERIC_VALUE = 66;
+    static readonly PERCENTAGE_VALUE = 67;
+    static readonly STRING_VALUE = 68;
+    static readonly ID = 69;
     static readonly channelNames: string[];
     static readonly literalNames: (string | null)[];
     static readonly symbolicNames: (string | null)[];
@@ -82,9 +83,9 @@ export declare class CircuitScriptLexer extends antlr.Lexer {
     get channelNames(): string[];
     get modeNames(): string[];
     action(localContext: antlr.ParserRuleContext | null, ruleIndex: number, actionIndex: number): void;
-    private OPEN_PAREN_action;
-    private CLOSE_PAREN_action;
     private NEWLINE_action;
+    private LParen_action;
+    private RParen_action;
     static readonly _serializedATN: number[];
     private static __ATN;
     static get _ATN(): antlr.ATN;