brighterscript 0.57.2 → 0.59.0

package/dist/parser/Statement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = exports.Statement = void 0;
+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;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
@@ -11,26 +11,8 @@ const reflection_1 = require("../astUtils/reflection");
 const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
-/**
- * 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 AstNode_1 = require("./AstNode");
+class EmptyStatement extends AstNode_1.Statement {
     constructor(
     /**
      * Create a negative range to indicate this is an interpolated location
@@ -50,14 +32,11 @@ 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()) {
+class Body extends AstNode_1.Statement {
+    constructor(statements = []) {
         super();
         this.statements = statements;
-        this.symbolTable = symbolTable;
-    }
-    getSymbolTable() {
-        return this.symbolTable;
+        this.symbolTable = new SymbolTable_1.SymbolTable();
     }
     get range() {
         var _a, _b, _c, _d;
@@ -109,7 +88,7 @@ class Body extends Statement {
     }
 }
 exports.Body = Body;
-class AssignmentStatement extends Statement {
+class AssignmentStatement extends AstNode_1.Statement {
     constructor(equals, name, value, containingFunction) {
         super();
         this.equals = equals;
@@ -141,11 +120,12 @@ class AssignmentStatement extends Statement {
     }
 }
 exports.AssignmentStatement = AssignmentStatement;
-class Block extends Statement {
+class Block extends AstNode_1.Statement {
     constructor(statements, startingRange) {
         super();
         this.statements = statements;
         this.startingRange = startingRange;
+        this.symbolTable = new SymbolTable_1.SymbolTable();
         this.range = util_1.util.createRangeFromPositions(this.startingRange.start, this.statements.length
             ? this.statements[this.statements.length - 1].range.end
             : this.startingRange.start);
@@ -181,7 +161,7 @@ class Block extends Statement {
     }
 }
 exports.Block = Block;
-class ExpressionStatement extends Statement {
+class ExpressionStatement extends AstNode_1.Statement {
     constructor(expression) {
         super();
         this.expression = expression;
@@ -197,7 +177,7 @@ class ExpressionStatement extends Statement {
     }
 }
 exports.ExpressionStatement = ExpressionStatement;
-class CommentStatement extends Statement {
+class CommentStatement extends AstNode_1.Statement {
     constructor(comments) {
         var _a;
         super();
@@ -233,7 +213,7 @@ class CommentStatement extends Statement {
     }
 }
 exports.CommentStatement = CommentStatement;
-class ExitForStatement extends Statement {
+class ExitForStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
@@ -249,7 +229,7 @@ class ExitForStatement extends Statement {
     }
 }
 exports.ExitForStatement = ExitForStatement;
-class ExitWhileStatement extends Statement {
+class ExitWhileStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
@@ -265,22 +245,23 @@ class ExitWhileStatement extends Statement {
     }
 }
 exports.ExitWhileStatement = ExitWhileStatement;
-class FunctionStatement extends Statement {
-    constructor(name, func, namespaceName) {
+class FunctionStatement extends AstNode_1.Statement {
+    constructor(name, func) {
         super();
         this.name = name;
         this.func = func;
-        this.namespaceName = namespaceName;
         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;
@@ -307,7 +288,7 @@ class FunctionStatement extends Statement {
     }
 }
 exports.FunctionStatement = FunctionStatement;
-class IfStatement extends Statement {
+class IfStatement extends AstNode_1.Statement {
     constructor(tokens, condition, thenBranch, elseBranch, isInline) {
         var _a, _b;
         super();
@@ -394,7 +375,7 @@ class IfStatement extends Statement {
     }
 }
 exports.IfStatement = IfStatement;
-class IncrementStatement extends Statement {
+class IncrementStatement extends AstNode_1.Statement {
     constructor(value, operator) {
         super();
         this.value = value;
@@ -417,7 +398,7 @@ exports.IncrementStatement = IncrementStatement;
 /**
  * Represents a `print` statement within BrightScript.
  */
-class PrintStatement extends Statement {
+class PrintStatement extends AstNode_1.Statement {
     /**
      * Creates a new internal representation of a BrightScript `print` statement.
      * @param expressions an array of expressions or `PrintSeparator`s to be
@@ -460,7 +441,7 @@ class PrintStatement extends Statement {
     }
 }
 exports.PrintStatement = PrintStatement;
-class DimStatement extends Statement {
+class DimStatement extends AstNode_1.Statement {
     constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
         var _a, _b, _c, _d;
         super();
@@ -495,7 +476,7 @@ class DimStatement extends Statement {
     }
 }
 exports.DimStatement = DimStatement;
-class GotoStatement extends Statement {
+class GotoStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
@@ -513,7 +494,7 @@ class GotoStatement extends Statement {
     }
 }
 exports.GotoStatement = GotoStatement;
-class LabelStatement extends Statement {
+class LabelStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
@@ -530,7 +511,7 @@ class LabelStatement extends Statement {
     }
 }
 exports.LabelStatement = LabelStatement;
-class ReturnStatement extends Statement {
+class ReturnStatement extends AstNode_1.Statement {
     constructor(tokens, value) {
         var _a;
         super();
@@ -554,7 +535,7 @@ class ReturnStatement extends Statement {
     }
 }
 exports.ReturnStatement = ReturnStatement;
-class EndStatement extends Statement {
+class EndStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
@@ -570,7 +551,7 @@ class EndStatement extends Statement {
     }
 }
 exports.EndStatement = EndStatement;
-class StopStatement extends Statement {
+class StopStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
@@ -586,7 +567,7 @@ class StopStatement extends Statement {
     }
 }
 exports.StopStatement = StopStatement;
-class ForStatement extends Statement {
+class ForStatement extends AstNode_1.Statement {
     constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
         var _a, _b;
         super();
@@ -639,7 +620,7 @@ class ForStatement extends Statement {
     }
 }
 exports.ForStatement = ForStatement;
-class ForEachStatement extends Statement {
+class ForEachStatement extends AstNode_1.Statement {
     constructor(tokens, item, target, body) {
         var _a, _b;
         super();
@@ -680,7 +661,7 @@ class ForEachStatement extends Statement {
     }
 }
 exports.ForEachStatement = ForEachStatement;
-class WhileStatement extends Statement {
+class WhileStatement extends AstNode_1.Statement {
     constructor(tokens, condition, body) {
         var _a, _b;
         super();
@@ -716,7 +697,7 @@ class WhileStatement extends Statement {
     }
 }
 exports.WhileStatement = WhileStatement;
-class DottedSetStatement extends Statement {
+class DottedSetStatement extends AstNode_1.Statement {
     constructor(obj, name, value) {
         super();
         this.obj = obj;
@@ -751,7 +732,7 @@ class DottedSetStatement extends Statement {
     }
 }
 exports.DottedSetStatement = DottedSetStatement;
-class IndexedSetStatement extends Statement {
+class IndexedSetStatement extends AstNode_1.Statement {
     constructor(obj, index, value, openingSquare, closingSquare) {
         super();
         this.obj = obj;
@@ -793,7 +774,7 @@ class IndexedSetStatement extends Statement {
     }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
-class LibraryStatement extends Statement {
+class LibraryStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
@@ -816,21 +797,19 @@ class LibraryStatement extends Statement {
     }
 }
 exports.LibraryStatement = LibraryStatement;
-class NamespaceStatement extends Statement {
+class NamespaceStatement extends AstNode_1.Statement {
     constructor(keyword, 
     //this should technically only be a VariableExpression or DottedGetExpression, but that can be enforced elsewhere
-    nameExpression, body, endKeyword, parentSymbolTable) {
+    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);
+        this.name = this.getName(Parser_1.ParseMode.BrighterScript);
     }
     getSymbolTable() {
-        return this.symbolTable;
+        return this.body.symbolTable;
     }
     get range() {
         return this.cacheRange();
@@ -852,7 +831,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++;
@@ -871,7 +850,7 @@ class NamespaceStatement extends Statement {
     }
 }
 exports.NamespaceStatement = NamespaceStatement;
-class ImportStatement extends Statement {
+class ImportStatement extends AstNode_1.Statement {
     constructor(importToken, filePathToken) {
         super();
         this.importToken = importToken;
@@ -910,12 +889,11 @@ class ImportStatement extends Statement {
     }
 }
 exports.ImportStatement = ImportStatement;
-class InterfaceStatement extends Statement {
-    constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken, namespaceName) {
+class InterfaceStatement extends AstNode_1.Statement {
+    constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken) {
         super();
         this.parentInterfaceName = parentInterfaceName;
         this.body = body;
-        this.namespaceName = namespaceName;
         this.tokens = {};
         this.tokens.interface = interfaceToken;
         this.tokens.name = name;
@@ -936,8 +914,9 @@ class InterfaceStatement 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 {
@@ -960,9 +939,10 @@ class InterfaceStatement extends Statement {
      * Get the name of this expression based on the parse mode
      */
     getName(parseMode) {
-        if (this.namespaceName) {
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        if (namespace) {
             let delimiter = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
-            let namespaceName = this.namespaceName.getName(parseMode);
+            let namespaceName = namespace.getName(parseMode);
             return namespaceName + delimiter + this.name;
         }
         else {
@@ -1009,7 +989,7 @@ class InterfaceStatement extends Statement {
     }
 }
 exports.InterfaceStatement = InterfaceStatement;
-class InterfaceFieldStatement extends Statement {
+class InterfaceFieldStatement extends AstNode_1.Statement {
     constructor(nameToken, asToken, typeToken, type) {
         super();
         this.type = type;
@@ -1045,7 +1025,7 @@ class InterfaceFieldStatement extends Statement {
     }
 }
 exports.InterfaceFieldStatement = InterfaceFieldStatement;
-class InterfaceMethodStatement extends Statement {
+class InterfaceMethodStatement extends AstNode_1.Statement {
     constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeToken, returnType) {
         super();
         this.params = params;
@@ -1094,12 +1074,12 @@ class InterfaceMethodStatement extends Statement {
     }
 }
 exports.InterfaceMethodStatement = InterfaceMethodStatement;
-class ClassStatement extends Statement {
+class ClassStatement extends AstNode_1.Statement {
     constructor(classKeyword, 
     /**
      * The name of the class (without namespace prefix)
      */
-    name, body, end, extendsKeyword, parentClassName, namespaceName) {
+    name, body, end, extendsKeyword, parentClassName) {
         var _a, _b, _c;
         super();
         this.classKeyword = classKeyword;
@@ -1108,7 +1088,6 @@ class ClassStatement extends Statement {
         this.end = end;
         this.extendsKeyword = extendsKeyword;
         this.parentClassName = parentClassName;
-        this.namespaceName = namespaceName;
         this.memberMap = {};
         this.methods = [];
         this.fields = [];
@@ -1129,8 +1108,9 @@ class ClassStatement extends Statement {
         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;
             }
@@ -1153,14 +1133,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(Parser_1.ParseMode.BrighterScript), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript));
             result.push(` extends ${fqName}`);
         }
         result.push(state.newline);
@@ -1188,13 +1169,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 = this.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(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;
                 myIndex++;
             }
             else {
@@ -1217,12 +1199,13 @@ class ClassStatement extends Statement {
      * 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(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;
                 ancestors.push(stmt);
             }
             else {
@@ -1264,7 +1247,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++;
@@ -1276,7 +1258,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 {
@@ -1381,7 +1364,7 @@ const accessModifiers = [
 class MethodStatement extends FunctionStatement {
     constructor(modifiers, name, func, override) {
         var _a;
-        super(name, func, undefined);
+        super(name, func);
         this.override = override;
         this.modifiers = [];
         if (modifiers) {
@@ -1397,6 +1380,12 @@ class MethodStatement extends FunctionStatement {
     get accessModifier() {
         return this.modifiers.find(x => accessModifiers.includes(x.kind));
     }
+    /**
+     * Get the name of this method.
+     */
+    getName(parseMode) {
+        return this.name.text;
+    }
     transpile(state) {
         if (this.name.text.toLowerCase() === 'new') {
             this.ensureSuperConstructorCall(state);
@@ -1468,7 +1457,7 @@ class MethodStatement extends FunctionStatement {
             isReserved: false,
             range: state.classStatement.name.range,
             leadingWhitespace: ''
-        }, null), {
+        }), {
             kind: TokenKind_1.TokenKind.LeftParen,
             text: '(',
             isReserved: false,
@@ -1480,7 +1469,7 @@ class MethodStatement extends FunctionStatement {
             isReserved: false,
             range: state.classStatement.name.range,
             leadingWhitespace: ''
-        }, [], null));
+        }, []));
         state.editor.arrayUnshift(this.func.body.statements, superCall);
     }
     /**
@@ -1516,7 +1505,7 @@ exports.MethodStatement = MethodStatement;
 class ClassMethodStatement extends MethodStatement {
 }
 exports.ClassMethodStatement = ClassMethodStatement;
-class FieldStatement extends Statement {
+class FieldStatement extends AstNode_1.Statement {
     constructor(accessModifier, name, as, type, equal, initialValue) {
         var _a, _b, _c, _d;
         super();
@@ -1574,7 +1563,7 @@ exports.FieldStatement = FieldStatement;
 class ClassFieldStatement extends FieldStatement {
 }
 exports.ClassFieldStatement = ClassFieldStatement;
-class TryCatchStatement extends Statement {
+class TryCatchStatement extends AstNode_1.Statement {
     constructor(tokens, tryBranch, catchStatement) {
         super();
         this.tokens = tokens;
@@ -1606,7 +1595,7 @@ class TryCatchStatement extends Statement {
     }
 }
 exports.TryCatchStatement = TryCatchStatement;
-class CatchStatement extends Statement {
+class CatchStatement extends AstNode_1.Statement {
     constructor(tokens, exceptionVariable, catchBranch) {
         super();
         this.tokens = tokens;
@@ -1633,7 +1622,7 @@ class CatchStatement extends Statement {
     }
 }
 exports.CatchStatement = CatchStatement;
-class ThrowStatement extends Statement {
+class ThrowStatement extends AstNode_1.Statement {
     constructor(throwToken, expression) {
         var _a;
         super();
@@ -1663,13 +1652,12 @@ class ThrowStatement extends Statement {
     }
 }
 exports.ThrowStatement = ThrowStatement;
-class EnumStatement extends Statement {
-    constructor(tokens, body, namespaceName) {
+class EnumStatement extends AstNode_1.Statement {
+    constructor(tokens, body) {
         var _a;
         super();
         this.tokens = tokens;
         this.body = body;
-        this.namespaceName = namespaceName;
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
     }
     get range() {
@@ -1690,7 +1678,7 @@ class EnumStatement extends Statement {
      * 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;
@@ -1709,10 +1697,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;
@@ -1734,8 +1726,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 {
@@ -1776,7 +1769,7 @@ class EnumStatement extends Statement {
     }
 }
 exports.EnumStatement = EnumStatement;
-class EnumMemberStatement extends Statement {
+class EnumMemberStatement extends AstNode_1.Statement {
     constructor(tokens, value) {
         super();
         this.tokens = tokens;
@@ -1814,12 +1807,11 @@ class EnumMemberStatement extends Statement {
     }
 }
 exports.EnumMemberStatement = EnumMemberStatement;
-class ConstStatement extends Statement {
-    constructor(tokens, value, namespaceName) {
+class ConstStatement extends AstNode_1.Statement {
+    constructor(tokens, value) {
         super();
         this.tokens = tokens;
         this.value = value;
-        this.namespaceName = namespaceName;
         this.range = util_1.util.createBoundingRange(this.tokens.const, this.tokens.name, this.tokens.equals, this.value);
     }
     get name() {
@@ -1832,8 +1824,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 {
@@ -1867,4 +1860,25 @@ class ConstStatement extends Statement {
     }
 }
 exports.ConstStatement = ConstStatement;
+class ContinueStatement extends AstNode_1.Statement {
+    constructor(tokens) {
+        super();
+        this.tokens = tokens;
+    }
+    get range() {
+        return this.tokens.continue.range;
+    }
+    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