Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update ada::idna to c++20 #733

Merged
merged 1 commit into from
Sep 6, 2024
Merged

update ada::idna to c++20 #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions include/ada/ada_idna.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* auto-generated on 2023-09-19 15:58:51 -0400. Do not edit! */
/* auto-generated on 2024-09-03 10:55:13 -0400. Do not edit! */
/* begin file include/idna.h */
#ifndef ADA_IDNA_H
#define ADA_IDNA_H
Expand Down Expand Up @@ -119,9 +119,6 @@ std::string to_ascii(std::string_view ut8_string);
// https://url.spec.whatwg.org/#forbidden-domain-code-point
bool contains_forbidden_domain_code_point(std::string_view ascii_string);

bool begins_with(std::u32string_view view, std::u32string_view prefix);
bool begins_with(std::string_view view, std::string_view prefix);

bool constexpr is_ascii(std::u32string_view view);
bool constexpr is_ascii(std::string_view view);

Expand Down
25 changes: 4 additions & 21 deletions src/ada_idna.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* auto-generated on 2023-09-19 15:58:51 -0400. Do not edit! */
/* auto-generated on 2024-09-03 10:55:13 -0400. Do not edit! */
/* begin file src/idna.cpp */
/* begin file src/unicode_transcoding.cpp */

Expand Down Expand Up @@ -9387,22 +9387,6 @@ bool is_label_valid(const std::u32string_view label) {

namespace ada::idna {

bool begins_with(std::u32string_view view, std::u32string_view prefix) {
if (view.size() < prefix.size()) {
return false;
}
// constexpr as of C++20
return std::equal(prefix.begin(), prefix.end(), view.begin());
}

bool begins_with(std::string_view view, std::string_view prefix) {
if (view.size() < prefix.size()) {
return false;
}
// constexpr as of C++20
return std::equal(prefix.begin(), prefix.end(), view.begin());
}

bool constexpr is_ascii(std::u32string_view view) {
for (uint32_t c : view) {
if (c >= 0x80) {
Expand Down Expand Up @@ -9465,7 +9449,7 @@ static std::string from_ascii_to_ascii(std::string_view ut8_string) {
label_start += label_size_with_dot;
if (label_size == 0) {
// empty label? Nothing to do.
} else if (begins_with(label_view, "xn--")) {
} else if (label_view.starts_with("xn--")) {
// The xn-- part is the expensive game.
out.append(label_view);
std::string_view puny_segment_ascii(
Expand Down Expand Up @@ -9532,7 +9516,7 @@ std::string to_ascii(std::string_view ut8_string) {
label_start += label_size_with_dot;
if (label_size == 0) {
// empty label? Nothing to do.
} else if (begins_with(label_view, U"xn--")) {
} else if (label_view.starts_with(U"xn--")) {
// we do not need to check, e.g., Xn-- because mapping goes to lower case
for (char32_t c : label_view) {
if (c >= 0x80) {
Expand Down Expand Up @@ -9611,8 +9595,7 @@ std::string to_unicode(std::string_view input) {
is_last_label ? input.size() - label_start : loc_dot - label_start;
auto label_view = std::string_view(input.data() + label_start, label_size);

if (ada::idna::begins_with(label_view, "xn--") &&
ada::idna::is_ascii(label_view)) {
if (label_view.starts_with("xn--") && ada::idna::is_ascii(label_view)) {
label_view.remove_prefix(4);
if (ada::idna::verify_punycode(label_view)) {
std::u32string tmp_buffer;
Expand Down
Loading