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

details

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2001-12-10 20:12:08 -02:00
parent e043b72a55
commit 9d801f43d4
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ltable.c
View File

@@ -218,18 +218,17 @@ static void setnodevector (lua_State *L, Table *t, int lsize) {
} }
static void rehash (lua_State *L, Table *t) { static void resize (lua_State *L, Table *t, int nasize, int nhsize) {
int i; int i;
int oldasize, oldhsize, nasize, nhsize; int oldasize, oldhsize;
Node *nold; Node *nold;
numuse(t, &nasize, &nhsize); /* compute new sizes for array and hash parts */
oldasize = t->sizearray; oldasize = t->sizearray;
if (nasize > oldasize) /* should grow array part? */ if (nasize > oldasize) /* should grow array part? */
setarrayvector(L, t, nasize); setarrayvector(L, t, nasize);
/* create new hash part with appropriate size */ /* create new hash part with appropriate size */
nold = t->node; /* save old hash ... */ nold = t->node; /* save old hash ... */
oldhsize = t->lsizenode; /* ... and (log of) old size */ oldhsize = t->lsizenode; /* ... and (log of) old size */
setnodevector(L, t, luaO_log2(nhsize+nhsize/4)+1); setnodevector(L, t, nhsize);
/* re-insert elements */ /* re-insert elements */
if (nasize < oldasize) { /* array part must shrink? */ if (nasize < oldasize) { /* array part must shrink? */
t->sizearray = nasize; t->sizearray = nasize;
@@ -251,6 +250,16 @@ static void rehash (lua_State *L, Table *t) {
luaM_freearray(L, nold, twoto(oldhsize), Node); /* free old array */ luaM_freearray(L, nold, twoto(oldhsize), Node); /* free old array */
} }
static void rehash (lua_State *L, Table *t) {
int nasize, nhsize;
numuse(t, &nasize, &nhsize); /* compute new sizes for array and hash parts */
nhsize += nhsize/4; /* allow some extra for growing nhsize */
resize(L, t, nasize, luaO_log2(nhsize)+1);
}
/* /*
** }============================================================= ** }=============================================================
*/ */