diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/awk.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c index e987bc868..bc8b0dad1 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
| @@ -2424,17 +2424,19 @@ static var *evaluate(node *op, var *res) | |||
| 2424 | X.re = as_regex(op1, &sreg); | 2424 | X.re = as_regex(op1, &sreg); |
| 2425 | R.i = regexec(X.re, L.s, 0, NULL, 0); | 2425 | R.i = regexec(X.re, L.s, 0, NULL, 0); |
| 2426 | if (X.re == &sreg) regfree(X.re); | 2426 | if (X.re == &sreg) regfree(X.re); |
| 2427 | setvar_i(res, (R.i == 0 ? 1 : 0) ^ (opn == '!' ? 1 : 0)); | 2427 | setvar_i(res, (R.i == 0) ^ (opn == '!')); |
| 2428 | break; | 2428 | break; |
| 2429 | 2429 | ||
| 2430 | case XC( OC_MOVE ): | 2430 | case XC( OC_MOVE ): |
| 2431 | /* if source is a temporary string, jusk relink it to dest */ | 2431 | /* if source is a temporary string, jusk relink it to dest */ |
| 2432 | if (R.v == v1+1 && R.v->string) { | 2432 | //Disabled: if R.v is numeric but happens to have cached R.v->string, |
| 2433 | res = setvar_p(L.v, R.v->string); | 2433 | //then L.v ends up being a string, which is wrong |
| 2434 | R.v->string = NULL; | 2434 | // if (R.v == v1+1 && R.v->string) { |
| 2435 | } else { | 2435 | // res = setvar_p(L.v, R.v->string); |
| 2436 | // R.v->string = NULL; | ||
| 2437 | // } else { | ||
| 2436 | res = copyvar(L.v, R.v); | 2438 | res = copyvar(L.v, R.v); |
| 2437 | } | 2439 | // } |
| 2438 | break; | 2440 | break; |
| 2439 | 2441 | ||
| 2440 | case XC( OC_TERNARY ): | 2442 | case XC( OC_TERNARY ): |