From 2f07baafb20d00426f27b2e5bd99ec7f5f598a63 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Thu, 2 Apr 2015 22:10:06 +0000 Subject: [PATCH] Unify warnings/errors from "maybe you meant" to "did you mean". git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@233981 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.td | 4 ++-- test/CXX/special/class.dtor/p10-0x.cpp | 4 ++-- test/FixIt/fixit-recursive-block.c | 2 +- test/FixIt/fixit.cpp | 2 +- test/Sema/member-reference.c | 2 +- test/SemaCXX/member-expr.cpp | 8 ++++---- test/SemaCXX/pseudo-destructors.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index fdac850d71..5cf6a4413b 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1553,7 +1553,7 @@ def warn_uninit_byref_blockvar_captured_by_block : Warning< "block pointer variable %0 is uninitialized when captured by block">, InGroup, DefaultIgnore; def note_block_var_fixit_add_initialization : Note< - "maybe you meant to use __block %0">; + "did you mean to use __block %0">; def note_in_omitted_aggregate_initializer : Note< "in implicit initialization of %select{array element %1|field %1}0 " "with omitted initializer">; @@ -4800,7 +4800,7 @@ def error_arc_weak_ivar_access : Error< def err_typecheck_member_reference_arrow : Error< "member reference type %0 is not a pointer">; def err_typecheck_member_reference_suggestion : Error< - "member reference type %0 is %select{a|not a}1 pointer; maybe you meant to use '%select{->|.}1'?">; + "member reference type %0 is %select{a|not a}1 pointer; did you mean to use '%select{->|.}1'?">; def note_typecheck_member_reference_suggestion : Note< "did you mean to use '.' instead?">; def note_member_reference_arrow_from_operator_arrow : Note< diff --git a/test/CXX/special/class.dtor/p10-0x.cpp b/test/CXX/special/class.dtor/p10-0x.cpp index 029cbd6ceb..3b8a0ad4d6 100644 --- a/test/CXX/special/class.dtor/p10-0x.cpp +++ b/test/CXX/special/class.dtor/p10-0x.cpp @@ -27,9 +27,9 @@ void a(const A *x, int i, int *pi) { y->~decltype(A())(); // expected-error{{use of undeclared identifier 'y'}} typedef int *intp; - i->~decltype(int())(); // expected-error{{member reference type 'int' is not a pointer; maybe you meant to use '.'?}} + i->~decltype(int())(); // expected-error{{member reference type 'int' is not a pointer; did you mean to use '.'?}} i.~decltype(int())(); - i->~decltype(intp())(); // expected-error{{member reference type 'int' is not a pointer; maybe you meant to use '.'?}} \ + i->~decltype(intp())(); // expected-error{{member reference type 'int' is not a pointer; did you mean to use '.'?}} \ expected-error{{the type of object expression ('int') does not match the type being destroyed ('decltype(intp())' (aka 'int *')) in pseudo-destructor expression}} i.~decltype(intp())(); // expected-error{{the type of object expression ('int') does not match the type being destroyed ('decltype(intp())' (aka 'int *')) in pseudo-destructor expression}} pi->~decltype(int())(); diff --git a/test/FixIt/fixit-recursive-block.c b/test/FixIt/fixit-recursive-block.c index b276b417ac..3793f825f6 100644 --- a/test/FixIt/fixit-recursive-block.c +++ b/test/FixIt/fixit-recursive-block.c @@ -5,7 +5,7 @@ int main() { void (^arc_fail)() = ^() { // expected-warning {{block pointer variable 'arc_fail' is uninitialized when captured by block}} \ - // expected-note {{maybe you meant to use __block 'arc_fail'}} + // expected-note {{did you mean to use __block 'arc_fail'}} arc_fail(); // BOOM }; } diff --git a/test/FixIt/fixit.cpp b/test/FixIt/fixit.cpp index 585c216f90..6c2fb7faf1 100644 --- a/test/FixIt/fixit.cpp +++ b/test/FixIt/fixit.cpp @@ -344,7 +344,7 @@ namespace PR15045 { int f() { Cl0 c; - return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; maybe you meant to use '.'?}} + return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; did you mean to use '.'?}} } } diff --git a/test/Sema/member-reference.c b/test/Sema/member-reference.c index 8939fd5157..4004673dfd 100644 --- a/test/Sema/member-reference.c +++ b/test/Sema/member-reference.c @@ -20,5 +20,5 @@ void g(void) { } int PR17762(struct simple c) { - return c->i; // expected-error {{member reference type 'struct simple' is not a pointer; maybe you meant to use '.'?}} + return c->i; // expected-error {{member reference type 'struct simple' is not a pointer; did you mean to use '.'?}} } diff --git a/test/SemaCXX/member-expr.cpp b/test/SemaCXX/member-expr.cpp index e0955aeb9c..5b3393efc0 100644 --- a/test/SemaCXX/member-expr.cpp +++ b/test/SemaCXX/member-expr.cpp @@ -87,7 +87,7 @@ namespace test5 { } void test2(A &x) { - x->A::foo(); // expected-error {{'test5::A' is not a pointer; maybe you meant to use '.'?}} + x->A::foo(); // expected-error {{'test5::A' is not a pointer; did you mean to use '.'?}} } } @@ -181,7 +181,7 @@ namespace PR15045 { int f() { Cl0 c; - return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; maybe you meant to use '.'?}} + return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; did you mean to use '.'?}} } struct bar { @@ -202,7 +202,7 @@ namespace PR15045 { foo f; // Show that recovery has happened by also triggering typo correction - e->Func(); // expected-error {{member reference type 'PR15045::bar' is not a pointer; maybe you meant to use '.'?}} \ + e->Func(); // expected-error {{member reference type 'PR15045::bar' is not a pointer; did you mean to use '.'?}} \ // expected-error {{no member named 'Func' in 'PR15045::bar'; did you mean 'func'?}} // Make sure a fixit isn't given in the case that the '->' isn't actually @@ -221,6 +221,6 @@ namespace pr16676 { int f(S* s) { T t; return t.get_s // expected-error {{reference to non-static member function must be called; did you mean to call it with no arguments?}} - .i; // expected-error {{member reference type 'pr16676::S *' is a pointer; maybe you meant to use '->'}} + .i; // expected-error {{member reference type 'pr16676::S *' is a pointer; did you mean to use '->'}} } } diff --git a/test/SemaCXX/pseudo-destructors.cpp b/test/SemaCXX/pseudo-destructors.cpp index 3971881a6b..45f1eafba1 100644 --- a/test/SemaCXX/pseudo-destructors.cpp +++ b/test/SemaCXX/pseudo-destructors.cpp @@ -46,7 +46,7 @@ void f(A* a, Foo *f, int *i, double *d, int ii) { i->N::~Integer(); // expected-error{{'Integer' does not refer to a type name in pseudo-destructor expression; expected the name of type 'int'}} i->Integer::~Double(); // expected-error{{the type of object expression ('int') does not match the type being destroyed ('Double' (aka 'double')) in pseudo-destructor expression}} - ii->~Integer(); // expected-error{{member reference type 'int' is not a pointer; maybe you meant to use '.'?}} + ii->~Integer(); // expected-error{{member reference type 'int' is not a pointer; did you mean to use '.'?}} ii.~Integer(); cv_test(a); -- 2.40.0