procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'json-available-p' on MS-Windows

Browse source 
* src/json.c (json_available_p, ensure_json_available)
(Fjson__available_p): New functions.
(Fjson_serialize, Fjson_insert, Fjson_parse_string)
(Fjson_parse_buffer): Use ensure_json_available.
(syms_of_json): Defsubr json--available-p.

* lisp/subr.el (json-available-p): Rewrite.
This commit is contained in:
Mattias Engdegård 2022-12-25 15:32:06 +01:00 • committed by Eli Zaretskii
parent 6c86faec29
commit 082fc6e308
2 changed files with 44 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/subr.el
View file

@ -6911,11 +6911,11 @@ sentence (see Info node `(elisp) Documentation Tips')."
(defun json-available-p ()
"Return non-nil if Emacs has libjansson support."
(and (fboundp 'json-serialize)
(condition-case nil
(json-serialize t)
(:success t)
(json-unavailable nil))))
(declare (side-effect-free error-free))
(and (eval-when-compile (fboundp 'json-serialize))
;; If `json--available-p' is present, we need to call it at run-time.
(or (not (eval-when-compile (fboundp 'json--available-p)))
(json--available-p))))
(defun ensure-list (object)
"Return OBJECT as a list.

91
src/json.c
View file

@ -555,6 +555,38 @@ json_parse_args (ptrdiff_t nargs,
}
}
#ifdef WINDOWSNT
static bool
json_available_p (void)
{
if (json_initialized)
return true;
json_initialized = init_json_functions ();
Lisp_Object status = json_initialized ? Qt : Qnil;
Vlibrary_cache = Fcons (Fcons (Qjson, status), Vlibrary_cache);
return json_initialized;
}
#endif
static void
ensure_json_available (void)
{
#ifdef WINDOWSNT
if (!json_available_p ())
Fsignal (Qjson_unavailable,
list1 (build_unibyte_string ("jansson library not found")));
#endif
}
#ifdef WINDOWSNT
DEFUN ("json--available-p", Fjson__available_p, Sjson__available_p, 0, 0, NULL,
doc: /* Whether libjansson is available (internal). */)
(void)
{
return json_available_p () ? Qt : Qnil;
}
#endif
DEFUN ("json-serialize", Fjson_serialize, Sjson_serialize, 1, MANY,
NULL,
doc: /* Return the JSON representation of OBJECT as a string.
@ -585,19 +617,7 @@ usage: (json-serialize OBJECT &rest ARGS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
specpdl_ref count = SPECPDL_INDEX ();
#ifdef WINDOWSNT
if (!json_initialized)
{
Lisp_Object status;
json_initialized = init_json_functions ();
status = json_initialized ? Qt : Qnil;
Vlibrary_cache = Fcons (Fcons (Qjson, status), Vlibrary_cache);
}
if (!json_initialized)
Fsignal (Qjson_unavailable,
list1 (build_unibyte_string ("jansson library not found")));
#endif
ensure_json_available ();
struct json_configuration conf =
{json_object_hashtable, json_array_array, QCnull, QCfalse};
@ -694,19 +714,7 @@ usage: (json-insert OBJECT &rest ARGS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
specpdl_ref count = SPECPDL_INDEX ();
#ifdef WINDOWSNT
if (!json_initialized)
{
Lisp_Object status;
json_initialized = init_json_functions ();
status = json_initialized ? Qt : Qnil;
Vlibrary_cache = Fcons (Fcons (Qjson, status), Vlibrary_cache);
}
if (!json_initialized)
Fsignal (Qjson_unavailable,
list1 (build_unibyte_string ("jansson library not found")));
#endif
ensure_json_available ();
struct json_configuration conf =
{json_object_hashtable, json_array_array, QCnull, QCfalse};
@ -951,19 +959,7 @@ usage: (json-parse-string STRING &rest ARGS) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
specpdl_ref count = SPECPDL_INDEX ();
#ifdef WINDOWSNT
if (!json_initialized)
{
Lisp_Object status;
json_initialized = init_json_functions ();
status = json_initialized ? Qt : Qnil;
Vlibrary_cache = Fcons (Fcons (Qjson, status), Vlibrary_cache);
}
if (!json_initialized)
Fsignal (Qjson_unavailable,
list1 (build_unibyte_string ("jansson library not found")));
#endif
ensure_json_available ();
Lisp_Object string = args[0];
CHECK_STRING (string);
@ -1048,19 +1044,7 @@ usage: (json-parse-buffer &rest args) */)
(ptrdiff_t nargs, Lisp_Object *args)
{
specpdl_ref count = SPECPDL_INDEX ();
#ifdef WINDOWSNT
if (!json_initialized)
{
Lisp_Object status;
json_initialized = init_json_functions ();
status = json_initialized ? Qt : Qnil;
Vlibrary_cache = Fcons (Fcons (Qjson, status), Vlibrary_cache);
}
if (!json_initialized)
Fsignal (Qjson_unavailable,
list1 (build_unibyte_string ("jansson library not found")));
#endif
ensure_json_available ();
struct json_configuration conf =
{json_object_hashtable, json_array_array, QCnull, QCfalse};
@ -1137,6 +1121,9 @@ syms_of_json (void)
DEFSYM (Qplist, "plist");
DEFSYM (Qarray, "array");
#ifdef WINDOWSNT
defsubr (&Sjson__available_p);
#endif
defsubr (&Sjson_serialize);
defsubr (&Sjson_insert);
defsubr (&Sjson_parse_string);