From: Arthur Cohen <arthur.cohen@embecosm.com>
To: gcc-patches@gcc.gnu.org
Cc: gcc-rust@gcc.gnu.org, dmalcolm@redhat.com, tromey@redhat.com,
Raiki Tamura <tamaron1203@gmail.com>
Subject: [PATCH] libcpp: add function to check XID properties
Date: Fri, 8 Sep 2023 14:58:40 +0200 [thread overview]
Message-ID: <20230908125840.789518-1-arthur.cohen@embecosm.com> (raw)
From: Raiki Tamura <tamaron1203@gmail.com>
libcpp/ChangeLog:
* charset.cc (check_xid_property):new function to check XID_Start and XID_Continue
* include/cpplib.h (check_xid_property):add enum representing XID properties
Signed-off-by: Raiki Tamura <tamaron1203@gmail.com>
---
libcpp/charset.cc | 36 ++++++++++++++++++++++++++++++++++++
libcpp/include/cpplib.h | 7 +++++++
2 files changed, 43 insertions(+)
diff --git a/libcpp/charset.cc b/libcpp/charset.cc
index 7b625c9956a..5d6d7aed325 100644
--- a/libcpp/charset.cc
+++ b/libcpp/charset.cc
@@ -1256,6 +1256,42 @@ _cpp_uname2c_uax44_lm2 (const char *name, size_t len, char *canon_name)
return result;
}
+/* Returns flags representing the XID properties of the given codepoint. */
+unsigned int
+check_xid_property (cppchar_t c)
+{
+ // fast path for ASCII
+ if (c < 0x80)
+ {
+ if (('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z'))
+ return XID_START | XID_CONTINUE;
+ if (('0' <= c && c <= '9') || c == '_')
+ return XID_CONTINUE;
+ }
+
+ if (c > UCS_LIMIT)
+ return 0;
+
+ int mn, mx, md;
+ mn = 0;
+ mx = ARRAY_SIZE (ucnranges) - 1;
+ while (mx != mn)
+ {
+ md = (mn + mx) / 2;
+ if (c <= ucnranges[md].end)
+ mx = md;
+ else
+ mn = md + 1;
+ }
+
+ unsigned short flags = ucnranges[mn].flags;
+
+ if (flags & CXX23)
+ return XID_START | XID_CONTINUE;
+ if (flags & NXX23)
+ return XID_CONTINUE;
+ return 0;
+}
/* Returns 1 if C is valid in an identifier, 2 if C is valid except at
the start of an identifier, and 0 if C is not valid in an
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index fcdaf082b09..4ad75f877d9 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -1606,4 +1606,11 @@ bool cpp_valid_utf8_p (const char *data, size_t num_bytes);
bool cpp_is_combining_char (cppchar_t c);
bool cpp_is_printable_char (cppchar_t c);
+enum {
+ XID_START = 1,
+ XID_CONTINUE = 2
+};
+
+unsigned int check_xid_property (cppchar_t c);
+
#endif /* ! LIBCPP_CPPLIB_H */
--
2.40.0
next reply other threads:[~2023-09-08 12:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 12:58 Arthur Cohen [this message]
2023-09-08 13:09 ` Jakub Jelinek
2023-09-08 14:25 ` [PATCH v2] " Arthur Cohen
2023-09-08 14:59 ` [PATCH v3] " Arthur Cohen
2023-10-16 15:02 ` Arthur Cohen
2023-12-18 19:00 ` Joseph Myers
2024-01-04 15:22 ` Arthur Cohen
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=20230908125840.789518-1-arthur.cohen@embecosm.com \
--to=arthur.cohen@embecosm.com \
--cc=dmalcolm@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=gcc-rust@gcc.gnu.org \
--cc=tamaron1203@gmail.com \
--cc=tromey@redhat.com \
/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).