collarbone-annihilation/libjsonincpp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved utf8.h/cpp to namespace json::

Browse Source
This commit is contained in:
Андреев Григорий 2024-08-21 09:50:46 +03:00
parent 1c2e479012
commit d4c48ea269
2 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/library/jsonincpp/utf8.cpp
View File

@ -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;
@ -15,7 +16,7 @@ int _utf8_retrieve_size(uint8_t firstByte) {
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);
@ -34,9 +35,9 @@ 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) {
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) {
@ -80,3 +81,4 @@ int codepoint_to_utf8(uint32_t cp, std::string &out) {
}
return 0;
}
}

6
src/library/jsonincpp/utf8.h
View File

@ -4,9 +4,10 @@
#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);
@ -14,5 +15,6 @@ 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);
}
#endif