[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Use get_key_arg to parse keyword arguments in json_parse_object_
From: |
Vibhav Pant |
Subject: |
[PATCH] Use get_key_arg to parse keyword arguments in json_parse_object_type |
Date: |
Wed, 20 Dec 2017 12:09:30 +0530 |
* src/fns.c (get_key_arg): Make function non-static.
* src/lisp.h: Add extern declaration for get_key_arg.
* src/json.c (json_parse_object_type): Use get_key_arg to get the
value of `:object-type'.
---
src/fns.c | 2 +-
src/json.c | 43 +++++++++++++++++++++++--------------------
src/lisp.h | 1 +
3 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/fns.c b/src/fns.c
index 9db9bea9f7..6193319228 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3558,7 +3558,7 @@ next_almost_prime (EMACS_INT n)
0. This function is used to extract a keyword/argument pair from
a DEFUN parameter list. */
-static ptrdiff_t
+ptrdiff_t
get_key_arg (Lisp_Object key, ptrdiff_t nargs, Lisp_Object *args, char *used)
{
ptrdiff_t i;
diff --git a/src/json.c b/src/json.c
index 1c9bf6d49b..4fbeab186c 100644
--- a/src/json.c
+++ b/src/json.c
@@ -632,26 +632,29 @@ json_to_lisp (json_t *json, enum json_object_type
object_type)
static enum json_object_type
json_parse_object_type (ptrdiff_t nargs, Lisp_Object *args)
{
- switch (nargs)
- {
- case 0:
- return json_object_hashtable;
- case 2:
- {
- Lisp_Object key = args[0];
- Lisp_Object value = args[1];
- if (!EQ (key, QCobject_type))
- wrong_choice (list1 (QCobject_type), key);
- if (EQ (value, Qhash_table))
- return json_object_hashtable;
- else if (EQ (value, Qalist))
- return json_object_alist;
- else
- wrong_choice (list2 (Qhash_table, Qalist), value);
- }
- default:
- wrong_type_argument (Qplistp, Flist (nargs, args));
- }
+ ptrdiff_t i;
+ enum json_object_type type;
+
+ USE_SAFE_ALLOCA;
+ char *used = SAFE_ALLOCA (nargs * sizeof *used);
+ memset (used, 0, nargs * sizeof *used);
+ i = get_key_arg (QCobject_type, nargs, args, used);
+
+ if (!i)
+ type = json_object_hashtable;
+ else if (EQ (args[i], Qhash_table))
+ type = json_object_hashtable;
+ else if (EQ (args[i], Qalist))
+ type = json_object_alist;
+ else
+ wrong_choice (list2 (Qhash_table, Qalist), args[i]);
+
+ for (i = 0; i < nargs; i++)
+ if (!used[i])
+ signal_error ("Invalid argument list", args[i]);
+
+ SAFE_FREE ();
+ return type;
}
DEFUN ("json-parse-string", Fjson_parse_string, Sjson_parse_string, 1, MANY,
diff --git a/src/lisp.h b/src/lisp.h
index eb31ba209a..9c54913972 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3494,6 +3494,7 @@ extern void syms_of_syntax (void);
/* Defined in fns.c. */
enum { NEXT_ALMOST_PRIME_LIMIT = 11 };
extern EMACS_INT next_almost_prime (EMACS_INT) ATTRIBUTE_CONST;
+extern ptrdiff_t get_key_arg (Lisp_Object, ptrdiff_t, Lisp_Object *, char *);
extern Lisp_Object larger_vector (Lisp_Object, ptrdiff_t, ptrdiff_t);
extern void sweep_weak_hash_tables (void);
extern char *extract_data_from_object (Lisp_Object, ptrdiff_t *, ptrdiff_t *);
--
2.15.1
- [PATCH] Use get_key_arg to parse keyword arguments in json_parse_object_type,
Vibhav Pant <=