mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.2.1372: Vim9: no error for missing white space around operator
Problem: Vim9: no error for missing white space around operator. Solution: Check for white space around ? and :.
This commit is contained in:
34
src/eval.c
34
src/eval.c
@@ -2072,7 +2072,7 @@ eval0(
|
|||||||
* expr2 ? expr1 : expr1
|
* expr2 ? expr1 : expr1
|
||||||
*
|
*
|
||||||
* "arg" must point to the first non-white of the expression.
|
* "arg" must point to the first non-white of the expression.
|
||||||
* "arg" is advanced to the next non-white after the recognized expression.
|
* "arg" is advanced to just after the recognized expression.
|
||||||
*
|
*
|
||||||
* Note: "rettv.v_lock" is not set.
|
* Note: "rettv.v_lock" is not set.
|
||||||
*
|
*
|
||||||
@@ -2111,7 +2111,15 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
|
|||||||
if (getnext)
|
if (getnext)
|
||||||
*arg = eval_next_line(evalarg_used);
|
*arg = eval_next_line(evalarg_used);
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (evaluate && in_vim9script() && !VIM_ISWHITE(p[-1]))
|
||||||
|
{
|
||||||
|
error_white_both(p, 1);
|
||||||
|
clear_tv(rettv);
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
*arg = p;
|
*arg = p;
|
||||||
|
}
|
||||||
|
|
||||||
result = FALSE;
|
result = FALSE;
|
||||||
if (evaluate)
|
if (evaluate)
|
||||||
@@ -2128,6 +2136,12 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
|
|||||||
/*
|
/*
|
||||||
* Get the second variable. Recursive!
|
* Get the second variable. Recursive!
|
||||||
*/
|
*/
|
||||||
|
if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[1]))
|
||||||
|
{
|
||||||
|
error_white_both(p, 1);
|
||||||
|
clear_tv(rettv);
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
*arg = skipwhite_and_linebreak(*arg + 1, evalarg_used);
|
*arg = skipwhite_and_linebreak(*arg + 1, evalarg_used);
|
||||||
evalarg_used->eval_flags = result ? orig_flags
|
evalarg_used->eval_flags = result ? orig_flags
|
||||||
: orig_flags & ~EVAL_EVALUATE;
|
: orig_flags & ~EVAL_EVALUATE;
|
||||||
@@ -2148,11 +2162,25 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
|
|||||||
if (getnext)
|
if (getnext)
|
||||||
*arg = eval_next_line(evalarg_used);
|
*arg = eval_next_line(evalarg_used);
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (evaluate && in_vim9script() && !VIM_ISWHITE(p[-1]))
|
||||||
|
{
|
||||||
|
error_white_both(p, 1);
|
||||||
|
clear_tv(rettv);
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
*arg = p;
|
*arg = p;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get the third variable. Recursive!
|
* Get the third variable. Recursive!
|
||||||
*/
|
*/
|
||||||
|
if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[1]))
|
||||||
|
{
|
||||||
|
error_white_both(p, 1);
|
||||||
|
clear_tv(rettv);
|
||||||
|
return FAIL;
|
||||||
|
}
|
||||||
*arg = skipwhite_and_linebreak(*arg + 1, evalarg_used);
|
*arg = skipwhite_and_linebreak(*arg + 1, evalarg_used);
|
||||||
evalarg_used->eval_flags = !result ? orig_flags
|
evalarg_used->eval_flags = !result ? orig_flags
|
||||||
: orig_flags & ~EVAL_EVALUATE;
|
: orig_flags & ~EVAL_EVALUATE;
|
||||||
@@ -2179,7 +2207,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
|
|||||||
* expr2 || expr2 || expr2 logical OR
|
* expr2 || expr2 || expr2 logical OR
|
||||||
*
|
*
|
||||||
* "arg" must point to the first non-white of the expression.
|
* "arg" must point to the first non-white of the expression.
|
||||||
* "arg" is advanced to the next non-white after the recognized expression.
|
* "arg" is advanced to just after the recognized expression.
|
||||||
*
|
*
|
||||||
* Return OK or FAIL.
|
* Return OK or FAIL.
|
||||||
*/
|
*/
|
||||||
@@ -2310,7 +2338,7 @@ eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
|
|||||||
* expr3 && expr3 && expr3 logical AND
|
* expr3 && expr3 && expr3 logical AND
|
||||||
*
|
*
|
||||||
* "arg" must point to the first non-white of the expression.
|
* "arg" must point to the first non-white of the expression.
|
||||||
* "arg" is advanced to the next non-white after the recognized expression.
|
* "arg" is advanced to just after the recognized expression.
|
||||||
*
|
*
|
||||||
* Return OK or FAIL.
|
* Return OK or FAIL.
|
||||||
*/
|
*/
|
||||||
|
@@ -60,7 +60,7 @@ def Test_expr1()
|
|||||||
enddef
|
enddef
|
||||||
|
|
||||||
def Test_expr1_vimscript()
|
def Test_expr1_vimscript()
|
||||||
# only checks line continuation
|
# check line continuation
|
||||||
let lines =<< trim END
|
let lines =<< trim END
|
||||||
vim9script
|
vim9script
|
||||||
let var = 1
|
let var = 1
|
||||||
@@ -87,6 +87,33 @@ def Test_expr1_vimscript()
|
|||||||
assert_equal('no', var)
|
assert_equal('no', var)
|
||||||
END
|
END
|
||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
|
|
||||||
|
# check white space
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
let var = v:true?1:2
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E1004:')
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
let var = v:true? 1 : 2
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E1004:')
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
let var = v:true ?1 : 2
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E1004:')
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
let var = v:true ? 1: 2
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E1004:')
|
||||||
|
lines =<< trim END
|
||||||
|
vim9script
|
||||||
|
let var = v:true ? 1 :2
|
||||||
|
END
|
||||||
|
CheckScriptFailure(lines, 'E1004:')
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
func Test_expr1_fails()
|
func Test_expr1_fails()
|
||||||
|
@@ -754,6 +754,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1372,
|
||||||
/**/
|
/**/
|
||||||
1371,
|
1371,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user