circuitscript 0.0.37 → 0.1.0

package/dist/cjs/BaseVisitor.js

@@ -13,6 +13,7 @@ const PinTypes_1 = require("./objects/PinTypes");
 const types_1 = require("./objects/types");
 const globals_1 = require("./globals");
 const builtinMethods_1 = require("./builtinMethods");
+const utils_1 = require("./utils");
 class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     constructor(silent = false, onErrorHandler = null, currentDirectory, defaultLibsPath) {
         super();
@@ -56,18 +57,21 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                     tmpComponent.instanceName = reference.name;
                     instances.delete(oldName);
                     instances.set(reference.name, tmpComponent);
-                    this.getExecutor().log(`assigned '${reference.name}' to ClassComponent`);
+                    this.log2(`assigned '${reference.name}' to ClassComponent`);
                 }
                 else {
                     this.getExecutor().scope.variables.set(reference.name, value);
+                    this.log2(`assigned variable ${reference.name} to ${value}`);
                 }
             }
             else {
-                if (reference.value instanceof ClassComponent_1.ClassComponent) {
-                    this.setInstanceParam(reference.value, trailers, value);
+                if (reference.parentValue instanceof ClassComponent_1.ClassComponent) {
+                    this.setInstanceParam(reference.parentValue, trailers, value);
+                    this.log2(`assigned component param ${reference.parentValue} trailers: ${trailers} value: ${value}`);
                 }
-                else if (reference.value instanceof Object) {
-                    reference.value[trailers.join('.')] = value;
+                else if (reference.parentValue instanceof Object) {
+                    reference.parentValue[trailers.join('.')] = value;
+                    this.log2(`assigned object ${reference.parentValue} trailers: ${trailers} value: ${value}`);
                 }
             }
             this.setResult(ctx, value);
@@ -78,7 +82,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             this.visit(ctxDataExpr);
             const value = this.getResult(ctxDataExpr);
             if (!reference.found) {
-                throw 'Undefined reference: ' + reference.name;
+                this.throwWithContext(ctx, 'Undefined reference: ' + reference.name);
             }
             const trailers = reference.trailers ?? [];
             let currentValue = null;
@@ -94,7 +98,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 }
             }
             if (currentValue === null) {
-                throw 'Operator assignment failed: could not get value';
+                this.throwWithContext(ctx, 'Operator assignment failed: could not get value');
             }
             let newValue = 0;
             if (ctx.AdditionAssign()) {
@@ -113,7 +117,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 newValue = currentValue % value;
             }
             else {
-                throw 'Operator assignment failed: could not perform operator';
+                this.throwWithContext(ctx, 'Operator assignment failed: could not perform operator');
             }
             if (trailers.length === 0) {
                 this.getExecutor().scope.variables.set(reference.name, newValue);
@@ -133,6 +137,14 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             const firstId = ctx.ID(0);
             const atomId = firstId.getText();
             let currentReference;
+            const idTrailers = [];
+            if (ctx.ID().length > 1) {
+                const idLength = ctx.ID().length;
+                for (let i = 1; i < idLength; i++) {
+                    const tmpCtx = ctx.ID(i);
+                    idTrailers.push(tmpCtx.getText());
+                }
+            }
             if (this.pinTypesList.indexOf(atomId) !== -1) {
                 currentReference = {
                     found: true,
@@ -141,26 +153,17 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                 };
             }
             else {
-                currentReference = executor.resolveVariable(this.executionStack, atomId);
-            }
-            const idTrailers = [];
-            if (ctx.ID().length > 1) {
-                const idLength = ctx.ID().length;
-                for (let i = 1; i < idLength; i++) {
-                    const tmpCtx = ctx.ID(i);
-                    idTrailers.push(tmpCtx.getText());
-                }
+                currentReference = executor.resolveVariable(this.executionStack, atomId, idTrailers);
             }
-            currentReference.trailers = idTrailers;
-            if (currentReference.found && currentReference.type === 'instance') {
+            if (currentReference.found && currentReference.type === 'instance' && idTrailers.length === 0) {
                 const tmpComponent = currentReference.value;
                 for (const [pinId, net] of tmpComponent.pinNets) {
                     executor.scope.setNet(tmpComponent, pinId, net);
                 }
             }
-            this.getExecutor().log('atomId:', atomId, currentReference);
+            this.log2(`atomId: ${atomId} ${currentReference}`);
             if (ctx.parent instanceof CircuitScriptParser_1.ExpressionContext && !currentReference.found) {
-                throw "Unknown symbol: " + atomId;
+                this.throwWithContext(ctx, "Unknown symbol: " + atomId);
             }
             this.setResult(ctx, currentReference);
         };
@@ -182,7 +185,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             let currentReference = executor.resolveVariable(this.executionStack, atomId);
             if (ctx.trailer_expr().length > 0) {
                 if (!currentReference.found) {
-                    throw "Unknown function name: " + atomId;
+                    this.throwWithContext(ctx, "Unknown function name: " + atomId);
                 }
                 currentReference.trailers = [];
                 ctx.trailer_expr().forEach(item => {
@@ -195,13 +198,18 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
                             parameters = this.getResult(ctxParameters);
                         }
                         const useNetNamespace = this.getNetNamespace(executor.netNamespace, passedNetNamespace);
-                        const [, functionResult] = executor.callFunction(currentReference.name, parameters, this.executionStack, useNetNamespace);
-                        currentReference = {
-                            found: true,
-                            value: functionResult,
-                            type: (functionResult instanceof ClassComponent_1.ClassComponent) ?
-                                'instance' : 'value',
-                        };
+                        try {
+                            const [, functionResult] = executor.callFunction(currentReference.name, parameters, this.executionStack, useNetNamespace);
+                            currentReference = {
+                                found: true,
+                                value: functionResult,
+                                type: (functionResult instanceof ClassComponent_1.ClassComponent) ?
+                                    'instance' : 'value',
+                            };
+                        }
+                        catch (err) {
+                            this.throwWithContext(ctx, err);
+                        }
                     }
                     else {
                         currentReference.trailers.push(itemValue);
@@ -233,7 +241,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
             }
             else {
                 if (sign === -1) {
-                    throw "Invalid value!";
+                    this.throwWithContext(ctx, "Invalid value");
                 }
             }
             if (ctxBooleanValue) {
@@ -320,7 +328,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         this.visitImport_expr = (ctx) => {
             const ID = ctx.ID().toString();
             this.log('import', ID);
-            this.handleImportFile(ID, true);
+            this.handleImportFile(ID, true, ctx);
             this.log('done import', ID);
         };
         this.visitFunction_return_expr = (ctx) => {
@@ -420,12 +428,15 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     getReference(ctx) {
         const atomStr = ctx.getText();
         if (atomStr.indexOf('(') !== -1 || atomStr.indexOf(')') !== -1) {
-            throw "Invalid assignment expression!";
+            this.throwWithContext(ctx, "Invalid assignment expression!");
         }
         this.visit(ctx);
         const reference = this.getResult(ctx);
-        if (!reference.found && reference.trailers && reference.trailers.length > 0) {
-            throw 'Undefined reference: ' + reference.name + '.' + reference.trailers.join('.');
+        const { trailers = [] } = reference;
+        const undefinedParentWithTrailers = trailers.length > 0
+            && reference.parentValue === undefined;
+        if (undefinedParentWithTrailers) {
+            this.throwWithContext(ctx, 'Undefined reference: ' + reference.name + '.' + trailers.join('.'));
         }
         return reference;
     }
@@ -435,7 +446,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     getResult(ctx) {
         return this.resultData.get(ctx);
     }
-    handleImportFile(name, throwErrors = true) {
+    handleImportFile(name, throwErrors = true, ctx = null) {
         let hasError = false;
         let hasParseError = false;
         let pathExists = false;
@@ -470,14 +481,18 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
         catch (err) {
             this.log('Failed to import file: ', err.message);
         }
+        let errorMessage = null;
         if (throwErrors && (hasError || hasParseError || !pathExists)) {
             if (!pathExists) {
-                throw `File does not exist: ${name}`;
+                errorMessage = `File does not exist: ${name}`;
             }
             else {
-                throw `Failed to import: ${name}`;
+                errorMessage = `Failed to import: ${name}`;
             }
         }
+        if (errorMessage !== null && ctx) {
+            this.throwWithContext(ctx, errorMessage);
+        }
         return {
             hasError,
             hasParseError,
@@ -559,7 +574,7 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     setInstanceParam(object, trailers, value) {
         const paramName = trailers[0];
         object.setParam(paramName, value);
-        this.getExecutor().log(`set instance ${object.instanceName} param ${paramName} to ${value}`);
+        this.log2(`set instance ${object.instanceName} param ${paramName} to ${value}`);
     }
     getInstanceParam(object, trailers) {
         const paramName = trailers[0];
@@ -580,5 +595,8 @@ class BaseVisitor extends CircuitScriptVisitor_1.CircuitScriptVisitor {
     prepareStringValue(value) {
         return value.slice(1, value.length - 1);
     }
+    throwWithContext(context, message) {
+        (0, utils_1.throwWithContext)(context, message);
+    }
 }
 exports.BaseVisitor = BaseVisitor;

package/dist/cjs/SymbolValidatorVisitor.js

@@ -9,7 +9,7 @@ class SymbolValidatorVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.symbolTable = new SymbolTable();
         this.visitImport_expr = (ctx) => {
             const ID = ctx.ID().toString();
-            const { pathExists } = this.handleImportFile(ID, false);
+            const { pathExists } = this.handleImportFile(ID, false, ctx);
             if (!pathExists) {
                 this.symbolTable.addUndefined(this.getExecutor(), ID, ctx.ID());
             }

package/dist/cjs/antlr/CircuitScriptLexer.js

@@ -155,8 +155,8 @@ CircuitScriptLexer.literalNames = [
     "'branch'", "'create'", "'component'", "'graphic'", "'module'",
     "'wire'", "'pin'", "'add'", "'at'", "'to'", "'point'", "'join'",
     "'parallel'", "'return'", "'def'", "'import'", "'for'", "'in'",
-    "'while'", "'continue'", "'if'", "'else'", "'!'", "'frame'", "'sheet'",
-    "'=='", "'!='", "'>'", "'>='", "'<'", "'<='", "'&&'", "'||'", "'+'",
+    "'while'", "'continue'", "'if'", "'else'", null, "'frame'", "'sheet'",
+    "'=='", "'!='", "'>'", "'>='", "'<'", "'<='", null, null, "'+'",
     "'-'", "'/'", "'*'", "'%'", "'+='", "'-='", "'/='", "'*='", "'%='",
     "'('", "')'"
 ];
@@ -191,7 +191,7 @@ CircuitScriptLexer.ruleNames = [
     "COMMENT_FRAGMENT", "COMMENT",
 ];
 CircuitScriptLexer._serializedATN = [
-    4, 0, 65, 479, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5,
+    4, 0, 65, 490, 6, -1, 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,
@@ -212,24 +212,25 @@ CircuitScriptLexer._serializedATN = [
     1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24,
     1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27,
     1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29,
-    1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32,
-    1, 32, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36,
-    1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40,
-    1, 41, 1, 41, 1, 42, 1, 42, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46,
-    1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 51,
-    1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 3, 53, 356, 8, 53, 1, 54,
-    1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 3, 54, 367, 8, 54, 1, 55, 1, 55,
-    5, 55, 371, 8, 55, 10, 55, 12, 55, 374, 9, 55, 1, 56, 1, 56, 1, 56, 5, 56, 379, 8, 56,
-    10, 56, 12, 56, 382, 9, 56, 3, 56, 384, 8, 56, 1, 57, 4, 57, 387, 8, 57, 11, 57, 12, 57,
-    388, 1, 57, 5, 57, 392, 8, 57, 10, 57, 12, 57, 395, 9, 57, 1, 57, 3, 57, 398, 8, 57, 1,
-    58, 1, 58, 1, 58, 1, 58, 5, 58, 404, 8, 58, 10, 58, 12, 58, 407, 9, 58, 1, 59, 1, 59, 3,
-    59, 411, 8, 59, 1, 59, 3, 59, 414, 8, 59, 1, 60, 1, 60, 5, 60, 418, 8, 60, 10, 60, 12,
-    60, 421, 9, 60, 1, 60, 1, 60, 1, 61, 4, 61, 426, 8, 61, 11, 61, 12, 61, 427, 1, 61, 5,
-    61, 431, 8, 61, 10, 61, 12, 61, 434, 9, 61, 1, 61, 1, 61, 1, 62, 4, 62, 439, 8, 62, 11,
-    62, 12, 62, 440, 1, 63, 4, 63, 444, 8, 63, 11, 63, 12, 63, 445, 1, 63, 1, 63, 1, 64, 3,
-    64, 451, 8, 64, 1, 64, 1, 64, 3, 64, 455, 8, 64, 1, 64, 3, 64, 458, 8, 64, 1, 64, 1, 64,
-    1, 65, 4, 65, 463, 8, 65, 11, 65, 12, 65, 464, 1, 66, 1, 66, 5, 66, 469, 8, 66, 10, 66,
-    12, 66, 472, 9, 66, 1, 67, 1, 67, 3, 67, 476, 8, 67, 1, 67, 1, 67, 1, 419, 0, 68, 1, 1,
+    1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 3, 30, 289, 8, 30, 1, 31, 1, 31, 1, 31,
+    1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 34,
+    1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 39,
+    1, 39, 1, 39, 1, 39, 1, 39, 3, 39, 324, 8, 39, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 330, 8,
+    40, 1, 41, 1, 41, 1, 42, 1, 42, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1,
+    46, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1,
+    51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 3, 53, 367, 8, 53, 1,
+    54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 3, 54, 378, 8, 54, 1, 55, 1,
+    55, 5, 55, 382, 8, 55, 10, 55, 12, 55, 385, 9, 55, 1, 56, 1, 56, 1, 56, 5, 56, 390, 8,
+    56, 10, 56, 12, 56, 393, 9, 56, 3, 56, 395, 8, 56, 1, 57, 4, 57, 398, 8, 57, 11, 57, 12,
+    57, 399, 1, 57, 5, 57, 403, 8, 57, 10, 57, 12, 57, 406, 9, 57, 1, 57, 3, 57, 409, 8, 57,
+    1, 58, 1, 58, 1, 58, 1, 58, 5, 58, 415, 8, 58, 10, 58, 12, 58, 418, 9, 58, 1, 59, 1, 59,
+    3, 59, 422, 8, 59, 1, 59, 3, 59, 425, 8, 59, 1, 60, 1, 60, 5, 60, 429, 8, 60, 10, 60, 12,
+    60, 432, 9, 60, 1, 60, 1, 60, 1, 61, 4, 61, 437, 8, 61, 11, 61, 12, 61, 438, 1, 61, 5,
+    61, 442, 8, 61, 10, 61, 12, 61, 445, 9, 61, 1, 61, 1, 61, 1, 62, 4, 62, 450, 8, 62, 11,
+    62, 12, 62, 451, 1, 63, 4, 63, 455, 8, 63, 11, 63, 12, 63, 456, 1, 63, 1, 63, 1, 64, 3,
+    64, 462, 8, 64, 1, 64, 1, 64, 3, 64, 466, 8, 64, 1, 64, 3, 64, 469, 8, 64, 1, 64, 1, 64,
+    1, 65, 4, 65, 474, 8, 65, 11, 65, 12, 65, 475, 1, 66, 1, 66, 5, 66, 480, 8, 66, 10, 66,
+    12, 66, 483, 9, 66, 1, 67, 1, 67, 3, 67, 487, 8, 67, 1, 67, 1, 67, 1, 430, 0, 68, 1, 1,
     3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14,
     29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25,
     51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36,
@@ -239,7 +240,7 @@ CircuitScriptLexer._serializedATN = [
     133, 0, 135, 65, 1, 0, 10, 3, 0, 65, 90, 95, 95, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95,
     97, 122, 1, 0, 49, 57, 2, 0, 48, 57, 95, 95, 1, 0, 48, 57, 1, 0, 48, 48, 5, 0, 77, 77, 107,
     107, 109, 110, 112, 112, 117, 117, 3, 0, 48, 57, 65, 90, 97, 122, 2, 0, 9, 9, 32, 32,
-    2, 0, 10, 10, 12, 13, 497, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0,
+    2, 0, 10, 10, 12, 13, 511, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0,
     0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0,
     0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0,
     0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0,
@@ -259,16 +260,16 @@ CircuitScriptLexer._serializedATN = [
     206, 1, 0, 0, 0, 33, 210, 1, 0, 0, 0, 35, 213, 1, 0, 0, 0, 37, 216, 1, 0, 0, 0, 39, 222,
     1, 0, 0, 0, 41, 227, 1, 0, 0, 0, 43, 236, 1, 0, 0, 0, 45, 243, 1, 0, 0, 0, 47, 247, 1, 0,
     0, 0, 49, 254, 1, 0, 0, 0, 51, 258, 1, 0, 0, 0, 53, 261, 1, 0, 0, 0, 55, 267, 1, 0, 0, 0,
-    57, 276, 1, 0, 0, 0, 59, 279, 1, 0, 0, 0, 61, 284, 1, 0, 0, 0, 63, 286, 1, 0, 0, 0, 65, 292,
-    1, 0, 0, 0, 67, 298, 1, 0, 0, 0, 69, 301, 1, 0, 0, 0, 71, 304, 1, 0, 0, 0, 73, 306, 1, 0,
-    0, 0, 75, 309, 1, 0, 0, 0, 77, 311, 1, 0, 0, 0, 79, 314, 1, 0, 0, 0, 81, 317, 1, 0, 0, 0,
-    83, 320, 1, 0, 0, 0, 85, 322, 1, 0, 0, 0, 87, 324, 1, 0, 0, 0, 89, 326, 1, 0, 0, 0, 91, 328,
-    1, 0, 0, 0, 93, 330, 1, 0, 0, 0, 95, 333, 1, 0, 0, 0, 97, 336, 1, 0, 0, 0, 99, 339, 1, 0,
-    0, 0, 101, 342, 1, 0, 0, 0, 103, 345, 1, 0, 0, 0, 105, 348, 1, 0, 0, 0, 107, 355, 1, 0,
-    0, 0, 109, 366, 1, 0, 0, 0, 111, 368, 1, 0, 0, 0, 113, 383, 1, 0, 0, 0, 115, 397, 1, 0,
-    0, 0, 117, 399, 1, 0, 0, 0, 119, 410, 1, 0, 0, 0, 121, 415, 1, 0, 0, 0, 123, 425, 1, 0,
-    0, 0, 125, 438, 1, 0, 0, 0, 127, 443, 1, 0, 0, 0, 129, 454, 1, 0, 0, 0, 131, 462, 1, 0,
-    0, 0, 133, 466, 1, 0, 0, 0, 135, 475, 1, 0, 0, 0, 137, 138, 5, 58, 0, 0, 138, 2, 1, 0, 0,
+    57, 276, 1, 0, 0, 0, 59, 279, 1, 0, 0, 0, 61, 288, 1, 0, 0, 0, 63, 290, 1, 0, 0, 0, 65, 296,
+    1, 0, 0, 0, 67, 302, 1, 0, 0, 0, 69, 305, 1, 0, 0, 0, 71, 308, 1, 0, 0, 0, 73, 310, 1, 0,
+    0, 0, 75, 313, 1, 0, 0, 0, 77, 315, 1, 0, 0, 0, 79, 323, 1, 0, 0, 0, 81, 329, 1, 0, 0, 0,
+    83, 331, 1, 0, 0, 0, 85, 333, 1, 0, 0, 0, 87, 335, 1, 0, 0, 0, 89, 337, 1, 0, 0, 0, 91, 339,
+    1, 0, 0, 0, 93, 341, 1, 0, 0, 0, 95, 344, 1, 0, 0, 0, 97, 347, 1, 0, 0, 0, 99, 350, 1, 0,
+    0, 0, 101, 353, 1, 0, 0, 0, 103, 356, 1, 0, 0, 0, 105, 359, 1, 0, 0, 0, 107, 366, 1, 0,
+    0, 0, 109, 377, 1, 0, 0, 0, 111, 379, 1, 0, 0, 0, 113, 394, 1, 0, 0, 0, 115, 408, 1, 0,
+    0, 0, 117, 410, 1, 0, 0, 0, 119, 421, 1, 0, 0, 0, 121, 426, 1, 0, 0, 0, 123, 436, 1, 0,
+    0, 0, 125, 449, 1, 0, 0, 0, 127, 454, 1, 0, 0, 0, 129, 465, 1, 0, 0, 0, 131, 473, 1, 0,
+    0, 0, 133, 477, 1, 0, 0, 0, 135, 486, 1, 0, 0, 0, 137, 138, 5, 58, 0, 0, 138, 2, 1, 0, 0,
     0, 139, 140, 5, 44, 0, 0, 140, 4, 1, 0, 0, 0, 141, 142, 5, 61, 0, 0, 142, 6, 1, 0, 0, 0,
     143, 144, 5, 46, 0, 0, 144, 145, 5, 46, 0, 0, 145, 8, 1, 0, 0, 0, 146, 147, 5, 46, 0, 0,
     147, 10, 1, 0, 0, 0, 148, 149, 5, 91, 0, 0, 149, 12, 1, 0, 0, 0, 150, 151, 5, 93, 0, 0,
@@ -307,64 +308,68 @@ CircuitScriptLexer._serializedATN = [
     0, 271, 272, 5, 105, 0, 0, 272, 273, 5, 110, 0, 0, 273, 274, 5, 117, 0, 0, 274, 275,
     5, 101, 0, 0, 275, 56, 1, 0, 0, 0, 276, 277, 5, 105, 0, 0, 277, 278, 5, 102, 0, 0, 278,
     58, 1, 0, 0, 0, 279, 280, 5, 101, 0, 0, 280, 281, 5, 108, 0, 0, 281, 282, 5, 115, 0, 0,
-    282, 283, 5, 101, 0, 0, 283, 60, 1, 0, 0, 0, 284, 285, 5, 33, 0, 0, 285, 62, 1, 0, 0, 0,
-    286, 287, 5, 102, 0, 0, 287, 288, 5, 114, 0, 0, 288, 289, 5, 97, 0, 0, 289, 290, 5, 109,
-    0, 0, 290, 291, 5, 101, 0, 0, 291, 64, 1, 0, 0, 0, 292, 293, 5, 115, 0, 0, 293, 294, 5,
-    104, 0, 0, 294, 295, 5, 101, 0, 0, 295, 296, 5, 101, 0, 0, 296, 297, 5, 116, 0, 0, 297,
-    66, 1, 0, 0, 0, 298, 299, 5, 61, 0, 0, 299, 300, 5, 61, 0, 0, 300, 68, 1, 0, 0, 0, 301,
-    302, 5, 33, 0, 0, 302, 303, 5, 61, 0, 0, 303, 70, 1, 0, 0, 0, 304, 305, 5, 62, 0, 0, 305,
-    72, 1, 0, 0, 0, 306, 307, 5, 62, 0, 0, 307, 308, 5, 61, 0, 0, 308, 74, 1, 0, 0, 0, 309,
-    310, 5, 60, 0, 0, 310, 76, 1, 0, 0, 0, 311, 312, 5, 60, 0, 0, 312, 313, 5, 61, 0, 0, 313,
-    78, 1, 0, 0, 0, 314, 315, 5, 38, 0, 0, 315, 316, 5, 38, 0, 0, 316, 80, 1, 0, 0, 0, 317,
-    318, 5, 124, 0, 0, 318, 319, 5, 124, 0, 0, 319, 82, 1, 0, 0, 0, 320, 321, 5, 43, 0, 0,
-    321, 84, 1, 0, 0, 0, 322, 323, 5, 45, 0, 0, 323, 86, 1, 0, 0, 0, 324, 325, 5, 47, 0, 0,
-    325, 88, 1, 0, 0, 0, 326, 327, 5, 42, 0, 0, 327, 90, 1, 0, 0, 0, 328, 329, 5, 37, 0, 0,
-    329, 92, 1, 0, 0, 0, 330, 331, 5, 43, 0, 0, 331, 332, 5, 61, 0, 0, 332, 94, 1, 0, 0, 0,
-    333, 334, 5, 45, 0, 0, 334, 335, 5, 61, 0, 0, 335, 96, 1, 0, 0, 0, 336, 337, 5, 47, 0,
-    0, 337, 338, 5, 61, 0, 0, 338, 98, 1, 0, 0, 0, 339, 340, 5, 42, 0, 0, 340, 341, 5, 61,
-    0, 0, 341, 100, 1, 0, 0, 0, 342, 343, 5, 37, 0, 0, 343, 344, 5, 61, 0, 0, 344, 102, 1,
-    0, 0, 0, 345, 346, 5, 40, 0, 0, 346, 347, 6, 51, 0, 0, 347, 104, 1, 0, 0, 0, 348, 349,
-    5, 41, 0, 0, 349, 350, 6, 52, 1, 0, 350, 106, 1, 0, 0, 0, 351, 352, 5, 110, 0, 0, 352,
-    356, 5, 99, 0, 0, 353, 354, 5, 78, 0, 0, 354, 356, 5, 67, 0, 0, 355, 351, 1, 0, 0, 0, 355,
-    353, 1, 0, 0, 0, 356, 108, 1, 0, 0, 0, 357, 358, 5, 116, 0, 0, 358, 359, 5, 114, 0, 0,
-    359, 360, 5, 117, 0, 0, 360, 367, 5, 101, 0, 0, 361, 362, 5, 102, 0, 0, 362, 363, 5,
-    97, 0, 0, 363, 364, 5, 108, 0, 0, 364, 365, 5, 115, 0, 0, 365, 367, 5, 101, 0, 0, 366,
-    357, 1, 0, 0, 0, 366, 361, 1, 0, 0, 0, 367, 110, 1, 0, 0, 0, 368, 372, 7, 0, 0, 0, 369,
-    371, 7, 1, 0, 0, 370, 369, 1, 0, 0, 0, 371, 374, 1, 0, 0, 0, 372, 370, 1, 0, 0, 0, 372,
-    373, 1, 0, 0, 0, 373, 112, 1, 0, 0, 0, 374, 372, 1, 0, 0, 0, 375, 384, 5, 48, 0, 0, 376,
-    380, 7, 2, 0, 0, 377, 379, 7, 3, 0, 0, 378, 377, 1, 0, 0, 0, 379, 382, 1, 0, 0, 0, 380,
-    378, 1, 0, 0, 0, 380, 381, 1, 0, 0, 0, 381, 384, 1, 0, 0, 0, 382, 380, 1, 0, 0, 0, 383,
-    375, 1, 0, 0, 0, 383, 376, 1, 0, 0, 0, 384, 114, 1, 0, 0, 0, 385, 387, 7, 2, 0, 0, 386,
-    385, 1, 0, 0, 0, 387, 388, 1, 0, 0, 0, 388, 386, 1, 0, 0, 0, 388, 389, 1, 0, 0, 0, 389,
-    393, 1, 0, 0, 0, 390, 392, 7, 4, 0, 0, 391, 390, 1, 0, 0, 0, 392, 395, 1, 0, 0, 0, 393,
-    391, 1, 0, 0, 0, 393, 394, 1, 0, 0, 0, 394, 398, 1, 0, 0, 0, 395, 393, 1, 0, 0, 0, 396,
-    398, 7, 5, 0, 0, 397, 386, 1, 0, 0, 0, 397, 396, 1, 0, 0, 0, 398, 116, 1, 0, 0, 0, 399,
-    400, 3, 113, 56, 0, 400, 401, 5, 46, 0, 0, 401, 405, 7, 4, 0, 0, 402, 404, 7, 3, 0, 0,
-    403, 402, 1, 0, 0, 0, 404, 407, 1, 0, 0, 0, 405, 403, 1, 0, 0, 0, 405, 406, 1, 0, 0, 0,
-    406, 118, 1, 0, 0, 0, 407, 405, 1, 0, 0, 0, 408, 411, 3, 115, 57, 0, 409, 411, 3, 117,
-    58, 0, 410, 408, 1, 0, 0, 0, 410, 409, 1, 0, 0, 0, 411, 413, 1, 0, 0, 0, 412, 414, 7, 6,
-    0, 0, 413, 412, 1, 0, 0, 0, 413, 414, 1, 0, 0, 0, 414, 120, 1, 0, 0, 0, 415, 419, 5, 34,
-    0, 0, 416, 418, 9, 0, 0, 0, 417, 416, 1, 0, 0, 0, 418, 421, 1, 0, 0, 0, 419, 420, 1, 0,
-    0, 0, 419, 417, 1, 0, 0, 0, 420, 422, 1, 0, 0, 0, 421, 419, 1, 0, 0, 0, 422, 423, 5, 34,
-    0, 0, 423, 122, 1, 0, 0, 0, 424, 426, 7, 2, 0, 0, 425, 424, 1, 0, 0, 0, 426, 427, 1, 0,
-    0, 0, 427, 425, 1, 0, 0, 0, 427, 428, 1, 0, 0, 0, 428, 432, 1, 0, 0, 0, 429, 431, 7, 4,
-    0, 0, 430, 429, 1, 0, 0, 0, 431, 434, 1, 0, 0, 0, 432, 430, 1, 0, 0, 0, 432, 433, 1, 0,
-    0, 0, 433, 435, 1, 0, 0, 0, 434, 432, 1, 0, 0, 0, 435, 436, 5, 37, 0, 0, 436, 124, 1, 0,
-    0, 0, 437, 439, 7, 7, 0, 0, 438, 437, 1, 0, 0, 0, 439, 440, 1, 0, 0, 0, 440, 438, 1, 0,
-    0, 0, 440, 441, 1, 0, 0, 0, 441, 126, 1, 0, 0, 0, 442, 444, 7, 8, 0, 0, 443, 442, 1, 0,
-    0, 0, 444, 445, 1, 0, 0, 0, 445, 443, 1, 0, 0, 0, 445, 446, 1, 0, 0, 0, 446, 447, 1, 0,
-    0, 0, 447, 448, 6, 63, 2, 0, 448, 128, 1, 0, 0, 0, 449, 451, 5, 13, 0, 0, 450, 449, 1,
-    0, 0, 0, 450, 451, 1, 0, 0, 0, 451, 452, 1, 0, 0, 0, 452, 455, 5, 10, 0, 0, 453, 455, 2,
-    12, 13, 0, 454, 450, 1, 0, 0, 0, 454, 453, 1, 0, 0, 0, 455, 457, 1, 0, 0, 0, 456, 458,
-    3, 131, 65, 0, 457, 456, 1, 0, 0, 0, 457, 458, 1, 0, 0, 0, 458, 459, 1, 0, 0, 0, 459, 460,
-    6, 64, 3, 0, 460, 130, 1, 0, 0, 0, 461, 463, 7, 8, 0, 0, 462, 461, 1, 0, 0, 0, 463, 464,
-    1, 0, 0, 0, 464, 462, 1, 0, 0, 0, 464, 465, 1, 0, 0, 0, 465, 132, 1, 0, 0, 0, 466, 470,
-    5, 35, 0, 0, 467, 469, 8, 9, 0, 0, 468, 467, 1, 0, 0, 0, 469, 472, 1, 0, 0, 0, 470, 468,
-    1, 0, 0, 0, 470, 471, 1, 0, 0, 0, 471, 134, 1, 0, 0, 0, 472, 470, 1, 0, 0, 0, 473, 476,
-    3, 127, 63, 0, 474, 476, 3, 133, 66, 0, 475, 473, 1, 0, 0, 0, 475, 474, 1, 0, 0, 0, 476,
-    477, 1, 0, 0, 0, 477, 478, 6, 67, 4, 0, 478, 136, 1, 0, 0, 0, 23, 0, 355, 366, 372, 380,
-    383, 388, 393, 397, 405, 410, 413, 419, 427, 432, 440, 445, 450, 454, 457, 464,
-    470, 475, 5, 1, 51, 0, 1, 52, 1, 6, 0, 0, 1, 64, 2, 0, 2, 0
+    282, 283, 5, 101, 0, 0, 283, 60, 1, 0, 0, 0, 284, 289, 5, 33, 0, 0, 285, 286, 5, 110,
+    0, 0, 286, 287, 5, 111, 0, 0, 287, 289, 5, 116, 0, 0, 288, 284, 1, 0, 0, 0, 288, 285,
+    1, 0, 0, 0, 289, 62, 1, 0, 0, 0, 290, 291, 5, 102, 0, 0, 291, 292, 5, 114, 0, 0, 292, 293,
+    5, 97, 0, 0, 293, 294, 5, 109, 0, 0, 294, 295, 5, 101, 0, 0, 295, 64, 1, 0, 0, 0, 296,
+    297, 5, 115, 0, 0, 297, 298, 5, 104, 0, 0, 298, 299, 5, 101, 0, 0, 299, 300, 5, 101,
+    0, 0, 300, 301, 5, 116, 0, 0, 301, 66, 1, 0, 0, 0, 302, 303, 5, 61, 0, 0, 303, 304, 5,
+    61, 0, 0, 304, 68, 1, 0, 0, 0, 305, 306, 5, 33, 0, 0, 306, 307, 5, 61, 0, 0, 307, 70, 1,
+    0, 0, 0, 308, 309, 5, 62, 0, 0, 309, 72, 1, 0, 0, 0, 310, 311, 5, 62, 0, 0, 311, 312, 5,
+    61, 0, 0, 312, 74, 1, 0, 0, 0, 313, 314, 5, 60, 0, 0, 314, 76, 1, 0, 0, 0, 315, 316, 5,
+    60, 0, 0, 316, 317, 5, 61, 0, 0, 317, 78, 1, 0, 0, 0, 318, 319, 5, 38, 0, 0, 319, 324,
+    5, 38, 0, 0, 320, 321, 5, 97, 0, 0, 321, 322, 5, 110, 0, 0, 322, 324, 5, 100, 0, 0, 323,
+    318, 1, 0, 0, 0, 323, 320, 1, 0, 0, 0, 324, 80, 1, 0, 0, 0, 325, 326, 5, 124, 0, 0, 326,
+    330, 5, 124, 0, 0, 327, 328, 5, 111, 0, 0, 328, 330, 5, 114, 0, 0, 329, 325, 1, 0, 0,
+    0, 329, 327, 1, 0, 0, 0, 330, 82, 1, 0, 0, 0, 331, 332, 5, 43, 0, 0, 332, 84, 1, 0, 0, 0,
+    333, 334, 5, 45, 0, 0, 334, 86, 1, 0, 0, 0, 335, 336, 5, 47, 0, 0, 336, 88, 1, 0, 0, 0,
+    337, 338, 5, 42, 0, 0, 338, 90, 1, 0, 0, 0, 339, 340, 5, 37, 0, 0, 340, 92, 1, 0, 0, 0,
+    341, 342, 5, 43, 0, 0, 342, 343, 5, 61, 0, 0, 343, 94, 1, 0, 0, 0, 344, 345, 5, 45, 0,
+    0, 345, 346, 5, 61, 0, 0, 346, 96, 1, 0, 0, 0, 347, 348, 5, 47, 0, 0, 348, 349, 5, 61,
+    0, 0, 349, 98, 1, 0, 0, 0, 350, 351, 5, 42, 0, 0, 351, 352, 5, 61, 0, 0, 352, 100, 1, 0,
+    0, 0, 353, 354, 5, 37, 0, 0, 354, 355, 5, 61, 0, 0, 355, 102, 1, 0, 0, 0, 356, 357, 5,
+    40, 0, 0, 357, 358, 6, 51, 0, 0, 358, 104, 1, 0, 0, 0, 359, 360, 5, 41, 0, 0, 360, 361,
+    6, 52, 1, 0, 361, 106, 1, 0, 0, 0, 362, 363, 5, 110, 0, 0, 363, 367, 5, 99, 0, 0, 364,
+    365, 5, 78, 0, 0, 365, 367, 5, 67, 0, 0, 366, 362, 1, 0, 0, 0, 366, 364, 1, 0, 0, 0, 367,
+    108, 1, 0, 0, 0, 368, 369, 5, 116, 0, 0, 369, 370, 5, 114, 0, 0, 370, 371, 5, 117, 0,
+    0, 371, 378, 5, 101, 0, 0, 372, 373, 5, 102, 0, 0, 373, 374, 5, 97, 0, 0, 374, 375, 5,
+    108, 0, 0, 375, 376, 5, 115, 0, 0, 376, 378, 5, 101, 0, 0, 377, 368, 1, 0, 0, 0, 377,
+    372, 1, 0, 0, 0, 378, 110, 1, 0, 0, 0, 379, 383, 7, 0, 0, 0, 380, 382, 7, 1, 0, 0, 381,
+    380, 1, 0, 0, 0, 382, 385, 1, 0, 0, 0, 383, 381, 1, 0, 0, 0, 383, 384, 1, 0, 0, 0, 384,
+    112, 1, 0, 0, 0, 385, 383, 1, 0, 0, 0, 386, 395, 5, 48, 0, 0, 387, 391, 7, 2, 0, 0, 388,
+    390, 7, 3, 0, 0, 389, 388, 1, 0, 0, 0, 390, 393, 1, 0, 0, 0, 391, 389, 1, 0, 0, 0, 391,
+    392, 1, 0, 0, 0, 392, 395, 1, 0, 0, 0, 393, 391, 1, 0, 0, 0, 394, 386, 1, 0, 0, 0, 394,
+    387, 1, 0, 0, 0, 395, 114, 1, 0, 0, 0, 396, 398, 7, 2, 0, 0, 397, 396, 1, 0, 0, 0, 398,
+    399, 1, 0, 0, 0, 399, 397, 1, 0, 0, 0, 399, 400, 1, 0, 0, 0, 400, 404, 1, 0, 0, 0, 401,
+    403, 7, 4, 0, 0, 402, 401, 1, 0, 0, 0, 403, 406, 1, 0, 0, 0, 404, 402, 1, 0, 0, 0, 404,
+    405, 1, 0, 0, 0, 405, 409, 1, 0, 0, 0, 406, 404, 1, 0, 0, 0, 407, 409, 7, 5, 0, 0, 408,
+    397, 1, 0, 0, 0, 408, 407, 1, 0, 0, 0, 409, 116, 1, 0, 0, 0, 410, 411, 3, 113, 56, 0, 411,
+    412, 5, 46, 0, 0, 412, 416, 7, 4, 0, 0, 413, 415, 7, 3, 0, 0, 414, 413, 1, 0, 0, 0, 415,
+    418, 1, 0, 0, 0, 416, 414, 1, 0, 0, 0, 416, 417, 1, 0, 0, 0, 417, 118, 1, 0, 0, 0, 418,
+    416, 1, 0, 0, 0, 419, 422, 3, 115, 57, 0, 420, 422, 3, 117, 58, 0, 421, 419, 1, 0, 0,
+    0, 421, 420, 1, 0, 0, 0, 422, 424, 1, 0, 0, 0, 423, 425, 7, 6, 0, 0, 424, 423, 1, 0, 0,
+    0, 424, 425, 1, 0, 0, 0, 425, 120, 1, 0, 0, 0, 426, 430, 5, 34, 0, 0, 427, 429, 9, 0, 0,
+    0, 428, 427, 1, 0, 0, 0, 429, 432, 1, 0, 0, 0, 430, 431, 1, 0, 0, 0, 430, 428, 1, 0, 0,
+    0, 431, 433, 1, 0, 0, 0, 432, 430, 1, 0, 0, 0, 433, 434, 5, 34, 0, 0, 434, 122, 1, 0, 0,
+    0, 435, 437, 7, 2, 0, 0, 436, 435, 1, 0, 0, 0, 437, 438, 1, 0, 0, 0, 438, 436, 1, 0, 0,
+    0, 438, 439, 1, 0, 0, 0, 439, 443, 1, 0, 0, 0, 440, 442, 7, 4, 0, 0, 441, 440, 1, 0, 0,
+    0, 442, 445, 1, 0, 0, 0, 443, 441, 1, 0, 0, 0, 443, 444, 1, 0, 0, 0, 444, 446, 1, 0, 0,
+    0, 445, 443, 1, 0, 0, 0, 446, 447, 5, 37, 0, 0, 447, 124, 1, 0, 0, 0, 448, 450, 7, 7, 0,
+    0, 449, 448, 1, 0, 0, 0, 450, 451, 1, 0, 0, 0, 451, 449, 1, 0, 0, 0, 451, 452, 1, 0, 0,
+    0, 452, 126, 1, 0, 0, 0, 453, 455, 7, 8, 0, 0, 454, 453, 1, 0, 0, 0, 455, 456, 1, 0, 0,
+    0, 456, 454, 1, 0, 0, 0, 456, 457, 1, 0, 0, 0, 457, 458, 1, 0, 0, 0, 458, 459, 6, 63, 2,
+    0, 459, 128, 1, 0, 0, 0, 460, 462, 5, 13, 0, 0, 461, 460, 1, 0, 0, 0, 461, 462, 1, 0, 0,
+    0, 462, 463, 1, 0, 0, 0, 463, 466, 5, 10, 0, 0, 464, 466, 2, 12, 13, 0, 465, 461, 1, 0,
+    0, 0, 465, 464, 1, 0, 0, 0, 466, 468, 1, 0, 0, 0, 467, 469, 3, 131, 65, 0, 468, 467, 1,
+    0, 0, 0, 468, 469, 1, 0, 0, 0, 469, 470, 1, 0, 0, 0, 470, 471, 6, 64, 3, 0, 471, 130, 1,
+    0, 0, 0, 472, 474, 7, 8, 0, 0, 473, 472, 1, 0, 0, 0, 474, 475, 1, 0, 0, 0, 475, 473, 1,
+    0, 0, 0, 475, 476, 1, 0, 0, 0, 476, 132, 1, 0, 0, 0, 477, 481, 5, 35, 0, 0, 478, 480, 8,
+    9, 0, 0, 479, 478, 1, 0, 0, 0, 480, 483, 1, 0, 0, 0, 481, 479, 1, 0, 0, 0, 481, 482, 1,
+    0, 0, 0, 482, 134, 1, 0, 0, 0, 483, 481, 1, 0, 0, 0, 484, 487, 3, 127, 63, 0, 485, 487,
+    3, 133, 66, 0, 486, 484, 1, 0, 0, 0, 486, 485, 1, 0, 0, 0, 487, 488, 1, 0, 0, 0, 488, 489,
+    6, 67, 4, 0, 489, 136, 1, 0, 0, 0, 26, 0, 288, 323, 329, 366, 377, 383, 391, 394, 399,
+    404, 408, 416, 421, 424, 430, 438, 443, 451, 456, 461, 465, 468, 475, 481, 486,
+    5, 1, 51, 0, 1, 52, 1, 6, 0, 0, 1, 64, 2, 0, 2, 0
 ];
 CircuitScriptLexer.vocabulary = new antlr.Vocabulary(CircuitScriptLexer.literalNames, CircuitScriptLexer.symbolicNames, []);
 CircuitScriptLexer.decisionsToDFA = CircuitScriptLexer._ATN.decisionToState.map((ds, index) => new antlr.DFA(ds, index));