--- libelwix/src/json.c	2017/11/28 00:46:53	1.1.2.4
+++ libelwix/src/json.c	2017/11/28 14:57:45	1.1.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: json.c,v 1.1.2.4 2017/11/28 00:46:53 misho Exp $
+* $Id: json.c,v 1.1.2.8 2017/11/28 14:57:45 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -116,7 +116,8 @@ json_gettoken(json_t * __restrict json, jtok_t * __res
 		elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]);
 		return NULL;
 	} else
-		tok = &jtoks[json->h_next++];
+		tok = &jtoks[json->h_next];
+	tok->tok_idx = json->h_next++;
 	tok->tok_start = tok->tok_end = tok->tok_parent = -1;
 	tok->tok_size = 0;
 
@@ -276,7 +277,7 @@ json_parse(json_t * __restrict json, const char *jstr,
 		switch ((ch = jstr[json->h_pos])) {
 			case '{':
 			case '[':
-				cx++;	/* start new token */
+				cx++;	/* start new object/array token */
 				if (!jtoks)
 					break;
 
@@ -324,11 +325,9 @@ json_parse(json_t * __restrict json, const char *jstr,
 				}
 				break;
 			case '\"':
-				if (json_parse_string(json, jstr, jlen, jtoks, toksnum) == -1) {
-					elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]);
+				if (json_parse_string(json, jstr, jlen, jtoks, toksnum) == -1)
 					return (u_int) -1;
-				}
-				cx++;
+				cx++;	/* start new string token */
 				if (jtoks && json->h_parent != -1)
 					jtoks[json->h_parent].tok_size++;
 				break;
@@ -374,7 +373,7 @@ json_parse(json_t * __restrict json, const char *jstr,
 
 					if (json_parse_value(json, jstr, jlen, jtoks, toksnum) == -1)
 						return (u_int) -1;
-					cx++;
+					cx++;	/* start new value token */
 					if (jtoks && json->h_parent != -1)
 						jtoks[json->h_parent].tok_size++;
 					break;
@@ -387,7 +386,7 @@ json_parse(json_t * __restrict json, const char *jstr,
 
 				if (json_parse_value(json, jstr, jlen, jtoks, toksnum) == -1)
 					return (u_int) -1;
-				cx++;
+				cx++;	/* start new value token */
 				if (jtoks && json->h_parent != -1)
 					jtoks[json->h_parent].tok_size++;
 				break;
@@ -402,7 +401,8 @@ json_parse(json_t * __restrict json, const char *jstr,
 				return (u_int) -1;
 			}
 		}
-	}
+	} else
+		cx++;	/* increment needed tokens number for termination empty token */
 
 	return cx;
 }
@@ -426,8 +426,8 @@ json_token2val(const char *jstr, jtok_t * __restrict t
 	if (!v)
 		return NULL;
 
-	AIT_SET_STRSIZ(v, tok->tok_end - tok->tok_start);
-	strncpy(AIT_GET_STR(v), jstr + tok->tok_start, AIT_LEN(v) - 1);
+	AIT_SET_STRSIZ(v, json_toklen(tok));
+	strncpy(AIT_GET_STR(v), json_tokstr(jstr, tok), AIT_LEN(v) - 1);
 
 	return v;
 }
@@ -448,12 +448,12 @@ json_token2str(const char *jstr, jtok_t * __restrict t
 	if (!jstr || !tok)
 		return NULL;
 
-	len = tok->tok_end - tok->tok_start;
+	len = json_toklen(tok);
 	str = e_malloc(len + 1);
 	if (!str)
 		return NULL;
 	else {
-		strncpy(str, jstr + tok->tok_start, len);
+		strncpy(str, json_tokstr(jstr, tok), len);
 		str[len] = 0;
 	}
 
@@ -516,11 +516,11 @@ json_findbykey(const char *jstr, const char *key, jtok
 }
 
 /*
- * 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 *
@@ -536,7 +536,7 @@ json_token2array(const char *jstr, jtok_t * __restrict
 		return NULL;
 
 	siz = tok->tok_size;
-	if (!siz && tok->tok_type != J_ARRAY && tok->tok_type != J_OBJECT)
+	if (!siz && json_toktype(tok) != J_ARRAY && json_toktype(tok) != J_OBJECT)
 		siz++;
 
 	arr = ait_allocVars(siz);
@@ -545,17 +545,25 @@ json_token2array(const char *jstr, jtok_t * __restrict
 
 	if (tok->tok_type == J_STRING || tok->tok_type == J_VALUE) {
 		v = ait_getVars(&arr, 0);
-		AIT_SET_STRSIZ(v, tok->tok_end - tok->tok_start);
-		strncpy(AIT_GET_STR(v), jstr + tok->tok_start, AIT_LEN(v) - 1);
+		AIT_SET_STRSIZ(v, json_toklen(tok) + 1);
+		json_tokstrcpy(AIT_GET_STR(v), jstr, tok);
 	} else if (tok->tok_type == J_ARRAY) {
 		for (i = 0; i < tok->tok_size; i++) {
 			t = &tok[i + 1];
 			v = ait_getVars(&arr, i);
-			AIT_SET_STRSIZ(v, t->tok_end - t->tok_start);
-			strncpy(AIT_GET_STR(v), jstr + t->tok_start, AIT_LEN(v) - 1);
+			AIT_SET_STRSIZ(v, json_toklen(t) + 1);
+			json_tokstrcpy(AIT_GET_STR(v), jstr, t);
 		}
+	} else if (tok->tok_type == J_OBJECT) {
+		for (i = 0; tok->tok_idx <= tok[i + 1].tok_parent; i++) {
+			t = &tok[i + 1];
+			v = ait_getVars(&arr, i);
+			AIT_SET_STRSIZ(v, json_toklen(t) + 1);
+			json_tokstrcpy(AIT_GET_STR(v), jstr, t);
+		}
 	} else {
-		/* todo for object */
+		elwix_SetErr(J_ERR_PARAM, "%s", jerrstr[J_ERR_PARAM]);
+		return NULL;
 	}
 
 	return arr;