hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added mio_trim_uchars() and mio_trim_bchars()

Browse Source
This commit is contained in:
hyung-hwan 2021-07-16 08:06:17 +00:00
parent f8d175a761
commit 07677a7080
2 changed files with 134 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mio/lib/mio-utl.h
View File

@ -225,6 +225,21 @@
#define MIO_HASH_UCSTR(hv, ptr) MIO_HASH_VPTR(hv, ptr, const mio_uch_t) #define MIO_HASH_UCSTR(hv, ptr) MIO_HASH_VPTR(hv, ptr, const mio_uch_t)
#define MIO_HASH_MORE_UCSTR(hv, ptr) MIO_HASH_MORE_VPTR(hv, ptr, const mio_uch_t) #define MIO_HASH_MORE_UCSTR(hv, ptr) MIO_HASH_MORE_VPTR(hv, ptr, const mio_uch_t)
/* =========================================================================
* STRING
* ========================================================================= */
enum mio_trim_oochars_flag_t
{
MIO_TRIM_OOCHARS_LEFT = (1 << 0), /**< trim leading spaces */
#define MIO_TRIM_OOCHARS_LEFT MIO_TRIM_OOCHARS_LEFT
#define MIO_TRIM_UCHARS_LEFT MIO_TRIM_OOCHARS_LEFT
#define MIO_TRIM_BCHARS_LEFT MIO_TRIM_OOCHARS_LEFT
MIO_TRIM_OOCHARS_RIGHT = (1 << 1) /**< trim trailing spaces */
#define MIO_TRIM_OOCHARS_RIGHT MIO_TRIM_OOCHARS_RIGHT
#define MIO_TRIM_UCHARS_RIGHT MIO_TRIM_OOCHARS_RIGHT
#define MIO_TRIM_BCHARS_RIGHT MIO_TRIM_OOCHARS_RIGHT
};
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -453,6 +468,19 @@ MIO_EXPORT mio_bch_t* mio_find_bchar_in_bcstr (
mio_bch_t c mio_bch_t c
); );
MIO_EXPORT mio_uch_t* mio_trim_uchars (
mio_uch_t* str,
mio_oow_t* len,
int flags
);
MIO_EXPORT mio_bch_t* mio_trim_bchars (
mio_bch_t* str,
mio_oow_t* len,
int flags
);
MIO_EXPORT int mio_split_ucstr ( MIO_EXPORT int mio_split_ucstr (
mio_uch_t* s, mio_uch_t* s,
const mio_uch_t* delim, const mio_uch_t* delim,
@ -503,6 +531,7 @@ MIO_EXPORT mio_oow_t mio_count_bcstr (
# define mio_rfind_oochar mio_rfind_uchar # define mio_rfind_oochar mio_rfind_uchar
# define mio_find_oochar_in_oocstr mio_find_uchar_in_ucstr # define mio_find_oochar_in_oocstr mio_find_uchar_in_ucstr
# define mio_trim_oochars mio_trim_uchars
# define mio_split_oocstr mio_split_ucstr # define mio_split_oocstr mio_split_ucstr
# define mio_count_oocstr mio_count_ucstr # define mio_count_oocstr mio_count_ucstr
#else #else
@ -531,6 +560,7 @@ MIO_EXPORT mio_oow_t mio_count_bcstr (
# define mio_rfind_oochar mio_rfind_bchar # define mio_rfind_oochar mio_rfind_bchar
# define mio_find_oochar_in_oocstr mio_find_bchar_in_bcstr # define mio_find_oochar_in_oocstr mio_find_bchar_in_bcstr
# define mio_trim_oochars mio_trim_bchars
# define mio_split_oocstr mio_split_bcstr # define mio_split_oocstr mio_split_bcstr
# define mio_count_oocstr mio_count_bcstr # define mio_count_oocstr mio_count_bcstr
#endif #endif

124
mio/lib/utl.c
View File

@ -638,8 +638,92 @@ const mio_uch_t* mio_find_ucstr_word_in_ucstr (const mio_uch_t* str, const mio_u
} }
/* ========================================================================= */ /* ========================================================================= */
#define IS_UCH_SPACE(x) ((x) ==' ' || (x) == '\t' || (x) == '\n' || (x) == '\r')
#define IS_BCH_SPACE(x) ((x) ==' ' || (x) == '\t' || (x) == '\n' || (x) == '\r') mio_uch_t* mio_trim_uchars (mio_uch_t* str, mio_oow_t* len, int flags)
{
mio_uch_t* p = str, * end = str + *len;
if (p < end)
{
mio_uch_t* s = MIO_NULL, * e = MIO_NULL;
do
{
if (!mio_is_uch_space(*p))
{
if (s == MIO_NULL) s = p;
e = p;
}
p++;
}
while (p < end);
if (e)
{
if (flags & MIO_TRIM_UCHARS_RIGHT)
{
*len -= end - e - 1;
}
if (flags & MIO_TRIM_UCHARS_LEFT)
{
*len -= s - str;
str = s;
}
}
else
{
/* the entire string need to be deleted */
if ((flags & MIO_TRIM_UCHARS_RIGHT) ||
(flags & MIO_TRIM_UCHARS_LEFT)) *len = 0;
}
}
return str;
}
mio_bch_t* mio_trim_bchars (mio_bch_t* str, mio_oow_t* len, int flags)
{
mio_bch_t* p = str, * end = str + *len;
if (p < end)
{
mio_bch_t* s = MIO_NULL, * e = MIO_NULL;
do
{
if (!mio_is_bch_space(*p))
{
if (s == MIO_NULL) s = p;
e = p;
}
p++;
}
while (p < end);
if (e)
{
if (flags & MIO_TRIM_BCHARS_RIGHT)
{
*len -= end - e - 1;
}
if (flags & MIO_TRIM_BCHARS_LEFT)
{
*len -= s - str;
str = s;
}
}
else
{
/* the entire string need to be deleted */
if ((flags & MIO_TRIM_BCHARS_RIGHT) ||
(flags & MIO_TRIM_BCHARS_LEFT)) *len = 0;
}
}
return str;
}
/* ========================================================================= */
int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio_uch_t rquote, mio_uch_t escape) int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio_uch_t rquote, mio_uch_t escape)
{ {
@ -653,13 +737,13 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
{ {
delim_mode = 1; delim_mode = 1;
for (d = (mio_uch_t*)delim; *d != '\0'; d++) for (d = (mio_uch_t*)delim; *d != '\0'; d++)
if (!IS_UCH_SPACE(*d)) delim_mode = 2; if (!mio_is_uch_space(*d)) delim_mode = 2;
} }
if (delim_mode == 0) if (delim_mode == 0)
{ {
/* skip preceding space characters */ /* skip preceding space characters */
while (IS_UCH_SPACE(*p)) p++; while (mio_is_uch_space(*p)) p++;
/* when 0 is given as "delim", it has an effect of cutting /* when 0 is given as "delim", it has an effect of cutting
preceding and trailing space characters off "s". */ preceding and trailing space characters off "s". */
@ -688,7 +772,7 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
ep = p; ep = p;
p++; p++;
} }
while (IS_UCH_SPACE(*p)) p++; while (mio_is_uch_space(*p)) p++;
if (*p != '\0') return -1; if (*p != '\0') return -1;
if (sp == 0 && ep == 0) s[0] = '\0'; if (sp == 0 && ep == 0) s[0] = '\0';
@ -703,7 +787,7 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
{ {
while (*p) while (*p)
{ {
if (!IS_UCH_SPACE(*p)) if (!mio_is_uch_space(*p))
{ {
if (sp == 0) sp = p; if (sp == 0) sp = p;
ep = p; ep = p;
@ -727,7 +811,7 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
while (*p) while (*p)
{ {
o = p; o = p;
while (IS_UCH_SPACE(*p)) p++; while (mio_is_uch_space(*p)) p++;
if (o != p) { mio_copy_ucstr_unlimited (o, p); p = o; } if (o != p) { mio_copy_ucstr_unlimited (o, p); p = o; }
if (lquote != '\0' && *p == lquote) if (lquote != '\0' && *p == lquote)
@ -764,7 +848,7 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
if (o != p) cnt++; if (o != p) cnt++;
break; break;
} }
if (IS_UCH_SPACE (*p)) if (mio_is_uch_space(*p))
{ {
*p++ = '\0'; *p++ = '\0';
cnt++; cnt++;
@ -783,7 +867,7 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
while (*p != '\0') while (*p != '\0')
{ {
o = p; o = p;
while (IS_UCH_SPACE(*p)) p++; while (mio_is_uch_space(*p)) p++;
if (o != p) { mio_copy_ucstr_unlimited (o, p); p = o; } if (o != p) { mio_copy_ucstr_unlimited (o, p); p = o; }
if (lquote != '\0' && *p == lquote) if (lquote != '\0' && *p == lquote)
@ -811,7 +895,7 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
} }
ok = 0; ok = 0;
while (IS_UCH_SPACE(*p)) p++; while (mio_is_uch_space(*p)) p++;
if (*p == '\0') ok = 1; if (*p == '\0') ok = 1;
for (d = (mio_uch_t*)delim; *d != '\0'; d++) for (d = (mio_uch_t*)delim; *d != '\0'; d++)
{ {
@ -863,7 +947,7 @@ int mio_split_ucstr (mio_uch_t* s, const mio_uch_t* delim, mio_uch_t lquote, mio
} }
} }
if (!IS_UCH_SPACE (*p)) if (!mio_is_uch_space(*p))
{ {
if (sp == MIO_NULL) sp = p; if (sp == MIO_NULL) sp = p;
ep = p; ep = p;
@ -891,13 +975,13 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
{ {
delim_mode = 1; delim_mode = 1;
for (d = (mio_bch_t*)delim; *d != '\0'; d++) for (d = (mio_bch_t*)delim; *d != '\0'; d++)
if (!IS_BCH_SPACE(*d)) delim_mode = 2; if (!mio_is_bch_space(*d)) delim_mode = 2;
} }
if (delim_mode == 0) if (delim_mode == 0)
{ {
/* skip preceding space characters */ /* skip preceding space characters */
while (IS_BCH_SPACE(*p)) p++; while (mio_is_bch_space(*p)) p++;
/* when 0 is given as "delim", it has an effect of cutting /* when 0 is given as "delim", it has an effect of cutting
preceding and trailing space characters off "s". */ preceding and trailing space characters off "s". */
@ -926,7 +1010,7 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
ep = p; ep = p;
p++; p++;
} }
while (IS_BCH_SPACE(*p)) p++; while (mio_is_bch_space(*p)) p++;
if (*p != '\0') return -1; if (*p != '\0') return -1;
if (sp == 0 && ep == 0) s[0] = '\0'; if (sp == 0 && ep == 0) s[0] = '\0';
@ -941,7 +1025,7 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
{ {
while (*p) while (*p)
{ {
if (!IS_BCH_SPACE(*p)) if (!mio_is_bch_space(*p))
{ {
if (sp == 0) sp = p; if (sp == 0) sp = p;
ep = p; ep = p;
@ -965,7 +1049,7 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
while (*p) while (*p)
{ {
o = p; o = p;
while (IS_BCH_SPACE(*p)) p++; while (mio_is_bch_space(*p)) p++;
if (o != p) { mio_copy_bcstr_unlimited (o, p); p = o; } if (o != p) { mio_copy_bcstr_unlimited (o, p); p = o; }
if (lquote != '\0' && *p == lquote) if (lquote != '\0' && *p == lquote)
@ -1002,7 +1086,7 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
if (o != p) cnt++; if (o != p) cnt++;
break; break;
} }
if (IS_BCH_SPACE (*p)) if (mio_is_bch_space(*p))
{ {
*p++ = '\0'; *p++ = '\0';
cnt++; cnt++;
@ -1021,7 +1105,7 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
while (*p != '\0') while (*p != '\0')
{ {
o = p; o = p;
while (IS_BCH_SPACE(*p)) p++; while (mio_is_bch_space(*p)) p++;
if (o != p) { mio_copy_bcstr_unlimited (o, p); p = o; } if (o != p) { mio_copy_bcstr_unlimited (o, p); p = o; }
if (lquote != '\0' && *p == lquote) if (lquote != '\0' && *p == lquote)
@ -1049,7 +1133,7 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
} }
ok = 0; ok = 0;
while (IS_BCH_SPACE(*p)) p++; while (mio_is_bch_space(*p)) p++;
if (*p == '\0') ok = 1; if (*p == '\0') ok = 1;
for (d = (mio_bch_t*)delim; *d != '\0'; d++) for (d = (mio_bch_t*)delim; *d != '\0'; d++)
{ {
@ -1101,7 +1185,7 @@ int mio_split_bcstr (mio_bch_t* s, const mio_bch_t* delim, mio_bch_t lquote, mio
} }
} }
if (!IS_BCH_SPACE (*p)) if (!mio_is_bch_space(*p))
{ {
if (sp == MIO_NULL) sp = p; if (sp == MIO_NULL) sp = p;
ep = p; ep = p;