@@ -28,37 +28,37 @@ auto map_code_points(
28
28
auto it = first;
29
29
30
30
while (it != last) {
31
- switch (domain::map_idna_status (*it)) {
32
- case domain ::idna_status::disallowed:
31
+ switch (idna::code_point_status (*it)) {
32
+ case idna ::idna_status::disallowed:
33
33
error = true ;
34
34
break ;
35
- case domain ::idna_status::disallowed_std3_valid:
35
+ case idna ::idna_status::disallowed_std3_valid:
36
36
if (use_std3_ascii_rules) {
37
37
error = true ;
38
38
} else {
39
39
result += *it;
40
40
}
41
41
break ;
42
- case domain ::idna_status::disallowed_std3_mapped:
42
+ case idna ::idna_status::disallowed_std3_mapped:
43
43
if (use_std3_ascii_rules) {
44
44
error = true ;
45
45
} else {
46
- result += domain::map_idna_code_point (*it);
46
+ result += idna::map_code_point (*it);
47
47
}
48
48
break ;
49
- case domain ::idna_status::ignored:
49
+ case idna ::idna_status::ignored:
50
50
break ;
51
- case domain ::idna_status::mapped:
52
- result += domain::map_idna_code_point (*it);
51
+ case idna ::idna_status::mapped:
52
+ result += idna::map_code_point (*it);
53
53
break ;
54
- case domain ::idna_status::deviation:
54
+ case idna ::idna_status::deviation:
55
55
if (transitional_processing) {
56
- result += domain::map_idna_code_point (*it);
56
+ result += idna::map_code_point (*it);
57
57
} else {
58
58
result += *it;
59
59
}
60
60
break ;
61
- case domain ::idna_status::valid:
61
+ case idna ::idna_status::valid:
62
62
result += *it;
63
63
break ;
64
64
}
@@ -95,8 +95,8 @@ auto validate_label(std::u32string_view label, [[maybe_unused]] bool use_std3_as
95
95
// / Criterion 6
96
96
if (transitional_processing) {
97
97
static constexpr auto is_valid = [](auto cp) {
98
- auto status = domain::map_idna_status (cp);
99
- return (cp <= U' \x7e ' ) || (status == domain ::idna_status::valid);
98
+ auto status = idna::code_point_status (cp);
99
+ return (cp <= U' \x7e ' ) || (status == idna ::idna_status::valid);
100
100
};
101
101
102
102
auto it = std::find_if_not (first, last, is_valid);
@@ -106,8 +106,8 @@ auto validate_label(std::u32string_view label, [[maybe_unused]] bool use_std3_as
106
106
}
107
107
else {
108
108
static constexpr auto is_valid_or_deviation = [](auto cp) {
109
- auto status = domain::map_idna_status (cp);
110
- return (cp <= U' \x7e ' ) || (status == domain ::idna_status::valid) || (status == domain ::idna_status::deviation);
109
+ auto status = idna::code_point_status (cp);
110
+ return (cp <= U' \x7e ' ) || (status == idna ::idna_status::valid) || (status == idna ::idna_status::deviation);
111
111
};
112
112
113
113
auto it = std::find_if_not (first, last, is_valid_or_deviation);
0 commit comments