patch 8.2.3263: Vim9: "..=" does not accept same types as the ".." operator

Problem:    Vim9: "..=" does not accept same types as the ".." operator.
Solution:   Convert value to string like ".." does. (issue #8664)

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index b2f8feca5cf9cd0d23a78312b50f72544e54c84f..97983ef3c31eefe67695e958f4c69ec8b17a7d35 100644 (file)
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -239,6 +239,32 @@ def Test_assignment()
   END
 enddef
 
+let g:someNumber = 43
+
+def Test_assign_concat()
+  var lines =<< trim END
+    var s = '-'
+    s ..= 99
+    s ..= true
+    s ..= '-'
+    s ..= v:null
+    s ..= g:someNumber
+    assert_equal('-99true-null43', s)
+  END
+  CheckDefAndScriptSuccess(lines)
+
+  lines =<< trim END
+    var s = '-'
+    s ..= [1, 2]
+  END
+  CheckDefAndScriptFailure2(lines, 'E1105: Cannot convert list to string', 'E734: Wrong variable type for .=', 2)
+  lines =<< trim END
+    var s = '-'
+    s ..= {a: 2}
+  END
+  CheckDefAndScriptFailure2(lines, 'E1105: Cannot convert dict to string', 'E734: Wrong variable type for .=', 2)
+enddef
+
 def Test_assign_register()
   var lines =<< trim END
     @c = 'areg'

diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index 1d100e0e0b62a4be0e65191f2dc7fd13752ea105..b151cb435ea9b81167aa43a98db7bcf599623cf1 100644 (file)
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -1254,7 +1254,7 @@ def Test_disassemble_for_loop_eval()
         'res ..= str\_s*' ..
         '\d\+ LOAD $0\_s*' ..
         '\d\+ LOAD $2\_s*' ..
-        '\d\+ CHECKTYPE string stack\[-1\]\_s*' ..
+        '\d 2STRING_ANY stack\[-1\]\_s*' ..
         '\d\+ CONCAT\_s*' ..
         '\d\+ STORE $0\_s*' ..
         'endfor\_s*' ..

diff --git a/src/version.c b/src/version.c
index fcfd211cb4140491125e401add3f145e0c85fbf7..76c3e97e5f75a4ee56e448fe41c0b76296e35928 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3263,
 /**/
     3262,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index c6a2965eae357fb11b637327021596ffeec2af96..cafbd6b2fc1fdc9b920635cf5f4df0184a6702a5 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7086,18 +7086,23 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
            type_T          *stacktype;
 
            if (*op == '.')
-               expected = &t_string;
+           {
+               if (may_generate_2STRING(-1, FALSE, cctx) == FAIL)
+                   goto theend;
+           }
            else
+           {
                expected = lhs.lhs_member_type;
-           stacktype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
-           if (
+               stacktype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
+               if (
 #ifdef FEAT_FLOAT
-               // If variable is float operation with number is OK.
-               !(expected == &t_float && stacktype == &t_number) &&
+                   // If variable is float operation with number is OK.
+                   !(expected == &t_float && stacktype == &t_number) &&
 #endif
                    need_type(stacktype, expected, -1, 0, cctx,
                                                         FALSE, FALSE) == FAIL)
-               goto theend;
+                   goto theend;
+           }
 
            if (*op == '.')
            {