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

fixed a bug of not handling console output properly in

Browse Source 
qse_awk_rtx_opensimple()
This commit is contained in:
hyung-hwan 2009-02-18 04:37:34 +00:00
parent d7d223cd7e
commit d3e69f1d23
6 changed files with 130 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qse/README
View File

@ -1,5 +1,5 @@
QSE provides a script engine for various scripting languages. It aims to produce a script engine framework that can be embedded into an application. A hosting application can access various aspects of the embedded script engine and vice versa. QSE provides a script engine for various scripting languages and utility programs. It aims to produce a flexible script engine framework that can be embedded into an application. A hosting application can access various aspects of the embedded script engine and vice versa.
<< INSTALL >> << INSTALL >>

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

@ -488,14 +488,14 @@ static int handle_args (int argc, qse_char_t* argv[], struct argout_t* ao)
} }
/* the source code is the string, not from the file */ /* the source code is the string, not from the file */
ao->ist = QSE_AWK_PARSE_STRING; ao->ist = QSE_AWK_SOURCE_STRING;
ao->isp = argv[opt.ind++]; ao->isp = argv[opt.ind++];
free (isf); free (isf);
} }
else else
{ {
ao->ist = QSE_AWK_PARSE_FILES; ao->ist = QSE_AWK_SOURCE_FILES;
ao->isp = isf; ao->isp = isf;
} }
@ -619,7 +619,7 @@ static int awk_main (int argc, qse_char_t* argv[])
rcb.on_exit = on_run_exit; rcb.on_exit = on_run_exit;
rcb.data = &ao; rcb.data = &ao;
rtx = qse_awk_rtx_opensimple (awk, ao.icf); rtx = qse_awk_rtx_opensimple (awk, ao.icf, QSE_T(""));
if (rtx == QSE_NULL) if (rtx == QSE_NULL)
{ {
qse_printf ( qse_printf (
@ -656,7 +656,7 @@ static int awk_main (int argc, qse_char_t* argv[])
oops: oops:
qse_awk_close (awk); qse_awk_close (awk);
if (ao.ist == QSE_AWK_PARSE_FILES && ao.isp != QSE_NULL) free (ao.isp); if (ao.ist == QSE_AWK_SOURCE_FILES && ao.isp != QSE_NULL) free (ao.isp);
/*if (ao.osf != QSE_NULL) free (ao.osf);*/ /*if (ao.osf != QSE_NULL) free (ao.osf);*/
if (ao.icf != QSE_NULL) free (ao.icf); if (ao.icf != QSE_NULL) free (ao.icf);
if (ao.vm != QSE_NULL) qse_map_close (ao.vm); if (ao.vm != QSE_NULL) qse_map_close (ao.vm);

23
qse/include/qse/awk/awk.h
View File

@ -553,12 +553,6 @@ enum qse_awk_rtx_valtostr_opt_t
QSE_AWK_VALTOSTR_PRINT = (1 << 2) QSE_AWK_VALTOSTR_PRINT = (1 << 2)
}; };
enum qse_awk_parse_ist_t
{
QSE_AWK_PARSE_FILES = 0,
QSE_AWK_PARSE_STRING = 1
};
typedef enum qse_awk_errnum_t qse_awk_errnum_t; typedef enum qse_awk_errnum_t qse_awk_errnum_t;
typedef struct qse_awk_val_nil_t qse_awk_val_nil_t; typedef struct qse_awk_val_nil_t qse_awk_val_nil_t;
@ -652,6 +646,15 @@ struct qse_awk_val_ref_t
qse_awk_val_t** adr; qse_awk_val_t** adr;
}; };
enum qse_awk_parse_ist_t
{
QSE_AWK_SOURCE_FILES = 0,
QSE_AWK_SOURCE_STRING = 1
};
#define QSE_AWK_CONSOLE_STDIO (qse_awk_console_stdio)
extern const qse_char_t* qse_awk_console_stdio[];
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -1592,11 +1595,17 @@ int qse_awk_parsesimple (
/****f* AWK/qse_awk_rtx_opensimple /****f* AWK/qse_awk_rtx_opensimple
* NAME * NAME
* qse_awk_rtx_opensimple - create a runtime context * qse_awk_rtx_opensimple - create a runtime context
* DESCRIPTION
* The caller should keep the contents of icf and ocf valid throughout
* the lifetime of the runtime context created. The runtime context
* remembers the pointers without copying in the contents.
*
* SYNOPSIS * SYNOPSIS
*/ */
qse_awk_rtx_t* qse_awk_rtx_opensimple ( qse_awk_rtx_t* qse_awk_rtx_opensimple (
qse_awk_t* awk, qse_awk_t* awk,
qse_char_t** icf const qse_char_t* icf[],
const qse_char_t* ocf[]
); );
/******/ /******/

145
qse/lib/awk/std.c
View File

@ -60,12 +60,25 @@ typedef struct rxtn_t
struct struct
{ {
struct { struct {
qse_char_t** files; const qse_char_t** files;
qse_size_t index; qse_size_t index;
} in; } in;
struct
{
const qse_char_t** files;
qse_size_t index;
} out;
} c; /* console */ } c; /* console */
} rxtn_t; } rxtn_t;
const qse_char_t* qse_awk_console_stdio[] =
{
QSE_T(""),
QSE_NULL
};
static qse_real_t custom_awk_pow (qse_awk_t* awk, qse_real_t x, qse_real_t y) static qse_real_t custom_awk_pow (qse_awk_t* awk, qse_real_t x, qse_real_t y)
{ {
#if defined(HAVE_POWL) #if defined(HAVE_POWL)
@ -153,7 +166,7 @@ static qse_ssize_t sf_in (
if (cmd == QSE_AWK_SIO_OPEN) if (cmd == QSE_AWK_SIO_OPEN)
{ {
if (xtn->s.in.type == QSE_AWK_PARSE_FILES) if (xtn->s.in.type == QSE_AWK_SOURCE_FILES)
{ {
if (xtn->s.in.p.files[xtn->s.in.index] == QSE_NULL) return 0; if (xtn->s.in.p.files[xtn->s.in.index] == QSE_NULL) return 0;
@ -195,7 +208,7 @@ static qse_ssize_t sf_in (
{ {
qse_ssize_t n = 0; qse_ssize_t n = 0;
if (xtn->s.in.type == QSE_AWK_PARSE_FILES) if (xtn->s.in.type == QSE_AWK_SOURCE_FILES)
{ {
qse_sio_t* sio; qse_sio_t* sio;
@ -285,27 +298,6 @@ static qse_ssize_t sf_out (
} }
else if (cmd == QSE_AWK_SIO_WRITE) else if (cmd == QSE_AWK_SIO_WRITE)
{ {
/*
qse_size_t left = size;
while (left > 0)
{
if (*data == QSE_T('\0'))
{
if (qse_fputc (*data, xtn->s.out.handle) == QSE_CHAR_EOF) return -1;
left -= 1; data += 1;
}
else
{
int chunk = (left > QSE_TYPE_MAX(int))? QSE_TYPE_MAX(int): (int)left;
int n = qse_fprintf (xtn->s.out.handle, QSE_T("%.*s"), chunk, data);
if (n < 0) return -1;
left -= n; data += n;
}
}
*/
return qse_sio_putsn (xtn->s.out.handle, data, size); return qse_sio_putsn (xtn->s.out.handle, data, size);
} }
@ -324,11 +316,11 @@ int qse_awk_parsesimple (
return -1; return -1;
} }
if (ist == QSE_AWK_PARSE_FILES) if (ist == QSE_AWK_SOURCE_FILES)
{ {
xtn->s.in.p.files = (const qse_char_t* const*)isp; xtn->s.in.p.files = (const qse_char_t* const*)isp;
} }
else if (ist == QSE_AWK_PARSE_STRING) else if (ist == QSE_AWK_SOURCE_STRING)
{ {
xtn->s.in.p.str = (const qse_char_t*)isp; xtn->s.in.p.str = (const qse_char_t*)isp;
} }
@ -540,6 +532,12 @@ static int open_rio_console (qse_awk_rtx_t* rtx, qse_awk_riod_t* riod)
if (riod->mode == QSE_AWK_RIO_CONSOLE_READ) if (riod->mode == QSE_AWK_RIO_CONSOLE_READ)
{ {
if (rxtn->c.in.files == QSE_NULL)
{
/* no input console file given */
return -1;
}
if (rxtn->c.in.files[rxtn->c.in.index] == QSE_NULL) if (rxtn->c.in.files[rxtn->c.in.index] == QSE_NULL)
{ {
/* no more input file */ /* no more input file */
@ -554,17 +552,17 @@ static int open_rio_console (qse_awk_rtx_t* rtx, qse_awk_riod_t* riod)
} }
else else
{ {
/* a temporary variable fp is used here not to change /* a temporary variable sio is used here not to change
* any fields of riod when the open operation fails */ * any fields of riod when the open operation fails */
qse_sio_t* fp; qse_sio_t* sio;
fp = qse_sio_open ( sio = qse_sio_open (
rtx->awk->mmgr, rtx->awk->mmgr,
0, 0,
rxtn->c.in.files[rxtn->c.in.index], rxtn->c.in.files[rxtn->c.in.index],
QSE_SIO_READ QSE_SIO_READ
); );
if (fp == QSE_NULL) if (sio == QSE_NULL)
{ {
qse_cstr_t errarg; qse_cstr_t errarg;
@ -580,11 +578,11 @@ static int open_rio_console (qse_awk_rtx_t* rtx, qse_awk_riod_t* riod)
rtx, rxtn->c.in.files[rxtn->c.in.index], rtx, rxtn->c.in.files[rxtn->c.in.index],
qse_strlen(rxtn->c.in.files[rxtn->c.in.index])) == -1) qse_strlen(rxtn->c.in.files[rxtn->c.in.index])) == -1)
{ {
qse_sio_close (fp); qse_sio_close (sio);
return -1; return -1;
} }
riod->handle = fp; riod->handle = sio;
} }
rxtn->c.in.index++; rxtn->c.in.index++;
@ -592,16 +590,60 @@ static int open_rio_console (qse_awk_rtx_t* rtx, qse_awk_riod_t* riod)
} }
else if (riod->mode == QSE_AWK_RIO_CONSOLE_WRITE) else if (riod->mode == QSE_AWK_RIO_CONSOLE_WRITE)
{ {
/*dprint (QSE_T(" console(w) - <standard output>\n"));*/ if (rxtn->c.out.files == QSE_NULL)
/* TODO: open console file properly..... */
if (qse_awk_rtx_setofilename (rtx, QSE_T(""), 0) == -1)
{ {
/* no output console file given */
return -1; return -1;
} }
if (rxtn->c.out.files[rxtn->c.out.index] == QSE_NULL)
{
/* no more input file */
/*dprint (QSE_T("console - no more file\n"));*/
return 0;
}
if (rxtn->c.out.files[rxtn->c.out.index][0] == QSE_T('\0'))
{
/*dprint (QSE_T(" console(w) - <standard output>\n"));*/
riod->handle = qse_sio_out; riod->handle = qse_sio_out;
}
else
{
/* a temporary variable sio is used here not to change
* any fields of riod when the open operation fails */
qse_sio_t* sio;
sio = qse_sio_open (
rtx->awk->mmgr,
0,
rxtn->c.out.files[rxtn->c.out.index],
QSE_SIO_READ
);
if (sio == QSE_NULL)
{
qse_cstr_t errarg;
errarg.ptr = rxtn->c.out.files[rxtn->c.out.index];
errarg.len = qse_strlen(rxtn->c.out.files[rxtn->c.out.index]);
qse_awk_rtx_seterror (rtx, QSE_AWK_EOPEN, 0, &errarg);
return -1;
}
/*dprint (QSE_T(" console(w) - %s\n"), rxtn->c.out.files[rxtn->c.out.index]);*/
if (qse_awk_rtx_setofilename (
rtx, rxtn->c.out.files[rxtn->c.out.index],
qse_strlen(rxtn->c.out.files[rxtn->c.out.index])) == -1)
{
qse_sio_close (sio);
return -1;
}
riod->handle = sio;
}
rxtn->c.out.index++;
return 1; return 1;
} }
@ -660,16 +702,16 @@ static qse_ssize_t awk_rio_console (
} }
else else
{ {
qse_sio_t* fp; qse_sio_t* sio;
fp = qse_sio_open ( sio = qse_sio_open (
rtx->awk->mmgr, rtx->awk->mmgr,
0, 0,
rxtn->c.in.files[rxtn->c.in.index], rxtn->c.in.files[rxtn->c.in.index],
QSE_SIO_READ QSE_SIO_READ
); );
if (fp == QSE_NULL) if (sio == QSE_NULL)
{ {
qse_cstr_t errarg; qse_cstr_t errarg;
@ -684,7 +726,7 @@ static qse_ssize_t awk_rio_console (
rtx, rxtn->c.in.files[rxtn->c.in.index], rtx, rxtn->c.in.files[rxtn->c.in.index],
qse_strlen(rxtn->c.in.files[rxtn->c.in.index])) == -1) qse_strlen(rxtn->c.in.files[rxtn->c.in.index])) == -1)
{ {
qse_sio_close (fp); qse_sio_close (sio);
return -1; return -1;
} }
@ -692,7 +734,7 @@ static qse_ssize_t awk_rio_console (
rtx, QSE_AWK_GBL_FNR, qse_awk_val_zero) == -1) rtx, QSE_AWK_GBL_FNR, qse_awk_val_zero) == -1)
{ {
/* need to reset FNR */ /* need to reset FNR */
qse_sio_close (fp); qse_sio_close (sio);
return -1; return -1;
} }
@ -705,7 +747,7 @@ static qse_ssize_t awk_rio_console (
} }
/*dprint (QSE_T("open the next console [%s]\n"), rxtn->c.in.files[rxtn->c.in.index]);*/ /*dprint (QSE_T("open the next console [%s]\n"), rxtn->c.in.files[rxtn->c.in.index]);*/
riod->handle = fp; riod->handle = sio;
} }
rxtn->c.in.index++; rxtn->c.in.index++;
@ -728,7 +770,7 @@ static qse_ssize_t awk_rio_console (
else if (cmd == QSE_AWK_RIO_NEXT) else if (cmd == QSE_AWK_RIO_NEXT)
{ {
int n; int n;
qse_sio_t* fp = (qse_sio_t*)riod->handle; qse_sio_t* sio = (qse_sio_t*)riod->handle;
/*dprint (QSE_T("switching console[%s] of type %x\n"), riod->name, riod->type);*/ /*dprint (QSE_T("switching console[%s] of type %x\n"), riod->name, riod->type);*/
@ -741,12 +783,12 @@ static qse_ssize_t awk_rio_console (
return 0; return 0;
} }
if (fp != QSE_NULL && if (sio != QSE_NULL &&
fp != qse_sio_in && sio != qse_sio_in &&
fp != qse_sio_out && sio != qse_sio_out &&
fp != qse_sio_err) sio != qse_sio_err)
{ {
qse_sio_close (fp); qse_sio_close (sio);
} }
return n; return n;
@ -755,7 +797,8 @@ static qse_ssize_t awk_rio_console (
return -1; return -1;
} }
qse_awk_rtx_t* qse_awk_rtx_opensimple (qse_awk_t* awk, qse_char_t** icf) qse_awk_rtx_t* qse_awk_rtx_opensimple (
qse_awk_t* awk, const qse_char_t* icf[], const qse_char_t* ocf[])
{ {
qse_awk_rtx_t* rtx; qse_awk_rtx_t* rtx;
qse_awk_rio_t rio; qse_awk_rio_t rio;
@ -783,6 +826,8 @@ qse_awk_rtx_t* qse_awk_rtx_opensimple (qse_awk_t* awk, qse_char_t** icf)
rxtn->c.in.files = icf; rxtn->c.in.files = icf;
rxtn->c.in.index = 0; rxtn->c.in.index = 0;
rxtn->c.out.files = ocf;
rxtn->c.out.index = 0;
return rtx; return rtx;
} }

6
qse/test/awk/awk01.c
View File

@ -41,6 +41,7 @@ int main ()
qse_awk_t* awk = QSE_NULL; qse_awk_t* awk = QSE_NULL;
qse_awk_rtx_t* rtx = QSE_NULL; qse_awk_rtx_t* rtx = QSE_NULL;
int ret; int ret;
const qse_char_t* co[] = { QSE_T(""), QSE_NULL };
awk = qse_awk_opensimple (); awk = qse_awk_opensimple ();
if (awk == QSE_NULL) if (awk == QSE_NULL)
@ -51,7 +52,7 @@ int main ()
ret = qse_awk_parsesimple ( ret = qse_awk_parsesimple (
awk, awk,
QSE_AWK_PARSE_STRING, src, /* parse AWK source in a string */ QSE_AWK_SOURCE_STRING, src, /* parse AWK source in a string */
QSE_NULL /* no parse output */ QSE_NULL /* no parse output */
); );
if (ret == -1) if (ret == -1)
@ -63,7 +64,8 @@ int main ()
rtx = qse_awk_rtx_opensimple ( rtx = qse_awk_rtx_opensimple (
awk, awk,
QSE_NULL /* no console files */ QSE_NULL, /* no console input */
QSE_AWK_CONSOLE_STDIO /* use standard out for console output */
); );
if (rtx == QSE_NULL) if (rtx == QSE_NULL)
{ {

9
qse/test/awk/awk03.c
View File

@ -62,8 +62,10 @@ int main ()
ret = qse_awk_parsesimple ( ret = qse_awk_parsesimple (
awk, awk,
QSE_AWK_PARSE_STRING, src, /* parse AWK source in a string */ /* parse AWK source in a string */
QSE_NULL /* no parse output */ QSE_AWK_SOURCE_STRING, src,
/* no parse output */
QSE_NULL
); );
if (ret == -1) if (ret == -1)
{ {
@ -75,7 +77,8 @@ int main ()
/* create a runtime context */ /* create a runtime context */
rtx = qse_awk_rtx_opensimple ( rtx = qse_awk_rtx_opensimple (
awk, awk,
QSE_NULL /* no console files */ QSE_NULL, /* no console input */
QSE_AWK_CONSOLE_STDIO /* console output */
); );
if (rtx == QSE_NULL) if (rtx == QSE_NULL)
{ {