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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2019-10-30 14:50:00 -07:00
parent 1377c0387a 5c2185f395
commit ae278ae961
22 changed files with 314 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/libSwiftSyntaxParser/libSwiftSyntaxParser.cpp
View File

@@ -233,21 +233,18 @@ struct SynParserDiagConsumer: public DiagnosticConsumer {
const unsigned BufferID;
SynParserDiagConsumer(SynParser &Parser, unsigned BufferID):
Parser(Parser), BufferID(BufferID) {}
void
handleDiagnostic(SourceManager &SM, SourceLoc Loc, DiagnosticKind Kind,
StringRef FormatString,
ArrayRef<DiagnosticArgument> FormatArgs,
const DiagnosticInfo &Info,
const SourceLoc bufferIndirectlyCausingDiagnostic) override {
assert(Kind != DiagnosticKind::Remark && "Shouldn't see this in parser.");
void handleDiagnostic(SourceManager &SM,
const DiagnosticInfo &Info) override {
assert(Info.Kind != DiagnosticKind::Remark &&
"Shouldn't see this in parser.");
// The buffer where all char* will point into.
llvm::SmallString<256> Buffer;
auto getCurrentText = [&]() -> const char* {
return Buffer.data() + Buffer.size();
};
DiagnosticDetail Result;
Result.Severity = getSeverity(Kind);
Result.Offset = getByteOffset(Loc, SM, BufferID);
Result.Severity = getSeverity(Info.Kind);
Result.Offset = getByteOffset(Info.Loc, SM, BufferID);
// Terminate each printed text with 0 so the client-side can use char* directly.
char NullTerm = '\0';
@@ -255,7 +252,8 @@ struct SynParserDiagConsumer: public DiagnosticConsumer {
// Print the error message to buffer and record it.
llvm::raw_svector_ostream OS(Buffer);
Result.Message = getCurrentText();
DiagnosticEngine::formatDiagnosticText(OS, FormatString, FormatArgs);
DiagnosticEngine::formatDiagnosticText(OS, Info.FormatString,
Info.FormatArgs);
OS << NullTerm;
}
for (auto R: Info.Ranges) {