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

fixed wrong return values of qse_fmtout

Browse Source
This commit is contained in:
hyung-hwan
2013-10-28 09:40:25 +00:00
parent 1a0dc68fa3
commit aaf73a86f5
12 changed files with 372 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qse/lib/awk/mod-sys.c
View File

@ -43,7 +43,6 @@
#endif
#include <stdlib.h> /* getenv */
#include <qse/cmn/stdio.h> /* qse_sprintf */
static int fnc_fork (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
{
@ -552,7 +551,7 @@ static int fnc_getnwifcfg (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
md[4].key.ptr = QSE_T("ethw");
md[4].key.len = 4;
md[4].type = QSE_AWK_VAL_MAP_DATA_STR;
qse_sprintf (ethw, QSE_COUNTOF(ethw), QSE_T("%02X:%02X:%02X:%02X:%02X:%02X"),
qse_strxfmt (ethw, QSE_COUNTOF(ethw), QSE_T("%02X:%02X:%02X:%02X:%02X:%02X"),
cfg.ethw[0], cfg.ethw[1], cfg.ethw[2], cfg.ethw[3], cfg.ethw[4], cfg.ethw[5]);
md[4].vptr = ethw;

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

@ -22,7 +22,7 @@
#include <qse/cmn/fmt.h>
#ifdef DEBUG_RUN
#include <qse/cmn/stdio.h>
#include <qse/cmn/sio.h>
#endif
#define PRINT_IOERR -99
@ -1889,7 +1889,7 @@ static int run_block0 (qse_awk_rtx_t* rtx, qse_awk_nde_blk_t* nde)
nlcls = nde->nlcls;
#ifdef DEBUG_RUN
qse_dprintf (
qse_errputstrf (
QSE_T("securing space for local variables nlcls = %d\n"),
(int)nlcls);
#endif
@ -1911,7 +1911,7 @@ static int run_block0 (qse_awk_rtx_t* rtx, qse_awk_nde_blk_t* nde)
}
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("executing block statements\n"));
qse_errputstrf (QSE_T("executing block statements\n"));
#endif
while (p != QSE_NULL && rtx->exit_level == EXIT_NONE)
@ -1926,7 +1926,7 @@ static int run_block0 (qse_awk_rtx_t* rtx, qse_awk_nde_blk_t* nde)
/* pop off local variables */
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("popping off local variables\n"));
qse_errputstrf (QSE_T("popping off local variables\n"));
#endif
nlcls = nde->nlcls;
while (nlcls > 0)
@ -3759,7 +3759,7 @@ retry:
if (str == QSE_NULL) return QSE_NULL;
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("**** index str=>%s, map->ref=%d, map->type=%d\n"),
qse_errputstrf (QSE_T("**** index str=>%s, map->ref=%d, map->type=%d\n"),
str, (int)map->ref, (int)map->type);
#endif
@ -5708,7 +5708,7 @@ static qse_awk_val_t* __eval_call (
saved_stack_top = run->stack_top;
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("setting up function stack frame top=%ld base=%ld\n"),
qse_errputstrf (QSE_T("setting up function stack frame top=%ld base=%ld\n"),
(long)run->stack_top, (long)run->stack_base);
#endif
if (__raw_push(run,(void*)run->stack_base) == -1)
@ -5775,7 +5775,7 @@ static qse_awk_val_t* __eval_call (
RTX_STACK_NARGS(run) = (void*)nargs;
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("running function body\n"));
qse_errputstrf (QSE_T("running function body\n"));
#endif
if (fun != QSE_NULL)
@ -5825,7 +5825,7 @@ static qse_awk_val_t* __eval_call (
/* refdown args in the run.stack */
nargs = (qse_size_t)RTX_STACK_NARGS(run);
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("block run complete nargs = %d\n"), (int)nargs);
qse_errputstrf (QSE_T("block run complete nargs = %d\n"), (int)nargs);
#endif
for (i = 0; i < nargs; i++)
@ -5834,7 +5834,7 @@ static qse_awk_val_t* __eval_call (
}
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("got return value\n"));
qse_errputstrf (QSE_T("got return value\n"));
#endif
v = RTX_STACK_RETVAL(run);
@ -5889,7 +5889,7 @@ static qse_awk_val_t* __eval_call (
if (run->exit_level == EXIT_FUNCTION) run->exit_level = EXIT_NONE;
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("returning from function top=%ld, base=%ld\n"),
qse_errputstrf (QSE_T("returning from function top=%ld, base=%ld\n"),
(long)run->stack_top, (long)run->stack_base);
#endif
return (n == -1)? QSE_NULL: v;
@ -6583,7 +6583,7 @@ read_again:
}
#ifdef DEBUG_RUN
qse_dprintf (QSE_T("record len = %d str=[%.*s]\n"),
qse_errputstrf (QSE_T("record len = %d str=[%.*s]\n"),
(int)QSE_STR_LEN(buf), (int)QSE_STR_LEN(buf), QSE_STR_PTR(buf));
#endif
if (n == 0)

36
qse/lib/awk/val.c
View File

@ -22,7 +22,7 @@
#include <qse/cmn/mbwc.h>
#ifdef DEBUG_VAL
#include <qse/cmn/stdio.h>
#include <qse/cmn/sio.h>
#endif
#define CHUNKSIZE QSE_AWK_VAL_CHUNK_SIZE
@ -140,7 +140,7 @@ qse_awk_val_t* qse_awk_rtx_makeintval (qse_awk_rtx_t* rtx, qse_long_t v)
val->nde = QSE_NULL;
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("makeintval => %ld [%p]\n"), (long)v, val);
qse_errputstrf (QSE_T("makeintval => %ld [%p]\n"), (long)v, val);
#endif
return (qse_awk_val_t*)val;
}
@ -196,7 +196,7 @@ qse_awk_val_t* qse_awk_rtx_makefltval (qse_awk_rtx_t* rtx, qse_flt_t v)
val->nde = QSE_NULL;
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("makefltval => %Lf [%p]\n"), (double)v, val);
qse_errputstrf (QSE_T("makefltval => %Lf [%p]\n"), (double)v, val);
#endif
return (qse_awk_val_t*)val;
}
@ -342,7 +342,7 @@ init:
qse_strncpy (val->val.ptr, str->ptr, str->len);
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("makestrval => %p\n"), val);
qse_errputstrf (QSE_T("makestrval => %p\n"), val);
#endif
return (qse_awk_val_t*)val;
}
@ -402,7 +402,7 @@ init:
qse_strncpy (&val->val.ptr[len1], str2, len2);
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("makestrval2 => %p\n"), val);
qse_errputstrf (QSE_T("makestrval2 => %p\n"), val);
#endif
return (qse_awk_val_t*)val;
}
@ -477,9 +477,9 @@ static void free_mapval (qse_htb_t* map, void* dptr, qse_size_t dlen)
qse_awk_rtx_t* rtx = *(qse_awk_rtx_t**)QSE_XTN(map);
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("refdown in map free..."));
qse_errputstrf (QSE_T("refdown in map free..."));
qse_awk_dprintval (rtx, dptr);
qse_dprintf (QSE_T("\n"));
qse_errputstrf (QSE_T("\n"));
#endif
qse_awk_rtx_refdownval (rtx, dptr);
@ -489,9 +489,9 @@ static void same_mapval (qse_htb_t* map, void* dptr, qse_size_t dlen)
{
qse_awk_rtx_t* run = *(qse_awk_rtx_t**)QSE_XTN(map);
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("refdown nofree in map free..."));
qse_errputstrf (QSE_T("refdown nofree in map free..."));
qse_awk_dprintval (run, dptr);
qse_dprintf (QSE_T("\n"));
qse_errputstrf (QSE_T("\n"));
#endif
qse_awk_rtx_refdownval_nofree (run, dptr);
}
@ -765,9 +765,9 @@ void qse_awk_rtx_freeval (
if (IS_STATICVAL(val)) return;
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("freeing [cache=%d] ... "), cache);
qse_errputstrf (QSE_T("freeing [cache=%d] ... "), cache);
qse_awk_dprintval (rtx, val);
qse_dprintf (QSE_T("\n"));
qse_errputstrf (QSE_T("\n"));
#endif
switch (val->type)
@ -857,9 +857,9 @@ void qse_awk_rtx_refupval (qse_awk_rtx_t* rtx, qse_awk_val_t* val)
if (IS_STATICVAL(val)) return;
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("ref up [ptr=%p] [count=%d] "), val, (int)val->ref);
qse_errputstrf (QSE_T("ref up [ptr=%p] [count=%d] "), val, (int)val->ref);
qse_awk_dprintval (rtx, val);
qse_dprintf (QSE_T("\n"));
qse_errputstrf (QSE_T("\n"));
#endif
val->ref++;
@ -870,9 +870,9 @@ void qse_awk_rtx_refdownval (qse_awk_rtx_t* rtx, qse_awk_val_t* val)
if (IS_STATICVAL(val)) return;
#ifdef DEBUG_VAL
qse_dprintf (QSE_T("ref down [ptr=%p] [count=%d]\n"), val, (int)val->ref);
qse_errputstrf (QSE_T("ref down [ptr=%p] [count=%d]\n"), val, (int)val->ref);
qse_awk_dprintval (rtx, val);
qse_dprintf (QSE_T("\n"));
qse_errputstrf (QSE_T("\n"));
#endif
QSE_ASSERTX (val->ref > 0,
@ -1402,7 +1402,7 @@ int qse_awk_rtx_valtostr (
#ifdef DEBUG_VAL
qse_dprintf (
qse_errputstrf (
QSE_T(">>WRONG VALUE TYPE [%d] in qse_awk_rtx_valtostr\n"),
v->type
);
@ -1569,7 +1569,7 @@ int qse_awk_rtx_valtonum (
}
#ifdef DEBUG_VAL
qse_dprintf (
qse_errputstrf (
QSE_T(">>WRONG VALUE TYPE [%d] in qse_awk_rtx_valtonum()\n"),
v->type
);
@ -1669,7 +1669,7 @@ qse_long_t qse_awk_rtx_hashval (qse_awk_rtx_t* rtx, qse_awk_val_t* v)
default:
#ifdef DEBUG_VAL
qse_dprintf (
qse_errputstrf (
QSE_T(">>WRONG VALUE TYPE [%d] in qse_awk_rtx_hashval()\n"),
v->type
);