brighterscript 1.0.0-alpha.26 → 1.0.0-alpha.27

package/dist/parser/Statement.js

@@ -8,10 +8,9 @@ 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_2 = require("../SymbolTable");
+const SymbolTable_1 = require("../SymbolTable");
 const AstNode_1 = require("./AstNode");
 const AstNode_2 = require("./AstNode");
 const ClassType_1 = require("../types/ClassType");
@@ -20,7 +19,7 @@ const NamespaceType_1 = require("../types/NamespaceType");
 const InterfaceType_1 = require("../types/InterfaceType");
 const VoidType_1 = require("../types/VoidType");
 const TypedFunctionType_1 = require("../types/TypedFunctionType");
-const types_1 = require("../types");
+const ArrayType_1 = require("../types/ArrayType");
 class EmptyStatement extends AstNode_2.Statement {
     constructor(options) {
         var _a;
@@ -45,7 +44,7 @@ class Body extends AstNode_2.Statement {
         super();
         this.statements = [];
         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(); });
+        this.symbolTable = new SymbolTable_1.SymbolTable('Body', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
         this.statements = (_a = options === null || options === void 0 ? void 0 : options.statements) !== null && _a !== void 0 ? _a : [];
     }
     get range() {
@@ -139,7 +138,7 @@ class AssignmentStatement extends AstNode_2.Statement {
         const variableType = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }))) !== null && _b !== void 0 ? _b : this.value.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
         // 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
-        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(this.tokens.name.text, variableType, options.data, this.tokens.name.range));
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, range: this.tokens.name.range, kind: this.kind }));
         return variableType;
     }
 }
@@ -151,7 +150,7 @@ class Block extends AstNode_2.Statement {
         this.kind = AstNode_1.AstNodeKind.Block;
         this.statements = options.statements;
         this.startingRange = options.startingRange;
-        this.range = util_1.util.createBoundingRange({ range: this.startingRange }, ...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
+        this.range = util_1.util.createBoundingRange(this.startingRange, ...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
         state.blockDepth++;
@@ -282,12 +281,15 @@ class ExitWhileStatement extends AstNode_2.Statement {
 exports.ExitWhileStatement = ExitWhileStatement;
 class FunctionStatement extends AstNode_2.Statement {
     constructor(options) {
+        var _a;
         super();
         this.kind = AstNode_1.AstNodeKind.FunctionStatement;
         this.tokens = {
             name: options.name
         };
         this.func = options.func;
+        this.func.symbolTable.name += `: '${(_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text}'`;
+        this.func.functionStatement = this;
         this.range = this.func.range;
     }
     /**
@@ -539,9 +541,9 @@ class DimStatement extends AstNode_2.Statement {
     getType(options) {
         var _a, _b;
         const numDimensions = (_b = (_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 1;
-        let type = new types_1.ArrayType();
+        let type = new ArrayType_1.ArrayType();
         for (let i = 0; i < numDimensions - 1; i++) {
-            type = new types_1.ArrayType(type);
+            type = new ArrayType_1.ArrayType(type);
         }
         return type;
     }
@@ -834,7 +836,12 @@ class DottedSetStatement extends AstNode_2.Statement {
         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.tokens.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.tokens.name) === null || _d === void 0 ? void 0 : _d.text, result, options.data, (_f = (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range));
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({
+            name: (_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.text,
+            type: result, data: options.data,
+            range: (_f = (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range,
+            kind: this.kind
+        }));
         return result;
     }
 }
@@ -924,7 +931,7 @@ class NamespaceStatement extends AstNode_2.Statement {
         this.nameExpression = options.nameExpression;
         this.body = options.body;
         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(); });
+        this.symbolTable = new SymbolTable_1.SymbolTable(`NamespaceStatement: '${this.name}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
     get range() {
         return this.cacheRange();
@@ -993,14 +1000,14 @@ class ImportStatement extends AstNode_2.Statement {
         this.kind = AstNode_1.AstNodeKind.ImportStatement;
         this.tokens = {
             import: options.import,
-            filePath: options.filePath
+            path: options.path
         };
-        this.range = util_1.util.createBoundingRange(this.tokens.import, this.tokens.filePath);
-        if (this.tokens.filePath) {
+        this.range = util_1.util.createBoundingRange(this.tokens.import, this.tokens.path);
+        if (this.tokens.path) {
             //remove quotes
-            this.filePath = this.tokens.filePath.text.replace(/"/g, '');
+            this.filePath = this.tokens.path.text.replace(/"/g, '');
             //adjust the range to exclude the quotes
-            this.tokens.filePath.range = util_1.util.createRange(this.tokens.filePath.range.start.line, this.tokens.filePath.range.start.character + 1, this.tokens.filePath.range.end.line, this.tokens.filePath.range.end.character - 1);
+            this.tokens.path.range = util_1.util.createRange(this.tokens.path.range.start.line, this.tokens.path.range.start.character + 1, this.tokens.path.range.end.line, this.tokens.path.range.end.character - 1);
         }
     }
     transpile(state) {
@@ -1010,7 +1017,7 @@ class ImportStatement extends AstNode_2.Statement {
             `'`,
             state.transpileToken(this.tokens.import, 'import'),
             ' ',
-            state.transpileToken(this.tokens.filePath)
+            state.transpileToken(this.tokens.path)
         ];
     }
     /**
@@ -1022,7 +1029,7 @@ class ImportStatement extends AstNode_2.Statement {
             (_b = (_a = this.tokens.import) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'import',
             ' ',
             //replace any `.bs` extension with `.brs`
-            this.tokens.filePath.text.replace(/\.bs"?$/i, '.brs"')
+            this.tokens.path.text.replace(/\.bs"?$/i, '.brs"')
         ];
     }
     walk(visitor, options) {
@@ -1145,15 +1152,21 @@ class InterfaceStatement extends AstNode_2.Statement {
         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;
+            const flag = statement.isOptional ? 1 /* SymbolTypeFlag.runtime */ | 4 /* SymbolTypeFlag.optional */ : 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;
+            const flag = statement.isOptional ? 1 /* SymbolTypeFlag.runtime */ | 4 /* SymbolTypeFlag.optional */ : 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));
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry({
+            name: this.getName(Parser_1.ParseMode.BrighterScript),
+            type: resultType,
+            data: options.data,
+            range: this.range,
+            kind: this.kind
+        }));
         return resultType;
     }
 }
@@ -1299,7 +1312,7 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
         }
         let funcName = this.getName(Parser_1.ParseMode.BrighterScript);
         resultType.setName(funcName);
-        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(resultType.name, resultType, options.data, this.range));
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry({ name: resultType.name, type: resultType, data: options.data, range: this.range, kind: this.kind }));
         return resultType;
     }
 }
@@ -1320,7 +1333,7 @@ class ClassStatement extends AstNode_2.Statement {
             extends: options.extends
         };
         this.parentClassName = options.parentClassName;
-        this.symbolTable = new SymbolTable_2.SymbolTable(`ClassStatement: '${(_b = this.tokens.name) === null || _b === void 0 ? void 0 : _b.text}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+        this.symbolTable = new SymbolTable_1.SymbolTable(`ClassStatement: '${(_b = this.tokens.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);
@@ -1459,8 +1472,8 @@ class ClassStatement extends AstNode_2.Statement {
     }
     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 });
+        const constructorType = (_b = (_a = this.getConstructorFunction()) === null || _a === void 0 ? void 0 : _a.getType({ flags: 1 /* SymbolTypeFlag.runtime */ })) !== null && _b !== void 0 ? _b : new TypedFunctionType_1.TypedFunctionType(null);
+        constructorType.returnType = this.getType({ flags: 1 /* SymbolTypeFlag.runtime */ });
         return constructorType;
     }
     /**
@@ -1605,30 +1618,30 @@ class ClassStatement extends AstNode_2.Statement {
         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;
+            let flag = 1 /* SymbolTypeFlag.runtime */;
             if (((_b = statement.accessModifier) === null || _b === void 0 ? void 0 : _b.kind) === TokenKind_1.TokenKind.Private) {
-                flag |= SymbolTable_1.SymbolTypeFlag.private;
+                flag |= 8 /* SymbolTypeFlag.private */;
             }
             if (((_c = statement.accessModifier) === null || _c === void 0 ? void 0 : _c.kind) === TokenKind_1.TokenKind.Protected) {
-                flag |= SymbolTable_1.SymbolTypeFlag.protected;
+                flag |= 16 /* SymbolTypeFlag.protected */;
             }
             resultType.addMember((_d = statement === null || statement === void 0 ? void 0 : statement.tokens.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;
+            let flag = 1 /* SymbolTypeFlag.runtime */;
             if (statement.isOptional) {
-                flag |= SymbolTable_1.SymbolTypeFlag.optional;
+                flag |= 4 /* SymbolTypeFlag.optional */;
             }
             if (((_e = statement.tokens.accessModifier) === null || _e === void 0 ? void 0 : _e.kind) === TokenKind_1.TokenKind.Private) {
-                flag |= SymbolTable_1.SymbolTypeFlag.private;
+                flag |= 8 /* SymbolTypeFlag.private */;
             }
             if (((_f = statement.tokens.accessModifier) === null || _f === void 0 ? void 0 : _f.kind) === TokenKind_1.TokenKind.Protected) {
-                flag |= SymbolTable_1.SymbolTypeFlag.protected;
+                flag |= 16 /* SymbolTypeFlag.protected */;
             }
             resultType.addMember((_g = statement === null || statement === void 0 ? void 0 : statement.tokens.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));
+        (_h = options.typeChain) === null || _h === void 0 ? void 0 : _h.push(new interfaces_1.TypeChainEntry({ name: resultType.name, type: resultType, data: options.data, range: this.range, kind: this.kind }));
         return resultType;
     }
 }
@@ -1822,7 +1835,7 @@ class FieldStatement extends AstNode_2.Statement {
      */
     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;
+        return (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */ }))) !== null && _b !== void 0 ? _b : (_c = this.initialValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: 1 /* SymbolTypeFlag.runtime */ }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
     }
     getLeadingTrivia() {
         var _a, _b, _c, _d, _e, _f;
@@ -1841,7 +1854,7 @@ class FieldStatement extends AstNode_2.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({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            let type = this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
             if ((0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type)) {
                 type = new DynamicType_1.DynamicType();
             }
@@ -1958,13 +1971,13 @@ class EnumStatement extends AstNode_2.Statement {
         var _a;
         super();
         this.kind = AstNode_1.AstNodeKind.EnumStatement;
-        this.symbolTable = new SymbolTable_2.SymbolTable('Enum');
         this.tokens = {
             enum: options.enum,
             name: options.name,
             endEnum: options.endEnum
         };
-        this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
+        this.symbolTable = new SymbolTable_1.SymbolTable('Enum');
+        this.body = (_a = options.body) !== null && _a !== void 0 ? _a : [];
     }
     get range() {
         return util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum);
@@ -2081,7 +2094,7 @@ class EnumStatement extends AstNode_2.Statement {
         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);
+            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), 1 /* SymbolTypeFlag.runtime */);
         }
         return resultType;
     }