circuitscript 0.0.38 → 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());
             }