--- libelwix/inc/elwix/ajson.h	2017/11/28 00:46:53	1.1.2.5
+++ libelwix/inc/elwix/ajson.h	2017/11/28 11:14:00	1.1.2.7
@@ -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.1.2.7 2017/11/28 11:14:00 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);