Skip to content

Commit af93494

Browse files
committed
Make ICU normalizers unconditional (void), style.
1 parent 4132085 commit af93494

10 files changed

Lines changed: 365 additions & 308 deletions

File tree

include/bitcoin/system/unicode/normalization.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ namespace libbitcoin {
2525
namespace system {
2626

2727
/// Change case of text, complies with section 3.13 of Unicode Standard.
28-
BC_API bool to_lower(std::string& value) NOEXCEPT;
29-
BC_API bool to_upper(std::string& value) NOEXCEPT;
28+
BC_API void to_lower(std::string& value) NOEXCEPT;
29+
BC_API void to_upper(std::string& value) NOEXCEPT;
3030

3131
/// Convert text to Unicode normal form (Unicode Standard).
3232
/// Failure indicated by empty string return for non-empty value.
33-
BC_API bool to_canonical_composition(std::string& value) NOEXCEPT;
34-
BC_API bool to_canonical_decomposition(std::string& value) NOEXCEPT;
35-
BC_API bool to_compatibility_composition(std::string& value) NOEXCEPT;
36-
BC_API bool to_compatibility_decomposition(std::string& value) NOEXCEPT;
33+
BC_API void to_canonical_composition(std::string& value) NOEXCEPT;
34+
BC_API void to_canonical_decomposition(std::string& value) NOEXCEPT;
35+
BC_API void to_compatibility_composition(std::string& value) NOEXCEPT;
36+
BC_API void to_compatibility_decomposition(std::string& value) NOEXCEPT;
3737

3838
/// Character tests.
3939
BC_API bool is_unicode(char32_t point) NOEXCEPT;

include/bitcoin/system/unicode/unicode_tables.hpp

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,17 @@
2929
namespace libbitcoin {
3030
namespace system {
3131

32-
constexpr int decomp_shift = 7;
33-
34-
constexpr size_t decomp_pool_count = 10320;
35-
constexpr size_t decomp_index1_count = 8704;
36-
constexpr size_t decomp_index2_count = 13568;
37-
constexpr size_t comp_pairs_count = 941;
32+
constexpr size_t decomposition_pool_count = 10320;
33+
constexpr size_t decomposition_index1_count = 8704;
34+
constexpr size_t decomposition_index2_count = 13568;
35+
constexpr size_t composition_pairs_count = 941;
3836
constexpr size_t case_fold_pairs_count = 1530;
3937
constexpr size_t upper_pairs_count = 1423;
4038

41-
extern const uint32_t decomp_pool[decomp_pool_count];
42-
extern const uint16_t decomp_index1[decomp_index1_count];
43-
extern const uint16_t decomp_index2[decomp_index2_count];
44-
extern const uint32_t comp_pairs[comp_pairs_count * 3];
39+
extern const uint32_t decomposition_pool[decomposition_pool_count];
40+
extern const uint16_t decomposition_index1[decomposition_index1_count];
41+
extern const uint16_t decomposition_index2[decomposition_index2_count];
42+
extern const uint32_t composition_pairs[composition_pairs_count * 3];
4543
extern const uint32_t case_fold_pairs[case_fold_pairs_count * 5];
4644
extern const uint32_t upper_pairs[upper_pairs_count * 5];
4745

0 commit comments

Comments
 (0)