brighterscript 1.0.0-alpha.24 → 1.0.0-alpha.25

package/dist/parser/Statement.js

@@ -1,39 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = exports.Statement = 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 interfaces_1 = require("../interfaces");
+const SymbolTable_1 = require("../SymbolTable");
 const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
-const SymbolTable_1 = require("../SymbolTable");
-const CustomType_1 = require("../types/CustomType");
+const SymbolTable_2 = require("../SymbolTable");
+const AstNode_1 = require("./AstNode");
+const AstNode_2 = require("./AstNode");
+const ClassType_1 = require("../types/ClassType");
 const EnumType_1 = require("../types/EnumType");
-const FunctionType_1 = require("../types/FunctionType");
+const NamespaceType_1 = require("../types/NamespaceType");
 const InterfaceType_1 = require("../types/InterfaceType");
-/**
- * A BrightScript statement
- */
-class Statement {
-    constructor() {
-        /**
-         * When being considered by the walk visitor, this describes what type of element the current class is.
-         */
-        this.visitMode = visitors_1.InternalWalkMode.visitStatements;
-    }
-    /**
-     * Get the closest symbol table for this node. Should be overridden in children that directly contain a symbol table
-     */
-    getSymbolTable() {
-        var _a;
-        return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable();
-    }
-}
-exports.Statement = Statement;
-class EmptyStatement extends Statement {
+const VoidType_1 = require("../types/VoidType");
+const TypedFunctionType_1 = require("../types/TypedFunctionType");
+class EmptyStatement extends AstNode_2.Statement {
     constructor(
     /**
      * Create a negative range to indicate this is an interpolated location
@@ -41,6 +28,7 @@ class EmptyStatement extends Statement {
     range = creators_1.interpolatedRange) {
         super();
         this.range = range;
+        this.kind = AstNode_1.AstNodeKind.EmptyStatement;
     }
     transpile(state) {
         return [];
@@ -53,18 +41,17 @@ exports.EmptyStatement = EmptyStatement;
 /**
  * This is a top-level statement. Consider this the root of the AST
  */
-class Body extends Statement {
-    constructor(statements = [], symbolTable = new SymbolTable_1.SymbolTable(undefined, `Body`)) {
+class Body extends AstNode_2.Statement {
+    constructor(statements = []) {
         super();
         this.statements = statements;
-        this.symbolTable = symbolTable;
-    }
-    getSymbolTable() {
-        return this.symbolTable;
+        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, _b, _c, _d;
-        return util_1.util.createRangeFromPositions((_b = (_a = this.statements[0]) === null || _a === void 0 ? void 0 : _a.range.start) !== null && _b !== void 0 ? _b : util_1.util.createPosition(0, 0), (_d = (_c = this.statements[this.statements.length - 1]) === null || _c === void 0 ? void 0 : _c.range.end) !== null && _d !== void 0 ? _d : util_1.util.createPosition(0, 0));
+        var _a;
+        //this needs to be a getter because the body has its statements pushed to it after being constructed
+        return util_1.util.createBoundingRange(...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
         let result = [];
@@ -112,15 +99,16 @@ class Body extends Statement {
     }
 }
 exports.Body = Body;
-class AssignmentStatement extends Statement {
-    constructor(name, equals, value, containingFunction) {
-        var _a;
+class AssignmentStatement extends AstNode_2.Statement {
+    constructor(equals, name, value, asToken, typeExpression) {
         super();
-        this.name = name;
         this.equals = equals;
+        this.name = name;
         this.value = value;
-        this.containingFunction = containingFunction;
-        this.range = (_a = util_1.util.createBoundingRange(this.name, this.equals, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.asToken = asToken;
+        this.typeExpression = typeExpression;
+        this.kind = AstNode_1.AstNodeKind.AssignmentStatement;
+        this.range = util_1.util.createBoundingRange(name, equals, value);
     }
     transpile(state) {
         var _a, _b;
@@ -140,18 +128,28 @@ class AssignmentStatement extends 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) {
+        // TODO: Do we still need this.typeExpression?
+        var _a;
+        // Note: compound assignments (eg. +=) are internally dealt with via the RHS being a BinaryExpression
+        // so this.value will be a BinaryExpression, and BinaryExpressions can figure out their own types
+        const rhs = this.value.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
+        (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry(this.name.text, rhs, options.data, this.name.range));
+        return rhs;
+    }
 }
 exports.AssignmentStatement = AssignmentStatement;
-class Block extends Statement {
+class Block extends AstNode_2.Statement {
     constructor(statements, startingRange) {
-        var _a;
         super();
         this.statements = statements;
         this.startingRange = startingRange;
-        this.range = (_a = util_1.util.createBoundingRange({ range: this.startingRange }, ...statements)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.Block;
+        this.range = util_1.util.createBoundingRange({ range: this.startingRange }, ...(statements !== null && statements !== void 0 ? statements : []));
     }
     transpile(state) {
         state.blockDepth++;
@@ -184,12 +182,12 @@ class Block extends Statement {
     }
 }
 exports.Block = Block;
-class ExpressionStatement extends Statement {
+class ExpressionStatement extends AstNode_2.Statement {
     constructor(expression) {
-        var _a, _b;
         super();
         this.expression = expression;
-        this.range = (_b = (_a = this.expression) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ExpressionStatement;
+        this.range = this.expression.range;
     }
     transpile(state) {
         return this.expression.transpile(state);
@@ -201,13 +199,16 @@ class ExpressionStatement extends Statement {
     }
 }
 exports.ExpressionStatement = ExpressionStatement;
-class CommentStatement extends Statement {
+class CommentStatement extends AstNode_2.Statement {
     constructor(comments) {
         var _a;
         super();
         this.comments = comments;
-        this.range = (_a = util_1.util.createBoundingRange(...this.comments)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        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);
+        }
     }
     get text() {
         return this.comments.map(x => x.text).join('\n');
@@ -235,12 +236,12 @@ class CommentStatement extends Statement {
     }
 }
 exports.CommentStatement = CommentStatement;
-class ExitForStatement extends Statement {
+class ExitForStatement extends AstNode_2.Statement {
     constructor(tokens) {
-        var _a, _b, _c;
         super();
         this.tokens = tokens;
-        this.range = (_c = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.exitFor) === null || _b === void 0 ? void 0 : _b.range) !== null && _c !== void 0 ? _c : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ExitForStatement;
+        this.range = this.tokens.exitFor.range;
     }
     transpile(state) {
         return [
@@ -252,12 +253,12 @@ class ExitForStatement extends Statement {
     }
 }
 exports.ExitForStatement = ExitForStatement;
-class ExitWhileStatement extends Statement {
+class ExitWhileStatement extends AstNode_2.Statement {
     constructor(tokens) {
-        var _a, _b, _c;
         super();
         this.tokens = tokens;
-        this.range = (_c = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.exitWhile) === null || _b === void 0 ? void 0 : _b.range) !== null && _c !== void 0 ? _c : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ExitWhileStatement;
+        this.range = this.tokens.exitWhile.range;
     }
     transpile(state) {
         return [
@@ -269,36 +270,32 @@ class ExitWhileStatement extends Statement {
     }
 }
 exports.ExitWhileStatement = ExitWhileStatement;
-class FunctionStatement extends Statement {
-    constructor(name, func, namespaceName) {
+class FunctionStatement extends AstNode_2.Statement {
+    constructor(name, func) {
         super();
         this.name = name;
         this.func = func;
-        this.namespaceName = namespaceName;
-    }
-    get range() {
-        return this.cacheRange();
-    }
-    cacheRange() {
-        var _a, _b;
-        if (!this._range) {
-            this._range = (_b = (_a = this.func) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : this.name.range;
-        }
-        return this._range;
+        this.kind = AstNode_1.AstNodeKind.FunctionStatement;
+        this.range = this.func.range;
     }
     /**
      * Get the name of this expression based on the parse mode
      */
     getName(parseMode) {
-        if (this.namespaceName) {
+        var _a;
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        if (namespace) {
             let delimiter = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
-            let namespaceName = this.namespaceName.getName(parseMode);
-            return namespaceName + delimiter + this.name.text;
+            let namespaceName = namespace.getName(parseMode);
+            return namespaceName + delimiter + ((_a = this.name) === null || _a === void 0 ? void 0 : _a.text);
         }
         else {
             return this.name.text;
         }
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
+    }
     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) });
@@ -310,7 +307,7 @@ class FunctionStatement extends Statement {
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
-        result.push(...this.func.getTypedef(state, this.name));
+        result.push(...this.func.getTypedef(state));
         return result;
     }
     walk(visitor, options) {
@@ -318,18 +315,24 @@ class FunctionStatement extends Statement {
             (0, visitors_1.walk)(this, 'func', visitor, options);
         }
     }
+    getType(options) {
+        var _a;
+        const funcExprType = this.func.getType(options);
+        funcExprType.setName((_a = this.name) === null || _a === void 0 ? void 0 : _a.text);
+        return funcExprType;
+    }
 }
 exports.FunctionStatement = FunctionStatement;
-class IfStatement extends Statement {
+class IfStatement extends AstNode_2.Statement {
     constructor(tokens, condition, thenBranch, elseBranch, isInline) {
-        var _a;
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.thenBranch = thenBranch;
         this.elseBranch = elseBranch;
         this.isInline = isInline;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.if, this.condition, this.tokens.then, this.thenBranch, this.tokens.else, this.elseBranch, this.tokens.endIf)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        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) {
         let results = [];
@@ -375,7 +378,7 @@ class IfStatement extends Statement {
             }
             else {
                 //else body
-                state.lineage.unshift(this.elseBranch);
+                state.lineage.unshift(this.tokens.else);
                 let body = this.elseBranch.transpile(state);
                 state.lineage.shift();
                 if (body.length > 0) {
@@ -407,13 +410,13 @@ class IfStatement extends Statement {
     }
 }
 exports.IfStatement = IfStatement;
-class IncrementStatement extends Statement {
+class IncrementStatement extends AstNode_2.Statement {
     constructor(value, operator) {
-        var _a;
         super();
         this.value = value;
         this.operator = operator;
-        this.range = (_a = util_1.util.createBoundingRange(this.value, this.operator)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.IncrementStatement;
+        this.range = util_1.util.createBoundingRange(value, operator);
     }
     transpile(state) {
         return [
@@ -431,18 +434,19 @@ exports.IncrementStatement = IncrementStatement;
 /**
  * Represents a `print` statement within BrightScript.
  */
-class PrintStatement extends Statement {
+class PrintStatement extends AstNode_2.Statement {
     /**
      * Creates a new internal representation of a BrightScript `print` statement.
-     * @param expressions an array of expressions or `PrintSeparator`s to be
-     *                    evaluated and printed.
+     * @param tokens the tokens for this statement
+     * @param tokens.print a print token
+     * @param expressions an array of expressions or `PrintSeparator`s to be evaluated and printed.
      */
     constructor(tokens, expressions) {
-        var _a;
         super();
         this.tokens = tokens;
         this.expressions = expressions;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.print, ...this.expressions)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.PrintStatement;
+        this.range = util_1.util.createBoundingRange(tokens.print, ...(expressions !== null && expressions !== void 0 ? expressions : []));
     }
     transpile(state) {
         var _a;
@@ -473,16 +477,16 @@ class PrintStatement extends Statement {
     }
 }
 exports.PrintStatement = PrintStatement;
-class DimStatement extends Statement {
+class DimStatement extends AstNode_2.Statement {
     constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
-        var _a;
         super();
         this.dimToken = dimToken;
         this.identifier = identifier;
         this.openingSquare = openingSquare;
         this.dimensions = dimensions;
         this.closingSquare = closingSquare;
-        this.range = (_a = util_1.util.createBoundingRange(this.dimToken, this.identifier, this.openingSquare, ...this.dimensions, this.closingSquare)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.DimStatement;
+        this.range = util_1.util.createBoundingRange(dimToken, identifier, openingSquare, ...(dimensions !== null && dimensions !== void 0 ? dimensions : []), closingSquare);
     }
     transpile(state) {
         let result = [
@@ -508,12 +512,12 @@ class DimStatement extends Statement {
     }
 }
 exports.DimStatement = DimStatement;
-class GotoStatement extends Statement {
+class GotoStatement extends AstNode_2.Statement {
     constructor(tokens) {
-        var _a;
         super();
         this.tokens = tokens;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.goto, this.tokens.label)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.GotoStatement;
+        this.range = util_1.util.createBoundingRange(tokens.goto, tokens.label);
     }
     transpile(state) {
         return [
@@ -527,12 +531,15 @@ class GotoStatement extends Statement {
     }
 }
 exports.GotoStatement = GotoStatement;
-class LabelStatement extends Statement {
+class LabelStatement extends AstNode_2.Statement {
     constructor(tokens) {
-        var _a;
         super();
         this.tokens = tokens;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.identifier, this.tokens.colon)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.LabelStatement;
+        this.range = util_1.util.createBoundingRange(tokens.identifier, tokens.colon);
+    }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.identifier.leadingTrivia);
     }
     transpile(state) {
         return [
@@ -545,13 +552,13 @@ class LabelStatement extends Statement {
     }
 }
 exports.LabelStatement = LabelStatement;
-class ReturnStatement extends Statement {
+class ReturnStatement extends AstNode_2.Statement {
     constructor(tokens, value) {
-        var _a;
         super();
         this.tokens = tokens;
         this.value = value;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.return, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ReturnStatement;
+        this.range = util_1.util.createBoundingRange(tokens.return, value);
     }
     transpile(state) {
         let result = [];
@@ -569,12 +576,12 @@ class ReturnStatement extends Statement {
     }
 }
 exports.ReturnStatement = ReturnStatement;
-class EndStatement extends Statement {
+class EndStatement extends AstNode_2.Statement {
     constructor(tokens) {
-        var _a, _b;
         super();
         this.tokens = tokens;
-        this.range = (_b = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.EndStatement;
+        this.range = tokens.end.range;
     }
     transpile(state) {
         return [
@@ -586,12 +593,13 @@ class EndStatement extends Statement {
     }
 }
 exports.EndStatement = EndStatement;
-class StopStatement extends Statement {
+class StopStatement extends AstNode_2.Statement {
     constructor(tokens) {
-        var _a, _b;
+        var _a;
         super();
         this.tokens = tokens;
-        this.range = (_b = (_a = this.tokens.stop) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
+        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) {
         return [
@@ -603,9 +611,8 @@ class StopStatement extends Statement {
     }
 }
 exports.StopStatement = StopStatement;
-class ForStatement extends Statement {
+class ForStatement extends AstNode_2.Statement {
     constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
-        var _a;
         super();
         this.forToken = forToken;
         this.counterDeclaration = counterDeclaration;
@@ -615,7 +622,8 @@ class ForStatement extends Statement {
         this.endForToken = endForToken;
         this.stepToken = stepToken;
         this.increment = increment;
-        this.range = (_a = util_1.util.createBoundingRange(this.forToken, this.counterDeclaration, this.toToken, this.finalValue, this.body, this.stepToken, this.increment, this.endForToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ForStatement;
+        this.range = util_1.util.createBoundingRange(forToken, counterDeclaration, toToken, finalValue, stepToken, increment, body, endForToken);
     }
     transpile(state) {
         let result = [];
@@ -655,26 +663,24 @@ class ForStatement extends Statement {
     }
 }
 exports.ForStatement = ForStatement;
-class ForEachStatement extends Statement {
-    constructor(forEachToken, item, inToken, target, body, endForToken) {
-        var _a;
+class ForEachStatement extends AstNode_2.Statement {
+    constructor(tokens, item, target, body) {
         super();
-        this.forEachToken = forEachToken;
+        this.tokens = tokens;
         this.item = item;
-        this.inToken = inToken;
         this.target = target;
         this.body = body;
-        this.endForToken = endForToken;
-        this.range = (_a = util_1.util.createBoundingRange(this.forEachToken, this.item, this.inToken, this.target, this.body, this.endForToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ForEachStatement;
+        this.range = util_1.util.createBoundingRange(tokens.forEach, item, tokens.in, target, body, tokens.endFor);
     }
     transpile(state) {
         let result = [];
         //for each
-        result.push(state.transpileToken(this.forEachToken), ' ');
+        result.push(state.transpileToken(this.tokens.forEach), ' ');
         //item
         result.push(state.transpileToken(this.item), ' ');
         //in
-        result.push(state.transpileToken(this.inToken), ' ');
+        result.push(state.transpileToken(this.tokens.in), ' ');
         //target
         result.push(...this.target.transpile(state));
         //body
@@ -684,7 +690,7 @@ class ForEachStatement extends Statement {
         // add new line before "end for"
         result.push('\n');
         //end for
-        result.push(state.indent(), state.transpileToken(this.endForToken));
+        result.push(state.indent(), state.transpileToken(this.tokens.endFor));
         return result;
     }
     walk(visitor, options) {
@@ -697,14 +703,14 @@ class ForEachStatement extends Statement {
     }
 }
 exports.ForEachStatement = ForEachStatement;
-class WhileStatement extends Statement {
+class WhileStatement extends AstNode_2.Statement {
     constructor(tokens, condition, body) {
-        var _a;
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.body = body;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.while, this.condition, this.body, this.tokens.endWhile)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.WhileStatement;
+        this.range = util_1.util.createBoundingRange(tokens.while, condition, body, tokens.endWhile);
     }
     transpile(state) {
         let result = [];
@@ -732,16 +738,15 @@ class WhileStatement extends Statement {
     }
 }
 exports.WhileStatement = WhileStatement;
-class DottedSetStatement extends Statement {
-    constructor(obj, name, value, dot, operator) {
-        var _a;
+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.operator = operator;
-        this.range = (_a = util_1.util.createBoundingRange(this.obj, this.dot, this.name, this.operator, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.DottedSetStatement;
+        this.range = util_1.util.createBoundingRange(obj, dot, name, value);
     }
     transpile(state) {
         var _a, _b;
@@ -753,7 +758,7 @@ class DottedSetStatement extends Statement {
             return [
                 //object
                 ...this.obj.transpile(state),
-                '.',
+                this.dot ? state.tokenToSourceNode(this.dot) : '.',
                 //name
                 state.transpileToken(this.name),
                 ' = ',
@@ -768,19 +773,25 @@ class DottedSetStatement extends Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType(options) {
+        var _a, _b, _c, _d, _e, _f;
+        const objType = (_a = this.obj) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const result = objType === null || objType === void 0 ? void 0 : objType.getMemberType((_b = this.name) === null || _b === void 0 ? void 0 : _b.text, options);
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry((_d = this.name) === null || _d === void 0 ? void 0 : _d.text, result, options.data, (_f = (_e = this.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range));
+        return result;
+    }
 }
 exports.DottedSetStatement = DottedSetStatement;
-class IndexedSetStatement extends Statement {
-    constructor(obj, index, value, openingSquare, closingSquare, operator) {
-        var _a;
+class IndexedSetStatement extends AstNode_2.Statement {
+    constructor(obj, index, value, openingSquare, closingSquare) {
         super();
         this.obj = obj;
         this.index = index;
         this.value = value;
         this.openingSquare = openingSquare;
         this.closingSquare = closingSquare;
-        this.operator = operator;
-        this.range = (_a = util_1.util.createBoundingRange(this.obj, this.openingSquare, this.index, this.closingSquare, this.operator, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.IndexedSetStatement;
+        this.range = util_1.util.createBoundingRange(obj, openingSquare, index, closingSquare, value);
     }
     transpile(state) {
         var _a, _b;
@@ -814,12 +825,12 @@ class IndexedSetStatement extends Statement {
     }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
-class LibraryStatement extends Statement {
+class LibraryStatement extends AstNode_2.Statement {
     constructor(tokens) {
-        var _a;
         super();
         this.tokens = tokens;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.LibraryStatement;
+        this.range = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath);
     }
     transpile(state) {
         let result = [];
@@ -838,21 +849,16 @@ class LibraryStatement extends Statement {
     }
 }
 exports.LibraryStatement = LibraryStatement;
-class NamespaceStatement extends Statement {
-    constructor(keyword, 
-    //this should technically only be a VariableExpression or DottedGetExpression, but that can be enforced elsewhere
-    nameExpression, body, endKeyword, parentSymbolTable) {
+class NamespaceStatement extends AstNode_2.Statement {
+    constructor(keyword, nameExpression, body, endKeyword) {
         super();
         this.keyword = keyword;
         this.nameExpression = nameExpression;
         this.body = body;
         this.endKeyword = endKeyword;
-        this.parentSymbolTable = parentSymbolTable;
-        this.name = this.nameExpression.getName(Parser_1.ParseMode.BrighterScript);
-        this.symbolTable = new SymbolTable_1.SymbolTable(parentSymbolTable, `Namespace ${this.name}`);
-    }
-    getSymbolTable() {
-        return this.symbolTable;
+        this.kind = AstNode_1.AstNodeKind.NamespaceStatement;
+        this.name = this.getName(Parser_1.ParseMode.BrighterScript);
+        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();
@@ -865,7 +871,24 @@ class NamespaceStatement extends Statement {
         return this._range;
     }
     getName(parseMode) {
-        return this.nameExpression.getName(parseMode);
+        var _a, _b;
+        const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
+        let name = util_1.util.getAllDottedGetPartsAsString(this.nameExpression, parseMode);
+        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
+            name = this.parent.parent.getName(parseMode) + sep + name;
+        }
+        return name;
+    }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.keyword.leadingTrivia);
+    }
+    getNameParts() {
+        var _a, _b;
+        let parts = util_1.util.getAllDottedGetParts(this.nameExpression);
+        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
+            parts = this.parent.parent.getNameParts().concat(parts);
+        }
+        return parts;
     }
     transpile(state) {
         //namespaces don't actually have any real content, so just transpile their bodies
@@ -874,7 +897,7 @@ class NamespaceStatement extends Statement {
     getTypedef(state) {
         let result = [
             'namespace ',
-            ...this.nameExpression.getName(Parser_1.ParseMode.BrighterScript),
+            ...this.getName(Parser_1.ParseMode.BrighterScript),
             state.newline
         ];
         state.blockDepth++;
@@ -891,15 +914,19 @@ class NamespaceStatement extends Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    getType(options) {
+        const resultType = new NamespaceType_1.NamespaceType(this.name);
+        return resultType;
+    }
 }
 exports.NamespaceStatement = NamespaceStatement;
-class ImportStatement extends Statement {
+class ImportStatement extends AstNode_2.Statement {
     constructor(importToken, filePathToken) {
-        var _a;
         super();
         this.importToken = importToken;
         this.filePathToken = filePathToken;
-        this.range = (_a = util_1.util.createBoundingRange(this.importToken, this.filePathToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ImportStatement;
+        this.range = util_1.util.createBoundingRange(importToken, filePathToken);
         if (this.filePathToken) {
             //remove quotes
             this.filePath = this.filePathToken.text.replace(/"/g, '');
@@ -933,89 +960,41 @@ class ImportStatement extends Statement {
     }
 }
 exports.ImportStatement = ImportStatement;
-class InterfaceStatement extends Statement {
-    constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken, namespaceName) {
-        var _a, _b, _c;
+class InterfaceStatement extends AstNode_2.Statement {
+    constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken) {
         super();
-        this.name = name;
         this.parentInterfaceName = parentInterfaceName;
         this.body = body;
-        this.namespaceName = namespaceName;
-        this.memberTable = new SymbolTable_1.SymbolTable();
+        this.kind = AstNode_1.AstNodeKind.InterfaceStatement;
         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;
-        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.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
-            }
-        }
-        this.memberTable.name = `Interface ${name === null || name === void 0 ? void 0 : name.text} (members)`;
+        this.range = util_1.util.createBoundingRange(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface);
     }
-    buildSymbolTable(parentIface) {
-        var _a, _b;
-        this.memberTable.clear();
-        if (parentIface) {
-            this.memberTable.pushParent(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.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType());
-        }
+    get fields() {
+        return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
     }
-    hasParent() {
-        return !!this.parentInterfaceName;
+    get methods() {
+        return this.body.filter(x => (0, reflection_1.isInterfaceMethodStatement)(x));
     }
-    getParentName() {
+    hasParentInterface() {
         return !!this.parentInterfaceName;
     }
-    /**
-     * 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
-     */
-    getPossibleFullParentNames() {
-        var _a;
-        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);
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.interface.leadingTrivia);
     }
     /**
      * The name of the interface WITH its leading namespace (if applicable)
      */
-    getName(parseMode) {
+    get fullName() {
         var _a;
         const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
         if (name) {
-            if (this.namespaceName) {
-                let namespaceName = this.namespaceName.getName(Parser_1.ParseMode.BrighterScript);
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(Parser_1.ParseMode.BrighterScript);
                 return `${namespaceName}.${name}`;
             }
             else {
@@ -1027,6 +1006,27 @@ class InterfaceStatement extends Statement {
             return undefined;
         }
     }
+    /**
+     * The name of the interface (without the namespace prefix)
+     */
+    get name() {
+        var _a;
+        return (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+    }
+    /**
+     * Get the name of this expression based on the parse mode
+     */
+    getName(parseMode) {
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        if (namespace) {
+            let delimiter = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
+            let namespaceName = namespace.getName(parseMode);
+            return namespaceName + delimiter + this.name;
+        }
+        else {
+            return this.name;
+        }
+    }
     transpile(state) {
         //interfaces should completely disappear at runtime
         return [];
@@ -1038,7 +1038,7 @@ class InterfaceStatement extends 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);
         }
@@ -1061,35 +1061,59 @@ class InterfaceStatement extends Statement {
         return result;
     }
     walk(visitor, options) {
+        //visitor-less walk function to do parent linking
+        (0, visitors_1.walk)(this, 'parentInterfaceName', null, options);
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
+    getType(options) {
+        var _a, _b, _c, _d;
+        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) {
+            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
+            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
+            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _b === void 0 ? void 0 : _b.text, { definingNode: statement }, memberType, flag);
+        }
+        for (const statement of this.fields) {
+            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
+            const flag = statement.isOptional ? SymbolTable_1.SymbolTypeFlag.runtime | SymbolTable_1.SymbolTypeFlag.optional : SymbolTable_1.SymbolTypeFlag.runtime;
+            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, memberType, flag);
+        }
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(this.getName(Parser_1.ParseMode.BrighterScript), resultType, options.data, this.range));
+        return resultType;
+    }
 }
 exports.InterfaceStatement = InterfaceStatement;
-class InterfaceFieldStatement extends Statement {
-    constructor(nameToken, asToken, type, namespaceName) {
-        var _a;
+class InterfaceFieldStatement extends AstNode_2.Statement {
+    constructor(nameToken, asToken, typeExpression, optionalToken) {
         super();
-        this.type = type;
-        this.namespaceName = namespaceName;
+        this.typeExpression = typeExpression;
+        this.kind = AstNode_1.AstNodeKind.InterfaceFieldStatement;
         this.tokens = {};
+        this.tokens.optional = optionalToken;
         this.tokens.name = nameToken;
         this.tokens.as = asToken;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.type)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.range = util_1.util.createBoundingRange(this.tokens.optional, this.tokens.name, this.tokens.as, this.typeExpression);
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
-    getType() {
-        var _a;
-        return (_a = this.type) === null || _a === void 0 ? void 0 : _a.type;
+    getLeadingTrivia() {
+        var _a, _b;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.name.leadingTrivia);
     }
     get name() {
-        return this.tokens.name;
+        return this.tokens.name.text;
+    }
+    get isOptional() {
+        return !!this.tokens.optional;
     }
     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;
@@ -1097,32 +1121,120 @@ class InterfaceFieldStatement extends Statement {
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
+        if (this.isOptional) {
+            result.push(this.tokens.optional.text, ' ');
+        }
         result.push(this.tokens.name.text);
-        if (this.tokens.as && this.type) {
-            result.push(' as ', ...this.type.transpile(state));
+        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 FunctionStatement {
+//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, optionalToken) {
+        super();
+        this.params = params;
+        this.returnTypeExpression = returnTypeExpression;
+        this.kind = AstNode_1.AstNodeKind.InterfaceMethodStatement;
+        this.tokens = {};
+        this.tokens.optional = optionalToken;
+        this.tokens.functionType = functionTypeToken;
+        this.tokens.name = nameToken;
+        this.tokens.leftParen = leftParen;
+        this.tokens.rightParen = rightParen;
+        this.tokens.as = asToken;
+    }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
-    constructor(name, func) {
-        super(name, func, undefined);
+    get range() {
+        var _a;
+        return util_1.util.createBoundingRange(this.tokens.optional, 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);
+    }
+    /**
+     * Get the name of this method.
+     */
+    getName(parseMode) {
+        return this.tokens.name.text;
+    }
+    get isOptional() {
+        return !!this.tokens.optional;
+    }
+    getLeadingTrivia() {
+        var _a, _b;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.functionType.leadingTrivia);
     }
     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;
+        const result = [];
+        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        if (this.isOptional) {
+            result.push(this.tokens.optional.text, ' ');
+        }
+        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 (param.typeExpression) {
+                result.push(' as ', ...param.typeExpression.getTypedef(state));
+            }
+        }
+        result.push(')');
+        if (this.returnTypeExpression) {
+            result.push(' as ', ...this.returnTypeExpression.getTypedef(state));
+        }
+        return result;
+    }
+    getType(options) {
+        var _a, _b, _c;
+        //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 TypedFunctionType_1.TypedFunctionType(returnType);
+        resultType.isSub = isSub;
+        for (let param of this.params) {
+            resultType.addParameter(param.name.text, param.getType(options), !!param.defaultValue);
+        }
+        if (options.typeChain) {
+            // need Interface type for type chain
+            (_b = this.parent) === null || _b === void 0 ? void 0 : _b.getType(options);
+        }
+        let funcName = this.getName(Parser_1.ParseMode.BrighterScript);
+        resultType.setName(funcName);
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, options.data, this.range));
+        return resultType;
     }
 }
 exports.InterfaceMethodStatement = InterfaceMethodStatement;
-class ClassStatement extends Statement {
+class ClassStatement extends AstNode_2.Statement {
     constructor(classKeyword, 
     /**
      * The name of the class (without namespace prefix)
      */
-    name, body, end, extendsKeyword, parentClassName, namespaceName, currentSymbolTable) {
+    name, body, end, extendsKeyword, parentClassName) {
         var _a, _b, _c, _d;
         super();
         this.classKeyword = classKeyword;
@@ -1131,16 +1243,12 @@ class ClassStatement extends Statement {
         this.end = end;
         this.extendsKeyword = extendsKeyword;
         this.parentClassName = parentClassName;
-        this.namespaceName = namespaceName;
-        this.currentSymbolTable = currentSymbolTable;
-        this.symbolTable = new SymbolTable_1.SymbolTable();
-        this.memberTable = new SymbolTable_1.SymbolTable();
+        this.kind = AstNode_1.AstNodeKind.ClassStatement;
         this.memberMap = {};
         this.methods = [];
         this.fields = [];
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
-        this.symbolTable.pushParent(currentSymbolTable);
-        this.range = (_b = util_1.util.createBoundingRange(this.classKeyword, this.name, this.extendsKeyword, this.parentClassName, ...this.body, this.end)) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
+        this.symbolTable = new SymbolTable_2.SymbolTable(`ClassStatement: '${(_b = this.name) === null || _b === void 0 ? void 0 : _b.text}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
         for (let statement of this.body) {
             if ((0, reflection_1.isMethodStatement)(statement)) {
                 this.methods.push(statement);
@@ -1151,15 +1259,15 @@ class ClassStatement extends Statement {
                 this.memberMap[(_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text.toLowerCase()] = statement;
             }
         }
-        this.symbolTable.name = `Class ${name === null || name === void 0 ? void 0 : name.text} (symbols)`;
-        this.memberTable.name = `Class ${name === null || name === void 0 ? void 0 : name.text} (members)`;
+        this.range = util_1.util.createBoundingRange(classKeyword, name, extendsKeyword, parentClassName, ...(body !== null && body !== void 0 ? body : []), end);
     }
     getName(parseMode) {
         var _a;
         const name = (_a = this.name) === null || _a === void 0 ? void 0 : _a.text;
         if (name) {
-            if (this.namespaceName) {
-                let namespaceName = this.namespaceName.getName(parseMode);
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(parseMode);
                 let separator = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
                 return namespaceName + separator + name;
             }
@@ -1172,35 +1280,8 @@ class ClassStatement extends Statement {
             return undefined;
         }
     }
-    getThisBscType() {
-        return new CustomType_1.CustomType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
-    }
-    getConstructorFunctionType() {
-        var _a, _b;
-        const constructFunc = this.getConstructorFunction();
-        const constructorFuncType = (_b = (_a = constructFunc === null || constructFunc === void 0 ? void 0 : constructFunc.func) === null || _a === void 0 ? void 0 : _a.getFunctionType()) !== null && _b !== void 0 ? _b : new FunctionType_1.FunctionType();
-        constructorFuncType.setName(this.getName(Parser_1.ParseMode.BrighterScript));
-        constructorFuncType.isNew = true;
-        return constructorFuncType;
-    }
-    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.getThisBscType());
-        this.memberTable.clear();
-        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.pushParent(parentClass === null || parentClass === void 0 ? void 0 : parentClass.memberTable);
-        }
-        for (const statement of this.methods) {
-            statement === null || statement === void 0 ? void 0 : statement.func.symbolTable.pushParent(this.symbolTable);
-            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getFunctionType();
-            funcType.setName(this.getName(Parser_1.ParseMode.BrighterScript) + '.' + ((_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text));
-            this.memberTable.addSymbol((_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text, statement === null || statement === void 0 ? void 0 : statement.range, funcType);
-        }
-        for (const statement of this.fields) {
-            this.memberTable.addSymbol((_e = statement === null || statement === void 0 ? void 0 : statement.name) === null || _e === void 0 ? void 0 : _e.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType());
-        }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.classKeyword.leadingTrivia);
     }
     transpile(state) {
         let result = [];
@@ -1212,14 +1293,15 @@ class ClassStatement extends Statement {
         return result;
     }
     getTypedef(state) {
-        var _a, _b;
+        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('class ', this.name.text);
         if (this.extendsKeyword && this.parentClassName) {
-            const fqName = util_1.util.getFullyQualifiedClassName(this.parentClassName.getName(Parser_1.ParseMode.BrighterScript), (_b = this.namespaceName) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript));
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            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);
@@ -1227,8 +1309,12 @@ class ClassStatement extends Statement {
         let body = this.body;
         //inject an empty "new" method if missing
         if (!this.getConstructorFunction()) {
+            const constructor = (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub);
+            constructor.parent = this;
+            //walk the constructor to set up parent links
+            constructor.link();
             body = [
-                (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
+                constructor,
                 ...this.body
             ];
         }
@@ -1247,13 +1333,14 @@ class ClassStatement extends Statement {
      * The base class is index 0, its child is index 1, and so on.
      */
     getParentClassIndex(state) {
-        var _a, _b;
+        var _a;
         let myIndex = 0;
         let stmt = this;
         while (stmt) {
             if (stmt.parentClassName) {
+                const namespace = stmt.findAncestor(reflection_1.isNamespaceStatement);
                 //find the parent class
-                stmt = (_b = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), (_a = stmt.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) === null || _b === void 0 ? void 0 : _b.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 {
@@ -1268,41 +1355,21 @@ class ClassStatement extends Statement {
             return null;
         }
     }
-    hasParent() {
+    hasParentClass() {
         return !!this.parentClassName;
     }
-    /**
-     * Gets an array of possible parent class names, taking into account the namespace this class was created under
-     * @returns array of possible parent class names
-     */
-    getPossibleFullParentNames() {
-        var _a;
-        if (!this.hasParent()) {
-            return [];
-        }
-        if (((_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getNameParts().length) > 1) {
-            // The specified parent class already has a dot, so it must already reference a namespace
-            return [this.parentClassName.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.parentClassName.getName());
-        }
-        names.push(this.parentClassName.getName());
-        return names;
-    }
     /**
      * Get all ancestor classes, in closest-to-furthest order (i.e. 0 is parent, 1 is grandparent, etc...).
      * This will return an empty array if no ancestors were found
      */
     getAncestors(state) {
-        var _a, _b;
+        var _a;
         let ancestors = [];
         let stmt = this;
         while (stmt) {
             if (stmt.parentClassName) {
-                stmt = (_b = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), (_a = this.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) === null || _b === void 0 ? void 0 : _b.item;
+                const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+                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 {
@@ -1317,6 +1384,12 @@ class ClassStatement extends Statement {
         }
         return `__${name}_builder`;
     }
+    getConstructorType() {
+        var _a, _b;
+        const constructorType = (_b = (_a = this.getConstructorFunction()) === null || _a === void 0 ? void 0 : _a.getType({ flags: SymbolTable_1.SymbolTypeFlag.runtime })) !== null && _b !== void 0 ? _b : new TypedFunctionType_1.TypedFunctionType(null);
+        constructorType.returnType = this.getType({ flags: SymbolTable_1.SymbolTypeFlag.runtime });
+        return constructorType;
+    }
     /**
      * Get the constructor function for this class (if exists), or undefined if not exist
      */
@@ -1344,7 +1417,6 @@ class ClassStatement extends Statement {
      * without instantiating the parent constructor at that point in time.
      */
     getTranspiledBuilder(state) {
-        var _a;
         let result = [];
         result.push(`function ${this.getBuilderName(this.getName(Parser_1.ParseMode.BrightScript))}()\n`);
         state.blockDepth++;
@@ -1356,7 +1428,8 @@ class ClassStatement extends Statement {
         let ancestors = this.getAncestors(state);
         //construct parent class or empty object
         if (ancestors[0]) {
-            let fullyQualifiedClassName = util_1.util.getFullyQualifiedClassName(ancestors[0].getName(Parser_1.ParseMode.BrighterScript), (_a = ancestors[0].namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript));
+            const ancestorNamespace = ancestors[0].findAncestor(reflection_1.isNamespaceStatement);
+            let fullyQualifiedClassName = util_1.util.getFullyQualifiedClassName(ancestors[0].getName(Parser_1.ParseMode.BrighterScript), ancestorNamespace === null || ancestorNamespace === void 0 ? void 0 : ancestorNamespace.getName(Parser_1.ParseMode.BrighterScript));
             result.push('instance = ', this.getBuilderName(fullyQualifiedClassName), '()');
         }
         else {
@@ -1447,10 +1520,44 @@ class ClassStatement extends Statement {
         return result;
     }
     walk(visitor, options) {
+        //visitor-less walk function to do parent linking
+        (0, visitors_1.walk)(this, 'parentClassName', null, options);
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
+    getType(options) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        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(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
+            let flag = SymbolTable_1.SymbolTypeFlag.runtime;
+            if (((_b = statement.accessModifier) === null || _b === void 0 ? void 0 : _b.kind) === TokenKind_1.TokenKind.Private) {
+                flag |= SymbolTable_1.SymbolTypeFlag.private;
+            }
+            if (((_c = statement.accessModifier) === null || _c === void 0 ? void 0 : _c.kind) === TokenKind_1.TokenKind.Protected) {
+                flag |= SymbolTable_1.SymbolTypeFlag.protected;
+            }
+            resultType.addMember((_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text, { definingNode: statement }, funcType, flag);
+        }
+        for (const statement of this.fields) {
+            const fieldType = statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
+            let flag = SymbolTable_1.SymbolTypeFlag.runtime;
+            if (statement.isOptional) {
+                flag |= SymbolTable_1.SymbolTypeFlag.optional;
+            }
+            if (((_e = statement.accessModifier) === null || _e === void 0 ? void 0 : _e.kind) === TokenKind_1.TokenKind.Private) {
+                flag |= SymbolTable_1.SymbolTypeFlag.private;
+            }
+            if (((_f = statement.accessModifier) === null || _f === void 0 ? void 0 : _f.kind) === TokenKind_1.TokenKind.Protected) {
+                flag |= SymbolTable_1.SymbolTypeFlag.protected;
+            }
+            resultType.addMember((_g = statement === null || statement === void 0 ? void 0 : statement.name) === null || _g === void 0 ? void 0 : _g.text, { definingNode: statement }, fieldType, flag);
+        }
+        (_h = options.typeChain) === null || _h === void 0 ? void 0 : _h.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, options.data, this.range));
+        return resultType;
+    }
 }
 exports.ClassStatement = ClassStatement;
 const accessModifiers = [
@@ -1460,8 +1567,9 @@ const accessModifiers = [
 ];
 class MethodStatement extends FunctionStatement {
     constructor(modifiers, name, func, override) {
-        super(name, func, undefined);
+        super(name, func);
         this.override = override;
+        this.kind = AstNode_1.AstNodeKind.MethodStatement;
         this.modifiers = [];
         if (modifiers) {
             if (Array.isArray(modifiers)) {
@@ -1471,19 +1579,19 @@ class MethodStatement extends FunctionStatement {
                 this.modifiers.push(modifiers);
             }
         }
+        this.range = util_1.util.createBoundingRange(...(this.modifiers), override, func);
     }
     get accessModifier() {
         return this.modifiers.find(x => accessModifiers.includes(x.kind));
     }
-    get range() {
-        return this.cacheRange();
+    /**
+     * Get the name of this method.
+     */
+    getName(parseMode) {
+        return this.name.text;
     }
-    cacheRange() {
-        var _a, _b;
-        if (!this._range) {
-            this._range = (_b = util_1.util.createBoundingRange(this.accessModifier, this.override, (_a = this.func) !== null && _a !== void 0 ? _a : this.name)) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
-        }
-        return this._range;
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
     }
     transpile(state) {
         if (this.name.text.toLowerCase() === 'new') {
@@ -1528,7 +1636,7 @@ class MethodStatement extends FunctionStatement {
         if (this.override) {
             result.push('override ');
         }
-        result.push(...this.func.getTypedef(state, this.name));
+        result.push(...this.func.getTypedef(state));
         return result;
     }
     /**
@@ -1540,54 +1648,60 @@ class MethodStatement extends FunctionStatement {
         if (state.classStatement.getAncestors(state).length === 0) {
             return;
         }
-        //if the first statement is a call to super, quit here
-        let firstStatement = this.func.body.statements[0];
-        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',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: ''
-        }, null), {
+            leadingWhitespace: '',
+            leadingTrivia: []
+        }), {
             kind: TokenKind_1.TokenKind.LeftParen,
             text: '(',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: ''
+            leadingWhitespace: '',
+            leadingTrivia: []
         }, {
             kind: TokenKind_1.TokenKind.RightParen,
             text: ')',
             isReserved: false,
             range: state.classStatement.name.range,
-            leadingWhitespace: ''
-        }, [], null));
+            leadingWhitespace: '',
+            leadingTrivia: []
+        }, []));
         state.editor.arrayUnshift(this.func.body.statements, superCall);
     }
     /**
      * Inject field initializers at the top of the `new` function (after any present `super()` call)
      */
     injectFieldInitializersForConstructor(state) {
-        let startingIndex = state.classStatement.hasParent() ? 1 : 0;
+        let startingIndex = state.classStatement.hasParentClass() ? 1 : 0;
         let newStatements = [];
         //insert the field initializers in order
         for (let field of state.classStatement.fields) {
             let thisQualifiedName = Object.assign({}, field.name);
             thisQualifiedName.text = 'm.' + field.name.text;
-            if (field.initialValue) {
-                newStatements.push(new AssignmentStatement(thisQualifiedName, field.equal, field.initialValue, this.func));
-            }
-            else {
+            const fieldAssignment = field.initialValue
+                ? new AssignmentStatement(field.equal, thisQualifiedName, field.initialValue)
+                : new AssignmentStatement((0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.name.range), thisQualifiedName, 
                 //if there is no initial value, set the initial value to `invalid`
-                newStatements.push(new AssignmentStatement(thisQualifiedName, (0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.name.range), (0, creators_1.createInvalidLiteral)('invalid', field.name.range), this.func));
-            }
+                (0, creators_1.createInvalidLiteral)('invalid', field.name.range));
+            // Add parent so namespace lookups work
+            fieldAssignment.parent = state.classStatement;
+            newStatements.push(fieldAssignment);
         }
         state.editor.arraySplice(this.func.body.statements, startingIndex, 0, ...newStatements);
     }
@@ -1598,33 +1712,33 @@ class MethodStatement extends FunctionStatement {
     }
 }
 exports.MethodStatement = MethodStatement;
-class FieldStatement extends Statement {
-    constructor(accessModifier, name, as, type, equal, initialValue, namespaceName) {
-        var _a;
+class FieldStatement extends AstNode_2.Statement {
+    constructor(accessModifier, name, as, typeExpression, equal, initialValue, optional) {
         super();
         this.accessModifier = accessModifier;
         this.name = name;
         this.as = as;
-        this.type = type;
+        this.typeExpression = typeExpression;
         this.equal = equal;
         this.initialValue = initialValue;
-        this.namespaceName = namespaceName;
-        this.range = (_a = util_1.util.createBoundingRange(this.accessModifier, this.name, this.as, this.type, this.equal, this.initialValue)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.optional = optional;
+        this.kind = AstNode_1.AstNodeKind.FieldStatement;
+        this.range = util_1.util.createBoundingRange(accessModifier, optional, name, as, typeExpression, equal, initialValue);
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
      * Defaults to `DynamicType`
      */
-    getType(parseMode = Parser_1.ParseMode.BrighterScript) {
-        if (this.type) {
-            return this.type.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;
+    }
+    getLeadingTrivia() {
+        var _a, _b, _c, _d, _e, _f;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_f = (_d = (_b = (_a = this.accessModifier) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : (_c = this.optional) === null || _c === void 0 ? void 0 : _c.leadingTrivia) !== null && _d !== void 0 ? _d : (_e = this.name) === null || _e === void 0 ? void 0 : _e.leadingTrivia) !== null && _f !== void 0 ? _f : []);
+    }
+    get isOptional() {
+        return !!this.optional;
     }
     transpile(state) {
         throw new Error('transpile not implemented for ' + Object.getPrototypeOf(this).constructor.name);
@@ -1636,30 +1750,34 @@ class FieldStatement extends 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(Parser_1.ParseMode.BrightScript);
-            if (!type || (0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type)) {
+            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();
             }
-            result.push((_c = (_b = this.accessModifier) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'public', ' ', (_d = this.name) === null || _d === void 0 ? void 0 : _d.text, ' as ', type.toTypeString());
+            result.push((_c = (_b = this.accessModifier) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'public', ' ');
+            if (this.isOptional) {
+                result.push(this.optional.text, ' ');
+            }
+            result.push((_d = this.name) === null || _d === void 0 ? void 0 : _d.text, ' as ', type.toTypeString());
         }
         return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            (0, visitors_1.walk)(this, 'type', visitor, options);
+            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
             (0, visitors_1.walk)(this, 'initialValue', visitor, options);
         }
     }
 }
 exports.FieldStatement = FieldStatement;
-class TryCatchStatement extends Statement {
+class TryCatchStatement extends AstNode_2.Statement {
     constructor(tokens, tryBranch, catchStatement) {
-        var _a;
         super();
         this.tokens = tokens;
         this.tryBranch = tryBranch;
         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;
+        this.kind = AstNode_1.AstNodeKind.TryCatchStatement;
+        this.range = util_1.util.createBoundingRange(tokens.try, tryBranch, catchStatement, tokens.endTry);
     }
     transpile(state) {
         var _a, _b;
@@ -1682,16 +1800,14 @@ class TryCatchStatement extends Statement {
     }
 }
 exports.TryCatchStatement = TryCatchStatement;
-class CatchStatement extends Statement {
+class CatchStatement extends AstNode_2.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);
+        this.kind = AstNode_1.AstNodeKind.CatchStatement;
+        this.range = util_1.util.createBoundingRange(tokens.catch, exceptionVariable, catchBranch);
     }
     transpile(state) {
         var _a, _b, _c, _d;
@@ -1709,13 +1825,13 @@ class CatchStatement extends Statement {
     }
 }
 exports.CatchStatement = CatchStatement;
-class ThrowStatement extends Statement {
+class ThrowStatement extends AstNode_2.Statement {
     constructor(throwToken, expression) {
-        var _a;
         super();
         this.throwToken = throwToken;
         this.expression = expression;
-        this.range = (_a = util_1.util.createBoundingRange(this.throwToken, this.expression)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.kind = AstNode_1.AstNodeKind.ThrowStatement;
+        this.range = util_1.util.createBoundingRange(throwToken, expression);
     }
     transpile(state) {
         const result = [
@@ -1739,17 +1855,18 @@ class ThrowStatement extends Statement {
     }
 }
 exports.ThrowStatement = ThrowStatement;
-class EnumStatement extends Statement {
-    constructor(tokens, body, namespaceName) {
-        var _a, _b, _c;
+class EnumStatement extends AstNode_2.Statement {
+    constructor(tokens, body) {
+        var _a;
         super();
         this.tokens = tokens;
         this.body = body;
-        this.namespaceName = namespaceName;
-        this.symbolTable = new SymbolTable_1.SymbolTable();
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
-        this.body = (_b = this.body) !== null && _b !== void 0 ? _b : [];
-        this.symbolTable.name = `Enum ${(_c = tokens === null || tokens === void 0 ? void 0 : tokens.name) === null || _c === void 0 ? void 0 : _c.text}`;
+        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);
     }
     getMembers() {
         const result = [];
@@ -1760,12 +1877,15 @@ class EnumStatement extends Statement {
         }
         return result;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.enum.leadingTrivia);
+    }
     /**
      * Get a map of member names and their values.
      * All values are stored as their AST LiteralExpression representation (i.e. string enum values include the wrapping quotes)
      */
     getMemberValueMap() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const result = new Map();
         const members = this.getMembers();
         let currentIntValue = 0;
@@ -1784,10 +1904,14 @@ class EnumStatement extends Statement {
                     currentIntValue++;
                 }
                 result.set((_c = member.name) === null || _c === void 0 ? void 0 : _c.toLowerCase(), member.value.token.text);
+                //simple unary expressions (like `-1`)
+            }
+            else if ((0, reflection_1.isUnaryExpression)(member.value) && (0, reflection_1.isLiteralExpression)(member.value.right)) {
+                result.set((_d = member.name) === null || _d === void 0 ? void 0 : _d.toLowerCase(), member.value.operator.text + member.value.right.token.text);
                 //all other values
             }
             else {
-                result.set((_d = member.name) === null || _d === void 0 ? void 0 : _d.toLowerCase(), (_g = (_f = (_e = member.value) === null || _e === void 0 ? void 0 : _e.token) === null || _f === void 0 ? void 0 : _f.text) !== null && _g !== void 0 ? _g : 'invalid');
+                result.set((_e = member.name) === null || _e === void 0 ? void 0 : _e.toLowerCase(), (_h = (_g = (_f = member.value) === null || _f === void 0 ? void 0 : _f.token) === null || _g === void 0 ? void 0 : _g.text) !== null && _h !== void 0 ? _h : 'invalid');
             }
         }
         return result;
@@ -1795,12 +1919,6 @@ class EnumStatement extends Statement {
     getMemberValue(name) {
         return this.getMemberValueMap().get(name.toLowerCase());
     }
-    buildSymbolTable() {
-        this.symbolTable.clear();
-        for (const member of this.getMembers()) {
-            this.symbolTable.addSymbol(member === null || member === void 0 ? void 0 : member.name, member === null || member === void 0 ? void 0 : member.range, new EnumType_1.EnumMemberType(this.fullName, member === null || member === void 0 ? void 0 : member.name));
-        }
-    }
     /**
      * The name of the enum (without the namespace prefix)
      */
@@ -1815,8 +1933,9 @@ class EnumStatement extends Statement {
         var _a;
         const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
         if (name) {
-            if (this.namespaceName) {
-                let namespaceName = this.namespaceName.getName(Parser_1.ParseMode.BrighterScript);
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(Parser_1.ParseMode.BrighterScript);
                 return `${namespaceName}.${name}`;
             }
             else {
@@ -1828,9 +1947,6 @@ class EnumStatement extends Statement {
             return undefined;
         }
     }
-    getThisBscType() {
-        return new EnumType_1.EnumType(this.fullName, this.symbolTable);
-    }
     transpile(state) {
         //enum declarations do not exist at runtime, so don't transpile anything...
         return [];
@@ -1858,15 +1974,27 @@ class EnumStatement extends Statement {
             (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
+    getType(options) {
+        var _a, _b, _c;
+        const members = this.getMembers();
+        const resultType = new EnumType_1.EnumType(this.fullName, (_a = members[0]) === null || _a === void 0 ? void 0 : _a.getType(options).underlyingType);
+        resultType.pushMemberProvider(() => this.getSymbolTable());
+        for (const statement of members) {
+            resultType.addMember((_c = (_b = statement === null || statement === void 0 ? void 0 : statement.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, statement.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+        }
+        return resultType;
+    }
 }
 exports.EnumStatement = EnumStatement;
-class EnumMemberStatement extends Statement {
+class EnumMemberStatement extends AstNode_2.Statement {
     constructor(tokens, value) {
-        var _a;
         super();
         this.tokens = tokens;
         this.value = value;
-        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        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
@@ -1874,6 +2002,9 @@ class EnumMemberStatement extends Statement {
     get name() {
         return this.tokens.name.text;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.name.leadingTrivia);
+    }
     transpile(state) {
         return [];
     }
@@ -1894,19 +2025,26 @@ class EnumMemberStatement extends Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType(options) {
+        var _a, _b, _c, _d;
+        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, (_d = this.value) === null || _d === void 0 ? void 0 : _d.getType(options));
+    }
 }
 exports.EnumMemberStatement = EnumMemberStatement;
-class ConstStatement extends Statement {
-    constructor(tokens, value, namespaceName) {
+class ConstStatement extends AstNode_2.Statement {
+    constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
-        this.namespaceName = namespaceName;
+        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() {
         return this.tokens.name.text;
     }
+    getLeadingTrivia() {
+        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.const.leadingTrivia);
+    }
     /**
      * The name of the statement WITH its leading namespace (if applicable)
      */
@@ -1914,8 +2052,9 @@ class ConstStatement extends Statement {
         var _a;
         const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
         if (name) {
-            if (this.namespaceName) {
-                let namespaceName = this.namespaceName.getName(Parser_1.ParseMode.BrighterScript);
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(Parser_1.ParseMode.BrighterScript);
                 return `${namespaceName}.${name}`;
             }
             else {
@@ -1947,6 +2086,29 @@ class ConstStatement extends Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType(options) {
+        return this.value.getType(options);
+    }
 }
 exports.ConstStatement = ConstStatement;
+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) {
+        var _a, _b, _c, _d, _e;
+        return [
+            state.sourceNode(this.tokens.continue, (_b = (_a = this.tokens.continue) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'continue'),
+            (_d = (_c = this.tokens.loopType) === null || _c === void 0 ? void 0 : _c.leadingWhitespace) !== null && _d !== void 0 ? _d : ' ',
+            state.sourceNode(this.tokens.continue, (_e = this.tokens.loopType) === null || _e === void 0 ? void 0 : _e.text)
+        ];
+    }
+    walk(visitor, options) {
+        //nothing to walk
+    }
+}
+exports.ContinueStatement = ContinueStatement;
 //# sourceMappingURL=Statement.js.map