brighterscript 0.65.0 → 0.66.0-alpha.0

package/dist/parser/Statement.js

@@ -1,17 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.FieldStatement = exports.ClassMethodStatement = exports.MethodStatement = 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 = void 0;
+exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.FieldStatement = exports.MethodStatement = 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 = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
 const Parser_1 = require("./Parser");
 const visitors_1 = require("../astUtils/visitors");
 const reflection_1 = require("../astUtils/reflection");
+const SymbolTable_1 = require("../SymbolTable");
 const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
-const SymbolTable_1 = require("../SymbolTable");
+const SymbolTable_2 = require("../SymbolTable");
 const AstNode_1 = require("./AstNode");
-class EmptyStatement extends AstNode_1.Statement {
+const AstNode_2 = require("./AstNode");
+const ClassType_1 = require("../types/ClassType");
+const EnumType_1 = require("../types/EnumType");
+const NamespaceType_1 = require("../types/NamespaceType");
+const InterfaceType_1 = require("../types/InterfaceType");
+const VoidType_1 = require("../types/VoidType");
+const FunctionType_1 = require("../types/FunctionType");
+class EmptyStatement extends AstNode_2.Statement {
     constructor(
     /**
      * Create a negative range to indicate this is an interpolated location
@@ -19,6 +27,7 @@ class EmptyStatement extends AstNode_1.Statement {
     range = creators_1.interpolatedRange) {
         super();
         this.range = range;
+        this.kind = AstNode_1.AstNodeKind.EmptyStatement;
     }
     transpile(state) {
         return [];
@@ -31,11 +40,12 @@ exports.EmptyStatement = EmptyStatement;
 /**
  * This is a top-level statement. Consider this the root of the AST
  */
-class Body extends AstNode_1.Statement {
+class Body extends AstNode_2.Statement {
     constructor(statements = []) {
         super();
         this.statements = statements;
-        this.symbolTable = new SymbolTable_1.SymbolTable('Body', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+        this.kind = AstNode_1.AstNodeKind.Body;
+        this.symbolTable = new SymbolTable_2.SymbolTable('Body', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
     get range() {
         var _a;
@@ -88,21 +98,17 @@ class Body extends AstNode_1.Statement {
     }
 }
 exports.Body = Body;
-class AssignmentStatement extends AstNode_1.Statement {
-    constructor(equals, name, value) {
+class AssignmentStatement extends AstNode_2.Statement {
+    constructor(equals, name, value, asToken, typeExpression) {
         super();
         this.equals = equals;
         this.name = name;
         this.value = value;
+        this.asToken = asToken;
+        this.typeExpression = typeExpression;
+        this.kind = AstNode_1.AstNodeKind.AssignmentStatement;
         this.range = util_1.util.createBoundingRange(name, equals, value);
     }
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isFunctionExpression)` instead.
-     */
-    get containingFunction() {
-        return this.findAncestor(reflection_1.isFunctionExpression);
-    }
     transpile(state) {
         var _a, _b;
         //if the value is a compound assignment, just transpile the expression itself
@@ -121,16 +127,22 @@ class AssignmentStatement extends AstNode_1.Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            //TODO: Walk TypeExpression. We need to decide how to implement types on assignments
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType(options) {
+        const rhs = this.value.getType(options);
+        return rhs;
+    }
 }
 exports.AssignmentStatement = AssignmentStatement;
-class Block extends AstNode_1.Statement {
+class Block extends AstNode_2.Statement {
     constructor(statements, startingRange) {
         super();
         this.statements = statements;
         this.startingRange = startingRange;
+        this.kind = AstNode_1.AstNodeKind.Block;
         this.range = util_1.util.createBoundingRange({ range: this.startingRange }, ...(statements !== null && statements !== void 0 ? statements : []));
     }
     transpile(state) {
@@ -164,10 +176,11 @@ class Block extends AstNode_1.Statement {
     }
 }
 exports.Block = Block;
-class ExpressionStatement extends AstNode_1.Statement {
+class ExpressionStatement extends AstNode_2.Statement {
     constructor(expression) {
         super();
         this.expression = expression;
+        this.kind = AstNode_1.AstNodeKind.ExpressionStatement;
         this.range = this.expression.range;
     }
     transpile(state) {
@@ -180,11 +193,12 @@ class ExpressionStatement extends AstNode_1.Statement {
     }
 }
 exports.ExpressionStatement = ExpressionStatement;
-class CommentStatement extends AstNode_1.Statement {
+class CommentStatement extends AstNode_2.Statement {
     constructor(comments) {
         var _a;
         super();
         this.comments = comments;
+        this.kind = AstNode_1.AstNodeKind.CommentStatement;
         this.visitMode = visitors_1.InternalWalkMode.visitStatements | visitors_1.InternalWalkMode.visitExpressions;
         if (((_a = this.comments) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             this.range = util_1.util.createBoundingRange(...this.comments);
@@ -216,10 +230,11 @@ class CommentStatement extends AstNode_1.Statement {
     }
 }
 exports.CommentStatement = CommentStatement;
-class ExitForStatement extends AstNode_1.Statement {
+class ExitForStatement extends AstNode_2.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.ExitForStatement;
         this.range = this.tokens.exitFor.range;
     }
     transpile(state) {
@@ -232,10 +247,11 @@ class ExitForStatement extends AstNode_1.Statement {
     }
 }
 exports.ExitForStatement = ExitForStatement;
-class ExitWhileStatement extends AstNode_1.Statement {
+class ExitWhileStatement extends AstNode_2.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.ExitWhileStatement;
         this.range = this.tokens.exitWhile.range;
     }
     transpile(state) {
@@ -248,11 +264,12 @@ class ExitWhileStatement extends AstNode_1.Statement {
     }
 }
 exports.ExitWhileStatement = ExitWhileStatement;
-class FunctionStatement extends AstNode_1.Statement {
+class FunctionStatement extends AstNode_2.Statement {
     constructor(name, func) {
         super();
         this.name = name;
         this.func = func;
+        this.kind = AstNode_1.AstNodeKind.FunctionStatement;
         this.range = this.func.range;
     }
     /**
@@ -270,14 +287,6 @@ class FunctionStatement extends AstNode_1.Statement {
             return this.name.text;
         }
     }
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    get namespaceName() {
-        var _a;
-        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
-    }
     transpile(state) {
         //create a fake token using the full transpiled name
         let nameToken = Object.assign(Object.assign({}, this.name), { text: this.getName(Parser_1.ParseMode.BrightScript) });
@@ -297,9 +306,14 @@ class FunctionStatement extends AstNode_1.Statement {
             (0, visitors_1.walk)(this, 'func', visitor, options);
         }
     }
+    getType(options) {
+        const funcExprType = this.func.getType(options);
+        funcExprType.setName(this.name.text);
+        return funcExprType;
+    }
 }
 exports.FunctionStatement = FunctionStatement;
-class IfStatement extends AstNode_1.Statement {
+class IfStatement extends AstNode_2.Statement {
     constructor(tokens, condition, thenBranch, elseBranch, isInline) {
         super();
         this.tokens = tokens;
@@ -307,6 +321,7 @@ class IfStatement extends AstNode_1.Statement {
         this.thenBranch = thenBranch;
         this.elseBranch = elseBranch;
         this.isInline = isInline;
+        this.kind = AstNode_1.AstNodeKind.IfStatement;
         this.range = util_1.util.createBoundingRange(tokens.if, condition, tokens.then, thenBranch, tokens.else, elseBranch, tokens.endIf);
     }
     transpile(state) {
@@ -385,11 +400,12 @@ class IfStatement extends AstNode_1.Statement {
     }
 }
 exports.IfStatement = IfStatement;
-class IncrementStatement extends AstNode_1.Statement {
+class IncrementStatement extends AstNode_2.Statement {
     constructor(value, operator) {
         super();
         this.value = value;
         this.operator = operator;
+        this.kind = AstNode_1.AstNodeKind.IncrementStatement;
         this.range = util_1.util.createBoundingRange(value, operator);
     }
     transpile(state) {
@@ -408,7 +424,7 @@ exports.IncrementStatement = IncrementStatement;
 /**
  * Represents a `print` statement within BrightScript.
  */
-class PrintStatement extends AstNode_1.Statement {
+class PrintStatement extends AstNode_2.Statement {
     /**
      * Creates a new internal representation of a BrightScript `print` statement.
      * @param tokens the tokens for this statement
@@ -419,6 +435,7 @@ class PrintStatement extends AstNode_1.Statement {
         super();
         this.tokens = tokens;
         this.expressions = expressions;
+        this.kind = AstNode_1.AstNodeKind.PrintStatement;
         this.range = util_1.util.createBoundingRange(tokens.print, ...(expressions !== null && expressions !== void 0 ? expressions : []));
     }
     transpile(state) {
@@ -450,7 +467,7 @@ class PrintStatement extends AstNode_1.Statement {
     }
 }
 exports.PrintStatement = PrintStatement;
-class DimStatement extends AstNode_1.Statement {
+class DimStatement extends AstNode_2.Statement {
     constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
         super();
         this.dimToken = dimToken;
@@ -458,6 +475,7 @@ class DimStatement extends AstNode_1.Statement {
         this.openingSquare = openingSquare;
         this.dimensions = dimensions;
         this.closingSquare = closingSquare;
+        this.kind = AstNode_1.AstNodeKind.DimStatement;
         this.range = util_1.util.createBoundingRange(dimToken, identifier, openingSquare, ...(dimensions !== null && dimensions !== void 0 ? dimensions : []), closingSquare);
     }
     transpile(state) {
@@ -484,10 +502,11 @@ class DimStatement extends AstNode_1.Statement {
     }
 }
 exports.DimStatement = DimStatement;
-class GotoStatement extends AstNode_1.Statement {
+class GotoStatement extends AstNode_2.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.GotoStatement;
         this.range = util_1.util.createBoundingRange(tokens.goto, tokens.label);
     }
     transpile(state) {
@@ -502,10 +521,11 @@ class GotoStatement extends AstNode_1.Statement {
     }
 }
 exports.GotoStatement = GotoStatement;
-class LabelStatement extends AstNode_1.Statement {
+class LabelStatement extends AstNode_2.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.LabelStatement;
         this.range = util_1.util.createBoundingRange(tokens.identifier, tokens.colon);
     }
     transpile(state) {
@@ -519,11 +539,12 @@ class LabelStatement extends AstNode_1.Statement {
     }
 }
 exports.LabelStatement = LabelStatement;
-class ReturnStatement extends AstNode_1.Statement {
+class ReturnStatement extends AstNode_2.Statement {
     constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
+        this.kind = AstNode_1.AstNodeKind.ReturnStatement;
         this.range = util_1.util.createBoundingRange(tokens.return, value);
     }
     transpile(state) {
@@ -542,10 +563,11 @@ class ReturnStatement extends AstNode_1.Statement {
     }
 }
 exports.ReturnStatement = ReturnStatement;
-class EndStatement extends AstNode_1.Statement {
+class EndStatement extends AstNode_2.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.EndStatement;
         this.range = tokens.end.range;
     }
     transpile(state) {
@@ -558,11 +580,12 @@ class EndStatement extends AstNode_1.Statement {
     }
 }
 exports.EndStatement = EndStatement;
-class StopStatement extends AstNode_1.Statement {
+class StopStatement extends AstNode_2.Statement {
     constructor(tokens) {
         var _a;
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.StopStatement;
         this.range = (_a = tokens === null || tokens === void 0 ? void 0 : tokens.stop) === null || _a === void 0 ? void 0 : _a.range;
     }
     transpile(state) {
@@ -575,7 +598,7 @@ class StopStatement extends AstNode_1.Statement {
     }
 }
 exports.StopStatement = StopStatement;
-class ForStatement extends AstNode_1.Statement {
+class ForStatement extends AstNode_2.Statement {
     constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
         super();
         this.forToken = forToken;
@@ -586,6 +609,7 @@ class ForStatement extends AstNode_1.Statement {
         this.endForToken = endForToken;
         this.stepToken = stepToken;
         this.increment = increment;
+        this.kind = AstNode_1.AstNodeKind.ForStatement;
         this.range = util_1.util.createBoundingRange(forToken, counterDeclaration, toToken, finalValue, stepToken, increment, body, endForToken);
     }
     transpile(state) {
@@ -626,13 +650,14 @@ class ForStatement extends AstNode_1.Statement {
     }
 }
 exports.ForStatement = ForStatement;
-class ForEachStatement extends AstNode_1.Statement {
+class ForEachStatement extends AstNode_2.Statement {
     constructor(tokens, item, target, body) {
         super();
         this.tokens = tokens;
         this.item = item;
         this.target = target;
         this.body = body;
+        this.kind = AstNode_1.AstNodeKind.ForEachStatement;
         this.range = util_1.util.createBoundingRange(tokens.forEach, item, tokens.in, target, body, tokens.endFor);
     }
     transpile(state) {
@@ -665,12 +690,13 @@ class ForEachStatement extends AstNode_1.Statement {
     }
 }
 exports.ForEachStatement = ForEachStatement;
-class WhileStatement extends AstNode_1.Statement {
+class WhileStatement extends AstNode_2.Statement {
     constructor(tokens, condition, body) {
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.body = body;
+        this.kind = AstNode_1.AstNodeKind.WhileStatement;
         this.range = util_1.util.createBoundingRange(tokens.while, condition, body, tokens.endWhile);
     }
     transpile(state) {
@@ -699,13 +725,14 @@ class WhileStatement extends AstNode_1.Statement {
     }
 }
 exports.WhileStatement = WhileStatement;
-class DottedSetStatement extends AstNode_1.Statement {
+class DottedSetStatement extends AstNode_2.Statement {
     constructor(obj, name, value, dot) {
         super();
         this.obj = obj;
         this.name = name;
         this.value = value;
         this.dot = dot;
+        this.kind = AstNode_1.AstNodeKind.DottedSetStatement;
         this.range = util_1.util.createBoundingRange(obj, dot, name, value);
     }
     transpile(state) {
@@ -735,7 +762,7 @@ class DottedSetStatement extends AstNode_1.Statement {
     }
 }
 exports.DottedSetStatement = DottedSetStatement;
-class IndexedSetStatement extends AstNode_1.Statement {
+class IndexedSetStatement extends AstNode_2.Statement {
     constructor(obj, index, value, openingSquare, closingSquare) {
         super();
         this.obj = obj;
@@ -743,6 +770,7 @@ class IndexedSetStatement extends AstNode_1.Statement {
         this.value = value;
         this.openingSquare = openingSquare;
         this.closingSquare = closingSquare;
+        this.kind = AstNode_1.AstNodeKind.IndexedSetStatement;
         this.range = util_1.util.createBoundingRange(obj, openingSquare, index, closingSquare, value);
     }
     transpile(state) {
@@ -777,10 +805,11 @@ class IndexedSetStatement extends AstNode_1.Statement {
     }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
-class LibraryStatement extends AstNode_1.Statement {
+class LibraryStatement extends AstNode_2.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.LibraryStatement;
         this.range = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath);
     }
     transpile(state) {
@@ -800,7 +829,7 @@ class LibraryStatement extends AstNode_1.Statement {
     }
 }
 exports.LibraryStatement = LibraryStatement;
-class NamespaceStatement extends AstNode_1.Statement {
+class NamespaceStatement extends AstNode_2.Statement {
     constructor(keyword, 
     // this should technically only be a VariableExpression or DottedGetExpression, but that can be enforced elsewhere
     nameExpression, body, endKeyword) {
@@ -809,8 +838,9 @@ class NamespaceStatement extends AstNode_1.Statement {
         this.nameExpression = nameExpression;
         this.body = body;
         this.endKeyword = endKeyword;
+        this.kind = AstNode_1.AstNodeKind.NamespaceStatement;
         this.name = this.getName(Parser_1.ParseMode.BrighterScript);
-        this.symbolTable = new SymbolTable_1.SymbolTable(`NamespaceStatement: '${this.name}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+        this.symbolTable = new SymbolTable_2.SymbolTable(`NamespaceStatement: '${this.name}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
     get range() {
         return this.cacheRange();
@@ -824,9 +854,9 @@ class NamespaceStatement extends AstNode_1.Statement {
     }
     getName(parseMode) {
         const parentNamespace = this.findAncestor(reflection_1.isNamespaceStatement);
-        let name = this.nameExpression.getName(parseMode);
+        const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
+        let name = util_1.util.getAllDottedGetPartsAsString(this.nameExpression, parseMode);
         if (parentNamespace) {
-            const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
             name = parentNamespace.getName(parseMode) + sep + name;
         }
         return name;
@@ -855,13 +885,19 @@ class NamespaceStatement extends AstNode_1.Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    getType(options) {
+        const resultType = new NamespaceType_1.NamespaceType(this.name);
+        resultType.pushMemberProvider(() => this.body.getSymbolTable());
+        return resultType;
+    }
 }
 exports.NamespaceStatement = NamespaceStatement;
-class ImportStatement extends AstNode_1.Statement {
+class ImportStatement extends AstNode_2.Statement {
     constructor(importToken, filePathToken) {
         super();
         this.importToken = importToken;
         this.filePathToken = filePathToken;
+        this.kind = AstNode_1.AstNodeKind.ImportStatement;
         this.range = util_1.util.createBoundingRange(importToken, filePathToken);
         if (this.filePathToken) {
             //remove quotes
@@ -896,11 +932,12 @@ class ImportStatement extends AstNode_1.Statement {
     }
 }
 exports.ImportStatement = ImportStatement;
-class InterfaceStatement extends AstNode_1.Statement {
+class InterfaceStatement extends AstNode_2.Statement {
     constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken) {
         super();
         this.parentInterfaceName = parentInterfaceName;
         this.body = body;
+        this.kind = AstNode_1.AstNodeKind.InterfaceStatement;
         this.tokens = {};
         this.tokens.interface = interfaceToken;
         this.tokens.name = name;
@@ -908,20 +945,15 @@ class InterfaceStatement extends AstNode_1.Statement {
         this.tokens.endInterface = endInterfaceToken;
         this.range = util_1.util.createBoundingRange(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface);
     }
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    get namespaceName() {
-        var _a;
-        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
-    }
     get fields() {
         return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
     }
     get methods() {
         return this.body.filter(x => (0, reflection_1.isInterfaceMethodStatement)(x));
     }
+    hasParentInterface() {
+        return !!this.parentInterfaceName;
+    }
     /**
      * The name of the interface WITH its leading namespace (if applicable)
      */
@@ -975,7 +1007,7 @@ class InterfaceStatement extends AstNode_1.Statement {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
         result.push(this.tokens.interface.text, ' ', this.tokens.name.text);
-        const parentInterfaceName = (_b = this.parentInterfaceName) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript);
+        const parentInterfaceName = (_b = this.parentInterfaceName) === null || _b === void 0 ? void 0 : _b.getName();
         if (parentInterfaceName) {
             result.push(' extends ', parentInterfaceName);
         }
@@ -1004,17 +1036,29 @@ class InterfaceStatement extends AstNode_1.Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
+    getType(options) {
+        var _a, _b, _c;
+        const superIface = (_a = this.parentInterfaceName) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const resultType = new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), superIface);
+        for (const statement of this.methods) {
+            resultType.addMember((_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 === null || statement === void 0 ? void 0 : statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+        }
+        for (const statement of this.fields) {
+            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+        }
+        return resultType;
+    }
 }
 exports.InterfaceStatement = InterfaceStatement;
-class InterfaceFieldStatement extends AstNode_1.Statement {
-    constructor(nameToken, asToken, typeToken, type) {
+class InterfaceFieldStatement extends AstNode_2.Statement {
+    constructor(nameToken, asToken, typeExpression) {
         super();
-        this.type = type;
+        this.typeExpression = typeExpression;
+        this.kind = AstNode_1.AstNodeKind.InterfaceFieldStatement;
         this.tokens = {};
         this.tokens.name = nameToken;
         this.tokens.as = asToken;
-        this.tokens.type = typeToken;
-        this.range = util_1.util.createBoundingRange(nameToken, asToken, typeToken);
+        this.range = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.typeExpression);
     }
     transpile(state) {
         throw new Error('Method not implemented.');
@@ -1023,47 +1067,57 @@ class InterfaceFieldStatement extends AstNode_1.Statement {
         return this.tokens.name.text;
     }
     walk(visitor, options) {
-        //nothing to walk
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
+        }
     }
     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.typeExpression) {
+            result.push(' as ', ...this.typeExpression.getTypedef(state));
         }
         return result;
     }
+    getType(options) {
+        var _a, _b;
+        return (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(options)) !== null && _b !== void 0 ? _b : DynamicType_1.DynamicType.instance;
+    }
 }
 exports.InterfaceFieldStatement = InterfaceFieldStatement;
-class InterfaceMethodStatement extends AstNode_1.Statement {
-    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeToken, returnType) {
+//TODO: there is much that is similar with this and FunctionExpression.
+//It would be nice to refactor this so there is less duplicated code
+class InterfaceMethodStatement extends AstNode_2.Statement {
+    constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeExpression) {
         super();
         this.params = params;
-        this.returnType = returnType;
+        this.returnTypeExpression = returnTypeExpression;
+        this.kind = AstNode_1.AstNodeKind.InterfaceMethodStatement;
         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;
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
     get range() {
         var _a;
-        return util_1.util.createBoundingRange(this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.tokens.returnType);
+        return util_1.util.createBoundingRange(this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.returnTypeExpression);
     }
     walk(visitor, options) {
-        //nothing to walk
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'returnTypeExpression', visitor, options);
+        }
     }
     getTypedef(state) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         const result = [];
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
@@ -1076,19 +1130,35 @@ class InterfaceMethodStatement extends AstNode_1.Statement {
             }
             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);
+            if (param.typeExpression) {
+                result.push(' as ', ...param.typeExpression.getTypedef(state));
             }
         }
         result.push(')');
-        if (((_e = this.tokens.returnType) === null || _e === void 0 ? void 0 : _e.text.length) > 0) {
-            result.push(' as ', this.tokens.returnType.text);
+        if (this.returnTypeExpression) {
+            result.push(' as ', ...this.returnTypeExpression.getTypedef(state));
         }
         return result;
     }
+    getType(options) {
+        var _a;
+        //if there's a defined return type, use that
+        let returnType = (_a = this.returnTypeExpression) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const isSub = this.tokens.functionType.kind === TokenKind_1.TokenKind.Sub;
+        //if we don't have a return type and this is a sub, set the return type to `void`. else use `dynamic`
+        if (!returnType) {
+            returnType = isSub ? VoidType_1.VoidType.instance : DynamicType_1.DynamicType.instance;
+        }
+        const resultType = new FunctionType_1.FunctionType(returnType);
+        resultType.isSub = isSub;
+        for (let param of this.params) {
+            resultType.addParameter(param.name.text, param.getType(options), !!param.defaultValue);
+        }
+        return resultType;
+    }
 }
 exports.InterfaceMethodStatement = InterfaceMethodStatement;
-class ClassStatement extends AstNode_1.Statement {
+class ClassStatement extends AstNode_2.Statement {
     constructor(classKeyword, 
     /**
      * The name of the class (without namespace prefix)
@@ -1102,6 +1172,7 @@ class ClassStatement extends AstNode_1.Statement {
         this.end = end;
         this.extendsKeyword = extendsKeyword;
         this.parentClassName = parentClassName;
+        this.kind = AstNode_1.AstNodeKind.ClassStatement;
         this.memberMap = {};
         this.methods = [];
         this.fields = [];
@@ -1118,14 +1189,6 @@ class ClassStatement extends AstNode_1.Statement {
         }
         this.range = util_1.util.createBoundingRange(classKeyword, name, extendsKeyword, parentClassName, ...(body !== null && body !== void 0 ? body : []), end);
     }
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    get namespaceName() {
-        var _a;
-        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
-    }
     getName(parseMode) {
         var _a;
         const name = (_a = this.name) === null || _a === void 0 ? void 0 : _a.text;
@@ -1163,7 +1226,7 @@ class ClassStatement extends AstNode_1.Statement {
         result.push('class ', this.name.text);
         if (this.extendsKeyword && this.parentClassName) {
             const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
-            const fqName = util_1.util.getFullyQualifiedClassName(this.parentClassName.getName(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript));
+            const fqName = util_1.util.getFullyQualifiedClassName(this.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript));
             result.push(` extends ${fqName}`);
         }
         result.push(state.newline);
@@ -1202,7 +1265,7 @@ class ClassStatement extends AstNode_1.Statement {
             if (stmt.parentClassName) {
                 const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
                 //find the parent class
-                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
+                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
                 myIndex++;
             }
             else {
@@ -1231,7 +1294,7 @@ class ClassStatement extends AstNode_1.Statement {
         while (stmt) {
             if (stmt.parentClassName) {
                 const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
-                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
+                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
                 ancestors.push(stmt);
             }
             else {
@@ -1382,6 +1445,19 @@ class ClassStatement extends AstNode_1.Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
+    getType(options) {
+        var _a, _b, _c;
+        const superClass = (_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const resultType = new ClassType_1.ClassType(this.getName(Parser_1.ParseMode.BrighterScript), superClass);
+        for (const statement of this.methods) {
+            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getType(options);
+            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, funcType, SymbolTable_1.SymbolTypeFlag.runtime);
+        }
+        for (const statement of this.fields) {
+            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+        }
+        return resultType;
+    }
 }
 exports.ClassStatement = ClassStatement;
 const accessModifiers = [
@@ -1393,6 +1469,7 @@ class MethodStatement extends FunctionStatement {
     constructor(modifiers, name, func, override) {
         super(name, func);
         this.override = override;
+        this.kind = AstNode_1.AstNodeKind.MethodStatement;
         this.modifiers = [];
         if (modifiers) {
             if (Array.isArray(modifiers)) {
@@ -1468,17 +1545,18 @@ class MethodStatement extends FunctionStatement {
         if (state.classStatement.getAncestors(state).length === 0) {
             return;
         }
-        //find the first non-comment statement
-        let firstStatement = this.func.body.statements.find(x => !(0, reflection_1.isCommentStatement)(x));
-        //if the first statement is a call to super, quit here
-        if (
-        //is a call statement
-        (0, reflection_1.isExpressionStatement)(firstStatement) && (0, reflection_1.isCallExpression)(firstStatement.expression) &&
-            //is a call to super
-            util_1.util.findBeginningVariableExpression(firstStatement === null || firstStatement === void 0 ? void 0 : firstStatement.expression.callee).name.text.toLowerCase() === 'super') {
+        //check whether any calls to super exist
+        let containsSuperCall = this.func.body.statements.findIndex((x) => {
+            //is a call statement
+            return (0, reflection_1.isExpressionStatement)(x) && (0, reflection_1.isCallExpression)(x.expression) &&
+                //is a call to super
+                util_1.util.findBeginningVariableExpression(x.expression.callee).name.text.toLowerCase() === 'super';
+        }) !== -1;
+        //if a call to super exists, quit here
+        if (containsSuperCall) {
             return;
         }
-        //this is a child class, and the first statement isn't a call to super. Inject one
+        //this is a child class, and the constructor doesn't contain a call to super. Inject one
         const superCall = new ExpressionStatement(new Expression_1.CallExpression(new Expression_1.VariableExpression({
             kind: TokenKind_1.TokenKind.Identifier,
             text: 'super',
@@ -1527,37 +1605,25 @@ class MethodStatement extends FunctionStatement {
     }
 }
 exports.MethodStatement = MethodStatement;
-/**
- * @deprecated use `MethodStatement`
- */
-class ClassMethodStatement extends MethodStatement {
-}
-exports.ClassMethodStatement = ClassMethodStatement;
-class FieldStatement extends AstNode_1.Statement {
-    constructor(accessModifier, name, as, type, equal, initialValue) {
+class FieldStatement extends AstNode_2.Statement {
+    constructor(accessModifier, name, as, typeExpression, equal, initialValue) {
         super();
         this.accessModifier = accessModifier;
         this.name = name;
         this.as = as;
-        this.type = type;
+        this.typeExpression = typeExpression;
         this.equal = equal;
         this.initialValue = initialValue;
-        this.range = util_1.util.createBoundingRange(accessModifier, name, as, type, equal, initialValue);
+        this.kind = AstNode_1.AstNodeKind.FieldStatement;
+        this.range = util_1.util.createBoundingRange(accessModifier, name, as, typeExpression, equal, initialValue);
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
      * Defaults to `DynamicType`
      */
-    getType() {
-        if (this.type) {
-            return util_1.util.tokenToBscType(this.type);
-        }
-        else if ((0, reflection_1.isLiteralExpression)(this.initialValue)) {
-            return this.initialValue.type;
-        }
-        else {
-            return new DynamicType_1.DynamicType();
-        }
+    getType(options) {
+        var _a, _b, _c, _d;
+        return (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime }))) !== null && _b !== void 0 ? _b : (_c = this.initialValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
     }
     transpile(state) {
         throw new Error('transpile not implemented for ' + Object.getPrototypeOf(this).constructor.name);
@@ -1569,7 +1635,7 @@ class FieldStatement extends AstNode_1.Statement {
             for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
                 result.push(...annotation.getTypedef(state), state.newline, state.indent());
             }
-            let type = this.getType();
+            let type = this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
             if ((0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type)) {
                 type = new DynamicType_1.DynamicType();
             }
@@ -1578,24 +1644,20 @@ class FieldStatement extends AstNode_1.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, 'typeExpression', visitor, options);
             (0, visitors_1.walk)(this, 'initialValue', visitor, options);
         }
     }
 }
 exports.FieldStatement = FieldStatement;
-/**
- * @deprecated use `FieldStatement`
- */
-class ClassFieldStatement extends FieldStatement {
-}
-exports.ClassFieldStatement = ClassFieldStatement;
-class TryCatchStatement extends AstNode_1.Statement {
+class TryCatchStatement extends AstNode_2.Statement {
     constructor(tokens, tryBranch, catchStatement) {
         super();
         this.tokens = tokens;
         this.tryBranch = tryBranch;
         this.catchStatement = catchStatement;
+        this.kind = AstNode_1.AstNodeKind.TryCatchStatement;
         this.range = util_1.util.createBoundingRange(tokens.try, tryBranch, catchStatement, tokens.endTry);
     }
     transpile(state) {
@@ -1619,12 +1681,13 @@ class TryCatchStatement extends AstNode_1.Statement {
     }
 }
 exports.TryCatchStatement = TryCatchStatement;
-class CatchStatement extends AstNode_1.Statement {
+class CatchStatement extends AstNode_2.Statement {
     constructor(tokens, exceptionVariable, catchBranch) {
         super();
         this.tokens = tokens;
         this.exceptionVariable = exceptionVariable;
         this.catchBranch = catchBranch;
+        this.kind = AstNode_1.AstNodeKind.CatchStatement;
         this.range = util_1.util.createBoundingRange(tokens.catch, exceptionVariable, catchBranch);
     }
     transpile(state) {
@@ -1643,11 +1706,12 @@ class CatchStatement extends AstNode_1.Statement {
     }
 }
 exports.CatchStatement = CatchStatement;
-class ThrowStatement extends AstNode_1.Statement {
+class ThrowStatement extends AstNode_2.Statement {
     constructor(throwToken, expression) {
         super();
         this.throwToken = throwToken;
         this.expression = expression;
+        this.kind = AstNode_1.AstNodeKind.ThrowStatement;
         this.range = util_1.util.createBoundingRange(throwToken, expression);
     }
     transpile(state) {
@@ -1672,25 +1736,19 @@ class ThrowStatement extends AstNode_1.Statement {
     }
 }
 exports.ThrowStatement = ThrowStatement;
-class EnumStatement extends AstNode_1.Statement {
+class EnumStatement extends AstNode_2.Statement {
     constructor(tokens, body) {
         var _a;
         super();
         this.tokens = tokens;
         this.body = body;
+        this.kind = AstNode_1.AstNodeKind.EnumStatement;
+        this.symbolTable = new SymbolTable_2.SymbolTable('Enum');
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
     }
     get range() {
         return util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum);
     }
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    get namespaceName() {
-        var _a;
-        return (_a = this.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.nameExpression;
-    }
     getMembers() {
         const result = [];
         for (const statement of this.body) {
@@ -1794,13 +1852,26 @@ class EnumStatement extends AstNode_1.Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
+    getType() {
+        var _a, _b;
+        const resultType = new EnumType_1.EnumType(this.fullName);
+        resultType.pushMemberProvider(() => this.getSymbolTable());
+        for (const statement of this.getMembers()) {
+            resultType.addMember((_b = (_a = statement === null || statement === void 0 ? void 0 : statement.tokens) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType(), SymbolTable_1.SymbolTypeFlag.runtime);
+        }
+        return resultType;
+    }
 }
 exports.EnumStatement = EnumStatement;
-class EnumMemberStatement extends AstNode_1.Statement {
+class EnumMemberStatement extends AstNode_2.Statement {
     constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
+        this.kind = AstNode_1.AstNodeKind.EnumMemberStatement;
+    }
+    get range() {
+        return util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value);
     }
     /**
      * The name of the member
@@ -1808,9 +1879,6 @@ class EnumMemberStatement extends AstNode_1.Statement {
     get name() {
         return this.tokens.name.text;
     }
-    get range() {
-        return util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value);
-    }
     transpile(state) {
         return [];
     }
@@ -1831,13 +1899,18 @@ class EnumMemberStatement extends AstNode_1.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType() {
+        var _a, _b, _c;
+        return new EnumType_1.EnumMemberType((_a = this.parent) === null || _a === void 0 ? void 0 : _a.fullName, (_c = (_b = this.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text);
+    }
 }
 exports.EnumMemberStatement = EnumMemberStatement;
-class ConstStatement extends AstNode_1.Statement {
+class ConstStatement extends AstNode_2.Statement {
     constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
+        this.kind = AstNode_1.AstNodeKind.ConstStatement;
         this.range = util_1.util.createBoundingRange(this.tokens.const, this.tokens.name, this.tokens.equals, this.value);
     }
     get name() {
@@ -1884,12 +1957,16 @@ class ConstStatement extends AstNode_1.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType(options) {
+        return this.value.getType(options);
+    }
 }
 exports.ConstStatement = ConstStatement;
-class ContinueStatement extends AstNode_1.Statement {
+class ContinueStatement extends AstNode_2.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
+        this.kind = AstNode_1.AstNodeKind.ContinueStatement;
         this.range = util_1.util.createBoundingRange(tokens.continue, tokens.loopType);
     }
     transpile(state) {