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

new implementation for userdatas, without `keys'

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2001-06-06 15:00:19 -03:00
parent da673d31aa
commit d5b83ead90
17 changed files with 215 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lstring.c
View File

@@ -1,5 +1,5 @@
/*
** $Id: lstring.c,v 1.61 2001/02/23 17:17:25 roberto Exp roberto $
** $Id: lstring.c,v 1.62 2001/03/26 14:31:49 roberto Exp roberto $
** String table (keeps all strings handled by Lua)
** See Copyright Notice in lua.h
*/
@@ -17,22 +17,15 @@
void luaS_init (lua_State *L) {
luaS_resize(L, &G(L)->strt, MINPOWER2);
luaS_resize(L, &G(L)->udt, MINPOWER2);
}
void luaS_freeall (lua_State *L) {
lua_assert(G(L)->strt.nuse==0);
luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size, TString *);
lua_assert(G(L)->udt.nuse==0);
luaM_freearray(L, G(L)->udt.hash, G(L)->udt.size, TString *);
}
void luaS_resize (lua_State *L, stringtable *tb, int newsize) {
void luaS_resize (lua_State *L, int newsize) {
TString **newhash = luaM_newvector(L, newsize, TString *);
stringtable *tb = &G(L)->strt;
int i;
for (i=0; i<newsize; i++) newhash[i] = NULL;
/* rehash */
@@ -40,7 +33,7 @@ void luaS_resize (lua_State *L, stringtable *tb, int newsize) {
TString *p = tb->hash[i];
while (p) { /* for each node in the list */
TString *next = p->nexthash; /* save next */
lu_hash h = (tb == &G(L)->strt) ? p->u.s.hash : IntPoint(p->u.d.value);
lu_hash h = p->hash;
int h1 = lmod(h, newsize); /* new position */
lua_assert((int)(h%newsize) == lmod(h, newsize));
p->nexthash = newhash[h1]; /* chain it in new position */
@@ -54,16 +47,6 @@ void luaS_resize (lua_State *L, stringtable *tb, int newsize) {
}
static void newentry (lua_State *L, stringtable *tb, TString *ts, int h) {
ts->nexthash = tb->hash[h]; /* chain new entry */
tb->hash[h] = ts;
tb->nuse++;
if (tb->nuse > (ls_nstr)tb->size && tb->size <= MAX_INT/2) /* too crowded? */
luaS_resize(L, tb, tb->size*2);
}
TString *luaS_newlstr (lua_State *L, const l_char *str, size_t l) {
TString *ts;
lu_hash h = l; /* seed */
@@ -80,39 +63,30 @@ TString *luaS_newlstr (lua_State *L, const l_char *str, size_t l) {
ts->marked = 0;
ts->nexthash = NULL;
ts->len = l;
ts->u.s.hash = h;
ts->u.s.constindex = 0;
ts->hash = h;
ts->constindex = 0;
memcpy(getstr(ts), str, l*sizeof(l_char));
getstr(ts)[l] = 0; /* ending 0 */
newentry(L, &G(L)->strt, ts, lmod(h, G(L)->strt.size)); /* insert it */
h = lmod(h, G(L)->strt.size);
ts->nexthash = G(L)->strt.hash[h]; /* chain new entry */
G(L)->strt.hash[h] = ts;
G(L)->strt.nuse++;
if (G(L)->strt.nuse > (ls_nstr)G(L)->strt.size &&
G(L)->strt.size <= MAX_INT/2)
luaS_resize(L, G(L)->strt.size*2); /* too crowded */
return ts;
}
TString *luaS_newudata (lua_State *L, size_t s, void *udata) {
TString *ts = (TString *)luaM_malloc(L, sizeudata(s));
ts->marked = 0;
ts->nexthash = NULL;
ts->len = s;
ts->u.d.tag = 0;
ts->u.d.value = (s > 0) ? getstr(ts) : udata;
/* insert it on table */
newentry(L, &G(L)->udt, ts, lmod(IntPoint(ts->u.d.value), G(L)->udt.size));
return ts;
}
int luaS_createudata (lua_State *L, void *udata, TObject *o) {
int h1 = lmod(IntPoint(udata), G(L)->udt.size);
TString *ts;
for (ts = G(L)->udt.hash[h1]; ts; ts = ts->nexthash) {
if (udata == ts->u.d.value) {
setuvalue(o, ts);
return 0;
}
}
/* not found */
setuvalue(o, luaS_newudata(L, 0, udata));
return 1;
Udata *luaS_newudata (lua_State *L, size_t s) {
Udata *u = (Udata *)luaM_malloc(L, sizeudata(s));
u->marked = 0;
u->len = s;
u->tag = 0;
u->value = ((union L_UUdata *)(u) + 1);
/* chain it on udata list */
u->next = G(L)->rootudata;
G(L)->rootudata = u;
return u;
}