diff options
| -rw-r--r-- | include/clang/Parse/Parser.h | 3 | ||||
| -rw-r--r-- | lib/Parse/ParseObjc.cpp | 4 | ||||
| -rw-r--r-- | lib/Parse/ParseTentative.cpp | 12 | ||||
| -rw-r--r-- | lib/Parse/Parser.cpp | 12 |
4 files changed, 8 insertions, 23 deletions
diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h index e6d7df5d37..3beb36c7af 100644 --- a/include/clang/Parse/Parser.h +++ b/include/clang/Parse/Parser.h @@ -315,9 +315,6 @@ private: DiagnosticInfo Diag(SourceLocation Loc, unsigned DiagID); DiagnosticInfo Diag(const Token &Tok, unsigned DiagID); - bool Diag(SourceLocation Loc, unsigned DiagID, const SourceRange &R); - bool Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg, - const SourceRange& R1); /// SkipUntil - Read tokens until we get to the specified token, then consume /// it (unless DontConsume is true). Because we cannot guarantee that the diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 45ce3e1d92..b228d2a46f 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -319,8 +319,8 @@ void Parser::ParseObjCInterfaceDeclList(DeclTy *interfaceDecl, for (unsigned i = 0, e = FieldDeclarators.size(); i != e; ++i) { FieldDeclarator &FD = FieldDeclarators[i]; if (FD.D.getIdentifier() == 0) { - Diag(AtLoc, diag::err_objc_property_requires_field_name, - FD.D.getSourceRange()); + Diag(AtLoc, diag::err_objc_property_requires_field_name) + << FD.D.getSourceRange(); continue; } diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp index 4f6f117f2a..ccaae6d3b2 100644 --- a/lib/Parse/ParseTentative.cpp +++ b/lib/Parse/ParseTentative.cpp @@ -130,12 +130,12 @@ bool Parser::isCXXSimpleDeclaration() { // We have a declaration that looks like a functional cast; there's a high // chance that the author intended the statement to be an expression. // Emit a warning. - Diag(Tok.getLocation(), diag::warn_statement_disambiguation, - "declaration", SourceRange(Tok.getLocation(), TentativeParseLoc)); + Diag(Tok, diag::warn_statement_disambiguation) + << "declaration" << SourceRange(Tok.getLocation(), TentativeParseLoc); } else if (TPR == TPResult::False() && Tok.is(tok::kw_void)) { // A functional cast to 'void' expression ? Warning.. - Diag(Tok.getLocation(), diag::warn_statement_disambiguation, - "expression", SourceRange(Tok.getLocation(), TentativeParseLoc)); + Diag(Tok, diag::warn_statement_disambiguation) + << "expression" << SourceRange(Tok.getLocation(), TentativeParseLoc); } return TPR == TPResult::True(); @@ -750,8 +750,8 @@ bool Parser::isCXXFunctionDeclarator(bool warnIfAmbiguous) { // Function declarator has precedence over constructor-style initializer. // Emit a warning just in case the author intended a variable definition. if (warnIfAmbiguous) - Diag(Tok.getLocation(), diag::warn_parens_disambiguated_as_function_decl, - SourceRange(Tok.getLocation(), TPLoc)); + Diag(Tok, diag::warn_parens_disambiguated_as_function_decl) + << SourceRange(Tok.getLocation(), TPLoc); return true; } diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index d0d1871829..168e2f556f 100644 --- a/lib/Parse/Parser.cpp +++ b/lib/Parse/Parser.cpp @@ -49,18 +49,6 @@ DiagnosticInfo Parser::Diag(const Token &Tok, unsigned DiagID) { return Diag(Tok.getLocation(), DiagID); } -bool Parser::Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg, - const SourceRange& Range) { - Diags.Report(PP.getFullLoc(Loc), DiagID) << Msg << Range; - return true; -} - -bool Parser::Diag(SourceLocation Loc, unsigned DiagID, const SourceRange &R) { - Diags.Report(FullSourceLoc(Loc,PP.getSourceManager()), DiagID) << R; - return true; -} - - /// MatchRHSPunctuation - For punctuation with a LHS and RHS (e.g. '['/']'), /// this helper function matches and consumes the specified RHS token if /// present. If not present, it emits the specified diagnostic indicating |