From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id C27BD3858D1E for ; Fri, 8 Sep 2023 14:55:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C27BD3858D1E 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-x330.google.com with SMTP id 5b1f17b1804b1-401d2e11dacso21782965e9.0 for ; Fri, 08 Sep 2023 07:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1694184947; x=1694789747; 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=anxzRjNuRHiC3BQ4YJ8LhO6MWQQ4IriBgHgMglYhoCY=; b=RpVNzUAfUwydu8nKPjDxYGKIWQ3x3J+nPEliw0qr1IisKHoen0jWqGEsfYjRsXaTlS vwFLk1M6b61DgGwtSRfQ7AkR4R3sQ9YQfHoSXRITtJTBW8UyV/OhHMUQXMAz/ojgO6yY PwoOXZu6ApLDsBTNST0E6n6BTut8y5EviZKagY7FawApfu2bid0jDs+DcYTOfoaw8GOr K6QSAD+82e/vPufsxmshwBN80+SE3rhqG0nbPdsqZBADvD9z+pZMiJE/vlDRrLY6w80T zgfVON2myuG6xsIht0/U9RO8NlLsEpwADa64+pxKygKlhlW41CAtzTpYwXeqNA/ci/3D o1FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694184947; x=1694789747; 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=anxzRjNuRHiC3BQ4YJ8LhO6MWQQ4IriBgHgMglYhoCY=; b=jQHQ9Y1aDgPEYMySeRATMK1o8aoaJtVsiCxjih8bdICcJPpiqAkzHCc3xVupGpVCAv 6MhfGk+dLkh25Jnw300BPOoYa2Jp6Hm4E2Q/DM5+TdGf0SFi9niVf1A8XV8dPchCihc6 Sp2CPKxG41Zpeq8lYWtGvKXLkGfeqIPMg4Pg7o9g2QHIcvR4cGsrDS6x9yolbuhL0uni ilhpA2cn2Upry1szCPwrsVYObWY9rolm4No9ZXTOI1/g7GaVG0uKsY9IfNwOy2TK83Bf seHb1/AefDOIctwd4uy6gJ4g/9DHCaEKHTgLpu5RnMHZs5NKCxVuYZhLabjgxmYHUy9a E+/A== X-Gm-Message-State: AOJu0YxR+ETkDnCOJncU0rd9wCMTUaOuF1UeGQwwc+REUNyB/cV5Qpn4 2XJ3XCXmxjL41+GOEtOLZZCi X-Google-Smtp-Source: AGHT+IG92nhie3EIlzba0cNTnAN4eiTZxnnYEaOFDQ/YoEHC+jxjF0thIpoXo9EEr5H6Qevvl6jD5w== X-Received: by 2002:a5d:6852:0:b0:319:6e9e:bbdc with SMTP id o18-20020a5d6852000000b003196e9ebbdcmr4303218wrw.32.1694184947393; Fri, 08 Sep 2023 07:55:47 -0700 (PDT) Received: from localhost.localdomain ([2001:861:5e4c:3bb0:fa3:84b9:61c0:bf1a]) by smtp.gmail.com with ESMTPSA id n4-20020a05600c294400b003fbdbd0a7desm5393339wmd.27.2023.09.08.07.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 07:55:47 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, dmalcolm@redhat.com, Raiki Tamura Subject: [PATCH v3] libcpp: add function to check XID properties Date: Fri, 8 Sep 2023 16:59:09 +0200 Message-Id: <20230908145908.915341-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.5 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 List-Id: From: Raiki Tamura Fixed to include the enum's name which I had forgotten to commit. Thanks ---- 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..583e3071e90 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_property { + CPP_XID_START = 1, + CPP_XID_CONTINUE = 2 +}; + +unsigned int cpp_check_xid_property (cppchar_t c); + #endif /* ! LIBCPP_CPPLIB_H */ -- 2.40.0