mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-02 10:11:05 -08:00
Code Issues Projects Releases Wiki Activity

Support custom null and false objects when parsing JSON

Browse source 
* doc/lispref/text.texi (Parsing JSON): Describe new :null-object
and :false-object kwargs to json-parse-string and
json-parse-buffer.

* src/json.c
(struct json_configuration): New type.
(json_to_lisp): Accept a struct json_configuration* param.
(json_parse_args): Rename from json_parse_object_type.
(Fjson_parse_string): Rework docstring.
(Fjson_parse_string, Fjson_parse_buffer): Update call to
json_to_lisp.
(syms_of_json): Two new syms, QCnull_object and QCfalse_object.

* test/src/json-tests.el
(json-parse-with-custom-null-and-false-objects): New test.
This commit is contained in:
João Távora 2018-06-07 17:41:19 +01:00
parent 8cb9beb321
commit 9348039ed4
3 changed files with 140 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

45
doc/lispref/text.texi
View file

@ -5008,9 +5008,10 @@ Specifically:
@itemize
@item
JSON has a couple of keywords: @code{null}, @code{false}, and
@code{true}. These are represented in Lisp using the keywords
@code{:null}, @code{:false}, and @code{t}, respectively.
JSON uses three keywords: @code{true}, @code{null}, @code{false}.
@code{true} is represented by the symbol @code{t}. By default, the
remaining two are represented, respectively, by the symbols
@code{:null} and @code{:false}.
@item
JSON only has floating-point numbers. They can represent both Lisp
@ -5062,14 +5063,6 @@ JSON. The subobjects within these top-level values can be of any
type. Likewise, the parsing functions will only return vectors,
hashtables, alists, and plists.
The parsing functions accept keyword arguments. Currently only one
keyword argument, @code{:object-type}, is recognized; its value
decides which Lisp object to use for representing the key-value
mappings of a JSON object. It can be either @code{hash-table}, the
default, to make hashtables with strings as keys, @code{alist} to use
alists with symbols as keys or @code{plist} to use plists with keyword
symbols as keys.
@defun json-serialize object
This function returns a new Lisp string which contains the JSON
representation of @var{object}.
@ -5080,16 +5073,38 @@ This function inserts the JSON representation of @var{object} into the
current buffer before point.
@end defun
@defun json-parse-string string &key (object-type @code{hash-table})
@defun json-parse-string string &rest args
This function parses the JSON value in @var{string}, which must be a
Lisp string.
Lisp string. The argument @var{args} is a list of keyword/argument
pairs. The following keywords are accepted:
@itemize
@item @code{:object-type}
The value decides which Lisp object to use for representing the
key-value mappings of a JSON object. It can be either
@code{hash-table}, the default, to make hashtables with strings as
keys; @code{alist} to use alists with symbols as keys; or @code{plist}
to use plists with keyword symbols as keys.
@item @code{:null-object}
The value decides which Lisp object to use to represent the JSON
keyword @code{null}. It defaults to the lisp symbol @code{:null}.
@item @code{:false-object}
The value decides which Lisp object to use to represent the JSON
keyword @code{false}. It defaults to the lisp symbol @code{:false}.
@end itemize
@end defun
@defun json-parse-buffer &key (object-type @code{hash-table})
@defun json-parse-buffer &rest args
This function reads the next JSON value from the current buffer,
starting at point. It moves point to the position immediately after
the value if a value could be read and converted to Lisp; otherwise it
doesn't move point.
doesn't move point. @var{args} is interpreted as in
@code{json-parse-string}.
@end defun