circuitscript 0.1.11 → 0.1.13

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

@@ -1,7 +1,7 @@
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
-import { CFunction, ComponentPinNet, ComponentPinNetPair, ParseSymbolType, ValueType } from './types.js';
-import { LayoutDirection } from '../globals.js';
+import { CFunction, 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';
 import { ParserRuleContext } from 'antlr4ng';
@@ -17,7 +17,7 @@ export declare class ExecutionScope {
     symbols: Map<string, {
         type: ParseSymbolType;
     }>;
-    blockStack: Map<number, any>;
+    blockStack: Map<number, BlockStackEntry>;
     contextStack: ParserRuleContext[];
     onPropertyHandler: OnPropertyHandler[];
     breakStack: ParserRuleContext[];
@@ -46,6 +46,7 @@ export declare class ExecutionScope {
     getNets(): ComponentPinNetPair[];
     dumpNets(): ComponentPinNet[];
     printNets(): void;
+    setVariable(name: string, value: any): void;
     setActive(type: ActiveObject, item: any): void;
     clearActive(): void;
     setCurrent(component: ClassComponent | null, pin?: number | null): void;
@@ -82,4 +83,15 @@ export type SequenceActionAtTo = [
 export type SequenceActionWire = [SequenceAction.Wire, wireId: number, WireSegment[]];
 export type SequenceActionAssign = [SequenceAction.Assign, variable: string, ClassComponent];
 export type SequenceItem = SequenceActionAtTo | SequenceActionWire | [SequenceAction.WireJump, wireId: number, pinId: number] | [SequenceAction.Frame, Frame, "enter" | "exit"] | SequenceActionAssign;
+export type InnerBlockStackEntry = {
+    last_net: ComponentPinWireId | null;
+    ignore_last_net: boolean;
+};
+export type BlockStackEntry = {
+    start_point: ComponentPinWireId;
+    end_point: ComponentPinWireId | null;
+    inner_blocks: Map<number, InnerBlockStackEntry>;
+    current_index: number;
+    type: BlockTypes;
+};
 export {};

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

@@ -4,6 +4,7 @@ export declare class Net {
     namespace: string;
     priority: number;
     type: any;
+    params: Map<string, any>;
     constructor(namespace: string, name: string, priority?: number, type?: any);
     toString(): string;
     static isSame(netA: Net, netB: Net): boolean;

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

@@ -3,6 +3,7 @@ import { ExecutionContext } from '../execute.js';
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
 import { NumericValue, PercentageValue } from './ParamDefinition.js';
+import { ReferenceTypes } from '../globals.js';
 export type CFunction = (args: CallableParameter[], options?: CFunctionOptions) => CFunctionResult;
 export type CFunctionOptions = {
     netNamespace?: string;
@@ -21,6 +22,11 @@ export type ComponentPinNetPair = [
     pin: number,
     net: Net
 ];
+export type ComponentPinWireId = [
+    component: ClassComponent,
+    pin: number,
+    wireId: number
+];
 export type ComponentPin = [
     component: ClassComponent,
     pinId: number | string
@@ -41,32 +47,33 @@ export type FunctionDefinedParameter = [
     token: Token,
     defaultValue: ValueType
 ] | [name: string, token: Token];
+export declare class AnyReference {
+    found: boolean;
+    name?: string;
+    trailers: string[];
+    type?: ReferenceTypes;
+    value?: any;
+    parentValue?: any;
+    constructor(refType: {
+        found: boolean;
+        name?: string;
+        trailers?: string[];
+        type?: ReferenceTypes;
+        value?: any;
+        parentValue?: any;
+    });
+}
 export declare class UndeclaredReference {
-    reference: ReferenceType;
-    constructor(reference: ReferenceType);
+    reference: AnyReference;
+    constructor(reference: AnyReference);
     throwMessage(): string;
     toString(): string;
     nameString(): string;
 }
-export declare class DeclaredReference {
-    found: boolean;
-    name?: string;
-    trailers?: string[];
-    type?: 'value' | 'instance' | 'variable';
-    value?: any;
-    parentValue?: any;
-    constructor(refType: ReferenceType);
+export declare class DeclaredReference extends AnyReference {
     toString(): string;
     toDisplayString(): string;
 }
-export type ReferenceType = {
-    found: boolean;
-    name?: string;
-    trailers?: string[];
-    type?: 'value' | 'instance' | 'variable';
-    value?: any;
-    parentValue?: any;
-};
 export declare enum ParseSymbolType {
     Variable = "variable",
     Function = "function",

package/dist/types/parser.d.ts

@@ -8,6 +8,7 @@ export declare function parseFileWithVisitor(visitor: BaseVisitor, data: string)
     hasParseError: boolean;
     parserTimeTaken: number;
     lexerTimeTaken: number;
+    throwError: any;
 }>;
 export declare class CircuitscriptParserErrorListener implements ANTLRErrorListener {
     syntaxErrorCounter: number;

package/dist/types/utils.d.ts

@@ -4,7 +4,7 @@ import { ClassComponent } from "./objects/ClassComponent.js";
 import { NumericValue } from "./objects/ParamDefinition.js";
 import { SequenceAction, SequenceItem } from './objects/ExecutionScope.js';
 import { BlockTypes } from './globals.js';
-import { ExecutionWarning } from './utils.js';
+import { DeclaredReference, AnyReference } from './objects/types.js';
 export declare class SimpleStopwatch {
     startTime: Date;
     constructor();
@@ -73,3 +73,5 @@ export type ExecutionWarning = {
     ctx?: ParserRuleContext;
 };
 export declare function printWarnings(warnings: ExecutionWarning[]): void;
+export declare function unwrapValue(value: AnyReference | DeclaredReference | any): any;
+export declare function isReference(value: any): boolean;

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, Path_blocksContext, 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 } 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 } from './antlr/CircuitScriptParser.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { PinTypes } from './objects/PinTypes.js';
 import { ComponentPin, ComponentPinNet, ComponentPinNetPair } from './objects/types.js';
@@ -13,7 +13,8 @@ export declare class ParserVisitor extends BaseVisitor {
     visitAt_component_expr: (ctx: At_component_exprContext) => ComponentPin;
     visitTo_component_expr: (ctx: To_component_exprContext) => ComponentPin;
     visitComponent_select_expr: (ctx: Component_select_exprContext) => void;
-    visitPath_blocks: (ctx: Path_blocksContext) => ComponentPin;
+    visitPath_block: (ctx: Path_blockContext) => void;
+    visitGraph_expressions: (ctx: Graph_expressionsContext) => void;
     visitCreate_component_expr: (ctx: Create_component_exprContext) => void;
     visitCreate_graphic_expr: (ctx: Create_graphic_exprContext) => void;
     visitGraphic_expressions_block: (ctx: Graphic_expressions_blockContext) => void;

package/package.json

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