Moved utf8.h/cpp to namespace json::
This commit is contained in:
parent
1c2e479012
commit
d4c48ea269
@ -1,7 +1,8 @@
|
||||
#include "utf8.h"
|
||||
#include <assert.h>
|
||||
|
||||
int _utf8_retrieve_size(uint8_t firstByte) {
|
||||
namespace json {
|
||||
int utf8_retrieve_size(uint8_t firstByte) {
|
||||
if (!(firstByte & 0b10000000))
|
||||
return 1;
|
||||
uint8_t a = 0b11000000;
|
||||
@ -13,9 +14,9 @@ int _utf8_retrieve_size(uint8_t firstByte) {
|
||||
b >>= 1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
int32_t _utf8_retrieve_character(int sz, size_t pos, const char *string) {
|
||||
int32_t utf8_retrieve_character(int sz, size_t pos, const char *string) {
|
||||
if (sz == 1)
|
||||
return (int32_t)string[pos];
|
||||
uint32_t v = ((uint8_t)string[pos]) & (0b01111111 >> sz);
|
||||
@ -30,16 +31,16 @@ int32_t _utf8_retrieve_character(int sz, size_t pos, const char *string) {
|
||||
}
|
||||
assert(v <= INT32_MAX);
|
||||
return static_cast<int32_t>(v);
|
||||
}
|
||||
}
|
||||
|
||||
void utf8_string_iterat(int32_t &cp, size_t &adj, size_t pos, const char *string, size_t string_size) {
|
||||
void utf8_string_iterat(int32_t &cp, size_t &adj, size_t pos, const char *string, size_t string_size) {
|
||||
if (pos >= string_size) {cp = -1; return;}
|
||||
adj = _utf8_retrieve_size((uint8_t)string[pos]);
|
||||
adj = utf8_retrieve_size((uint8_t)string[pos]);
|
||||
if (adj < 0 || pos + adj > string_size) {cp = -1; return;}
|
||||
if ((cp = _utf8_retrieve_character(adj, pos, string)) < 0) {cp = -1; return;}
|
||||
}
|
||||
if ((cp = utf8_retrieve_character(adj, pos, string)) < 0) {cp = -1; return;}
|
||||
}
|
||||
|
||||
bool isUtf8String(const std::string &str) {
|
||||
bool isUtf8String(const std::string &str) {
|
||||
size_t N = str.size();
|
||||
size_t cpos = 0;
|
||||
while (cpos < N) {
|
||||
@ -51,9 +52,9 @@ bool isUtf8String(const std::string &str) {
|
||||
cpos += adj;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
int codepoint_to_utf8(uint32_t cp, std::string &out) {
|
||||
int codepoint_to_utf8(uint32_t cp, std::string &out) {
|
||||
size_t N = out.size();
|
||||
auto make_compl = [cp](int imp) -> char {
|
||||
return (char)(((cp >> imp) & 0x3f) | 0x80);
|
||||
@ -79,4 +80,5 @@ int codepoint_to_utf8(uint32_t cp, std::string &out) {
|
||||
out[N + 3] = make_compl(0);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@ -4,15 +4,17 @@
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
|
||||
int _utf8_retrieve_size(uint8_t firstByte);
|
||||
namespace json {
|
||||
int utf8_retrieve_size(uint8_t firstByte);
|
||||
|
||||
int32_t _utf8_retrieve_character(int sz, size_t pos, const char *string);
|
||||
int32_t utf8_retrieve_character(int sz, size_t pos, const char *string);
|
||||
|
||||
void utf8_string_iterat(int32_t &cp, size_t &adj, size_t pos, const char *string, size_t string_size);
|
||||
void utf8_string_iterat(int32_t &cp, size_t &adj, size_t pos, const char *string, size_t string_size);
|
||||
|
||||
bool isUtf8String(const std::string& str);
|
||||
bool isUtf8String(const std::string& str);
|
||||
|
||||
/* Returns -1 if cp is not in 0-0x10FFFF range */
|
||||
int codepoint_to_utf8(uint32_t cp, std::string& out);
|
||||
/* Returns -1 if cp is not in 0-0x10FFFF range */
|
||||
int codepoint_to_utf8(uint32_t cp, std::string& out);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user