From 83f5cbf5f8d5e663b8d4f02fbc3d70444cf7dbc7 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 19 Dec 2013 22:47:11 +0000 Subject: [PATCH] Wordsmith "maybe" into "may be" in diagnostic, and move warning under flag. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@197736 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticGroups.td | 1 + include/clang/Basic/DiagnosticSemaKinds.td | 5 +++-- test/Misc/warning-flags.c | 3 +-- test/SemaObjC/special-dep-unavail-warning.m | 20 +++++++++---------- .../warn-forward-class-attr-deprecated.m | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index 1c69e0075f..e41f2d975f 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -71,6 +71,7 @@ def CXX11CompatDeprecatedWritableStr : DiagGroup<"c++11-compat-deprecated-writable-strings">; def DeprecatedDeclarations : DiagGroup<"deprecated-declarations">; +def UnavailableDeclarations : DiagGroup<"unavailable-declarations">; def DeprecatedImplementations :DiagGroup<"deprecated-implementations">; def DeprecatedIncrementBool : DiagGroup<"deprecated-increment-bool">; def DeprecatedRegister : DiagGroup<"deprecated-register">; diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 5bc5637c52..7bdce94300 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -3515,7 +3515,7 @@ def warn_deprecated : Warning<"%0 is deprecated">, def warn_deprecated_message : Warning<"%0 is deprecated: %1">, InGroup; def warn_deprecated_fwdclass_message : Warning< - "%0 maybe deprecated because receiver type is unknown">, + "%0 may be deprecated because the receiver type is unknown">, InGroup; def warn_deprecated_def : Warning< "Implementing deprecated %select{method|class|category}0">, @@ -3523,7 +3523,8 @@ def warn_deprecated_def : Warning< def err_unavailable : Error<"%0 is unavailable">; def err_unavailable_message : Error<"%0 is unavailable: %1">; def warn_unavailable_fwdclass_message : Warning< - "%0 maybe unavailable because receiver type is unknown">; + "%0 may be unavailable because the receiver type is unknown">, + InGroup; def note_availability_specified_here : Note< "%0 has been explicitly marked " "%select{unavailable|deleted|deprecated}1 here">; diff --git a/test/Misc/warning-flags.c b/test/Misc/warning-flags.c index c48f5be5e5..67937a5cef 100644 --- a/test/Misc/warning-flags.c +++ b/test/Misc/warning-flags.c @@ -18,7 +18,7 @@ This test serves two purposes: The list of warnings below should NEVER grow. It should gradually shrink to 0. -CHECK: Warnings without flags (134): +CHECK: Warnings without flags (133): CHECK-NEXT: ext_delete_void_ptr_operand CHECK-NEXT: ext_expected_semi_decl_list CHECK-NEXT: ext_explicit_specialization_storage_class @@ -146,7 +146,6 @@ CHECK-NEXT: warn_template_export_unsupported CHECK-NEXT: warn_template_spec_extra_headers CHECK-NEXT: warn_tentative_incomplete_array CHECK-NEXT: warn_typecheck_function_qualifiers -CHECK-NEXT: warn_unavailable_fwdclass_message CHECK-NEXT: warn_undef_interface CHECK-NEXT: warn_undef_interface_suggest CHECK-NEXT: warn_undef_protocolref diff --git a/test/SemaObjC/special-dep-unavail-warning.m b/test/SemaObjC/special-dep-unavail-warning.m index 29e215348b..9e16b331c2 100644 --- a/test/SemaObjC/special-dep-unavail-warning.m +++ b/test/SemaObjC/special-dep-unavail-warning.m @@ -30,16 +30,16 @@ @class C; // expected-note 10 {{forward declaration of class here}} void test(C *c) { - [c depInA]; // expected-warning {{'depInA' maybe deprecated because receiver type is unknown}} - [c unavailMeth]; // expected-warning {{'unavailMeth' maybe unavailable because receiver type is unknown}} - [c depInA1]; // expected-warning {{'depInA1' maybe deprecated because receiver type is unknown}} - [c unavailMeth1]; // expected-warning {{'unavailMeth1' maybe unavailable because receiver type is unknown}} - [c depInA2]; // expected-warning {{'depInA2' maybe deprecated because receiver type is unknown}} - [c unavailMeth2]; // expected-warning {{'unavailMeth2' maybe unavailable because receiver type is unknown}} - [c depunavailInA]; // expected-warning {{'depunavailInA' maybe unavailable because receiver type is unknown}} - [c depunavailInA1];// expected-warning {{'depunavailInA1' maybe unavailable because receiver type is unknown}} - [c FuzzyMeth]; // expected-warning {{'FuzzyMeth' maybe deprecated because receiver type is unknown}} - [c FuzzyMeth1]; // expected-warning {{'FuzzyMeth1' maybe deprecated because receiver type is unknown}} + [c depInA]; // expected-warning {{'depInA' may be deprecated because the receiver type is unknown}} + [c unavailMeth]; // expected-warning {{'unavailMeth' may be unavailable because the receiver type is unknown}} + [c depInA1]; // expected-warning {{'depInA1' may be deprecated because the receiver type is unknown}} + [c unavailMeth1]; // expected-warning {{'unavailMeth1' may be unavailable because the receiver type is unknown}} + [c depInA2]; // expected-warning {{'depInA2' may be deprecated because the receiver type is unknown}} + [c unavailMeth2]; // expected-warning {{'unavailMeth2' may be unavailable because the receiver type is unknown}} + [c depunavailInA]; // expected-warning {{'depunavailInA' may be unavailable because the receiver type is unknown}} + [c depunavailInA1];// expected-warning {{'depunavailInA1' may be unavailable because the receiver type is unknown}} + [c FuzzyMeth]; // expected-warning {{'FuzzyMeth' may be deprecated because the receiver type is unknown}} + [c FuzzyMeth1]; // expected-warning {{'FuzzyMeth1' may be deprecated because the receiver type is unknown}} } diff --git a/test/SemaObjC/warn-forward-class-attr-deprecated.m b/test/SemaObjC/warn-forward-class-attr-deprecated.m index ba365ba5e4..cb118c3caf 100644 --- a/test/SemaObjC/warn-forward-class-attr-deprecated.m +++ b/test/SemaObjC/warn-forward-class-attr-deprecated.m @@ -16,7 +16,7 @@ @implementation I2 - (id) Meth : (ABGroupImportFilesScope*) scope { - id p = [self initWithAccount : 0 filenames :[scope filenames]]; // expected-warning {{'filenames' maybe deprecated because receiver type is unknown}} + id p = [self initWithAccount : 0 filenames :[scope filenames]]; // expected-warning {{'filenames' may be deprecated because the receiver type is unknown}} return 0; } - (id) filenames { return 0; } -- 2.40.0