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

[Accessibility] When a private type is used in a public way, show its decl.

Browse Source 
At the very least, this makes it easier to mark the private type as public
if that's the correct answer.

Swift SVN r19436
This commit is contained in:
Jordan Rose
2014-07-01 23:42:01 +00:00
parent 287059b360
commit cfd7851a67
5 changed files with 69 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/Frontend/DiagnosticVerifier.cpp
View File

@@ -172,25 +172,38 @@ bool DiagnosticVerifier::verifyFile(unsigned BufferID) {
unsigned MatchCount = 1;
int LineOffset = 0;
if (TextStartIdx > 0) {
if (MatchStart[0] == '@') {
if (MatchStart[1] != '+' && MatchStart[1] != '-') {
Errors.push_back({ MatchStart.data(),
"expected '+'/'-' for line offset" });
continue;
}
StringRef Offs;
if (MatchStart[1] == '+')
Offs = MatchStart.substr(2, TextStartIdx-2);
else
Offs = MatchStart.substr(1, TextStartIdx-1);
if (Offs.rtrim().getAsInteger(10, LineOffset)) {
Errors.push_back({ MatchStart.data(),
"expected line offset before '{{'" });
continue;
}
if (TextStartIdx > 0 && MatchStart[0] == '@') {
if (MatchStart[1] != '+' && MatchStart[1] != '-') {
Errors.push_back({ MatchStart.data(),
"expected '+'/'-' for line offset" });
continue;
}
StringRef Offs;
if (MatchStart[1] == '+')
Offs = MatchStart.slice(2, TextStartIdx).rtrim();
else
Offs = MatchStart.slice(1, TextStartIdx).rtrim();
} else if (MatchStart.substr(0, TextStartIdx).rtrim()
size_t SpaceIndex = Offs.find(' ');
if (SpaceIndex != StringRef::npos && SpaceIndex < TextStartIdx) {
size_t Delta = Offs.size() - SpaceIndex;
MatchStart = MatchStart.substr(TextStartIdx - Delta);
TextStartIdx = Delta;
Offs = Offs.slice(0, SpaceIndex);
} else {
MatchStart = MatchStart.substr(TextStartIdx);
TextStartIdx = 0;
}
if (Offs.getAsInteger(10, LineOffset)) {
Errors.push_back({ MatchStart.data(),
"expected line offset before '{{'" });
continue;
}
}
if (TextStartIdx > 0) {
if (MatchStart.substr(0, TextStartIdx).rtrim()
.getAsInteger(10, MatchCount)) {
Errors.push_back(std::make_pair(MatchStart.data(),
"expected match count before '{{'"));