diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-04-08 22:07:57 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-04-08 22:07:57 +0000 |
| commit | 8804bdcac242741528036d7e62f26ae5b6a01261 (patch) | |
| tree | 18ca58bc983da15a3fd63a2cfc5ddd632557b35b | |
| parent | 5d07401587ca9ccde3ad32f02197097549bda7b6 (diff) | |
Reorder diagnostics to separate the Sema::AssignmentAction diagnostics from other diagnostics
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@100817 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index ed2db770d8..e2d8d6fa77 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/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">; |