circuitscript 0.0.35 → 0.0.37

package/dist/cjs/BaseVisitor.js

@@ -12,6 +12,7 @@ const ParamDefinition_1 = require("./objects/ParamDefinition");
 const PinTypes_1 = require("./objects/PinTypes");
 const types_1 = require("./objects/types");
 const globals_1 = require("./globals");
+const builtinMethods_1 = require("./builtinMethods");
 class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     constructor(silent = false, onErrorHandler = null, currentDirectory, defaultLibsPath) {
         super();
@@ -381,69 +382,8 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     getExecutor() {
         return this.executionStack[this.executionStack.length - 1];
     }
-    toString(obj) {
-        if (typeof obj === 'string') {
-            return `"${obj}"`;
-        }
-        else if (typeof obj === 'number') {
-            return obj.toString();
-        }
-        else if (Array.isArray(obj)) {
-            const inner = obj.map(item => this.toString(item)).join(", ");
-            return "[" + inner + "]";
-        }
-        else {
-            if (obj.toString) {
-                return obj.toString();
-            }
-            else {
-                throw "Could not create string from object: " + obj;
-            }
-        }
-    }
     setupPrintFunction(context) {
-        context.createFunction('print', (params) => {
-            const items = params.map(([, , value]) => {
-                return this.toString(value);
-            });
-            if (this.printToConsole) {
-                console.log('::', ...items);
-            }
-            this.printStream.push(...items);
-            return [this, null];
-        });
-        context.createFunction('range', (params) => {
-            const items = params.map(([, , value]) => {
-                if (isNaN(value)) {
-                    throw 'Invalid value: ' + value;
-                }
-                return value;
-            });
-            let startValue = 0;
-            let endValue = 0;
-            if (items.length === 1) {
-                endValue = items[0];
-            }
-            else if (items.length === 2) {
-                startValue = items[0];
-                endValue = items[1];
-            }
-            const returnArray = [];
-            for (let i = startValue; i < endValue; i++) {
-                returnArray.push(i);
-            }
-            return [this, returnArray];
-        });
-        context.createFunction('enumerate', (params) => {
-            const [, , array] = params[0];
-            if (!Array.isArray(array)) {
-                throw "Invalid parameter for enumerate function!";
-            }
-            const output = array.map((item, index) => {
-                return [index, item];
-            });
-            return [this, output];
-        });
+        (0, builtinMethods_1.linkBuiltInMethods)(context, this);
     }
     createNetResolver(executionStack) {
         const resolveNet = (netName, netNamespace) => {

package/dist/cjs/antlr/CircuitScriptParser.js

@@ -3439,6 +3439,7 @@ class CircuitScriptParser extends antlr.Parser {
     for_expr() {
         let localContext = new For_exprContext(this.context, this.state);
         this.enterRule(localContext, 126, CircuitScriptParser.RULE_for_expr);
+        let _la;
         try {
             this.enterOuterAlt(localContext, 1);
             {
@@ -3446,13 +3447,29 @@ class CircuitScriptParser extends antlr.Parser {
                 this.match(CircuitScriptParser.For);
                 this.state = 661;
                 this.match(CircuitScriptParser.ID);
-                this.state = 662;
+                this.state = 666;
+                this.errorHandler.sync(this);
+                _la = this.tokenStream.LA(1);
+                while (_la === 2) {
+                    {
+                        {
+                            this.state = 662;
+                            this.match(CircuitScriptParser.T__1);
+                            this.state = 663;
+                            this.match(CircuitScriptParser.ID);
+                        }
+                    }
+                    this.state = 668;
+                    this.errorHandler.sync(this);
+                    _la = this.tokenStream.LA(1);
+                }
+                this.state = 669;
                 this.match(CircuitScriptParser.In);
-                this.state = 663;
+                this.state = 670;
                 this.data_expr(0);
-                this.state = 664;
+                this.state = 671;
                 this.match(CircuitScriptParser.T__0);
-                this.state = 665;
+                this.state = 672;
                 this.expressions_block();
             }
         }
@@ -3676,7 +3693,7 @@ CircuitScriptParser.ruleNames = [
     "for_expr",
 ];
 CircuitScriptParser._serializedATN = [
-    4, 1, 67, 668, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7,
+    4, 1, 67, 675, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7,
     6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13,
     2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20,
     7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26,
@@ -3732,81 +3749,82 @@ CircuitScriptParser._serializedATN = [
     57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 58, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 5, 59, 638,
     8, 59, 10, 59, 12, 59, 641, 9, 59, 1, 59, 3, 59, 644, 8, 59, 1, 60, 1, 60, 1, 60, 1, 60,
     1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63,
-    1, 63, 1, 63, 1, 63, 1, 63, 1, 63, 1, 63, 0, 1, 62, 64, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18,
-    20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62,
-    64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104,
-    106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 0, 14, 2, 0, 9, 9, 19, 21, 1,
-    0, 56, 57, 2, 0, 57, 57, 60, 60, 2, 0, 54, 54, 57, 57, 1, 0, 47, 51, 1, 0, 44, 46, 1, 0,
-    42, 43, 1, 0, 40, 41, 1, 0, 34, 39, 2, 0, 31, 31, 43, 43, 2, 0, 55, 55, 57, 61, 2, 0, 15,
-    15, 56, 56, 2, 0, 56, 57, 60, 60, 1, 0, 32, 33, 703, 0, 130, 1, 0, 0, 0, 2, 158, 1, 0, 0,
-    0, 4, 160, 1, 0, 0, 0, 6, 171, 1, 0, 0, 0, 8, 175, 1, 0, 0, 0, 10, 179, 1, 0, 0, 0, 12, 191,
-    1, 0, 0, 0, 14, 195, 1, 0, 0, 0, 16, 198, 1, 0, 0, 0, 18, 206, 1, 0, 0, 0, 20, 217, 1, 0,
-    0, 0, 22, 222, 1, 0, 0, 0, 24, 224, 1, 0, 0, 0, 26, 226, 1, 0, 0, 0, 28, 231, 1, 0, 0, 0,
-    30, 243, 1, 0, 0, 0, 32, 265, 1, 0, 0, 0, 34, 275, 1, 0, 0, 0, 36, 277, 1, 0, 0, 0, 38, 291,
-    1, 0, 0, 0, 40, 293, 1, 0, 0, 0, 42, 301, 1, 0, 0, 0, 44, 303, 1, 0, 0, 0, 46, 305, 1, 0,
-    0, 0, 48, 307, 1, 0, 0, 0, 50, 309, 1, 0, 0, 0, 52, 313, 1, 0, 0, 0, 54, 317, 1, 0, 0, 0,
-    56, 344, 1, 0, 0, 0, 58, 346, 1, 0, 0, 0, 60, 350, 1, 0, 0, 0, 62, 372, 1, 0, 0, 0, 64, 392,
-    1, 0, 0, 0, 66, 394, 1, 0, 0, 0, 68, 397, 1, 0, 0, 0, 70, 401, 1, 0, 0, 0, 72, 421, 1, 0,
-    0, 0, 74, 452, 1, 0, 0, 0, 76, 454, 1, 0, 0, 0, 78, 469, 1, 0, 0, 0, 80, 472, 1, 0, 0, 0,
-    82, 481, 1, 0, 0, 0, 84, 487, 1, 0, 0, 0, 86, 490, 1, 0, 0, 0, 88, 494, 1, 0, 0, 0, 90, 507,
-    1, 0, 0, 0, 92, 517, 1, 0, 0, 0, 94, 522, 1, 0, 0, 0, 96, 536, 1, 0, 0, 0, 98, 572, 1, 0,
-    0, 0, 100, 574, 1, 0, 0, 0, 102, 578, 1, 0, 0, 0, 104, 589, 1, 0, 0, 0, 106, 597, 1, 0,
-    0, 0, 108, 599, 1, 0, 0, 0, 110, 606, 1, 0, 0, 0, 112, 622, 1, 0, 0, 0, 114, 625, 1, 0,
-    0, 0, 116, 628, 1, 0, 0, 0, 118, 632, 1, 0, 0, 0, 120, 645, 1, 0, 0, 0, 122, 651, 1, 0,
-    0, 0, 124, 655, 1, 0, 0, 0, 126, 660, 1, 0, 0, 0, 128, 131, 3, 2, 1, 0, 129, 131, 5, 64,
-    0, 0, 130, 128, 1, 0, 0, 0, 130, 129, 1, 0, 0, 0, 131, 132, 1, 0, 0, 0, 132, 130, 1, 0,
-    0, 0, 132, 133, 1, 0, 0, 0, 133, 134, 1, 0, 0, 0, 134, 135, 5, 0, 0, 1, 135, 1, 1, 0, 0,
-    0, 136, 159, 3, 20, 10, 0, 137, 159, 3, 28, 14, 0, 138, 159, 3, 26, 13, 0, 139, 159,
-    3, 50, 25, 0, 140, 159, 3, 52, 26, 0, 141, 159, 3, 58, 29, 0, 142, 159, 3, 10, 5, 0, 143,
-    159, 3, 60, 30, 0, 144, 159, 3, 46, 23, 0, 145, 159, 3, 48, 24, 0, 146, 159, 3, 70, 35,
-    0, 147, 159, 3, 80, 40, 0, 148, 159, 3, 108, 54, 0, 149, 159, 3, 114, 57, 0, 150, 159,
-    3, 116, 58, 0, 151, 159, 3, 76, 38, 0, 152, 159, 3, 36, 18, 0, 153, 159, 3, 6, 3, 0, 154,
-    159, 3, 112, 56, 0, 155, 159, 3, 118, 59, 0, 156, 159, 3, 124, 62, 0, 157, 159, 3, 126,
-    63, 0, 158, 136, 1, 0, 0, 0, 158, 137, 1, 0, 0, 0, 158, 138, 1, 0, 0, 0, 158, 139, 1, 0,
-    0, 0, 158, 140, 1, 0, 0, 0, 158, 141, 1, 0, 0, 0, 158, 142, 1, 0, 0, 0, 158, 143, 1, 0,
-    0, 0, 158, 144, 1, 0, 0, 0, 158, 145, 1, 0, 0, 0, 158, 146, 1, 0, 0, 0, 158, 147, 1, 0,
-    0, 0, 158, 148, 1, 0, 0, 0, 158, 149, 1, 0, 0, 0, 158, 150, 1, 0, 0, 0, 158, 151, 1, 0,
-    0, 0, 158, 152, 1, 0, 0, 0, 158, 153, 1, 0, 0, 0, 158, 154, 1, 0, 0, 0, 158, 155, 1, 0,
-    0, 0, 158, 156, 1, 0, 0, 0, 158, 157, 1, 0, 0, 0, 159, 3, 1, 0, 0, 0, 160, 161, 5, 64, 0,
-    0, 161, 164, 5, 66, 0, 0, 162, 165, 5, 64, 0, 0, 163, 165, 3, 2, 1, 0, 164, 162, 1, 0,
-    0, 0, 164, 163, 1, 0, 0, 0, 165, 166, 1, 0, 0, 0, 166, 164, 1, 0, 0, 0, 166, 167, 1, 0,
-    0, 0, 167, 168, 1, 0, 0, 0, 168, 169, 5, 67, 0, 0, 169, 5, 1, 0, 0, 0, 170, 172, 3, 8, 4,
-    0, 171, 170, 1, 0, 0, 0, 172, 173, 1, 0, 0, 0, 173, 171, 1, 0, 0, 0, 173, 174, 1, 0, 0,
-    0, 174, 7, 1, 0, 0, 0, 175, 176, 7, 0, 0, 0, 176, 177, 5, 1, 0, 0, 177, 178, 3, 4, 2, 0,
-    178, 9, 1, 0, 0, 0, 179, 180, 3, 76, 38, 0, 180, 181, 5, 1, 0, 0, 181, 182, 5, 64, 0, 0,
-    182, 185, 5, 66, 0, 0, 183, 186, 5, 64, 0, 0, 184, 186, 3, 12, 6, 0, 185, 183, 1, 0, 0,
-    0, 185, 184, 1, 0, 0, 0, 186, 187, 1, 0, 0, 0, 187, 185, 1, 0, 0, 0, 187, 188, 1, 0, 0,
-    0, 188, 189, 1, 0, 0, 0, 189, 190, 5, 67, 0, 0, 190, 11, 1, 0, 0, 0, 191, 192, 7, 1, 0,
-    0, 192, 193, 5, 1, 0, 0, 193, 194, 3, 68, 34, 0, 194, 13, 1, 0, 0, 0, 195, 196, 5, 15,
-    0, 0, 196, 197, 7, 2, 0, 0, 197, 15, 1, 0, 0, 0, 198, 199, 5, 56, 0, 0, 199, 202, 5, 1,
-    0, 0, 200, 203, 3, 68, 34, 0, 201, 203, 5, 56, 0, 0, 202, 200, 1, 0, 0, 0, 202, 201, 1,
-    0, 0, 0, 203, 17, 1, 0, 0, 0, 204, 207, 3, 62, 31, 0, 205, 207, 3, 50, 25, 0, 206, 204,
-    1, 0, 0, 0, 206, 205, 1, 0, 0, 0, 207, 211, 1, 0, 0, 0, 208, 210, 3, 16, 8, 0, 209, 208,
-    1, 0, 0, 0, 210, 213, 1, 0, 0, 0, 211, 209, 1, 0, 0, 0, 211, 212, 1, 0, 0, 0, 212, 215,
-    1, 0, 0, 0, 213, 211, 1, 0, 0, 0, 214, 216, 3, 14, 7, 0, 215, 214, 1, 0, 0, 0, 215, 216,
-    1, 0, 0, 0, 216, 19, 1, 0, 0, 0, 217, 218, 5, 16, 0, 0, 218, 219, 3, 18, 9, 0, 219, 21,
-    1, 0, 0, 0, 220, 223, 3, 18, 9, 0, 221, 223, 3, 14, 7, 0, 222, 220, 1, 0, 0, 0, 222, 221,
-    1, 0, 0, 0, 223, 23, 1, 0, 0, 0, 224, 225, 7, 2, 0, 0, 225, 25, 1, 0, 0, 0, 226, 229, 5,
-    17, 0, 0, 227, 230, 3, 22, 11, 0, 228, 230, 5, 19, 0, 0, 229, 227, 1, 0, 0, 0, 229, 228,
-    1, 0, 0, 0, 230, 27, 1, 0, 0, 0, 231, 241, 5, 18, 0, 0, 232, 237, 3, 22, 11, 0, 233, 234,
-    5, 2, 0, 0, 234, 236, 3, 22, 11, 0, 235, 233, 1, 0, 0, 0, 236, 239, 1, 0, 0, 0, 237, 235,
-    1, 0, 0, 0, 237, 238, 1, 0, 0, 0, 238, 242, 1, 0, 0, 0, 239, 237, 1, 0, 0, 0, 240, 242,
-    5, 19, 0, 0, 241, 232, 1, 0, 0, 0, 241, 240, 1, 0, 0, 0, 242, 29, 1, 0, 0, 0, 243, 244,
-    5, 17, 0, 0, 244, 245, 3, 22, 11, 0, 245, 246, 5, 18, 0, 0, 246, 251, 3, 22, 11, 0, 247,
-    248, 5, 2, 0, 0, 248, 250, 3, 22, 11, 0, 249, 247, 1, 0, 0, 0, 250, 253, 1, 0, 0, 0, 251,
-    249, 1, 0, 0, 0, 251, 252, 1, 0, 0, 0, 252, 254, 1, 0, 0, 0, 253, 251, 1, 0, 0, 0, 254,
-    255, 5, 1, 0, 0, 255, 256, 5, 64, 0, 0, 256, 259, 5, 66, 0, 0, 257, 260, 5, 64, 0, 0, 258,
-    260, 3, 32, 16, 0, 259, 257, 1, 0, 0, 0, 259, 258, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261,
-    259, 1, 0, 0, 0, 261, 262, 1, 0, 0, 0, 262, 263, 1, 0, 0, 0, 263, 264, 5, 67, 0, 0, 264,
-    31, 1, 0, 0, 0, 265, 266, 3, 24, 12, 0, 266, 267, 5, 1, 0, 0, 267, 272, 3, 34, 17, 0, 268,
-    269, 5, 2, 0, 0, 269, 271, 3, 34, 17, 0, 270, 268, 1, 0, 0, 0, 271, 274, 1, 0, 0, 0, 272,
-    270, 1, 0, 0, 0, 272, 273, 1, 0, 0, 0, 273, 33, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 275, 276,
-    7, 3, 0, 0, 276, 35, 1, 0, 0, 0, 277, 278, 3, 26, 13, 0, 278, 279, 5, 1, 0, 0, 279, 280,
-    5, 64, 0, 0, 280, 283, 5, 66, 0, 0, 281, 284, 5, 64, 0, 0, 282, 284, 3, 38, 19, 0, 283,
-    281, 1, 0, 0, 0, 283, 282, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 283, 1, 0, 0, 0, 285,
-    286, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 288, 5, 67, 0, 0, 288, 37, 1, 0, 0, 0, 289,
-    292, 3, 2, 1, 0, 290, 292, 3, 40, 20, 0, 291, 289, 1, 0, 0, 0, 291, 290, 1, 0, 0, 0, 292,
-    39, 1, 0, 0, 0, 293, 294, 3, 24, 12, 0, 294, 297, 5, 1, 0, 0, 295, 298, 3, 42, 21, 0, 296,
+    1, 63, 1, 63, 5, 63, 665, 8, 63, 10, 63, 12, 63, 668, 9, 63, 1, 63, 1, 63, 1, 63, 1, 63,
+    1, 63, 1, 63, 0, 1, 62, 64, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32,
+    34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76,
+    78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114,
+    116, 118, 120, 122, 124, 126, 0, 14, 2, 0, 9, 9, 19, 21, 1, 0, 56, 57, 2, 0, 57, 57, 60,
+    60, 2, 0, 54, 54, 57, 57, 1, 0, 47, 51, 1, 0, 44, 46, 1, 0, 42, 43, 1, 0, 40, 41, 1, 0, 34,
+    39, 2, 0, 31, 31, 43, 43, 2, 0, 55, 55, 57, 61, 2, 0, 15, 15, 56, 56, 2, 0, 56, 57, 60,
+    60, 1, 0, 32, 33, 711, 0, 130, 1, 0, 0, 0, 2, 158, 1, 0, 0, 0, 4, 160, 1, 0, 0, 0, 6, 171,
+    1, 0, 0, 0, 8, 175, 1, 0, 0, 0, 10, 179, 1, 0, 0, 0, 12, 191, 1, 0, 0, 0, 14, 195, 1, 0, 0,
+    0, 16, 198, 1, 0, 0, 0, 18, 206, 1, 0, 0, 0, 20, 217, 1, 0, 0, 0, 22, 222, 1, 0, 0, 0, 24,
+    224, 1, 0, 0, 0, 26, 226, 1, 0, 0, 0, 28, 231, 1, 0, 0, 0, 30, 243, 1, 0, 0, 0, 32, 265,
+    1, 0, 0, 0, 34, 275, 1, 0, 0, 0, 36, 277, 1, 0, 0, 0, 38, 291, 1, 0, 0, 0, 40, 293, 1, 0,
+    0, 0, 42, 301, 1, 0, 0, 0, 44, 303, 1, 0, 0, 0, 46, 305, 1, 0, 0, 0, 48, 307, 1, 0, 0, 0,
+    50, 309, 1, 0, 0, 0, 52, 313, 1, 0, 0, 0, 54, 317, 1, 0, 0, 0, 56, 344, 1, 0, 0, 0, 58, 346,
+    1, 0, 0, 0, 60, 350, 1, 0, 0, 0, 62, 372, 1, 0, 0, 0, 64, 392, 1, 0, 0, 0, 66, 394, 1, 0,
+    0, 0, 68, 397, 1, 0, 0, 0, 70, 401, 1, 0, 0, 0, 72, 421, 1, 0, 0, 0, 74, 452, 1, 0, 0, 0,
+    76, 454, 1, 0, 0, 0, 78, 469, 1, 0, 0, 0, 80, 472, 1, 0, 0, 0, 82, 481, 1, 0, 0, 0, 84, 487,
+    1, 0, 0, 0, 86, 490, 1, 0, 0, 0, 88, 494, 1, 0, 0, 0, 90, 507, 1, 0, 0, 0, 92, 517, 1, 0,
+    0, 0, 94, 522, 1, 0, 0, 0, 96, 536, 1, 0, 0, 0, 98, 572, 1, 0, 0, 0, 100, 574, 1, 0, 0, 0,
+    102, 578, 1, 0, 0, 0, 104, 589, 1, 0, 0, 0, 106, 597, 1, 0, 0, 0, 108, 599, 1, 0, 0, 0,
+    110, 606, 1, 0, 0, 0, 112, 622, 1, 0, 0, 0, 114, 625, 1, 0, 0, 0, 116, 628, 1, 0, 0, 0,
+    118, 632, 1, 0, 0, 0, 120, 645, 1, 0, 0, 0, 122, 651, 1, 0, 0, 0, 124, 655, 1, 0, 0, 0,
+    126, 660, 1, 0, 0, 0, 128, 131, 3, 2, 1, 0, 129, 131, 5, 64, 0, 0, 130, 128, 1, 0, 0, 0,
+    130, 129, 1, 0, 0, 0, 131, 132, 1, 0, 0, 0, 132, 130, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0,
+    133, 134, 1, 0, 0, 0, 134, 135, 5, 0, 0, 1, 135, 1, 1, 0, 0, 0, 136, 159, 3, 20, 10, 0,
+    137, 159, 3, 28, 14, 0, 138, 159, 3, 26, 13, 0, 139, 159, 3, 50, 25, 0, 140, 159, 3,
+    52, 26, 0, 141, 159, 3, 58, 29, 0, 142, 159, 3, 10, 5, 0, 143, 159, 3, 60, 30, 0, 144,
+    159, 3, 46, 23, 0, 145, 159, 3, 48, 24, 0, 146, 159, 3, 70, 35, 0, 147, 159, 3, 80, 40,
+    0, 148, 159, 3, 108, 54, 0, 149, 159, 3, 114, 57, 0, 150, 159, 3, 116, 58, 0, 151, 159,
+    3, 76, 38, 0, 152, 159, 3, 36, 18, 0, 153, 159, 3, 6, 3, 0, 154, 159, 3, 112, 56, 0, 155,
+    159, 3, 118, 59, 0, 156, 159, 3, 124, 62, 0, 157, 159, 3, 126, 63, 0, 158, 136, 1, 0,
+    0, 0, 158, 137, 1, 0, 0, 0, 158, 138, 1, 0, 0, 0, 158, 139, 1, 0, 0, 0, 158, 140, 1, 0,
+    0, 0, 158, 141, 1, 0, 0, 0, 158, 142, 1, 0, 0, 0, 158, 143, 1, 0, 0, 0, 158, 144, 1, 0,
+    0, 0, 158, 145, 1, 0, 0, 0, 158, 146, 1, 0, 0, 0, 158, 147, 1, 0, 0, 0, 158, 148, 1, 0,
+    0, 0, 158, 149, 1, 0, 0, 0, 158, 150, 1, 0, 0, 0, 158, 151, 1, 0, 0, 0, 158, 152, 1, 0,
+    0, 0, 158, 153, 1, 0, 0, 0, 158, 154, 1, 0, 0, 0, 158, 155, 1, 0, 0, 0, 158, 156, 1, 0,
+    0, 0, 158, 157, 1, 0, 0, 0, 159, 3, 1, 0, 0, 0, 160, 161, 5, 64, 0, 0, 161, 164, 5, 66,
+    0, 0, 162, 165, 5, 64, 0, 0, 163, 165, 3, 2, 1, 0, 164, 162, 1, 0, 0, 0, 164, 163, 1, 0,
+    0, 0, 165, 166, 1, 0, 0, 0, 166, 164, 1, 0, 0, 0, 166, 167, 1, 0, 0, 0, 167, 168, 1, 0,
+    0, 0, 168, 169, 5, 67, 0, 0, 169, 5, 1, 0, 0, 0, 170, 172, 3, 8, 4, 0, 171, 170, 1, 0, 0,
+    0, 172, 173, 1, 0, 0, 0, 173, 171, 1, 0, 0, 0, 173, 174, 1, 0, 0, 0, 174, 7, 1, 0, 0, 0,
+    175, 176, 7, 0, 0, 0, 176, 177, 5, 1, 0, 0, 177, 178, 3, 4, 2, 0, 178, 9, 1, 0, 0, 0, 179,
+    180, 3, 76, 38, 0, 180, 181, 5, 1, 0, 0, 181, 182, 5, 64, 0, 0, 182, 185, 5, 66, 0, 0,
+    183, 186, 5, 64, 0, 0, 184, 186, 3, 12, 6, 0, 185, 183, 1, 0, 0, 0, 185, 184, 1, 0, 0,
+    0, 186, 187, 1, 0, 0, 0, 187, 185, 1, 0, 0, 0, 187, 188, 1, 0, 0, 0, 188, 189, 1, 0, 0,
+    0, 189, 190, 5, 67, 0, 0, 190, 11, 1, 0, 0, 0, 191, 192, 7, 1, 0, 0, 192, 193, 5, 1, 0,
+    0, 193, 194, 3, 68, 34, 0, 194, 13, 1, 0, 0, 0, 195, 196, 5, 15, 0, 0, 196, 197, 7, 2,
+    0, 0, 197, 15, 1, 0, 0, 0, 198, 199, 5, 56, 0, 0, 199, 202, 5, 1, 0, 0, 200, 203, 3, 68,
+    34, 0, 201, 203, 5, 56, 0, 0, 202, 200, 1, 0, 0, 0, 202, 201, 1, 0, 0, 0, 203, 17, 1, 0,
+    0, 0, 204, 207, 3, 62, 31, 0, 205, 207, 3, 50, 25, 0, 206, 204, 1, 0, 0, 0, 206, 205,
+    1, 0, 0, 0, 207, 211, 1, 0, 0, 0, 208, 210, 3, 16, 8, 0, 209, 208, 1, 0, 0, 0, 210, 213,
+    1, 0, 0, 0, 211, 209, 1, 0, 0, 0, 211, 212, 1, 0, 0, 0, 212, 215, 1, 0, 0, 0, 213, 211,
+    1, 0, 0, 0, 214, 216, 3, 14, 7, 0, 215, 214, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 19,
+    1, 0, 0, 0, 217, 218, 5, 16, 0, 0, 218, 219, 3, 18, 9, 0, 219, 21, 1, 0, 0, 0, 220, 223,
+    3, 18, 9, 0, 221, 223, 3, 14, 7, 0, 222, 220, 1, 0, 0, 0, 222, 221, 1, 0, 0, 0, 223, 23,
+    1, 0, 0, 0, 224, 225, 7, 2, 0, 0, 225, 25, 1, 0, 0, 0, 226, 229, 5, 17, 0, 0, 227, 230,
+    3, 22, 11, 0, 228, 230, 5, 19, 0, 0, 229, 227, 1, 0, 0, 0, 229, 228, 1, 0, 0, 0, 230, 27,
+    1, 0, 0, 0, 231, 241, 5, 18, 0, 0, 232, 237, 3, 22, 11, 0, 233, 234, 5, 2, 0, 0, 234, 236,
+    3, 22, 11, 0, 235, 233, 1, 0, 0, 0, 236, 239, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0, 237, 238,
+    1, 0, 0, 0, 238, 242, 1, 0, 0, 0, 239, 237, 1, 0, 0, 0, 240, 242, 5, 19, 0, 0, 241, 232,
+    1, 0, 0, 0, 241, 240, 1, 0, 0, 0, 242, 29, 1, 0, 0, 0, 243, 244, 5, 17, 0, 0, 244, 245,
+    3, 22, 11, 0, 245, 246, 5, 18, 0, 0, 246, 251, 3, 22, 11, 0, 247, 248, 5, 2, 0, 0, 248,
+    250, 3, 22, 11, 0, 249, 247, 1, 0, 0, 0, 250, 253, 1, 0, 0, 0, 251, 249, 1, 0, 0, 0, 251,
+    252, 1, 0, 0, 0, 252, 254, 1, 0, 0, 0, 253, 251, 1, 0, 0, 0, 254, 255, 5, 1, 0, 0, 255,
+    256, 5, 64, 0, 0, 256, 259, 5, 66, 0, 0, 257, 260, 5, 64, 0, 0, 258, 260, 3, 32, 16, 0,
+    259, 257, 1, 0, 0, 0, 259, 258, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 259, 1, 0, 0, 0,
+    261, 262, 1, 0, 0, 0, 262, 263, 1, 0, 0, 0, 263, 264, 5, 67, 0, 0, 264, 31, 1, 0, 0, 0,
+    265, 266, 3, 24, 12, 0, 266, 267, 5, 1, 0, 0, 267, 272, 3, 34, 17, 0, 268, 269, 5, 2,
+    0, 0, 269, 271, 3, 34, 17, 0, 270, 268, 1, 0, 0, 0, 271, 274, 1, 0, 0, 0, 272, 270, 1,
+    0, 0, 0, 272, 273, 1, 0, 0, 0, 273, 33, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 275, 276, 7, 3,
+    0, 0, 276, 35, 1, 0, 0, 0, 277, 278, 3, 26, 13, 0, 278, 279, 5, 1, 0, 0, 279, 280, 5, 64,
+    0, 0, 280, 283, 5, 66, 0, 0, 281, 284, 5, 64, 0, 0, 282, 284, 3, 38, 19, 0, 283, 281,
+    1, 0, 0, 0, 283, 282, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 283, 1, 0, 0, 0, 285, 286,
+    1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 288, 5, 67, 0, 0, 288, 37, 1, 0, 0, 0, 289, 292,
+    3, 2, 1, 0, 290, 292, 3, 40, 20, 0, 291, 289, 1, 0, 0, 0, 291, 290, 1, 0, 0, 0, 292, 39,
+    1, 0, 0, 0, 293, 294, 3, 24, 12, 0, 294, 297, 5, 1, 0, 0, 295, 298, 3, 42, 21, 0, 296,
     298, 3, 44, 22, 0, 297, 295, 1, 0, 0, 0, 297, 296, 1, 0, 0, 0, 298, 41, 1, 0, 0, 0, 299,
     302, 3, 2, 1, 0, 300, 302, 5, 54, 0, 0, 301, 299, 1, 0, 0, 0, 301, 300, 1, 0, 0, 0, 302,
     43, 1, 0, 0, 0, 303, 304, 3, 4, 2, 0, 304, 45, 1, 0, 0, 0, 305, 306, 5, 8, 0, 0, 306, 47,
@@ -3913,13 +3931,15 @@ CircuitScriptParser._serializedATN = [
     648, 3, 62, 31, 0, 648, 649, 5, 1, 0, 0, 649, 650, 3, 4, 2, 0, 650, 121, 1, 0, 0, 0, 651,
     652, 5, 30, 0, 0, 652, 653, 5, 1, 0, 0, 653, 654, 3, 4, 2, 0, 654, 123, 1, 0, 0, 0, 655,
     656, 5, 27, 0, 0, 656, 657, 3, 62, 31, 0, 657, 658, 5, 1, 0, 0, 658, 659, 3, 4, 2, 0, 659,
-    125, 1, 0, 0, 0, 660, 661, 5, 25, 0, 0, 661, 662, 5, 56, 0, 0, 662, 663, 5, 26, 0, 0, 663,
-    664, 3, 62, 31, 0, 664, 665, 5, 1, 0, 0, 665, 666, 3, 4, 2, 0, 666, 127, 1, 0, 0, 0, 70,
+    125, 1, 0, 0, 0, 660, 661, 5, 25, 0, 0, 661, 666, 5, 56, 0, 0, 662, 663, 5, 2, 0, 0, 663,
+    665, 5, 56, 0, 0, 664, 662, 1, 0, 0, 0, 665, 668, 1, 0, 0, 0, 666, 664, 1, 0, 0, 0, 666,
+    667, 1, 0, 0, 0, 667, 669, 1, 0, 0, 0, 668, 666, 1, 0, 0, 0, 669, 670, 5, 26, 0, 0, 670,
+    671, 3, 62, 31, 0, 671, 672, 5, 1, 0, 0, 672, 673, 3, 4, 2, 0, 673, 127, 1, 0, 0, 0, 71,
     130, 132, 158, 164, 166, 173, 185, 187, 202, 206, 211, 215, 222, 229, 237, 241,
     251, 259, 261, 272, 283, 285, 291, 297, 301, 326, 333, 341, 344, 362, 372, 387,
     389, 397, 405, 413, 415, 421, 428, 437, 449, 452, 459, 464, 469, 472, 478, 481,
     485, 501, 503, 511, 513, 530, 532, 540, 542, 548, 556, 564, 572, 586, 589, 594,
-    597, 603, 612, 617, 639, 643
+    597, 603, 612, 617, 639, 643, 666
 ];
 CircuitScriptParser.vocabulary = new antlr.Vocabulary(CircuitScriptParser.literalNames, CircuitScriptParser.symbolicNames, []);
 CircuitScriptParser.decisionsToDFA = CircuitScriptParser._ATN.decisionToState.map((ds, index) => new antlr.DFA(ds, index));
@@ -6107,8 +6127,13 @@ class For_exprContext extends antlr.ParserRuleContext {
     For() {
         return this.getToken(CircuitScriptParser.For, 0);
     }
-    ID() {
-        return this.getToken(CircuitScriptParser.ID, 0);
+    ID(i) {
+        if (i === undefined) {
+            return this.getTokens(CircuitScriptParser.ID);
+        }
+        else {
+            return this.getToken(CircuitScriptParser.ID, i);
+        }
     }
     In() {
         return this.getToken(CircuitScriptParser.In, 0);

package/dist/cjs/builtinMethods.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.linkBuiltInMethods = void 0;
+function linkBuiltInMethods(context, visitor) {
+    context.createFunction('print', (params) => {
+        const args = getPositionParams(params);
+        const items = args.map(item => toString(item));
+        if (visitor.printToConsole) {
+            console.log('::', ...items);
+        }
+        const printedValue = items.join(" ");
+        visitor.printStream.push(printedValue);
+        return [visitor, printedValue];
+    });
+    const builtIns = [
+        ['enumerate', enumerate],
+        ['toMils', toMils],
+        ['range', range],
+        ['len', objectLength],
+    ];
+    builtIns.forEach(([functionName, functionImpl]) => {
+        context.createFunction(functionName, params => {
+            const args = getPositionParams(params);
+            const functionReturn = functionImpl(...args);
+            return [visitor, functionReturn];
+        });
+    });
+}
+exports.linkBuiltInMethods = linkBuiltInMethods;
+function range(...args) {
+    let startValue = 0;
+    let endValue = 0;
+    if (args.length === 1) {
+        endValue = args[0];
+    }
+    else if (args.length === 2) {
+        startValue = args[0];
+        endValue = args[1];
+    }
+    const returnArray = [];
+    for (let i = startValue; i < endValue; i++) {
+        returnArray.push(i);
+    }
+    return returnArray;
+}
+function enumerate(array) {
+    if (!Array.isArray(array)) {
+        throw "Invalid parameter for enumerate function!";
+    }
+    const output = array.map((item, index) => {
+        return [index, item];
+    });
+    return output;
+}
+function toMils(value) {
+    if (isNaN(value)) {
+        throw "Invalid input for method toMils";
+    }
+    return value / 25.4 * 1000;
+}
+function objectLength(obj) {
+    if (Array.isArray(obj)) {
+        return obj.length;
+    }
+    else {
+        if (obj.length) {
+            return obj.length;
+        }
+        else {
+            throw "Could not get length of object: " + obj;
+        }
+    }
+}
+function getPositionParams(params) {
+    return params.map(([, , value]) => value);
+}
+function toString(obj) {
+    if (typeof obj === 'string') {
+        return `"${obj}"`;
+    }
+    else if (typeof obj === 'number') {
+        return obj.toString();
+    }
+    else if (Array.isArray(obj)) {
+        const inner = obj.map(item => toString(item)).join(", ");
+        return "[" + inner + "]";
+    }
+    else {
+        if (obj.toString) {
+            return obj.toString();
+        }
+        else {
+            throw "Could not create string from object: " + obj;
+        }
+    }
+}

package/dist/cjs/export.js

@@ -53,6 +53,7 @@ function generateKiCADNetList(netlist) {
             if (instance.typeProp !== globals_js_1.ComponentTypes.label &&
                 instance.typeProp !== globals_js_1.ComponentTypes.net &&
                 instance.typeProp !== globals_js_1.ComponentTypes.point &&
+                instance.typeProp !== globals_js_1.ComponentTypes.frame &&
                 instance.typeProp !== null) {
                 console.log('Skipping', instance.instanceName);
             }

package/dist/cjs/globals.js

@@ -78,6 +78,7 @@ var ComponentTypes;
     ComponentTypes["net"] = "net";
     ComponentTypes["label"] = "label";
     ComponentTypes["point"] = "point";
+    ComponentTypes["frame"] = "frame";
 })(ComponentTypes || (exports.ComponentTypes = ComponentTypes = {}));
 var ReferenceTypes;
 (function (ReferenceTypes) {

package/dist/cjs/helpers.js

@@ -161,7 +161,7 @@ function validateScript(scriptData, options) {
 }
 exports.validateScript = validateScript;
 function renderScript(scriptData, outputPath, options) {
-    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, kicadNetlistPath = null, showStats = false } = options;
+    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, showStats = false } = options;
     const onErrorHandler = (line, column, message, error) => {
         if (error instanceof visitor_js_1.VisitorExecutionException) {
             console.log('Error', line, column, message, error.errorMessage);
@@ -194,14 +194,6 @@ function renderScript(scriptData, outputPath, options) {
     catch (err) {
         console.log('Error during annotation: ', err);
     }
-    if (kicadNetlistPath) {
-        const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
-        missingFootprints.forEach(entry => {
-            console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
-        });
-        (0, fs_1.writeFileSync)(kicadNetlistPath, (0, export_js_1.printTree)(kicadNetList));
-        console.log('Generated KiCad netlist file');
-    }
     const { sequence, nets } = visitor.getGraph();
     const tmpSequence = sequence.map(item => {
         const tmp = [...item];
@@ -230,6 +222,15 @@ function renderScript(scriptData, outputPath, options) {
                 outputDefaultZoom = 1;
             }
         }
+        if (fileExtension === 'net') {
+            const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
+            missingFootprints.forEach(entry => {
+                console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
+            });
+            (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
+            console.log('Generated file', outputPath);
+            return null;
+        }
         const layoutEngine = new layout_js_1.LayoutEngine();
         const layoutTimer = new utils_js_1.SimpleStopwatch();
         const sheetFrames = layoutEngine.runLayout(sequence, nets);

package/dist/cjs/layout.js

@@ -287,8 +287,8 @@ class LayoutEngine {
             boundPoints.push([innerFrame.x, innerFrame.y], [innerFrame.x + frameWidth, innerFrame.y + frameHeight]);
         });
         const contentsBounds = (0, utils_js_1.resizeBounds)(getBoundsFromPoints(boundPoints), frame.padding);
-        if (frame.frame.parameters.has(Frame_js_1.FrameParamKeys.SheetFrame)) {
-            const frameComponent = frame.frame.parameters.get(Frame_js_1.FrameParamKeys.SheetFrame);
+        if (frame.frame.parameters.has(Frame_js_1.FrameParamKeys.SheetType)) {
+            const frameComponent = frame.frame.parameters.get(Frame_js_1.FrameParamKeys.SheetType);
             const rects = ExtractDrawingRects(frameComponent.displayProp);
             let frameWidth = 0;
             let frameHeight = 0;

package/dist/cjs/main.js

@@ -21,7 +21,6 @@ async function main() {
         .argument('[output path]', 'Output path')
         .option('-i, --input text <input text>', 'Input text directly')
         .option('-c, --current-directory <path>', 'Set current directory')
-        .option('-k, --kicad-netlist <filename>', 'Create KiCad netlist')
         .option('-w, --watch', 'Watch for file changes')
         .option('-n, --dump-nets', 'Dump out net information')
         .option('-d, --dump-data', 'Dump data during parsing')
@@ -38,7 +37,6 @@ async function main() {
     const watchFileChanges = options.watch;
     const dumpNets = options.dumpNets;
     const dumpData = options.dumpData;
-    const kicadNetlist = options.kicadNetlist;
     let currentDirectory = options.currentDirectory ?? null;
     if (watchFileChanges) {
         console.log('watching for file changes...');
@@ -75,7 +73,6 @@ async function main() {
         defaultLibsPath,
         dumpNets,
         dumpData,
-        kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
     };
     let outputPath = null;

package/dist/cjs/objects/Frame.js

@@ -18,7 +18,7 @@ var FrameParamKeys;
     FrameParamKeys["Width"] = "width";
     FrameParamKeys["Height"] = "height";
     FrameParamKeys["PaperSize"] = "paper_size";
-    FrameParamKeys["SheetFrame"] = "sheet_frame";
+    FrameParamKeys["SheetType"] = "sheet_type";
 })(FrameParamKeys || (exports.FrameParamKeys = FrameParamKeys = {}));
 var FramePlotDirection;
 (function (FramePlotDirection) {

package/dist/cjs/render.js

@@ -36,7 +36,7 @@ function renderSheetsToSVG(sheetFrames) {
         let sheetYOffset = 0;
         if (sheet.frame.frame) {
             const frameComponent = sheet.frame.frame.parameters
-                .get(Frame_js_1.FrameParamKeys.SheetFrame);
+                .get(Frame_js_1.FrameParamKeys.SheetType);
             if (frameComponent) {
                 if (frameComponent.displayProp === null) {
                     throw 'Invalid graphic object for sheet frame';
@@ -257,8 +257,8 @@ function drawGrid(group, canvasSize, extendGrid) {
 }
 function drawSheetFrameBorder(frameGroup, frame) {
     const frameParams = frame.frame.parameters;
-    if (frameParams.has(Frame_js_1.FrameParamKeys.SheetFrame)) {
-        const frameComponent = frameParams.get(Frame_js_1.FrameParamKeys.SheetFrame);
+    if (frameParams.has(Frame_js_1.FrameParamKeys.SheetType)) {
+        const frameComponent = frameParams.get(Frame_js_1.FrameParamKeys.SheetType);
         const { displayProp = null } = frameComponent ?? {};
         if (displayProp) {
             const sheetFrameGroup = frameGroup.group();

package/dist/cjs/visitor.js

@@ -842,7 +842,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.log('exit while loop');
         };
         this.visitFor_expr = (ctx) => {
-            const forVariableName = ctx.ID().getText();
+            const forVariableNames = ctx.ID().map(item => item.getText());
             const ctxDataExpr = ctx.data_expr();
             this.visit(ctxDataExpr);
             const listItems = this.getResult(ctxDataExpr);
@@ -851,7 +851,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             let counter = 0;
             while (keepLooping) {
                 if (counter < listItems.length) {
-                    this.getExecutor().scope.variables.set(forVariableName, listItems[counter]);
+                    let useValueArray = listItems[counter];
+                    if (!Array.isArray(useValueArray)) {
+                        useValueArray = [useValueArray];
+                    }
+                    useValueArray.forEach((value, index) => {
+                        this.getExecutor().scope.variables.set(forVariableNames[index], value);
+                    });
                     this.visit(ctx.expressions_block());
                     keepLooping = true;
                     const currentResult = this.getResult(ctx) ?? {};
@@ -1129,11 +1135,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         const baseScope = this.getExecutor().scope;
         const document = baseScope.variables.get(globals_js_1.GlobalDocumentName);
         let frameComponent = null;
-        if (document && document[Frame_js_1.FrameParamKeys.SheetFrame]) {
-            frameComponent = document[Frame_js_1.FrameParamKeys.SheetFrame];
+        if (document && document[Frame_js_1.FrameParamKeys.SheetType]) {
+            frameComponent = document[Frame_js_1.FrameParamKeys.SheetType];
             baseScope.frames.forEach(item => {
                 if (item.frameType === globals_js_1.FrameType.Sheet) {
-                    item.parameters.set(Frame_js_1.FrameParamKeys.SheetFrame, frameComponent);
+                    item.parameters.set(Frame_js_1.FrameParamKeys.SheetType, frameComponent);
                 }
             });
         }
@@ -1218,6 +1224,9 @@ class ComponentAnnotater {
                 this.counter[type] = 1;
             }
         }
+        if (ComponentRefDesPrefixes[type] === undefined) {
+            return null;
+        }
         let attempts = 100;
         let proposedName;
         while (attempts >= 0) {