first implementation of multiple states (reentrant code).

1 files changed, 295 insertions, 296 deletions

diff --git a/lbuiltin.c b/lbuiltin.c
index 2ebdd66f..da8a573c 100644
--- a/lbuiltin.c
+++ b/lbuiltin.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lbuiltin.c,v 1.72 1999/11/11 17:02:40 roberto Exp roberto $
+** $Id: lbuiltin.c,v 1.73 1999/11/16 12:50:48 roberto Exp roberto $
 ** Built-in functions
 ** See Copyright Notice in lua.h
 */
@@ -10,6 +10,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define LUA_REENTRANT
+
 #include "lapi.h"
 #include "lauxlib.h"
 #include "lbuiltin.h"
@@ -34,7 +36,7 @@
 */
 
 
-static void pushtagstring (TaggedString *s) {
+static void pushtagstring (lua_State *L, TaggedString *s) {
   ttype(L->stack.top) = LUA_T_STRING;
   tsvalue(L->stack.top) = s;
   incr_top;
@@ -46,29 +48,29 @@ static real getsize (const Hash *h) {
   int i = h->size;
   Node *n = h->node;
   while (i--) {
-    if (ttype(key(n)) == LUA_T_NUMBER && 
-        ttype(val(n)) != LUA_T_NIL &&
-        nvalue(key(n)) > max)
-      max = nvalue(key(n));
+    if (ttype(key(L, n)) == LUA_T_NUMBER && 
+        ttype(val(L, n)) != LUA_T_NIL &&
+        nvalue(key(L, n)) > max)
+      max = nvalue(key(L, n));
     n++;
   }
   return max;
 }
 
 
-static real getnarg (const Hash *a) {
+static real getnarg (lua_State *L, const Hash *a) {
   TObject index;
   const TObject *value;
   /* value = table.n */
   ttype(&index) = LUA_T_STRING;
-  tsvalue(&index) = luaS_new("n");
-  value = luaH_get(a, &index);
+  tsvalue(&index) = luaS_new(L, "n");
+  value = luaH_get(L, a, &index);
   return (ttype(value) == LUA_T_NUMBER) ? nvalue(value) : getsize(a);
 }
 
 
-static Hash *gettable (int arg) {
-  return avalue(luaA_Address(luaL_tablearg(arg)));
+static Hash *gettable (lua_State *L, int arg) {
+  return avalue(luaA_Address(L, luaL_tablearg(L, arg)));
 }
 
 /* }====================================================== */
@@ -85,8 +87,8 @@ static Hash *gettable (int arg) {
 ** If your system does not support "stderr", redefine this function, or
 ** redefine _ERRORMESSAGE so that it won't need _ALERT.
 */
-static void luaB_alert (void) {
-  fputs(luaL_check_string(1), stderr);
+static void luaB_alert (lua_State *L) {
+  fputs(luaL_check_string(L, 1), stderr);
 }
 
 
@@ -94,13 +96,13 @@ static void luaB_alert (void) {
 ** Standard implementation of _ERRORMESSAGE.
 ** The library "iolib" redefines _ERRORMESSAGE for better error information.
 */
-static void error_message (void) {
-  lua_Object al = lua_rawgetglobal("_ALERT");
-  if (lua_isfunction(al)) {  /* avoid error loop if _ALERT is not defined */
+static void error_message (lua_State *L) {
+  lua_Object al = lua_rawgetglobal(L, "_ALERT");
+  if (lua_isfunction(L, al)) {  /* avoid error loop if _ALERT is not defined */
     char buff[600];
-    sprintf(buff, "lua error: %.500s\n", luaL_check_string(1));
-    lua_pushstring(buff);
-    lua_callfunction(al);
+    sprintf(buff, "lua error: %.500s\n", luaL_check_string(L, 1));
+    lua_pushstring(L, buff);
+    lua_callfunction(L, al);
   }
 }
 
@@ -115,142 +117,142 @@ static void error_message (void) {
 #define MAXPRINT        40  /* arbitrary limit */
 #endif
 
-static void luaB_print (void) {
+static void luaB_print (lua_State *L) {
   lua_Object args[MAXPRINT];
   lua_Object obj;
   int n = 0;
   int i;
-  while ((obj = lua_getparam(n+1)) != LUA_NOOBJECT) {
-    luaL_arg_check(n < MAXPRINT, n+1, "too many arguments");
+  while ((obj = lua_getparam(L, n+1)) != LUA_NOOBJECT) {
+    luaL_arg_check(L, n < MAXPRINT, n+1, "too many arguments");
     args[n++] = obj;
   }
   for (i=0; i<n; i++) {
-    lua_pushobject(args[i]);
-    if (lua_call("tostring"))
-      lua_error("error in `tostring' called by `print'");
-    obj = lua_getresult(1);
-    if (!lua_isstring(obj))
-      lua_error("`tostring' must return a string to `print'");
+    lua_pushobject(L, args[i]);
+    if (lua_call(L, "tostring"))
+      lua_error(L, "error in `tostring' called by `print'");
+    obj = lua_getresult(L, 1);
+    if (!lua_isstring(L, obj))
+      lua_error(L, "`tostring' must return a string to `print'");
     if (i>0) fputs("\t", stdout);
-    fputs(lua_getstring(obj), stdout);
+    fputs(lua_getstring(L, obj), stdout);
   }
   fputs("\n", stdout);
 }
 
 
-static void luaB_tonumber (void) {
-  int base = luaL_opt_int(2, 10);
+static void luaB_tonumber (lua_State *L) {
+  int base = luaL_opt_int(L, 2, 10);
   if (base == 10) {  /* standard conversion */
-    lua_Object o = lua_getparam(1);
-    if (lua_isnumber(o)) lua_pushnumber(lua_getnumber(o));
-    else lua_pushnil();  /* not a number */
+    lua_Object o = lua_getparam(L, 1);
+    if (lua_isnumber(L, o)) lua_pushnumber(L, lua_getnumber(L, o));
+    else lua_pushnil(L);  /* not a number */
   }
   else {
-    const char *s1 = luaL_check_string(1);
+    const char *s1 = luaL_check_string(L, 1);
     char *s2;
     real n;
-    luaL_arg_check(0 <= base && base <= 36, 2, "base out of range");
+    luaL_arg_check(L, 0 <= base && base <= 36, 2, "base out of range");
     n = strtoul(s1, &s2, base);
     if (s1 == s2) return;  /* no valid digits: return nil */
     while (isspace((unsigned char)*s2)) s2++;  /* skip trailing spaces */
     if (*s2) return;  /* invalid trailing character: return nil */
-    lua_pushnumber(n);
+    lua_pushnumber(L, n);
   }
 }
 
 
-static void luaB_error (void) {
-  lua_error(lua_getstring(lua_getparam(1)));
+static void luaB_error (lua_State *L) {
+  lua_error(L, lua_getstring(L, lua_getparam(L, 1)));
 }
 
-static void luaB_setglobal (void) {
-  const char *n = luaL_check_string(1);
-  lua_Object value = luaL_nonnullarg(2);
-  lua_pushobject(value);
-  lua_setglobal(n);
-  lua_pushobject(value);  /* return given value */
+static void luaB_setglobal (lua_State *L) {
+  const char *n = luaL_check_string(L, 1);
+  lua_Object value = luaL_nonnullarg(L, 2);
+  lua_pushobject(L, value);
+  lua_setglobal(L, n);
+  lua_pushobject(L, value);  /* return given value */
 }
 
-static void luaB_rawsetglobal (void) {
-  const char *n = luaL_check_string(1);
-  lua_Object value = luaL_nonnullarg(2);
-  lua_pushobject(value);
-  lua_rawsetglobal(n);
-  lua_pushobject(value);  /* return given value */
+static void luaB_rawsetglobal (lua_State *L) {
+  const char *n = luaL_check_string(L, 1);
+  lua_Object value = luaL_nonnullarg(L, 2);
+  lua_pushobject(L, value);
+  lua_rawsetglobal(L, n);
+  lua_pushobject(L, value);  /* return given value */
 }
 
-static void luaB_getglobal (void) {
-  lua_pushobject(lua_getglobal(luaL_check_string(1)));
+static void luaB_getglobal (lua_State *L) {
+  lua_pushobject(L, lua_getglobal(L, luaL_check_string(L, 1)));
 }
 
-static void luaB_rawgetglobal (void) {
-  lua_pushobject(lua_rawgetglobal(luaL_check_string(1)));
+static void luaB_rawgetglobal (lua_State *L) {
+  lua_pushobject(L, lua_rawgetglobal(L, luaL_check_string(L, 1)));
 }
 
-static void luaB_luatag (void) {
-  lua_pushnumber(lua_tag(lua_getparam(1)));
+static void luaB_luatag (lua_State *L) {
+  lua_pushnumber(L, lua_tag(L, lua_getparam(L, 1)));
 }
 
-static void luaB_settag (void) {
-  lua_Object o = luaL_tablearg(1);
-  lua_pushobject(o);
-  lua_settag(luaL_check_int(2));
-  lua_pushobject(o);  /* return first argument */
+static void luaB_settag (lua_State *L) {
+  lua_Object o = luaL_tablearg(L, 1);
+  lua_pushobject(L, o);
+  lua_settag(L, luaL_check_int(L, 2));
+  lua_pushobject(L, o);  /* return first argument */
 }
 
-static void luaB_newtag (void) {
-  lua_pushnumber(lua_newtag());
+static void luaB_newtag (lua_State *L) {
+  lua_pushnumber(L, lua_newtag(L));
 }
 
-static void luaB_copytagmethods (void) {
-  lua_pushnumber(lua_copytagmethods(luaL_check_int(1),
-                                    luaL_check_int(2)));
+static void luaB_copytagmethods (lua_State *L) {
+  lua_pushnumber(L, lua_copytagmethods(L, luaL_check_int(L, 1),
+                                    luaL_check_int(L, 2)));
 }
 
-static void luaB_rawgettable (void) {
-  lua_pushobject(luaL_nonnullarg(1));
-  lua_pushobject(luaL_nonnullarg(2));
-  lua_pushobject(lua_rawgettable());
+static void luaB_rawgettable (lua_State *L) {
+  lua_pushobject(L, luaL_nonnullarg(L, 1));
+  lua_pushobject(L, luaL_nonnullarg(L, 2));
+  lua_pushobject(L, lua_rawgettable(L));
 }
 
-static void luaB_rawsettable (void) {
-  lua_pushobject(luaL_nonnullarg(1));
-  lua_pushobject(luaL_nonnullarg(2));
-  lua_pushobject(luaL_nonnullarg(3));
-  lua_rawsettable();
+static void luaB_rawsettable (lua_State *L) {
+  lua_pushobject(L, luaL_nonnullarg(L, 1));
+  lua_pushobject(L, luaL_nonnullarg(L, 2));
+  lua_pushobject(L, luaL_nonnullarg(L, 3));
+  lua_rawsettable(L);
 }
 
-static void luaB_settagmethod (void) {
-  int tag = luaL_check_int(1);
-  const char *event = luaL_check_string(2);
-  lua_Object nf = luaL_nonnullarg(3);
+static void luaB_settagmethod (lua_State *L) {
+  int tag = luaL_check_int(L, 1);
+  const char *event = luaL_check_string(L, 2);
+  lua_Object nf = luaL_nonnullarg(L, 3);
 #ifndef LUA_COMPAT_GC
   if (strcmp(event, "gc") == 0 && tag != LUA_T_NIL)
-    lua_error("cannot set this tag method from Lua");
+    lua_error(L, "cannot set this tag method from Lua");
 #endif
-  lua_pushobject(nf);
-  lua_pushobject(lua_settagmethod(tag, event));
+  lua_pushobject(L, nf);
+  lua_pushobject(L, lua_settagmethod(L, tag, event));
 }
 
-static void luaB_gettagmethod (void) {
-  lua_pushobject(lua_gettagmethod(luaL_check_int(1), luaL_check_string(2)));
+static void luaB_gettagmethod (lua_State *L) {
+  lua_pushobject(L, lua_gettagmethod(L, luaL_check_int(L, 1), luaL_check_string(L, 2)));
 }
 
-static void luaB_seterrormethod (void) {
-  lua_Object nf = luaL_functionarg(1);
-  lua_pushobject(nf);
-  lua_pushobject(lua_seterrormethod());
+static void luaB_seterrormethod (lua_State *L) {
+  lua_Object nf = luaL_functionarg(L, 1);
+  lua_pushobject(L, nf);
+  lua_pushobject(L, lua_seterrormethod(L));
 }
 
-static void luaB_collectgarbage (void) {
-  lua_pushnumber(lua_collectgarbage(luaL_opt_int(1, 0)));
+static void luaB_collectgarbage (lua_State *L) {
+  lua_pushnumber(L, lua_collectgarbage(L, luaL_opt_int(L, 1, 0)));
 }
 
 
-static void luaB_type (void) {
-  lua_Object o = luaL_nonnullarg(1);
-  lua_pushstring(lua_type(o));
-  lua_pushnumber(lua_tag(o));
+static void luaB_type (lua_State *L) {
+  lua_Object o = luaL_nonnullarg(L, 1);
+  lua_pushstring(L, lua_type(L, o));
+  lua_pushnumber(L, lua_tag(L, o));
 }
 
 /* }====================================================== */
@@ -264,62 +266,62 @@ static void luaB_type (void) {
 */
 
 
-static void passresults (void) {
+static void passresults (lua_State *L) {
   L->Cstack.base = L->Cstack.lua2C;  /* position of first result */
   if (L->Cstack.num == 0)
-    lua_pushuserdata(NULL);  /* at least one result to signal no errors */
+    lua_pushuserdata(L, NULL);  /* at least one result to signal no errors */
 }
 
-static void luaB_dostring (void) {
+static void luaB_dostring (lua_State *L) {
   long l;
-  const char *s = luaL_check_lstr(1, &l);
+  const char *s = luaL_check_lstr(L, 1, &l);
   if (*s == ID_CHUNK)
-    lua_error("`dostring' cannot run pre-compiled code");
-  if (lua_dobuffer(s, l, luaL_opt_string(2, s)) == 0)
-    passresults();
+    lua_error(L, "`dostring' cannot run pre-compiled code");
+  if (lua_dobuffer(L, s, l, luaL_opt_string(L, 2, s)) == 0)
+    passresults(L);
   /* else return no value */
 }
 
 
-static void luaB_dofile (void) {
-  const char *fname = luaL_opt_string(1, NULL);
-  if (lua_dofile(fname) == 0)
-    passresults();
+static void luaB_dofile (lua_State *L) {
+  const char *fname = luaL_opt_string(L, 1, NULL);
+  if (lua_dofile(L, fname) == 0)
+    passresults(L);
   /* else return no value */
 }
 
 
-static void luaB_call (void) {
-  lua_Object f = luaL_nonnullarg(1);
-  const Hash *arg = gettable(2);
-  const char *options = luaL_opt_string(3, "");
-  lua_Object err = lua_getparam(4);
-  int narg = (int)getnarg(arg);
+static void luaB_call (lua_State *L) {
+  lua_Object f = luaL_nonnullarg(L, 1);
+  const Hash *arg = gettable(L, 2);
+  const char *options = luaL_opt_string(L, 3, "");
+  lua_Object err = lua_getparam(L, 4);
+  int narg = (int)getnarg(L, arg);
   int i, status;
   if (err != LUA_NOOBJECT) {  /* set new error method */
-    lua_pushobject(err);
-    err = lua_seterrormethod();
+    lua_pushobject(L, err);
+    err = lua_seterrormethod(L);
   }
   /* push arg[1...n] */
-  luaD_checkstack(narg);
+  luaD_checkstack(L, narg);
   for (i=0; i<narg; i++)
-    *(L->stack.top++) = *luaH_getint(arg, i+1);
-  status = lua_callfunction(f);
+    *(L->stack.top++) = *luaH_getint(L, arg, i+1);
+  status = lua_callfunction(L, f);
   if (err != LUA_NOOBJECT) {  /* restore old error method */
-    lua_pushobject(err);
-    lua_seterrormethod();
+    lua_pushobject(L, err);
+    lua_seterrormethod(L);
   }
   if (status != 0) {  /* error in call? */
     if (strchr(options, 'x')) {
-      lua_pushnil();
+      lua_pushnil(L);
       return;  /* return nil to signal the error */
     }
     else
-      lua_error(NULL);
+      lua_error(L, NULL);
   }
   else {  /* no errors */
     if (strchr(options, 'p')) {  /* pack results? */
-      luaV_pack(L->Cstack.lua2C, L->Cstack.num, L->stack.top);
+      luaV_pack(L, L->Cstack.lua2C, L->Cstack.num, L->stack.top);
       incr_top;
     }
     else
@@ -328,45 +330,45 @@ static void luaB_call (void) {
 }
 
 
-static void luaB_nextvar (void) {
-  const TObject *o = luaA_Address(luaL_nonnullarg(1));
+static void luaB_nextvar (lua_State *L) {
+  const TObject *o = luaA_Address(L, luaL_nonnullarg(L, 1));
   TaggedString *g;
   if (ttype(o) == LUA_T_NIL)
     g = NULL;
   else {
-    luaL_arg_check(ttype(o) == LUA_T_STRING, 1, "variable name expected");
+    luaL_arg_check(L, ttype(o) == LUA_T_STRING, 1, "variable name expected");
     g = tsvalue(o);
   }
-  if (!luaA_nextvar(g))
-    lua_pushnil();
+  if (!luaA_nextvar(L, g))
+    lua_pushnil(L);
 }
 
 
-static void luaB_next (void) {
-  const Hash *a = gettable(1);
-  const TObject *k = luaA_Address(luaL_nonnullarg(2));
+static void luaB_next (lua_State *L) {
+  const Hash *a = gettable(L, 1);
+  const TObject *k = luaA_Address(L, luaL_nonnullarg(L, 2));
   int i;  /* will get first element after `i' */
   if (ttype(k) == LUA_T_NIL)
     i = 0;  /* get first */
   else {
-    i = luaH_pos(a, k)+1;
-    luaL_arg_check(i != 0, 2, "key not found");
+    i = luaH_pos(L, a, k)+1;
+    luaL_arg_check(L, i != 0, 2, "key not found");
   }
-  if (luaA_next(a, i) == 0)
-    lua_pushnil();
+  if (luaA_next(L, a, i) == 0)
+    lua_pushnil(L);
 }
 
 
-static void luaB_tostring (void) {
-  lua_Object obj = lua_getparam(1);
-  const TObject *o = luaA_Address(obj);
+static void luaB_tostring (lua_State *L) {
+  lua_Object obj = lua_getparam(L, 1);
+  const TObject *o = luaA_Address(L, obj);
   char buff[64];
   switch (ttype(o)) {
     case LUA_T_NUMBER:
-      lua_pushstring(lua_getstring(obj));
+      lua_pushstring(L, lua_getstring(L, obj));
       return;
     case LUA_T_STRING:
-      lua_pushobject(obj);
+      lua_pushobject(L, obj);
       return;
     case LUA_T_ARRAY:
       sprintf(buff, "table: %p", o->value.a);
@@ -384,12 +386,12 @@ static void luaB_tostring (void) {
       sprintf(buff, "userdata: %p", o->value.ts->u.d.value);
       break;
     case LUA_T_NIL:
-      lua_pushstring("nil");
+      lua_pushstring(L, "nil");
       return;
     default:
-      LUA_INTERNALERROR("invalid type");
+      LUA_INTERNALERROR(L, "invalid type");
   }
-  lua_pushstring(buff);
+  lua_pushstring(L, buff);
 }
 
 /* }====================================================== */
@@ -406,28 +408,28 @@ static void luaB_tostring (void) {
 ** =======================================================
 */
 
-static void luaB_assert (void) {
-  lua_Object p = lua_getparam(1);
-  if (p == LUA_NOOBJECT || lua_isnil(p))
-    luaL_verror("assertion failed!  %.90s", luaL_opt_string(2, ""));
+static void luaB_assert (lua_State *L) {
+  lua_Object p = lua_getparam(L, 1);
+  if (p == LUA_NOOBJECT || lua_isnil(L, p))
+    luaL_verror(L, "assertion failed!  %.90s", luaL_opt_string(L, 2, ""));
 }
 
 
-static void luaB_foreachi (void) {
-  const Hash *t = gettable(1);
+static void luaB_foreachi (lua_State *L) {
+  const Hash *t = gettable(L, 1);
   int i;
-  int n = (int)getnarg(t);
+  int n = (int)getnarg(L, t);
   TObject f;
   /* 'f' cannot be a pointer to TObject, because it is on the stack, and the
      stack may be reallocated by the call. Moreover, some C compilers do not
      initialize structs, so we must do the assignment after the declaration */
-  f = *luaA_Address(luaL_functionarg(2));
-  luaD_checkstack(3);  /* for f, key, and val */
+  f = *luaA_Address(L, luaL_functionarg(L, 2));
+  luaD_checkstack(L, 3);  /* for f, key, and val */
   for (i=1; i<=n; i++) {
     *(L->stack.top++) = f;
     ttype(L->stack.top) = LUA_T_NUMBER; nvalue(L->stack.top++) = i;
-    *(L->stack.top++) = *luaH_getint(t, i);
-    luaD_calln(2, 1);
+    *(L->stack.top++) = *luaH_getint(L, t, i);
+    luaD_calln(L, 2, 1);
     if (ttype(L->stack.top-1) != LUA_T_NIL)
       return;
     L->stack.top--;
@@ -435,19 +437,19 @@ static void luaB_foreachi (void) {
 }
 
 
-static void luaB_foreach (void) {
-  const Hash *a = gettable(1);
+static void luaB_foreach (lua_State *L) {
+  const Hash *a = gettable(L, 1);
   int i;
   TObject f;  /* see comment in 'foreachi' */
-  f = *luaA_Address(luaL_functionarg(2));
-  luaD_checkstack(3);  /* for f, key, and val */
+  f = *luaA_Address(L, luaL_functionarg(L, 2));
+  luaD_checkstack(L, 3);  /* for f, key, and val */
   for (i=0; i<a->size; i++) {
     const Node *nd = &(a->node[i]);
-    if (ttype(val(nd)) != LUA_T_NIL) {
+    if (ttype(val(L, nd)) != LUA_T_NIL) {
       *(L->stack.top++) = f;
-      *(L->stack.top++) = *key(nd);
-      *(L->stack.top++) = *val(nd);
-      luaD_calln(2, 1);
+      *(L->stack.top++) = *key(L, nd);
+      *(L->stack.top++) = *val(L, nd);
+      luaD_calln(L, 2, 1);
       if (ttype(L->stack.top-1) != LUA_T_NIL)
         return;
       L->stack.top--;  /* remove result */
@@ -456,18 +458,18 @@ static void luaB_foreach (void) {
 }
 
 
-static void luaB_foreachvar (void) {
+static void luaB_foreachvar (lua_State *L) {
   GlobalVar *gv;
   TObject f;  /* see comment in 'foreachi' */
-  f = *luaA_Address(luaL_functionarg(1));
-  luaD_checkstack(4);  /* for extra var name, f, var name, and globalval */
+  f = *luaA_Address(L, luaL_functionarg(L, 1));
+  luaD_checkstack(L, 4);  /* for extra var name, f, var name, and globalval */
   for (gv = L->rootglobal; gv; gv = gv->next) {
     if (gv->value.ttype != LUA_T_NIL) {
-      pushtagstring(gv->name);  /* keep (extra) name on stack to avoid GC */
+      pushtagstring(L, gv->name);  /* keep (extra) name on stack to avoid GC */
       *(L->stack.top++) = f;
-      pushtagstring(gv->name);
+      pushtagstring(L, gv->name);
       *(L->stack.top++) = gv->value;
-      luaD_calln(2, 1);
+      luaD_calln(L, 2, 1);
       if (ttype(L->stack.top-1) != LUA_T_NIL) {
         L->stack.top--;
         *(L->stack.top-1) = *L->stack.top;  /* remove extra name */
@@ -479,39 +481,39 @@ static void luaB_foreachvar (void) {
 }
 
 
-static void luaB_getn (void) {
-  lua_pushnumber(getnarg(gettable(1)));
+static void luaB_getn (lua_State *L) {
+  lua_pushnumber(L, getnarg(L, gettable(L, 1)));
 }
 
 
-static void luaB_tinsert (void) {
-  Hash *a = gettable(1);
-  lua_Object v = lua_getparam(3);
-  int n = (int)getnarg(a);
+static void luaB_tinsert (lua_State *L) {
+  Hash *a = gettable(L, 1);
+  lua_Object v = lua_getparam(L, 3);
+  int n = (int)getnarg(L, a);
   int pos;
   if (v != LUA_NOOBJECT)
-    pos = luaL_check_int(2);
+    pos = luaL_check_int(L, 2);
   else {  /* called with only 2 arguments */
-    v = luaL_nonnullarg(2);
+    v = luaL_nonnullarg(L, 2);
     pos = n+1;
   }
-  luaV_setn(a, n+1);  /* a.n = n+1 */
+  luaV_setn(L, a, n+1);  /* a.n = n+1 */
   for ( ;n>=pos; n--)
-    luaH_move(a, n, n+1);  /* a[n+1] = a[n] */
-  luaH_setint(a, pos, luaA_Address(v));  /* a[pos] = v */
+    luaH_move(L, a, n, n+1);  /* a[n+1] = a[n] */
+  luaH_setint(L, a, pos, luaA_Address(L, v));  /* a[pos] = v */
 }
 
 
-static void luaB_tremove (void) {
-  Hash *a = gettable(1);
-  int n = (int)getnarg(a);
-  int pos = luaL_opt_int(2, n);
+static void luaB_tremove (lua_State *L) {
+  Hash *a = gettable(L, 1);
+  int n = (int)getnarg(L, a);
+  int pos = luaL_opt_int(L, 2, n);
   if (n <= 0) return;  /* table is "empty" */
-  luaA_pushobject(luaH_getint(a, pos));  /* result = a[pos] */
+  luaA_pushobject(L, luaH_getint(L, a, pos));  /* result = a[pos] */
   for ( ;pos<n; pos++)
-    luaH_move(a, pos+1, pos);  /* a[pos] = a[pos+1] */
-  luaV_setn(a, n-1);  /* a.n = n-1 */
-  luaH_setint(a, n, &luaO_nilobject);  /* a[n] = nil */
+    luaH_move(L, a, pos+1, pos);  /* a[pos] = a[pos+1] */
+  luaV_setn(L, a, n-1);  /* a.n = n-1 */
+  luaH_setint(L, a, n, &luaO_nilobject);  /* a[n] = nil */
 }
 
 
@@ -520,63 +522,63 @@ static void luaB_tremove (void) {
 ** Quicksort
 */
 
-static void swap (Hash *a, int i, int j) {
+static void swap (lua_State *L, Hash *a, int i, int j) {
   TObject temp;
-  temp = *luaH_getint(a, i);
-  luaH_move(a, j, i);
-  luaH_setint(a, j, &temp);
+  temp = *luaH_getint(L, a, i);
+  luaH_move(L, a, j, i);
+  luaH_setint(L, a, j, &temp);
 }
 
-static int sort_comp (lua_Object f, const TObject *a, const TObject *b) {
+static int sort_comp (lua_State *L, lua_Object f, const TObject *a, const TObject *b) {
   /* notice: the caller (auxsort) must check stack space */
   if (f != LUA_NOOBJECT) {
-    *(L->stack.top) = *luaA_Address(f);
+    *(L->stack.top) = *luaA_Address(L, f);
     *(L->stack.top+1) = *a;
     *(L->stack.top+2) = *b;
     L->stack.top += 3;
-    luaD_calln(2, 1);
+    luaD_calln(L, 2, 1);
   }
   else {  /* a < b? */
     *(L->stack.top) = *a;
     *(L->stack.top+1) = *b;
     L->stack.top += 2;
-    luaV_comparison(LUA_T_NUMBER, LUA_T_NIL, LUA_T_NIL, IM_LT);
+    luaV_comparison(L, LUA_T_NUMBER, LUA_T_NIL, LUA_T_NIL, IM_LT);
   }
   return ttype(--(L->stack.top)) != LUA_T_NIL;
 }
 
-static void auxsort (Hash *a, int l, int u, lua_Object f) {
+static void auxsort (lua_State *L, Hash *a, int l, int u, lua_Object f) {
   StkId P = L->stack.top - L->stack.stack;  /* temporary place for pivot */
   L->stack.top++;
   ttype(L->stack.stack+P) = LUA_T_NIL;
   while (l < u) {  /* for tail recursion */
     int i, j;
     /* sort elements a[l], a[(l+u)/2] and a[u] */
-    if (sort_comp(f, luaH_getint(a, u), luaH_getint(a, l)))  /* a[u]<a[l]? */
-      swap(a, l, u);
+    if (sort_comp(L, f, luaH_getint(L, a, u), luaH_getint(L, a, l)))  /* a[u]<a[l]? */
+      swap(L, a, l, u);
     if (u-l == 1) break;  /* only 2 elements */
     i = (l+u)/2;
-    *(L->stack.stack+P) = *luaH_getint(a, i);  /* P = a[i] */
-    if (sort_comp(f, L->stack.stack+P, luaH_getint(a, l)))  /* a[i]<a[l]? */
-      swap(a, l, i);
-    else if (sort_comp(f, luaH_getint(a, u), L->stack.stack+P)) /* a[u]<a[i]? */
-      swap(a, i, u);
+    *(L->stack.stack+P) = *luaH_getint(L, a, i);  /* P = a[i] */
+    if (sort_comp(L, f, L->stack.stack+P, luaH_getint(L, a, l)))  /* a[i]<a[l]? */
+      swap(L, a, l, i);
+    else if (sort_comp(L, f, luaH_getint(L, a, u), L->stack.stack+P)) /* a[u]<a[i]? */
+      swap(L, a, i, u);
     if (u-l == 2) break;  /* only 3 elements */
-    *(L->stack.stack+P) = *luaH_getint(a, i); /* save pivot on stack (for GC) */
-    swap(a, i, u-1);  /* put median element as pivot (a[u-1]) */
+    *(L->stack.stack+P) = *luaH_getint(L, a, i); /* save pivot on stack (GC) */
+    swap(L, a, i, u-1);  /* put median element as pivot (a[u-1]) */
     /* a[l] <= P == a[u-1] <= a[u], only needs to sort from l+1 to u-2 */
     i = l; j = u-1;
-    for  (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
+    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
       /* repeat i++ until a[i] >= P */
-      while (sort_comp(f, luaH_getint(a, ++i), L->stack.stack+P))
-        if (i>u) lua_error("invalid order function for sorting");
+      while (sort_comp(L, f, luaH_getint(L, a, ++i), L->stack.stack+P))
+        if (i>u) lua_error(L, "invalid order function for sorting");
       /* repeat j-- until a[j] <= P */
-      while (sort_comp(f, (L->stack.stack+P), luaH_getint(a, --j)))
-        if (j<l) lua_error("invalid order function for sorting");
+      while (sort_comp(L, f, (L->stack.stack+P), luaH_getint(L, a, --j)))
+        if (j<l) lua_error(L, "invalid order function for sorting");
       if (j<i) break;
-      swap(a, i, j);
+      swap(L, a, i, j);
     }
-    swap(a, u-1, i);  /* swap pivot (a[u-1]) with a[i] */
+    swap(L, a, u-1, i);  /* swap pivot (a[u-1]) with a[i] */
     /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
     /* adjust so that smaller "half" is in [j..i] and larger one in [l..u] */
     if (i-l < u-i) {
@@ -585,21 +587,21 @@ static void auxsort (Hash *a, int l, int u, lua_Object f) {
     else {
       j=i+1; i=u; u=j-2;
     }
-    auxsort(a, j, i, f);  /* call recursively the smaller one */
+    auxsort(L, a, j, i, f);  /* call recursively the smaller one */
   }  /* repeat the routine for the larger one */
   L->stack.top--;  /* remove pivot from stack */
 }
 
-static void luaB_sort (void) {
-  lua_Object t = lua_getparam(1);
-  Hash *a = gettable(1);
-  int n = (int)getnarg(a);
-  lua_Object func = lua_getparam(2);
-  luaL_arg_check(func == LUA_NOOBJECT || lua_isfunction(func), 2,
+static void luaB_sort (lua_State *L) {
+  lua_Object t = lua_getparam(L, 1);
+  Hash *a = gettable(L, 1);
+  int n = (int)getnarg(L, a);
+  lua_Object func = lua_getparam(L, 2);
+  luaL_arg_check(L, func == LUA_NOOBJECT || lua_isfunction(L, func), 2,
                  "function expected");
-  luaD_checkstack(4);  /* for Pivot, f, a, b (sort_comp) */
-  auxsort(a, 1, n, func);
-  lua_pushobject(t);
+  luaD_checkstack(L, 4);  /* for Pivot, f, a, b (sort_comp) */
+  auxsort(L, a, 1, n, func);
+  lua_pushobject(L, t);
 }
 
 /* }====================================================== */
@@ -617,138 +619,138 @@ static void luaB_sort (void) {
 ** =======================================================
 */
 
-static void mem_query (void) {
-  lua_pushnumber(totalmem);
-  lua_pushnumber(numblocks);
+static void mem_query (lua_State *L) {
+  lua_pushnumber(L, totalmem);
+  lua_pushnumber(L, numblocks);
 }
 
 
-static void hash_query (void) {
-  const TObject *o = luaA_Address(luaL_nonnullarg(1));
-  if (lua_getparam(2) == LUA_NOOBJECT) {
-    luaL_arg_check(ttype(o) == LUA_T_STRING, 1, "string expected");
-    lua_pushnumber(tsvalue(o)->hash);
+static void hash_query (lua_State *L) {
+  const TObject *o = luaA_Address(L, luaL_nonnullarg(L, 1));
+  if (lua_getparam(L, 2) == LUA_NOOBJECT) {
+    luaL_arg_check(L, ttype(o) == LUA_T_STRING, 1, "string expected");
+    lua_pushnumber(L, tsvalue(o)->hash);
   }
   else {
-    const Hash *t = avalue(luaA_Address(luaL_tablearg(2)));
-    lua_pushnumber(luaH_mainposition(t, o) - t->node);
+    const Hash *t = avalue(luaA_Address(L, luaL_tablearg(L, 2)));
+    lua_pushnumber(L, luaH_mainposition(L, t, o) - t->node);
   }
 }
 
 
-static void table_query (void) {
-  const Hash *t = avalue(luaA_Address(luaL_tablearg(1)));
-  int i = luaL_opt_int(2, -1);
+static void table_query (lua_State *L) {
+  const Hash *t = avalue(luaA_Address(L, luaL_tablearg(L, 1)));
+  int i = luaL_opt_int(L, 2, -1);
   if (i == -1) {
-    lua_pushnumber(t->size);
-    lua_pushnumber(t->firstfree - t->node);
+    lua_pushnumber(L, t->size);
+    lua_pushnumber(L, t->firstfree - t->node);
   }
   else if (i < t->size) {
-    luaA_pushobject(&t->node[i].key);
-    luaA_pushobject(&t->node[i].val);
+    luaA_pushobject(L, &t->node[i].key);
+    luaA_pushobject(L, &t->node[i].val);
     if (t->node[i].next)
-      lua_pushnumber(t->node[i].next - t->node);
+      lua_pushnumber(L, t->node[i].next - t->node);
   }
 }
 
 
-static void query_strings (void) {
-  int h = luaL_check_int(1) - 1;
-  int s = luaL_opt_int(2, 0) - 1;
+static void query_strings (lua_State *L) {
+  int h = luaL_check_int(L, 1) - 1;
+  int s = luaL_opt_int(L, 2, 0) - 1;
   if (s==-1) {
     if (h < NUM_HASHS) {
-      lua_pushnumber(L->string_root[h].nuse);
-      lua_pushnumber(L->string_root[h].size);
+      lua_pushnumber(L, L->string_root[h].nuse);
+      lua_pushnumber(L, L->string_root[h].size);
     }
   }
   else {
     TaggedString *ts = L->string_root[h].hash[s];
     for (ts = L->string_root[h].hash[s]; ts; ts = ts->nexthash) {
-      if (ts->constindex == -1) lua_pushstring("<USERDATA>");
-      else lua_pushstring(ts->str);
+      if (ts->constindex == -1) lua_pushstring(L, "<USERDATA>");
+      else lua_pushstring(L, ts->str);
     }
   }
 }
 
 
-static void extra_services (void) {
-  const char *service = luaL_check_string(1);
+static void extra_services (lua_State *L) {
+  const char *service = luaL_check_string(L, 1);
   switch (*service) {
     case 'U':  /* create a userdata with a given value/tag */
-      lua_pushusertag((void *)luaL_check_int(2), luaL_check_int(3));
+      lua_pushusertag(L, (void *)luaL_check_int(L, 2), luaL_check_int(L, 3));
       break;
 
     case 'u':  /* return the value of a userdata */
-      lua_pushnumber((int)lua_getuserdata(lua_getparam(2)));
+      lua_pushnumber(L, (int)lua_getuserdata(L, lua_getparam(L, 2)));
       break;
 
     case 't':  /* set `gc' tag method */
-      lua_pushobject(lua_getparam(3));
-      lua_settagmethod(luaL_check_int(2), "gc");
+      lua_pushobject(L, lua_getparam(L, 3));
+      lua_settagmethod(L, luaL_check_int(L, 2), "gc");
       break;
 
-    default: luaL_argerror(1, "invalid service");
+    default: luaL_argerror(L, 1, "invalid service");
   }
 }
 
 
-static void testC (void) {
-#define getnum(s)       ((*s++) - '0')
-#define getname(s)      (nome[0] = *s++, nome)
+static void testC (lua_State *L) {
+#define getnum(L, s)    ((*s++) - '0')
+#define getname(L, s)   (nome[0] = *s++, nome)
 
   lua_Object reg[10];
   char nome[2];
-  const char *s = luaL_check_string(1);
+  const char *s = luaL_check_string(L, 1);
   nome[1] = 0;
   for (;;) {
     switch (*s++) {
       case '0': case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9':
-        lua_pushnumber(*(s-1) - '0');
+        lua_pushnumber(L, *(s-1) - '0');
         break;
 
-      case 'c': reg[getnum(s)] = lua_createtable(); break;
-      case 'C': { lua_CFunction f = lua_getcfunction(lua_getglobal(getname(s)));
-                  lua_pushcclosure(f, getnum(s));
+      case 'c': reg[getnum(L, s)] = lua_createtable(L); break;
+      case 'C': { lua_CFunction f = lua_getcfunction(L, lua_getglobal(L, getname(L, s)));
+                  lua_pushcclosure(L, f, getnum(L, s));
                   break;
                 }
-      case 'P': reg[getnum(s)] = lua_pop(); break;
-      case 'g': { int n=getnum(s); reg[n]=lua_getglobal(getname(s)); break; }
-      case 'G': { int n = getnum(s);
-                  reg[n] = lua_rawgetglobal(getname(s));
+      case 'P': reg[getnum(L, s)] = lua_pop(L); break;
+      case 'g': { int n=getnum(L, s); reg[n]=lua_getglobal(L, getname(L, s)); break; }
+      case 'G': { int n = getnum(L, s);
+                  reg[n] = lua_rawgetglobal(L, getname(L, s));
                   break;
                 }
-      case 'l': lua_pushnumber(lua_ref(1)); reg[getnum(s)] = lua_pop(); break;
-      case 'L': lua_pushnumber(lua_ref(0)); reg[getnum(s)] = lua_pop(); break;
-      case 'r': { int n=getnum(s);
-                  reg[n]=lua_getref((int)lua_getnumber(reg[getnum(s)]));
+      case 'l': lua_pushnumber(L, lua_ref(L, 1)); reg[getnum(L, s)] = lua_pop(L); break;
+      case 'L': lua_pushnumber(L, lua_ref(L, 0)); reg[getnum(L, s)] = lua_pop(L); break;
+      case 'r': { int n=getnum(L, s);
+                  reg[n]=lua_getref(L, (int)lua_getnumber(L, reg[getnum(L, s)]));
                   break;
                 }
-      case 'u': lua_unref((int)lua_getnumber(reg[getnum(s)]));
+      case 'u': lua_unref(L, (int)lua_getnumber(L, reg[getnum(L, s)]));
                 break;
-      case 'p': { int n = getnum(s); reg[n] = lua_getparam(getnum(s)); break; }
-      case '=': lua_setglobal(getname(s)); break;
-      case 's': lua_pushstring(getname(s)); break;
-      case 'o': lua_pushobject(reg[getnum(s)]); break;
-      case 'f': lua_call(getname(s)); break;
-      case 'i': reg[getnum(s)] = lua_gettable(); break;
-      case 'I': reg[getnum(s)] = lua_rawgettable(); break;
-      case 't': lua_settable(); break;
-      case 'T': lua_rawsettable(); break;
-      case 'N' : lua_pushstring(lua_nextvar(lua_getstring(reg[getnum(s)])));
+      case 'p': { int n = getnum(L, s); reg[n] = lua_getparam(L, getnum(L, s)); break; }
+      case '=': lua_setglobal(L, getname(L, s)); break;
+      case 's': lua_pushstring(L, getname(L, s)); break;
+      case 'o': lua_pushobject(L, reg[getnum(L, s)]); break;
+      case 'f': lua_call(L, getname(L, s)); break;
+      case 'i': reg[getnum(L, s)] = lua_gettable(L); break;
+      case 'I': reg[getnum(L, s)] = lua_rawgettable(L); break;
+      case 't': lua_settable(L); break;
+      case 'T': lua_rawsettable(L); break;
+      case 'N' : lua_pushstring(L, lua_nextvar(L, lua_getstring(L, reg[getnum(L, s)])));
                  break;
-      case 'n' : { int n=getnum(s);
-                   n=lua_next(reg[n], (int)lua_getnumber(reg[getnum(s)]));
-                   lua_pushnumber(n); break;
+      case 'n' : { int n=getnum(L, s);
+                   n=lua_next(L, reg[n], (int)lua_getnumber(L, reg[getnum(L, s)]));
+                   lua_pushnumber(L, n); break;
                  }
-      case 'q' : { int n1=getnum(s); int n2=getnum(s);
-                   lua_pushnumber(lua_equalobj(reg[n1], reg[n2]));
+      case 'q' : { int n1=getnum(L, s); int n2=getnum(L, s);
+                   lua_pushnumber(L, lua_equalobj(L, reg[n1], reg[n2]));
                    break;
                  }
-      default: luaL_verror("unknown command in `testC': %c", *(s-1));
+      default: luaL_verror(L, "unknown command in `testC': %c", *(s-1));
     }
   if (*s == 0) return;
-  if (*s++ != ' ') lua_error("missing ` ' between commands in `testC'");
+  if (*s++ != ' ') lua_error(L, "missing ` ' between commands in `testC'");
   }
 }
 
@@ -804,15 +806,12 @@ static const struct luaL_reg builtin_funcs[] = {
 };
 
 
-#define INTFUNCSIZE (sizeof(builtin_funcs)/sizeof(builtin_funcs[0]))
-
-
-void luaB_predefine (void) {
+void luaB_predefine (lua_State *L) {
   /* pre-register mem error messages, to avoid loop when error arises */
-  luaS_newfixedstring(tableEM);
-  luaS_newfixedstring(memEM);
-  luaL_openlib(builtin_funcs, (sizeof(builtin_funcs)/sizeof(builtin_funcs[0])));
-  lua_pushstring(LUA_VERSION);
-  lua_setglobal("_VERSION");
+  luaS_newfixedstring(L, tableEM);
+  luaS_newfixedstring(L, memEM);
+  luaL_openlib(L, builtin_funcs, (sizeof(builtin_funcs)/sizeof(builtin_funcs[0])));
+  lua_pushstring(L, LUA_VERSION);
+  lua_setglobal(L, "_VERSION");
 }