summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-04-08 22:07:57 +0000
committerDouglas Gregor <dgregor@apple.com>2010-04-08 22:07:57 +0000
commit5e349b5469548493490d5c2e4d6586f6ca82cd83 (patch)
tree51831b7f055e12361125f937c7223709d6fc83ef
parent769b06cba337c576594fed5d7408738498593337 (diff)
downloadbcm5719-llvm-5e349b5469548493490d5c2e4d6586f6ca82cd83.tar.gz
bcm5719-llvm-5e349b5469548493490d5c2e4d6586f6ca82cd83.zip
Reorder diagnostics to separate the Sema::AssignmentAction diagnostics from other diagnostics
llvm-svn: 100817
-rw-r--r--clang/include/clang/Basic/DiagnosticSemaKinds.td19
1 files changed, 10 insertions, 9 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index ed2db770d88..e2d8d6fa779 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2231,13 +2231,6 @@ def warn_value_always_zero : Warning<
def err_typecheck_convert_incompatible : Error<
"incompatible type %select{assigning|passing|returning|converting|initializing|sending|casting}2"
" %1, expected %0">;
-def err_typecheck_convert_ambiguous : Error<
- "ambiguity in initializing value of type %0 with initializer of type %1">;
-def err_cannot_initialize_decl_noname : Error<
- "cannot initialize a value of type %0 with an %select{rvalue|lvalue}1 "
- "of type %2">;
-def err_cannot_initialize_decl : Error<
- "cannot initialize %0 with an %select{rvalue|lvalue}1 of type %2">;
def warn_incompatible_qualified_id : Warning<
"incompatible type %select{assigning|passing|returning|converting|initializing|sending|casting}2"
" %1, expected %0">;
@@ -2271,11 +2264,19 @@ def err_int_to_block_pointer : Error<
"invalid conversion "
"%select{assigning|passing|returning|converting|initializing|sending|casting}2"
" integer %1, expected block pointer %0">;
-def err_typecheck_comparison_of_distinct_blocks : Error<
- "comparison of distinct block types (%0 and %1)">;
def err_typecheck_convert_incompatible_block_pointer : Error<
"incompatible block pointer types "
"%select{assigning|passing|returning|converting|initializing|sending|casting}2 %1, expected %0">;
+
+def err_typecheck_convert_ambiguous : Error<
+ "ambiguity in initializing value of type %0 with initializer of type %1">;
+def err_cannot_initialize_decl_noname : Error<
+ "cannot initialize a value of type %0 with an %select{rvalue|lvalue}1 "
+ "of type %2">;
+def err_cannot_initialize_decl : Error<
+ "cannot initialize %0 with an %select{rvalue|lvalue}1 of type %2">;
+def err_typecheck_comparison_of_distinct_blocks : Error<
+ "comparison of distinct block types (%0 and %1)">;
def err_typecheck_array_not_modifiable_lvalue : Error<
"array type %0 is not assignable">;
OpenPOWER on IntegriCloud