Mercurial > vim
changeset 15328:f7130bc17248 v8.1.0672
patch 8.1.0672: the Lua interface doesn't know about v:null
commit https://github.com/vim/vim/commit/9067cd6cdfdc0bb869aa7f5d2a6c607ea8255239
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 1 00:41:54 2019 +0100
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 https://github.com/vim/vim/issues/3744)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 01 Jan 2019 00:45:07 +0100 |
| parents | c77ac37fbc14 |
| children | 9a739a3d145e |
| files | src/if_lua.c src/testdir/test_lua.vim src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_lua.c +++ b/src/if_lua.c @@ -562,6 +562,10 @@ luaV_totypval(lua_State *L, int pos, typ 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));
--- 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')