diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-01 00:41:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-01 00:41:54 +0100 |
| commit | 9067cd6cdfdc0bb869aa7f5d2a6c607ea8255239 (patch) | |
| tree | 35d7bf43d853823feca230e914e6486f90e15682 | |
| parent | e1e714ef0d1f4bb8b1712795e9106e3b4ff4c7bd (diff) | |
patch 8.1.0672: the Lua interface doesn't know about v:nullv8.1.0672
Problem: The Lua interface doesn't know about v:null.
Solution: Add Lua support for v:null. (Uji, closes #3744)
| -rw-r--r-- | src/if_lua.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_lua.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/if_lua.c b/src/if_lua.c index 6e33734643..9400e3a35f 100644 --- a/src/if_lua.c +++ b/src/if_lua.c @@ -562,6 +562,10 @@ luaV_totypval(lua_State *L, int pos, typval_T *tv) tv->v_type = VAR_SPECIAL; tv->vval.v_number = (varnumber_T) lua_toboolean(L, pos); break; + case LUA_TNIL: + tv->v_type = VAR_SPECIAL; + tv->vval.v_number = VVAL_NULL; + break; case LUA_TSTRING: tv->v_type = VAR_STRING; tv->vval.v_string = vim_strsave((char_u *) lua_tostring(L, pos)); diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim index e021a2f447..1a5c74f780 100644 --- a/src/testdir/test_lua.vim +++ b/src/testdir/test_lua.vim @@ -298,17 +298,18 @@ func Test_list() lua l:add('abc') lua l:add(true) lua l:add(false) + lua l:add(nil) lua l:add(vim.eval("[1, 2, 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(6.0, luaeval('#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(7.0, luaeval('#l')) call assert_match('^list: \%(0x\)\?\x\+$', luaeval('tostring(l)')) lua l[0] = 124 - lua l[4] = nil + lua l[5] = nil lua l:insert('first') 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 call assert_fails('lua l:add("x")', '[string "vim chunk"]:1: list is locked') diff --git a/src/version.c b/src/version.c index 3de44618f9..623d2a0ef5 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 672, +/**/ 671, /**/ 670, |