nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new function 'luaV_flttointeger' to convert floats to integers (without

Browse Source 
string coercions) + string operands to bitwise operations handled
by string metamethods
This commit is contained in:
Roberto Ierusalimschy
2017-11-08 12:50:23 -02:00
parent c3e5946fb2
commit 26679ea35b
8 changed files with 126 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ltable.c
View File

@@ -1,5 +1,5 @@
/*
** $Id: ltable.c,v 2.124 2017/06/12 14:21:44 roberto Exp roberto $
** $Id: ltable.c,v 2.125 2017/06/29 15:06:44 roberto Exp roberto $
** Lua tables (hash)
** See Copyright Notice in lua.h
*/
@@ -495,7 +495,7 @@ TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
if (ttisnil(key)) luaG_runerror(L, "table index is nil");
else if (ttisfloat(key)) {
lua_Integer k;
if (luaV_tointeger(key, &k, 0)) { /* does index fit in an integer? */
if (luaV_flttointeger(key, &k, 0)) { /* does index fit in an integer? */
setivalue(&aux, k);
key = &aux; /* insert it as an integer */
}
@@ -604,7 +604,7 @@ const TValue *luaH_get (Table *t, const TValue *key) {
case LUA_TNIL: return luaO_nilobject;
case LUA_TNUMFLT: {
lua_Integer k;
if (luaV_tointeger(key, &k, 0)) /* index is int? */
if (luaV_flttointeger(key, &k, 0)) /* index is an integral? */
return luaH_getint(t, k); /* use specialized version */
/* else... */
} /* FALLTHROUGH */