Skip to content

Commit

Permalink
patch 8.2.3376: Vim9: no warning that "@r" does not do anything
Browse files Browse the repository at this point in the history
Problem:    Vim9: no warning that "@r" does not do anything.
Solution:   Give a "no effect" error. (closes #8779)
  • Loading branch information
brammool committed Aug 25, 2021
1 parent df9070e commit 4799cef
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 15 deletions.
30 changes: 21 additions & 9 deletions src/ex_eval.c
Expand Up @@ -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".
Expand All @@ -897,18 +917,10 @@ ex_eval(exarg_T *eap)
typval_T tv;
evalarg_T evalarg;
int name_only = FALSE;
char_u *p;
long lnum = SOURCING_LNUM;

if (in_vim9script())
{
char_u *alias;

p = eap->arg;
get_name_len(&p, &alias, FALSE, FALSE);
name_only = ends_excmd2(eap->arg, skipwhite(p));
vim_free(alias);
}
name_only = cmd_is_name_only(eap->arg);

fill_evalarg_from_eap(&evalarg, eap, eap->skip);

Expand Down
1 change: 1 addition & 0 deletions src/proto/ex_eval.pro
Expand Up @@ -12,6 +12,7 @@ int throw_exception(void *value, except_type_T type, char_u *cmdname);
void discard_current_exception(void);
void catch_exception(except_T *excp);
void report_make_pending(int pending, void *value);
int cmd_is_name_only(char_u *arg);
void ex_eval(exarg_T *eap);
void ex_if(exarg_T *eap);
void ex_endif(exarg_T *eap);
Expand Down
8 changes: 7 additions & 1 deletion src/testdir/test_vim9_cmd.vim
Expand Up @@ -537,7 +537,7 @@ def Test_option_use_linebreak()
CheckDefAndScriptSuccess(lines)
enddef

def Test_register_use_linebreak()
def Test_use_register()
var lines =<< trim END
new
@a = 'one'
Expand All @@ -551,6 +551,12 @@ def Test_register_use_linebreak()
bwipe!
END
CheckDefAndScriptSuccess(lines)

lines =<< trim END
@a = 'echo "text"'
@a
END
CheckDefAndScriptFailure(lines, 'E1207:')
enddef

def Test_environment_use_linebreak()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -755,6 +755,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3376,
/**/
3375,
/**/
Expand Down
6 changes: 1 addition & 5 deletions src/vim9compile.c
Expand Up @@ -8828,17 +8828,13 @@ compile_eval(char_u *arg, cctx_T *cctx)
{
char_u *p = arg;
int name_only;
char_u *alias;
long lnum = SOURCING_LNUM;

// find_ex_command() will consider a variable name an expression, assuming
// that something follows on the next line. Check that something actually
// follows, otherwise it's probably a misplaced command.
get_name_len(&p, &alias, FALSE, FALSE);
name_only = ends_excmd2(arg, skipwhite(p));
vim_free(alias);
name_only = cmd_is_name_only(arg);

p = arg;
if (compile_expr0(&p, cctx) == FAIL)
return NULL;

Expand Down

0 comments on commit 4799cef

Please sign in to comment.