admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #11

Browse Source 
Rename string_pbrk into string_search_pbrk for consistency
This commit is contained in:
Patrick Pelissier committed 2017-08-15 09:23:21 +02:00
1 parent 469a4cd074
commit 84e7f4ccaf
3 files changed
+85 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bench/bench-string.cpp
+1 -1
View File
@@ -412,7 +412,7 @@ int testMLIB_scan (int count) {
for (c=i=0; i < count; i++) {
c += string_search_char (b, '.');
c += string_search_str (b, "123");
c += string_pbrk (b, "sm") ^i;
c += string_search_pbrk (b, "sm") ^i;
}
string_clear(b);
return c;
m-string.h
+74 -27
View File
@@ -401,45 +401,62 @@ string_cmpi(const string_t v1, const string_t v2)
}
static inline size_t
string_search_char (const string_t v, char c)
string_search_char (const string_t v, char c, size_t start)
{
STRING_CONTRACT (v);
const char *p = M_ASSIGN_CAST(const char*, strchr(string_get_cstr(v), c));
assert (start <= v->size);
const char *p = M_ASSIGN_CAST(const char*,
strchr(string_get_cstr(v)+start, c));
return p == NULL ? STRING_FAILURE : (size_t) (p-string_get_cstr(v));
}
static inline size_t
string_search_rchar (const string_t v, char c)
string_search_rchar (const string_t v, char c, size_t start)
{
STRING_CONTRACT (v);
assert (start <= v->size);
// NOTE: Can implement it in a faster way than the libc function
// by scanning backward from the bottom of the string (which is
// possible since we know the size)
const char *p = M_ASSIGN_CAST(const char*, strrchr(string_get_cstr(v), c));
const char *p = M_ASSIGN_CAST(const char*,
strrchr(string_get_cstr(v)+start, c));
return p == NULL ? STRING_FAILURE : (size_t) (p-string_get_cstr(v));
}
static inline size_t
string_search_str (const string_t v, const char str[])
string_search_str (const string_t v, const char str[], size_t start)
{
STRING_CONTRACT (v);
assert (start <= v->size);
M_ASSUME (str != NULL);
const char *p = M_ASSIGN_CAST(const char*, strstr(string_get_cstr(v), str));
const char *p = M_ASSIGN_CAST(const char*,
strstr(string_get_cstr(v)+start, str));
return p == NULL ? STRING_FAILURE : (size_t) (p-string_get_cstr(v));
}
static inline size_t
string_search (const string_t v1, const string_t v2)
string_search (const string_t v1, const string_t v2, size_t start)
{
STRING_CONTRACT (v2);
return string_search_str(v1, string_get_cstr(v2));
assert (start <= v1->size);
return string_search_str(v1, string_get_cstr(v2), start);
}
static inline size_t
string_search_pbrk(const string_t v1, const char first_of[], size_t start)
{
STRING_CONTRACT (v1);
assert (start <= v1->size);
M_ASSUME (first_of != NULL);
const char *p = M_ASSIGN_CAST(const char*,
strpbrk(string_get_cstr(v1)+start, first_of));
return p == NULL ? STRING_FAILURE : (size_t) (p-string_get_cstr(v1));
}
static inline int
string_strcoll_str(const string_t v, const char str[])
{
STRING_CONTRACT (v);
M_ASSUME (str != NULL);
return strcoll(string_get_cstr(v), str);
}
@@ -466,15 +483,6 @@ string_cspn(const string_t v1, const char accept[])
return strcspn(string_get_cstr(v1), accept);
}
static inline size_t
string_pbrk(const string_t v1, const char first_of[])
{
STRING_CONTRACT (v1);
M_ASSUME (first_of != NULL);
const char *p = M_ASSIGN_CAST(const char*, strpbrk(string_get_cstr(v1), first_of));
return p == NULL ? STRING_FAILURE : (size_t) (p-string_get_cstr(v1));
}
static inline void
string_left(string_t v, size_t index)
{
@@ -514,12 +522,12 @@ string_mid (string_t v, size_t index, size_t size)
string_left(v, size);
}
static inline bool
string_replace_str (string_t v, const char str1[], const char str2[])
static inline size_t
string_replace_str (string_t v, const char str1[], const char str2[], size_t start)
{
STRING_CONTRACT (v);
M_ASSUME (str1 != NULL && str2 != NULL);
size_t i = string_search_str(v, str1);
size_t i = string_search_str(v, str1, start);
if (i != STRING_FAILURE) {
size_t str1_l = strlen(str1);
size_t str2_l = strlen(str2);
@@ -529,18 +537,17 @@ string_replace_str (string_t v, const char str1[], const char str2[])
memcpy (&v->ptr[i], str2, str2_l);
v->size += str2_l - str1_l;
STRING_CONTRACT (v);
return true;
}
return false;
return i;
}
static inline bool
string_replace (string_t v, const string_t v1, const string_t v2)
static inline size_t
string_replace (string_t v, const string_t v1, const string_t v2, size_t start)
{
STRING_CONTRACT (v);
STRING_CONTRACT (v1);
STRING_CONTRACT (v2);
return string_replace_str(v, string_get_cstr(v1), string_get_cstr(v2));
return string_replace_str(v, string_get_cstr(v1), string_get_cstr(v2), start);
}
static inline void
@@ -902,6 +909,36 @@ namespace m_string {
EXT_ALGO(STRING_SPLIT) \
)
/* Macro encapsulation to give default value for start offset */
#define string_search_char(v, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_char(v, __VA_ARGS__, 0), \
string_search_char(v, __VA_ARGS__) )
#define string_search_rchar(v, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_rchar(v, __VA_ARGS__, 0), \
string_search_rchar(v, __VA_ARGS__) )
#define string_search_str(v, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_str(v, __VA_ARGS__, 0), \
string_search_str(v, __VA_ARGS__) )
#define string_search(v, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__)(string_search(v, __VA_ARGS__, 0), \
string_search(v, __VA_ARGS__) )
#define string_search_pbrk(v, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_pbrk(v, __VA_ARGS__, 0), \
string_search_pbrk(v, __VA_ARGS__) )
#define string_replace_str(v, s1, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__)(string_replace_str(v, s1, __VA_ARGS__, 0), \
string_replace_str(v, s1, __VA_ARGS__) )
#define string_replace(v, s1, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__)(string_replace(v, s1, __VA_ARGS__, 0), \
string_replace(v, s1, __VA_ARGS__) )
/* Macro encapsulation for C11 */
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
@@ -914,6 +951,12 @@ namespace m_string {
const char *: func2, \
default : func1 \
)(a,b)
# define STRINGI_SELECT3(func1,func2,a,b,c) \
_Generic((b)+0, \
char*: func2, \
const char *: func2, \
default : func1 \
)(a,b,c)
#define string_set(a,b) STRINGI_SELECT2(string_set, string_set_str, a, b)
#define string_init_set(a,b) STRINGI_SELECT2(string_init_set, string_init_set_str, a, b)
@@ -921,9 +964,13 @@ namespace m_string {
#define string_cat(a,b) STRINGI_SELECT2(string_cat, string_cat_str, a, b)
#define string_cmp(a,b) STRINGI_SELECT2(string_cmp, string_cmp_str, a, b)
#define string_equal_p(a,b) STRINGI_SELECT2(string_equal_p, string_equal_str_p, a, b)
#define string_search(a,b) STRINGI_SELECT2(string_search, string_search_str, a, b)
#define string_strcoll(a,b) STRINGI_SELECT2(string_strcoll, string_strcoll_str, a, b)
#undef string_search
#define string_search(v, ...) \
M_APPLY(STRINGI_SELECT3, string_search, string_search_str, \
v, __VA_ARGS__ M_IF_NARGS_EQ1(__VA_ARGS__)(M_DEFERRED_COMMA 0, ))
#endif
#endif
tests/test-mstring.c
+10 -10
View File
@@ -103,16 +103,16 @@ int main(void)
assert (string_cmp_str (s1, ", ") == 0);
string_set (s1, s2);
b = string_replace_str (s1, "world", "Paul");
assert (b == true);
i = string_replace_str (s1, "world", "Paul");
assert (i != STRING_FAILURE);
assert (string_cmp_str (s1, "Hello, Paul!") == 0);
b = string_replace_str (s1, "world", "Paul");
assert (b == false);
i = string_replace_str (s1, "world", "Paul");
assert (i == STRING_FAILURE);
assert (string_cmp_str (s1, "Hello, Paul!") == 0);
b = string_replace_str (s1, "Paul", "Juliette");
assert (b == true);
i = string_replace_str (s1, "Paul", "Juliette");
assert (i != STRING_FAILURE);
assert (string_cmp_str (s1, "Hello, Juliette!") == 0);
string_printf (s1, "There is %d Paul!", 2);
@@ -255,8 +255,8 @@ int main(void)
string_init (s1);
string_init (s2);
string_printf (s1, "Hello %d worlds. How do you do? I'm fine. Thank you! The weather is bad today. I should hae brought my umbrella. Oh! You can lend me one! Thank you very much! No really thank you. I wouldn't be able to get in time for my job.", 2);
assert (string_equal_str_p(s1, "Hello 2 worlds. How do you do? I'm fine. Thank you! The weather is bad today. I should hae brought my umbrella. Oh! You can lend me one! Thank you very much! No really thank you. I wouldn't be able to get in time for my job."));
string_printf (s1, "Hello %d worlds. How do you do? I'm fine. Thank you! The weather is bad today. I should had brought my umbrella. Oh! You can lend me one! Thank you very much! No really thank you. I wouldn't be able to get in time for my job.", 2);
assert (string_equal_str_p(s1, "Hello 2 worlds. How do you do? I'm fine. Thank you! The weather is bad today. I should had brought my umbrella. Oh! You can lend me one! Thank you very much! No really thank you. I wouldn't be able to get in time for my job."));
f = fopen ("a.dat", "wt");
assert (f != NULL);
@@ -324,9 +324,9 @@ int main(void)
string_replace_at(s1, 6, 3, "World");
assert(string_equal_str_p(s1, "HELLO World!"));
h = string_pbrk(s1, "AB");
h = string_search_pbrk(s1, "AB");
assert(h==STRING_FAILURE);
h = string_pbrk(s1, "oO");
h = string_search_pbrk(s1, "oO");
assert(h==4);
string_clear (s1);