brighterscript 1.0.0-alpha.13 → 1.0.0-alpha.16

package/dist/parser/tests/controlFlow/ForEach.spec.js

@@ -2,42 +2,43 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const Parser_1 = require("../../Parser");
-const lexer_1 = require("../../../lexer");
+const TokenKind_1 = require("../../../lexer/TokenKind");
 const Parser_spec_1 = require("../Parser.spec");
-const __1 = require("../..");
 const vscode_languageserver_1 = require("vscode-languageserver");
+const Statement_1 = require("../../Statement");
+const Expression_1 = require("../../Expression");
 const testHelpers_spec_1 = require("../../../testHelpers.spec");
 describe('parser foreach loops', () => {
     it('requires a name and target', () => {
         let { statements, diagnostics } = Parser_1.Parser.parse([
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.ForEach, 'for each'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.ForEach, 'for each'),
             (0, Parser_spec_1.identifier)('word'),
             (0, Parser_spec_1.identifier)('in'),
             (0, Parser_spec_1.identifier)('lipsum'),
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             // body would go here, but it's not necessary for this test
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.EndFor, 'end for'),
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.EndFor, 'end for'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             Parser_spec_1.EOF
         ]);
         (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
         (0, chai_1.expect)(statements).to.exist;
         let forEach = statements[0];
-        (0, chai_1.expect)(forEach).to.be.instanceof(__1.ForEachStatement);
+        (0, chai_1.expect)(forEach).to.be.instanceof(Statement_1.ForEachStatement);
         (0, chai_1.expect)(forEach.item.text).to.eql('word');
-        (0, chai_1.expect)(forEach.target).to.be.instanceof(__1.VariableExpression);
+        (0, chai_1.expect)(forEach.target).to.be.instanceof(Expression_1.VariableExpression);
         (0, chai_1.expect)(forEach.target.name).to.deep.include((0, Parser_spec_1.identifier)('lipsum'));
     });
     it('allows \'next\' to terminate loop', () => {
         let { statements, diagnostics } = Parser_1.Parser.parse([
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.ForEach, 'for each'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.ForEach, 'for each'),
             (0, Parser_spec_1.identifier)('word'),
             (0, Parser_spec_1.identifier)('in'),
             (0, Parser_spec_1.identifier)('lipsum'),
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             // body would go here, but it's not necessary for this test
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.Next, 'next'),
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Next, 'next'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             Parser_spec_1.EOF
         ]);
         (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
@@ -55,43 +56,43 @@ describe('parser foreach loops', () => {
          */
         let { statements, diagnostics } = Parser_1.Parser.parse([
             {
-                kind: lexer_1.TokenKind.ForEach,
+                kind: TokenKind_1.TokenKind.ForEach,
                 text: 'for each',
                 isReserved: true,
                 range: vscode_languageserver_1.Range.create(0, 0, 0, 8)
             },
             {
-                kind: lexer_1.TokenKind.Identifier,
+                kind: TokenKind_1.TokenKind.Identifier,
                 text: 'a',
                 isReserved: false,
                 range: vscode_languageserver_1.Range.create(0, 9, 0, 10)
             },
             {
-                kind: lexer_1.TokenKind.Identifier,
+                kind: TokenKind_1.TokenKind.Identifier,
                 text: 'in',
                 isReserved: true,
                 range: vscode_languageserver_1.Range.create(0, 11, 0, 13)
             },
             {
-                kind: lexer_1.TokenKind.Identifier,
+                kind: TokenKind_1.TokenKind.Identifier,
                 text: 'b',
                 isReserved: false,
                 range: vscode_languageserver_1.Range.create(0, 14, 0, 15)
             },
             {
-                kind: lexer_1.TokenKind.Newline,
+                kind: TokenKind_1.TokenKind.Newline,
                 text: '\n',
                 isReserved: false,
                 range: vscode_languageserver_1.Range.create(0, 15, 0, 16)
             },
             // loop body isn't significant for location tracking, so helper functions are safe
             (0, Parser_spec_1.identifier)('Rnd'),
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.LeftParen, '('),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.LeftParen, '('),
             (0, Parser_spec_1.identifier)('a'),
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.RightParen, ')'),
-            (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.RightParen, ')'),
+            (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
             {
-                kind: lexer_1.TokenKind.EndFor,
+                kind: TokenKind_1.TokenKind.EndFor,
                 text: 'end for',
                 isReserved: false,
                 range: vscode_languageserver_1.Range.create(2, 0, 2, 7)

package/dist/parser/tests/controlFlow/ForEach.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ForEach.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/controlFlow/ForEach.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ForEach.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/controlFlow/ForEach.spec.ts"],"names":[],"mappings":"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"}

package/dist/parser/tests/controlFlow/If.spec.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const assert = require("assert");
 const Parser_1 = require("../../Parser");
-const lexer_1 = require("../../../lexer");
+const Lexer_1 = require("../../../lexer/Lexer");
+const TokenKind_1 = require("../../../lexer/TokenKind");
 const Parser_spec_1 = require("../Parser.spec");
-const astUtils_1 = require("../../../astUtils");
+const reflection_1 = require("../../../astUtils/reflection");
 describe('parser if statements', () => {
     it('allows empty if blocks', () => {
         var _a;
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if true then
 
             else if true then
@@ -24,7 +25,7 @@ describe('parser if statements', () => {
     });
     it('allows empty elseif blocks', () => {
         var _a;
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if true then
                 stop
             else if true then
@@ -39,7 +40,7 @@ describe('parser if statements', () => {
     });
     it('allows empty else blocks', () => {
         var _a;
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if true then
                 stop
             else if true then
@@ -54,7 +55,7 @@ describe('parser if statements', () => {
     });
     it('single-line if next to else or endif', () => {
         var _a;
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if type(component.TextAttrs.font) = "roString"
                 font = m.fonts.Lookup(component.TextAttrs.font)
                 if font = invalid then font = m.fonts.medium
@@ -68,17 +69,17 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
         let ifs = statements[0];
-        if (!(0, astUtils_1.isIfStatement)(ifs) || !(0, astUtils_1.isIfStatement)((_a = ifs.thenBranch) === null || _a === void 0 ? void 0 : _a.statements[1])) {
+        if (!(0, reflection_1.isIfStatement)(ifs) || !(0, reflection_1.isIfStatement)((_a = ifs.thenBranch) === null || _a === void 0 ? void 0 : _a.statements[1])) {
             assert.fail('Missing single-line if inside if-then');
         }
-        if (!(0, astUtils_1.isIfStatement)(ifs.elseBranch)) {
+        if (!(0, reflection_1.isIfStatement)(ifs.elseBranch)) {
             assert.fail('Missing chained else-if statement');
         }
         (0, chai_1.expect)(ifs.elseBranch.elseBranch).to.exist;
     });
     it('single-line if inside multi-line if', () => {
         var _a;
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if true
                 if true then t = 1
             else
@@ -89,16 +90,16 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
         let ifs = statements[0];
-        if (!(0, astUtils_1.isIfStatement)(ifs) || !(0, astUtils_1.isIfStatement)((_a = ifs.thenBranch) === null || _a === void 0 ? void 0 : _a.statements[0])) {
+        if (!(0, reflection_1.isIfStatement)(ifs) || !(0, reflection_1.isIfStatement)((_a = ifs.thenBranch) === null || _a === void 0 ? void 0 : _a.statements[0])) {
             assert.fail('Missing single-line if inside if-then');
         }
         (0, chai_1.expect)(ifs.elseBranch).to.exist;
-        if (!(0, astUtils_1.isBlock)(ifs.elseBranch) || !(0, astUtils_1.isCommentStatement)(ifs.elseBranch.statements[0])) {
+        if (!(0, reflection_1.isBlock)(ifs.elseBranch) || !(0, reflection_1.isCommentStatement)(ifs.elseBranch.statements[0])) {
             assert.fail('Missing comment inside else branch');
         }
     });
     it('dotted set in else block', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if true then m.top.visible = true else m.top.visible = false
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -111,15 +112,15 @@ describe('parser if statements', () => {
     describe('single-line if', () => {
         it('parses if only', () => {
             let { statements, diagnostics } = Parser_1.Parser.parse([
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.If, 'if'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '1'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Less, '<'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '2'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Then, 'then'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.If, 'if'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '1'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Less, '<'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '2'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Then, 'then'),
                 (0, Parser_spec_1.identifier)('foo'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.True, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.True, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
                 Parser_spec_1.EOF
             ]);
             (0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
@@ -127,19 +128,19 @@ describe('parser if statements', () => {
         });
         it('parses if-else', () => {
             let { statements, diagnostics } = Parser_1.Parser.parse([
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.If, 'if'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '1'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Less, '<'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '2'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Then, 'then'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.If, 'if'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '1'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Less, '<'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '2'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Then, 'then'),
                 (0, Parser_spec_1.identifier)('foo'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.True, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Else, 'else'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.True, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Else, 'else'),
                 (0, Parser_spec_1.identifier)('foo'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.False, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.False, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
                 Parser_spec_1.EOF
             ]);
             (0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
@@ -147,28 +148,28 @@ describe('parser if statements', () => {
         });
         it('parses if-elseif-else', () => {
             let { statements, diagnostics } = Parser_1.Parser.parse([
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.If, 'if'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '1'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Less, '<'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '2'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Then, 'then'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.If, 'if'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '1'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Less, '<'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '2'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Then, 'then'),
                 (0, Parser_spec_1.identifier)('foo'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.True, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Else, 'else'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.If, 'if'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '1'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '2'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Then, 'then'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.True, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Else, 'else'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.If, 'if'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '1'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '2'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Then, 'then'),
                 (0, Parser_spec_1.identifier)('same'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.True, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Else, 'else'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.True, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Else, 'else'),
                 (0, Parser_spec_1.identifier)('foo'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.True, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.True, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
                 Parser_spec_1.EOF
             ]);
             (0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
@@ -177,26 +178,26 @@ describe('parser if statements', () => {
         it('allows \'then\' to be skipped', () => {
             // if 1 < 2 foo = true else if 1 = 2 same = true
             let { statements, diagnostics } = Parser_1.Parser.parse([
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.If, 'if'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '1'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Less, '<'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '2'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.If, 'if'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '1'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Less, '<'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '2'),
                 (0, Parser_spec_1.identifier)('foo'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.True, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Else, 'else'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.If, 'if'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '1'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.IntegerLiteral, '2'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.True, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Else, 'else'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.If, 'if'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '1'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.IntegerLiteral, '2'),
                 (0, Parser_spec_1.identifier)('same'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.True, 'true'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Else, 'else'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.True, 'true'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Else, 'else'),
                 (0, Parser_spec_1.identifier)('foo'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Equal, '='),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.False, 'false'),
-                (0, Parser_spec_1.token)(lexer_1.TokenKind.Newline, '\n'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Equal, '='),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.False, 'false'),
+                (0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
                 Parser_spec_1.EOF
             ]);
             (0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
@@ -219,7 +220,7 @@ describe('parser if statements', () => {
     describe('block if', () => {
         it('parses if only', () => {
             //because the parser depends on line numbers for certain if statements, this needs to be location-aware
-            let { tokens } = lexer_1.Lexer.scan(`
+            let { tokens } = Lexer_1.Lexer.scan(`
                 if 1 < 2 THEN
                     foo = true
                     bar = true
@@ -231,7 +232,7 @@ describe('parser if statements', () => {
         });
         it('parses if-else', () => {
             //this test requires token locations, so use the lexer
-            let { tokens } = lexer_1.Lexer.scan(`
+            let { tokens } = Lexer_1.Lexer.scan(`
                 if 1 < 2 then
                     foo = true
                 else
@@ -245,7 +246,7 @@ describe('parser if statements', () => {
         });
         it('parses if-elseif-else', () => {
             //this test requires token locations, so use the lexer
-            let { tokens } = lexer_1.Lexer.scan(`
+            let { tokens } = Lexer_1.Lexer.scan(`
                 if 1 < 2 then
                     foo = true
                 else if 1 > 2 then
@@ -261,7 +262,7 @@ describe('parser if statements', () => {
         });
         it('allows \'then\' to be skipped', () => {
             //this test requires token locations, so use the lexer
-            let { tokens } = lexer_1.Lexer.scan(`
+            let { tokens } = Lexer_1.Lexer.scan(`
                 if 1 < 2
                     foo = true
                 else if 1 > 2
@@ -277,7 +278,7 @@ describe('parser if statements', () => {
         });
         it('sets endif token properly', () => {
             //this test requires token locations, so use the lexer
-            let { tokens } = lexer_1.Lexer.scan(`
+            let { tokens } = Lexer_1.Lexer.scan(`
                 sub a()
                     if true then
                         print false
@@ -293,7 +294,7 @@ describe('parser if statements', () => {
             (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
             //the endif token should be set
             let ifs = statements[0].func.body.statements[0];
-            if (!(0, astUtils_1.isIfStatement)(ifs) || !(0, astUtils_1.isIfStatement)(ifs.elseBranch)) {
+            if (!(0, reflection_1.isIfStatement)(ifs) || !(0, reflection_1.isIfStatement)(ifs.elseBranch)) {
                 assert.fail('Unexpected statement found');
             }
             (0, chai_1.expect)(ifs.tokens.endIf).to.not.exist;
@@ -301,7 +302,7 @@ describe('parser if statements', () => {
         });
     });
     it('supports trailing colons after conditional statements', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             sub main()
                 if 1 > 0:
                     print "positive!"
@@ -317,7 +318,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
     });
     it('supports trailing colons for one-line if statements', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2: return true: end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -326,7 +327,7 @@ describe('parser if statements', () => {
     });
     it('catches one-line if statement missing first colon', () => {
         //missing colon after 2
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 return true : end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -335,7 +336,7 @@ describe('parser if statements', () => {
     });
     it('catches one-line if statement with multiple statements missing first colon', () => {
         //missing colon after 2
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 print "ok" : return true : end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -344,7 +345,7 @@ describe('parser if statements', () => {
     });
     it('catches one-line if statement missing second colon', () => {
         //missing colon after `2`
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 : return true end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -353,7 +354,7 @@ describe('parser if statements', () => {
     });
     it('catches one-line if statement with else missing colons', () => {
         //missing colon after `2`
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 : return true: else return false end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -362,7 +363,7 @@ describe('parser if statements', () => {
     });
     it('catches one-line if statement with colon and missing end if', () => {
         //missing colon after `2`
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2: return true
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -371,7 +372,7 @@ describe('parser if statements', () => {
     });
     it('catches one-line if multi-statement with colon and missing end if', () => {
         //missing colon after `2`
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2: print "ok": return true
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -380,7 +381,7 @@ describe('parser if statements', () => {
     });
     it('catches one-line if statement with colon and missing endif inside a function', () => {
         //missing 'end if'
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             function missingendif()
                 if true : return true
             end function
@@ -391,7 +392,7 @@ describe('parser if statements', () => {
     });
     it('catches extraneous colon at the end of one-line if-else', () => {
         //colon at the end not allowed
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then return true else return false:
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -400,7 +401,7 @@ describe('parser if statements', () => {
     });
     it('catches colon before if, unless there is `then` before', () => {
         //colon before if isn't allowed
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then: if 2<3: return false: end if
             : if 1 < 2: return true: end if
             end if
@@ -411,7 +412,7 @@ describe('parser if statements', () => {
     });
     it('catches extraneous colon+end if at the end of one-line if-else', () => {
         //expected newline + unexpected endif
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then return true else return false: end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -420,7 +421,7 @@ describe('parser if statements', () => {
     });
     it('recovers from extraneous endif at the end of one-line if-else', () => {
         //unexpected endif
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             function test1()
                 if 1 < 2: return true: else return false end if
             end function
@@ -431,7 +432,7 @@ describe('parser if statements', () => {
     });
     it('recovers from missing end-if', () => {
         //unexpected endif
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             function test1()
                 if 1 < 2 then if 1 < 3
                     return true
@@ -446,7 +447,7 @@ describe('parser if statements', () => {
     });
     it('catches extraneous colon at the end of one-line if', () => {
         //colon at the end not allowed
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then return true:
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -455,7 +456,7 @@ describe('parser if statements', () => {
     });
     it('catches multi-line if inside a one-line if branch', () => {
         //second if should be inline
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then if 1 < 3
                 return true
             end if
@@ -466,7 +467,7 @@ describe('parser if statements', () => {
     });
     it('supports multiple statements in one-line if statements', () => {
         //second if should be inline
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then ok = true : m.ok = true : print "ok" : ook() else if 1 < 3
                 return true
             end if
@@ -477,7 +478,7 @@ describe('parser if statements', () => {
     });
     it('catches multi-line if inside a one-line if else branch', () => {
         //second if should be inline
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then return false else if 1 < 3
                 return true
             end if
@@ -488,7 +489,7 @@ describe('parser if statements', () => {
     });
     it('catches else statement missing colon', () => {
         //missing colon before `end if`
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2
               return true
             else return false end if
@@ -498,7 +499,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.lengthOf(1);
     });
     it('supports if statement with condition and action on one line, but end if on separate line', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2: return true
             end if
         `);
@@ -507,7 +508,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
     });
     it('supports colon after return in single-line if statement', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if false : print "true" : end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -515,7 +516,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
     });
     it('supports if elseif endif single line', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if true: print "8 worked": else if true: print "not run": else: print "not run": end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -523,7 +524,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
     });
     it('supports comment at the end of one-line if', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 > 2 then return true 'OK
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -531,7 +532,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
     });
     it('supports colon at the beginning of a line', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if 1 < 2 then: if 1 < 4 then return false
             : end if
         `);
@@ -540,7 +541,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
     });
     it('supports one-line functions inside of one-line if statement', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if true then : test = sub() : print "yes" : end sub : end if
         `);
         let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
@@ -548,7 +549,7 @@ describe('parser if statements', () => {
         (0, chai_1.expect)(statements).to.be.length.greaterThan(0);
     });
     it('single-line if block statements have correct range', () => {
-        let { tokens } = lexer_1.Lexer.scan(`
+        let { tokens } = Lexer_1.Lexer.scan(`
             if false then print "true"
             if false then print "true": a = 10
             if false then print "true" else print "false"