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 #8277)
diff --git a/src/eval.c b/src/eval.c
index f75263d..008b032 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2358,7 +2358,7 @@
++*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 @@
*/
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 @@
*/
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 @@
*/
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 @@
? 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 @@
{
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 @@
{
if (evaluate && in_vim9script() && !VIM_ISWHITE(**arg))
{
- error_white_both(p, 1);
+ error_white_both(*arg, 1);
clear_tv(rettv);
return FAIL;
}