summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_vim9_expr.vim2
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c6
3 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index a45d0eae6..c81468cb3 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1376,6 +1376,7 @@ def Test_expr6()
assert_equal(1, g:anint / 6)
assert_equal(2, g:anint
/ g:thefour)
+ assert_true(1 / 0 > 99999)
assert_equal(5, 11 % 6)
assert_equal(4, g:anint % 6)
@@ -1383,6 +1384,7 @@ def Test_expr6()
g:anint)
assert_equal(2, g:anint
% g:thefour)
+ assert_equal(0, 1 % 0)
assert_equal(4, 6 * 4 / 6)
diff --git a/src/version.c b/src/version.c
index 452fa2d22..b809cb2b7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2376,
+/**/
2375,
/**/
2374,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index d1df00821..36fd2534c 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4300,9 +4300,11 @@ compile_expr6(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
{
case '*': res = tv1->vval.v_number * tv2->vval.v_number;
break;
- case '/': res = tv1->vval.v_number / tv2->vval.v_number;
+ case '/': res = num_divide(tv1->vval.v_number,
+ tv2->vval.v_number);
break;
- case '%': res = tv1->vval.v_number % tv2->vval.v_number;
+ case '%': res = num_modulus(tv1->vval.v_number,
+ tv2->vval.v_number);
break;
}
tv1->vval.v_number = res;