--- libelwix/inc/elwix/ajson.h	2017/11/28 00:46:53	1.1.2.5
+++ libelwix/inc/elwix/ajson.h	2017/11/30 13:46:27	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: ajson.h,v 1.1.2.5 2017/11/28 00:46:53 misho Exp $
+* $Id: ajson.h,v 1.2 2017/11/30 13:46:27 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -72,14 +72,22 @@ typedef struct _tagHandler {
 	void		*h_alloc;
 	int		h_strict;
 } json_t;
+#define json_toksnum(x)		(x)->h_next
 
 typedef struct _tagToken {
+	long		tok_idx;
 	jtype_t		tok_type;
 	long		tok_start;
 	long		tok_end;
 	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)); \
+					(d)[json_toklen(x)] = 0; } 
 
 
 /*
@@ -137,11 +145,11 @@ char *json_token2str(const char *jstr, jtok_t * __rest
  */
 long json_token2num(const char *jstr, jtok_t * __restrict tok);
 /*
- * json_token2array() - Convert token to array
+ * json_token2array() - Convert token to string array
  *
  * @jstr = JSON string
  * @tok = Token for convert
- * return: =NULL error or !=NULL allocated array with variables, 
+ * return: =NULL error or !=NULL allocated array with string variables, 
  * 		after use should be ait_freeVars()
  */
 array_t *json_token2array(const char *jstr, jtok_t * __restrict tok);
@@ -157,6 +165,114 @@ array_t *json_token2array(const char *jstr, jtok_t * _
  */
 jtok_t *json_findbykey(const char *jstr, const char *key, 
 		jtok_t * __restrict toks, int toksnum);
+
+
+/*
+ * json_add_begin_object() - Adds begin of object {
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_begin_object(char * __restrict jstr, int jlen, int wspace);
+/*
+ * json_add_end_object() - Adds end of object }
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_end_object(char * __restrict jstr, int jlen, int wspace);
+/*
+ * json_add_begin_array() - Adds begin of array [
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_begin_array(char * __restrict jstr, int jlen, int wspace);
+/*
+ * json_add_end_array() - Adds end of array ]
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_end_array(char * __restrict jstr, int jlen, int wspace);
+/*
+ * json_add_char() - Adds character
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @ch = Character
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_char(char * __restrict jstr, int jlen, unsigned char ch);
+/*
+ * json_add_colon() - Adds key/value pair delimiter colon :
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_colon(char * __restrict jstr, int jlen, int wspace);
+/*
+ * json_add_comma() - Adds value delimiter comma ,
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_comma(char * __restrict jstr, int jlen, int wspace);
+/*
+ * json_add_string() - Adds string
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @unquot = Unquoted string
+ * @str = String, it can't be NULL
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_string(char * __restrict jstr, int jlen, int unquot, const char *str);
+/*
+ * json_add_value() - Adds value
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @unquot = Unquoted number
+ * @num = Number
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_value(char * __restrict jstr, int jlen, int unquot, long num);
+/*
+ * json_add_pair() - Adds key/value pair
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * @key = Key string
+ * @val = Value string
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_pair(char * __restrict jstr, int jlen, int wspace, 
+		const char *key, const char *val);
+/*
+ * json_add_array() - Adds array
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * @arr = Array with variables
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_array(char * __restrict jstr, int jlen, int wspace, 
+		array_t * __restrict arr);
 
 
 #endif