<div dir="ltr"><br><br><div class="gmail_quote">On Thu, Apr 2, 2015 at 3:22 PM Richard Smith <<a href="mailto:richard@metafoo.co.uk">richard@metafoo.co.uk</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Apr 2, 2015 at 3:10 PM, Eric Christopher <span dir="ltr"><<a href="mailto:echristo@gmail.com" target="_blank">echristo@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: echristo<br>
Date: Thu Apr 2 17:10:06 2015<br>
New Revision: 233981<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=233981&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=233981&view=rev</a><br>
Log:<br>
Unify warnings/errors from "maybe you meant" to "did you mean".<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
cfe/trunk/test/CXX/special/class.dtor/p10-0x.cpp<br>
cfe/trunk/test/FixIt/fixit-recursive-block.c<br>
cfe/trunk/test/FixIt/fixit.cpp<br>
cfe/trunk/test/Sema/member-reference.c<br>
cfe/trunk/test/SemaCXX/member-expr.cpp<br>
cfe/trunk/test/SemaCXX/pseudo-destructors.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=233981&r1=233980&r2=233981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=233981&r1=233980&r2=233981&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Thu Apr 2 17:10:06 2015<br>
@@ -1553,7 +1553,7 @@ def warn_uninit_byref_blockvar_captured_<br>
"block pointer variable %0 is uninitialized when captured by block">,<br>
InGroup<Uninitialized>, DefaultIgnore;<br>
def note_block_var_fixit_add_initialization : Note<<br>
- "maybe you meant to use __block %0">;<br>
+ "did you mean to use __block %0">;<br></blockquote><div><br></div></div></div></div><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div>Question mark missing here?</div></div></div></div></blockquote><div><br></div><div>Sure, I can add one. This was just a straight sed replacement :)</div><div><br></div><div>-eric</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
def note_in_omitted_aggregate_initializer : Note<<br>
"in implicit initialization of %select{array element %1|field %1}0 "<br>
"with omitted initializer">;<br>
@@ -4800,7 +4800,7 @@ def error_arc_weak_ivar_access : Error<<br>
def err_typecheck_member_reference_arrow : Error<<br>
"member reference type %0 is not a pointer">;<br>
def err_typecheck_member_reference_suggestion : Error<<br>
- "member reference type %0 is %select{a|not a}1 pointer; maybe you meant to use '%select{->|.}1'?">;<br>
+ "member reference type %0 is %select{a|not a}1 pointer; did you mean to use '%select{->|.}1'?">;<br>
def note_typecheck_member_reference_suggestion : Note<<br>
"did you mean to use '.' instead?">;<br>
def note_member_reference_arrow_from_operator_arrow : Note<<br>
<br>
Modified: cfe/trunk/test/CXX/special/class.dtor/p10-0x.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/special/class.dtor/p10-0x.cpp?rev=233981&r1=233980&r2=233981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/special/class.dtor/p10-0x.cpp?rev=233981&r1=233980&r2=233981&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CXX/special/class.dtor/p10-0x.cpp (original)<br>
+++ cfe/trunk/test/CXX/special/class.dtor/p10-0x.cpp Thu Apr 2 17:10:06 2015<br>
@@ -27,9 +27,9 @@ void a(const A *x, int i, int *pi) {<br>
y->~decltype(A())(); // expected-error{{use of undeclared identifier 'y'}}<br>
<br>
typedef int *intp;<br>
- i->~decltype(int())(); // expected-error{{member reference type 'int' is not a pointer; maybe you meant to use '.'?}}<br>
+ i->~decltype(int())(); // expected-error{{member reference type 'int' is not a pointer; did you mean to use '.'?}}<br>
i.~decltype(int())();<br>
- i->~decltype(intp())(); // expected-error{{member reference type 'int' is not a pointer; maybe you meant to use '.'?}} \<br>
+ i->~decltype(intp())(); // expected-error{{member reference type 'int' is not a pointer; did you mean to use '.'?}} \<br>
expected-error{{the type of object expression ('int') does not match the type being destroyed ('decltype(intp())' (aka 'int *')) in pseudo-destructor expression}}<br>
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}}<br>
pi->~decltype(int())();<br>
<br>
Modified: cfe/trunk/test/FixIt/fixit-recursive-block.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-recursive-block.c?rev=233981&r1=233980&r2=233981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-recursive-block.c?rev=233981&r1=233980&r2=233981&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/FixIt/fixit-recursive-block.c (original)<br>
+++ cfe/trunk/test/FixIt/fixit-recursive-block.c Thu Apr 2 17:10:06 2015<br>
@@ -5,7 +5,7 @@<br>
<br>
int main() {<br>
void (^arc_fail)() = ^() { // expected-warning {{block pointer variable 'arc_fail' is uninitialized when captured by block}} \<br>
- // expected-note {{maybe you meant to use __block 'arc_fail'}}<br>
+ // expected-note {{did you mean to use __block 'arc_fail'}}<br>
arc_fail(); // BOOM<br>
};<br>
}<br>
<br>
Modified: cfe/trunk/test/FixIt/fixit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.cpp?rev=233981&r1=233980&r2=233981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit.cpp?rev=233981&r1=233980&r2=233981&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/FixIt/fixit.cpp (original)<br>
+++ cfe/trunk/test/FixIt/fixit.cpp Thu Apr 2 17:10:06 2015<br>
@@ -344,7 +344,7 @@ namespace PR15045 {<br>
<br>
int f() {<br>
Cl0 c;<br>
- return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; maybe you meant to use '.'?}}<br>
+ return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; did you mean to use '.'?}}<br>
}<br>
}<br>
<br>
<br>
Modified: cfe/trunk/test/Sema/member-reference.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/member-reference.c?rev=233981&r1=233980&r2=233981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/member-reference.c?rev=233981&r1=233980&r2=233981&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Sema/member-reference.c (original)<br>
+++ cfe/trunk/test/Sema/member-reference.c Thu Apr 2 17:10:06 2015<br>
@@ -20,5 +20,5 @@ void g(void) {<br>
}<br>
<br>
int PR17762(struct simple c) {<br>
- return c->i; // expected-error {{member reference type 'struct simple' is not a pointer; maybe you meant to use '.'?}}<br>
+ return c->i; // expected-error {{member reference type 'struct simple' is not a pointer; did you mean to use '.'?}}<br>
}<br>
<br>
Modified: cfe/trunk/test/SemaCXX/member-expr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/member-expr.cpp?rev=233981&r1=233980&r2=233981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/member-expr.cpp?rev=233981&r1=233980&r2=233981&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/member-expr.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/member-expr.cpp Thu Apr 2 17:10:06 2015<br>
@@ -87,7 +87,7 @@ namespace test5 {<br>
}<br>
<br>
void test2(A &x) {<br>
- x->A::foo<int>(); // expected-error {{'test5::A' is not a pointer; maybe you meant to use '.'?}}<br>
+ x->A::foo<int>(); // expected-error {{'test5::A' is not a pointer; did you mean to use '.'?}}<br>
}<br>
}<br>
<br>
@@ -181,7 +181,7 @@ namespace PR15045 {<br>
<br>
int f() {<br>
Cl0 c;<br>
- return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; maybe you meant to use '.'?}}<br>
+ return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; did you mean to use '.'?}}<br>
}<br>
<br>
struct bar {<br>
@@ -202,7 +202,7 @@ namespace PR15045 {<br>
foo f;<br>
<br>
// Show that recovery has happened by also triggering typo correction<br>
- e->Func(); // expected-error {{member reference type 'PR15045::bar' is not a pointer; maybe you meant to use '.'?}} \<br>
+ e->Func(); // expected-error {{member reference type 'PR15045::bar' is not a pointer; did you mean to use '.'?}} \<br>
// expected-error {{no member named 'Func' in 'PR15045::bar'; did you mean 'func'?}}<br>
<br>
// Make sure a fixit isn't given in the case that the '->' isn't actually<br>
@@ -221,6 +221,6 @@ namespace pr16676 {<br>
int f(S* s) {<br>
T t;<br>
return t.get_s // expected-error {{reference to non-static member function must be called; did you mean to call it with no arguments?}}<br>
- .i; // expected-error {{member reference type 'pr16676::S *' is a pointer; maybe you meant to use '->'}}<br>
+ .i; // expected-error {{member reference type 'pr16676::S *' is a pointer; did you mean to use '->'}}<br>
}<br>
}<br>
<br>
Modified: cfe/trunk/test/SemaCXX/pseudo-destructors.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/pseudo-destructors.cpp?rev=233981&r1=233980&r2=233981&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/pseudo-destructors.cpp?rev=233981&r1=233980&r2=233981&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/pseudo-destructors.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/pseudo-destructors.cpp Thu Apr 2 17:10:06 2015<br>
@@ -46,7 +46,7 @@ void f(A* a, Foo *f, int *i, double *d,<br>
i->N::~Integer(); // expected-error{{'Integer' does not refer to a type name in pseudo-destructor expression; expected the name of type 'int'}}<br>
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}}<br>
<br>
- ii->~Integer(); // expected-error{{member reference type 'int' is not a pointer; maybe you meant to use '.'?}}<br>
+ ii->~Integer(); // expected-error{{member reference type 'int' is not a pointer; did you mean to use '.'?}}<br>
ii.~Integer();<br>
<br>
cv_test(a);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div></div></blockquote></div></div>