diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-13 22:29:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-13 22:29:02 +0200 |
| commit | 8c34ea54ad1ba3ea9a604ba0495669bdd1393d9a (patch) | |
| tree | ddce956699c5e2d0141eb21c74d3356aec5a85ce /src/eval.c | |
| parent | 5d2eb0fff0fbe905da2c57fd73f7f127a73d1c99 (diff) | |
patch 8.2.1205: Vim9: && and || work different when not compiledv8.2.1205
Problem: Vim9: && and || work different when not compiled.
Solution: Keep the value.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 82 |
1 files changed, 58 insertions, 24 deletions
diff --git a/src/eval.c b/src/eval.c index c524151304..9a9110efcd 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2196,6 +2196,7 @@ eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg) long result = FALSE; typval_T var2; int error; + int vim9script = in_vim9script(); if (evalarg == NULL) { @@ -2206,12 +2207,19 @@ eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg) evaluate = orig_flags & EVAL_EVALUATE; if (evaluate) { - error = FALSE; - if (tv_get_number_chk(rettv, &error) != 0) - result = TRUE; - clear_tv(rettv); - if (error) - return FAIL; + if (vim9script) + { + result = tv2bool(rettv); + } + else + { + error = FALSE; + if (tv_get_number_chk(rettv, &error) != 0) + result = TRUE; + clear_tv(rettv); + if (error) + return FAIL; + } } /* @@ -2236,13 +2244,22 @@ eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg) */ if (evaluate && !result) { - if (tv_get_number_chk(&var2, &error) != 0) - result = TRUE; - clear_tv(&var2); - if (error) - return FAIL; + if (vim9script) + { + clear_tv(rettv); + *rettv = var2; + result = tv2bool(rettv); + } + else + { + if (tv_get_number_chk(&var2, &error) != 0) + result = TRUE; + clear_tv(&var2); + if (error) + return FAIL; + } } - if (evaluate) + if (evaluate && !vim9script) { rettv->v_type = VAR_NUMBER; rettv->vval.v_number = result; @@ -2294,6 +2311,7 @@ eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg) long result = TRUE; typval_T var2; int error; + int vim9script = in_vim9script(); if (evalarg == NULL) { @@ -2304,12 +2322,19 @@ eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg) evaluate = orig_flags & EVAL_EVALUATE; if (evaluate) { - error = FALSE; - if (tv_get_number_chk(rettv, &error) == 0) - result = FALSE; - clear_tv(rettv); - if (error) - return FAIL; + if (vim9script) + { + result = tv2bool(rettv); + } + else + { + error = FALSE; + if (tv_get_number_chk(rettv, &error) == 0) + result = FALSE; + clear_tv(rettv); + if (error) + return FAIL; + } } /* @@ -2334,13 +2359,22 @@ eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg) */ if (evaluate && result) { - if (tv_get_number_chk(&var2, &error) == 0) - result = FALSE; - clear_tv(&var2); - if (error) - return FAIL; + if (vim9script) + { + clear_tv(rettv); + *rettv = var2; + result = tv2bool(rettv); + } + else + { + if (tv_get_number_chk(&var2, &error) == 0) + result = FALSE; + clear_tv(&var2); + if (error) + return FAIL; + } } - if (evaluate) + if (evaluate && !vim9script) { rettv->v_type = VAR_NUMBER; rettv->vval.v_number = result; |