diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-05-22 20:16:32 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-05-22 20:16:32 +0100 |
commit | 338bf58eba758585ffef3fdfdba7d48477aacb7c (patch) | |
tree | 5ae6ce8b90f6aaaa06eb6d2192c9102c59fdd3b1 /src | |
parent | a061f34191712df7dde7716705fe0ec074e9758e (diff) |
patch 8.2.5004: right shift on negative number does not work as documentedv8.2.5004
Problem: Right shift on negative number does not work as documented.
Solution: Use a uvarnumber_T type cast.
Diffstat (limited to 'src')
-rw-r--r-- | src/charset.c | 1 | ||||
-rw-r--r-- | src/eval.c | 6 | ||||
-rw-r--r-- | src/testdir/test_expr.vim | 11 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9execute.c | 7 | ||||
-rw-r--r-- | src/vim9expr.c | 7 |
6 files changed, 18 insertions, 16 deletions
diff --git a/src/charset.c b/src/charset.c index 34751e1862..203a8fe0f9 100644 --- a/src/charset.c +++ b/src/charset.c @@ -2002,6 +2002,7 @@ vim_str2nr( } else { + // prevent a larg unsigned number to become negative if (un > VARNUM_MAX) un = VARNUM_MAX; *nptr = (varnumber_T)un; diff --git a/src/eval.c b/src/eval.c index 0ac2dfb358..7f90954667 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3091,12 +3091,8 @@ eval5(char_u **arg, typval_T *rettv, evalarg_T *evalarg) rettv->vval.v_number = rettv->vval.v_number << var2.vval.v_number; else - { rettv->vval.v_number = - rettv->vval.v_number >> var2.vval.v_number; - // clear the topmost sign bit - rettv->vval.v_number &= ~((uvarnumber_T)1 << MAX_LSHIFT_BITS); - } + (uvarnumber_T)rettv->vval.v_number >> var2.vval.v_number; } clear_tv(&var2); diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim index 24daeb6655..ffac6df806 100644 --- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -958,6 +958,8 @@ func Test_bitwise_shift() call assert_equal(0, 0 >> 4) call assert_equal(0, 999999 >> 100) call assert_equal(0, 999999 << 100) + call assert_equal(-1, -1 >> 0) + call assert_equal(-1, -1 << 0) VAR a = 8 VAR b = 2 call assert_equal(2, a >> b) @@ -976,6 +978,15 @@ func Test_bitwise_shift() for i in range(0, v:numbersize - 2) LET val = and(val, invert(1 << i)) endfor + #" -1 has all the bits set + call assert_equal(-2, -1 << 1) + call assert_equal(-4, -1 << 2) + call assert_equal(-8, -1 << 3) + if v:numbersize == 64 + call assert_equal(0x7fffffffffffffff, -1 >> 1) + call assert_equal(0x3fffffffffffffff, -1 >> 2) + call assert_equal(0x1fffffffffffffff, -1 >> 3) + endif call assert_equal(0, val) #" multiple operators call assert_equal(16, 1 << 2 << 2) diff --git a/src/version.c b/src/version.c index a6570a3cf2..e8799ad576 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5004, +/**/ 5003, /**/ 5002, diff --git a/src/vim9execute.c b/src/vim9execute.c index b4fd9d591b..5410aa2841 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -4096,12 +4096,7 @@ exec_instructions(ectx_T *ectx) case EXPR_RSHIFT: if (arg2 > MAX_LSHIFT_BITS) res = 0; else - { - res = arg1 >> arg2; - // clear the topmost sign bit - res &= ~((uvarnumber_T)1 - << MAX_LSHIFT_BITS); - } + res = (uvarnumber_T)arg1 >> arg2; break; default: break; } diff --git a/src/vim9expr.c b/src/vim9expr.c index c84be874af..3e720d9135 100644 --- a/src/vim9expr.c +++ b/src/vim9expr.c @@ -2719,11 +2719,8 @@ compile_expr5(char_u **arg, cctx_T *cctx, ppconst_T *ppconst) else if (type == EXPR_LSHIFT) tv1->vval.v_number = tv1->vval.v_number << tv2->vval.v_number; else - { - tv1->vval.v_number = tv1->vval.v_number >> tv2->vval.v_number; - // clear the topmost sign bit - tv1->vval.v_number &= ~((uvarnumber_T)1 << MAX_LSHIFT_BITS); - } + tv1->vval.v_number = + (uvarnumber_T)tv1->vval.v_number >> tv2->vval.v_number; clear_tv(tv2); --ppconst->pp_used; } |