Mercurial > vim
changeset 8017:c59a65524084 v7.4.1303
commit https://github.com/vim/vim/commit/b6a4fee37ebbb0c76f2fbda7d06cbf48a3a07e8d
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Feb 11 20:48:34 2016 +0100
patch 7.4.1303
Problem: A Funcref is not accepted as a callback.
Solution: Make a Funcref work. (Damien)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 11 Feb 2016 21:00:09 +0100 |
| parents | 3c70729873ad |
| children | c47cff6ef75d |
| files | src/eval.c src/testdir/test_channel.vim src/version.c |
| diffstat | 3 files changed, 27 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -9871,12 +9871,13 @@ f_ch_open(typval_T *argvars, typval_T *r if (argvars[1].v_type == VAR_DICT) { + dict_T *dict = argvars[1].vval.v_dict; + dictitem_T *item; + /* parse argdict */ - dict_T *dict = argvars[1].vval.v_dict; - - if (dict_find(dict, (char_u *)"mode", -1) != NULL) - { - mode = get_dict_string(dict, (char_u *)"mode", FALSE); + if ((item = dict_find(dict, (char_u *)"mode", -1)) != NULL) + { + mode = get_tv_string(&item->di_tv); if (STRCMP(mode, "raw") == 0) ch_mode = MODE_RAW; else if (STRCMP(mode, "js") == 0) @@ -9889,12 +9890,12 @@ f_ch_open(typval_T *argvars, typval_T *r return; } } - if (dict_find(dict, (char_u *)"waittime", -1) != NULL) - waittime = get_dict_number(dict, (char_u *)"waittime"); - if (dict_find(dict, (char_u *)"timeout", -1) != NULL) - timeout = get_dict_number(dict, (char_u *)"timeout"); - if (dict_find(dict, (char_u *)"callback", -1) != NULL) - callback = get_dict_string(dict, (char_u *)"callback", FALSE); + if ((item = dict_find(dict, (char_u *)"waittime", -1)) != NULL) + waittime = get_tv_number(&item->di_tv); + if ((item = dict_find(dict, (char_u *)"timeout", -1)) != NULL) + timeout = get_tv_number(&item->di_tv); + if ((item = dict_find(dict, (char_u *)"callback", -1)) != NULL) + callback = get_callback(&item->di_tv); } if (waittime < 0 || timeout < 0) {
--- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -118,6 +118,13 @@ func s:communicate(port) call assert_equal(handle, s:responseHandle) call assert_equal('got it', s:responseMsg) + let s:responseHandle = -1 + let s:responseMsg = '' + call ch_sendexpr(handle, 'hello!', function('s:RequestHandler')) + sleep 10m + call assert_equal(handle, s:responseHandle) + call assert_equal('got it', s:responseMsg) + " Send an eval request that works. call assert_equal('ok', ch_sendexpr(handle, 'eval-works')) sleep 10m @@ -206,13 +213,12 @@ endfunc let s:reply = "" func s:Handler(chan, msg) + unlet s:reply let s:reply = a:msg endfunc func s:channel_handler(port) - let chopt = copy(s:chopt) - let chopt['callback'] = 's:Handler' - let handle = ch_open('localhost:' . a:port, chopt) + let handle = ch_open('localhost:' . a:port, s:chopt) if handle < 0 call assert_false(1, "Can't open channel") return @@ -230,7 +236,11 @@ func s:channel_handler(port) endfunc func Test_channel_handler() + let s:chopt.callback = 's:Handler' call s:run_server('s:channel_handler') + let s:chopt.callback = function('s:Handler') + call s:run_server('s:channel_handler') + unlet s:chopt.callback endfunc " Test that trying to connect to a non-existing port fails quickly.