FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Little clean-up in parser

Browse Source 
Before, json_loads checked for '[' or '{' at the beginning. Now
there's a dedicated function for that: parse_json(). Also rename
parse() to parse_value().
This commit is contained in:
Petri Lehtinen 2009-07-11 11:16:14 +03:00
parent 287ec3f9da
commit 1b67edb54d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/load.c
View File

@ -304,7 +304,7 @@ static void lex_close(lex_t *lex)
/*** parser ***/ /*** parser ***/
static json_t *parse(lex_t *lex, json_error_t *error); static json_t *parse_value(lex_t *lex, json_error_t *error);
static json_t *parse_object(lex_t *lex, json_error_t *error) static json_t *parse_object(lex_t *lex, json_error_t *error)
{ {
@ -338,7 +338,7 @@ static json_t *parse_object(lex_t *lex, json_error_t *error)
lex_scan(lex); lex_scan(lex);
value = parse(lex, error); value = parse_value(lex, error);
if(!value) { if(!value) {
free(key); free(key);
goto error; goto error;
@ -382,7 +382,7 @@ static json_t *parse_array(lex_t *lex, json_error_t *error)
return array; return array;
while(lex->token) { while(lex->token) {
json_t *elem = parse(lex, error); json_t *elem = parse_value(lex, error);
if(!elem) if(!elem)
goto error; goto error;
@ -411,7 +411,7 @@ error:
return NULL; return NULL;
} }
static json_t *parse(lex_t *lex, json_error_t *error) static json_t *parse_value(lex_t *lex, json_error_t *error)
{ {
json_t *json; json_t *json;
@ -467,6 +467,16 @@ static json_t *parse(lex_t *lex, json_error_t *error)
return json; return json;
} }
json_t *parse_json(lex_t *lex, json_error_t *error)
{
if(lex->token != '[' && lex->token != '{') {
error_set(error, lex, "'[' or '{' expected");
return NULL;
}
return parse_value(lex, error);
}
json_t *json_load(const char *path, json_error_t *error) json_t *json_load(const char *path, json_error_t *error)
{ {
json_t *result; json_t *result;
@ -494,12 +504,7 @@ json_t *json_loads(const char *string, json_error_t *error)
if(lex_init(&lex, string)) if(lex_init(&lex, string))
return NULL; return NULL;
if(lex.token != '[' && lex.token != '{') { result = parse_json(&lex, error);
error_set(error, &lex, "'[' or '{' expected");
goto out;
}
result = parse(&lex, error);
if(!result) if(!result)
goto out; goto out;