aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDmitry Gutov2019-04-13 01:33:05 +0300
committerDmitry Gutov2019-04-13 01:33:42 +0300
commitb41c1ca10fab4ed94e59aea8ad5eae334c2452bd (patch)
tree19e3521522c0924e696bbbae80e90fc466c5a61e /doc
parentcc80eeb4a43d2079963de3d181002a6a6b56560d (diff)
downloademacs-b41c1ca10fab4ed94e59aea8ad5eae334c2452bd.tar.gz
emacs-b41c1ca10fab4ed94e59aea8ad5eae334c2452bd.zip
Add :array-type option to json-parse-string
* src/json.c (enum json_array_type): New type. (struct json_configuration): New field array_type. (json_parse_args): Rename the last argument. Handle the :array-type keyword argument (bug#32793). (Fjson_parse_string): Update the docstring accordingly. (json_to_lisp): Handle the case of :array-type being `list'. Add a call to 'rarely_quit' inside the loop. (syms_of_json): Define new symbols. (Fjson_serialize, Fjson_insert, Fjson_parse_string) (Fjson_parse_buffer): Update the config struct initializers.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/text.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 1ef836b8f94..b46ee647862 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -5167,6 +5167,11 @@ key-value mappings of a JSON object. It can be either
5167keys; @code{alist} to use alists with symbols as keys; or @code{plist} 5167keys; @code{alist} to use alists with symbols as keys; or @code{plist}
5168to use plists with keyword symbols as keys. 5168to use plists with keyword symbols as keys.
5169 5169
5170@item :array-type
5171The value decides which Lisp object to use for representing a JSON
5172array. It can be either @code{array}, the default, to use Lisp
5173arrays; or @code{list} to use lists.
5174
5170@item :null-object 5175@item :null-object
5171The value decides which Lisp object to use to represent the JSON 5176The value decides which Lisp object to use to represent the JSON
5172keyword @code{null}. It defaults to the symbol @code{:null}. 5177keyword @code{null}. It defaults to the symbol @code{:null}.