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

sed - enhanced a function to get text following 'a', 'i', 'c'.

Browse Source
This commit is contained in:
hyung-hwan 2009-03-11 07:38:35 +00:00
parent 791565aa2b
commit 2e818033c9
4 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qse/include/qse/utl/sed.h
View File

@ -41,7 +41,9 @@ enum qse_sed_errnum_t
enum qse_sed_option_t enum qse_sed_option_t
{ {
QSE_SED_STRIPLS = (1 << 0) /* strip leading spaces from text*/ QSE_SED_STRIPLS = (1 << 0), /* strip leading spaces from text*/
QSE_SED_KEEPTBS = (1 << 1), /* keep an trailing backslash */
QSE_SED_ENSURENL = (1 << 2) /* ensure NL at the text end */
}; };
typedef struct qse_sed_t qse_sed_t; typedef struct qse_sed_t qse_sed_t;

59
qse/lib/utl/sed.c
View File

@ -214,7 +214,7 @@ static qse_sed_a_t* address (qse_sed_t* sed, qse_sed_a_t* a)
return a; return a;
} }
/* get the text following 'a' and 'i' command. /* get the text for the 'a', 'i', and 'c' commands.
* POSIX: * POSIX:
* The argument text shall consist of one or more lines. Each embedded * The argument text shall consist of one or more lines. Each embedded
* <newline> in the text shall be preceded by a backslash. Other backslashes * <newline> in the text shall be preceded by a backslash. Other backslashes
@ -223,10 +223,19 @@ static qse_sed_a_t* address (qse_sed_t* sed, qse_sed_a_t* a)
static qse_str_t* get_text (qse_sed_t* sed, qse_sed_c_t* cmd) static qse_str_t* get_text (qse_sed_t* sed, qse_sed_c_t* cmd)
{ {
qse_cint_t c; qse_cint_t c;
qse_str_t* text = QSE_NULL; qse_str_t* t = QSE_NULL;
text = qse_str_open (sed->mmgr, 0, 128); #define ADD(sed,str,c,errlabel) \
if (text == QSE_NULL) goto oops; do { \
if (qse_str_ccat (str, c) == (qse_size_t)-1) \
{ \
sed->errnum = QSE_SED_ENOMEM; \
goto errlabel; \
} \
} while (0)
t = qse_str_open (sed->mmgr, 0, 128);
if (t == QSE_NULL) goto oops;
do do
{ {
@ -245,22 +254,23 @@ static qse_str_t* get_text (qse_sed_t* sed, qse_sed_c_t* cmd)
if (c == QSE_T('\\')) if (c == QSE_T('\\'))
{ {
c = NXTSC (sed); c = NXTSC (sed);
if (c == QSE_CHAR_EOF) break; if (c == QSE_CHAR_EOF)
/* TODO: alternate bahavior - add \ to text. */ {
if (sed->option & QSE_SED_KEEPTBS)
ADD (sed, t, QSE_T('\\'), oops);
break;
}
} }
else if (c == QSE_T('\n')) nl = 1; else if (c == QSE_T('\n')) nl = 1;
if (qse_str_ccat (text, c) == (qse_size_t)-1) ADD (sed, t, c, oops);
{
sed->errnum = QSE_SED_ENOMEM;
goto oops;
}
if (c == QSE_T('\n')) if (c == QSE_T('\n'))
{ {
ADVSCP (sed); ADVSCP (sed);
if (nl) break; if (nl) goto done;
break;
} }
c = NXTSC (sed); c = NXTSC (sed);
@ -268,20 +278,19 @@ static qse_str_t* get_text (qse_sed_t* sed, qse_sed_c_t* cmd)
} }
while (c != QSE_CHAR_EOF); while (c != QSE_CHAR_EOF);
if (/*(sed->option & QSE_SED_ENSURENL) &&*/ QSE_STR_LEN(text) == 0) done:
if ((sed->option & QSE_SED_ENSURENL) && c != QSE_T('\n'))
{ {
if (qse_str_ccat (text, QSE_T('\n')) == (qse_size_t)-1) ADD (sed, t, QSE_T('\n'), oops);
{
sed->errnum = QSE_SED_ENOMEM;
goto oops;
}
} }
return text; return t;
oops: oops:
if (text != QSE_NULL) qse_str_close (text); if (t != QSE_NULL) qse_str_close (t);
return QSE_NULL; return QSE_NULL;
#undef ADD
} }
static int command (qse_sed_t* sed) static int command (qse_sed_t* sed)
@ -333,9 +342,10 @@ qse_printf (QSE_T("command not recognized [%c]\n"), c);
case QSE_SED_CMD_A: case QSE_SED_CMD_A:
case QSE_SED_CMD_I: case QSE_SED_CMD_I:
case QSE_SED_CMD_C:
{ {
cmd->type = c; cmd->type = c;
/* /* TODO: this check for A and I
if (cmd->a2.type != QSE_SED_A_NONE) if (cmd->a2.type != QSE_SED_A_NONE)
{ {
sed->errnum = QSE_SED_EA2PHB; sed->errnum = QSE_SED_EA2PHB;
@ -371,15 +381,12 @@ qse_printf (QSE_T("command not recognized [%c]\n"), c);
{ {
qse_char_t ttt[1000]; qse_char_t ttt[1000];
fgets (ttt, QSE_COUNTOF(ttt), stdin); qse_fgets (ttt, QSE_COUNTOF(ttt), QSE_STDIN);
qse_printf (QSE_T("%s%s"), ttt, QSE_STR_PTR(cmd->u.text)); qse_printf (QSE_T("%s%s"), ttt, QSE_STR_PTR(cmd->u.text));
} }
break; break;
} }
case QSE_T('c'):
break;
case QSE_T('g'): case QSE_T('g'):
break; break;

3
qse/lib/utl/sed.h
View File

@ -64,7 +64,8 @@ struct qse_sed_c_t
QSE_SED_CMD_EQ = QSE_T('='), /* print current line number */ QSE_SED_CMD_EQ = QSE_T('='), /* print current line number */
QSE_SED_CMD_A = QSE_T('a'), /* append text */ QSE_SED_CMD_A = QSE_T('a'), /* append text */
QSE_SED_CMD_I = QSE_T('i') /* insert text */ QSE_SED_CMD_I = QSE_T('i'), /* insert text */
QSE_SED_CMD_C = QSE_T('c') /* change text */
} type; } type;
/* TODO: change the data type to a shorter one to save space */ /* TODO: change the data type to a shorter one to save space */

5
qse/test/utl/sed01.c
View File

@ -23,13 +23,14 @@
#include <qse/utl/sed.h> #include <qse/utl/sed.h>
#include <qse/utl/stdio.h> #include <qse/utl/stdio.h>
#include <qse/utl/main.h> #include <qse/utl/main.h>
#include <qse/cmn/str.h>
int sed_main (int argc, qse_char_t* argv[]) int sed_main (int argc, qse_char_t* argv[])
{ {
qse_sed_t* sed = QSE_NULL; qse_sed_t* sed = QSE_NULL;
int ret = -1; int ret = -1;
if (argc != 2) if (argc != 2 && argc != 3)
{ {
qse_fprintf (QSE_STDERR, QSE_T("usage: %s string\n"), argv[0]); qse_fprintf (QSE_STDERR, QSE_T("usage: %s string\n"), argv[0]);
return -1; return -1;
@ -42,7 +43,7 @@ int sed_main (int argc, qse_char_t* argv[])
goto oops; goto oops;
} }
qse_sed_setoption (sed, QSE_SED_STRIPLS); if (argc == 3) qse_sed_setoption (sed, qse_strtoi(argv[2]));
if (qse_sed_compile (sed, argv[1], qse_strlen(argv[1])) == -1) if (qse_sed_compile (sed, argv[1], qse_strlen(argv[1])) == -1)
{ {