From patchwork Fri Sep 8 14:25:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 137746 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp576790vqo; Fri, 8 Sep 2023 07:23:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMbl5W36lq9hfZI0XIqPyook5t914CAeNuvwkKXNHnD0GxA/w0eajG8mJaXkA1lmKWjfGW X-Received: by 2002:a17:906:76c2:b0:9a5:7ade:b5e8 with SMTP id q2-20020a17090676c200b009a57adeb5e8mr2077399ejn.10.1694183018447; Fri, 08 Sep 2023 07:23:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694183018; cv=none; d=google.com; s=arc-20160816; b=xaGd+9SvXXLizHuMO++7KiqQmRfJACZqTmOYGXDW63Tp3K+kNAJK/qQYCISDxGh56f rax5TSjXIvmc8hnM+Eb1pIH6w7dWxdTP1mnOwEiAF9ATd3JpToSk7c8vmYmso8C36nER jf66h24Kk+aOJl92iuWMcNMWIqNVo0tnG/iSCNQnihiTyHDZ9cRrsltnRysMWsYFC8nq jQzLwkcW2Fd5wrZQgMAfINYb0EGDnILpfzoaqk2Ty2a21GQLnmm8XFvwWpAoj1DF1XUS P4m9iCCuxkhQdBzDvjNFS9FMc25buxhCzjnIC5mZ7oNfZt8hpE+wa9WO9DjF9Lrenk1K 5CdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:dmarc-filter:delivered-to; bh=0VawUG2snJJ+gIZ3Re/Xngl81ZWBtEpU8nWL+wtJqkA=; fh=SKln+KR++PCZUMaG0/oLHZxM5NRcpHy4Vek9Z+au8lk=; b=ySdg3/jE4R9LOKS2X4sWJLhWY++DXIU18CgRp+UtnPKOcvhxVGy9IlHsBhrtnFppCc H8CGh/ouOVomJjthJsZm2UPzGJ37HhbsW0DiMHEitZdfQN2VcB354SGw4OX70c/fT8P0 syNW6X5cBYDHjJdW7OkKZ9K9HNzD5fv3chbiMb222Chh6CPIUBQxV2xztRYvZ1UcEG82 Ea1ksW5iD5G8Do09gCkJfjKlS+adhx694mdmrg5kCMaJNl9xgoSD+N/hoDH/rMBIwfU+ Thsw+/HS16Kzczw9YmEwK1U64lEueOFmzcl52CDW9Aut6HsdQXOX8eR2sRnt7NxvSB92 5pxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=flfD1MzS; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id gg6-20020a170906e28600b0099cd6660994si1385835ejb.116.2023.09.08.07.23.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 07:23:38 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=flfD1MzS; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A719C3857029 for ; Fri, 8 Sep 2023 14:23:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id D22C43858D35 for ; Fri, 8 Sep 2023 14:23:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D22C43858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-402e7968042so21882155e9.2 for ; Fri, 08 Sep 2023 07:23:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1694182984; x=1694787784; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0VawUG2snJJ+gIZ3Re/Xngl81ZWBtEpU8nWL+wtJqkA=; b=flfD1MzS8cK44mTLwiChp2SmP4on4xr5d6xgPD0D2WrVTaCCGNn+4v7aZqYJ2V/93X gmf2nIYCn8FzHUC9aKongiO16sQr28wCKeL4A3b45+J38SCPibSbJoHJKFtThocx6drm PoPUCnraz9Sg9cKmywkQz3jy6NGkZxOLKlLCPFXFc++M8PDYINxqVU9Kcq9+PDPBcpXK EpJH6YdZZjd+bN0CWGG6DMsbvxiKIYWkK74aKKPVQfF0AmsLu2KBi/COxXlaP3oRRmZr /b1TQendHVP7G7zAPazIlNsmzvCFAs6abbabTkUgIMvWK5lkfZyUlu86yn+RKH1qMFs3 5Zrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694182984; x=1694787784; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0VawUG2snJJ+gIZ3Re/Xngl81ZWBtEpU8nWL+wtJqkA=; b=kRtqhq00JgKL5ROlgXQNVYTti6HqxixmPw4mf6OpCt2KsV6SglBelvC0ByPHqBeWJK /drNb4QmzWNH1cRyFxIeVzUSSXmeMGRxNUL3+/GL9Wg1ZucHvabKmYPxda86dnoQQmfk QvQZazdAqfjchrUYEZfmjwT/d7UOcW+K2y8y4H7Gf2e3HwQC8ghCwvzEWmYupkJOZNo3 KWYuC2TP2wAt7icX41Cjzih4B9BXAsE8CFdmyxuYrXzeQCeJY61Miyn6iW2TMcImembU 6Jsj7agoxWSdr3Do//mhxIo0V2Eo9WRLAlJPd3b5bzSJyQmyiYMM+SIDrcp02SIIQT5q vTnA== X-Gm-Message-State: AOJu0Yy7GMFgnZNTGdj3a/6SV6eBRNvJvU5TmwOnZ8dYj63GkLAJfPaS l7tEhm0QJ158ZP/DJXTHjPndHv/ITubIQ+2LaohY X-Received: by 2002:a7b:cd9a:0:b0:3fe:dd91:b5b6 with SMTP id y26-20020a7bcd9a000000b003fedd91b5b6mr2440245wmj.25.1694182984260; Fri, 08 Sep 2023 07:23:04 -0700 (PDT) Received: from localhost.localdomain ([2001:861:5e4c:3bb0:fa3:84b9:61c0:bf1a]) by smtp.gmail.com with ESMTPSA id e11-20020a05600c108b00b0040210a27e29sm2118150wmd.32.2023.09.08.07.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 07:23:03 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Subject: [PATCH v2] libcpp: add function to check XID properties Date: Fri, 8 Sep 2023 16:25:20 +0200 Message-Id: <20230908142519.899241-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gcc-rust@gcc.gnu.org, Raiki Tamura Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776474240827802085 X-GMAIL-MSGID: 1776479652341243375 From: Raiki Tamura This commit adds a new function intended for checking the XID properties of a possibly unicode character, as well as the accompanying enum describing the possible properties. libcpp/ChangeLog: * charset.cc (cpp_check_xid_property): New. * include/cpplib.h (cpp_check_xid_property): New. (enum cpp_xid_property): New. Signed-off-by: Raiki Tamura --- 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..a92ba75539e 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 +cpp_check_xid_property (cppchar_t c) +{ + // fast path for ASCII + if (c < 0x80) + { + if (('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z')) + return CPP_XID_START | CPP_XID_CONTINUE; + if (('0' <= c && c <= '9') || c == '_') + return CPP_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 CPP_XID_START | CPP_XID_CONTINUE; + if (flags & NXX23) + return CPP_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..013d276f384 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 { + CPP_XID_START = 1, + CPP_XID_CONTINUE = 2 +}; + +unsigned int cpp_check_xid_property (cppchar_t c); + #endif /* ! LIBCPP_CPPLIB_H */