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

added QSE_XLI_JSON and abandoned QSE_XLI_TAGMARKER, QSE_XLI_ARRAYMARKER, and QSE_XLI_ASSIGNWITHCOLON

Browse Source
This commit is contained in:
hyung-hwan
2018-01-08 08:25:49 +00:00
parent 03cb7dd9dc
commit 6237b43441
12 changed files with 284 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
qse/lib/cmn/str-cmp.c
View File

@ -35,7 +35,7 @@ int qse_mbscmp (const qse_mchar_t* s1, const qse_mchar_t* s2)
s1++; s2++;
}
return (*s1 > *s2)? 1: -1;
return ((qse_mchau_t)*s1 > (qse_mchau_t)*s2)? 1: -1;
}
int qse_mbsxcmp (const qse_mchar_t* s1, qse_size_t ln, const qse_mchar_t* s2)
@ -44,7 +44,7 @@ int qse_mbsxcmp (const qse_mchar_t* s1, qse_size_t ln, const qse_mchar_t* s2)
while (s1 < end && *s2 != QSE_MT('\0'))
{
if (*s1 != *s2) return (*s1 > *s2)? 1: -1;
if (*s1 != *s2) return ((qse_mchau_t)*s1 > (qse_mchau_t)*s2)? 1: -1;
s1++; s2++;
}
@ -56,7 +56,7 @@ int qse_mbsxncmp (
const qse_mchar_t* s1, qse_size_t ln1,
const qse_mchar_t* s2, qse_size_t ln2)
{
qse_mchar_t c1, c2;
qse_mchau_t c1, c2;
const qse_mchar_t* end1 = s1 + ln1;
const qse_mchar_t* end2 = s2 + ln2;
@ -78,24 +78,24 @@ int qse_mbsxncmp (
int qse_mbscasecmp (const qse_mchar_t* s1, const qse_mchar_t* s2)
{
while (QSE_TOMUPPER(*s1) == QSE_TOMUPPER(*s2))
while (QSE_TOMUPPER((qse_mchau_t)*s1) == QSE_TOMUPPER((qse_mchau_t)*s2))
{
if (*s1 == QSE_C('\0')) return 0;
s1++; s2++;
}
return (QSE_TOMUPPER(*s1) > QSE_TOMUPPER(*s2))? 1: -1;
return (QSE_TOMUPPER((qse_mchau_t)*s1) > QSE_TOMUPPER((qse_mchau_t)*s2))? 1: -1;
}
int qse_mbsxcasecmp (const qse_mchar_t* s1, qse_size_t ln, const qse_mchar_t* s2)
{
qse_mchar_t c1, c2;
qse_mchau_t c1, c2;
const qse_mchar_t* end = s1 + ln;
while (s1 < end && *s2 != QSE_MT('\0'))
{
c1 = QSE_TOMUPPER(*s1);
c2 = QSE_TOMUPPER(*s2);
c1 = QSE_TOMUPPER((qse_mchau_t)*s1);
c2 = QSE_TOMUPPER((qse_mchau_t)*s2);
if (c1 != c2) return (c1 > c2)? 1: -1;
s1++; s2++;
}
@ -107,16 +107,16 @@ int qse_mbsxncasecmp (
const qse_mchar_t* s1, qse_size_t ln1,
const qse_mchar_t* s2, qse_size_t ln2)
{
qse_mchar_t c1, c2;
qse_mchau_t c1, c2;
const qse_mchar_t* end1 = s1 + ln1;
const qse_mchar_t* end2 = s2 + ln2;
while (s1 < end1)
{
c1 = QSE_TOMUPPER (*s1);
c1 = QSE_TOMUPPER ((qse_mchau_t)*s1);
if (s2 < end2)
{
c2 = QSE_TOMUPPER (*s2);
c2 = QSE_TOMUPPER ((qse_mchau_t)*s2);
if (c1 > c2) return 1;
if (c1 < c2) return -1;
}
@ -138,20 +138,20 @@ int qse_mbszcmp (const qse_mchar_t* s1, const qse_mchar_t* s2, qse_size_t n)
s1++; s2++; n--;
}
return (*s1 > *s2)? 1: -1;
return ((qse_mchau_t)*s1 > (qse_mchau_t)*s2)? 1: -1;
}
int qse_mbszcasecmp (const qse_mchar_t* s1, const qse_mchar_t* s2, qse_size_t n)
{
if (n == 0) return 0;
while (QSE_TOMUPPER(*s1) == QSE_TOMUPPER(*s2))
while (QSE_TOMUPPER((qse_mchau_t)*s1) == QSE_TOMUPPER((qse_mchau_t)*s2))
{
if (*s1 == QSE_MT('\0') || n == 1) return 0;
s1++; s2++; n--;
}
return (QSE_TOMUPPER(*s1) > QSE_TOMUPPER(*s2))? 1: -1;
return (QSE_TOMUPPER((qse_mchau_t)*s1) > QSE_TOMUPPER((qse_mchau_t)*s2))? 1: -1;
}
/* ------------------------------------------------------------- */
@ -173,7 +173,7 @@ int qse_wcsxcmp (const qse_wchar_t* s1, qse_size_t ln, const qse_wchar_t* s2)
while (s1 < end && *s2 != QSE_WT('\0'))
{
if (*s1 != *s2) return (*s1 > *s2)? 1: -1;
if (*s1 != *s2) return ((qse_wchau_t)*s1 > (qse_wchau_t)*s2)? 1: -1;
s1++; s2++;
}
@ -184,7 +184,7 @@ int qse_wcsxncmp (
const qse_wchar_t* s1, qse_size_t ln1,
const qse_wchar_t* s2, qse_size_t ln2)
{
qse_wchar_t c1, c2;
qse_wchau_t c1, c2;
const qse_wchar_t* end1 = s1 + ln1;
const qse_wchar_t* end2 = s2 + ln2;
@ -206,24 +206,24 @@ int qse_wcsxncmp (
int qse_wcscasecmp (const qse_wchar_t* s1, const qse_wchar_t* s2)
{
while (QSE_TOWUPPER(*s1) == QSE_TOWUPPER(*s2))
while (QSE_TOWUPPER((qse_wchau_t)*s1) == QSE_TOWUPPER((qse_wchau_t)*s2))
{
if (*s1 == QSE_C('\0')) return 0;
s1++, s2++;
}
return (QSE_TOWUPPER(*s1) > QSE_TOWUPPER(*s2))? 1: -1;
return (QSE_TOWUPPER((qse_wchau_t)*s1) > QSE_TOWUPPER((qse_wchau_t)*s2))? 1: -1;
}
int qse_wcsxcasecmp (const qse_wchar_t* s1, qse_size_t ln, const qse_wchar_t* s2)
{
qse_wchar_t c1, c2;
qse_wchau_t c1, c2;
const qse_wchar_t* end = s1 + ln;
while (s1 < end && *s2 != QSE_WT('\0'))
{
c1 = QSE_TOWUPPER(*s1);
c2 = QSE_TOWUPPER(*s2);
c1 = QSE_TOWUPPER((qse_wchau_t)*s1);
c2 = QSE_TOWUPPER((qse_wchau_t)*s2);
if (c1 != c2) return (c1 > c2)? 1: -1;
s1++; s2++;
}
@ -234,16 +234,16 @@ int qse_wcsxncasecmp (
const qse_wchar_t* s1, qse_size_t ln1,
const qse_wchar_t* s2, qse_size_t ln2)
{
qse_wchar_t c1, c2;
qse_wchau_t c1, c2;
const qse_wchar_t* end1 = s1 + ln1;
const qse_wchar_t* end2 = s2 + ln2;
while (s1 < end1)
{
c1 = QSE_TOWUPPER (*s1);
c1 = QSE_TOWUPPER((qse_wchau_t)*s1);
if (s2 < end2)
{
c2 = QSE_TOWUPPER (*s2);
c2 = QSE_TOWUPPER((qse_wchau_t)*s2);
if (c1 > c2) return 1;
if (c1 < c2) return -1;
}
@ -264,18 +264,18 @@ int qse_wcszcmp (const qse_wchar_t* s1, const qse_wchar_t* s2, qse_size_t n)
s1++; s2++; n--;
}
return (*s1 > *s2)? 1: -1;
return ((qse_wchau_t)*s1 > (qse_wchau_t)*s2)? 1: -1;
}
int qse_wcszcasecmp (const qse_wchar_t* s1, const qse_wchar_t* s2, qse_size_t n)
{
if (n == 0) return 0;
while (QSE_TOWUPPER(*s1) == QSE_TOWUPPER(*s2))
while (QSE_TOWUPPER((qse_wchau_t)*s1) == QSE_TOWUPPER((qse_wchau_t)*s2))
{
if (*s1 == QSE_WT('\0') || n == 1) return 0;
s1++; s2++; n--;
}
return (QSE_TOWUPPER(*s1) > QSE_TOWUPPER(*s2))? 1: -1;
return (QSE_TOWUPPER((qse_wchau_t)*s1) > QSE_TOWUPPER((qse_wchau_t)*s2))? 1: -1;
}