Thanks to visit codestin.com
Credit goes to github.com

Skip to content

IDNA refactor names #130

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

Merged
merged 4 commits into from
Jun 17, 2020
Merged

IDNA refactor names #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a825680
I managed to find that I renamed a namespace and class as the same, s…
glynos Jun 17, 2020
6579218
Made IDNA code point status a bit more efficient
glynos Jun 17, 2020
badfb73
Compressed IDNA table a little more by storing code points with value…
glynos Jun 17, 2020
88e5bb5
Fixed IDNA table generator script
glynos Jun 17, 2020
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
10 changes: 5 additions & 5 deletions examples/example_11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ using namespace std::string_view_literals;

int main() {
auto host_domain = skyr::parse_host("example.com"sv);
std::cout << host_domain.value().domain().value() << std::endl;
std::cout << host_domain.value().serialize() << std::endl;

auto host_ipv4 = skyr::parse_host("192.168.0.1"sv);
std::cout << host_ipv4.value().ipv4_address().value().serialize() << std::endl;
std::cout << host_ipv4.value().serialize() << std::endl;

auto host_ipv6 = skyr::parse_host("[::1]"sv);
std::cout << host_ipv6.value().ipv6_address().value().serialize() << std::endl;
auto host_ipv6 = skyr::parse_host("[2001:0db8:0:0::1428:57ab]"sv);
std::cout << host_ipv6.value().serialize() << std::endl;

auto localhost = skyr::parse_host("localhost"sv);
std::cout << localhost.value().domain().value() << std::endl;
std::cout << localhost.value().serialize() << std::endl;
}
30 changes: 15 additions & 15 deletions src/v1/domain/domain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,37 +28,37 @@ auto map_code_points(
auto it = first;

while (it != last) {
switch (domain::map_idna_status(*it)) {
case domain::idna_status::disallowed:
switch (idna::code_point_status(*it)) {
case idna::idna_status::disallowed:
error = true;
break;
case domain::idna_status::disallowed_std3_valid:
case idna::idna_status::disallowed_std3_valid:
if (use_std3_ascii_rules) {
error = true;
} else {
result += *it;
}
break;
case domain::idna_status::disallowed_std3_mapped:
case idna::idna_status::disallowed_std3_mapped:
if (use_std3_ascii_rules) {
error = true;
} else {
result += domain::map_idna_code_point(*it);
result += idna::map_code_point(*it);
}
break;
case domain::idna_status::ignored:
case idna::idna_status::ignored:
break;
case domain::idna_status::mapped:
result += domain::map_idna_code_point(*it);
case idna::idna_status::mapped:
result += idna::map_code_point(*it);
break;
case domain::idna_status::deviation:
case idna::idna_status::deviation:
if (transitional_processing) {
result += domain::map_idna_code_point(*it);
result += idna::map_code_point(*it);
} else {
result += *it;
}
break;
case domain::idna_status::valid:
case idna::idna_status::valid:
result += *it;
break;
}
Expand Down Expand Up @@ -95,8 +95,8 @@ auto validate_label(std::u32string_view label, [[maybe_unused]] bool use_std3_as
/// Criterion 6
if (transitional_processing) {
static constexpr auto is_valid = [](auto cp) {
auto status = domain::map_idna_status(cp);
return (cp <= U'\x7e') || (status == domain::idna_status::valid);
auto status = idna::code_point_status(cp);
return (cp <= U'\x7e') || (status == idna::idna_status::valid);
};

auto it = std::find_if_not(first, last, is_valid);
Expand All @@ -106,8 +106,8 @@ auto validate_label(std::u32string_view label, [[maybe_unused]] bool use_std3_as
}
else {
static constexpr auto is_valid_or_deviation = [](auto cp) {
auto status = domain::map_idna_status(cp);
return (cp <= U'\x7e') || (status == domain::idna_status::valid) || (status == domain::idna_status::deviation);
auto status = idna::code_point_status(cp);
return (cp <= U'\x7e') || (status == idna::idna_status::valid) || (status == idna::idna_status::deviation);
};

auto it = std::find_if_not(first, last, is_valid_or_deviation);
Expand Down
Loading