Skip to content

Commit

Permalink
🛠 Use ztd.idk unciode utilities to share with cuneicode
Browse files Browse the repository at this point in the history
  • Loading branch information
ThePhD committed Nov 18, 2021
1 parent 74419ca commit 648d7ed
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 247 deletions.
2 changes: 1 addition & 1 deletion include/ztd/text/ascii.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ namespace ztd { namespace text {
ranges::advance(__init);

if constexpr (__call_error_handler) {
if (__point > __txt_detail::__last_ascii_value) {
if (__point > __ztd_idk_detail_last_ascii_value) {
ascii_t __self {};
return __error_handler(__self,
_Result(ranges::reconstruct(::std::in_place_type<_UInputRange>, ::std::move(__init),
Expand Down
6 changes: 3 additions & 3 deletions include/ztd/text/detail/replacement_units.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <ztd/text/version.hpp>

#include <ztd/text/detail/unicode.hpp>
#include <ztd/idk/detail/unicode.hpp>

#include <array>

Expand All @@ -48,11 +48,11 @@ namespace ztd { namespace text {

template <typename _CharType>
inline constexpr ::std::array<_CharType, 1> __question_mark_replacement_units { { static_cast<_CharType>(
__ascii_replacement) } };
__ztd_idk_detail_ascii_replacement) } };

template <typename _CharType>
inline constexpr ::std::array<_CharType, 1> __0xfffd_replacement_units { { static_cast<_CharType>(
__replacement) } };
__ztd_idk_detail_replacement) } };

} // namespace __txt_detail

Expand Down
177 changes: 0 additions & 177 deletions include/ztd/text/detail/unicode.hpp

This file was deleted.

16 changes: 8 additions & 8 deletions include/ztd/text/error_handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
#include <ztd/text/assume_valid_handler.hpp>
#include <ztd/text/throw_handler.hpp>
#include <ztd/text/pass_handler.hpp>
#include <ztd/text/detail/unicode.hpp>
#include <ztd/text/detail/pass_through_handler.hpp>
#include <ztd/text/detail/forwarding_handler.hpp>
#include <ztd/text/detail/transcode_one.hpp>

#include <ztd/ranges/range.hpp>
#include <ztd/ranges/reconstruct.hpp>
#include <ztd/idk/ebco.hpp>
#include <ztd/idk/detail/unicode.hpp>

#include <climits>
#include <cstddef>
Expand Down Expand Up @@ -138,7 +138,7 @@ namespace ztd { namespace text {
}
else if constexpr (is_unicode_code_point_v<_InputCodePoint>) {
constexpr _InputCodePoint __replacements[1]
= { static_cast<_InputCodePoint>(__txt_detail::__replacement) };
= { static_cast<_InputCodePoint>(__ztd_idk_detail_replacement) };
return __txt_detail::__write_direct(__encoding, __replacements, ::std::forward<_Result>(__result));
}
else {
Expand Down Expand Up @@ -184,7 +184,7 @@ namespace ztd { namespace text {
}
else if constexpr (sizeof(_InputCodeUnit) >= sizeof(char)) {
constexpr _InputCodeUnit __replacements[1]
= { static_cast<_InputCodeUnit>(__txt_detail::__ascii_replacement) };
= { static_cast<_InputCodeUnit>(__ztd_idk_detail_ascii_replacement) };
return __txt_detail::__write_direct(__encoding, __replacements, ::std::forward<_Result>(__result));
}
else {
Expand Down Expand Up @@ -241,7 +241,7 @@ namespace ztd { namespace text {
return __replacement_index;
}
else if constexpr (is_unicode_code_point_v<_InputCodePoint>) {
__replacement_code_points[0] = static_cast<_InputCodePoint>(__replacement);
__replacement_code_points[0] = static_cast<_InputCodePoint>(__ztd_idk_detail_replacement);
return 1;
}
else {
Expand Down Expand Up @@ -298,11 +298,11 @@ namespace ztd { namespace text {
return __replacement_index;
}
else if constexpr (is_unicode_code_point_v<_InputCodeUnit>) {
__replacement_code_units[0] = static_cast<_InputCodeUnit>(__replacement);
__replacement_code_units[0] = static_cast<_InputCodeUnit>(__ztd_idk_detail_replacement);
return 1;
}
else if constexpr (sizeof(_InputCodeUnit) >= sizeof(char)) {
__replacement_code_units[0] = static_cast<_InputCodeUnit>(__ascii_replacement);
__replacement_code_units[0] = static_cast<_InputCodeUnit>(__ztd_idk_detail_ascii_replacement);
return 1;
}
else {
Expand Down Expand Up @@ -365,7 +365,7 @@ namespace ztd { namespace text {
else if constexpr (
!(is_code_points_maybe_replaceable_v<_Encoding,
_State&> || is_code_points_maybe_replaceable_v<_Encoding>)&&is_unicode_code_point_v<_CodeUnit>) {
constexpr _CodeUnit __replacements[1] = { static_cast<_CodeUnit>(__txt_detail::__replacement) };
constexpr _CodeUnit __replacements[1] = { static_cast<_CodeUnit>(__ztd_idk_detail_replacement) };
return __txt_detail::__write_direct(__encoding, __replacements, ::std::move(__result));
}
else {
Expand Down Expand Up @@ -462,7 +462,7 @@ namespace ztd { namespace text {
else if constexpr (
!(is_code_points_maybe_replaceable_v<_Encoding,
_State&> || is_code_points_maybe_replaceable_v<_Encoding>)&&is_unicode_code_point_v<_CodePoint>) {
constexpr _CodePoint __replacements[1] = { static_cast<_CodePoint>(__txt_detail::__replacement) };
constexpr _CodePoint __replacements[1] = { static_cast<_CodePoint>(__ztd_idk_detail_replacement) };
return __txt_detail::__write_direct(__encoding, __replacements, ::std::move(__result));
}
else {
Expand Down
2 changes: 1 addition & 1 deletion include/ztd/text/unicode_code_point.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@

#include <ztd/text/type_traits.hpp>
#include <ztd/text/assert.hpp>
#include <ztd/text/detail/unicode.hpp>

#include <ztd/ranges/algorithm.hpp>
#include <ztd/idk/detail/unicode.hpp>

#include <utility>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion include/ztd/text/unicode_scalar_value.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@

#include <ztd/text/type_traits.hpp>
#include <ztd/text/assert.hpp>
#include <ztd/text/detail/unicode.hpp>

#include <ztd/ranges/algorithm.hpp>
#include <ztd/idk/detail/unicode.hpp>

#include <string>
#include <utility>
Expand Down
12 changes: 6 additions & 6 deletions include/ztd/text/utf16.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ namespace ztd { namespace text {
::ztd::span<code_unit, 2>(__units.data(), 2), ::ztd::span<code_point, 0>());
}
}
*__outit = static_cast<code_point>(__txt_detail::__utf16_combine_surrogates(
*__outit = static_cast<code_point>(__ztd_idk_detail_utf16_combine_surrogates(
static_cast<char16_t>(__lead), static_cast<char16_t>(__trail)));
ranges::advance(::std::move(__outit));

Expand Down Expand Up @@ -318,17 +318,17 @@ namespace ztd { namespace text {
}
}

if (__point <= __txt_detail::__last_bmp_value) {
if (__point <= __ztd_idk_detail_last_bmp_value) {
*__outit = static_cast<char16_t>(__point);
ranges::advance(__outit);
}
else {
auto __normal = __point - __txt_detail::__normalizing_value;
auto __normal = __point - __ztd_idk_detail_normalizing_value;
auto __lead = __ztd_idk_detail_first_lead_surrogate
+ ((__normal & __txt_detail::__lead_surrogate_bitmask)
>> __txt_detail::__lead_shifted_bits);
+ ((__normal & __ztd_idk_detail_lead_surrogate_bitmask)
>> __ztd_idk_detail_lead_shifted_bits);
auto __trail = __ztd_idk_detail_first_trail_surrogate
+ (__normal & __txt_detail::__trail_surrogate_bitmask);
+ (__normal & __ztd_idk_detail_trail_surrogate_bitmask);

code_unit __lead16 = static_cast<code_unit>(static_cast<char16_t>(__lead));
code_unit __trail16 = static_cast<code_unit>(static_cast<char16_t>(__trail));
Expand Down

0 comments on commit 648d7ed

Please sign in to comment.