On Wed, Apr 16, 2025 at 09:25:00PM +0200, Jakub Jelinek wrote:
> Hi!
>
> Aaron mentioned in the PR that late in C23 N3124 was adopted and
> $@` are now part of basic character set. The paper has been implemented
> in GCC from what I can see, but we should allow for GNU23/2Y $@` in
> raw string delimiters as well, like they are allowed for C++26, because
> the delimiters can contain anything from basic character set but space,
> ()\, tab, form-feed, newline and backspace.
>
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
>
> 2025-04-16 Jakub Jelinek <ja...@redhat.com>
>
> PR c++/110343
> * lex.cc (lex_raw_string): For C allow $@` in raw string delimiters
> if CPP_OPTION (pfile, low_ucns) i.e. for C23 and later.
>
> * gcc.dg/raw-string-1.c: New test.
>
> --- libcpp/lex.cc.jj 2025-04-08 14:09:47.173503355 +0200
> +++ libcpp/lex.cc 2025-04-16 17:18:04.556931275 +0200
> @@ -2711,8 +2711,9 @@ lex_raw_string (cpp_reader *pfile, cpp_t
> || c == '!' || c == '=' || c == ','
> || c == '"' || c == '\''
> || ((c == '$' || c == '@' || c == '`')
> - && CPP_OPTION (pfile, cplusplus)
> - && CPP_OPTION (pfile, lang) > CLK_CXX23)))
> + && (CPP_OPTION (pfile, cplusplus)
> + ? CPP_OPTION (pfile, lang) > CLK_CXX23
> + : CPP_OPTION (pfile, low_ucns)))))
> prefix[prefix_len++] = c;
> else
> {
> --- gcc/testsuite/gcc.dg/raw-string-1.c.jj 2025-04-16 17:32:20.595541753
> +0200
> +++ gcc/testsuite/gcc.dg/raw-string-1.c 2025-04-16 17:35:09.266302136
> +0200
> @@ -0,0 +1,24 @@
> +/* { dg-do compile } */
> +/* { dg-options "-std=gnu23" } */
Maybe mention PR c++/110343?
I think the patch is OK though. Thanks.
> +const void *s0 = R"0123456789abcdefg()0123456789abcdefg" 0;
> + /* { dg-error "raw string delimiter longer" "longer" { target *-*-* }
> .-1 } */
> + /* { dg-error "stray" "stray" { target *-*-* } .-2 } */
> +const void *s1 = R" () " 0;
> + /* { dg-error "invalid character" "invalid" { target *-*-* } .-1 } */
> + /* { dg-error "stray" "stray" { target *-*-* } .-2 } */
> +const void *s2 = R" () " 0;
> + /* { dg-error "invalid character" "invalid" { target *-*-* } .-1 } */
> + /* { dg-error "stray" "stray" { target *-*-* } .-2 } */
> +const void *s3 = R")())" 0;
> + /* { dg-error "invalid character" "invalid" { target *-*-* } .-1 } */
> + /* { dg-error "stray" "stray" { target *-*-* } .-2 } */
> +const char *s4 = R"@()@";
> +const char *s5 = R"$()$";
> +const char *s6 = R"`()`";
> +const void *s7 = R"\u0040()\u0040" 0;
> + /* { dg-error "invalid character" "invalid" { target *-*-* } .-1 } */
> + /* { dg-error "stray" "stray" { target *-*-* } .-2 } */
> +const char *s8 = R"`@$$@`@`$()`@$$@`@`$";
> +
> +int main () {}
Marek
