detail

+ home-made `sprintf' (first version)

bugs

@@ -270,3 +270,19 @@ Tue Jul 10 16:59:18 EST 2001
 >> error message for `%a' gave wrong line number
 (by Leonardo Constantino; since 4.0)
 
+** lbaselib.c
+Fri Dec 21 15:21:05 EDT 2001
+>> seg. fault when rawget/rawset get extra arguments
+(by Eric Mauger; since 4.0b)
+
+** lvm.c
+Wed Jun 19 13:28:20 EST 2002
+>> line hook gets wrong `ar'
+(by Daniel C. Sinclair; since 4.0.b)
+
+** ldo.c
+Wed Jun 19 13:31:49 EST 2002
+>> `protectedparser' may run GC, and then collect `filename'
+>> (in function `parse_file')
+(by Alex Bilyk; since 4.0)
+

lapi.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.c,v 1.148 2001/07/12 18:11:58 roberto Exp roberto $
+** $Id: lapi.c,v 1.210 2002/08/07 14:24:24 roberto Exp roberto $
 ** Lua API
 ** See Copyright Notice in lua.h
 */
@@ -7,10 +7,10 @@
 
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lapi.h"
+#include "ldebug.h"
 #include "ldo.h"
 #include "lfunc.h"
 #include "lgc.h"
@@ -20,36 +20,52 @@
 #include "lstring.h"
 #include "ltable.h"
 #include "ltm.h"
+#include "lundump.h"
 #include "lvm.h"
 
 
-const l_char lua_ident[] = l_s("$Lua: ") l_s(LUA_VERSION) l_s(" ")
-  l_s(LUA_COPYRIGHT) l_s(" $\n") l_s("$Authors: ") l_s(LUA_AUTHORS) l_s(" $");
+const char lua_ident[] =
+  "$Lua: " LUA_VERSION " " LUA_COPYRIGHT " $\n"
+  "$Authors: " LUA_AUTHORS " $\n"
+  "$URL: www.lua.org $\n";
 
 
 
 #ifndef api_check
-#define api_check(L, o)		/* nothing */
+#define api_check(L, o)		((void)1)
 #endif
 
 #define api_checknelems(L, n)	api_check(L, (n) <= (L->top - L->ci->base))
 
-#define api_incr_top(L)	incr_top
+#define api_incr_top(L)   (api_check(L, L->top<L->ci->top), L->top++)
 
 
 
-TObject *luaA_index (lua_State *L, int index) {
-  if (index > 0) {
-    api_check(L, index <= L->top - L->ci->base);
-    return L->ci->base+index-1;
-  }
-  else {
+
+static TObject *negindex (lua_State *L, int index) {
+  if (index > LUA_REGISTRYINDEX) {
     api_check(L, index != 0 && -index <= L->top - L->ci->base);
     return L->top+index;
   }
+  else switch (index) {  /* pseudo-indices */
+    case LUA_REGISTRYINDEX: return registry(L);
+    case LUA_GLOBALSINDEX: return gt(L);
+    default: {
+      TObject *func = (L->ci->base - 1);
+      index = LUA_GLOBALSINDEX - index;
+      api_check(L, iscfunction(func) && index <= clvalue(func)->c.nupvalues);
+      return &clvalue(func)->c.upvalue[index-1];
+    }
+  }
 }
 
 
+#define luaA_index(L, index) \
+  ( (index > 0) ? \
+    (api_check(L, index <= L->top - L->ci->base), L->ci->base+index-1) : \
+    negindex(L, index))
+
+
 static TObject *luaA_indexAcceptable (lua_State *L, int index) {
   if (index > 0) {
     TObject *o = L->ci->base+(index-1);
@@ -57,23 +73,42 @@ static TObject *luaA_indexAcceptable (lua_State *L, int index) {
     if (o >= L->top) return NULL;
     else return o;
   }
-  else {
-    api_check(L, index != 0 && -index <= L->top - L->ci->base);
-    return L->top+index;
-  }
+  else
+    return negindex(L, index);
 }
 
 
 void luaA_pushobject (lua_State *L, const TObject *o) {
   setobj(L->top, o);
-  incr_top;
+  incr_top(L);
 }
 
-LUA_API int lua_stackspace (lua_State *L) {
-  return (L->stack_last - L->top);
+
+LUA_API int lua_checkstack (lua_State *L, int size) {
+  int res;
+  lua_lock(L);
+  if ((L->top - L->ci->base + size) > LUA_MAXCSTACK)
+    res = 0;  /* stack overflow */
+  else {
+    luaD_checkstack(L, size);
+    if (L->ci->top < L->top + size)
+      L->ci->top = L->top + size;
+    res = 1;
+  }
+  lua_unlock(L);
+  return res;
 }
 
 
+LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
+  lua_CFunction old;
+  lua_lock(L);
+  old = G(L)->panic;
+  G(L)->panic = panicf;
+  lua_unlock(L);
+  return old;
+}
+
 
 /*
 ** basic stack manipulation
@@ -89,7 +124,9 @@ LUA_API void lua_settop (lua_State *L, int index) {
   lua_lock(L);
   if (index >= 0) {
     api_check(L, index <= L->stack_last - L->ci->base);
-    luaD_adjusttop(L, L->ci->base+index);
+    while (L->top < L->ci->base + index)
+      setnilvalue(L->top++);
+    L->top = L->ci->base + index;
   }
   else {
     api_check(L, -(index+1) <= (L->top - L->ci->base));
@@ -120,6 +157,15 @@ LUA_API void lua_insert (lua_State *L, int index) {
 }
 
 
+LUA_API void lua_replace (lua_State *L, int index) {
+  lua_lock(L);
+  api_checknelems(L, 1);
+  setobj(luaA_index(L, index), L->top - 1);
+  L->top--;
+  lua_unlock(L);
+}
+
+
 LUA_API void lua_pushvalue (lua_State *L, int index) {
   lua_lock(L);
   setobj(L->top, luaA_index(L, index));
@@ -134,20 +180,15 @@ LUA_API void lua_pushvalue (lua_State *L, int index) {
 */
 
 
-LUA_API int lua_rawtag (lua_State *L, int index) {
+LUA_API int lua_type (lua_State *L, int index) {
   StkId o = luaA_indexAcceptable(L, index);
   return (o == NULL) ? LUA_TNONE : ttype(o);
 }
 
 
-LUA_API const l_char *lua_type (lua_State *L, int index) {
-  StkId o;
-  const l_char *type;
-  lua_lock(L);
-  o = luaA_indexAcceptable(L, index);
-  type = (o == NULL) ? l_s("no value") : luaT_typename(G(L), o);
-  lua_unlock(L);
-  return type;
+LUA_API const char *lua_typename (lua_State *L, int t) {
+  UNUSED(L);
+  return (t == LUA_TNONE) ? "no value" : luaT_typenames[t];
 }
 
 
@@ -159,33 +200,35 @@ LUA_API int lua_iscfunction (lua_State *L, int index) {
 
 LUA_API int lua_isnumber (lua_State *L, int index) {
   TObject n;
-  TObject *o = luaA_indexAcceptable(L, index);
-  return (o != NULL && (ttype(o) == LUA_TNUMBER || luaV_tonumber(o, &n)));
+  const TObject *o = luaA_indexAcceptable(L, index);
+  return (o != NULL && tonumber(o, &n));
 }
 
 
 LUA_API int lua_isstring (lua_State *L, int index) {
-  int t = lua_rawtag(L, index);
+  int t = lua_type(L, index);
   return (t == LUA_TSTRING || t == LUA_TNUMBER);
 }
 
 
-LUA_API int lua_tag (lua_State *L, int index) {
-  StkId o;
-  int i;
-  lua_lock(L);  /* other thread could be changing the tag */
-  o = luaA_indexAcceptable(L, index);
-  i = (o == NULL) ? LUA_NOTAG : luaT_tag(o);
-  lua_unlock(L);
-  return i;
+LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
+  StkId o1 = luaA_indexAcceptable(L, index1);
+  StkId o2 = luaA_indexAcceptable(L, index2);
+  return (o1 == NULL || o2 == NULL) ? 0  /* index out of range */
+                                    : luaO_rawequalObj(o1, o2);
 }
 
 
 LUA_API int lua_equal (lua_State *L, int index1, int index2) {
-  StkId o1 = luaA_indexAcceptable(L, index1);
-  StkId o2 = luaA_indexAcceptable(L, index2);
-  return (o1 == NULL || o2 == NULL) ? 0  /* index out of range */
-                                 : luaO_equalObj(o1, o2);
+  StkId o1, o2;
+  int i;
+  lua_lock(L);  /* may call tag method */
+  o1 = luaA_indexAcceptable(L, index1);
+  o2 = luaA_indexAcceptable(L, index2);
+  i = (o1 == NULL || o2 == NULL) ? 0  /* index out of range */
+                                 : equalobj(L, o1, o2);
+  lua_unlock(L);
+  return i;
 }
 
 
@@ -206,24 +249,29 @@ LUA_API int lua_lessthan (lua_State *L, int index1, int index2) {
 LUA_API lua_Number lua_tonumber (lua_State *L, int index) {
   TObject n;
   const TObject *o = luaA_indexAcceptable(L, index);
-  if (o != NULL &&
-      (ttype(o) == LUA_TNUMBER || (o = luaV_tonumber(o, &n)) != NULL))
+  if (o != NULL && tonumber(o, &n))
     return nvalue(o);
   else
     return 0;
 }
 
 
-LUA_API const l_char *lua_tostring (lua_State *L, int index) {
+LUA_API int lua_toboolean (lua_State *L, int index) {
+  const TObject *o = luaA_indexAcceptable(L, index);
+  return (o != NULL) && !l_isfalse(o);
+}
+
+
+LUA_API const char *lua_tostring (lua_State *L, int index) {
   StkId o = luaA_indexAcceptable(L, index);
   if (o == NULL)
     return NULL;
-  else if (ttype(o) == LUA_TSTRING)
+  else if (ttisstring(o))
     return svalue(o);
   else {
-    const l_char *s;
+    const char *s;
     lua_lock(L);  /* `luaV_tostring' may create a new string */
-    s = (luaV_tostring(L, o) == 0) ? svalue(o) : NULL;
+    s = (luaV_tostring(L, o) ? svalue(o) : NULL);
     lua_unlock(L);
     return s;
   }
@@ -234,12 +282,12 @@ LUA_API size_t lua_strlen (lua_State *L, int index) {
   StkId o = luaA_indexAcceptable(L, index);
   if (o == NULL)
     return 0;
-  else if (ttype(o) == LUA_TSTRING)
+  else if (ttisstring(o))
     return tsvalue(o)->tsv.len;
   else {
     size_t l;
     lua_lock(L);  /* `luaV_tostring' may create a new string */
-    l = (luaV_tostring(L, o) == 0) ? tsvalue(o)->tsv.len : 0;
+    l = (luaV_tostring(L, o) ? tsvalue(o)->tsv.len : 0);
     lua_unlock(L);
     return l;
   }
@@ -248,13 +296,18 @@ LUA_API size_t lua_strlen (lua_State *L, int index) {
 
 LUA_API lua_CFunction lua_tocfunction (lua_State *L, int index) {
   StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL || !iscfunction(o)) ? NULL : clvalue(o)->f.c;
+  return (o == NULL || !iscfunction(o)) ? NULL : clvalue(o)->c.f;
 }
 
 
 LUA_API void *lua_touserdata (lua_State *L, int index) {
   StkId o = luaA_indexAcceptable(L, index);
-  return (o == NULL || ttype(o) != LUA_TUSERDATA) ? NULL : uvalue(o)->uv.value;
+  if (o == NULL) return NULL;
+  switch (ttype(o)) {
+    case LUA_TUSERDATA: return (uvalue(o) + 1);
+    case LUA_TLIGHTUSERDATA: return pvalue(o);
+    default: return NULL;
+  }
 }
 
 
@@ -265,6 +318,9 @@ LUA_API const void *lua_topointer (lua_State *L, int index) {
     switch (ttype(o)) {
       case LUA_TTABLE: return hvalue(o);
       case LUA_TFUNCTION: return clvalue(o);
+      case LUA_TUSERDATA:
+      case LUA_TLIGHTUSERDATA:
+        return lua_touserdata(L, index);
       default: return NULL;
     }
   }
@@ -293,7 +349,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
 }
 
 
-LUA_API void lua_pushlstring (lua_State *L, const l_char *s, size_t len) {
+LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
   lua_lock(L);
   setsvalue(L->top, luaS_newlstr(L, s, len));
   api_incr_top(L);
@@ -301,7 +357,7 @@ LUA_API void lua_pushlstring (lua_State *L, const l_char *s, size_t len) {
 }
 
 
-LUA_API void lua_pushstring (lua_State *L, const l_char *s) {
+LUA_API void lua_pushstring (lua_State *L, const char *s) {
   if (s == NULL)
     lua_pushnil(L);
   else
@@ -309,10 +365,55 @@ LUA_API void lua_pushstring (lua_State *L, const l_char *s) {
 }
 
 
+LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
+                                      va_list argp) {
+  const char *ret;
+  lua_lock(L);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *ret;
+  va_list argp;
+  lua_lock(L);
+  va_start(argp, fmt);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  lua_unlock(L);
+  return ret;
+}
+
+
 LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
+  Closure *cl;
   lua_lock(L);
   api_checknelems(L, n);
-  luaV_Cclosure(L, fn, n);
+  cl = luaF_newCclosure(L, n);
+  cl->c.f = fn;
+  L->top -= n;
+  while (n--)
+    setobj(&cl->c.upvalue[n], L->top+n);
+  setclvalue(L->top, cl);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushboolean (lua_State *L, int b) {
+  lua_lock(L);
+  setbvalue(L->top, (b != 0));  /* ensure that true is 1 */
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
+  lua_lock(L);
+  setpvalue(L->top, p);
+  api_incr_top(L);
   lua_unlock(L);
 }
 
@@ -323,19 +424,13 @@ LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
 */
 
 
-LUA_API void lua_getglobal (lua_State *L, const l_char *name) {
-  lua_lock(L);
-  luaV_getglobal(L, luaS_new(L, name), L->top);
-  api_incr_top(L);
-  lua_unlock(L);
-}
-
-
 LUA_API void lua_gettable (lua_State *L, int index) {
   StkId t;
+  const TObject *v;
   lua_lock(L);
   t = luaA_index(L, index);
-  luaV_gettable(L, t, L->top-1, L->top-1);
+  v = luaV_gettable(L, t, L->top-1, 0);
+  setobj(L->top - 1, v);
   lua_unlock(L);
 }
 
@@ -344,7 +439,7 @@ LUA_API void lua_rawget (lua_State *L, int index) {
   StkId t;
   lua_lock(L);
   t = luaA_index(L, index);
-  api_check(L, ttype(t) == LUA_TTABLE);
+  api_check(L, ttistable(t));
   setobj(L->top - 1, luaH_get(hvalue(t), L->top - 1));
   lua_unlock(L);
 }
@@ -354,78 +449,78 @@ LUA_API void lua_rawgeti (lua_State *L, int index, int n) {
   StkId o;
   lua_lock(L);
   o = luaA_index(L, index);
-  api_check(L, ttype(o) == LUA_TTABLE);
+  api_check(L, ttistable(o));
   setobj(L->top, luaH_getnum(hvalue(o), n));
   api_incr_top(L);
   lua_unlock(L);
 }
 
 
-LUA_API void lua_getglobals (lua_State *L) {
-  lua_lock(L);
-  sethvalue(L->top, L->gt);
-  api_incr_top(L);
-  lua_unlock(L);
-}
-
-
-LUA_API int lua_getref (lua_State *L, int ref) {
-  int status;
-  lua_lock(L);
-  if (ref == LUA_REFNIL) {
-    setnilvalue(L->top);
-    status = 1;
-  }
-  else {
-    setobj(L->top, luaH_getnum(G(L)->weakregistry, ref));
-    status = (ttype(L->top) != LUA_TNIL);
-  }
-  if (status)
-    api_incr_top(L);
-  lua_unlock(L);
-  return status;
-}
-
-
 LUA_API void lua_newtable (lua_State *L) {
   lua_lock(L);
-  sethvalue(L->top, luaH_new(L, 0));
+  sethvalue(L->top, luaH_new(L, 0, 0));
   api_incr_top(L);
   lua_unlock(L);
 }
 
 
-LUA_API void  lua_getregistry (lua_State *L) {
+LUA_API const char *lua_getmode (lua_State *L, int index) {
+  static const char *const modes[] = {"", "k", "v", "kv"};
+  int mode = 0;
+  TObject *t;
   lua_lock(L);
-  sethvalue(L->top, G(L)->registry);
-  api_incr_top(L);
+  t = luaA_index(L, index);
+  api_check(L, ttistable(t));
+  if (hvalue(t)->mode & WEAKKEY) mode += 1;
+  if (hvalue(t)->mode & WEAKVALUE) mode += 2;
   lua_unlock(L);
+  return modes[mode];
 }
 
 
-LUA_API void  lua_getweakregistry (lua_State *L) {
+LUA_API int lua_getmetatable (lua_State *L, int objindex) {
+  StkId obj;
+  Table *mt;
+  int res;
   lua_lock(L);
-  sethvalue(L->top, G(L)->weakregistry);
+  obj = luaA_indexAcceptable(L, objindex);
+  switch (ttype(obj)) {
+    case LUA_TTABLE:
+      mt = hvalue(obj)->metatable;
+      break;
+    case LUA_TUSERDATA:
+      mt = uvalue(obj)->uv.metatable;
+      break;
+    default:
+      mt = hvalue(defaultmeta(L));
+  }
+  if (mt == hvalue(defaultmeta(L)))
+    res = 0;
+  else {
+    sethvalue(L->top, mt);
+    api_incr_top(L);
+    res = 1;
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API void lua_getglobals (lua_State *L, int index) {
+  StkId o;
+  lua_lock(L);
+  o = luaA_index(L, index);
+  setobj(L->top, isLfunction(o) ? &clvalue(o)->l.g : gt(L));
   api_incr_top(L);
   lua_unlock(L);
 }
 
 
-
 /*
 ** set functions (stack -> Lua)
 */
 
 
-LUA_API void lua_setglobal (lua_State *L, const l_char *name) {
-  lua_lock(L);
-  api_checknelems(L, 1);
-  luaV_setglobal(L, luaS_new(L, name), L->top - 1);
-  L->top--;  /* remove element from the top */
-  lua_unlock(L);
-}
-
-
 LUA_API void lua_settable (lua_State *L, int index) {
   StkId t;
   lua_lock(L);
@@ -442,8 +537,8 @@ LUA_API void lua_rawset (lua_State *L, int index) {
   lua_lock(L);
   api_checknelems(L, 2);
   t = luaA_index(L, index);
-  api_check(L, ttype(t) == LUA_TTABLE);
-  setobj(luaH_set(L, hvalue(t), L->top-2), (L->top-1));
+  api_check(L, ttistable(t));
+  setobj(luaH_set(L, hvalue(t), L->top-2), L->top-1);
   L->top -= 2;
   lua_unlock(L);
 }
@@ -454,98 +549,116 @@ LUA_API void lua_rawseti (lua_State *L, int index, int n) {
   lua_lock(L);
   api_checknelems(L, 1);
   o = luaA_index(L, index);
-  api_check(L, ttype(o) == LUA_TTABLE);
-  setobj(luaH_setnum(L, hvalue(o), n), (L->top-1));
+  api_check(L, ttistable(o));
+  setobj(luaH_setnum(L, hvalue(o), n), L->top-1);
   L->top--;
   lua_unlock(L);
 }
 
 
-LUA_API void lua_setglobals (lua_State *L) {
-  StkId newtable;
+LUA_API void lua_setmode (lua_State *L, int index, const char *mode) {
+  TObject *t;
   lua_lock(L);
-  api_checknelems(L, 1);
-  newtable = --L->top;
-  api_check(L, ttype(newtable) == LUA_TTABLE);
-  L->gt = hvalue(newtable);
+  t = luaA_index(L, index);
+  api_check(L, ttistable(t));
+  hvalue(t)->mode &= ~(WEAKKEY | WEAKVALUE);  /* clear bits */
+  if (strchr(mode, 'k')) hvalue(t)->mode |= WEAKKEY;
+  if (strchr(mode, 'v')) hvalue(t)->mode |= WEAKVALUE;
   lua_unlock(L);
 }
 
-
-LUA_API int lua_ref (lua_State *L,  int lock) {
-  int ref;
-  if (lua_isnil(L, -1)) {
-    lua_pop(L, 1);
-    ref = LUA_REFNIL;
-  }
-  else {
-    lua_getweakregistry(L);
-    ref = lua_getn(L, -1) + 1;
-    lua_pushvalue(L, -2);
-    lua_rawseti(L, -2, ref);
-    if (lock) {
-      lua_getregistry(L);
-      lua_pushvalue(L, -3);
-      lua_rawseti(L, -2, ref);
-      lua_pop(L, 1);  /* remove registry */
+LUA_API int lua_setmetatable (lua_State *L, int objindex) {
+  TObject *obj, *mt;
+  int res = 1;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  obj = luaA_index(L, objindex);
+  mt = (!ttisnil(L->top - 1)) ? L->top - 1 : defaultmeta(L);
+  api_check(L, ttistable(mt));
+  switch (ttype(obj)) {
+    case LUA_TTABLE: {
+      hvalue(obj)->metatable = hvalue(mt);
+      break;
+    }
+    case LUA_TUSERDATA: {
+      uvalue(obj)->uv.metatable = hvalue(mt);
+      break;
+    }
+    default: {
+      res = 0;  /* cannot set */
+      break;
     }
-    lua_pushliteral(L, l_s("n"));
-    lua_pushnumber(L, ref);
-    lua_settable(L, -3);
-    lua_pop(L, 2);
   }
-  return ref;
+  L->top--;
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API int lua_setglobals (lua_State *L, int index) {
+  StkId o;
+  int res = 0;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = luaA_index(L, index);
+  L->top--;
+  api_check(L, ttistable(L->top));
+  if (isLfunction(o)) {
+    res = 1;
+    clvalue(o)->l.g = *(L->top);
+  }
+  lua_unlock(L);
+  return res;
 }
 
 
 /*
-** `do' functions (run Lua code)
+** `load' and `call' functions (run Lua code)
 */
 
-LUA_API void lua_rawcall (lua_State *L, int nargs, int nresults) {
+LUA_API void lua_call (lua_State *L, int nargs, int nresults) {
   StkId func;
   lua_lock(L);
   api_checknelems(L, nargs+1);
   func = L->top - (nargs+1);
-  luaD_call(L, func);
-  if (nresults != LUA_MULTRET)
-    luaD_adjusttop(L, func + nresults);
+  luaD_call(L, func, nresults);
   lua_unlock(L);
 }
 
 
-LUA_API int lua_dofile (lua_State *L, const l_char *filename) {
+LUA_API int lua_pcall (lua_State *L, int nargs, int nresults, int errfunc) {
   int status;
-  status = lua_loadfile(L, filename);
-  if (status == 0)  /* parse OK? */
-    status = lua_call(L, 0, LUA_MULTRET);  /* call main */
+  ptrdiff_t func;
+  lua_lock(L);
+  func = (errfunc == 0) ? 0 : savestack(L, luaA_index(L, errfunc));
+  status = luaD_pcall(L, nargs, nresults, func);
+  lua_unlock(L);
   return status;
 }
 
 
-LUA_API int lua_dobuffer (lua_State *L, const l_char *buff, size_t size,
-                          const l_char *name) {
+LUA_API int lua_load (lua_State *L, lua_Chunkreader reader, void *data,
+                      const char *chunkname) {
+  ZIO z;
   int status;
-  status = lua_loadbuffer(L, buff, size, name);
-  if (status == 0)  /* parse OK? */
-    status = lua_call(L, 0, LUA_MULTRET);  /* call main */
+  int c;
+  lua_lock(L);
+  if (!chunkname) chunkname = "?";
+  luaZ_init(&z, reader, data, chunkname);
+  c = luaZ_lookahead(&z);
+  status = luaD_protectedparser(L, &z, (c == LUA_SIGNATURE[0]));
+  lua_unlock(L);
   return status;
 }
 
 
-LUA_API int lua_dostring (lua_State *L, const l_char *str) {
-  return lua_dobuffer(L, str, strlen(str), str);
-}
-
-
-
 /*
 ** Garbage-collection functions
 */
 
 /* GC values are expressed in Kbytes: #bytes/2^10 */
-#define GCscale(x)		((int)((x)>>10))
-#define GCunscale(x)		((lu_mem)(x)<<10)
+#define GCscale(x)		(cast(int, (x)>>10))
+#define GCunscale(x)		(cast(lu_mem, (x)<<10))
 
 LUA_API int lua_getgcthreshold (lua_State *L) {
   int threshold;
@@ -578,151 +691,42 @@ LUA_API void lua_setgcthreshold (lua_State *L, int newthreshold) {
 ** miscellaneous functions
 */
 
-LUA_API int lua_newtype (lua_State *L, const l_char *name, int basictype) {
-  int tag;
-  lua_lock(L);
-  if (basictype != LUA_TNONE &&
-      basictype != LUA_TTABLE &&
-      basictype != LUA_TUSERDATA)
-    luaO_verror(L, l_s("invalid basic type (%d) for new type"), basictype);
-  tag = luaT_newtag(L, name, basictype);
-  if (tag == LUA_TNONE)
-    luaO_verror(L, l_s("type name '%.30s' already exists"), name);
-  lua_unlock(L);
-  return tag;
-}
 
-
-LUA_API int lua_name2tag (lua_State *L, const l_char *name) {
-  int tag;
-  const TObject *v;
-  lua_lock(L);
-  v = luaH_getstr(G(L)->type2tag, luaS_new(L, name));
-  if (ttype(v) == LUA_TNIL)
-    tag = LUA_TNONE;
-  else {
-    lua_assert(ttype(v) == LUA_TNUMBER);
-    tag = (int)nvalue(v);
-  }
-  lua_unlock(L);
-  return tag;
-}
-
-
-LUA_API const l_char *lua_tag2name (lua_State *L, int tag) {
-  const l_char *s;
-  lua_lock(L);
-  s = (tag == LUA_TNONE) ? l_s("no value") : typenamebytag(G(L), tag);
-  lua_unlock(L);
-  return s;
-}
-
-
-LUA_API void lua_settag (lua_State *L, int tag) {
-  int basictype;
+LUA_API int lua_error (lua_State *L) {
   lua_lock(L);
   api_checknelems(L, 1);
-  if (tag < 0 || tag >= G(L)->ntag)
-    luaO_verror(L, l_s("%d is not a valid tag"), tag);
-  basictype = G(L)->TMtable[tag].basictype;
-  if (basictype != LUA_TNONE && basictype != ttype(L->top-1))
-    luaO_verror(L, l_s("tag %d can only be used for type '%.20s'"), tag,
-                typenamebytag(G(L), basictype));
-  switch (ttype(L->top-1)) {
-    case LUA_TTABLE:
-      hvalue(L->top-1)->htag = tag;
-      break;
-    case LUA_TUSERDATA:
-      uvalue(L->top-1)->uv.tag = tag;
-      break;
-    default:
-      luaO_verror(L, l_s("cannot change the tag of a %.20s"),
-                  luaT_typename(G(L), L->top-1));
-  }
+  luaG_errormsg(L);
   lua_unlock(L);
-}
-
-
-LUA_API void lua_error (lua_State *L, const l_char *s) {
-  lua_lock(L);
-  luaD_error(L, s);
-  lua_unlock(L);
-}
-
-
-LUA_API void lua_unref (lua_State *L, int ref) {
-  if (ref >= 0) {
-    lua_getregistry(L);
-    lua_pushnil(L);
-    lua_rawseti(L, -2, ref);
-    lua_getweakregistry(L);
-    lua_pushnil(L);
-    lua_rawseti(L, -2, ref);
-    lua_pop(L, 2);  /* remove both registries */
-  }
+  return 0;  /* to avoid warnings */
 }
 
 
 LUA_API int lua_next (lua_State *L, int index) {
   StkId t;
-  Node *n;
   int more;
   lua_lock(L);
   t = luaA_index(L, index);
-  api_check(L, ttype(t) == LUA_TTABLE);
-  n = luaH_next(L, hvalue(t), luaA_index(L, -1));
-  if (n) {
-    setobj(L->top-1, key(n));
-    setobj(L->top, val(n));
+  api_check(L, ttistable(t));
+  more = luaH_next(L, hvalue(t), L->top - 1);
+  if (more) {
     api_incr_top(L);
-    more = 1;
   }
-  else {  /* no more elements */
+  else  /* no more elements */
     L->top -= 1;  /* remove key */
-    more = 0;
-  }
   lua_unlock(L);
   return more;
 }
 
 
-LUA_API int lua_getn (lua_State *L, int index) {
-  StkId t;
-  const TObject *value;
-  int n;
-  lua_lock(L);
-  t = luaA_index(L, index);
-  api_check(L, ttype(t) == LUA_TTABLE);
-  value = luaH_getstr(hvalue(t), luaS_newliteral(L, l_s("n")));  /* = t.n */
-  if (ttype(value) == LUA_TNUMBER)
-    n = (int)nvalue(value);
-  else {
-    lua_Number max = 0;
-    int i = hvalue(t)->size;
-    Node *nd = hvalue(t)->node;
-    while (i--) {
-      if (ttype(key(nd)) == LUA_TNUMBER &&
-          ttype(val(nd)) != LUA_TNIL &&
-          nvalue(key(nd)) > max)
-        max = nvalue(key(nd));
-      nd++;
-    }
-    n = (int)max;
-  }
-  lua_unlock(L);
-  return n;
-}
-
-
 LUA_API void lua_concat (lua_State *L, int n) {
   lua_lock(L);
   api_checknelems(L, n);
   if (n >= 2) {
-    luaV_strconc(L, n, L->top);
+    luaV_concat(L, n, L->top - L->ci->base - 1);
     L->top -= (n-1);
     luaC_checkGC(L);
   }
-  else if (n == 0) {  /* push null string */
+  else if (n == 0) {  /* push empty string */
     setsvalue(L->top, luaS_newlstr(L, NULL, 0));
     api_incr_top(L);
   }
@@ -731,50 +735,31 @@ LUA_API void lua_concat (lua_State *L, int n) {
 }
 
 
-static Udata *pushnewudata (lua_State *L, size_t size) {
-  Udata *u = luaS_newudata(L, size);
-  setuvalue(L->top, u);
-  api_incr_top(L);
-  return uvalue(L->top-1);
-}
-
-
 LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
   Udata *u;
-  void *p;
   lua_lock(L);
-  u = pushnewudata(L, size);
-  p = u->uv.value;
+  u = luaS_newudata(L, size);
+  setuvalue(L->top, u);
+  api_incr_top(L);
   lua_unlock(L);
-  return p;
+  return u + 1;
 }
 
 
-LUA_API void lua_newuserdatabox (lua_State *L, void *p) {
-  Udata *u;
+LUA_API int lua_pushupvalues (lua_State *L) {
+  Closure *func;
+  int n, i;
   lua_lock(L);
-  u = pushnewudata(L, 0);
-  u->uv.value = p;
+  api_check(L, iscfunction(L->ci->base - 1));
+  func = clvalue(L->ci->base - 1);
+  n = func->c.nupvalues;
+  luaD_checkstack(L, n + LUA_MINSTACK);
+  for (i=0; i<n; i++) {
+    setobj(L->top, &func->c.upvalue[i]);
+    L->top++;
+  }
   lua_unlock(L);
+  return n;
 }
 
 
-LUA_API int lua_getweakmode (lua_State *L, int index) {
-  StkId t;
-  int mode;
-  lua_lock(L);
-  t = luaA_index(L, index);
-  api_check(L, ttype(t) == LUA_TTABLE);
-  mode = hvalue(t)->weakmode;
-  lua_unlock(L);
-  return mode;
-}
-
-
-LUA_API void  lua_setweakmode (lua_State *L, int mode) {
-  lua_lock(L);
-  api_check(L, ttype(L->top-1) == LUA_TTABLE);
-  hvalue(L->top-1)->weakmode = mode;
-  lua_unlock(L);
-}
-

lapi.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.h,v 1.19 2000/08/28 17:57:04 roberto Exp roberto $
+** $Id: lapi.h,v 1.20 2000/08/31 14:08:27 roberto Exp roberto $
 ** Auxiliary functions from Lua API
 ** See Copyright Notice in lua.h
 */
@@ -11,7 +11,6 @@
 #include "lobject.h"
 
 
-TObject *luaA_index (lua_State *L, int index);
 void luaA_pushobject (lua_State *L, const TObject *o);
 
 #endif

lauxlib.c

@@ -1,29 +1,95 @@
 /*
-** $Id: lauxlib.c,v 1.50 2001/04/23 16:35:45 roberto Exp roberto $
+** $Id: lauxlib.c,v 1.82 2002/08/06 18:01:50 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
 
 
+#include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
+#ifndef lua_filerror
+#include <errno.h>
+#define lua_fileerror	(strerror(errno))
+#endif
+
+
 /* This file uses only the official API of Lua.
 ** Any function declared here could be written as an application function.
-** With care, these functions can be used by other libraries.
 */
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lauxlib.h"
-#include "luadebug.h"
-#include "lualib.h"
 
 
+/*
+** {======================================================
+** Error-report functions
+** =======================================================
+*/
 
-LUALIB_API int luaL_findstring (const l_char *name, const l_char *const list[]) {
+
+LUALIB_API int luaL_argerror (lua_State *L, int narg, const char *extramsg) {
+  lua_Debug ar;
+  lua_getstack(L, 0, &ar);
+  lua_getinfo(L, "n", &ar);
+  if (strcmp(ar.namewhat, "method") == 0) {
+    narg--;  /* do not count `self' */
+    if (narg == 0)  /* error is in the self argument itself? */
+      return luaL_error(L,
+        "calling %s on bad self (perhaps using `:' instead of `.')",
+        ar.name);
+  }
+  if (ar.name == NULL)
+    ar.name = "?";
+  return luaL_error(L, "bad argument #%d to `%s' (%s)",
+                        narg, ar.name, extramsg);
+}
+
+
+LUALIB_API int luaL_typerror (lua_State *L, int narg, const char *tname) {
+  const char *msg = lua_pushfstring(L, "%s expected, got %s",
+                                    tname, lua_typename(L, lua_type(L,narg)));
+  return luaL_argerror(L, narg, msg);
+}
+
+
+static void tag_error (lua_State *L, int narg, int tag) {
+  luaL_typerror(L, narg, lua_typename(L, tag)); 
+}
+
+
+LUALIB_API void luaL_where (lua_State *L, int level) {
+  lua_Debug ar;
+  if (lua_getstack(L, level, &ar)) {  /* check function at level */
+    lua_getinfo(L, "Snl", &ar);  /* get info about it */
+    if (ar.currentline > 0) {  /* is there info? */
+      lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
+      return;
+    }
+  }
+  lua_pushliteral(L, "");  /* else, no information available... */
+}
+
+
+LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
+  va_list argp;
+  va_start(argp, fmt);
+  luaL_where(L, 1);
+  lua_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  lua_pushliteral(L, "\n");
+  lua_concat(L, 3);
+  return lua_error(L);
+}
+
+/* }====================================================== */
+
+
+LUALIB_API int luaL_findstring (const char *name, const char *const list[]) {
   int i;
   for (i=0; list[i]; i++)
     if (strcmp(list[i], name) == 0)
@@ -31,65 +97,35 @@ LUALIB_API int luaL_findstring (const l_char *name, const l_char *const list[])
   return -1;  /* name not found */
 }
 
-LUALIB_API void luaL_argerror (lua_State *L, int narg, const l_char *extramsg) {
-  lua_Debug ar;
-  lua_getstack(L, 0, &ar);
-  lua_getinfo(L, l_s("n"), &ar);
-  if (ar.name == NULL)
-    ar.name = l_s("?");
-  luaL_verror(L, l_s("bad argument #%d to `%.50s' (%.100s)"),
-              narg, ar.name, extramsg);
+
+LUALIB_API void luaL_check_stack (lua_State *L, int space, const char *mes) {
+  if (!lua_checkstack(L, space))
+    luaL_error(L, "stack overflow (%s)", mes);
 }
 
 
-static void type_error (lua_State *L, int narg, const l_char *tname) {
-  l_char buff[80];
-  sprintf(buff, l_s("%.25s expected, got %.25s"), tname, lua_type(L,narg));
-  luaL_argerror(L, narg, buff);
-}
-
-
-static void tag_error (lua_State *L, int narg, int tag) {
-  type_error(L, narg, lua_typename(L, tag)); 
-}
-
-
-LUALIB_API void luaL_checkstack (lua_State *L, int space, const l_char *mes) {
-  if (space > lua_stackspace(L))
-    luaL_verror(L, l_s("stack overflow (%.30s)"), mes);
-}
-
-
-LUALIB_API void luaL_checktype(lua_State *L, int narg, int t) {
-  if (lua_rawtag(L, narg) != t)
+LUALIB_API void luaL_check_type (lua_State *L, int narg, int t) {
+  if (lua_type(L, narg) != t)
     tag_error(L, narg, t);
 }
 
 
-LUALIB_API void luaL_checkany (lua_State *L, int narg) {
-  if (lua_rawtag(L, narg) == LUA_TNONE)
-    luaL_argerror(L, narg, l_s("value expected"));
+LUALIB_API void luaL_check_any (lua_State *L, int narg) {
+  if (lua_type(L, narg) == LUA_TNONE)
+    luaL_argerror(L, narg, "value expected");
 }
 
 
-LUALIB_API void *luaL_check_userdata (lua_State *L, int narg,
-                                      const l_char *name) {
-  if (strcmp(lua_type(L, narg), name) != 0)
-    type_error(L, narg, name);
-  return lua_touserdata(L, narg);
-}
-
-
-LUALIB_API const l_char *luaL_check_lstr (lua_State *L, int narg, size_t *len) {
-  const l_char *s = lua_tostring(L, narg);
+LUALIB_API const char *luaL_check_lstr (lua_State *L, int narg, size_t *len) {
+  const char *s = lua_tostring(L, narg);
   if (!s) tag_error(L, narg, LUA_TSTRING);
   if (len) *len = lua_strlen(L, narg);
   return s;
 }
 
 
-LUALIB_API const l_char *luaL_opt_lstr (lua_State *L, int narg, const l_char *def, size_t *len) {
-  if (lua_isnull(L, narg)) {
+LUALIB_API const char *luaL_opt_lstr (lua_State *L, int narg, const char *def, size_t *len) {
+  if (lua_isnoneornil(L, narg)) {
     if (len)
       *len = (def ? strlen(def) : 0);
     return def;
@@ -107,28 +143,51 @@ LUALIB_API lua_Number luaL_check_number (lua_State *L, int narg) {
 
 
 LUALIB_API lua_Number luaL_opt_number (lua_State *L, int narg, lua_Number def) {
-  if (lua_isnull(L, narg)) return def;
+  if (lua_isnoneornil(L, narg)) return def;
   else return luaL_check_number(L, narg);
 }
 
 
-LUALIB_API void luaL_openlib (lua_State *L, const luaL_reg *l, int n) {
-  int i;
-  for (i=0; i<n; i++)
-    lua_register(L, l[i].name, l[i].func);
+LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
+  if (!lua_getmetatable(L, obj))  /* no metatable? */
+    return 0;
+  lua_pushstring(L, event);
+  lua_rawget(L, -2);
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 2);  /* remove metatable and metafield */
+    return 0;
+  }
+  lua_pushvalue(L, obj);
+  lua_call(L, 1, 1);
+  return 1;
 }
 
 
-LUALIB_API void luaL_verror (lua_State *L, const l_char *fmt, ...) {
-  l_char buff[500];
-  va_list argp;
-  va_start(argp, fmt);
-  vsprintf(buff, fmt, argp);
-  va_end(argp);
-  lua_error(L, buff);
+LUALIB_API void luaL_openlib (lua_State *L, const luaL_reg *l, int nup) {
+  for (; l->name; l++) {
+    int i;
+    lua_pushstring(L, l->name);
+    for (i=0; i<nup; i++)  /* copy upvalues to the top */
+      lua_pushvalue(L, -(nup+1));
+    lua_pushcclosure(L, l->func, nup);
+    lua_settable(L, -(nup+3));
+  }
+  lua_pop(L, nup);
 }
 
 
+LUALIB_API void luaL_opennamedlib (lua_State *L, const char *libname,
+                                   const luaL_reg *l, int nup) {
+  lua_pushstring(L, libname);
+  lua_insert(L, -(nup+1));
+  lua_newtable(L);
+  lua_insert(L, -(nup+1));
+  luaL_openlib(L, l, nup);
+  lua_settable(L, LUA_GLOBALSINDEX);
+}
+
+
+
 /*
 ** {======================================================
 ** Generic Buffer manipulation
@@ -174,20 +233,20 @@ static void adjuststack (luaL_Buffer *B) {
 }
 
 
-LUALIB_API l_char *luaL_prepbuffer (luaL_Buffer *B) {
+LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) {
   if (emptybuffer(B))
     adjuststack(B);
   return B->buffer;
 }
 
 
-LUALIB_API void luaL_addlstring (luaL_Buffer *B, const l_char *s, size_t l) {
+LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
   while (l--)
     luaL_putchar(B, *s++);
 }
 
 
-LUALIB_API void luaL_addstring (luaL_Buffer *B, const l_char *s) {
+LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
   luaL_addlstring(B, s, strlen(s));
 }
 
@@ -223,3 +282,165 @@ LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
 }
 
 /* }====================================================== */
+
+
+LUALIB_API int luaL_ref (lua_State *L, int t) {
+  int ref;
+  lua_rawgeti(L, t, 0);  /* get first free element */
+  ref = (int)lua_tonumber(L, -1);  /* ref = t[0] */
+  lua_pop(L, 1);  /* remove it from stack */
+  if (ref != 0) {  /* any free element? */
+    lua_rawgeti(L, t, ref);  /* remove it from list */
+    lua_rawseti(L, t, 0);  /* (that is, t[0] = t[ref]) */
+  }
+  else {  /* no free elements */
+    lua_pushliteral(L, "n");
+    lua_pushvalue(L, -1);
+    lua_rawget(L, t);  /* get t.n */
+    ref = (int)lua_tonumber(L, -1) + 1;  /* ref = t.n + 1 */
+    lua_pop(L, 1);  /* pop t.n */
+    lua_pushnumber(L, ref);
+    lua_rawset(L, t);  /* t.n = t.n + 1 */
+  }
+  lua_rawseti(L, t, ref);
+  return ref;
+}
+
+
+LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
+  if (ref >= 0) {
+    lua_rawgeti(L, t, 0);
+    lua_rawseti(L, t, ref);  /* t[ref] = t[0] */
+    lua_pushnumber(L, ref);
+    lua_rawseti(L, t, 0);  /* t[0] = ref */
+  }
+}
+
+
+
+/*
+** {======================================================
+** Load functions
+** =======================================================
+*/
+
+typedef struct LoadF {
+  FILE *f;
+  char buff[LUAL_BUFFERSIZE];
+} LoadF;
+
+
+static const char *getF (lua_State *L, void *ud, size_t *size) {
+  LoadF *lf = (LoadF *)ud;
+  (void)L;
+  if (feof(lf->f)) return NULL;
+  *size = fread(lf->buff, 1, LUAL_BUFFERSIZE, lf->f);
+  return (*size > 0) ? lf->buff : NULL;
+}
+
+
+static int errfile (lua_State *L, const char *filename) {
+  if (filename == NULL) filename = "stdin";
+  lua_pushfstring(L, "cannot read %s: %s", filename, lua_fileerror);
+  return LUA_ERRFILE;
+}
+
+
+LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
+  LoadF lf;
+  int status;
+  int c;
+  int old_top = lua_gettop(L);
+  lf.f = (filename == NULL) ? stdin : fopen(filename, "r");
+  if (lf.f == NULL) return errfile(L, filename);  /* unable to open file */
+  c = ungetc(getc(lf.f), lf.f);
+  if (!(isspace(c) || isprint(c)) && lf.f != stdin) {  /* binary file? */
+    fclose(lf.f);
+    lf.f = fopen(filename, "rb");  /* reopen in binary mode */
+    if (lf.f == NULL) return errfile(L, filename);  /* unable to reopen file */
+  }
+  if (filename == NULL)
+    lua_pushliteral(L, "=stdin");
+  else
+    lua_pushfstring(L, "@%s", filename);
+  status = lua_load(L, getF, &lf, lua_tostring(L, -1));
+  lua_remove(L, old_top+1);  /* remove filename from stack */
+  if (ferror(lf.f)) {
+    lua_settop(L, old_top);  /* ignore results from `lua_load' */
+    return errfile(L, filename);
+  }
+  if (lf.f != stdin)
+    fclose(lf.f);
+  return status;
+}
+
+
+typedef struct LoadS {
+  const char *s;
+  size_t size;
+} LoadS;
+
+
+static const char *getS (lua_State *L, void *ud, size_t *size) {
+  LoadS *ls = (LoadS *)ud;
+  (void)L;
+  if (ls->size == 0) return NULL;
+  *size = ls->size;
+  ls->size = 0;
+  return ls->s;
+}
+
+
+LUALIB_API int luaL_loadbuffer (lua_State *L, const char *buff, size_t size,
+                                const char *name) {
+  LoadS ls;
+  ls.s = buff;
+  ls.size = size;
+  return lua_load(L, getS, &ls, name);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** compatibility code
+** =======================================================
+*/
+
+
+static void callalert (lua_State *L, int status) {
+  if (status != 0) {
+    lua_getglobal(L, "_ALERT");
+    lua_insert(L, -2);
+    lua_call(L, 1, 0);
+    lua_pop(L, 1);
+  }
+}
+
+
+static int aux_do (lua_State *L, int status) {
+  if (status == 0) {  /* parse OK? */
+    status = lua_pcall(L, 0, LUA_MULTRET, 0);  /* call main */
+  }
+  callalert(L, status);
+  return status;
+}
+
+
+LUALIB_API int lua_dofile (lua_State *L, const char *filename) {
+  return aux_do(L, luaL_loadfile(L, filename));
+}
+
+
+LUALIB_API int lua_dobuffer (lua_State *L, const char *buff, size_t size,
+                          const char *name) {
+  return aux_do(L, luaL_loadbuffer(L, buff, size, name));
+}
+
+
+LUALIB_API int lua_dostring (lua_State *L, const char *str) {
+  return lua_dobuffer(L, str, strlen(str), str);
+}
+
+/* }====================================================== */

lauxlib.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.h,v 1.35 2001/04/06 21:17:37 roberto Exp roberto $
+** $Id: lauxlib.h,v 1.51 2002/07/01 19:23:58 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -20,31 +20,42 @@
 #endif
 
 
+
 typedef struct luaL_reg {
-  const lua_char *name;
+  const char *name;
   lua_CFunction func;
 } luaL_reg;
 
 
-LUALIB_API void luaL_openlib (lua_State *L, const luaL_reg *l, int n);
-LUALIB_API void luaL_argerror (lua_State *L, int numarg,
-                               const lua_char *extramsg);
-LUALIB_API const lua_char *luaL_check_lstr (lua_State *L, int numArg,
+LUALIB_API void luaL_openlib (lua_State *L, const luaL_reg *l, int nup);
+LUALIB_API void luaL_opennamedlib (lua_State *L, const char *libname,
+                                   const luaL_reg *l, int nup);
+LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event);
+LUALIB_API int luaL_typerror (lua_State *L, int narg, const char *tname);
+LUALIB_API int luaL_argerror (lua_State *L, int numarg, const char *extramsg);
+LUALIB_API const char *luaL_check_lstr (lua_State *L, int numArg,
                                             size_t *len);
-LUALIB_API const lua_char *luaL_opt_lstr (lua_State *L, int numArg,
-                                          const lua_char *def, size_t *len);
+LUALIB_API const char *luaL_opt_lstr (lua_State *L, int numArg,
+                                          const char *def, size_t *len);
 LUALIB_API lua_Number luaL_check_number (lua_State *L, int numArg);
 LUALIB_API lua_Number luaL_opt_number (lua_State *L, int nArg, lua_Number def);
 
-LUALIB_API void luaL_checkstack (lua_State *L, int space, const lua_char *msg);
-LUALIB_API void luaL_checktype (lua_State *L, int narg, int t);
-LUALIB_API void luaL_checkany (lua_State *L, int narg);
-LUALIB_API void *luaL_check_userdata (lua_State *L, int narg,
-                                      const lua_char *name);
+LUALIB_API void luaL_check_stack (lua_State *L, int space, const char *msg);
+LUALIB_API void luaL_check_type (lua_State *L, int narg, int t);
+LUALIB_API void luaL_check_any (lua_State *L, int narg);
 
-LUALIB_API void luaL_verror (lua_State *L, const lua_char *fmt, ...);
-LUALIB_API int luaL_findstring (const lua_char *name, 
-                                const lua_char *const list[]);
+LUALIB_API void luaL_where (lua_State *L, int level);
+LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...);
+
+LUALIB_API int luaL_findstring (const char *name, 
+                                const char *const list[]);
+
+LUALIB_API int luaL_ref (lua_State *L, int t);
+LUALIB_API void luaL_unref (lua_State *L, int t, int ref);
+
+LUALIB_API int luaL_loadfile (lua_State *L, const char *filename);
+LUALIB_API int luaL_loadbuffer (lua_State *L, const char *buff, size_t size,
+                                const char *name);
 
 
 
@@ -62,7 +73,6 @@ LUALIB_API int luaL_findstring (const lua_char *name,
 #define luaL_check_long(L,n)	((long)luaL_check_number(L, n))
 #define luaL_opt_int(L,n,d)	((int)luaL_opt_number(L, n,d))
 #define luaL_opt_long(L,n,d)	((long)luaL_opt_number(L, n,d))
-#define luaL_openl(L,a)		luaL_openlib(L, a, (sizeof(a)/sizeof(a[0])))
 
 
 /*
@@ -78,22 +88,22 @@ LUALIB_API int luaL_findstring (const lua_char *name,
 
 
 typedef struct luaL_Buffer {
-  lua_char *p;			/* current position in buffer */
+  char *p;			/* current position in buffer */
   int level;
   lua_State *L;
-  lua_char buffer[LUAL_BUFFERSIZE];
+  char buffer[LUAL_BUFFERSIZE];
 } luaL_Buffer;
 
 #define luaL_putchar(B,c) \
   ((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \
-   (*(B)->p++ = (lua_char)(c)))
+   (*(B)->p++ = (char)(c)))
 
 #define luaL_addsize(B,n)	((B)->p += (n))
 
 LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B);
-LUALIB_API lua_char *luaL_prepbuffer (luaL_Buffer *B);
-LUALIB_API void luaL_addlstring (luaL_Buffer *B, const lua_char *s, size_t l);
-LUALIB_API void luaL_addstring (luaL_Buffer *B, const lua_char *s);
+LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B);
+LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);
+LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s);
 LUALIB_API void luaL_addvalue (luaL_Buffer *B);
 LUALIB_API void luaL_pushresult (luaL_Buffer *B);
 
@@ -101,6 +111,20 @@ LUALIB_API void luaL_pushresult (luaL_Buffer *B);
 /* }====================================================== */
 
 
+
+/*
+** Compatibility macros
+*/
+
+#define luaL_checktype  luaL_check_type
+#define luaL_checkany   luaL_check_any
+
+LUALIB_API int   lua_dofile (lua_State *L, const char *filename);
+LUALIB_API int   lua_dostring (lua_State *L, const char *str);
+LUALIB_API int   lua_dobuffer (lua_State *L, const char *buff, size_t size,
+                               const char *name);
+
+
 #endif
 
 

lcode.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.c,v 1.77 2001/07/17 14:30:44 roberto Exp roberto $
+** $Id: lcode.c,v 1.108 2002/06/13 13:39:55 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -7,7 +7,6 @@
 
 #include <stdlib.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lcode.h"
@@ -18,40 +17,21 @@
 #include "lobject.h"
 #include "lopcodes.h"
 #include "lparser.h"
+#include "ltable.h"
 
 
 #define hasjumps(e)	((e)->t != (e)->f)
 
-#define getcode(fs,e)	((fs)->f->code[(e)->u.i.info])
-
-
-
-void luaK_error (LexState *ls, const l_char *msg) {
-  luaX_error(ls, msg, ls->t.token);
-}
-
-
-/*
-** Returns the the previous instruction, for optimizations.
-** If there is a jump target between this and the current instruction,
-** returns a dummy instruction to avoid wrong optimizations.
-*/
-static Instruction previous_instruction (FuncState *fs) {
-  if (fs->pc > fs->lasttarget)  /* no jumps to current position? */
-    return fs->f->code[fs->pc-1];  /* returns previous instruction */
-  else
-    return (Instruction)(-1);/* no optimizations after an invalid instruction */
-}
-
 
 void luaK_nil (FuncState *fs, int from, int n) {
-  Instruction previous = previous_instruction(fs);
-  if (GET_OPCODE(previous) == OP_LOADNIL) {
-    int pfrom = GETARG_A(previous);
-    int pto = GETARG_B(previous);
+  Instruction *previous;
+  if (fs->pc > fs->lasttarget &&  /* no jumps to current position? */
+      GET_OPCODE(*(previous = &fs->f->code[fs->pc-1])) == OP_LOADNIL) {
+    int pfrom = GETARG_A(*previous);
+    int pto = GETARG_B(*previous);
     if (pfrom <= from && from <= pto+1) {  /* can connect both? */
       if (from+n-1 > pto)
-        SETARG_B(fs->f->code[fs->pc-1], from+n-1);
+        SETARG_B(*previous, from+n-1);
       return;
     }
   }
@@ -60,63 +40,43 @@ void luaK_nil (FuncState *fs, int from, int n) {
 
 
 int luaK_jump (FuncState *fs) {
-  int j = luaK_codeAsBc(fs, OP_JMP, 0, NO_JUMP);
-  if (j == fs->lasttarget) {  /* possible jumps to this jump? */
-    luaK_concat(fs, &j, fs->jlt);  /* keep them on hold */
-    fs->jlt = NO_JUMP;
-  }
+  int jpc = fs->jpc;  /* save list of jumps to here */
+  int j;
+  fs->jpc = NO_JUMP;
+  j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
+  luaK_concat(fs, &j, jpc);  /* keep them on hold */
   return j;
 }
 
 
 static int luaK_condjump (FuncState *fs, OpCode op, int A, int B, int C) {
   luaK_codeABC(fs, op, A, B, C);
-  return luaK_codeAsBc(fs, OP_CJMP, 0, NO_JUMP);
+  return luaK_jump(fs);
 }
 
 
 static void luaK_fixjump (FuncState *fs, int pc, int dest) {
-  Instruction *jmp = &fs->f->code[pc];
-  if (dest == NO_JUMP)
-    SETARG_sBc(*jmp, NO_JUMP);  /* point to itself to represent end of list */
-  else {  /* jump is relative to position following jump instruction */
-    int offset = dest-(pc+1);
-    if (abs(offset) > MAXARG_sBc)
-      luaK_error(fs->ls, l_s("control structure too long"));
-    SETARG_sBc(*jmp, offset);
-  }
-}
-
-
-/*
-** prep-for instructions (OP_FORPREP & OP_TFORPREP) have a negated jump,
-** as they simulate the real jump...
-*/
-void luaK_fixfor (FuncState *fs, int pc, int dest) {
   Instruction *jmp = &fs->f->code[pc];
   int offset = dest-(pc+1);
-  SETARG_sBc(*jmp, -offset);
+  lua_assert(dest != NO_JUMP);
+  if (abs(offset) > MAXARG_sBx)
+    luaX_syntaxerror(fs->ls, "control structure too long");
+  SETARG_sBx(*jmp, offset);
 }
 
 
 /*
 ** returns current `pc' and marks it as a jump target (to avoid wrong
 ** optimizations with consecutive instructions not in the same basic block).
-** discharge list of jumps to last target.
 */
 int luaK_getlabel (FuncState *fs) {
-  if (fs->pc != fs->lasttarget) {
-    int lasttarget = fs->lasttarget;
-    fs->lasttarget = fs->pc;
-    luaK_patchlist(fs, fs->jlt, lasttarget);  /* discharge old list `jlt' */
-    fs->jlt = NO_JUMP;  /* nobody jumps to this new label (yet) */
-  }
+  fs->lasttarget = fs->pc;
   return fs->pc;
 }
 
 
 static int luaK_getjump (FuncState *fs, int pc) {
-  int offset = GETARG_sBc(fs->f->code[pc]);
+  int offset = GETARG_sBx(fs->f->code[pc]);
   if (offset == NO_JUMP)  /* point to itself represents end of list */
     return NO_JUMP;  /* end of list */
   else
@@ -126,26 +86,28 @@ static int luaK_getjump (FuncState *fs, int pc) {
 
 static Instruction *getjumpcontrol (FuncState *fs, int pc) {
   Instruction *pi = &fs->f->code[pc];
-  OpCode op = GET_OPCODE(*pi);
-  if (op == OP_CJMP)
+  if (pc >= 1 && testOpMode(GET_OPCODE(*(pi-1)), OpModeT))
     return pi-1;
-  else {
-    lua_assert(op == OP_JMP || op == OP_FORLOOP || op == OP_TFORLOOP);
+  else
     return pi;
-  }
 }
 
 
-static int need_value (FuncState *fs, int list, OpCode op) {
-  /* check whether list has any jump different from `op' */
-  for (; list != NO_JUMP; list = luaK_getjump(fs, list))
-    if (GET_OPCODE(*getjumpcontrol(fs, list)) != op) return 1;
+/*
+** check whether list has any jump that do not produce a value
+** (or produce an inverted value)
+*/
+static int need_value (FuncState *fs, int list, int cond) {
+  for (; list != NO_JUMP; list = luaK_getjump(fs, list)) {
+    Instruction i = *getjumpcontrol(fs, list);
+    if (GET_OPCODE(i) != OP_TEST || GETARG_B(i) != cond) return 1;
+  }
   return 0;  /* not found */
 }
 
 
 static void patchtestreg (Instruction *i, int reg) {
-  if (reg == NO_REG) reg = GETARG_B(*i);
+  if (reg == NO_REG) reg = GETARG_C(*i);
   SETARG_A(*i, reg);
 }
 
@@ -155,20 +117,20 @@ static void luaK_patchlistaux (FuncState *fs, int list,
   while (list != NO_JUMP) {
     int next = luaK_getjump(fs, list);
     Instruction *i = getjumpcontrol(fs, list);
-    switch (GET_OPCODE(*i)) {
-      case OP_TESTT: {
+    if (GET_OPCODE(*i) != OP_TEST) {
+      lua_assert(dtarget != NO_JUMP);
+      luaK_fixjump(fs, list, dtarget);  /* jump to default target */
+    }
+    else {
+      if (GETARG_B(*i)) {
+        lua_assert(ttarget != NO_JUMP);
         patchtestreg(i, treg);
         luaK_fixjump(fs, list, ttarget);
-        break;
       }
-      case OP_TESTF: {
+      else {
+        lua_assert(ftarget != NO_JUMP);
         patchtestreg(i, freg);
         luaK_fixjump(fs, list, ftarget);
-        break;
-      }
-      default: {
-        luaK_fixjump(fs, list, dtarget);  /* jump to default target */
-        break;
       }
     }
     list = next;
@@ -176,16 +138,31 @@ static void luaK_patchlistaux (FuncState *fs, int list,
 }
 
 
+static void luaK_dischargejpc (FuncState *fs) {
+  luaK_patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc, NO_REG, fs->pc);
+  fs->jpc = NO_JUMP;
+}
+
+
 void luaK_patchlist (FuncState *fs, int list, int target) {
-  if (target == fs->lasttarget)  /* same target that list `jlt'? */
-    luaK_concat(fs, &fs->jlt, list);  /* delay fixing */
-  else
+  if (target == fs->pc)
+    luaK_patchtohere(fs, list);
+  else {
+    lua_assert(target < fs->pc);
     luaK_patchlistaux(fs, list, target, NO_REG, target, NO_REG, target);
+  }
+}
+
+
+void luaK_patchtohere (FuncState *fs, int list) {
+  luaK_getlabel(fs);
+  luaK_concat(fs, &fs->jpc, list);
 }
 
 
 void luaK_concat (FuncState *fs, int *l1, int l2) {
-  if (*l1 == NO_JUMP)
+  if (l2 == NO_JUMP) return;
+  else if (*l1 == NO_JUMP)
     *l1 = l2;
   else {
     int list = *l1;
@@ -197,18 +174,24 @@ void luaK_concat (FuncState *fs, int *l1, int l2) {
 }
 
 
-void luaK_reserveregs (FuncState *fs, int n) {
-  fs->freereg += n;
-  if (fs->freereg > fs->f->maxstacksize) {
-    if (fs->freereg >= MAXSTACK)
-      luaK_error(fs->ls, l_s("function or expression too complex"));
-    fs->f->maxstacksize = (short)fs->freereg;
+static void luaK_checkstack (FuncState *fs, int n) {
+  int newstack = fs->freereg + n;
+  if (newstack > fs->f->maxstacksize) {
+    if (newstack >= MAXSTACK)
+      luaX_syntaxerror(fs->ls, "function or expression too complex");
+    fs->f->maxstacksize = cast(lu_byte, newstack);
   }
 }
 
 
+void luaK_reserveregs (FuncState *fs, int n) {
+  luaK_checkstack(fs, n);
+  fs->freereg += n;
+}
+
+
 static void freereg (FuncState *fs, int reg) {
-  if (reg >= fs->nactloc && reg < MAXSTACK) {
+  if (reg >= fs->nactvar && reg < MAXSTACK) {
     fs->freereg--;
     lua_assert(reg == fs->freereg);
   }
@@ -217,55 +200,55 @@ static void freereg (FuncState *fs, int reg) {
 
 static void freeexp (FuncState *fs, expdesc *e) {
   if (e->k == VNONRELOC)
-    freereg(fs, e->u.i.info);
+    freereg(fs, e->info);
 }
 
 
-static int addk (FuncState *fs, TObject *k) {
-  Proto *f = fs->f;
-  luaM_growvector(fs->L, f->k, fs->nk, f->sizek, TObject,
-                  MAXARG_Bc, l_s("constant table overflow"));
-  setobj(&f->k[fs->nk], k);
-  return fs->nk++;
-}
-
-
-int luaK_stringk (FuncState *fs, TString *s) {
-  Proto *f = fs->f;
-  int c = s->tsv.constindex;
-  if (c >= fs->nk || ttype(&f->k[c]) != LUA_TSTRING || tsvalue(&f->k[c]) != s) {
-    TObject o;
-    setsvalue(&o, s);
-    c = addk(fs, &o);
-    s->tsv.constindex = (unsigned short)c;  /* hint for next time */
+static int addk (FuncState *fs, TObject *k, TObject *v) {
+  const TObject *index = luaH_get(fs->h, k);
+  if (ttisnumber(index)) {
+    lua_assert(luaO_rawequalObj(&fs->f->k[cast(int, nvalue(index))], v));
+    return cast(int, nvalue(index));
+  }
+  else {  /* constant not found; create a new entry */
+    Proto *f = fs->f;
+    luaM_growvector(fs->L, f->k, fs->nk, f->sizek, TObject,
+                    MAXARG_Bx, "constant table overflow");
+    setobj(&f->k[fs->nk], v);
+    setnvalue(luaH_set(fs->L, fs->h, k), fs->nk);
+    return fs->nk++;
   }
-  return c;
 }
 
 
-static int number_constant (FuncState *fs, lua_Number r) {
-  /* check whether `r' has appeared within the last LOOKBACKNUMS entries */
+int luaK_stringK (FuncState *fs, TString *s) {
+  TObject o;
+  setsvalue(&o, s);
+  return addk(fs, &o, &o);
+}
+
+
+int luaK_numberK (FuncState *fs, lua_Number r) {
   TObject o;
-  Proto *f = fs->f;
-  int c = fs->nk;
-  int lim = c < LOOKBACKNUMS ? 0 : c-LOOKBACKNUMS;
-  while (--c >= lim) {
-    if (ttype(&f->k[c]) == LUA_TNUMBER && nvalue(&f->k[c]) == r)
-      return c;
-  }
-  /* not found; create a new entry */
   setnvalue(&o, r);
-  return addk(fs, &o);
+  return addk(fs, &o, &o);
+}
+
+
+static int nil_constant (FuncState *fs) {
+  TObject k, v;
+  setnilvalue(&v);
+  sethvalue(&k, fs->h);  /* cannot use nil as key; instead use table itself */
+  return addk(fs, &k, &v);
 }
 
 
 void luaK_setcallreturns (FuncState *fs, expdesc *e, int nresults) {
   if (e->k == VCALL) {  /* expression is an open function call? */
-    if (nresults == LUA_MULTRET) nresults = NO_REG;
-    SETARG_C(getcode(fs, e), nresults);
+    SETARG_C(getcode(fs, e), nresults+1);
     if (nresults == 1) {  /* `regular' expression? */
       e->k = VNONRELOC;
-      e->u.i.info = GETARG_A(getcode(fs, e));
+      e->info = GETARG_A(getcode(fs, e));
     }
   }
 }
@@ -277,15 +260,20 @@ void luaK_dischargevars (FuncState *fs, expdesc *e) {
       e->k = VNONRELOC;
       break;
     }
+    case VUPVAL: {
+      e->info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->info, 0);
+      e->k = VRELOCABLE;
+      break;
+    }
     case VGLOBAL: {
-      e->u.i.info = luaK_codeABc(fs, OP_GETGLOBAL, 0, e->u.i.info);
+      e->info = luaK_codeABx(fs, OP_GETGLOBAL, 0, e->info);
       e->k = VRELOCABLE;
       break;
     }
     case VINDEXED: {
-      freereg(fs, e->u.i.aux);
-      freereg(fs, e->u.i.info);
-      e->u.i.info = luaK_codeABC(fs, OP_GETTABLE, 0, e->u.i.info, e->u.i.aux);
+      freereg(fs, e->aux);
+      freereg(fs, e->info);
+      e->info = luaK_codeABC(fs, OP_GETTABLE, 0, e->info, e->aux);
       e->k = VRELOCABLE;
       break;
     }
@@ -298,29 +286,9 @@ void luaK_dischargevars (FuncState *fs, expdesc *e) {
 }
 
 
-static int code_label (FuncState *fs, OpCode op, int A, int sBc) {
+static int code_label (FuncState *fs, int A, int b, int jump) {
   luaK_getlabel(fs);  /* those instructions may be jump targets */
-  return luaK_codeAsBc(fs, op, A, sBc);
-}
-
-
-static void dischargejumps (FuncState *fs, expdesc *e, int reg) {
-  if (hasjumps(e)) {
-    int final;  /* position after whole expression */
-    int p_nil = NO_JUMP;  /* position of an eventual PUSHNIL */
-    int p_1 = NO_JUMP;  /* position of an eventual PUSHINT */
-    if (need_value(fs, e->f, OP_TESTF) || need_value(fs, e->t, OP_TESTT)) {
-      /* expression needs values */
-      if (e->k != VJMP)
-        code_label(fs, OP_JMP, 0, 2);  /* to jump over both pushes */
-      p_nil = code_label(fs, OP_NILJMP, reg, 0);
-      p_1 = code_label(fs, OP_LOADINT, reg, 1);
-    }
-    final = luaK_getlabel(fs);
-    luaK_patchlistaux(fs, e->f, p_nil, NO_REG, final,    reg, p_nil);
-    luaK_patchlistaux(fs, e->t, final,    reg,   p_1, NO_REG,   p_1);
-  }
-  e->f = e->t = NO_JUMP;
+  return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
 }
 
 
@@ -331,17 +299,12 @@ static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
       luaK_nil(fs, reg, 1);
       break;
     }
-    case VNUMBER: {
-      lua_Number f = e->u.n;
-      int i = (int)f;
-      if ((lua_Number)i == f && -MAXARG_sBc <= i && i <= MAXARG_sBc)
-        luaK_codeAsBc(fs, OP_LOADINT, reg, i);  /* f has a small int value */
-      else
-        luaK_codeABc(fs, OP_LOADK, reg, number_constant(fs, f));
+    case VFALSE:  case VTRUE: {
+      luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
       break;
     }
     case VK: {
-      luaK_codeABc(fs, OP_LOADK, reg, e->u.i.info);
+      luaK_codeABx(fs, OP_LOADK, reg, e->info);
       break;
     }
     case VRELOCABLE: {
@@ -349,9 +312,17 @@ static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
       SETARG_A(*pc, reg);
       break;
     }
-    default: return;
+    case VNONRELOC: {
+      if (reg != e->info)
+        luaK_codeABC(fs, OP_MOVE, reg, e->info, 0);
+      break;
+    }
+    default: {
+      lua_assert(e->k == VVOID || e->k == VJMP);
+      return;  /* nothing to do... */
+    }
   }
-  e->u.i.info = reg;
+  e->info = reg;
   e->k = VNONRELOC;
 }
 
@@ -366,51 +337,49 @@ static void discharge2anyreg (FuncState *fs, expdesc *e) {
 
 static void luaK_exp2reg (FuncState *fs, expdesc *e, int reg) {
   discharge2reg(fs, e, reg);
-  switch (e->k) {
-    case VVOID: {
-      return;  /* nothing to do... */
-    }
-    case VNONRELOC: {
-      if (reg != e->u.i.info)
-        luaK_codeABC(fs, OP_MOVE, reg, e->u.i.info, 0);
-      break;
-    }
-    case VJMP: {
-      luaK_concat(fs, &e->t, e->u.i.info);  /* put this jump in `t' list */
-      break;
-    }
-    default: {
-      lua_assert(0);  /* cannot happen */
-      break;
+  if (e->k == VJMP)
+    luaK_concat(fs, &e->t, e->info);  /* put this jump in `t' list */
+  if (hasjumps(e)) {
+    int final;  /* position after whole expression */
+    int p_f = NO_JUMP;  /* position of an eventual LOAD false */
+    int p_t = NO_JUMP;  /* position of an eventual LOAD true */
+    if (need_value(fs, e->t, 1) || need_value(fs, e->f, 0)) {
+      int fj = NO_JUMP;  /* first jump (over LOAD ops.) */
+      if (e->k != VJMP)
+        fj = luaK_jump(fs);
+      p_f = code_label(fs, reg, 0, 1);
+      p_t = code_label(fs, reg, 1, 0);
+      luaK_patchtohere(fs, fj);
     }
+    final = luaK_getlabel(fs);
+    luaK_patchlistaux(fs, e->f, p_f, NO_REG, final, reg, p_f);
+    luaK_patchlistaux(fs, e->t, final, reg, p_t, NO_REG, p_t);
   }
-  dischargejumps(fs, e, reg);
-  e->u.i.info = reg;
+  e->f = e->t = NO_JUMP;
+  e->info = reg;
   e->k = VNONRELOC;
 }
 
 
 void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
-  int reg;
   luaK_dischargevars(fs, e);
   freeexp(fs, e);
-  reg = fs->freereg;
   luaK_reserveregs(fs, 1);
-  luaK_exp2reg(fs, e, reg);
+  luaK_exp2reg(fs, e, fs->freereg - 1);
 }
 
 
 int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
   luaK_dischargevars(fs, e);
   if (e->k == VNONRELOC) {
-    if (!hasjumps(e)) return e->u.i.info;  /* exp is already in a register */ 
-    if (e->u.i.info >= fs->nactloc) {  /* reg. is not a local? */
-      dischargejumps(fs, e, e->u.i.info);  /* put value on it */
-      return e->u.i.info;
+    if (!hasjumps(e)) return e->info;  /* exp is already in a register */ 
+    if (e->info >= fs->nactvar) {  /* reg. is not a local? */
+      luaK_exp2reg(fs, e, e->info);  /* put value on it */
+      return e->info;
     }
   }
   luaK_exp2nextreg(fs, e);  /* default */
-  return e->u.i.info;
+  return e->info;
 }
 
 
@@ -424,13 +393,24 @@ void luaK_exp2val (FuncState *fs, expdesc *e) {
 
 int luaK_exp2RK (FuncState *fs, expdesc *e) {
   luaK_exp2val(fs, e);
-  if (e->k == VNUMBER && fs->nk + MAXSTACK <= MAXARG_C) {
-      e->u.i.info = number_constant(fs, e->u.n);
-      e->k = VK;
+  switch (e->k) {
+    case VNIL: {
+      if (fs->nk + MAXSTACK <= MAXARG_C) {  /* constant fit in argC? */
+        e->info = nil_constant(fs);
+        e->k = VK;
+        return e->info + MAXSTACK;
+      }
+      else break;
+    }
+    case VK: {
+      if (e->info + MAXSTACK <= MAXARG_C)  /* constant fit in argC? */
+        return e->info + MAXSTACK;
+      else break;
+    }
+    default: break;
   }
-  else if (!(e->k == VK && e->u.i.info + MAXSTACK <= MAXARG_C))
-    luaK_exp2anyreg(fs, e);  /* not a constant in the right range */
-  return (e->k == VK) ? e->u.i.info+MAXSTACK : e->u.i.info;
+  /* not a constant in the right range: put in a register */
+  return luaK_exp2anyreg(fs, e);
 }
 
 
@@ -438,19 +418,22 @@ void luaK_storevar (FuncState *fs, expdesc *var, expdesc *exp) {
   switch (var->k) {
     case VLOCAL: {
       freeexp(fs, exp);
-      luaK_exp2reg(fs, exp, var->u.i.info);
+      luaK_exp2reg(fs, exp, var->info);
+      return;
+    }
+    case VUPVAL: {
+      int e = luaK_exp2anyreg(fs, exp);
+      luaK_codeABC(fs, OP_SETUPVAL, e, var->info, 0);
       break;
     }
     case VGLOBAL: {
       int e = luaK_exp2anyreg(fs, exp);
-      freereg(fs, e);
-      luaK_codeABc(fs, OP_SETGLOBAL, e, var->u.i.info);
+      luaK_codeABx(fs, OP_SETGLOBAL, e, var->info);
       break;
     }
     case VINDEXED: {
       int e = luaK_exp2anyreg(fs, exp);
-      freereg(fs, e);
-      luaK_codeABC(fs, OP_SETTABLE, e, var->u.i.info, var->u.i.aux);
+      luaK_codeABC(fs, OP_SETTABLE, e, var->info, var->aux);
       break;
     }
     default: {
@@ -458,6 +441,7 @@ void luaK_storevar (FuncState *fs, expdesc *var, expdesc *exp) {
       break;
     }
   }
+  freeexp(fs, exp);
 }
 
 
@@ -467,47 +451,32 @@ void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
   freeexp(fs, e);
   func = fs->freereg;
   luaK_reserveregs(fs, 2);
-  luaK_codeABC(fs, OP_SELF, func, e->u.i.info, luaK_exp2RK(fs, key));
+  luaK_codeABC(fs, OP_SELF, func, e->info, luaK_exp2RK(fs, key));
   freeexp(fs, key);
-  e->u.i.info = func;
+  e->info = func;
   e->k = VNONRELOC;
 }
 
 
-static OpCode invertoperator (OpCode op) {
-  switch (op) {
-    case OP_TESTNE: return OP_TESTEQ;
-    case OP_TESTEQ: return OP_TESTNE;
-    case OP_TESTLT: return OP_TESTGE;
-    case OP_TESTLE: return OP_TESTGT;
-    case OP_TESTGT: return OP_TESTLE;
-    case OP_TESTGE: return OP_TESTLT;
-    case OP_TESTT: return OP_TESTF;
-    case OP_TESTF: return OP_TESTT;
-    default: lua_assert(0); return op;  /* invalid jump instruction */
-  }
-}
-
-
 static void invertjump (FuncState *fs, expdesc *e) {
-  Instruction *pc = getjumpcontrol(fs, e->u.i.info);
-  *pc = SET_OPCODE(*pc, invertoperator(GET_OPCODE(*pc)));
+  Instruction *pc = getjumpcontrol(fs, e->info);
+  lua_assert(testOpMode(GET_OPCODE(*pc), OpModeT));
+  SETARG_B(*pc, !(GETARG_B(*pc)));
 }
 
 
-static int jumponcond (FuncState *fs, expdesc *e, OpCode op) {
+static int jumponcond (FuncState *fs, expdesc *e, int cond) {
   if (e->k == VRELOCABLE) {
     Instruction ie = getcode(fs, e);
     if (GET_OPCODE(ie) == OP_NOT) {
-      op = invertoperator(op);
       fs->pc--;  /* remove previous OP_NOT */
-      return luaK_condjump(fs, op, NO_REG, GETARG_B(ie), 0);
+      return luaK_condjump(fs, OP_TEST, NO_REG, !cond ,GETARG_B(ie));
     }
     /* else go through */
   }
   discharge2anyreg(fs, e);
   freeexp(fs, e);
-  return luaK_condjump(fs, op, NO_REG, e->u.i.info, 0);
+  return luaK_condjump(fs, OP_TEST, NO_REG, cond, e->info);
 }
 
 
@@ -515,76 +484,62 @@ void luaK_goiftrue (FuncState *fs, expdesc *e) {
   int pc;  /* pc of last jump */
   luaK_dischargevars(fs, e);
   switch (e->k) {
-    case VK: case VNUMBER: {
+    case VK: case VTRUE: {
       pc = NO_JUMP;  /* always true; do nothing */
       break;
     }
-    case VNIL: {
-      pc = luaK_codeAsBc(fs, OP_JMP, 0, NO_JUMP);  /* always jump */
+    case VFALSE: {
+      pc = luaK_jump(fs);  /* always jump */
       break;
     }
     case VJMP: {
       invertjump(fs, e);
-      pc = e->u.i.info;
-      break;
-    }
-    case VRELOCABLE:
-    case VNONRELOC: {
-      pc = jumponcond(fs, e, OP_TESTF);
+      pc = e->info;
       break;
     }
     default: {
-      pc = 0;  /* to avoid warnings */
-      lua_assert(0);  /* cannot happen */
+      pc = jumponcond(fs, e, 0);
       break;
     }
   }
   luaK_concat(fs, &e->f, pc);  /* insert last jump in `f' list */
-  luaK_patchlist(fs, e->t, luaK_getlabel(fs));
-  e->t = NO_JUMP;
 }
 
 
-static void luaK_goiffalse (FuncState *fs, expdesc *e) {
+void luaK_goiffalse (FuncState *fs, expdesc *e) {
   int pc;  /* pc of last jump */
   luaK_dischargevars(fs, e);
   switch (e->k) {
-    case VNIL: {
+    case VNIL: case VFALSE: {
       pc = NO_JUMP;  /* always false; do nothing */
       break;
     }
-    case VJMP: {
-      pc = e->u.i.info;
+    case VTRUE: {
+      pc = luaK_jump(fs);  /* always jump */
       break;
     }
-    case VK: case VNUMBER:  /* cannot optimize it (`or' must keep value) */
-    case VRELOCABLE:
-    case VNONRELOC: {
-      pc = jumponcond(fs, e, OP_TESTT);
+    case VJMP: {
+      pc = e->info;
       break;
     }
     default: {
-      pc = 0;  /* to avoid warnings */
-      lua_assert(0);  /* cannot happen */
+      pc = jumponcond(fs, e, 1);
       break;
     }
   }
   luaK_concat(fs, &e->t, pc);  /* insert last jump in `t' list */
-  luaK_patchlist(fs, e->f, luaK_getlabel(fs));
-  e->f = NO_JUMP;
 }
 
 
 static void codenot (FuncState *fs, expdesc *e) {
   luaK_dischargevars(fs, e);
   switch (e->k) {
-    case VNIL: {
-      e->u.n = 1;
-      e->k = VNUMBER;
+    case VNIL: case VFALSE: {
+      e->k = VTRUE;
       break;
     }
-    case VK:  case VNUMBER: {
-      e->k = VNIL;
+    case VK: case VTRUE: {
+      e->k = VFALSE;
       break;
     }
     case VJMP: {
@@ -595,7 +550,7 @@ static void codenot (FuncState *fs, expdesc *e) {
     case VNONRELOC: {
       discharge2anyreg(fs, e);
       freeexp(fs, e);
-      e->u.i.info = luaK_codeABC(fs, OP_NOT, 0, e->u.i.info, 0);
+      e->info = luaK_codeABC(fs, OP_NOT, 0, e->info, 0);
       e->k = VRELOCABLE;
       break;
     }
@@ -610,7 +565,7 @@ static void codenot (FuncState *fs, expdesc *e) {
 
 
 void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
-  t->u.i.aux = luaK_exp2RK(fs, k);
+  t->aux = luaK_exp2RK(fs, k);
   t->k = VINDEXED;
 }
 
@@ -618,12 +573,12 @@ void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
 void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
   if (op == OPR_MINUS) {
     luaK_exp2val(fs, e);
-    if (e->k == VNUMBER)
-      e->u.n = -e->u.n;
+    if (e->k == VK && ttisnumber(&fs->f->k[e->info]))
+      e->info = luaK_numberK(fs, -nvalue(&fs->f->k[e->info]));
     else {
       luaK_exp2anyreg(fs, e);
       freeexp(fs, e);
-      e->u.i.info = luaK_codeABC(fs, OP_UNM, 0, e->u.i.info, 0);
+      e->info = luaK_codeABC(fs, OP_UNM, 0, e->info, 0);
       e->k = VRELOCABLE;
     }
   }
@@ -636,10 +591,14 @@ void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
   switch (op) {
     case OPR_AND: {
       luaK_goiftrue(fs, v);
+      luaK_patchtohere(fs, v->t);
+      v->t = NO_JUMP;
       break;
     }
     case OPR_OR: {
       luaK_goiffalse(fs, v);
+      luaK_patchtohere(fs, v->f);
+      v->f = NO_JUMP;
       break;
     }
     case OPR_CONCAT: {
@@ -659,24 +618,43 @@ void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
 }
 
 
-
-/* opcode for each binary operator */
-static const OpCode codes[] = {  /* ORDER OPR */
-  OP_ADD, OP_SUB, OP_MUL, OP_DIV,
-  OP_POW, OP_CONCAT,
-  OP_TESTNE, OP_TESTEQ,
-  OP_TESTLT, OP_TESTLE, OP_TESTGT, OP_TESTGE
-};
-
-
-/* `inverted' opcode for each binary operator */
-/* ( -1 means operator has no inverse) */
-static const OpCode invcodes[] = {  /* ORDER OPR */
-  OP_ADD, (OpCode)-1, OP_MUL, (OpCode)-1,
-  (OpCode)-1, (OpCode)-1,
-  OP_TESTNE, OP_TESTEQ,
-  OP_TESTGT, OP_TESTGE, OP_TESTLT, OP_TESTLE
-};
+static void codebinop (FuncState *fs, expdesc *res, BinOpr op,
+                       int o1, int o2, int ic) {
+  switch (op) {
+    case OPR_SUB:
+    case OPR_DIV:
+    case OPR_POW:
+      lua_assert(!ic);
+      /* go through */
+    case OPR_ADD:
+    case OPR_MULT: {  /* ORDER OPR */
+      OpCode opc = cast(OpCode, (op - OPR_ADD) + OP_ADD);
+      res->info = luaK_codeABC(fs, opc, 0, o1, o2);
+      res->k = VRELOCABLE;
+      break;
+    }
+    case OPR_NE:
+    case OPR_EQ: {
+      res->info = luaK_condjump(fs, OP_EQ, o1, (op == OPR_EQ), o2);
+      res->k = VJMP;
+      break;
+    }
+    case OPR_LT:
+    case OPR_LE:
+    case OPR_GT:
+    case OPR_GE: {  /* ORDER OPR */
+      OpCode opc;
+      int i = op - OPR_LT;
+      if (ic)  /* operands were interchanged? */
+        i = (i+2)&3;  /* correct operator */
+      opc = cast(OpCode, i + OP_LT);
+      res->info = luaK_condjump(fs, opc, o1, 1, o2);
+      res->k = VJMP;
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
 
 
 void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
@@ -685,117 +663,82 @@ void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
       lua_assert(e1->t == NO_JUMP);  /* list must be closed */
       luaK_dischargevars(fs, e2);
       luaK_concat(fs, &e1->f, e2->f);
-      e1->k = e2->k; e1->u = e2->u; e1->t = e2->t;
+      e1->k = e2->k; e1->info = e2->info; e1->aux = e2->aux; e1->t = e2->t;
       break;
     }
     case OPR_OR: {
       lua_assert(e1->f == NO_JUMP);  /* list must be closed */
       luaK_dischargevars(fs, e2);
       luaK_concat(fs, &e1->t, e2->t);
-      e1->k = e2->k; e1->u = e2->u; e1->f = e2->f;
+      e1->k = e2->k; e1->info = e2->info; e1->aux = e2->aux; e1->f = e2->f;
       break;
     }
     case OPR_CONCAT: {
       luaK_exp2val(fs, e2);
       if (e2->k == VRELOCABLE && GET_OPCODE(getcode(fs, e2)) == OP_CONCAT) {
-        lua_assert(e1->u.i.info == GETARG_B(getcode(fs, e2))-1);
+        lua_assert(e1->info == GETARG_B(getcode(fs, e2))-1);
         freeexp(fs, e1);
-        SETARG_B(getcode(fs, e2), e1->u.i.info);
-        e1->k = e2->k; e1->u.i.info = e2->u.i.info;
+        SETARG_B(getcode(fs, e2), e1->info);
+        e1->k = e2->k; e1->info = e2->info;
       }
       else {
         luaK_exp2nextreg(fs, e2);
         freeexp(fs, e2);
         freeexp(fs, e1);
-        e1->u.i.info = luaK_codeABC(fs, codes[op], 0, e1->u.i.info,
-                                                      e2->u.i.info);
+        e1->info = luaK_codeABC(fs, OP_CONCAT, 0, e1->info, e2->info);
         e1->k = VRELOCABLE;
       }
       break;
     }
-    case OPR_EQ: case OPR_NE: {
-      luaK_exp2val(fs, e2);
-      if (e2->k == VNIL) {  /* exp x= nil ? */
-        if (e1->k == VK) {  /* constant x= nil ? */
-          if (op == OPR_EQ)  /* constant == nil ? */
-            e1->k = VNIL;  /* always false */
-          /* else always true (leave the constant itself) */
-        }
-        else {
-          OpCode opc = (op == OPR_EQ) ? OP_TESTF : OP_TESTT;
-          e1->u.i.info = jumponcond(fs, e1, opc);
-          e1->k = VJMP;
-        }
-        break;
-      }
-      /* else go through */
-    }
     default: {
       int o1, o2;
-      OpCode opc;
+      int ic;  /* interchange flag */
       if (e1->k != VK) {  /* not a constant operator? */
-        o1 = e1->u.i.info;
+        o1 = e1->info;
         o2 = luaK_exp2RK(fs, e2);  /* maybe other operator is constant... */
-        opc = codes[op];
+        ic = 0;
       }
-      else {  /* invert operands */
+      else {  /* interchange operands */
         o2 = luaK_exp2RK(fs, e1);  /* constant must be 2nd operand */
         o1 = luaK_exp2anyreg(fs, e2);  /* other operator must be in register */
-        opc = invcodes[op];  /* use inverted operator */
+        ic = 1;
       }
       freeexp(fs, e2);
       freeexp(fs, e1);
-      if (op < OPR_NE) {  /* ORDER OPR */
-        e1->u.i.info = luaK_codeABC(fs, opc, 0, o1, o2);
-        e1->k = VRELOCABLE;
-      }
-      else {  /* jump */
-        e1->u.i.info = luaK_condjump(fs, opc, o1, 0, o2);
-        e1->k = VJMP;
-      }
+      codebinop(fs, e1, op, o1, o2, ic);
     }
   }
 }
 
 
-static void codelineinfo (FuncState *fs) {
+void luaK_fixline (FuncState *fs, int line) {
+  fs->f->lineinfo[fs->pc - 1] = line;
+}
+
+
+int luaK_code (FuncState *fs, Instruction i, int line) {
   Proto *f = fs->f;
-  LexState *ls = fs->ls;
-  if (ls->lastline > fs->lastline) {
-    if (ls->lastline > fs->lastline+1) {
-      luaM_growvector(fs->L, f->lineinfo, fs->nlineinfo, f->sizelineinfo, int,
-                      MAX_INT, l_s("line info overflow"));
-      f->lineinfo[fs->nlineinfo++] = -(ls->lastline - (fs->lastline+1));
-    }
-    luaM_growvector(fs->L, f->lineinfo, fs->nlineinfo, f->sizelineinfo, int,
-                    MAX_INT, l_s("line info overflow"));
-    f->lineinfo[fs->nlineinfo++] = fs->pc;
-    fs->lastline = ls->lastline;
-  }
-}
-
-
-static int luaK_code (FuncState *fs, Instruction i) {
-  Proto *f;
-  codelineinfo(fs);
-  f = fs->f;
+  int oldsize = f->sizecode;
+  luaK_dischargejpc(fs);  /* `pc' will change */
   /* put new instruction in code array */
   luaM_growvector(fs->L, f->code, fs->pc, f->sizecode, Instruction,
-                  MAX_INT, l_s("code size overflow"));
+                  MAX_INT, "code size overflow");
   f->code[fs->pc] = i;
-/*printf("free: %d  ", fs->freereg); printopcode(f, fs->pc);*/
+  if (f->sizecode != oldsize)
+    luaM_reallocvector(fs->L, f->lineinfo, oldsize, f->sizecode, int);
+  f->lineinfo[fs->pc] = line;
   return fs->pc++;
 }
 
 
 int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) {
   lua_assert(getOpMode(o) == iABC);
-  return luaK_code(fs, CREATE_ABC(o, a, b, c));
+  return luaK_code(fs, CREATE_ABC(o, a, b, c), fs->ls->lastline);
 }
 
 
-int luaK_codeABc (FuncState *fs, OpCode o, int a, unsigned int bc) {
-  lua_assert(getOpMode(o) == iABc || getOpMode(o) == iAsBc);
-  return luaK_code(fs, CREATE_ABc(o, a, bc));
+int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
+  lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
+  return luaK_code(fs, CREATE_ABx(o, a, bc), fs->ls->lastline);
 }
 

lcode.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.h,v 1.23 2001/06/12 14:36:48 roberto Exp roberto $
+** $Id: lcode.h,v 1.36 2002/05/13 13:07:48 roberto Exp roberto $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -26,7 +26,8 @@
 typedef enum BinOpr {
   OPR_ADD, OPR_SUB, OPR_MULT, OPR_DIV, OPR_POW,
   OPR_CONCAT,
-  OPR_NE, OPR_EQ, OPR_LT, OPR_LE, OPR_GT, OPR_GE,
+  OPR_NE, OPR_EQ,
+  OPR_LT, OPR_LE, OPR_GT, OPR_GE,
   OPR_AND, OPR_OR,
   OPR_NOBINOPR
 } BinOpr;
@@ -36,14 +37,18 @@ typedef enum BinOpr {
 typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_NOUNOPR } UnOpr;
 
 
-#define luaK_codeAsBc(fs,o,A,sBc)	luaK_codeABc(fs,o,A,(sBc)+MAXARG_sBc)
+#define getcode(fs,e)	((fs)->f->code[(e)->info])
 
-void luaK_error (LexState *ls, const l_char *msg);
-int luaK_codeABc (FuncState *fs, OpCode o, int A, unsigned int Bc);
+#define luaK_codeAsBx(fs,o,A,sBx)	luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx)
+
+int luaK_code (FuncState *fs, Instruction i, int line);
+int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
 int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
+void luaK_fixline (FuncState *fs, int line);
 void luaK_nil (FuncState *fs, int from, int n);
 void luaK_reserveregs (FuncState *fs, int n);
-int luaK_stringk (FuncState *fs, TString *s);
+int luaK_stringK (FuncState *fs, TString *s);
+int luaK_numberK (FuncState *fs, lua_Number r);
 void luaK_dischargevars (FuncState *fs, expdesc *e);
 int luaK_exp2anyreg (FuncState *fs, expdesc *e);
 void luaK_exp2nextreg (FuncState *fs, expdesc *e);
@@ -52,11 +57,12 @@ int luaK_exp2RK (FuncState *fs, expdesc *e);
 void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
 void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
 void luaK_goiftrue (FuncState *fs, expdesc *e);
+void luaK_goiffalse (FuncState *fs, expdesc *e);
 void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
 void luaK_setcallreturns (FuncState *fs, expdesc *var, int nresults);
 int luaK_jump (FuncState *fs);
 void luaK_patchlist (FuncState *fs, int list, int target);
-void luaK_fixfor (FuncState *fs, int pc, int dest);
+void luaK_patchtohere (FuncState *fs, int list);
 void luaK_concat (FuncState *fs, int *l1, int l2);
 int luaK_getlabel (FuncState *fs);
 void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v);

ldblib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ldblib.c,v 1.36 2001/03/26 14:31:49 roberto Exp roberto $
+** $Id: ldblib.c,v 1.66 2002/08/06 18:01:50 roberto Exp roberto $
 ** Interface from Lua to its debug API
 ** See Copyright Notice in lua.h
 */
@@ -9,72 +9,68 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lauxlib.h"
-#include "luadebug.h"
 #include "lualib.h"
 
 
 
-static void settabss (lua_State *L, const l_char *i, const l_char *v) {
+static void settabss (lua_State *L, const char *i, const char *v) {
   lua_pushstring(L, i);
   lua_pushstring(L, v);
-  lua_settable(L, -3);
+  lua_rawset(L, -3);
 }
 
 
-static void settabsi (lua_State *L, const l_char *i, int v) {
+static void settabsi (lua_State *L, const char *i, int v) {
   lua_pushstring(L, i);
   lua_pushnumber(L, v);
-  lua_settable(L, -3);
+  lua_rawset(L, -3);
 }
 
 
 static int getinfo (lua_State *L) {
   lua_Debug ar;
-  const l_char *options = luaL_opt_string(L, 2, l_s("flnSu"));
-  l_char buff[20];
+  const char *options = luaL_opt_string(L, 2, "flnSu");
   if (lua_isnumber(L, 1)) {
-    if (!lua_getstack(L, (int)lua_tonumber(L, 1), &ar)) {
+    if (!lua_getstack(L, (int)(lua_tonumber(L, 1)), &ar)) {
       lua_pushnil(L);  /* level out of range */
       return 1;
     }
   }
   else if (lua_isfunction(L, 1)) {
+    lua_pushfstring(L, ">%s", options);
+    options = lua_tostring(L, -1);
     lua_pushvalue(L, 1);
-    sprintf(buff, l_s(">%.10s"), options);
-    options = buff;
   }
   else
-    luaL_argerror(L, 1, l_s("function or level expected"));
+    return luaL_argerror(L, 1, "function or level expected");
   if (!lua_getinfo(L, options, &ar))
-    luaL_argerror(L, 2, l_s("invalid option"));
+    return luaL_argerror(L, 2, "invalid option");
   lua_newtable(L);
   for (; *options; options++) {
     switch (*options) {
-      case l_c('S'):
-        settabss(L, l_s("source"), ar.source);
-        if (ar.source)
-          settabss(L, l_s("short_src"), ar.short_src);
-        settabsi(L, l_s("linedefined"), ar.linedefined);
-        settabss(L, l_s("what"), ar.what);
+      case 'S':
+        settabss(L, "source", ar.source);
+        settabss(L, "short_src", ar.short_src);
+        settabsi(L, "linedefined", ar.linedefined);
+        settabss(L, "what", ar.what);
         break;
-      case l_c('l'):
-        settabsi(L, l_s("currentline"), ar.currentline);
+      case 'l':
+        settabsi(L, "currentline", ar.currentline);
         break;
-      case l_c('u'):
-        settabsi(L, l_s("nups"), ar.nups);
+      case 'u':
+        settabsi(L, "nups", ar.nups);
         break;
-      case l_c('n'):
-        settabss(L, l_s("name"), ar.name);
-        settabss(L, l_s("namewhat"), ar.namewhat);
+      case 'n':
+        settabss(L, "name", ar.name);
+        settabss(L, "namewhat", ar.namewhat);
         break;
-      case l_c('f'):
-        lua_pushliteral(L, l_s("func"));
+      case 'f':
+        lua_pushliteral(L, "func");
         lua_pushvalue(L, -3);
-        lua_settable(L, -3);
+        lua_rawset(L, -3);
         break;
     }
   }
@@ -84,9 +80,9 @@ static int getinfo (lua_State *L) {
 
 static int getlocal (lua_State *L) {
   lua_Debug ar;
-  const l_char *name;
+  const char *name;
   if (!lua_getstack(L, luaL_check_int(L, 1), &ar))  /* level out of range? */
-    luaL_argerror(L, 1, l_s("level out of range"));
+    return luaL_argerror(L, 1, "level out of range");
   name = lua_getlocal(L, &ar, luaL_check_int(L, 2));
   if (name) {
     lua_pushstring(L, name);
@@ -103,86 +99,166 @@ static int getlocal (lua_State *L) {
 static int setlocal (lua_State *L) {
   lua_Debug ar;
   if (!lua_getstack(L, luaL_check_int(L, 1), &ar))  /* level out of range? */
-    luaL_argerror(L, 1, l_s("level out of range"));
-  luaL_checkany(L, 3);
+    return luaL_argerror(L, 1, "level out of range");
+  luaL_check_any(L, 3);
   lua_pushstring(L, lua_setlocal(L, &ar, luaL_check_int(L, 2)));
   return 1;
 }
 
 
 
-#define KEY_CALLHOOK	l_s("luadblibCallhook")
-#define KEY_LINEHOOK	l_s("luadblibLinehook")
+static const char KEY_HOOK = 'h';
 
 
-static void hookf (lua_State *L, const l_char *key) {
-  lua_getregistry(L);
-  lua_pushstring(L, key);
-  lua_gettable(L, -2);
+static void hookf (lua_State *L, lua_Debug *ar) {
+  static const char *const hooknames[] = {"call", "return", "line", "count"};
+  lua_pushlightuserdata(L, (void *)&KEY_HOOK);
+  lua_rawget(L, LUA_REGISTRYINDEX);
   if (lua_isfunction(L, -1)) {
-    lua_pushvalue(L, -3);  /* original argument (below table and function) */
-    lua_rawcall(L, 1, 0);
+    lua_pushstring(L, hooknames[(int)ar->event]);
+    if (ar->currentline >= 0) lua_pushnumber(L, ar->currentline);
+    else lua_pushnil(L);
+    lua_assert(lua_getinfo(L, "lS", ar));
+    lua_call(L, 2, 0);
   }
   else
     lua_pop(L, 1);  /* pop result from gettable */
-  lua_pop(L, 1);  /* pop table */
 }
 
 
-static void callf (lua_State *L, lua_Debug *ar) {
-  lua_pushstring(L, ar->event);
-  hookf(L, KEY_CALLHOOK);
+static unsigned long makemask (const char *smask, int count) {
+  unsigned long mask = 0;
+  if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
+  if (strchr(smask, 'r')) mask |= LUA_MASKRET;
+  if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+  return mask | LUA_MASKCOUNT(count);
 }
 
 
-static void linef (lua_State *L, lua_Debug *ar) {
-  lua_pushnumber(L, ar->currentline);
-  hookf(L, KEY_LINEHOOK);
+static char *unmakemask (unsigned long mask, char *smask) {
+  int i = 0;
+  if (mask & LUA_MASKCALL) smask[i++] = 'c';
+  if (mask & LUA_MASKRET) smask[i++] = 'r';
+  if (mask & LUA_MASKLINE) smask[i++] = 'l';
+  smask[i] = '\0';
+  return smask;
 }
 
 
-static void sethook (lua_State *L, const l_char *key, lua_Hook hook,
-                     lua_Hook (*sethookf)(lua_State * L, lua_Hook h)) {
-  lua_settop(L, 1);
-  if (lua_isnil(L, 1))
-    (*sethookf)(L, NULL);
-  else if (lua_isfunction(L, 1))
-    (*sethookf)(L, hook);
-  else
-    luaL_argerror(L, 1, l_s("function expected"));
-  lua_getregistry(L);
-  lua_pushstring(L, key);
-  lua_pushvalue(L, -1);  /* dup key */
-  lua_gettable(L, -3);   /* get old value */
-  lua_pushvalue(L, -2);  /* key (again) */
+static int sethook (lua_State *L) {
+  if (lua_isnoneornil(L, 1)) {
+    lua_settop(L, 1);
+    lua_sethook(L, NULL, 0);  /* turn off hooks */
+  }
+  else {
+    const char *smask = luaL_check_string(L, 2);
+    lua_Number count = luaL_opt_number(L, 3, 0);
+    luaL_check_type(L, 1, LUA_TFUNCTION);
+    luaL_arg_check(L, count <= LUA_MAXCOUNT, 2, "count too large (>= 2^24)");
+    lua_sethook(L, hookf, makemask(smask, count));
+  }
+  lua_pushlightuserdata(L, (void *)&KEY_HOOK);
   lua_pushvalue(L, 1);
-  lua_settable(L, -5);  /* set new value */
+  lua_rawset(L, LUA_REGISTRYINDEX);  /* set new hook */
+  return 0;
 }
 
 
-static int setcallhook (lua_State *L) {
-  sethook(L, KEY_CALLHOOK, callf, lua_setcallhook);
-  return 1;
+static int gethook (lua_State *L) {
+  char buff[5];
+  unsigned long mask = lua_gethookmask(L);
+  lua_pushlightuserdata(L, (void *)&KEY_HOOK);
+  lua_rawget(L, LUA_REGISTRYINDEX);   /* get hook */
+  lua_pushstring(L, unmakemask(mask, buff));
+  lua_pushnumber(L, lua_getmaskcount(mask));
+  return 3;
 }
 
 
-static int setlinehook (lua_State *L) {
-  sethook(L, KEY_LINEHOOK, linef, lua_setlinehook);
+static int debug (lua_State *L) {
+  for (;;) {
+    char buffer[250];
+    fputs("lua_debug> ", stderr);
+    if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
+        strcmp(buffer, "cont\n") == 0)
+      return 0;
+    lua_dostring(L, buffer);
+    lua_settop(L, 0);  /* remove eventual returns */
+  }
+}
+
+
+#define LEVELS1	12	/* size of the first part of the stack */
+#define LEVELS2	10	/* size of the second part of the stack */
+
+static int errorfb (lua_State *L) {
+  int level = 1;  /* skip level 0 (it's this function) */
+  int firstpart = 1;  /* still before eventual `...' */
+  lua_Debug ar;
+  if (lua_gettop(L) == 0)
+    lua_pushliteral(L, "");
+  else if (!lua_isstring(L, 1)) return 1;  /* no string message */
+  lua_pushliteral(L, "stack traceback:\n");
+  while (lua_getstack(L, level++, &ar)) {
+    if (level > LEVELS1 && firstpart) {
+      /* no more than `LEVELS2' more levels? */
+      if (!lua_getstack(L, level+LEVELS2, &ar))
+        level--;  /* keep going */
+      else {
+        lua_pushliteral(L, "\t...\n");  /* too many levels */
+        while (lua_getstack(L, level+LEVELS2, &ar))  /* find last levels */
+          level++;
+      }
+      firstpart = 0;
+      continue;
+    }
+    lua_pushliteral(L, "\t");
+    lua_getinfo(L, "Snl", &ar);
+    lua_pushfstring(L, "%s:", ar.short_src);
+    if (ar.currentline > 0)
+      lua_pushfstring(L, "%d:", ar.currentline);
+    switch (*ar.namewhat) {
+      case 'g':  /* global */ 
+      case 'l':  /* local */
+      case 'f':  /* field */
+      case 'm':  /* method */
+        lua_pushfstring(L, " in function `%s'", ar.name);
+        break;
+      default: {
+        if (*ar.what == 'm')  /* main? */
+          lua_pushfstring(L, " in main chunk");
+        else if (*ar.what == 'C')  /* C function? */
+          lua_pushfstring(L, "%s", ar.short_src);
+        else
+          lua_pushfstring(L, " in function <%s:%d>",
+                             ar.short_src, ar.linedefined);
+      }
+    }
+    lua_pushliteral(L, "\n");
+    lua_concat(L, lua_gettop(L));
+  }
+  lua_concat(L, lua_gettop(L));
   return 1;
 }
 
 
 static const luaL_reg dblib[] = {
-  {l_s("getlocal"), getlocal},
-  {l_s("getinfo"), getinfo},
-  {l_s("setcallhook"), setcallhook},
-  {l_s("setlinehook"), setlinehook},
-  {l_s("setlocal"), setlocal}
+  {"getlocal", getlocal},
+  {"getinfo", getinfo},
+  {"gethook", gethook},
+  {"sethook", sethook},
+  {"setlocal", setlocal},
+  {"debug", debug},
+  {"traceback", errorfb},
+  {NULL, NULL}
 };
 
 
 LUALIB_API int lua_dblibopen (lua_State *L) {
-  luaL_openl(L, dblib);
+  luaL_opennamedlib(L, LUA_DBLIBNAME, dblib, 0);
+  lua_pushliteral(L, "_TRACEBACK");
+  lua_pushcfunction(L, errorfb);
+  lua_settable(L, LUA_GLOBALSINDEX);
   return 0;
 }
 

ldebug.c

@@ -1,13 +1,13 @@
 /*
-** $Id: ldebug.c,v 1.86 2001/06/28 19:58:57 roberto Exp roberto $
+** $Id: ldebug.c,v 1.131 2002/08/08 20:08:41 roberto Exp roberto $
 ** Debug Interface
 ** See Copyright Notice in lua.h
 */
 
 
 #include <stdlib.h>
+#include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lapi.h"
@@ -21,61 +21,68 @@
 #include "lstring.h"
 #include "ltable.h"
 #include "ltm.h"
-#include "luadebug.h"
 #include "lvm.h"
 
 
 
-static const l_char *getfuncname (lua_State *L, CallInfo *ci,
-                                  const l_char **name);
+static const char *getfuncname (CallInfo *ci, const char **name);
 
 
+#define isLua(ci)	(!((ci)->state & CI_C))
 
-static int isLmark (CallInfo *ci) {
-  lua_assert(ci == NULL || ttype(ci->base - 1) == LUA_TFUNCTION);
-  return (ci && ci->prev && !ci_func(ci)->isC);
+
+static int currentpc (CallInfo *ci) {
+  if (!isLua(ci)) return -1;  /* function is not a Lua function? */
+  if (ci->state & CI_HASFRAME)  /* function has a frame? */
+    ci->u.l.savedpc = *ci->u.l.pc;  /* use `pc' from there */
+  /* function's pc is saved */
+  return pcRel(ci->u.l.savedpc, ci_func(ci)->l.p);
 }
 
 
-LUA_API lua_Hook lua_setcallhook (lua_State *L, lua_Hook func) {
-  lua_Hook oldhook;
+static int currentline (CallInfo *ci) {
+  int pc = currentpc(ci);
+  if (pc < 0)
+    return -1;  /* only active lua functions have current-line information */
+  else
+    return getline(ci_func(ci)->l.p, pc);
+}
+
+
+LUA_API int lua_sethook (lua_State *L, lua_Hook func, unsigned long mask) {
+  int allow;
+  CallInfo *ci;
   lua_lock(L);
-  oldhook = L->callhook;
-  L->callhook = func;
+  allow = allowhook(L);
+  if (func == NULL) mask = 0;
+  else if (mask == 0) func = NULL;
+  L->hook = func;
+  L->hookmask = mask;
+  setallowhook(L, allow);
+  resethookcount(L);
+  for (ci = L->ci; ci != L->base_ci; ci--)  /* update all `savedpc's */
+    currentpc(ci);
   lua_unlock(L);
-  return oldhook;
+  return 1;
 }
 
 
-LUA_API lua_Hook lua_setlinehook (lua_State *L, lua_Hook func) {
-  lua_Hook oldhook;
-  lua_lock(L);
-  oldhook = L->linehook;
-  L->linehook = func;
-  lua_unlock(L);
-  return oldhook;
+LUA_API lua_Hook lua_gethook (lua_State *L) {
+  return L->hook;
 }
 
 
-static CallInfo *ci_stack (lua_State *L, StkId obj) {
-  CallInfo *ci = L->ci;
-  while (ci->base > obj) ci = ci->prev;
-  return (ci != &L->basefunc) ? ci : NULL;
+LUA_API unsigned long lua_gethookmask (lua_State *L) {
+  return L->hookmask;
 }
 
 
 LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
-  CallInfo *ci;
   int status;
   lua_lock(L);
-  ci = L->ci;
-  while (level-- && ci != &L->basefunc) {
-    lua_assert(ci->base > ci->prev->base);
-    ci = ci->prev;
-  }
-  if (ci == &L->basefunc) status = 0;  /* there is no such level */
+  if (L->ci - L->base_ci <= level) status = 0;  /* there is no such level */
   else {
-    ar->_ci = ci;
+    ar->i_ci = (L->ci - L->base_ci) - level;
     status = 1;
   }
   lua_unlock(L);
@@ -83,69 +90,18 @@ LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
 }
 
 
-int luaG_getline (int *lineinfo, int pc, int refline, int *prefi) {
-  int refi;
-  if (lineinfo == NULL || pc == -1)
-    return -1;  /* no line info or function is not active */
-  refi = prefi ? *prefi : 0;
-  if (lineinfo[refi] < 0)
-    refline += -lineinfo[refi++];
-  lua_assert(lineinfo[refi] >= 0);
-  while (lineinfo[refi] > pc) {
-    refline--;
-    refi--;
-    if (lineinfo[refi] < 0)
-      refline -= -lineinfo[refi--];
-    lua_assert(lineinfo[refi] >= 0);
-  }
-  for (;;) {
-    int nextline = refline + 1;
-    int nextref = refi + 1;
-    if (lineinfo[nextref] < 0)
-      nextline += -lineinfo[nextref++];
-    lua_assert(lineinfo[nextref] >= 0);
-    if (lineinfo[nextref] > pc)
-      break;
-    refline = nextline;
-    refi = nextref;
-  }
-  if (prefi) *prefi = refi;
-  return refline;
-}
-
-
-static int currentpc (CallInfo *ci) {
-  lua_assert(isLmark(ci));
-  if (ci->pc)
-    return (*ci->pc - ci_func(ci)->f.l->code) - 1;
-  else
-    return -1;  /* function is not active */
-}
-
-
-static int currentline (CallInfo *ci) {
-  if (!isLmark(ci))
-    return -1;  /* only active lua functions have current-line information */
-  else {
-    int *lineinfo = ci_func(ci)->f.l->lineinfo;
-    return luaG_getline(lineinfo, currentpc(ci), 1, NULL);
-  }
-}
-
-
-
 static Proto *getluaproto (CallInfo *ci) {
-  return (isLmark(ci) ? ci_func(ci)->f.l : NULL);
+  return (isLua(ci) ? ci_func(ci)->l.p : NULL);
 }
 
 
-LUA_API const l_char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
-  const l_char *name;
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
+  const char *name;
   CallInfo *ci;
   Proto *fp;
   lua_lock(L);
   name = NULL;
-  ci = ar->_ci;
+  ci = L->base_ci + ar->i_ci;
   fp = getluaproto(ci);
   if (fp) {  /* is a Lua function? */
     name = luaF_getlocalname(fp, n, currentpc(ci));
@@ -157,18 +113,18 @@ LUA_API const l_char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
 }
 
 
-LUA_API const l_char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
-  const l_char *name;
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
+  const char *name;
   CallInfo *ci;
   Proto *fp;
   lua_lock(L);
   name = NULL;
-  ci = ar->_ci;
+  ci = L->base_ci + ar->i_ci;
   fp = getluaproto(ci);
   L->top--;  /* pop new value */
   if (fp) {  /* is a Lua function? */
     name = luaF_getlocalname(fp, n, currentpc(ci));
-    if (!name || name[0] == l_c('('))  /* `(' starts private locals */
+    if (!name || name[0] == '(')  /* `(' starts private locals */
       name = NULL;
     else
       setobj(ci->base+(n-1), L->top);
@@ -181,52 +137,38 @@ LUA_API const l_char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
 static void infoLproto (lua_Debug *ar, Proto *f) {
   ar->source = getstr(f->source);
   ar->linedefined = f->lineDefined;
-  ar->what = l_s("Lua");
+  ar->what = "Lua";
 }
 
 
 static void funcinfo (lua_State *L, lua_Debug *ar, StkId func) {
   Closure *cl;
-  if (ttype(func) == LUA_TFUNCTION)
+  if (ttisfunction(func))
     cl = clvalue(func);
   else {
-    luaD_error(L, l_s("value for `lua_getinfo' is not a function"));
+    luaG_runerror(L, "value for `lua_getinfo' is not a function");
     cl = NULL;  /* to avoid warnings */
   }
-  if (cl->isC) {
-    ar->source = l_s("=C");
+  if (cl->c.isC) {
+    ar->source = "=[C]";
     ar->linedefined = -1;
-    ar->what = l_s("C");
+    ar->what = "C";
   }
   else
-    infoLproto(ar, cl->f.l);
+    infoLproto(ar, cl->l.p);
   luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
   if (ar->linedefined == 0)
-    ar->what = l_s("main");
+    ar->what = "main";
 }
 
 
-static const l_char *travtagmethods (global_State *G, const TObject *o) {
-  if (ttype(o) == LUA_TFUNCTION) {
-    int e;
-    for (e=0; e<TM_N; e++) {
-      int t;
-      for (t=0; t<G->ntag; t++)
-        if (clvalue(o) == luaT_gettm(G, t, e))
-          return luaT_eventname[e];
-    }
-  }
-  return NULL;
-}
-
-
-static const l_char *travglobals (lua_State *L, const TObject *o) {
-  Hash *g = L->gt;
-  int i;
-  for (i=0; i<g->size; i++) {
-    if (luaO_equalObj(o, val(node(g, i))) &&
-        ttype(key(node(g, i))) == LUA_TSTRING)
-      return getstr(tsvalue(key(node(g, i))));
+static const char *travglobals (lua_State *L, const TObject *o) {
+  Table *g = hvalue(gt(L));
+  int i = sizenode(g);
+  while (i--) {
+    Node *n = node(g, i);
+    if (luaO_rawequalObj(o, val(n)) && ttisstring(key(n)))
+      return getstr(tsvalue(key(n)));
   }
   return NULL;
 }
@@ -235,21 +177,19 @@ static const l_char *travglobals (lua_State *L, const TObject *o) {
 static void getname (lua_State *L, const TObject *f, lua_Debug *ar) {
   /* try to find a name for given function */
   if ((ar->name = travglobals(L, f)) != NULL)
-    ar->namewhat = l_s("global");
-  /* not found: try tag methods */
-  else if ((ar->name = travtagmethods(G(L), f)) != NULL)
-    ar->namewhat = l_s("tag-method");
-  else ar->namewhat = l_s("");  /* not found at all */
+    ar->namewhat = "global";
+  else ar->namewhat = "";  /* not found */
 }
 
 
-LUA_API int lua_getinfo (lua_State *L, const l_char *what, lua_Debug *ar) {
+
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
   StkId f;
   CallInfo *ci;
   int status = 1;
   lua_lock(L);
-  if (*what != l_c('>')) {  /* function is active? */
-    ci = ar->_ci;
+  if (*what != '>') {  /* function is active? */
+    ci = L->base_ci + ar->i_ci;
     f = ci->base - 1;
   }
   else {
@@ -259,33 +199,34 @@ LUA_API int lua_getinfo (lua_State *L, const l_char *what, lua_Debug *ar) {
   }
   for (; *what; what++) {
     switch (*what) {
-      case l_c('S'): {
+      case 'S': {
         funcinfo(L, ar, f);
         break;
       }
-      case l_c('l'): {
-        ar->currentline = currentline(ci);
+      case 'l': {
+        ar->currentline = (ci) ? currentline(ci) : -1;
         break;
       }
-      case l_c('u'): {
-        ar->nups = (ttype(f) == LUA_TFUNCTION) ? clvalue(f)->nupvalues : 0;
+      case 'u': {
+        ar->nups = (ttisfunction(f)) ? clvalue(f)->c.nupvalues : 0;
         break;
       }
-      case l_c('n'): {
-        ar->namewhat = (ci) ? getfuncname(L, ci, &ar->name) : NULL;
+      case 'n': {
+        ar->namewhat = (ci) ? getfuncname(ci, &ar->name) : NULL;
         if (ar->namewhat == NULL)
           getname(L, f, ar);
         break;
       }
-      case l_c('f'): {
+      case 'f': {
         setobj(L->top, f);
-        incr_top;  /* push function */
+        status = 2;
         break;
       }
       default: status = 0;  /* invalid option */
     }
   }
   if (!ci) L->top--;  /* pop function */
+  if (status == 2) incr_top(L);
   lua_unlock(L);
   return status;
 }
@@ -304,31 +245,22 @@ LUA_API int lua_getinfo (lua_State *L, const l_char *what, lua_Debug *ar) {
 #define checkreg(pt,reg)	check((reg) < (pt)->maxstacksize)
 
 
-static int checklineinfo (const Proto *pt) {
-  int *lineinfo = pt->lineinfo;
-  if (lineinfo == NULL) return 1;
-  check(pt->sizelineinfo >= 2 && lineinfo[pt->sizelineinfo-1] == MAX_INT);
-  if (*lineinfo < 0) lineinfo++;
-  check(*lineinfo == 0);
-  return 1;
-}
-
 
 static int precheck (const Proto *pt) {
-  check(checklineinfo(pt));
   check(pt->maxstacksize <= MAXSTACK);
-  check(pt->numparams+pt->is_vararg <= pt->maxstacksize);
+  lua_assert(pt->numparams+pt->is_vararg <= pt->maxstacksize);
   check(GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN);
   return 1;
 }
 
 
-static int checkopenop (Instruction i) {
-  OpCode op = GET_OPCODE(i);
-  switch (op) {
+static int checkopenop (const Proto *pt, int pc) {
+  Instruction i = pt->code[pc+1];
+  switch (GET_OPCODE(i)) {
     case OP_CALL:
+    case OP_TAILCALL:
     case OP_RETURN: {
-      check(GETARG_B(i) == NO_REG);
+      check(GETARG_B(i) == 0);
       return 1;
     }
     case OP_SETLISTO: return 1;
@@ -341,8 +273,7 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
   int pc;
   int last;  /* stores position of last instruction that changed `reg' */
   last = pt->sizecode-1;  /* points to final return (a `neutral' instruction) */
-  if (reg == NO_REG)  /* full check? */
-    check(precheck(pt));
+  check(precheck(pt));
   for (pc = 0; pc < lastpc; pc++) {
     const Instruction i = pt->code[pc];
     OpCode op = GET_OPCODE(i);
@@ -361,34 +292,41 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
                (c >= MAXSTACK && c-MAXSTACK < pt->sizek));
         break;
       }
-      case iABc: {
-        b = GETARG_Bc(i);
+      case iABx: {
+        b = GETARG_Bx(i);
         if (testOpMode(op, OpModeK)) check(b < pt->sizek);
         break;
       }
-      case iAsBc: {
-        b = GETARG_sBc(i);
+      case iAsBx: {
+        b = GETARG_sBx(i);
         break;
       }
     }
     if (testOpMode(op, OpModesetA)) {
       if (a == reg) last = pc;  /* change register `a' */
     }
-    if (testOpMode(op, OpModeT))
-      check(GET_OPCODE(pt->code[pc+1]) == OP_CJMP);
+    if (testOpMode(op, OpModeT)) {
+      check(pc+2 < pt->sizecode);  /* check skip */
+      check(GET_OPCODE(pt->code[pc+1]) == OP_JMP);
+    }
     switch (op) {
+      case OP_LOADBOOL: {
+        check(c == 0 || pc+2 < pt->sizecode);  /* check its jump */
+        break;
+      }
       case OP_LOADNIL: {
         if (a <= reg && reg <= b)
           last = pc;  /* set registers from `a' to `b' */
         break;
       }
-      case OP_LOADUPVAL: {
+      case OP_GETUPVAL:
+      case OP_SETUPVAL: {
         check(b < pt->nupvalues);
         break;
       }
       case OP_GETGLOBAL:
       case OP_SETGLOBAL: {
-        check(ttype(&pt->k[b]) == LUA_TSTRING);
+        check(ttisstring(&pt->k[b]));
         break;
       }
       case OP_SELF: {
@@ -401,8 +339,13 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
         check(c < MAXSTACK && b < c);
         break;
       }
-      case OP_JMP:
-      case OP_CJMP: {
+      case OP_TFORLOOP:
+        checkreg(pt, a+2+c);
+        /* go through */
+      case OP_FORLOOP:
+        checkreg(pt, a+2);
+        /* go through */
+      case OP_JMP: {
         int dest = pc+1+b;
 	check(0 <= dest && dest < pt->sizecode);
         /* not full check and jump is forward and do not skip `lastpc'? */
@@ -410,16 +353,14 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
           pc += b;  /* do the jump */
         break;
       }
-      case OP_NILJMP: {
-        check(pc+2 < pt->sizecode);  /* check its jump */
-        break;
-      }
-      case OP_CALL: {
-        if (b != NO_REG) {
-          checkreg(pt, a+b);
+      case OP_CALL:
+      case OP_TAILCALL: {
+        if (b != 0) {
+          checkreg(pt, a+b-1);
         }
-        if (c == NO_REG) {
-          check(checkopenop(pt->code[pc+1]));
+        c--;  /* c = num. returns */
+        if (c == LUA_MULTRET) {
+          check(checkopenop(pt, pc));
         }
         else if (c != 0)
           checkreg(pt, a+c-1);
@@ -427,23 +368,8 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
         break;
       }
       case OP_RETURN: {
-        if (b != NO_REG && b != 0)
-          checkreg(pt, a+b-1);
-        break;
-      }
-      case OP_FORPREP:
-      case OP_TFORPREP: {
-        int dest = pc-b;  /* jump is negated here */
-        check(0 <= dest && dest < pt->sizecode &&
-              GET_OPCODE(pt->code[dest]) == op+1);
-        break;
-      }
-      case OP_FORLOOP:
-      case OP_TFORLOOP: {
-        int dest = pc+b;
-        check(0 <= dest && dest < pt->sizecode &&
-              pt->code[dest] == SET_OPCODE(i, op-1));
-        checkreg(pt, a + ((op == OP_FORLOOP) ? 2 : 3));
+        b--;  /* b = num. returns */
+        if (b > 0) checkreg(pt, a+b-1);
         break;
       }
       case OP_SETLIST: {
@@ -451,8 +377,14 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
         break;
       }
       case OP_CLOSURE: {
+        int nup;
         check(b < pt->sizep);
-        checkreg(pt, a + pt->p[b]->nupvalues - 1);
+        nup = pt->p[b]->nupvalues;
+        check(pc + nup < pt->sizecode);
+        for (; nup>0; nup--) {
+          OpCode op1 = GET_OPCODE(pt->code[pc+nup]);
+          check(op1 == OP_GETUPVAL || op1 == OP_MOVE);
+        }
         break;
       }
       default: break;
@@ -461,6 +393,10 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
   return pt->code[last];
 }
 
+#undef check
+#undef checkjump
+#undef checkreg
+
 /* }====================================================== */
 
 
@@ -469,39 +405,45 @@ int luaG_checkcode (const Proto *pt) {
 }
 
 
-static const l_char *getobjname (lua_State *L, StkId obj, const l_char **name) {
-  CallInfo *ci = ci_stack(L, obj);
-  if (isLmark(ci)) {  /* an active Lua function? */
-    Proto *p = ci_func(ci)->f.l;
+static const char *kname (Proto *p, int c) {
+  c = c - MAXSTACK;
+  if (c >= 0 && ttisstring(&p->k[c]))
+    return svalue(&p->k[c]);
+  else
+    return "?";
+}
+
+
+static const char *getobjname (CallInfo *ci, int stackpos, const char **name) {
+  if (isLua(ci)) {  /* a Lua function? */
+    Proto *p = ci_func(ci)->l.p;
     int pc = currentpc(ci);
-    int stackpos = obj - ci->base;
     Instruction i;
     *name = luaF_getlocalname(p, stackpos+1, pc);
     if (*name)  /* is a local? */
-      return l_s("local");
+      return "local";
     i = luaG_symbexec(p, pc, stackpos);  /* try symbolic execution */
     lua_assert(pc != -1);
     switch (GET_OPCODE(i)) {
       case OP_GETGLOBAL: {
-        lua_assert(ttype(&p->k[GETARG_Bc(i)]) == LUA_TSTRING);
-        *name = svalue(&p->k[GETARG_Bc(i)]);
-        return l_s("global");
+        lua_assert(ttisstring(&p->k[GETARG_Bx(i)]));
+        *name = svalue(&p->k[GETARG_Bx(i)]);
+        return "global";
       }
       case OP_MOVE: {
         int a = GETARG_A(i);
         int b = GETARG_B(i);  /* move from `b' to `a' */
         if (b < a)
-          return getobjname(L, ci->base+b, name);  /* get name for `b' */
+          return getobjname(ci, b, name);  /* get name for `b' */
         break;
       }
-      case OP_GETTABLE:
+      case OP_GETTABLE: {
+        *name = kname(p, GETARG_C(i));
+        return "field";
+      }
       case OP_SELF: {
-        int c = GETARG_C(i) - MAXSTACK;
-        if (c >= 0 && ttype(&p->k[c]) == LUA_TSTRING) {
-          *name = svalue(&p->k[c]);
-          return l_s("field");
-        }
-        break;
+        *name = kname(p, GETARG_C(i));
+        return "method";
       }
       default: break;
     }
@@ -510,57 +452,101 @@ static const l_char *getobjname (lua_State *L, StkId obj, const l_char **name) {
 }
 
 
-static const l_char *getfuncname (lua_State *L, CallInfo *ci,
-                                  const l_char **name) {
-  ci = ci->prev;  /* calling function */
-  if (ci == &L->basefunc || !isLmark(ci))
-    return NULL;  /* not an active Lua function */
-  else {
-    Proto *p = ci_func(ci)->f.l;
-    int pc = currentpc(ci);
-    Instruction i;
-    if (pc == -1) return NULL;  /* function is not activated */
-    i = p->code[pc];
-    return (GET_OPCODE(i) == OP_CALL
-             ? getobjname(L, ci->base+GETARG_A(i), name)
-             : NULL);  /* no useful name found */
-  }
+static Instruction getcurrentinstr (CallInfo *ci) {
+  return (!isLua(ci)) ? (Instruction)(-1) :
+                        ci_func(ci)->l.p->code[currentpc(ci)];
 }
 
 
-void luaG_typeerror (lua_State *L, StkId o, const l_char *op) {
-  const l_char *name;
-  const l_char *kind = getobjname(L, o, &name);
-  const l_char *t = luaT_typename(G(L), o);
+static const char *getfuncname (CallInfo *ci, const char **name) {
+  Instruction i;
+  ci--;  /* calling function */
+  i = getcurrentinstr(ci);
+  return (GET_OPCODE(i) == OP_CALL ? getobjname(ci, GETARG_A(i), name)
+                                   : NULL);  /* no useful name found */
+}
+
+
+/* only ANSI way to check whether a pointer points to an array */
+static int isinstack (CallInfo *ci, const TObject *o) {
+  StkId p;
+  for (p = ci->base; p < ci->top; p++)
+    if (o == p) return 1;
+  return 0;
+}
+
+
+void luaG_typeerror (lua_State *L, const TObject *o, const char *op) {
+  const char *name = NULL;
+  const char *t = luaT_typenames[ttype(o)];
+  const char *kind = (isinstack(L->ci, o)) ?
+                         getobjname(L->ci, o - L->ci->base, &name) : NULL;
   if (kind)
-    luaO_verror(L, l_s("attempt to %.30s %.20s `%.40s' (a %.10s value)"),
+    luaG_runerror(L, "attempt to %s %s `%s' (a %s value)",
                 op, kind, name, t);
   else
-    luaO_verror(L, l_s("attempt to %.30s a %.10s value"), op, t);
+    luaG_runerror(L, "attempt to %s a %s value", op, t);
 }
 
 
 void luaG_concaterror (lua_State *L, StkId p1, StkId p2) {
-  if (ttype(p1) == LUA_TSTRING) p1 = p2;
-  lua_assert(ttype(p1) != LUA_TSTRING);
-  luaG_typeerror(L, p1, l_s("concat"));
+  if (ttisstring(p1)) p1 = p2;
+  lua_assert(!ttisstring(p1));
+  luaG_typeerror(L, p1, "concat");
 }
 
 
-void luaG_aritherror (lua_State *L, StkId p1, TObject *p2) {
+void luaG_aritherror (lua_State *L, StkId p1, const TObject *p2) {
   TObject temp;
-  if (luaV_tonumber(p1, &temp) != NULL)
-    p1 = p2;  /* first operand is OK; error is in the second */
-  luaG_typeerror(L, p1, l_s("perform arithmetic on"));
+  if (luaV_tonumber(p1, &temp) == NULL)
+    p2 = p1;  /* first operand is wrong */
+  luaG_typeerror(L, p2, "perform arithmetic on");
 }
 
 
-void luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2) {
-  const l_char *t1 = luaT_typename(G(L), p1);
-  const l_char *t2 = luaT_typename(G(L), p2);
+int luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2) {
+  const char *t1 = luaT_typenames[ttype(p1)];
+  const char *t2 = luaT_typenames[ttype(p2)];
   if (t1[2] == t2[2])
-    luaO_verror(L, l_s("attempt to compare two %.10s values"), t1);
+    luaG_runerror(L, "attempt to compare two %s values", t1);
   else
-    luaO_verror(L, l_s("attempt to compare %.10s with %.10s"), t1, t2);
+    luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
+  return 0;
+}
+
+
+static void addinfo (lua_State *L, const char *msg) {
+  CallInfo *ci = L->ci;
+  if (!isLua(ci)) {  /* no Lua code? */
+    luaO_pushfstring(L, "%s\n", msg);  /* no extra info; just add '\n' */
+  }
+  else {  /* add file:line information */
+    char buff[LUA_IDSIZE];
+    int line = currentline(ci);
+    luaO_chunkid(buff, getstr(getluaproto(ci)->source), LUA_IDSIZE);
+    luaO_pushfstring(L, "%s:%d: %s\n", buff, line, msg);
+  }
+}
+
+
+void luaG_errormsg (lua_State *L) {
+  if (L->errfunc != 0) {  /* is there an error handling function? */
+    StkId errfunc = restorestack(L, L->errfunc);
+    if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR);
+    setobj(L->top, L->top - 1);  /* move argument */
+    setobj(L->top - 1, errfunc);  /* push function */
+    incr_top(L);
+    luaD_call(L, L->top - 2, 1);  /* call it */
+  }
+  luaD_throw(L, LUA_ERRRUN);
+}
+
+
+void luaG_runerror (lua_State *L, const char *fmt, ...) {
+  va_list argp;
+  va_start(argp, fmt);
+  addinfo(L, luaO_pushvfstring(L, fmt, argp));
+  va_end(argp);
+  luaG_errormsg(L);
 }
 

ldebug.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.h,v 1.14 2001/06/11 14:56:42 roberto Exp roberto $
+** $Id: ldebug.h,v 1.29 2002/08/08 20:08:41 roberto Exp roberto $
 ** Auxiliary functions from Debug Interface module
 ** See Copyright Notice in lua.h
 */
@@ -9,14 +9,24 @@
 
 
 #include "lstate.h"
-#include "luadebug.h"
 
 
-void luaG_typeerror (lua_State *L, StkId o, const l_char *op);
+#define pcRel(pc, p)	(cast(int, (pc) - (p)->code) - 1)
+
+#define getline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
+
+#define resethookcount(L)	(L->hookcount = lua_getmaskcount(L->hookmask))
+
+#define setallowhook(L,cond)	((L->hookmask) = ((L->hookmask) & ~1) | (cond))
+#define allowhook(L)		((L->hookmask) & 1)
+
+
+void luaG_typeerror (lua_State *L, const TObject *o, const char *opname);
 void luaG_concaterror (lua_State *L, StkId p1, StkId p2);
-void luaG_aritherror (lua_State *L, StkId p1, TObject *p2);
-int luaG_getline (int *lineinfo, int pc, int refline, int *refi);
-void luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2);
+void luaG_aritherror (lua_State *L, StkId p1, const TObject *p2);
+int luaG_ordererror (lua_State *L, const TObject *p1, const TObject *p2);
+void luaG_runerror (lua_State *L, const char *fmt, ...);
+void luaG_errormsg (lua_State *L);
 int luaG_checkcode (const Proto *pt);
 
 

ldo.c

@@ -1,23 +1,23 @@
 /*
-** $Id: ldo.c,v 1.137 2001/07/12 19:34:03 roberto Exp roberto $
+** $Id: ldo.c,v 1.191 2002/08/07 19:22:39 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
 
 
 #include <setjmp.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "ldebug.h"
 #include "ldo.h"
+#include "lfunc.h"
 #include "lgc.h"
 #include "lmem.h"
 #include "lobject.h"
+#include "lopcodes.h"
 #include "lparser.h"
 #include "lstate.h"
 #include "lstring.h"
@@ -28,105 +28,254 @@
 #include "lzio.h"
 
 
-/* space to handle stack overflow errors */
-#define EXTRA_STACK   (2*LUA_MINSTACK)
+
+/*
+** {======================================================
+** Error-recovery functions (based on long jumps)
+** =======================================================
+*/
+
+
+/* chain list of long jump buffers */
+struct lua_longjmp {
+  struct lua_longjmp *previous;
+  jmp_buf b;
+  volatile int status;  /* error code */
+};
+
+
+static void seterrorobj (lua_State *L, int errcode) {
+  switch (errcode) {
+    case LUA_ERRMEM: {
+      setsvalue(L->top, luaS_new(L, MEMERRMSG));
+      break;
+    }
+    case LUA_ERRERR: {
+      setsvalue(L->top, luaS_new(L, "error in error handling"));
+      break;
+    }
+    case LUA_ERRSYNTAX:
+    case LUA_ERRRUN: {
+      return;  /* error message already on top */
+    }
+  }
+  L->top++;
+}
+
+
+void luaD_throw (lua_State *L, int errcode) {
+  if (L->errorJmp) {
+    L->errorJmp->status = errcode;
+    longjmp(L->errorJmp->b, 1);
+  }
+  else {
+    G(L)->panic(L);
+    exit(EXIT_FAILURE);
+  }
+}
+
+
+int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
+  struct lua_longjmp lj;
+  lj.status = 0;
+  lj.previous = L->errorJmp;  /* chain new error handler */
+  L->errorJmp = &lj;
+  if (setjmp(lj.b) == 0)
+    (*f)(L, ud);
+  L->errorJmp = lj.previous;  /* restore old error handler */
+  return lj.status;
+}
 
 
 static void restore_stack_limit (lua_State *L) {
-  StkId limit = L->stack+(L->stacksize-EXTRA_STACK)-1;
-  if (L->top < limit)
-    L->stack_last = limit;
-}
-
-
-void luaD_init (lua_State *L, int stacksize) {
-  stacksize += EXTRA_STACK;
-  L->stack = luaM_newvector(L, stacksize, TObject);
-  L->stacksize = stacksize;
-  L->basefunc.base = L->top = L->stack;
-  restore_stack_limit(L);
-}
-
-
-void luaD_stackerror (lua_State *L) {
-  if (L->stack_last == L->stack+L->stacksize-1) {
-    /* overflow while handling overflow */
-    luaD_breakrun(L, LUA_ERRERR);  /* break run without error message */
+  L->stack_last = L->stack+L->stacksize-1;
+  if (L->size_ci > LUA_MAXCALLS) {  /* there was an overflow? */
+    int inuse = (L->ci - L->base_ci);
+    if (inuse + 1 < LUA_MAXCALLS)  /* can `undo' overflow? */
+      luaD_reallocCI(L, LUA_MAXCALLS);
   }
+}
+
+/* }====================================================== */
+
+
+static void correctstack (lua_State *L, TObject *oldstack) {
+  CallInfo *ci;
+  UpVal *up;
+  L->top = (L->top - oldstack) + L->stack;
+  for (up = L->openupval; up != NULL; up = up->next)
+    up->v = (up->v - oldstack) + L->stack;
+  for (ci = L->base_ci; ci <= L->ci; ci++) {
+    ci->base = (ci->base - oldstack) + L->stack;
+    ci->top = (ci->top - oldstack) + L->stack;
+    if (ci->state & CI_HASFRAME)  /* Lua function with active frame? */
+      *ci->u.l.pb = (*ci->u.l.pb - oldstack) + L->stack;  /* correct frame */
+  }
+}
+
+
+void luaD_reallocstack (lua_State *L, int newsize) {
+  TObject *oldstack = L->stack;
+  luaM_reallocvector(L, L->stack, L->stacksize, newsize, TObject);
+  L->stacksize = newsize;
+  L->stack_last = L->stack+newsize-1-EXTRA_STACK;
+  correctstack(L, oldstack);
+}
+
+
+void luaD_reallocCI (lua_State *L, int newsize) {
+  CallInfo *oldci = L->base_ci;
+  luaM_reallocvector(L, L->base_ci, L->size_ci, newsize, CallInfo);
+  L->size_ci = newsize;
+  L->ci = (L->ci - oldci) + L->base_ci;
+  L->end_ci = L->base_ci + L->size_ci;
+}
+
+
+void luaD_growstack (lua_State *L, int n) {
+  if (n <= L->stacksize)  /* double size is enough? */
+    luaD_reallocstack(L, 2*L->stacksize);
+  else
+    luaD_reallocstack(L, L->stacksize + n + EXTRA_STACK);
+}
+
+
+static void luaD_growCI (lua_State *L) {
+  if (L->size_ci > LUA_MAXCALLS)  /* overflow while handling overflow? */
+    luaD_throw(L, LUA_ERRERR);
   else {
-    L->stack_last += EXTRA_STACK;  /* to be used by error message */
-    lua_assert(L->stack_last == L->stack+L->stacksize-1);
-    luaD_error(L, l_s("stack overflow"));
+    luaD_reallocCI(L, 2*L->size_ci);
+    if (L->size_ci > LUA_MAXCALLS)
+      luaG_runerror(L, "stack overflow");
   }
 }
 
 
-/*
-** adjust top to new value; assume that new top is valid
-*/
-void luaD_adjusttop (lua_State *L, StkId newtop) {
-  while (L->top < newtop)
-    setnilvalue(L->top++);
-  L->top = newtop;  /* `newtop' could be lower than `top' */
-}
-
-
-/*
-** Open a hole inside the stack at `pos'
-*/
-static void luaD_openstack (lua_State *L, StkId pos) {
-  int i = L->top-pos; 
-  while (i--) setobj(pos+i+1, pos+i);
-  incr_top;
-}
-
-
-static void dohook (lua_State *L, lua_Debug *ar, lua_Hook hook) {
-  StkId old_top = L->top;
-  luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
-  L->allowhooks = 0;  /* cannot call hooks inside a hook */
-  lua_unlock(L);
-  (*hook)(L, ar);
-  lua_lock(L);
-  lua_assert(L->allowhooks == 0);
-  L->allowhooks = 1;
-  L->top = old_top;
-}
-
-
-void luaD_lineHook (lua_State *L, int line, lua_Hook linehook) {
-  if (L->allowhooks) {
-    lua_Debug ar;
-    ar.event = l_s("line");
-    ar._ci = L->ci;
-    ar.currentline = line;
-    dohook(L, &ar, linehook);
-  }
-}
-
-
-static void luaD_callHook (lua_State *L, lua_Hook callhook,
-                           const l_char *event) {
-  if (L->allowhooks) {
+void luaD_callhook (lua_State *L, lua_Hookevent event, int line) {
+  lua_Hook hook = L->hook;
+  if (hook && allowhook(L)) {
+    ptrdiff_t top = savestack(L, L->top);
+    ptrdiff_t ci_top = savestack(L, L->ci->top);
     lua_Debug ar;
     ar.event = event;
-    ar._ci = L->ci;
-    L->ci->pc = NULL;  /* function is not active */
-    dohook(L, &ar, callhook);
+    ar.currentline = line;
+    ar.i_ci = L->ci - L->base_ci;
+    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+    L->ci->top = L->top + LUA_MINSTACK;
+    setallowhook(L, 0);  /* cannot call hooks inside a hook */
+    lua_unlock(L);
+    (*hook)(L, &ar);
+    lua_lock(L);
+    lua_assert(!allowhook(L));
+    setallowhook(L, 1);
+    L->ci->top = restorestack(L, ci_top);
+    L->top = restorestack(L, top);
   }
 }
 
 
-static StkId callCclosure (lua_State *L, const struct Closure *cl) {
-  int nup = cl->nupvalues;  /* number of upvalues */
-  int n;
-  luaD_checkstack(L, nup+LUA_MINSTACK);  /* ensure minimum stack size */
-  for (n=0; n<nup; n++)  /* copy upvalues as extra arguments */
-    setobj(L->top++, &cl->upvalue[n]);
-  lua_unlock(L);
-  n = (*cl->f.c)(L);  /* do the actual call */
-  lua_lock(L);
-  return L->top - n;  /* return index of first result */
+static void adjust_varargs (lua_State *L, int nfixargs, StkId base) {
+  int i;
+  Table *htab;
+  TObject nname;
+  int actual = L->top - base;  /* actual number of arguments */
+  if (actual < nfixargs) {
+    luaD_checkstack(L, nfixargs - actual);
+    for (; actual < nfixargs; ++actual)
+      setnilvalue(L->top++);
+  }
+  actual -= nfixargs;  /* number of extra arguments */
+  htab = luaH_new(L, 0, 0);  /* create `arg' table */
+  for (i=0; i<actual; i++)  /* put extra arguments into `arg' table */
+    setobj(luaH_setnum(L, htab, i+1), L->top - actual + i);
+  /* store counter in field `n' */
+  setsvalue(&nname, luaS_newliteral(L, "n"));
+  setnvalue(luaH_set(L, htab, &nname), actual);
+  L->top -= actual;  /* remove extra elements from the stack */
+  sethvalue(L->top, htab);
+  incr_top(L);
+}
+
+
+static StkId tryfuncTM (lua_State *L, StkId func) {
+  const TObject *tm = luaT_gettmbyobj(L, func, TM_CALL);
+  StkId p;
+  ptrdiff_t funcr = savestack(L, func);
+  if (!ttisfunction(tm))
+    luaG_typeerror(L, func, "call");
+  /* Open a hole inside the stack at `func' */
+  for (p = L->top; p > func; p--) setobj(p, p-1);
+  incr_top(L);
+  func = restorestack(L, funcr);  /* previous call may change stack */
+  setobj(func, tm);  /* tag method is the new function to be called */
+  return func;
+}
+
+
+StkId luaD_precall (lua_State *L, StkId func) {
+  LClosure *cl;
+  ptrdiff_t funcr = savestack(L, func);
+  if (!ttisfunction(func)) /* `func' is not a function? */
+    func = tryfuncTM(L, func);  /* check the `function' tag method */
+  if (L->ci + 1 == L->end_ci) luaD_growCI(L);
+  cl = &clvalue(func)->l;
+  if (!cl->isC) {  /* Lua function? prepare its call */
+    CallInfo *ci;
+    Proto *p = cl->p;
+    if (p->is_vararg)  /* varargs? */
+      adjust_varargs(L, p->numparams, func+1);
+    luaD_checkstack(L, p->maxstacksize);
+    ci = ++L->ci;  /* now `enter' new function */
+    ci->base = restorestack(L, funcr) + 1;
+    ci->top = ci->base + p->maxstacksize;
+    ci->u.l.savedpc = p->code;  /* starting point */
+    ci->state = CI_SAVEDPC;
+    while (L->top < ci->top)
+      setnilvalue(L->top++);
+    L->top = ci->top;
+    return NULL;
+  }
+  else {  /* if is a C function, call it */
+    CallInfo *ci;
+    int n;
+    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+    ci = ++L->ci;  /* now `enter' new function */
+    ci->base = restorestack(L, funcr) + 1;
+    ci->top = L->top + LUA_MINSTACK;
+    ci->state = CI_C;  /* a C function */
+    if (L->hookmask & LUA_MASKCALL) {
+      luaD_callhook(L, LUA_HOOKCALL, -1);
+      ci = L->ci;  /* previous call may realocate `ci' */
+    }
+    lua_unlock(L);
+#ifdef LUA_COMPATUPVALUES
+    lua_pushupvalues(L);
+#endif
+    n = (*clvalue(ci->base-1)->c.f)(L);  /* do the actual call */
+    lua_lock(L);
+    return L->top - n;
+  }
+}
+
+
+void luaD_poscall (lua_State *L, int wanted, StkId firstResult) { 
+  StkId res;
+  if (L->hookmask & LUA_MASKRET) {
+    ptrdiff_t fr = savestack(L, firstResult);  /* next call may change stack */
+    luaD_callhook(L, LUA_HOOKRET, -1);
+    firstResult = restorestack(L, fr);
+  }
+  res = L->ci->base - 1;  /* res == final position of 1st result */
+  L->ci--;
+  /* move results to correct place */
+  while (wanted != 0 && firstResult < L->top) {
+    setobj(res++, firstResult++);
+    wanted--;
+  }
+  while (wanted-- > 0)
+    setnilvalue(res++);
+  L->top = res;
+  luaC_checkGC(L);
 }
 
 
@@ -136,34 +285,90 @@ static StkId callCclosure (lua_State *L, const struct Closure *cl) {
 ** When returns, all the results are on the stack, starting at the original
 ** function position.
 */ 
-void luaD_call (lua_State *L, StkId func) {
-  lua_Hook callhook;
-  StkId firstResult;
-  CallInfo ci;
-  if (ttype(func) != LUA_TFUNCTION) {
-    /* `func' is not a function; check the `function' tag method */
-    Closure *tm = luaT_gettmbyObj(G(L), func, TM_FUNCTION);
-    if (tm == NULL)
-      luaG_typeerror(L, func, l_s("call"));
-    luaD_openstack(L, func);
-    setclvalue(func, tm);  /* tag method is the new function to be called */
+void luaD_call (lua_State *L, StkId func, int nResults) {
+  StkId firstResult = luaD_precall(L, func);
+  if (firstResult == NULL) {  /* is a Lua function? */
+    firstResult = luaV_execute(L);  /* call it */
+    if (firstResult == NULL) {
+      luaD_poscall(L, 0, L->top);
+      luaG_runerror(L, "attempt to yield across tag-method/C-call boundary");
+    }
   }
-  ci.prev = L->ci;  /* chain new callinfo */
-  L->ci = &ci;
-  ci.base = func+1;
-  callhook = L->callhook;
-  if (callhook)
-    luaD_callHook(L, callhook, l_s("call"));
-  firstResult = (clvalue(func)->isC ? callCclosure(L, clvalue(func)) :
-                                      luaV_execute(L, clvalue(func), func+1));
-  if (callhook)  /* same hook that was active at entry */
-    luaD_callHook(L, callhook, l_s("return"));
-  L->ci = ci.prev;  /* unchain callinfo */
-  /* move results to `func' (to erase parameters and function) */
-  while (firstResult < L->top)
-    setobj(func++, firstResult++);
-  L->top = func;
-  luaC_checkGC(L);
+  luaD_poscall(L, nResults, firstResult);
+}
+
+
+LUA_API void lua_cobegin (lua_State *L, int nargs) {
+  lua_lock(L);
+  luaD_precall(L, L->top - (nargs+1));
+  lua_unlock(L);
+}
+
+
+static void move_results (lua_State *L, TObject *from, TObject *to) {
+  while (from < to) {
+    setobj(L->top, from);
+    from++;
+    incr_top(L);
+  }
+}
+
+
+static void resume (lua_State *L, void *ud) {
+  StkId firstResult;
+  CallInfo *ci = L->ci;
+  if (ci->state & CI_C) {  /* not first time (i.e. inside a yield)? */
+    /* finish interrupted execution of `OP_CALL' */
+    int nresults;
+    lua_assert((ci-1)->state & CI_SAVEDPC);
+    lua_assert(GET_OPCODE(*((ci-1)->u.l.savedpc - 1)) == OP_CALL ||
+               GET_OPCODE(*((ci-1)->u.l.savedpc - 1)) == OP_TAILCALL);
+    nresults = GETARG_C(*((ci-1)->u.l.savedpc - 1)) - 1;
+    luaD_poscall(L, nresults, L->top);  /* complete it */
+    if (nresults >= 0) L->top = L->ci->top;
+  }
+  firstResult = luaV_execute(L);
+  if (firstResult == NULL)   /* yield? */
+    *cast(int *, ud) = L->ci->u.c.yield_results;
+  else {  /* return */
+    *cast(int *, ud) = L->top - firstResult;
+    luaD_poscall(L, LUA_MULTRET, firstResult);  /* finalize this coroutine */
+  }
+}
+
+
+LUA_API int lua_resume (lua_State *L, lua_State *co) {
+  CallInfo *ci;
+  int numres;
+  int status;
+  lua_lock(L);
+  ci = co->ci;
+  if (ci == co->base_ci)  /* no activation record? ?? */
+    luaG_runerror(L, "cannot resume dead thread");
+  if (co->errorJmp != NULL)  /* ?? */
+    luaG_runerror(L, "cannot resume active thread");
+  status = luaD_rawrunprotected(co, resume, &numres);
+  if (status == 0)  
+    move_results(L, co->top - numres, co->top);
+  else {
+    setobj(L->top++, co->top - 1);  /* move error message to other stack */
+    co->ci = co->base_ci;  /* `kill' thread */
+  }
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_yield (lua_State *L, int nresults) {
+  CallInfo *ci;
+  lua_lock(L);
+  ci = L->ci;
+  if ((ci-1)->state & CI_C)
+    luaG_runerror(L, "cannot yield a C function");
+  lua_assert(ci->state & CI_C);  /* current function is not Lua */
+  ci->u.c.yield_results = nresults;
+  lua_unlock(L);
+  return -1;
 }
 
 
@@ -175,25 +380,37 @@ struct CallS {  /* data to `f_call' */
   int nresults;
 };
 
+
 static void f_call (lua_State *L, void *ud) {
-  struct CallS *c = (struct CallS *)ud;
-  luaD_call(L, c->func);
-  if (c->nresults != LUA_MULTRET)
-    luaD_adjusttop(L, c->func + c->nresults);
+  struct CallS *c = cast(struct CallS *, ud);
+  luaD_call(L, c->func, c->nresults);
 }
 
 
-LUA_API int lua_call (lua_State *L, int nargs, int nresults) {
-  StkId func;
+int luaD_pcall (lua_State *L, int nargs, int nresults, ptrdiff_t errfunc) {
   struct CallS c;
   int status;
-  lua_lock(L);
-  func = L->top - (nargs+1);  /* function to be called */
-  c.func = func; c.nresults = nresults;
-  status = luaD_runprotected(L, f_call, &c);
-  if (status != 0)  /* an error occurred? */
-    L->top = func;  /* remove parameters from the stack */
-  lua_unlock(L);
+  ptrdiff_t old_top = savestack(L, L->top);
+  ptrdiff_t old_ci = saveci(L, L->ci);
+  int old_allowhooks = allowhook(L);
+  ptrdiff_t old_errfunc = L->errfunc;
+  L->errfunc = errfunc;
+  c.func = L->top - (nargs+1);  /* function to be called */
+  c.nresults = nresults;
+  status = luaD_rawrunprotected(L, &f_call, &c);
+  if (status != 0) {  /* an error occurred? */
+    StkId err;  /* error msg. position */
+    seterrorobj(L, status);
+    err = L->top - 1;
+    /* remove parameters and func from the stack */
+    L->top = restorestack(L, old_top) - (nargs+1);
+    setobj(L->top++, err);  /* copy error message to corrected top */
+    luaF_close(L, L->top);  /* close eventual pending closures */
+    L->ci = restoreci(L, old_ci);
+    setallowhook(L, old_allowhooks);
+    restore_stack_limit(L);
+  }
+  L->errfunc = old_errfunc;
   return status;
 }
 
@@ -207,142 +424,38 @@ struct SParser {  /* data to `f_parser' */
 };
 
 static void f_parser (lua_State *L, void *ud) {
-  struct SParser *p = (struct SParser *)ud;
+  struct SParser *p = cast(struct SParser *, ud);
   Proto *tf = p->bin ? luaU_undump(L, p->z) : luaY_parser(L, p->z);
-  luaV_Lclosure(L, tf, 0);
+  Closure *cl = luaF_newLclosure(L, 0, gt(L));
+  cl->l.p = tf;
+  setclvalue(L->top, cl);
+  incr_top(L);
 }
 
 
-static int protectedparser (lua_State *L, ZIO *z, int bin) {
+int luaD_protectedparser (lua_State *L, ZIO *z, int bin) {
   struct SParser p;
   lu_mem old_blocks;
   int status;
-  lua_lock(L);
+  ptrdiff_t oldtopr = savestack(L, L->top);  /* save current top */
   p.z = z; p.bin = bin;
   /* before parsing, give a (good) chance to GC */
-  if (G(L)->nblocks/8 >= G(L)->GCthreshold/10)
+  if (G(L)->nblocks + G(L)->nblocks/4 >= G(L)->GCthreshold)
     luaC_collectgarbage(L);
   old_blocks = G(L)->nblocks;
-  status = luaD_runprotected(L, f_parser, &p);
+  status = luaD_rawrunprotected(L, f_parser, &p);
   if (status == 0) {
     /* add new memory to threshold (as it probably will stay) */
     lua_assert(G(L)->nblocks >= old_blocks);
     G(L)->GCthreshold += (G(L)->nblocks - old_blocks);
   }
-  else if (status == LUA_ERRRUN)  /* an error occurred: correct error code */
-    status = LUA_ERRSYNTAX;
-  lua_unlock(L);
+  else {  /* error */
+    StkId oldtop = restorestack(L, oldtopr);
+    seterrorobj(L, status);
+    setobj(oldtop, L->top - 1);  /* copy error message to old top */
+    L->top = oldtop+1;
+  }
   return status;
 }
 
 
-LUA_API int lua_loadfile (lua_State *L, const l_char *filename) {
-  ZIO z;
-  int status;
-  int bin;  /* flag for file mode */
-  int nlevel;  /* level on the stack of filename */
-  FILE *f = (filename == NULL) ? stdin : fopen(filename, l_s("r"));
-  if (f == NULL) return LUA_ERRFILE;  /* unable to open file */
-  bin = (ungetc(getc(f), f) == LUA_SIGNATURE[0]);
-  if (bin && f != stdin) {
-    fclose(f);
-    f = fopen(filename, l_s("rb"));  /* reopen in binary mode */
-    if (f == NULL) return LUA_ERRFILE;  /* unable to reopen file */
-  }
-  lua_pushliteral(L, l_s("@"));
-  lua_pushstring(L, (filename == NULL) ? l_s("(stdin)") : filename);
-  lua_concat(L, 2);
-  nlevel = lua_gettop(L);
-  filename = lua_tostring(L, -1);  /* filename = `@'..filename */
-  luaZ_Fopen(&z, f, filename);
-  status = protectedparser(L, &z, bin);
-  lua_remove(L, nlevel);  /* remove filename */
-  if (f != stdin)
-    fclose(f);
-  return status;
-}
-
-
-LUA_API int lua_loadbuffer (lua_State *L, const l_char *buff, size_t size,
-                          const l_char *name) {
-  ZIO z;
-  int status;
-  if (!name) name = l_s("?");
-  luaZ_mopen(&z, buff, size, name);
-  status = protectedparser(L, &z, buff[0]==LUA_SIGNATURE[0]);
-  return status;
-}
-
-
-
-/*
-** {======================================================
-** Error-recover functions (based on long jumps)
-** =======================================================
-*/
-
-/* chain list of long jump buffers */
-struct lua_longjmp {
-  jmp_buf b;
-  struct lua_longjmp *previous;
-  volatile int status;  /* error code */
-};
-
-
-static void message (lua_State *L, const l_char *s) {
-  StkId top = L->top;
-  luaV_getglobal(L, luaS_newliteral(L, l_s(LUA_ERRORMESSAGE)), top);
-  if (ttype(top) == LUA_TFUNCTION) {
-    incr_top;
-    setsvalue(top+1, luaS_new(L, s));
-    incr_top;
-    luaD_call(L, top);
-    L->top = top;
-  }
-}
-
-
-/*
-** Reports an error, and jumps up to the available recovery label
-*/
-void luaD_error (lua_State *L, const l_char *s) {
-  if (s) message(L, s);
-  luaD_breakrun(L, LUA_ERRRUN);
-}
-
-
-void luaD_breakrun (lua_State *L, int errcode) {
-  if (L->errorJmp) {
-    L->errorJmp->status = errcode;
-    longjmp(L->errorJmp->b, 1);
-  }
-  else {
-    if (errcode != LUA_ERRMEM)
-      message(L, l_s("unable to recover; exiting\n"));
-    exit(EXIT_FAILURE);
-  }
-}
-
-
-int luaD_runprotected (lua_State *L, void (*f)(lua_State *, void *), void *ud) {
-  CallInfo *oldci = L->ci;
-  StkId oldtop = L->top;
-  struct lua_longjmp lj;
-  int allowhooks = L->allowhooks;
-  lj.status = 0;
-  lj.previous = L->errorJmp;  /* chain new error handler */
-  L->errorJmp = &lj;
-  if (setjmp(lj.b) == 0)
-    (*f)(L, ud);
-  else {  /* an error occurred: restore the state */
-    L->allowhooks = allowhooks;
-    L->ci = oldci;
-    L->top = oldtop;
-    restore_stack_limit(L);
-  }
-  L->errorJmp = lj.previous;  /* restore old error handler */
-  return lj.status;
-}
-
-/* }====================================================== */
-

ldo.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.h,v 1.33 2001/06/05 19:41:24 roberto Exp roberto $
+** $Id: ldo.h,v 1.50 2002/08/06 15:32:22 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -10,27 +10,43 @@
 
 #include "lobject.h"
 #include "lstate.h"
+#include "lzio.h"
 
 
 /*
 ** macro to increment stack top.
 ** There must be always an empty slot at the L->stack.top
 */
-#define incr_top {if (L->top == L->stack_last) luaD_checkstack(L, 1); L->top++;}
+#define incr_top(L) \
+	{if (L->top >= L->stack_last) luaD_growstack(L, 1); L->top++;}
+
+#define luaD_checkstack(L,n)	\
+  if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TObject)) \
+    luaD_growstack(L, n)
+
+#define savestack(L,p)		((char *)(p) - (char *)L->stack)
+#define restorestack(L,n)	((TObject *)((char *)L->stack + (n)))
+
+#define saveci(L,p)		((char *)(p) - (char *)L->base_ci)
+#define restoreci(L,n)		((CallInfo *)((char *)L->base_ci + (n)))
 
 
-#define luaD_checkstack(L,n) if (L->stack_last-(n)<=L->top) luaD_stackerror(L)
+/* type of protected functions, to be ran by `runprotected' */
+typedef void (*Pfunc) (lua_State *L, void *ud);
 
+void luaD_resetprotection (lua_State *L);
+int luaD_protectedparser (lua_State *L, ZIO *z, int bin);
+void luaD_callhook (lua_State *L, lua_Hookevent event, int line);
+StkId luaD_precall (lua_State *L, StkId func);
+void luaD_call (lua_State *L, StkId func, int nResults);
+int luaD_pcall (lua_State *L, int nargs, int nresults, ptrdiff_t errfunc);
+void luaD_poscall (lua_State *L, int wanted, StkId firstResult);
+void luaD_reallocCI (lua_State *L, int newsize);
+void luaD_reallocstack (lua_State *L, int newsize);
+void luaD_growstack (lua_State *L, int n);
 
-void luaD_init (lua_State *L, int stacksize);
-void luaD_adjusttop (lua_State *L, StkId newtop);
-void luaD_lineHook (lua_State *L, int line, lua_Hook linehook);
-void luaD_call (lua_State *L, StkId func);
-void luaD_stackerror (lua_State *L);
-
-void luaD_error (lua_State *L, const l_char *s);
-void luaD_breakrun (lua_State *L, int errcode);
-int luaD_runprotected (lua_State *L, void (*f)(lua_State *, void *), void *ud);
+void luaD_throw (lua_State *L, int errcode);
+int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
 
 
 #endif

lfunc.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lfunc.c,v 1.44 2001/06/05 18:17:01 roberto Exp roberto $
+** $Id: lfunc.c,v 1.56 2002/05/02 13:06:20 roberto Exp roberto $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
@@ -7,27 +7,72 @@
 
 #include <stdlib.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lfunc.h"
 #include "lmem.h"
+#include "lobject.h"
 #include "lstate.h"
 
 
-#define sizeclosure(n)	((int)sizeof(Closure) + (int)sizeof(TObject)*((n)-1))
+#define sizeCclosure(n)	(cast(int, sizeof(CClosure)) + \
+                         cast(int, sizeof(TObject)*((n)-1)))
+
+#define sizeLclosure(n)	(cast(int, sizeof(LClosure)) + \
+                         cast(int, sizeof(TObject *)*((n)-1)))
 
 
-Closure *luaF_newclosure (lua_State *L, int nelems) {
-  Closure *c = (Closure *)luaM_malloc(L, sizeclosure(nelems));
-  c->next = G(L)->rootcl;
+
+Closure *luaF_newCclosure (lua_State *L, int nelems) {
+  Closure *c = cast(Closure *, luaM_malloc(L, sizeCclosure(nelems)));
+  c->c.isC = 1;
+  c->c.next = G(L)->rootcl;
   G(L)->rootcl = c;
-  c->mark = c;
-  c->nupvalues = nelems;
+  c->c.marked = 0;
+  c->c.nupvalues = cast(lu_byte, nelems);
   return c;
 }
 
 
+Closure *luaF_newLclosure (lua_State *L, int nelems, TObject *gt) {
+  Closure *c = cast(Closure *, luaM_malloc(L, sizeLclosure(nelems)));
+  c->l.isC = 0;
+  c->c.next = G(L)->rootcl;
+  G(L)->rootcl = c;
+  c->l.marked = 0;
+  c->l.g = *gt;
+  c->l.nupvalues = cast(lu_byte, nelems);
+  return c;
+}
+
+
+UpVal *luaF_findupval (lua_State *L, StkId level) {
+  UpVal **pp = &L->openupval;
+  UpVal *p;
+  while ((p = *pp) != NULL && p->v >= level) {
+    if (p->v == level) return p;
+    pp = &p->next;
+  }
+  p = luaM_new(L, UpVal);  /* not found: create a new one */
+  p->v = level;  /* current value lives in the stack */
+  p->next = *pp;  /* chain it in the proper position */
+  *pp = p;
+  return p;
+}
+
+
+void luaF_close (lua_State *L, StkId level) {
+  UpVal *p;
+  while ((p = L->openupval) != NULL && p->v >= level) {
+    setobj(&p->value, p->v);  /* save current value */
+    p->v = &p->value;  /* now current value lives here */
+    L->openupval = p->next;  /* remove from `open' list */
+    p->next = G(L)->rootupval;  /* chain in `closed' list */
+    G(L)->rootupval = p;
+  }
+}
+
+
 Proto *luaF_newproto (lua_State *L) {
   Proto *f = luaM_new(L, Proto);
   f->k = NULL;
@@ -43,7 +88,6 @@ Proto *luaF_newproto (lua_State *L) {
   f->marked = 0;
   f->lineinfo = NULL;
   f->sizelocvars = 0;
-  f->sizelineinfo = 0;
   f->locvars = NULL;
   f->lineDefined = 0;
   f->source = NULL;
@@ -55,16 +99,19 @@ Proto *luaF_newproto (lua_State *L) {
 
 void luaF_freeproto (lua_State *L, Proto *f) {
   luaM_freearray(L, f->code, f->sizecode, Instruction);
+  if (f->lineinfo)
+    luaM_freearray(L, f->lineinfo, f->sizecode, int);
   luaM_freearray(L, f->locvars, f->sizelocvars, struct LocVar);
   luaM_freearray(L, f->k, f->sizek, TObject);
   luaM_freearray(L, f->p, f->sizep, Proto *);
-  luaM_freearray(L, f->lineinfo, f->sizelineinfo, int);
-  luaM_freelem(L, f, Proto);
+  luaM_freelem(L, f);
 }
 
 
 void luaF_freeclosure (lua_State *L, Closure *c) {
-  luaM_free(L, c, sizeclosure(c->nupvalues));
+  int size = (c->c.isC) ? sizeCclosure(c->c.nupvalues) :
+                          sizeLclosure(c->l.nupvalues);
+  luaM_free(L, c, size);
 }
 
 
@@ -72,7 +119,7 @@ void luaF_freeclosure (lua_State *L, Closure *c) {
 ** Look for n-th local variable at line `line' in function `func'.
 ** Returns NULL if not found.
 */
-const l_char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
+const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
   int i;
   for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
     if (pc < f->locvars[i].endpc) {  /* is variable active? */

lfunc.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lfunc.h,v 1.14 2000/12/28 12:55:41 roberto Exp roberto $
+** $Id: lfunc.h,v 1.19 2001/11/29 20:22:22 roberto Exp roberto $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
@@ -11,13 +11,15 @@
 #include "lobject.h"
 
 
-
 Proto *luaF_newproto (lua_State *L);
-Closure *luaF_newclosure (lua_State *L, int nelems);
+Closure *luaF_newCclosure (lua_State *L, int nelems);
+Closure *luaF_newLclosure (lua_State *L, int nelems, TObject *gt);
+UpVal *luaF_findupval (lua_State *L, StkId level);
+void luaF_close (lua_State *L, StkId level);
 void luaF_freeproto (lua_State *L, Proto *f);
 void luaF_freeclosure (lua_State *L, Closure *c);
 
-const l_char *luaF_getlocalname (const Proto *func, int local_number, int pc);
+const char *luaF_getlocalname (const Proto *func, int local_number, int pc);
 
 
 #endif

lgc.c

@@ -1,12 +1,14 @@
 /*
-** $Id: lgc.c,v 1.108 2001/06/26 13:20:45 roberto Exp roberto $
+** $Id: lgc.c,v 1.144 2002/08/05 14:50:39 roberto Exp roberto $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
 
-#define LUA_PRIVATE
+#include <string.h>
+
 #include "lua.h"
 
+#include "ldebug.h"
 #include "ldo.h"
 #include "lfunc.h"
 #include "lgc.h"
@@ -18,18 +20,44 @@
 #include "ltm.h"
 
 
-
 typedef struct GCState {
-  Hash *tmark;  /* list of marked tables to be visited */
-  Closure *cmark;  /* list of marked closures to be visited */
+  Table *tmark;  /* list of marked tables to be visited */
+  Table *toclear;  /* list of visited weak tables (to be cleared after GC) */
+  lua_State *L;
 } GCState;
 
 
-
 /* mark a string; marks larger than 1 cannot be changed */
 #define strmark(s)    {if ((s)->tsv.marked == 0) (s)->tsv.marked = 1;}
 
 
+/* unmarked tables are represented by pointing `mark' to themselves */
+#define ismarked(x)	((x)->mark != (x))
+
+
+
+/* mark tricks for userdata */
+#define isudmarked(u)	(u->uv.len & 1)
+#define markud(u)	(u->uv.len |= 1)
+#define unmarkud(u)	(u->uv.len &= (~(size_t)1))
+
+#define isfinalized(u)		(u->uv.len & 2)
+#define markfinalized(u)	(u->uv.len |= 2)
+
+
+/* mark tricks for upvalues (assume that open upvalues are always marked) */
+#define isupvalmarked(uv)	((uv)->v != &(uv)->value)
+
+
+
+#define ismarkable(o)	(!((1 << ttype(o)) & \
+	((1 << LUA_TNIL)     | (1 << LUA_TNUMBER) | \
+	 (1 << LUA_TBOOLEAN) | (1 << LUA_TLIGHTUSERDATA))))
+
+static void reallymarkobject (GCState *st, TObject *o);
+
+#define markobject(st,o)	if (ismarkable(o)) reallymarkobject(st,o)
+
 
 static void protomark (Proto *f) {
   if (!f->marked) {
@@ -37,7 +65,7 @@ static void protomark (Proto *f) {
     f->marked = 1;
     strmark(f->source);
     for (i=0; i<f->sizek; i++) {
-      if (ttype(f->k+i) == LUA_TSTRING)
+      if (ttisstring(f->k+i))
         strmark(tsvalue(f->k+i));
     }
     for (i=0; i<f->sizep; i++)
@@ -45,22 +73,11 @@ static void protomark (Proto *f) {
     for (i=0; i<f->sizelocvars; i++)  /* mark local-variable names */
       strmark(f->locvars[i].varname);
   }
+  lua_assert(luaG_checkcode(f));
 }
 
 
-static void markclosure (GCState *st, Closure *cl) {
-  if (!ismarked(cl)) {
-    if (!cl->isC) {
-      lua_assert(cl->nupvalues == cl->f.l->nupvalues);
-      protomark(cl->f.l);
-    }
-    cl->mark = st->cmark;  /* chain it for later traversal */
-    st->cmark = cl;
-  }
-}
-
-
-static void marktable (GCState *st, Hash *h) {
+static void marktable (GCState *st, Table *h) {
   if (!ismarked(h)) {
     h->mark = st->tmark;  /* chain it for later traversal */
     st->tmark = h;
@@ -68,14 +85,45 @@ static void marktable (GCState *st, Hash *h) {
 }
 
 
-static void markobject (GCState *st, TObject *o) {
+static void markclosure (GCState *st, Closure *cl) {
+  if (!cl->c.marked) {
+    cl->c.marked = 1;
+    if (cl->c.isC) {
+      int i;
+      for (i=0; i<cl->c.nupvalues; i++)  /* mark its upvalues */
+        markobject(st, &cl->c.upvalue[i]);
+    }
+    else {
+      int i;
+      lua_assert(cl->l.nupvalues == cl->l.p->nupvalues);
+      marktable(st, hvalue(&cl->l.g));
+      protomark(cl->l.p);
+      for (i=0; i<cl->l.nupvalues; i++) {  /* mark its upvalues */
+        UpVal *u = cl->l.upvals[i];
+        if (!isupvalmarked(u)) {
+          markobject(st, &u->value);
+          u->v = NULL;  /* mark it! */
+        }
+      }
+    }
+  }
+}
+
+
+static void markudata (GCState *st, Udata *u) {
+  markud(u);
+  marktable(st, u->uv.metatable);
+}
+
+
+static void reallymarkobject (GCState *st, TObject *o) {
   switch (ttype(o)) {
     case LUA_TSTRING:
       strmark(tsvalue(o));
       break;
     case LUA_TUSERDATA:
-      if (!ismarkedudata(uvalue(o)))
-        switchudatamark(uvalue(o));
+      if (!isudmarked(uvalue(o)))
+        markudata(st, uvalue(o));
       break;
     case LUA_TFUNCTION:
       markclosure(st, clvalue(o));
@@ -84,134 +132,181 @@ static void markobject (GCState *st, TObject *o) {
       marktable(st, hvalue(o));
       break;
     }
-    default: break;  /* numbers, etc */
+    default: lua_assert(0);  /* should not be called with other types */
   }
 }
 
 
-static void markstacks (lua_State *L, GCState *st) {
-  lua_State *L1 = L;
+static void checkstacksizes (lua_State *L, StkId max) {
+  int used = L->ci - L->base_ci;  /* number of `ci' in use */
+  if (4*used < L->size_ci && 2*BASIC_CI_SIZE < L->size_ci)
+    luaD_reallocCI(L, L->size_ci/2);  /* still big enough... */
+  used = max - L->stack;  /* part of stack in use */
+  if (4*used < L->stacksize && 2*(BASIC_STACK_SIZE+EXTRA_STACK) < L->stacksize)
+    luaD_reallocstack(L, L->stacksize/2);  /* still big enough... */
+}
+
+
+static void markstacks (GCState *st) {
+  lua_State *L1 = st->L;
   do {  /* for each thread */
     StkId o, lim;
-    marktable(st, L1->gt);  /* mark table of globals */
+    CallInfo *ci;
+    if (ttisnil(defaultmeta(L1))) {  /* incomplete state? */
+      lua_assert(L1 != st->L);
+      L1 = L1->next;
+      luaE_closethread(st->L, L1->previous);  /* collect it */
+      continue;
+    }
+    markobject(st, defaultmeta(L1));
+    markobject(st, gt(L1));
+    markobject(st, registry(L1));
     for (o=L1->stack; o<L1->top; o++)
       markobject(st, o);
-    lim = (L1->stack_last - L1->ci->base > MAXSTACK) ? L1->ci->base+MAXSTACK
-                                                     : L1->stack_last;
+    lim = o;
+    for (ci = L1->base_ci; ci <= L1->ci; ci++) {
+      lua_assert(ci->top <= L1->stack_last);
+      if (lim < ci->top) lim = ci->top;
+    }
     for (; o<=lim; o++) setnilvalue(o);
+    checkstacksizes(L1, lim);
     lua_assert(L1->previous->next == L1 && L1->next->previous == L1);
     L1 = L1->next;
-  } while (L1 != L);
+  } while (L1 != st->L);
 }
 
 
-static void marktagmethods (global_State *G, GCState *st) {
-  int t;
-  for (t=0; t<G->ntag; t++) {
-    struct TM *tm = &G->TMtable[t];
-    int e;
-    if (tm->name) strmark(tm->name);
-    for (e=0; e<TM_N; e++) {
-      Closure *cl = tm->method[e];
-      if (cl) markclosure(st, cl);
+static void marktmu (GCState *st) {
+  Udata *u;
+  for (u = G(st->L)->tmudata; u; u = u->uv.next)
+    markudata(st, u);
+}
+
+
+/* move `dead' udata that need finalization to list `tmudata' */
+static void separateudata (lua_State *L) {
+  Udata **p = &G(L)->rootudata;
+  Udata *curr;
+  Udata *collected = NULL;  /* to collect udata with gc event */
+  Udata **lastcollected = &collected;
+  while ((curr = *p) != NULL) {
+    if (isudmarked(curr) || isfinalized(curr) ||
+        (fasttm(L, curr->uv.metatable, TM_GC) == NULL))
+      p = &curr->uv.next;
+    else {  /* must call its gc method */
+      *p = curr->uv.next;
+      curr->uv.next = NULL;  /* link `curr' at the end of `collected' list */
+      *lastcollected = curr;
+      lastcollected = &curr->uv.next;
     }
   }
-}
-
-
-static void traverseclosure (GCState *st, Closure *f) {
-  int i;
-  for (i=0; i<f->nupvalues; i++)  /* mark its upvalues */
-    markobject(st, &f->upvalue[i]);
+  /* insert collected udata with gc event into `tmudata' list */
+  *lastcollected = G(L)->tmudata;
+  G(L)->tmudata = collected;
 }
 
 
 static void removekey (Node *n) {
-  lua_assert(ttype(val(n)) == LUA_TNIL);
-  if (ttype(key(n)) != LUA_TNIL && ttype(key(n)) != LUA_TNUMBER)
+  setnilvalue(val(n));  /* remove corresponding value ... */
+  if (ismarkable(key(n)))
     setttype(key(n), LUA_TNONE);  /* dead key; remove it */
 }
 
 
-static void traversetable (GCState *st, Hash *h) {
+static void traversetable (GCState *st, Table *h) {
   int i;
-  int mode = h->weakmode;
-  if (mode == (LUA_WEAK_KEY | LUA_WEAK_VALUE))
-    return;  /* avoid traversing if both keys and values are weak */
-  for (i=0; i<h->size; i++) {
+  int weakkey = 0;
+  int weakvalue = 0;
+  marktable(st, h->metatable);
+  lua_assert(h->lsizenode || h->node == G(st->L)->dummynode);
+  if (h->mode & (WEAKKEY | WEAKVALUE)) {  /* weak table? */
+    weakkey = h->mode & WEAKKEY;
+    weakvalue = h->mode & WEAKVALUE;
+    h->mark = st->toclear;  /* must be cleared after GC, ... */
+    st->toclear = h;  /* ... so put in the appropriate list */
+  }
+  if (!weakvalue) {
+    i = sizearray(h);
+    while (i--)
+      markobject(st, &h->array[i]);
+  }
+  i = sizenode(h);
+  while (i--) {
     Node *n = node(h, i);
-    if (ttype(val(n)) == LUA_TNIL)
-      removekey(n);
-    else {
-      lua_assert(ttype(key(n)) != LUA_TNIL);
-      if (ttype(key(n)) != LUA_TNUMBER && !(mode & LUA_WEAK_KEY))
-        markobject(st, key(n));
-      if (!(mode & LUA_WEAK_VALUE))
-        markobject(st, val(n));
+    if (!ttisnil(val(n))) {
+      lua_assert(!ttisnil(key(n)));
+      if (!weakkey) markobject(st, key(n));
+      if (!weakvalue) markobject(st, val(n));
     }
   }
 }
 
 
-static void markall (lua_State *L) {
-  GCState st;
-  st.cmark = NULL;
-  st.tmark = NULL;
-  marktagmethods(G(L), &st);  /* mark tag methods */
-  markstacks(L, &st); /* mark all stacks */
-  marktable(&st, G(L)->type2tag);
-  marktable(&st, G(L)->registry);
-  marktable(&st, G(L)->weakregistry);
-  for (;;) {  /* mark tables and closures */
-    if (st.cmark) {
-      Closure *f = st.cmark;  /* get first closure from list */
-      st.cmark = f->mark;  /* remove it from list */
-      traverseclosure(&st, f);
-    }
-    else if (st.tmark) {
-      Hash *h = st.tmark;  /* get first table from list */
-      st.tmark = h->mark;  /* remove it from list */
-      traversetable(&st, h);
-    }
-    else break;  /* nothing else to mark */
+static void propagatemarks (GCState *st) {
+  while (st->tmark) {  /* traverse marked tables */
+    Table *h = st->tmark;  /* get first table from list */
+    st->tmark = h->mark;  /* remove it from list */
+    traversetable(st, h);
   }
 }
 
 
 static int hasmark (const TObject *o) {
   switch (ttype(o)) {
-    case LUA_TSTRING:
-      return tsvalue(o)->tsv.marked;
     case LUA_TUSERDATA:
-      return ismarkedudata(uvalue(o));
+      return isudmarked(uvalue(o));
     case LUA_TTABLE:
       return ismarked(hvalue(o));
     case LUA_TFUNCTION:
-      return ismarked(clvalue(o));
-    default:  /* number, nil */
+      return clvalue(o)->c.marked;
+    case LUA_TSTRING:
+      strmark(tsvalue(o));  /* strings are `values', so are never weak */
+      /* go through */
+    default:  /* number, nil, boolean, udataval */
       return 1;
   }
 }
 
 
-static void cleardeadnodes (Hash *h) {
-  int i;
-  for (i=0; i<h->size; i++) {
-    Node *n = node(h, i);
-    if (ttype(val(n)) == LUA_TNIL) continue;  /* empty node */
-    if (!hasmark(val(n)) || !hasmark(key(n))) {
-      setnilvalue(val(n));  /* remove value */
-      removekey(n);
+/*
+** clear collected keys from weaktables
+*/
+static void cleartablekeys (GCState *st) {
+  Table *h;
+  for (h = st->toclear; h; h = h->mark) {
+    lua_assert(h->mode & (WEAKKEY | WEAKVALUE));
+    if ((h->mode & WEAKKEY)) {  /* table may have collected keys? */
+      int i = sizenode(h);
+      while (i--) {
+        Node *n = node(h, i);
+        if (!hasmark(key(n)))  /* key was collected? */
+          removekey(n);  /* remove entry from table */
+      }
     }
   }
 }
 
 
-static void cleartables (global_State *G) {
-  Hash *h;
-  for (h = G->roottable; h; h = h->next) {
-    if (h->weakmode && ismarked(h))
-      cleardeadnodes(h);
+/*
+** clear collected values from weaktables
+*/
+static void cleartablevalues (GCState *st) {
+  Table *h;
+  for (h = st->toclear; h; h = h->mark) {
+    if ((h->mode & WEAKVALUE)) {  /* table may have collected values? */
+      int i = sizearray(h);
+      while (i--) {
+        TObject *o = &h->array[i];
+        if (!hasmark(o))  /* value was collected? */
+          setnilvalue(o);  /* remove value */
+      }
+      i = sizenode(h);
+      while (i--) {
+        Node *n = node(h, i);
+        if (!hasmark(val(n)))  /* value was collected? */
+          removekey(n);  /* remove entry from table */
+      }
+    }
   }
 }
 
@@ -232,25 +327,42 @@ static void collectproto (lua_State *L) {
 }
 
 
-static void collectclosure (lua_State *L) {
+static void collectclosures (lua_State *L) {
   Closure **p = &G(L)->rootcl;
   Closure *curr;
   while ((curr = *p) != NULL) {
-    if (ismarked(curr)) {
-      curr->mark = curr;  /* unmark */
-      p = &curr->next;
+    if (curr->c.marked) {
+      curr->c.marked = 0;
+      p = &curr->c.next;
     }
     else {
-      *p = curr->next;
+      *p = curr->c.next;
       luaF_freeclosure(L, curr);
     }
   }
 }
 
 
+static void collectupval (lua_State *L) {
+  UpVal **v = &G(L)->rootupval;
+  UpVal *curr;
+  while ((curr = *v) != NULL) {
+    if (isupvalmarked(curr)) {
+      lua_assert(curr->v == NULL);
+      curr->v = &curr->value;  /* unmark */
+      v = &curr->next;  /* next */
+    }
+    else {
+      *v = curr->next;  /* next */
+      luaM_freelem(L, curr);
+    }
+  }
+}
+
+
 static void collecttable (lua_State *L) {
-  Hash **p = &G(L)->roottable;
-  Hash *curr;
+  Table **p = &G(L)->roottable;
+  Table *curr;
   while ((curr = *p) != NULL) {
     if (ismarked(curr)) {
       curr->mark = curr;  /* unmark */
@@ -264,24 +376,18 @@ static void collecttable (lua_State *L) {
 }
 
 
-static void collectudata (lua_State *L, int keep) {
+
+static void collectudata (lua_State *L) {
   Udata **p = &G(L)->rootudata;
   Udata *curr;
   while ((curr = *p) != NULL) {
-    if (ismarkedudata(curr)) {
-      switchudatamark(curr);  /* unmark */
+    if (isudmarked(curr)) {
+      unmarkud(curr);
       p = &curr->uv.next;
     }
-    else {  /* collect */
-      int tag = curr->uv.tag;
+    else {
       *p = curr->uv.next;
-      if (keep ||  /* must keep all of them (to close state)? */
-          luaT_gettm(G(L), tag, TM_GC)) {  /* or is there a GC tag method? */
-        curr->uv.next = G(L)->TMtable[tag].collected;  /* chain udata ... */
-        G(L)->TMtable[tag].collected = curr;  /* ... to call its TM later */
-      }
-      else  /* no tag method; delete udata */
-        luaM_free(L, curr, sizeudata(curr->uv.len));
+      luaM_free(L, curr, sizeudata(curr->uv.len & (~(size_t)3)));
     }
   }
 }
@@ -305,8 +411,8 @@ static void collectstrings (lua_State *L, int all) {
       }
     }
   }
-  if (G(L)->strt.nuse < (ls_nstr)(G(L)->strt.size/4) &&
-      G(L)->strt.size > MINPOWER2)
+  if (G(L)->strt.nuse < cast(ls_nstr, G(L)->strt.size/4) &&
+      G(L)->strt.size > MINSTRTABSIZE*2)
     luaS_resize(L, G(L)->strt.size/2);  /* table is too big */
 }
 
@@ -316,71 +422,73 @@ static void collectstrings (lua_State *L, int all) {
 static void checkMbuffer (lua_State *L) {
   if (G(L)->Mbuffsize > MINBUFFER*2) {  /* is buffer too big? */
     size_t newsize = G(L)->Mbuffsize/2;  /* still larger than MINBUFFER */
-    luaM_reallocvector(L, G(L)->Mbuffer, G(L)->Mbuffsize, newsize, l_char);
+    luaM_reallocvector(L, G(L)->Mbuffer, G(L)->Mbuffsize, newsize, char);
     G(L)->Mbuffsize = newsize;
   }
 }
 
 
-static void callgcTM (lua_State *L, const TObject *obj) {
-  Closure *tm = luaT_gettmbyObj(G(L), obj, TM_GC);
+static void do1gcTM (lua_State *L, Udata *udata) {
+  const TObject *tm = fasttm(L, udata->uv.metatable, TM_GC);
   if (tm != NULL) {
-    int oldah = L->allowhooks;
-    StkId top = L->top;
-    L->allowhooks = 0;  /* stop debug hooks during GC tag methods */
-    setclvalue(top, tm);
-    setobj(top+1, obj);
+    setobj(L->top, tm);
+    setuvalue(L->top+1, udata);
     L->top += 2;
-    luaD_call(L, top);
-    L->top = top;  /* restore top */
-    L->allowhooks = oldah;  /* restore hooks */
+    luaD_call(L, L->top - 2, 0);
   }
 }
 
 
-static void callgcTMudata (lua_State *L) {
-  int tag;
-  luaD_checkstack(L, 3);
-  for (tag=G(L)->ntag-1; tag>=0; tag--) {  /* for each tag (in reverse order) */
-    Udata *udata;
-    while ((udata = G(L)->TMtable[tag].collected) != NULL) {
-      G(L)->TMtable[tag].collected = udata->uv.next;  /* remove it from list */
-      udata->uv.next = G(L)->rootudata;  /* resurect it */
-      G(L)->rootudata = udata;
-      setuvalue(L->top, udata);
-      L->top++;  /* keep it in stack to avoid being (recursively) collected */
-      callgcTM(L, L->top-1);
-      uvalue(L->top-1)->uv.tag = 0;  /* default tag (udata is `finalized') */
-      L->top--;
-    }
+static void callGCTM (lua_State *L) {
+  int oldah = allowhook(L);
+  setallowhook(L, 0);  /* stop debug hooks during GC tag methods */
+  L->top++;  /* reserve space to keep udata while runs its gc method */
+  while (G(L)->tmudata != NULL) {
+    Udata *udata = G(L)->tmudata;
+    G(L)->tmudata = udata->uv.next;  /* remove udata from `tmudata' */
+    udata->uv.next = G(L)->rootudata;  /* return it to `root' list */
+    G(L)->rootudata = udata;
+    setuvalue(L->top - 1, udata);  /* keep a reference to it */
+    unmarkud(udata);
+    markfinalized(udata);
+    do1gcTM(L, udata);
   }
+  L->top--;
+  setallowhook(L, oldah);  /* restore hooks */
 }
 
 
 void luaC_callallgcTM (lua_State *L) {
-  if (G(L)->rootudata) {  /* avoid problems with incomplete states */
-    collectudata(L, 1);  /* collect all udata into tag lists */
-    callgcTMudata(L);  /* call their GC tag methods */
-  }
+  separateudata(L);
+  callGCTM(L);  /* call their GC tag methods */
 }
 
 
 void luaC_collect (lua_State *L, int all) {
-  collectudata(L, 0);
+  collectudata(L);
   collectstrings(L, all);
   collecttable(L);
   collectproto(L);
-  collectclosure(L);
+  collectupval(L);
+  collectclosures(L);
 }
 
 
 void luaC_collectgarbage (lua_State *L) {
-  markall(L);
-  cleartables(G(L));
+  GCState st;
+  st.L = L;
+  st.tmark = NULL;
+  st.toclear = NULL;
+  markstacks(&st); /* mark all stacks */
+  propagatemarks(&st);  /* mark all reachable objects */
+  cleartablevalues(&st);
+  separateudata(L);  /* separate userdata to be preserved */
+  marktmu(&st);  /* mark `preserved' userdata */
+  propagatemarks(&st);  /* remark */
+  cleartablekeys(&st);
   luaC_collect(L, 0);
   checkMbuffer(L);
   G(L)->GCthreshold = 2*G(L)->nblocks;  /* new threshold */
-  callgcTMudata(L);
-  callgcTM(L, &luaO_nilobject);
+  callGCTM(L);
 }
 

lgc.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.h,v 1.11 2001/06/12 18:43:13 roberto Exp roberto $
+** $Id: lgc.h,v 1.1 2001/11/29 22:14:34 rieru Exp rieru $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */

liolib.c

@@ -1,56 +1,46 @@
 /*
-** $Id: liolib.c,v 1.120 2001/07/16 18:48:31 roberto Exp roberto $
+** $Id: liolib.c,v 2.14 2002/07/17 16:25:13 roberto Exp roberto $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
 
 
+#include <errno.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lauxlib.h"
-#include "luadebug.h"
 #include "lualib.h"
 
 
-#ifndef OLD_ANSI
-#include <errno.h>
-#include <locale.h>
+
+/*
+** {======================================================
+** FILE Operations
+** =======================================================
+*/
+
+
+#ifndef POPEN
+#define pclose(f)    (-1)
 #endif
 
 
+#define FILEHANDLE		"FileHandle"
+#define CLOSEDFILEHANDLE	"ClosedFileHandle"
 
-#ifdef POPEN
-/* FILE *popen();
-int pclose(); */
-#define CLOSEFILE(L, f)    ((pclose(f) == -1) ? fclose(f) : 0)
-#else
-/* no support for popen */
-#define popen(x,y) NULL  /* that is, popen always fails */
-#define CLOSEFILE(L, f)    (fclose(f))
-#endif
-
-
-#define INFILE	0
-#define OUTFILE 1
-#define NOFILE	2
-
-#define FILEHANDLE		l_s("FileHandle")
-#define CLOSEDFILEHANDLE	l_s("ClosedFileHandle")
-
-
-static const l_char *const filenames[] = {l_s("_INPUT"), l_s("_OUTPUT")};
-static const l_char *const basicfiles[] = {l_s("_STDIN"), l_s("_STDOUT")};
+#define IO_INPUT		"_input"
+#define IO_OUTPUT		"_output"
 
 
 static int pushresult (lua_State *L, int i) {
   if (i) {
-    lua_pushnumber(L, 1);
+    lua_pushboolean(L, 1);
     return 1;
   }
   else {
@@ -62,134 +52,136 @@ static int pushresult (lua_State *L, int i) {
 }
 
 
-/*
-** {======================================================
-** FILE Operations
-** =======================================================
-*/
-
-
-#define checkfile(L,f)	(strcmp(lua_type(L,(f)), FILEHANDLE) == 0)
-
-
-static FILE *getopthandle (lua_State *L, int inout) {
-  FILE *p = (FILE *)lua_touserdata(L, 1);
-  if (p != NULL) {  /* is it a userdata ? */
-    if (!checkfile(L, 1)) {  /* not a valid file handle? */
-      if (strcmp(lua_type(L, 1), CLOSEDFILEHANDLE) == 0)
-        luaL_argerror(L, 1, l_s("file is closed"));
-      else
-        luaL_argerror(L, 1, l_s("(invalid value)"));
-    }
-    lua_pushvalue(L, 1); lua_remove(L, 1);  /* move it to stack top */
+static FILE *tofile (lua_State *L, int findex) {
+  FILE **f = (FILE **)lua_touserdata(L, findex);
+  if (f && lua_getmetatable(L, findex) &&
+      lua_rawequal(L, -1, lua_upvalueindex(1))) {
+    lua_pop(L, 1);
+    return *f;
   }
-  else {  /* try global value */
-    lua_getglobal(L, filenames[inout]);
-    if (!checkfile(L,-1))
-      luaL_verror(L, l_s("global variable `%.10s' is not a valid file handle"),
-                  filenames[inout]);
-    p = (FILE *)lua_touserdata(L, -1);
-  }
-  return p;  /* leave handle at stack top to avoid GC */
+  if (findex > 0)
+    luaL_argerror(L, findex, "bad file");
+  return NULL;
 }
 
 
 static void newfile (lua_State *L, FILE *f) {
-  lua_newuserdatabox(L, f);
-  lua_settag(L, lua_name2tag(L, FILEHANDLE));
+  lua_boxpointer(L, f);
+  lua_pushliteral(L, FILEHANDLE);
+  lua_rawget(L, LUA_REGISTRYINDEX);
+  lua_setmetatable(L, -2);
 }
 
 
-static void newfilewithname (lua_State *L, FILE *f, const l_char *name) {
+static void registerfile (lua_State *L, FILE *f, const char *name,
+                                                 const char *impname) {
+  lua_pushstring(L, name);
   newfile(L, f);
-  lua_setglobal(L, name);
+  if (impname) {
+    lua_pushstring(L, impname);
+    lua_pushvalue(L, -2);
+    lua_settable(L, -6);
+  }
+  lua_settable(L, -3);
 }
 
 
-static int setnewfile (lua_State *L, FILE *f, int inout) {
+static int setnewfile (lua_State *L, FILE *f) {
   if (f == NULL)
     return pushresult(L, 0);
   else {
     newfile(L, f);
-    if (inout != NOFILE) {
-      lua_pushvalue(L, -1);
-      lua_setglobal(L, filenames[inout]);
-    }
     return 1;
   }
 }
 
 
-static void resetfile (lua_State *L, int inout) {
-  lua_getglobal(L, basicfiles[inout]);
-  lua_setglobal(L, filenames[inout]);
-}
-
-
 static int io_close (lua_State *L) {
-  FILE *f = (FILE *)luaL_check_userdata(L, 1, FILEHANDLE);
+  FILE *f;
   int status = 1;
+  if (lua_isnone(L, 1)) {
+    lua_pushstring(L, IO_OUTPUT);
+    lua_rawget(L, lua_upvalueindex(1));
+  }
+  f = tofile(L, 1);
   if (f != stdin && f != stdout && f != stderr) {
     lua_settop(L, 1);  /* make sure file is on top */
-    lua_settag(L, lua_name2tag(L, CLOSEDFILEHANDLE));
-    status = (CLOSEFILE(L, f) == 0);
+    lua_pushliteral(L, CLOSEDFILEHANDLE);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_setmetatable(L, 1);
+    status = (pclose(f) != -1) || (fclose(f) == 0);
   }
   return pushresult(L, status);
 }
 
 
-static int file_collect (lua_State *L) {
-  FILE *f = (FILE *)luaL_check_userdata(L, 1, FILEHANDLE);
-  if (f != stdin && f != stdout && f != stderr)
-    CLOSEFILE(L, f);
-  return 0;
+static int io_open (lua_State *L) {
+  FILE *f = fopen(luaL_check_string(L, 1), luaL_opt_string(L, 2, "r"));
+  return setnewfile(L, f);
 }
 
 
-static int io_open (lua_State *L) {
-  FILE *f = fopen(luaL_check_string(L, 1), luaL_check_string(L, 2));
-  return setnewfile(L, f, NOFILE);
+static int io_popen (lua_State *L) {
+#ifndef POPEN
+  luaL_error(L, "`popen' not supported");
+  return 0;
+#else
+  FILE *f = popen(luaL_check_string(L, 1), luaL_opt_string(L, 2, "r"));
+  return setnewfile(L, f);
+#endif
 }
 
 
 static int io_tmpfile (lua_State *L) {
-  return setnewfile(L, tmpfile(), NOFILE);
+  return setnewfile(L, tmpfile());
 }
 
 
+static FILE *getiofile (lua_State *L, const char *name) {
+  FILE *f;
+  lua_pushstring(L, name);
+  lua_rawget(L, lua_upvalueindex(1));
+  f = tofile(L, -1);
+  if (f == NULL)
+    luaL_error(L, "%s is closed", name);
+  return f;
+}
 
-static int io_fromto (lua_State *L, int inout, const l_char *mode) {
-  FILE *current;
-  if (lua_isnull(L, 1)) {
-    getopthandle(L, inout);
-    resetfile(L, inout);
-    return io_close(L);
+
+static int g_iofile (lua_State *L, const char *name, const char *mode) {
+  if (lua_isnoneornil(L, 1)) {
+    lua_pushstring(L, name);
+    lua_rawget(L, lua_upvalueindex(1));
+    return 1;
   }
   else {
-    const l_char *s = luaL_check_string(L, 1);
-    current = (*s == l_c('|')) ? popen(s+1, mode) : fopen(s, mode);
-    return setnewfile(L, current, inout);
+    const char *filename = lua_tostring(L, 1);
+    lua_pushstring(L, name);
+    if (filename) {
+      FILE *f = fopen(filename, mode);
+      luaL_arg_check(L, f, 1,  strerror(errno));
+      newfile(L, f);
+    }
+    else {
+      tofile(L, 1);  /* check that it's a valid file handle */
+      lua_pushvalue(L, 1);
+    }
+    lua_rawset(L, lua_upvalueindex(1));
+    return 0;
   }
 }
 
 
-static int io_readfrom (lua_State *L) {
-  return io_fromto(L, INFILE, l_s("r"));
+static int io_input (lua_State *L) {
+  return g_iofile(L, IO_INPUT, "r");
 }
 
 
-static int io_writeto (lua_State *L) {
-  return io_fromto(L, OUTFILE, l_s("w"));
+static int io_output (lua_State *L) {
+  return g_iofile(L, IO_OUTPUT, "w");
 }
 
 
-static int io_appendto (lua_State *L) {
-  FILE *current = fopen(luaL_check_string(L, 1), l_s("a"));
-  return setnewfile(L, current, OUTFILE);
-}
-
-
-
 /*
 ** {======================================================
 ** READ
@@ -197,65 +189,9 @@ static int io_appendto (lua_State *L) {
 */
 
 
-#ifndef LUA_MAXUNTIL
-#define LUA_MAXUNTIL	100
-#endif
-
-
-/*
-** Knuth-Morris-Pratt algorithm for string searching
-** (based on `Algorithms in MODULA-3', Robert Sedgewick;
-**  Addison-Wesley, 1993.)
-*/
-
-static void prep_read_until (int next[], const l_char *p, int pl) {
-  int i = 0;
-  int j = -1;
-  next[0] = -1;
-  while (i < pl) {
-    if (j == -1 || p[i] == p[j]) {
-      i++; j++; next[i] = j;
-    }
-    else j = next[j];
-  }
-}
-
-
-static int read_until (lua_State *L, FILE *f, const l_char *p, int pl) {
-  l_charint c;
-  int j;
-  int next[LUA_MAXUNTIL+1];
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  prep_read_until(next, p, pl);
-  j = 0;
-  while ((c = getc(f)) != EOF) {
-  NoRead:
-    if (c == p[j]) {
-      j++;  /* go to next char in pattern */
-      if (j == pl) {  /* complete match? */
-        luaL_pushresult(&b);  /* close buffer */
-        return 1;  /* always success */
-      }
-    }
-    else if (j == 0)
-      luaL_putchar(&b, c);
-    else {  /* match fail */
-      luaL_addlstring(&b, p, j - next[j]);  /* put failed part on result */
-      j = next[j];  /* backtrack pattern index */
-      goto NoRead;  /* repeat without reading next char */
-    }
-  }
-  /* end of file without a match */
-  luaL_addlstring(&b, p, j);  /* put failed part on result */
-  luaL_pushresult(&b);  /* close buffer */
-  return (lua_strlen(L, -1) > 0);
-}
-
-
 static int read_number (lua_State *L, FILE *f) {
-  double d;
-  if (fscanf(f, l_s(LUA_NUMBER_SCAN), &d) == 1) {
+  lua_Number d;
+  if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
     lua_pushnumber(L, d);
     return 1;
   }
@@ -264,13 +200,35 @@ static int read_number (lua_State *L, FILE *f) {
 
 
 static int test_eof (lua_State *L, FILE *f) {
-  l_charint c = getc(f);
+  int c = getc(f);
   ungetc(c, f);
   lua_pushlstring(L, NULL, 0);
   return (c != EOF);
 }
 
 
+static int read_line (lua_State *L, FILE *f) {
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  for (;;) {
+    size_t l;
+    char *p = luaL_prepbuffer(&b);
+    if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) {  /* eof? */
+      luaL_pushresult(&b);  /* close buffer */
+      return (lua_strlen(L, -1) > 0);  /* check whether read something */
+    }
+    l = strlen(p);
+    if (p[l-1] != '\n')
+      luaL_addsize(&b, l);
+    else {
+      luaL_addsize(&b, l - 1);  /* do not include `eol' */
+      luaL_pushresult(&b);  /* close buffer */
+      return 1;  /* read at least an `eol' */
+    }
+  }
+}
+
+
 static int read_chars (lua_State *L, FILE *f, size_t n) {
   size_t rlen;  /* how much to read */
   size_t nr;  /* number of chars actually read */
@@ -278,9 +236,9 @@ static int read_chars (lua_State *L, FILE *f, size_t n) {
   luaL_buffinit(L, &b);
   rlen = LUAL_BUFFERSIZE;  /* try to read that much each time */
   do {
-    l_char *p = luaL_prepbuffer(&b);
+    char *p = luaL_prepbuffer(&b);
     if (rlen > n) rlen = n;  /* cannot read more than asked */
-    nr = fread(p, sizeof(l_char), rlen, f);
+    nr = fread(p, sizeof(char), rlen, f);
     luaL_addsize(&b, nr);
     n -= nr;  /* still have to read `n' chars */
   } while (n > 0 && nr == rlen);  /* until end of count or eof */
@@ -289,51 +247,41 @@ static int read_chars (lua_State *L, FILE *f, size_t n) {
 }
 
 
-static int io_read (lua_State *L) {
-  FILE *f = getopthandle(L, INFILE);
+static int g_read (lua_State *L, FILE *f, int first) {
   int nargs = lua_gettop(L) - 1;
   int success;
   int n;
   if (nargs == 0) {  /* no arguments? */
-    success = read_until(L, f, l_s("\n"), 1);  /* read until \n (a line) */
-    n = 2;  /* will return n-1 results */
+    success = read_line(L, f);
+    n = first+1;  /* to return 1 result */
   }
   else {  /* ensure stack space for all results and for auxlib's buffer */
-    luaL_checkstack(L, nargs+LUA_MINSTACK, l_s("too many arguments"));
+    luaL_check_stack(L, nargs+LUA_MINSTACK, "too many arguments");
     success = 1;
-    for (n = 1; n<=nargs && success; n++) {
-      if (lua_rawtag(L, n) == LUA_TNUMBER) {
+    for (n = first; nargs-- && success; n++) {
+      if (lua_type(L, n) == LUA_TNUMBER) {
         size_t l = (size_t)lua_tonumber(L, n);
         success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
       }
       else {
-        const l_char *p = lua_tostring(L, n);
-        if (!p || p[0] != l_c('*'))
-          lua_error(L, l_s("invalid `read' option"));
+        const char *p = lua_tostring(L, n);
+        if (!p || p[0] != '*')
+          return luaL_error(L, "invalid `read' option");
         switch (p[1]) {
-          case l_c('n'):  /* number */
+          case 'n':  /* number */
             success = read_number(L, f);
             break;
-          case l_c('l'):  /* line */
-            success = read_until(L, f, l_s("\n"), 1);  /* read until \n */
+          case 'l':  /* line */
+            success = read_line(L, f);
             break;
-          case l_c('a'):  /* file */
+          case 'a':  /* file */
             read_chars(L, f, ~((size_t)0));  /* read MAX_SIZE_T chars */
             success = 1; /* always success */
             break;
-          case l_c('w'):  /* word */
-            lua_error(L, l_s("option `*w' is deprecated"));
-            break;
-          case l_c('u'): {  /* read until */
-            size_t pl = lua_strlen(L, n) - 2;
-            luaL_arg_check(L, 0 < pl && pl <= LUA_MAXUNTIL, n,
-                              l_s("invalid read-until length"));
-            success = read_until(L, f, p+2, (int)pl);
-            break;
-          }
+          case 'w':  /* word */
+            return luaL_error(L, "obsolete option `*w'");
           default:
-            luaL_argerror(L, n, l_s("invalid format"));
-            success = 0;  /* to avoid warnings */
+            return luaL_argerror(L, n, "invalid format");
         }
       }
     }
@@ -342,27 +290,35 @@ static int io_read (lua_State *L) {
     lua_pop(L, 1);  /* remove last result */
     lua_pushnil(L);  /* push nil instead */
   }
-  return n - 1;
+  return n - first;
+}
+
+
+static int io_read (lua_State *L) {
+  return g_read(L, getiofile(L, IO_INPUT), 1);
+}
+
+
+static int f_read (lua_State *L) {
+  return g_read(L, tofile(L, 1), 2);
 }
 
 /* }====================================================== */
 
 
-static int io_write (lua_State *L) {
-  FILE *f = getopthandle(L, OUTFILE);
-  int nargs = lua_gettop(L)-1;
-  int arg;
+static int g_write (lua_State *L, FILE *f, int arg) {
+  int nargs = lua_gettop(L) - 1;
   int status = 1;
-  for (arg=1; arg<=nargs; arg++) {
-    if (lua_rawtag(L, arg) == LUA_TNUMBER) {
+  for (; nargs--; arg++) {
+    if (lua_type(L, arg) == LUA_TNUMBER) {
       /* optimization: could be done exactly as for strings */
       status = status &&
-          fprintf(f, l_s(LUA_NUMBER_FMT), lua_tonumber(L, arg)) > 0;
+          fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
     }
     else {
       size_t l;
-      const l_char *s = luaL_check_lstr(L, arg, &l);
-      status = status && (fwrite(s, sizeof(l_char), l, f) == l);
+      const char *s = luaL_check_lstr(L, arg, &l);
+      status = status && (fwrite(s, sizeof(char), l, f) == l);
     }
   }
   pushresult(L, status);
@@ -370,13 +326,23 @@ static int io_write (lua_State *L) {
 }
 
 
-static int io_seek (lua_State *L) {
+static int io_write (lua_State *L) {
+  return g_write(L, getiofile(L, IO_OUTPUT), 1);
+}
+
+
+static int f_write (lua_State *L) {
+  return g_write(L, tofile(L, 1), 2);
+}
+
+
+static int f_seek (lua_State *L) {
   static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
-  static const l_char *const modenames[] = {l_s("set"), l_s("cur"), l_s("end"), NULL};
-  FILE *f = (FILE *)luaL_check_userdata(L, 1, FILEHANDLE);
-  int op = luaL_findstring(luaL_opt_string(L, 2, l_s("cur")), modenames);
+  static const char *const modenames[] = {"set", "cur", "end", NULL};
+  FILE *f = tofile(L, 1);
+  int op = luaL_findstring(luaL_opt_string(L, 2, "cur"), modenames);
   long offset = luaL_opt_long(L, 3, 0);
-  luaL_arg_check(L, op != -1, 2, l_s("invalid mode"));
+  luaL_arg_check(L, op != -1, 2, "invalid mode");
   op = fseek(f, offset, mode[op]);
   if (op)
     return pushresult(L, 0);  /* error */
@@ -388,9 +354,59 @@ static int io_seek (lua_State *L) {
 
 
 static int io_flush (lua_State *L) {
-  FILE *f = (lua_isnull(L, 1)) ? (FILE *)NULL :
-                                 (FILE *)luaL_check_userdata(L, 1, FILEHANDLE);
-  return pushresult(L, fflush(f) == 0);
+  return pushresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0);
+}
+
+
+static int f_flush (lua_State *L) {
+  return pushresult(L, fflush(tofile(L, 1)) == 0);
+}
+
+
+static const luaL_reg iolib[] = {
+  {"input", io_input},
+  {"output", io_output},
+  {"close", io_close},
+  {"flush", io_flush},
+  {"open", io_open},
+  {"popen", io_popen},
+  {"read", io_read},
+  {"tmpfile", io_tmpfile},
+  {"write", io_write},
+  {NULL, NULL}
+};
+
+
+static const luaL_reg flib[] = {
+  {"flush", f_flush},
+  {"read", f_read},
+  {"seek", f_seek},
+  {"write", f_write},
+  {"close", io_close},
+  {NULL, NULL}
+};
+
+
+static void createmeta (lua_State *L) {
+  lua_pushliteral(L, FILEHANDLE);  /* S: FH */
+  lua_newtable(L);  /* S: mt FH */
+  /* close files when collected */
+  lua_pushliteral(L, "__gc");  /* S: `gc' mt FH */
+  lua_pushvalue(L, -2);  /* S: mt `gc' mt FH */
+  lua_pushcclosure(L, io_close, 1);  /* S: close `gc' mt FH */
+  lua_rawset(L, -3);  /* S: mt FH */
+  /* file methods */
+  lua_pushliteral(L, "__gettable");  /* S: `gettable' mt FH */
+  lua_pushvalue(L, -2);  /* S: mt `gettable' mt FH */
+  lua_rawset(L, -3);  /* S: mt FH */
+  lua_pushvalue(L, -1);  /* S: mt mt FH */
+  luaL_openlib(L, flib, 1);  /* S: mt FH */
+  /* put new metatable into registry */
+  lua_rawset(L, LUA_REGISTRYINDEX);  /* S: empty */
+  /* meta table for CLOSEDFILEHANDLE */
+  lua_pushliteral(L, CLOSEDFILEHANDLE);
+  lua_newtable(L);
+  lua_rawset(L, LUA_REGISTRYINDEX);
 }
 
 /* }====================================================== */
@@ -420,15 +436,14 @@ static int io_rename (lua_State *L) {
 
 
 static int io_tmpname (lua_State *L) {
-  l_char buff[L_tmpnam];
+  char buff[L_tmpnam];
   if (tmpnam(buff) != buff)
-    lua_error(L, l_s("unable to generate a unique filename"));
+    return luaL_error(L, "unable to generate a unique filename");
   lua_pushstring(L, buff);
   return 1;
 }
 
 
-
 static int io_getenv (lua_State *L) {
   lua_pushstring(L, getenv(luaL_check_string(L, 1)));  /* if NULL push nil */
   return 1;
@@ -449,22 +464,37 @@ static int io_clock (lua_State *L) {
 ** =======================================================
 */
 
-static void setfield (lua_State *L, const l_char *key, int value) {
+static void setfield (lua_State *L, const char *key, int value) {
   lua_pushstring(L, key);
   lua_pushnumber(L, value);
   lua_rawset(L, -3);
 }
 
+static void setboolfield (lua_State *L, const char *key, int value) {
+  lua_pushstring(L, key);
+  lua_pushboolean(L, value);
+  lua_rawset(L, -3);
+}
 
-static int getfield (lua_State *L, const l_char *key, int d) {
+static int getboolfield (lua_State *L, const char *key) {
   int res;
   lua_pushstring(L, key);
-  lua_rawget(L, -2);
+  lua_gettable(L, -2);
+  res = lua_toboolean(L, -1);
+  lua_pop(L, 1);
+  return res;
+}
+
+
+static int getfield (lua_State *L, const char *key, int d) {
+  int res;
+  lua_pushstring(L, key);
+  lua_gettable(L, -2);
   if (lua_isnumber(L, -1))
-    res = (int)lua_tonumber(L, -1);
+    res = (int)(lua_tonumber(L, -1));
   else {
     if (d == -2)
-      luaL_verror(L, l_s("field `%.20s' missing in date table"), key);
+      return luaL_error(L, "field `%s' missing in date table", key);
     res = d;
   }
   lua_pop(L, 1);
@@ -473,12 +503,12 @@ static int getfield (lua_State *L, const l_char *key, int d) {
 
 
 static int io_date (lua_State *L) {
-  const l_char *s = luaL_opt_string(L, 1, l_s("%c"));
-  time_t t = (time_t)luaL_opt_number(L, 2, -1);
+  const char *s = luaL_opt_string(L, 1, "%c");
+  time_t t = (time_t)(luaL_opt_number(L, 2, -1));
   struct tm *stm;
-  if (t == (time_t)-1)  /* no time given? */
+  if (t == (time_t)(-1))  /* no time given? */
     t = time(NULL);  /* use current time */
-  if (*s == l_c('!')) {  /* UTC? */
+  if (*s == '!') {  /* UTC? */
     stm = gmtime(&t);
     s++;  /* skip `!' */
   }
@@ -486,46 +516,46 @@ static int io_date (lua_State *L) {
     stm = localtime(&t);
   if (stm == NULL)  /* invalid date? */
     lua_pushnil(L);
-  else if (strcmp(s, l_s("*t")) == 0) {
+  else if (strcmp(s, "*t") == 0) {
     lua_newtable(L);
-    setfield(L, l_s("sec"), stm->tm_sec);
-    setfield(L, l_s("min"), stm->tm_min);
-    setfield(L, l_s("hour"), stm->tm_hour);
-    setfield(L, l_s("day"), stm->tm_mday);
-    setfield(L, l_s("month"), stm->tm_mon+1);
-    setfield(L, l_s("year"), stm->tm_year+1900);
-    setfield(L, l_s("wday"), stm->tm_wday+1);
-    setfield(L, l_s("yday"), stm->tm_yday+1);
-    setfield(L, l_s("isdst"), stm->tm_isdst);
+    setfield(L, "sec", stm->tm_sec);
+    setfield(L, "min", stm->tm_min);
+    setfield(L, "hour", stm->tm_hour);
+    setfield(L, "day", stm->tm_mday);
+    setfield(L, "month", stm->tm_mon+1);
+    setfield(L, "year", stm->tm_year+1900);
+    setfield(L, "wday", stm->tm_wday+1);
+    setfield(L, "yday", stm->tm_yday+1);
+    setboolfield(L, "isdst", stm->tm_isdst);
   }
   else {
-    l_char b[256];
+    char b[256];
     if (strftime(b, sizeof(b), s, stm))
       lua_pushstring(L, b);
     else
-      lua_error(L, l_s("invalid `date' format"));
+      return luaL_error(L, "`date' format too long");
   }
   return 1;
 }
 
 
 static int io_time (lua_State *L) {
-  if (lua_isnull(L, 1))  /* called without args? */
+  if (lua_isnoneornil(L, 1))  /* called without args? */
     lua_pushnumber(L, time(NULL));  /* return current time */
   else {
     time_t t;
     struct tm ts;
-    luaL_checktype(L, 1, LUA_TTABLE);
+    luaL_check_type(L, 1, LUA_TTABLE);
     lua_settop(L, 1);  /* make sure table is at the top */
-    ts.tm_sec = getfield(L, l_s("sec"), 0);
-    ts.tm_min = getfield(L, l_s("min"), 0);
-    ts.tm_hour = getfield(L, l_s("hour"), 12);
-    ts.tm_mday = getfield(L, l_s("day"), -2);
-    ts.tm_mon = getfield(L, l_s("month"), -2)-1;
-    ts.tm_year = getfield(L, l_s("year"), -2)-1900;
-    ts.tm_isdst = getfield(L, l_s("isdst"), -1);
+    ts.tm_sec = getfield(L, "sec", 0);
+    ts.tm_min = getfield(L, "min", 0);
+    ts.tm_hour = getfield(L, "hour", 12);
+    ts.tm_mday = getfield(L, "day", -2);
+    ts.tm_mon = getfield(L, "month", -2) - 1;
+    ts.tm_year = getfield(L, "year", -2) - 1900;
+    ts.tm_isdst = getboolfield(L, "isdst");
     t = mktime(&ts);
-    if (t == (time_t)-1)
+    if (t == (time_t)(-1))
       lua_pushnil(L);
     else
       lua_pushnumber(L, t);
@@ -535,8 +565,8 @@ static int io_time (lua_State *L) {
 
 
 static int io_difftime (lua_State *L) {
-  lua_pushnumber(L, difftime((time_t)luaL_check_number(L, 1),
-                             (time_t)luaL_opt_number(L, 2, 0)));
+  lua_pushnumber(L, difftime((time_t)(luaL_check_number(L, 1)),
+                             (time_t)(luaL_opt_number(L, 2, 0))));
   return 1;
 }
 
@@ -546,11 +576,13 @@ static int io_difftime (lua_State *L) {
 static int io_setloc (lua_State *L) {
   static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
                       LC_NUMERIC, LC_TIME};
-  static const l_char *const catnames[] = {l_s("all"), l_s("collate"), l_s("ctype"), l_s("monetary"),
-     l_s("numeric"), l_s("time"), NULL};
-  int op = luaL_findstring(luaL_opt_string(L, 2, l_s("all")), catnames);
-  luaL_arg_check(L, op != -1, 2, l_s("invalid option"));
-  lua_pushstring(L, setlocale(cat[op], luaL_check_string(L, 1)));
+  static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
+     "numeric", "time", NULL};
+  const char *l = lua_tostring(L, 1);
+  int op = luaL_findstring(luaL_opt_string(L, 2, "all"), catnames);
+  luaL_arg_check(L, l || lua_isnoneornil(L, 1), 1, "string expected");
+  luaL_arg_check(L, op != -1, 2, "invalid option");
+  lua_pushstring(L, setlocale(cat[op], l));
   return 1;
 }
 
@@ -560,136 +592,39 @@ static int io_exit (lua_State *L) {
   return 0;  /* to avoid warnings */
 }
 
+static const luaL_reg syslib[] = {
+  {"clock",     io_clock},
+  {"date",      io_date},
+  {"difftime",  io_difftime},
+  {"execute",   io_execute},
+  {"exit",      io_exit},
+  {"getenv",    io_getenv},
+  {"remove",    io_remove},
+  {"rename",    io_rename},
+  {"setlocale", io_setloc},
+  {"time",      io_time},
+  {"tmpname",   io_tmpname},
+  {NULL, NULL}
+};
+
 /* }====================================================== */
 
 
 
-static int io_debug (lua_State *L) {
-  for (;;) {
-    l_char buffer[250];
-    fprintf(stderr, l_s("lua_debug> "));
-    if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
-        strcmp(buffer, l_s("cont\n")) == 0)
-      return 0;
-    lua_dostring(L, buffer);
-    lua_settop(L, 0);  /* remove eventual returns */
-  }
-}
-
-
-#define LEVELS1	12	/* size of the first part of the stack */
-#define LEVELS2	10	/* size of the second part of the stack */
-
-static int errorfb (lua_State *L) {
-  int level = 1;  /* skip level 0 (it's this function) */
-  int firstpart = 1;  /* still before eventual `...' */
-  lua_Debug ar;
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  luaL_addstring(&b, l_s("error: "));
-  luaL_addstring(&b, luaL_check_string(L, 1));
-  luaL_addstring(&b, l_s("\n"));
-  while (lua_getstack(L, level++, &ar)) {
-    l_char buff[120];  /* enough to fit following `sprintf's */
-    if (level == 2)
-      luaL_addstring(&b, l_s("stack traceback:\n"));
-    else if (level > LEVELS1 && firstpart) {
-      /* no more than `LEVELS2' more levels? */
-      if (!lua_getstack(L, level+LEVELS2, &ar))
-        level--;  /* keep going */
-      else {
-        luaL_addstring(&b, l_s("       ...\n"));  /* too many levels */
-        while (lua_getstack(L, level+LEVELS2, &ar))  /* find last levels */
-          level++;
-      }
-      firstpart = 0;
-      continue;
-    }
-    sprintf(buff, l_s("%4d:  "), level-1);
-    luaL_addstring(&b, buff);
-    lua_getinfo(L, l_s("Snl"), &ar);
-    switch (*ar.namewhat) {
-      case l_c('g'):  case l_c('l'):  /* global, local */
-        sprintf(buff, l_s("function `%.50s'"), ar.name);
-        break;
-      case l_c('f'):  /* field */
-        sprintf(buff, l_s("method `%.50s'"), ar.name);
-        break;
-      case l_c('t'):  /* tag method */
-        sprintf(buff, l_s("`%.50s' tag method"), ar.name);
-        break;
-      default: {
-        if (*ar.what == l_c('m'))  /* main? */
-          sprintf(buff, l_s("main of %.70s"), ar.short_src);
-        else if (*ar.what == l_c('C'))  /* C function? */
-          sprintf(buff, l_s("%.70s"), ar.short_src);
-        else
-          sprintf(buff, l_s("function <%d:%.70s>"), ar.linedefined, ar.short_src);
-        ar.source = NULL;  /* do not print source again */
-      }
-    }
-    luaL_addstring(&b, buff);
-    if (ar.currentline > 0) {
-      sprintf(buff, l_s(" at line %d"), ar.currentline);
-      luaL_addstring(&b, buff);
-    }
-    if (ar.source) {
-      sprintf(buff, l_s(" [%.70s]"), ar.short_src);
-      luaL_addstring(&b, buff);
-    }
-    luaL_addstring(&b, l_s("\n"));
-  }
-  luaL_pushresult(&b);
-  lua_getglobal(L, l_s(LUA_ALERT));
-  if (lua_isfunction(L, -1)) {  /* avoid loop if _ALERT is not defined */
-    lua_pushvalue(L, -2);  /* error message */
-    lua_rawcall(L, 1, 0);
-  }
-  return 0;
-}
-
-
-
-static const luaL_reg iolib[] = {
-  {l_s("appendto"),  io_appendto},
-  {l_s("clock"),     io_clock},
-  {l_s("closefile"), io_close},
-  {l_s("date"),      io_date},
-  {l_s("debug"),     io_debug},
-  {l_s("difftime"),  io_difftime},
-  {l_s("execute"),   io_execute},
-  {l_s("exit"),      io_exit},
-  {l_s("flush"),     io_flush},
-  {l_s("getenv"),    io_getenv},
-  {l_s("openfile"),  io_open},
-  {l_s("read"),      io_read},
-  {l_s("readfrom"),  io_readfrom},
-  {l_s("remove"),    io_remove},
-  {l_s("rename"),    io_rename},
-  {l_s("seek"),      io_seek},
-  {l_s("setlocale"), io_setloc},
-  {l_s("time"),      io_time},
-  {l_s("tmpfile"),   io_tmpfile},
-  {l_s("tmpname"),   io_tmpname},
-  {l_s("write"),     io_write},
-  {l_s("writeto"),   io_writeto},
-  {l_s(LUA_ERRORMESSAGE), errorfb}
-};
-
-
 LUALIB_API int lua_iolibopen (lua_State *L) {
-  int iotag = lua_newtype(L, FILEHANDLE, LUA_TUSERDATA);
-  lua_newtype(L, CLOSEDFILEHANDLE, LUA_TUSERDATA);
-  luaL_openl(L, iolib);
-  /* predefined file handles */
-  newfilewithname(L, stdin, basicfiles[INFILE]);
-  newfilewithname(L, stdout, basicfiles[OUTFILE]);
-  newfilewithname(L, stderr, l_s("_STDERR"));
-  resetfile(L, INFILE);
-  resetfile(L, OUTFILE);
-  /* close files when collected */
-  lua_pushcfunction(L, file_collect);
-  lua_settagmethod(L, iotag, l_s("gc"));
+  createmeta(L);
+  luaL_opennamedlib(L, LUA_OSLIBNAME, syslib, 0);
+  lua_pushliteral(L, FILEHANDLE);  /* S: FH */
+  lua_rawget(L, LUA_REGISTRYINDEX);  /* S: mt */
+  lua_pushvalue(L, -1);  /* S: mt mt */
+  luaL_opennamedlib(L, LUA_IOLIBNAME, iolib, 1);  /* S: mt */
+  lua_pushliteral(L, LUA_IOLIBNAME);  /* S: `io' mt */
+  lua_gettable(L, LUA_GLOBALSINDEX);  /* S: io mt */
+  /* put predefined file handles into `io' table */
+  registerfile(L, stdin, "stdin", IO_INPUT);
+  registerfile(L, stdout, "stdout", IO_OUTPUT);
+  registerfile(L, stderr, "stderr", NULL);
+  lua_pop(L, 2);  /* S: empty */
   return 0;
 }
 

llex.c

@@ -1,17 +1,16 @@
 /*
-** $Id: llex.c,v 1.88 2001/06/20 21:07:57 roberto Exp roberto $
+** $Id: llex.c,v 1.107 2002/07/08 18:14:36 roberto Exp roberto $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
 
 
 #include <ctype.h>
-#include <stdio.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
+#include "ldo.h"
 #include "llex.h"
 #include "lobject.h"
 #include "lparser.h"
@@ -26,13 +25,13 @@
 
 
 /* ORDER RESERVED */
-static const l_char *const token2string [] = {
-    l_s("and"), l_s("break"), l_s("do"), l_s("else"), l_s("elseif"),
-    l_s("end"), l_s("for"), l_s("function"), l_s("global"), l_s("if"),
-    l_s("in"), l_s("local"), l_s("nil"), l_s("not"), l_s("or"), l_s("repeat"),
-    l_s("return"), l_s("then"), l_s("until"), l_s("while"), l_s(""),
-    l_s(".."), l_s("..."), l_s("=="), l_s(">="), l_s("<="), l_s("~="),
-    l_s(""), l_s(""), l_s("<eof>")
+static const char *const token2string [] = {
+    "and", "break", "do", "else", "elseif",
+    "end", "false", "for", "function", "global", "if",
+    "in", "local", "nil", "not", "or", "repeat",
+    "return", "then", "true", "until", "while", "*name",
+    "..", "...", "==", ">=", "<=", "~=",
+    "*number", "*string", "<eof>"
 };
 
 
@@ -41,7 +40,7 @@ void luaX_init (lua_State *L) {
   for (i=0; i<NUM_RESERVED; i++) {
     TString *ts = luaS_new(L, token2string[i]);
     lua_assert(strlen(token2string[i])+1 <= TOKEN_LEN);
-    ts->tsv.marked = (unsigned short)(RESERVEDMARK+i);  /* reserved word */
+    ts->tsv.marked = cast(unsigned short, RESERVEDMARK+i);  /* reserved word */
   }
 }
 
@@ -49,55 +48,65 @@ void luaX_init (lua_State *L) {
 #define MAXSRC          80
 
 
-void luaX_checklimit (LexState *ls, int val, int limit, const l_char *msg) {
+void luaX_checklimit (LexState *ls, int val, int limit, const char *msg) {
   if (val > limit) {
-    l_char buff[90];
-    sprintf(buff, l_s("too many %.40s (limit=%d)"), msg, limit);
-    luaX_error(ls, buff, ls->t.token);
+    msg = luaO_pushfstring(ls->L, "too many %s (limit=%d)", msg, limit);
+    luaX_syntaxerror(ls, msg);
   }
 }
 
 
-void luaX_syntaxerror (LexState *ls, const l_char *s, const l_char *token) {
-  l_char buff[MAXSRC];
+static void luaX_error (LexState *ls, const char *s, const char *token) {
+  lua_State *L = ls->L;
+  char buff[MAXSRC];
   luaO_chunkid(buff, getstr(ls->source), MAXSRC);
-  luaO_verror(ls->L,
-              l_s("%.99s;\n  last token read: `%.30s' at line %d in %.80s"),
-              s, token, ls->linenumber, buff);
+  luaO_pushfstring(L, "%s:%d: %s near `%s'\n", buff, ls->linenumber, s, token); 
+  luaD_throw(L, LUA_ERRSYNTAX);
 }
 
 
-void luaX_error (LexState *ls, const l_char *s, int token) {
-  l_char buff[TOKEN_LEN];
-  luaX_token2str(token, buff);
-  if (buff[0] == l_c('\0'))
-    luaX_syntaxerror(ls, s, (l_char *)G(ls->L)->Mbuffer);
-  else
-    luaX_syntaxerror(ls, s, buff);
+void luaX_syntaxerror (LexState *ls, const char *msg) {
+  const char *lasttoken;
+  switch (ls->t.token) {
+    case TK_NAME:
+      lasttoken = luaO_pushfstring(ls->L, "%s", getstr(ls->t.seminfo.ts));
+      break;
+    case TK_STRING:
+      lasttoken = luaO_pushfstring(ls->L, "\"%s\"", getstr(ls->t.seminfo.ts));
+      break;
+    case TK_NUMBER:
+      lasttoken = luaO_pushfstring(ls->L, "%f", ls->t.seminfo.r);
+      break;
+    default:
+      lasttoken = luaX_token2str(ls, ls->t.token);
+      break;
+  }
+  luaX_error(ls, msg, lasttoken);
 }
 
 
-void luaX_token2str (int token, l_char *s) {
-  if (token < 256) {
-    s[0] = (l_char)token;
-    s[1] = l_c('\0');
+const char *luaX_token2str (LexState *ls, int token) {
+  if (token < FIRST_RESERVED) {
+    lua_assert(token == (char)token);
+    return luaO_pushfstring(ls->L, "%c", token);
   }
   else
-    strcpy(s, token2string[token-FIRST_RESERVED]);
+    return token2string[token-FIRST_RESERVED];
 }
 
 
-static void luaX_invalidchar (LexState *ls, int c) {
-  l_char buff[8];
-  sprintf(buff, l_s("0x%02X"), uchar(c));
-  luaX_syntaxerror(ls, l_s("invalid control char"), buff);
+static void luaX_lexerror (LexState *ls, const char *s, int token) {
+  if (token == TK_EOS)
+    luaX_error(ls, s, luaX_token2str(ls, token));
+  else
+    luaX_error(ls, s, cast(char *, G(ls->L)->Mbuffer));
 }
 
 
 static void inclinenumber (LexState *LS) {
   next(LS);  /* skip `\n' */
   ++LS->linenumber;
-  luaX_checklimit(LS, LS->linenumber, MAX_INT, l_s("lines in a chunk"));
+  luaX_checklimit(LS, LS->linenumber, MAX_INT, "lines in a chunk");
 }
 
 
@@ -110,10 +119,10 @@ void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source) {
   LS->lastline = 1;
   LS->source = source;
   next(LS);  /* read first char */
-  if (LS->current == l_c('#')) {
+  if (LS->current == '#') {
     do {  /* skip first line */
       next(LS);
-    } while (LS->current != l_c('\n') && LS->current != EOZ);
+    } while (LS->current != '\n' && LS->current != EOZ);
   }
 }
 
@@ -129,63 +138,63 @@ void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source) {
 /* use Mbuffer to store names, literal strings and numbers */
 
 #define EXTRABUFF	128
-#define checkbuffer(L, n, len)	\
-    if (((len)+(n))*sizeof(l_char) > G(L)->Mbuffsize) \
-      luaO_openspace(L, (len)+(n)+EXTRABUFF, l_char)
+#define checkbuffer(L, len)	\
+    if (((len)+10)*sizeof(char) > G(L)->Mbuffsize) \
+      luaO_openspace(L, (len)+EXTRABUFF, char)
 
-#define save(L, c, l)	(((l_char *)G(L)->Mbuffer)[l++] = (l_char)c)
+#define save(L, c, l)	(cast(char *, G(L)->Mbuffer)[l++] = cast(char, c))
 #define save_and_next(L, LS, l)  (save(L, LS->current, l), next(LS))
 
 
 static size_t readname (LexState *LS) {
   lua_State *L = LS->L;
   size_t l = 0;
-  checkbuffer(L, 10, l);
+  checkbuffer(L, l);
   do {
-    checkbuffer(L, 10, l);
+    checkbuffer(L, l);
     save_and_next(L, LS, l);
-  } while (isalnum(LS->current) || LS->current == l_c('_'));
-  save(L, l_c('\0'), l);
+  } while (isalnum(LS->current) || LS->current == '_');
+  save(L, '\0', l);
   return l-1;
 }
 
 
 /* LUA_NUMBER */
-static void read_number (LexState *LS, int comma, SemInfo *seminfo) {
+static void read_numeral (LexState *LS, int comma, SemInfo *seminfo) {
   lua_State *L = LS->L;
   size_t l = 0;
-  checkbuffer(L, 10, l);
-  if (comma) save(L, l_c('.'), l);
+  checkbuffer(L, l);
+  if (comma) save(L, '.', l);
   while (isdigit(LS->current)) {
-    checkbuffer(L, 10, l);
+    checkbuffer(L, l);
     save_and_next(L, LS, l);
   }
-  if (LS->current == l_c('.')) {
+  if (LS->current == '.') {
     save_and_next(L, LS, l);
-    if (LS->current == l_c('.')) {
+    if (LS->current == '.') {
       save_and_next(L, LS, l);
-      save(L, l_c('\0'), l);
-      luaX_error(LS,
-                 l_s("ambiguous syntax (decimal point x string concatenation)"),
+      save(L, '\0', l);
+      luaX_lexerror(LS,
+                 "ambiguous syntax (decimal point x string concatenation)",
                  TK_NUMBER);
     }
   }
   while (isdigit(LS->current)) {
-    checkbuffer(L, 10, l);
+    checkbuffer(L, l);
     save_and_next(L, LS, l);
   }
-  if (LS->current == l_c('e') || LS->current == l_c('E')) {
+  if (LS->current == 'e' || LS->current == 'E') {
     save_and_next(L, LS, l);  /* read `E' */
-    if (LS->current == l_c('+') || LS->current == l_c('-'))
+    if (LS->current == '+' || LS->current == '-')
       save_and_next(L, LS, l);  /* optional exponent sign */
     while (isdigit(LS->current)) {
-      checkbuffer(L, 10, l);
+      checkbuffer(L, l);
       save_and_next(L, LS, l);
     }
   }
-  save(L, l_c('\0'), l);
-  if (!luaO_str2d((l_char *)G(L)->Mbuffer, &seminfo->r))
-    luaX_error(LS, l_s("malformed number"), TK_NUMBER);
+  save(L, '\0', l);
+  if (!luaO_str2d(cast(char *, G(L)->Mbuffer), &seminfo->r))
+    luaX_lexerror(LS, "malformed number", TK_NUMBER);
 }
 
 
@@ -193,70 +202,78 @@ static void read_long_string (LexState *LS, SemInfo *seminfo) {
   lua_State *L = LS->L;
   int cont = 0;
   size_t l = 0;
-  checkbuffer(L, 10, l);
-  save(L, l_c('['), l);  /* save first `[' */
+  checkbuffer(L, l);
+  save(L, '[', l);  /* save first `[' */
   save_and_next(L, LS, l);  /* pass the second `[' */
-  if (LS->current == l_c('\n'))  /* string starts with a newline? */
+  if (LS->current == '\n')  /* string starts with a newline? */
     inclinenumber(LS);  /* skip it */
   for (;;) {
-    checkbuffer(L, 10, l);
+    checkbuffer(L, l);
     switch (LS->current) {
       case EOZ:
-        save(L, l_c('\0'), l);
-        luaX_error(LS, l_s("unfinished long string"), TK_STRING);
+        save(L, '\0', l);
+        luaX_lexerror(LS, (seminfo) ? "unfinished long string" :
+                                   "unfinished long comment", TK_EOS);
         break;  /* to avoid warnings */
-      case l_c('['):
+      case '[':
         save_and_next(L, LS, l);
-        if (LS->current == l_c('[')) {
+        if (LS->current == '[') {
           cont++;
           save_and_next(L, LS, l);
         }
         continue;
-      case l_c(']'):
+      case ']':
         save_and_next(L, LS, l);
-        if (LS->current == l_c(']')) {
+        if (LS->current == ']') {
           if (cont == 0) goto endloop;
           cont--;
           save_and_next(L, LS, l);
         }
         continue;
-      case l_c('\n'):
-        save(L, l_c('\n'), l);
+      case '\n':
+        save(L, '\n', l);
         inclinenumber(LS);
+        if (!seminfo) l = 0;  /* reset buffer to avoid wasting space */
         continue;
       default:
         save_and_next(L, LS, l);
     }
   } endloop:
   save_and_next(L, LS, l);  /* skip the second `]' */
-  save(L, l_c('\0'), l);
-  seminfo->ts = luaS_newlstr(L, (l_char *)G(L)->Mbuffer+2, l-5);
+  save(L, '\0', l);
+  if (seminfo)
+    seminfo->ts = luaS_newlstr(L, cast(char *, G(L)->Mbuffer)+2, l-5);
 }
 
 
 static void read_string (LexState *LS, int del, SemInfo *seminfo) {
   lua_State *L = LS->L;
   size_t l = 0;
-  checkbuffer(L, 10, l);
+  checkbuffer(L, l);
   save_and_next(L, LS, l);
   while (LS->current != del) {
-    checkbuffer(L, 10, l);
+    checkbuffer(L, l);
     switch (LS->current) {
-      case EOZ:  case l_c('\n'):
-        save(L, l_c('\0'), l);
-        luaX_error(LS, l_s("unfinished string"), TK_STRING);
+      case EOZ:
+        save(L, '\0', l);
+        luaX_lexerror(LS, "unfinished string", TK_EOS);
         break;  /* to avoid warnings */
-      case l_c('\\'):
+      case '\n':
+        save(L, '\0', l);
+        luaX_lexerror(LS, "unfinished string", TK_STRING);
+        break;  /* to avoid warnings */
+      case '\\':
         next(LS);  /* do not save the `\' */
         switch (LS->current) {
-          case l_c('a'): save(L, l_c('\a'), l); next(LS); break;
-          case l_c('b'): save(L, l_c('\b'), l); next(LS); break;
-          case l_c('f'): save(L, l_c('\f'), l); next(LS); break;
-          case l_c('n'): save(L, l_c('\n'), l); next(LS); break;
-          case l_c('r'): save(L, l_c('\r'), l); next(LS); break;
-          case l_c('t'): save(L, l_c('\t'), l); next(LS); break;
-          case l_c('v'): save(L, l_c('\v'), l); next(LS); break;
-          case l_c('\n'): save(L, l_c('\n'), l); inclinenumber(LS); break;
+          case 'a': save(L, '\a', l); next(LS); break;
+          case 'b': save(L, '\b', l); next(LS); break;
+          case 'f': save(L, '\f', l); next(LS); break;
+          case 'n': save(L, '\n', l); next(LS); break;
+          case 'r': save(L, '\r', l); next(LS); break;
+          case 't': save(L, '\t', l); next(LS); break;
+          case 'v': save(L, '\v', l); next(LS); break;
+          case '\n': save(L, '\n', l); inclinenumber(LS); break;
+          case EOZ: break;  /* will raise an error next loop */
           default: {
             if (!isdigit(LS->current))
               save_and_next(L, LS, l);  /* handles \\, \", \', and \? */
@@ -264,12 +281,12 @@ static void read_string (LexState *LS, int del, SemInfo *seminfo) {
               int c = 0;
               int i = 0;
               do {
-                c = 10*c + (LS->current-l_c('0'));
+                c = 10*c + (LS->current-'0');
                 next(LS);
               } while (++i<3 && isdigit(LS->current));
               if (c > UCHAR_MAX) {
-                save(L, l_c('\0'), l);
-                luaX_error(LS, l_s("escape sequence too large"), TK_STRING);
+                save(L, '\0', l);
+                luaX_lexerror(LS, "escape sequence too large", TK_STRING);
               }
               save(L, c, l);
             }
@@ -281,8 +298,8 @@ static void read_string (LexState *LS, int del, SemInfo *seminfo) {
     }
   }
   save_and_next(L, LS, l);  /* skip delimiter */
-  save(L, l_c('\0'), l);
-  seminfo->ts = luaS_newlstr(L, (l_char *)G(L)->Mbuffer+1, l-3);
+  save(L, '\0', l);
+  seminfo->ts = luaS_newlstr(L, cast(char *, G(L)->Mbuffer)+1, l-3);
 }
 
 
@@ -290,96 +307,97 @@ int luaX_lex (LexState *LS, SemInfo *seminfo) {
   for (;;) {
     switch (LS->current) {
 
-      case l_c(' '): case l_c('\t'): case l_c('\r'):  /* `\r' to avoid problems with DOS */
-        next(LS);
-        continue;
-
-      case l_c('\n'):
+      case '\n': {
         inclinenumber(LS);
         continue;
-
-      case l_c('$'):
-        luaX_error(LS,
-                   l_s("unexpected `$' (pragmas are no longer supported)"),
-                   LS->current);
-        break;
-
-      case l_c('-'):
+      }
+      case '-': {
         next(LS);
-        if (LS->current != l_c('-')) return l_c('-');
-        do { next(LS); } while (LS->current != l_c('\n') && LS->current != EOZ);
+        if (LS->current != '-') return '-';
+        /* else is a comment */
+        next(LS);
+        if (LS->current == '[' && (next(LS), LS->current == '['))
+          read_long_string(LS, NULL);  /* long comment */
+        else  /* short comment */
+          while (LS->current != '\n' && LS->current != EOZ)
+            next(LS);
         continue;
-
-      case l_c('['):
+      }
+      case '[': {
         next(LS);
-        if (LS->current != l_c('[')) return l_c('[');
+        if (LS->current != '[') return '[';
         else {
           read_long_string(LS, seminfo);
           return TK_STRING;
         }
-
-      case l_c('='):
+      }
+      case '=': {
         next(LS);
-        if (LS->current != l_c('=')) return l_c('=');
+        if (LS->current != '=') return '=';
         else { next(LS); return TK_EQ; }
-
-      case l_c('<'):
+      }
+      case '<': {
         next(LS);
-        if (LS->current != l_c('=')) return l_c('<');
+        if (LS->current != '=') return '<';
         else { next(LS); return TK_LE; }
-
-      case l_c('>'):
+      }
+      case '>': {
         next(LS);
-        if (LS->current != l_c('=')) return l_c('>');
+        if (LS->current != '=') return '>';
         else { next(LS); return TK_GE; }
-
-      case l_c('~'):
+      }
+      case '~': {
         next(LS);
-        if (LS->current != l_c('=')) return l_c('~');
+        if (LS->current != '=') return '~';
         else { next(LS); return TK_NE; }
-
-      case l_c('"'):
-      case l_c('\''):
+      }
+      case '"':
+      case '\'': {
         read_string(LS, LS->current, seminfo);
         return TK_STRING;
-
-      case l_c('.'):
+      }
+      case '.': {
         next(LS);
-        if (LS->current == l_c('.')) {
+        if (LS->current == '.') {
           next(LS);
-          if (LS->current == l_c('.')) {
+          if (LS->current == '.') {
             next(LS);
             return TK_DOTS;   /* ... */
           }
           else return TK_CONCAT;   /* .. */
         }
-        else if (!isdigit(LS->current)) return l_c('.');
+        else if (!isdigit(LS->current)) return '.';
         else {
-          read_number(LS, 1, seminfo);
+          read_numeral(LS, 1, seminfo);
           return TK_NUMBER;
         }
-
-      case EOZ:
+      }
+      case EOZ: {
         return TK_EOS;
-
+      }
       default: {
-        if (isdigit(LS->current)) {
-          read_number(LS, 0, seminfo);
+        if (isspace(LS->current)) {
+          next(LS);
+          continue;
+        }
+        else if (isdigit(LS->current)) {
+          read_numeral(LS, 0, seminfo);
           return TK_NUMBER;
         }
-        else if (isalpha(LS->current) || LS->current == l_c('_')) {
+        else if (isalpha(LS->current) || LS->current == '_') {
           /* identifier or reserved word */
           size_t l = readname(LS);
-          TString *ts = luaS_newlstr(LS->L, (l_char *)G(LS->L)->Mbuffer, l);
+          TString *ts = luaS_newlstr(LS->L, cast(char *, G(LS->L)->Mbuffer), l);
           if (ts->tsv.marked >= RESERVEDMARK)  /* reserved word? */
             return ts->tsv.marked-RESERVEDMARK+FIRST_RESERVED;
           seminfo->ts = ts;
           return TK_NAME;
         }
         else {
-          l_charint c = LS->current;
+          int c = LS->current;
           if (iscntrl(c))
-            luaX_invalidchar(LS, c);
+            luaX_error(LS, "invalid control char",
+                           luaO_pushfstring(LS->L, "char(%d)", c));
           next(LS);
           return c;  /* single-char tokens (+ - / ...) */
         }
@@ -388,3 +406,4 @@ int luaX_lex (LexState *LS, SemInfo *seminfo) {
   }
 }
 
+#undef next

llex.h

@@ -1,5 +1,5 @@
 /*
-** $Id: llex.h,v 1.36 2001/06/20 21:07:57 roberto Exp roberto $
+** $Id: llex.h,v 1.42 2002/02/08 22:42:41 roberto Exp roberto $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
@@ -14,7 +14,7 @@
 #define FIRST_RESERVED	257
 
 /* maximum length of a reserved word */
-#define TOKEN_LEN	(sizeof(l_s("function"))/sizeof(l_char))
+#define TOKEN_LEN	(sizeof("function")/sizeof(char))
 
 
 /*
@@ -24,16 +24,16 @@
 enum RESERVED {
   /* terminal symbols denoted by reserved words */
   TK_AND = FIRST_RESERVED, TK_BREAK,
-  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FOR, TK_FUNCTION, TK_GLOBAL, TK_IF,
-  TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT, TK_RETURN, TK_THEN,
-  TK_UNTIL, TK_WHILE,
+  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
+  TK_GLOBAL, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
+  TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
   /* other terminal symbols */
   TK_NAME, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NUMBER,
   TK_STRING, TK_EOS
 };
 
 /* number of reserved words */
-#define NUM_RESERVED	((int)(TK_WHILE-FIRST_RESERVED+1))
+#define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
 
 
 typedef union {
@@ -49,14 +49,14 @@ typedef struct Token {
 
 
 typedef struct LexState {
-  l_charint current;  /* current character */
+  int current;  /* current character (charint) */
+  int linenumber;  /* input line counter */
+  int lastline;  /* line of last token `consumed' */
   Token t;  /* current token */
   Token lookahead;  /* look ahead token */
   struct FuncState *fs;  /* `FuncState' is private to the parser */
   struct lua_State *L;
   struct zio *z;  /* input stream */
-  int linenumber;  /* input line counter */
-  int lastline;  /* line of last token `consumed' */
   TString *source;  /* current source name */
 } LexState;
 
@@ -64,10 +64,9 @@ typedef struct LexState {
 void luaX_init (lua_State *L);
 void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source);
 int luaX_lex (LexState *LS, SemInfo *seminfo);
-void luaX_checklimit (LexState *ls, int val, int limit, const l_char *msg);
-void luaX_syntaxerror (LexState *ls, const l_char *s, const l_char *token);
-void luaX_error (LexState *ls, const l_char *s, int token);
-void luaX_token2str (int token, l_char *s);
+void luaX_checklimit (LexState *ls, int val, int limit, const char *msg);
+void luaX_syntaxerror (LexState *ls, const char *s);
+const char *luaX_token2str (LexState *ls, int token);
 
 
 #endif

llimits.h

@@ -1,5 +1,5 @@
 /*
-** $Id: llimits.h,v 1.29 2001/06/05 18:17:01 roberto Exp roberto $
+** $Id: llimits.h,v 1.44 2002/06/13 13:45:31 roberto Exp roberto $
 ** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
@@ -45,12 +45,17 @@ typedef unsigned int lu_hash;
 /* its signed equivalent */
 typedef int ls_hash;
 
-/* an unsigned integer big enough to count the total memory used by Lua */
+/* an unsigned integer big enough to count the total memory used by Lua; */
+/* it should be at least as large as size_t */
 typedef unsigned long lu_mem;
 
 /* an integer big enough to count the number of strings in use */
 typedef long ls_nstr;
 
+/* an integer big enough to count the number of steps when calling a
+** `count' hook */
+typedef long ls_count;
+
 
 /* chars used as small naturals (so that `char' is reserved for characteres) */
 typedef unsigned char lu_byte;
@@ -65,19 +70,8 @@ typedef unsigned char lu_byte;
 ** conversion of pointer to integer
 ** this is for hashing only; there is no problem if the integer
 ** cannot hold the whole pointer value
-** (the shift removes bits that are usually 0 because of alignment)
 */
-#define IntPoint(p)  ((((lu_hash)(p)) >> 4) ^ (lu_hash)(p))
-
-
-
-#define MINPOWER2       4       /* minimum size for `growing' vectors */
-
-
-
-#ifndef DEFAULT_STACK_SIZE
-#define DEFAULT_STACK_SIZE      1024
-#endif
+#define IntPoint(p)  ((lu_hash)(p))
 
 
 
@@ -88,6 +82,26 @@ typedef unsigned char lu_byte;
 union L_Umaxalign { LUSER_ALIGNMENT_T u; void *s; long l; };
 
 
+#ifndef lua_assert
+#define lua_assert(c)		/* empty */
+#endif
+
+
+#ifndef check_exp
+#define check_exp(c,e)	(e)
+#endif
+
+
+#ifndef UNUSED
+#define UNUSED(x)	((void)(x))	/* to avoid warnings */
+#endif
+
+
+#ifndef cast
+#define cast(t, exp)	((t)(exp))
+#endif
+
+
 
 /*
 ** type for virtual-machine instructions
@@ -96,19 +110,31 @@ union L_Umaxalign { LUSER_ALIGNMENT_T u; void *s; long l; };
 typedef unsigned long Instruction;
 
 
+/* maximum depth for calls */
+#ifndef LUA_MAXCALLS
+#define LUA_MAXCALLS        4096
+#endif
+
+
+/* maximum size for the C stack */
+#ifndef LUA_MAXCSTACK
+#define LUA_MAXCSTACK        2048
+#endif
+
+
 /* maximum stack for a Lua function */
 #define MAXSTACK	250
 
 
-/* maximum number of local variables */
-#ifndef MAXLOCALS
-#define MAXLOCALS 200           /* arbitrary limit (<MAXSTACK) */
+/* maximum number of variables declared in a function */
+#ifndef MAXVARS
+#define MAXVARS 200           /* arbitrary limit (<MAXSTACK) */
 #endif
 
 
-/* maximum number of upvalues */
+/* maximum number of upvalues per function */
 #ifndef MAXUPVALUES
-#define MAXUPVALUES 32          /* arbitrary limit (<MAXSTACK) */
+#define MAXUPVALUES	32
 #endif
 
 
@@ -118,15 +144,9 @@ typedef unsigned long Instruction;
 #endif
 
 
-/* number of list items to accumulate before a SETLIST instruction */
-/* (must be a power of 2) */
-#define LFIELDS_PER_FLUSH	64
-
-
-
-/* maximum lookback to find a real constant (for code generation) */
-#ifndef LOOKBACKNUMS
-#define LOOKBACKNUMS    40      /* arbitrary constant */
+/* minimum size for the string table (must be power of 2) */
+#ifndef MINSTRTABSIZE
+#define MINSTRTABSIZE	32
 #endif
 
 

lmathlib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lmathlib.c,v 1.37 2001/03/06 20:09:38 roberto Exp roberto $
+** $Id: lmathlib.c,v 1.50 2002/08/14 20:07:43 roberto Exp roberto $
 ** Standard mathematical library
 ** See Copyright Notice in lua.h
 */
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lauxlib.h"
@@ -22,15 +21,15 @@
 
 
 /*
-** If you want Lua to operate in radians (instead of degrees),
-** define RADIANS
+** If you want Lua to operate in degrees (instead of radians),
+** define USE_DEGREES
 */
-#ifdef RADIANS
-#define FROMRAD(a)	(a)
-#define TORAD(a)	(a)
-#else
+#ifdef USE_DEGREES
 #define FROMRAD(a)	((a)/RADIANS_PER_DEGREE)
 #define TORAD(a)	((a)*RADIANS_PER_DEGREE)
+#else
+#define FROMRAD(a)	(a)
+#define TORAD(a)	(a)
 #endif
 
 
@@ -177,18 +176,18 @@ static int math_random (lua_State *L) {
     }
     case 1: {  /* only upper limit */
       int u = luaL_check_int(L, 1);
-      luaL_arg_check(L, 1<=u, 1, l_s("interval is empty"));
-      lua_pushnumber(L, (int)(r*u)+1);  /* integer between 1 and `u' */
+      luaL_arg_check(L, 1<=u, 1, "interval is empty");
+      lua_pushnumber(L, (int)floor(r*u)+1);  /* int between 1 and `u' */
       break;
     }
     case 2: {  /* lower and upper limits */
       int l = luaL_check_int(L, 1);
       int u = luaL_check_int(L, 2);
-      luaL_arg_check(L, l<=u, 2, l_s("interval is empty"));
-      lua_pushnumber(L, (int)(r*(u-l+1))+l);  /* integer between `l' and `u' */
+      luaL_arg_check(L, l<=u, 2, "interval is empty");
+      lua_pushnumber(L, (int)floor(r*(u-l+1))+l);  /* int between `l' and `u' */
       break;
     }
-    default: lua_error(L, l_s("wrong number of arguments"));
+    default: return luaL_error(L, "wrong number of arguments");
   }
   return 1;
 }
@@ -201,40 +200,48 @@ static int math_randomseed (lua_State *L) {
 
 
 static const luaL_reg mathlib[] = {
-{l_s("abs"),   math_abs},
-{l_s("sin"),   math_sin},
-{l_s("cos"),   math_cos},
-{l_s("tan"),   math_tan},
-{l_s("asin"),  math_asin},
-{l_s("acos"),  math_acos},
-{l_s("atan"),  math_atan},
-{l_s("atan2"), math_atan2},
-{l_s("ceil"),  math_ceil},
-{l_s("floor"), math_floor},
-{l_s("mod"),   math_mod},
-{l_s("frexp"), math_frexp},
-{l_s("ldexp"), math_ldexp},
-{l_s("sqrt"),  math_sqrt},
-{l_s("min"),   math_min},
-{l_s("max"),   math_max},
-{l_s("log"),   math_log},
-{l_s("log10"), math_log10},
-{l_s("exp"),   math_exp},
-{l_s("deg"),   math_deg},
-{l_s("rad"),   math_rad},
-{l_s("random"),     math_random},
-{l_s("randomseed"), math_randomseed}
+  {"abs",   math_abs},
+  {"sin",   math_sin},
+  {"cos",   math_cos},
+  {"tan",   math_tan},
+  {"asin",  math_asin},
+  {"acos",  math_acos},
+  {"atan",  math_atan},
+  {"atan2", math_atan2},
+  {"ceil",  math_ceil},
+  {"floor", math_floor},
+  {"mod",   math_mod},
+  {"frexp", math_frexp},
+  {"ldexp", math_ldexp},
+  {"sqrt",  math_sqrt},
+  {"min",   math_min},
+  {"max",   math_max},
+  {"log",   math_log},
+  {"log10", math_log10},
+  {"exp",   math_exp},
+  {"deg",   math_deg},
+  {"pow",   math_pow},
+  {"rad",   math_rad},
+  {"random",     math_random},
+  {"randomseed", math_randomseed},
+  {NULL, NULL}
 };
 
+
 /*
 ** Open math library
 */
 LUALIB_API int lua_mathlibopen (lua_State *L) {
-  luaL_openl(L, mathlib);
-  lua_pushcfunction(L, math_pow);
-  lua_settagmethod(L, LUA_TNUMBER, l_s("pow"));
+  lua_pushliteral(L, LUA_MATHLIBNAME);
+  lua_newtable(L);
+  luaL_openlib(L, mathlib, 0);
+  lua_pushliteral(L, "pi");
   lua_pushnumber(L, PI);
-  lua_setglobal(L, l_s("PI"));
+  lua_settable(L, -3);
+  lua_settable(L, LUA_GLOBALSINDEX);
+  lua_pushliteral(L, "__pow");
+  lua_pushcfunction(L, math_pow);
+  lua_settable(L, LUA_REGISTRYINDEX);
   return 0;
 }
 

lmem.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.c,v 1.48 2001/02/23 17:17:25 roberto Exp roberto $
+** $Id: lmem.c,v 1.56 2002/06/11 16:23:47 roberto Exp roberto $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
@@ -7,9 +7,9 @@
 
 #include <stdlib.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
+#include "ldebug.h"
 #include "ldo.h"
 #include "lmem.h"
 #include "lobject.h"
@@ -17,25 +17,34 @@
 
 
 
+/*
+** definition for realloc function. It must assure that
+** l_realloc(block, x, 0) frees the block, and l_realloc(NULL, 0, x)
+** allocates a new block (ANSI C assures that).
+** (`os' is the old block size; some allocators may use that.)
+*/
 #ifndef l_realloc
 #define l_realloc(b,os,s)	realloc(b,s)
-#define l_free(b,s)		free(b)
 #endif
 
 
+#define MINSIZEARRAY	4
+
+
 void *luaM_growaux (lua_State *L, void *block, int *size, int size_elems,
-                    int limit, const l_char *errormsg) {
+                    int limit, const char *errormsg) {
   void *newblock;
   int newsize = (*size)*2;
-  if (newsize < MINPOWER2)
-    newsize = MINPOWER2;  /* minimum size */
+  if (newsize < MINSIZEARRAY)
+    newsize = MINSIZEARRAY;  /* minimum size */
   else if (*size >= limit/2) {  /* cannot double it? */
-    if (*size < limit - MINPOWER2)  /* try something smaller... */
-      newsize = limit;  /* still have at least MINPOWER2 free places */
-    else luaD_error(L, errormsg);
+    if (*size < limit - MINSIZEARRAY)  /* try something smaller... */
+      newsize = limit;  /* still have at least MINSIZEARRAY free places */
+    else luaG_runerror(L, errormsg);
   }
-  newblock = luaM_realloc(L, block, (lu_mem)(*size)*(lu_mem)size_elems,
-                                    (lu_mem)newsize*(lu_mem)size_elems);
+  newblock = luaM_realloc(L, block,
+                          cast(lu_mem, *size)*cast(lu_mem, size_elems),
+                          cast(lu_mem, newsize)*cast(lu_mem, size_elems));
   *size = newsize;  /* update only when everything else is OK */
   return newblock;
 }
@@ -46,16 +55,18 @@ void *luaM_growaux (lua_State *L, void *block, int *size, int size_elems,
 */
 void *luaM_realloc (lua_State *L, void *block, lu_mem oldsize, lu_mem size) {
   if (size == 0) {
-    l_free(block, oldsize);  /* block may be NULL; that is OK for free */
-    block = NULL;
+    if (block != NULL) {
+      l_realloc(block, oldsize, size);
+      block = NULL;
+    }
   }
   else if (size >= MAX_SIZET)
-    luaD_error(L, l_s("memory allocation error: block too big"));
+    luaG_runerror(L, "memory allocation error: block too big");
   else {
     block = l_realloc(block, oldsize, size);
     if (block == NULL) {
       if (L)
-        luaD_breakrun(L, LUA_ERRMEM);  /* break run without error message */
+        luaD_throw(L, LUA_ERRMEM);
       else return NULL;  /* error before creating state! */
     }
   }

lmem.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.h,v 1.21 2001/02/20 18:15:33 roberto Exp roberto $
+** $Id: lmem.h,v 1.25 2001/11/28 20:13:13 roberto Exp roberto $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
@@ -13,28 +13,31 @@
 #include "llimits.h"
 #include "lua.h"
 
+#define MEMERRMSG	"not enough memory"
+
+
 void *luaM_realloc (lua_State *L, void *oldblock, lu_mem oldsize, lu_mem size);
 
 void *luaM_growaux (lua_State *L, void *block, int *size, int size_elem,
-                    int limit, const l_char *errormsg);
+                    int limit, const char *errormsg);
 
 #define luaM_free(L, b, s)	luaM_realloc(L, (b), (s), 0)
-#define luaM_freelem(L, b, t)	luaM_realloc(L, (b), sizeof(t), 0)
+#define luaM_freelem(L, b)	luaM_realloc(L, (b), sizeof(*(b)), 0)
 #define luaM_freearray(L, b, n, t)	luaM_realloc(L, (b), \
-                                          ((lu_mem)(n)*(lu_mem)sizeof(t)), 0)
+                                      cast(lu_mem, n)*cast(lu_mem, sizeof(t)), 0)
 
 #define luaM_malloc(L, t)	luaM_realloc(L, NULL, 0, (t))
-#define luaM_new(L, t)          ((t *)luaM_malloc(L, sizeof(t)))
-#define luaM_newvector(L, n,t)  ((t *)luaM_malloc(L, \
-                                         (lu_mem)(n)*(lu_mem)sizeof(t)))
+#define luaM_new(L, t)          cast(t *, luaM_malloc(L, sizeof(t)))
+#define luaM_newvector(L, n,t)  cast(t *, luaM_malloc(L, \
+                                         cast(lu_mem, n)*cast(lu_mem, sizeof(t))))
 
 #define luaM_growvector(L,v,nelems,size,t,limit,e) \
           if (((nelems)+1) > (size)) \
-            ((v)=(t *)luaM_growaux(L,v,&(size),sizeof(t),limit,e))
+            ((v)=cast(t *, luaM_growaux(L,v,&(size),sizeof(t),limit,e)))
 
 #define luaM_reallocvector(L, v,oldn,n,t) \
-	((v)=(t *)luaM_realloc(L, v,(lu_mem)(oldn)*(lu_mem)sizeof(t), \
-                                    (lu_mem)(n)*(lu_mem)sizeof(t)))
+   ((v)=cast(t *, luaM_realloc(L, v,cast(lu_mem, oldn)*cast(lu_mem, sizeof(t)), \
+                                    cast(lu_mem, n)*cast(lu_mem, sizeof(t)))))
 
 
 #endif

lobject.c

@@ -1,38 +1,82 @@
 /*
-** $Id: lobject.c,v 1.69 2001/03/07 12:27:06 roberto Exp roberto $
+** $Id: lobject.c,v 1.85 2002/07/17 16:25:13 roberto Exp roberto $
 ** Some generic functions over Lua objects
 ** See Copyright Notice in lua.h
 */
 
 #include <ctype.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "ldo.h"
 #include "lmem.h"
 #include "lobject.h"
 #include "lstate.h"
+#include "lstring.h"
+#include "lvm.h"
 
 
+/* function to convert a string to a lua_Number */
+#ifndef lua_str2number
+#define lua_str2number(s,p)     strtod((s), (p))
+#endif
+
 
 const TObject luaO_nilobject = {LUA_TNIL, {NULL}};
 
 
-int luaO_equalObj (const TObject *t1, const TObject *t2) {
+int luaO_log2 (unsigned int x) {
+  static const lu_byte log_8[255] = {
+    0,
+    1,1,
+    2,2,2,2,
+    3,3,3,3,3,3,3,3,
+    4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+    5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+  };
+  if (x >= 0x00010000) {
+    if (x >= 0x01000000) return log_8[((x>>24) & 0xff) - 1]+24;
+    else return log_8[((x>>16) & 0xff) - 1]+16;
+  }
+  else {
+    if (x >= 0x00000100) return log_8[((x>>8) & 0xff) - 1]+8;
+    else if (x) return log_8[(x & 0xff) - 1];
+    return -1;  /* special `log' for 0 */
+  }
+}
+
+
+int luaO_rawequalObj (const TObject *t1, const TObject *t2) {
   if (ttype(t1) != ttype(t2)) return 0;
   switch (ttype(t1)) {
     case LUA_TNUMBER:
       return nvalue(t1) == nvalue(t2);
     case LUA_TNIL:
       return 1;
-    default:  /* all other types are equal if pointers are equal */
+    case LUA_TSTRING:
       return tsvalue(t1) == tsvalue(t2);
+    case LUA_TBOOLEAN:
+      return bvalue(t1) == bvalue(t2);  /* boolean true must be 1 !! */
+    case LUA_TLIGHTUSERDATA:
+      return pvalue(t1) == pvalue(t2);
+    case LUA_TUSERDATA:
+      return uvalue(t1) == uvalue(t2);
+    case LUA_TTABLE:
+      return hvalue(t1) == hvalue(t2);
+    case LUA_TFUNCTION:
+      return clvalue(t1) == clvalue(t2);
   }
+  lua_assert(0);
+  return 0;  /* to avoid warnings */
 }
 
 
@@ -45,61 +89,107 @@ void *luaO_openspaceaux (lua_State *L, size_t n) {
 }
 
 
-int luaO_str2d (const l_char *s, lua_Number *result) {
-  l_char *endptr;
+int luaO_str2d (const char *s, lua_Number *result) {
+  char *endptr;
   lua_Number res = lua_str2number(s, &endptr);
   if (endptr == s) return 0;  /* no conversion */
-  while (isspace(uchar(*endptr))) endptr++;
-  if (*endptr != l_c('\0')) return 0;  /* invalid trailing characters? */
+  while (isspace((unsigned char)(*endptr))) endptr++;
+  if (*endptr != '\0') return 0;  /* invalid trailing characters? */
   *result = res;
   return 1;
 }
 
 
-/* maximum length of a string format for `luaO_verror' */
-#define MAX_VERROR	280
 
-/* this function needs to handle only '%d' and '%.XXs' formats */
-void luaO_verror (lua_State *L, const l_char *fmt, ...) {
-  va_list argp;
-  l_char buff[MAX_VERROR];  /* to hold formatted message */
-  va_start(argp, fmt);
-  vsprintf(buff, fmt, argp);
-  va_end(argp);
-  luaD_error(L, buff);
+static void pushstr (lua_State *L, const char *str) {
+  setsvalue(L->top, luaS_new(L, str));
+  incr_top(L);
 }
 
 
-void luaO_chunkid (l_char *out, const l_char *source, int bufflen) {
-  if (*source == l_c('=')) {
-    strncpy(out, source+1, bufflen);  /* remove first char */
-    out[bufflen-1] = l_c('\0');  /* ensures null termination */
+/* this function handles only `%d', `%c', %f, and `%s' formats */
+const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
+  int n = 1;
+  pushstr(L, "");
+  for (;;) {
+    const char *e = strchr(fmt, '%');
+    if (e == NULL) break;
+    setsvalue(L->top, luaS_newlstr(L, fmt, e-fmt));
+    incr_top(L);
+    switch (*(e+1)) {
+      case 's':
+        pushstr(L, va_arg(argp, char *));
+        break;
+      case 'c': {
+        char buff[2];
+        buff[0] = cast(char, va_arg(argp, int));
+        buff[1] = '\0';
+        pushstr(L, buff);
+        break;
+      }
+      case 'd':
+        setnvalue(L->top, va_arg(argp, int));
+        incr_top(L);
+        break;
+      case 'f':
+        setnvalue(L->top, va_arg(argp, lua_Number));
+        incr_top(L);
+        break;
+      case '%':
+        pushstr(L, "%");
+        break;
+      default: lua_assert(0);
+    }
+    n += 2;
+    fmt = e+2;
   }
-  else {
-    if (*source == l_c('@')) {
+  pushstr(L, fmt);
+  luaV_concat(L, n+1, L->top - L->ci->base - 1);
+  L->top -= n;
+  return svalue(L->top - 1);
+}
+
+
+const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *msg;
+  va_list argp;
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  return msg;
+}
+
+
+void luaO_chunkid (char *out, const char *source, int bufflen) {
+  if (*source == '=') {
+    strncpy(out, source+1, bufflen);  /* remove first char */
+    out[bufflen-1] = '\0';  /* ensures null termination */
+  }
+  else {  /* out = "source", or "...source" */
+    if (*source == '@') {
       int l;
       source++;  /* skip the `@' */
-      bufflen -= sizeof(l_s("file `...%s'"));
+      bufflen -= sizeof(" `...' ");
       l = strlen(source);
+      strcpy(out, "");
       if (l>bufflen) {
         source += (l-bufflen);  /* get last part of file name */
-        sprintf(out, l_s("file `...%.99s'"), source);
+        strcat(out, "...");
       }
-      else
-        sprintf(out, l_s("file `%.99s'"), source);
+      strcat(out, source);
     }
-    else {
-      int len = strcspn(source, l_s("\n"));  /* stop at first newline */
-      bufflen -= sizeof(l_s("string \"%.*s...\""));
+    else {  /* out = [string "string"] */
+      int len = strcspn(source, "\n");  /* stop at first newline */
+      bufflen -= sizeof(" [string \"...\"] ");
       if (len > bufflen) len = bufflen;
-      if (source[len] != l_c('\0')) {  /* must truncate? */
-        strcpy(out, l_s("string \""));
-        out += strlen(out);
-        strncpy(out, source, len);
-        strcpy(out+len, l_s("...\""));
+      strcpy(out, "[string \"");
+      if (source[len] != '\0') {  /* must truncate? */
+        strncat(out, source, len);
+        strcat(out, "...");
       }
       else
-        sprintf(out, l_s("string \"%.99s\""), source);
+        strcat(out, source);
+      strcat(out, "\"]");
     }
   }
 }

lobject.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lobject.h,v 1.108 2001/06/28 14:48:44 roberto Exp roberto $
+** $Id: lobject.h,v 1.141 2002/08/05 14:08:02 roberto Exp roberto $
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
@@ -12,27 +12,18 @@
 #include "lua.h"
 
 
-#ifndef lua_assert
-#define lua_assert(c)		/* empty */
-#endif
-
-
-#ifndef UNUSED
-#define UNUSED(x)	((void)(x))	/* to avoid warnings */
-#endif
-
-
-
-/* tags for values visible from Lua == first user-created tag */
-#define NUM_TAGS	6
+/* tags for values visible from Lua */
+#define NUM_TAGS	LUA_TFUNCTION
 
 
 typedef union {
+  void *p;
   union TString *ts;
   union Udata *u;
-  struct Closure *cl;
-  struct Hash *h;
-  lua_Number n;		/* LUA_TNUMBER */
+  union Closure *cl;
+  struct Table *h;
+  lua_Number n;
+  int b;
 } Value;
 
 
@@ -42,37 +33,57 @@ typedef struct lua_TObject {
 } TObject;
 
 
-/* Macros to access values */
-#define ttype(o)        ((o)->tt)
-#define nvalue(o)       ((o)->value.n)
-#define tsvalue(o)      ((o)->value.ts)
-#define uvalue(o)      ((o)->value.u)
-#define clvalue(o)      ((o)->value.cl)
-#define hvalue(o)       ((o)->value.h)
+/* Macros to test type */
+#define ttisnil(o)	(ttype(o) == LUA_TNIL)
+#define ttisnumber(o)	(ttype(o) == LUA_TNUMBER)
+#define ttisstring(o)	(ttype(o) == LUA_TSTRING)
+#define ttistable(o)	(ttype(o) == LUA_TTABLE)
+#define ttisfunction(o)	(ttype(o) == LUA_TFUNCTION)
+#define ttisboolean(o)	(ttype(o) == LUA_TBOOLEAN)
+#define ttisuserdata(o)	(ttype(o) == LUA_TUSERDATA)
+#define ttislightuserdata(o)	(ttype(o) == LUA_TLIGHTUSERDATA)
 
+/* Macros to access values */
+#define ttype(o)	((o)->tt)
+#define pvalue(o)	check_exp(ttislightuserdata(o), (o)->value.p)
+#define nvalue(o)	check_exp(ttisnumber(o), (o)->value.n)
+#define tsvalue(o)	check_exp(ttisstring(o), (o)->value.ts)
+#define uvalue(o)	check_exp(ttisuserdata(o), (o)->value.u)
+#define clvalue(o)	check_exp(ttisfunction(o), (o)->value.cl)
+#define hvalue(o)	check_exp(ttistable(o), (o)->value.h)
+#define bvalue(o)	check_exp(ttisboolean(o), (o)->value.b)
+
+#define l_isfalse(o)	(ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0))
 
 /* Macros to set values */
 #define setnvalue(obj,x) \
-  { TObject *_o=(obj); _o->tt=LUA_TNUMBER; _o->value.n=(x); }
+  { TObject *i_o=(obj); i_o->tt=LUA_TNUMBER; i_o->value.n=(x); }
 
-#define chgnvalue(obj,x)	((obj)->value.n=(x))
+#define chgnvalue(obj,x) \
+	check_exp(ttype(obj)==LUA_TNUMBER, (obj)->value.n=(x))
+
+#define setpvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TLIGHTUSERDATA; i_o->value.p=(x); }
+
+#define setbvalue(obj,x) \
+  { TObject *i_o=(obj); i_o->tt=LUA_TBOOLEAN; i_o->value.b=(x); }
 
 #define setsvalue(obj,x) \
-  { TObject *_o=(obj); _o->tt=LUA_TSTRING; _o->value.ts=(x); }
+  { TObject *i_o=(obj); i_o->tt=LUA_TSTRING; i_o->value.ts=(x); }
 
 #define setuvalue(obj,x) \
-  { TObject *_o=(obj); _o->tt=LUA_TUSERDATA; _o->value.u=(x); }
+  { TObject *i_o=(obj); i_o->tt=LUA_TUSERDATA; i_o->value.u=(x); }
 
 #define setclvalue(obj,x) \
-  { TObject *_o=(obj); _o->tt=LUA_TFUNCTION; _o->value.cl=(x); }
+  { TObject *i_o=(obj); i_o->tt=LUA_TFUNCTION; i_o->value.cl=(x); }
 
 #define sethvalue(obj,x) \
-  { TObject *_o=(obj); _o->tt=LUA_TTABLE; _o->value.h=(x); }
+  { TObject *i_o=(obj); i_o->tt=LUA_TTABLE; i_o->value.h=(x); }
 
 #define setnilvalue(obj) ((obj)->tt=LUA_TNIL)
 
 #define setobj(obj1,obj2) \
-  { TObject *o1=(obj1); const TObject *o2=(obj2); \
+  { const TObject *o2=(obj2); TObject *o1=(obj1); \
     o1->tt=o2->tt; o1->value = o2->value; }
 
 #define setttype(obj, tt) (ttype(obj) = (tt))
@@ -90,14 +101,13 @@ typedef union TString {
   struct {
     lu_hash hash;
     size_t len;
-    unsigned short constindex;  /* hint to reuse constants */
-    short marked;
+    int marked;
     union TString *nexthash;  /* chain for hash table */
   } tsv;
 } TString;
 
 
-#define getstr(ts)	((l_char *)((ts) + 1))
+#define getstr(ts)	cast(const char *, (ts) + 1)
 #define svalue(o)       getstr(tsvalue(o))
 
 
@@ -105,17 +115,13 @@ typedef union TString {
 typedef union Udata {
   union L_Umaxalign dummy;  /* ensures maximum alignment for `local' udata */
   struct {
-    int tag;  /* negative means `marked' (only during GC) */
-    void *value;
-    size_t len;
+    struct Table *metatable;
     union Udata *next;  /* chain for list of all udata */
+    size_t len;  /* least 2 bits reserved for gc mark */
   } uv;
 } Udata;
 
 
-#define switchudatamark(u)	((u)->uv.tag = (-((u)->uv.tag+1)))
-#define ismarkedudata(u)	((u)->uv.tag < 0)
-
 
 
 /*
@@ -123,24 +129,22 @@ typedef union Udata {
 */
 typedef struct Proto {
   TObject *k;  /* constants used by the function */
-  int sizek;  /* size of `k' */
-  struct Proto **p;  /* functions defined inside the function */
-  int sizep;  /* size of `p' */
   Instruction *code;
-  int sizecode;
-  short nupvalues;
-  short numparams;
-  short is_vararg;
-  short maxstacksize;
-  short marked;
+  struct Proto **p;  /* functions defined inside the function */
   struct Proto *next;
-  /* debug information */
   int *lineinfo;  /* map from opcodes to source lines */
-  int sizelineinfo;  /* size of `lineinfo' */
   struct LocVar *locvars;  /* information about local variables */
+  TString  *source;
+  int sizek;  /* size of `k' */
+  int sizecode;
+  int sizep;  /* size of `p' */
   int sizelocvars;
   int lineDefined;
-  TString  *source;
+  lu_byte nupvalues;
+  lu_byte numparams;
+  lu_byte is_vararg;
+  lu_byte maxstacksize;
+  lu_byte marked;
 } Proto;
 
 
@@ -151,81 +155,109 @@ typedef struct LocVar {
 } LocVar;
 
 
+
+/*
+** Upvalues
+*/
+
+typedef struct UpVal {
+  TObject *v;  /* points to stack or to its own value */
+  struct UpVal *next;
+  TObject value;  /* the value (when closed) */
+} UpVal;
+
+
 /*
 ** Closures
 */
-typedef struct Closure {
-  int isC;  /* 0 for Lua functions, 1 for C functions */
-  int nupvalues;
-  union {
-    lua_CFunction c;  /* C functions */
-    struct Proto *l;  /* Lua functions */
-  } f;
-  struct Closure *next;
-  struct Closure *mark;  /* marked closures (point to itself when not marked) */
+
+typedef struct CClosure {
+  lu_byte isC;  /* 0 for Lua functions, 1 for C functions */
+  lu_byte nupvalues;
+  lu_byte marked;
+  union Closure *next;
+  lua_CFunction f;
   TObject upvalue[1];
+} CClosure;
+
+
+typedef struct LClosure {
+  lu_byte isC;
+  lu_byte nupvalues;
+  lu_byte marked;
+  union Closure *next;  /* first four fields must be equal to CClosure!! */
+  struct Proto *p;
+  TObject g;  /* global table for this closure */
+  UpVal *upvals[1];
+} LClosure;
+
+
+typedef union Closure {
+  CClosure c;
+  LClosure l;
 } Closure;
 
 
-#define iscfunction(o)	(ttype(o) == LUA_TFUNCTION && clvalue(o)->isC)
+#define iscfunction(o)	(ttype(o) == LUA_TFUNCTION && clvalue(o)->c.isC)
+#define isLfunction(o)	(ttype(o) == LUA_TFUNCTION && !clvalue(o)->c.isC)
 
 
+/*
+** Tables
+*/
+
 typedef struct Node {
+  TObject i_key;
+  TObject i_val;
   struct Node *next;  /* for chaining */
-  TObject key;
-  TObject val;
 } Node;
 
 
-typedef struct Hash {
+typedef struct Table {
+  struct Table *metatable;
+  TObject *array;  /* array part */
   Node *node;
-  int htag;
-  int size;
   Node *firstfree;  /* this position is free; all positions after it are full */
-  struct Hash *next;
-  struct Hash *mark;  /* marked tables (point to itself when not marked) */
-  int weakmode;
-} Hash;
+  struct Table *next;
+  struct Table *mark;  /* marked tables (point to itself when not marked) */
+  int sizearray;  /* size of `array' array */
+  lu_byte flags;  /* 1<<p means tagmethod(p) is not present */ 
+  lu_byte lsizenode;  /* log2 of size of `node' array */
+  lu_byte mode;
+} Table;
 
-
-/* unmarked tables and closures are represented by pointing `mark' to
-** themselves
-*/
-#define ismarked(x)	((x)->mark != (x))
+/* bit masks for `mode' */
+#define WEAKKEY		1
+#define WEAKVALUE	2
 
 
 /*
 ** `module' operation for hashing (size is always a power of 2)
 */
-#define lmod(s,size)	((int)((s) & ((size)-1)))
+#define lmod(s,size) \
+	check_exp((size&(size-1))==0, (cast(int, (s) & ((size)-1))))
 
 
-/*
-** informations about a call (for debugging)
-*/
-typedef struct CallInfo {
-  struct CallInfo *prev;  /* linked list */
-  StkId base;  /* base for called function */
-  const Instruction **pc;  /* current pc of called function */
-  int lastpc;  /* last pc traced */
-  int line;  /* current line */
-  int refi;  /* current index in `lineinfo' */
-} CallInfo;
+#define twoto(x)	(1<<(x))
+#define sizenode(t)	(twoto((t)->lsizenode))
+#define sizearray(t)	((t)->sizearray)
 
-#define ci_func(ci)	(clvalue((ci)->base - 1))
 
 
 extern const TObject luaO_nilobject;
 
+int luaO_log2 (unsigned int x);
 
-#define luaO_openspace(L,n,t)	((t *)luaO_openspaceaux(L,(n)*sizeof(t)))
+
+#define luaO_openspace(L,n,t)	cast(t *, luaO_openspaceaux(L,(n)*sizeof(t)))
 void *luaO_openspaceaux (lua_State *L, size_t n);
 
-int luaO_equalObj (const TObject *t1, const TObject *t2);
-int luaO_str2d (const l_char *s, lua_Number *result);
+int luaO_rawequalObj (const TObject *t1, const TObject *t2);
+int luaO_str2d (const char *s, lua_Number *result);
 
-void luaO_verror (lua_State *L, const l_char *fmt, ...);
-void luaO_chunkid (l_char *out, const l_char *source, int len);
+const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp);
+const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
+void luaO_chunkid (char *out, const char *source, int len);
 
 
 #endif

lopcodes.c

@@ -1,59 +1,57 @@
 /*
-** $Id:$
+** $Id: lopcodes.c,v 1.19 2002/05/13 13:09:00 roberto Exp roberto $
 ** extracted automatically from lopcodes.h by mkprint.lua
 ** DO NOT EDIT
 ** See Copyright Notice in lua.h
 */
 
 
-#define LUA_PRIVATE
 #include "lua.h"
 
+#include "lobject.h"
 #include "lopcodes.h"
 
 
 #ifdef LUA_OPNAMES
 
-const l_char *const luaP_opnames[] = {
-  l_s("MOVE"),
-  l_s("LOADK"),
-  l_s("LOADINT"),
-  l_s("LOADNIL"),
-  l_s("LOADUPVAL"),
-  l_s("GETGLOBAL"),
-  l_s("GETTABLE"),
-  l_s("SETGLOBAL"),
-  l_s("SETTABLE"),
-  l_s("NEWTABLE"),
-  l_s("SELF"),
-  l_s("ADD"),
-  l_s("SUB"),
-  l_s("MUL"),
-  l_s("DIV"),
-  l_s("POW"),
-  l_s("UNM"),
-  l_s("NOT"),
-  l_s("CONCAT"),
-  l_s("JMP"),
-  l_s("CJMP"),
-  l_s("TESTEQ"),
-  l_s("TESTNE"),
-  l_s("TESTLT"),
-  l_s("TESTLE"),
-  l_s("TESTGT"),
-  l_s("TESTGE"),
-  l_s("TESTT"),
-  l_s("TESTF"),
-  l_s("NILJMP"),
-  l_s("CALL"),
-  l_s("RETURN"),
-  l_s("FORPREP"),
-  l_s("FORLOOP"),
-  l_s("TFORPREP"),
-  l_s("TFORLOOP"),
-  l_s("SETLIST"),
-  l_s("SETLISTO"),
-  l_s("CLOSURE")
+const char *const luaP_opnames[] = {
+  "MOVE",
+  "LOADK",
+  "LOADBOOL",
+  "LOADNIL",
+  "GETUPVAL",
+  "GETGLOBAL",
+  "GETTABLE",
+  "SETGLOBAL",
+  "SETUPVAL",
+  "SETTABLE",
+  "NEWTABLE",
+  "SELF",
+  "ADD",
+  "SUB",
+  "MUL",
+  "DIV",
+  "POW",
+  "UNM",
+  "NOT",
+  "CONCAT",
+  "JMP",
+  "EQ",
+  "LT",
+  "LE",
+  "GT",
+  "GE",
+  "TEST",
+  "CALL",
+  "TAILCALL",
+  "RETURN",
+  "FORLOOP",
+  "TFORLOOP",
+  "TFORPREP",
+  "SETLIST",
+  "SETLISTO",
+  "CLOSE",
+  "CLOSURE"
 };
 
 #endif
@@ -62,18 +60,20 @@ const l_char *const luaP_opnames[] = {
    ((b)<<OpModeBreg) | ((c)<<OpModeCreg) | \
    ((sa)<<OpModesetA) | ((k)<<OpModeK) | (m))
 
-const lu_byte luaP_opmodes[] = {
+
+const lu_byte luaP_opmodes[NUM_OPCODES] = {
 /*       T _ B C sA K mode		   opcode    */
   opmode(0,0,1,0, 1,0,iABC)		/* OP_MOVE */
- ,opmode(0,0,0,0, 1,1,iABc)		/* OP_LOADK */
- ,opmode(0,0,0,0, 1,0,iAsBc)		/* OP_LOADINT */
+ ,opmode(0,0,0,0, 1,1,iABx)		/* OP_LOADK */
+ ,opmode(0,0,0,0, 1,0,iABC)		/* OP_LOADBOOL */
  ,opmode(0,0,1,0, 1,0,iABC)		/* OP_LOADNIL */
- ,opmode(0,0,0,0, 1,0,iABc)		/* OP_LOADUPVAL */
- ,opmode(0,0,0,0, 1,1,iABc)		/* OP_GETGLOBAL */
+ ,opmode(0,0,0,0, 1,0,iABC)		/* OP_GETUPVAL */
+ ,opmode(0,0,0,0, 1,1,iABx)		/* OP_GETGLOBAL */
  ,opmode(0,0,1,1, 1,0,iABC)		/* OP_GETTABLE */
- ,opmode(0,0,0,0, 0,1,iABc)		/* OP_SETGLOBAL */
+ ,opmode(0,0,0,0, 0,1,iABx)		/* OP_SETGLOBAL */
+ ,opmode(0,0,0,0, 0,0,iABC)		/* OP_SETUPVAL */
  ,opmode(0,0,1,1, 0,0,iABC)		/* OP_SETTABLE */
- ,opmode(0,0,0,0, 1,0,iABc)		/* OP_NEWTABLE */
+ ,opmode(0,0,0,0, 1,0,iABC)		/* OP_NEWTABLE */
  ,opmode(0,0,1,1, 1,0,iABC)		/* OP_SELF */
  ,opmode(0,0,1,1, 1,0,iABC)		/* OP_ADD */
  ,opmode(0,0,1,1, 1,0,iABC)		/* OP_SUB */
@@ -83,25 +83,22 @@ const lu_byte luaP_opmodes[] = {
  ,opmode(0,0,1,0, 1,0,iABC)		/* OP_UNM */
  ,opmode(0,0,1,0, 1,0,iABC)		/* OP_NOT */
  ,opmode(0,0,1,1, 1,0,iABC)		/* OP_CONCAT */
- ,opmode(0,0,0,0, 0,0,iAsBc)		/* OP_JMP */
- ,opmode(0,0,0,0, 0,0,iAsBc)		/* OP_CJMP */
- ,opmode(1,0,0,1, 0,0,iABC)		/* OP_TESTEQ */
- ,opmode(1,0,0,1, 0,0,iABC)		/* OP_TESTNE */
- ,opmode(1,0,0,1, 0,0,iABC)		/* OP_TESTLT */
- ,opmode(1,0,0,1, 0,0,iABC)		/* OP_TESTLE */
- ,opmode(1,0,0,1, 0,0,iABC)		/* OP_TESTGT */
- ,opmode(1,0,0,1, 0,0,iABC)		/* OP_TESTGE */
- ,opmode(1,0,1,0, 1,0,iABC)		/* OP_TESTT */
- ,opmode(1,0,1,0, 1,0,iABC)		/* OP_TESTF */
- ,opmode(0,0,0,0, 1,0,iABc)		/* OP_NILJMP */
+ ,opmode(0,0,0,0, 0,0,iAsBx)		/* OP_JMP */
+ ,opmode(1,0,0,1, 0,0,iABC)		/* OP_EQ */
+ ,opmode(1,0,0,1, 0,0,iABC)		/* OP_LT */
+ ,opmode(1,0,0,1, 0,0,iABC)		/* OP_LE */
+ ,opmode(1,0,0,1, 0,0,iABC)		/* OP_GT */
+ ,opmode(1,0,0,1, 0,0,iABC)		/* OP_GE */
+ ,opmode(1,0,0,1, 1,0,iABC)		/* OP_TEST */
  ,opmode(0,0,0,0, 0,0,iABC)		/* OP_CALL */
+ ,opmode(0,0,0,0, 0,0,iABC)		/* OP_TAILCALL */
  ,opmode(0,0,0,0, 0,0,iABC)		/* OP_RETURN */
- ,opmode(0,0,0,0, 0,0,iAsBc)		/* OP_FORPREP */
- ,opmode(0,0,0,0, 0,0,iAsBc)		/* OP_FORLOOP */
- ,opmode(0,0,0,0, 0,0,iAsBc)		/* OP_TFORPREP */
- ,opmode(0,0,0,0, 0,0,iAsBc)		/* OP_TFORLOOP */
- ,opmode(0,0,0,0, 0,0,iABc)		/* OP_SETLIST */
- ,opmode(0,0,0,0, 0,0,iABc)		/* OP_SETLISTO */
- ,opmode(0,0,0,0, 1,0,iABc)		/* OP_CLOSURE */
+ ,opmode(0,0,0,0, 0,0,iAsBx)		/* OP_FORLOOP */
+ ,opmode(1,0,0,0, 0,0,iABC)		/* OP_TFORLOOP */
+ ,opmode(0,0,0,0, 0,0,iAsBx)		/* OP_TFORPREP */
+ ,opmode(0,0,0,0, 0,0,iABx)		/* OP_SETLIST */
+ ,opmode(0,0,0,0, 0,0,iABx)		/* OP_SETLISTO */
+ ,opmode(0,0,0,0, 0,0,iABC)		/* OP_CLOSE */
+ ,opmode(0,0,0,0, 1,0,iABx)		/* OP_CLOSURE */
 };
 

lopcodes.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.h,v 1.77 2001/07/03 17:01:34 roberto Exp roberto $
+** $Id: lopcodes.h,v 1.99 2002/06/12 14:51:31 roberto Exp $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -17,8 +17,8 @@
 	`A' : 8 bits (25-32)
 	`B' : 8 bits (17-24)
 	`C' : 10 bits (7-16)
-	`Bc' : 18 bits (`B' and `C' together)
-	`sBc' : signed Bc
+	`Bx' : 18 bits (`B' and `C' together)
+	`sBx' : signed Bx
 
   A signed argument is represented in excess K; that is, the number
   value is the unsigned value minus K. K is exactly the maximum value
@@ -28,7 +28,7 @@
 ===========================================================================*/
 
 
-enum OpMode {iABC, iABc, iAsBc};  /* basic instruction format */
+enum OpMode {iABC, iABx, iAsBx};  /* basic instruction format */
 
 
 /*
@@ -36,14 +36,14 @@ enum OpMode {iABC, iABc, iAsBc};  /* basic instruction format */
 */
 #define SIZE_C		10
 #define SIZE_B		8
-#define SIZE_Bc		(SIZE_C + SIZE_B)
+#define SIZE_Bx		(SIZE_C + SIZE_B)
 #define SIZE_A		8
 
 #define SIZE_OP		6
 
 #define POS_C		SIZE_OP
 #define POS_B		(POS_C + SIZE_C)
-#define POS_Bc		POS_C
+#define POS_Bx		POS_C
 #define POS_A		(POS_B + SIZE_B)
 
 
@@ -52,12 +52,12 @@ enum OpMode {iABC, iABc, iAsBc};  /* basic instruction format */
 ** we use (signed) int to manipulate most arguments,
 ** so they must fit in BITS_INT-1 bits (-1 for sign)
 */
-#if SIZE_Bc < BITS_INT-1
-#define MAXARG_Bc        ((1<<SIZE_Bc)-1)
-#define MAXARG_sBc        (MAXARG_Bc>>1)         /* `sBc' is signed */
+#if SIZE_Bx < BITS_INT-1
+#define MAXARG_Bx        ((1<<SIZE_Bx)-1)
+#define MAXARG_sBx        (MAXARG_Bx>>1)         /* `sBx' is signed */
 #else
-#define MAXARG_Bc        MAX_INT
-#define MAXARG_sBc        MAX_INT
+#define MAXARG_Bx        MAX_INT
+#define MAXARG_sBx        MAX_INT
 #endif
 
 
@@ -76,45 +76,46 @@ enum OpMode {iABC, iABc, iAsBc};  /* basic instruction format */
 ** the following macros help to manipulate instructions
 */
 
-#define GET_OPCODE(i)	((OpCode)((i)&MASK1(SIZE_OP,0)))
-#define SET_OPCODE(i,o)	(((i)&MASK0(SIZE_OP,0)) | (Instruction)(o))
+#define GET_OPCODE(i)	(cast(OpCode, (i)&MASK1(SIZE_OP,0)))
+#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,0)) | cast(Instruction, o)))
 
-#define GETARG_A(i)	((int)((i)>>POS_A))
+#define GETARG_A(i)	(cast(int, (i)>>POS_A))
 #define SETARG_A(i,u)	((i) = (((i)&MASK0(SIZE_A,POS_A)) | \
-                               ((Instruction)(u)<<POS_A)))
+		((cast(Instruction, u)<<POS_A)&MASK1(SIZE_A,POS_A))))
 
-#define GETARG_B(i)	((int)(((i)>>POS_B) & MASK1(SIZE_B,0)))
+#define GETARG_B(i)	(cast(int, ((i)>>POS_B) & MASK1(SIZE_B,0)))
 #define SETARG_B(i,b)	((i) = (((i)&MASK0(SIZE_B,POS_B)) | \
-                               ((Instruction)(b)<<POS_B)))
+		((cast(Instruction, b)<<POS_B)&MASK1(SIZE_B,POS_B))))
 
-#define GETARG_C(i)	((int)(((i)>>POS_C) & MASK1(SIZE_C,0)))
+#define GETARG_C(i)	(cast(int, ((i)>>POS_C) & MASK1(SIZE_C,0)))
 #define SETARG_C(i,b)	((i) = (((i)&MASK0(SIZE_C,POS_C)) | \
-                               ((Instruction)(b)<<POS_C)))
+		((cast(Instruction, b)<<POS_C)&MASK1(SIZE_C,POS_C))))
 
-#define GETARG_Bc(i)	((int)(((i)>>POS_Bc) & MASK1(SIZE_Bc,0)))
-#define SETARG_Bc(i,b)	((i) = (((i)&MASK0(SIZE_Bc,POS_Bc)) | \
-                               ((Instruction)(b)<<POS_Bc)))
+#define GETARG_Bx(i)	(cast(int, ((i)>>POS_Bx) & MASK1(SIZE_Bx,0)))
+#define SETARG_Bx(i,b)	((i) = (((i)&MASK0(SIZE_Bx,POS_Bx)) | \
+		((cast(Instruction, b)<<POS_Bx)&MASK1(SIZE_Bx,POS_Bx))))
 
-#define GETARG_sBc(i)	(GETARG_Bc(i)-MAXARG_sBc)
-#define SETARG_sBc(i,b)	SETARG_Bc((i),(unsigned int)((b)+MAXARG_sBc))
+#define GETARG_sBx(i)	(GETARG_Bx(i)-MAXARG_sBx)
+#define SETARG_sBx(i,b)	SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_sBx))
 
 
-#define CREATE_ABC(o,a,b,c)	((Instruction)(o) \
-			| ((Instruction)(a)<<POS_A) \
-			| ((Instruction)(b)<<POS_B) \
-			| ((Instruction)(c)<<POS_C))
+#define CREATE_ABC(o,a,b,c)	(cast(Instruction, o) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, b)<<POS_B) \
+			| (cast(Instruction, c)<<POS_C))
 
-#define CREATE_ABc(o,a,bc)	((Instruction)(o) \
-			| ((Instruction)(a)<<POS_A) \
-			| ((Instruction)(bc)<<POS_Bc))
+#define CREATE_ABx(o,a,bc)	(cast(Instruction, o) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, bc)<<POS_Bx))
 
 
 
 
 /*
-** an invalid register that fits in 8 bits
+** invalid registers that fits in 8 bits
 */
 #define NO_REG		MAXARG_A
+#define NO_REG1		(NO_REG+1)
 
 
 /*
@@ -128,18 +129,19 @@ typedef enum {
 name		args	description
 ------------------------------------------------------------------------*/
 OP_MOVE,/*	A B	R(A) := R(B)					*/
-OP_LOADK,/*	A Bc	R(A) := Kst(Bc)					*/
-OP_LOADINT,/*	A sBc	R(A) := (Number)sBc				*/
+OP_LOADK,/*	A Bx	R(A) := Kst(Bx)					*/
+OP_LOADBOOL,/*	A B C	R(A) := (Bool)B; if (C) PC++			*/
 OP_LOADNIL,/*	A B	R(A) := ... := R(B) := nil			*/
-OP_LOADUPVAL,/*	A Bc	R(A) := UpValue[Bc]				*/
+OP_GETUPVAL,/*	A B	R(A) := UpValue[B]				*/
 
-OP_GETGLOBAL,/*	A Bc	R(A) := Gbl[Kst(Bc)]				*/
+OP_GETGLOBAL,/*	A Bx	R(A) := Gbl[Kst(Bx)]				*/
 OP_GETTABLE,/*	A B C	R(A) := R(B)[R/K(C)]				*/
 
-OP_SETGLOBAL,/*	A Bc	Gbl[Kst(Bc)] := R(A)				*/
+OP_SETGLOBAL,/*	A Bx	Gbl[Kst(Bx)] := R(A)				*/
+OP_SETUPVAL,/*	A B	UpValue[B] := R(A)				*/
 OP_SETTABLE,/*	A B C	R(B)[R/K(C)] := R(A)				*/
 
-OP_NEWTABLE,/*	A Bc	R(A) := {} (size = Bc)				*/
+OP_NEWTABLE,/*	A B C	R(A) := {} (size = B,C)				*/
 
 OP_SELF,/*	A B C	R(A+1) := R(B); R(A) := R(B)[R/K(C)]		*/
 
@@ -153,53 +155,51 @@ OP_NOT,/*	A B	R(A) := not R(B)				*/
 
 OP_CONCAT,/*	A B C	R(A) := R(B).. ... ..R(C)			*/
 
-OP_JMP,/*	sBc	PC += sBc					*/
-OP_CJMP,/*	sBc	if test then PC += sBc		(see (1))	*/
+OP_JMP,/*	sBx	PC += sBx					*/
 
-OP_TESTEQ,/*	A C	test := (R(A) == R/K(C))			*/
-OP_TESTNE,/*	A C	test := (R(A) ~= R/K(C))			*/
-OP_TESTLT,/*	A C	test := (R(A) < R/K(C))				*/
-OP_TESTLE,/*	A C	test := (R(A) <= R/K(C))			*/
-OP_TESTGT,/*	A C	test := (R(A) > R/K(C))				*/
-OP_TESTGE,/*	A C	test := (R(A) >= R/K(C))			*/
+OP_EQ,/*	A B C	if ((R(A) == R/K(C)) ~= B) then pc++		*/
+OP_LT,/*	A B C	if ((R(A) <  R/K(C)) ~= B) then pc++  		*/
+OP_LE,/*	A B C	if ((R(A) <= R/K(C)) ~= B) then pc++  		*/
+OP_GT,/*	A B C	if ((R(A) >  R/K(C)) ~= B) then pc++  		*/
+OP_GE,/*	A B C	if ((R(A) >= R/K(C)) ~= B) then pc++  		*/
 
-OP_TESTT,/*	A B	test := R(B); if (test) R(A) := R(B)		*/
-OP_TESTF,/*	A B	test := not R(B); if (test) R(A) := nil		*/
+OP_TEST,/*	A B C	if (R(C) <=> B) then R(A) := R(C) else pc++	*/ 
 
-OP_NILJMP,/*	A Bc	R(A) := nil; PC++;				*/
+OP_CALL,/*	A B C	R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
+OP_TAILCALL,/*	A B C	return R(A)(R(A+1), ... ,R(A+B-1))		*/
+OP_RETURN,/*	A B	return R(A), ... ,R(A+B-2)	(see note)	*/
 
-OP_CALL,/*	A B C	R(A), ... ,R(A+C-1) := R(A)(R(A+1), ... ,R(A+B))*/
-OP_RETURN,/*	A B	return R(A), ... ,R(A+B-1)	(see (3))	*/
+OP_FORLOOP,/*	A sBx	R(A)+=R(A+2); if R(A) <?= R(A+1) then PC+= sBx	*/
 
-OP_FORPREP,/*	A sBc							*/
-OP_FORLOOP,/*	A sBc							*/
+OP_TFORLOOP,/*	A C	R(A+2), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2)); 
+                        if R(A+2) ~= nil then pc++			*/
+OP_TFORPREP,/*	A sBx	if type(R(A)) == table then R(A+1):=R(A), R(A):=next;
+			PC += sBx					*/
 
-OP_TFORPREP,/*	A sBc							*/
-OP_TFORLOOP,/*	A sBc							*/
+OP_SETLIST,/*	A Bx	R(A)[Bx-Bx%FPF+i] := R(A+i), 1 <= i <= Bx%FPF+1	*/
+OP_SETLISTO,/*	A Bx							*/
 
-OP_SETLIST,/*	A Bc	R(A)[Bc-Bc%FPF+i] := R(A+i), 1 <= i <= Bc%FPF+1	*/
-OP_SETLISTO,/*	A Bc							*/
-
-OP_CLOSURE /*	A Bc	R(A) := closure(KPROTO[Bc], R(A), ... ,R(A+n))	*/
+OP_CLOSE,/*	A 	close all variables in the stack up to (>=) R(A)*/
+OP_CLOSURE/*	A Bx	R(A) := closure(KPROTO[Bx], R(A), ... ,R(A+n))	*/
 } OpCode;
 
 
-#define NUM_OPCODES	((int)OP_CLOSURE+1)
+#define NUM_OPCODES	(cast(int, OP_CLOSURE+1))
 
 
 
 /*===========================================================================
   Notes:
-  (1) In the current implementation there is no `test' variable;
-      instructions OP_TEST* and OP_CJMP must always occur together.
-
-  (2) In OP_CALL, if (B == NO_REG) then B = top. C is the number of returns,
-      and can be NO_REG. OP_CALL can set `top' to last_result+1, so
+  (1) In OP_CALL, if (B == 0) then B = top. C is the number of returns - 1,
+      and can be 0: OP_CALL then sets `top' to last_result+1, so
       next open instruction (OP_CALL, OP_RETURN, OP_SETLIST) may use `top'.
 
-  (3) In OP_RETURN, if (B == NO_REG) then return up to `top'
-===========================================================================*/
+  (2) In OP_RETURN, if (B == 0) then return up to `top'
 
+  (3) For comparisons, B specifies what conditions the test should accept.
+
+  (4) All `skips' (pc++) assume that next instruction is a jump
+===========================================================================*/
 
 
 /*
@@ -209,20 +209,25 @@ enum OpModeMask {
   OpModeBreg = 2,       /* B is a register */
   OpModeCreg,           /* C is a register/constant */
   OpModesetA,           /* instruction set register A */
-  OpModeK,              /* Bc is a constant */
-  OpModeT               /* operator is a test */
+  OpModeK,              /* Bx is a constant */
+  OpModeT		/* operator is a test */
 };
 
-extern const lu_byte luaP_opmodes[];
+extern const lu_byte luaP_opmodes[NUM_OPCODES];
 
-#define getOpMode(m)            ((enum OpMode)(luaP_opmodes[m] & 3))
+#define getOpMode(m)            (cast(enum OpMode, luaP_opmodes[m] & 3))
 #define testOpMode(m, b)        (luaP_opmodes[m] & (1 << (b)))
 
 
-/*
-** opcode names (only included when compiled with LUA_OPNAMES)
-*/
-extern const l_char *const luaP_opnames[];
+#ifdef LUA_OPNAMES
+extern const char *const luaP_opnames[];  /* opcode names */
+#endif
+
+
+
+/* number of list items to accumulate before a SETLIST instruction */
+/* (must be a power of 2) */
+#define LFIELDS_PER_FLUSH	32
 
 
 #endif

lparser.h

@@ -1,13 +1,15 @@
 /*
-** $Id: lparser.h,v 1.31 2001/06/05 18:17:01 roberto Exp roberto $
-** LL(1) Parser and code generator for Lua
+** $Id: lparser.h,v 1.43 2002/05/10 19:22:11 roberto Exp roberto $
+** Lua Parser
 ** See Copyright Notice in lua.h
 */
 
 #ifndef lparser_h
 #define lparser_h
 
+#include "llimits.h"
 #include "lobject.h"
+#include "ltable.h"
 #include "lzio.h"
 
 
@@ -18,49 +20,48 @@
 typedef enum {
   VVOID,	/* no value */
   VNIL,
-  VNUMBER,	/* n = value */
+  VTRUE,
+  VFALSE,
   VK,		/* info = index of constant in `k' */
-  VGLOBAL,	/* info = index of global name in `k' */
   VLOCAL,	/* info = local register */
+  VUPVAL,       /* info = index of upvalue in `upvalues' */
+  VGLOBAL,	/* info = index of table; aux = index of global name in `k' */
   VINDEXED,	/* info = table register; aux = index register (or `k') */
+  VJMP,		/* info = instruction pc */
   VRELOCABLE,	/* info = instruction pc */
   VNONRELOC,	/* info = result register */
-  VJMP,		/* info = result register */
   VCALL		/* info = result register */
 } expkind;
 
 typedef struct expdesc {
   expkind k;
-  union {
-    struct {
-      int info, aux;
-    } i;
-    lua_Number n;
-  } u;
+  int info, aux;
   int t;  /* patch list of `exit when true' */
   int f;  /* patch list of `exit when false' */
 } expdesc;
 
 
+struct BlockCnt;  /* defined in lparser.c */
+
+
 /* state needed to generate code for a given function */
 typedef struct FuncState {
   Proto *f;  /* current function header */
+  Table *h;  /* table to find (and reuse) elements in `k' */
   struct FuncState *prev;  /* enclosing function */
   struct LexState *ls;  /* lexical state */
   struct lua_State *L;  /* copy of the Lua state */
+  struct BlockCnt *bl;  /* chain of current blocks */
   int pc;  /* next position to code (equivalent to `ncode') */
   int lasttarget;   /* `pc' of last `jump target' */
-  int jlt;  /* list of jumps to `lasttarget' */
+  int jpc;  /* list of pending jumps to `pc' */
   int freereg;  /* first free register */
   int nk;  /* number of elements in `k' */
   int np;  /* number of elements in `p' */
-  int nlineinfo;  /* number of elements in `lineinfo' */
   int nlocvars;  /* number of elements in `locvars' */
-  int nactloc;  /* number of active local variables */
-  int lastline;  /* line where last `lineinfo' was generated */
-  struct Breaklabel *bl;  /* chain of breakable blocks */
+  int nactvar;  /* number of active local variables */
   expdesc upvalues[MAXUPVALUES];  /* upvalues */
-  int actloc[MAXLOCALS];  /* local-variable stack (indices to locvars) */
+  int actvar[MAXVARS];  /* declared-variable stack */
 } FuncState;
 
 

lstate.c

@@ -1,16 +1,15 @@
 /*
-** $Id: lstate.c,v 1.65 2001/06/21 16:41:34 roberto Exp roberto $
+** $Id: lstate.c,v 1.102 2002/08/06 15:32:22 roberto Exp roberto $
 ** Global State
 ** See Copyright Notice in lua.h
 */
 
 
-#include <stdio.h>
-
-#define LUA_PRIVATE
 #include "lua.h"
 
+#include "ldebug.h"
 #include "ldo.h"
+#include "lfunc.h"
 #include "lgc.h"
 #include "llex.h"
 #include "lmem.h"
@@ -20,123 +19,174 @@
 #include "ltm.h"
 
 
-struct Sopen {
-  int stacksize;
-  lua_State *L;
-};
 
 
-static void close_state (lua_State *L, lua_State *OL);
+static void close_state (lua_State *L);
+
+
+/*
+** you can change this function through the official API
+** call `lua_setpanicf'
+*/
+static int default_panic (lua_State *L) {
+  UNUSED(L);
+  return 0;
+}
+
+
+static void stack_init (lua_State *L, lua_State *OL) {
+  L->stack = luaM_newvector(OL, BASIC_STACK_SIZE + EXTRA_STACK, TObject);
+  L->stacksize = BASIC_STACK_SIZE + EXTRA_STACK;
+  L->top = L->stack;
+  L->stack_last = L->stack+(L->stacksize - EXTRA_STACK)-1;
+  L->base_ci = luaM_newvector(OL, BASIC_CI_SIZE, CallInfo);
+  L->ci = L->base_ci;
+  L->ci->state = CI_C;  /*  not a Lua function */
+  setnilvalue(L->top++);  /* `function' entry for this `ci' */
+  L->ci->base = L->top;
+  L->ci->top = L->top + LUA_MINSTACK;
+  L->size_ci = BASIC_CI_SIZE;
+  L->end_ci = L->base_ci + L->size_ci;
+}
 
 
 /*
 ** open parts that may cause memory-allocation errors
 */
 static void f_luaopen (lua_State *L, void *ud) {
-  struct Sopen *so = (struct Sopen *)ud;
-  if (so->stacksize == 0)
-    so->stacksize = DEFAULT_STACK_SIZE;
-  else
-    so->stacksize += LUA_MINSTACK;
-  if (so->L != NULL) {  /* shared global state? */
-    L->G = G(so->L);
-    L->gt = so->L->gt;  /* share table of globals */
-    so->L->next->previous = L;  /* insert L into linked list */
-    L->next = so->L->next;
-    so->L->next = L;
-    L->previous = so->L;
-    luaD_init(L, so->stacksize);  /* init stack */
-  }
-  else {  /* create a new global state */
-    L->G = luaM_new(L, global_State);
-    G(L)->strt.size = 0;
-    G(L)->strt.nuse = 0;
-    G(L)->strt.hash = NULL;
-    G(L)->Mbuffer = NULL;
-    G(L)->Mbuffsize = 0;
-    G(L)->rootproto = NULL;
-    G(L)->rootcl = NULL;
-    G(L)->roottable = NULL;
-    G(L)->rootudata = NULL;
-    G(L)->TMtable = NULL;
-    G(L)->sizeTM = 0;
-    G(L)->ntag = 0;
-    G(L)->nblocks = sizeof(lua_State) + sizeof(global_State);
-    luaD_init(L, so->stacksize);  /* init stack */
-    L->gt = luaH_new(L, 10);  /* table of globals */
-    G(L)->type2tag = luaH_new(L, 10);
-    G(L)->registry = luaH_new(L, 0);
-    G(L)->weakregistry = luaH_new(L, 0);
-    /* make weakregistry weak */
-    G(L)->weakregistry->weakmode = LUA_WEAK_KEY | LUA_WEAK_VALUE;
-    luaS_resize(L, MINPOWER2);
-    luaX_init(L);
-    luaT_init(L);
-    G(L)->GCthreshold = 4*G(L)->nblocks;
-  }
+  UNUSED(ud);
+  /* create a new global state */
+  L->l_G = luaM_new(L, global_State);
+  G(L)->GCthreshold = 0;  /* mark it as unfinished state */
+  G(L)->strt.size = 0;
+  G(L)->strt.nuse = 0;
+  G(L)->strt.hash = NULL;
+  G(L)->Mbuffer = NULL;
+  G(L)->Mbuffsize = 0;
+  G(L)->panic = &default_panic;
+  G(L)->rootproto = NULL;
+  G(L)->rootcl = NULL;
+  G(L)->roottable = NULL;
+  G(L)->rootupval = NULL;
+  G(L)->rootudata = NULL;
+  G(L)->tmudata = NULL;
+  setnilvalue(key(G(L)->dummynode));
+  setnilvalue(val(G(L)->dummynode));
+  G(L)->dummynode->next = NULL;
+  G(L)->nblocks = sizeof(lua_State) + sizeof(global_State);
+  stack_init(L, L);  /* init stack */
+  /* create default meta table with a dummy table, and then close the loop */
+  sethvalue(defaultmeta(L), NULL);
+  sethvalue(defaultmeta(L), luaH_new(L, 0, 4));
+  hvalue(defaultmeta(L))->metatable = hvalue(defaultmeta(L));
+  sethvalue(gt(L), luaH_new(L, 0, 4));  /* table of globals */
+  sethvalue(registry(L), luaH_new(L, 0, 0));  /* registry */
+  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
+  luaT_init(L);
+  luaX_init(L);
+  luaS_fix(luaS_newliteral(L, MEMERRMSG));
+  G(L)->GCthreshold = 4*G(L)->nblocks;
 }
 
 
-LUA_API lua_State *lua_newthread (lua_State *OL, int stacksize) {
-  struct Sopen so;
+static void preinit_state (lua_State *L) {
+  L->stack = NULL;
+  L->stacksize = 0;
+  L->errorJmp = NULL;
+  L->hook = NULL;
+  L->hookmask = 0;
+  setallowhook(L, 1);
+  resethookcount(L);
+  L->openupval = NULL;
+  L->size_ci = 0;
+  L->base_ci = L->ci = NULL;
+  L->errfunc = 0;
+  setnilvalue(defaultmeta(L));
+  setnilvalue(gt(L));
+  setnilvalue(registry(L));
+}
+
+
+LUA_API lua_State *lua_newthread (lua_State *OL) {
   lua_State *L;
-  if (OL) lua_lock(OL);
+  lua_lock(OL);
   L = luaM_new(OL, lua_State);
-  if (L) {  /* allocation OK? */
-    L->G = NULL;
-    L->stack = NULL;
-    L->stacksize = 0;
-    L->ci = &L->basefunc;
-    L->basefunc.prev = NULL;
-    L->errorJmp = NULL;
-    L->callhook = NULL;
-    L->linehook = NULL;
-    L->allowhooks = 1;
-    L->next = L->previous = L;
-    so.stacksize = stacksize;
-    so.L = OL;
-    if (luaD_runprotected(L, f_luaopen, &so) != 0) {
-      /* memory allocation error: free partial state */
-      close_state(L, OL);
-      L = NULL;
-    }
-  }
-  if (OL) lua_unlock(OL);
+  preinit_state(L);
+  L->l_G = OL->l_G;
+  OL->next->previous = L;  /* insert L into linked list */
+  L->next = OL->next;
+  OL->next = L;
+  L->previous = OL;
+  stack_init(L, OL);  /* init stack */
+  setobj(defaultmeta(L), defaultmeta(OL));  /* share default meta table */
+  setobj(gt(L), gt(OL));  /* share table of globals */
+  setobj(registry(L), registry(OL));  /* share registry */
+  lua_unlock(OL);
+  lua_userstateopen(L);
   return L;
 }
 
 
-static void close_state (lua_State *L, lua_State *OL) {
-  if (OL != NULL) {  /* are there other threads? */
-    lua_assert(L->previous != L);
-    L->previous->next = L->next;
-    L->next->previous = L->previous;
+LUA_API lua_State *lua_open (void) {
+  lua_State *L;
+  L = luaM_new(NULL, lua_State);
+  if (L) {  /* allocation OK? */
+    preinit_state(L);
+    L->l_G = NULL;
+    L->next = L->previous = L;
+    if (luaD_rawrunprotected(L, f_luaopen, NULL) != 0) {
+      /* memory allocation error: free partial state */
+      close_state(L);
+      L = NULL;
+    }
   }
-  else if (G(L)) {  /* last thread; close global state */
-    luaC_callallgcTM(L);  /* call GC tag methods for all udata */
+  lua_userstateopen(L);
+  return L;
+}
+
+
+void luaE_closethread (lua_State *OL, lua_State *L) {
+  luaF_close(L, L->stack);  /* close all upvalues for this thread */
+  lua_assert(L->openupval == NULL);
+  L->previous->next = L->next;
+  L->next->previous = L->previous;
+  luaM_freearray(OL, L->base_ci, L->size_ci, CallInfo);
+  luaM_freearray(OL, L->stack, L->stacksize, TObject);
+  luaM_freelem(OL, L);
+}
+
+
+static void close_state (lua_State *L) {
+  luaF_close(L, L->stack);  /* close all upvalues for this thread */
+  if (G(L)) {  /* close global state */
     luaC_collect(L, 1);  /* collect all elements */
     lua_assert(G(L)->rootproto == NULL);
     lua_assert(G(L)->rootudata == NULL);
     lua_assert(G(L)->rootcl == NULL);
+    lua_assert(G(L)->rootupval == NULL);
     lua_assert(G(L)->roottable == NULL);
     luaS_freeall(L);
-    luaM_freearray(L, G(L)->TMtable, G(L)->sizeTM, struct TM);
-    luaM_freearray(L, G(L)->Mbuffer, G(L)->Mbuffsize, l_char);
-    luaM_freelem(NULL, L->G, global_State);
+    luaM_freearray(L, G(L)->Mbuffer, G(L)->Mbuffsize, char);
+    luaM_freelem(NULL, L->l_G);
   }
-  luaM_freearray(OL, L->stack, L->stacksize, TObject);
-  luaM_freelem(OL, L, lua_State);
+  luaE_closethread(NULL, L);
 }
 
+
+LUA_API void lua_closethread (lua_State *L, lua_State *thread) {
+  lua_lock(L);
+  if (L == thread) luaG_runerror(L, "cannot close only thread of a state");
+  luaE_closethread(L, thread);
+  lua_unlock(L);
+}
+
+
 LUA_API void lua_close (lua_State *L) {
-  lua_State *OL;
-  lua_assert(L != lua_state || lua_gettop(L) == 0);
   lua_lock(L);
-  OL = L->next;  /* any surviving thread (if there is one) */
-  if (OL == L) OL = NULL;  /* no surviving threads */
-  close_state(L, OL);
-  if (OL) lua_unlock(OL);  /* cannot unlock over a freed state */
-  lua_assert(L != lua_state || memdebug_numblocks == 0);
-  lua_assert(L != lua_state || memdebug_total == 0);
+  luaC_callallgcTM(L);  /* call GC tag methods for all udata */
+  lua_assert(G(L)->tmudata == NULL);
+  while (L->next != L)  /* then, close all other threads */
+    luaE_closethread(L, L->next);
+  close_state(L);
 }
 

lstate.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstate.h,v 1.57 2001/06/06 18:00:19 roberto Exp roberto $
+** $Id: lstate.h,v 1.93 2002/08/07 19:22:39 roberto Exp roberto $
 ** Global State
 ** See Copyright Notice in lua.h
 */
@@ -7,9 +7,10 @@
 #ifndef lstate_h
 #define lstate_h
 
-#include "lobject.h"
 #include "lua.h"
-#include "luadebug.h"
+
+#include "lobject.h"
+#include "ltm.h"
 
 
 /*
@@ -37,38 +38,102 @@
 #define LUA_USERSTATE
 #endif
 
+#ifndef lua_userstateopen
+#define lua_userstateopen(l)
+#endif
+
 
 
 struct lua_longjmp;  /* defined in ldo.c */
-struct TM;  /* defined in ltm.h */
+
+
+
+/*
+** array of `global' objects
+*/
+
+#define NUMGLOBS	3
+
+/* default meta table (both for tables and udata) */
+#define defaultmeta(L)	(L->globs)
+
+/* table of globals */
+#define gt(L)	(L->globs + 1)
+
+/* registry */
+#define registry(L)	(L->globs + 2)
+
+
+/* extra stack space to handle TM calls and some other extras */
+#define EXTRA_STACK   5
+
+
+#define BASIC_CI_SIZE           8
+
+#define BASIC_STACK_SIZE        (2*LUA_MINSTACK)
+
 
 
 typedef struct stringtable {
-  int size;
-  ls_nstr nuse;  /* number of elements */
   TString **hash;
+  ls_nstr nuse;  /* number of elements */
+  int size;
 } stringtable;
 
 
+/*
+** informations about a call
+*/
+typedef struct CallInfo {
+  StkId base;  /* base for called function */
+  StkId	top;  /* top for this function */
+  int state;  /* bit fields; see below */
+  union {
+    struct {  /* for Lua functions */
+      const Instruction *savedpc;
+      const Instruction **pc;  /* points to `pc' variable in `luaV_execute' */
+      StkId *pb;  /* points to `base' variable in `luaV_execute' */
+    } l;
+    struct {  /* for C functions */
+      int yield_results;
+    } c;
+  } u;
+} CallInfo;
+
+
+/*
+** bit fields for `CallInfo.state'
+*/
+#define CI_C		1  /* 1 if function is a C function */
+/* 1 if (Lua) function has an active `luaV_execute' running it */
+#define CI_HASFRAME	2
+/* 1 if Lua function is calling another Lua function (and therefore its
+   `pc' is being used by the other, and therefore CI_SAVEDPC is 1 too) */
+#define CI_CALLING	4
+#define CI_SAVEDPC	8  /* 1 if `savedpc' is updated */
+
+
+#define ci_func(ci)	(clvalue((ci)->base - 1))
+
+
 /*
 ** `global state', shared by all threads of this state
 */
 typedef struct global_State {
-  void *Mbuffer;  /* global buffer */
-  size_t Mbuffsize;  /* size of Mbuffer */
+  stringtable strt;  /* hash table for strings */
   Proto *rootproto;  /* list of all prototypes */
   Closure *rootcl;  /* list of all closures */
-  Hash *roottable;  /* list of all tables */
+  Table *roottable;  /* list of all tables */
+  UpVal *rootupval;  /* list of closed up values */
   Udata *rootudata;   /* list of all userdata */
-  stringtable strt;  /* hash table for strings */
-  Hash *type2tag;  /* hash table from type names to tags */
-  Hash *registry;  /* (strong) registry table */
-  Hash *weakregistry;  /* weakregistry table */
-  struct TM *TMtable;  /* table for tag methods */
-  int sizeTM;  /* size of TMtable */
-  int ntag;  /* number of tags in TMtable */
+  Udata *tmudata;  /* list of userdata to be GC */
+  void *Mbuffer;  /* global buffer */
+  size_t Mbuffsize;  /* size of Mbuffer */
   lu_mem GCthreshold;
   lu_mem nblocks;  /* number of `bytes' currently allocated */
+  lua_CFunction panic;  /* to be called in unprotected errors */
+  Node dummynode[1];  /* common node array for all empty tables */
+  TString *tmname[TM_N];  /* array with tag-method names */
 } global_State;
 
 
@@ -78,24 +143,30 @@ typedef struct global_State {
 struct lua_State {
   LUA_USERSTATE
   StkId top;  /* first free slot in the stack */
+  global_State *l_G;
   CallInfo *ci;  /* call info for current function */
   StkId stack_last;  /* last free slot in the stack */
-  Hash *gt;  /* table for globals */
-  global_State *G;
   StkId stack;  /* stack base */
   int stacksize;
-  lua_Hook callhook;
-  lua_Hook linehook;
-  int allowhooks;
+  CallInfo *end_ci;  /* points after end of ci array*/
+  CallInfo *base_ci;  /* array of CallInfo's */
+  int size_ci;  /* size of array `base_ci' */
+  unsigned long hookmask;
+  ls_count hookcount;
+  lua_Hook hook;
+  UpVal *openupval;  /* list of open upvalues in this stack */
   struct lua_longjmp *errorJmp;  /* current error recover point */
+  ptrdiff_t errfunc;  /* current error handling function (stack index) */
   lua_State *next;  /* circular double linked list of states */
   lua_State *previous;
-  CallInfo basefunc;
+  TObject globs[NUMGLOBS];  /* registry, table of globals, etc. */
 };
 
 
-#define G(L)	(L->G)
+#define G(L)	(L->l_G)
 
 
+void luaE_closethread (lua_State *OL, lua_State *L);
+
 #endif
 

lstring.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.c,v 1.64 2001/06/07 15:01:21 roberto Exp roberto $
+** $Id: lstring.c,v 1.73 2002/03/20 18:37:13 roberto Exp roberto $
 ** String table (keeps all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -7,7 +7,6 @@
 
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lmem.h"
@@ -35,7 +34,7 @@ void luaS_resize (lua_State *L, int newsize) {
       TString *next = p->tsv.nexthash;  /* save next */
       lu_hash h = p->tsv.hash;
       int h1 = lmod(h, newsize);  /* new position */
-      lua_assert((int)(h%newsize) == lmod(h, newsize));
+      lua_assert(cast(int, h%newsize) == lmod(h, newsize));
       p->tsv.nexthash = newhash[h1];  /* chain it in new position */
       newhash[h1] = p;
       p = next;
@@ -47,34 +46,33 @@ void luaS_resize (lua_State *L, int newsize) {
 }
 
 
-static TString *newlstr (lua_State *L, const l_char *str, size_t l, lu_hash h) {
-  TString *ts = (TString *)luaM_malloc(L, sizestring(l));
+static TString *newlstr (lua_State *L, const char *str, size_t l, lu_hash h) {
+  TString *ts = cast(TString *, luaM_malloc(L, sizestring(l)));
   stringtable *tb;
   ts->tsv.nexthash = NULL;
   ts->tsv.len = l;
   ts->tsv.hash = h;
   ts->tsv.marked = 0;
-  ts->tsv.constindex = 0;
-  memcpy(getstr(ts), str, l*sizeof(l_char));
-  getstr(ts)[l] = l_c('\0');  /* ending 0 */
+  memcpy(ts+1, str, l*sizeof(char));
+  ((char *)(ts+1))[l] = '\0';  /* ending 0 */
   tb = &G(L)->strt;
   h = lmod(h, tb->size);
   ts->tsv.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)
+  if (tb->nuse > cast(ls_nstr, tb->size) && tb->size <= MAX_INT/2)
     luaS_resize(L, tb->size*2);  /* too crowded */
   return ts;
 }
 
 
-TString *luaS_newlstr (lua_State *L, const l_char *str, size_t l) {
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
   TString *ts;
-  lu_hash h = l;  /* seed */
+  lu_hash h = (lu_hash)l;  /* seed */
   size_t step = (l>>5)+1;  /* if string is too long, don't hash all its chars */
   size_t l1;
   for (l1=l; l1>=step; l1-=step)  /* compute hash */
-    h = h ^ ((h<<5)+(h>>2)+uchar(str[l1-1]));
+    h = h ^ ((h<<5)+(h>>2)+(unsigned char)(str[l1-1]));
   for (ts = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
        ts != NULL;
        ts = ts->tsv.nexthash) {
@@ -86,10 +84,11 @@ TString *luaS_newlstr (lua_State *L, const l_char *str, size_t l) {
 
 
 Udata *luaS_newudata (lua_State *L, size_t s) {
-  Udata *u = (Udata *)luaM_malloc(L, sizeudata(s));
+  Udata *u;
+  s = (s+3) & (~(size_t)3);  /* make sure size is multiple of 4 */
+  u = cast(Udata *, luaM_malloc(L, sizeudata(s)));
   u->uv.len = s;
-  u->uv.tag = 0;
-  u->uv.value = u + 1;
+  u->uv.metatable = hvalue(defaultmeta(L));
   /* chain it on udata list */
   u->uv.next = G(L)->rootudata;
   G(L)->rootudata = u;

lstring.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.h,v 1.32 2001/06/06 18:00:19 roberto Exp roberto $
+** $Id: lstring.h,v 1.35 2001/11/28 20:13:13 roberto Exp roberto $
 ** String table (keep all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -21,19 +21,21 @@
 #define RESERVEDMARK	3
 
 
-#define sizestring(l)	((lu_mem)sizeof(union TString)+ \
-                         ((lu_mem)(l)+1)*sizeof(l_char))
+#define sizestring(l)	(cast(lu_mem, sizeof(union TString))+ \
+                         (cast(lu_mem, l)+1)*sizeof(char))
 
-#define sizeudata(l)	((lu_mem)sizeof(union Udata)+(l))
+#define sizeudata(l)	(cast(lu_mem, sizeof(union Udata))+(l))
 
 #define luaS_new(L, s)	(luaS_newlstr(L, s, strlen(s)))
-#define luaS_newliteral(L, s)	(luaS_newlstr(L, l_s("") s, \
-                                 (sizeof(s)/sizeof(l_char))-1))
+#define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
+                                 (sizeof(s)/sizeof(char))-1))
+
+#define luaS_fix(s)	((s)->tsv.marked = FIXMARK)
 
 void luaS_resize (lua_State *L, int newsize);
 Udata *luaS_newudata (lua_State *L, size_t s);
 void luaS_freeall (lua_State *L);
-TString *luaS_newlstr (lua_State *L, const l_char *str, size_t l);
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
 
 
 #endif

lstrlib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lstrlib.c,v 1.68 2001/03/26 14:31:49 roberto Exp roberto $
+** $Id: lstrlib.c,v 1.86 2002/06/25 19:16:44 roberto Exp roberto $
 ** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
@@ -11,13 +11,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lauxlib.h"
 #include "lualib.h"
 
 
+/* macro to `unsign' a character */
+#ifndef uchar
+#define uchar(c)        ((unsigned char)(c))
+#endif
+
+
 typedef long sint32;	/* a signed version for size_t */
 
 
@@ -37,14 +42,14 @@ static sint32 posrelat (sint32 pos, size_t len) {
 
 static int str_sub (lua_State *L) {
   size_t l;
-  const l_char *s = luaL_check_lstr(L, 1, &l);
+  const char *s = luaL_check_lstr(L, 1, &l);
   sint32 start = posrelat(luaL_check_long(L, 2), l);
   sint32 end = posrelat(luaL_opt_long(L, 3, -1), l);
   if (start < 1) start = 1;
   if (end > (sint32)l) end = l;
   if (start <= end)
     lua_pushlstring(L, s+start-1, end-start+1);
-  else lua_pushliteral(L, l_s(""));
+  else lua_pushliteral(L, "");
   return 1;
 }
 
@@ -53,7 +58,7 @@ static int str_lower (lua_State *L) {
   size_t l;
   size_t i;
   luaL_Buffer b;
-  const l_char *s = luaL_check_lstr(L, 1, &l);
+  const char *s = luaL_check_lstr(L, 1, &l);
   luaL_buffinit(L, &b);
   for (i=0; i<l; i++)
     luaL_putchar(&b, tolower(uchar(s[i])));
@@ -66,7 +71,7 @@ static int str_upper (lua_State *L) {
   size_t l;
   size_t i;
   luaL_Buffer b;
-  const l_char *s = luaL_check_lstr(L, 1, &l);
+  const char *s = luaL_check_lstr(L, 1, &l);
   luaL_buffinit(L, &b);
   for (i=0; i<l; i++)
     luaL_putchar(&b, toupper(uchar(s[i])));
@@ -77,7 +82,7 @@ static int str_upper (lua_State *L) {
 static int str_rep (lua_State *L) {
   size_t l;
   luaL_Buffer b;
-  const l_char *s = luaL_check_lstr(L, 1, &l);
+  const char *s = luaL_check_lstr(L, 1, &l);
   int n = luaL_check_int(L, 2);
   luaL_buffinit(L, &b);
   while (n-- > 0)
@@ -89,9 +94,9 @@ static int str_rep (lua_State *L) {
 
 static int str_byte (lua_State *L) {
   size_t l;
-  const l_char *s = luaL_check_lstr(L, 1, &l);
+  const char *s = luaL_check_lstr(L, 1, &l);
   sint32 pos = posrelat(luaL_opt_long(L, 2, 1), l);
-  luaL_arg_check(L, 0<pos && (size_t)pos<=l, 2,  l_s("out of range"));
+  luaL_arg_check(L, 0 < pos && (size_t)(pos) <= l, 2,  "out of range");
   lua_pushnumber(L, uchar(s[pos-1]));
   return 1;
 }
@@ -104,7 +109,7 @@ static int str_char (lua_State *L) {
   luaL_buffinit(L, &b);
   for (i=1; i<=n; i++) {
     int c = luaL_check_int(L, i);
-    luaL_arg_check(L, uchar(c) == c, i, l_s("invalid value"));
+    luaL_arg_check(L, uchar(c) == c, i, "invalid value");
     luaL_putchar(&b, uchar(c));
   }
   luaL_pushresult(&b);
@@ -128,25 +133,25 @@ static int str_char (lua_State *L) {
 #define CAP_POSITION	(-2)
 
 typedef struct MatchState {
-  const l_char *src_init;  /* init of source string */
-  const l_char *src_end;  /* end (`\0') of source string */
+  const char *src_init;  /* init of source string */
+  const char *src_end;  /* end (`\0') of source string */
+  lua_State *L;
   int level;  /* total number of captures (finished or unfinished) */
   struct {
-    const l_char *init;
+    const char *init;
     sint32 len;
   } capture[MAX_CAPTURES];
-  lua_State *L;
 } MatchState;
 
 
-#define ESC		l_c('%')
-#define SPECIALS	l_s("^$*+?.([%-")
+#define ESC		'%'
+#define SPECIALS	"^$*+?.([%-"
 
 
 static int check_capture (MatchState *ms, int l) {
-  l -= l_c('1');
+  l -= '1';
   if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
-    lua_error(ms->L, l_s("invalid capture index"));
+    return luaL_error(ms->L, "invalid capture index");
   return l;
 }
 
@@ -155,25 +160,24 @@ static int capture_to_close (MatchState *ms) {
   int level = ms->level;
   for (level--; level>=0; level--)
     if (ms->capture[level].len == CAP_UNFINISHED) return level;
-  lua_error(ms->L, l_s("invalid pattern capture"));
-  return 0;  /* to avoid warnings */
+  return luaL_error(ms->L, "invalid pattern capture");
 }
 
 
-static const l_char *luaI_classend (MatchState *ms, const l_char *p) {
+static const char *luaI_classend (MatchState *ms, const char *p) {
   switch (*p++) {
     case ESC:
-      if (*p == l_c('\0'))
-        lua_error(ms->L, l_s("malformed pattern (ends with `%')"));
+      if (*p == '\0')
+        luaL_error(ms->L, "malformed pattern (ends with `%')");
       return p+1;
-    case l_c('['):
-      if (*p == l_c('^')) p++;
+    case '[':
+      if (*p == '^') p++;
       do {  /* look for a `]' */
-        if (*p == l_c('\0'))
-          lua_error(ms->L, l_s("malformed pattern (missing `]')"));
-        if (*(p++) == ESC && *p != l_c('\0'))
+        if (*p == '\0')
+          luaL_error(ms->L, "malformed pattern (missing `]')");
+        if (*(p++) == ESC && *p != '\0')
           p++;  /* skip escapes (e.g. `%]') */
-      } while (*p != l_c(']'));
+      } while (*p != ']');
       return p+1;
     default:
       return p;
@@ -181,28 +185,28 @@ static const l_char *luaI_classend (MatchState *ms, const l_char *p) {
 }
 
 
-static int match_class (l_char c, l_char cl) {
+static int match_class (int c, int cl) {
   int res;
-  switch (tolower(uchar(cl))) {
-    case l_c('a') : res = isalpha(uchar(c)); break;
-    case l_c('c') : res = iscntrl(uchar(c)); break;
-    case l_c('d') : res = isdigit(uchar(c)); break;
-    case l_c('l') : res = islower(uchar(c)); break;
-    case l_c('p') : res = ispunct(uchar(c)); break;
-    case l_c('s') : res = isspace(uchar(c)); break;
-    case l_c('u') : res = isupper(uchar(c)); break;
-    case l_c('w') : res = isalnum(uchar(c)); break;
-    case l_c('x') : res = isxdigit(uchar(c)); break;
-    case l_c('z') : res = (c == l_c('\0')); break;
+  switch (tolower(cl)) {
+    case 'a' : res = isalpha(c); break;
+    case 'c' : res = iscntrl(c); break;
+    case 'd' : res = isdigit(c); break;
+    case 'l' : res = islower(c); break;
+    case 'p' : res = ispunct(c); break;
+    case 's' : res = isspace(c); break;
+    case 'u' : res = isupper(c); break;
+    case 'w' : res = isalnum(c); break;
+    case 'x' : res = isxdigit(c); break;
+    case 'z' : res = (c == 0); break;
     default: return (cl == c);
   }
-  return (islower(uchar(cl)) ? res : !res);
+  return (islower(cl) ? res : !res);
 }
 
 
-static int matchbracketclass (l_char c, const l_char *p, const l_char *ec) {
+static int matchbracketclass (int c, const char *p, const char *ec) {
   int sig = 1;
-  if (*(p+1) == l_c('^')) {
+  if (*(p+1) == '^') {
     sig = 0;
     p++;  /* skip the `^' */
   }
@@ -212,38 +216,38 @@ static int matchbracketclass (l_char c, const l_char *p, const l_char *ec) {
       if (match_class(c, *p))
         return sig;
     }
-    else if ((*(p+1) == l_c('-')) && (p+2 < ec)) {
+    else if ((*(p+1) == '-') && (p+2 < ec)) {
       p+=2;
-      if (uchar(*(p-2)) <= uchar(c) && uchar(c) <= uchar(*p))
+      if (uchar(*(p-2)) <= c && c <= uchar(*p))
         return sig;
     }
-    else if (*p == c) return sig;
+    else if (uchar(*p) == c) return sig;
   }
   return !sig;
 }
 
 
-static int luaI_singlematch (l_char c, const l_char *p, const l_char *ep) {
+static int luaI_singlematch (int c, const char *p, const char *ep) {
   switch (*p) {
-    case l_c('.'):  /* matches any char */
+    case '.':  /* matches any char */
       return 1;
     case ESC:
       return match_class(c, *(p+1));
-    case l_c('['):
+    case '[':
       return matchbracketclass(c, p, ep-1);
     default:
-      return (*p == c);
+      return (uchar(*p) == c);
   }
 }
 
 
-static const l_char *match (MatchState *ms, const l_char *s, const l_char *p);
+static const char *match (MatchState *ms, const char *s, const char *p);
 
 
-static const l_char *matchbalance (MatchState *ms, const l_char *s,
-                                   const l_char *p) {
+static const char *matchbalance (MatchState *ms, const char *s,
+                                   const char *p) {
   if (*p == 0 || *(p+1) == 0)
-    lua_error(ms->L, l_s("unbalanced pattern"));
+    luaL_error(ms->L, "unbalanced pattern");
   if (*s != *p) return NULL;
   else {
     int b = *p;
@@ -260,14 +264,14 @@ static const l_char *matchbalance (MatchState *ms, const l_char *s,
 }
 
 
-static const l_char *max_expand (MatchState *ms, const l_char *s,
-                                 const l_char *p, const l_char *ep) {
+static const char *max_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
   sint32 i = 0;  /* counts maximum expand for item */
-  while ((s+i)<ms->src_end && luaI_singlematch(*(s+i), p, ep))
+  while ((s+i)<ms->src_end && luaI_singlematch(uchar(*(s+i)), p, ep))
     i++;
   /* keeps trying to match with the maximum repetitions */
   while (i>=0) {
-    const l_char *res = match(ms, (s+i), ep+1);
+    const char *res = match(ms, (s+i), ep+1);
     if (res) return res;
     i--;  /* else didn't match; reduce 1 repetition to try again */
   }
@@ -275,24 +279,24 @@ static const l_char *max_expand (MatchState *ms, const l_char *s,
 }
 
 
-static const l_char *min_expand (MatchState *ms, const l_char *s,
-                                 const l_char *p, const l_char *ep) {
+static const char *min_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
   for (;;) {
-    const l_char *res = match(ms, s, ep+1);
+    const char *res = match(ms, s, ep+1);
     if (res != NULL)
       return res;
-    else if (s<ms->src_end && luaI_singlematch(*s, p, ep))
+    else if (s<ms->src_end && luaI_singlematch(uchar(*s), p, ep))
       s++;  /* try with one more repetition */
     else return NULL;
   }
 }
 
 
-static const l_char *start_capture (MatchState *ms, const l_char *s,
-                                    const l_char *p, int what) {
-  const l_char *res;
+static const char *start_capture (MatchState *ms, const char *s,
+                                    const char *p, int what) {
+  const char *res;
   int level = ms->level;
-  if (level >= MAX_CAPTURES) lua_error(ms->L, l_s("too many captures"));
+  if (level >= MAX_CAPTURES) luaL_error(ms->L, "too many captures");
   ms->capture[level].init = s;
   ms->capture[level].len = what;
   ms->level = level+1;
@@ -302,10 +306,10 @@ static const l_char *start_capture (MatchState *ms, const l_char *s,
 }
 
 
-static const l_char *end_capture (MatchState *ms, const l_char *s,
-                                  const l_char *p) {
+static const char *end_capture (MatchState *ms, const char *s,
+                                  const char *p) {
   int l = capture_to_close(ms);
-  const l_char *res;
+  const char *res;
   ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
   if ((res = match(ms, s, p)) == NULL)  /* match failed? */
     ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
@@ -313,7 +317,7 @@ static const l_char *end_capture (MatchState *ms, const l_char *s,
 }
 
 
-static const l_char *match_capture (MatchState *ms, const l_char *s, int l) {
+static const char *match_capture (MatchState *ms, const char *s, int l) {
   size_t len;
   l = check_capture(ms, l);
   len = ms->capture[l].len;
@@ -324,15 +328,15 @@ static const l_char *match_capture (MatchState *ms, const l_char *s, int l) {
 }
 
 
-static const l_char *match (MatchState *ms, const l_char *s, const l_char *p) {
+static const char *match (MatchState *ms, const char *s, const char *p) {
   init: /* using goto's to optimize tail recursion */
   switch (*p) {
-    case l_c('('):  /* start capture */
-      if (*(p+1) == l_c(')'))  /* position capture? */
+    case '(':  /* start capture */
+      if (*(p+1) == ')')  /* position capture? */
         return start_capture(ms, s, p+2, CAP_POSITION);
       else
         return start_capture(ms, s, p+1, CAP_UNFINISHED);
-    case l_c(')'):  /* end capture */
+    case ')':  /* end capture */
       return end_capture(ms, s, p+1);
     case ESC:  /* may be %[0-9] or %b */
       if (isdigit(uchar(*(p+1)))) {  /* capture? */
@@ -340,33 +344,33 @@ static const l_char *match (MatchState *ms, const l_char *s, const l_char *p) {
         if (s == NULL) return NULL;
         p+=2; goto init;  /* else return match(ms, s, p+2) */
       }
-      else if (*(p+1) == l_c('b')) {  /* balanced string? */
+      else if (*(p+1) == 'b') {  /* balanced string? */
         s = matchbalance(ms, s, p+2);
         if (s == NULL) return NULL;
         p+=4; goto init;  /* else return match(ms, s, p+4); */
       }
       else goto dflt;  /* case default */
-    case l_c('\0'):  /* end of pattern */
+    case '\0':  /* end of pattern */
       return s;  /* match succeeded */
-    case l_c('$'):
-      if (*(p+1) == l_c('\0'))  /* is the `$' the last char in pattern? */
+    case '$':
+      if (*(p+1) == '\0')  /* is the `$' the last char in pattern? */
         return (s == ms->src_end) ? s : NULL;  /* check end of string */
       else goto dflt;
     default: dflt: {  /* it is a pattern item */
-      const l_char *ep = luaI_classend(ms, p);  /* points to what is next */
-      int m = s<ms->src_end && luaI_singlematch(*s, p, ep);
+      const char *ep = luaI_classend(ms, p);  /* points to what is next */
+      int m = s<ms->src_end && luaI_singlematch(uchar(*s), p, ep);
       switch (*ep) {
-        case l_c('?'): {  /* optional */
-          const l_char *res;
+        case '?': {  /* optional */
+          const char *res;
           if (m && ((res=match(ms, s+1, ep+1)) != NULL))
             return res;
           p=ep+1; goto init;  /* else return match(ms, s, ep+1); */
         }
-        case l_c('*'):  /* 0 or more repetitions */
+        case '*':  /* 0 or more repetitions */
           return max_expand(ms, s, p, ep);
-        case l_c('+'):  /* 1 or more repetitions */
+        case '+':  /* 1 or more repetitions */
           return (m ? max_expand(ms, s+1, p, ep) : NULL);
-        case l_c('-'):  /* 0 or more repetitions (minimum) */
+        case '-':  /* 0 or more repetitions (minimum) */
           return min_expand(ms, s, p, ep);
         default:
           if (!m) return NULL;
@@ -378,15 +382,15 @@ static const l_char *match (MatchState *ms, const l_char *s, const l_char *p) {
 
 
 
-static const l_char *lmemfind (const l_char *s1, size_t l1,
-                               const l_char *s2, size_t l2) {
+static const char *lmemfind (const char *s1, size_t l1,
+                               const char *s2, size_t l2) {
   if (l2 == 0) return s1;  /* empty strings are everywhere */
   else if (l2 > l1) return NULL;  /* avoids a negative `l1' */
   else {
-    const l_char *init;  /* to search for a `*s2' inside `s1' */
+    const char *init;  /* to search for a `*s2' inside `s1' */
     l2--;  /* 1st char will be checked by `memchr' */
     l1 = l1-l2;  /* `s2' cannot be found after that */
-    while (l1 > 0 && (init = (const l_char *)memchr(s1, *s2, l1)) != NULL) {
+    while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
       init++;   /* 1st char is already checked */
       if (memcmp(init, s2+1, l2) == 0)
         return init-1;
@@ -402,7 +406,7 @@ static const l_char *lmemfind (const l_char *s1, size_t l1,
 
 static void push_onecapture (MatchState *ms, int i) {
   int l = ms->capture[i].len;
-  if (l == CAP_UNFINISHED) lua_error(ms->L, l_s("unfinished capture"));
+  if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
   if (l == CAP_POSITION)
     lua_pushnumber(ms->L, ms->capture[i].init - ms->src_init + 1);
   else
@@ -410,24 +414,31 @@ static void push_onecapture (MatchState *ms, int i) {
 }
 
 
-static int push_captures (MatchState *ms) {
+static int push_captures (MatchState *ms, const char *s, const char *e) {
   int i;
-  luaL_checkstack(ms->L, ms->level, l_s("too many captures"));
-  for (i=0; i<ms->level; i++)
-    push_onecapture(ms, i);
-  return ms->level;  /* number of strings pushed */
+  luaL_check_stack(ms->L, ms->level, "too many captures");
+  if (ms->level == 0 && s) {  /* no explicit captures? */
+    lua_pushlstring(ms->L, s, e-s);  /* return whole match */
+    return 1;
+  }
+  else {  /* return all captures */
+    for (i=0; i<ms->level; i++)
+      push_onecapture(ms, i);
+    return ms->level;  /* number of strings pushed */
+  }
 }
 
 
 static int str_find (lua_State *L) {
   size_t l1, l2;
-  const l_char *s = luaL_check_lstr(L, 1, &l1);
-  const l_char *p = luaL_check_lstr(L, 2, &l2);
+  const char *s = luaL_check_lstr(L, 1, &l1);
+  const char *p = luaL_check_lstr(L, 2, &l2);
   sint32 init = posrelat(luaL_opt_long(L, 3, 1), l1) - 1;
-  luaL_arg_check(L, 0 <= init && (size_t)init <= l1, 3, l_s("out of range"));
-  if (lua_gettop(L) > 3 ||  /* extra argument? */
+  luaL_arg_check(L, 0 <= init && (size_t)(init) <= l1, 3, "out of range");
+  if (lua_toboolean(L, 4) ||  /* explicit request? */
       strpbrk(p, SPECIALS) == NULL) {  /* or no special characters? */
-    const l_char *s2 = lmemfind(s+init, l1-init, p, l2);
+    /* do a plain search */
+    const char *s2 = lmemfind(s+init, l1-init, p, l2);
     if (s2) {
       lua_pushnumber(L, s2-s+1);
       lua_pushnumber(L, s2-s+l2);
@@ -436,18 +447,18 @@ static int str_find (lua_State *L) {
   }
   else {
     MatchState ms;
-    int anchor = (*p == l_c('^')) ? (p++, 1) : 0;
-    const l_char *s1=s+init;
+    int anchor = (*p == '^') ? (p++, 1) : 0;
+    const char *s1=s+init;
     ms.L = L;
     ms.src_init = s;
     ms.src_end = s+l1;
     do {
-      const l_char *res;
+      const char *res;
       ms.level = 0;
       if ((res=match(&ms, s1, p)) != NULL) {
         lua_pushnumber(L, s1-s+1);  /* start */
         lua_pushnumber(L, res-s);   /* end */
-        return push_captures(&ms) + 2;
+        return push_captures(&ms, NULL, 0) + 2;
       }
     } while (s1++<ms.src_end && !anchor);
   }
@@ -456,10 +467,47 @@ static int str_find (lua_State *L) {
 }
 
 
-static void add_s (MatchState *ms, luaL_Buffer *b) {
+static int gfind_aux (lua_State *L) {
+  MatchState ms;
+  const char *s = lua_tostring(L, lua_upvalueindex(1));
+  size_t ls = lua_strlen(L, lua_upvalueindex(1));
+  const char *p = lua_tostring(L, lua_upvalueindex(2));
+  const char *src;
+  ms.L = L;
+  ms.src_init = s;
+  ms.src_end = s+ls;
+  for (src = s + (size_t)lua_tonumber(L, lua_upvalueindex(3));
+       src <= ms.src_end;
+       src++) {
+    const char *e;
+    ms.level = 0;
+    if ((e = match(&ms, src, p)) != NULL) {
+      int newstart = e-s;
+      if (e == src) newstart++;  /* empty match? go at least one position */
+      lua_pushnumber(L, newstart);
+      lua_replace(L, lua_upvalueindex(3));
+      return push_captures(&ms, src, e);
+    }
+  }
+  return 0;  /* not found */
+}
+
+
+static int gfind (lua_State *L) {
+  luaL_check_string(L, 1);
+  luaL_check_string(L, 2);
+  lua_settop(L, 2);
+  lua_pushnumber(L, 0);
+  lua_pushcclosure(L, gfind_aux, 3);
+  return 1;
+}
+
+
+static void add_s (MatchState *ms, luaL_Buffer *b,
+                   const char *s, const char *e) {
   lua_State *L = ms->L;
   if (lua_isstring(L, 3)) {
-    const l_char *news = lua_tostring(L, 3);
+    const char *news = lua_tostring(L, 3);
     size_t l = lua_strlen(L, 3);
     size_t i;
     for (i=0; i<l; i++) {
@@ -480,8 +528,8 @@ static void add_s (MatchState *ms, luaL_Buffer *b) {
   else {  /* is a function */
     int n;
     lua_pushvalue(L, 3);
-    n = push_captures(ms);
-    lua_rawcall(L, n, 1);
+    n = push_captures(ms, s, e);
+    lua_call(L, n, 1);
     if (lua_isstring(L, -1))
       luaL_addvalue(b);  /* add return to accumulated result */
     else
@@ -492,27 +540,27 @@ static void add_s (MatchState *ms, luaL_Buffer *b) {
 
 static int str_gsub (lua_State *L) {
   size_t srcl;
-  const l_char *src = luaL_check_lstr(L, 1, &srcl);
-  const l_char *p = luaL_check_string(L, 2);
+  const char *src = luaL_check_lstr(L, 1, &srcl);
+  const char *p = luaL_check_string(L, 2);
   int max_s = luaL_opt_int(L, 4, srcl+1);
-  int anchor = (*p == l_c('^')) ? (p++, 1) : 0;
+  int anchor = (*p == '^') ? (p++, 1) : 0;
   int n = 0;
   MatchState ms;
   luaL_Buffer b;
   luaL_arg_check(L,
     lua_gettop(L) >= 3 && (lua_isstring(L, 3) || lua_isfunction(L, 3)),
-    3, l_s("string or function expected"));
+    3, "string or function expected");
   luaL_buffinit(L, &b);
   ms.L = L;
   ms.src_init = src;
   ms.src_end = src+srcl;
   while (n < max_s) {
-    const l_char *e;
+    const char *e;
     ms.level = 0;
     e = match(&ms, src, p);
     if (e) {
       n++;
-      add_s(&ms, &b);
+      add_s(&ms, &b, src, e);
     }
     if (e && e>src) /* non empty match? */
       src = e;  /* skip it */
@@ -538,40 +586,40 @@ static int str_gsub (lua_State *L) {
 
 static void luaI_addquoted (lua_State *L, luaL_Buffer *b, int arg) {
   size_t l;
-  const l_char *s = luaL_check_lstr(L, arg, &l);
-  luaL_putchar(b, l_c('"'));
+  const char *s = luaL_check_lstr(L, arg, &l);
+  luaL_putchar(b, '"');
   while (l--) {
     switch (*s) {
-      case l_c('"'):  case l_c('\\'):  case l_c('\n'):
-        luaL_putchar(b, l_c('\\'));
+      case '"':  case '\\':  case '\n':
+        luaL_putchar(b, '\\');
         luaL_putchar(b, *s);
         break;
-      case l_c('\0'): luaL_addlstring(b, l_s("\\000"), 4); break;
+      case '\0': luaL_addlstring(b, "\\000", 4); break;
       default: luaL_putchar(b, *s);
     }
     s++;
   }
-  luaL_putchar(b, l_c('"'));
+  luaL_putchar(b, '"');
 }
 
 
-static const l_char *scanformat (lua_State *L, const l_char *strfrmt,
-                                 l_char *form, int *hasprecision) {
-  const l_char *p = strfrmt;
-  while (strchr(l_s("-+ #0"), *p)) p++;  /* skip flags */
+static const char *scanformat (lua_State *L, const char *strfrmt,
+                                 char *form, int *hasprecision) {
+  const char *p = strfrmt;
+  while (strchr("-+ #0", *p)) p++;  /* skip flags */
   if (isdigit(uchar(*p))) p++;  /* skip width */
   if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
-  if (*p == l_c('.')) {
+  if (*p == '.') {
     p++;
     *hasprecision = 1;
     if (isdigit(uchar(*p))) p++;  /* skip precision */
     if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
   }
   if (isdigit(uchar(*p)))
-    lua_error(L, l_s("invalid format (width or precision too long)"));
+    luaL_error(L, "invalid format (width or precision too long)");
   if (p-strfrmt+2 > MAX_FORMAT)  /* +2 to include `%' and the specifier */
-    lua_error(L, l_s("invalid format (too long)"));
-  form[0] = l_c('%');
+    luaL_error(L, "invalid format (too long)");
+  form[0] = '%';
   strncpy(form+1, strfrmt, p-strfrmt+1);
   form[p-strfrmt+2] = 0;
   return p;
@@ -581,40 +629,40 @@ static const l_char *scanformat (lua_State *L, const l_char *strfrmt,
 static int str_format (lua_State *L) {
   int arg = 1;
   size_t sfl;
-  const l_char *strfrmt = luaL_check_lstr(L, arg, &sfl);
-  const l_char *strfrmt_end = strfrmt+sfl;
+  const char *strfrmt = luaL_check_lstr(L, arg, &sfl);
+  const char *strfrmt_end = strfrmt+sfl;
   luaL_Buffer b;
   luaL_buffinit(L, &b);
   while (strfrmt < strfrmt_end) {
-    if (*strfrmt != l_c('%'))
+    if (*strfrmt != '%')
       luaL_putchar(&b, *strfrmt++);
-    else if (*++strfrmt == l_c('%'))
+    else if (*++strfrmt == '%')
       luaL_putchar(&b, *strfrmt++);  /* %% */
     else { /* format item */
-      l_char form[MAX_FORMAT];  /* to store the format (`%...') */
-      l_char buff[MAX_ITEM];  /* to store the formatted item */
+      char form[MAX_FORMAT];  /* to store the format (`%...') */
+      char buff[MAX_ITEM];  /* to store the formatted item */
       int hasprecision = 0;
-      if (isdigit(uchar(*strfrmt)) && *(strfrmt+1) == l_c('$'))
-        lua_error(L, l_s("obsolete `format' option (d$)"));
+      if (isdigit(uchar(*strfrmt)) && *(strfrmt+1) == '$')
+        return luaL_error(L, "obsolete `format' option (d$)");
       arg++;
       strfrmt = scanformat(L, strfrmt, form, &hasprecision);
       switch (*strfrmt++) {
-        case l_c('c'):  case l_c('d'):  case l_c('i'):
+        case 'c':  case 'd':  case 'i':
           sprintf(buff, form, luaL_check_int(L, arg));
           break;
-        case l_c('o'):  case l_c('u'):  case l_c('x'):  case l_c('X'):
-          sprintf(buff, form, (unsigned int)luaL_check_number(L, arg));
+        case 'o':  case 'u':  case 'x':  case 'X':
+          sprintf(buff, form, (unsigned int)(luaL_check_number(L, arg)));
           break;
-        case l_c('e'):  case l_c('E'): case l_c('f'):
-        case l_c('g'): case l_c('G'):
+        case 'e':  case 'E': case 'f':
+        case 'g': case 'G':
           sprintf(buff, form, luaL_check_number(L, arg));
           break;
-        case l_c('q'):
+        case 'q':
           luaI_addquoted(L, &b, arg);
           continue;  /* skip the `addsize' at the end */
-        case l_c('s'): {
+        case 's': {
           size_t l;
-          const l_char *s = luaL_check_lstr(L, arg, &l);
+          const char *s = luaL_check_lstr(L, arg, &l);
           if (!hasprecision && l >= 100) {
             /* no precision and string is too long to be formatted;
                keep original string */
@@ -628,7 +676,7 @@ static int str_format (lua_State *L) {
           }
         }
         default:  /* also treat cases `pnLlh' */
-          lua_error(L, l_s("invalid option in `format'"));
+          return luaL_error(L, "invalid option in `format'");
       }
       luaL_addlstring(&b, buff, strlen(buff));
     }
@@ -639,16 +687,18 @@ static int str_format (lua_State *L) {
 
 
 static const luaL_reg strlib[] = {
-{l_s("strlen"), str_len},
-{l_s("strsub"), str_sub},
-{l_s("strlower"), str_lower},
-{l_s("strupper"), str_upper},
-{l_s("strchar"), str_char},
-{l_s("strrep"), str_rep},
-{l_s("strbyte"), str_byte},
-{l_s("format"), str_format},
-{l_s("strfind"), str_find},
-{l_s("gsub"), str_gsub}
+  {"len", str_len},
+  {"sub", str_sub},
+  {"lower", str_lower},
+  {"upper", str_upper},
+  {"char", str_char},
+  {"rep", str_rep},
+  {"byte", str_byte},
+  {"format", str_format},
+  {"find", str_find},
+  {"gfind", gfind},
+  {"gsub", str_gsub},
+  {NULL, NULL}
 };
 
 
@@ -656,6 +706,7 @@ static const luaL_reg strlib[] = {
 ** Open string library
 */
 LUALIB_API int lua_strlibopen (lua_State *L) {
-  luaL_openl(L, strlib);
+  luaL_opennamedlib(L, LUA_STRLIBNAME, strlib, 0);
   return 0;
 }
+

ltable.c

@@ -1,13 +1,17 @@
 /*
-** $Id: ltable.c,v 1.82 2001/06/26 13:20:45 roberto Exp roberto $
+** $Id: ltable.c,v 1.115 2002/08/05 14:45:32 roberto Exp roberto $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
 
 
 /*
-** Implementation of tables (aka arrays, objects, or hash tables);
-** uses a mix of chained scatter table with Brent's variation.
+** Implementation of tables (aka arrays, objects, or hash tables).
+** Tables keep its elements in two parts: an array part and a hash part.
+** Non-negative integer keys are all candidates to be kept in the array
+** part. The actual size of the array is the largest `n' such that at
+** least half the slots between 0 and n are in use.
+** Hash uses a mix of chained scatter table with Brent's variation.
 ** A main invariant of these tables is that, if an element is not
 ** in its main position (i.e. the `original' position that its hash gives
 ** to it), then the colliding element is in its own main position.
@@ -18,9 +22,10 @@
 */
 
 
-#define LUA_PRIVATE
+
 #include "lua.h"
 
+#include "ldebug.h"
 #include "ldo.h"
 #include "lmem.h"
 #include "lobject.h"
@@ -28,146 +33,321 @@
 #include "ltable.h"
 
 
+/*
+** max size of array part is 2^MAXBITS
+*/
+#if BITS_INT > 26
+#define MAXBITS		24
+#else
+#define MAXBITS		(BITS_INT-2)
+#endif
 
-#define TagDefault LUA_TTABLE
+/* check whether `x' < 2^MAXBITS */
+#define toobig(x)	((((x)-1) >> MAXBITS) != 0)
 
 
-#define hashnum(t,n)		(node(t, lmod((lu_hash)(ls_hash)(n), t->size)))
-#define hashstr(t,str)		(node(t, lmod((str)->tsv.hash, t->size)))
-#define hashpointer(t,p)	(node(t, lmod(IntPoint(p), t->size)))
+/* function to convert a lua_Number to int (with any rounding method) */
+#ifndef lua_number2int
+#define lua_number2int(i,n)	((i)=(int)(n))
+#endif
+
+
+
+#define hashnum(t,n)	\
+           (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 hashboolean(t,p) (node(t, lmod(p, sizenode(t))))
+
+/*
+** avoid modulus by power of 2 for pointers, as they tend to have many
+** 2 factors.
+*/
+#define hashpointer(t,p) (node(t, (IntPoint(p) % ((sizenode(t)-1)|1))))
 
 
 /*
 ** returns the `main' position of an element in a table (that is, the index
 ** of its hash value)
 */
-Node *luaH_mainposition (const Hash *t, const TObject *key) {
+Node *luaH_mainposition (const Table *t, const TObject *key) {
   switch (ttype(key)) {
-    case LUA_TNUMBER:
-      return hashnum(t, nvalue(key));
+    case LUA_TNUMBER: {
+      int ikey;
+      lua_number2int(ikey, nvalue(key));
+      return hashnum(t, ikey);
+    }
     case LUA_TSTRING:
       return hashstr(t, tsvalue(key));
-    default:  /* all other types are hashed as (void *) */
-      return hashpointer(t, tsvalue(key));
+    case LUA_TBOOLEAN:
+      return hashboolean(t, bvalue(key));
+    case LUA_TLIGHTUSERDATA:
+      return hashpointer(t, pvalue(key));
+    case LUA_TUSERDATA:
+      return hashpointer(t, uvalue(key));
+    case LUA_TFUNCTION:
+      return hashpointer(t, clvalue(key));
+    case LUA_TTABLE:
+      return hashpointer(t, hvalue(key));
   }
+  lua_assert(0);
+  return 0;  /* to avoid warnings */
 }
 
 
-Node *luaH_next (lua_State *L, Hash *t, const TObject *key) {
+/*
+** returns the index for `key' if `key' is an appropriate key to live in
+** the array part of the table, -1 otherwise.
+*/
+static int arrayindex (const TObject *key) {
+  if (ttisnumber(key)) {
+    int k;
+    lua_number2int(k, (nvalue(key)));
+    if (cast(lua_Number, k) == nvalue(key) && k >= 1 && !toobig(k))
+      return k;
+  }
+  return -1;  /* `key' did not match some condition */
+}
+
+
+/*
+** returns the index of a `key' for table traversals. First goes all
+** elements in the array part, then elements in the hash part. The
+** beginning and end of a traversal are signalled by -1.
+*/
+static int luaH_index (lua_State *L, Table *t, const TObject *key) {
   int i;
-  if (ttype(key) == LUA_TNIL)
-    i = 0;  /* first iteration */
+  if (ttisnil(key)) return -1;  /* first iteration */
+  i = arrayindex(key);
+  if (0 <= i && i <= t->sizearray) {  /* is `key' inside array part? */
+    return i-1;  /* yes; that's the index (corrected to C) */
+  }
   else {
     const TObject *v = luaH_get(t, key);
     if (v == &luaO_nilobject)
-      luaD_error(L, l_s("invalid key for `next'"));
-    i = (int)(((const lu_byte *)v -
-               (const lu_byte *)(val(node(t, 0)))) / sizeof(Node)) + 1;
+      luaG_runerror(L, "invalid key for `next'");
+    i = cast(int, (cast(const lu_byte *, v) -
+                   cast(const lu_byte *, val(node(t, 0)))) / sizeof(Node));
+    return i + t->sizearray;  /* hash elements are numbered after array ones */
   }
-  for (; i<t->size; i++) {
-    Node *n = node(t, i);
-    if (ttype(val(n)) != LUA_TNIL)
-      return n;
-  }
-  return NULL;  /* no more elements */
 }
 
 
-int luaH_nexti (Hash *t, int i) {
-  while ((++i)<t->size) {
-    if (ttype(val(node(t, i))) != LUA_TNIL)  /* a non-nil value? */
-      return i;
+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 */
+    if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
+      setnvalue(key, i+1);
+      setobj(key+1, &t->array[i]);
+      return 1;
+    }
   }
-  return -1;  /* no more elements */
+  for (i -= t->sizearray; i < sizenode(t); i++) {  /* then hash part */
+    if (!ttisnil(val(node(t, i)))) {  /* a non-nil value? */
+      setobj(key, key(node(t, i)));
+      setobj(key+1, val(node(t, i)));
+      return 1;
+    }
+  }
+  return 0;  /* no more elements */
 }
 
 
-#define check_grow(L, p, n) \
-	if ((p) >= MAX_INT/(n)) luaD_error(L, l_s("table overflow"));
-
 /*
-** returns smaller power of 2 larger than `n' (minimum is MINPOWER2) 
+** {=============================================================
+** Rehash
+** ==============================================================
 */
-static int power2 (lua_State *L, int n) {
-  int p = MINPOWER2;
-  while (p <= n) {
-    check_grow(L, p, 2);
-    p *= 2;
+
+
+static void computesizes  (int nums[], int ntotal, int *narray, int *nhash) {
+  int i;
+  int a = nums[0];  /* number of elements smaller than 2^i */
+  int na = a;  /* number of elements to go to array part */
+  int n = (na == 0) ? -1 : 0;  /* (log of) optimal size for array part */
+  for (i = 1; i <= MAXBITS && *narray >= twoto(i-1); i++) {
+    if (nums[i] > 0) {
+      a += nums[i];
+      if (a >= twoto(i-1)) {  /* more than half elements in use? */
+        n = i;
+        na = a;
+      }
+    }
   }
-  return p;
+  lua_assert(na <= *narray && *narray <= ntotal);
+  *nhash = ntotal - na;
+  *narray = (n == -1) ? 0 : twoto(n);
+  lua_assert(na <= *narray && na >= *narray/2);
 }
 
 
-static void setnodevector (lua_State *L, Hash *t, int size) {
+static void numuse (const Table *t, int *narray, int *nhash) {
+  int nums[MAXBITS+1];
   int i;
-  t->node = luaM_newvector(L, size, Node);
-  for (i=0; i<size; i++) {
-    t->node[i].next = NULL;
-    setnilvalue(key(node(t, i)));
-    setnilvalue(val(node(t, i)));
+  int totaluse = 0;
+  for (i=0; i<=MAXBITS; i++) nums[i] = 0;  /* init `nums' */
+  /* count elements in array part */
+  i = luaO_log2(t->sizearray) + 1;  /* number of `slices' */
+  while (i--) {  /* for each slice [2^(i-1) to 2^i) */
+    int to = twoto(i);
+    int from = to/2;
+    if (to > t->sizearray) to = t->sizearray;
+    for (; from < to; from++)
+      if (!ttisnil(&t->array[from])) {
+        nums[i]++;
+        totaluse++;
+      }
   }
-  t->size = size;
+  *narray = totaluse;  /* all previous uses were in array part */
+  /* count elements in hash part */
+  i = sizenode(t);
+  while (i--) {
+    if (!ttisnil(val(&t->node[i]))) {
+      int k = arrayindex(key(&t->node[i]));
+      if (k >= 0) {  /* is `key' an appropriate array index? */
+        nums[luaO_log2(k-1)+1]++;  /* count as such */
+        (*narray)++;
+      }
+      totaluse++;
+    }
+  }
+  computesizes(nums, totaluse, narray, nhash);
+}
+
+
+static void setarrayvector (lua_State *L, Table *t, int size) {
+  int i;
+  luaM_reallocvector(L, t->array, t->sizearray, size, TObject);
+  for (i=t->sizearray; i<size; i++)
+     setnilvalue(&t->array[i]);
+  t->sizearray = size;
+}
+
+
+static void setnodevector (lua_State *L, Table *t, int lsize) {
+  int i;
+  int size = twoto(lsize);
+  if (lsize > MAXBITS)
+    luaG_runerror(L, "table overflow");
+  if (lsize == 0) {  /* no elements to hash part? */
+    t->node = G(L)->dummynode;  /* use common `dummynode' */
+    lua_assert(ttisnil(key(t->node)));  /* assert invariants: */
+    lua_assert(ttisnil(val(t->node)));
+    lua_assert(t->node->next == NULL);  /* (`dummynode' must be empty) */
+  }
+  else {
+    t->node = luaM_newvector(L, size, Node);
+    for (i=0; i<size; i++) {
+      t->node[i].next = NULL;
+      setnilvalue(key(node(t, i)));
+      setnilvalue(val(node(t, i)));
+    }
+  }
+  t->lsizenode = cast(lu_byte, lsize);
   t->firstfree = node(t, size-1);  /* first free position to be used */
 }
 
 
-Hash *luaH_new (lua_State *L, int size) {
-  Hash *t = luaM_new(L, Hash);
-  t->htag = TagDefault;
+static void resize (lua_State *L, Table *t, int nasize, int nhsize) {
+  int i;
+  int oldasize = t->sizearray;
+  int oldhsize = t->lsizenode;
+  Node *nold;
+  Node temp[1];
+  if (oldhsize)
+    nold = t->node;  /* save old hash ... */
+  else {  /* old hash is `dummynode' */
+    lua_assert(t->node == G(L)->dummynode);
+    temp[0] = t->node[0];  /* copy it to `temp' */
+    nold = temp;
+    setnilvalue(key(G(L)->dummynode));  /* restate invariant */
+    setnilvalue(val(G(L)->dummynode));
+    lua_assert(G(L)->dummynode->next == NULL);
+  }
+  if (nasize > oldasize)  /* array part must grow? */
+    setarrayvector(L, t, nasize);
+  /* create new hash part with appropriate size */
+  setnodevector(L, t, nhsize);  
+  /* re-insert elements */
+  if (nasize < oldasize) {  /* array part must shrink? */
+    t->sizearray = nasize;
+    /* re-insert elements from vanishing slice */
+    for (i=nasize; i<oldasize; i++) {
+      if (!ttisnil(&t->array[i]))
+        setobj(luaH_setnum(L, t, i+1), &t->array[i]);
+    }
+    /* shrink array */
+    luaM_reallocvector(L, t->array, oldasize, nasize, TObject);
+  }
+  /* re-insert elements in hash part */
+  for (i = twoto(oldhsize) - 1; i >= 0; i--) {
+    Node *old = nold+i;
+    if (!ttisnil(val(old)))
+      setobj(luaH_set(L, t, key(old)), val(old));
+  }
+  if (oldhsize)
+    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 */
+  resize(L, t, nasize, luaO_log2(nhsize)+1);
+}
+
+
+
+/*
+** }=============================================================
+*/
+
+
+Table *luaH_new (lua_State *L, int narray, int lnhash) {
+  Table *t = luaM_new(L, Table);
+  t->metatable = hvalue(defaultmeta(L));
   t->next = G(L)->roottable;
   G(L)->roottable = t;
   t->mark = t;
-  t->size = 0;
-  t->weakmode = 0;
+  t->flags = cast(lu_byte, ~0);
+  t->mode = 0;
+  /* temporary values (kept only if some malloc fails) */
+  t->array = NULL;
+  t->sizearray = 0;
+  t->lsizenode = 0;
   t->node = NULL;
-  setnodevector(L, t, power2(L, size));
+  setarrayvector(L, t, narray);
+  setnodevector(L, t, lnhash);
   return t;
 }
 
 
-void luaH_free (lua_State *L, Hash *t) {
-  luaM_freearray(L, t->node, t->size, Node);
-  luaM_freelem(L, t, Hash);
+void luaH_free (lua_State *L, Table *t) {
+  if (t->lsizenode)
+    luaM_freearray(L, t->node, sizenode(t), Node);
+  luaM_freearray(L, t->array, t->sizearray, TObject);
+  luaM_freelem(L, t);
 }
 
 
-static int numuse (const Hash *t) {
-  Node *v = t->node;
-  int size = t->size;
-  int realuse = 0;
-  int i;
-  for (i=0; i<size; i++) {
-    if (ttype(&v[i].val) != LUA_TNIL)
-      realuse++;
+#if 0
+/*
+** try to remove an element from a hash table; cannot move any element
+** (because gc can call `remove' during a table traversal)
+*/
+void luaH_remove (Table *t, Node *e) {
+  Node *mp = luaH_mainposition(t, key(e));
+  if (e != mp) {  /* element not in its main position? */
+    while (mp->next != e) mp = mp->next;  /* find previous */
+    mp->next = e->next;  /* remove `e' from its list */
   }
-  return realuse;
-}
-
-
-static void rehash (lua_State *L, Hash *t) {
-  int oldsize = t->size;
-  Node *nold = t->node;
-  int nelems = numuse(t);
-  int i;
-  lua_assert(nelems<=oldsize);
-  if (nelems >= oldsize-oldsize/4) {  /* using more than 3/4? */
-    check_grow(L, oldsize, 2);
-    setnodevector(L, t, oldsize*2);  /* grow array */
-  }
-  else if (nelems <= oldsize/4 &&  /* less than 1/4? */
-           oldsize > MINPOWER2)
-    setnodevector(L, t, oldsize/2);  /* shrink array */
-  else
-    setnodevector(L, t, oldsize);  /* just rehash; keep the same size */
-  for (i=0; i<oldsize; i++) {
-    Node *old = nold+i;
-    if (ttype(val(old)) != LUA_TNIL) {
-      TObject *v = luaH_set(L, t, key(old));
-      setobj(v, val(old));
-    }
-  }
-  luaM_freearray(L, nold, oldsize, Node);  /* free old array */
+  else {
+    if (e->next != NULL) ??
+  }
+  lua_assert(ttisnil(val(node)));
+  setnilvalue(key(e));  /* clear node `e' */
+  e->next = NULL;
 }
+#endif
 
 
 /*
@@ -177,9 +357,10 @@ static void rehash (lua_State *L, Hash *t) {
 ** put new key in its main position; otherwise (colliding node is in its main 
 ** position), new key goes to an empty position. 
 */
-static TObject *newkey (lua_State *L, Hash *t, const TObject *key) {
+static TObject *newkey (lua_State *L, Table *t, const TObject *key) {
+  TObject *val;
   Node *mp = luaH_mainposition(t, key);
-  if (ttype(val(mp)) != LUA_TNIL) {  /* main position is not free? */
+  if (!ttisnil(val(mp))) {  /* main position is not free? */
     Node *othern = luaH_mainposition(t, key(mp));  /* `mp' of colliding node */
     Node *n = t->firstfree;  /* get a free place */
     if (othern != mp) {  /* is colliding node out of its main position? */
@@ -198,27 +379,32 @@ static TObject *newkey (lua_State *L, Hash *t, const TObject *key) {
     }
   }
   setobj(key(mp), key);
-  lua_assert(ttype(val(mp)) == LUA_TNIL);
+  lua_assert(ttisnil(val(mp)));
   for (;;) {  /* correct `firstfree' */
-    if (ttype(key(t->firstfree)) == LUA_TNIL)
+    if (ttisnil(key(t->firstfree)))
       return val(mp);  /* OK; table still has a free place */
     else if (t->firstfree == t->node) break;  /* cannot decrement from here */
     else (t->firstfree)--;
   }
-  rehash(L, t);  /* no more free places */
-  return luaH_set(L, t, key);  /* `rehash' invalidates this insertion */
+  /* no more free places; must create one */
+  setbvalue(val(mp), 0);  /* avoid new key being removed */
+  rehash(L, t);  /* grow table */
+  val = cast(TObject *, luaH_get(t, key));  /* get new position */
+  lua_assert(ttisboolean(val));
+  setnilvalue(val);
+  return val;
 }
 
 
 /*
 ** generic search function
 */
-static const TObject *luaH_getany (Hash *t, const TObject *key) {
-  if (ttype(key) == LUA_TNIL) return &luaO_nilobject;
+static const TObject *luaH_getany (Table *t, const TObject *key) {
+  if (ttisnil(key)) return &luaO_nilobject;
   else {
     Node *n = luaH_mainposition(t, key);
     do {  /* check whether `key' is somewhere in the chain */
-      if (luaO_equalObj(key(n), key)) return val(n);  /* that's it */
+      if (luaO_rawequalObj(key(n), key)) return val(n);  /* that's it */
       else n = n->next;
     } while (n);
     return &luaO_nilobject;
@@ -229,24 +415,28 @@ static const TObject *luaH_getany (Hash *t, const TObject *key) {
 /*
 ** search function for integers
 */
-const TObject *luaH_getnum (Hash *t, int key) {
-  Node *n = hashnum(t, key);
-  do {  /* check whether `key' is somewhere in the chain */
-    if (ttype(key(n)) == LUA_TNUMBER && nvalue(key(n)) == (lua_Number)key)
-      return val(n);  /* that's it */
-    else n = n->next;
-  } while (n);
-  return &luaO_nilobject;
+const TObject *luaH_getnum (Table *t, int key) {
+  if (1 <= key && key <= t->sizearray)
+    return &t->array[key-1];
+  else {
+    Node *n = hashnum(t, key);
+    do {  /* check whether `key' is somewhere in the chain */
+      if (ttisnumber(key(n)) && nvalue(key(n)) == (lua_Number)key)
+        return val(n);  /* that's it */
+      else n = n->next;
+    } while (n);
+    return &luaO_nilobject;
+  }
 }
 
 
 /*
 ** search function for strings
 */
-const TObject *luaH_getstr (Hash *t, TString *key) {
+const TObject *luaH_getstr (Table *t, TString *key) {
   Node *n = hashstr(t, key);
   do {  /* check whether `key' is somewhere in the chain */
-    if (ttype(key(n)) == LUA_TSTRING && tsvalue(key(n)) == key)
+    if (ttisstring(key(n)) && tsvalue(key(n)) == key)
       return val(n);  /* that's it */
     else n = n->next;
   } while (n);
@@ -257,12 +447,13 @@ const TObject *luaH_getstr (Hash *t, TString *key) {
 /*
 ** main search function
 */
-const TObject *luaH_get (Hash *t, const TObject *key) {
+const TObject *luaH_get (Table *t, const TObject *key) {
   switch (ttype(key)) {
     case LUA_TSTRING: return luaH_getstr(t, tsvalue(key));
     case LUA_TNUMBER: {
-      int k = (int)nvalue(key);
-      if ((lua_Number)k == nvalue(key))  /* is an integer index? */
+      int k;
+      lua_number2int(k, (nvalue(key)));
+      if (cast(lua_Number, k) == nvalue(key))  /* is an integer index? */
         return luaH_getnum(t, k);  /* use specialized version */
       /* else go through */
     }
@@ -271,28 +462,24 @@ const TObject *luaH_get (Hash *t, const TObject *key) {
 }
 
 
-TObject *luaH_set (lua_State *L, Hash *t, const TObject *key) {
+TObject *luaH_set (lua_State *L, Table *t, const TObject *key) {
   const TObject *p = luaH_get(t, key);
-  if (p != &luaO_nilobject) return (TObject *)p;
-  else if (ttype(key) == LUA_TNIL) luaD_error(L, l_s("table index is nil"));
-  return newkey(L, t, key);
-}
-
-
-TObject *luaH_setstr (lua_State *L, Hash *t, TString *key) {
-  const TObject *p = luaH_getstr(t, key);
-  if (p != &luaO_nilobject) return (TObject *)p;
+  t->flags = 0;
+  if (p != &luaO_nilobject)
+    return cast(TObject *, p);
   else {
-    TObject k;
-    setsvalue(&k, key);
-    return newkey(L, t, &k);
+    if (ttisnil(key)) luaG_runerror(L, "table index is nil");
+    else if (ttisnumber(key) && nvalue(key) != nvalue(key))
+      luaG_runerror(L, "table index is NaN");
+    return newkey(L, t, key);
   }
 }
 
 
-TObject *luaH_setnum (lua_State *L, Hash *t, int key) {
+TObject *luaH_setnum (lua_State *L, Table *t, int key) {
   const TObject *p = luaH_getnum(t, key);
-  if (p != &luaO_nilobject) return (TObject *)p;
+  if (p != &luaO_nilobject)
+    return cast(TObject *, p);
   else {
     TObject k;
     setnvalue(&k, key);

ltable.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.h,v 1.33 2001/06/26 13:20:45 roberto Exp roberto $
+** $Id: ltable.h,v 1.41 2002/03/11 12:45:00 roberto Exp roberto $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
@@ -10,23 +10,22 @@
 #include "lobject.h"
 
 
-#define node(_t,_i)	(&(_t)->node[_i])
-#define key(_n)		(&(_n)->key)
-#define val(_n)		(&(_n)->val)
+#define node(t,i)	(&(t)->node[i])
+#define key(n)		(&(n)->i_key)
+#define val(n)		(&(n)->i_val)
 
-const TObject *luaH_getnum (Hash *t, int key);
-TObject *luaH_setnum (lua_State *L, Hash *t, int key);
-const TObject *luaH_getstr (Hash *t, TString *key);
-TObject *luaH_setstr (lua_State *L, Hash *t, TString *key);
-const TObject *luaH_get (Hash *t, const TObject *key);
-TObject *luaH_set (lua_State *L, Hash *t, const TObject *key);
-Hash *luaH_new (lua_State *L, int nhash);
-void luaH_free (lua_State *L, Hash *t);
-Node *luaH_next (lua_State *L, Hash *t, const TObject *r);
-int luaH_nexti (Hash *t, int i);
+
+const TObject *luaH_getnum (Table *t, int key);
+TObject *luaH_setnum (lua_State *L, Table *t, int key);
+const TObject *luaH_getstr (Table *t, TString *key);
+const TObject *luaH_get (Table *t, const TObject *key);
+TObject *luaH_set (lua_State *L, Table *t, const TObject *key);
+Table *luaH_new (lua_State *L, int narray, int lnhash);
+void luaH_free (lua_State *L, Table *t);
+int luaH_next (lua_State *L, Table *t, TObject *key);
 
 /* exported only for debugging */
-Node *luaH_mainposition (const Hash *t, const TObject *key);
+Node *luaH_mainposition (const Table *t, const TObject *key);
 
 
 #endif

ltablib.c

@@ -0,0 +1,294 @@
+/*
+** $Id: ltablib.c,v 1.11 2002/08/06 17:06:56 roberto Exp roberto $
+** Library for Table Manipulation
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+
+static int checkint (lua_State *L) {
+  int n = (int)lua_tonumber(L, -1);
+  if (n == 0 && !lua_isnumber(L, -1)) n = -1;
+  lua_pop(L, 1);
+  return n;
+}
+
+
+static void aux_setn (lua_State *L, int t, int n) {
+  lua_pushliteral(L, "n");
+  lua_rawget(L, t);
+  if (checkint(L) >= 0) {
+    lua_pushliteral(L, "n");  /* use it */
+    lua_pushnumber(L, n);
+    lua_rawset(L, t);
+  }
+  else {  /* use N */
+    lua_pushvalue(L, t);
+    lua_pushnumber(L, n);
+    lua_rawset(L, lua_upvalueindex(1));  /* N[t] = n */
+  }
+}
+
+
+static int aux_getn (lua_State *L, int t) {
+  int n;
+  luaL_check_type(L, t, LUA_TTABLE);
+  lua_pushliteral(L, "n");  /* try t.n */
+  lua_rawget(L, t);
+  if ((n = checkint(L)) >= 0) return n;
+  lua_pushvalue(L, t);  /* try N[t] */
+  lua_rawget(L, lua_upvalueindex(1));
+  if ((n = checkint(L)) >= 0) return n;
+  else {  /* must count elements */
+    n = 0;
+    for (;;) {
+      lua_rawgeti(L, t, ++n);
+      if (lua_isnil(L, -1)) break;
+      lua_pop(L, 1);
+    }
+    lua_pop(L, 1);
+    aux_setn(L, t, n - 1);
+    return n - 1;
+  }
+}
+
+
+static int luaB_foreachi (lua_State *L) {
+  int i;
+  int n = aux_getn(L, 1);
+  luaL_check_type(L, 2, LUA_TFUNCTION);
+  for (i=1; i<=n; i++) {
+    lua_pushvalue(L, 2);  /* function */
+    lua_pushnumber(L, i);  /* 1st argument */
+    lua_rawgeti(L, 1, i);  /* 2nd argument */
+    lua_call(L, 2, 1);
+    if (!lua_isnil(L, -1))
+      return 1;
+    lua_pop(L, 1);  /* remove nil result */
+  }
+  return 0;
+}
+
+
+static int luaB_foreach (lua_State *L) {
+  luaL_check_type(L, 1, LUA_TTABLE);
+  luaL_check_type(L, 2, LUA_TFUNCTION);
+  lua_pushnil(L);  /* first key */
+  for (;;) {
+    if (lua_next(L, 1) == 0)
+      return 0;
+    lua_pushvalue(L, 2);  /* function */
+    lua_pushvalue(L, -3);  /* key */
+    lua_pushvalue(L, -3);  /* value */
+    lua_call(L, 2, 1);
+    if (!lua_isnil(L, -1))
+      return 1;
+    lua_pop(L, 2);  /* remove value and result */
+  }
+}
+
+
+static int luaB_getn (lua_State *L) {
+  lua_pushnumber(L, aux_getn(L, 1));
+  return 1;
+}
+
+
+static int luaB_setn (lua_State *L) {
+  luaL_check_type(L, 1, LUA_TTABLE);
+  aux_setn(L, 1, luaL_check_int(L, 2));
+  return 0;
+}
+
+
+static int luaB_tinsert (lua_State *L) {
+  int v = lua_gettop(L);  /* number of arguments */
+  int n = aux_getn(L, 1) + 1;
+  int pos;  /* where to insert new element */
+  if (v == 2)  /* called with only 2 arguments */
+    pos = n;  /* insert new element at the end */
+  else {
+    pos = luaL_check_int(L, 2);  /* 2nd argument is the position */
+    if (pos > n) n = pos;  /* `grow' array if necessary */
+    v = 3;  /* function may be called with more than 3 args */
+  }
+  aux_setn(L, 1, n);  /* new size */
+  while (--n >= pos) {  /* move up elements */
+    lua_rawgeti(L, 1, n);
+    lua_rawseti(L, 1, n+1);  /* t[n+1] = t[n] */
+  }
+  lua_pushvalue(L, v);
+  lua_rawseti(L, 1, pos);  /* t[pos] = v */
+  return 0;
+}
+
+
+static int luaB_tremove (lua_State *L) {
+  int n = aux_getn(L, 1);
+  int pos = luaL_opt_int(L, 2, n);
+  if (n <= 0) return 0;  /* table is `empty' */
+  aux_setn(L, 1, n-1);  /* t.n = n-1 */
+  lua_rawgeti(L, 1, pos);  /* result = t[pos] */
+  for ( ;pos<n; pos++) {
+    lua_rawgeti(L, 1, pos+1);
+    lua_rawseti(L, 1, pos);  /* t[pos] = t[pos+1] */
+  }
+  lua_pushnil(L);
+  lua_rawseti(L, 1, n);  /* t[n] = nil */
+  return 1;
+}
+
+
+static int str_concat (lua_State *L) {
+  luaL_Buffer b;
+  int n = aux_getn(L, 1);
+  size_t lsep;
+  const char *sep = luaL_opt_lstr(L, 2, "", &lsep);
+  int i;
+  luaL_buffinit(L, &b);
+  for (i=1; i<=n; i++) {
+    lua_rawgeti(L, 1, i);
+    luaL_arg_check(L, lua_isstring(L, -1), 1,
+                      "table contains non-strings");
+    luaL_addvalue(&b);
+    if (i != n)
+      luaL_addlstring(&b, sep, lsep);
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+
+/*
+** {======================================================
+** Quicksort
+** (based on `Algorithms in MODULA-3', Robert Sedgewick;
+**  Addison-Wesley, 1993.)
+*/
+
+
+static void set2 (lua_State *L, int i, int j) {
+  lua_rawseti(L, 1, i);
+  lua_rawseti(L, 1, j);
+}
+
+static int sort_comp (lua_State *L, int a, int b) {
+  if (!lua_isnil(L, 2)) {  /* function? */
+    int res;
+    lua_pushvalue(L, 2);
+    lua_pushvalue(L, a-1);  /* -1 to compensate function */
+    lua_pushvalue(L, b-2);  /* -2 to compensate function and `a' */
+    lua_call(L, 2, 1);
+    res = lua_toboolean(L, -1);
+    lua_pop(L, 1);
+    return res;
+  }
+  else  /* a < b? */
+    return lua_lessthan(L, a, b);
+}
+
+static void auxsort (lua_State *L, int l, int u) {
+  while (l < u) {  /* for tail recursion */
+    int i, j;
+    /* sort elements a[l], a[(l+u)/2] and a[u] */
+    lua_rawgeti(L, 1, l);
+    lua_rawgeti(L, 1, u);
+    if (sort_comp(L, -1, -2))  /* a[u] < a[l]? */
+      set2(L, l, u);  /* swap a[l] - a[u] */
+    else
+      lua_pop(L, 2);
+    if (u-l == 1) break;  /* only 2 elements */
+    i = (l+u)/2;
+    lua_rawgeti(L, 1, i);
+    lua_rawgeti(L, 1, l);
+    if (sort_comp(L, -2, -1))  /* a[i]<a[l]? */
+      set2(L, i, l);
+    else {
+      lua_pop(L, 1);  /* remove a[l] */
+      lua_rawgeti(L, 1, u);
+      if (sort_comp(L, -1, -2))  /* a[u]<a[i]? */
+        set2(L, i, u);
+      else
+        lua_pop(L, 2);
+    }
+    if (u-l == 2) break;  /* only 3 elements */
+    lua_rawgeti(L, 1, i);  /* Pivot */
+    lua_pushvalue(L, -1);
+    lua_rawgeti(L, 1, u-1);
+    set2(L, i, u-1);
+    /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
+    i = l; j = u-1;
+    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
+      /* repeat ++i until a[i] >= P */
+      while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
+        if (i>u) luaL_error(L, "invalid order function for sorting");
+        lua_pop(L, 1);  /* remove a[i] */
+      }
+      /* repeat --j until a[j] <= P */
+      while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
+        if (j<l) luaL_error(L, "invalid order function for sorting");
+        lua_pop(L, 1);  /* remove a[j] */
+      }
+      if (j<i) {
+        lua_pop(L, 3);  /* pop pivot, a[i], a[j] */
+        break;
+      }
+      set2(L, i, j);
+    }
+    lua_rawgeti(L, 1, u-1);
+    lua_rawgeti(L, 1, i);
+    set2(L, 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) {
+      j=l; i=i-1; l=i+2;
+    }
+    else {
+      j=i+1; i=u; u=j-2;
+    }
+    auxsort(L, j, i);  /* call recursively the smaller one */
+  }  /* repeat the routine for the larger one */
+}
+
+static int luaB_sort (lua_State *L) {
+  int n = aux_getn(L, 1);
+  luaL_check_stack(L, 40, "");  /* assume array is smaller than 2^40 */
+  if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+    luaL_check_type(L, 2, LUA_TFUNCTION);
+  lua_settop(L, 2);  /* make sure there is two arguments */
+  auxsort(L, 1, n);
+  return 0;
+}
+
+/* }====================================================== */
+
+
+static const luaL_reg tab_funcs[] = {
+  {"concat", str_concat},
+  {"foreach", luaB_foreach},
+  {"foreachi", luaB_foreachi},
+  {"getn", luaB_getn},
+  {"setn", luaB_setn},
+  {"sort", luaB_sort},
+  {"insert", luaB_tinsert},
+  {"remove", luaB_tremove},
+  {NULL, NULL}
+};
+
+
+LUALIB_API int lua_tablibopen (lua_State *L) {
+  lua_newtable(L);  /* create N (table to store num. elements in tables) */
+  lua_setmode(L, -1, "k");  /* make it a weak table */
+  luaL_opennamedlib(L, LUA_TABLIBNAME, tab_funcs, 1);
+  return 0;
+}
+

ltests.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ltests.c,v 1.87 2001/07/05 20:31:14 roberto Exp roberto $
+** $Id: ltests.c,v 1.132 2002/08/06 15:32:22 roberto Exp roberto $
 ** Internal Module for Debugging of the Lua Implementation
 ** See Copyright Notice in lua.h
 */
@@ -12,7 +12,6 @@
 #include <string.h>
 
 
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "lapi.h"
@@ -26,7 +25,6 @@
 #include "lstate.h"
 #include "lstring.h"
 #include "ltable.h"
-#include "luadebug.h"
 #include "lualib.h"
 
 
@@ -37,13 +35,15 @@
 #ifdef LUA_DEBUG
 
 
-lua_State *lua_state = NULL;
+static lua_State *lua_state = NULL;
 
 int islocked = 0;
 
 
+#define index(L,k)	(L->ci->base+(k) - 1)
 
-static void setnameval (lua_State *L, const l_char *name, int val) {
+
+static void setnameval (lua_State *L, const char *name, int val) {
   lua_pushstring(L, name);
   lua_pushnumber(L, val);
   lua_settable(L, -3);
@@ -64,7 +64,7 @@ static void setnameval (lua_State *L, const l_char *name, int val) {
 #define MARK		0x55  /* 01010101 (a nice pattern) */
 
 
-#define blocksize(b)	((size_t *)((l_char *)(b) - HEADER))
+#define blocksize(b)	(cast(size_t *, b) - HEADER/sizeof(size_t))
 
 unsigned long memdebug_numblocks = 0;
 unsigned long memdebug_total = 0;
@@ -77,7 +77,7 @@ static void *checkblock (void *block) {
   size_t size = *b;
   int i;
   for (i=0;i<MARKSIZE;i++)
-    lua_assert(*(((l_char *)b)+HEADER+size+i) == MARK+i);  /* corrupted block? */
+    lua_assert(*(cast(char *, b)+HEADER+size+i) == MARK+i); /* corrupted block? */
   return b;
 }
 
@@ -95,7 +95,10 @@ static void freeblock (void *block) {
 
 
 void *debug_realloc (void *block, size_t oldsize, size_t size) {
-  lua_assert((oldsize == 0) ? block == NULL : oldsize == *blocksize(block));
+  lua_assert((oldsize == 0) == (block == NULL));
+  lua_assert(oldsize == 0 || oldsize == *blocksize(block));
+  /* ISO does not specify what realloc(NULL, 0) does */
+  lua_assert(block != NULL || size > 0);
   if (size == 0) {
     freeblock(block);
     return NULL;
@@ -103,27 +106,27 @@ void *debug_realloc (void *block, size_t oldsize, size_t size) {
   else if (memdebug_total+size-oldsize > memdebug_memlimit)
     return NULL;  /* to test memory allocation errors */
   else {
-    l_char *newblock;
+    void *newblock;
     int i;
     size_t realsize = HEADER+size+MARKSIZE;
     if (realsize < size) return NULL;  /* overflow! */
-    newblock = (l_char *)malloc(realsize);  /* alloc a new block */
+    newblock = malloc(realsize);  /* alloc a new block */
     if (newblock == NULL) return NULL;
     if (oldsize > size) oldsize = size;
     if (block) {
-      memcpy(newblock+HEADER, block, oldsize);
+      memcpy(cast(char *, newblock)+HEADER, block, oldsize);
       freeblock(block);  /* erase (and check) old copy */
     }
     /* initialize new part of the block with something `weird' */
-    memset(newblock+HEADER+oldsize, -MARK, size-oldsize);
+    memset(cast(char *, newblock)+HEADER+oldsize, -MARK, size-oldsize);
     memdebug_total += size;
     if (memdebug_total > memdebug_maxmem)
       memdebug_maxmem = memdebug_total;
     memdebug_numblocks++;
-    *(size_t *)newblock = size;
+    *cast(size_t *, newblock) = size;
     for (i=0;i<MARKSIZE;i++)
-      *(newblock+HEADER+size+i) = (l_char)(MARK+i);
-    return newblock+HEADER;
+      *(cast(char *, newblock)+HEADER+size+i) = cast(char, MARK+i);
+    return cast(char *, newblock)+HEADER;
   }
 }
 
@@ -139,38 +142,51 @@ void *debug_realloc (void *block, size_t oldsize, size_t size) {
 */
 
 
-static l_char *buildop (Proto *p, int pc, l_char *buff) {
+static char *buildop (Proto *p, int pc, char *buff) {
   Instruction i = p->code[pc];
   OpCode o = GET_OPCODE(i);
-  const l_char *name = luaP_opnames[o];
-  sprintf(buff, l_s("%4d - "), pc);
+  const char *name = luaP_opnames[o];
+  int line = getline(p, pc);
+  sprintf(buff, "(%4d) %4d - ", line, pc);
   switch (getOpMode(o)) {  
     case iABC:
-      sprintf(buff+strlen(buff), l_s("%-12s%4d %4d %4d"), name,
+      sprintf(buff+strlen(buff), "%-12s%4d %4d %4d", name,
               GETARG_A(i), GETARG_B(i), GETARG_C(i));
       break;
-    case iABc:
-      sprintf(buff+strlen(buff), l_s("%-12s%4d %4d"), name, GETARG_A(i), GETARG_Bc(i));
+    case iABx:
+      sprintf(buff+strlen(buff), "%-12s%4d %4d", name, GETARG_A(i), GETARG_Bx(i));
       break;
-    case iAsBc:
-      sprintf(buff+strlen(buff), l_s("%-12s%4d %4d"), name, GETARG_A(i), GETARG_sBc(i));
+    case iAsBx:
+      sprintf(buff+strlen(buff), "%-12s%4d %4d", name, GETARG_A(i), GETARG_sBx(i));
       break;
   }
   return buff;
 }
 
 
+#if 0
+void luaI_printcode (Proto *pt, int size) {
+  int pc;
+  for (pc=0; pc<size; pc++) {
+    char buff[100];
+    printf("%s\n", buildop(pt, pc, buff));
+  }
+  printf("-------\n");
+}
+#endif
+
+
 static int listcode (lua_State *L) {
   int pc;
   Proto *p;
   luaL_arg_check(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1),
-                 1, l_s("Lua function expected"));
-  p = clvalue(luaA_index(L, 1))->f.l;
+                 1, "Lua function expected");
+  p = clvalue(index(L, 1))->l.p;
   lua_newtable(L);
-  setnameval(L, l_s("maxstack"), p->maxstacksize);
-  setnameval(L, l_s("numparams"), p->numparams);
+  setnameval(L, "maxstack", p->maxstacksize);
+  setnameval(L, "numparams", p->numparams);
   for (pc=0; pc<p->sizecode; pc++) {
-    l_char buff[100];
+    char buff[100];
     lua_pushnumber(L, pc+1);
     lua_pushstring(L, buildop(p, pc, buff));
     lua_settable(L, -3);
@@ -183,8 +199,8 @@ static int listk (lua_State *L) {
   Proto *p;
   int i;
   luaL_arg_check(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1),
-                 1, l_s("Lua function expected"));
-  p = clvalue(luaA_index(L, 1))->f.l;
+                 1, "Lua function expected");
+  p = clvalue(index(L, 1))->l.p;
   lua_newtable(L);
   for (i=0; i<p->sizek; i++) {
     lua_pushnumber(L, i+1);
@@ -199,10 +215,10 @@ static int listlocals (lua_State *L) {
   Proto *p;
   int pc = luaL_check_int(L, 2) - 1;
   int i = 0;
-  const l_char *name;
+  const char *name;
   luaL_arg_check(L, lua_isfunction(L, 1) && !lua_iscfunction(L, 1),
-                 1, l_s("Lua function expected"));
-  p = clvalue(luaA_index(L, 1))->f.l;
+                 1, "Lua function expected");
+  p = clvalue(index(L, 1))->l.p;
   while ((name = luaF_getlocalname(p, ++i, pc)) != NULL)
     lua_pushstring(L, name);
   return i-1;
@@ -211,28 +227,22 @@ static int listlocals (lua_State *L) {
 /* }====================================================== */
 
 
-static int pushbool (lua_State *L, int b) {
-  if (b) lua_pushnumber(L, 1);
-  else lua_pushnil(L);
-  return 1;
-}
-
 
 
 static int get_limits (lua_State *L) {
   lua_newtable(L);
-  setnameval(L, l_s("BITS_INT"), BITS_INT);
-  setnameval(L, l_s("LFPF"), LFIELDS_PER_FLUSH);
-  setnameval(L, l_s("MAXLOCALS"), MAXLOCALS);
-  setnameval(L, l_s("MAXPARAMS"), MAXPARAMS);
-  setnameval(L, l_s("MAXSTACK"), MAXSTACK);
-  setnameval(L, l_s("MAXUPVALUES"), MAXUPVALUES);
+  setnameval(L, "BITS_INT", BITS_INT);
+  setnameval(L, "LFPF", LFIELDS_PER_FLUSH);
+  setnameval(L, "MAXVARS", MAXVARS);
+  setnameval(L, "MAXPARAMS", MAXPARAMS);
+  setnameval(L, "MAXSTACK", MAXSTACK);
+  setnameval(L, "MAXUPVALUES", MAXUPVALUES);
   return 1;
 }
 
 
 static int mem_query (lua_State *L) {
-  if (lua_isnull(L, 1)) {
+  if (lua_isnone(L, 1)) {
     lua_pushnumber(L, memdebug_total);
     lua_pushnumber(L, memdebug_numblocks);
     lua_pushnumber(L, memdebug_maxmem);
@@ -246,48 +256,62 @@ static int mem_query (lua_State *L) {
 
 
 static int hash_query (lua_State *L) {
-  if (lua_isnull(L, 2)) {
-    luaL_arg_check(L, lua_tag(L, 1) == LUA_TSTRING, 1, l_s("string expected"));
-    lua_pushnumber(L, tsvalue(luaA_index(L, 1))->tsv.hash);
+  if (lua_isnone(L, 2)) {
+    luaL_arg_check(L, lua_type(L, 1) == LUA_TSTRING, 1, "string expected");
+    lua_pushnumber(L, tsvalue(index(L, 1))->tsv.hash);
   }
   else {
-    TObject *o = luaA_index(L, 1);
-    Hash *t;
-    luaL_checktype(L, 2, LUA_TTABLE);
-    t = hvalue(luaA_index(L, 2));
+    TObject *o = index(L, 1);
+    Table *t;
+    luaL_check_type(L, 2, LUA_TTABLE);
+    t = hvalue(index(L, 2));
     lua_pushnumber(L, luaH_mainposition(t, o) - t->node);
   }
   return 1;
 }
 
 
+static int stacklevel (lua_State *L) {
+  unsigned long a = 0;
+  lua_pushnumber(L, (int)(L->top - L->stack));
+  lua_pushnumber(L, (int)(L->stack_last - L->stack));
+  lua_pushnumber(L, (int)(L->ci - L->base_ci));
+  lua_pushnumber(L, (int)(L->end_ci - L->base_ci));
+  lua_pushnumber(L, (unsigned long)&a);
+  return 5;
+}
+
+
 static int table_query (lua_State *L) {
-  const Hash *t;
+  const Table *t;
   int i = luaL_opt_int(L, 2, -1);
-  luaL_checktype(L, 1, LUA_TTABLE);
-  t = hvalue(luaA_index(L, 1));
+  luaL_check_type(L, 1, LUA_TTABLE);
+  t = hvalue(index(L, 1));
   if (i == -1) {
-    lua_pushnumber(L, t->size);
+    lua_pushnumber(L, t->sizearray);
+    lua_pushnumber(L, sizenode(t));
     lua_pushnumber(L, t->firstfree - t->node);
-    return 2;
   }
-  else if (i < t->size) {
-    if (ttype(val(node(t, i))) != LUA_TNIL ||
-        ttype(key(node(t, i))) == LUA_TNIL ||
-        ttype(key(node(t, i))) == LUA_TNUMBER) {
+  else if (i < t->sizearray) {
+    lua_pushnumber(L, i);
+    luaA_pushobject(L, &t->array[i]);
+    lua_pushnil(L); 
+  }
+  else if ((i -= t->sizearray) < sizenode(t)) {
+    if (!ttisnil(val(node(t, i))) ||
+        ttisnil(key(node(t, i))) ||
+        ttisnumber(key(node(t, i)))) {
       luaA_pushobject(L, key(node(t, i)));
     }
     else
       lua_pushstring(L, "<undef>");
-    luaA_pushobject(L, &t->node[i].val);
-    if (t->node[i].next) {
+    luaA_pushobject(L, val(&t->node[i]));
+    if (t->node[i].next)
       lua_pushnumber(L, t->node[i].next - t->node);
-      return 3;
-    }
     else
-      return 2;
+      lua_pushnil(L);
   }
-  return 0;
+  return 3;
 }
 
 
@@ -304,7 +328,7 @@ static int string_query (lua_State *L) {
     int n = 0;
     for (ts = tb->hash[s]; ts; ts = ts->tsv.nexthash) {
       setsvalue(L->top, ts);
-      incr_top;
+      incr_top(L);
       n++;
     }
     return n;
@@ -315,23 +339,19 @@ static int string_query (lua_State *L) {
 
 static int tref (lua_State *L) {
   int level = lua_gettop(L);
-  luaL_checkany(L, 1);
+  int lock = luaL_opt_int(L, 2, 1);
+  luaL_check_any(L, 1);
   lua_pushvalue(L, 1);
-  lua_pushnumber(L, lua_ref(L, luaL_opt_int(L, 2, 1)));
+  lua_pushnumber(L, lua_ref(L, lock));
   assert(lua_gettop(L) == level+1);  /* +1 for result */
   return 1;
 }
 
 static int getref (lua_State *L) {
   int level = lua_gettop(L);
-  if (lua_getref(L, luaL_check_int(L, 1))) {
-    assert(lua_gettop(L) == level+1);
-    return 1;
-  }
-  else {
-    assert(lua_gettop(L) == level);
-    return 0;
-  }
+  lua_getref(L, luaL_check_int(L, 1));
+  assert(lua_gettop(L) == level+1);
+  return 1;
 }
 
 static int unref (lua_State *L) {
@@ -341,64 +361,69 @@ static int unref (lua_State *L) {
   return 0;
 }
 
+static int metatable (lua_State *L) {
+  luaL_check_any(L, 1);
+  if (lua_isnone(L, 2)) {
+    if (lua_getmetatable(L, 1) == 0)
+      lua_pushnil(L);
+  }
+  else {
+    lua_settop(L, 2);
+    luaL_check_type(L, 2, LUA_TTABLE);
+    lua_setmetatable(L, 1);
+  }
+  return 1;
+}
+
 static int newuserdata (lua_State *L) {
   size_t size = luaL_check_int(L, 1);
-  l_char *p = (l_char *)lua_newuserdata(L, size);
-  while (size--) *p++ = l_c('\0');
+  char *p = cast(char *, lua_newuserdata(L, size));
+  while (size--) *p++ = '\0';
   return 1;
 }
 
-static int newuserdatabox (lua_State *L) {
-  lua_newuserdatabox(L, (void *)luaL_check_int(L, 1));
+
+static int pushuserdata (lua_State *L) {
+  lua_pushlightuserdata(L, cast(void *, luaL_check_int(L, 1)));
   return 1;
 }
 
-static int settag (lua_State *L) {
-  luaL_checkany(L, 1);
-  lua_pushvalue(L, 1);  /* push value */
-  lua_settag(L, luaL_check_int(L, 2));
-  return 1;  /* return value */
-}
 
 static int udataval (lua_State *L) {
-  luaL_checktype(L, 1, LUA_TUSERDATA);
-  lua_pushnumber(L, (int)lua_touserdata(L, 1));
+  lua_pushnumber(L, cast(int, lua_touserdata(L, 1)));
   return 1;
 }
 
-static int newtag (lua_State *L) {
-  lua_pushnumber(L, lua_newtype(L, lua_tostring(L, 1),
-                                   (int)lua_tonumber(L, 2)));
-  return 1;
-}
 
 static int doonnewstack (lua_State *L) {
-  lua_State *L1 = lua_newthread(L, luaL_check_int(L, 1));
-  if (L1 == NULL) return 0;
-  *((int **)L1) = &islocked;  /* initialize the lock */
-  lua_dostring(L1, luaL_check_string(L, 2));
-  lua_pushnumber(L, 1);
-  lua_close(L1);
+  lua_State *L1 = lua_newthread(L);
+  size_t l;
+  const char *s = luaL_check_lstr(L, 1, &l);
+  int status = luaL_loadbuffer(L1, s, l, s);
+  if (status == 0)
+    status = lua_pcall(L1, 0, 0, 0);
+  lua_pushnumber(L, status);
+  lua_closethread(L, L1);
   return 1;
 }
 
 
 static int s2d (lua_State *L) {
-  lua_pushnumber(L, *(double *)luaL_check_string(L, 1));
+  lua_pushnumber(L, *cast(const double *, luaL_check_string(L, 1)));
   return 1;
 }
 
 static int d2s (lua_State *L) {
   double d = luaL_check_number(L, 1);
-  lua_pushlstring(L, (l_char *)&d, sizeof(d));
+  lua_pushlstring(L, cast(char *, &d), sizeof(d));
   return 1;
 }
 
 
 static int newstate (lua_State *L) {
-  lua_State *L1 = lua_open(luaL_check_int(L, 1));
+  lua_State *L1 = lua_open();
   if (L1) {
-    *((int **)L1) = &islocked;  /* initialize the lock */
+    *cast(int **, L1) = &islocked;  /* initialize the lock */
     lua_pushnumber(L, (unsigned long)L1);
   }
   else
@@ -407,7 +432,7 @@ static int newstate (lua_State *L) {
 }
 
 static int loadlib (lua_State *L) {
-  lua_State *L1 = (lua_State *)(unsigned long)luaL_check_number(L, 1);
+  lua_State *L1 = cast(lua_State *, cast(unsigned long, luaL_check_number(L, 1)));
   lua_register(L1, "mathlibopen", lua_mathlibopen);
   lua_register(L1, "strlibopen", lua_strlibopen);
   lua_register(L1, "iolibopen", lua_iolibopen);
@@ -417,18 +442,21 @@ static int loadlib (lua_State *L) {
 }
 
 static int closestate (lua_State *L) {
-  lua_State *L1 = (lua_State *)(unsigned long)luaL_check_number(L, 1);
+  lua_State *L1 = cast(lua_State *, cast(unsigned long, luaL_check_number(L, 1)));
   lua_close(L1);
   lua_unlock(L);  /* close cannot unlock that */
   return 0;
 }
 
 static int doremote (lua_State *L) {
-  lua_State *L1;
-  const l_char *code = luaL_check_string(L, 2);
+  lua_State *L1 = cast(lua_State *,cast(unsigned long,luaL_check_number(L, 1)));
+  size_t lcode;
+  const char *code = luaL_check_lstr(L, 2, &lcode);
   int status;
-  L1 = (lua_State *)(unsigned long)luaL_check_number(L, 1);
-  status = lua_dostring(L1, code);
+  lua_settop(L1, 0);
+  status = luaL_loadbuffer(L1, code, lcode, code);
+  if (status == 0)
+    status = lua_pcall(L1, 0, LUA_MULTRET, 0);
   if (status != 0) {
     lua_pushnil(L);
     lua_pushnumber(L, status);
@@ -436,28 +464,19 @@ static int doremote (lua_State *L) {
   }
   else {
     int i = 0;
-    while (!lua_isnull(L1, ++i))
+    while (!lua_isnone(L1, ++i))
       lua_pushstring(L, lua_tostring(L1, i));
     lua_pop(L1, i-1);
     return i-1;
   }
 }
 
-static int settagmethod (lua_State *L) {
-  int tag = luaL_check_int(L, 1);
-  const l_char *event = luaL_check_string(L, 2);
-  luaL_checkany(L, 3);
-  lua_gettagmethod(L, tag, event);
-  lua_pushvalue(L, 3);
-  lua_settagmethod(L, tag, event);
+
+static int log2_aux (lua_State *L) {
+  lua_pushnumber(L, luaO_log2(luaL_check_int(L, 1)));
   return 1;
 }
 
-static int equal (lua_State *L) {
-  return pushbool(L, lua_equal(L, 1, 2));
-}
-
-  
 
 /*
 ** {======================================================
@@ -466,162 +485,186 @@ static int equal (lua_State *L) {
 ** =======================================================
 */
 
-static const l_char *const delimits = l_s(" \t\n,;");
+static const char *const delimits = " \t\n,;";
 
-static void skip (const l_char **pc) {
-  while (**pc != l_c('\0') && strchr(delimits, **pc)) (*pc)++;
+static void skip (const char **pc) {
+  while (**pc != '\0' && strchr(delimits, **pc)) (*pc)++;
 }
 
-static int getnum (lua_State *L, const l_char **pc) {
+static int getnum_aux (lua_State *L, const char **pc) {
   int res = 0;
   int sig = 1;
   skip(pc);
-  if (**pc == l_c('.')) {
-    res = (int)lua_tonumber(L, -1);
+  if (**pc == '.') {
+    res = cast(int, lua_tonumber(L, -1));
     lua_pop(L, 1);
     (*pc)++;
     return res;
   }
-  else if (**pc == l_c('-')) {
+  else if (**pc == '-') {
     sig = -1;
     (*pc)++;
   }
-  while (isdigit(**pc)) res = res*10 + (*(*pc)++) - l_c('0');
+  while (isdigit(cast(int, **pc))) res = res*10 + (*(*pc)++) - '0';
   return sig*res;
 }
   
-static const l_char *getname (l_char *buff, const l_char **pc) {
+static const char *getname_aux (char *buff, const char **pc) {
   int i = 0;
   skip(pc);
-  while (**pc != l_c('\0') && !strchr(delimits, **pc))
+  while (**pc != '\0' && !strchr(delimits, **pc))
     buff[i++] = *(*pc)++;
-  buff[i] = l_c('\0');
+  buff[i] = '\0';
   return buff;
 }
 
 
 #define EQ(s1)	(strcmp(s1, inst) == 0)
 
-#define getnum	((getnum)(L, &pc))
-#define getname	((getname)(buff, &pc))
+#define getnum	(getnum_aux(L, &pc))
+#define getname	(getname_aux(buff, &pc))
 
 
 static int testC (lua_State *L) {
-  l_char buff[30];
-  const l_char *pc = luaL_check_string(L, 1);
+  char buff[30];
+  const char *pc = luaL_check_string(L, 1);
   for (;;) {
-    const l_char *inst = getname;
-    if EQ(l_s("")) return 0;
-    else if EQ(l_s("isnumber")) {
+    const char *inst = getname;
+    if EQ("") return 0;
+    else if EQ("isnumber") {
       lua_pushnumber(L, lua_isnumber(L, getnum));
     }
-    else if EQ(l_s("isstring")) {
+    else if EQ("isstring") {
       lua_pushnumber(L, lua_isstring(L, getnum));
     }
-    else if EQ(l_s("istable")) {
+    else if EQ("istable") {
       lua_pushnumber(L, lua_istable(L, getnum));
     }
-    else if EQ(l_s("iscfunction")) {
+    else if EQ("iscfunction") {
       lua_pushnumber(L, lua_iscfunction(L, getnum));
     }
-    else if EQ(l_s("isfunction")) {
+    else if EQ("isfunction") {
       lua_pushnumber(L, lua_isfunction(L, getnum));
     }
-    else if EQ(l_s("isuserdata")) {
+    else if EQ("isuserdata") {
       lua_pushnumber(L, lua_isuserdata(L, getnum));
     }
-    else if EQ(l_s("isnil")) {
+    else if EQ("isudataval") {
+      lua_pushnumber(L, lua_islightuserdata(L, getnum));
+    }
+    else if EQ("isnil") {
       lua_pushnumber(L, lua_isnil(L, getnum));
     }
-    else if EQ(l_s("isnull")) {
-      lua_pushnumber(L, lua_isnull(L, getnum));
+    else if EQ("isnull") {
+      lua_pushnumber(L, lua_isnone(L, getnum));
     }
-    else if EQ(l_s("tonumber")) {
+    else if EQ("tonumber") {
       lua_pushnumber(L, lua_tonumber(L, getnum));
     }
-    else if EQ(l_s("tostring")) {
-      const l_char *s = lua_tostring(L, getnum);
+    else if EQ("tostring") {
+      const char *s = lua_tostring(L, getnum);
       lua_pushstring(L, s);
     }
-    else if EQ(l_s("tonumber")) {
+    else if EQ("tonumber") {
       lua_pushnumber(L, lua_tonumber(L, getnum));
     }
-    else if EQ(l_s("strlen")) {
+    else if EQ("strlen") {
       lua_pushnumber(L, lua_strlen(L, getnum));
     }
-    else if EQ(l_s("tocfunction")) {
+    else if EQ("tocfunction") {
       lua_pushcfunction(L, lua_tocfunction(L, getnum));
     }
-    else if EQ(l_s("return")) {
+    else if EQ("return") {
       return getnum;
     }
-    else if EQ(l_s("gettop")) {
+    else if EQ("gettop") {
       lua_pushnumber(L, lua_gettop(L));
     }
-    else if EQ(l_s("settop")) {
+    else if EQ("settop") {
       lua_settop(L, getnum);
     }
-    else if EQ(l_s("pop")) {
+    else if EQ("pop") {
       lua_pop(L, getnum);
     }
-    else if EQ(l_s("pushnum")) {
+    else if EQ("pushnum") {
       lua_pushnumber(L, getnum);
     }
-    else if EQ(l_s("pushvalue")) {
+    else if EQ("pushnil") {
+      lua_pushnil(L);
+    }
+    else if EQ("pushbool") {
+      lua_pushboolean(L, getnum);
+    }
+    else if EQ("tobool") {
+      lua_pushnumber(L, lua_toboolean(L, getnum));
+    }
+    else if EQ("pushvalue") {
       lua_pushvalue(L, getnum);
     }
-    else if EQ(l_s("remove")) {
+    else if EQ("pushcclosure") {
+      lua_pushcclosure(L, testC, getnum);
+    }
+    else if EQ("pushupvalues") {
+      lua_pushupvalues(L);
+    }
+    else if EQ("remove") {
       lua_remove(L, getnum);
     }
-    else if EQ(l_s("insert")) {
+    else if EQ("insert") {
       lua_insert(L, getnum);
     }
-    else if EQ(l_s("gettable")) {
+    else if EQ("replace") {
+      lua_replace(L, getnum);
+    }
+    else if EQ("gettable") {
       lua_gettable(L, getnum);
     }
-    else if EQ(l_s("settable")) {
+    else if EQ("settable") {
       lua_settable(L, getnum);
     }
-    else if EQ(l_s("next")) {
+    else if EQ("next") {
       lua_next(L, -2);
     }
-    else if EQ(l_s("concat")) {
+    else if EQ("concat") {
       lua_concat(L, getnum);
     }
-    else if EQ(l_s("lessthan")) {
+    else if EQ("lessthan") {
       int a = getnum;
-      if (lua_lessthan(L, a, getnum))
-        lua_pushnumber(L, 1);
-      else
-        lua_pushnil(L);
+      lua_pushboolean(L, lua_lessthan(L, a, getnum));
     }
-    else if EQ(l_s("rawcall")) {
-      int narg = getnum;
-      int nres = getnum;
-      lua_rawcall(L, narg, nres);
+    else if EQ("equal") {
+      int a = getnum;
+      lua_pushboolean(L, lua_equal(L, a, getnum));
     }
-    else if EQ(l_s("call")) {
+    else if EQ("rawcall") {
       int narg = getnum;
       int nres = getnum;
       lua_call(L, narg, nres);
     }
-    else if EQ(l_s("dostring")) {
-      lua_dostring(L, luaL_check_string(L, getnum));
+    else if EQ("call") {
+      int narg = getnum;
+      int nres = getnum;
+      lua_pcall(L, narg, nres, 0);
     }
-    else if EQ(l_s("settagmethod")) {
-      int tag = getnum;
-      const l_char *event = getname;
-      lua_settagmethod(L, tag, event);
+    else if EQ("loadstring") {
+      size_t sl;
+      const char *s = luaL_check_lstr(L, getnum, &sl);
+      luaL_loadbuffer(L, s, sl, s);
     }
-    else if EQ(l_s("gettagmethod")) {
-      int tag = getnum;
-      const l_char *event = getname;
-      lua_gettagmethod(L, tag, event);
+    else if EQ("loadfile") {
+      luaL_loadfile(L, luaL_check_string(L, getnum));
     }
-    else if EQ(l_s("type")) {
-      lua_pushstring(L, lua_type(L, getnum));
+    else if EQ("setmetatable") {
+      lua_setmetatable(L, getnum);
     }
-    else luaL_verror(L, l_s("unknown instruction %.30s"), buff);
+    else if EQ("getmetatable") {
+      if (lua_getmetatable(L, getnum) == 0)
+        lua_pushnil(L);
+    }
+    else if EQ("type") {
+      lua_pushstring(L, lua_typename(L, lua_type(L, getnum)));
+    }
+    else luaL_error(L, "unknown instruction %s", buff);
   }
   return 0;
 }
@@ -631,46 +674,49 @@ static int testC (lua_State *L) {
 
 
 static const struct luaL_reg tests_funcs[] = {
-  {l_s("hash"), hash_query},
-  {l_s("limits"), get_limits},
-  {l_s("listcode"), listcode},
-  {l_s("listk"), listk},
-  {l_s("listlocals"), listlocals},
-  {l_s("loadlib"), loadlib},
-  {l_s("querystr"), string_query},
-  {l_s("querytab"), table_query},
-  {l_s("testC"), testC},
-  {l_s("ref"), tref},
-  {l_s("getref"), getref},
-  {l_s("unref"), unref},
-  {l_s("d2s"), d2s},
-  {l_s("s2d"), s2d},
-  {l_s("newuserdata"), newuserdata},
-  {l_s("newuserdatabox"), newuserdatabox},
-  {l_s("settag"), settag},
-  {l_s("udataval"), udataval},
-  {l_s("newtag"), newtag},
-  {l_s("doonnewstack"), doonnewstack},
-  {l_s("newstate"), newstate},
-  {l_s("closestate"), closestate},
-  {l_s("doremote"), doremote},
-  {l_s("settagmethod"), settagmethod},
-  {l_s("equal"), equal},
-  {l_s("totalmem"), mem_query}
+  {"hash", hash_query},
+  {"limits", get_limits},
+  {"listcode", listcode},
+  {"listk", listk},
+  {"listlocals", listlocals},
+  {"loadlib", loadlib},
+  {"stacklevel", stacklevel},
+  {"querystr", string_query},
+  {"querytab", table_query},
+  {"testC", testC},
+  {"ref", tref},
+  {"getref", getref},
+  {"unref", unref},
+  {"d2s", d2s},
+  {"s2d", s2d},
+  {"metatable", metatable},
+  {"newuserdata", newuserdata},
+  {"pushuserdata", pushuserdata},
+  {"udataval", udataval},
+  {"doonnewstack", doonnewstack},
+  {"newstate", newstate},
+  {"closestate", closestate},
+  {"doremote", doremote},
+  {"log2", log2_aux},
+  {"totalmem", mem_query},
+  {NULL, NULL}
 };
 
 
-void luaB_opentests (lua_State *L) {
-  *((int **)L) = &islocked;  /* init lock */
+static void fim (void) {
+  if (!islocked)
+    lua_close(lua_state);
+  lua_assert(memdebug_numblocks == 0);
+  lua_assert(memdebug_total == 0);
+}
+
+
+int luaB_opentests (lua_State *L) {
+  *cast(int **, L) = &islocked;  /* init lock */
   lua_state = L;  /* keep first state to be opened */
-  /* open lib in a new table */
-  lua_newtable(L);
-  lua_getglobals(L);
-  lua_pushvalue(L, -2);
-  lua_setglobals(L);
-  luaL_openl(L, tests_funcs);  /* open functions inside new table */
-  lua_setglobals(L);  /* restore old table of globals */
-  lua_setglobal(L, l_s("T"));  /* set new table as global T */
+  luaL_opennamedlib(L, "T", tests_funcs, 0);
+  atexit(fim);
+  return 0;
 }
 
 #endif

ltests.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltests.h,v 1.6 2001/03/02 17:27:50 roberto Exp roberto $
+** $Id: ltests.h,v 1.14 2002/06/13 13:45:31 roberto Exp roberto $
 ** Internal Header for Debugging of the Lua Implementation
 ** See Copyright Notice in lua.h
 */
@@ -18,6 +18,7 @@
 #undef NDEBUG
 #include <assert.h>
 #define lua_assert(c)           assert(c)
+#define check_exp(c,e)		(lua_assert(c), (e))
 #define api_check(L, o)		lua_assert(o)
 
 
@@ -32,27 +33,29 @@ extern unsigned long memdebug_maxmem;
 extern unsigned long memdebug_memlimit;
 
 
-#define l_malloc(s)		debug_realloc(NULL, 0, s)
 #define l_realloc(b, os, s)	debug_realloc(b, os, s)
-#define l_free(b, s)		debug_realloc(b, s, 0)
 
 void *debug_realloc (void *block, size_t oldsize, size_t size);
 
 
 
 /* test for lock/unlock */
-#define LUA_USERSTATE	int *lock;
 extern int islocked;
-#define lua_lock(L)     lua_assert((**((int **)L))++ == 0)
-#define lua_unlock(L)   lua_assert(--(**((int **)L)) == 0)
+#define LUA_USERSTATE	int *lock;
+#define lua_userstateopen(l) if (l != NULL) *cast(int **, l) = &islocked;
+#define lua_lock(L)     lua_assert((**cast(int **, L))++ == 0)
+#define lua_unlock(L)   lua_assert(--(**cast(int **, L)) == 0)
 
 
-extern lua_State *lua_state;
+int luaB_opentests (lua_State *L);
+
+#define lua_userinit(L) (luaB_opentests(L) + openstdlibs(L))
 
 
-void luaB_opentests (lua_State *L);
 
-#define LUA_USERINIT(L) (luaB_opentests(L), openstdlibs(L))
+/* change some sizes to give some bugs a chance */
 
+#define LUAL_BUFFERSIZE		27
+#define MINSTRTABSIZE		2
 
 #endif

ltm.c

@@ -1,18 +1,14 @@
 /*
-** $Id: ltm.c,v 1.75 2001/07/23 19:56:00 roberto Exp roberto $
+** $Id: ltm.c,v 1.99 2002/08/05 14:09:06 roberto Exp roberto $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
 
 
-#include <stdio.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
-#include "ldo.h"
-#include "lmem.h"
 #include "lobject.h"
 #include "lstate.h"
 #include "lstring.h"
@@ -20,173 +16,54 @@
 #include "ltm.h"
 
 
-const l_char *const luaT_eventname[] = {  /* ORDER TM */
-  l_s("gettable"), l_s("settable"), l_s("index"), l_s("getglobal"),
-  l_s("setglobal"), l_s("add"), l_s("sub"), l_s("mul"), l_s("div"),
-  l_s("pow"), l_s("unm"), l_s("lt"), l_s("concat"), l_s("gc"),
-  l_s("function"),
-  NULL
+
+const char *const luaT_typenames[] = {
+  "nil", "number", "string", "boolean", "table",
+  "function", "userdata", "userdata"
 };
 
 
-static int findevent (const l_char *name) {
-  int i;
-  for (i=0; luaT_eventname[i]; i++)
-    if (strcmp(luaT_eventname[i], name) == 0)
-      return i;
-  return -1;  /* name not found */
-}
-
-
-static int luaI_checkevent (lua_State *L, const l_char *name) {
-  int e = findevent(name);
-  if (e < 0)
-    luaO_verror(L, l_s("`%.50s' is not a valid event name"), name);
-  return e;
-}
-
-
-
-/* events in LUA_TNIL are all allowed, since this is used as a
-*  `placeholder' for default fallbacks
-*/
-/* ORDER LUA_T, ORDER TM */
-static const lu_byte luaT_validevents[NUM_TAGS][TM_N] = {
-  {1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},  /* LUA_TUSERDATA */
-  {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},  /* LUA_TNIL */
-  {1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1},  /* LUA_TNUMBER */
-  {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},  /* LUA_TSTRING */
-  {0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},  /* LUA_TTABLE */
-  {1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0}   /* LUA_TFUNCTION */
-};
-
-int luaT_validevent (int t, int e) {  /* ORDER LUA_T */
-  return (t >= NUM_TAGS) ?  1 : (int)luaT_validevents[t][e];
-}
-
-
 void luaT_init (lua_State *L) {
-  static const l_char *const typenames[NUM_TAGS] = {
-    l_s("userdata"), l_s("nil"), l_s("number"), l_s("string"),
-    l_s("table"), l_s("function")
+  static const char *const luaT_eventname[] = {  /* ORDER TM */
+    "__index", "__newindex",
+    "__gc", "__eq",
+    "__gettable", "__settable",
+    "__add", "__sub", "__mul", "__div",
+    "__pow", "__unm", "__lt", "__le",
+    "__concat", "__call"
   };
   int i;
-  for (i=0; i<NUM_TAGS; i++)
-    luaT_newtag(L, typenames[i], i);
-}
-
-
-int luaT_newtag (lua_State *L, const l_char *name, int basictype) {
-  int tag;
-  int i;
-  TString *ts = NULL;
-  luaM_growvector(L, G(L)->TMtable, G(L)->ntag, G(L)->sizeTM, struct TM,
-                  MAX_INT, l_s("tag table overflow"));
-  tag = G(L)->ntag;
-  if (name) {
-    TObject *v;
-    ts = luaS_new(L, name);
-    v = luaH_setstr(L, G(L)->type2tag, ts);
-    if (ttype(v) == LUA_TNUMBER) return (int)nvalue(v);
-    setnvalue(v, tag);
-  }
-  for (i=0; i<TM_N; i++)
-    luaT_gettm(G(L), tag, i) = NULL;
-  G(L)->TMtable[tag].collected = NULL;
-  G(L)->TMtable[tag].name = ts;
-  G(L)->TMtable[tag].basictype = basictype;
-  G(L)->ntag++;
-  return tag;
-}
-
-
-static void checktag (lua_State *L, int tag) {
-  if (!(0 <= tag && tag < G(L)->ntag))
-    luaO_verror(L, l_s("%d is not a valid tag"), tag);
-}
-
-
-LUA_API int lua_copytagmethods (lua_State *L, int tagto, int tagfrom) {
-  int e;
-  lua_lock(L);
-  checktag(L, tagto);
-  checktag(L, tagfrom);
-  for (e=0; e<TM_N; e++) {
-    if (luaT_validevent(tagto, e))
-      luaT_gettm(G(L), tagto, e) = luaT_gettm(G(L), tagfrom, e);
-  }
-  lua_unlock(L);
-  return tagto;
-}
-
-
-int luaT_tag (const TObject *o) {
-  int t = ttype(o);
-  switch (t) {
-    case LUA_TUSERDATA: return uvalue(o)->uv.tag;
-    case LUA_TTABLE:    return hvalue(o)->htag;
-    default:            return t;
+  for (i=0; i<TM_N; i++) {
+    G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
+    luaS_fix(G(L)->tmname[i]);  /* never collect these names */
   }
 }
 
 
-const l_char *luaT_typename (global_State *G, const TObject *o) {
-  int t = ttype(o);
-  int tag;
-  TString *ts;
-  switch (t) {
-    case LUA_TUSERDATA:
-      tag = uvalue(o)->uv.tag;
-      break;
+/*
+** function to be used with macro "fasttm": optimized for absence of
+** tag methods
+*/
+const TObject *luaT_gettm (Table *events, TMS event, TString *ename) {
+  const TObject *tm = luaH_getstr(events, ename);
+  lua_assert(event <= TM_EQ);
+  if (ttisnil(tm)) {  /* no tag method? */
+    events->flags |= (1u<<event);  /* cache this fact */
+    return NULL;
+  }
+  else return tm;
+}
+
+
+const TObject *luaT_gettmbyobj (lua_State *L, const TObject *o, TMS event) {
+  TString *ename = G(L)->tmname[event];
+  switch (ttype(o)) {
     case LUA_TTABLE:
-      tag = hvalue(o)->htag;
-      break;
+      return luaH_getstr(hvalue(o)->metatable, ename);
+    case LUA_TUSERDATA:
+      return luaH_getstr(uvalue(o)->uv.metatable, ename);
     default:
-      tag = t;
+      return &luaO_nilobject;
   }
-  ts = G->TMtable[tag].name;
-  if (ts == NULL)
-    ts = G->TMtable[t].name;
-  return getstr(ts);
-}
-
-
-LUA_API void lua_gettagmethod (lua_State *L, int t, const l_char *event) {
-  int e;
-  lua_lock(L);
-  e = luaI_checkevent(L, event);
-  checktag(L, t);
-  if (luaT_validevent(t, e) && luaT_gettm(G(L), t, e)) {
-    setclvalue(L->top, luaT_gettm(G(L), t, e));
-  }
-  else
-    setnilvalue(L->top);
-  incr_top;
-  lua_unlock(L);
-}
-
-
-LUA_API void lua_settagmethod (lua_State *L, int t, const l_char *event) {
-  int e;
-  lua_lock(L);
-  e = luaI_checkevent(L, event);
-  checktag(L, t);
-  if (!luaT_validevent(t, e))
-    luaO_verror(L, l_s("cannot change `%.20s' tag method for type `%.20s'%.20s"),
-                luaT_eventname[e], typenamebytag(G(L), t),
-                (t == LUA_TTABLE || t == LUA_TUSERDATA) ?
-                   l_s(" with default tag") : l_s(""));
-  switch (ttype(L->top - 1)) {
-    case LUA_TNIL:
-      luaT_gettm(G(L), t, e) = NULL;
-      break;
-    case LUA_TFUNCTION:
-      luaT_gettm(G(L), t, e) = clvalue(L->top - 1);
-      break;
-    default:
-      luaD_error(L, l_s("tag method must be a function (or nil)"));
-  }
-  L->top--;
-  lua_unlock(L);
 }
 

ltm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltm.h,v 1.25 2001/06/06 18:00:19 roberto Exp roberto $
+** $Id: ltm.h,v 1.38 2002/07/01 17:06:58 roberto Exp roberto $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
@@ -9,18 +9,19 @@
 
 
 #include "lobject.h"
-#include "lstate.h"
+
 
 /*
 * WARNING: if you change the order of this enumeration,
 * grep "ORDER TM"
 */
 typedef enum {
-  TM_GETTABLE = 0,
-  TM_SETTABLE,
   TM_INDEX,
-  TM_GETGLOBAL,
-  TM_SETGLOBAL,
+  TM_NEWINDEX,
+  TM_GC,
+  TM_EQ,  /* last tag method with `fast' access */
+  TM_GETTABLE,
+  TM_SETTABLE,
   TM_ADD,
   TM_SUB,
   TM_MUL,
@@ -28,53 +29,22 @@ typedef enum {
   TM_POW,
   TM_UNM,
   TM_LT,
+  TM_LE,
   TM_CONCAT,
-  TM_GC,
-  TM_FUNCTION,
+  TM_CALL,
   TM_N		/* number of elements in the enum */
 } TMS;
 
 
 
-/*
-** masks for allowable tag methods
-** (see `luaT_validevents')
-*/
-#define HAS_TM_GETGLOBAL(L,t)	(1<<(t) & ((1<<LUA_TUSERDATA) | \
-                                           (1<<LUA_TTABLE) | \
-                                           (1<<LUA_TNIL)))
-
-#define HAS_TM_SETGLOBAL(L,t)	(1<<(t) & ((1<<LUA_TUSERDATA) | \
-                                           (1<<LUA_TTABLE) | \
-                                           (1<<LUA_TNIL) | \
-                                           (1<<LUA_TFUNCTION)))
-
-
-
-struct TM {
-  Closure *method[TM_N];
-  Udata *collected;  /* list of garbage-collected udata with this tag */
-  TString *name;  /* type name */
-  int basictype;
-};
-
-
-#define luaT_gettm(G,tag,event) (G->TMtable[tag].method[event])
-#define luaT_gettmbyObj(G,o,e)  (luaT_gettm((G),luaT_tag(o),(e)))
-
-#define typenamebytag(G, t)	getstr(G->TMtable[t].name)
-
-
-#define validtag(G,t) (NUM_TAGS <= (t) && (t) < G->ntag)
-
-extern const l_char *const luaT_eventname[];
+#define fasttm(l,et,e) \
+  (((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, G(l)->tmname[e]))
 
 
+const TObject *luaT_gettm (Table *events, TMS event, TString *ename);
+const TObject *luaT_gettmbyobj (lua_State *L, const TObject *o, TMS event);
 void luaT_init (lua_State *L);
-int luaT_newtag (lua_State *L, const l_char *name, int basictype);
-const l_char *luaT_typename (global_State *G, const TObject *o);
-int luaT_tag (const TObject *o);
-int luaT_validevent (int t, int e);  /* used by compatibility module */
 
+extern const char *const luaT_typenames[];
 
 #endif

lua.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lua.c,v 1.67 2001/06/06 18:00:19 roberto Exp roberto $
+** $Id: lua.c,v 1.102 2002/08/12 17:23:12 roberto Exp roberto $
 ** Lua stand-alone interpreter
 ** See Copyright Notice in lua.h
 */
@@ -10,13 +10,20 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
-#include "luadebug.h"
+#include "lauxlib.h"
 #include "lualib.h"
 
 
+/*
+** generic extra include file
+*/
+#ifdef LUA_USERCONFIG
+#include LUA_USERCONFIG
+#endif
+
+
 #ifdef _POSIX_SOURCE
 #include <unistd.h>
 #else
@@ -26,310 +33,353 @@ static int isatty (int x) { return x==0; }  /* assume stdin is a tty */
 
 
 #ifndef PROMPT
-#define PROMPT		l_s("> ")
+#define PROMPT		"> "
 #endif
 
 
-#ifndef LUA_USERINIT
-#define LUA_USERINIT(L)		openstdlibs(L)
+#ifndef PROMPT2
+#define PROMPT2		">> "
 #endif
 
 
-
-/*
-** global options
-*/
-struct Options {
-  int toclose;
-  int stacksize;
-};
+#ifndef lua_userinit
+#define lua_userinit(L)		openstdlibs(L)
+#endif
 
 
 static lua_State *L = NULL;
 
-
-typedef void (*handler)(int);  /* type for signal actions */
-
-static void laction (int i);
+static const char *progname;
 
 
-static lua_Hook old_linehook = NULL;
-static lua_Hook old_callhook = NULL;
+static lua_Hook old_hook = NULL;
+static unsigned long old_mask = 0;
 
 
-
-static handler lreset (void) {
-  return signal(SIGINT, laction);
-}
-
-
-static void lstop (void) {
-  lua_setlinehook(L, old_linehook);
-  lua_setcallhook(L, old_callhook);
-  lreset();
-  lua_error(L, l_s("interrupted!"));
+static void lstop (lua_State *l, lua_Debug *ar) {
+  (void)ar;  /* unused arg. */
+  lua_sethook(l, old_hook, old_mask);
+  luaL_error(l, "interrupted!");
 }
 
 
 static void laction (int i) {
-  (void)i;  /* to avoid warnings */
-  signal(SIGINT, SIG_DFL); /* if another SIGINT happens before lstop,
+  signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
                               terminate process (default action) */
-  old_linehook = lua_setlinehook(L, (lua_Hook)lstop);
-  old_callhook = lua_setcallhook(L, (lua_Hook)lstop);
+  old_hook = lua_gethook(L);
+  old_mask = lua_gethookmask(L);
+  lua_sethook(L, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT(1));
 }
 
 
-static int ldo (int (*f)(lua_State *l, const l_char *), const l_char *name) {
-  int res;
-  handler h = lreset();
-  int top = lua_gettop(L);
-  res = f(L, name);  /* dostring | dofile */
-  lua_settop(L, top);  /* remove eventual results */
-  signal(SIGINT, h);  /* restore old action */
-  /* Lua gives no message in such cases, so lua.c provides one */
-  if (res == LUA_ERRMEM) {
-    fprintf(stderr, l_s("lua: memory allocation error\n"));
-  }
-  else if (res == LUA_ERRERR)
-    fprintf(stderr, l_s("lua: error in error message\n"));
-  return res;
-}
-
-
-static void print_message (void) {
+static void print_usage (void) {
   fprintf(stderr,
-  l_s("usage: lua [options].  Available options are:\n")
-  l_s("  -        execute stdin as a file\n")
-  l_s("  -c       close Lua when exiting\n")
-  l_s("  -e stat  execute string `stat'\n")
-  l_s("  -f name  execute file `name' with remaining arguments in table `arg'\n")
-  l_s("  -i       enter interactive mode with prompt\n")
-  l_s("  -q       enter interactive mode without prompt\n")
-  l_s("  -sNUM    set stack size to NUM (must be the first option)\n")
-  l_s("  -v       print version information\n")
-  l_s("  a=b      set global `a' to string `b'\n")
-  l_s("  name     execute file `name'\n")
-);
+  "usage: %s [options] [prog [args]].\n"
+  "Available options are:\n"
+  "  -        execute stdin as a file\n"
+  "  -e stat  execute string `stat'\n"
+  "  -i       enter interactive mode after executing `prog'\n"
+  "  -l name  execute file `name'\n"
+  "  -v       print version information\n"
+  "  --       stop handling options\n" ,
+  progname);
+}
+
+
+static void l_message (const char *pname, const char *msg) {
+  size_t l = strlen(msg);
+  if (pname) fprintf(stderr, "%s: ", pname);
+  fprintf(stderr, "%s", msg);
+  if (l > 0 && msg[l-1] != '\n')  /* does not end with newline? */
+    fprintf(stderr, "\n");  /* add a newline */
+}
+
+
+static void report (int status) {
+  const char *msg;
+  if (status) {
+    msg = lua_tostring(L, -1);
+    if (msg == NULL) msg = "(error with no message)";
+    l_message(progname, msg);
+    lua_pop(L, 1);
+  }
+}
+
+
+static int lcall (int clear) {
+  int status;
+  int top = lua_gettop(L);
+  lua_getglobal(L, "_TRACEBACK");  /* get traceback function */
+  lua_insert(L, top);  /* put it under chunk */
+  signal(SIGINT, laction);
+  status = lua_pcall(L, 0, LUA_MULTRET, -2);
+  signal(SIGINT, SIG_DFL);
+  lua_remove(L, top);  /* remove traceback function */
+  if (status == 0 && clear)
+    lua_settop(L, top);  /* remove eventual results */
+  return status;
+}
+
+
+static int l_panic (lua_State *l) {
+  (void)l;
+  l_message(progname, "unable to recover; exiting");
+  return 0;
 }
 
 
 static void print_version (void) {
-  printf(l_s("%.80s  %.80s\n"), l_s(LUA_VERSION), l_s(LUA_COPYRIGHT));
+  l_message(NULL, LUA_VERSION "  " LUA_COPYRIGHT);
 }
 
 
-static void assign (l_char *arg) {
-  l_char *eq = strchr(arg, l_c('='));
-  *eq = l_c('\0');  /* spilt `arg' in two strings (name & value) */
-  lua_pushstring(L, eq+1);
-  lua_setglobal(L, arg);
-}
-
-
-static void getargs (l_char *argv[]) {
+static void getargs (char *argv[], int n) {
   int i;
   lua_newtable(L);
   for (i=0; argv[i]; i++) {
-    /* arg[i] = argv[i] */
-    lua_pushnumber(L, i);
+    lua_pushnumber(L, i - n);
     lua_pushstring(L, argv[i]);
-    lua_settable(L, -3);
+    lua_rawset(L, -3);
   }
   /* arg.n = maximum index in table `arg' */
-  lua_pushliteral(L, l_s("n"));
-  lua_pushnumber(L, i-1);
-  lua_settable(L, -3);
+  lua_pushliteral(L, "n");
+  lua_pushnumber(L, i-n-1);
+  lua_rawset(L, -3);
 }
 
 
-static int l_getargs (lua_State *l) {
-  l_char **argv = (l_char **)lua_touserdata(l, -1);
-  getargs(argv);
-  return 1;
+static int docall (int status) {
+  if (status == 0) status = lcall(1);
+  report(status);
+  return status;
 }
 
 
-static int file_input (const l_char *argv) {
-  int result = ldo(lua_dofile, argv);
-  if (result) {
-    if (result == LUA_ERRFILE) {
-      fprintf(stderr, l_s("lua: cannot execute file "));
-      perror(argv);
-    }
-    return EXIT_FAILURE;
-  }
-  else
-    return EXIT_SUCCESS;
+static int file_input (const char *name) {
+  return docall(luaL_loadfile(L, name));
 }
 
 
+static int dostring (const char *s, const char *name) {
+  return docall(luaL_loadbuffer(L, s, strlen(s), name));
+}
+
+
+/*
+** this macro can be used by some `history' system to save lines
+** read in manual input
+*/
+#ifndef lua_saveline
+#define lua_saveline(L,line)	/* empty */
+#endif
+
+
+/*
+** this macro defines a function to show the prompt and reads the
+** next line for manual input
+*/
+#ifndef lua_readline
+#define lua_readline(L,prompt)		readline(L,prompt)
+
 /* maximum length of an input line */
 #ifndef MAXINPUT
 #define MAXINPUT	512
 #endif
 
 
-static const l_char *get_prompt (int prompt) {
-  if (!prompt)
-    return l_s("");
+static int readline (lua_State *l, const char *prompt) {
+  static char buffer[MAXINPUT];
+  if (prompt) {
+    fputs(prompt, stdout);
+    fflush(stdout);
+  }
+  if (fgets(buffer, sizeof(buffer), stdin) == NULL)
+    return 0;  /* read fails */
   else {
-    const l_char *s;
-    lua_getglobal(L, l_s("_PROMPT"));
-    s = lua_tostring(L, -1);
-    if (!s) s = PROMPT;
-    lua_pop(L, 1);  /* remove global */
-    return s;
+    lua_pushstring(l, buffer);
+    return 1;
   }
 }
 
+#endif
 
-static void manual_input (int version, int prompt) {
-  if (version) print_version();
-  for (;;) {
-    fputs(get_prompt(prompt), stdout);  /* show prompt */
-    for(;;) {
-      l_char buffer[MAXINPUT];
-      size_t l;
-      if (fgets(buffer, sizeof(buffer), stdin) == NULL) {
-        printf(l_s("\n"));
-        return;
-      }
-      l = strlen(buffer);
-      if (buffer[l-1] == l_c('\n') && buffer[l-2] == l_c('\\')) {
-        buffer[l-2] = l_c('\n');
-        lua_pushlstring(L, buffer, l-1);
-      }
-      else {
-        lua_pushlstring(L, buffer, l);
-        break;
-      }
+
+static const char *get_prompt (int firstline) {
+  const char *p = NULL;
+  lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
+  p = lua_tostring(L, -1);
+  if (p == NULL) p = (firstline ? PROMPT : PROMPT2);
+  lua_pop(L, 1);  /* remove global */
+  return p;
+}
+
+
+static int incomplete (int status) {
+  if (status == LUA_ERRSYNTAX &&
+         strstr(lua_tostring(L, -1), "near `<eof>'") != NULL) {
+    lua_pop(L, 1);
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+static int load_string (void) {
+  int status;
+  lua_settop(L, 0);
+  if (lua_readline(L, get_prompt(1)) == 0)  /* no input? */
+    return -1;
+  if (lua_tostring(L, -1)[0] == '=') {  /* line starts with `=' ? */
+    lua_pushfstring(L, "return %s", lua_tostring(L, -1)+1);/* `=' -> `return' */
+    lua_remove(L, -2);  /* remove original line */
+  }
+  for (;;) {  /* repeat until gets a complete line */
+    status = luaL_loadbuffer(L, lua_tostring(L, 1), lua_strlen(L, 1), "=stdin");
+    if (!incomplete(status)) break;  /* cannot try to add lines? */
+    if (lua_readline(L, get_prompt(0)) == 0)  /* no more input? */
+      return -1;
+    lua_concat(L, lua_gettop(L));  /* join lines */
+  }
+  lua_saveline(L, lua_tostring(L, 1));
+  lua_remove(L, 1);  /* remove line */
+  return status;
+}
+
+
+static void manual_input (void) {
+  int status;
+  const char *oldprogname = progname;
+  progname = NULL;
+  while ((status = load_string()) != -1) {
+    if (status == 0) status = lcall(0);
+    report(status);
+    if (status == 0 && lua_gettop(L) > 0) {  /* any result to print? */
+      lua_getglobal(L, "print");
+      lua_insert(L, 1);
+      if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != 0)
+        l_message(progname, "error calling `print'");
     }
-    lua_concat(L, lua_gettop(L));
-    ldo(lua_dostring, lua_tostring(L, -1));
-    lua_settop(L, 0);  /* remove eventual results */
   }
+  lua_settop(L, 0);  /* clear stack */
+  fputs("\n", stdout);
+  progname = oldprogname;
 }
 
 
-static int handle_argv (l_char *argv[], struct Options *opt) {
-  if (opt->stacksize > 0) argv++;  /* skip option `-s' (if present) */
-  if (*argv == NULL) {  /* no more arguments? */
+static int handle_argv (char *argv[], int *interactive) {
+  if (argv[1] == NULL) {  /* no more arguments? */
     if (isatty(0)) {
-      manual_input(1, 1);
+      print_version();
+      manual_input();
     }
     else
-      ldo(lua_dofile, NULL);  /* executes stdin as a file */
+      file_input(NULL);  /* executes stdin as a file */
   }
   else {  /* other arguments; loop over them */
     int i;
-    for (i = 0; argv[i] != NULL; i++) {
-      if (argv[i][0] != l_c('-')) {  /* not an option? */
-        if (strchr(argv[i], l_c('=')))
-          assign(argv[i]);
-        else
-          if (file_input(argv[i]) != EXIT_SUCCESS)
+    for (i = 1; argv[i] != NULL; i++) {
+      if (argv[i][0] != '-') break;  /* not an option? */
+      switch (argv[i][1]) {  /* option */
+        case '-': {  /* `--' */
+          i++;  /* skip this argument */
+          goto endloop;  /* stop handling arguments */
+        }
+        case '\0': {
+          file_input(NULL);  /* executes stdin as a file */
+          break;
+        }
+        case 'i': {
+          *interactive = 1;
+          break;
+        }
+        case 'v': {
+          print_version();
+          break;
+        }
+        case 'e': {
+          const char *chunk = argv[i] + 2;
+          if (*chunk == '\0') chunk = argv[++i];
+          if (chunk == NULL) {
+            print_usage();
+            return EXIT_FAILURE;
+          }
+          if (dostring(chunk, "=<command line>") != 0)
+            return EXIT_FAILURE;
+          break;
+        }
+        case 'l': {
+          const char *filename = argv[i] + 2;
+          if (*filename == '\0') filename = argv[++i];
+          if (filename == NULL) {
+            print_usage();
+            return EXIT_FAILURE;
+          }
+          if (file_input(filename))
             return EXIT_FAILURE;  /* stop if file fails */
+          break;
         }
-        else switch (argv[i][1]) {  /* option */
-          case 0: {
-            ldo(lua_dofile, NULL);  /* executes stdin as a file */
-            break;
-          }
-          case l_c('i'): {
-            manual_input(0, 1);
-            break;
-          }
-          case l_c('q'): {
-            manual_input(0, 0);
-            break;
-          }
-          case l_c('c'): {
-            opt->toclose = 1;
-            break;
-          }
-          case l_c('v'): {
-            print_version();
-            break;
-          }
-          case l_c('e'): {
-            i++;
-            if (argv[i] == NULL) {
-              print_message();
-              return EXIT_FAILURE;
-            }
-            if (ldo(lua_dostring, argv[i]) != 0) {
-              fprintf(stderr, l_s("lua: error running argument `%.99s'\n"), argv[i]);
-              return EXIT_FAILURE;
-            }
-            break;
-          }
-          case l_c('f'): {
-            i++;
-            if (argv[i] == NULL) {
-              print_message();
-              return EXIT_FAILURE;
-            }
-            getargs(argv+i);  /* collect remaining arguments */
-            lua_setglobal(L, l_s("arg"));
-            return file_input(argv[i]);  /* stop scanning arguments */
-          }
-          case l_c('s'): {
-            fprintf(stderr, l_s("lua: stack size (`-s') must be the first option\n"));
-            return EXIT_FAILURE;
-          }
-          default: {
-            print_message();
-            return EXIT_FAILURE;
-          }
+        case 'c': {
+          l_message(progname, "option `-c' is deprecated");
+          break;
         }
+        case 's': {
+          l_message(progname, "option `-s' is deprecated");
+          break;
+        }
+        default: {
+          print_usage();
+          return EXIT_FAILURE;
+        }
+      }
+    } endloop:
+    if (argv[i] != NULL) {
+      const char *filename = argv[i];
+      getargs(argv, i);  /* collect remaining arguments */
+      lua_setglobal(L, "arg");
+      return file_input(filename);  /* stop scanning arguments */
     }
   }
   return EXIT_SUCCESS;
 }
 
 
-static void getstacksize (int argc, l_char *argv[], struct Options *opt) {
-  if (argc >= 2 && argv[1][0] == l_c('-') && argv[1][1] == l_c('s')) {
-    int stacksize = strtol(&argv[1][2], NULL, 10);
-    if (stacksize <= 0) {
-      fprintf(stderr, l_s("lua: invalid stack size ('%.20s')\n"), &argv[1][2]);
-      exit(EXIT_FAILURE);
-    }
-    opt->stacksize = stacksize;
-  }
+static int openstdlibs (lua_State *l) {
+  int res = 0;
+  res += lua_baselibopen(l);
+  res += lua_tablibopen(l);
+  res += lua_iolibopen(l);
+  res += lua_strlibopen(l);
+  res += lua_mathlibopen(l);
+  res += lua_dblibopen(l);
+  /* add your libraries here */
+  return res;
+}
+
+
+static int handle_luainit (void) {
+  const char *init = getenv("LUA_INIT");
+  if (init == NULL) return 0;  /* status OK */
+  else if (init[0] == '@')
+    return file_input(init+1);
   else
-    opt->stacksize = 0;  /* no stack size */
+    return dostring(init, "=LUA_INIT");
 }
 
 
-static void register_getargs (l_char *argv[]) {
-  lua_newuserdatabox(L, argv);
-  lua_pushcclosure(L, l_getargs, 1);
-  lua_setglobal(L, l_s("getargs"));
-}
-
-
-static void openstdlibs (lua_State *l) {
-  lua_baselibopen(l);
-  lua_iolibopen(l);
-  lua_strlibopen(l);
-  lua_mathlibopen(l);
-  lua_dblibopen(l);
-}
-
-
-int main (int argc, l_char *argv[]) {
-  struct Options opt;
+int main (int argc, char *argv[]) {
   int status;
-  opt.toclose = 0;
-  getstacksize(argc, argv, &opt);  /* handle option `-s' */
-  L = lua_open(opt.stacksize);  /* create state */
-  LUA_USERINIT(L);  /* open libraries */
-  register_getargs(argv);  /* create `getargs' function */
-  status = handle_argv(argv+1, &opt);
-  if (opt.toclose)
-    lua_close(L);
+  int interactive = 0;
+  (void)argc;  /* to avoid warnings */
+  progname = argv[0];
+  L = lua_open();  /* create state */
+  lua_atpanic(L, l_panic);
+  lua_pop(L, lua_userinit(L));  /* open libraries, discard any results */
+  status = handle_luainit();
+  if (status != 0) return status;
+  status = handle_argv(argv, &interactive);
+  if (status == 0 && interactive) manual_input();
+  lua_close(L);
   return status;
 }
 

lua.h

@@ -1,9 +1,8 @@
 /*
-** $Id: lua.h,v 1.101 2001/07/12 18:11:58 roberto Exp roberto $
+** $Id: lua.h,v 1.153 2002/08/06 18:54:18 roberto Exp roberto $
 ** Lua - An Extensible Extension Language
-** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil
-** e-mail: info@lua.org
-** www: http://www.lua.org
+** Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
+** http://www.lua.org	mailto:info@lua.org
 ** See Copyright Notice at the end of this file
 */
 
@@ -12,39 +11,39 @@
 #define lua_h
 
 
+/* definition of `va_list' */
+#include <stdarg.h>
+
 /* definition of `size_t' */
 #include <stddef.h>
 
 
 
-#define LUA_VERSION	"Lua 4.1 (alpha)"
-#define LUA_COPYRIGHT	"Copyright (C) 1994-2001 TeCGraf, PUC-Rio"
+#define LUA_VERSION	"Lua 5.0 (alpha)"
+#define LUA_COPYRIGHT	"Copyright (C) 1994-2002 Tecgraf, PUC-Rio"
 #define LUA_AUTHORS 	"W. Celes, R. Ierusalimschy & L. H. de Figueiredo"
 
 
-/* name of global variable with error handler */
-#define LUA_ERRORMESSAGE	"_ERRORMESSAGE"
 
-
-/* pre-defined references */
-#define LUA_NOREF	(-2)
-#define LUA_REFNIL	(-1)
-
-
-/* option for multiple returns in `lua_call' */
+/* option for multiple returns in `lua_pcall' and `lua_call' */
 #define LUA_MULTRET	(-1)
 
 
-/* error codes for `lua_do*' and the like */
+/*
+** pseudo-indices
+*/
+#define LUA_REGISTRYINDEX	(-10000)
+#define LUA_GLOBALSINDEX	(-10001)
+#define lua_upvalueindex(i)	(LUA_GLOBALSINDEX-(i))
+
+
+/* error codes for `lua_load' and `lua_pcall' */
 #define LUA_ERRRUN	1
 #define LUA_ERRFILE	2
 #define LUA_ERRSYNTAX	3
 #define LUA_ERRMEM	4
 #define LUA_ERRERR	5
-
-/* weak-table modes */
-#define LUA_WEAK_KEY	1
-#define LUA_WEAK_VALUE	2
+#define LUA_ERRTHROW	6
 
 
 typedef struct lua_State lua_State;
@@ -53,21 +52,24 @@ typedef int (*lua_CFunction) (lua_State *L);
 
 
 /*
-** an invalid `tag'
+** functions that read blocks when loading Lua chunk
 */
-#define LUA_NOTAG	(-1)
+typedef const char * (*lua_Chunkreader) (lua_State *L, void *ud, size_t *size);
+
 
 /*
-** tags for basic types
+** basic types
 */
-#define LUA_TNONE	LUA_NOTAG
+#define LUA_TNONE	(-1)
 
-#define LUA_TUSERDATA	0
-#define LUA_TNIL	1
-#define LUA_TNUMBER	2
-#define LUA_TSTRING	3
+#define LUA_TNIL	0
+#define LUA_TNUMBER	1
+#define LUA_TSTRING	2
+#define LUA_TBOOLEAN	3
 #define LUA_TTABLE	4
 #define LUA_TFUNCTION	5
+#define LUA_TUSERDATA	6
+#define LUA_TLIGHTUSERDATA	7
 
 
 /* minimum Lua stack available to a C function */
@@ -82,18 +84,12 @@ typedef int (*lua_CFunction) (lua_State *L);
 #endif
 
 
-/* Lua numerical type */
+/* type of Numbers in Lua */
 #ifndef LUA_NUMBER
 #define LUA_NUMBER	double
 #endif
 typedef LUA_NUMBER lua_Number;
 
-/* Lua character type */
-#ifndef L_CHAR
-#define L_CHAR	char
-#endif
-typedef L_CHAR lua_char;
-
 
 /* mark for all API functions */
 #ifndef LUA_API
@@ -104,8 +100,12 @@ typedef L_CHAR lua_char;
 /*
 ** state manipulation
 */
-LUA_API lua_State *lua_newthread (lua_State *L, int stacksize);
+LUA_API lua_State *lua_open (void);
 LUA_API void       lua_close (lua_State *L);
+LUA_API lua_State *lua_newthread (lua_State *L);
+LUA_API void       lua_closethread (lua_State *L, lua_State *thread);
+
+LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf);
 
 
 /*
@@ -116,25 +116,27 @@ LUA_API void  lua_settop (lua_State *L, int index);
 LUA_API void  lua_pushvalue (lua_State *L, int index);
 LUA_API void  lua_remove (lua_State *L, int index);
 LUA_API void  lua_insert (lua_State *L, int index);
-LUA_API int   lua_stackspace (lua_State *L);
+LUA_API void  lua_replace (lua_State *L, int index);
+LUA_API int   lua_checkstack (lua_State *L, int size);
 
 
 /*
 ** access functions (stack -> C)
 */
 
-LUA_API const lua_char *lua_type (lua_State *L, int index);
 LUA_API int             lua_isnumber (lua_State *L, int index);
 LUA_API int             lua_isstring (lua_State *L, int index);
 LUA_API int             lua_iscfunction (lua_State *L, int index);
-LUA_API int             lua_tag (lua_State *L, int index);
-LUA_API int             lua_rawtag (lua_State *L, int index);
+LUA_API int             lua_type (lua_State *L, int index);
+LUA_API const char     *lua_typename (lua_State *L, int type);
 
 LUA_API int            lua_equal (lua_State *L, int index1, int index2);
+LUA_API int            lua_rawequal (lua_State *L, int index1, int index2);
 LUA_API int            lua_lessthan (lua_State *L, int index1, int index2);
 
 LUA_API lua_Number      lua_tonumber (lua_State *L, int index);
-LUA_API const lua_char *lua_tostring (lua_State *L, int index);
+LUA_API int             lua_toboolean (lua_State *L, int index);
+LUA_API const char     *lua_tostring (lua_State *L, int index);
 LUA_API size_t          lua_strlen (lua_State *L, int index);
 LUA_API lua_CFunction   lua_tocfunction (lua_State *L, int index);
 LUA_API void	       *lua_touserdata (lua_State *L, int index);
@@ -146,50 +148,54 @@ LUA_API const void     *lua_topointer (lua_State *L, int index);
 */
 LUA_API void  lua_pushnil (lua_State *L);
 LUA_API void  lua_pushnumber (lua_State *L, lua_Number n);
-LUA_API void  lua_pushlstring (lua_State *L, const lua_char *s, size_t len);
-LUA_API void  lua_pushstring (lua_State *L, const lua_char *s);
+LUA_API void  lua_pushlstring (lua_State *L, const char *s, size_t len);
+LUA_API void  lua_pushstring (lua_State *L, const char *s);
+LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
+                                                    va_list argp);
+LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...);
 LUA_API void  lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);
+LUA_API void  lua_pushboolean (lua_State *L, int b);
+LUA_API void  lua_pushlightuserdata (lua_State *L, void *p);
 
 
 /*
 ** get functions (Lua -> stack)
 */
-LUA_API void  lua_getglobal (lua_State *L, const lua_char *name);
 LUA_API void  lua_gettable (lua_State *L, int index);
 LUA_API void  lua_rawget (lua_State *L, int index);
 LUA_API void  lua_rawgeti (lua_State *L, int index, int n);
-LUA_API void  lua_getglobals (lua_State *L);
-LUA_API void  lua_gettagmethod (lua_State *L, int tag, const lua_char *event);
-LUA_API int   lua_getref (lua_State *L, int ref);
 LUA_API void  lua_newtable (lua_State *L);
-LUA_API void  lua_getregistry (lua_State *L);
-LUA_API void  lua_getweakregistry (lua_State *L);
+LUA_API int   lua_getmetatable (lua_State *L, int objindex);
+LUA_API const char *lua_getmode (lua_State *L, int index);
+LUA_API void  lua_getglobals (lua_State *L, int index);
 
 
 /*
 ** set functions (stack -> Lua)
 */
-LUA_API void  lua_setglobal (lua_State *L, const lua_char *name);
 LUA_API void  lua_settable (lua_State *L, int index);
 LUA_API void  lua_rawset (lua_State *L, int index);
 LUA_API void  lua_rawseti (lua_State *L, int index, int n);
-LUA_API void  lua_setglobals (lua_State *L);
-LUA_API void  lua_settagmethod (lua_State *L, int tag, const lua_char *event);
-LUA_API int   lua_ref (lua_State *L, int lock);
+LUA_API void  lua_setmode (lua_State *L, int index, const char *mode);
+LUA_API int   lua_setmetatable (lua_State *L, int objindex);
+LUA_API int   lua_setglobals (lua_State *L, int index);
 
 
 /*
-** `load' and `do' functions (load and run Lua code)
+** `load' and `call' functions (load and run Lua code)
 */
-LUA_API int   lua_call (lua_State *L, int nargs, int nresults);
-LUA_API void  lua_rawcall (lua_State *L, int nargs, int nresults);
-LUA_API int   lua_loadfile (lua_State *L, const lua_char *filename);
-LUA_API int   lua_dofile (lua_State *L, const lua_char *filename);
-LUA_API int   lua_dostring (lua_State *L, const lua_char *str);
-LUA_API int   lua_loadbuffer (lua_State *L, const lua_char *buff, size_t size,
-                            const lua_char *name);
-LUA_API int   lua_dobuffer (lua_State *L, const lua_char *buff, size_t size,
-                            const lua_char *name);
+LUA_API void  lua_call (lua_State *L, int nargs, int nresults);
+LUA_API int   lua_pcall (lua_State *L, int nargs, int nresults, int errfunc);
+LUA_API int   lua_load (lua_State *L, lua_Chunkreader reader, void *data,
+                        const char *chunkname);
+
+
+/*
+** coroutine functions
+*/
+LUA_API void lua_cobegin (lua_State *L, int nargs);
+LUA_API int  lua_yield (lua_State *L, int nresults);
+LUA_API int  lua_resume (lua_State *L, lua_State *co);
 
 /*
 ** Garbage-collection functions
@@ -201,27 +207,14 @@ LUA_API void  lua_setgcthreshold (lua_State *L, int newthreshold);
 /*
 ** miscellaneous functions
 */
-LUA_API int   lua_newtype (lua_State *L, const lua_char *name, int basictype);
-LUA_API int   lua_copytagmethods (lua_State *L, int tagto, int tagfrom);
-LUA_API void  lua_settag (lua_State *L, int tag);
 
-LUA_API int             lua_name2tag (lua_State *L, const lua_char *name);
-LUA_API const lua_char *lua_tag2name (lua_State *L, int tag);
-
-LUA_API void  lua_error (lua_State *L, const lua_char *s);
-
-LUA_API void  lua_unref (lua_State *L, int ref);
+LUA_API int   lua_error (lua_State *L);
 
 LUA_API int   lua_next (lua_State *L, int index);
-LUA_API int   lua_getn (lua_State *L, int index);
 
 LUA_API void  lua_concat (lua_State *L, int n);
 
 LUA_API void *lua_newuserdata (lua_State *L, size_t size);
-LUA_API void  lua_newuserdatabox (lua_State *L, void *u);
-
-LUA_API void  lua_setweakmode (lua_State *L, int mode);
-LUA_API int   lua_getweakmode (lua_State *L, int index);
 
 
 
@@ -231,119 +224,159 @@ LUA_API int   lua_getweakmode (lua_State *L, int index);
 ** ===============================================================
 */
 
-#define lua_open(n)		lua_newthread(NULL, (n))
+#define lua_boxpointer(L,u) \
+	(*(void **)(lua_newuserdata(L, sizeof(void *))) = (u))
+
+#define lua_unboxpointer(L,i)	(*(void **)(lua_touserdata(L, i)))
 
 #define lua_pop(L,n)		lua_settop(L, -(n)-1)
 
-#define lua_register(L,n,f)	(lua_pushcfunction(L, f), lua_setglobal(L, n))
+#define lua_register(L,n,f) \
+	(lua_pushstring(L, n), \
+	 lua_pushcfunction(L, f), \
+	 lua_settable(L, LUA_GLOBALSINDEX))
+
 #define lua_pushcfunction(L,f)	lua_pushcclosure(L, f, 0)
-#define lua_clonetag(L,t)	lua_copytagmethods(L, lua_newtag(L), (t))
 
-#define lua_isfunction(L,n)	(lua_rawtag(L,n) == LUA_TFUNCTION)
-#define lua_istable(L,n)	(lua_rawtag(L,n) == LUA_TTABLE)
-#define lua_isuserdata(L,n)	(lua_rawtag(L,n) == LUA_TUSERDATA)
-#define lua_isnil(L,n)		(lua_rawtag(L,n) == LUA_TNIL)
-#define lua_isnull(L,n)		(lua_rawtag(L,n) == LUA_TNONE)
+#define lua_isfunction(L,n)	(lua_type(L,n) == LUA_TFUNCTION)
+#define lua_istable(L,n)	(lua_type(L,n) == LUA_TTABLE)
+#define lua_isuserdata(L,n)	(lua_type(L,n) >= LUA_TUSERDATA)
+#define lua_islightuserdata(L,n)	(lua_type(L,n) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)		(lua_type(L,n) == LUA_TNIL)
+#define lua_isboolean(L,n)	(lua_type(L,n) == LUA_TBOOLEAN)
+#define lua_isnone(L,n)		(lua_type(L,n) == LUA_TNONE)
+#define lua_isnoneornil(L, n)	(lua_type(L,n) <= 0)
 
-#define lua_pushliteral(L, s)	lua_pushlstring(L, s, \
-                                                (sizeof(s)/sizeof(lua_char))-1)
+#define lua_pushliteral(L, s)	\
+	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
 
 
 
 /*
-** compatibility macros
+** compatibility macros and functions
 */
-#define lua_newtag(L)	lua_newtype(L, NULL, LUA_TNONE)
-#define lua_typename	lua_tag2name
 
-#endif
+
+LUA_API int lua_pushupvalues (lua_State *L);
+
+#define lua_getregistry(L)	lua_pushvalue(L, LUA_REGISTRYINDEX)
+#define lua_setglobal(L,s)	\
+   (lua_pushstring(L, s), lua_insert(L, -2), lua_settable(L, LUA_GLOBALSINDEX))
+
+#define lua_getglobal(L,s)	\
+		(lua_pushstring(L, s), lua_gettable(L, LUA_GLOBALSINDEX))
+
+#define lua_isnull	lua_isnone
+
+
+/* compatibility with ref system */
+
+/* pre-defined references */
+#define LUA_NOREF	(-2)
+#define LUA_REFNIL	(-1)
+
+#define lua_ref(L,lock)	((lock) ? luaL_ref(L, LUA_REGISTRYINDEX) : \
+      (lua_pushstring(L, "unlocked references are obsolete"), lua_error(L), 0))
+
+#define lua_unref(L,ref)	luaL_unref(L, LUA_REGISTRYINDEX, (ref))
+
+#define lua_getref(L,ref)	lua_rawgeti(L, LUA_REGISTRYINDEX, ref)
 
 
 
 /*
 ** {======================================================================
 ** useful definitions for Lua kernel and libraries
+** =======================================================================
 */
-#ifdef LUA_PRIVATE
 
-#define l_char	lua_char
-
-/* macro to control type of literal strings */
-#ifndef l_s
-#define l_s(x)  x
-#endif
-
-/* macro to control type of literal chars */
-#ifndef l_c
-#define l_c(x)  x
-#endif
-
-/* macro to `unsign' a character */
-#ifndef uchar
-#define uchar(c)        ((unsigned char)(c))
-#endif
-
-/* integer type to hold the result of fgetc */
-#ifndef l_charint
-#define l_charint	int
-#endif
-
-/*
-** formats for Lua numbers
-*/
+/* formats for Lua numbers */
 #ifndef LUA_NUMBER_SCAN
 #define LUA_NUMBER_SCAN		"%lf"
 #endif
+
 #ifndef LUA_NUMBER_FMT
 #define LUA_NUMBER_FMT		"%.16g"
 #endif
-/* function to convert a lua_Number to a string */
-#ifndef lua_number2str
-#define lua_number2str(s,n)     sprintf((s), l_s(LUA_NUMBER_FMT), (n))
-#endif
 
-/* function to convert a string to a lua_Number */
-#ifndef lua_str2number
-#define lua_str2number(s,p)     strtod((s), (p))
-#endif
-
-#endif
 /* }====================================================================== */
 
 
+/*
+** {======================================================================
+** Debug API
+** =======================================================================
+*/
+
+typedef enum lua_Hookevent {
+  LUA_HOOKCALL, LUA_HOOKRET, LUA_HOOKLINE, LUA_HOOKCOUNT
+} lua_Hookevent;
+
+
+#define LUA_MASKCALL	(2 << LUA_HOOKCALL)
+#define LUA_MASKRET	(2 << LUA_HOOKRET)
+#define LUA_MASKLINE	(2 << LUA_HOOKLINE)
+#define LUA_MASKCOUNT(count)	((unsigned long)(count) << 8)
+#define lua_getmaskcount(mask)	((mask) >> 8)
+
+#define LUA_MAXCOUNT	((1<<24) - 1)
+
+typedef struct lua_Debug lua_Debug;  /* activation record */
+
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+
+
+LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
+
+LUA_API int lua_sethook (lua_State *L, lua_Hook func, unsigned long mask);
+LUA_API lua_Hook lua_gethook (lua_State *L);
+LUA_API unsigned long lua_gethookmask (lua_State *L);
+
+
+#define LUA_IDSIZE	60
+
+struct lua_Debug {
+  lua_Hookevent event;
+  const char *name;	/* (n) */
+  const char *namewhat;	/* (n) `global', `local', `field', `method' */
+  const char *what;	/* (S) `Lua' function, `C' function, Lua `main' */
+  const char *source;	/* (S) */
+  int currentline;	/* (l) */
+  int nups;		/* (u) number of upvalues */
+  int linedefined;	/* (S) */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  int i_ci;  /* active function */
+};
+
+/* }====================================================================== */
+
 
 /******************************************************************************
-* Copyright (C) 1994-2001 TeCGraf, PUC-Rio.  All rights reserved.
-* 
-* Permission is hereby granted, without written agreement and without license
-* or royalty fees, to use, copy, modify, and distribute this software and its
-* documentation for any purpose, including commercial applications, subject to
-* the following conditions:
-* 
-*  - The above copyright notice and this permission notice shall appear in all
-*    copies or substantial portions of this software.
-* 
-*  - The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software in a
-*    product, an acknowledgment in the product documentation would be greatly
-*    appreciated (but it is not required).
-* 
-*  - Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-*    
-* The authors specifically disclaim any warranties, including, but not limited
-* to, the implied warranties of merchantability and fitness for a particular
-* purpose.  The software provided hereunder is on an "as is" basis, and the
-* authors have no obligation to provide maintenance, support, updates,
-* enhancements, or modifications.  In no event shall TeCGraf, PUC-Rio, or the
-* authors be held liable to any party for direct, indirect, special,
-* incidental, or consequential damages arising out of the use of this software
-* and its documentation.
-* 
-* The Lua language and this implementation have been entirely designed and
-* written by Waldemar Celes Filho, Roberto Ierusalimschy and
-* Luiz Henrique de Figueiredo at TeCGraf, PUC-Rio.
+* Copyright (C) 2002 Tecgraf, PUC-Rio.  All rights reserved.
 *
-* This implementation contains no third-party code.
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************************/
 
+
+#endif

luadebug.h

@@ -1,46 +0,0 @@
-/*
-** $Id: luadebug.h,v 1.19 2001/03/07 18:09:25 roberto Exp roberto $
-** Debugging API
-** See Copyright Notice in lua.h
-*/
-
-
-#ifndef luadebug_h
-#define luadebug_h
-
-
-#include "lua.h"
-
-typedef struct lua_Debug lua_Debug;  /* activation record */
-typedef struct lua_Localvar lua_Localvar;
-
-typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
-
-
-LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
-LUA_API int lua_getinfo (lua_State *L, const lua_char *what, lua_Debug *ar);
-LUA_API const lua_char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n);
-LUA_API const lua_char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n);
-
-LUA_API lua_Hook lua_setcallhook (lua_State *L, lua_Hook func);
-LUA_API lua_Hook lua_setlinehook (lua_State *L, lua_Hook func);
-
-
-#define LUA_IDSIZE	60
-
-struct lua_Debug {
-  const lua_char *event;     /* `call', `return' */
-  int currentline;       /* (l) */
-  const lua_char *name;      /* (n) */
-  const lua_char *namewhat;  /* (n) `global', `tag method', `local', `field' */
-  int nups;              /* (u) number of upvalues */
-  int linedefined;       /* (S) */
-  const lua_char *what;      /* (S) `Lua' function, `C' function, Lua `main' */
-  const lua_char *source;    /* (S) */
-  lua_char short_src[LUA_IDSIZE]; /* (S) */
-  /* private part */
-  struct CallInfo *_ci;  /* active function */
-};
-
-
-#endif

lualib.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lualib.h,v 1.20 2001/03/06 20:09:38 roberto Exp roberto $
+** $Id: lualib.h,v 1.24 2002/06/18 17:42:52 roberto Exp roberto $
 ** Lua standard libraries
 ** See Copyright Notice in lua.h
 */
@@ -16,13 +16,29 @@
 #endif
 
 
-#define LUA_ALERT               "_ALERT"
-
+#define LUA_COLIBNAME	"coroutine"
 LUALIB_API int lua_baselibopen (lua_State *L);
+
+#define LUA_TABLIBNAME	"table"
+LUALIB_API int lua_tablibopen (lua_State *L);
+
+#define LUA_IOLIBNAME	"io"
+#define LUA_OSLIBNAME	"os"
 LUALIB_API int lua_iolibopen (lua_State *L);
+
+#define LUA_STRLIBNAME	"string"
 LUALIB_API int lua_strlibopen (lua_State *L);
+
+#define LUA_MATHLIBNAME	"math"
 LUALIB_API int lua_mathlibopen (lua_State *L);
+
+#define LUA_DBLIBNAME	"debug"
 LUALIB_API int lua_dblibopen (lua_State *L);
 
 
+/* to help testing the libraries */
+#ifndef lua_assert
+#define lua_assert(c)		/* empty */
+#endif
+
 #endif

lundump.c

@@ -1,13 +1,9 @@
 /*
-** $Id: lundump.c,v 1.36 2001/07/19 14:34:06 lhf Exp lhf $
+** $Id: lundump.c,v 1.43 2002/08/07 00:36:03 lhf Exp $
 ** load pre-compiled Lua chunks
 ** See Copyright Notice in lua.h
 */
 
-#include <stdio.h>
-#include <string.h>
-
-#define LUA_PRIVATE
 #include "lua.h"
 
 #include "ldebug.h"
@@ -16,231 +12,234 @@
 #include "lopcodes.h"
 #include "lstring.h"
 #include "lundump.h"
+#include "lzio.h"
 
-#define	LoadByte		ezgetc
-#define	LoadShort		(short) LoadInt
+#define	LoadByte	(lu_byte) ezgetc
 
-static const l_char* ZNAME (ZIO* Z)
+typedef struct {
+ lua_State* L;
+ ZIO* Z;
+ int swap;
+ const char* name;
+} LoadState;
+
+static void unexpectedEOZ (LoadState* S)
 {
- const l_char* s=zname(Z);
- return (*s==l_c('@')) ? s+1 : s;
+ luaG_runerror(S->L,"unexpected end of file in %s",S->name);
 }
 
-static void unexpectedEOZ (lua_State* L, ZIO* Z)
+static int ezgetc (LoadState* S)
 {
- luaO_verror(L,l_s("unexpected end of file in `%.99s'"),ZNAME(Z));
-}
-
-static int ezgetc (lua_State* L, ZIO* Z)
-{
- int c=zgetc(Z);
- if (c==EOZ) unexpectedEOZ(L,Z);
+ int c=zgetc(S->Z);
+ if (c==EOZ) unexpectedEOZ(S);
  return c;
 }
 
-static void ezread (lua_State* L, ZIO* Z, void* b, int n)
+static void ezread (LoadState* S, void* b, int n)
 {
- int r=zread(Z,b,n);
- if (r!=0) unexpectedEOZ(L,Z);
+ int r=luaZ_read(S->Z,b,n);
+ if (r!=0) unexpectedEOZ(S);
 }
 
-static void LoadBlock (lua_State* L, void* b, size_t size, ZIO* Z, int swap)
+static void LoadBlock (LoadState* S, void* b, size_t size)
 {
- if (swap)
+ if (S->swap)
  {
-  l_char *p=(l_char*) b+size-1;
+  char *p=(char*) b+size-1;
   int n=size;
-  while (n--) *p--=(l_char)ezgetc(L,Z);
+  while (n--) *p--=(char)ezgetc(S);
  }
  else
-  ezread(L,Z,b,size);
+  ezread(S,b,size);
 }
 
-static void LoadVector (lua_State* L, void* b, int m, size_t size, ZIO* Z, int swap)
+static void LoadVector (LoadState* S, void* b, int m, size_t size)
 {
- if (swap)
+ if (S->swap)
  {
-  l_char *q=(l_char*) b;
+  char *q=(char*) b;
   while (m--)
   {
-   l_char *p=q+size-1;
+   char *p=q+size-1;
    int n=size;
-   while (n--) *p--=(l_char)ezgetc(L,Z);
+   while (n--) *p--=(char)ezgetc(S);
    q+=size;
   }
  }
  else
-  ezread(L,Z,b,m*size);
+  ezread(S,b,m*size);
 }
 
-static int LoadInt (lua_State* L, ZIO* Z, int swap)
+static int LoadInt (LoadState* S)
 {
  int x;
- LoadBlock(L,&x,sizeof(x),Z,swap);
+ LoadBlock(S,&x,sizeof(x));
+ if (x<0) luaG_runerror(S->L,"bad integer in %s",S->name);
  return x;
 }
 
-static size_t LoadSize (lua_State* L, ZIO* Z, int swap)
+static size_t LoadSize (LoadState* S)
 {
  size_t x;
- LoadBlock(L,&x,sizeof(x),Z,swap);
+ LoadBlock(S,&x,sizeof(x));
  return x;
 }
 
-static lua_Number LoadNumber (lua_State* L, ZIO* Z, int swap)
+static lua_Number LoadNumber (LoadState* S)
 {
  lua_Number x;
- LoadBlock(L,&x,sizeof(x),Z,swap);
+ LoadBlock(S,&x,sizeof(x));
  return x;
 }
 
-static TString* LoadString (lua_State* L, ZIO* Z, int swap)
+static TString* LoadString (LoadState* S)
 {
- size_t size=LoadSize(L,Z,swap);
+ size_t size=LoadSize(S);
  if (size==0)
   return NULL;
  else
  {
-  l_char* s=luaO_openspace(L,size,l_char);
-  LoadBlock(L,s,size,Z,0);
-  return luaS_newlstr(L,s,size-1);	/* remove trailing '\0' */
+  char* s=luaO_openspace(S->L,size,char);
+  ezread(S,s,size);
+  return luaS_newlstr(S->L,s,size-1);	/* remove trailing '\0' */
  }
 }
 
-static void LoadCode (lua_State* L, Proto* f, ZIO* Z, int swap)
+static void LoadCode (LoadState* S, Proto* f)
 {
- int size=LoadInt(L,Z,swap);
- f->code=luaM_newvector(L,size,Instruction);
+ int size=LoadInt(S);
+ f->code=luaM_newvector(S->L,size,Instruction);
  f->sizecode=size;
- LoadVector(L,f->code,size,sizeof(*f->code),Z,swap);
+ LoadVector(S,f->code,size,sizeof(*f->code));
 }
 
-static void LoadLocals (lua_State* L, Proto* f, ZIO* Z, int swap)
+static void LoadLocals (LoadState* S, Proto* f)
 {
  int i,n;
- n=LoadInt(L,Z,swap);
- f->locvars=luaM_newvector(L,n,LocVar);
+ n=LoadInt(S);
+ f->locvars=luaM_newvector(S->L,n,LocVar);
  f->sizelocvars=n;
  for (i=0; i<n; i++)
  {
-  f->locvars[i].varname=LoadString(L,Z,swap);
-  f->locvars[i].startpc=LoadInt(L,Z,swap);
-  f->locvars[i].endpc=LoadInt(L,Z,swap);
+  f->locvars[i].varname=LoadString(S);
+  f->locvars[i].startpc=LoadInt(S);
+  f->locvars[i].endpc=LoadInt(S);
  }
 }
 
-static void LoadLines (lua_State* L, Proto* f, ZIO* Z, int swap)
+static void LoadLines (LoadState* S, Proto* f)
 {
  int n;
- n=LoadInt(L,Z,swap);
- f->lineinfo=luaM_newvector(L,n,int);
- f->sizelineinfo=n;
- LoadVector(L,f->lineinfo,n,sizeof(*f->lineinfo),Z,swap);
+ n=LoadInt(S);
+ f->lineinfo=luaM_newvector(S->L,n,int);
+ LoadVector(S,f->lineinfo,n,sizeof(*f->lineinfo));
 }
 
-static Proto* LoadFunction (lua_State* L, TString* p, ZIO* Z, int swap);
+static Proto* LoadFunction (LoadState* S, TString* p);
 
-static void LoadConstants (lua_State* L, Proto* f, ZIO* Z, int swap)
+static void LoadConstants (LoadState* S, Proto* f)
 {
  int i,n;
- n=LoadInt(L,Z,swap);
- f->k=luaM_newvector(L,n,TObject);
+ n=LoadInt(S);
+ f->k=luaM_newvector(S->L,n,TObject);
  f->sizek=n;
  for (i=0; i<n; i++)
  {
   TObject* o=&f->k[i];
-  ttype(o)=LoadByte(L,Z);
-  switch (ttype(o))
+  int t=LoadByte(S);
+  switch (t)
   {
    case LUA_TNUMBER:
-	nvalue(o)=LoadNumber(L,Z,swap);
+	setnvalue(o,LoadNumber(S));
 	break;
    case LUA_TSTRING:
-	tsvalue(o)=LoadString(L,Z,swap);
+	setsvalue(o,LoadString(S));
+	break;
+   case LUA_TNIL:
+   	setnilvalue(o);
 	break;
    default:
-	luaO_verror(L,l_s("bad constant type (%d) in `%.99s'"),ttype(o),ZNAME(Z));
+	luaG_runerror(S->L,"bad constant type (%d) in %s",t,S->name);
 	break;
   }
  }
- n=LoadInt(L,Z,swap);
- f->p=luaM_newvector(L,n,Proto*);
+ n=LoadInt(S);
+ f->p=luaM_newvector(S->L,n,Proto*);
  f->sizep=n;
- for (i=0; i<n; i++) f->p[i]=LoadFunction(L,f->source,Z,swap);
+ for (i=0; i<n; i++) f->p[i]=LoadFunction(S,f->source);
 }
 
-static Proto* LoadFunction (lua_State* L, TString* p, ZIO* Z, int swap)
+static Proto* LoadFunction (LoadState* S, TString* p)
 {
- Proto* f=luaF_newproto(L);
- f->source=LoadString(L,Z,swap); if (f->source==NULL) f->source=p;
- f->lineDefined=LoadInt(L,Z,swap);
- f->nupvalues=LoadShort(L,Z,swap);
- f->numparams=LoadShort(L,Z,swap);
- f->is_vararg=LoadShort(L,Z,swap);
- f->maxstacksize=LoadShort(L,Z,swap);
- LoadLocals(L,f,Z,swap);
- LoadLines(L,f,Z,swap);
- LoadConstants(L,f,Z,swap);
- LoadCode(L,f,Z,swap);
+ Proto* f=luaF_newproto(S->L);
+ f->source=LoadString(S); if (f->source==NULL) f->source=p;
+ f->lineDefined=LoadInt(S);
+ f->nupvalues=LoadByte(S);
+ f->numparams=LoadByte(S);
+ f->is_vararg=LoadByte(S);
+ f->maxstacksize=LoadByte(S);
+ LoadLocals(S,f);
+ LoadLines(S,f);
+ LoadConstants(S,f);
+ LoadCode(S,f);
 #ifndef TRUST_BINARIES
- if (!luaG_checkcode(f)) luaO_verror(L,l_s("bad code in `%.99s'"),ZNAME(Z));
+ if (!luaG_checkcode(f)) luaG_runerror(S->L,"bad code in %s",S->name);
 #endif
  return f;
 }
 
-static void LoadSignature (lua_State* L, ZIO* Z)
+static void LoadSignature (LoadState* S)
 {
- const l_char* s=l_s(LUA_SIGNATURE);
- while (*s!=0 && ezgetc(L,Z)==*s)
+ const char* s=LUA_SIGNATURE;
+ while (*s!=0 && ezgetc(S)==*s)
   ++s;
- if (*s!=0) luaO_verror(L,l_s("bad signature in `%.99s'"),ZNAME(Z));
+ if (*s!=0) luaG_runerror(S->L,"bad signature in %s",S->name);
 }
 
-static void TestSize (lua_State* L, int s, const l_char* what, ZIO* Z)
+static void TestSize (LoadState* S, int s, const char* what)
 {
- int r=LoadByte(L,Z);
+ int r=LoadByte(S);
  if (r!=s)
-  luaO_verror(L,l_s("virtual machine mismatch in `%.99s':\n")
-	l_s("  size of %.20s is %d but read %d"),ZNAME(Z),what,s,r);
+  luaG_runerror(S->L,"virtual machine mismatch in %s: "
+	"size of %s is %d but read %d",S->name,what,s,r);
 }
 
-#define TESTSIZE(s,w)	TestSize(L,s,w,Z)
+#define TESTSIZE(s,w)	TestSize(S,s,w)
 #define V(v)		v/16,v%16
 
-static int LoadHeader (lua_State* L, ZIO* Z)
+static void LoadHeader (LoadState* S)
 {
- int version,swap;
+ int version;
  lua_Number x=0,tx=TEST_NUMBER;
- LoadSignature(L,Z);
- version=LoadByte(L,Z);
+ LoadSignature(S);
+ version=LoadByte(S);
  if (version>VERSION)
-  luaO_verror(L,l_s("`%.99s' too new:\n")
-	l_s("  read version %d.%d; expected at most %d.%d"),
-	ZNAME(Z),V(version),V(VERSION));
+  luaG_runerror(S->L,"%s too new: "
+	"read version %d.%d; expected at most %d.%d",
+	S->name,V(version),V(VERSION));
  if (version<VERSION0)			/* check last major change */
-  luaO_verror(L,l_s("`%.99s' too old:\n")
-	l_s("  read version %d.%d; expected at least %d.%d"),
-	ZNAME(Z),V(version),V(VERSION));
- swap=(luaU_endianness()!=LoadByte(L,Z));	/* need to swap bytes? */
- TESTSIZE(sizeof(int),l_s("int"));
- TESTSIZE(sizeof(size_t), l_s("size_t"));
- TESTSIZE(sizeof(Instruction), l_s("size_t"));
- TESTSIZE(SIZE_OP, l_s("OP"));
- TESTSIZE(SIZE_A, l_s("A"));
- TESTSIZE(SIZE_B, l_s("B"));
- TESTSIZE(SIZE_C, l_s("C"));
- TESTSIZE(sizeof(lua_Number), l_s("number"));
- x=LoadNumber(L,Z,swap);
+  luaG_runerror(S->L,"%s too old: "
+	"read version %d.%d; expected at least %d.%d",
+	S->name,V(version),V(VERSION0));
+ S->swap=(luaU_endianness()!=LoadByte(S));	/* need to swap bytes? */
+ TESTSIZE(sizeof(int),"int");
+ TESTSIZE(sizeof(size_t), "size_t");
+ TESTSIZE(sizeof(Instruction), "Instruction");
+ TESTSIZE(SIZE_OP, "OP");
+ TESTSIZE(SIZE_A, "A");
+ TESTSIZE(SIZE_B, "B");
+ TESTSIZE(SIZE_C, "C");
+ TESTSIZE(sizeof(lua_Number), "number");
+ x=LoadNumber(S);
  if ((long)x!=(long)tx)		/* disregard errors in last bits of fraction */
-  luaO_verror(L,l_s("unknown number format in `%.99s':\n")
-      l_s("  read ") l_s(LUA_NUMBER_FMT) l_s("; expected ") l_s(LUA_NUMBER_FMT),
-      ZNAME(Z),x,tx);
- return swap;
+  luaG_runerror(S->L,"unknown number format in %s: read %f; expected %f",
+      S->name,x,tx);
 }
 
-static Proto* LoadChunk (lua_State* L, ZIO* Z)
+static Proto* LoadChunk (LoadState* S)
 {
- return LoadFunction(L,NULL,Z,LoadHeader(L,Z));
+ LoadHeader(S);
+ return LoadFunction(S,NULL);
 }
 
 /*
@@ -248,9 +247,20 @@ static Proto* LoadChunk (lua_State* L, ZIO* Z)
 */
 Proto* luaU_undump (lua_State* L, ZIO* Z)
 {
- Proto* f=LoadChunk(L,Z);
+ LoadState S;
+ Proto* f;
+ const char* s=zname(Z);
+ if (*s=='@' || *s=='=')
+  S.name=s+1;
+ else if (*s==LUA_SIGNATURE[0])
+  S.name="binary string";
+ else
+  S.name=s;
+ S.L=L;
+ S.Z=Z;
+ f=LoadChunk(&S);
  if (zgetc(Z)!=EOZ)
-  luaO_verror(L,l_s("`%.99s' apparently contains more than one chunk"),ZNAME(Z));
+  luaG_runerror(L,"%s apparently contains more than one chunk",S.name);
  return f;
 }
 
@@ -260,5 +270,5 @@ Proto* luaU_undump (lua_State* L, ZIO* Z)
 int luaU_endianness (void)
 {
  int x=1;
- return *(l_char*)&x;
+ return *(char*)&x;
 }

lundump.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lundump.h,v 1.23 2001/06/28 13:55:17 lhf Exp lhf $
+** $Id: lundump.h,v 1.26 2002/08/07 00:36:03 lhf Exp $
 ** load pre-compiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -10,16 +10,24 @@
 #include "lobject.h"
 #include "lzio.h"
 
-/* load one chunk */
+typedef int (*Writer)(const void* p, size_t size, void* u);
+
+/* load one chunk; from lundump.c */
 Proto* luaU_undump (lua_State* L, ZIO* Z);
 
-/* find byte order */
+/* find byte order; from lundump.c */
 int luaU_endianness (void);
 
+/* dump one chunk; from dump.c */
+void luaU_dump (const Proto* Main, Writer w, void* data);
+
+/* print one chunk; from print.c */
+void luaU_print (const Proto* Main);
+
 /* definitions for headers of binary files */
-#define	VERSION		0x41		/* last format change was in 4.1 */
-#define	VERSION0	0x41		/* last major  change was in 4.1 */
 #define	LUA_SIGNATURE	"\033Lua"	/* binary files start with <esc>Lua */
+#define	VERSION		0x50		/* last format change was in 5.0 */
+#define	VERSION0	0x50		/* last major  change was in 5.0 */
 
 /* a multiple of PI for testing native format */
 /* multiplying by 1E8 gives non-trivial integer values */

lvm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.h,v 1.29 2001/02/07 18:13:49 roberto Exp roberto $
+** $Id: lvm.h,v 1.45 2002/08/05 17:36:24 roberto Exp roberto $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -13,19 +13,23 @@
 #include "ltm.h"
 
 
-#define tostring(L,o) ((ttype(o) != LUA_TSTRING) && (luaV_tostring(L, o) != 0))
+#define tostring(L,o) ((ttype(o) == LUA_TSTRING) || (luaV_tostring(L, o)))
+
+#define tonumber(o,n)	(ttype(o) == LUA_TNUMBER || \
+                         (((o) = luaV_tonumber(o,n)) != NULL))
+
+#define equalobj(L,o1,o2) \
+	(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
 
 
+int luaV_lessthan (lua_State *L, const TObject *l, const TObject *r);
+int luaV_equalval (lua_State *L, const TObject *t1, const TObject *t2);
 const TObject *luaV_tonumber (const TObject *obj, TObject *n);
 int luaV_tostring (lua_State *L, TObject *obj);
-void luaV_gettable (lua_State *L, StkId t, TObject *key, StkId res);
-void luaV_settable (lua_State *L, StkId t, TObject *key, StkId val);
-void luaV_getglobal (lua_State *L, TString *s, StkId res);
-void luaV_setglobal (lua_State *L, TString *s, StkId val);
-StkId luaV_execute (lua_State *L, const Closure *cl, StkId base);
-void luaV_Cclosure (lua_State *L, lua_CFunction c, int nelems);
-void luaV_Lclosure (lua_State *L, Proto *l, int nelems);
-int luaV_lessthan (lua_State *L, const TObject *l, const TObject *r);
-void luaV_strconc (lua_State *L, int total, StkId top);
+const TObject *luaV_gettable (lua_State *L, const TObject *t, TObject *key,
+                              int loop);
+void luaV_settable (lua_State *L, const TObject *t, TObject *key, StkId val);
+StkId luaV_execute (lua_State *L);
+void luaV_concat (lua_State *L, int total, int last);
 
 #endif

lzio.c

@@ -1,76 +1,55 @@
 /*
-** $Id: lzio.c,v 1.13 2000/06/12 13:52:05 roberto Exp roberto $
+** $Id: lzio.c,v 1.20 2002/08/05 18:45:02 roberto Exp roberto $
 ** a generic input stream interface
 ** See Copyright Notice in lua.h
 */
 
 
-
-#include <stdio.h>
 #include <string.h>
 
-#define LUA_PRIVATE
 #include "lua.h"
 
+#include "llimits.h"
 #include "lzio.h"
 
 
 
-/* ----------------------------------------------------- memory buffers --- */
-
-static int zmfilbuf (ZIO* z) {
-  (void)z;  /* to avoid warnings */
-  return EOZ;
-}
-
-
-ZIO* zmopen (ZIO* z, const char* b, size_t size, const char *name) {
-  if (b==NULL) return NULL;
-  z->n = size;
-  z->p = (const unsigned char *)b;
-  z->filbuf = zmfilbuf;
-  z->u = NULL;
-  z->name = name;
-  return z;
-}
-
-/* ------------------------------------------------------------ strings --- */
-
-ZIO* zsopen (ZIO* z, const char* s, const char *name) {
-  if (s==NULL) return NULL;
-  return zmopen(z, s, strlen(s), name);
-}
-
-/* -------------------------------------------------------------- FILEs --- */
-
-static int zffilbuf (ZIO* z) {
-  size_t n;
-  if (feof((FILE *)z->u)) return EOZ;
-  n = fread(z->buffer, 1, ZBSIZE, (FILE *)z->u);
-  if (n==0) return EOZ;
-  z->n = n-1;
-  z->p = z->buffer;
+int luaZ_fill (ZIO *z) {
+  size_t size;
+  const char *buff = z->reader(NULL, z->data, &size);
+  if (buff == NULL || size == 0) return EOZ;
+  z->n = size - 1;
+  z->p = buff;
   return *(z->p++);
 }
 
 
-ZIO* zFopen (ZIO* z, FILE* f, const char *name) {
-  if (f==NULL) return NULL;
-  z->n = 0;
-  z->p = z->buffer;
-  z->filbuf = zffilbuf;
-  z->u = f;
+int luaZ_lookahead (ZIO *z) {
+  if (z->n == 0) {
+    int c = luaZ_fill(z);
+    if (c == EOZ) return c;
+    z->n++;
+    z->p--;
+  }
+  return *z->p;
+}
+
+
+void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name) {
+  z->reader = reader;
+  z->data = data;
   z->name = name;
-  return z;
+  z->n = 0;
+  z->p = NULL;
 }
 
 
 /* --------------------------------------------------------------- read --- */
-size_t zread (ZIO *z, void *b, size_t n) {
+size_t luaZ_read (ZIO *z, void *b, size_t n) {
   while (n) {
     size_t m;
     if (z->n == 0) {
-      if (z->filbuf(z) == EOZ)
+      if (luaZ_fill(z) == EOZ)
         return n;  /* return number of missing bytes */
       else {
         ++z->n;  /* filbuf removed first byte; put back it */
@@ -86,3 +65,4 @@ size_t zread (ZIO *z, void *b, size_t n) {
   }
   return 0;
 }
+

lzio.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lzio.h,v 1.7 2000/10/20 16:36:32 roberto Exp roberto $
+** $Id: lzio.h,v 1.12 2002/06/06 12:40:22 roberto Exp roberto $
 ** Buffered streams
 ** See Copyright Notice in lua.h
 */
@@ -8,45 +8,35 @@
 #ifndef lzio_h
 #define lzio_h
 
-#include <stdio.h>
+#include "lua.h"
 
 
-
-/* For Lua only */
-#define zFopen	luaZ_Fopen
-#define zsopen	luaZ_sopen
-#define zmopen	luaZ_mopen
-#define zread	luaZ_read
-
 #define EOZ	(-1)			/* end of stream */
 
 typedef struct zio ZIO;
 
-ZIO* zFopen (ZIO* z, FILE* f, const char *name);	/* open FILEs */
-ZIO* zsopen (ZIO* z, const char* s, const char *name);	/* string */
-ZIO* zmopen (ZIO* z, const char* b, size_t size, const char *name); /* memory */
+#define zgetc(z)  (((z)->n--)>0 ? \
+			cast(int, cast(unsigned char, *(z)->p++)) : \
+			luaZ_fill(z))
 
-size_t zread (ZIO* z, void* b, size_t n);	/* read next n bytes */
-
-#define zgetc(z)	(((z)->n--)>0 ? ((int)*(z)->p++): (z)->filbuf(z))
 #define zname(z)	((z)->name)
 
+void luaZ_init (ZIO *z, lua_Chunkreader reader, void *data, const char *name);
+size_t luaZ_read (ZIO* z, void* b, size_t n);	/* read next n bytes */
+int luaZ_lookahead (ZIO *z);
 
 
 /* --------- Private Part ------------------ */
 
-#ifndef ZBSIZE
-#define ZBSIZE	256			/* buffer size */
-#endif
-
 struct zio {
-  size_t n;				/* bytes still unread */
-  const unsigned char* p;		/* current position in buffer */
-  int (*filbuf)(ZIO* z);
-  void* u;				/* additional data */
+  size_t n;			/* bytes still unread */
+  const char *p;		/* current position in buffer */
+  lua_Chunkreader reader;
+  void* data;			/* additional data */
   const char *name;
-  unsigned char buffer[ZBSIZE];		/* buffer */
 };
 
 
+int luaZ_fill (ZIO *z);
+
 #endif

makefile

@@ -1,5 +1,5 @@
 #
-## $Id: makefile,v 1.31 2001/07/24 17:25:30 roberto Exp roberto $
+## $Id: makefile,v 1.35 2002/03/18 18:18:35 roberto Exp roberto $
 ## Makefile
 ## See Copyright Notice in lua.h
 #
@@ -11,35 +11,35 @@
 #
 # define (undefine) _POSIX_SOURCE if your system is (not) POSIX compliant
 #
-# define (undefine) OLD_ANSI if your system does NOT have some new ANSI
-# facilities (e.g. strerror, locale.h, memmove). SunOS does not comply;
-# so, add "-DOLD_ANSI" on SunOS
-#
 # define LUA_NUM_TYPE if you need numbers to be different from double
 # (for instance, -DLUA_NUM_TYPE=float)
 # you may need to adapat the code, too.
-#
 
-#EXTRA_H=-DLUA_USER_H='"ltests.h"'
 
-CONFIG = -DPOPEN -D_POSIX_SOURCE  $(EXTRA_H)
-#CONFIG = -DOLD_ANSI
+# DEBUG = -g -DLUA_USER_H='"ltests.h"'
+OPTIMIZE =  -O2 \
+   -D'lua_number2int(i,d)=__asm__("fldl %1\nfistpl %0":"=m"(i):"m"(d))' \
+  -fomit-frame-pointer
+
+CONFIG = -D_POSIX_SOURCE -DPOPEN $(DEBUG) $(OPTIMIZE)
+
 
 
 # Compilation parameters
 CC = gcc
-CWARNS = -Wall -W -pedantic \
+CWARNS = -Wall -pedantic \
 	-Waggregate-return \
 	-Wcast-align \
 	-Wmissing-prototypes \
+	-Wstrict-prototypes \
 	-Wnested-externs \
 	-Wpointer-arith \
 	-Wshadow \
 	-Wwrite-strings \
+#	-Wtraditional \
 #	-Wcast-qual
-#	-Wtraditional
 
-CFLAGS = $(CONFIG) $(CWARNS) -ansi -O3 -fomit-frame-pointer
+CFLAGS = $(CONFIG) $(CWARNS) -ansi
 
 
 # To make early versions
@@ -75,8 +75,9 @@ LUAOBJS = \
 LIBOBJS = 	\
 	lauxlib.o \
 	lbaselib.o \
-	liolib.o \
+        ltablib.o \
 	lmathlib.o \
+ 	liolib.o \
 	lstrlib.o \
 	ldblib.o
 
@@ -108,51 +109,52 @@ clear	:
 	co $(CO_OPTIONS) $@
 
 
-lapi.o: lapi.c lua.h lapi.h lobject.h llimits.h ldo.h lstate.h \
- luadebug.h lfunc.h lgc.h lmem.h lstring.h ltable.h ltm.h lvm.h
-lauxlib.o: lauxlib.c lua.h lauxlib.h luadebug.h lualib.h
-lbaselib.o: lbaselib.c lua.h lauxlib.h luadebug.h lualib.h
+lapi.o: lapi.c lua.h lapi.h lobject.h llimits.h ldebug.h lstate.h \
+ ltm.h ldo.h lzio.h lfunc.h lgc.h lmem.h lstring.h ltable.h lundump.h \
+ lvm.h
+lauxlib.o: lauxlib.c lua.h lauxlib.h
+lbaselib.o: lbaselib.c lua.h lauxlib.h lualib.h
 lcode.o: lcode.c lua.h lcode.h llex.h lobject.h llimits.h lzio.h \
- lopcodes.h lparser.h ldebug.h lstate.h luadebug.h ldo.h lmem.h
-ldblib.o: ldblib.c lua.h lauxlib.h luadebug.h lualib.h
+ lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h ldo.h lmem.h
+ldblib.o: ldblib.c lua.h lauxlib.h lualib.h
 ldebug.o: ldebug.c lua.h lapi.h lobject.h llimits.h lcode.h llex.h \
- lzio.h lopcodes.h lparser.h ldebug.h lstate.h luadebug.h ldo.h \
- lfunc.h lstring.h ltable.h ltm.h lvm.h
-ldo.o: ldo.c lua.h ldebug.h lstate.h lobject.h llimits.h luadebug.h \
- ldo.h lgc.h lmem.h lparser.h lzio.h lstring.h ltable.h ltm.h \
+ lzio.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h ldo.h \
+ lfunc.h lstring.h lvm.h
+ldo.o: ldo.c lua.h ldebug.h lstate.h lobject.h llimits.h ltm.h ldo.h \
+ lzio.h lfunc.h lgc.h lmem.h lopcodes.h lparser.h ltable.h lstring.h \
  lundump.h lvm.h
 lfunc.o: lfunc.c lua.h lfunc.h lobject.h llimits.h lmem.h lstate.h \
- luadebug.h
-lgc.o: lgc.c lua.h ldo.h lobject.h llimits.h lstate.h luadebug.h \
- lfunc.h lgc.h lmem.h lstring.h ltable.h ltm.h
-liolib.o: liolib.c lua.h lauxlib.h luadebug.h lualib.h
-llex.o: llex.c lua.h llex.h lobject.h llimits.h lzio.h lparser.h \
- lstate.h luadebug.h lstring.h
+ ltm.h
+lgc.o: lgc.c lua.h ldebug.h lstate.h lobject.h llimits.h ltm.h ldo.h \
+ lzio.h lfunc.h lgc.h lmem.h lstring.h ltable.h
+liolib.o: liolib.c lua.h lauxlib.h lualib.h
+llex.o: llex.c lua.h ldo.h lobject.h llimits.h lstate.h ltm.h lzio.h \
+ llex.h lparser.h ltable.h lstring.h
 lmathlib.o: lmathlib.c lua.h lauxlib.h lualib.h
-lmem.o: lmem.c lua.h ldo.h lobject.h llimits.h lstate.h luadebug.h \
- lmem.h
-lobject.o: lobject.c lua.h ldo.h lobject.h llimits.h lstate.h \
- luadebug.h lmem.h
-lopcodes.o: lopcodes.c lua.h lopcodes.h llimits.h
+lmem.o: lmem.c lua.h ldebug.h lstate.h lobject.h llimits.h ltm.h ldo.h \
+ lzio.h lmem.h
+lobject.o: lobject.c lua.h ldo.h lobject.h llimits.h lstate.h ltm.h \
+ lzio.h lmem.h lstring.h lvm.h
+lopcodes.o: lopcodes.c lua.h lobject.h llimits.h lopcodes.h
 lparser.o: lparser.c lua.h lcode.h llex.h lobject.h llimits.h lzio.h \
- lopcodes.h lparser.h ldebug.h lstate.h luadebug.h lfunc.h lmem.h \
+ lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h lfunc.h lmem.h \
+ lstring.h
+lstate.o: lstate.c lua.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+ ldo.h lzio.h lfunc.h lgc.h llex.h lmem.h lstring.h ltable.h
+lstring.o: lstring.c lua.h lmem.h llimits.h lobject.h lstate.h ltm.h \
  lstring.h
-lstate.o: lstate.c lua.h ldo.h lobject.h llimits.h lstate.h luadebug.h \
- lgc.h llex.h lzio.h lmem.h lstring.h ltable.h ltm.h
-lstring.o: lstring.c lua.h lmem.h llimits.h lobject.h lstate.h \
- luadebug.h lstring.h
 lstrlib.o: lstrlib.c lua.h lauxlib.h lualib.h
-ltable.o: ltable.c lua.h ldo.h lobject.h llimits.h lstate.h luadebug.h \
- lmem.h ltable.h
+ltable.o: ltable.c lua.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+ ldo.h lzio.h lmem.h ltable.h
+ltablib.o: ltablib.c lua.h lauxlib.h lualib.h
 ltests.o: ltests.c lua.h lapi.h lobject.h llimits.h lauxlib.h lcode.h \
- llex.h lzio.h lopcodes.h lparser.h ldebug.h lstate.h luadebug.h ldo.h \
- lfunc.h lmem.h lstring.h ltable.h lualib.h
-ltm.o: ltm.c lua.h ldo.h lobject.h llimits.h lstate.h luadebug.h \
- lmem.h lstring.h ltable.h ltm.h
-lua.o: lua.c lua.h luadebug.h lualib.h
-lundump.o: lundump.c lua.h ldebug.h lstate.h lobject.h llimits.h \
- luadebug.h lfunc.h lmem.h lopcodes.h lstring.h lundump.h lzio.h
-lvm.o: lvm.c lua.h lapi.h lobject.h llimits.h ldebug.h lstate.h \
- luadebug.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h ltm.h \
- lvm.h
-lzio.o: lzio.c lua.h lzio.h
+ llex.h lzio.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h \
+ ldo.h lfunc.h lmem.h lstring.h lualib.h
+ltm.o: ltm.c lua.h lobject.h llimits.h lstate.h ltm.h lstring.h \
+ ltable.h
+lua.o: lua.c lua.h lauxlib.h lualib.h
+lundump.o: lundump.c lua.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+ lfunc.h lmem.h lopcodes.h lstring.h lundump.h lzio.h
+lvm.o: lvm.c lua.h ldebug.h lstate.h lobject.h llimits.h ltm.h ldo.h \
+ lzio.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h
+lzio.o: lzio.c lua.h llimits.h lzio.h