diff options
| author | Mark Pulford <mark@kyne.com.au> | 2012-01-19 00:56:40 +1030 |
|---|---|---|
| committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 18:54:35 +1030 |
| commit | dd231d4cd0e277fedb6ca23d9685202787dc65b1 (patch) | |
| tree | bf187867fd91a5cc70505c2d441dc3a66e3bb86c /lua_cjson.c | |
| parent | 3040931d6bb7331b130fd4c34a7b17bc5d226039 (diff) | |
| download | lua-cjson-dd231d4cd0e277fedb6ca23d9685202787dc65b1.tar.gz lua-cjson-dd231d4cd0e277fedb6ca23d9685202787dc65b1.tar.bz2 lua-cjson-dd231d4cd0e277fedb6ca23d9685202787dc65b1.zip | |
Remove deprecated "refuse_invalid_numbers"
Remove deprecated "refuse_invalid_numbers" since the version number will
be bumped to 1.1.0. Also remove "version" variable since it has been
replaced by _VERSION.
Diffstat (limited to 'lua_cjson.c')
| -rw-r--r-- | lua_cjson.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/lua_cjson.c b/lua_cjson.c index 7f0bbb1..fea3ed5 100644 --- a/lua_cjson.c +++ b/lua_cjson.c | |||
| @@ -354,41 +354,6 @@ static int json_cfg_decode_invalid_numbers(lua_State *l) | |||
| 354 | return 1; | 354 | return 1; |
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | /* When enabled, rejects: NaN, Infinity, hexadecimal numbers. | ||
| 358 | * | ||
| 359 | * This function has been deprecated and may be removed in future. */ | ||
| 360 | static int json_cfg_refuse_invalid_numbers(lua_State *l) | ||
| 361 | { | ||
| 362 | static const char *options[] = { "none", "encode", "decode", "both", NULL }; | ||
| 363 | json_config_t *cfg = json_arg_init(l, 1); | ||
| 364 | int setting; | ||
| 365 | |||
| 366 | /* Map config variables to options list index */ | ||
| 367 | setting = !cfg->encode_invalid_numbers + /* bit 0 */ | ||
| 368 | (!cfg->decode_invalid_numbers << 1); /* bit 1 */ | ||
| 369 | |||
| 370 | json_enum_option(l, 1, &setting, options, 3); | ||
| 371 | |||
| 372 | /* Map options list index to config variables | ||
| 373 | * | ||
| 374 | * Only update the config variables when an argument has been provided. | ||
| 375 | * Otherwise a "null" encoding setting may inadvertently be disabled. */ | ||
| 376 | if (!lua_isnil(l, 1)) { | ||
| 377 | cfg->encode_invalid_numbers = !(setting & 1); | ||
| 378 | cfg->decode_invalid_numbers = !(setting & 2); | ||
| 379 | |||
| 380 | #if DISABLE_INVALID_NUMBERS | ||
| 381 | if (cfg->encode_invalid_numbers || cfg->decode_invalid_numbers) { | ||
| 382 | cfg->encode_invalid_numbers = cfg->decode_invalid_numbers = 0; | ||
| 383 | luaL_error(l, "Infinity, NaN, and/or hexadecimal numbers are not supported."); | ||
| 384 | } | ||
| 385 | #endif | ||
| 386 | |||
| 387 | } | ||
| 388 | |||
| 389 | return 1; | ||
| 390 | } | ||
| 391 | |||
| 392 | static int json_destroy_config(lua_State *l) | 357 | static int json_destroy_config(lua_State *l) |
| 393 | { | 358 | { |
| 394 | json_config_t *cfg; | 359 | json_config_t *cfg; |
| @@ -1348,7 +1313,6 @@ static int lua_cjson_new(lua_State *l) | |||
| 1348 | { "encode_keep_buffer", json_cfg_encode_keep_buffer }, | 1313 | { "encode_keep_buffer", json_cfg_encode_keep_buffer }, |
| 1349 | { "encode_invalid_numbers", json_cfg_encode_invalid_numbers }, | 1314 | { "encode_invalid_numbers", json_cfg_encode_invalid_numbers }, |
| 1350 | { "decode_invalid_numbers", json_cfg_decode_invalid_numbers }, | 1315 | { "decode_invalid_numbers", json_cfg_decode_invalid_numbers }, |
| 1351 | { "refuse_invalid_numbers", json_cfg_refuse_invalid_numbers }, | ||
| 1352 | { "new", lua_cjson_new }, | 1316 | { "new", lua_cjson_new }, |
| 1353 | { NULL, NULL } | 1317 | { NULL, NULL } |
| 1354 | }; | 1318 | }; |
| @@ -1372,8 +1336,6 @@ static int lua_cjson_new(lua_State *l) | |||
| 1372 | lua_setfield(l, -2, "_NAME"); | 1336 | lua_setfield(l, -2, "_NAME"); |
| 1373 | lua_pushliteral(l, CJSON_VERSION); | 1337 | lua_pushliteral(l, CJSON_VERSION); |
| 1374 | lua_setfield(l, -2, "_VERSION"); | 1338 | lua_setfield(l, -2, "_VERSION"); |
| 1375 | lua_pushliteral(l, CJSON_VERSION); | ||
| 1376 | lua_setfield(l, -2, "version"); | ||
| 1377 | 1339 | ||
| 1378 | return 1; | 1340 | return 1; |
| 1379 | } | 1341 | } |