Author: epilk
Date: Tue Sep 17 11:02:45 2019
New Revision: 372152
URL: http://llvm.org/viewvc/llvm-project?rev=372152&view=rev
Log:
Use 'BOOL' instead of BOOL in diagnostic messages
Type names should be enclosed in single quotes.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/Sema/objc-bool-constant-conversion.m
cfe/trunk/test/Sema/tautological-objc-bool-compare.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=372152&r1=372151&r2=372152&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Sep 17 11:02:45
2019
@@ -3291,8 +3291,8 @@ def warn_impcast_bitfield_precision_cons
"implicit truncation from %2 to bit-field changes value from %0 to %1">,
InGroup<BitFieldConstantConversion>;
def warn_impcast_constant_int_to_objc_bool : Warning<
- "implicit conversion from constant value %0 to BOOL; "
- "the only well defined values for BOOL are YES and NO">,
+ "implicit conversion from constant value %0 to 'BOOL'; "
+ "the only well defined values for 'BOOL' are YES and NO">,
InGroup<ObjCBoolConstantConversion>;
def warn_impcast_fixed_point_range : Warning<
@@ -6109,8 +6109,8 @@ def warn_tautological_constant_compare :
"%select{%1|%3}0 is always %4">,
InGroup<TautologicalTypeLimitCompare>, DefaultIgnore;
def warn_tautological_compare_objc_bool : Warning<
- "result of comparison of constant %0 with expression of type BOOL"
- " is always %1, as the only well defined values for BOOL are YES and NO">,
+ "result of comparison of constant %0 with expression of type 'BOOL'"
+ " is always %1, as the only well defined values for 'BOOL' are YES and NO">,
InGroup<TautologicalObjCBoolCompare>;
def warn_mixed_sign_comparison : Warning<
Modified: cfe/trunk/test/Sema/objc-bool-constant-conversion.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/objc-bool-constant-conversion.m?rev=372152&r1=372151&r2=372152&view=diff
==============================================================================
--- cfe/trunk/test/Sema/objc-bool-constant-conversion.m (original)
+++ cfe/trunk/test/Sema/objc-bool-constant-conversion.m Tue Sep 17 11:02:45 2019
@@ -12,20 +12,20 @@ int main() {
B = YES;
B = NO;
- B = -1; // expected-warning{{implicit conversion from constant value -1 to
BOOL; the only well defined values for BOOL are YES and NO}}
- B = 0 - 1; // expected-warning{{implicit conversion from constant value -1
to BOOL; the only well defined values for BOOL are YES and NO}}
- B = YES + YES; // expected-warning {{implicit conversion from constant value
2 to BOOL; the only well defined values for BOOL are YES and NO}}
+ B = -1; // expected-warning{{implicit conversion from constant value -1 to
'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
+ B = 0 - 1; // expected-warning{{implicit conversion from constant value -1
to 'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
+ B = YES + YES; // expected-warning {{implicit conversion from constant value
2 to 'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
B = YES | YES;
- B = B ? 2 : 2; // expected-warning 2 {{implicit conversion from constant
value 2 to BOOL; the only well defined values for BOOL are YES and NO}}
+ B = B ? 2 : 2; // expected-warning 2 {{implicit conversion from constant
value 2 to 'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
- BOOL Init = -1; // expected-warning{{implicit conversion from constant value
-1 to BOOL; the only well defined values for BOOL are YES and NO}}
- BOOL Init2 = B ? 2 : 2; // expected-warning 2 {{implicit conversion from
constant value 2 to BOOL; the only well defined values for BOOL are YES and NO}}
+ BOOL Init = -1; // expected-warning{{implicit conversion from constant value
-1 to 'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
+ BOOL Init2 = B ? 2 : 2; // expected-warning 2 {{implicit conversion from
constant value 2 to 'BOOL'; the only well defined values for 'BOOL' are YES and
NO}}
void takesbool(BOOL);
- takesbool(43); // expected-warning {{implicit conversion from constant value
43 to BOOL; the only well defined values for BOOL are YES and NO}}
+ takesbool(43); // expected-warning {{implicit conversion from constant value
43 to 'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
- BOOL OutOfRange = 400; // expected-warning{{implicit conversion from
constant value 400 to BOOL; the only well defined values for BOOL are YES and
NO}}
+ BOOL OutOfRange = 400; // expected-warning{{implicit conversion from
constant value 400 to 'BOOL'; the only well defined values for 'BOOL' are YES
and NO}}
}
@interface BoolProp
@@ -33,6 +33,6 @@ int main() {
@end
void f(BoolProp *bp) {
- bp.b = 43; // expected-warning {{implicit conversion from constant value 43
to BOOL; the only well defined values for BOOL are YES and NO}}
- [bp setB:43]; // expected-warning {{implicit conversion from constant value
43 to BOOL; the only well defined values for BOOL are YES and NO}}
+ bp.b = 43; // expected-warning {{implicit conversion from constant value 43
to 'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
+ [bp setB:43]; // expected-warning {{implicit conversion from constant value
43 to 'BOOL'; the only well defined values for 'BOOL' are YES and NO}}
}
Modified: cfe/trunk/test/Sema/tautological-objc-bool-compare.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/tautological-objc-bool-compare.m?rev=372152&r1=372151&r2=372152&view=diff
==============================================================================
--- cfe/trunk/test/Sema/tautological-objc-bool-compare.m (original)
+++ cfe/trunk/test/Sema/tautological-objc-bool-compare.m Tue Sep 17 11:02:45
2019
@@ -9,16 +9,16 @@ BOOL B;
void test() {
int r;
r = B > 0;
- r = B > 1; // expected-warning {{result of comparison of constant 1 with
expression of type BOOL is always false, as the only well defined values for
BOOL are YES and NO}}
+ r = B > 1; // expected-warning {{result of comparison of constant 1 with
expression of type 'BOOL' is always false, as the only well defined values for
'BOOL' are YES and NO}}
r = B < 1;
- r = B < 0; // expected-warning {{result of comparison of constant 0 with
expression of type BOOL is always false, as the only well defined values for
BOOL are YES and NO}}
- r = B >= 0; // expected-warning {{result of comparison of constant 0 with
expression of type BOOL is always true, as the only well defined values for
BOOL are YES and NO}}
+ r = B < 0; // expected-warning {{result of comparison of constant 0 with
expression of type 'BOOL' is always false, as the only well defined values for
'BOOL' are YES and NO}}
+ r = B >= 0; // expected-warning {{result of comparison of constant 0 with
expression of type 'BOOL' is always true, as the only well defined values for
'BOOL' are YES and NO}}
r = B <= 0;
- r = B > YES; // expected-warning {{result of comparison of constant YES with
expression of type BOOL is always false, as the only well defined values for
BOOL are YES and NO}}
+ r = B > YES; // expected-warning {{result of comparison of constant YES with
expression of type 'BOOL' is always false, as the only well defined values for
'BOOL' are YES and NO}}
r = B > NO;
- r = B < NO; // expected-warning {{result of comparison of constant NO with
expression of type BOOL is always false, as the only well defined values for
BOOL are YES and NO}}
+ r = B < NO; // expected-warning {{result of comparison of constant NO with
expression of type 'BOOL' is always false, as the only well defined values for
'BOOL' are YES and NO}}
r = B < YES;
- r = B >= NO; // expected-warning {{result of comparison of constant NO with
expression of type BOOL is always true, as the only well defined values for
BOOL are YES and NO}}
+ r = B >= NO; // expected-warning {{result of comparison of constant NO with
expression of type 'BOOL' is always true, as the only well defined values for
'BOOL' are YES and NO}}
r = B <= NO;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
