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

Add check for decl attributes being applied to types in function declaration (fixes SR-215)

Browse Source
This commit is contained in:
Joshua Garnham
2015-12-19 21:19:51 +00:00
committed by SquaredTiki
parent 85231a20ed
commit d231cb0321
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Parse/ParsePattern.cpp
View File

@@ -235,6 +235,22 @@ Parser::parseParameterClause(SourceLoc &leftParenLoc,
if (Tok.is(tok::colon)) {
param.ColonLoc = consumeToken();
// Check if token is @ sign ergo an attribute
if (Tok.is(tok::at_sign)) {
Token nextToken = peekToken();
// Fix for SR215
// Check if attribute is invalid type attribute
// and actually a declaration attribute
if (TypeAttributes::getAttrKindFromString(nextToken.getText()) == TAK_Count
&& DeclAttribute::getAttrKindFromString(nextToken.getText()) != TAK_Count) {
SourceLoc AtLoc = consumeToken(tok::at_sign);
SourceLoc AttrLoc = consumeToken(tok::identifier);
diagnose(AtLoc, diag::decl_attribute_applied_to_type)
.fixItRemove(SourceRange(AtLoc, AttrLoc))
.fixItInsert(StartLoc, "@" + nextToken.getText().str()+" ");
}
}
auto type = parseType(diag::expected_parameter_type);
status |= type;
param.Type = type.getPtrOrNull();