Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support lua 5.3 integer representation #59

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support lua 5.3 integer representation #59

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f13d18e
Support lua 5.3 integer representation
cloudwu Mar 5, 2015
a825604
encode integer for lua 5.3
cloudwu Sep 1, 2015
c3f001f
Compatible with lua 5.3.2
cloudwu Dec 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions lua_cjson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ typedef enum {
T_ARR_END,
T_STRING,
T_NUMBER,
T_INTEGER,
T_BOOLEAN,
T_NULL,
T_COLON,
Expand All @@ -104,6 +105,7 @@ static const char *json_token_type_name[] = {
"T_ARR_END",
"T_STRING",
"T_NUMBER",
"T_INTEGER",
"T_BOOLEAN",
"T_NULL",
"T_COLON",
Expand Down Expand Up @@ -149,6 +151,7 @@ typedef struct {
union {
const char *string;
double number;
lua_Integer integer;
int boolean;
} value;
int string_len;
Expand Down Expand Up @@ -592,8 +595,17 @@ static void json_append_array(lua_State *l, json_config_t *cfg, int current_dept
static void json_append_number(lua_State *l, json_config_t *cfg,
strbuf_t *json, int lindex)
{
double num = lua_tonumber(l, lindex);
int len;
#if LUA_VERSION_NUM >= 503
if (lua_isinteger(l, lindex)) {
lua_Integer num = lua_tointeger(l, lindex);
strbuf_ensure_empty_length(json, FPCONV_G_FMT_BUFSIZE); /* max length of int64 is 19 */
len = sprintf(strbuf_empty_ptr(json), LUA_INTEGER_FMT, num);
strbuf_extend_length(json, len);
return;
}
#endif
double num = lua_tonumber(l, lindex);

if (cfg->encode_invalid_numbers == 0) {
/* Prevent encoding invalid numbers */
Expand Down Expand Up @@ -1008,13 +1020,18 @@ static int json_is_invalid_number(json_parse_t *json)
static void json_next_number_token(json_parse_t *json, json_token_t *token)
{
char *endptr;

token->type = T_NUMBER;
token->value.number = fpconv_strtod(json->ptr, &endptr);
if (json->ptr == endptr)
token->value.integer = strtoll(json->ptr, &endptr, 0);
if (json->ptr == endptr) {
json_set_token_error(token, json, "invalid number");
else
json->ptr = endptr; /* Skip the processed number */
return;
}
if (*endptr == '.' || *endptr == 'e' || *endptr == 'E') {
token->type = T_NUMBER;
token->value.number = fpconv_strtod(json->ptr, &endptr);
} else {
token->type = T_INTEGER;
}
json->ptr = endptr; /* Skip the processed number */

return;
}
Expand Down Expand Up @@ -1243,6 +1260,9 @@ static void json_process_value(lua_State *l, json_parse_t *json,
case T_NUMBER:
lua_pushnumber(l, token->value.number);
break;;
case T_INTEGER:
lua_pushinteger(l, token->value.integer);
break;;
case T_BOOLEAN:
lua_pushboolean(l, token->value.boolean);
break;;
Expand Down