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

fixed a minor problem of returning a long option string with a leading colon in qse_getopt().

Browse Source 
enhanced cmd/awk/awk.c
cleaned up code a little
This commit is contained in:
hyung-hwan
2009-06-22 07:33:05 +00:00
parent e66a372119
commit 385e1acc26
7 changed files with 202 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qse/lib/awk/Awk.cpp
View File

@ -1,5 +1,5 @@
/*
* $Id: Awk.cpp 202 2009-06-16 06:05:40Z hyunghwan.chung $
* $Id: Awk.cpp 206 2009-06-21 13:33:05Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -1366,12 +1366,10 @@ int Awk::run (const char_t** args, size_t nargs)
{
QSE_MEMSET (&rcb, 0, QSE_SIZEOF(rcb));
// TODO: deprecate onRunStart and onRunEnd
//rcb.on_start = onRunStart;
//rcb.on_end = onRunEnd;
rcb.on_enter = onRunEnter;
rcb.on_statement = onRunStatement;
rcb.on_exit = onRunExit;
rcb.data = &runctx;
rcb.on_loop_enter = onRunEnter;
rcb.on_loop_exit = onRunExit;
rcb.on_statement = onRunStatement;
rcb.data = &runctx;
}
if (nargs > 0)

25
qse/lib/awk/run.c
View File

@ -1,5 +1,5 @@
/*
* $Id: run.c 204 2009-06-18 12:08:06Z hyunghwan.chung $
* $Id: run.c 206 2009-06-21 13:33:05Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -1322,10 +1322,10 @@ static int run_bpae_loop (qse_awk_rtx_t* rtx)
STACK_NARGS(rtx) = (void*)nargs;
/* call the callback */
if (rtx->rcb.on_enter != QSE_NULL)
if (rtx->rcb.on_loop_enter != QSE_NULL)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOERR);
ret = rtx->rcb.on_enter (rtx, rtx->rcb.data);
ret = rtx->rcb.on_loop_enter (rtx, rtx->rcb.data);
if (ret <= -1)
{
if (rtx->errinf.num == QSE_AWK_ENOMEM)
@ -1424,12 +1424,12 @@ static int run_bpae_loop (qse_awk_rtx_t* rtx)
/* get the return value in the current stack frame */
v = STACK_RETVAL(rtx);
if (rtx->rcb.on_exit != QSE_NULL)
if (rtx->rcb.on_loop_exit != QSE_NULL)
{
/* we call the on_exit handler regardless of ret.
* the return value passed is the global return value
* in the stack. */
rtx->rcb.on_exit (rtx, v, rtx->rcb.data);
rtx->rcb.on_loop_exit (rtx, v, rtx->rcb.data);
}
/* end the life of the global return value */
@ -1462,9 +1462,6 @@ qse_awk_val_t* qse_awk_rtx_call (
qse_awk_rtx_t* rtx, const qse_char_t* name,
qse_awk_val_t** args, qse_size_t nargs)
{
#if 0
int ret = 0;
#endif
qse_map_pair_t* pair;
qse_awk_fun_t* fun;
struct capture_retval_data_t crdata;
@ -1475,7 +1472,7 @@ qse_awk_val_t* qse_awk_rtx_call (
pafv.args = args;
pafv.nargs = nargs;
if (rtx->exit_level >= EXIT_NEXT)
if (rtx->exit_level >= EXIT_GLOBAL)
{
/* cannot call the function again when exit() is called
* in an AWK program or qse_awk_rtx_stop() is invoked */
@ -1548,14 +1545,16 @@ qse_awk_val_t* qse_awk_rtx_call (
qse_awk_rtx_refupval (rtx, v);
}
if (rtx->rcb.on_exit != QSE_NULL)
#if 0
if (rtx->rcb.on_loop_exit != QSE_NULL)
{
rtx->rcb.on_exit (
rtx->rcb.on_loop_exit (
rtx,
((v == QSE_NULL)? qse_awk_val_nil: v),
rtx->rcb.data
);
}
#endif
/* return the return value with its reference count at least 1.
* the caller of this function should count down its reference. */
@ -4027,7 +4026,7 @@ static int __cmp_int_str (
qse_awk_rtx_valtostr_out_t out;
int n;
if (rtx->awk->option & QSE_AWK_NUMCMPONSTR)
if (rtx->awk->option & QSE_AWK_NCMPONSTR)
{
const qse_char_t* end;
qse_long_t ll;
@ -4114,7 +4113,7 @@ static int __cmp_real_str (
qse_awk_rtx_valtostr_out_t out;
int n;
if (rtx->awk->option & QSE_AWK_NUMCMPONSTR)
if (rtx->awk->option & QSE_AWK_NCMPONSTR)
{
const qse_char_t* end;
qse_real_t rr;

10
qse/lib/cmn/opt.c
View File

@ -1,5 +1,5 @@
/*
* $Id: opt.c 76 2009-02-22 14:18:06Z hyunghwan.chung $
* $Id: opt.c 206 2009-06-21 13:33:05Z hyunghwan.chung $
*
Copyright 2006-2009 Chung, Hyung-Hwan.
@ -131,6 +131,10 @@ qse_cint_t qse_getopt (int argc, qse_char_t* const* argv, qse_opt_t* opt)
/* match */
opt->cur = EMSG;
opt->lngopt = o->str;
/* for a long matching option, remove the leading colon */
if (opt->lngopt[0] == QSE_T(':')) opt->lngopt++;
if (*end == QSE_T('=')) opt->arg = end + 1;
if (*o->str != QSE_T(':'))
@ -140,7 +144,7 @@ qse_cint_t qse_getopt (int argc, qse_char_t* const* argv, qse_opt_t* opt)
}
else if (opt->arg == QSE_NULL)
{
/* Check if it has a remaining argument
/* check if it has a remaining argument
* available */
if (argc <= ++opt->ind) return BADARG;
/* If so, the next available argument is
@ -153,7 +157,7 @@ qse_cint_t qse_getopt (int argc, qse_char_t* const* argv, qse_opt_t* opt)
}
/*if (*end == QSE_T('=')) *end = QSE_T('\0');*/
opt->lngopt = opt->cur;
opt->lngopt = opt->cur;
return BADCH;
}