Mercurial > vim

diff src/vim9execute.c @ 21831:d8422de73113 v8.2.1465

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1465: Vim9: subscript not handled properly Commit: https://github.com/vim/vim/commit/56acb0943ede35cd9d2f6667cde2442819ccbf59 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 16 14:48:19 2020 +0200 patch 8.2.1465: Vim9: subscript not handled properly Problem: Vim9: subscript not handled properly. Solution: Adjust error message. Remove dead code. Disallow string to number conversion in scripts.
author Bram Moolenaar <Bram@vim.org>
date Sun, 16 Aug 2020 15:00:05 +0200
parents 21c552fb7da5
children e3f9528bddda
line wrap: on
line diff
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -2241,33 +2241,13 @@ call_def_function(
 		    // string index: string is at stack-2, index at stack-1
 		    // string slice: string is at stack-3, first index at
 		    // stack-2, second index at stack-1
-		    tv = is_slice ? STACK_TV_BOT(-3) : STACK_TV_BOT(-2);
-		    if (tv->v_type != VAR_STRING)
-		    {
-			SOURCING_LNUM = iptr->isn_lnum;
-			emsg(_(e_stringreq));
-			goto on_error;
-		    }
-
 		    if (is_slice)
 		    {
 			tv = STACK_TV_BOT(-2);
-			if (tv->v_type != VAR_NUMBER)
-			{
-			    SOURCING_LNUM = iptr->isn_lnum;
-			    emsg(_(e_number_exp));
-			    goto on_error;
-			}
 			n1 = tv->vval.v_number;
 		    }
 
 		    tv = STACK_TV_BOT(-1);
-		    if (tv->v_type != VAR_NUMBER)
-		    {
-			SOURCING_LNUM = iptr->isn_lnum;
-			emsg(_(e_number_exp));
-			goto on_error;
-		    }
 		    n2 = tv->vval.v_number;
 
 		    ectx.ec_stack.ga_len -= is_slice ? 2 : 1;
@@ -2296,33 +2276,15 @@ call_def_function(
 		    // list slice: list is at stack-3, indexes at stack-2 and
 		    // stack-1
 		    tv = is_slice ? STACK_TV_BOT(-3) : STACK_TV_BOT(-2);
-		    if (tv->v_type != VAR_LIST)
-		    {
-			SOURCING_LNUM = iptr->isn_lnum;
-			emsg(_(e_listreq));
-			goto on_error;
-		    }
 		    list = tv->vval.v_list;
 
 		    tv = STACK_TV_BOT(-1);
-		    if (tv->v_type != VAR_NUMBER)
-		    {
-			SOURCING_LNUM = iptr->isn_lnum;
-			emsg(_(e_number_exp));
-			goto on_error;
-		    }
 		    n1 = n2 = tv->vval.v_number;
 		    clear_tv(tv);
 
 		    if (is_slice)
 		    {
 			tv = STACK_TV_BOT(-2);
-			if (tv->v_type != VAR_NUMBER)
-			{
-			    SOURCING_LNUM = iptr->isn_lnum;
-			    emsg(_(e_number_exp));
-			    goto on_error;
-			}
 			n1 = tv->vval.v_number;
 			clear_tv(tv);
 		    }