diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-02-13 21:39:28 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2016-04-18 02:48:20 +0300 |
| commit | 2f67786796d5fb4237f4b0258ec3db0982cc7f53 (patch) | |
| tree | dc8a7d2f10ce72316a8e1162ab160de7dc3aa1fb /src | |
| parent | f1ced96c28b7db7b3dad9b0ca2f71f8d046ef732 (diff) | |
| download | rneovim-2f67786796d5fb4237f4b0258ec3db0982cc7f53.tar.gz rneovim-2f67786796d5fb4237f4b0258ec3db0982cc7f53.tar.bz2 rneovim-2f67786796d5fb4237f4b0258ec3db0982cc7f53.zip | |
eval: Rename json* functions to json_*
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 12 | ||||
| -rw-r--r-- | src/nvim/eval/encode.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 11 |
3 files changed, 13 insertions, 12 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 755b05e591..c23613aeab 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -6784,8 +6784,8 @@ static struct fst { { "jobstop", 1, 1, f_jobstop }, { "jobwait", 1, 2, f_jobwait }, { "join", 1, 2, f_join }, - { "jsondecode", 1, 1, f_jsondecode }, - { "jsonencode", 1, 1, f_jsonencode }, + { "json_decode", 1, 1, f_json_decode }, + { "json_encode", 1, 1, f_json_encode }, { "keys", 1, 1, f_keys }, { "last_buffer_nr", 0, 0, f_last_buffer_nr }, // obsolete { "len", 1, 1, f_len }, @@ -11583,8 +11583,8 @@ static void f_join(typval_T *argvars, typval_T *rettv) rettv->vval.v_string = NULL; } -/// jsondecode() function -static void f_jsondecode(typval_T *argvars, typval_T *rettv) +/// json_decode() function +static void f_json_decode(typval_T *argvars, typval_T *rettv) { char numbuf[NUMBUFLEN]; char *s = NULL; @@ -11614,8 +11614,8 @@ static void f_jsondecode(typval_T *argvars, typval_T *rettv) xfree(tofree); } -/// jsonencode() function -static void f_jsonencode(typval_T *argvars, typval_T *rettv) +/// json_encode() function +static void f_json_encode(typval_T *argvars, typval_T *rettv) { rettv->v_type = VAR_STRING; rettv->vval.v_string = (char_u *) encode_tv2json(&argvars[0], NULL); diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index e3d0bf69b2..a131f5c3c1 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -1020,7 +1020,7 @@ static inline int convert_to_json_string(garray_T *const gap, "attempt to dump function reference"), \ mpstack, objname) -/// Check whether given key can be used in jsonencode() +/// Check whether given key can be used in json_encode() /// /// @param[in] tv Key to check. static inline bool check_json_key(const typval_T *const tv) diff --git a/src/nvim/version.c b/src/nvim/version.c index 106cc8d1d8..e0d5e984cd 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -78,14 +78,15 @@ static int included_patches[] = { 1511, 1425, 1366, + 1304, 1292, 1284, // 1283 1282, // 1281 // 1280 - // 1279 - // 1278 + // 1279 NA + // 1278 NA // 1277 // 1276 // 1275 @@ -94,7 +95,7 @@ static int included_patches[] = { // 1272 1271, // 1270 - // 1269 + 1269, // 1268 1267, // 1266 @@ -120,7 +121,7 @@ static int included_patches[] = { // 1246 // 1245 // 1244 - // 1243 + // 1243 NA // 1242 // 1241 // 1240 @@ -132,7 +133,7 @@ static int included_patches[] = { // 1234 // 1233 // 1232 - // 1231 + // 1231 NA // 1230 // 1229 1228, |