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

Introduce a new 'renamed' modifier on unavailable attributes. This allows Xcode

Browse Source 
to emit fixit's when we rename something, e.g.:

t.swift:6:9: error: 'float' has been renamed to Float
var y : float
        ^~~~~
        Float

Adopt this in the stdlib.



Swift SVN r20549
This commit is contained in:
Chris Lattner
2014-07-25 18:00:37 +00:00
parent 681059a089
commit 6d0934d33d
14 changed files with 123 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Parse/ParseDecl.cpp
View File

@@ -589,10 +589,23 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
consumeToken();
StringRef Message;
StringRef Message, Renamed;
if (consumeIf(tok::comma)) {
if (!Tok.is(tok::identifier) || Tok.getText() != "message") {
StringRef ArgumentKindStr = Tok.getText();
enum {
IsMessage, IsRenamed, IsInvalid
} ArgumentKind = IsInvalid;
if (Tok.is(tok::identifier)) {
if (ArgumentKindStr == "message")
ArgumentKind = IsMessage;
else if (ArgumentKindStr == "renamed")
ArgumentKind = IsRenamed;
}
if (ArgumentKind == IsInvalid) {
diagnose(Tok.getLoc(), diag::attr_availability_expected_option,
AttrName)
.highlight(SourceRange(Tok.getLoc()));
@@ -602,8 +615,8 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
consumeToken();
if (!consumeIf(tok::equal)) {
diagnose(Tok.getLoc(), diag::attr_availability_expected_equal,
AttrName, "message");
diagnose(Tok.getLoc(), diag::attr_availability_expected_equal, AttrName,
ArgumentKindStr);
return false;
}
@@ -612,16 +625,20 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
return false;
}
Message =
getStringLiteralIfNotInterpolated(*this, Loc, Tok, "message");
auto Value =
getStringLiteralIfNotInterpolated(*this, Loc, Tok, ArgumentKindStr);
// FIXME: an empty message is still possible if parsing was valid.
// We need to updategetStringLiteralIfNotInterpolated().
if (Message.empty())
if (Value.empty())
return false;
consumeToken(tok::string_literal);
switch (ArgumentKind) {
case IsInvalid: assert(0 && "Unreachable");
case IsMessage: Message = Value; break;
case IsRenamed: Renamed = Value; break;
}
consumeToken(tok::string_literal);
}
AttrRange = SourceRange(Loc, Tok.getLoc());
@@ -638,7 +655,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
Attributes.add(new (Context)
AvailabilityAttr(AtLoc, AttrRange,
PlatformKind.getValue(),
Message,
Message, Renamed,
clang::VersionTuple(),
clang::VersionTuple(),
clang::VersionTuple(),