Skip to content

Commit

Permalink
static range for expressions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@TwitchBronBron
TwitchBronBron committed Feb 23, 2022
1 parent c95136f commit 51047e9
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 73 deletions.
138 changes: 65 additions & 73 deletions src/parser/Expression.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class BinaryExpression extends Expression {
public right: Expression
) {
super();
this.range = util.createRangeFromPositions(this.left.range.start, this.right.range.end);
this.range = util.createBoundingRange(this.left, this.right);
}

public readonly range: Range;
Expand Down Expand Up @@ -80,7 +80,7 @@ export class CallExpression extends Expression {
readonly namespaceName: NamespacedVariableNameExpression
) {
super();
this.range = util.createRangeFromPositions(this.callee.range.start, this.closingParen.range.end);
this.range = util.createBoundingRange(this.callee, this.closingParen);
}

public readonly range: Range;
Expand Down Expand Up @@ -153,6 +153,26 @@ export class FunctionExpression extends Expression implements TypedefProvider {
}
}

/**
* The range of the function
*/
public get range() {
if (!this._range) {
this._range = util.createBoundingRange(
this.functionType,
this.leftParen,
...(this.parameters ?? []),
this.rightParen,
this.asToken,
this.returnTypeToken,
this.body,
this.end
);
}
return this._range;
}
private _range: Range;

public readonly symbolTable: SymbolTable;

public labelStatements = [] as LabelStatement[];
Expand All @@ -178,17 +198,6 @@ export class FunctionExpression extends Expression implements TypedefProvider {
*/
public childFunctionExpressions = [] as FunctionExpression[];

/**
* 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'
*/
public get range() {
return util.createRangeFromPositions(
(this.functionType ?? this.leftParen).range.start,
(this.end ?? this.body ?? this.returnTypeToken ?? this.asToken ?? this.rightParen).range.end
);
}

transpile(state: BrsTranspileState, name?: Identifier, includeBody = true) {
let results = [];
//'function'|'sub'
Expand Down Expand Up @@ -284,15 +293,10 @@ export class FunctionParameterExpression extends Expression {
readonly namespaceName?: NamespacedVariableNameExpression
) {
super();
this.range = util.createBoundingRange(this.name, this.equalsToken, this.defaultValue, this.asToken, this.typeToken);
}


public get range(): Range {
return {
start: this.name.range.start,
end: this.typeToken ? this.typeToken.range.end : this.name.range.end
};
}
public readonly range: Range;

public transpile(state: BrsTranspileState) {
let result = [
Expand Down Expand Up @@ -335,7 +339,7 @@ export class NamespacedVariableNameExpression extends Expression {
super();
this.range = expression.range;
}
range: Range;
public readonly range: Range;

transpile(state: BrsTranspileState) {
return [
Expand Down Expand Up @@ -382,7 +386,7 @@ export class DottedGetExpression extends Expression {
readonly dot: Token
) {
super();
this.range = util.createRangeFromPositions(this.obj.range.start, this.name.range.end);
this.range = util.createBoundingRange(this.obj, this.dot, this.name);
}

public readonly range: Range;
Expand Down Expand Up @@ -414,7 +418,7 @@ export class XmlAttributeGetExpression extends Expression {
readonly at: Token
) {
super();
this.range = util.createRangeFromPositions(this.obj.range.start, this.name.range.end);
this.range = util.createBoundingRange(this.obj, this.at, this.name);
}

public readonly range: Range;
Expand Down Expand Up @@ -442,7 +446,7 @@ export class IndexedGetExpression extends Expression {
readonly closingSquare: Token
) {
super();
this.range = util.createRangeFromPositions(this.obj.range.start, this.closingSquare.range.end);
this.range = util.createBoundingRange(this.obj, this.openingSquare, this.index, this.closingSquare);
}

public readonly range: Range;
Expand Down Expand Up @@ -473,7 +477,7 @@ export class GroupingExpression extends Expression {
public expression: Expression
) {
super();
this.range = util.createRangeFromPositions(this.tokens.left.range.start, this.tokens.right.range.end);
this.range = util.createBoundingRange(this.tokens.left, this.expression, this.tokens.right);
}

public readonly range: Range;
Expand All @@ -498,12 +502,11 @@ export class LiteralExpression extends Expression {
public token: Token
) {
super();
this.range = this.token.range;
this.type = util.tokenToBscType(token);
}

public get range() {
return this.token.range;
}
public readonly range: Range;

/**
* The (data) type of this expression
Expand Down Expand Up @@ -547,7 +550,7 @@ export class EscapedCharCodeLiteralExpression extends Expression {
super();
this.range = token.range;
}
readonly range: Range;
public readonly range: Range;

transpile(state: BrsTranspileState) {
return [
Expand All @@ -568,7 +571,7 @@ export class ArrayLiteralExpression extends Expression {
readonly hasSpread = false
) {
super();
this.range = util.createRangeFromPositions(this.open.range.start, this.close.range.end);
this.range = util.createBoundingRange(this.open, ...(this.elements ?? []), this.close);
}

public readonly range: Range;
Expand Down Expand Up @@ -647,10 +650,10 @@ export class AAMemberExpression extends Expression {
public type: BscType
) {
super();
this.range = util.createRangeFromPositions(keyToken.range.start, this.value.range.end);
this.range = util.createBoundingRange(this.keyToken, this.colonToken, this.value);
}

public range: Range;
public readonly range: Range;
public commaToken?: Token;

transpile(state: BrsTranspileState) {
Expand All @@ -672,15 +675,15 @@ export class AALiteralExpression extends Expression implements SymbolContainer {
readonly functionExpression: FunctionExpression
) {
super();
this.range = util.createRangeFromPositions(this.open.range.start, this.close.range.end);
this.range = util.createBoundingRange(this.open, ...(this.elements ?? []), this.close);
this.buildSymbolTable();
}

public readonly range: Range;

readonly symbolTable: SymbolTable = new SymbolTable();
readonly memberTable: SymbolTable = new SymbolTable();

public readonly range: Range;

public buildSymbolTable() {
this.symbolTable.clear();
this.symbolTable.addSymbol('m', { start: this.open.range.start, end: this.close.range.end }, new ObjectType(this.memberTable));
Expand Down Expand Up @@ -791,7 +794,7 @@ export class UnaryExpression extends Expression {
public right: Expression
) {
super();
this.range = util.createRangeFromPositions(this.operator.range.start, this.right.range.end);
this.range = util.createBoundingRange(this.operator, this.right);
}

public readonly range: Range;
Expand Down Expand Up @@ -821,6 +824,7 @@ export class VariableExpression extends Expression {
}

public readonly range: Range;

public isCalled: boolean;

public getName(parseMode: ParseMode) {
Expand Down Expand Up @@ -932,9 +936,11 @@ export class NewExpression extends Expression {
readonly call: CallExpression
) {
super();
this.range = util.createRangeFromPositions(this.newKeyword.range.start, this.call.range.end);
this.range = util.createBoundingRange(this.newKeyword, this.call);
}

public readonly range: Range;

/**
* The name of the class to initialize (with optional namespace prefixed)
*/
Expand All @@ -948,8 +954,6 @@ export class NewExpression extends Expression {
return this.call.namespaceName;
}

public readonly range: Range;

public transpile(state: BrsTranspileState) {
const cls = state.file.getClassFileLink(
this.className.getName(ParseMode.BrighterScript),
Expand Down Expand Up @@ -977,10 +981,7 @@ export class CallfuncExpression extends Expression {
readonly closingParen: Token
) {
super();
this.range = util.createRangeFromPositions(
callee.range.start,
(closingParen ?? args[args.length - 1] ?? openingParen ?? methodName ?? operator).range.end
);
this.range = util.createBoundingRange(this.callee, this.operator, this.methodName, this.openingParen, ...(this.args ?? []), this.closingParen);
}

public readonly range: Range;
Expand Down Expand Up @@ -1034,12 +1035,10 @@ export class TemplateStringQuasiExpression extends Expression {
readonly expressions: Array<LiteralExpression | EscapedCharCodeLiteralExpression>
) {
super();
this.range = util.createRangeFromPositions(
this.expressions[0].range.start,
this.expressions[this.expressions.length - 1].range.end
);
this.range = util.createBoundingRange(...(this.expressions ?? []));
}
readonly range: Range;

public readonly range: Range;

transpile(state: BrsTranspileState, skipEmptyStrings = true) {
let result = [];
Expand Down Expand Up @@ -1076,10 +1075,8 @@ export class TemplateStringExpression extends Expression {
readonly closingBacktick: Token
) {
super();
this.range = util.createRangeFromPositions(
quasis[0].range.start,
quasis[quasis.length - 1].range.end
);
//the expression always starts and ends with a quasi, so we don't need to consider the expression locations
this.range = util.createBoundingRange(this.openingBacktick, ...(this.quasis ?? []), this.closingBacktick);
}

public readonly range: Range;
Expand Down Expand Up @@ -1159,10 +1156,8 @@ export class TaggedTemplateStringExpression extends Expression {
readonly closingBacktick: Token
) {
super();
this.range = util.createRangeFromPositions(
quasis[0].range.start,
quasis[quasis.length - 1].range.end
);
//the expression always starts and ends with a quasi, so we don't need to consider the expression locations
this.range = util.createBoundingRange(this.tagName, this.openingBacktick, ...(this.quasis ?? []), this.closingBacktick);
}

public readonly range: Range;
Expand Down Expand Up @@ -1231,14 +1226,17 @@ export class AnnotationExpression extends Expression {
) {
super();
this.name = nameToken.text;
this.range = util.createRangeFromPositions(
atToken.range.start,
nameToken.range.end
);
}

public get range() {
if (!this._range) {
this._range = util.createBoundingRange(this.atToken, this.nameToken, this.call);
}
return this._range;
}
private _range: Range;

public name: string;
public range: Range;
public call: CallExpression;

/**
Expand Down Expand Up @@ -1277,13 +1275,10 @@ export class TernaryExpression extends Expression {
readonly alternate?: Expression
) {
super();
this.range = util.createRangeFromPositions(
test.range.start,
(alternate ?? colonToken ?? consequent ?? questionMarkToken ?? test).range.end
);
this.range = util.createBoundingRange(this.test, this.questionMarkToken, this.consequent, this.colonToken, this.alternate);
}

public range: Range;
public readonly range: Range;

transpile(state: BrsTranspileState) {
let result = [];
Expand Down Expand Up @@ -1360,11 +1355,9 @@ export class NullCoalescingExpression extends Expression {
public alternate: Expression
) {
super();
this.range = util.createRangeFromPositions(
consequent.range.start,
(alternate ?? questionQuestionToken ?? consequent).range.end
);
this.range = util.createBoundingRange(this.consequent, this.questionQuestionToken, this.alternate);
}

public readonly range: Range;

transpile(state: BrsTranspileState) {
Expand Down Expand Up @@ -1442,11 +1435,10 @@ export class RegexLiteralExpression extends Expression {
}
) {
super();
this.range = this.tokens.regexLiteral.range;
}

public get range() {
return this.tokens.regexLiteral.range;
}
public readonly range: Range;

public transpile(state: BrsTranspileState): TranspileResult {
let text = this.tokens.regexLiteral?.text ?? '';
Expand Down
4 changes: 4 additions & 0 deletions src/parser/Parser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,8 @@ export class Parser {
func.callExpressions = this.callExpressions;

if (isAnonymous) {
//read the range property so it's cached
noop(func.range);
return func;
} else {
let result = new FunctionStatement(name, func, this.currentNamespaceName);
Expand Down Expand Up @@ -1521,6 +1523,8 @@ export class Parser {
let leftParen = this.advance();
annotation.call = this.finishCall(leftParen, annotation, false);
}
//read the range property so it's cached
noop(annotation.range);
return annotation;
}

Expand Down

0 comments on commit 51047e9

Please sign in to comment.