OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Jason Merrill 2021-06-08 17:48:26 -04:00
parent 40917137b6
commit 61fc01806f
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/testsuite/g++.dg/cpp0x/pr60209-neg.C
View File

@ -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" }

6
gcc/testsuite/g++.dg/diagnostic/string-literal-concat.C
View File

@ -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";
^~~~

12
gcc/testsuite/g++.dg/ext/utf-badconcat.C
View File

@ -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";

12
gcc/testsuite/g++.dg/ext/utf-badconcat2.C
View File

@ -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 () {}