From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id D8839385DC33; Tue, 8 Jun 2021 21:54:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8839385DC33 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1308] c++: update diagnostic messages X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: 40917137b6bb66c8020add0b4083c13b566275ba X-Git-Newrev: 61fc01806f376a780978a6dea165ec3dadef085b Message-Id: <20210608215427.D8839385DC33@sourceware.org> Date: Tue, 8 Jun 2021 21:54:27 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 21:54:28 -0000 https://gcc.gnu.org/g:61fc01806f376a780978a6dea165ec3dadef085b commit r12-1308-g61fc01806f376a780978a6dea165ec3dadef085b Author: Jason Merrill Date: Tue Jun 8 17:48:26 2021 -0400 c++: update diagnostic messages These tests needed updating for the diagnostic change in r12-1306. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/pr60209-neg.C: Update diagnostic. * g++.dg/diagnostic/string-literal-concat.C: Likewise. * g++.dg/ext/utf-badconcat.C: Likewise. * g++.dg/ext/utf-badconcat2.C: Likewise. Diff: --- gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C | 2 +- gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C | 6 +++--- gcc/testsuite/g++.dg/ext/utf-badconcat.C | 12 ++++++------ gcc/testsuite/g++.dg/ext/utf-badconcat2.C | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C b/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C index 77fd3d81691..6c3ad0c9016 100644 --- a/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C +++ b/gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C @@ -17,7 +17,7 @@ void operator L"" "" _x(unsigned long long); // { dg-error "invalid encoding pre void operator u8"" "" _y(unsigned long long); // { dg-error "invalid encoding prefix in literal operator" } -void operator u"" L"" _z(unsigned long long); // { dg-error "unsupported non-standard concatenation of string literals" } +void operator u"" L"" _z(unsigned long long); // { dg-error "concatenation of string literals with conflicting encoding prefixes" } void operator ""_p ""_q(unsigned long long); // { dg-error "inconsistent user-defined literal suffixes" } diff --git a/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C b/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C index 4ede799da8d..326520e5dec 100644 --- a/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C +++ b/gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C @@ -1,12 +1,12 @@ /* { dg-options "-fdiagnostics-show-caret -std=c++11" } */ -const void *s = u8"a" u"b"; // { dg-error "24: non-standard concatenation" } +const void *s = u8"a" u"b"; // { dg-error "24: concatenation" } /* { dg-begin-multiline-output "" } const void *s = u8"a" u"b"; ~~~~~ ^~~~ { dg-end-multiline-output "" } */ -const void *s2 = u"a" u"b" u8"c"; // { dg-error "30: non-standard concatenation" } +const void *s2 = u"a" u"b" u8"c"; // { dg-error "30: concatenation" } /* { dg-begin-multiline-output "" } const void *s2 = u"a" u"b" u8"c"; ~~~~ ^~~~~ @@ -16,7 +16,7 @@ const void *s2 = u"a" u"b" u8"c"; // { dg-error "30: non-standard concatenati const void *s3 = TEST_U8_LITERAL u8"b"; -const void *s4 = TEST_U8_LITERAL u"b"; // { dg-error "34: non-standard concatenation" } +const void *s4 = TEST_U8_LITERAL u"b"; // { dg-error "34: concatenation" } /* { dg-begin-multiline-output "" } const void *s4 = TEST_U8_LITERAL u"b"; ^~~~ diff --git a/gcc/testsuite/g++.dg/ext/utf-badconcat.C b/gcc/testsuite/g++.dg/ext/utf-badconcat.C index 4079b83879e..550e0da84d1 100644 --- a/gcc/testsuite/g++.dg/ext/utf-badconcat.C +++ b/gcc/testsuite/g++.dg/ext/utf-badconcat.C @@ -4,15 +4,15 @@ const void *s0 = u"a" "b"; const void *s1 = "a" u"b"; -const void *s2 = u"a" U"b"; /* { dg-error "non-standard concatenation" } */ -const void *s3 = U"a" u"b"; /* { dg-error "non-standard concatenation" } */ -const void *s4 = u"a" L"b"; /* { dg-error "non-standard concatenation" } */ -const void *s5 = L"a" u"b"; /* { dg-error "non-standard concatenation" } */ +const void *s2 = u"a" U"b"; /* { dg-error "concatenation" } */ +const void *s3 = U"a" u"b"; /* { dg-error "concatenation" } */ +const void *s4 = u"a" L"b"; /* { dg-error "concatenation" } */ +const void *s5 = L"a" u"b"; /* { dg-error "concatenation" } */ const void *s6 = u"a" u"b"; const void *s7 = U"a" "b"; const void *s8 = "a" U"b"; -const void *s9 = U"a" L"b"; /* { dg-error "non-standard concatenation" } */ -const void *sa = L"a" U"b"; /* { dg-error "non-standard concatenation" } */ +const void *s9 = U"a" L"b"; /* { dg-error "concatenation" } */ +const void *sa = L"a" U"b"; /* { dg-error "concatenation" } */ const void *sb = U"a" U"b"; const void *sc = L"a" "b"; const void *sd = "a" L"b"; diff --git a/gcc/testsuite/g++.dg/ext/utf-badconcat2.C b/gcc/testsuite/g++.dg/ext/utf-badconcat2.C index 0d3fe33039b..535d9265fcc 100644 --- a/gcc/testsuite/g++.dg/ext/utf-badconcat2.C +++ b/gcc/testsuite/g++.dg/ext/utf-badconcat2.C @@ -4,11 +4,11 @@ const void *s0 = u8"a" "b"; const void *s1 = "a" u8"b"; const void *s2 = u8"a" u8"b"; -const void *s3 = u8"a" u"b"; // { dg-error "non-standard concatenation" } -const void *s4 = u"a" u8"b"; // { dg-error "non-standard concatenation" } -const void *s5 = u8"a" U"b"; // { dg-error "non-standard concatenation" } -const void *s6 = U"a" u8"b"; // { dg-error "non-standard concatenation" } -const void *s7 = u8"a" L"b"; // { dg-error "non-standard concatenation" } -const void *s8 = L"a" u8"b"; // { dg-error "non-standard concatenation" } +const void *s3 = u8"a" u"b"; // { dg-error "concatenation" } +const void *s4 = u"a" u8"b"; // { dg-error "concatenation" } +const void *s5 = u8"a" U"b"; // { dg-error "concatenation" } +const void *s6 = U"a" u8"b"; // { dg-error "concatenation" } +const void *s7 = u8"a" L"b"; // { dg-error "concatenation" } +const void *s8 = L"a" u8"b"; // { dg-error "concatenation" } int main () {}