patch 8.2.3203: Vim9: compiled string expression causes type error

Problem:    Vim9: compiled string expression causes type error. (Yegappan
            Lakshmanan)
Solution:   Remove the string type from the stack.

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 92621ec330a650f2793217af63f8d390ccd15c32..6570c5976d3463b6dcd92d0e830a4f441c80b32f 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -711,6 +711,8 @@ static argcheck_T arg3_slice[] = {arg_slice1, arg_number, arg_number};
 static argcheck_T arg4_strpart[] = {arg_string, arg_number, arg_number, arg_bool};
 static argcheck_T arg23_win_execute[] = {arg_number, arg_string_or_list_string, arg_string};
 static argcheck_T arg4_match_func[] = {arg_string_or_list_any, arg_string, arg_number, arg_number};
+static argcheck_T arg15_search[] = {arg_string, arg_string, arg_number, arg_number, NULL};
+
 
 /*
  * Functions that return the return type of a builtin function.
@@ -1738,7 +1740,7 @@ static funcentry_T global_functions[] =
                        ret_number,         f_screenrow},
     {"screenstring",   2, 2, FEARG_1,      arg2_number,
                        ret_string,         f_screenstring},
-    {"search",         1, 5, FEARG_1,      NULL,
+    {"search",         1, 5, FEARG_1,      arg15_search,
                        ret_number,         f_search},
     {"searchcount",    0, 1, FEARG_1,      arg1_dict_any,
                        ret_dict_any,       f_searchcount},

diff --git a/src/version.c b/src/version.c
index 8eb758c0ade9040b3481de72c75f9e5baadff89e..ef2ea8d4262d79f9fc0c8da455e41ae222352ca1 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 */
+/**/
+    3203,
 /**/
     3202,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 4f7a0397b70214980199c497760b40ec9913571f..23994342c775b6b7e8f136498744bc7211c239bf 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3244,6 +3244,9 @@ compile_string(isn_T *isn, cctx_T *cctx)
     int                instr_count;
     isn_T      *instr = NULL;
 
+    // Remove the string type from the stack.
+    --cctx->ctx_type_stack.ga_len;
+
     // Temporarily reset the list of instructions so that the jump labels are
     // correct.
     cctx->ctx_instr.ga_len = 0;
@@ -4263,8 +4266,8 @@ compile_subscript(
            }
        }
 
-       // Do not skip over white space to find the "(", "execute 'x' ()" is
-       // not a function call.
+       // Do not skip over white space to find the "(", "execute 'x' (expr)"
+       // is not a function call.
        if (**arg == '(')
        {
            garray_T    *stack = &cctx->ctx_type_stack;