diff options
Diffstat (limited to 'include/clang/Basic/DiagnosticLexKinds.td')
| -rw-r--r-- | include/clang/Basic/DiagnosticLexKinds.td | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index 39123d9..d8b5f2d 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -51,6 +51,9 @@ def err_empty_character : Error<"empty character constant">; def err_unterminated_block_comment : Error<"unterminated /* comment">; def err_invalid_character_to_charify : Error< "invalid argument to convert to character">; + +def err_conflict_marker : Error<"version control conflict marker in file">; + def ext_multichar_character_literal : ExtWarn< "multi-character character constant">, InGroup<MultiChar>; def ext_four_char_character_literal : Extension< @@ -150,9 +153,10 @@ def ext_pp_comma_expr : Extension<"comma operator in operand of #if">; def ext_pp_bad_vaargs_use : Extension< "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro">; def ext_pp_macro_redef : ExtWarn<"%0 macro redefined">; -def ext_variadic_macro : Extension<"variadic macros were introduced in C99">; +def ext_variadic_macro : Extension<"variadic macros were introduced in C99">, + InGroup<VariadicMacros>; def ext_named_variadic_macro : Extension< - "named variadic macros are a GNU extension">; + "named variadic macros are a GNU extension">, InGroup<VariadicMacros>; def ext_embedded_directive : Extension< "embedding a directive within macro arguments is not portable">; def ext_missing_varargs_arg : Extension< @@ -160,18 +164,11 @@ def ext_missing_varargs_arg : Extension< def ext_empty_fnmacro_arg : Extension< "empty macro arguments were standardized in C99">; -def ext_pp_base_file : Extension<"__BASE_FILE__ is a language extension">; -def ext_pp_include_level : Extension< - "__INCLUDE_LEVEL__ is a language extension">; -def ext_pp_timestamp : Extension<"__TIMESTAMP__ is a language extension">; -def ext_pp_counter : Extension< - "__COUNTER__ is a language extension">; - def err_pp_invalid_directive : Error<"invalid preprocessing directive">; def err_pp_hash_error : Error<"#error%0">; def err_pp_file_not_found : Error<"'%0' file not found">, DefaultFatal; def err_pp_error_opening_file : Error< - "error opening file '%0'">, DefaultFatal; + "error opening file '%0': %1">, DefaultFatal; def err_pp_empty_filename : Error<"empty filename">; def err_pp_include_too_deep : Error<"#include nested too deeply">; def err_pp_expects_filename : Error<"expected \"FILENAME\" or <FILENAME>">; |
