added qse_mbsxstr()/qse_wcsxstr() and related functions

This commit is contained in:
2011-03-30 09:37:19 +00:00
parent 5662ae2010
commit 9cf0386f11
14 changed files with 2190 additions and 414 deletions

View File

@ -10,8 +10,8 @@ libqsecmn_la_SOURCES = \
syscall.h mem.h \
mem.c xma.c fma.c chr.c chr_cnv.c rex.c \
str_bas.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c str_dup.c \
str_dyn.c str_fcpy.c str_pbrk.c str_put.c str_spn.c str_subst.c \
str_utl.c \
str_dyn.c str_fcpy.c str_pbrk.c str_put.c str_spn.c str_str.c \
str_subst.c str_utl.c \
lda.c oht.c htb.c rbt.c sll.c gdl.c dll.c opt.c \
tio.c tio_get.c tio_put.c \
fio.c pio.c sio.c \

View File

@ -75,8 +75,8 @@ libqsecmn_la_DEPENDENCIES =
am_libqsecmn_la_OBJECTS = mem.lo xma.lo fma.lo chr.lo chr_cnv.lo \
rex.lo str_bas.lo str_cat.lo str_chr.lo str_cnv.lo str_cmp.lo \
str_cpy.lo str_dup.lo str_dyn.lo str_fcpy.lo str_pbrk.lo str_put.lo \
str_spn.lo str_subst.lo str_utl.lo lda.lo oht.lo htb.lo rbt.lo sll.lo \
gdl.lo dll.lo opt.lo tio.lo tio_get.lo tio_put.lo fio.lo \
str_spn.lo str_str.lo str_subst.lo str_utl.lo lda.lo oht.lo htb.lo \
rbt.lo sll.lo gdl.lo dll.lo opt.lo tio.lo tio_get.lo tio_put.lo fio.lo \
pio.lo sio.lo alg_search.lo alg_sort.lo time.lo misc.lo \
assert.lo main.lo stdio.lo
libqsecmn_la_OBJECTS = $(am_libqsecmn_la_OBJECTS)
@ -267,8 +267,8 @@ libqsecmn_la_SOURCES = \
syscall.h mem.h \
mem.c xma.c fma.c chr.c chr_cnv.c rex.c \
str_bas.c str_cat.c str_chr.c str_cnv.c str_cmp.c str_cpy.c str_dup.c \
str_dyn.c str_fcpy.c str_pbrk.c str_put.c str_spn.c str_subst.c \
str_utl.c \
str_dyn.c str_fcpy.c str_pbrk.c str_put.c str_spn.c str_str.c \
str_subst.c str_utl.c \
lda.c oht.c htb.c rbt.c sll.c gdl.c dll.c opt.c \
tio.c tio_get.c tio_put.c \
fio.c pio.c sio.c \
@ -398,6 +398,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_pbrk.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_put.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_spn.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_str.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_subst.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_utl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@

View File

@ -1,5 +1,5 @@
/*
* $Id: str_bas.c 420 2011-03-29 11:20:29Z hyunghwan.chung $
* $Id: str_bas.c 421 2011-03-29 15:37:19Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
@ -43,209 +43,6 @@ qse_size_t qse_strbytes (const qse_char_t* str)
return (p - str) * QSE_SIZEOF(qse_char_t);
}
qse_mchar_t* qse_mbsstr (const qse_mchar_t* str, const qse_mchar_t* sub)
{
const qse_mchar_t* x, * y;
y = sub;
if (*y == QSE_MT('\0')) return (qse_mchar_t*)str;
while (*str != QSE_MT('\0'))
{
if (*str != *y)
{
str++;
continue;
}
x = str;
do
{
if (*y == QSE_MT('\0')) return (qse_mchar_t*)str;
if (*x++ != *y++) break;
}
while (1);
y = sub;
str++;
}
return QSE_NULL;
}
qse_wchar_t* qse_wcsstr (const qse_wchar_t* str, const qse_wchar_t* sub)
{
const qse_wchar_t* x, * y;
y = sub;
if (*y == QSE_WT('\0')) return (qse_wchar_t*)str;
while (*str != QSE_WT('\0'))
{
if (*str != *y)
{
str++;
continue;
}
x = str;
do
{
if (*y == QSE_WT('\0')) return (qse_wchar_t*)str;
if (*x++ != *y++) break;
}
while (1);
y = sub;
str++;
}
return QSE_NULL;
}
qse_char_t* qse_strxstr (
const qse_char_t* str, qse_size_t size, const qse_char_t* sub)
{
return qse_strxnstr (str, size, sub, qse_strlen(sub));
}
qse_char_t* qse_strxnstr (
const qse_char_t* str, qse_size_t strsz,
const qse_char_t* sub, qse_size_t subsz)
{
const qse_char_t* end, * subp;
if (subsz == 0) return (qse_char_t*)str;
if (strsz < subsz) return QSE_NULL;
end = str + strsz - subsz;
subp = sub + subsz;
while (str <= end)
{
const qse_char_t* x = str;
const qse_char_t* y = sub;
while (1)
{
if (y >= subp) return (qse_char_t*)str;
if (*x != *y) break;
x++; y++;
}
str++;
}
return QSE_NULL;
}
qse_char_t* qse_strcasestr (const qse_char_t* str, const qse_char_t* sub)
{
const qse_char_t* x, * y;
y = sub;
if (*y == QSE_T('\0')) return (qse_char_t*)str;
while (*str != QSE_T('\0'))
{
if (QSE_TOUPPER(*str) != QSE_TOUPPER(*y))
{
str++;
continue;
}
x = str;
while (1)
{
if (*y == QSE_T('\0')) return (qse_char_t*)str;
if (QSE_TOUPPER(*x) != QSE_TOUPPER(*y)) break;
x++; y++;
}
y = sub;
str++;
}
return QSE_NULL;
}
qse_char_t* qse_strxcasestr (
const qse_char_t* str, qse_size_t size, const qse_char_t* sub)
{
return qse_strxncasestr (str, size, sub, qse_strlen(sub));
}
qse_char_t* qse_strxncasestr (
const qse_char_t* str, qse_size_t strsz,
const qse_char_t* sub, qse_size_t subsz)
{
const qse_char_t* end, * subp;
if (subsz == 0) return (qse_char_t*)str;
if (strsz < subsz) return QSE_NULL;
end = str + strsz - subsz;
subp = sub + subsz;
while (str <= end)
{
const qse_char_t* x = str;
const qse_char_t* y = sub;
while (1)
{
if (y >= subp) return (qse_char_t*)str;
if (QSE_TOUPPER(*x) != QSE_TOUPPER(*y)) break;
x++; y++;
}
str++;
}
return QSE_NULL;
}
qse_char_t* qse_strrstr (const qse_char_t* str, const qse_char_t* sub)
{
return qse_strxnrstr (str, qse_strlen(str), sub, qse_strlen(sub));
}
qse_char_t* qse_strxrstr (
const qse_char_t* str, qse_size_t size, const qse_char_t* sub)
{
return qse_strxnrstr (str, size, sub, qse_strlen(sub));
}
qse_char_t* qse_strxnrstr (
const qse_char_t* str, qse_size_t strsz,
const qse_char_t* sub, qse_size_t subsz)
{
const qse_char_t* p = str + strsz;
const qse_char_t* subp = sub + subsz;
if (subsz == 0) return (qse_char_t*)p;
if (strsz < subsz) return QSE_NULL;
p = p - subsz;
while (p >= str)
{
const qse_char_t* x = p;
const qse_char_t* y = sub;
while (1)
{
if (y >= subp) return (qse_char_t*)p;
if (*x != *y) break;
x++; y++;
}
p--;
}
return QSE_NULL;
}
const qse_char_t* qse_strxword (
const qse_char_t* str, qse_size_t len, const qse_char_t* word)
{

450
qse/lib/cmn/str_str.c Normal file
View File

@ -0,0 +1,450 @@
/*
* $Id$
*
Copyright 2006-2009 Chung, Hyung-Hwan.
This file is part of QSE.
QSE is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of
the License, or (at your option) any later version.
QSE is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with QSE. If not, see <http://www.gnu.org/licenses/>.
*/
#include <qse/cmn/str.h>
#include <qse/cmn/chr.h>
qse_mchar_t* qse_mbsstr (const qse_mchar_t* str, const qse_mchar_t* sub)
{
const qse_mchar_t* x, * y;
y = sub;
if (*y == QSE_MT('\0')) return (qse_mchar_t*)str;
while (*str != QSE_MT('\0'))
{
if (*str != *y)
{
str++;
continue;
}
x = str;
do
{
if (*y == QSE_MT('\0')) return (qse_mchar_t*)str;
if (*x++ != *y++) break;
}
while (1);
y = sub;
str++;
}
return QSE_NULL;
}
qse_mchar_t* qse_mbsxstr (
const qse_mchar_t* str, qse_size_t size, const qse_mchar_t* sub)
{
return qse_mbsxnstr (str, size, sub, qse_mbslen(sub));
}
qse_mchar_t* qse_mbsxnstr (
const qse_mchar_t* str, qse_size_t strsz,
const qse_mchar_t* sub, qse_size_t subsz)
{
const qse_mchar_t* end, * subp;
if (subsz == 0) return (qse_mchar_t*)str;
if (strsz < subsz) return QSE_NULL;
end = str + strsz - subsz;
subp = sub + subsz;
while (str <= end)
{
const qse_mchar_t* x = str;
const qse_mchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_mchar_t*)str;
if (*x != *y) break;
x++; y++;
}
str++;
}
return QSE_NULL;
}
qse_mchar_t* qse_mbscasestr (const qse_mchar_t* str, const qse_mchar_t* sub)
{
const qse_mchar_t* x, * y;
y = sub;
if (*y == QSE_MT('\0')) return (qse_mchar_t*)str;
while (*str != QSE_MT('\0'))
{
if (QSE_TOMUPPER(*str) != QSE_TOMUPPER(*y))
{
str++;
continue;
}
x = str;
while (1)
{
if (*y == QSE_MT('\0')) return (qse_mchar_t*)str;
if (QSE_TOMUPPER(*x) != QSE_TOMUPPER(*y)) break;
x++; y++;
}
y = sub;
str++;
}
return QSE_NULL;
}
qse_mchar_t* qse_mbsxcasestr (
const qse_mchar_t* str, qse_size_t size, const qse_mchar_t* sub)
{
return qse_mbsxncasestr (str, size, sub, qse_mbslen(sub));
}
qse_mchar_t* qse_mbsxncasestr (
const qse_mchar_t* str, qse_size_t strsz,
const qse_mchar_t* sub, qse_size_t subsz)
{
const qse_mchar_t* end, * subp;
if (subsz == 0) return (qse_mchar_t*)str;
if (strsz < subsz) return QSE_NULL;
end = str + strsz - subsz;
subp = sub + subsz;
while (str <= end)
{
const qse_mchar_t* x = str;
const qse_mchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_mchar_t*)str;
if (QSE_TOMUPPER(*x) != QSE_TOMUPPER(*y)) break;
x++; y++;
}
str++;
}
return QSE_NULL;
}
qse_mchar_t* qse_mbsrstr (const qse_mchar_t* str, const qse_mchar_t* sub)
{
return qse_mbsxnrstr (str, qse_mbslen(str), sub, qse_mbslen(sub));
}
qse_mchar_t* qse_mbsxrstr (
const qse_mchar_t* str, qse_size_t size, const qse_mchar_t* sub)
{
return qse_mbsxnrstr (str, size, sub, qse_mbslen(sub));
}
qse_mchar_t* qse_mbsxnrstr (
const qse_mchar_t* str, qse_size_t strsz,
const qse_mchar_t* sub, qse_size_t subsz)
{
const qse_mchar_t* p = str + strsz;
const qse_mchar_t* subp = sub + subsz;
if (subsz == 0) return (qse_mchar_t*)p;
if (strsz < subsz) return QSE_NULL;
p = p - subsz;
while (p >= str)
{
const qse_mchar_t* x = p;
const qse_mchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_mchar_t*)p;
if (*x != *y) break;
x++; y++;
}
p--;
}
return QSE_NULL;
}
qse_mchar_t* qse_mbsrcasestr (const qse_mchar_t* str, const qse_mchar_t* sub)
{
return qse_mbsxnrcasestr (str, qse_mbslen(str), sub, qse_mbslen(sub));
}
qse_mchar_t* qse_mbsxrcasestr (
const qse_mchar_t* str, qse_size_t size, const qse_mchar_t* sub)
{
return qse_mbsxnrcasestr (str, size, sub, qse_mbslen(sub));
}
qse_mchar_t* qse_mbsxnrcasestr (
const qse_mchar_t* str, qse_size_t strsz,
const qse_mchar_t* sub, qse_size_t subsz)
{
const qse_mchar_t* p = str + strsz;
const qse_mchar_t* subp = sub + subsz;
if (subsz == 0) return (qse_mchar_t*)p;
if (strsz < subsz) return QSE_NULL;
p = p - subsz;
while (p >= str)
{
const qse_mchar_t* x = p;
const qse_mchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_mchar_t*)p;
if (QSE_TOMUPPER(*x) != QSE_TOMUPPER(*y)) break;
x++; y++;
}
p--;
}
return QSE_NULL;
}
qse_wchar_t* qse_wcsstr (const qse_wchar_t* str, const qse_wchar_t* sub)
{
const qse_wchar_t* x, * y;
y = sub;
if (*y == QSE_WT('\0')) return (qse_wchar_t*)str;
while (*str != QSE_WT('\0'))
{
if (*str != *y)
{
str++;
continue;
}
x = str;
do
{
if (*y == QSE_WT('\0')) return (qse_wchar_t*)str;
if (*x++ != *y++) break;
}
while (1);
y = sub;
str++;
}
return QSE_NULL;
}
qse_wchar_t* qse_wcsxstr (
const qse_wchar_t* str, qse_size_t size, const qse_wchar_t* sub)
{
return qse_wcsxnstr (str, size, sub, qse_wcslen(sub));
}
qse_wchar_t* qse_wcsxnstr (
const qse_wchar_t* str, qse_size_t strsz,
const qse_wchar_t* sub, qse_size_t subsz)
{
const qse_wchar_t* end, * subp;
if (subsz == 0) return (qse_wchar_t*)str;
if (strsz < subsz) return QSE_NULL;
end = str + strsz - subsz;
subp = sub + subsz;
while (str <= end)
{
const qse_wchar_t* x = str;
const qse_wchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_wchar_t*)str;
if (*x != *y) break;
x++; y++;
}
str++;
}
return QSE_NULL;
}
qse_wchar_t* qse_wcscasestr (const qse_wchar_t* str, const qse_wchar_t* sub)
{
const qse_wchar_t* x, * y;
y = sub;
if (*y == QSE_WT('\0')) return (qse_wchar_t*)str;
while (*str != QSE_WT('\0'))
{
if (QSE_TOWUPPER(*str) != QSE_TOWUPPER(*y))
{
str++;
continue;
}
x = str;
while (1)
{
if (*y == QSE_WT('\0')) return (qse_wchar_t*)str;
if (QSE_TOWUPPER(*x) != QSE_TOWUPPER(*y)) break;
x++; y++;
}
y = sub;
str++;
}
return QSE_NULL;
}
qse_wchar_t* qse_wcsxcasestr (
const qse_wchar_t* str, qse_size_t size, const qse_wchar_t* sub)
{
return qse_wcsxncasestr (str, size, sub, qse_wcslen(sub));
}
qse_wchar_t* qse_wcsxncasestr (
const qse_wchar_t* str, qse_size_t strsz,
const qse_wchar_t* sub, qse_size_t subsz)
{
const qse_wchar_t* end, * subp;
if (subsz == 0) return (qse_wchar_t*)str;
if (strsz < subsz) return QSE_NULL;
end = str + strsz - subsz;
subp = sub + subsz;
while (str <= end)
{
const qse_wchar_t* x = str;
const qse_wchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_wchar_t*)str;
if (QSE_TOWUPPER(*x) != QSE_TOWUPPER(*y)) break;
x++; y++;
}
str++;
}
return QSE_NULL;
}
qse_wchar_t* qse_wcsrstr (const qse_wchar_t* str, const qse_wchar_t* sub)
{
return qse_wcsxnrstr (str, qse_wcslen(str), sub, qse_wcslen(sub));
}
qse_wchar_t* qse_wcsxrstr (
const qse_wchar_t* str, qse_size_t size, const qse_wchar_t* sub)
{
return qse_wcsxnrstr (str, size, sub, qse_wcslen(sub));
}
qse_wchar_t* qse_wcsxnrstr (
const qse_wchar_t* str, qse_size_t strsz,
const qse_wchar_t* sub, qse_size_t subsz)
{
const qse_wchar_t* p = str + strsz;
const qse_wchar_t* subp = sub + subsz;
if (subsz == 0) return (qse_wchar_t*)p;
if (strsz < subsz) return QSE_NULL;
p = p - subsz;
while (p >= str)
{
const qse_wchar_t* x = p;
const qse_wchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_wchar_t*)p;
if (*x != *y) break;
x++; y++;
}
p--;
}
return QSE_NULL;
}
qse_wchar_t* qse_wcsrcasestr (const qse_wchar_t* str, const qse_wchar_t* sub)
{
return qse_wcsxnrcasestr (str, qse_wcslen(str), sub, qse_wcslen(sub));
}
qse_wchar_t* qse_wcsxrcasestr (
const qse_wchar_t* str, qse_size_t size, const qse_wchar_t* sub)
{
return qse_wcsxnrcasestr (str, size, sub, qse_wcslen(sub));
}
qse_wchar_t* qse_wcsxnrcasestr (
const qse_wchar_t* str, qse_size_t strsz,
const qse_wchar_t* sub, qse_size_t subsz)
{
const qse_wchar_t* p = str + strsz;
const qse_wchar_t* subp = sub + subsz;
if (subsz == 0) return (qse_wchar_t*)p;
if (strsz < subsz) return QSE_NULL;
p = p - subsz;
while (p >= str)
{
const qse_wchar_t* x = p;
const qse_wchar_t* y = sub;
while (1)
{
if (y >= subp) return (qse_wchar_t*)p;
if (QSE_TOWUPPER(*x) != QSE_TOWUPPER(*y)) break;
x++; y++;
}
p--;
}
return QSE_NULL;
}

View File

@ -154,7 +154,6 @@ static int eval_entity (qse_scm_t* scm)
car = PAIR_CAR(scm->e.cod);
if (SYNT(car))
{
qse_printf (QSE_T("xxxxx\n"));
/* the first item in the list is a syntax symbol */
cdr = PAIR_CDR(scm->e.cod);
if (IS_SMALLINT(scm,cdr) || TYPE(cdr) != QSE_SCM_ENT_PAIR)