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

luaH_next' works like next' + better hash for pointers

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2002-02-14 19:41:08 -02:00
parent 0056ed4135
commit bee86e23be
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ltable.c
View File

@@ -53,7 +53,12 @@
(node(t, lmod(cast(lu_hash, cast(ls_hash, n)), sizenode(t)))) (node(t, lmod(cast(lu_hash, cast(ls_hash, n)), sizenode(t))))
#define hashstr(t,str) (node(t, lmod((str)->tsv.hash, sizenode(t)))) #define hashstr(t,str) (node(t, lmod((str)->tsv.hash, sizenode(t))))
#define hashboolean(t,p) (node(t, p)) /* `p' in [0,1] < minimum table size */ #define hashboolean(t,p) (node(t, p)) /* `p' in [0,1] < minimum table size */
#define hashpointer(t,p) (node(t, lmod(IntPoint(p), sizenode(t))))
/*
** for pointers, avoid modulus by power of 2, as they tend to have many
** 2 factors.
*/
#define hashpointer(t,p) (node(t, (IntPoint(p) % (sizenode(t)-1))))
/* /*
@@ -93,7 +98,7 @@ static int arrayindex (const TObject *key) {
** elements in the array part, then elements in the hash part. The ** elements in the array part, then elements in the hash part. The
** beginning and end of a traversal are signalled by -1. ** beginning and end of a traversal are signalled by -1.
*/ */
int luaH_index (lua_State *L, Table *t, const TObject *key) { static int luaH_index (lua_State *L, Table *t, const TObject *key) {
int i; int i;
if (ttype(key) == LUA_TNIL) return -1; /* first iteration */ if (ttype(key) == LUA_TNIL) return -1; /* first iteration */
i = arrayindex(key); i = arrayindex(key);
@@ -111,22 +116,23 @@ int luaH_index (lua_State *L, Table *t, const TObject *key) {
} }
int luaH_nexti (Table *t, int i, TObject *where) { int luaH_next (lua_State *L, Table *t, TObject *key) {
int i = luaH_index(L, t, key); /* find original element */
for (i++; i < t->sizearray; i++) { /* try first array part */ for (i++; i < t->sizearray; i++) { /* try first array part */
if (ttype(&t->array[i]) != LUA_TNIL) { /* a non-nil value? */ if (ttype(&t->array[i]) != LUA_TNIL) { /* a non-nil value? */
setnvalue(where, i+1); setnvalue(key, i+1);
setobj(where+1, &t->array[i]); setobj(key+1, &t->array[i]);
return i; return 1;
} }
} }
for (i -= t->sizearray; i < sizenode(t); i++) { /* then hash part */ for (i -= t->sizearray; i < sizenode(t); i++) { /* then hash part */
if (ttype(val(node(t, i))) != LUA_TNIL) { /* a non-nil value? */ if (ttype(val(node(t, i))) != LUA_TNIL) { /* a non-nil value? */
setobj(where, key(node(t, i))); setobj(key, key(node(t, i)));
setobj(where+1, val(node(t, i))); setobj(key+1, val(node(t, i)));
return i + t->sizearray; return 1;
} }
} }
return -1; /* no more elements */ return 0; /* no more elements */
} }