# HG changeset patch # User Bram Moolenaar # Date 1622217603 -7200 # Node ID 34a5329b85aab135be73f8d7159f409f9082da59 # Parent a2a1b64d088b1f77988b1d6f55e162237fa88350 patch 8.2.2895: Vim9: random characters appear in some error messages Commit: https://github.com/vim/vim/commit/4ac198c61cb3097d4839d5a697cc8b2b256ac575 Author: mityu Date: Fri May 28 17:52:40 2021 +0200 patch 8.2.2895: Vim9: random characters appear in some error messages Problem: Vim9: random characters appear in some error messages. Solution: Pass the correct pointer. (closes https://github.com/vim/vim/issues/8277) diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -2358,7 +2358,7 @@ eval1(char_u **arg, typval_T *rettv, eva ++*arg; if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[1])) { - error_white_both(p, op_falsy ? 2 : 1); + error_white_both(*arg - (op_falsy ? 1 : 0), op_falsy ? 2 : 1); clear_tv(rettv); return FAIL; } @@ -2406,7 +2406,7 @@ eval1(char_u **arg, typval_T *rettv, eva */ if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[1])) { - error_white_both(p, 1); + error_white_both(*arg, 1); clear_tv(rettv); evalarg_used->eval_flags = orig_flags; return FAIL; @@ -2511,7 +2511,7 @@ eval2(char_u **arg, typval_T *rettv, eva */ if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[2])) { - error_white_both(p, 2); + error_white_both(*arg, 2); clear_tv(rettv); return FAIL; } @@ -2637,7 +2637,7 @@ eval3(char_u **arg, typval_T *rettv, eva */ if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[2])) { - error_white_both(p, 2); + error_white_both(*arg, 2); clear_tv(rettv); return FAIL; } @@ -2735,10 +2735,13 @@ eval4(char_u **arg, typval_T *rettv, eva ? 0 : (evalarg->eval_flags & EVAL_EVALUATE); if (getnext) + { *arg = eval_next_line(evalarg); + p = *arg; + } else if (evaluate && vim9script && !VIM_ISWHITE(**arg)) { - error_white_both(p, len); + error_white_both(*arg, len); clear_tv(rettv); return FAIL; } @@ -2898,7 +2901,7 @@ eval5(char_u **arg, typval_T *rettv, eva { if (evaluate && vim9script && !VIM_ISWHITE(**arg)) { - error_white_both(p, oplen); + error_white_both(*arg, oplen); clear_tv(rettv); return FAIL; } @@ -3130,7 +3133,7 @@ eval6( { if (evaluate && in_vim9script() && !VIM_ISWHITE(**arg)) { - error_white_both(p, 1); + error_white_both(*arg, 1); clear_tv(rettv); return FAIL; } 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 @@ -172,11 +172,23 @@ func Test_expr1_trinary_fails() call CheckDefAndScriptFailure(["var x = 1? 'one' : 'two'"], msg, 1) call CheckDefAndScriptFailure(["var x = 1 ?'one' : 'two'"], msg, 1) call CheckDefAndScriptFailure(["var x = 1?'one' : 'two'"], msg, 1) + let lines =<< trim END + var x = 1 + ?'one' : 'two' + # comment + END + call CheckDefAndScriptFailure(lines, 'E1004: White space required before and after ''?'' at "?''one'' : ''two''"', 2) let msg = "White space required before and after ':'" call CheckDefAndScriptFailure(["var x = 1 ? 'one': 'two'"], msg, 1) call CheckDefAndScriptFailure(["var x = 1 ? 'one' :'two'"], msg, 1) call CheckDefAndScriptFailure(["var x = 1 ? 'one':'two'"], msg, 1) + let lines =<< trim END + var x = 1 ? 'one' + :'two' + # Comment + END + call CheckDefAndScriptFailure(lines, 'E1004: White space required before and after '':'' at ":''two''"', 2) call CheckDefAndScriptFailure(["var x = 'x' ? 'one' : 'two'"], 'E1135:', 1) call CheckDefAndScriptFailure(["var x = 0z1234 ? 'one' : 'two'"], 'E974:', 1) @@ -229,6 +241,12 @@ def Test_expr1_falsy() call CheckDefAndScriptFailure(["var x = 1?? 'one' : 'two'"], msg, 1) call CheckDefAndScriptFailure(["var x = 1 ??'one' : 'two'"], msg, 1) call CheckDefAndScriptFailure(["var x = 1??'one' : 'two'"], msg, 1) + lines =<< trim END + var x = 1 + ??'one' : 'two' + #comment + END + CheckDefAndScriptFailure(lines, 'E1004: White space required before and after ''??'' at "??''one'' : ''two''"', 2) enddef def Record(val: any): any @@ -376,6 +394,13 @@ def Test_expr2_fails() call CheckDefAndScriptFailure2(["var x = [] || false"], 'E1012: Type mismatch; expected bool but got list', 'E745:', 1) + var lines =<< trim END + vim9script + echo false + ||true + # comment + END + CheckScriptFailure(lines, 'E1004: White space required before and after ''||'' at "||true"', 3) enddef " test && @@ -476,13 +501,19 @@ def Test_expr3_fails() CheckDefAndScriptFailure(["var x = 1&&2"], msg, 1) CheckDefAndScriptFailure(["var x = 1 &&2"], msg, 1) CheckDefAndScriptFailure(["var x = 1&& 2"], msg, 1) + var lines =<< trim END + var x = 1 + &&2 + # comment + END + CheckDefAndScriptFailure(lines, 'E1004: White space required before and after ''&&'' at "&&2"', 2) g:vals = [] CheckDefAndScriptFailure2(["if 'yes' && 0", 'echo 0', 'endif'], 'E1012: Type mismatch; expected bool but got string', 'E1135: Using a String as a Bool', 1) CheckDefExecAndScriptFailure(['assert_equal(false, Record(1) && Record(4) && Record(0))'], 'E1023: Using a Number as a Bool: 4', 1) - var lines =<< trim END + lines =<< trim END if 3 && true endif @@ -976,6 +1007,12 @@ def Test_expr4_vim9script() END CheckDefAndScriptFailure(lines, 'E1004:', 1) + for op in ['==', '>', '>=', '<', '<=', '=~', '!~', 'is', 'isnot'] + lines = ["echo 'aaa'", op .. "'bbb'", '# comment'] + var msg = printf("E1004: White space required before and after '%s'", op) + CheckDefAndScriptFailure(lines, msg, 2) + endfor + lines =<< trim END echo len('xxx') == 3 END @@ -1264,6 +1301,12 @@ def Test_expr5_vim9script() bwipe! END CheckDefAndScriptFailure(lines, "E1004: White space required before and after '/' at \"/pattern", 3) + + for op in ['+', '-'] + lines = ['var x = 1', op .. '2', '# comment'] + var msg = printf("E1004: White space required before and after '%s' at \"%s2\"", op, op) + CheckDefAndScriptFailure(lines, msg, 2) + endfor enddef def Test_expr5_vim9script_channel() @@ -1545,6 +1588,12 @@ func Test_expr6_fails() if has('float') call CheckDefAndScriptFailure2(["var x = 0.7[1]"], 'E1107:', 'E806:', 1) endif + + for op in ['*', '/', '%'] + let lines = ['var x = 1', op .. '2', '# comment'] + let msg = printf("E1004: White space required before and after '%s' at \"%s2\"", op, op) + call CheckDefAndScriptFailure(lines, msg, 2) + endfor endfunc func Test_expr6_float_fails() 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 */ /**/ + 2895, +/**/ 2894, /**/ 2893, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -5187,7 +5187,7 @@ compile_expr1(char_u **arg, cctx_T *cctx if (!IS_WHITE_OR_NUL(**arg) || !IS_WHITE_OR_NUL(p[1 + op_falsy])) { semsg(_(e_white_space_required_before_and_after_str_at_str), - op_falsy ? "??" : "?", *arg); + op_falsy ? "??" : "?", p); return FAIL; }