brighterscript 1.0.0-alpha.16 → 1.0.0-alpha.17

package/dist/parser/Parser.js

@@ -246,13 +246,12 @@ class Parser {
     interfaceFieldStatement() {
         const name = this.identifier(...TokenKind_1.AllowedProperties);
         let asToken = this.consumeToken(TokenKind_1.TokenKind.As);
-        let typeToken = this.typeToken();
-        const type = util_1.util.tokenToBscType(typeToken);
-        if (!type) {
-            this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionParameterTypeIsInvalid(name.text, typeToken.text)), { range: typeToken.range }));
+        let typeExpr = this.typeExpression();
+        if (!typeExpr.isValidType()) {
+            this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionParameterTypeIsInvalid(name.text, typeExpr.getText())), { range: typeExpr.range }));
             throw this.lastDiagnosticAsError();
         }
-        return new Statement_1.InterfaceFieldStatement(name, asToken, typeToken, type);
+        return new Statement_1.InterfaceFieldStatement(name, asToken, typeExpr);
     }
     /**
      * Create a new InterfaceMethodStatement. This should only be called from within `interfaceDeclaration()`
@@ -264,17 +263,16 @@ class Parser {
         const params = [];
         const rightParen = this.consumeToken(TokenKind_1.TokenKind.RightParen);
         let asToken = null;
-        let returnTypeToken = null;
+        let returnTypeExpr;
         if (this.check(TokenKind_1.TokenKind.As)) {
             asToken = this.advance();
-            returnTypeToken = this.typeToken();
-            const returnType = util_1.util.tokenToBscType(returnTypeToken);
-            if (!returnType) {
-                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionParameterTypeIsInvalid(name.text, returnTypeToken.text)), { range: returnTypeToken.range }));
+            returnTypeExpr = this.typeExpression();
+            if (!returnTypeExpr.isValidType(this.options.mode)) {
+                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionParameterTypeIsInvalid(name.text, returnTypeExpr.getText())), { range: returnTypeExpr.range }));
                 throw this.lastDiagnosticAsError();
             }
         }
-        return new Statement_1.InterfaceMethodStatement(functionType, name, leftParen, params, rightParen, asToken, returnTypeToken, util_1.util.tokenToBscType(returnTypeToken));
+        return new Statement_1.InterfaceMethodStatement(functionType, name, leftParen, params, rightParen, asToken, returnTypeExpr);
     }
     interfaceDeclaration() {
         this.warnIfNotBrighterScriptMode('interface declarations');
@@ -476,13 +474,13 @@ class Parser {
     classFieldDeclaration(accessModifier) {
         let name = this.consume(DiagnosticMessages_1.DiagnosticMessages.expectedClassFieldIdentifier(), TokenKind_1.TokenKind.Identifier, ...TokenKind_1.AllowedProperties);
         let asToken;
-        let fieldType;
+        let fieldTypeExpr;
         //look for `as SOME_TYPE`
         if (this.check(TokenKind_1.TokenKind.As)) {
             asToken = this.advance();
-            fieldType = this.typeToken();
+            fieldTypeExpr = this.typeExpression();
             //no field type specified
-            if (!util_1.util.tokenToBscType(fieldType, true, this.currentNamespaceName)) {
+            if (!fieldTypeExpr.isValidType(this.options.mode)) {
                 this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.expectedValidTypeToFollowAsKeyword()), { range: this.peek().range }));
             }
         }
@@ -493,7 +491,7 @@ class Parser {
             equal = this.advance();
             initialValue = this.expression();
         }
-        return new Statement_1.ClassFieldStatement(accessModifier, name, asToken, fieldType, equal, initialValue, this.currentNamespaceName);
+        return new Statement_1.ClassFieldStatement(accessModifier, name, asToken, fieldTypeExpr, equal, initialValue, this.currentNamespaceName);
     }
     functionDeclaration(isAnonymous, checkIdentifier = true, forClassMethod = false) {
         var _a, _b, _c, _d;
@@ -543,7 +541,7 @@ class Parser {
             }
             let params = [];
             let asToken;
-            let typeToken;
+            let typeExpr;
             if (!this.check(TokenKind_1.TokenKind.RightParen)) {
                 do {
                     if (params.length >= Expression_1.CallExpression.MaximumArguments) {
@@ -555,9 +553,9 @@ class Parser {
             let rightParen = this.advance();
             if (this.check(TokenKind_1.TokenKind.As)) {
                 asToken = this.advance();
-                typeToken = this.typeToken();
-                if (!util_1.util.tokenToBscType(typeToken, this.options.mode === ParseMode.BrighterScript, this.currentNamespaceName)) {
-                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.invalidFunctionReturnType((_a = typeToken.text) !== null && _a !== void 0 ? _a : '')), { range: typeToken.range }));
+                typeExpr = this.typeExpression();
+                if (!typeExpr.isValidType(this.options.mode)) {
+                    this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.invalidFunctionReturnType((_a = typeExpr.getText()) !== null && _a !== void 0 ? _a : '')), { range: typeExpr.range }));
                 }
             }
             params.reduce((haveFoundOptional, param) => {
@@ -569,7 +567,7 @@ class Parser {
             this.consumeStatementSeparators(true);
             let func = new Expression_1.FunctionExpression(params, undefined, //body
             functionType, undefined, //ending keyword
-            leftParen, rightParen, asToken, typeToken, //return type
+            leftParen, rightParen, asToken, typeExpr, //return type
             this.currentFunctionExpression, this.currentNamespaceName, (_c = (_b = this.currentNamespace) === null || _b === void 0 ? void 0 : _b.symbolTable) !== null && _c !== void 0 ? _c : this.symbolTable);
             //if there is a parent function, register this function with the parent
             if (this.currentFunctionExpression) {
@@ -638,7 +636,7 @@ class Parser {
             throw this.lastDiagnosticAsError();
         }
         const name = this.identifier(...TokenKind_1.AllowedLocalIdentifiers);
-        let typeToken;
+        let typeExpr;
         let defaultValue;
         let equalsToken;
         // parse argument default value
@@ -650,26 +648,26 @@ class Parser {
         let asToken = null;
         if (this.check(TokenKind_1.TokenKind.As)) {
             asToken = this.advance();
-            typeToken = this.typeToken();
-            if (!util_1.util.tokenToBscType(typeToken, this.options.mode === ParseMode.BrighterScript, this.currentNamespaceName)) {
-                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionParameterTypeIsInvalid(name.text, typeToken.text)), { range: typeToken.range }));
+            typeExpr = this.typeExpression();
+            if (!typeExpr.isValidType(this.options.mode)) {
+                this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.functionParameterTypeIsInvalid(name.text, typeExpr.getText())), { range: typeExpr.range }));
                 throw this.lastDiagnosticAsError();
             }
         }
-        let type;
-        if (typeToken) {
-            type = util_1.util.tokenToBscType(typeToken, true, this.currentNamespaceName);
+        let typeInContext;
+        if (typeExpr) {
+            typeInContext = typeExpr.type;
         }
         else if (defaultValue) {
-            type = getBscTypeFromExpression(defaultValue, this.currentFunctionExpression);
-            if ((0, reflection_1.isInvalidType)(type)) {
-                type = new DynamicType_1.DynamicType();
+            typeInContext = getBscTypeFromExpression(defaultValue, this.currentFunctionExpression);
+            if ((0, reflection_1.isInvalidType)(typeInContext)) {
+                typeInContext = new DynamicType_1.DynamicType();
             }
         }
         else {
-            type = new DynamicType_1.DynamicType();
+            typeInContext = new DynamicType_1.DynamicType();
         }
-        return new Expression_1.FunctionParameterExpression(name, type, equalsToken, defaultValue, asToken, typeToken, this.currentNamespaceName);
+        return new Expression_1.FunctionParameterExpression(name, typeInContext, equalsToken, defaultValue, asToken, typeExpr, this.currentNamespaceName);
     }
     assignment() {
         let name = this.identifier(...this.allowedLocalIdentifiers);
@@ -863,6 +861,12 @@ class Parser {
             this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.expectedExpressionAfterForEachIn()), { range: this.peek().range }));
             throw this.lastDiagnosticAsError();
         }
+        let itemType = new DynamicType_1.DynamicType();
+        const targetType = getBscTypeFromExpression(target, this.currentFunctionExpression);
+        if ((0, reflection_1.isArrayType)(targetType)) {
+            itemType = targetType.getDefaultType();
+        }
+        this.currentSymbolTable.addSymbol(name.text, name.range, itemType);
         this.consumeStatementSeparators();
         let body = this.block(TokenKind_1.TokenKind.EndFor, TokenKind_1.TokenKind.Next);
         if (!body) {
@@ -870,12 +874,6 @@ class Parser {
             throw this.lastDiagnosticAsError();
         }
         let endFor = this.advance();
-        let itemType = new DynamicType_1.DynamicType();
-        const targetType = getBscTypeFromExpression(target, this.currentFunctionExpression);
-        if ((0, reflection_1.isArrayType)(targetType)) {
-            itemType = targetType.getDefaultType();
-        }
-        this.currentSymbolTable.addSymbol(name.text, name.range, itemType);
         return new Statement_1.ForEachStatement(forEach, name, maybeIn, target, body, endFor);
     }
     exitFor() {
@@ -1784,7 +1782,7 @@ class Parser {
      * Allows for built-in types (double, string, etc.) or namespaced custom types in Brighterscript mode
      * Will  return a token of whatever is next to be parsed (unless `advanceIfUnknown` is false, in which case undefined will be returned instead
      */
-    typeToken() {
+    typeExpression() {
         let typeToken;
         if (this.checkAny(...TokenKind_1.DeclarableTypes)) {
             // Token is a built in type
@@ -1805,18 +1803,23 @@ class Parser {
             // just get whatever's next
             typeToken = this.advance();
         }
-        if (typeToken && this.options.mode === ParseMode.BrighterScript) {
+        //TODO: to support InterfaceTypeLiterals - (eg. `{name as string; age as integer}`), check if "typeToken" is a curly bracket, and do something else
+        let typeExpr = new Expression_1.TypeExpression({ type: typeToken }, this.currentNamespaceName);
+        if (this.options.mode === ParseMode.BrighterScript) {
             // Check if it is an array - that is, if it has `[]` after the type
-            // eg. `string[]` or `SomeKlass[]`
-            if (this.check(TokenKind_1.TokenKind.LeftSquareBracket)) {
-                this.advance();
+            // eg. `string[]` or `SomeKlass[]` or `float[][][]`
+            while (this.check(TokenKind_1.TokenKind.LeftSquareBracket)) {
+                const leftBracket = this.advance();
                 if (this.check(TokenKind_1.TokenKind.RightSquareBracket)) {
                     const rightBracket = this.advance();
-                    typeToken = (0, creators_1.createToken)(TokenKind_1.TokenKind.Identifier, typeToken.text + '[]', util_1.util.getRange(typeToken, rightBracket));
+                    typeExpr = new Expression_1.ArrayTypeExpression([typeExpr], { leftBracket: leftBracket, rightBracket: rightBracket }, this.currentNamespaceName);
+                }
+                else {
+                    break;
                 }
             }
         }
-        return typeToken;
+        return typeExpr;
     }
     primary() {
         switch (true) {
@@ -2587,7 +2590,7 @@ function getBscTypeFromExpression(expression, functionExpression) {
             //Associative array literal
         }
         else if ((0, reflection_1.isAALiteralExpression)(expression)) {
-            return new ObjectType_1.ObjectType(expression.memberTable);
+            return new ObjectType_1.ObjectType('object', expression.memberTable);
             //Array literal
         }
         else if ((0, reflection_1.isArrayLiteralExpression)(expression)) {