mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-10 07:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify things by storing integer values only as int64_t's internally, and

Browse Source 
omit the range check during parsing since we already have the checks when
 accessing the value. There is no longer a json_type_int64, only json_type_int.
Fix some problems with parsing 0 and -0 values, and add a couple of tests.
Fix some minor compile issues on HPUX environments.


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@60 327403b1-1117-474d-bef2-5cb71233fd97
This commit is contained in:
ehaszla
2010-12-07 18:15:35 +00:00
parent f1ae67dbf0
commit 252669cee6
8 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
json_tokener.c
View File

@@ -204,7 +204,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
case json_tokener_state_eatws:
/* Advance until we change state */
while (isspace(c)) {
while (isspace((int)c)) {
if ((!ADVANCE_CHAR(str, tok)) || (!POP_CHAR(c, tok)))
goto out;
}
@@ -547,17 +547,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
int64_t num64;
double numd;
if (!tok->is_double && json_parse_int64(tok->pb->buf, &num64) == 0) {
// Decode the type based on the value range to keep compatibilty
// with code that checks the type of objects. i.e. this:
// json_object_get_type(o) == json_type_int
// will continue to work.
// The other option would be to eliminate any distinction between
// int and int64 types, but that would change the ABI of
// json_object_get_int().
if (num64 < INT32_MAX && num64 > INT32_MIN)
current = json_object_new_int(num64);
else
current = json_object_new_int64(num64);
current = json_object_new_int64(num64);
} else if(tok->is_double && sscanf(tok->pb->buf, "%lf", &numd) == 1) {
current = json_object_new_double(numd);
} else {