version 1.1.2.2, 2017/11/24 15:52:57
|
version 1.1.2.3, 2017/11/27 19:37:22
|
Line 105 json_free(json_t * __restrict json)
|
Line 105 json_free(json_t * __restrict json)
|
} |
} |
} |
} |
|
|
|
static jtok_t * |
|
json_gettoken(json_t * __restrict json, jtok_t * __restrict jtoks, u_int toksnum) |
|
{ |
|
jtok_t *tok; |
|
|
|
assert(json || !(!jtoks && toksnum)); |
|
|
|
if (json->h_next >= toksnum) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
return NULL; |
|
} else |
|
tok = &jtoks[json->h_next++]; |
|
tok->tok_start = tok->tok_end = tok->tok_parent = -1; |
|
tok->tok_size = 0; |
|
|
|
return tok; |
|
} |
|
|
|
inline void |
|
json_filltoken(jtok_t * __restrict tok, jtype_t type, long start, long end, long parent) |
|
{ |
|
assert(tok); |
|
|
|
tok->tok_type = type; |
|
tok->tok_start = start; |
|
tok->tok_end = end; |
|
tok->tok_parent = parent; |
|
tok->tok_size = 0; |
|
} |
|
|
|
static int |
|
json_parse_string(json_t * __restrict json, const char *jstr, size_t jlen, jtok_t * __restrict jtoks, u_int toksnum) |
|
{ |
|
jtok_t *tok; |
|
u_long pos; |
|
char ch; |
|
register int i; |
|
|
|
assert(json || jstr || !(!jtoks && toksnum)); |
|
|
|
for (pos = json->h_pos++; json->h_pos < jlen && jstr[json->h_pos]; json->h_pos++) { |
|
ch = jstr[json->h_pos]; |
|
|
|
if (ch == '\"') { |
|
if (!jtoks) |
|
return 0; |
|
if (!(tok = json_gettoken(json, jtoks, toksnum))) { |
|
json->h_pos = pos; |
|
return -1; |
|
} else |
|
json_filltoken(tok, J_STRING, pos + 1, json->h_pos, json->h_parent); |
|
return 0; |
|
} |
|
|
|
if (ch == '\\' && json->h_pos + 1 < jlen) { |
|
switch (jstr[++json->h_pos]) { |
|
case '\"': |
|
case '/': |
|
case '\\': |
|
case 'b': |
|
case 'f': |
|
case 'r': |
|
case 'n': |
|
case 't': |
|
/* Allowed escaped symbols */ |
|
break; |
|
case 'u': |
|
/* Allows escaped symbol \uXXXX */ |
|
json->h_pos++; |
|
for (i = 0; i < 4 && json->h_pos < jlen && jstr[json->h_pos]; i++, json->h_pos++) { |
|
/* If it isn't a hex character we have an error */ |
|
if (!((jstr[json->h_pos] >= 48 && jstr[json->h_pos] <= 57) || /* 0-9 */ |
|
(jstr[json->h_pos] >= 65 && jstr[json->h_pos] <= 70) || /* A-F */ |
|
(jstr[json->h_pos] >= 97 && jstr[json->h_pos] <= 102))) { /* a-f */ |
|
json->h_pos = pos; |
|
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |
|
return -1; |
|
} |
|
} |
|
json->h_pos--; |
|
break; |
|
default: |
|
/* Unexpected symbol */ |
|
json->h_pos = pos; |
|
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |
|
return -1; |
|
} |
|
} |
|
} |
|
|
|
json->h_pos = pos; |
|
elwix_SetErr(J_ERR_PART, "%s", jerrstr[J_ERR_PART]); |
|
return -1; |
|
} |
|
|
|
static int |
|
json_parse_value(json_t * __restrict json, const char *jstr, size_t jlen, jtok_t * __restrict jtoks, u_int toksnum) |
|
{ |
|
jtok_t *tok; |
|
u_long pos; |
|
|
|
assert(json || jstr || !(!jtoks && toksnum)); |
|
|
|
for (pos = json->h_pos; json->h_pos < jlen && jstr[json->h_pos]; json->h_pos++) { |
|
switch (jstr[json->h_pos]) { |
|
case ':': |
|
if (json->h_strict) |
|
goto found; |
|
break; |
|
case '\t': |
|
case '\r': |
|
case '\n': |
|
case ' ': |
|
case ',': |
|
case ']': |
|
case '}': |
|
goto found; |
|
} |
|
if (jstr[json->h_pos] < 32 || jstr[json->h_pos] > 127) { |
|
json->h_pos = pos; |
|
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |
|
return -1; |
|
} |
|
} |
|
|
|
if (json->h_strict) { |
|
json->h_pos = pos; |
|
elwix_SetErr(J_ERR_PART, "%s", jerrstr[J_ERR_PART]); |
|
return -1; |
|
} |
|
found: |
|
if (jtoks) { |
|
if (!(tok = json_gettoken(json, jtoks, toksnum))) { |
|
json->h_pos = pos; |
|
return -1; |
|
} else |
|
json_filltoken(tok, J_VALUE, pos, json->h_pos, json->h_parent); |
|
} |
|
|
|
json->h_pos--; |
|
return 0; |
|
} |
|
|
/* |
/* |
* json_parse() - Parse JSON string |
* json_parse() - Parse JSON string |
* |
* |
Line 138 json_parse(json_t * __restrict json, const char *jstr,
|
Line 281 json_parse(json_t * __restrict json, const char *jstr,
|
break; |
break; |
|
|
tok = json_gettoken(json, jtoks, toksnum); |
tok = json_gettoken(json, jtoks, toksnum); |
if (!tok) { | if (!tok) |
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); | |
return (u_int) -1; |
return (u_int) -1; |
} |
|
if (json->h_parent != -1) { |
if (json->h_parent != -1) { |
jtoks[json->h_parent].tok_size++; |
jtoks[json->h_parent].tok_size++; |
tok->tok_parent = json->h_parent; |
tok->tok_parent = json->h_parent; |
Line 220 json_parse(json_t * __restrict json, const char *jstr,
|
Line 361 json_parse(json_t * __restrict json, const char *jstr,
|
case 't': |
case 't': |
case 'f': |
case 'f': |
case 'n': |
case 'n': |
if (!json->h_strict) | if (json->h_strict) { |
break; | if (jtoks && json->h_parent != -1) { |
| /* they must not be keys of the object */ |
| if (jtoks[json->h_parent].tok_type == J_OBJECT || |
| (jtoks[json->h_parent].tok_type == J_STRING && |
| jtoks[json->h_parent].tok_size)) { |
| elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |
| return (u_int) -1; |
| } |
| } |
|
|
if (jtoks && json->h_parent != -1) { | if (json_parse_value(json, jstr, jlen, jtoks, toksnum) == -1) |
/* they must not be keys of the object */ | |
if (jtoks[json->h_parent].tok_type == J_OBJECT || | |
(jtoks[json->h_parent].tok_type == J_STRING && | |
jtoks[json->h_parent].tok_size)) { | |
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); | |
return (u_int) -1; |
return (u_int) -1; |
} | cx++; |
| if (jtoks && json->h_parent != -1) |
| jtoks[json->h_parent].tok_size++; |
| break; |
} |
} |
|
|
if (json_parse_value(json, jstr, jlen, jtoks, toksnum) == -1) |
|
return (u_int) -1; |
|
cx++; |
|
if (jtoks && json->h_parent != -1) |
|
jtoks[json->h_parent].tok_size++; |
|
break; |
|
default: |
default: |
if (json->h_strict) { |
if (json->h_strict) { |
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |