brighterscript 1.0.0-alpha.25 → 1.0.0-alpha.26

package/dist/parser/Expression.js

@@ -9,33 +9,35 @@ const visitors_1 = require("../astUtils/visitors");
 const visitors_2 = require("../astUtils/visitors");
 const reflection_1 = require("../astUtils/reflection");
 const interfaces_1 = require("../interfaces");
+const VoidType_1 = require("../types/VoidType");
+const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
 const TypedFunctionType_1 = require("../types/TypedFunctionType");
 const AstNode_1 = require("./AstNode");
 const SymbolTable_2 = require("../SymbolTable");
 const source_map_1 = require("source-map");
 const StringType_1 = require("../types/StringType");
-const DynamicType_1 = require("../types/DynamicType");
-const VoidType_1 = require("../types/VoidType");
 const ReferenceType_1 = require("../types/ReferenceType");
 const UnionType_1 = require("../types/UnionType");
 const types_1 = require("../types");
 const AssociativeArrayType_1 = require("../types/AssociativeArrayType");
 const creators_1 = require("../astUtils/creators");
 class BinaryExpression extends AstNode_1.Expression {
-    constructor(left, operator, right) {
+    constructor(options) {
         super();
-        this.left = left;
-        this.operator = operator;
-        this.right = right;
         this.kind = AstNode_1.AstNodeKind.BinaryExpression;
-        this.range = util_1.default.createRangeFromPositions(this.left.range.start, this.right.range.end);
+        this.tokens = {
+            operator: options.operator
+        };
+        this.left = options.left;
+        this.right = options.right;
+        this.range = util_1.default.createBoundingRange(this.left, this.tokens.operator, this.right);
     }
     transpile(state) {
         return [
             state.sourceNode(this.left, this.left.transpile(state)),
             ' ',
-            state.transpileToken(this.operator),
+            state.transpileToken(this.tokens.operator),
             ' ',
             state.sourceNode(this.right, this.right.transpile(state))
         ];
@@ -47,7 +49,7 @@ class BinaryExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        const operatorKind = this.operator.kind;
+        const operatorKind = this.tokens.operator.kind;
         if (options.flags & SymbolTable_1.SymbolTypeFlag.typetime) {
             // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
             switch (operatorKind) {
@@ -57,25 +59,24 @@ class BinaryExpression extends AstNode_1.Expression {
             }
         }
         else if (options.flags & SymbolTable_1.SymbolTypeFlag.runtime) {
-            return util_1.default.binaryOperatorResultType(this.left.getType(options), this.operator, this.right.getType(options));
+            return util_1.default.binaryOperatorResultType(this.left.getType(options), this.tokens.operator, this.right.getType(options));
         }
         return DynamicType_1.DynamicType.instance;
     }
 }
 exports.BinaryExpression = BinaryExpression;
 class CallExpression extends AstNode_1.Expression {
-    constructor(callee, 
-    /**
-     * Can either be `(`, or `?(` for optional chaining
-     */
-    openingParen, closingParen, args, unused) {
+    constructor(options) {
+        var _a;
         super();
-        this.callee = callee;
-        this.openingParen = openingParen;
-        this.closingParen = closingParen;
-        this.args = args;
         this.kind = AstNode_1.AstNodeKind.CallExpression;
-        this.range = util_1.default.createBoundingRange(this.callee, this.openingParen, ...args, this.closingParen);
+        this.tokens = {
+            openingParen: options.openingParen,
+            closingParen: options.closingParen
+        };
+        this.callee = options.callee;
+        this.args = (_a = options.args) !== null && _a !== void 0 ? _a : [];
+        this.range = util_1.default.createBoundingRange(this.callee, this.tokens.openingParen, ...this.args, this.tokens.closingParen);
     }
     transpile(state, nameOverride) {
         let result = [];
@@ -86,7 +87,7 @@ class CallExpression extends AstNode_1.Expression {
         else {
             result.push(...this.callee.transpile(state));
         }
-        result.push(state.transpileToken(this.openingParen));
+        result.push(state.transpileToken(this.tokens.openingParen, '('));
         for (let i = 0; i < this.args.length; i++) {
             //add comma between args
             if (i > 0) {
@@ -95,8 +96,8 @@ class CallExpression extends AstNode_1.Expression {
             let arg = this.args[i];
             result.push(...arg.transpile(state));
         }
-        if (this.closingParen) {
-            result.push(state.transpileToken(this.closingParen));
+        if (this.tokens.closingParen) {
+            result.push(state.transpileToken(this.tokens.closingParen));
         }
         return result;
     }
@@ -127,22 +128,25 @@ class CallExpression extends AstNode_1.Expression {
 exports.CallExpression = CallExpression;
 CallExpression.MaximumArguments = 32;
 class FunctionExpression extends AstNode_1.Expression {
-    constructor(parameters, body, functionType, end, leftParen, rightParen, asToken, returnTypeExpression) {
+    constructor(options) {
+        var _a;
         super();
-        this.parameters = parameters;
-        this.body = body;
-        this.functionType = functionType;
-        this.end = end;
-        this.leftParen = leftParen;
-        this.rightParen = rightParen;
-        this.asToken = asToken;
-        this.returnTypeExpression = returnTypeExpression;
         this.kind = AstNode_1.AstNodeKind.FunctionExpression;
         /**
          * The list of function calls that are declared within this function scope. This excludes CallExpressions
          * declared in child functions
          */
         this.callExpressions = [];
+        this.tokens = {
+            functionType: options.functionType,
+            leftParen: options.leftParen,
+            rightParen: options.rightParen,
+            as: options.as,
+            endFunctionType: options.endFunctionType
+        };
+        this.parameters = (_a = options.parameters) !== null && _a !== void 0 ? _a : [];
+        this.body = options.body;
+        this.returnTypeExpression = options.returnTypeExpression;
         //if there's a body, and it doesn't have a SymbolTable, assign one
         if (this.body && !this.body.symbolTable) {
             this.body.symbolTable = new SymbolTable_2.SymbolTable(`Function Body`);
@@ -151,25 +155,26 @@ class FunctionExpression extends AstNode_1.Expression {
     }
     getLeadingTrivia() {
         var _a, _b;
-        return (_b = (_a = this.functionType) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+        return (_b = (_a = this.tokens.functionType) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
     /**
      * The range of the function, starting at the 'f' in function or 's' in sub (or the open paren if the keyword is missing),
      * and ending with the last n' in 'end function' or 'b' in 'end sub'
      */
     get range() {
-        return util_1.default.createBoundingRange(this.functionType, this.leftParen, ...this.parameters, this.rightParen, this.asToken, this.returnTypeExpression, this.end);
+        return util_1.default.createBoundingRange(this.tokens.functionType, this.tokens.leftParen, ...this.parameters, this.tokens.rightParen, this.tokens.as, this.returnTypeExpression, this.tokens.endFunctionType);
     }
     transpile(state, name, includeBody = true) {
+        var _a;
         let results = [];
         //'function'|'sub'
-        results.push(state.transpileToken(this.functionType));
+        results.push(state.transpileToken(this.tokens.functionType, 'function'));
         //functionName?
         if (name) {
             results.push(' ', state.transpileToken(name));
         }
         //leftParen
-        results.push(state.transpileToken(this.leftParen));
+        results.push(state.transpileToken(this.tokens.leftParen));
         //parameters
         for (let i = 0; i < this.parameters.length; i++) {
             let param = this.parameters[i];
@@ -181,12 +186,12 @@ class FunctionExpression extends AstNode_1.Expression {
             results.push(param.transpile(state));
         }
         //right paren
-        results.push(state.transpileToken(this.rightParen));
+        results.push(state.transpileToken(this.tokens.rightParen));
         //as [Type]
-        if (this.asToken && !state.options.removeParameterTypes && this.returnTypeExpression) {
+        if (!state.options.removeParameterTypes && this.returnTypeExpression) {
             results.push(' ', 
             //as
-            state.transpileToken(this.asToken), ' ', 
+            state.transpileToken(this.tokens.as, 'as'), ' ', 
             //return type
             ...this.returnTypeExpression.transpile(state));
         }
@@ -198,36 +203,38 @@ class FunctionExpression extends AstNode_1.Expression {
         }
         results.push('\n');
         //'end sub'|'end function'
-        results.push(state.indent(), state.transpileToken(this.end));
+        results.push(state.indent(), state.transpileToken(this.tokens.endFunctionType, `end ${(_a = this.tokens.functionType) !== null && _a !== void 0 ? _a : 'function'}`));
         return results;
     }
     getTypedef(state) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         let results = [
             new source_map_1.SourceNode(1, 0, null, [
                 //'function'|'sub'
-                (_a = this.functionType) === null || _a === void 0 ? void 0 : _a.text,
+                (_b = (_a = this.tokens.functionType) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'function',
                 //functionName?
-                ...((0, reflection_1.isFunctionStatement)(this.parent) || (0, reflection_1.isMethodStatement)(this.parent) ? [' ', (_c = (_b = this.parent.name) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : ''] : []),
+                ...((0, reflection_1.isFunctionStatement)(this.parent) || (0, reflection_1.isMethodStatement)(this.parent) ? [' ', (_d = (_c = this.parent.tokens.name) === null || _c === void 0 ? void 0 : _c.text) !== null && _d !== void 0 ? _d : ''] : []),
                 //leftParen
                 '(',
                 //parameters
-                ...((_e = (_d = this.parameters) === null || _d === void 0 ? void 0 : _d.map((param, i) => ([
+                ...((_f = (_e = this.parameters) === null || _e === void 0 ? void 0 : _e.map((param, i) => ([
                     //separating comma
                     i > 0 ? ', ' : '',
                     ...param.getTypedef(state)
-                ]))) !== null && _e !== void 0 ? _e : []),
+                ]))) !== null && _f !== void 0 ? _f : []),
                 //right paren
                 ')',
                 //as <ReturnType>
-                ...(this.asToken ? [
-                    ' as ',
+                ...(this.returnTypeExpression ? [
+                    ' ',
+                    (_h = (_g = this.tokens.as) === null || _g === void 0 ? void 0 : _g.text) !== null && _h !== void 0 ? _h : 'as',
+                    ' ',
                     ...this.returnTypeExpression.getTypedef(state)
                 ] : []),
                 '\n',
                 state.indent(),
                 //'end sub'|'end function'
-                this.end.text
+                (_k = (_j = this.tokens.endFunctionType) === null || _j === void 0 ? void 0 : _j.text) !== null && _k !== void 0 ? _k : `end ${(_l = this.tokens.functionType) !== null && _l !== void 0 ? _l : 'function'}`
             ])
         ];
         return results;
@@ -243,10 +250,10 @@ class FunctionExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         //if there's a defined return type, use that
         let returnType = (_a = this.returnTypeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
-        const isSub = this.functionType.kind === TokenKind_1.TokenKind.Sub;
+        const isSub = ((_b = this.tokens.functionType) === null || _b === void 0 ? void 0 : _b.kind) === TokenKind_1.TokenKind.Sub;
         //if we don't have a return type and this is a sub, set the return type to `void`. else use `dynamic`
         if (!returnType) {
             returnType = isSub ? VoidType_1.VoidType.instance : DynamicType_1.DynamicType.instance;
@@ -254,7 +261,7 @@ class FunctionExpression extends AstNode_1.Expression {
         const resultType = new TypedFunctionType_1.TypedFunctionType(returnType);
         resultType.isSub = isSub;
         for (let param of this.parameters) {
-            resultType.addParameter(param.name.text, param.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })), !!param.defaultValue);
+            resultType.addParameter(param.tokens.name.text, param.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })), !!param.defaultValue);
         }
         // Figure out this function's name if we can
         let funcName = '';
@@ -262,7 +269,7 @@ class FunctionExpression extends AstNode_1.Expression {
             funcName = this.parent.getName(Parser_1.ParseMode.BrighterScript);
             if (options.typeChain) {
                 // Get the typechain info from the parent class
-                (_b = this.parent.parent) === null || _b === void 0 ? void 0 : _b.getType(options);
+                (_c = this.parent.parent) === null || _c === void 0 ? void 0 : _c.getType(options);
             }
         }
         else if ((0, reflection_1.isFunctionStatement)(this.parent)) {
@@ -271,35 +278,37 @@ class FunctionExpression extends AstNode_1.Expression {
         if (funcName) {
             resultType.setName(funcName);
         }
-        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(funcName, resultType, options.data, this.range));
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(funcName, resultType, options.data, this.range));
         return resultType;
     }
 }
 exports.FunctionExpression = FunctionExpression;
 class FunctionParameterExpression extends AstNode_1.Expression {
-    constructor(name, equalToken, defaultValue, asToken, typeExpression) {
+    constructor(options) {
         super();
-        this.name = name;
-        this.equalToken = equalToken;
-        this.defaultValue = defaultValue;
-        this.asToken = asToken;
-        this.typeExpression = typeExpression;
         this.kind = AstNode_1.AstNodeKind.FunctionParameterExpression;
+        this.tokens = {
+            name: options.name,
+            equals: options.equals,
+            as: options.as
+        };
+        this.defaultValue = options.defaultValue;
+        this.typeExpression = options.typeExpression;
     }
     getType(options) {
         var _a, _b, _c, _d, _e;
         const paramType = (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime, typeChain: undefined }))) !== null && _b !== void 0 ? _b : (_c = this.defaultValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime, typeChain: undefined }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
-        (_e = options.typeChain) === null || _e === void 0 ? void 0 : _e.push(new interfaces_1.TypeChainEntry(this.name.text, paramType, options.data, this.range));
+        (_e = options.typeChain) === null || _e === void 0 ? void 0 : _e.push(new interfaces_1.TypeChainEntry(this.tokens.name.text, paramType, options.data, this.range));
         return paramType;
     }
     get range() {
-        return util_1.default.createBoundingRange(this.name, this.asToken, this.typeExpression, this.defaultValue);
+        return util_1.default.createBoundingRange(this.tokens.name, this.tokens.as, this.typeExpression, this.tokens.equals, this.defaultValue);
     }
     transpile(state) {
         var _a, _b;
         let result = [
             //name
-            state.transpileToken(this.name)
+            state.transpileToken(this.tokens.name)
         ];
         //default value
         if (this.defaultValue) {
@@ -307,9 +316,9 @@ class FunctionParameterExpression extends AstNode_1.Expression {
             result.push(this.defaultValue.transpile(state));
         }
         //type declaration
-        if (this.asToken && !state.options.removeParameterTypes) {
+        if (this.typeExpression && !state.options.removeParameterTypes) {
             result.push(' ');
-            result.push(state.transpileToken(this.asToken));
+            result.push(state.transpileToken(this.tokens.as, 'as'));
             result.push(' ');
             result.push(...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : []));
         }
@@ -319,14 +328,14 @@ class FunctionParameterExpression extends AstNode_1.Expression {
         var _a, _b;
         return [
             //name
-            this.name.text,
+            this.tokens.name.text,
             //default value
             ...(this.defaultValue ? [
                 ' = ',
                 ...this.defaultValue.transpile(state)
             ] : []),
             //type declaration
-            ...(this.asToken ? [
+            ...(this.typeExpression ? [
                 ' as ',
                 ...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getTypedef(state)) !== null && _b !== void 0 ? _b : [''])
             ] : [])
@@ -342,17 +351,15 @@ class FunctionParameterExpression extends AstNode_1.Expression {
 }
 exports.FunctionParameterExpression = FunctionParameterExpression;
 class DottedGetExpression extends AstNode_1.Expression {
-    constructor(obj, name, 
-    /**
-     * Can either be `.`, or `?.` for optional chaining
-     */
-    dot) {
+    constructor(options) {
         super();
-        this.obj = obj;
-        this.name = name;
-        this.dot = dot;
         this.kind = AstNode_1.AstNodeKind.DottedGetExpression;
-        this.range = util_1.default.createBoundingRange(this.obj, this.dot, this.name);
+        this.tokens = {
+            name: options.name,
+            dot: options.dot
+        };
+        this.obj = options.obj;
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.dot, this.tokens.name);
     }
     transpile(state) {
         //if the callee starts with a namespace name, transpile the name
@@ -364,8 +371,8 @@ class DottedGetExpression extends AstNode_1.Expression {
         else {
             return [
                 ...this.obj.transpile(state),
-                state.transpileToken(this.dot),
-                state.transpileToken(this.name)
+                state.transpileToken(this.tokens.dot, '.'),
+                state.transpileToken(this.tokens.name)
             ];
         }
     }
@@ -377,8 +384,8 @@ class DottedGetExpression extends AstNode_1.Expression {
     getType(options) {
         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.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.name) === null || _d === void 0 ? void 0 : _d.text, result, options.data, (_f = (_e = this.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range));
+        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));
         if (result || options.flags & SymbolTable_1.SymbolTypeFlag.typetime) {
             // All types should be known at typetime
             return result;
@@ -393,23 +400,18 @@ class DottedGetExpression extends AstNode_1.Expression {
 }
 exports.DottedGetExpression = DottedGetExpression;
 class XmlAttributeGetExpression extends AstNode_1.Expression {
-    constructor(obj, name, 
-    /**
-     * Can either be `@`, or `?@` for optional chaining
-     */
-    at) {
+    constructor(options) {
         super();
-        this.obj = obj;
-        this.name = name;
-        this.at = at;
         this.kind = AstNode_1.AstNodeKind.XmlAttributeGetExpression;
-        this.range = util_1.default.createBoundingRange(this.obj, this.at, this.name);
+        this.obj = options.obj;
+        this.tokens = { at: options.at, name: options.name };
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.at, this.tokens.name);
     }
     transpile(state) {
         return [
             ...this.obj.transpile(state),
-            state.transpileToken(this.at),
-            state.transpileToken(this.name)
+            state.transpileToken(this.tokens.at, '@'),
+            state.transpileToken(this.tokens.name)
         ];
     }
     walk(visitor, options) {
@@ -420,35 +422,37 @@ class XmlAttributeGetExpression extends AstNode_1.Expression {
 }
 exports.XmlAttributeGetExpression = XmlAttributeGetExpression;
 class IndexedGetExpression extends AstNode_1.Expression {
-    constructor(obj, index, 
-    /**
-     * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.`
-     */
-    openingSquare, closingSquare, questionDotToken //  ? or ?.
-    ) {
+    constructor(options) {
         super();
-        this.obj = obj;
-        this.index = index;
-        this.openingSquare = openingSquare;
-        this.closingSquare = closingSquare;
-        this.questionDotToken = questionDotToken;
         this.kind = AstNode_1.AstNodeKind.IndexedGetExpression;
-        this.range = util_1.default.createBoundingRange(this.obj, this.openingSquare, this.questionDotToken, this.openingSquare, this.index, this.closingSquare);
+        this.tokens = {
+            openingSquare: options.openingSquare,
+            closingSquare: options.closingSquare,
+            questionDot: options.questionDot
+        };
+        this.obj = options.obj;
+        this.indexes = options.indexes;
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.openingSquare, this.tokens.questionDot, this.tokens.openingSquare, ...this.indexes, this.tokens.closingSquare);
     }
     transpile(state) {
-        var _a, _b;
-        return [
-            ...this.obj.transpile(state),
-            this.questionDotToken ? state.transpileToken(this.questionDotToken) : '',
-            state.transpileToken(this.openingSquare),
-            ...((_b = (_a = this.index) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : []),
-            this.closingSquare ? state.transpileToken(this.closingSquare) : ''
-        ];
+        var _a;
+        const result = [];
+        result.push(...this.obj.transpile(state), this.tokens.questionDot ? state.transpileToken(this.tokens.questionDot) : '', state.transpileToken(this.tokens.openingSquare, '['));
+        for (let i = 0; i < this.indexes.length; i++) {
+            //add comma between indexes
+            if (i > 0) {
+                result.push(', ');
+            }
+            let index = this.indexes[i];
+            result.push(...((_a = index === null || index === void 0 ? void 0 : index.transpile(state)) !== null && _a !== void 0 ? _a : []));
+        }
+        result.push(state.transpileToken(this.tokens.closingSquare, ']'));
+        return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
             (0, visitors_2.walk)(this, 'obj', visitor, options);
-            (0, visitors_2.walk)(this, 'index', visitor, options);
+            (0, visitors_2.walkArray)(this.indexes, visitor, options, this);
         }
     }
     getType(options) {
@@ -462,21 +466,24 @@ class IndexedGetExpression extends AstNode_1.Expression {
 }
 exports.IndexedGetExpression = IndexedGetExpression;
 class GroupingExpression extends AstNode_1.Expression {
-    constructor(tokens, expression) {
+    constructor(options) {
         super();
-        this.tokens = tokens;
-        this.expression = expression;
         this.kind = AstNode_1.AstNodeKind.GroupingExpression;
-        this.range = util_1.default.createBoundingRange(this.tokens.left, this.expression, this.tokens.right);
+        this.tokens = {
+            rightParen: options.rightParen,
+            leftParen: options.leftParen
+        };
+        this.expression = options.expression;
+        this.range = util_1.default.createBoundingRange(this.tokens.leftParen, this.expression, this.tokens.rightParen);
     }
     transpile(state) {
         if ((0, reflection_1.isTypeCastExpression)(this.expression)) {
             return this.expression.transpile(state);
         }
         return [
-            state.transpileToken(this.tokens.left),
+            state.transpileToken(this.tokens.leftParen),
             ...this.expression.transpile(state),
-            state.transpileToken(this.tokens.right)
+            state.transpileToken(this.tokens.rightParen)
         ];
     }
     walk(visitor, options) {
@@ -490,32 +497,34 @@ class GroupingExpression extends AstNode_1.Expression {
 }
 exports.GroupingExpression = GroupingExpression;
 class LiteralExpression extends AstNode_1.Expression {
-    constructor(token) {
+    constructor(options) {
         super();
-        this.token = token;
         this.kind = AstNode_1.AstNodeKind.LiteralExpression;
+        this.tokens = {
+            value: options.value
+        };
     }
     get range() {
-        return this.token.range;
+        return this.tokens.value.range;
     }
     getType(options) {
-        return util_1.default.tokenToBscType(this.token);
+        return util_1.default.tokenToBscType(this.tokens.value);
     }
     transpile(state) {
         let text;
-        if (this.token.kind === TokenKind_1.TokenKind.TemplateStringQuasi) {
+        if (this.tokens.value.kind === TokenKind_1.TokenKind.TemplateStringQuasi) {
             //wrap quasis with quotes (and escape inner quotemarks)
-            text = `"${this.token.text.replace(/"/g, '""')}"`;
+            text = `"${this.tokens.value.text.replace(/"/g, '""')}"`;
         }
-        else if (this.token.kind === TokenKind_1.TokenKind.StringLiteral) {
-            text = this.token.text;
+        else if (this.tokens.value.kind === TokenKind_1.TokenKind.StringLiteral) {
+            text = this.tokens.value.text;
             //add trailing quotemark if it's missing. We will have already generated a diagnostic for this.
             if (text.endsWith('"') === false) {
                 text += '"';
             }
         }
         else {
-            text = this.token.text;
+            text = this.tokens.value.text;
         }
         return [
             state.sourceNode(this, text)
@@ -531,15 +540,15 @@ exports.LiteralExpression = LiteralExpression;
  * during template string transpile by identifying these expressions explicitly and skipping the bslib_toString around them
  */
 class EscapedCharCodeLiteralExpression extends AstNode_1.Expression {
-    constructor(token) {
+    constructor(options) {
         super();
-        this.token = token;
         this.kind = AstNode_1.AstNodeKind.EscapedCharCodeLiteralExpression;
-        this.range = token.range;
+        this.tokens = { value: options.value };
+        this.range = this.tokens.value.range;
     }
     transpile(state) {
         return [
-            state.sourceNode(this, `chr(${this.token.charCode})`)
+            state.sourceNode(this, `chr(${this.tokens.value.charCode})`)
         ];
     }
     walk(visitor, options) {
@@ -548,18 +557,19 @@ class EscapedCharCodeLiteralExpression extends AstNode_1.Expression {
 }
 exports.EscapedCharCodeLiteralExpression = EscapedCharCodeLiteralExpression;
 class ArrayLiteralExpression extends AstNode_1.Expression {
-    constructor(elements, open, close, hasSpread = false) {
+    constructor(options) {
         super();
-        this.elements = elements;
-        this.open = open;
-        this.close = close;
-        this.hasSpread = hasSpread;
         this.kind = AstNode_1.AstNodeKind.ArrayLiteralExpression;
-        this.range = util_1.default.createBoundingRange(this.open, ...this.elements, this.close);
+        this.tokens = {
+            open: options.open,
+            close: options.close
+        };
+        this.elements = options.elements;
+        this.range = util_1.default.createBoundingRange(this.tokens.open, ...this.elements, this.tokens.close);
     }
     transpile(state) {
         let result = [];
-        result.push(state.transpileToken(this.open));
+        result.push(state.transpileToken(this.tokens.open, '['));
         let hasChildren = this.elements.length > 0;
         state.blockDepth++;
         for (let i = 0; i < this.elements.length; i++) {
@@ -567,7 +577,7 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
             let element = this.elements[i];
             if ((0, reflection_1.isCommentStatement)(element)) {
                 //if the comment is on the same line as opening square or previous statement, don't add newline
-                if (util_1.default.linesTouch(this.open, element) || util_1.default.linesTouch(previousElement, element)) {
+                if (util_1.default.linesTouch(this.tokens.open, element) || util_1.default.linesTouch(previousElement, element)) {
                     result.push(' ');
                 }
                 else {
@@ -588,8 +598,8 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
             result.push('\n');
             result.push(state.indent());
         }
-        if (this.close) {
-            result.push(state.transpileToken(this.close));
+        if (this.tokens.close) {
+            result.push(state.transpileToken(this.tokens.close));
         }
         return result;
     }
@@ -605,15 +615,16 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
 }
 exports.ArrayLiteralExpression = ArrayLiteralExpression;
 class AAMemberExpression extends AstNode_1.Expression {
-    constructor(keyToken, colonToken, 
-    /** The expression evaluated to determine the member's initial value. */
-    value) {
+    constructor(options) {
         super();
-        this.keyToken = keyToken;
-        this.colonToken = colonToken;
-        this.value = value;
         this.kind = AstNode_1.AstNodeKind.AAMemberExpression;
-        this.range = util_1.default.createBoundingRange(this.keyToken, this.colonToken, this.value);
+        this.tokens = {
+            key: options.key,
+            colon: options.colon,
+            comma: options.comma
+        };
+        this.value = options.value;
+        this.range = util_1.default.createBoundingRange(this.tokens.key, this.tokens.colon, this.value);
     }
     transpile(state) {
         //TODO move the logic from AALiteralExpression loop into this function
@@ -628,21 +639,23 @@ class AAMemberExpression extends AstNode_1.Expression {
 }
 exports.AAMemberExpression = AAMemberExpression;
 class AALiteralExpression extends AstNode_1.Expression {
-    constructor(elements, open, close) {
+    constructor(options) {
         super();
-        this.elements = elements;
-        this.open = open;
-        this.close = close;
         this.kind = AstNode_1.AstNodeKind.AALiteralExpression;
-        this.range = util_1.default.createBoundingRange(this.open, ...this.elements, this.close);
+        this.tokens = {
+            open: options.open,
+            close: options.close
+        };
+        this.elements = options.elements;
+        this.range = util_1.default.createBoundingRange(this.tokens.open, ...this.elements, this.tokens.close);
     }
     transpile(state) {
         let result = [];
         //open curly
-        result.push(state.transpileToken(this.open));
+        result.push(state.transpileToken(this.tokens.open, '{'));
         let hasChildren = this.elements.length > 0;
         //add newline if the object has children and the first child isn't a comment starting on the same line as opening curly
-        if (hasChildren && ((0, reflection_1.isCommentStatement)(this.elements[0]) === false || !util_1.default.linesTouch(this.elements[0], this.open))) {
+        if (hasChildren && ((0, reflection_1.isCommentStatement)(this.elements[0]) === false || !util_1.default.linesTouch(this.elements[0], this.tokens.open))) {
             result.push('\n');
         }
         state.blockDepth++;
@@ -652,7 +665,7 @@ class AALiteralExpression extends AstNode_1.Expression {
             let nextElement = this.elements[i + 1];
             //don't indent if comment is same-line
             if ((0, reflection_1.isCommentStatement)(element) &&
-                (util_1.default.linesTouch(this.open, element) || util_1.default.linesTouch(previousElement, element))) {
+                (util_1.default.linesTouch(this.tokens.open, element) || util_1.default.linesTouch(previousElement, element))) {
                 result.push(' ');
                 //indent line
             }
@@ -665,9 +678,9 @@ class AALiteralExpression extends AstNode_1.Expression {
             }
             else {
                 //key
-                result.push(state.transpileToken(element.keyToken));
+                result.push(state.transpileToken(element.tokens.key));
                 //colon
-                result.push(state.transpileToken(element.colonToken), ' ');
+                result.push(state.transpileToken(element.tokens.colon, ':'), ' ');
                 //value
                 result.push(...element.value.transpile(state));
             }
@@ -685,9 +698,7 @@ class AALiteralExpression extends AstNode_1.Expression {
             result.push(state.indent());
         }
         //close curly
-        if (this.close) {
-            result.push(state.transpileToken(this.close));
-        }
+        result.push(state.transpileToken(this.tokens.close, '}'));
         return result;
     }
     walk(visitor, options) {
@@ -699,7 +710,7 @@ class AALiteralExpression extends AstNode_1.Expression {
         const resultType = new AssociativeArrayType_1.AssociativeArrayType();
         for (const element of this.elements) {
             if ((0, reflection_1.isAAMemberExpression)(element)) {
-                resultType.addMember(element.keyToken.text, { definingNode: element }, element.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+                resultType.addMember(element.tokens.key.text, { definingNode: element }, element.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
             }
         }
         return resultType;
@@ -707,26 +718,28 @@ class AALiteralExpression extends AstNode_1.Expression {
 }
 exports.AALiteralExpression = AALiteralExpression;
 class UnaryExpression extends AstNode_1.Expression {
-    constructor(operator, right) {
+    constructor(options) {
         super();
-        this.operator = operator;
-        this.right = right;
         this.kind = AstNode_1.AstNodeKind.UnaryExpression;
-        this.range = util_1.default.createBoundingRange(this.operator, this.right);
+        this.tokens = {
+            operator: options.operator
+        };
+        this.right = options.right;
+        this.range = util_1.default.createBoundingRange(this.tokens.operator, this.right);
     }
     transpile(state) {
         let separatingWhitespace;
         if ((0, reflection_1.isVariableExpression)(this.right)) {
-            separatingWhitespace = this.right.name.leadingWhitespace;
+            separatingWhitespace = this.right.tokens.name.leadingWhitespace;
         }
         else if ((0, reflection_1.isLiteralExpression)(this.right)) {
-            separatingWhitespace = this.right.token.leadingWhitespace;
+            separatingWhitespace = this.right.tokens.value.leadingWhitespace;
         }
         else {
             separatingWhitespace = ' ';
         }
         return [
-            state.transpileToken(this.operator),
+            state.transpileToken(this.tokens.operator),
             separatingWhitespace,
             ...this.right.transpile(state)
         ];
@@ -737,20 +750,22 @@ class UnaryExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return util_1.default.unaryOperatorResultType(this.operator, this.right.getType(options));
+        return util_1.default.unaryOperatorResultType(this.tokens.operator, this.right.getType(options));
     }
 }
 exports.UnaryExpression = UnaryExpression;
 class VariableExpression extends AstNode_1.Expression {
-    constructor(name) {
+    constructor(options) {
         var _a;
         super();
-        this.name = name;
         this.kind = AstNode_1.AstNodeKind.VariableExpression;
-        this.range = (_a = this.name) === null || _a === void 0 ? void 0 : _a.range;
+        this.tokens = {
+            name: options.name
+        };
+        this.range = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.range;
     }
     getName(parseMode) {
-        return this.name.text;
+        return this.tokens.name.text;
     }
     transpile(state) {
         let result = [];
@@ -765,7 +780,7 @@ class VariableExpression extends AstNode_1.Expression {
             //transpile  normally
         }
         else {
-            result.push(state.transpileToken(this.name));
+            result.push(state.transpileToken(this.tokens.name));
         }
         return result;
     }
@@ -774,8 +789,8 @@ class VariableExpression extends AstNode_1.Expression {
     }
     getType(options) {
         var _a;
-        let resultType = util_1.default.tokenToBscType(this.name);
-        const nameKey = this.name.text;
+        let resultType = util_1.default.tokenToBscType(this.tokens.name);
+        const nameKey = this.getName();
         if (!resultType) {
             const symbolTable = this.getSymbolTable();
             resultType = symbolTable === null || symbolTable === void 0 ? void 0 : symbolTable.getSymbolType(nameKey, Object.assign(Object.assign({}, options), { fullName: nameKey, tableProvider: () => this.getSymbolTable() }));
@@ -786,11 +801,14 @@ class VariableExpression extends AstNode_1.Expression {
 }
 exports.VariableExpression = VariableExpression;
 class SourceLiteralExpression extends AstNode_1.Expression {
-    constructor(token) {
+    constructor(options) {
+        var _a;
         super();
-        this.token = token;
         this.kind = AstNode_1.AstNodeKind.SourceLiteralExpression;
-        this.range = token === null || token === void 0 ? void 0 : token.range;
+        this.tokens = {
+            value: options.value
+        };
+        this.range = (_a = this.tokens.value) === null || _a === void 0 ? void 0 : _a.range;
     }
     /**
      * Find the index of the function in its parent
@@ -810,7 +828,7 @@ class SourceLiteralExpression extends AstNode_1.Expression {
         return index;
     }
     getFunctionName(state, parseMode) {
-        let func = state.file.getFunctionScopeAtPosition(this.token.range.start).func;
+        let func = state.file.getFunctionScopeAtPosition(this.tokens.value.range.start).func;
         let nameParts = [];
         let parentFunction;
         while ((parentFunction = func.findAncestor(reflection_1.isFunctionExpression))) {
@@ -824,13 +842,13 @@ class SourceLiteralExpression extends AstNode_1.Expression {
     }
     transpile(state) {
         let text;
-        switch (this.token.kind) {
+        switch (this.tokens.value.kind) {
             case TokenKind_1.TokenKind.SourceFilePathLiteral:
                 const pathUrl = fileUrl(state.srcPath);
                 text = `"${pathUrl.substring(0, 4)}" + "${pathUrl.substring(4)}"`;
                 break;
             case TokenKind_1.TokenKind.SourceLineNumLiteral:
-                text = `${this.token.range.start.line + 1}`;
+                text = `${this.tokens.value.range.start.line + 1}`;
                 break;
             case TokenKind_1.TokenKind.FunctionNameLiteral:
                 text = `"${this.getFunctionName(state, Parser_1.ParseMode.BrightScript)}"`;
@@ -840,7 +858,7 @@ class SourceLiteralExpression extends AstNode_1.Expression {
                 break;
             case TokenKind_1.TokenKind.SourceLocationLiteral:
                 const locationUrl = fileUrl(state.srcPath);
-                text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.token.range.start.line + 1}"`;
+                text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.tokens.value.range.start.line + 1}"`;
                 break;
             case TokenKind_1.TokenKind.PkgPathLiteral:
                 text = `"${util_1.default.sanitizePkgPath(state.file.pkgPath)}"`;
@@ -851,7 +869,7 @@ class SourceLiteralExpression extends AstNode_1.Expression {
             case TokenKind_1.TokenKind.LineNumLiteral:
             default:
                 //use the original text (because it looks like a variable)
-                text = this.token.text;
+                text = this.tokens.value.text;
                 break;
         }
         return [
@@ -869,12 +887,14 @@ exports.SourceLiteralExpression = SourceLiteralExpression;
  * do more type checking.
  */
 class NewExpression extends AstNode_1.Expression {
-    constructor(newKeyword, call) {
+    constructor(options) {
         super();
-        this.newKeyword = newKeyword;
-        this.call = call;
         this.kind = AstNode_1.AstNodeKind.NewExpression;
-        this.range = util_1.default.createBoundingRange(this.newKeyword, this.call);
+        this.tokens = {
+            new: options.new
+        };
+        this.call = options.call;
+        this.range = util_1.default.createBoundingRange(this.tokens.new, this.call);
     }
     /**
      * The name of the class to initialize (with optional namespace prefixed)
@@ -903,28 +923,29 @@ class NewExpression extends AstNode_1.Expression {
 }
 exports.NewExpression = NewExpression;
 class CallfuncExpression extends AstNode_1.Expression {
-    constructor(callee, operator, methodName, openingParen, args, closingParen) {
+    constructor(options) {
+        var _a;
         super();
-        this.callee = callee;
-        this.operator = operator;
-        this.methodName = methodName;
-        this.openingParen = openingParen;
-        this.args = args;
-        this.closingParen = closingParen;
         this.kind = AstNode_1.AstNodeKind.CallfuncExpression;
-        this.range = util_1.default.createBoundingRange(callee, operator, methodName, openingParen, ...args, closingParen);
+        this.tokens = {
+            operator: options.operator,
+            methodName: options.methodName,
+            openingParen: options.openingParen,
+            closingParen: options.closingParen
+        };
+        this.callee = options.callee;
+        this.args = (_a = options.args) !== null && _a !== void 0 ? _a : [];
+        this.range = util_1.default.createBoundingRange(this.callee, this.tokens.operator, this.tokens.methodName, this.tokens.openingParen, ...this.args, this.tokens.closingParen);
     }
     transpile(state) {
+        var _a;
         let result = [];
-        result.push(...this.callee.transpile(state), state.sourceNode(this.operator, '.callfunc'), state.transpileToken(this.openingParen), 
+        result.push(...this.callee.transpile(state), state.sourceNode(this.tokens.operator, '.callfunc'), state.transpileToken(this.tokens.openingParen, '('), 
         //the name of the function
-        state.sourceNode(this.methodName, ['"', this.methodName.text, '"']), ', ');
-        //transpile args
-        //callfunc with zero args never gets called, so pass invalid as the first parameter if there are no args
-        if (this.args.length === 0) {
-            result.push('invalid');
-        }
-        else {
+        state.sourceNode(this.tokens.methodName, ['"', this.tokens.methodName.text, '"']));
+        if (((_a = this.args) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            result.push(', ');
+            //transpile args
             for (let i = 0; i < this.args.length; i++) {
                 //add comma between args
                 if (i > 0) {
@@ -934,7 +955,10 @@ class CallfuncExpression extends AstNode_1.Expression {
                 result.push(...arg.transpile(state));
             }
         }
-        result.push(state.transpileToken(this.closingParen));
+        else if (state.options.legacyCallfuncHandling) {
+            result.push(', ', 'invalid');
+        }
+        result.push(state.transpileToken(this.tokens.closingParen, ')'));
         return result;
     }
     walk(visitor, options) {
@@ -950,9 +974,9 @@ class CallfuncExpression extends AstNode_1.Expression {
         // It's nicer for CallExpression, because it's a call on any expression.
         const calleeType = this.callee.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime }));
         if ((0, reflection_1.isComponentType)(calleeType) || (0, reflection_1.isReferenceType)(calleeType)) {
-            const funcType = (_b = (_a = calleeType).getCallFuncType) === null || _b === void 0 ? void 0 : _b.call(_a, this.methodName.text, options);
+            const funcType = (_b = (_a = calleeType).getCallFuncType) === null || _b === void 0 ? void 0 : _b.call(_a, this.tokens.methodName.text, options);
             if (funcType) {
-                (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(this.methodName.text, funcType, options.data, this.methodName.range, (0, creators_1.createToken)(TokenKind_1.TokenKind.Callfunc)));
+                (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(this.tokens.methodName.text, funcType, options.data, this.tokens.methodName.range, (0, creators_1.createToken)(TokenKind_1.TokenKind.Callfunc)));
                 if (options.ignoreCall) {
                     result = funcType;
                 }
@@ -977,11 +1001,11 @@ exports.CallfuncExpression = CallfuncExpression;
  * This is a single expression that represents the string contatenation of all parts of a single quasi.
  */
 class TemplateStringQuasiExpression extends AstNode_1.Expression {
-    constructor(expressions) {
+    constructor(options) {
         super();
-        this.expressions = expressions;
         this.kind = AstNode_1.AstNodeKind.TemplateStringQuasiExpression;
-        this.range = util_1.default.createBoundingRange(...expressions);
+        this.expressions = options.expressions;
+        this.range = util_1.default.createBoundingRange(...this.expressions);
     }
     transpile(state, skipEmptyStrings = true) {
         let result = [];
@@ -989,7 +1013,7 @@ class TemplateStringQuasiExpression extends AstNode_1.Expression {
         for (let expression of this.expressions) {
             //skip empty strings
             //TODO what does an empty string literal expression look like?
-            if (expression.token.text === '' && skipEmptyStrings === true) {
+            if (expression.tokens.value.text === '' && skipEmptyStrings === true) {
                 continue;
             }
             result.push(plus, ...expression.transpile(state));
@@ -1005,14 +1029,16 @@ class TemplateStringQuasiExpression extends AstNode_1.Expression {
 }
 exports.TemplateStringQuasiExpression = TemplateStringQuasiExpression;
 class TemplateStringExpression extends AstNode_1.Expression {
-    constructor(openingBacktick, quasis, expressions, closingBacktick) {
+    constructor(options) {
         super();
-        this.openingBacktick = openingBacktick;
-        this.quasis = quasis;
-        this.expressions = expressions;
-        this.closingBacktick = closingBacktick;
         this.kind = AstNode_1.AstNodeKind.TemplateStringExpression;
-        this.range = util_1.default.createBoundingRange(openingBacktick, quasis[0], quasis[quasis.length - 1], closingBacktick);
+        this.tokens = {
+            openingBacktick: options.openingBacktick,
+            closingBacktick: options.closingBacktick
+        };
+        this.quasis = options.quasis;
+        this.expressions = options.expressions;
+        this.range = util_1.default.createBoundingRange(this.tokens.openingBacktick, this.quasis[0], this.quasis[this.quasis.length - 1], this.tokens.closingBacktick);
     }
     getType(options) {
         return StringType_1.StringType.instance;
@@ -1068,19 +1094,21 @@ class TemplateStringExpression extends AstNode_1.Expression {
 }
 exports.TemplateStringExpression = TemplateStringExpression;
 class TaggedTemplateStringExpression extends AstNode_1.Expression {
-    constructor(tagName, openingBacktick, quasis, expressions, closingBacktick) {
+    constructor(options) {
         super();
-        this.tagName = tagName;
-        this.openingBacktick = openingBacktick;
-        this.quasis = quasis;
-        this.expressions = expressions;
-        this.closingBacktick = closingBacktick;
         this.kind = AstNode_1.AstNodeKind.TaggedTemplateStringExpression;
-        this.range = util_1.default.createBoundingRange(tagName, openingBacktick, quasis[0], quasis[quasis.length - 1], closingBacktick);
+        this.tokens = {
+            tagName: options.tagName,
+            openingBacktick: options.openingBacktick,
+            closingBacktick: options.closingBacktick
+        };
+        this.quasis = options.quasis;
+        this.expressions = options.expressions;
+        this.range = util_1.default.createBoundingRange(this.tokens.tagName, this.tokens.openingBacktick, this.quasis[0], this.quasis[this.quasis.length - 1], this.tokens.closingBacktick);
     }
     transpile(state) {
         let result = [];
-        result.push(state.transpileToken(this.tagName), '([');
+        result.push(state.transpileToken(this.tokens.tagName), '([');
         //add quasis as the first array
         for (let i = 0; i < this.quasis.length; i++) {
             let quasi = this.quasis[i];
@@ -1099,7 +1127,7 @@ class TaggedTemplateStringExpression extends AstNode_1.Expression {
             }
             result.push(...expression.transpile(state));
         }
-        result.push(state.sourceNode(this.closingBacktick, '])'));
+        result.push(state.sourceNode(this.tokens.closingBacktick, '])'));
         return result;
     }
     walk(visitor, options) {
@@ -1117,15 +1145,18 @@ class TaggedTemplateStringExpression extends AstNode_1.Expression {
 }
 exports.TaggedTemplateStringExpression = TaggedTemplateStringExpression;
 class AnnotationExpression extends AstNode_1.Expression {
-    constructor(atToken, nameToken) {
+    constructor(options) {
         super();
-        this.atToken = atToken;
-        this.nameToken = nameToken;
         this.kind = AstNode_1.AstNodeKind.AnnotationExpression;
-        this.name = nameToken.text;
+        this.tokens = {
+            at: options.at,
+            name: options.name
+        };
+        this.call = options.call;
+        this.name = this.tokens.name.text;
     }
     get range() {
-        return util_1.default.createBoundingRange(this.atToken, this.nameToken, this.call);
+        return util_1.default.createBoundingRange(this.tokens.at, this.tokens.name, this.call);
     }
     /**
      * Convert annotation arguments to JavaScript types
@@ -1138,7 +1169,8 @@ class AnnotationExpression extends AstNode_1.Expression {
         return this.call.args.map(e => expressionToValue(e, strict));
     }
     getLeadingTrivia() {
-        return this.atToken.leadingTrivia;
+        var _a;
+        return (_a = this.tokens.at) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
     transpile(state) {
         return [];
@@ -1157,15 +1189,17 @@ class AnnotationExpression extends AstNode_1.Expression {
 }
 exports.AnnotationExpression = AnnotationExpression;
 class TernaryExpression extends AstNode_1.Expression {
-    constructor(test, questionMarkToken, consequent, colonToken, alternate) {
+    constructor(options) {
         super();
-        this.test = test;
-        this.questionMarkToken = questionMarkToken;
-        this.consequent = consequent;
-        this.colonToken = colonToken;
-        this.alternate = alternate;
         this.kind = AstNode_1.AstNodeKind.TernaryExpression;
-        this.range = util_1.default.createBoundingRange(test, questionMarkToken, consequent, colonToken, alternate);
+        this.tokens = {
+            questionMark: options.questionMark,
+            colon: options.colon
+        };
+        this.test = options.test;
+        this.consequent = options.consequent;
+        this.alternate = options.alternate;
+        this.range = util_1.default.createBoundingRange(this.test, this.tokens.questionMark, this.consequent, this.tokens.colon, this.alternate);
     }
     transpile(state) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
@@ -1179,12 +1213,12 @@ class TernaryExpression extends AstNode_1.Expression {
             ...alternateInfo.expressions
         ].filter(e => e instanceof CallExpression || e instanceof CallfuncExpression || e instanceof DottedGetExpression);
         if (mutatingExpressions.length > 0) {
-            result.push(state.sourceNode(this.questionMarkToken, 
+            result.push(state.sourceNode(this.tokens.questionMark, 
             //write all the scope variables as parameters.
             //TODO handle when there are more than 31 parameters
             `(function(__bsCondition, ${allUniqueVarNames.join(', ')})`), state.newline, 
             //double indent so our `end function` line is still indented one at the end
-            state.indent(2), state.sourceNode(this.test, `if __bsCondition then`), state.newline, state.indent(1), state.sourceNode((_a = this.consequent) !== null && _a !== void 0 ? _a : this.questionMarkToken, 'return '), ...(_c = (_b = this.consequent) === null || _b === void 0 ? void 0 : _b.transpile(state)) !== null && _c !== void 0 ? _c : [state.sourceNode(this.questionMarkToken, 'invalid')], state.newline, state.indent(-1), state.sourceNode((_d = this.consequent) !== null && _d !== void 0 ? _d : this.questionMarkToken, 'else'), state.newline, state.indent(1), state.sourceNode((_e = this.consequent) !== null && _e !== void 0 ? _e : this.questionMarkToken, 'return '), ...(_g = (_f = this.alternate) === null || _f === void 0 ? void 0 : _f.transpile(state)) !== null && _g !== void 0 ? _g : [state.sourceNode((_h = this.consequent) !== null && _h !== void 0 ? _h : this.questionMarkToken, 'invalid')], state.newline, state.indent(-1), state.sourceNode(this.questionMarkToken, 'end if'), state.newline, state.indent(-1), state.sourceNode(this.questionMarkToken, 'end function)('), ...this.test.transpile(state), state.sourceNode(this.questionMarkToken, `, ${allUniqueVarNames.join(', ')})`));
+            state.indent(2), state.sourceNode(this.test, `if __bsCondition then`), state.newline, state.indent(1), state.sourceNode((_a = this.consequent) !== null && _a !== void 0 ? _a : this.tokens.questionMark, 'return '), ...(_c = (_b = this.consequent) === null || _b === void 0 ? void 0 : _b.transpile(state)) !== null && _c !== void 0 ? _c : [state.sourceNode(this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode((_d = this.consequent) !== null && _d !== void 0 ? _d : this.tokens.questionMark, 'else'), state.newline, state.indent(1), state.sourceNode((_e = this.consequent) !== null && _e !== void 0 ? _e : this.tokens.questionMark, 'return '), ...(_g = (_f = this.alternate) === null || _f === void 0 ? void 0 : _f.transpile(state)) !== null && _g !== void 0 ? _g : [state.sourceNode((_h = this.consequent) !== null && _h !== void 0 ? _h : this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end if'), state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end function)('), ...this.test.transpile(state), state.sourceNode(this.tokens.questionMark, `, ${allUniqueVarNames.join(', ')})`));
             state.blockDepth--;
         }
         else {
@@ -1202,13 +1236,15 @@ class TernaryExpression extends AstNode_1.Expression {
 }
 exports.TernaryExpression = TernaryExpression;
 class NullCoalescingExpression extends AstNode_1.Expression {
-    constructor(consequent, questionQuestionToken, alternate) {
+    constructor(options) {
         super();
-        this.consequent = consequent;
-        this.questionQuestionToken = questionQuestionToken;
-        this.alternate = alternate;
         this.kind = AstNode_1.AstNodeKind.NullCoalescingExpression;
-        this.range = util_1.default.createBoundingRange(consequent, questionQuestionToken, alternate);
+        this.tokens = {
+            questionQuestion: options.questionQuestion
+        };
+        this.consequent = options.consequent;
+        this.alternate = options.alternate;
+        this.range = util_1.default.createBoundingRange(this.consequent, this.tokens.questionQuestion, this.alternate);
     }
     transpile(state) {
         let result = [];
@@ -1245,10 +1281,12 @@ class NullCoalescingExpression extends AstNode_1.Expression {
 }
 exports.NullCoalescingExpression = NullCoalescingExpression;
 class RegexLiteralExpression extends AstNode_1.Expression {
-    constructor(tokens) {
+    constructor(options) {
         super();
-        this.tokens = tokens;
         this.kind = AstNode_1.AstNodeKind.RegexLiteralExpression;
+        this.tokens = {
+            regexLiteral: options.regexLiteral
+        };
     }
     get range() {
         var _a, _b;
@@ -1288,17 +1326,17 @@ function expressionToValue(expr, strict) {
         return null;
     }
     if ((0, reflection_1.isUnaryExpression)(expr) && (0, reflection_1.isLiteralNumber)(expr.right)) {
-        return numberExpressionToValue(expr.right, expr.operator.text);
+        return numberExpressionToValue(expr.right, expr.tokens.operator.text);
     }
     if ((0, reflection_1.isLiteralString)(expr)) {
         //remove leading and trailing quotes
-        return expr.token.text.replace(/^"/, '').replace(/"$/, '');
+        return expr.tokens.value.text.replace(/^"/, '').replace(/"$/, '');
     }
     if ((0, reflection_1.isLiteralNumber)(expr)) {
         return numberExpressionToValue(expr);
     }
     if ((0, reflection_1.isLiteralBoolean)(expr)) {
-        return expr.token.text.toLowerCase() === 'true';
+        return expr.tokens.value.text.toLowerCase() === 'true';
     }
     if ((0, reflection_1.isArrayLiteralExpression)(expr)) {
         return expr.elements
@@ -1308,7 +1346,7 @@ function expressionToValue(expr, strict) {
     if ((0, reflection_1.isAALiteralExpression)(expr)) {
         return expr.elements.reduce((acc, e) => {
             if (!(0, reflection_1.isCommentStatement)(e)) {
-                acc[e.keyToken.text] = expressionToValue(e.value, strict);
+                acc[e.tokens.key.text] = expressionToValue(e.value, strict);
             }
             return acc;
         }, {});
@@ -1317,22 +1355,19 @@ function expressionToValue(expr, strict) {
 }
 function numberExpressionToValue(expr, operator = '') {
     if ((0, reflection_1.isIntegerType)(expr.getType()) || (0, reflection_1.isLongIntegerType)(expr.getType())) {
-        return parseInt(operator + expr.token.text);
+        return parseInt(operator + expr.tokens.value.text);
     }
     else {
-        return parseFloat(operator + expr.token.text);
+        return parseFloat(operator + expr.tokens.value.text);
     }
 }
 class TypeExpression extends AstNode_1.Expression {
-    constructor(
-    /**
-     * The standard AST expression that represents the type for this TypeExpression.
-     */
-    expression) {
+    constructor(options) {
+        var _a;
         super();
-        this.expression = expression;
         this.kind = AstNode_1.AstNodeKind.TypeExpression;
-        this.range = expression === null || expression === void 0 ? void 0 : expression.range;
+        this.expression = options.expression;
+        this.range = (_a = this.expression) === null || _a === void 0 ? void 0 : _a.range;
     }
     transpile(state) {
         return [this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }).toTypeString()];
@@ -1360,13 +1395,15 @@ class TypeExpression extends AstNode_1.Expression {
 }
 exports.TypeExpression = TypeExpression;
 class TypeCastExpression extends AstNode_1.Expression {
-    constructor(obj, asToken, typeExpression) {
+    constructor(options) {
         super();
-        this.obj = obj;
-        this.asToken = asToken;
-        this.typeExpression = typeExpression;
         this.kind = AstNode_1.AstNodeKind.TypeCastExpression;
-        this.range = util_1.default.createBoundingRange(this.obj, this.asToken, this.typeExpression);
+        this.tokens = {
+            as: options.as
+        };
+        this.obj = options.obj;
+        this.typeExpression = options.typeExpression;
+        this.range = util_1.default.createBoundingRange(this.obj, this.tokens.as, this.typeExpression);
     }
     transpile(state) {
         return this.obj.transpile(state);
@@ -1383,13 +1420,15 @@ class TypeCastExpression extends AstNode_1.Expression {
 }
 exports.TypeCastExpression = TypeCastExpression;
 class TypedArrayExpression extends AstNode_1.Expression {
-    constructor(innerType, leftBracket, rightBracket) {
+    constructor(options) {
         super();
-        this.innerType = innerType;
-        this.leftBracket = leftBracket;
-        this.rightBracket = rightBracket;
         this.kind = AstNode_1.AstNodeKind.TypedArrayExpression;
-        this.range = util_1.default.createBoundingRange(this.innerType, this.leftBracket, this.rightBracket);
+        this.tokens = {
+            leftBracket: options.leftBracket,
+            rightBracket: options.rightBracket
+        };
+        this.innerType = options.innerType;
+        this.range = util_1.default.createBoundingRange(this.innerType, this.tokens.leftBracket, this.tokens.rightBracket);
     }
     transpile(state) {
         return [this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }).toTypeString()];