circuitscript 0.1.10 → 0.1.12

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/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 prepareValue(value: AnyReference | DeclaredReference | any): any;
+export declare function isReference(value: any): boolean;

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

@@ -1,5 +1,5 @@
 import { TerminalNode, Token } from "antlr4ng";
-import { Import_exprContext, Assignment_exprContext, Atom_exprContext, Function_call_exprContext, ValueAtomExprContext, UnaryOperatorExprContext, MultiplyExprContext, AdditionExprContext, BinaryOperatorExprContext, DataExprContext, Function_def_exprContext } from "src/antlr/CircuitScriptParser";
+import { Import_exprContext, Assignment_exprContext, Atom_exprContext, Function_call_exprContext, ValueAtomExprContext, UnaryOperatorExprContext, MultiplyExprContext, AdditionExprContext, BinaryOperatorExprContext, DataExprContext, Function_def_exprContext, For_exprContext } from "src/antlr/CircuitScriptParser";
 import { ExecutionContext } from "../execute.js";
 import { ComplexType, FunctionDefinedParameter } from "../objects/types.js";
 import { SymbolTableItem } from "./SymbolTable.js";
@@ -27,6 +27,7 @@ export declare class SymbolValidatorVisitor extends BaseVisitor {
     visitBinaryOperatorExpr: (ctx: BinaryOperatorExprContext) => void;
     visitDataExpr: (ctx: DataExprContext) => void;
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
+    visitFor_expr: (ctx: For_exprContext) => void;
     getSymbols(): SymbolTable;
     dumpSymbols(): void;
 }

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.10",
+    "version": "0.1.12",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -69,7 +69,8 @@
         "profile": "node --prof build/src/main.js examples/example_garden_pump.cst",
         "profile-flame": "node --prof-process --preprocess -j isolate*.log | flamebearer",
         "server": "node server.js",
-        "pack-local": "npm run build; npm pack; rm circuitscript-install.tgz; mv `ls | grep circuitscript-` circuitscript-install.tgz; cp circuitscript-install.tgz ../circuitscript-vscode/client; cp circuitscript-install.tgz ../circuitscript-vscode/server && echo 'OK'",
+        "_old_pack-local": "npm run build; npm pack; rm circuitscript-install.tgz; mv `ls | grep circuitscript-` circuitscript-install.tgz; cp circuitscript-install.tgz ../circuitscript-vscode/client; cp circuitscript-install.tgz ../circuitscript-vscode/server && echo 'OK'",
+        "pack-language-server": "npm run build:release; npm pack; rm circuitscript-install.tgz; mv `ls | grep circuitscript-` circuitscript-install.tgz; cp circuitscript-install.tgz ../circuitscript-ide/language-server",
         "changelog": "auto-changelog --handlebars-setup ../changelog/helper.js -p",
         "preversion": "npm run test",
         "version": "npm run changelog && git add CHANGELOG.md",