forked from aniani/vim
patch 8.2.3376: Vim9: no warning that "@r" does not do anything
Problem: Vim9: no warning that "@r" does not do anything. Solution: Give a "no effect" error. (closes #8779)
This commit is contained in:
parent
df9070e300
commit
4799cef85c
@ -887,6 +887,26 @@ report_discard_pending(int pending, void *value)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
cmd_is_name_only(char_u *arg)
|
||||||
|
{
|
||||||
|
char_u *p = arg;
|
||||||
|
char_u *alias;
|
||||||
|
int name_only = FALSE;
|
||||||
|
|
||||||
|
if (*p == '&')
|
||||||
|
{
|
||||||
|
++p;
|
||||||
|
if (STRNCMP("l:", p, 2) == 0 || STRNCMP("g:", p, 2) == 0)
|
||||||
|
p += 2;
|
||||||
|
}
|
||||||
|
else if (*p == '@')
|
||||||
|
++p;
|
||||||
|
get_name_len(&p, &alias, FALSE, FALSE);
|
||||||
|
name_only = ends_excmd2(arg, skipwhite(p));
|
||||||
|
vim_free(alias);
|
||||||
|
return name_only;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ":eval".
|
* ":eval".
|
||||||
@ -897,18 +917,10 @@ ex_eval(exarg_T *eap)
|
|||||||
typval_T tv;
|
typval_T tv;
|
||||||
evalarg_T evalarg;
|
evalarg_T evalarg;
|
||||||
int name_only = FALSE;
|
int name_only = FALSE;
|
||||||
char_u *p;
|
|
||||||
long lnum = SOURCING_LNUM;
|
long lnum = SOURCING_LNUM;
|
||||||
|
|
||||||
if (in_vim9script())
|
if (in_vim9script())
|
||||||
{
|
name_only = cmd_is_name_only(eap->arg);
|
||||||
char_u *alias;
|
|
||||||
|
|
||||||
p = eap->arg;
|
|
||||||
get_name_len(&p, &alias, FALSE, FALSE);
|
|
||||||
name_only = ends_excmd2(eap->arg, skipwhite(p));
|
|
||||||
vim_free(alias);
|
|
||||||
}
|
|
||||||
|
|
||||||
fill_evalarg_from_eap(&evalarg, eap, eap->skip);
|
fill_evalarg_from_eap(&evalarg, eap, eap->skip);
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ int throw_exception(void *value, except_type_T type, char_u *cmdname);
|
|||||||
void discard_current_exception(void);
|
void discard_current_exception(void);
|
||||||
void catch_exception(except_T *excp);
|
void catch_exception(except_T *excp);
|
||||||
void report_make_pending(int pending, void *value);
|
void report_make_pending(int pending, void *value);
|
||||||
|
int cmd_is_name_only(char_u *arg);
|
||||||
void ex_eval(exarg_T *eap);
|
void ex_eval(exarg_T *eap);
|
||||||
void ex_if(exarg_T *eap);
|
void ex_if(exarg_T *eap);
|
||||||
void ex_endif(exarg_T *eap);
|
void ex_endif(exarg_T *eap);
|
||||||
|
@ -537,7 +537,7 @@ def Test_option_use_linebreak()
|
|||||||
CheckDefAndScriptSuccess(lines)
|
CheckDefAndScriptSuccess(lines)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
def Test_register_use_linebreak()
|
def Test_use_register()
|
||||||
var lines =<< trim END
|
var lines =<< trim END
|
||||||
new
|
new
|
||||||
@a = 'one'
|
@a = 'one'
|
||||||
@ -551,6 +551,12 @@ def Test_register_use_linebreak()
|
|||||||
bwipe!
|
bwipe!
|
||||||
END
|
END
|
||||||
CheckDefAndScriptSuccess(lines)
|
CheckDefAndScriptSuccess(lines)
|
||||||
|
|
||||||
|
lines =<< trim END
|
||||||
|
@a = 'echo "text"'
|
||||||
|
@a
|
||||||
|
END
|
||||||
|
CheckDefAndScriptFailure(lines, 'E1207:')
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
def Test_environment_use_linebreak()
|
def Test_environment_use_linebreak()
|
||||||
|
@ -755,6 +755,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 */
|
||||||
|
/**/
|
||||||
|
3376,
|
||||||
/**/
|
/**/
|
||||||
3375,
|
3375,
|
||||||
/**/
|
/**/
|
||||||
|
@ -8828,17 +8828,13 @@ compile_eval(char_u *arg, cctx_T *cctx)
|
|||||||
{
|
{
|
||||||
char_u *p = arg;
|
char_u *p = arg;
|
||||||
int name_only;
|
int name_only;
|
||||||
char_u *alias;
|
|
||||||
long lnum = SOURCING_LNUM;
|
long lnum = SOURCING_LNUM;
|
||||||
|
|
||||||
// find_ex_command() will consider a variable name an expression, assuming
|
// find_ex_command() will consider a variable name an expression, assuming
|
||||||
// that something follows on the next line. Check that something actually
|
// that something follows on the next line. Check that something actually
|
||||||
// follows, otherwise it's probably a misplaced command.
|
// follows, otherwise it's probably a misplaced command.
|
||||||
get_name_len(&p, &alias, FALSE, FALSE);
|
name_only = cmd_is_name_only(arg);
|
||||||
name_only = ends_excmd2(arg, skipwhite(p));
|
|
||||||
vim_free(alias);
|
|
||||||
|
|
||||||
p = arg;
|
|
||||||
if (compile_expr0(&p, cctx) == FAIL)
|
if (compile_expr0(&p, cctx) == FAIL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user