maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Addressed code review feedback.

Browse source
This commit is contained in:
Daniel Rosenwasser 2014-07-24 18:05:05 -07:00
parent 57d7cf54c6
commit b76c13cfd5
3 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/compiler/parser.ts
View file

@ -1468,14 +1468,14 @@ module ts {
// *Maybe* we had an arrow function and we need to try to parse it out,
// rolling back and trying other parses if we fail.
var sig = tryParse(parseSignatureIfArrowOrBraceFollows);
if (sig === undefined) {
return undefined;
}
else {
var sig = tryParseSignatureIfArrowOrBraceFollows();
if (sig) {
parseExpected(SyntaxKind.EqualsGreaterThanToken);
return parseArrowExpressionTail(pos, sig, /*noIn:*/ false);
}
else {
return undefined;
}
}
// True -> We definitely expect a parenthesized arrow function here.
@ -1549,22 +1549,24 @@ module ts {
return Tristate.False;
}
function parseSignatureIfArrowOrBraceFollows(): ParsedSignature {
var sig = parseSignature(SyntaxKind.CallSignature, SyntaxKind.ColonToken);
function tryParseSignatureIfArrowOrBraceFollows(): ParsedSignature {
return tryParse(() => {
var sig = parseSignature(SyntaxKind.CallSignature, SyntaxKind.ColonToken);
// Parsing a signature isn't enough.
// Parenthesized arrow signatures often look like other valid expressions.
// For instance:
// - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
// - "(x,y)" is a comma expression parsed as a signature with two parameters.
// - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
//
// So we need just a bit of lookahead to ensure that it can only be a signature.
if (token === SyntaxKind.EqualsGreaterThanToken || token === SyntaxKind.OpenBraceToken) {
return sig;
}
// Parsing a signature isn't enough.
// Parenthesized arrow signatures often look like other valid expressions.
// For instance:
// - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
// - "(x,y)" is a comma expression parsed as a signature with two parameters.
// - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
//
// So we need just a bit of lookahead to ensure that it can only be a signature.
if (token === SyntaxKind.EqualsGreaterThanToken || token === SyntaxKind.OpenBraceToken) {
return sig;
}
return undefined;
return undefined;
});
}
function parseArrowExpressionTail(pos: number, sig: ParsedSignature, noIn: boolean): FunctionExpression {

2
tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt
View file

@ -80,7 +80,7 @@
~
!!! Declaration or statement expected.
module ceci_nEst_pas_une_arrow_function {
module ce_nEst_pas_une_arrow_function {
var a = ();
~
!!! Expression expected.

2
tests/cases/compiler/arrowFunctionsMissingTokens.ts
View file

@ -41,7 +41,7 @@ module missingCurliesWithArrow {
}
}
module ceci_nEst_pas_une_arrow_function {
module ce_nEst_pas_une_arrow_function {
var a = ();
var b = (): void;