small optimizations (?)

2 files changed, 10 insertions, 5 deletions

diff --git a/lstring.c b/lstring.c
index aa720428..070674c7 100644
--- a/lstring.c
+++ b/lstring.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.c,v 1.8 1997/12/09 13:35:19 roberto Exp roberto $
+** $Id: lstring.c,v 1.9 1997/12/30 19:15:52 roberto Exp roberto $
 ** String table (keeps all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -102,17 +102,21 @@ static TaggedString *insert (char *buff, int tag, stringtable *tb)
 {
   TaggedString *ts;
   unsigned long h = hash(buff, tag);
+  int size = tb->size;
   int i;
   int j = -1;
-  if ((long)tb->nuse*3 >= (long)tb->size*2)
+  if ((long)tb->nuse*3 >= (long)size*2) {
     grow(tb);
-  for (i = h%tb->size; (ts = tb->hash[i]) != NULL; i = (i+1)%tb->size) {
+    size = tb->size;
+  }
+  for (i = h%size; (ts = tb->hash[i]) != NULL; ) {
     if (ts == &EMPTY)
       j = i;
     else if ((ts->constindex >= 0) ?  /* is a string? */
               (tag == LUA_T_STRING && (strcmp(buff, ts->str) == 0)) :
               ((tag == ts->u.d.tag || tag == LUA_ANYTAG) && buff == ts->u.d.v))
       return ts;
+    if (++i == size) i=0;
   }
   /* not found */
   if (j != -1)  /* is there an EMPTY space? */
diff --git a/ltable.c b/ltable.c
index 0c91833a..df5b7a5a 100644
--- a/ltable.c
+++ b/ltable.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.c,v 1.9 1997/12/15 16:17:20 roberto Exp roberto $
+** $Id: ltable.c,v 1.10 1998/01/09 14:44:55 roberto Exp roberto $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
@@ -65,7 +65,8 @@ static int present (Hash *t, TObject *key)
   if (ttype(rf) != LUA_T_NIL && !luaO_equalObj(key, rf)) {
     int h2 = h%(tsize-2) + 1;
     do {
-      h1 = (h1+h2)%tsize;
+      h1 += h2;
+      if (h1 >= tsize) h1 -= tsize;
       rf = ref(node(t, h1));
     } while (ttype(rf) != LUA_T_NIL && !luaO_equalObj(key, rf));
   }