circuitscript 0.5.2 → 0.5.3

package/dist/cjs/BaseVisitor.js

@@ -206,65 +206,6 @@ class BaseVisitor extends CircuitScriptParserVisitor_js_1.CircuitScriptParserVis
                 this.setResult(ctx, newValue);
             }
         };
-        this.visitTrailer_expr2 = (ctx) => {
-            const reference = this.getResult(ctx);
-            const ctxID = ctx.ID();
-            const ctxDataExpr = ctx.data_expr();
-            const useValue = reference.value;
-            let nextReference;
-            if (ctxID) {
-                reference.trailers.push(ctxID.getText());
-                const useRootValue = reference.rootValue ?? reference.value;
-                const useTrailerIndex = reference.trailerIndex ?? 0;
-                nextReference = this.getExecutor().resolveTrailers(reference.type, useRootValue, reference.trailers);
-                nextReference.name =
-                    [reference.name,
-                        ...reference.trailers.slice(useTrailerIndex)].join('.');
-            }
-            else if (ctxDataExpr) {
-                const arrayIndex = this.visitResult(ctxDataExpr);
-                if (arrayIndex instanceof NumericValue_js_1.NumericValue) {
-                    const arrayIndexValue = arrayIndex.toNumber();
-                    const foundValue = useValue[arrayIndexValue];
-                    const refType = foundValue instanceof ClassComponent_js_1.ClassComponent
-                        ? globals_js_1.ReferenceTypes.instance : globals_js_1.ReferenceTypes.variable;
-                    nextReference = new types_js_1.AnyReference({
-                        found: true,
-                        type: refType,
-                        value: foundValue,
-                        trailers: [[globals_js_1.TrailerArrayIndex, arrayIndexValue]],
-                        rootValue: useValue
-                    });
-                }
-            }
-            this.setResult(ctx, nextReference);
-        };
-        this.visitAtom_expr = (ctx) => {
-            const executor = this.getExecutor();
-            const firstId = ctx.ID(0);
-            const atomId = firstId.getText();
-            let currentReference;
-            if (globals_js_1.PinTypesList.indexOf(atomId) !== -1) {
-                currentReference = new types_js_1.AnyReference({
-                    found: true,
-                    value: atomId,
-                    type: globals_js_1.ReferenceTypes.pinType,
-                });
-            }
-            else {
-                this.log('resolve variable ctx: ' + ctx.getText(), 'atomId', atomId);
-                currentReference = executor.resolveVariable(this.executionStack, atomId);
-                this.log('reference:', currentReference.name, 'found:', currentReference.found);
-            }
-            if (currentReference !== undefined && currentReference.found) {
-                ctx.trailer_expr2().forEach(ctxTrailer => {
-                    this.setResult(ctxTrailer, currentReference);
-                    currentReference = this.visitResult(ctxTrailer);
-                });
-            }
-            this.setResult(ctx, currentReference);
-            this.log2('atom resolved: ' + ctx.getText() + ' -> ' + currentReference);
-        };
         this.visitValue_expr = (ctx) => {
             const sign = ctx.Minus() ? -1 : 1;
             const ctxIntegerValue = ctx.INTEGER_VALUE();

package/dist/cjs/semantic-tokens/SemanticTokenVisitor.js

@@ -125,6 +125,8 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
                 });
             }
         };
+        this.visitTrailer = (ctx) => {
+        };
         this.lexer = lexer;
         this.script = script;
     }

package/dist/cjs/validate/SymbolValidatorVisitor.js

@@ -106,6 +106,8 @@ class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.addSymbolVariable(ctxID.getSymbol(), ctxID.getText(), null);
             }
         };
+        this.visitTrailer = (ctx) => {
+        };
     }
     addSymbolVariable(token, name, value, executor = null) {
         const useExecutor = executor === null ? this.getExecutor() : executor;

package/dist/esm/BaseVisitor.js

@@ -408,65 +408,6 @@ export class BaseVisitor extends CircuitScriptParserVisitor {
         }
         return reference;
     }
-    visitTrailer_expr2 = (ctx) => {
-        const reference = this.getResult(ctx);
-        const ctxID = ctx.ID();
-        const ctxDataExpr = ctx.data_expr();
-        const useValue = reference.value;
-        let nextReference;
-        if (ctxID) {
-            reference.trailers.push(ctxID.getText());
-            const useRootValue = reference.rootValue ?? reference.value;
-            const useTrailerIndex = reference.trailerIndex ?? 0;
-            nextReference = this.getExecutor().resolveTrailers(reference.type, useRootValue, reference.trailers);
-            nextReference.name =
-                [reference.name,
-                    ...reference.trailers.slice(useTrailerIndex)].join('.');
-        }
-        else if (ctxDataExpr) {
-            const arrayIndex = this.visitResult(ctxDataExpr);
-            if (arrayIndex instanceof NumericValue) {
-                const arrayIndexValue = arrayIndex.toNumber();
-                const foundValue = useValue[arrayIndexValue];
-                const refType = foundValue instanceof ClassComponent
-                    ? ReferenceTypes.instance : ReferenceTypes.variable;
-                nextReference = new AnyReference({
-                    found: true,
-                    type: refType,
-                    value: foundValue,
-                    trailers: [[TrailerArrayIndex, arrayIndexValue]],
-                    rootValue: useValue
-                });
-            }
-        }
-        this.setResult(ctx, nextReference);
-    };
-    visitAtom_expr = (ctx) => {
-        const executor = this.getExecutor();
-        const firstId = ctx.ID(0);
-        const atomId = firstId.getText();
-        let currentReference;
-        if (PinTypesList.indexOf(atomId) !== -1) {
-            currentReference = new AnyReference({
-                found: true,
-                value: atomId,
-                type: ReferenceTypes.pinType,
-            });
-        }
-        else {
-            this.log('resolve variable ctx: ' + ctx.getText(), 'atomId', atomId);
-            currentReference = executor.resolveVariable(this.executionStack, atomId);
-            this.log('reference:', currentReference.name, 'found:', currentReference.found);
-        }
-        if (currentReference !== undefined && currentReference.found) {
-            ctx.trailer_expr2().forEach(ctxTrailer => {
-                this.setResult(ctxTrailer, currentReference);
-                currentReference = this.visitResult(ctxTrailer);
-            });
-        }
-        this.setResult(ctx, currentReference);
-        this.log2('atom resolved: ' + ctx.getText() + ' -> ' + currentReference);
-    };
     handleFunctionCall(currentReference, passedNetNamespace, ctx) {
         const executor = this.getExecutor();
         let parameters = [];

package/dist/esm/semantic-tokens/SemanticTokenVisitor.js

@@ -127,6 +127,8 @@ export class SemanticTokensVisitor extends BaseVisitor {
             });
         }
     };
+    visitTrailer = (ctx) => {
+    };
     addSemanticToken(node, modifiers, tokenType = null) {
         const parsedToken = this.parseToken(node, modifiers, tokenType);
         this.semanticTokens.set(`${parsedToken.line}_${parsedToken.column}_${parsedToken.length}`, parsedToken);

package/dist/esm/validate/SymbolValidatorVisitor.js

@@ -191,6 +191,8 @@ export class SymbolValidatorVisitor extends BaseVisitor {
             this.addSymbolVariable(ctxID.getSymbol(), ctxID.getText(), null);
         }
     };
+    visitTrailer = (ctx) => {
+    };
     getSymbols() {
         return this.symbolTable;
     }

package/dist/types/BaseVisitor.d.ts

@@ -57,8 +57,6 @@ export declare class BaseVisitor extends CircuitScriptParserVisitor<ComplexType
     visitAssignment_expr: (ctx: Assignment_exprContext) => void;
     protected assignValueToReference(sequenceParts: (string | any)[], leftSideReference: AnyReference, lhsCtx: ParserRuleContext, rhsValue: any): void;
     private getReference;
-    visitTrailer_expr2: (ctx: Trailer_expr2Context) => void;
-    visitAtom_expr: (ctx: Atom_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;

package/dist/types/semantic-tokens/SemanticTokenVisitor.d.ts

@@ -1,6 +1,6 @@
 import { TerminalNode, Token } from "antlr4ng";
 import { CircuitScriptLexer } from "../antlr/CircuitScriptLexer.js";
-import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Callable_exprContext, Property_key_exprContext, Assignment_exprContext, Function_args_exprContext, GraphicCommandExprContext, For_exprContext, Annotation_comment_exprContext, ScriptContext, CreateExprContext, Import_simpleContext, Import_specific_or_allContext } from "../antlr/CircuitScriptParser.js";
+import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Callable_exprContext, Property_key_exprContext, Assignment_exprContext, Function_args_exprContext, GraphicCommandExprContext, For_exprContext, Annotation_comment_exprContext, ScriptContext, CreateExprContext, Import_simpleContext, Import_specific_or_allContext, TrailerContext } from "../antlr/CircuitScriptParser.js";
 import { BaseVisitor, OnErrorHandler } from "../BaseVisitor.js";
 import { NodeScriptEnvironment } from "../environment/environment.js";
 export declare class SemanticTokensVisitor extends BaseVisitor {
@@ -23,6 +23,7 @@ export declare class SemanticTokensVisitor extends BaseVisitor {
     visitImport_specific_or_all: (ctx: Import_specific_or_allContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
     visitAnnotation_comment_expr: (ctx: Annotation_comment_exprContext) => void;
+    visitTrailer: (ctx: TrailerContext) => void;
     addSemanticToken(node: TerminalNode, modifiers: string[], tokenType?: string | null): void;
     parseToken(node: TerminalNode, modifiers: string[], tokenType?: string | null): IParsedToken;
     dumpTokens(): void;

package/dist/types/validate/SymbolValidatorVisitor.d.ts

@@ -1,5 +1,5 @@
 import { TerminalNode, Token } from "antlr4ng";
-import { Assignment_exprContext, CallableExprContext, UnaryOperatorExprContext, MultiplyExprContext, AdditionExprContext, BinaryOperatorExprContext, Function_def_exprContext, For_exprContext, Import_simpleContext, Import_specific_or_allContext, Create_graphic_exprContext } from "../antlr/CircuitScriptParser.js";
+import { Assignment_exprContext, CallableExprContext, UnaryOperatorExprContext, MultiplyExprContext, AdditionExprContext, BinaryOperatorExprContext, Function_def_exprContext, For_exprContext, Import_simpleContext, Import_specific_or_allContext, Create_graphic_exprContext, TrailerContext } from "../antlr/CircuitScriptParser.js";
 import { ExecutionContext } from "../execute.js";
 import { ComplexType, FunctionDefinedParameter } from "../objects/types.js";
 import { SymbolTableItem } from "./SymbolTable.js";
@@ -28,6 +28,7 @@ export declare class SymbolValidatorVisitor extends BaseVisitor {
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
     visitCreate_graphic_expr: (ctx: Create_graphic_exprContext) => void;
+    visitTrailer: (ctx: TrailerContext) => void;
     getSymbols(): SymbolTable;
     dumpSymbols(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.5.2",
+    "version": "0.5.3",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {