# HG changeset patch # User Bram Moolenaar # Date 1605717903 -3600 # Node ID 87b62395a4d130443a6a543d340a274ba44a9a2e # Parent 7b03a3108d098b18c86d640b041c6d6c8251ccac patch 8.2.2013: Vim9: not skipping white space after unary minus Commit: https://github.com/vim/vim/commit/79cdf80bed3192add70882bc0aaeede91cc74300 Author: Bram Moolenaar Date: Wed Nov 18 17:39:05 2020 +0100 patch 8.2.2013: Vim9: not skipping white space after unary minus Problem: Vim9: not skipping white space after unary minus. Solution: Skip whitespace. (closes https://github.com/vim/vim/issues/7324) diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -2300,12 +2300,29 @@ def Test_expr7_parens_vim9script() CheckScriptSuccess(lines) enddef -def Test_expr7_negate() +def Test_expr7_negate_add() assert_equal(-99, -99) + assert_equal(-99, - 99) assert_equal(99, --99) + assert_equal(99, -- 99) + assert_equal(99, - - 99) + assert_equal(99, +99) + assert_equal(-99, -+99) + assert_equal(-99, -+ 99) + assert_equal(-99, - +99) + assert_equal(-99, - + 99) + assert_equal(-99, +-99) + assert_equal(-99, + -99) + assert_equal(-99, + - 99) + var nr = 88 assert_equal(-88, -nr) - assert_equal(88, --nr) + assert_equal(-88, - nr) + assert_equal(-88, - +nr) + assert_equal(88, -- nr) + assert_equal(88, + nr) + assert_equal(88, --+ nr) + assert_equal(88, - - nr) enddef def Echo(arg: any): string diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2013, +/**/ 2012, /**/ 2011, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3362,6 +3362,8 @@ compile_leader(cctx_T *cctx, int numeric while (p > start) { --p; + while (VIM_ISWHITE(*p)) + --p; if (*p == '-' || *p == '+') { int negate = *p == '-';