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
Subject: Re: [PATCH v3 2/3] libcpp: add a function to determine UTF-8 validity of a C string
Date: Tue, 15 Nov 2022 19:00:41 -0500 [thread overview]
Message-ID: <656d0680-900d-9e7b-09a7-f273b80b5dd7@redhat.com> (raw)
In-Reply-To: <20221109021048.2123704-3-ben.boeckel@kitware.com>
On 11/8/22 16:10, Ben Boeckel wrote:
> This simplifies the interface for other UTF-8 validity detections when a
> simple "yes" or "no" answer is sufficient.
>
> libcpp/
>
> * charset.cc: Add `_cpp_valid_utf8_str` which determines whether
> a C string is valid UTF-8 or not.
> * internal.h: Add prototype for `_cpp_valid_utf8_str`.
>
> Signed-off-by: Ben Boeckel <ben.boeckel@kitware.com>
> ---
> libcpp/charset.cc | 20 ++++++++++++++++++++
> libcpp/internal.h | 2 ++
> 2 files changed, 22 insertions(+)
>
> diff --git a/libcpp/charset.cc b/libcpp/charset.cc
> index 324b5b19136..e130bc01f48 100644
> --- a/libcpp/charset.cc
> +++ b/libcpp/charset.cc
> @@ -1868,6 +1868,26 @@ _cpp_valid_utf8 (cpp_reader *pfile,
> return true;
> }
>
> +/* Detect whether a C-string is a valid UTF-8-encoded set of bytes. Returns
> + `false` if any contained byte sequence encodes an invalid Unicode codepoint
> + or is not a valid UTF-8 sequence. Returns `true` otherwise. */
> +
> +extern bool
> +_cpp_valid_utf8_str (const char *name)
> +{
> + const uchar* in = (const uchar*)name;
> + size_t len = strlen(name);
You'se missing a space before (.
> + cppchar_t cp;
> +
> + while (*in)
> + {
> + if (one_utf8_to_cppchar(&in, &len, &cp))
Here too.
OK with those fixed.
> + return false;
> + }
> +
> + 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-16 0:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 2:10 [PATCH v3 0/3] RFC: P1689R5 support Ben Boeckel
2022-11-09 2:10 ` [PATCH v3 1/3] libcpp: reject codepoints above 0x10FFFF Ben Boeckel
2022-11-16 0:00 ` Jason Merrill
2022-11-09 2:10 ` [PATCH v3 2/3] libcpp: add a function to determine UTF-8 validity of a C string Ben Boeckel
2022-11-16 0:00 ` Jason Merrill [this message]
2022-11-09 2:10 ` [PATCH v3 3/3] p1689r5: initial support 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=656d0680-900d-9e7b-09a7-f273b80b5dd7@redhat.com \
--to=jason@redhat.com \
--cc=ben.boeckel@kitware.com \
--cc=brad.king@kitware.com \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=gcc@gcc.gnu.org \
--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).