From patchwork Fri Sep 8 12:58:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 137740 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp521558vqo; Fri, 8 Sep 2023 05:57:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTZPTtYuMyXpdu9Em/Uz5+2LqKy7Jgx8Ti6X3QPeGs1Dq+uddr0195ozQ4xaoAxNZaFydn X-Received: by 2002:aa7:d4c3:0:b0:523:363e:f6e3 with SMTP id t3-20020aa7d4c3000000b00523363ef6e3mr1689767edr.15.1694177857405; Fri, 08 Sep 2023 05:57:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694177857; cv=none; d=google.com; s=arc-20160816; b=yLdfADYOsLDK3G5/HOLvwv5fWxupi72t27X+SXSaNPMJA5mree01fdkvExiSCjlVt1 5P3boOjIOFWkrcCjZx5+g711ZENr+QMe88+GzgFCtp71RIEVU8+wl8kZ5pGEtI5rITB4 XCArSy33iGFwMfGGPbBSIdoUf7C81nGH8rVRfC+fllGpE7Ia24jHObeu40+xAkKZPJiJ Tho2EdEH4jVYIm/6luiLaMyczRvH8qmr4gslojvKnr7btnU6BleEYPxjSreo8VQv0y8T jCYOMVtw2qpSHVYJ8hQq7xymTyzdT+WGtOZi+/lAudE9a6LiSkSBA3ebIP/AlUqvhzle JdqA== 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:message-id:date:subject:to:from:dkim-signature :dmarc-filter:delivered-to; bh=SnTLbIg1O8jl7Rn926pJNQnS/waRdUWpVYd6qJkvA8Y=; fh=AhGKYtk0XACc7VMe6Jnlt3x6JbHBBI13XYj5aQUAAcs=; b=I5UxSAaKZVEvk94AFTs2GHRvra+Q4fH3RlvJEac49FJ+DYqR/kFwax/Q6meF7ZH0rj JhlJXqnkbQvevatv4rjQigdtQExwUL1553SCCvJbqFmMjAqRDkNoXODWtOZJHgKF+Ipm 3of7WWRYVmZlkfAQbAHqmJsk3xNcxmruj1g0ycw65irk/deRJMUTyePk1CfqdPacSmFs c4hHYY++Kcw4s0wJw+fWGRDrztJ9flCS5fXIluH47EaraoyMsNyh2ydAHMY7c/7Bi49X 0DXB4WfLZwB737fV/c82fm9gX8+8ecGAfq06fk0afL2trfl3YsnfaYNBh00XiYVRmQ1J 57KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=GU9GtsEr; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id b4-20020aa7df84000000b00527d44d0456si1442304edy.456.2023.09.08.05.57.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 05:57:37 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=GU9GtsEr; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 A5CC23857730 for ; Fri, 8 Sep 2023 12:57:18 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id E417A3858CD1 for ; Fri, 8 Sep 2023 12:56:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E417A3858CD1 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-x32d.google.com with SMTP id 5b1f17b1804b1-401b393ddd2so22976925e9.0 for ; Fri, 08 Sep 2023 05:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1694177812; x=1694782612; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=SnTLbIg1O8jl7Rn926pJNQnS/waRdUWpVYd6qJkvA8Y=; b=GU9GtsEryBi8dFTxEUbFk9gUaYdwRfRYLTjcqFyGg6fr4Vi+8WmMu8fflxFe5m/U+j 0Qi+nB98nEdWPddYxQIL07Mw5E+9vN/vSZ4JFrdacM9Cu/HLi7oh86yF32iYO3UYQoIc sd/S0ILuse4WLyI3sj+4E0BTLa9oYbPKL4O4GLE9k3/48/gHDPNCh4xP5tlm5tr51o0t xcsIIQsdeSxZQhDkqilw9Cf2Dw17uyTWFb6EuJXRgb6Yk9UC4+cJ+XXsV6l/B+Xc5ZJV boeY2OmgBSFfbEVNh+fzX1vFD84yPEkrXKgWBhJiPo0T/lQe4nrH6AfnSuAL89V7A5rr 4U0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694177812; x=1694782612; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SnTLbIg1O8jl7Rn926pJNQnS/waRdUWpVYd6qJkvA8Y=; b=CMeq0ZtWlcLrqyi8N3neDMPnL3XZsS3NJ2y7At2j5N0vxioB61ITV2uMBXRrTEADyh 9cwEqNj4hP1Wv3KV4n8hdRA+ZmvBanANgP/Zr54q19m6IS4DjplRInyqm+jSejVikPtw /ZHRKmRRYGc2ORWPZwtN0cooBDcW3iX1dJDwbFCTZ4FLA9AZxWkGz2K20osvT+r6lumz h1lwoyQi3MsdV9/TpF8CmL1qWy8c9JfMlBOjLy6oK9qYlqDwmY80BC5lR1BLbTRBM316 HbBcFkZvaGjjgti2DWVr/o2Fcvkyo/PWfamA9Qirlpjm6u/gibrVdAEW2xHtscfKsdoU 9k7w== X-Gm-Message-State: AOJu0Yw9EcvvpniWAocqL3LpSRV3J3FHpF3+G6LB2qKF3U4prCWYLAiA ARMLL2D1XdAN7HJ6CASf6poOuLVK9TnNsGR8GQmX X-Received: by 2002:a7b:ce14:0:b0:3ff:233f:2cfb with SMTP id m20-20020a7bce14000000b003ff233f2cfbmr1987649wmc.23.1694177811916; Fri, 08 Sep 2023 05:56:51 -0700 (PDT) Received: from localhost.localdomain ([2001:861:5e4c:3bb0:fa3:84b9:61c0:bf1a]) by smtp.gmail.com with ESMTPSA id m6-20020a7bca46000000b00401dc20a070sm5067707wml.43.2023.09.08.05.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 05:56:51 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Subject: [PATCH] libcpp: add function to check XID properties Date: Fri, 8 Sep 2023 14:58:40 +0200 Message-Id: <20230908125840.789518-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.9 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: tromey@redhat.com, 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: 1776474240827802085 From: Raiki Tamura 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 --- 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 */