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

Parse: Re-allow '_' in foreach statement patterns.

Browse Source 
Missed a spot. Add a test for 'for _ in seq'.

Swift SVN r5814
This commit is contained in:
Joe Groff
2013-06-26 17:20:06 +00:00
parent 5c661f3c38
commit a7db082ee9
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Parse/ParsePattern.cpp
View File

@@ -179,7 +179,7 @@ static bool parseSelectorFunctionArguments(Parser *parser,
llvm::StringMap<VarDecl*> selectorNames;
for (;;) {
if (parser->Tok.is(tok::identifier) || parser->Tok.is(tok::kw__)) {
if (parser->isStartOfBindingName(parser->Tok)) {
if (parseSelectorArgument(parser, argElts, bodyElts, selectorNames, rp)) {
return true;
}
@@ -204,7 +204,7 @@ bool Parser::parseFunctionArguments(SmallVectorImpl<Pattern*> &argPatterns,
else {
Pattern *firstPattern = pattern.get();
if (Tok.is(tok::identifier) || Tok.is(tok::kw__)) {
if (isStartOfBindingName(Tok)) {
// This looks like a selector-style argument. Try to convert the first
// argument pattern into a single argument type and parse subsequent
// selector forms.
@@ -268,6 +268,12 @@ bool Parser::isStartOfPattern(Token tok) {
return tok.is(tok::kw__) || tok.is(tok::identifier) || tok.is(tok::l_paren);
}
/// \brief Determine whether this token can start a binding name, whether an
/// identifier or the special discard-value binding '_'.
bool Parser::isStartOfBindingName(Token tok) {
return tok.is(tok::kw__) || tok.is(tok::identifier);
}
/// Parse an identifier as a pattern.
NullablePtr<Pattern> Parser::parsePatternIdentifier() {
SourceLoc loc = Tok.getLoc();