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

Revert "[Parser] Fix-it for declaration attributes being applied to parameter types (SR-215)"

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-01-12 17:57:56 -08:00
parent 72fdaff813
commit f40c2a5b7f
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Parse/ParsePattern.cpp
View File

@@ -235,21 +235,6 @@ 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();
// Check if attribute is invalid type attribute
// and actually a declaration attribute
if (TypeAttributes::getAttrKindFromString(nextToken.getText()) == TAK_Count
&& DeclAttribute::getAttrKindFromString(nextToken.getText()) != DAK_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();

2
test/attr/attr_noescape.swift
View File

@@ -2,8 +2,6 @@
@noescape var fn : () -> Int = { 4 } // expected-error {{@noescape may only be used on 'parameter' declarations}} {{1-11=}}
func appliedToType(g: @noescape ()->Void) { g() } // expected-error {{attribute can only be applied to declarations, not types}} {{20-20=@noescape }} {{23-33=}}
func doesEscape(fn : () -> Int) {}
func takesGenericClosure<T>(a : Int, @noescape _ fn : () -> T) {}