mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.1.0672: the Lua interface doesn't know about v:null
Problem: The Lua interface doesn't know about v:null. Solution: Add Lua support for v:null. (Uji, closes #3744)
This commit is contained in:
@@ -562,6 +562,10 @@ luaV_totypval(lua_State *L, int pos, typval_T *tv)
|
|||||||
tv->v_type = VAR_SPECIAL;
|
tv->v_type = VAR_SPECIAL;
|
||||||
tv->vval.v_number = (varnumber_T) lua_toboolean(L, pos);
|
tv->vval.v_number = (varnumber_T) lua_toboolean(L, pos);
|
||||||
break;
|
break;
|
||||||
|
case LUA_TNIL:
|
||||||
|
tv->v_type = VAR_SPECIAL;
|
||||||
|
tv->vval.v_number = VVAL_NULL;
|
||||||
|
break;
|
||||||
case LUA_TSTRING:
|
case LUA_TSTRING:
|
||||||
tv->v_type = VAR_STRING;
|
tv->v_type = VAR_STRING;
|
||||||
tv->vval.v_string = vim_strsave((char_u *) lua_tostring(L, pos));
|
tv->vval.v_string = vim_strsave((char_u *) lua_tostring(L, pos));
|
||||||
|
@@ -298,17 +298,18 @@ func Test_list()
|
|||||||
lua l:add('abc')
|
lua l:add('abc')
|
||||||
lua l:add(true)
|
lua l:add(true)
|
||||||
lua l:add(false)
|
lua l:add(false)
|
||||||
|
lua l:add(nil)
|
||||||
lua l:add(vim.eval("[1, 2, 3]"))
|
lua l:add(vim.eval("[1, 2, 3]"))
|
||||||
lua l:add(vim.eval("{'a':1, 'b':2, 'c':3}"))
|
lua l:add(vim.eval("{'a':1, 'b':2, 'c':3}"))
|
||||||
call assert_equal([123.0, 'abc', v:true, v:false, [1, 2, 3], {'a': 1, 'b': 2, 'c': 3}], l)
|
call assert_equal([123.0, 'abc', v:true, v:false, v:null, [1, 2, 3], {'a': 1, 'b': 2, 'c': 3}], l)
|
||||||
call assert_equal(6.0, luaeval('#l'))
|
call assert_equal(7.0, luaeval('#l'))
|
||||||
call assert_match('^list: \%(0x\)\?\x\+$', luaeval('tostring(l)'))
|
call assert_match('^list: \%(0x\)\?\x\+$', luaeval('tostring(l)'))
|
||||||
|
|
||||||
lua l[0] = 124
|
lua l[0] = 124
|
||||||
lua l[4] = nil
|
lua l[5] = nil
|
||||||
lua l:insert('first')
|
lua l:insert('first')
|
||||||
lua l:insert('xx', 3)
|
lua l:insert('xx', 3)
|
||||||
call assert_equal(['first', 124.0, 'abc', 'xx', v:true, v:false, {'a': 1, 'b': 2, 'c': 3}], l)
|
call assert_equal(['first', 124.0, 'abc', 'xx', v:true, v:false, v:null, {'a': 1, 'b': 2, 'c': 3}], l)
|
||||||
|
|
||||||
lockvar 1 l
|
lockvar 1 l
|
||||||
call assert_fails('lua l:add("x")', '[string "vim chunk"]:1: list is locked')
|
call assert_fails('lua l:add("x")', '[string "vim chunk"]:1: list is locked')
|
||||||
|
@@ -799,6 +799,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 */
|
||||||
|
/**/
|
||||||
|
672,
|
||||||
/**/
|
/**/
|
||||||
671,
|
671,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user