circuitscript 0.1.10 → 0.1.11

package/dist/cjs/SemanticTokenVisitor.js

@@ -100,6 +100,11 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visitImport_expr = (ctx) => {
             this.addSemanticToken(ctx.ID(), [], 'namespace');
         };
+        this.visitFor_expr = (ctx) => {
+            ctx.ID().forEach(item => {
+                this.addSemanticToken(item, [], 'variable');
+            });
+        };
         this.lexer = lexer;
         this.script = script;
     }
@@ -187,7 +192,7 @@ const languageKeywords = [
     'break', 'branch', 'create', 'component',
     'graphic', 'wire', 'pin', 'add', 'at', 'to',
     'point', 'join', 'parallel', 'return', 'def', 'import',
-    'true', 'false', 'nc', 'sheet', 'frame', 'if', 'for',
+    'true', 'false', 'nc', 'sheet', 'frame', 'if', 'else', 'for', 'in',
 ];
 const operatorKeywords = [
     'at', 'to', 'wire', 'add', 'frame', 'join', 'parallel', 'point'

package/dist/cjs/antlr/CircuitScriptParser.js

@@ -577,21 +577,13 @@ class CircuitScriptParser extends antlr.Parser {
     pin_select_expr() {
         let localContext = new Pin_select_exprContext(this.context, this.state);
         this.enterRule(localContext, 14, CircuitScriptParser.RULE_pin_select_expr);
-        let _la;
         try {
             this.enterOuterAlt(localContext, 1);
             {
                 this.state = 202;
                 this.match(CircuitScriptParser.Pin);
                 this.state = 203;
-                _la = this.tokenStream.LA(1);
-                if (!(_la === 57 || _la === 60)) {
-                    this.errorHandler.recoverInline(this);
-                }
-                else {
-                    this.errorHandler.reportMatch(this);
-                    this.consume();
-                }
+                this.data_expr(0);
             }
         }
         catch (re) {
@@ -3805,7 +3797,7 @@ CircuitScriptParser._serializedATN = [
     191, 1, 0, 0, 0, 193, 194, 1, 0, 0, 0, 194, 192, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195,
     196, 1, 0, 0, 0, 196, 197, 5, 67, 0, 0, 197, 11, 1, 0, 0, 0, 198, 199, 7, 1, 0, 0, 199,
     200, 5, 1, 0, 0, 200, 201, 3, 68, 34, 0, 201, 13, 1, 0, 0, 0, 202, 203, 5, 15, 0, 0, 203,
-    204, 7, 2, 0, 0, 204, 15, 1, 0, 0, 0, 205, 206, 5, 56, 0, 0, 206, 209, 5, 1, 0, 0, 207,
+    204, 3, 62, 31, 0, 204, 15, 1, 0, 0, 0, 205, 206, 5, 56, 0, 0, 206, 209, 5, 1, 0, 0, 207,
     210, 3, 68, 34, 0, 208, 210, 5, 56, 0, 0, 209, 207, 1, 0, 0, 0, 209, 208, 1, 0, 0, 0, 210,
     17, 1, 0, 0, 0, 211, 214, 3, 62, 31, 0, 212, 214, 3, 50, 25, 0, 213, 211, 1, 0, 0, 0, 213,
     212, 1, 0, 0, 0, 214, 218, 1, 0, 0, 0, 215, 217, 3, 16, 8, 0, 216, 215, 1, 0, 0, 0, 217,
@@ -4241,11 +4233,8 @@ class Pin_select_exprContext extends antlr.ParserRuleContext {
     Pin() {
         return this.getToken(CircuitScriptParser.Pin, 0);
     }
-    INTEGER_VALUE() {
-        return this.getToken(CircuitScriptParser.INTEGER_VALUE, 0);
-    }
-    STRING_VALUE() {
-        return this.getToken(CircuitScriptParser.STRING_VALUE, 0);
+    data_expr() {
+        return this.getRuleContext(0, Data_exprContext);
     }
     get ruleIndex() {
         return CircuitScriptParser.RULE_pin_select_expr;

package/dist/cjs/draw_symbols.js

@@ -427,7 +427,8 @@ class SymbolPlaceholder extends SymbolGraphic {
                     drawing.addArc(...positionParams);
                     break;
                 case PlaceHolderCommands.circle:
-                    drawing.addArc(...positionParams, (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(360));
+                    drawing.addArc(...positionParams, (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(180));
+                    drawing.addArc(...positionParams, (0, ParamDefinition_js_1.numeric)(180), (0, ParamDefinition_js_1.numeric)(360));
                     break;
                 case PlaceHolderCommands.triangle:
                     drawing.addTriangle(...positionParams);

package/dist/cjs/geometry.js

@@ -266,17 +266,12 @@ class Geometry {
                 const x = item.center.x;
                 const y = item.center.y;
                 const radius = item.r;
-                let useEndAngle = item.endAngle;
                 let extraEnd = '';
-                if (item.startAngle === 0 && item.endAngle === Geometry.FullCircleRadians) {
-                    useEndAngle = 359.9999 * Math.PI / 180;
-                    isClosedPolygon = true;
-                    extraEnd = ' Z';
-                }
-                const startPoint = getArcPointRadians(x, y, radius, item.startAngle);
+                const { startAngle: useStartAngle, endAngle: useEndAngle } = item;
+                const startPoint = getArcPointRadians(x, y, radius, useStartAngle);
                 const endPoint = getArcPointRadians(x, y, radius, useEndAngle);
                 let largeArcSweepFlag = 0;
-                if (useEndAngle - item.startAngle > Math.PI) {
+                if (useEndAngle - useStartAngle > Math.PI) {
                     largeArcSweepFlag = 1;
                 }
                 let sweepFlag = 1;
@@ -428,7 +423,6 @@ class Geometry {
     }
 }
 exports.Geometry = Geometry;
-Geometry.FullCircleRadians = 2 * Math.PI;
 function replaceSegments(segments, index, replacedSegments) {
     if (replacedSegments.length > 0) {
         segments.splice(index, 1);

package/dist/cjs/validate/SymbolValidatorVisitor.js

@@ -103,6 +103,11 @@ class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.runExpressions(newExecutor, ctx.function_expr());
             this.executionStack.pop();
         };
+        this.visitFor_expr = (ctx) => {
+            ctx.ID().forEach(item => {
+                this.addSymbolVariable(item.getSymbol(), item.getText(), null);
+            });
+        };
     }
     enterFile(filePath) {
         this.filePathStack.push(filePath);

package/dist/cjs/visitor.js

@@ -22,13 +22,16 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitPin_select_expr = (ctx) => {
             let value = null;
-            const ctxIntegerValue = ctx.INTEGER_VALUE();
-            const ctxStringValue = ctx.STRING_VALUE();
-            if (ctxIntegerValue) {
-                value = Number(ctxIntegerValue.getText());
+            const ctxData = ctx.data_expr();
+            const result = this.visitResult(ctxData);
+            if (result instanceof ParamDefinition_js_1.NumericValue) {
+                value = result.toNumber();
             }
-            else if (ctxStringValue) {
-                value = this.prepareStringValue(ctxStringValue.getText());
+            else if (typeof result === 'string') {
+                value = result;
+            }
+            else {
+                throw new utils_js_1.RuntimeExecutionError("Invalid value for pin", ctx);
             }
             this.setResult(ctx, value);
         };

package/dist/esm/SemanticTokenVisitor.js

@@ -102,6 +102,11 @@ export class SemanticTokensVisitor extends BaseVisitor {
     visitImport_expr = (ctx) => {
         this.addSemanticToken(ctx.ID(), [], 'namespace');
     };
+    visitFor_expr = (ctx) => {
+        ctx.ID().forEach(item => {
+            this.addSemanticToken(item, [], 'variable');
+        });
+    };
     addSemanticToken(node, modifiers, tokenType = null) {
         const parsedToken = this.parseToken(node, modifiers, tokenType);
         this.semanticTokens.set(parsedToken.line + "_" + parsedToken.column, parsedToken);
@@ -184,7 +189,7 @@ const languageKeywords = [
     'break', 'branch', 'create', 'component',
     'graphic', 'wire', 'pin', 'add', 'at', 'to',
     'point', 'join', 'parallel', 'return', 'def', 'import',
-    'true', 'false', 'nc', 'sheet', 'frame', 'if', 'for',
+    'true', 'false', 'nc', 'sheet', 'frame', 'if', 'else', 'for', 'in',
 ];
 const operatorKeywords = [
     'at', 'to', 'wire', 'add', 'frame', 'join', 'parallel', 'point'

package/dist/esm/antlr/CircuitScriptParser.js

@@ -724,21 +724,13 @@ export class CircuitScriptParser extends antlr.Parser {
     pin_select_expr() {
         let localContext = new Pin_select_exprContext(this.context, this.state);
         this.enterRule(localContext, 14, CircuitScriptParser.RULE_pin_select_expr);
-        let _la;
         try {
             this.enterOuterAlt(localContext, 1);
             {
                 this.state = 202;
                 this.match(CircuitScriptParser.Pin);
                 this.state = 203;
-                _la = this.tokenStream.LA(1);
-                if (!(_la === 57 || _la === 60)) {
-                    this.errorHandler.recoverInline(this);
-                }
-                else {
-                    this.errorHandler.reportMatch(this);
-                    this.consume();
-                }
+                this.data_expr(0);
             }
         }
         catch (re) {
@@ -3767,7 +3759,7 @@ export class CircuitScriptParser extends antlr.Parser {
         191, 1, 0, 0, 0, 193, 194, 1, 0, 0, 0, 194, 192, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195,
         196, 1, 0, 0, 0, 196, 197, 5, 67, 0, 0, 197, 11, 1, 0, 0, 0, 198, 199, 7, 1, 0, 0, 199,
         200, 5, 1, 0, 0, 200, 201, 3, 68, 34, 0, 201, 13, 1, 0, 0, 0, 202, 203, 5, 15, 0, 0, 203,
-        204, 7, 2, 0, 0, 204, 15, 1, 0, 0, 0, 205, 206, 5, 56, 0, 0, 206, 209, 5, 1, 0, 0, 207,
+        204, 3, 62, 31, 0, 204, 15, 1, 0, 0, 0, 205, 206, 5, 56, 0, 0, 206, 209, 5, 1, 0, 0, 207,
         210, 3, 68, 34, 0, 208, 210, 5, 56, 0, 0, 209, 207, 1, 0, 0, 0, 209, 208, 1, 0, 0, 0, 210,
         17, 1, 0, 0, 0, 211, 214, 3, 62, 31, 0, 212, 214, 3, 50, 25, 0, 213, 211, 1, 0, 0, 0, 213,
         212, 1, 0, 0, 0, 214, 218, 1, 0, 0, 0, 215, 217, 3, 16, 8, 0, 216, 215, 1, 0, 0, 0, 217,
@@ -4207,11 +4199,8 @@ export class Pin_select_exprContext extends antlr.ParserRuleContext {
     Pin() {
         return this.getToken(CircuitScriptParser.Pin, 0);
     }
-    INTEGER_VALUE() {
-        return this.getToken(CircuitScriptParser.INTEGER_VALUE, 0);
-    }
-    STRING_VALUE() {
-        return this.getToken(CircuitScriptParser.STRING_VALUE, 0);
+    data_expr() {
+        return this.getRuleContext(0, Data_exprContext);
     }
     get ruleIndex() {
         return CircuitScriptParser.RULE_pin_select_expr;

package/dist/esm/draw_symbols.js

@@ -424,7 +424,8 @@ export class SymbolPlaceholder extends SymbolGraphic {
                     drawing.addArc(...positionParams);
                     break;
                 case PlaceHolderCommands.circle:
-                    drawing.addArc(...positionParams, numeric(0), numeric(360));
+                    drawing.addArc(...positionParams, numeric(0), numeric(180));
+                    drawing.addArc(...positionParams, numeric(180), numeric(360));
                     break;
                 case PlaceHolderCommands.triangle:
                     drawing.addTriangle(...positionParams);

package/dist/esm/geometry.js

@@ -254,7 +254,6 @@ export class Geometry {
             height: maxY - minY,
         };
     }
-    static FullCircleRadians = 2 * Math.PI;
     static featuresToPath(items, flipX, flipY) {
         const paths = [];
         let isClosedPolygon = false;
@@ -267,17 +266,12 @@ export class Geometry {
                 const x = item.center.x;
                 const y = item.center.y;
                 const radius = item.r;
-                let useEndAngle = item.endAngle;
                 let extraEnd = '';
-                if (item.startAngle === 0 && item.endAngle === Geometry.FullCircleRadians) {
-                    useEndAngle = 359.9999 * Math.PI / 180;
-                    isClosedPolygon = true;
-                    extraEnd = ' Z';
-                }
-                const startPoint = getArcPointRadians(x, y, radius, item.startAngle);
+                const { startAngle: useStartAngle, endAngle: useEndAngle } = item;
+                const startPoint = getArcPointRadians(x, y, radius, useStartAngle);
                 const endPoint = getArcPointRadians(x, y, radius, useEndAngle);
                 let largeArcSweepFlag = 0;
-                if (useEndAngle - item.startAngle > Math.PI) {
+                if (useEndAngle - useStartAngle > Math.PI) {
                     largeArcSweepFlag = 1;
                 }
                 let sweepFlag = 1;

package/dist/esm/validate/SymbolValidatorVisitor.js

@@ -154,6 +154,11 @@ export class SymbolValidatorVisitor extends BaseVisitor {
         this.runExpressions(newExecutor, ctx.function_expr());
         this.executionStack.pop();
     };
+    visitFor_expr = (ctx) => {
+        ctx.ID().forEach(item => {
+            this.addSymbolVariable(item.getSymbol(), item.getText(), null);
+        });
+    };
     getSymbols() {
         return this.symbolTable;
     }

package/dist/esm/visitor.js

@@ -17,13 +17,16 @@ export class ParserVisitor extends BaseVisitor {
     };
     visitPin_select_expr = (ctx) => {
         let value = null;
-        const ctxIntegerValue = ctx.INTEGER_VALUE();
-        const ctxStringValue = ctx.STRING_VALUE();
-        if (ctxIntegerValue) {
-            value = Number(ctxIntegerValue.getText());
+        const ctxData = ctx.data_expr();
+        const result = this.visitResult(ctxData);
+        if (result instanceof NumericValue) {
+            value = result.toNumber();
         }
-        else if (ctxStringValue) {
-            value = this.prepareStringValue(ctxStringValue.getText());
+        else if (typeof result === 'string') {
+            value = result;
+        }
+        else {
+            throw new RuntimeExecutionError("Invalid value for pin", ctx);
         }
         this.setResult(ctx, value);
     };

package/dist/types/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, Atom_exprContext, Property_key_exprContext, ValueAtomExprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, Function_call_exprContext, GraphicCommandExprContext } from "./antlr/CircuitScriptParser.js";
+import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Atom_exprContext, Property_key_exprContext, ValueAtomExprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, Function_call_exprContext, GraphicCommandExprContext, For_exprContext } from "./antlr/CircuitScriptParser.js";
 import { BaseVisitor, OnErrorHandler } from "./BaseVisitor.js";
 import { NodeScriptEnvironment } from "./environment.js";
 export declare class SemanticTokensVisitor extends BaseVisitor {
@@ -20,6 +20,7 @@ export declare class SemanticTokensVisitor extends BaseVisitor {
     visitAssignment_expr: (ctx: Assignment_exprContext) => void;
     visitAtom_expr: (ctx: Atom_exprContext) => void;
     visitImport_expr: (ctx: Import_exprContext) => void;
+    visitFor_expr: (ctx: For_exprContext) => void;
     addSemanticToken(node: TerminalNode, modifiers: string[], tokenType?: string | null): void;
     parseToken(node: TerminalNode, modifiers: string[], tokenType?: string | null): IParsedToken;
     dumpTokens(): void;

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

@@ -307,8 +307,7 @@ export declare class Assignment_expr2Context extends antlr.ParserRuleContext {
 export declare class Pin_select_exprContext extends antlr.ParserRuleContext {
     constructor(parent: antlr.ParserRuleContext | null, invokingState: number);
     Pin(): antlr.TerminalNode;
-    INTEGER_VALUE(): antlr.TerminalNode | null;
-    STRING_VALUE(): antlr.TerminalNode | null;
+    data_expr(): Data_exprContext;
     get ruleIndex(): number;
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }

package/dist/types/geometry.d.ts

@@ -64,7 +64,6 @@ export declare class Geometry {
         width: number;
         height: number;
     };
-    static FullCircleRadians: number;
     static featuresToPath(items: Feature[], flipX: number, flipY: number): {
         path: string;
         isClosedPolygon: 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.1.10",
+    "version": "0.1.11",
     "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",