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

restructured runtime context functions to support more flexibility

Browse Source 
- New functions include: 
    qse_awk_rtx_open ()
    qse_awk_rtx_close ()
    qse_awk_rtx_loop ()
    qse_awk_rtx_call ()
- deprecated qse_awk_run ()
This commit is contained in:
hyung-hwan
2009-02-12 04:46:24 +00:00
parent 0f4fcd737e
commit 44d4f890f4
14 changed files with 653 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
qse/cmd/awk/Awk.cpp
View File

@ -731,8 +731,7 @@ static void print_usage (const qse_char_t* argv0)
if (base == QSE_NULL) base = qse_strrchr(argv0, QSE_T('\\'));
if (base == QSE_NULL) base = argv0; else base++;
qse_printf (QSE_T("Usage: %s [-m main] [-si file]? [-so file]? [-ci file]* [-co file]* [-a arg]* [-w o:n]* \n"), base);
qse_printf (QSE_T(" -m main Specify the main function name\n"));
qse_printf (QSE_T("Usage: %s [-si file]? [-so file]? [-ci file]* [-co file]* [-a arg]* [-w o:n]* \n"), base);
qse_printf (QSE_T(" -si file Specify the input source file\n"));
qse_printf (QSE_T(" The source code is read from stdin when it is not specified\n"));
qse_printf (QSE_T(" -so file Specify the output source file\n"));
@ -758,7 +757,6 @@ static int awk_main (int argc, qse_char_t* argv[])
TestAwk awk;
int mode = 0;
const qse_char_t* mainfn = NULL;
const qse_char_t* srcin = QSE_T("");
const qse_char_t* srcout = NULL;
const qse_char_t* args[256];
@ -781,8 +779,7 @@ static int awk_main (int argc, qse_char_t* argv[])
else if (qse_strcmp(argv[i], QSE_T("-ci")) == 0) mode = 3;
else if (qse_strcmp(argv[i], QSE_T("-co")) == 0) mode = 4;
else if (qse_strcmp(argv[i], QSE_T("-a")) == 0) mode = 5;
else if (qse_strcmp(argv[i], QSE_T("-m")) == 0) mode = 6;
else if (qse_strcmp(argv[i], QSE_T("-w")) == 0) mode = 7;
else if (qse_strcmp(argv[i], QSE_T("-w")) == 0) mode = 6;
else if (qse_strcmp(argv[i], QSE_T("-v")) == 0)
{
verbose = true;
@ -887,18 +884,7 @@ static int awk_main (int argc, qse_char_t* argv[])
args[nargs++] = argv[i];
mode = 0;
}
else if (mode == 6) // entry point
{
if (mainfn != NULL)
{
print_usage (argv[0]);
return -1;
}
mainfn = argv[i];
mode = 0;
}
else if (mode == 7) // word replacement
else if (mode == 6) // word replacement
{
const qse_char_t* p;
qse_size_t l;
@ -938,7 +924,7 @@ static int awk_main (int argc, qse_char_t* argv[])
awk.enableRunCallback ();
if (awk.run (mainfn, args, nargs) == -1)
if (awk.run (args, nargs) == -1)
{
qse_fprintf (stderr, QSE_T("cannot run: LINE[%d] %s\n"),
awk.getErrorLine(), awk.getErrorMessage());

16
qse/cmd/awk/awk.c
View File

@ -587,7 +587,7 @@ static int awk_main (int argc, qse_char_t* argv[])
{
qse_awk_t* awk;
qse_awk_runcbs_t runcbs;
qse_awk_rcb_t rcb;
int i;
int runarg_count = 0;
@ -625,14 +625,14 @@ static int awk_main (int argc, qse_char_t* argv[])
goto oops;
}
runcbs.on_start = on_run_start;
runcbs.on_enter = on_run_enter;
runcbs.on_statement = on_run_statement;
runcbs.on_exit = on_run_exit;
runcbs.on_end = on_run_end;
runcbs.data = &ao;
rcb.on_start = on_run_start;
rcb.on_enter = on_run_enter;
rcb.on_statement = on_run_statement;
rcb.on_exit = on_run_exit;
rcb.on_end = on_run_end;
rcb.data = &ao;
if (qse_awk_runsimple (awk, ao.icf, &runcbs) == -1)
if (qse_awk_runsimple (awk, ao.icf, &rcb) == -1)
{
qse_printf (
QSE_T("RUN ERROR: CODE [%d] LINE [%u] %s\n"),