vim: src/json.c annotate

annotate src/json.c @ 10328:299f1669c20e v8.0.0059

commit https://github.com/vim/vim/commit/de5e2c219b99895445fb75ae3541ee69282a5846 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 4 20:35:31 2016 +0100 patch 8.0.0059 Problem: Vim does not build on VMS systems. Solution: Various changes for VMS. (Zoltan Arpadffy)

author	Christian Brabandt <cb@256bit.org>
date	Fri, 04 Nov 2016 20:45:04 +0100
parents	7b2f95633e28
children	e70ff5756201

rev	line source
10042 4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47 Christian Brabandt <cb@256bit.org> parents: 9969 diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	2 *
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	4 *
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	8 */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	9
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	10 /*
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	11 * json.c: Encoding and decoding JSON.
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	12 *
7782 3a99194bd187 commit https://github.com/vim/vim/commit/009d84a34f3678ec93921bee3bc05be2fd606264 Christian Brabandt <cb@256bit.org> parents: 7736 diff changeset	13 * Follows this standard: https://tools.ietf.org/html/rfc7159.html
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	14 */
8295 18fd94bd4eb8 commit https://github.com/vim/vim/commit/fefecb0fbe14c44d46f91036d76bbb6c28162da8 Christian Brabandt <cb@256bit.org> parents: 8293 diff changeset	15 #define USING_FLOAT_STUFF
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	16
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	17 #include "vim.h"
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	18
10328 299f1669c20e commit https://github.com/vim/vim/commit/de5e2c219b99895445fb75ae3541ee69282a5846 Christian Brabandt <cb@256bit.org> parents: 10299 diff changeset	19 #ifdef VAX
299f1669c20e commit https://github.com/vim/vim/commit/de5e2c219b99895445fb75ae3541ee69282a5846 Christian Brabandt <cb@256bit.org> parents: 10299 diff changeset	20 # undef FEAT_FLOAT // VAX does not handle well the Infinities
299f1669c20e commit https://github.com/vim/vim/commit/de5e2c219b99895445fb75ae3541ee69282a5846 Christian Brabandt <cb@256bit.org> parents: 10299 diff changeset	21 #endif
299f1669c20e commit https://github.com/vim/vim/commit/de5e2c219b99895445fb75ae3541ee69282a5846 Christian Brabandt <cb@256bit.org> parents: 10299 diff changeset	22
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	23 #if defined(FEAT_EVAL) \|\| defined(PROTO)
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	24
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	25 static int json_encode_item(garray_T gap, typval_T val, int copyID, int options);
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	26 static int json_decode_item(js_read_T reader, typval_T res, int options);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	27
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	28 /*
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	29 * Encode "val" into a JSON format string.
9969 176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	30 * The result is added to "gap"
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	31 * Returns FAIL on failure and makes gap->ga_data empty.
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	32 */
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	33 static int
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	34 json_encode_gap(garray_T gap, typval_T val, int options)
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	35 {
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	36 if (json_encode_item(gap, val, get_copyID(), options) == FAIL)
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	37 {
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	38 ga_clear(gap);
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	39 gap->ga_data = vim_strsave((char_u *)"");
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	40 return FAIL;
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	41 }
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	42 return OK;
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	43 }
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	44
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	45 /*
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	46 * Encode "val" into a JSON format string.
7965 646d5148fee2 commit https://github.com/vim/vim/commit/55fab439a6f3bba6dbe780ac034b84d5822a1a96 Christian Brabandt <cb@256bit.org> parents: 7947 diff changeset	47 * The result is in allocated memory.
646d5148fee2 commit https://github.com/vim/vim/commit/55fab439a6f3bba6dbe780ac034b84d5822a1a96 Christian Brabandt <cb@256bit.org> parents: 7947 diff changeset	48 * The result is empty when encoding fails.
9969 176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	49 * "options" can contain JSON_JS, JSON_NO_NONE and JSON_NL.
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	50 */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	51 char_u *
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	52 json_encode(typval_T *val, int options)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	53 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	54 garray_T ga;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	55
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	56 /* Store bytes in the growarray. */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	57 ga_init2(&ga, 1, 4000);
9969 176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	58 json_encode_gap(&ga, val, options);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	59 return ga.ga_data;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	60 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	61
7864 6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	62 /*
7965 646d5148fee2 commit https://github.com/vim/vim/commit/55fab439a6f3bba6dbe780ac034b84d5822a1a96 Christian Brabandt <cb@256bit.org> parents: 7947 diff changeset	63 * Encode ["nr", "val"] into a JSON format string in allocated memory.
9969 176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	64 * "options" can contain JSON_JS, JSON_NO_NONE and JSON_NL.
7864 6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	65 * Returns NULL when out of memory.
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	66 */
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	67 char_u *
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	68 json_encode_nr_expr(int nr, typval_T *val, int options)
7864 6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	69 {
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	70 typval_T listtv;
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	71 typval_T nrtv;
9969 176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	72 garray_T ga;
7864 6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	73
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	74 nrtv.v_type = VAR_NUMBER;
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	75 nrtv.vval.v_number = nr;
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	76 if (rettv_list_alloc(&listtv) == FAIL)
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	77 return NULL;
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	78 if (list_append_tv(listtv.vval.v_list, &nrtv) == FAIL
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	79 \|\| list_append_tv(listtv.vval.v_list, val) == FAIL)
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	80 {
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	81 list_unref(listtv.vval.v_list);
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	82 return NULL;
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	83 }
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	84
9969 176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	85 ga_init2(&ga, 1, 4000);
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	86 if (json_encode_gap(&ga, &listtv, options) == OK && (options & JSON_NL))
176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	87 ga_append(&ga, '\n');
7864 6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	88 list_unref(listtv.vval.v_list);
9969 176e34b0d678 commit https://github.com/vim/vim/commit/f1f0792e55e72cdc7c833b30f565a9b02f18bb1e Christian Brabandt <cb@256bit.org> parents: 9389 diff changeset	89 return ga.ga_data;
7864 6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	90 }
6b0891de44a9 commit https://github.com/vim/vim/commit/fb1f62691eae7c79a28b3b17a60e72ce198c71a2 Christian Brabandt <cb@256bit.org> parents: 7791 diff changeset	91
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	92 static void
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	93 write_string(garray_T gap, char_u str)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	94 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	95 char_u *res = str;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	96 char_u numbuf[NUMBUFLEN];
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	97
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	98 if (res == NULL)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	99 ga_concat(gap, (char_u *)"null");
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	100 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	101 {
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	102 #if defined(FEAT_MBYTE) && defined(USE_ICONV)
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	103 vimconv_T conv;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	104 char_u *converted = NULL;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	105
8293 367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	106 if (!enc_utf8)
367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	107 {
8306 7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	108 /* Convert the text from 'encoding' to utf-8, the JSON string is
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	109 * always utf-8. */
8293 367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	110 conv.vc_type = CONV_NONE;
367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	111 convert_setup(&conv, p_enc, (char_u*)"utf-8");
367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	112 if (conv.vc_type != CONV_NONE)
367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	113 converted = res = string_convert(&conv, res, NULL);
367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	114 convert_setup(&conv, NULL, NULL);
367a7fed630b commit https://github.com/vim/vim/commit/f97ddbeb255c64a2b3d9db4b049278cd286070a6 Christian Brabandt <cb@256bit.org> parents: 8289 diff changeset	115 }
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	116 #endif
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	117 ga_append(gap, '"');
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	118 while (*res != NUL)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	119 {
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	120 int c;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	121 #ifdef FEAT_MBYTE
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	122 /* always use utf-8 encoding, ignore 'encoding' */
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	123 c = utf_ptr2char(res);
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	124 #else
8304 097886a3379b commit https://github.com/vim/vim/commit/0f526f5652e0a5432493b3f2a1cb34ab99a9da0a Christian Brabandt <cb@256bit.org> parents: 8295 diff changeset	125 c = *res;
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	126 #endif
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	127
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	128 switch (c)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	129 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	130 case 0x08:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	131 ga_append(gap, '\\'); ga_append(gap, 'b'); break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	132 case 0x09:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	133 ga_append(gap, '\\'); ga_append(gap, 't'); break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	134 case 0x0a:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	135 ga_append(gap, '\\'); ga_append(gap, 'n'); break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	136 case 0x0c:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	137 ga_append(gap, '\\'); ga_append(gap, 'f'); break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	138 case 0x0d:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	139 ga_append(gap, '\\'); ga_append(gap, 'r'); break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	140 case 0x22: /* " */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	141 case 0x5c: /* \ */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	142 ga_append(gap, '\\');
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	143 ga_append(gap, c);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	144 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	145 default:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	146 if (c >= 0x20)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	147 {
7791 6f81cf49da14 commit https://github.com/vim/vim/commit/fa06a517b5d5e37f40ab7c884bd334f089988fac Christian Brabandt <cb@256bit.org> parents: 7782 diff changeset	148 #ifdef FEAT_MBYTE
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	149 numbuf[utf_char2bytes(c, numbuf)] = NUL;
7791 6f81cf49da14 commit https://github.com/vim/vim/commit/fa06a517b5d5e37f40ab7c884bd334f089988fac Christian Brabandt <cb@256bit.org> parents: 7782 diff changeset	150 #else
6f81cf49da14 commit https://github.com/vim/vim/commit/fa06a517b5d5e37f40ab7c884bd334f089988fac Christian Brabandt <cb@256bit.org> parents: 7782 diff changeset	151 numbuf[0] = c;
6f81cf49da14 commit https://github.com/vim/vim/commit/fa06a517b5d5e37f40ab7c884bd334f089988fac Christian Brabandt <cb@256bit.org> parents: 7782 diff changeset	152 numbuf[1] = NUL;
6f81cf49da14 commit https://github.com/vim/vim/commit/fa06a517b5d5e37f40ab7c884bd334f089988fac Christian Brabandt <cb@256bit.org> parents: 7782 diff changeset	153 #endif
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	154 ga_concat(gap, numbuf);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	155 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	156 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	157 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	158 vim_snprintf((char *)numbuf, NUMBUFLEN,
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	159 "\\u%04lx", (long)c);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	160 ga_concat(gap, numbuf);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	161 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	162 }
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	163 #ifdef FEAT_MBYTE
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	164 res += utf_ptr2len(res);
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	165 #else
8304 097886a3379b commit https://github.com/vim/vim/commit/0f526f5652e0a5432493b3f2a1cb34ab99a9da0a Christian Brabandt <cb@256bit.org> parents: 8295 diff changeset	166 ++res;
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	167 #endif
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	168 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	169 ga_append(gap, '"');
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	170 #if defined(FEAT_MBYTE) && defined(USE_ICONV)
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	171 vim_free(converted);
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	172 #endif
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	173 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	174 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	175
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	176 /*
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	177 * Return TRUE if "key" can be used without quotes.
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	178 * That is when it starts with a letter and only contains letters, digits and
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	179 * underscore.
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	180 */
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	181 static int
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	182 is_simple_key(char_u *key)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	183 {
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	184 char_u *p;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	185
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	186 if (!ASCII_ISALPHA(*key))
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	187 return FALSE;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	188 for (p = key + 1; *p != NUL; ++p)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	189 if (!ASCII_ISALPHA(p) && p != '_' && !vim_isdigit(*p))
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	190 return FALSE;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	191 return TRUE;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	192 }
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	193
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	194 /*
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	195 * Encode "val" into "gap".
f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	196 * Return FAIL or OK.
f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	197 */
f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	198 static int
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	199 json_encode_item(garray_T gap, typval_T val, int copyID, int options)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	200 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	201 char_u numbuf[NUMBUFLEN];
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	202 char_u *res;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	203 list_T *l;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	204 dict_T *d;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	205
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	206 switch (val->v_type)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	207 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	208 case VAR_SPECIAL:
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	209 switch (val->vval.v_number)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	210 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	211 case VVAL_FALSE: ga_concat(gap, (char_u *)"false"); break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	212 case VVAL_TRUE: ga_concat(gap, (char_u *)"true"); break;
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	213 case VVAL_NONE: if ((options & JSON_JS) != 0
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	214 && (options & JSON_NO_NONE) == 0)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	215 /* empty item */
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	216 break;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	217 /* FALLTHROUGH */
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	218 case VVAL_NULL: ga_concat(gap, (char_u *)"null"); break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	219 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	220 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	221
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	222 case VAR_NUMBER:
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 8989 diff changeset	223 vim_snprintf((char *)numbuf, NUMBUFLEN, "%lld",
32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 8989 diff changeset	224 val->vval.v_number);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	225 ga_concat(gap, numbuf);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	226 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	227
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	228 case VAR_STRING:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	229 res = val->vval.v_string;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	230 write_string(gap, res);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	231 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	232
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	233 case VAR_FUNC:
8538 c337c813c64d commit https://github.com/vim/vim/commit/1735bc988c546cc962c5f94792815b4d7cb79710 Christian Brabandt <cb@256bit.org> parents: 8414 diff changeset	234 case VAR_PARTIAL:
7965 646d5148fee2 commit https://github.com/vim/vim/commit/55fab439a6f3bba6dbe780ac034b84d5822a1a96 Christian Brabandt <cb@256bit.org> parents: 7947 diff changeset	235 case VAR_JOB:
8041 c6443e78cf2d commit https://github.com/vim/vim/commit/7707344ddec9069b495b2a5ed41f2104466fc88b Christian Brabandt <cb@256bit.org> parents: 7967 diff changeset	236 case VAR_CHANNEL:
7947 b2922673917a commit https://github.com/vim/vim/commit/4f8b8faec31a934920a723053e8dcf47b6fac08c Christian Brabandt <cb@256bit.org> parents: 7931 diff changeset	237 /* no JSON equivalent TODO: better error */
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	238 EMSG(_(e_invarg));
f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	239 return FAIL;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	240
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	241 case VAR_LIST:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	242 l = val->vval.v_list;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	243 if (l == NULL)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	244 ga_concat(gap, (char_u *)"null");
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	245 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	246 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	247 if (l->lv_copyID == copyID)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	248 ga_concat(gap, (char_u *)"[]");
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	249 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	250 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	251 listitem_T *li;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	252
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	253 l->lv_copyID = copyID;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	254 ga_append(gap, '[');
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	255 for (li = l->lv_first; li != NULL && !got_int; )
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	256 {
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	257 if (json_encode_item(gap, &li->li_tv, copyID,
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	258 options & JSON_JS) == FAIL)
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	259 return FAIL;
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	260 if ((options & JSON_JS)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	261 && li->li_next == NULL
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	262 && li->li_tv.v_type == VAR_SPECIAL
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	263 && li->li_tv.vval.v_number == VVAL_NONE)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	264 /* add an extra comma if the last item is v:none */
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	265 ga_append(gap, ',');
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	266 li = li->li_next;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	267 if (li != NULL)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	268 ga_append(gap, ',');
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	269 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	270 ga_append(gap, ']');
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	271 l->lv_copyID = 0;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	272 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	273 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	274 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	275
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	276 case VAR_DICT:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	277 d = val->vval.v_dict;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	278 if (d == NULL)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	279 ga_concat(gap, (char_u *)"null");
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	280 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	281 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	282 if (d->dv_copyID == copyID)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	283 ga_concat(gap, (char_u *)"{}");
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	284 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	285 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	286 int first = TRUE;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	287 int todo = (int)d->dv_hashtab.ht_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	288 hashitem_T *hi;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	289
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	290 d->dv_copyID = copyID;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	291 ga_append(gap, '{');
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	292
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	293 for (hi = d->dv_hashtab.ht_array; todo > 0 && !got_int;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	294 ++hi)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	295 if (!HASHITEM_EMPTY(hi))
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	296 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	297 --todo;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	298 if (first)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	299 first = FALSE;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	300 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	301 ga_append(gap, ',');
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	302 if ((options & JSON_JS)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	303 && is_simple_key(hi->hi_key))
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	304 ga_concat(gap, hi->hi_key);
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	305 else
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	306 write_string(gap, hi->hi_key);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	307 ga_append(gap, ':');
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	308 if (json_encode_item(gap, &dict_lookup(hi)->di_tv,
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	309 copyID, options \| JSON_NO_NONE) == FAIL)
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	310 return FAIL;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	311 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	312 ga_append(gap, '}');
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	313 d->dv_copyID = 0;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	314 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	315 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	316 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	317
7965 646d5148fee2 commit https://github.com/vim/vim/commit/55fab439a6f3bba6dbe780ac034b84d5822a1a96 Christian Brabandt <cb@256bit.org> parents: 7947 diff changeset	318 case VAR_FLOAT:
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	319 #ifdef FEAT_FLOAT
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	320 # if defined(HAVE_MATH_H)
8275 ff900e499f79 commit https://github.com/vim/vim/commit/7ce686c990ea8c490d16be7f1c6bd95eb48816f9 Christian Brabandt <cb@256bit.org> parents: 8230 diff changeset	321 if (isnan(val->vval.v_float))
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	322 ga_concat(gap, (char_u *)"NaN");
8275 ff900e499f79 commit https://github.com/vim/vim/commit/7ce686c990ea8c490d16be7f1c6bd95eb48816f9 Christian Brabandt <cb@256bit.org> parents: 8230 diff changeset	323 else if (isinf(val->vval.v_float))
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	324 ga_concat(gap, (char_u *)"Infinity");
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	325 else
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	326 # endif
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	327 {
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	328 vim_snprintf((char *)numbuf, NUMBUFLEN, "%g",
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	329 val->vval.v_float);
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	330 ga_concat(gap, numbuf);
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	331 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	332 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	333 #endif
7965 646d5148fee2 commit https://github.com/vim/vim/commit/55fab439a6f3bba6dbe780ac034b84d5822a1a96 Christian Brabandt <cb@256bit.org> parents: 7947 diff changeset	334 case VAR_UNKNOWN:
8146 5dacbd22fefd commit https://github.com/vim/vim/commit/c6b14f0a8346ec7ddd86f3349d0b861a1b500147 Christian Brabandt <cb@256bit.org> parents: 8041 diff changeset	335 EMSG2(_(e_intern2), "json_encode_item()");
7965 646d5148fee2 commit https://github.com/vim/vim/commit/55fab439a6f3bba6dbe780ac034b84d5822a1a96 Christian Brabandt <cb@256bit.org> parents: 7947 diff changeset	336 return FAIL;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	337 }
7736 f2ddad8cbce7 commit https://github.com/vim/vim/commit/fcaaae6b3fdbf3421a1ff95a25ae16d82381c39a Christian Brabandt <cb@256bit.org> parents: 7732 diff changeset	338 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	339 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	340
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	341 /*
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	342 * When "reader" has less than NUMBUFLEN bytes available, call the fill
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	343 * callback to get more.
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	344 */
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	345 static void
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	346 fill_numbuflen(js_read_T *reader)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	347 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	348 if (reader->js_fill != NULL && (int)(reader->js_end - reader->js_buf)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	349 - reader->js_used < NUMBUFLEN)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	350 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	351 if (reader->js_fill(reader))
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	352 reader->js_end = reader->js_buf + STRLEN(reader->js_buf);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	353 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	354 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	355
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	356 /*
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	357 * Skip white space in "reader". All characters <= space are considered white
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	358 * space.
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	359 * Also tops up readahead when needed.
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	360 */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	361 static void
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	362 json_skip_white(js_read_T *reader)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	363 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	364 int c;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	365
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	366 for (;;)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	367 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	368 c = reader->js_buf[reader->js_used];
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	369 if (reader->js_fill != NULL && c == NUL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	370 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	371 if (reader->js_fill(reader))
8755 7038ec89d1fd commit https://github.com/vim/vim/commit/46c00a6565b8f1f4b7b1041d03eaceaf6ffc4aee Christian Brabandt <cb@256bit.org> parents: 8655 diff changeset	372 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	373 reader->js_end = reader->js_buf + STRLEN(reader->js_buf);
8755 7038ec89d1fd commit https://github.com/vim/vim/commit/46c00a6565b8f1f4b7b1041d03eaceaf6ffc4aee Christian Brabandt <cb@256bit.org> parents: 8655 diff changeset	374 continue;
7038ec89d1fd commit https://github.com/vim/vim/commit/46c00a6565b8f1f4b7b1041d03eaceaf6ffc4aee Christian Brabandt <cb@256bit.org> parents: 8655 diff changeset	375 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	376 }
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	377 if (c == NUL \|\| c > ' ')
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	378 break;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	379 ++reader->js_used;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	380 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	381 fill_numbuflen(reader);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	382 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	383
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	384 static int
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	385 json_decode_array(js_read_T reader, typval_T res, int options)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	386 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	387 char_u *p;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	388 typval_T item;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	389 listitem_T *li;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	390 int ret;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	391
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	392 if (res != NULL && rettv_list_alloc(res) == FAIL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	393 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	394 res->v_type = VAR_SPECIAL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	395 res->vval.v_number = VVAL_NONE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	396 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	397 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	398 ++reader->js_used; /* consume the '[' */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	399
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	400 while (TRUE)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	401 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	402 json_skip_white(reader);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	403 p = reader->js_buf + reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	404 if (*p == NUL)
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	405 return MAYBE;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	406 if (*p == ']')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	407 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	408 ++reader->js_used; /* consume the ']' */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	409 break;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	410 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	411
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	412 ret = json_decode_item(reader, res == NULL ? NULL : &item, options);
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	413 if (ret != OK)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	414 return ret;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	415 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	416 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	417 li = listitem_alloc();
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	418 if (li == NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	419 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	420 clear_tv(&item);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	421 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	422 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	423 li->li_tv = item;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	424 list_append(res->vval.v_list, li);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	425 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	426
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	427 json_skip_white(reader);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	428 p = reader->js_buf + reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	429 if (*p == ',')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	430 ++reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	431 else if (*p != ']')
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	432 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	433 if (*p == NUL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	434 return MAYBE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	435 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	436 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	437 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	438 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	439 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	440
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	441 static int
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	442 json_decode_object(js_read_T reader, typval_T res, int options)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	443 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	444 char_u *p;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	445 typval_T tvkey;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	446 typval_T item;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	447 dictitem_T *di;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	448 char_u buf[NUMBUFLEN];
7893 df2b8af14072 commit https://github.com/vim/vim/commit/fbf9c6b6c3bdb1c2eb42ea8c227e8ee021a7a8f2 Christian Brabandt <cb@256bit.org> parents: 7883 diff changeset	449 char_u *key = NULL;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	450 int ret;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	451
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	452 if (res != NULL && rettv_dict_alloc(res) == FAIL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	453 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	454 res->v_type = VAR_SPECIAL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	455 res->vval.v_number = VVAL_NONE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	456 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	457 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	458 ++reader->js_used; /* consume the '{' */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	459
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	460 while (TRUE)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	461 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	462 json_skip_white(reader);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	463 p = reader->js_buf + reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	464 if (*p == NUL)
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	465 return MAYBE;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	466 if (*p == '}')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	467 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	468 ++reader->js_used; /* consume the '}' */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	469 break;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	470 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	471
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	472 if ((options & JSON_JS) && reader->js_buf[reader->js_used] != '"')
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	473 {
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	474 /* accept a key that is not in quotes */
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	475 key = p = reader->js_buf + reader->js_used;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	476 while (p != NUL && p != ':' && *p > ' ')
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	477 ++p;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	478 tvkey.v_type = VAR_STRING;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	479 tvkey.vval.v_string = vim_strnsave(key, (int)(p - key));
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	480 reader->js_used += (int)(p - key);
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	481 key = tvkey.vval.v_string;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	482 }
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	483 else
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	484 {
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	485 ret = json_decode_item(reader, res == NULL ? NULL : &tvkey,
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	486 options);
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	487 if (ret != OK)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	488 return ret;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	489 if (res != NULL)
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	490 {
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	491 key = get_tv_string_buf_chk(&tvkey, buf);
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	492 if (key == NULL \|\| *key == NUL)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	493 {
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	494 clear_tv(&tvkey);
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	495 return FAIL;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	496 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	497 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	498 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	499
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	500 json_skip_white(reader);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	501 p = reader->js_buf + reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	502 if (*p != ':')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	503 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	504 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	505 clear_tv(&tvkey);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	506 if (*p == NUL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	507 return MAYBE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	508 return FAIL;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	509 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	510 ++reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	511 json_skip_white(reader);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	512
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	513 ret = json_decode_item(reader, res == NULL ? NULL : &item, options);
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	514 if (ret != OK)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	515 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	516 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	517 clear_tv(&tvkey);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	518 return ret;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	519 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	520
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	521 if (res != NULL)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	522 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	523 di = dictitem_alloc(key);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	524 clear_tv(&tvkey);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	525 if (di == NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	526 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	527 clear_tv(&item);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	528 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	529 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	530 di->di_tv = item;
8414 8c888844de9c commit https://github.com/vim/vim/commit/2588b5a43f049ddf542991050260237051caad77 Christian Brabandt <cb@256bit.org> parents: 8350 diff changeset	531 di->di_tv.v_lock = 0;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	532 if (dict_add(res->vval.v_dict, di) == FAIL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	533 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	534 dictitem_free(di);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	535 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	536 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	537 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	538
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	539 json_skip_white(reader);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	540 p = reader->js_buf + reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	541 if (*p == ',')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	542 ++reader->js_used;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	543 else if (*p != '}')
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	544 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	545 if (*p == NUL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	546 return MAYBE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	547 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	548 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	549 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	550 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	551 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	552
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	553 static int
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	554 json_decode_string(js_read_T reader, typval_T res)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	555 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	556 garray_T ga;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	557 int len;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	558 char_u *p;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	559 int c;
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 8989 diff changeset	560 varnumber_T nr;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	561
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	562 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	563 ga_init2(&ga, 1, 200);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	564
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	565 p = reader->js_buf + reader->js_used + 1; /* skip over " */
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	566 while (*p != '"')
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	567 {
8306 7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	568 /* The JSON is always expected to be utf-8, thus use utf functions
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	569 * here. The string is converted below if needed. */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	570 if (*p == NUL \|\| p[1] == NUL
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	571 #ifdef FEAT_MBYTE
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	572 \|\| utf_ptr2len(p) < utf_byte2len(*p)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	573 #endif
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	574 )
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	575 {
8306 7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	576 /* Not enough bytes to make a character or end of the string. Get
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	577 * more if possible. */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	578 if (reader->js_fill == NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	579 break;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	580 len = (int)(reader->js_end - p);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	581 reader->js_used = (int)(p - reader->js_buf);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	582 if (!reader->js_fill(reader))
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	583 break; /* didn't get more */
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	584 p = reader->js_buf + reader->js_used;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	585 reader->js_end = reader->js_buf + STRLEN(reader->js_buf);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	586 continue;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	587 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	588
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	589 if (*p == '\\')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	590 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	591 c = -1;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	592 switch (p[1])
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	593 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	594 case '\\': c = '\\'; break;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	595 case '"': c = '"'; break;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	596 case 'b': c = BS; break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	597 case 't': c = TAB; break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	598 case 'n': c = NL; break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	599 case 'f': c = FF; break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	600 case 'r': c = CAR; break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	601 case 'u':
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	602 if (reader->js_fill != NULL
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	603 && (int)(reader->js_end - p) < NUMBUFLEN)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	604 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	605 reader->js_used = (int)(p - reader->js_buf);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	606 if (reader->js_fill(reader))
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	607 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	608 p = reader->js_buf + reader->js_used;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	609 reader->js_end = reader->js_buf
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	610 + STRLEN(reader->js_buf);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	611 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	612 }
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	613 nr = 0;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	614 len = 0;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	615 vim_str2nr(p + 2, NULL, &len,
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	616 STR2NR_HEX + STR2NR_FORCE, &nr, NULL, 4);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	617 p += len + 2;
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	618 if (0xd800 <= nr && nr <= 0xdfff
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	619 && (int)(reader->js_end - p) >= 6
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	620 && p == '\\' && (p+1) == 'u')
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	621 {
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 8989 diff changeset	622 varnumber_T nr2 = 0;
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	623
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	624 /* decode surrogate pair: \ud812\u3456 */
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	625 len = 0;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	626 vim_str2nr(p + 2, NULL, &len,
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	627 STR2NR_HEX + STR2NR_FORCE, &nr2, NULL, 4);
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	628 if (0xdc00 <= nr2 && nr2 <= 0xdfff)
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	629 {
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	630 p += len + 2;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	631 nr = (((nr - 0xd800) << 10) \|
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	632 ((nr2 - 0xdc00) & 0x3ff)) + 0x10000;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	633 }
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	634 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	635 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	636 {
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	637 #ifdef FEAT_MBYTE
8989 e600e696c0a1 commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8 Christian Brabandt <cb@256bit.org> parents: 8755 diff changeset	638 char_u buf[NUMBUFLEN];
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	639 buf[utf_char2bytes((int)nr, buf)] = NUL;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	640 ga_concat(&ga, buf);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	641 #else
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 8989 diff changeset	642 ga_append(&ga, (int)nr);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	643 #endif
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	644 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	645 break;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	646 default:
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	647 /* not a special char, skip over \ */
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	648 ++p;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	649 continue;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	650 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	651 if (c > 0)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	652 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	653 p += 2;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	654 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	655 ga_append(&ga, c);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	656 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	657 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	658 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	659 {
8283 b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	660 #ifdef FEAT_MBYTE
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	661 len = utf_ptr2len(p);
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	662 #else
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	663 len = 1;
b8a56d4d83e0 commit https://github.com/vim/vim/commit/b6ff81188d27fae774d9ad2dfb498f596d697d4b Christian Brabandt <cb@256bit.org> parents: 8275 diff changeset	664 #endif
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	665 if (res != NULL)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	666 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	667 if (ga_grow(&ga, len) == FAIL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	668 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	669 ga_clear(&ga);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	670 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	671 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	672 mch_memmove((char *)ga.ga_data + ga.ga_len, p, (size_t)len);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	673 ga.ga_len += len;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	674 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	675 p += len;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	676 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	677 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	678
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	679 reader->js_used = (int)(p - reader->js_buf);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	680 if (*p == '"')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	681 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	682 ++reader->js_used;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	683 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	684 {
8308 c1f29c1a968a commit https://github.com/vim/vim/commit/80e78847395b5c8ada7861674774d81bd0a42789 Christian Brabandt <cb@256bit.org> parents: 8306 diff changeset	685 ga_append(&ga, NUL);
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	686 res->v_type = VAR_STRING;
8306 7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	687 #if defined(FEAT_MBYTE) && defined(USE_ICONV)
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	688 if (!enc_utf8)
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	689 {
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	690 vimconv_T conv;
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	691
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	692 /* Convert the utf-8 string to 'encoding'. */
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	693 conv.vc_type = CONV_NONE;
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	694 convert_setup(&conv, (char_u*)"utf-8", p_enc);
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	695 if (conv.vc_type != CONV_NONE)
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	696 {
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	697 res->vval.v_string =
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	698 string_convert(&conv, ga.ga_data, NULL);
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	699 vim_free(ga.ga_data);
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	700 }
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	701 convert_setup(&conv, NULL, NULL);
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	702 }
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	703 else
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	704 #endif
7fcf3f6020c1 commit https://github.com/vim/vim/commit/b36287283781e09d8874157b9d9bdc5243a2f319 Christian Brabandt <cb@256bit.org> parents: 8304 diff changeset	705 res->vval.v_string = ga.ga_data;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	706 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	707 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	708 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	709 if (res != NULL)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	710 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	711 res->v_type = VAR_SPECIAL;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	712 res->vval.v_number = VVAL_NONE;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	713 ga_clear(&ga);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	714 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	715 return MAYBE;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	716 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	717
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	718 /*
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	719 * Decode one item and put it in "res". If "res" is NULL only advance.
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	720 * Must already have skipped white space.
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	721 *
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	722 * Return FAIL for a decoding error.
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	723 * Return MAYBE for an incomplete message.
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	724 */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	725 static int
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	726 json_decode_item(js_read_T reader, typval_T res, int options)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	727 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	728 char_u *p;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	729 int len;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	730
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	731 fill_numbuflen(reader);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	732 p = reader->js_buf + reader->js_used;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	733 switch (*p)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	734 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	735 case '[': /* array */
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	736 return json_decode_array(reader, res, options);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	737
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	738 case '{': /* object */
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	739 return json_decode_object(reader, res, options);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	740
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	741 case '"': /* string */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	742 return json_decode_string(reader, res);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	743
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	744 case ',': /* comma: empty item */
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	745 if ((options & JSON_JS) == 0)
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	746 return FAIL;
45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	747 /* FALLTHROUGH */
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	748 case NUL: /* empty */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	749 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	750 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	751 res->v_type = VAR_SPECIAL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	752 res->vval.v_number = VVAL_NONE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	753 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	754 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	755
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	756 default:
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	757 if (VIM_ISDIGIT(p) \|\| p == '-')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	758 {
8350 e70fa2e110ec commit https://github.com/vim/vim/commit/10b369f67064cee91a5eb41383a694162c5c5e73 Christian Brabandt <cb@256bit.org> parents: 8308 diff changeset	759 #ifdef FEAT_FLOAT
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	760 char_u *sp = p;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	761
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	762 if (*sp == '-')
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	763 {
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	764 ++sp;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	765 if (*sp == NUL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	766 return MAYBE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	767 if (!VIM_ISDIGIT(*sp))
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	768 return FAIL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	769 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	770 sp = skipdigits(sp);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	771 if (sp == '.' \|\| sp == 'e' \|\| *sp == 'E')
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	772 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	773 if (res == NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	774 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	775 float_T f;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	776
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	777 len = string2float(p, &f);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	778 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	779 else
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	780 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	781 res->v_type = VAR_FLOAT;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	782 len = string2float(p, &res->vval.v_float);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	783 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	784 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	785 else
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	786 #endif
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	787 {
9389 32e34e574716 commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12 Christian Brabandt <cb@256bit.org> parents: 8989 diff changeset	788 varnumber_T nr;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	789
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	790 vim_str2nr(reader->js_buf + reader->js_used,
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	791 NULL, &len, 0, /* what */
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	792 &nr, NULL, 0);
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	793 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	794 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	795 res->v_type = VAR_NUMBER;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	796 res->vval.v_number = nr;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	797 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	798 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	799 reader->js_used += len;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	800 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	801 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	802 if (STRNICMP((char *)p, "false", 5) == 0)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	803 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	804 reader->js_used += 5;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	805 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	806 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	807 res->v_type = VAR_SPECIAL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	808 res->vval.v_number = VVAL_FALSE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	809 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	810 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	811 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	812 if (STRNICMP((char *)p, "true", 4) == 0)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	813 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	814 reader->js_used += 4;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	815 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	816 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	817 res->v_type = VAR_SPECIAL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	818 res->vval.v_number = VVAL_TRUE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	819 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	820 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	821 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	822 if (STRNICMP((char *)p, "null", 4) == 0)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	823 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	824 reader->js_used += 4;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	825 if (res != NULL)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	826 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	827 res->v_type = VAR_SPECIAL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	828 res->vval.v_number = VVAL_NULL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	829 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	830 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	831 }
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	832 #ifdef FEAT_FLOAT
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	833 if (STRNICMP((char *)p, "NaN", 3) == 0)
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	834 {
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	835 reader->js_used += 3;
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	836 if (res != NULL)
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	837 {
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	838 res->v_type = VAR_FLOAT;
8230 51ca0cee512e commit https://github.com/vim/vim/commit/3ea0f1ae318db6cd9413914bb2ff824d71cefc6e Christian Brabandt <cb@256bit.org> parents: 8228 diff changeset	839 res->vval.v_float = NAN;
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	840 }
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	841 return OK;
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	842 }
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	843 if (STRNICMP((char *)p, "Infinity", 8) == 0)
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	844 {
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	845 reader->js_used += 8;
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	846 if (res != NULL)
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	847 {
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	848 res->v_type = VAR_FLOAT;
8230 51ca0cee512e commit https://github.com/vim/vim/commit/3ea0f1ae318db6cd9413914bb2ff824d71cefc6e Christian Brabandt <cb@256bit.org> parents: 8228 diff changeset	849 res->vval.v_float = INFINITY;
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	850 }
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	851 return OK;
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	852 }
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	853 #endif
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	854 /* check for truncated name */
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	855 len = (int)(reader->js_end - (reader->js_buf + reader->js_used));
8228 a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	856 if (
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	857 (len < 5 && STRNICMP((char *)p, "false", len) == 0)
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	858 #ifdef FEAT_FLOAT
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	859 \|\| (len < 8 && STRNICMP((char *)p, "Infinity", len) == 0)
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	860 \|\| (len < 3 && STRNICMP((char *)p, "NaN", len) == 0)
a0e552c51c34 commit https://github.com/vim/vim/commit/f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 Christian Brabandt <cb@256bit.org> parents: 8146 diff changeset	861 #endif
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	862 \|\| (len < 4 && (STRNICMP((char *)p, "true", len) == 0
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	863 \|\| STRNICMP((char *)p, "null", len) == 0)))
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	864 return MAYBE;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	865 break;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	866 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	867
10299 7b2f95633e28 commit https://github.com/vim/vim/commit/7756e7465d627ff9cd01e59625484a8c302ef853 Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	868 if (res != NULL)
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	869 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	870 res->v_type = VAR_SPECIAL;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	871 res->vval.v_number = VVAL_NONE;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	872 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	873 return FAIL;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	874 }
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	875
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	876 /*
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	877 * Decode the JSON from "reader" and store the result in "res".
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	878 * "options" can be JSON_JS or zero;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	879 * Return FAIL if not the whole message was consumed.
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	880 */
7868 17e6ff1a74f1 commit https://github.com/vim/vim/commit/19d2f1589850d7db1ce77efec052929246f156e2 Christian Brabandt <cb@256bit.org> parents: 7864 diff changeset	881 int
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	882 json_decode_all(js_read_T reader, typval_T res, int options)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	883 {
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	884 int ret;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	885
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	886 /* We find the end once, to avoid calling strlen() many times. */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	887 reader->js_end = reader->js_buf + STRLEN(reader->js_buf);
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	888 json_skip_white(reader);
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	889 ret = json_decode_item(reader, res, options);
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	890 if (ret != OK)
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	891 return FAIL;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	892 json_skip_white(reader);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	893 if (reader->js_buf[reader->js_used] != NUL)
7868 17e6ff1a74f1 commit https://github.com/vim/vim/commit/19d2f1589850d7db1ce77efec052929246f156e2 Christian Brabandt <cb@256bit.org> parents: 7864 diff changeset	894 return FAIL;
17e6ff1a74f1 commit https://github.com/vim/vim/commit/19d2f1589850d7db1ce77efec052929246f156e2 Christian Brabandt <cb@256bit.org> parents: 7864 diff changeset	895 return OK;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	896 }
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	897
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	898 /*
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	899 * Decode the JSON from "reader" and store the result in "res".
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	900 * "options" can be JSON_JS or zero;
8655 1eb302bf2475 commit https://github.com/vim/vim/commit/ba61ac0d61f46de7d29c64bb0de6d25c2e378be0 Christian Brabandt <cb@256bit.org> parents: 8538 diff changeset	901 * Return FAIL for a decoding error.
1eb302bf2475 commit https://github.com/vim/vim/commit/ba61ac0d61f46de7d29c64bb0de6d25c2e378be0 Christian Brabandt <cb@256bit.org> parents: 8538 diff changeset	902 * Return MAYBE for an incomplete message.
1eb302bf2475 commit https://github.com/vim/vim/commit/ba61ac0d61f46de7d29c64bb0de6d25c2e378be0 Christian Brabandt <cb@256bit.org> parents: 8538 diff changeset	903 * Consumes the message anyway.
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	904 */
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	905 int
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	906 json_decode(js_read_T reader, typval_T res, int options)
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	907 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	908 int ret;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	909
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	910 /* We find the end once, to avoid calling strlen() many times. */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	911 reader->js_end = reader->js_buf + STRLEN(reader->js_buf);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	912 json_skip_white(reader);
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	913 ret = json_decode_item(reader, res, options);
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	914 json_skip_white(reader);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	915
8655 1eb302bf2475 commit https://github.com/vim/vim/commit/ba61ac0d61f46de7d29c64bb0de6d25c2e378be0 Christian Brabandt <cb@256bit.org> parents: 8538 diff changeset	916 return ret;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	917 }
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	918
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	919 /*
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	920 * Decode the JSON from "reader" to find the end of the message.
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	921 * "options" can be JSON_JS or zero;
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	922 * Return FAIL if the message has a decoding error.
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	923 * Return MAYBE if the message is truncated, need to read more.
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	924 * This only works reliable if the message contains an object, array or
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	925 * string. A number might be trucated without knowing.
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	926 * Does not advance the reader.
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	927 */
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	928 int
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	929 json_find_end(js_read_T *reader, int options)
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	930 {
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	931 int used_save = reader->js_used;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	932 int ret;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	933
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	934 /* We find the end once, to avoid calling strlen() many times. */
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	935 reader->js_end = reader->js_buf + STRLEN(reader->js_buf);
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	936 json_skip_white(reader);
7967 45ea5ebf3a98 commit https://github.com/vim/vim/commit/595e64e259faefb330866852e1b9f6168544572a Christian Brabandt <cb@256bit.org> parents: 7965 diff changeset	937 ret = json_decode_item(reader, NULL, options);
7883 98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	938 reader->js_used = used_save;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	939 return ret;
98a96e0ca73b commit https://github.com/vim/vim/commit/56ead341a75e1a0395eee94a3280c67e2278a57e Christian Brabandt <cb@256bit.org> parents: 7868 diff changeset	940 }
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: diff changeset	941 #endif

Mercurial > vim

annotate src/json.c @ 10328:299f1669c20e v8.0.0059