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

fixed a bug in converting multidimensional array index to a string in lib/awk/run.c

Browse Source
This commit is contained in:
hyung-hwan 2020-03-07 15:50:53 +00:00
parent 390e72d209
commit 34d1b1d1d7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4361,7 +4361,7 @@ static QSE_INLINE int __cmp_flt_str (qse_awk_rtx_t* rtx, qse_awk_val_t* left, qs
int n; int n;
/* SCO CC doesn't seem to handle right->nstr > 0 properly */ /* SCO CC doesn't seem to handle right->nstr > 0 properly */
if (rtx->awk->opt.trait & QSE_AWK_NCMPONSTR || right->nstr /*> 0*/) if ((rtx->awk->opt.trait & QSE_AWK_NCMPONSTR) || right->nstr /*> 0*/)
{ {
const qse_char_t* end; const qse_char_t* end;
qse_awk_flt_t rr; qse_awk_flt_t rr;
@ -4396,7 +4396,7 @@ static QSE_INLINE int __cmp_flt_mbs (qse_awk_rtx_t* rtx, qse_awk_val_t* left, qs
qse_size_t len0; qse_size_t len0;
int n; int n;
if (rtx->awk->opt.trait & QSE_AWK_NCMPONSTR || right->nstr /*> 0*/) if ((rtx->awk->opt.trait & QSE_AWK_NCMPONSTR) || right->nstr /*> 0*/)
{ {
const qse_mchar_t* end; const qse_mchar_t* end;
qse_awk_flt_t rr; qse_awk_flt_t rr;
@ -7010,6 +7010,7 @@ static qse_char_t* idxnde_to_str (qse_awk_rtx_t* rtx, qse_awk_nde_t* nde, qse_ch
qse_str_t idxstr; qse_str_t idxstr;
qse_cstr_t tmp; qse_cstr_t tmp;
qse_awk_rtx_valtostr_out_t out; qse_awk_rtx_valtostr_out_t out;
qse_awk_nde_t* xnde;
out.type = QSE_AWK_RTX_VALTOSTR_STRPCAT; out.type = QSE_AWK_RTX_VALTOSTR_STRPCAT;
out.u.strpcat = &idxstr; out.u.strpcat = &idxstr;
@ -7020,6 +7021,7 @@ static qse_char_t* idxnde_to_str (qse_awk_rtx_t* rtx, qse_awk_nde_t* nde, qse_ch
return QSE_NULL; return QSE_NULL;
} }
xnde = nde;
while (nde) while (nde)
{ {
idx = eval_expression(rtx, nde); idx = eval_expression(rtx, nde);
@ -7031,7 +7033,7 @@ static qse_char_t* idxnde_to_str (qse_awk_rtx_t* rtx, qse_awk_nde_t* nde, qse_ch
qse_awk_rtx_refupval (rtx, idx); qse_awk_rtx_refupval (rtx, idx);
if (QSE_STR_LEN(&idxstr) > 0 && qse_str_ncat(&idxstr, rtx->gbl.subsep.ptr, rtx->gbl.subsep.len) == (qse_size_t)-1) if (nde != xnde && qse_str_ncat(&idxstr, rtx->gbl.subsep.ptr, rtx->gbl.subsep.len) == (qse_size_t)-1)
{ {
qse_awk_rtx_refdownval (rtx, idx); qse_awk_rtx_refdownval (rtx, idx);
qse_str_fini (&idxstr); qse_str_fini (&idxstr);