diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-05-26 14:10:22 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-05-26 14:10:22 -0300 |
commit | c98f195eb930422be2829f78696fb4bf79b93677 (patch) | |
tree | 119b0eca4b1b1435f6a73cecb50e368455081c14 /ltable.c | |
parent | 4d696c45b9710e4b3d2eb65a0ebef79766937a4a (diff) | |
download | lua-github-c98f195eb930422be2829f78696fb4bf79b93677.tar.gz |
function 'luaV_numtointeger' changed to a global macro
'lua_numtointeger' (tricky, small, and useful in several places)
Diffstat (limited to 'ltable.c')
-rw-r--r-- | ltable.c | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -1,5 +1,5 @@ /* -** $Id: ltable.c,v 2.87 2014/04/15 14:28:20 roberto Exp roberto $ +** $Id: ltable.c,v 2.88 2014/04/15 16:32:49 roberto Exp roberto $ ** Lua tables (hash) ** See Copyright Notice in lua.h */ @@ -67,12 +67,6 @@ #define hashpointer(t,p) hashmod(t, IntPoint(p)) -/* checks whether a float has a value representable as a lua_Integer - (and does the conversion if so) */ -#define numisinteger(x,i) \ - (((x) == l_floor(x)) && luaV_numtointeger(x, i)) - - #define dummynode (&dummynode_) #define isdummy(n) ((n) == dummynode) @@ -84,6 +78,17 @@ static const Node dummynode_ = { /* +** Checks whether a float has a value representable as a lua_Integer +** (and does the conversion if so) +*/ +static int numisinteger (lua_Number x, lua_Integer *p) { + if ((x) == l_floor(x)) /* integral value? */ + return lua_numtointeger(x, p); /* try as an integer */ + else return 0; +} + + +/* ** hash for floating-point numbers */ static Node *hashfloat (const Table *t, lua_Number n) { @@ -424,7 +429,7 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) { if (luai_numisnan(n)) luaG_runerror(L, "table index is NaN"); if (numisinteger(n, &k)) { /* index is int? */ - setivalue(&aux, k); + setivalue(&aux, k); key = &aux; /* insert it as an integer */ } } |