brighterscript 1.0.0-alpha.20 → 1.0.0-alpha.23

package/dist/parser/Statement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.ClassMethodStatement = 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.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;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
@@ -12,6 +12,8 @@ const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
 const CustomType_1 = require("../types/CustomType");
 const InterfaceType_1 = require("../types/InterfaceType");
+const EnumType_1 = require("../types/EnumType");
+const FunctionType_1 = require("../types/FunctionType");
 /**
  * A BrightScript statement
  */
@@ -92,9 +94,7 @@ class Body extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            for (let i = 0; i < this.statements.length; i++) {
-                (0, visitors_1.walk)(this.statements, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.statements, visitor, options, this);
         }
     }
 }
@@ -166,9 +166,7 @@ class Block extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            for (let i = 0; i < this.statements.length; i++) {
-                (0, visitors_1.walk)(this.statements, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.statements, visitor, options, this);
         }
     }
 }
@@ -456,12 +454,8 @@ class PrintStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            for (let i = 0; i < this.expressions.length; i++) {
-                //sometimes we have semicolon `Token`s in the expressions list (should probably fix that...), so only emit the actual expressions
-                if ((0, reflection_1.isExpression)(this.expressions[i])) {
-                    (0, visitors_1.walk)(this.expressions, i, visitor, options, this);
-                }
-            }
+            //sometimes we have semicolon Tokens in the expressions list (should probably fix that...), so only walk the actual expressions
+            (0, visitors_1.walkArray)(this.expressions, visitor, options, this, (item) => (0, reflection_1.isExpression)(item));
         }
     }
 }
@@ -496,9 +490,7 @@ class DimStatement extends Statement {
     walk(visitor, options) {
         var _a;
         if (((_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) > 0 && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            for (let i = 0; i < this.dimensions.length; i++) {
-                (0, visitors_1.walk)(this.dimensions, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.dimensions, visitor, options, this);
         }
     }
 }
@@ -950,29 +942,9 @@ class InterfaceStatement extends Statement {
             }
             else if ((0, reflection_1.isInterfaceFieldStatement)(statement)) {
                 this.fields.push(statement);
-                this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
-            }
-        }
-    }
-    /**
-     * The name of the interface WITH its leading namespace (if applicable)
-     */
-    getName(parseMode) {
-        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);
-                return `${namespaceName}.${name}`;
-            }
-            else {
-                return name;
+                this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
         }
-        else {
-            //return undefined which will allow outside callers to know that this interface doesn't have a name
-            return undefined;
-        }
     }
     buildSymbolTable(parentIface) {
         var _a, _b;
@@ -985,7 +957,7 @@ class InterfaceStatement extends Statement {
             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.tokens.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType());
+            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());
         }
     }
     hasParent() {
@@ -1018,6 +990,26 @@ class InterfaceStatement extends Statement {
     getThisBscType() {
         return new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
     }
+    /**
+     * The name of the interface WITH its leading namespace (if applicable)
+     */
+    getName(parseMode) {
+        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);
+                return `${namespaceName}.${name}`;
+            }
+            else {
+                return name;
+            }
+        }
+        else {
+            //return undefined which will allow outside callers to know that this interface doesn't have a name
+            return undefined;
+        }
+    }
     transpile(state) {
         //interfaces should completely disappear at runtime
         return [];
@@ -1053,9 +1045,7 @@ class InterfaceStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            for (let i = 0; i < this.body.length; i++) {
-                (0, visitors_1.walk)(this.body, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
 }
@@ -1135,11 +1125,11 @@ class ClassStatement extends Statement {
         this.symbolTable.setParent(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;
         for (let statement of this.body) {
-            if ((0, reflection_1.isClassMethodStatement)(statement)) {
+            if ((0, reflection_1.isMethodStatement)(statement)) {
                 this.methods.push(statement);
                 this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
-            else if ((0, reflection_1.isClassFieldStatement)(statement)) {
+            else if ((0, reflection_1.isFieldStatement)(statement)) {
                 this.fields.push(statement);
                 this.memberMap[(_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text.toLowerCase()] = statement;
             }
@@ -1167,9 +1157,9 @@ class ClassStatement extends Statement {
         return new CustomType_1.CustomType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
     }
     getConstructorFunctionType() {
-        var _a;
-        const constructFunc = (_a = this.getConstructorFunction()) !== null && _a !== void 0 ? _a : this.getEmptyNewFunction();
-        const constructorFuncType = constructFunc.func.getFunctionType();
+        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;
@@ -1204,7 +1194,6 @@ class ClassStatement extends Statement {
     }
     getTypedef(state) {
         var _a, _b;
-        this.ensureConstructorFunctionExists();
         const result = [];
         for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
@@ -1216,7 +1205,15 @@ class ClassStatement extends Statement {
         }
         result.push(state.newline);
         state.blockDepth++;
-        for (const member of this.body) {
+        let body = this.body;
+        //inject an empty "new" method if missing
+        if (!this.getConstructorFunction()) {
+            body = [
+                (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
+                ...this.body
+            ];
+        }
+        for (const member of body) {
             if ((0, reflection_1.isTypedefProvider)(member)) {
                 result.push(state.indent(), ...member.getTypedef(state), state.newline);
             }
@@ -1244,7 +1241,13 @@ class ClassStatement extends Statement {
                 break;
             }
         }
-        return myIndex - 1;
+        const result = myIndex - 1;
+        if (result >= 0) {
+            return result;
+        }
+        else {
+            return null;
+        }
     }
     hasParent() {
         return !!this.parentClassName;
@@ -1299,25 +1302,10 @@ class ClassStatement extends Statement {
      * Get the constructor function for this class (if exists), or undefined if not exist
      */
     getConstructorFunction() {
-        var _a, _b;
-        for (let key in this.memberMap) {
-            let member = this.memberMap[key];
-            if (((_b = (_a = member.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'new') {
-                return member;
-            }
-        }
-    }
-    getEmptyNewFunction() {
-        return (0, creators_1.createClassMethodStatement)('new', TokenKind_1.TokenKind.Sub);
-    }
-    /**
-     * Create an empty `new` function if class is missing it (simplifies transpile logic)
-     */
-    ensureConstructorFunctionExists() {
-        if (!this.getConstructorFunction()) {
-            this.memberMap.new = this.getEmptyNewFunction();
-            this.body = [this.memberMap.new, ...this.body];
-        }
+        return this.body.find((stmt) => {
+            var _a, _b;
+            return ((_b = (_a = stmt === null || stmt === void 0 ? void 0 : stmt.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'new';
+        });
     }
     /**
      * Determine if the specified field was declared in one of the ancestor classes
@@ -1338,7 +1326,6 @@ class ClassStatement extends Statement {
      */
     getTranspiledBuilder(state) {
         var _a;
-        this.ensureConstructorFunctionExists();
         let result = [];
         result.push(`function ${this.getBuilderName(this.getName(Parser_1.ParseMode.BrightScript))}()\n`);
         state.blockDepth++;
@@ -1359,14 +1346,22 @@ class ClassStatement extends Statement {
         }
         result.push(state.newline, state.indent());
         let parentClassIndex = this.getParentClassIndex(state);
-        for (let statement of this.body) {
+        let body = this.body;
+        //inject an empty "new" method if missing
+        if (!this.getConstructorFunction()) {
+            body = [
+                (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
+                ...this.body
+            ];
+        }
+        for (let statement of body) {
             //is field statement
-            if ((0, reflection_1.isClassFieldStatement)(statement)) {
+            if ((0, reflection_1.isFieldStatement)(statement)) {
                 //do nothing with class fields in this situation, they are handled elsewhere
                 continue;
                 //methods
             }
-            else if ((0, reflection_1.isClassMethodStatement)(statement)) {
+            else if ((0, reflection_1.isMethodStatement)(statement)) {
                 //store overridden parent methods as super{parentIndex}_{methodName}
                 if (
                 //is override method
@@ -1434,18 +1429,32 @@ class ClassStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            for (let i = 0; i < this.body.length; i++) {
-                (0, visitors_1.walk)(this.body, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
 }
 exports.ClassStatement = ClassStatement;
-class ClassMethodStatement extends FunctionStatement {
-    constructor(accessModifier, name, func, override) {
+const accessModifiers = [
+    TokenKind_1.TokenKind.Public,
+    TokenKind_1.TokenKind.Protected,
+    TokenKind_1.TokenKind.Private
+];
+class MethodStatement extends FunctionStatement {
+    constructor(modifiers, name, func, override) {
         super(name, func, undefined);
-        this.accessModifier = accessModifier;
         this.override = override;
+        this.modifiers = [];
+        if (modifiers) {
+            if (Array.isArray(modifiers)) {
+                this.modifiers.push(...modifiers);
+            }
+            else {
+                this.modifiers.push(modifiers);
+            }
+        }
+    }
+    get accessModifier() {
+        return this.modifiers.find(x => accessModifiers.includes(x.kind));
     }
     get range() {
         return this.cacheRange();
@@ -1469,15 +1478,15 @@ class ClassMethodStatement extends FunctionStatement {
         const visitor = (0, visitors_1.createVisitor)({
             VariableExpression: e => {
                 if (e.name.text.toLocaleLowerCase() === 'super') {
-                    e.name.text = `m.super${parentClassIndex}_new`;
+                    state.editor.setProperty(e.name, 'text', `m.super${parentClassIndex}_new`);
                 }
             },
             DottedGetExpression: e => {
                 const beginningVariable = util_1.util.findBeginningVariableExpression(e);
                 const lowerName = beginningVariable === null || beginningVariable === void 0 ? void 0 : beginningVariable.getName(Parser_1.ParseMode.BrighterScript).toLowerCase();
                 if (lowerName === 'super') {
-                    beginningVariable.name.text = 'm';
-                    e.name.text = `super${parentClassIndex}_${e.name.text}`;
+                    state.editor.setProperty(beginningVariable.name, 'text', 'm');
+                    state.editor.setProperty(e.name, 'text', `super${parentClassIndex}_${e.name.text}`);
                 }
             }
         });
@@ -1522,7 +1531,7 @@ class ClassMethodStatement extends FunctionStatement {
             return;
         }
         //this is a child class, and the first statement isn't a call to super. Inject one
-        this.func.body.statements.unshift(new ExpressionStatement(new Expression_1.CallExpression(new Expression_1.VariableExpression({
+        const superCall = new ExpressionStatement(new Expression_1.CallExpression(new Expression_1.VariableExpression({
             kind: TokenKind_1.TokenKind.Identifier,
             text: 'super',
             isReserved: false,
@@ -1540,7 +1549,8 @@ class ClassMethodStatement extends FunctionStatement {
             isReserved: false,
             range: state.classStatement.name.range,
             leadingWhitespace: ''
-        }, [], null)));
+        }, [], null));
+        state.editor.arrayUnshift(this.func.body.statements, superCall);
     }
     /**
      * Inject field initializers at the top of the `new` function (after any present `super()` call)
@@ -1560,7 +1570,7 @@ class ClassMethodStatement extends FunctionStatement {
                 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));
             }
         }
-        this.func.body.statements.splice(startingIndex, 0, ...newStatements);
+        state.editor.arraySplice(this.func.body.statements, startingIndex, 0, ...newStatements);
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
@@ -1568,8 +1578,8 @@ class ClassMethodStatement extends FunctionStatement {
         }
     }
 }
-exports.ClassMethodStatement = ClassMethodStatement;
-class ClassFieldStatement extends Statement {
+exports.MethodStatement = MethodStatement;
+class FieldStatement extends Statement {
     constructor(accessModifier, name, as, type, equal, initialValue, namespaceName) {
         var _a;
         super();
@@ -1622,7 +1632,7 @@ class ClassFieldStatement extends Statement {
         }
     }
 }
-exports.ClassFieldStatement = ClassFieldStatement;
+exports.FieldStatement = FieldStatement;
 class TryCatchStatement extends Statement {
     constructor(tokens, tryBranch, catchStatement) {
         var _a;
@@ -1717,6 +1727,7 @@ class EnumStatement extends Statement {
         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 : [];
     }
@@ -1764,6 +1775,12 @@ 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)
      */
@@ -1791,6 +1808,9 @@ 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 [];
@@ -1815,9 +1835,7 @@ class EnumStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            for (let i = 0; i < this.body.length; i++) {
-                (0, visitors_1.walk)(this.body, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
         }
     }
 }