diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-01-25 22:34:12 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-01-25 22:34:12 +0000 |
| commit | 04342eee52a865aaee6e8a2fcf21dbedf98b0443 (patch) | |
| tree | 8cef7c7ae57e6ad7ecfc9bce633f65ffe6ba887a | |
| parent | 7722a2d4e33da6f5b0569241328a26ba78c2836b (diff) | |
| download | bcm5719-llvm-04342eee52a865aaee6e8a2fcf21dbedf98b0443.tar.gz bcm5719-llvm-04342eee52a865aaee6e8a2fcf21dbedf98b0443.zip | |
Improve the error message slightly for files that aren't using the expected UTF-8 encoding. Patch by Seth Cantrell.
llvm-svn: 148991
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticLexKinds.td | 4 | ||||
| -rw-r--r-- | clang/test/Lexer/char-literal-encoding-error.c | 8 | ||||
| -rw-r--r-- | clang/test/Lexer/string-literal-encoding.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/clang/include/clang/Basic/DiagnosticLexKinds.td b/clang/include/clang/Basic/DiagnosticLexKinds.td index 547f2722c04..936a72e8e7b 100644 --- a/clang/include/clang/Basic/DiagnosticLexKinds.td +++ b/clang/include/clang/Basic/DiagnosticLexKinds.td @@ -133,9 +133,9 @@ def warn_cxx98_compat_unicode_literal : Warning< def err_unsupported_string_concat : Error< "unsupported non-standard concatenation of string literals">; def err_bad_string_encoding : Error< - "illegal sequence in string literal">; + "illegal character encoding in string literal">; def err_bad_character_encoding : Error< - "illegal sequence in character literal">; + "illegal character encoding in character literal">; //===----------------------------------------------------------------------===// // PTH Diagnostics diff --git a/clang/test/Lexer/char-literal-encoding-error.c b/clang/test/Lexer/char-literal-encoding-error.c index 08f9a50a0dc..833ffcaa251 100644 --- a/clang/test/Lexer/char-literal-encoding-error.c +++ b/clang/test/Lexer/char-literal-encoding-error.c @@ -3,8 +3,8 @@ // This file is encoded using ISO-8859-1 int main() { - 'é'; // expected-error {{illegal sequence in character literal}} - u'é'; // expected-error {{illegal sequence in character literal}} - U'é'; // expected-error {{illegal sequence in character literal}} - L'é'; // expected-error {{illegal sequence in character literal}} + 'é'; // expected-error {{illegal character encoding in character literal}} + u'é'; // expected-error {{illegal character encoding in character literal}} + U'é'; // expected-error {{illegal character encoding in character literal}} + L'é'; // expected-error {{illegal character encoding in character literal}} } diff --git a/clang/test/Lexer/string-literal-encoding.c b/clang/test/Lexer/string-literal-encoding.c index c92f7bbe4b6..b12cfab156d 100644 --- a/clang/test/Lexer/string-literal-encoding.c +++ b/clang/test/Lexer/string-literal-encoding.c @@ -5,11 +5,11 @@ // U+00F5 U+00FC void f() { - wchar_t const *a = L"Àéîõü"; // expected-error {{illegal sequence in string literal}} + wchar_t const *a = L"Àéîõü"; // expected-error {{illegal character encoding in string literal}} - char16_t const *b = u"Àéîõü"; // expected-error {{illegal sequence in string literal}} - char32_t const *c = U"Àéîõü"; // expected-error {{illegal sequence in string literal}} - wchar_t const *d = LR"(Àéîõü)"; // expected-error {{illegal sequence in string literal}} - char16_t const *e = uR"(Àéîõü)"; // expected-error {{illegal sequence in string literal}} - char32_t const *f = UR"(Àéîõü)"; // expected-error {{illegal sequence in string literal}} + char16_t const *b = u"Àéîõü"; // expected-error {{illegal character encoding in string literal}} + char32_t const *c = U"Àéîõü"; // expected-error {{illegal character encoding in string literal}} + wchar_t const *d = LR"(Àéîõü)"; // expected-error {{illegal character encoding in string literal}} + char16_t const *e = uR"(Àéîõü)"; // expected-error {{illegal character encoding in string literal}} + char32_t const *f = UR"(Àéîõü)"; // expected-error {{illegal character encoding in string literal}} } |
