From: Jason Merrill <jason@redhat.com>
To: Ben Boeckel <ben.boeckel@kitware.com>, gcc-patches@gcc.gnu.org
Cc: nathan@acm.org, fortran@gcc.gnu.org, gcc@gcc.gnu.org,
brad.king@kitware.com, dmalcolm@redhat.com, mliska@suse.cz,
anlauf@gmx.de
Subject: Re: [PATCH v2 2/3] libcpp: add a function to determine UTF-8 validity of a C string
Date: Mon, 7 Nov 2022 13:47:51 -1000 [thread overview]
Message-ID: <a1a0033c-0597-8218-b0d1-513f4bdbe230@redhat.com> (raw)
In-Reply-To: <20221027231645.67623-3-ben.boeckel@kitware.com>
On 10/27/22 13:16, Ben Boeckel wrote:
> This simplifies the interface for other UTF-8 validity detections when a
> simple "yes" or "no" answer is sufficient.
>
> Signed-off-by: Ben Boeckel <ben.boeckel@kitware.com>
> ---
> libcpp/ChangeLog | 6 ++++++
> libcpp/charset.cc | 18 ++++++++++++++++++
> libcpp/internal.h | 2 ++
> 3 files changed, 26 insertions(+)
>
> diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
> index 4d707277531..4e2c7900ae2 100644
> --- a/libcpp/ChangeLog
> +++ b/libcpp/ChangeLog
> @@ -1,3 +1,9 @@
> +2022-10-27 Ben Boeckel <ben.boeckel@kitware.com>
> +
> + * include/charset.cc: Add `_cpp_valid_utf8_str` which determines
> + whether a C string is valid UTF-8 or not.
> + * include/internal.h: Add prototype for `_cpp_valid_utf8_str`.
> +
> 2022-10-27 Ben Boeckel <ben.boeckel@kitware.com>
>
> * include/charset.cc: Reject encodings of codepoints above 0x10FFFF.
> diff --git a/libcpp/charset.cc b/libcpp/charset.cc
> index e9da6674b5f..0524ab6beba 100644
> --- a/libcpp/charset.cc
> +++ b/libcpp/charset.cc
> @@ -1864,6 +1864,24 @@ _cpp_valid_utf8 (cpp_reader *pfile,
> return true;
> }
Please add a comment before the function.
> +extern bool
> +_cpp_valid_utf8_str (const char *name)
> +{
> + const uchar* in = (const uchar*)name;
> + size_t len = strlen(name);
> + cppchar_t cp;
> +
> + while (*in)
> + {
> + if (one_utf8_to_cppchar(&in, &len, &cp))
> + {
> + return false;
> + }
> + }
We usually omit unnecessary { } around single statements.
> + return true;
> +}
> +
> /* Subroutine of convert_hex and convert_oct. N is the representation
> in the execution character set of a numeric escape; write it into the
> string buffer TBUF and update the end-of-string pointer therein. WIDE
> diff --git a/libcpp/internal.h b/libcpp/internal.h
> index badfd1b40da..4f2dd4a2f5c 100644
> --- a/libcpp/internal.h
> +++ b/libcpp/internal.h
> @@ -834,6 +834,8 @@ extern bool _cpp_valid_utf8 (cpp_reader *pfile,
> struct normalize_state *nst,
> cppchar_t *cp);
>
> +extern bool _cpp_valid_utf8_str (const char *str);
> +
> extern void _cpp_destroy_iconv (cpp_reader *);
> extern unsigned char *_cpp_convert_input (cpp_reader *, const char *,
> unsigned char *, size_t, size_t,
next prev parent reply other threads:[~2022-11-07 23:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 23:16 [PATCH v2 0/1] RFC: P1689R5 support Ben Boeckel
2022-10-27 23:16 ` [PATCH v2 1/3] libcpp: reject codepoints above 0x10FFFF Ben Boeckel
2022-10-28 12:54 ` David Malcolm
2022-11-07 23:04 ` Jason Merrill
2022-10-27 23:16 ` [PATCH v2 2/3] libcpp: add a function to determine UTF-8 validity of a C string Ben Boeckel
2022-10-28 12:59 ` David Malcolm
2022-10-28 17:14 ` Ben Boeckel
2022-11-07 23:47 ` Jason Merrill [this message]
2022-10-27 23:16 ` [PATCH v2 3/3] p1689r5: initial support Ben Boeckel
2022-10-28 17:15 ` Ben Boeckel
2022-11-01 14:57 ` Tom Tromey
2022-11-01 16:22 ` Ben Boeckel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a1a0033c-0597-8218-b0d1-513f4bdbe230@redhat.com \
--to=jason@redhat.com \
--cc=anlauf@gmx.de \
--cc=ben.boeckel@kitware.com \
--cc=brad.king@kitware.com \
--cc=dmalcolm@redhat.com \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=gcc@gcc.gnu.org \
--cc=mliska@suse.cz \
--cc=nathan@acm.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).