brighterscript 1.0.0-alpha.16 → 1.0.0-alpha.19

package/dist/parser/Statement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.ClassMethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = exports.Statement = void 0;
+exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.ClassMethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = exports.Statement = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
@@ -11,6 +11,7 @@ const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
 const CustomType_1 = require("../types/CustomType");
+const InterfaceType_1 = require("../types/InterfaceType");
 /**
  * A BrightScript statement
  */
@@ -326,14 +327,11 @@ class IfStatement extends Statement {
         results.push(' ');
         //conditions
         results.push(...this.condition.transpile(state));
-        results.push(' ');
         //then
         if (this.tokens.then) {
+            results.push(' ');
             results.push(state.transpileToken(this.tokens.then));
         }
-        else {
-            results.push('then');
-        }
         state.lineage.unshift(this);
         //if statement body
         let thenNodes = this.thenBranch.transpile(state);
@@ -354,7 +352,8 @@ class IfStatement extends Statement {
                 let body = this.elseBranch.transpile(state);
                 state.lineage.shift();
                 if (body.length > 0) {
-                    results.push(' ');
+                    //zero or more spaces between the `else` and the `if`
+                    results.push(this.elseBranch.tokens.if.leadingWhitespace);
                     results.push(...body);
                     // stop here because chained if will transpile the rest
                     return results;
@@ -928,28 +927,37 @@ class ImportStatement extends Statement {
 exports.ImportStatement = ImportStatement;
 class InterfaceStatement extends Statement {
     constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken, namespaceName) {
-        var _a;
+        var _a, _b, _c;
         super();
+        this.name = name;
         this.parentInterfaceName = parentInterfaceName;
         this.body = body;
         this.namespaceName = namespaceName;
+        this.memberTable = new SymbolTable_1.SymbolTable();
         this.tokens = {};
+        this.memberMap = {};
+        this.methods = [];
+        this.fields = [];
         this.tokens.interface = interfaceToken;
         this.tokens.name = name;
         this.tokens.extends = extendsToken;
         this.tokens.endInterface = endInterfaceToken;
         this.range = (_a = util_1.util.createBoundingRange(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
-    }
-    get fields() {
-        return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
-    }
-    get methods() {
-        return this.body.filter(x => (0, reflection_1.isInterfaceMethodStatement)(x));
+        for (let statement of this.body) {
+            if ((0, reflection_1.isInterfaceMethodStatement)(statement)) {
+                this.methods.push(statement);
+                this.memberMap[(_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text.toLowerCase()] = statement;
+            }
+            else if ((0, reflection_1.isInterfaceFieldStatement)(statement)) {
+                this.fields.push(statement);
+                this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
+            }
+        }
     }
     /**
      * The name of the interface WITH its leading namespace (if applicable)
      */
-    get fullName() {
+    getName(parseMode) {
         var _a;
         const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
         if (name) {
@@ -966,12 +974,49 @@ class InterfaceStatement extends Statement {
             return undefined;
         }
     }
+    buildSymbolTable(parentIface) {
+        var _a, _b;
+        this.memberTable.clear();
+        if (parentIface) {
+            this.memberTable.setParent(parentIface === null || parentIface === void 0 ? void 0 : parentIface.memberTable);
+        }
+        for (const statement of this.methods) {
+            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getFunctionType();
+            this.memberTable.addSymbol((_a = statement === null || statement === void 0 ? void 0 : statement.name) === null || _a === void 0 ? void 0 : _a.text, statement === null || statement === void 0 ? void 0 : statement.range, funcType);
+        }
+        for (const statement of this.fields) {
+            this.memberTable.addSymbol((_b = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType());
+        }
+    }
+    hasParent() {
+        return !!this.parentInterfaceName;
+    }
+    getParentName() {
+        return !!this.parentInterfaceName;
+    }
     /**
-     * The name of the interface (without the namespace prefix)
+     * Gets an array of possible parent interface names, taking into account the namespace this interface was created under
+     * @returns array of possible parent interface names
      */
-    get name() {
+    getPossibleFullParentNames() {
         var _a;
-        return (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+        if (!this.hasParent()) {
+            return [];
+        }
+        if (((_a = this.parentInterfaceName) === null || _a === void 0 ? void 0 : _a.getNameParts().length) > 1) {
+            // The specified parent interface already has a dot, so it must already reference a namespace
+            return [this.parentInterfaceName.getName()];
+        }
+        const names = [];
+        if (this.namespaceName) {
+            // We're under a namespace, so the full parent name MIGHT be with this namespace too
+            names.push(this.namespaceName.getName() + '.' + this.parentInterfaceName.getName());
+        }
+        names.push(this.parentInterfaceName.getName());
+        return names;
+    }
+    getThisBscType() {
+        return new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
     }
     transpile(state) {
         //interfaces should completely disappear at runtime
@@ -1016,84 +1061,53 @@ class InterfaceStatement extends Statement {
 }
 exports.InterfaceStatement = InterfaceStatement;
 class InterfaceFieldStatement extends Statement {
-    constructor(nameToken, asToken, typeToken, type) {
+    constructor(nameToken, asToken, type, namespaceName) {
         var _a;
         super();
         this.type = type;
+        this.namespaceName = namespaceName;
         this.tokens = {};
         this.tokens.name = nameToken;
         this.tokens.as = asToken;
-        this.tokens.type = typeToken;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.tokens.type)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.type)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
+    getType() {
+        var _a;
+        return (_a = this.type) === null || _a === void 0 ? void 0 : _a.type;
+    }
     get name() {
-        return this.tokens.name.text;
+        return this.tokens.name;
     }
     walk(visitor, options) {
         //nothing to walk
     }
     getTypedef(state) {
-        var _a, _b, _c;
+        var _a;
         const result = [];
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
         result.push(this.tokens.name.text);
-        if (((_c = (_b = this.tokens.type) === null || _b === void 0 ? void 0 : _b.text) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-            result.push(' as ', this.tokens.type.text);
+        if (this.tokens.as && this.type) {
+            result.push(' as ', ...this.type.transpile(state));
         }
         return result;
     }
 }
 exports.InterfaceFieldStatement = InterfaceFieldStatement;
-class InterfaceMethodStatement extends Statement {
-    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeToken, returnType) {
-        var _a;
-        super();
-        this.params = params;
-        this.returnType = returnType;
-        this.tokens = {};
-        this.tokens.functionType = functionTypeToken;
-        this.tokens.name = nameToken;
-        this.tokens.leftParen = leftParen;
-        this.tokens.rightParen = rightParen;
-        this.tokens.as = asToken;
-        this.tokens.returnType = returnTypeToken;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.tokens.leftParen, ...this.params, this.tokens.rightParen, this.tokens.as, this.tokens.returnType)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+class InterfaceMethodStatement extends FunctionStatement {
+    transpile(state) {
+        throw new Error('Method not implemented.');
+    }
+    constructor(name, func) {
+        super(name, func, undefined);
     }
     walk(visitor, options) {
         //nothing to walk
     }
-    getTypedef(state) {
-        var _a, _b, _c, _d, _e;
-        const result = [];
-        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
-            result.push(...annotation.getTypedef(state), state.newline, state.indent());
-        }
-        result.push(this.tokens.functionType.text, ' ', this.tokens.name.text, '(');
-        const params = (_b = this.params) !== null && _b !== void 0 ? _b : [];
-        for (let i = 0; i < params.length; i++) {
-            if (i > 0) {
-                result.push(', ');
-            }
-            const param = params[i];
-            result.push(param.name.text);
-            if (((_d = (_c = param.typeToken) === null || _c === void 0 ? void 0 : _c.text) === null || _d === void 0 ? void 0 : _d.length) > 0) {
-                result.push(' as ', param.typeToken.text);
-            }
-        }
-        result.push(')');
-        if (((_e = this.tokens.returnType) === null || _e === void 0 ? void 0 : _e.text.length) > 0) {
-            result.push(' as ', this.tokens.returnType.text);
-        }
-        return result;
-    }
-    transpile(state) {
-        throw new Error('Method not implemented.');
-    }
 }
 exports.InterfaceMethodStatement = InterfaceMethodStatement;
 class ClassStatement extends Statement {
@@ -1149,7 +1163,7 @@ class ClassStatement extends Statement {
             return undefined;
         }
     }
-    getCustomType() {
+    getThisBscType() {
         return new CustomType_1.CustomType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
     }
     getConstructorFunctionType() {
@@ -1163,9 +1177,9 @@ class ClassStatement extends Statement {
     buildSymbolTable(parentClass) {
         var _a, _b, _c, _d, _e;
         this.symbolTable.clear();
-        this.symbolTable.addSymbol('m', (_a = this.name) === null || _a === void 0 ? void 0 : _a.range, this.getCustomType());
+        this.symbolTable.addSymbol('m', (_a = this.name) === null || _a === void 0 ? void 0 : _a.range, this.getThisBscType());
         this.memberTable.clear();
-        if (parentClass) {
+        if ((0, reflection_1.isClassStatement)(parentClass)) {
             this.symbolTable.addSymbol('super', (_b = this.parentClassName) === null || _b === void 0 ? void 0 : _b.range, parentClass.getConstructorFunctionType());
             this.memberTable.setParent(parentClass === null || parentClass === void 0 ? void 0 : parentClass.memberTable);
         }
@@ -1190,6 +1204,7 @@ class ClassStatement extends Statement {
     }
     getTypedef(state) {
         var _a, _b;
+        this.ensureConstructorFunctionExists();
         const result = [];
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
@@ -1231,7 +1246,7 @@ class ClassStatement extends Statement {
         }
         return myIndex - 1;
     }
-    hasParentClass() {
+    hasParent() {
         return !!this.parentClassName;
     }
     /**
@@ -1240,7 +1255,7 @@ class ClassStatement extends Statement {
      */
     getPossibleFullParentNames() {
         var _a;
-        if (!this.hasParentClass()) {
+        if (!this.hasParent()) {
             return [];
         }
         if (((_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getNameParts().length) > 1) {
@@ -1295,6 +1310,15 @@ class ClassStatement extends Statement {
     getEmptyNewFunction() {
         return (0, creators_1.createClassMethodStatement)('new', TokenKind_1.TokenKind.Sub);
     }
+    /**
+     * Create an empty `new` function if class is missing it (simplifies transpile logic)
+     */
+    ensureConstructorFunctionExists() {
+        if (!this.getConstructorFunction()) {
+            this.memberMap.new = this.getEmptyNewFunction();
+            this.body = [this.memberMap.new, ...this.body];
+        }
+    }
     /**
      * Determine if the specified field was declared in one of the ancestor classes
      */
@@ -1314,6 +1338,7 @@ class ClassStatement extends Statement {
      */
     getTranspiledBuilder(state) {
         var _a;
+        this.ensureConstructorFunctionExists();
         let result = [];
         result.push(`function ${this.getBuilderName(this.getName(Parser_1.ParseMode.BrightScript))}()\n`);
         state.blockDepth++;
@@ -1334,11 +1359,6 @@ class ClassStatement extends Statement {
         }
         result.push(state.newline, state.indent());
         let parentClassIndex = this.getParentClassIndex(state);
-        //create empty `new` function if class is missing it (simplifies transpile logic)
-        if (!this.getConstructorFunction()) {
-            this.memberMap.new = this.getEmptyNewFunction();
-            this.body = [this.memberMap.new, ...this.body];
-        }
         for (let statement of this.body) {
             //is field statement
             if ((0, reflection_1.isClassFieldStatement)(statement)) {
@@ -1526,7 +1546,7 @@ class ClassMethodStatement extends FunctionStatement {
      * Inject field initializers at the top of the `new` function (after any present `super()` call)
      */
     injectFieldInitializersForConstructor(state) {
-        let startingIndex = state.classStatement.hasParentClass() ? 1 : 0;
+        let startingIndex = state.classStatement.hasParent() ? 1 : 0;
         let newStatements = [];
         //insert the field initializers in order
         for (let field of state.classStatement.fields) {
@@ -1568,7 +1588,7 @@ class ClassFieldStatement extends Statement {
      */
     getType(parseMode = Parser_1.ParseMode.BrighterScript) {
         if (this.type) {
-            return util_1.util.tokenToBscType(this.type, parseMode === Parser_1.ParseMode.BrighterScript, this.namespaceName);
+            return this.type.type;
         }
         else if ((0, reflection_1.isLiteralExpression)(this.initialValue)) {
             return this.initialValue.type;
@@ -1596,47 +1616,70 @@ class ClassFieldStatement extends Statement {
         return result;
     }
     walk(visitor, options) {
-        if (this.initialValue && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'type', visitor, options);
             (0, visitors_1.walk)(this, 'initialValue', visitor, options);
         }
     }
 }
 exports.ClassFieldStatement = ClassFieldStatement;
 class TryCatchStatement extends Statement {
-    constructor(tryToken, tryBranch, catchToken, exceptionVariable, catchBranch, endTryToken) {
+    constructor(tokens, tryBranch, catchStatement) {
         var _a;
         super();
-        this.tryToken = tryToken;
+        this.tokens = tokens;
         this.tryBranch = tryBranch;
-        this.catchToken = catchToken;
-        this.exceptionVariable = exceptionVariable;
-        this.catchBranch = catchBranch;
-        this.endTryToken = endTryToken;
-        this.range = (_a = util_1.util.createBoundingRange(this.tryToken, this.tryBranch, this.catchToken, this.exceptionVariable, this.catchBranch, this.endTryToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.catchStatement = catchStatement;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.try, this.tryBranch, this.catchStatement, this.tokens.endTry)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
+        var _a, _b;
         return [
-            state.transpileToken(this.tryToken),
+            state.transpileToken(this.tokens.try),
             ...this.tryBranch.transpile(state),
             state.newline,
             state.indent(),
-            state.transpileToken(this.catchToken),
-            ' ',
-            state.transpileToken(this.exceptionVariable),
-            ...this.catchBranch.transpile(state),
+            ...((_b = (_a = this.catchStatement) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : ['catch']),
             state.newline,
             state.indent(),
-            state.transpileToken(this.endTryToken)
+            state.transpileToken(this.tokens.endTry)
         ];
     }
     walk(visitor, options) {
         if (this.tryBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
             (0, visitors_1.walk)(this, 'tryBranch', visitor, options);
-            (0, visitors_1.walk)(this, 'catchBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'catchStatement', visitor, options);
         }
     }
 }
 exports.TryCatchStatement = TryCatchStatement;
+class CatchStatement extends Statement {
+    constructor(tokens, exceptionVariable, catchBranch) {
+        super();
+        this.tokens = tokens;
+        this.exceptionVariable = exceptionVariable;
+        this.catchBranch = catchBranch;
+    }
+    get range() {
+        var _a, _b;
+        return util_1.util.createRangeFromPositions(this.tokens.catch.range.start, ((_b = (_a = this.catchBranch) !== null && _a !== void 0 ? _a : this.exceptionVariable) !== null && _b !== void 0 ? _b : this.tokens.catch).range.end);
+    }
+    transpile(state) {
+        var _a, _b, _c, _d;
+        return [
+            state.transpileToken(this.tokens.catch),
+            ' ',
+            (_b = (_a = this.exceptionVariable) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'e',
+            ...((_d = (_c = this.catchBranch) === null || _c === void 0 ? void 0 : _c.transpile(state)) !== null && _d !== void 0 ? _d : [])
+        ];
+    }
+    walk(visitor, options) {
+        if (this.catchBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            (0, visitors_1.walk)(this, 'catchBranch', visitor, options);
+        }
+    }
+}
+exports.CatchStatement = CatchStatement;
 class ThrowStatement extends Statement {
     constructor(throwToken, expression) {
         var _a;