From: Bram Moolenaar Date: Thu, 23 Jul 2020 17:06:23 +0000 (+0200) Subject: patch 8.2.1283: Vim9: error for misplaced -> lacks argument X-Git-Tag: v8.2.1283 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=637cd7d1c9fa0ee47951ccdc310a388cb7ecfada;p=vim patch 8.2.1283: Vim9: error for misplaced -> lacks argument Problem: Vim9: error for misplaced -> lacks argument. Solution: Use the pointer before it was advanced. --- diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index b0a83f49a..d7072f34b 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1532,7 +1532,7 @@ func Test_expr7_fails() call CheckDefFailure(["let x = ''", "let y = x.memb"], 'E715:') - call CheckDefFailure(["'yes'->", "Echo()"], 'E488:') + call CheckDefFailure(["'yes'->", "Echo()"], 'E488: Trailing characters: ->') call CheckDefExecFailure(["[1, 2->len()"], 'E697:') call CheckDefExecFailure(["#{a: 1->len()"], 'E488:') diff --git a/src/version.c b/src/version.c index 4ef305162..ab410712a 100644 --- 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 */ +/**/ + 1283, /**/ 1282, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 0fe0b16dd..3be8733ea 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3761,6 +3761,8 @@ compile_subscript( } else if (*p == '-' && p[1] == '>') { + char_u *pstart = p; + if (generate_ppconst(cctx, ppconst) == FAIL) return FAIL; @@ -3786,7 +3788,7 @@ compile_subscript( p = *arg; if (!eval_isnamec1(*p)) { - semsg(_(e_trailing_arg), p); + semsg(_(e_trailing_arg), pstart); return FAIL; } if (ASCII_ISALPHA(*p) && p[1] == ':')