circuitscript 0.1.19 → 0.1.22

package/dist/types/execute.d.ts

@@ -30,6 +30,10 @@ export declare class ExecutionContext {
     parentContext: ExecutionContext;
     componentAngleFollowsWire: boolean;
     warnings: ExecutionWarning[];
+    indexedStack: Map<ParserRuleContext, {
+        index: number;
+        funcCallIndex: Map<ParserRuleContext, number>;
+    }>;
     constructor(name: string, namespace: string, netNamespace: string, executionLevel: number | undefined, scopeLevel: number | undefined, silent: boolean | undefined, logger: Logger, warnings: ExecutionWarning[], parent: ExecutionContext);
     logWarning(message: string, context?: ParserRuleContext, fileName?: string): void;
     log(...params: any[]): void;
@@ -68,7 +72,10 @@ export declare class ExecutionContext {
     atPointBlock(): void;
     toPointBlock(): void;
     getPointBlockLocation(): [component: ClassComponent, pin: number, wireId: number];
+    getParentBreakContext(): null | ParserRuleContext;
     addBreakContext(ctx: ParserRuleContext): void;
+    setBreakContextIndex(index: number): void;
+    resetBreakContextFunctionCalls(): void;
     popBreakContext(): ParserRuleContext;
     getBreakContext(): ParserRuleContext;
     createFunction(functionName: string, __runFunc: CFunction, source?: ParserRuleContext, uniqueId?: string): void;
@@ -77,7 +84,7 @@ export declare class ExecutionContext {
     resolveVariable(executionStack: ExecutionContext[], idName: string, trailers?: string[]): AnyReference;
     resolveTrailers(type: ReferenceTypes, item: any, trailers?: string[]): AnyReference;
     callFunction(functionName: string, functionParams: CallableParameter[], executionStack: ExecutionContext[], netNamespace: string): CFunctionResult;
-    mergeScope(childScope: ExecutionScope, namespace: string): void;
+    mergeScope(childScope: ExecutionScope, namespace: string): ClassComponent[];
     addWire(segments: [string, (number | UnitDimension)?][]): void;
     addPoint(pointId: string, userDefined?: boolean): ComponentPin;
     private getPointSymbol;

package/dist/types/helpers.d.ts

@@ -18,6 +18,9 @@ export type ScriptOptions = {
     dumpData: boolean;
     showStats: boolean;
     environment: NodeScriptEnvironment;
+    inputPath?: string;
+    updateSource: boolean;
+    saveAnnotatedCopy: string | boolean;
 };
 export declare function prepareFile(textData: string): {
     parser: CircuitScriptParser;
@@ -42,11 +45,11 @@ export declare function renderScriptCustom(scriptData: string, outputPath: strin
 export declare abstract class ParseOutputHandler {
     beforeRender: boolean;
     afterRender: boolean;
-    abstract parse(visitor: ParserVisitor, outputPath: string | null, fileExtension: string | null): boolean;
+    abstract parse(visitor: ParserVisitor, outputPath: string | null, fileExtension: string | null, extra: any | null): boolean;
 }
 export declare class KiCadNetListOutputHandler extends ParseOutputHandler {
-    beforeRender: boolean;
-    parse(visitor: ParserVisitor, outputPath: string | null, fileExtension: string | null): boolean;
+    afterRender: boolean;
+    parse(visitor: ParserVisitor, outputPath: string | null, fileExtension: string | null, extra?: any): boolean;
 }
 export declare function detectJSModuleType(): JSModuleType;
 export declare class UnitDimension {

package/dist/types/layout.d.ts

@@ -107,6 +107,7 @@ export declare class RenderText extends RenderObject {
     constructor(text: string);
 }
 export declare class RenderFrame extends RenderObject {
+    static FrameIdCounter: number;
     bounds: BoundBox | null;
     frame: Frame;
     innerItems: (RenderComponent | RenderFrame | RenderText)[];
@@ -121,6 +122,7 @@ export declare class RenderFrame extends RenderObject {
     subgraphId: string;
     renderType: RenderFrameType;
     containsTitle: boolean;
+    frameId: number;
     constructor(frame: Frame, type?: RenderFrameType);
     toString(): string;
 }

package/dist/types/lexer.d.ts

@@ -10,7 +10,7 @@ export declare class MainLexer extends CircuitScriptLexer {
     nextToken(): Token;
     createDedent(): Token;
     getCharIndex(): number;
-    commonToken(type: number, text: string): Token;
+    commonToken(type: number, text: string, start?: number, stop?: number): Token;
     getIndentationCount(whitespace: string): number;
     atStartOfInput(): boolean;
     openBrace(): void;

package/dist/types/objects/ClassComponent.d.ts

@@ -1,3 +1,4 @@
+import { ParserRuleContext } from 'antlr4ng';
 import { Expressions_blockContext } from 'src/antlr/CircuitScriptParser.js';
 import { SymbolDrawingCommands } from '../draw_symbols.js';
 import { Net } from './Net.js';
@@ -31,6 +32,9 @@ export declare class ClassComponent {
     useWireOrientationAngle: boolean;
     didSetWireOrientationAngle: boolean;
     assignedRefDes: string | null;
+    placeHolderRefDes: string | null;
+    ctxReferences: CtxReference[];
+    _creationIndex: number;
     constructor(instanceName: string, numPins: number);
     setupPins(): void;
     getDefaultPin(): PinId;
@@ -55,3 +59,8 @@ export declare class ModuleComponent extends ClassComponent {
     moduleExecutionContextName?: string;
     modulePinIdToPortMap?: Map<number, ClassComponent>;
 }
+export type CtxReference = {
+    ctx: ParserRuleContext;
+    indexedStack: [ParserRuleContext, number][];
+    creationFlag: boolean;
+};

package/dist/types/objects/ExecutionScope.d.ts

@@ -1,6 +1,6 @@
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
-import { CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ParseSymbolType, ValueType } from './types.js';
+import { CFunction, CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ParseSymbolType, ValueType } from './types.js';
 import { BlockTypes, LayoutDirection } from '../globals.js';
 import { Wire, WireSegment } from './Wire.js';
 import { Frame } from './Frame.js';
@@ -14,6 +14,7 @@ export declare class ExecutionScope {
     private nets;
     instances: Map<string, ClassComponent>;
     functions: Map<string, CFunctionEntry>;
+    functionCounter: Map<CFunction, number>;
     variables: Map<string, ValueType | ClassComponent>;
     symbols: Map<string, {
         type: ParseSymbolType;

package/dist/types/objects/types.d.ts

@@ -16,6 +16,7 @@ export declare class CFunctionEntry {
 }
 export type CFunctionOptions = {
     netNamespace?: string;
+    functionCallIndex: number;
 };
 export type CFunctionResult = [
     executionContext: ExecutionContext,

package/dist/types/parser.d.ts

@@ -1,9 +1,10 @@
 import { CircuitScriptParser, ScriptContext } from './antlr/CircuitScriptParser.js';
-import { ANTLRErrorListener, ATNConfigSet, ATNSimulator, BitSet, DFA, Parser, RecognitionException, Recognizer, Token } from 'antlr4ng';
+import { ANTLRErrorListener, ATNConfigSet, ATNSimulator, BitSet, CommonTokenStream, DFA, Parser, RecognitionException, Recognizer, Token } from 'antlr4ng';
 import { BaseVisitor, OnErrorHandler } from './BaseVisitor.js';
 export declare function parseFileWithVisitor(visitor: BaseVisitor, data: string): Promise<{
     tree: ScriptContext;
     parser: CircuitScriptParser;
+    tokens: CommonTokenStream;
     hasError: boolean;
     hasParseError: boolean;
     parserTimeTaken: number;

package/dist/types/visitor.d.ts

@@ -1,4 +1,4 @@
-import { Add_component_exprContext, AdditionExprContext, At_blockContext, At_block_pin_exprContext, At_block_pin_expression_complexContext, At_block_pin_expression_simpleContext, At_component_exprContext, BinaryOperatorExprContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, DataExprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, Keyword_assignment_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_expr2Context, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Property_set_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, Wire_expr_direction_onlyContext, Wire_expr_direction_valueContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext, Nested_properties_innerContext, Expressions_blockContext, Create_module_exprContext, Property_block_exprContext, While_exprContext, For_exprContext, GraphicCommandExprContext, Graphic_expressions_blockContext, GraphicForExprContext, Graph_expressionsContext, Path_blockContext } from './antlr/CircuitScriptParser.js';
+import { Add_component_exprContext, AdditionExprContext, At_blockContext, At_block_pin_exprContext, At_block_pin_expression_complexContext, At_block_pin_expression_simpleContext, At_component_exprContext, BinaryOperatorExprContext, Component_select_exprContext, Create_component_exprContext, Create_graphic_exprContext, DataExprContext, Data_expr_with_assignmentContext, Double_dot_property_set_exprContext, Frame_exprContext, Function_def_exprContext, Keyword_assignment_exprContext, MultiplyExprContext, Nested_propertiesContext, Net_namespace_exprContext, Pin_select_expr2Context, Pin_select_exprContext, Point_exprContext, Property_exprContext, Property_key_exprContext, Property_set_exprContext, Single_line_propertyContext, To_component_exprContext, Wire_exprContext, UnaryOperatorExprContext, Wire_expr_direction_onlyContext, Wire_expr_direction_valueContext, If_exprContext, If_inner_exprContext, LogicalOperatorExprContext, Nested_properties_innerContext, Expressions_blockContext, Create_module_exprContext, Property_block_exprContext, While_exprContext, For_exprContext, GraphicCommandExprContext, Graphic_expressions_blockContext, GraphicForExprContext, Graph_expressionsContext, Path_blockContext, Annotation_comment_exprContext, At_block_headerContext } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ComponentPin, ComponentPinNet, ComponentPinNetPair } from './objects/types.js';
@@ -7,8 +7,10 @@ import { Net } from './objects/Net.js';
 import { BaseVisitor } from './BaseVisitor.js';
 import { ParserRuleContext } from 'antlr4ng';
 export declare class ParserVisitor extends BaseVisitor {
+    componentCreationIndex: number;
     visitKeyword_assignment_expr: (ctx: Keyword_assignment_exprContext) => void;
     visitPin_select_expr: (ctx: Pin_select_exprContext) => void;
+    trackNewComponentCreated: (callback: () => void) => boolean;
     visitAdd_component_expr: (ctx: Add_component_exprContext) => void;
     visitAt_component_expr: (ctx: At_component_exprContext) => ComponentPin;
     visitTo_component_expr: (ctx: To_component_exprContext) => ComponentPin;
@@ -40,6 +42,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
     visitPin_select_expr2: (ctx: Pin_select_expr2Context) => void;
     visitAt_block_pin_expr: (ctx: At_block_pin_exprContext) => void;
+    visitAt_block_header: (ctx: At_block_headerContext) => void;
     visitAt_block: (ctx: At_blockContext) => void;
     visitAt_block_pin_expression_simple: (ctx: At_block_pin_expression_simpleContext) => void;
     visitAt_block_pin_expression_complex: (ctx: At_block_pin_expression_complexContext) => void;
@@ -56,6 +59,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitIf_inner_expr: (ctx: If_inner_exprContext) => void;
     visitWhile_expr: (ctx: While_exprContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
+    visitAnnotation_comment_expr: (ctx: Annotation_comment_exprContext) => void;
     private resolveDataExpr;
     private resolveDataValue;
     pinTypes: PinTypes[];
@@ -88,6 +92,9 @@ export declare class ParserVisitor extends BaseVisitor {
     private getPropertyExprList;
     getWarnings(): ExecutionWarning[];
 }
+export declare const ComponentRefDesPrefixes: {
+    [key: string]: string;
+};
 export type NetListItem = {
     instanceName: string;
     instance: ClassComponent;

package/package.json

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