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

fixed a bug in NF=value assignment handling

Browse Source
This commit is contained in:
hyung-hwan 2020-03-08 11:02:03 +00:00
parent 59ad30bab2
commit 41dd60e4b2
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,7 @@ static int set_global (qse_awk_rtx_t* rtx, int idx, qse_awk_nde_var_t* var, qse_
} }
} }
if (old == val) if (old == val && idx != QSE_AWK_GBL_NF) /* read the comment in the case block for HAWK_GBL_NF below */
{ {
/* if the old value is the same as the new value, don't take any actions. /* if the old value is the same as the new value, don't take any actions.
* note that several inspections have been performed before this check, * note that several inspections have been performed before this check,
@ -486,8 +486,16 @@ static int set_global (qse_awk_rtx_t* rtx, int idx, qse_awk_nde_var_t* var, qse_
return -1; return -1;
} }
if (lv < (qse_awk_int_t)rtx->inrec.nflds) if (lv < (qse_awk_int_t)rtx->inrec.nflds || (assign && lv == (qse_int_t)rtx->inrec.nflds))
{ {
/* when NF is assigned a value, it should rebuild $X values.
* even when there is no change in the value like NF = NF,
* it has to rebuil $X values with the current OFS value.
* { OFS=":"; NF=NF; print $0; }
* the NF=value assignment is indicated by a non-zero value in the 'assign' variable.
* 'assign' is 0 if this function is called from a different context such as
* explicit call to qse_awk_rtx_setgbl().
*/
if (qse_awk_rtx_truncrec(rtx, (qse_size_t)lv) == -1) if (qse_awk_rtx_truncrec(rtx, (qse_size_t)lv) == -1)
{ {
/* adjust the error line */ /* adjust the error line */
@ -503,10 +511,14 @@ static int set_global (qse_awk_rtx_t* rtx, int idx, qse_awk_nde_var_t* var, qse_
if (qse_awk_rtx_setrec(rtx, lv, &cs) <= -1) return -1; if (qse_awk_rtx_setrec(rtx, lv, &cs) <= -1) return -1;
} }
/* for all other globals, it returns before this switch/case block is reached
* if the same value is assigned. but NF change requires extra action to take
* as coded before this switch/code block */
if (old == val) return 0;
break; break;
} }
case QSE_AWK_GBL_NR: case QSE_AWK_GBL_NR:
{ {
int n; int n;