averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix <rdar://problem/20457938> typed pattern is not allowed on if/let condition

Browse Source 
Swift SVN r27110
This commit is contained in:
Chris Lattner
2015-04-08 00:28:29 +00:00
parent 652aace9a6
commit a63120f11a
5 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Parse/ParsePattern.cpp
View File

@@ -941,29 +941,30 @@ ParserResult<Pattern> Parser::parsePatternTuple() {
EllipsisLoc.isValid(), EllipsisLoc));
}
/// Parse a pattern with an optional type annotation.
/// Parse an optional type annotation on a pattern.
///
/// typed-pattern ::= mattching-pattern (':' type)?
/// pattern-type-annotation ::= (':' type)?
///
ParserResult<Pattern> Parser::parseTypedMatchingPattern() {
auto result = parseMatchingPattern(/*isExprBasic*/true);
// Now parse an optional type annotation.
if (consumeIf(tok::colon)) {
if (result.isNull()) // Recover by creating AnyPattern.
result = makeParserErrorResult(new (Context) AnyPattern(PreviousLoc));
ParserResult<TypeRepr> Ty = parseType();
if (Ty.hasCodeCompletion())
return makeParserCodeCompletionResult<Pattern>();
if (Ty.isNull())
Ty = makeParserResult(new (Context) ErrorTypeRepr(PreviousLoc));
result = makeParserResult(result,
new (Context) TypedPattern(result.get(), Ty.get()));
}
return result;
ParserResult<Pattern> Parser::
parseOptionalPatternTypeAnnotation(ParserResult<Pattern> result) {
// Parse an optional type annotation.
if (!consumeIf(tok::colon))
return result;
Pattern *P;
if (result.isNull()) // Recover by creating AnyPattern.
P = new (Context) AnyPattern(Tok.getLoc());
else
P = result.get();
ParserResult<TypeRepr> Ty = parseType();
if (Ty.hasCodeCompletion())
return makeParserCodeCompletionResult<Pattern>();
if (Ty.isNull())
Ty = makeParserResult(new (Context) ErrorTypeRepr(PreviousLoc));
return makeParserResult(new (Context) TypedPattern(P, Ty.get()));
}