aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.1562: Vim9: error when using "%" where a buffer is expected

Browse Source 
Problem:    Vim9: error when using "%" where a buffer is expected.
Solution:   Add tv_get_buf_from_arg(). (closes #6814)
This commit is contained in:
Bram Moolenaar
2020-09-01 23:06:01 +02:00
parent 81fcb67fb3
commit 3767e3a330
5 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/evalbuffer.c
View File

@@ -364,16 +364,7 @@ f_bufname(typval_T *argvars, typval_T *rettv)
if (tv->v_type == VAR_UNKNOWN)
buf = curbuf;
else
{
++emsg_off;
buf = tv_get_buf(tv, FALSE);
--emsg_off;
if (buf == NULL
&& tv->v_type != VAR_NUMBER
&& tv->v_type != VAR_STRING)
// issue errmsg for type error
(void)tv_get_number(tv);
}
buf = tv_get_buf_from_arg(tv);
rettv->v_type = VAR_STRING;
if (buf != NULL && buf->b_fname != NULL)
rettv->vval.v_string = vim_strsave(buf->b_fname);
@@ -394,13 +385,7 @@ f_bufnr(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type == VAR_UNKNOWN)
buf = curbuf;
else
{
if (argvars[0].v_type != VAR_STRING)
(void)tv_get_number(&argvars[0]); // issue errmsg if type error
++emsg_off;
buf = tv_get_buf(&argvars[0], FALSE);
--emsg_off;
}
buf = tv_get_buf_from_arg(&argvars[0]);
// If the buffer isn't found and the second argument is not zero create a
// new buffer.
@@ -425,9 +410,7 @@ buf_win_common(typval_T *argvars, typval_T *rettv, int get_nr)
int winnr = 0;
buf_T *buf;
(void)tv_get_number(&argvars[0]); // issue errmsg if type error
++emsg_off;
buf = tv_get_buf(&argvars[0], TRUE);
buf = tv_get_buf_from_arg(&argvars[0]);
FOR_ALL_WINDOWS(wp)
{
++winnr;
@@ -435,7 +418,6 @@ buf_win_common(typval_T *argvars, typval_T *rettv, int get_nr)
break;
}
rettv->vval.v_number = (wp != NULL ? (get_nr ? winnr : wp->w_id) : -1);
--emsg_off;
}
/*
@@ -662,10 +644,7 @@ f_getbufinfo(typval_T *argvars, typval_T *rettv)
else if (argvars[0].v_type != VAR_UNKNOWN)
{
// Information about one buffer. Argument specifies the buffer
(void)tv_get_number(&argvars[0]); // issue errmsg if type error
++emsg_off;
argbuf = tv_get_buf(&argvars[0], FALSE);
--emsg_off;
argbuf = tv_get_buf_from_arg(&argvars[0]);
if (argbuf == NULL)
return;
}
@@ -752,10 +731,7 @@ f_getbufline(typval_T *argvars, typval_T *rettv)
linenr_T end;
buf_T *buf;
(void)tv_get_number(&argvars[0]); // issue errmsg if type error
++emsg_off;
buf = tv_get_buf(&argvars[0], FALSE);
--emsg_off;
buf = tv_get_buf_from_arg(&argvars[0]);
lnum = tv_get_lnum_buf(&argvars[1], buf);
if (argvars[2].v_type == VAR_UNKNOWN)

1
src/proto/typval.pro
View File

@@ -29,4 +29,5 @@ int eval_env_var(char_u **arg, typval_T *rettv, int evaluate);
linenr_T tv_get_lnum(typval_T *argvars);
linenr_T tv_get_lnum_buf(typval_T *argvars, buf_T *buf);
buf_T *tv_get_buf(typval_T *tv, int curtab_only);
buf_T *tv_get_buf_from_arg(typval_T *tv);
/* vim: set ft=c : */

5
src/testdir/test_vim9_func.vim
View File

@@ -1443,6 +1443,11 @@ def Test_bufname()
close
enddef
def Test_gebufinfo()
let bufinfo = getbufinfo(bufnr())
assert_equal(bufinfo, getbufinfo('%'))
enddef
def Fibonacci(n: number): number
if n < 2
return n

19
src/typval.c
View File

@@ -1562,4 +1562,23 @@ tv_get_buf(typval_T *tv, int curtab_only)
return buf;
}
/*
* Like tv_get_buf() but give an error message is the type is wrong.
*/
buf_T *
tv_get_buf_from_arg(typval_T *tv)
{
buf_T *buf;
++emsg_off;
buf = tv_get_buf(tv, FALSE);
--emsg_off;
if (buf == NULL
&& tv->v_type != VAR_NUMBER
&& tv->v_type != VAR_STRING)
// issue errmsg for type error
(void)tv_get_number(tv);
return buf;
}
#endif // FEAT_EVAL

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1562,
/**/
1561,
/**/