From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id E02123858D35 for ; Fri, 8 Sep 2023 12:56:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E02123858D35 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-x32c.google.com with SMTP id 5b1f17b1804b1-401b393ddd2so22976845e9.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=g2VBQY6qK8bWYNafpuw+dktz4wJNY2tiQMaAcIwbYbCTcUZUAfrCbO5UJ5gF2obUYV ZM8tOTiZ0vI4DtpQRmswq0haLsjrAHZNkCOHlF2klJ6xTMcz2GkHH38RlGDxvgouuw5v USaRqIJq1Mp6Gcy6c7yjyxaoydm58v3GIXQrPJ7/tRpeXbqbIgLfD6i5EmUjkWOQxcZ9 dt5JIFaKUD5HbW/5ZKK5zexCg7pjvlBxvXCL5C1iChJnA/nb+cS6PGUDtyskwpKQMwZe VWlXvPqMT7kuawkIaVsrBPQLTWn6RQ1DmqOTnMZ9lgmMLhnj0ylFqxojJi9PPe4t80id 2NFQ== X-Gm-Message-State: AOJu0YxDeWv3Un09OrMiSpJOZrOAFW+ZSoqjKhMyg4iPCQBeOEGdTtWd w2YUqLS0c+27XQRtNNOz9sXl X-Google-Smtp-Source: AGHT+IF8e+bZ3LttLIHNPwH97mW9QepUgUj58RfIZsqV0kPjDnSG2GLHZATy0lxbqHstgsKH9yDWMQ== 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 Cc: gcc-rust@gcc.gnu.org, dmalcolm@redhat.com, tromey@redhat.com, Raiki Tamura 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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 */ -- 2.40.0