Skip to content

More parser & tokenizer refactorings #1376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 10, 2020
Merged

More parser & tokenizer refactorings #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8586693
refactor some logical condisionals
MaxGraey Jul 4, 2020
be34422
isGetterOrSetter
MaxGraey Jul 4, 2020
54f2cdc
t -> ty, skipping explicit type decl for ints
MaxGraey Jul 4, 2020
2b8dc5f
t -> ty
MaxGraey Jul 4, 2020
7522735
use lazy typeArguments init for tryParseTypeArgumentsBeforeArguments
MaxGraey Jul 5, 2020
bd5c0ee
simplify
MaxGraey Jul 5, 2020
df214d6
refactor switch with single case to if-branch
MaxGraey Jul 5, 2020
f373252
cache pos for readInteger in tokenizer
MaxGraey Jul 5, 2020
9722c43
refactor Tokenizer's constructor
MaxGraey Jul 5, 2020
c89ba9d
cache pos for unsafeNext
MaxGraey Jul 5, 2020
01d8ef6
more
MaxGraey Jul 5, 2020
ae9bde3
more
MaxGraey Jul 5, 2020
d351233
ty -> type
MaxGraey Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/diagnostics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ export abstract class DiagnosticEmitter {

/** Initializes this diagnostic emitter. */
protected constructor(diagnostics: DiagnosticMessage[] | null = null) {
if (!diagnostics) diagnostics = new Array();
if (!diagnostics) diagnostics = [];
this.diagnostics = diagnostics;
}

Expand Down
109 changes: 59 additions & 50 deletions src/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export class Parser extends DiagnosticEmitter {
namespace: NamespaceDeclaration | null = null
): Statement | null {
var flags = CommonFlags.NONE;
var startPos: i32 = -1;
var startPos = -1;

// check decorators
var decorators: DecoratorNode[] | null = null;
Expand All @@ -209,10 +209,10 @@ export class Parser extends DiagnosticEmitter {
}

// check modifiers
var exportStart: i32 = 0;
var exportEnd: i32 = 0;
var defaultStart: i32 = 0;
var defaultEnd: i32 = 0;
var exportStart = 0;
var exportEnd = 0;
var defaultStart = 0;
var defaultEnd = 0;
if (tn.skip(Token.EXPORT)) {
if (startPos < 0) startPos = tn.tokenPos;
flags |= CommonFlags.EXPORT;
Expand All @@ -224,8 +224,8 @@ export class Parser extends DiagnosticEmitter {
}
}

var declareStart: i32 = 0;
var declareEnd: i32 = 0;
var declareStart = 0;
var declareEnd = 0;
var contextIsAmbient = namespace != null && namespace.is(CommonFlags.AMBIENT);
if (tn.skip(Token.DECLARE)) {
if (contextIsAmbient) {
Expand Down Expand Up @@ -700,7 +700,7 @@ export class Parser extends DiagnosticEmitter {
} else {
isSignature = false; // not yet known
do {
let paramStart: i32 = -1;
let paramStart = -1;
let kind = ParameterKind.DEFAULT;
if (tn.skip(Token.DOT_DOT_DOT)) {
paramStart = tn.tokenPos;
Expand All @@ -713,17 +713,17 @@ export class Parser extends DiagnosticEmitter {
if (tn.skip(Token.COLON)) {
isSignature = true;
tn.discard(state);
let t = this.parseType(tn, false);
if (!t) return null;
if (t.kind != NodeKind.NAMEDTYPE) {
let type = this.parseType(tn, false);
if (!type) return null;
if (type.kind != NodeKind.NAMEDTYPE) {
this.error(
DiagnosticCode.Identifier_expected,
t.range
type.range
);
this.tryParseSignatureIsSignature = true;
return null;
}
thisType = <NamedTypeNode>t;
thisType = <NamedTypeNode>type;
} else {
tn.reset(state);
this.tryParseSignatureIsSignature = false;
Expand Down Expand Up @@ -981,7 +981,7 @@ export class Parser extends DiagnosticEmitter {
}
}
var range = Range.join(identifier.range, tn.range());
if ((flags & CommonFlags.DEFINITELY_ASSIGNED) != 0 && initializer !== null) {
if (initializer !== null && (flags & CommonFlags.DEFINITELY_ASSIGNED) != 0) {
this.error(
DiagnosticCode.A_definite_assignment_assertion_is_not_permitted_in_this_context,
range
Expand Down Expand Up @@ -1154,29 +1154,29 @@ export class Parser extends DiagnosticEmitter {
);
let extendsType: NamedTypeNode | null = null;
if (tn.skip(Token.EXTENDS)) {
let t = this.parseType(tn);
if (!t) return null;
if (t.kind != NodeKind.NAMEDTYPE) {
let type = this.parseType(tn);
if (!type) return null;
if (type.kind != NodeKind.NAMEDTYPE) {
this.error(
DiagnosticCode.Identifier_expected,
t.range
type.range
);
return null;
}
extendsType = <NamedTypeNode>t;
extendsType = <NamedTypeNode>type;
}
let defaultType: NamedTypeNode | null = null;
if (tn.skip(Token.EQUALS)) {
let t = this.parseType(tn);
if (!t) return null;
if (t.kind != NodeKind.NAMEDTYPE) {
let type = this.parseType(tn);
if (!type) return null;
if (type.kind != NodeKind.NAMEDTYPE) {
this.error(
DiagnosticCode.Identifier_expected,
t.range
type.range
);
return null;
}
defaultType = <NamedTypeNode>t;
defaultType = <NamedTypeNode>type;
}
return Node.createTypeParameter(
identifier,
Expand Down Expand Up @@ -1414,7 +1414,7 @@ export class Parser extends DiagnosticEmitter {
}

var name = Node.createIdentifierExpression(tn.readIdentifier(), tn.range());
var signatureStart: i32 = -1;
var signatureStart = -1;

var typeParameters: TypeParameterNode[] | null = null;
if (tn.skip(Token.LESSTHAN)) {
Expand Down Expand Up @@ -1674,16 +1674,16 @@ export class Parser extends DiagnosticEmitter {

var extendsType: NamedTypeNode | null = null;
if (tn.skip(Token.EXTENDS)) {
let t = this.parseType(tn);
if (!t) return null;
if (t.kind != NodeKind.NAMEDTYPE) {
let type = this.parseType(tn);
if (!type) return null;
if (type.kind != NodeKind.NAMEDTYPE) {
this.error(
DiagnosticCode.Identifier_expected,
t.range
type.range
);
return null;
}
extendsType = <NamedTypeNode>t;
extendsType = <NamedTypeNode>type;
}

var implementsTypes: NamedTypeNode[] | null = null;
Expand Down Expand Up @@ -1852,7 +1852,7 @@ export class Parser extends DiagnosticEmitter {
if (!decorators) decorators = new Array();
decorators.push(decorator);
} while (tn.skip(Token.AT));
if (decorators !== null && isInterface) {
if (isInterface && decorators !== null) {
this.error(
DiagnosticCode.Decorators_are_not_valid_here,
Range.join(decorators[0].range, decorators[decorators.length - 1].range)
Expand Down Expand Up @@ -1940,8 +1940,8 @@ export class Parser extends DiagnosticEmitter {
if (parent.flags & CommonFlags.GENERIC) flags |= CommonFlags.GENERIC_CONTEXT;
}

var readonlyStart: i32 = 0;
var readonlyEnd: i32 = 0;
var readonlyStart = 0;
var readonlyEnd = 0;
if (tn.peek() == Token.READONLY) {
let state = tn.mark();
tn.next();
Expand All @@ -1960,11 +1960,11 @@ export class Parser extends DiagnosticEmitter {
var state = tn.mark();
var isConstructor = false;
var isGetter = false;
var getStart: i32 = 0;
var getEnd: i32 = 0;
var getStart = 0;
var getEnd = 0;
var isSetter = false;
var setStart: i32 = 0;
var setEnd: i32 = 0;
var setStart = 0;
var setEnd = 0;
if (!isInterface) {
if (tn.skip(Token.GET)) {
if (tn.peek(true, IdentifierHandling.PREFER) == Token.IDENTIFIER && !tn.nextTokenOnNewLine) {
Expand Down Expand Up @@ -2023,11 +2023,12 @@ export class Parser extends DiagnosticEmitter {
}
}

var isGetterOrSetter = isGetter || isSetter;
var name: IdentifierExpression;
if (isConstructor) {
name = Node.createConstructorExpression(tn.range());
} else {
if (!(isGetter || isSetter) && tn.skip(Token.OPENBRACKET)) {
if (!isGetterOrSetter && tn.skip(Token.OPENBRACKET)) {
if (!startPos) startPos = tn.tokenPos;
// TODO: also handle symbols, which might have some of these modifiers
if (flags & CommonFlags.PUBLIC) {
Expand Down Expand Up @@ -2091,7 +2092,7 @@ export class Parser extends DiagnosticEmitter {
DiagnosticCode.Type_parameters_cannot_appear_on_a_constructor_declaration,
tn.range(typeParametersStart, tn.pos)
); // recoverable
} else if (isGetter || isSetter) {
} else if (isGetterOrSetter) {
this.error(
DiagnosticCode.An_accessor_cannot_have_type_parameters,
tn.range(typeParametersStart, tn.pos)
Expand Down Expand Up @@ -2236,7 +2237,7 @@ export class Parser extends DiagnosticEmitter {
name.range
);

} else if (isGetter || isSetter) {
} else if (isGetterOrSetter) {
this.error(
DiagnosticCode.Function_implementation_is_missing_or_not_immediately_following_the_declaration,
name.range
Expand Down Expand Up @@ -3246,7 +3247,11 @@ export class Parser extends DiagnosticEmitter {
if (!label) return null;
if (tn.skip(Token.COLON)) {
statements = new Array<Statement>();
while (tn.peek() != Token.CASE && tn.nextToken != Token.DEFAULT && tn.nextToken != Token.CLOSEBRACE) {
while (
tn.peek() != Token.CASE &&
tn.nextToken != Token.DEFAULT &&
tn.nextToken != Token.CLOSEBRACE
) {
statement = this.parseStatement(tn);
if (!statement) return null;
statements.push(statement);
Expand All @@ -3264,7 +3269,11 @@ export class Parser extends DiagnosticEmitter {
} else if (tn.skip(Token.DEFAULT)) {
if (tn.skip(Token.COLON)) {
statements = new Array<Statement>();
while (tn.peek() != Token.CASE && tn.nextToken != Token.DEFAULT && tn.nextToken != Token.CLOSEBRACE) {
while (
tn.peek() != Token.CASE &&
tn.nextToken != Token.DEFAULT &&
tn.nextToken != Token.CLOSEBRACE
) {
statement = this.parseStatement(tn);
if (!statement) return null;
statements.push(statement);
Expand Down Expand Up @@ -3544,8 +3553,7 @@ export class Parser extends DiagnosticEmitter {
let typeArguments: TypeNode[] | null = null;
let arguments_: Expression[] | null = null;
if (
tn.skip(Token.OPENPAREN)
||
tn.skip(Token.OPENPAREN) ||
(typeArguments = this.tryParseTypeArgumentsBeforeArguments(tn)) !== null
) {
arguments_ = this.parseArguments(tn);
Expand Down Expand Up @@ -3845,7 +3853,7 @@ export class Parser extends DiagnosticEmitter {
var state = tn.mark();
if (!tn.skip(Token.LESSTHAN)) return null;
var start = tn.tokenPos;
var typeArguments = new Array<TypeNode>();
var typeArguments: TypeNode[] | null = null;
do {
if (tn.peek() === Token.GREATERTHAN) {
break;
Expand All @@ -3855,12 +3863,13 @@ export class Parser extends DiagnosticEmitter {
tn.reset(state);
return null;
}
typeArguments.push(type);
if (!typeArguments) typeArguments = [ type ];
else typeArguments.push(type);
} while (tn.skip(Token.COMMA));
if (tn.skip(Token.GREATERTHAN)) {
let end = tn.pos;
if (tn.skip(Token.OPENPAREN)) {
if (!typeArguments.length) {
if (!typeArguments) {
this.error(
DiagnosticCode.Type_argument_list_cannot_be_empty,
tn.range(start, end)
Expand Down Expand Up @@ -4153,9 +4162,9 @@ export class Parser extends DiagnosticEmitter {
): Expression {
var typeArguments: TypeNode[] | null = null;
while (
tn.skip(Token.OPENPAREN)
||
potentiallyGeneric && (typeArguments = this.tryParseTypeArgumentsBeforeArguments(tn)) !== null
tn.skip(Token.OPENPAREN) ||
potentiallyGeneric &&
(typeArguments = this.tryParseTypeArgumentsBeforeArguments(tn)) !== null
) {
let args = this.parseArguments(tn);
if (!args) break;
Expand Down
Loading