Skip to content

Commit 535dc0d

Browse files
CyrusNajmabadiCyrusNajmabadi
committed
Simplify module name parsing.
Conflicts: src/services/syntax/SyntaxGenerator.js.map
1 parent fc25dfb commit 535dc0d

10 files changed

Lines changed: 41 additions & 47 deletions

‎src/services/syntax/SyntaxGenerator.js‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/services/syntax/SyntaxGenerator.js.map‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/services/syntax/parser.ts‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,23 +1240,18 @@ module TypeScript.Parser {
12401240
return new FunctionDeclarationSyntax(parseNodeData, modifiers, functionKeyword, identifier, callSignature, block, semicolonToken);
12411241
}
12421242

1243-
function parseModuleDeclaration(): ModuleDeclarationSyntax {
1244-
var modifiers = parseModifiers();
1245-
var moduleKeyword = eatToken(SyntaxKind.ModuleKeyword);
1246-
1247-
var moduleName: INameSyntax = undefined;
1248-
var stringLiteral: ISyntaxToken = undefined;
1249-
1250-
if (currentToken().kind === SyntaxKind.StringLiteral) {
1251-
stringLiteral = eatToken(SyntaxKind.StringLiteral);
1252-
}
1253-
else {
1254-
moduleName = parseName(/*allowIdentifierNames*/ false);
1255-
}
1243+
function parseModuleName(): INameSyntax {
1244+
return currentToken().kind === SyntaxKind.StringLiteral
1245+
? eatToken(SyntaxKind.StringLiteral)
1246+
: parseName(/*allowIdentifierNames*/ false);
1247+
}
12561248

1249+
function parseModuleDeclaration(): ModuleDeclarationSyntax {
12571250
var openBraceToken: ISyntaxToken;
12581251
return new ModuleDeclarationSyntax(parseNodeData,
1259-
modifiers, moduleKeyword, moduleName, stringLiteral,
1252+
parseModifiers(),
1253+
eatToken(SyntaxKind.ModuleKeyword),
1254+
parseModuleName(),
12601255
openBraceToken = eatToken(SyntaxKind.OpenBraceToken),
12611256
openBraceToken.fullWidth() > 0 ? parseSyntaxList<IModuleElementSyntax>(ListParsingState.ModuleDeclaration_ModuleElements) : [],
12621257
eatToken(SyntaxKind.CloseBraceToken));
@@ -3595,17 +3590,18 @@ module TypeScript.Parser {
35953590
}
35963591

35973592
function parseFunctionType(): FunctionTypeSyntax {
3598-
var typeParameterList = tryParseTypeParameterList(/*requireCompleteTypeParameterList:*/ false);
3599-
var parameterList = parseParameterList();
3600-
36013593
return new FunctionTypeSyntax(parseNodeData,
3602-
typeParameterList, parameterList, eatToken(SyntaxKind.EqualsGreaterThanToken), parseType());
3594+
tryParseTypeParameterList(/*requireCompleteTypeParameterList:*/ false),
3595+
parseParameterList(),
3596+
eatToken(SyntaxKind.EqualsGreaterThanToken), parseType());
36033597
}
36043598

36053599
function parseConstructorType(): ConstructorTypeSyntax {
36063600
return new ConstructorTypeSyntax(parseNodeData,
3607-
eatToken(SyntaxKind.NewKeyword), tryParseTypeParameterList(/*requireCompleteTypeParameterList:*/ false),
3608-
parseParameterList(), eatToken(SyntaxKind.EqualsGreaterThanToken), parseType());
3601+
eatToken(SyntaxKind.NewKeyword),
3602+
tryParseTypeParameterList(/*requireCompleteTypeParameterList:*/ false),
3603+
parseParameterList(),
3604+
eatToken(SyntaxKind.EqualsGreaterThanToken), parseType());
36093605
}
36103606

36113607
function isParameter(): boolean {

‎src/services/syntax/prettyPrinter.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,6 @@ module TypeScript.PrettyPrinter {
305305
this.ensureSpace();
306306
this.appendElement(node.name);
307307
this.ensureSpace();
308-
this.appendToken(node.stringLiteral);
309-
this.ensureSpace();
310-
311308
this.appendToken(node.openBraceToken);
312309
this.ensureNewLine();
313310

‎src/services/syntax/syntaxGenerator.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ var definitions:ITypeDefinition[] = [
145145
<any>{ name: 'modifiers', isList: true, elementType: 'ISyntaxToken' },
146146
<any>{ name: 'moduleKeyword', isToken: true, excludeFromAST: true },
147147
<any>{ name: 'name', type: 'INameSyntax', isOptional: true },
148-
<any>{ name: 'stringLiteral', isToken: true, isOptional: true, tokenKinds: ['StringLiteral'] },
149148
<any>{ name: 'openBraceToken', isToken: true, excludeFromAST: true },
150149
<any>{ name: 'moduleElements', isList: true, elementType: 'IModuleElementSyntax' },
151150
<any>{ name: 'closeBraceToken', isToken: true, excludeFromAST: true }

‎src/services/syntax/syntaxInterfaces.generated.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,11 @@ module TypeScript {
103103
modifiers: ISyntaxToken[];
104104
moduleKeyword: ISyntaxToken;
105105
name: INameSyntax;
106-
stringLiteral: ISyntaxToken;
107106
openBraceToken: ISyntaxToken;
108107
moduleElements: IModuleElementSyntax[];
109108
closeBraceToken: ISyntaxToken;
110109
}
111-
export interface ModuleDeclarationConstructor { new (data: number, modifiers: ISyntaxToken[], moduleKeyword: ISyntaxToken, name: INameSyntax, stringLiteral: ISyntaxToken, openBraceToken: ISyntaxToken, moduleElements: IModuleElementSyntax[], closeBraceToken: ISyntaxToken): ModuleDeclarationSyntax }
110+
export interface ModuleDeclarationConstructor { new (data: number, modifiers: ISyntaxToken[], moduleKeyword: ISyntaxToken, name: INameSyntax, openBraceToken: ISyntaxToken, moduleElements: IModuleElementSyntax[], closeBraceToken: ISyntaxToken): ModuleDeclarationSyntax }
112111

113112
export interface ClassDeclarationSyntax extends ISyntaxNode, IModuleElementSyntax {
114113
modifiers: ISyntaxToken[];

‎src/services/syntax/syntaxList.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ module TypeScript {
1919

2020
module TypeScript {
2121
export function separatorCount(list: ISeparatedSyntaxList<ISyntaxNodeOrToken>) {
22-
return list.length >> 1;
22+
return list === undefined ? 0 : list.length >> 1;
2323
}
2424

2525
export function nonSeparatorCount(list: ISeparatedSyntaxList<ISyntaxNodeOrToken>) {
26-
return (list.length + 1) >> 1;
26+
return list === undefined ? 0 : (list.length + 1) >> 1;
2727
}
2828

2929
export function separatorAt(list: ISeparatedSyntaxList<ISyntaxNodeOrToken>, index: number): ISyntaxToken {
@@ -48,16 +48,20 @@ module TypeScript.Syntax {
4848
addArrayPrototypeValue("kind", SyntaxKind.List);
4949

5050
export function list<T extends ISyntaxNodeOrToken>(nodes: T[]): T[] {
51-
for (var i = 0, n = nodes.length; i < n; i++) {
52-
nodes[i].parent = nodes;
51+
if (nodes !== undefined) {
52+
for (var i = 0, n = nodes.length; i < n; i++) {
53+
nodes[i].parent = nodes;
54+
}
5355
}
5456

5557
return nodes;
5658
}
5759

5860
export function separatedList<T extends ISyntaxNodeOrToken>(nodesAndTokens: ISyntaxNodeOrToken[]): ISeparatedSyntaxList<T> {
59-
for (var i = 0, n = nodesAndTokens.length; i < n; i++) {
60-
nodesAndTokens[i].parent = nodesAndTokens;
61+
if (nodesAndTokens !== undefined) {
62+
for (var i = 0, n = nodesAndTokens.length; i < n; i++) {
63+
nodesAndTokens[i].parent = nodesAndTokens;
64+
}
6165
}
6266

6367
return <ISeparatedSyntaxList<T>>nodesAndTokens;

‎src/services/syntax/syntaxNodes.concrete.generated.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,34 +266,31 @@ module TypeScript {
266266
}
267267
}
268268

269-
export var ModuleDeclarationSyntax: ModuleDeclarationConstructor = <any>function(data: number, modifiers: ISyntaxToken[], moduleKeyword: ISyntaxToken, name: INameSyntax, stringLiteral: ISyntaxToken, openBraceToken: ISyntaxToken, moduleElements: IModuleElementSyntax[], closeBraceToken: ISyntaxToken) {
269+
export var ModuleDeclarationSyntax: ModuleDeclarationConstructor = <any>function(data: number, modifiers: ISyntaxToken[], moduleKeyword: ISyntaxToken, name: INameSyntax, openBraceToken: ISyntaxToken, moduleElements: IModuleElementSyntax[], closeBraceToken: ISyntaxToken) {
270270
if (data) { this.__data = data; }
271271
this.modifiers = modifiers,
272272
this.moduleKeyword = moduleKeyword,
273273
this.name = name,
274-
this.stringLiteral = stringLiteral,
275274
this.openBraceToken = openBraceToken,
276275
this.moduleElements = moduleElements,
277276
this.closeBraceToken = closeBraceToken,
278277
modifiers.parent = this,
279278
moduleKeyword.parent = this,
280279
name && (name.parent = this),
281-
stringLiteral && (stringLiteral.parent = this),
282280
openBraceToken.parent = this,
283281
moduleElements.parent = this,
284282
closeBraceToken.parent = this;
285283
};
286284
ModuleDeclarationSyntax.prototype.kind = SyntaxKind.ModuleDeclaration;
287-
ModuleDeclarationSyntax.prototype.childCount = 7;
285+
ModuleDeclarationSyntax.prototype.childCount = 6;
288286
ModuleDeclarationSyntax.prototype.childAt = function(index: number): ISyntaxElement {
289287
switch (index) {
290288
case 0: return this.modifiers;
291289
case 1: return this.moduleKeyword;
292290
case 2: return this.name;
293-
case 3: return this.stringLiteral;
294-
case 4: return this.openBraceToken;
295-
case 5: return this.moduleElements;
296-
case 6: return this.closeBraceToken;
291+
case 3: return this.openBraceToken;
292+
case 4: return this.moduleElements;
293+
case 5: return this.closeBraceToken;
297294
}
298295
}
299296

‎src/services/syntax/syntaxTree.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ module TypeScript {
814814
}
815815

816816
private checkForDisallowedImportDeclaration(node: ModuleDeclarationSyntax): boolean {
817-
if (!node.stringLiteral) {
817+
if (node.name.kind !== SyntaxKind.StringLiteral) {
818818
for (var i = 0, n = node.moduleElements.length; i < n; i++) {
819819
var child = node.moduleElements[i];
820820
if (child.kind === SyntaxKind.ImportDeclaration) {
@@ -849,21 +849,21 @@ module TypeScript {
849849

850850
public visitModuleDeclaration(node: ModuleDeclarationSyntax): void {
851851
if (this.checkForDisallowedDeclareModifier(node.modifiers) ||
852-
this.checkForRequiredDeclareModifier(node, node.stringLiteral ? node.stringLiteral : firstToken(node.name), node.modifiers) ||
852+
this.checkForRequiredDeclareModifier(node, firstToken(node.name), node.modifiers) ||
853853
this.checkModuleElementModifiers(node.modifiers) ||
854854
this.checkForDisallowedImportDeclaration(node)) {
855855

856856
return;
857857
}
858858

859-
if (node.stringLiteral) {
859+
if (node.name.kind === SyntaxKind.StringLiteral) {
860860
if (!this.inAmbientDeclaration && !SyntaxUtilities.containsToken(node.modifiers, SyntaxKind.DeclareKeyword)) {
861-
this.pushDiagnostic(node.stringLiteral, DiagnosticCode.Only_ambient_modules_can_use_quoted_names);
861+
this.pushDiagnostic(node.name, DiagnosticCode.Only_ambient_modules_can_use_quoted_names);
862862
return;
863863
}
864864
}
865865

866-
if (!node.stringLiteral && this.checkForDisallowedExportAssignment(node)) {
866+
if (node.name.kind !== SyntaxKind.StringLiteral && this.checkForDisallowedExportAssignment(node)) {
867867
return;
868868
}
869869

‎src/services/syntax/syntaxWalker.generated.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ module TypeScript {
107107
this.visitList(node.modifiers);
108108
this.visitToken(node.moduleKeyword);
109109
visitNodeOrToken(this, node.name);
110-
this.visitOptionalToken(node.stringLiteral);
111110
this.visitToken(node.openBraceToken);
112111
this.visitList(node.moduleElements);
113112
this.visitToken(node.closeBraceToken);

0 commit comments

Comments
 (0)