procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: Test for mixed string literal concatenation

Browse source 
From wg21.link/p2201r1

gcc/cp/ChangeLog:

	* parser.c (cp_parser_string_literal): Adjust diagnostic.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp23/mixed-concat1.C: New test.
This commit is contained in:
Jason Merrill 2021-06-08 14:38:42 -04:00
parent 5668b5d09a
commit 924e02553a
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/parser.c
View file

@ -4378,8 +4378,8 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok,
rich_location rich_loc (line_table, tok->location);
rich_loc.add_range (last_tok_loc);
error_at (&rich_loc,
"unsupported non-standard concatenation "
"of string literals");
"concatenation of string literals with "
"conflicting encoding prefixes");
}
}

21
gcc/testsuite/g++.dg/cpp23/mixed-concat1.C Normal file
View file

@ -0,0 +1,21 @@
// Test from P2201R1
// { dg-do compile { target c++11 } }
void f() {
{ auto a = L"" u""; } // { dg-error "concatenation" }
{ auto a = L"" u8""; } // { dg-error "concatenation" }
{ auto a = L"" U""; } // { dg-error "concatenation" }
{ auto a = u8"" L""; } // { dg-error "concatenation" }
{ auto a = u8"" u""; } // { dg-error "concatenation" }
{ auto a = u8"" U""; } // { dg-error "concatenation" }
{ auto a = u"" L""; } // { dg-error "concatenation" }
{ auto a = u"" u8""; } // { dg-error "concatenation" }
{ auto a = u"" U""; } // { dg-error "concatenation" }
{ auto a = U"" L""; } // { dg-error "concatenation" }
{ auto a = U"" u""; } // { dg-error "concatenation" }
{ auto a = U"" u8""; } // { dg-error "concatenation" }
}