GitHub/nodemcu-firmware
1
0
Fork 0
mirror of https://github.com/nodemcu/nodemcu-firmware.git synced 2025-02-06 21:18:25 +08:00
Code Issues Projects Releases Wiki Activity

Now round trips in float firmware, and gets it roughly right in double (in lua 51)

Browse Source
This commit is contained in:
philip 2020-09-22 21:24:47 -04:00 committed by Nathaniel Wesley Filardo
parent 96d8047f71
commit 85298b34c5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/modules/sjson.c
View File

@ -724,13 +724,21 @@ static void encode_lua_object(lua_State *L, ENC_DATA *data, int argno, const cha
lua_pushvalue(L, argno); lua_pushvalue(L, argno);
char value[50]; char value[50];
#if LUA_VERSION_NUM == 501
#ifdef LUA_NUMBER_INTEGRAL
snprintf(value, sizeof(value), LUA_INTEGER_FMT, lua_tointeger(L, -1));
#else
snprintf(value, sizeof(value), SJSON_FLOAT_FMT, lua_tonumber(L, -1));
#endif
#else
if (lua_isinteger(L, -1)) { if (lua_isinteger(L, -1)) {
snprintf(value, sizeof(value), LUA_INTEGER_FMT, lua_tointeger(L, -1)); snprintf(value, sizeof(value), LUA_INTEGER_FMT, lua_tointeger(L, -1));
} else { } else {
snprintf(value, sizeof(value), SJSON_FLOAT_FMT, lua_tonumber(L, -1)); snprintf(value, sizeof(value), SJSON_FLOAT_FMT, lua_tonumber(L, -1));
} }
#endif
lua_pop(L, 1); lua_pop(L, 1);
if (strcmp(value, "-Infinity") == 0 || strcmp(value, "NaN") == 0 || strcmp(value, "Infinity") == 0) { if (strcmp(value, "-inf") == 0 || strcmp(value, "nan") == 0 || strcmp(value, "inf") == 0) {
luaL_addstring(&b, "null"); // According to ECMA-262 section 24.5.2 Note 4 luaL_addstring(&b, "null"); // According to ECMA-262 section 24.5.2 Note 4
} else { } else {
luaL_addstring(&b, value); luaL_addstring(&b, value);