From: Aaron Ballman Date: Fri, 3 Jan 2014 13:34:55 +0000 (+0000) Subject: Removing some more unnecessary manual quotes from diagnostics. Updated the related... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe17b20b10d8e80409a446cb46fae7d02914dcee;p=clang Removing some more unnecessary manual quotes from diagnostics. Updated the related test case to ensure correctness. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198412 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index b2af797397..8dafe23a62 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -146,7 +146,7 @@ def ext_flexible_array_init : Extension< def err_bad_variable_name : Error< "%0 cannot be the name of a variable or data member">; def err_bad_parameter_name : Error< - "'%0' cannot be the name of a parameter">; + "%0 cannot be the name of a parameter">; def err_parameter_name_omitted : Error<"parameter name omitted">; def warn_unused_parameter : Warning<"unused parameter %0">, InGroup, DefaultIgnore; diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 1dec695462..6f6ee25dcb 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -9169,7 +9169,7 @@ Decl *Sema::ActOnParamDeclarator(Scope *S, Declarator &D) { II = D.getIdentifier(); if (!II) { Diag(D.getIdentifierLoc(), diag::err_bad_parameter_name) - << GetNameForDeclarator(D).getName().getAsString(); + << GetNameForDeclarator(D).getName(); D.setInvalidType(true); } } diff --git a/test/SemaCXX/PR8012.cpp b/test/SemaCXX/PR8012.cpp index 9cfc2b000c..0a43af7c29 100644 --- a/test/SemaCXX/PR8012.cpp +++ b/test/SemaCXX/PR8012.cpp @@ -1,3 +1,3 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++11 -void foo (int operator+); // expected-error{{cannot be the name of a parameter}} +void foo(int operator+); // expected-error{{'operator+' cannot be the name of a parameter}}