--- libelwix/inc/elwix/ajson.h	2017/11/24 15:53:04	1.1.2.3
+++ libelwix/inc/elwix/ajson.h	2017/11/28 02:00:45	1.1.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: ajson.h,v 1.1.2.3 2017/11/24 15:53:04 misho Exp $
+* $Id: ajson.h,v 1.1.2.6 2017/11/28 02:00:45 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -53,9 +53,7 @@ typedef enum {
 	J_OBJECT = 1,
 	J_ARRAY = 2,
 	J_STRING = 3,
-	J_NUMBER = 4,
-	J_BOOL = 5,
-	J_NULL = 6
+	J_VALUE = 4
 } jtype_t;
 
 /* JSON error numbers */
@@ -74,6 +72,7 @@ typedef struct _tagHandler {
 	void		*h_alloc;
 	int		h_strict;
 } json_t;
+#define json_toksnum(x)		(x)->h_next
 
 typedef struct _tagToken {
 	jtype_t		tok_type;
@@ -82,6 +81,12 @@ typedef struct _tagToken {
 	long		tok_size;
 	long		tok_parent;
 } jtok_t;
+#define json_toktype(x)		(x)->tok_type
+#define json_toksize(x)		(x)->tok_size
+#define json_toklen(x)		((x)->tok_end - (x)->tok_start)
+#define json_tokstr(j, x)	((j) + (x)->tok_start)
+#define json_tokstrcpy(d, j, x)	{ strncpy((d), json_tokstr((j), (x)), json_toklen(x) - 1); \
+					(d)[json_toklen(x)] = 0; } 
 
 
 /*
@@ -113,6 +118,52 @@ void json_free(json_t * __restrict json);
  */
 unsigned int json_parse(json_t * __restrict json, const char *jstr, size_t jlen, 
 		jtok_t * __restrict jtoks, unsigned int toksnum);
+
+/*
+ * json_token2val() - Return token to AIT variable
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return =NULL error or !=NULL variable, after use should be ait_freeVar()
+ */
+ait_val_t *json_token2val(const char *jstr, jtok_t * __restrict tok);
+/*
+ * json_token2str() - Return token to string
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return =NULL error or !=NULL allocated str, after use should be e_free()
+ */
+char *json_token2str(const char *jstr, jtok_t * __restrict tok);
+/*
+ * json_token2num() - Return token to numeric
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return number
+ */
+long json_token2num(const char *jstr, jtok_t * __restrict tok);
+/*
+ * json_token2array() - Convert token to array
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * return: =NULL error or !=NULL allocated array with variables, 
+ * 		after use should be ait_freeVars()
+ */
+array_t *json_token2array(const char *jstr, jtok_t * __restrict tok);
+
+/*
+ * json_findbykey() - Find data by key
+ *
+ * @jstr = JSON string
+ * @key = Search key
+ * @toks = Parsed tokens
+ * @toksnum = Number of parsed tokens
+ * return: =NULL error or !=NULL data token found 
+ */
+jtok_t *json_findbykey(const char *jstr, const char *key, 
+		jtok_t * __restrict toks, int toksnum);
 
 
 #endif