patch 8.2.1490: Vim9: using /= with float and number doesn't work

Problem:    Vim9: using /= with float and number doesn't work.
Solution:   Better support assignment with operator. (closes #6742)

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index af86815132ab21f9125e2bf2fd5421cd97e0f82a..18e64105f0611a55d4163ac7706efb825389f684 100644 (file)
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -90,6 +90,18 @@ def Test_assignment()
   &ts %= 4
   assert_equal(2, &ts)
 
+  if has('float')
+    let f100: float = 100.0
+    f100 /= 5
+    assert_equal(20.0, f100)
+
+    let f200: float = 200.0
+    f200 /= 5.0
+    assert_equal(40.0, f200)
+
+    CheckDefFailure(['let nr: number = 200', 'nr /= 5.0'], 'E1012:')
+  endif
+
   lines =<< trim END
     vim9script
     &ts = 6

diff --git a/src/version.c b/src/version.c
index b281a4728b7d10faac62e7d121ba59d065bf75ba..8205b4d0fccec0f11f5ace7c10946c5d623d632a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1490,
 /**/
     1489,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 3e0ad9a3ede751934123f6db5e3e63cbc33d8522..37ecf28c89374ad673d539aeb96f43902015919b 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4923,10 +4923,11 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
                                lvar->lv_type = stacktype;
                        }
                    }
-                   else
+                   else if (*op == '=')
                    {
                        type_T *use_type = lvar->lv_type;
 
+                       // without operator type is here, otherwise below
                        if (has_index)
                        {
                            use_type = use_type->tt_member;
@@ -4934,7 +4935,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
                                use_type = &t_void;
                        }
                        if (need_type(stacktype, use_type, -1, cctx, FALSE)
-                                                                  == FAIL)
+                                                                      == FAIL)
                            goto theend;
                    }
                }
@@ -5008,18 +5009,20 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
 
        if (oplen > 0 && *op != '=')
        {
-           type_T          *expected = &t_number;
+           type_T          *expected;
            type_T          *stacktype;
 
-           // TODO: if type is known use float or any operation
-           // TODO: check operator matches variable type
-
            if (*op == '.')
                expected = &t_string;
-           else if (*op == '+')
+           else
                expected = member_type;
            stacktype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
-           if (need_type(stacktype, expected, -1, cctx, FALSE) == FAIL)
+           if (
+#ifdef FEAT_FLOAT
+               // If variable is float operation with number is OK.
+               !(expected == &t_float && stacktype == &t_number) &&
+#endif
+                   need_type(stacktype, expected, -1, cctx, FALSE) == FAIL)
                goto theend;
 
            if (*op == '.')
@@ -5034,20 +5037,8 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
                                               member_type, stacktype) == FAIL)
                    goto theend;
            }
-           else
-           {
-               isn_T *isn = generate_instr_drop(cctx, ISN_OPNR, 1);
-
-               if (isn == NULL)
-                   goto theend;
-               switch (*op)
-               {
-                   case '-': isn->isn_arg.op.op_type = EXPR_SUB; break;
-                   case '*': isn->isn_arg.op.op_type = EXPR_MULT; break;
-                   case '/': isn->isn_arg.op.op_type = EXPR_DIV; break;
-                   case '%': isn->isn_arg.op.op_type = EXPR_REM; break;
-               }
-           }
+           else if (generate_two_op(cctx, op) == FAIL)
+               goto theend;
        }
 
        if (has_index)