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

simplified qse_cut_comp() and related functions

Browse Source
This commit is contained in:
hyung-hwan
2009-12-23 06:56:01 +00:00
parent 200a3f6656
commit aaa1097128
18 changed files with 850 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/lib/cut/Cut.cpp
View File

@ -51,13 +51,13 @@ void Cut::close ()
int Cut::compile (const char_t* sptr)
{
QSE_ASSERT (cut != QSE_NULL);
return qse_cut_comp (cut, sptr, qse_strlen(sptr), delim.in, delim.out);
return qse_cut_comp (cut, sptr, qse_strlen(sptr));
}
int Cut::compile (const char_t* sptr, size_t slen)
{
QSE_ASSERT (cut != QSE_NULL);
return qse_cut_comp (cut, sptr, slen, delim.in, delim.out);
return qse_cut_comp (cut, sptr, slen);
}
int Cut::execute (Stream& iostream)

150
qse/lib/cut/cut.c
View File

@ -162,9 +162,7 @@ void qse_cut_clear (qse_cut_t* cut)
qse_str_setcapa (&cut->e.in.line, DFL_LINE_CAPA);
}
int qse_cut_comp (
qse_cut_t* cut, const qse_char_t* str, qse_size_t len,
qse_char_t din, qse_char_t dout)
int qse_cut_comp (qse_cut_t* cut, const qse_char_t* str, qse_size_t len)
{
const qse_char_t* p = str;
const qse_char_t* xnd = str + len;
@ -178,10 +176,17 @@ int qse_cut_comp (
#define MASK_END (1 << 2)
#define MAX QSE_TYPE_MAX(qse_size_t)
/* free selector blocks compiled previously */
free_all_selector_blocks (cut);
/* set the default delimiters */
cut->sel.din = QSE_T(' ');
cut->sel.dout = QSE_T(' ');
/* if the selector string is empty, don't need to proceed */
if (len <= 0) return 0;
/* compile the selector string */
xnd--; c = CC (p, xnd);
while (1)
{
@ -200,82 +205,115 @@ int qse_cut_comp (
break;
}
if (c == QSE_T('c'))
if (c == QSE_T('d'))
{
sel = QSE_SED_SEL_CHAR;
/* the next character is the input delimiter.
* the output delimiter defaults to the input
* delimiter. */
c = NC (p, xnd);
while (QSE_ISSPACE(c)) c = NC (p, xnd);
}
else if (c == QSE_T('f'))
{
sel = QSE_SED_SEL_FIELD;
c = NC (p, xnd);
while (QSE_ISSPACE(c)) c = NC (p, xnd);
}
if (EOF(c))
{
SETERR0 (cut, QSE_CUT_ESELNV);
return -1;
}
cut->sel.din = c;
cut->sel.dout = c;
if (QSE_ISDIGIT(c))
c = NC (p, xnd);
}
else if (c == QSE_T('D'))
{
do
{
start = start * 10 + (c - QSE_T('0'));
/* the next two characters are the input and
* the output delimiter each. */
c = NC (p, xnd);
if (EOF(c))
{
SETERR0 (cut, QSE_CUT_ESELNV);
return -1;
}
cut->sel.din = c;
c = NC (p, xnd);
if (EOF(c))
{
SETERR0 (cut, QSE_CUT_ESELNV);
return -1;
}
cut->sel.dout = c;
c = NC (p, xnd);
}
else
{
if (c == QSE_T('c') || c == QSE_T('f'))
{
sel = c;
c = NC (p, xnd);
}
while (QSE_ISDIGIT(c));
while (QSE_ISSPACE(c)) c = NC (p, xnd);
mask |= MASK_START;
}
else start++;
if (c == QSE_T('-'))
{
c = NC (p, xnd);
while (QSE_ISSPACE(c)) c = NC (p, xnd);
while (QSE_ISSPACE(c)) c = NC (p, xnd);
}
if (QSE_ISDIGIT(c))
{
do
{
end = end * 10 + (c - QSE_T('0'));
start = start * 10 + (c - QSE_T('0'));
c = NC (p, xnd);
}
while (QSE_ISDIGIT(c));
mask |= MASK_END;
while (QSE_ISSPACE(c)) c = NC (p, xnd);
mask |= MASK_START;
}
else end = MAX;
else start++;
while (QSE_ISSPACE(c)) c = NC (p, xnd);
}
else end = start;
if (!(mask & (MASK_START | MASK_END)))
{
SETERR0 (cut, QSE_CUT_ESELNV);
return -1;
}
if (cut->sel.lb->len >= QSE_COUNTOF(cut->sel.lb->range))
{
if (add_selector_block (cut) <= -1)
if (c == QSE_T('-'))
{
c = NC (p, xnd);
while (QSE_ISSPACE(c)) c = NC (p, xnd);
if (QSE_ISDIGIT(c))
{
do
{
end = end * 10 + (c - QSE_T('0'));
c = NC (p, xnd);
}
while (QSE_ISDIGIT(c));
mask |= MASK_END;
}
else end = MAX;
while (QSE_ISSPACE(c)) c = NC (p, xnd);
}
else end = start;
if (!(mask & (MASK_START | MASK_END)))
{
SETERR0 (cut, QSE_CUT_ESELNV);
return -1;
}
}
cut->sel.lb->range[cut->sel.lb->len].id = sel;
cut->sel.lb->range[cut->sel.lb->len].start = start;
cut->sel.lb->range[cut->sel.lb->len].end = end;
cut->sel.lb->len++;
cut->sel.count++;
if (sel == QSE_SED_SEL_FIELD) cut->sel.fcount++;
else cut->sel.ccount++;
if (cut->sel.lb->len >= QSE_COUNTOF(cut->sel.lb->range))
{
if (add_selector_block (cut) <= -1)
{
return -1;
}
}
cut->sel.lb->range[cut->sel.lb->len].id = sel;
cut->sel.lb->range[cut->sel.lb->len].start = start;
cut->sel.lb->range[cut->sel.lb->len].end = end;
cut->sel.lb->len++;
cut->sel.count++;
if (sel == QSE_SED_SEL_FIELD) cut->sel.fcount++;
else cut->sel.ccount++;
}
if (EOF(c)) break;
if (c == QSE_T(',')) c = NC (p, xnd);
}
cut->sel.din = din;
cut->sel.dout = dout;
return 0;
}

4
qse/lib/cut/cut.h
View File

@ -33,8 +33,8 @@ struct qse_cut_sel_blk_t
{
enum
{
QSE_SED_SEL_CHAR,
QSE_SED_SEL_FIELD
QSE_SED_SEL_CHAR = QSE_T('c'),
QSE_SED_SEL_FIELD = QSE_T('f')
} id;
qse_size_t start;
qse_size_t end;

6
qse/lib/cut/std.c
View File

@ -54,9 +54,9 @@ void* qse_cut_getxtnstd (qse_cut_t* cut)
return (void*)((xtn_t*)QSE_XTN(cut) + 1);
}
int qse_cut_compstd (qse_cut_t* cut, const qse_char_t* sptr, qse_char_t din, qse_char_t dout)
int qse_cut_compstd (qse_cut_t* cut, const qse_char_t* sptr)
{
return qse_cut_comp (cut, sptr, qse_strlen(sptr), din, dout);
return qse_cut_comp (cut, sptr, qse_strlen(sptr));
}
static qse_ssize_t xin (
@ -88,7 +88,7 @@ static qse_ssize_t xin (
qse_cstr_t ea;
ea.ptr = xtn->infile;
ea.len = qse_strlen (xtn->infile);
qse_cut_seterrnum (cut,QSE_CUT_EIOFIL, &ea);
qse_cut_seterrnum (cut, QSE_CUT_EIOFIL, &ea);
return -1;
}
}