Mercurial > vim
changeset 7732:4a4f1dd1abe8 v7.4.1164
commit https://github.com/vim/vim/commit/6039c7f05376f0e470cf62bf2757e653aea357f3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 24 15:05:32 2016 +0100
patch 7.4.1164
Problem: No tests for comparing special variables. Error in jsondecode()
not reported. test_json does not work Japanse system.
Solution: Set scriptencoding. (Ken Takata) Add a few more tests. Add error.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 24 Jan 2016 15:15:04 +0100 |
| parents | c0b0e9255b13 |
| children | 1352ecbcef4d |
| files | src/json.c src/testdir/test_json.vim src/testdir/test_viml.vim src/version.c |
| diffstat | 4 files changed, 38 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/json.c +++ b/src/json.c @@ -220,7 +220,7 @@ json_decode_array(js_read_T *reader, typ listitem_T *li; if (rettv_list_alloc(res) == FAIL) - goto fail; + goto failsilent; ++reader->js_used; /* consume the '[' */ while (TRUE) @@ -253,6 +253,8 @@ json_decode_array(js_read_T *reader, typ goto fail; } fail: + EMSG(_(e_invarg)); +failsilent: res->v_type = VAR_SPECIAL; res->vval.v_number = VVAL_NONE; } @@ -268,7 +270,7 @@ json_decode_object(js_read_T *reader, ty char_u *key; if (rettv_dict_alloc(res) == FAIL) - goto fail; + goto failsilent; ++reader->js_used; /* consume the '{' */ while (TRUE) @@ -293,7 +295,7 @@ json_decode_object(js_read_T *reader, ty if (key != NULL) EMSG(_(e_emptykey)); clear_tv(&tvkey); - goto fail; + goto failsilent; } json_skip_white(reader); @@ -329,6 +331,8 @@ json_decode_object(js_read_T *reader, ty goto fail; } fail: + EMSG(_(e_invarg)); +failsilent: res->v_type = VAR_SPECIAL; res->vval.v_number = VVAL_NONE; }
--- a/src/testdir/test_json.vim +++ b/src/testdir/test_json.vim @@ -1,4 +1,5 @@ " Test for JSON functions. +scriptencoding utf-8 let s:json1 = '"str\"in\\g"' let s:var1 = "str\"in\\g" @@ -95,11 +96,25 @@ func Test_decode() call assert_equal(type(v:none), type(jsondecode(''))) call assert_equal("", jsondecode('""')) + call assert_equal({'n': 1}, jsondecode('{"n":1,}')) + call assert_fails('call jsondecode("\"")', "E474:") - call assert_fails('call jsondecode("{-}")', "E474:") call assert_fails('call jsondecode("blah")', "E474:") call assert_fails('call jsondecode("true blah")', "E474:") call assert_fails('call jsondecode("<foobar>")', "E474:") - call assert_fails('call jsondecode("[foobar]")', "E474:") + + call assert_fails('call jsondecode("{")', "E474:") call assert_fails('call jsondecode("{foobar}")', "E474:") + call assert_fails('call jsondecode("{\"n\",")', "E474:") + call assert_fails('call jsondecode("{\"n\":")', "E474:") + call assert_fails('call jsondecode("{\"n\":1")', "E474:") + call assert_fails('call jsondecode("{\"n\":1,")', "E474:") + call assert_fails('call jsondecode("{\"n\",1}")', "E474:") + call assert_fails('call jsondecode("{-}")', "E474:") + + call assert_fails('call jsondecode("[foobar]")', "E474:") + call assert_fails('call jsondecode("[")', "E474:") + call assert_fails('call jsondecode("[1")', "E474:") + call assert_fails('call jsondecode("[1,")', "E474:") + call assert_fails('call jsondecode("[1 2]")', "E474:") endfunc
--- a/src/testdir/test_viml.vim +++ b/src/testdir/test_viml.vim @@ -946,6 +946,18 @@ func Test_type() call assert_equal('true', '' . v:true) call assert_equal('none', '' . v:none) call assert_equal('null', '' . v:null) + + call assert_true(v:false == 0) + call assert_false(v:false != 0) + call assert_true(v:true == 1) + call assert_false(v:true != 1) + call assert_false(v:true == v:false) + call assert_true(v:true != v:false) + + call assert_true(v:null == 0) + call assert_false(v:null != 0) + call assert_true(v:none == 0) + call assert_false(v:none != 0) endfunc "-------------------------------------------------------------------------------