wrong assert

therefore distributed as a regular library).

bugs

@@ -1,9 +1,12 @@
+
 ** lua.stx / llex.c
 Tue Dec  2 10:45:48 EDT 1997
 >> BUG: "lastline" was not reset on function entry, so debug information
 >> started only in the 2nd line of a function.
 
 
+
+=================================================================
 --- Version 3.1 alpha
 
 ** lua.c
@@ -13,7 +16,7 @@ Thu Jan 15 14:34:58 EDT 1998
 ** lbuiltin.c / lobject.h
 Thu Jan 15 14:34:58 EDT 1998
 >> MAX_WORD may be bigger than MAX_INT
-
+(by lhf)
 
 ** llex.c
 Mon Jan 19 18:17:18 EDT 1998
@@ -42,6 +45,8 @@ Mon May 18 19:20:00 EST 1998
 >> arguments for "format" 'x', 'X', 'o' and 'u' must be unsigned int.
 
 
+
+=================================================================
 --- Version 3.1
 
 ** liolib.c / lauxlib.c
@@ -52,11 +57,13 @@ of view) when functions have upvalues.
 ** lstrlib.c
 Tue Nov 10 17:29:36 EDT 1998
 >> gsub/strfind do not check whether captures are properly finished.
+(by roberto/tomas)
 
 ** lbuiltin.c
 Fri Dec 18 11:22:55 EDT 1998
 >> "tonumber" goes crazy with negative numbers in other bases (not 10),
 because "strtol" returns long, not unsigned long.
+(by Visual C++)
 
 ** lstrlib.c
 Mon Jan  4 10:41:40 EDT 1999
@@ -70,8 +77,124 @@ lua_isnumber can modify it.
 ** lstrlib.c
 Thu Feb  4 17:08:50 EDT 1999
 >> format "%s" may break limit of "sprintf" on some machines.
-
+(by Marcelo Sales)
 
 ** lzio.c
 Thu Mar  4 11:49:37 EST 1999
 >> file stream cannot call fread after EOF.
+(by lhf)
+
+
+
+=================================================================
+--- Version 3.2 (beta)
+
+** lstrlib.c
+Fri Apr 30 11:10:20 EST 1999
+>> '$' at end of pattern was matching regular '$', too.
+(by anna; since 2.5)
+
+** lbuiltin.c
+Fri May 21 17:15:11 EST 1999
+>> foreach, foreachi, foreachvar points to function in stack when stack
+can be reallocated.
+(by tomas; since 3.2 beta)
+
+** lparser.c
+Wed Jun 16 10:32:46 EST 1999
+>> cannot assign to unlimited variables, because it causes overflow in
+the number of returns of a function.
+(since 3.1)
+
+
+
+=================================================================
+--- Version 3.2
+
+** lmathlib.c
+Wed Aug 18 11:28:38 EST 1999
+>> random(0) and random(x,0) are wrong (0 is read as no argument!).
+(by Dave Bollinger; since 3.1)
+
+** lparser.c
+Thu Sep  2 10:07:20 EST 1999
+>> in the (old) expression << ls->fs->f->consts[checkname(ls)] >>, checkname
+could realloc f->consts.
+(by Supratik Champati; since 3.2 beta)
+
+** lobject.c / lbuiltin.c
+Wed Sep  8 17:41:54 EST 1999
+>> tonumber'e1' and tonumber('  ', x), for x!=10, gave 0 instead of nil.
+(since 3.1)
+
+** lstrlib.c
+Thu Nov 11 14:36:30 EDT 1999
+>> `strfind' does not handle \0 in plain search.
+(by Jon Kleiser; since 3.1)
+
+** lparser.c
+Wed Dec 29 16:05:43 EDT 1999
+>> return gives wrong line in debug information
+(by lhf; since 3.2 [at least])
+
+** ldo.c
+Thu Dec 30 16:39:33 EDT 1999
+>> cannot reopen stdin (for binary mode)
+(by lhf & roberto; since 3.1)
+
+** lapi.c
+Thu Mar  2 09:41:53 EST 2000
+>> lua_settable should check stack space (it could call a T.M.)
+(by lhf & celes; since 3.2; it was already fixed by fixed stack)
+
+** lparser.c
+Mon Apr  3 09:59:06 EST 2000
+>> '%' should be in expfollow
+(by Edgar Toernig; since 3.1; it was already fixed)
+
+** lbuiltin.c
+Mon Apr  3 10:05:05 EST 2000
+>> tostring() without arguments gives seg. fault.
+(by Edgar Toernig; since 3.0)
+
+
+
+=================================================================
+--- Version 4.0 alpha
+
+Tested with full test suites (as locked in Mon Apr 24 14:23:11 EST 2000)
+in the following platforms:
+* Linux   - gcc, g++
+* AIX     - gcc
+* Solaris - gcc, cc
+* IRIX	  - cc, cc-purify
+* Windows - Visual C++ (.c e .cpp, warning level=4)
+
+
+** lstrlib.c
+Tue May  2 15:27:58 EST 2000
+>> `strfind' gets wrong subject length when there is an offset
+(by Jon Kleiser; since 4.0a)
+
+** lparser.c
+Fri May 12 15:11:12 EST 2000
+>> first element in a list constructor is not adjusted to one value
+>> (e.g. «a = {gsub('a','a','')}»)
+(by Tomas; since 4.0a)
+
+** lparser.c
+Wed May 24 14:50:16 EST 2000
+>> record-constructor starting with an upvalue name gets an error
+>> (e.g. «local a; function f() x = {a=1} end»)
+(by Edgar Toernig; since 3.1)
+
+** lparser.c
+Tue Aug 29 15:56:05 EST 2000
+>> error message for `for' uses `while'
+(since 4.0a; already corrected)
+
+** lgc.c
+Tue Aug 29 15:57:41 EST 2000
+>> gc tag method for nil could call line hook
+(by ry; since ?)
+

lapi.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.h,v 1.3 1999/02/22 19:13:12 roberto Exp roberto $
+** $Id: lapi.h,v 1.19 2000/08/28 17:57:04 roberto Exp roberto $
 ** Auxiliary functions from Lua API
 ** See Copyright Notice in lua.h
 */
@@ -8,15 +8,10 @@
 #define lapi_h
 
 
-#include "lua.h"
 #include "lobject.h"
 
 
-TObject *luaA_Address (lua_Object o);
-void luaA_pushobject (TObject *o);
-void luaA_packresults (void);
-int luaA_passresults (void);
-TaggedString *luaA_nextvar (TaggedString *g);
-int luaA_next (Hash *t, int i);
+TObject *luaA_index (lua_State *L, int index);
+void luaA_pushobject (lua_State *L, const TObject *o);
 
 #endif

lauxlib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.c,v 1.16 1999/03/10 14:19:41 roberto Exp roberto $
+** $Id: lauxlib.c,v 1.35 2000/09/11 20:29:27 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -9,18 +9,19 @@
 #include <stdio.h>
 #include <string.h>
 
-/* Please Notice: This file uses only the official API of Lua
+/* 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.
 */
 
-#include "lauxlib.h"
 #include "lua.h"
+
+#include "lauxlib.h"
 #include "luadebug.h"
 
 
 
-int luaL_findstring (char *name, char *list[]) {
+int luaL_findstring (const char *name, const char *const list[]) {
   int i;
   for (i=0; list[i]; i++)
     if (strcmp(list[i], name) == 0)
@@ -28,106 +29,191 @@ int luaL_findstring (char *name, char *list[]) {
   return -1;  /* name not found */
 }
 
-void luaL_argerror (int numarg, char *extramsg) {
-  lua_Function f = lua_stackedfunction(0);
-  char *funcname;
-  lua_getobjname(f, &funcname);
-  numarg -= lua_nups(f);
-  if (funcname == NULL)
-    funcname = "?";
-  if (extramsg == NULL)
-    luaL_verror("bad argument #%d to function `%.50s'", numarg, funcname);
-  else
-    luaL_verror("bad argument #%d to function `%.50s' (%.100s)",
-                    numarg, funcname, extramsg);
-}
-
-char *luaL_check_lstr (int numArg, long *len)
-{
-  lua_Object o = lua_getparam(numArg);
-  luaL_arg_check(lua_isstring(o), numArg, "string expected");
-  if (len) *len = lua_strlen(o);
-  return lua_getstring(o);
-}
-
-char *luaL_opt_lstr (int numArg, char *def, long *len)
-{
-  return (lua_getparam(numArg) == LUA_NOOBJECT) ? def :
-                              luaL_check_lstr(numArg, len);
-}
-
-double luaL_check_number (int numArg)
-{
-  lua_Object o = lua_getparam(numArg);
-  luaL_arg_check(lua_isnumber(o), numArg, "number expected");
-  return lua_getnumber(o);
+void luaL_argerror (lua_State *L, int narg, const char *extramsg) {
+  lua_Debug ar;
+  lua_getstack(L, 0, &ar);
+  lua_getinfo(L, "n", &ar);
+  if (ar.name == NULL)
+    ar.name = "?";
+  luaL_verror(L, "bad argument #%d to `%.50s' (%.100s)",
+              narg, ar.name, extramsg);
 }
 
 
-double luaL_opt_number (int numArg, double def)
-{
-  return (lua_getparam(numArg) == LUA_NOOBJECT) ? def :
-                              luaL_check_number(numArg);
-}  
-
-
-lua_Object luaL_tablearg (int arg)
-{
-  lua_Object o = lua_getparam(arg);
-  luaL_arg_check(lua_istable(o), arg, "table expected");
-  return o;
+static void type_error (lua_State *L, int narg, const char *type_name) {
+  char buff[100];
+  const char *rt = lua_type(L, narg);
+  if (*rt == 'N') rt = "no value";
+  sprintf(buff, "%.10s expected, got %.10s", type_name, rt);
+  luaL_argerror(L, narg, buff);
 }
 
-lua_Object luaL_functionarg (int arg)
-{
-  lua_Object o = lua_getparam(arg);
-  luaL_arg_check(lua_isfunction(o), arg, "function expected");
-  return o;
+
+void luaL_checkstack (lua_State *L, int space, const char *mes) {
+  if (space > lua_stackspace(L))
+    luaL_verror(L, "stack overflow (%.30s)", mes);
 }
 
-lua_Object luaL_nonnullarg (int numArg)
-{
-  lua_Object o = lua_getparam(numArg);
-  luaL_arg_check(o != LUA_NOOBJECT, numArg, "value expected");
-  return o;
+
+/*
+** use the 3rd letter of type names for testing:
+** nuMber, niL, stRing, fuNction, usErdata, taBle, anY
+*/
+void luaL_checktype(lua_State *L, int narg, const char *tname) {
+  const char *rt = lua_type(L, narg);
+  if (!(*rt != 'N' && (tname[2] == 'y' || tname[2] == rt[2])))
+    type_error(L, narg, tname);
 }
 
-void luaL_openlib (struct luaL_reg *l, int n)
-{
+
+static const char *checkstr (lua_State *L, int narg, size_t *len) {
+  const char *s = lua_tostring(L, narg);
+  if (!s) type_error(L, narg, "string");
+  if (len) *len = lua_strlen(L, narg);
+  return s;
+}
+
+const char *luaL_check_lstr (lua_State *L, int narg, size_t *len) {
+  return checkstr(L, narg, len);
+}
+
+const char *luaL_opt_lstr (lua_State *L, int narg, const char *def,
+                           size_t *len) {
+  if (lua_isnull(L, narg)) {
+    if (len) *len = def ? strlen(def) : 0;
+    return def;
+  }
+  else return checkstr(L, narg, len);
+}
+
+double luaL_check_number (lua_State *L, int narg) {
+  if (!lua_isnumber(L, narg)) type_error(L, narg, "number");
+  return lua_tonumber(L, narg);
+}
+
+
+double luaL_opt_number (lua_State *L, int narg, double def) {
+  if (lua_isnull(L, narg)) return def;
+  else {
+    if (!lua_isnumber(L, narg)) type_error(L, narg, "number");
+    return lua_tonumber(L, narg);
+  }
+}
+
+
+void luaL_openlib (lua_State *L, const struct luaL_reg *l, int n) {
   int i;
-  lua_open();  /* make sure lua is already open */
   for (i=0; i<n; i++)
-    lua_register(l[i].name, l[i].func);
+    lua_register(L, l[i].name, l[i].func);
 }
 
 
-void luaL_verror (char *fmt, ...)
-{
+void luaL_verror (lua_State *L, const char *fmt, ...) {
   char buff[500];
   va_list argp;
   va_start(argp, fmt);
   vsprintf(buff, fmt, argp);
   va_end(argp);
-  lua_error(buff);
+  lua_error(L, buff);
 }
 
 
-void luaL_chunkid (char *out, char *source, int len) {
-  len -= 13;  /* 13 = strlen("string ''...\0") */
-  if (*source == '@')
-    sprintf(out, "file `%.*s'", len, source+1);
-  else if (*source == '(')
-    strcpy(out, "(C code)");
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+
+#define buffempty(B)	((B)->p == (B)->buffer)
+#define bufflen(B)	((B)->p - (B)->buffer)
+#define bufffree(B)	((size_t)(LUAL_BUFFERSIZE - bufflen(B)))
+
+#define LIMIT	(LUA_MINSTACK/2)
+
+
+static int emptybuffer (luaL_Buffer *B) {
+  size_t l = bufflen(B);
+  if (l == 0) return 0;  /* put nothing on stack */
   else {
-    char *b = strchr(source , '\n');  /* stop string at first new line */
-    int lim = (b && (b-source)<len) ? b-source : len;
-    sprintf(out, "string `%.*s'", lim, source);
-    strcpy(out+lim+(13-5), "...'");  /* 5 = strlen("...'\0") */
+    lua_pushlstring(B->L, B->buffer, l);
+    B->p = B->buffer;
+    B->level++;
+    return 1;
   }
 }
 
 
-void luaL_filesource (char *out, char *filename, int len) {
-  if (filename == NULL) filename = "(stdin)";
-  sprintf(out, "@%.*s", len-2, filename);  /* -2 for '@' and '\0' */
+static void adjuststack (luaL_Buffer *B) {
+  if (B->level > 1) {
+    lua_State *L = B->L;
+    int toget = 1;  /* number of levels to concat */
+    size_t toplen = lua_strlen(L, -1);
+    do {
+      size_t l = lua_strlen(L, -(toget+1));
+      if (B->level - toget + 1 >= LIMIT || toplen > l) {
+        toplen += l;
+        toget++;
+      }
+      else break;
+    } while (toget < B->level);
+    if (toget >= 2) {
+      lua_concat(L, toget);
+      B->level = B->level - toget + 1;
+    }
+  }
 }
+
+
+char *luaL_prepbuffer (luaL_Buffer *B) {
+  if (emptybuffer(B))
+    adjuststack(B);
+  return B->buffer;
+}
+
+
+void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
+  while (l--)
+    luaL_putchar(B, *s++);
+}
+
+
+void luaL_addstring (luaL_Buffer *B, const char *s) {
+  luaL_addlstring(B, s, strlen(s));
+}
+
+
+void luaL_pushresult (luaL_Buffer *B) {
+  emptybuffer(B);
+  if (B->level == 0)
+    lua_pushlstring(B->L, NULL, 0);
+  else if (B->level > 1)
+    lua_concat(B->L, B->level);
+  B->level = 1;
+}
+
+
+void luaL_addvalue (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  size_t vl = lua_strlen(L, -1);
+  if (vl <= bufffree(B)) {  /* fit into buffer? */
+    memcpy(B->p, lua_tostring(L, -1), vl);  /* put it there */
+    B->p += vl;
+    lua_pop(L, 1);  /* remove from stack */
+  }
+  else {
+    if (emptybuffer(B))
+      lua_insert(L, -2);  /* put buffer before new value */
+    B->level++;  /* add new value into B stack */
+    adjuststack(B);
+  }
+}
+
+
+void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
+  B->L = L;
+  B->p = B->buffer;
+  B->level = 0;
+}
+
+/* }====================================================== */

lauxlib.h

@@ -1,53 +1,93 @@
 /*
-** $Id: lauxlib.h,v 1.11 1999/03/04 21:17:26 roberto Exp roberto $
+** $Id: lauxlib.h,v 1.24 2000/09/11 20:29:27 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
 
 
-#ifndef auxlib_h
-#define auxlib_h
+#ifndef lauxlib_h
+#define lauxlib_h
 
 
+#include <stddef.h>
+#include <stdio.h>
+
 #include "lua.h"
 
 
 struct luaL_reg {
-  char *name;
+  const char *name;
   lua_CFunction func;
 };
 
 
-#define luaL_arg_check(cond,numarg,extramsg) if (!(cond)) \
-                                               luaL_argerror(numarg,extramsg)
+void luaL_openlib (lua_State *L, const struct luaL_reg *l, int n);
+void luaL_argerror (lua_State *L, int numarg, const char *extramsg);
+const char *luaL_check_lstr (lua_State *L, int numArg, size_t *len);
+const char *luaL_opt_lstr (lua_State *L, int numArg, const char *def,
+                           size_t *len);
+double luaL_check_number (lua_State *L, int numArg);
+double luaL_opt_number (lua_State *L, int numArg, double def);
 
-void luaL_openlib (struct luaL_reg *l, int n);
-void luaL_argerror (int numarg, char *extramsg);
-#define luaL_check_string(n)  (luaL_check_lstr((n), NULL))
-char *luaL_check_lstr (int numArg, long *len);
-#define luaL_opt_string(n, d) (luaL_opt_lstr((n), (d), NULL))
-char *luaL_opt_lstr (int numArg, char *def, long *len);
-double luaL_check_number (int numArg);
-#define luaL_check_int(n)	((int)luaL_check_number(n))
-#define luaL_check_long(n)	((long)luaL_check_number(n))
-double luaL_opt_number (int numArg, double def);
-#define luaL_opt_int(n,d)	((int)luaL_opt_number(n,d))
-#define luaL_opt_long(n,d)	((long)luaL_opt_number(n,d))
-lua_Object luaL_functionarg (int arg);
-lua_Object luaL_tablearg (int arg);
-lua_Object luaL_nonnullarg (int numArg);
-void luaL_verror (char *fmt, ...);
-char *luaL_openspace (int size);
-void luaL_resetbuffer (void);
-void luaL_addchar (int c);
-int luaL_getsize (void);
-void luaL_addsize (int n);
-int luaL_newbuffer (int size);
-void luaL_oldbuffer (int old);
-char *luaL_buffer (void);
-int luaL_findstring (char *name, char *list[]);
-void luaL_chunkid (char *out, char *source, int len);
-void luaL_filesource (char *out, char *filename, int len);
+void luaL_checkstack (lua_State *L, int space, const char *msg);
+void luaL_checktype (lua_State *L, int narg, const char *tname);
+
+void luaL_verror (lua_State *L, const char *fmt, ...);
+int luaL_findstring (const char *name, const char *const list[]);
+
+
+
+/*
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
+
+#define luaL_arg_check(L, cond,numarg,extramsg) if (!(cond)) \
+                                               luaL_argerror(L, numarg,extramsg)
+#define luaL_check_string(L,n)	(luaL_check_lstr(L, (n), NULL))
+#define luaL_opt_string(L,n,d)	(luaL_opt_lstr(L, (n), (d), NULL))
+#define luaL_check_int(L,n)	((int)luaL_check_number(L, n))
+#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])))
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+
+#define LUAL_BUFFERSIZE	  BUFSIZ
+
+
+typedef struct luaL_Buffer {
+  char *p;			/* current position in buffer */
+  int level;
+  lua_State *L;
+  char buffer[LUAL_BUFFERSIZE];
+} luaL_Buffer;
+
+#define luaL_putchar(B,c) \
+  ((void)((B)->p < &(B)->buffer[LUAL_BUFFERSIZE] || luaL_prepbuffer(B)), \
+   (*(B)->p++ = (char)(c)))
+
+#define luaL_addsize(B,n)	((B)->p += (n))
+
+void luaL_buffinit (lua_State *L, luaL_Buffer *B);
+char *luaL_prepbuffer (luaL_Buffer *B);
+void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);
+void luaL_addstring (luaL_Buffer *B, const char *s);
+void luaL_addvalue (luaL_Buffer *B);
+void luaL_pushresult (luaL_Buffer *B);
+
+
+/* }====================================================== */
 
 
 #endif
+
+

lbaselib.c

@@ -0,0 +1,636 @@
+/*
+** $Id: lbaselib.c,v 1.5 2000/09/14 14:09:31 roberto Exp roberto $
+** Basic library
+** See Copyright Notice in lua.h
+*/
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "luadebug.h"
+#include "lualib.h"
+
+
+
+/*
+** If your system does not support `stderr', redefine this function, or
+** redefine _ERRORMESSAGE so that it won't need _ALERT.
+*/
+static int luaB__ALERT (lua_State *L) {
+  fputs(luaL_check_string(L, 1), stderr);
+  return 0;
+}
+
+
+/*
+** Basic implementation of _ERRORMESSAGE.
+** The library `liolib' redefines _ERRORMESSAGE for better error information.
+*/
+static int luaB__ERRORMESSAGE (lua_State *L) {
+  luaL_checktype(L, 1, "string");
+  lua_getglobal(L, LUA_ALERT);
+  if (lua_isfunction(L, -1)) {  /* avoid error loop if _ALERT is not defined */
+    lua_Debug ar;
+    lua_pushstring(L, "error: ");
+    lua_pushvalue(L, 1);
+    if (lua_getstack(L, 1, &ar)) {
+      lua_getinfo(L, "Sl", &ar);
+      if (ar.source && ar.currentline > 0) {
+        char buff[100];
+        sprintf(buff, "\n  <%.70s: line %d>", ar.short_src, ar.currentline);
+        lua_pushstring(L, buff);
+        lua_concat(L, 2);
+      }
+    }
+    lua_pushstring(L, "\n");
+    lua_concat(L, 3);
+    lua_rawcall(L, 1, 0);
+  }
+  return 0;
+}
+
+
+/*
+** If your system does not support `stdout', you can just remove this function.
+** If you need, you can define your own `print' function, following this
+** model but changing `fputs' to put the strings at a proper place
+** (a console window or a log file, for instance).
+*/
+static int luaB_print (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  lua_getglobal(L, "tostring");
+  for (i=1; i<=n; i++) {
+    const char *s;
+    lua_pushvalue(L, -1);  /* function to be called */
+    lua_pushvalue(L, i);   /* value to print */
+    lua_rawcall(L, 1, 1);
+    s = lua_tostring(L, -1);  /* get result */
+    if (s == NULL)
+      lua_error(L, "`tostring' must return a string to `print'");
+    if (i>1) fputs("\t", stdout);
+    fputs(s, stdout);
+    lua_pop(L, 1);  /* pop result */
+  }
+  fputs("\n", stdout);
+  return 0;
+}
+
+
+static int luaB_tonumber (lua_State *L) {
+  int base = luaL_opt_int(L, 2, 10);
+  if (base == 10) {  /* standard conversion */
+    luaL_checktype(L, 1, "any");
+    if (lua_isnumber(L, 1)) {
+      lua_pushnumber(L, lua_tonumber(L, 1));
+      return 1;
+    }
+  }
+  else {
+    const char *s1 = luaL_check_string(L, 1);
+    char *s2;
+    unsigned long n;
+    luaL_arg_check(L, 2 <= base && base <= 36, 2, "base out of range");
+    n = strtoul(s1, &s2, base);
+    if (s1 != s2) {  /* at least one valid digit? */
+      while (isspace((unsigned char)*s2)) s2++;  /* skip trailing spaces */
+      if (*s2 == '\0') {  /* no invalid trailing characters? */
+        lua_pushnumber(L, n);
+        return 1;
+      }
+    }
+  }
+  lua_pushnil(L);  /* else not a number */
+  return 1;
+}
+
+
+static int luaB_error (lua_State *L) {
+  lua_error(L, luaL_opt_string(L, 1, NULL));
+  return 0;  /* to avoid warnings */
+}
+
+static int luaB_setglobal (lua_State *L) {
+  luaL_checktype(L, 2, "any");
+  lua_setglobal(L, luaL_check_string(L, 1));
+  return 0;
+}
+
+static int luaB_getglobal (lua_State *L) {
+  lua_getglobal(L, luaL_check_string(L, 1));
+  return 1;
+}
+
+static int luaB_tag (lua_State *L) {
+  luaL_checktype(L, 1, "any");
+  lua_pushnumber(L, lua_tag(L, 1));
+  return 1;
+}
+
+static int luaB_settag (lua_State *L) {
+  luaL_checktype(L, 1, "table");
+  lua_pushvalue(L, 1);  /* push table */
+  lua_settag(L, luaL_check_int(L, 2));
+  lua_pop(L, 1);  /* remove second argument */
+  return 1;  /* return first argument */
+}
+
+static int luaB_newtag (lua_State *L) {
+  lua_pushnumber(L, lua_newtag(L));
+  return 1;
+}
+
+static int luaB_copytagmethods (lua_State *L) {
+  lua_pushnumber(L, lua_copytagmethods(L, luaL_check_int(L, 1),
+                                          luaL_check_int(L, 2)));
+  return 1;
+}
+
+static int luaB_globals (lua_State *L) {
+  lua_getglobals(L);  /* value to be returned */
+  if (!lua_isnull(L, 1)) {
+    luaL_checktype(L, 1, "table");
+    lua_pushvalue(L, 1);  /* new table of globals */
+    lua_setglobals(L);
+  }
+  return 1;
+}
+
+static int luaB_rawget (lua_State *L) {
+  luaL_checktype(L, 1, "table");
+  luaL_checktype(L, 2, "any");
+  lua_rawget(L, -2);
+  return 1;
+}
+
+static int luaB_rawset (lua_State *L) {
+  luaL_checktype(L, 1, "table");
+  luaL_checktype(L, 2, "any");
+  luaL_checktype(L, 3, "any");
+  lua_rawset(L, -3);
+  return 1;
+}
+
+static int luaB_settagmethod (lua_State *L) {
+  int tag = (int)luaL_check_int(L, 1);
+  const char *event = luaL_check_string(L, 2);
+  luaL_arg_check(L, lua_isfunction(L, 3) || lua_isnil(L, 3), 3,
+                 "function or nil expected");
+  lua_pushnil(L);  /* to get its tag */
+  if (strcmp(event, "gc") == 0 && tag != lua_tag(L, -1))
+    lua_error(L, "deprecated use: cannot set the `gc' tag method from Lua");
+  lua_pop(L, 1);  /* remove the nil */
+  lua_settagmethod(L, tag, event);
+  return 1;
+}
+
+static int luaB_gettagmethod (lua_State *L) {
+  lua_gettagmethod(L, luaL_check_int(L, 1), luaL_check_string(L, 2));
+  return 1;
+}
+
+
+static int luaB_collectgarbage (lua_State *L) {
+  lua_pushnumber(L, lua_collectgarbage(L, luaL_opt_int(L, 1, 0)));
+  return 1;
+}
+
+
+static int luaB_type (lua_State *L) {
+  luaL_checktype(L, 1, "any");
+  lua_pushstring(L, lua_type(L, 1));
+  return 1;
+}
+
+
+static int luaB_next (lua_State *L) {
+  luaL_checktype(L, 1, "table");
+  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
+  if (lua_next(L, 1))
+    return 2;
+  else {
+    lua_pushnil(L);
+    return 1;
+  }
+}
+
+
+static int passresults (lua_State *L, int status, int oldtop) {
+  static const char *const errornames[] =
+    {"ok", "run-time error", "file error", "syntax error", "memory error"};
+  if (status == 0) {
+    int nresults = lua_gettop(L) - oldtop;
+    if (nresults > 0)
+      return nresults;  /* results are already on the stack */
+    else {
+      lua_pushuserdata(L, NULL);  /* at least one result to signal no errors */
+      return 1;
+    }
+  }
+  else {  /* error */
+    lua_pushnil(L);
+    lua_pushstring(L, errornames[status]);  /* error code */
+    return 2;
+  }
+}
+
+static int luaB_dostring (lua_State *L) {
+  int oldtop = lua_gettop(L);
+  size_t l;
+  const char *s = luaL_check_lstr(L, 1, &l);
+  if (*s == '\27')  /* binary files start with ESC... */
+    lua_error(L, "`dostring' cannot run pre-compiled code");
+  return passresults(L, lua_dobuffer(L, s, l, luaL_opt_string(L, 2, s)), oldtop);
+}
+
+
+static int luaB_dofile (lua_State *L) {
+  int oldtop = lua_gettop(L);
+  const char *fname = luaL_opt_string(L, 1, NULL);
+  return passresults(L, lua_dofile(L, fname), oldtop);
+}
+
+
+static int luaB_call (lua_State *L) {
+  int oldtop;
+  const char *options = luaL_opt_string(L, 3, "");
+  int err = 0;  /* index of old error method */
+  int i, status;
+  int n;
+  luaL_checktype(L, 2, "table");
+  n = lua_getn(L, 2);
+  if (!lua_isnull(L, 4)) {  /* set new error method */
+    lua_getglobal(L, LUA_ERRORMESSAGE);
+    err = lua_gettop(L);  /* get index */
+    lua_pushvalue(L, 4);
+    lua_setglobal(L, LUA_ERRORMESSAGE);
+  }
+  oldtop = lua_gettop(L);  /* top before function-call preparation */
+  /* push function */
+  lua_pushvalue(L, 1);
+  luaL_checkstack(L, n, "too many arguments");
+  for (i=0; i<n; i++)  /* push arg[1...n] */
+    lua_rawgeti(L, 2, i+1);
+  status = lua_call(L, n, LUA_MULTRET);
+  if (err != 0) {  /* restore old error method */
+    lua_pushvalue(L, err);
+    lua_setglobal(L, LUA_ERRORMESSAGE);
+  }
+  if (status != 0) {  /* error in call? */
+    if (strchr(options, 'x'))
+      lua_pushnil(L);  /* return nil to signal the error */
+    else
+      lua_error(L, NULL);  /* propagate error without additional messages */
+    return 1;
+  }
+  if (strchr(options, 'p'))  /* pack results? */
+    lua_error(L, "deprecated option `p' in `call'");
+  return lua_gettop(L) - oldtop;  /* results are already on the stack */
+}
+
+
+static int luaB_tostring (lua_State *L) {
+  char buff[64];
+  switch (lua_type(L, 1)[2]) {
+    case 'm':  /* nuMber */
+      lua_pushstring(L, lua_tostring(L, 1));
+      return 1;
+    case 'r':  /* stRing */
+      lua_pushvalue(L, 1);
+      return 1;
+    case 'b':  /* taBle */
+      sprintf(buff, "table: %p", lua_topointer(L, 1));
+      break;
+    case 'n':  /* fuNction */
+      sprintf(buff, "function: %p", lua_topointer(L, 1));
+      break;
+    case 'e':  /* usErdata */
+      sprintf(buff, "userdata(%d): %p", lua_tag(L, 1), lua_touserdata(L, 1));
+      break;
+    case 'l':  /* niL */
+      lua_pushstring(L, "nil");
+      return 1;
+    default:
+      luaL_argerror(L, 1, "value expected");
+  }
+  lua_pushstring(L, buff);
+  return 1;
+}
+
+
+static int luaB_foreachi (lua_State *L) {
+  int n, i;
+  luaL_checktype(L, 1, "table");
+  luaL_checktype(L, 2, "function");
+  n = lua_getn(L, 1);
+  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_rawcall(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_checktype(L, 1, "table");
+  luaL_checktype(L, 2, "function");
+  lua_pushnil(L);  /* first index */
+  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_rawcall(L, 2, 1);
+    if (!lua_isnil(L, -1))
+      return 1;
+    lua_pop(L, 2);  /* remove value and result */
+  }
+}
+
+
+static int luaB_assert (lua_State *L) {
+  luaL_checktype(L, 1, "any");
+  if (lua_isnil(L, 1))
+    luaL_verror(L, "assertion failed!  %.90s", luaL_opt_string(L, 2, ""));
+  return 0;
+}
+
+
+static int luaB_getn (lua_State *L) {
+  luaL_checktype(L, 1, "table");
+  lua_pushnumber(L, lua_getn(L, 1));
+  return 1;
+}
+
+
+static int luaB_tinsert (lua_State *L) {
+  int v = lua_gettop(L);  /* last argument: to be inserted */
+  int n, pos;
+  luaL_checktype(L, 1, "table");
+  n = lua_getn(L, 1);
+  if (v == 2)  /* called with only 2 arguments */
+    pos = n+1;
+  else
+    pos = luaL_check_int(L, 2);  /* 2nd argument is the position */
+  lua_pushstring(L, "n");
+  lua_pushnumber(L, n+1);
+  lua_rawset(L, 1);  /* t.n = n+1 */
+  for (; n>=pos; n--) {
+    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 pos, n;
+  luaL_checktype(L, 1, "table");
+  n = lua_getn(L, 1);
+  pos = luaL_opt_int(L, 2, n);
+  if (n <= 0) return 0;  /* table is "empty" */
+  lua_rawgeti(L, 1, pos);  /* result = t[pos] */
+  for ( ;pos<n; pos++) {
+    lua_rawgeti(L, 1, pos+1);
+    lua_rawseti(L, 1, pos);  /* a[pos] = a[pos+1] */
+  }
+  lua_pushstring(L, "n");
+  lua_pushnumber(L, n-1);
+  lua_rawset(L, 1);  /* t.n = n-1 */
+  lua_pushnil(L);
+  lua_rawseti(L, 1, n);  /* t[n] = nil */
+  return 1;
+}
+
+
+
+
+/*
+** {======================================================
+** Quicksort
+** (based on `Algorithms in MODULA-3', Robert Sedgewick;
+**  Addison-Wesley, 1993.)
+*/
+
+
+static void swap (lua_State *L, int i, int j) {
+  lua_rawgeti(L, 1, i);
+  lua_rawgeti(L, 1, j);
+  lua_rawseti(L, 1, i);
+  lua_rawseti(L, 1, j);
+}
+
+static int sort_comp (lua_State *L, int n, int r) {
+  /* WARNING: the caller (auxsort) must ensure stack space */
+  int res;
+  if (!lua_isnil(L, 2)) {  /* function? */
+    lua_pushvalue(L, 2);
+    if (r) {
+      lua_rawgeti(L, 1, n);   /* a[n] */
+      lua_pushvalue(L, -3);  /* pivot */
+    }
+    else {
+      lua_pushvalue(L, -2);  /* pivot */
+      lua_rawgeti(L, 1, n);   /* a[n] */
+    }
+    lua_rawcall(L, 2, 1);
+    res = !lua_isnil(L, -1);
+  }
+  else {  /* a < b? */
+    lua_rawgeti(L, 1, n);   /* a[n] */
+    if (r)  
+      res = lua_lessthan(L, -1, -2);
+    else
+      res = lua_lessthan(L, -2, -1);
+  }
+  lua_pop(L, 1);
+  return res;
+}
+
+static void auxsort (lua_State *L, int l, int u) {
+  while (l < u) {  /* for tail recursion */
+    int i, j;
+    luaL_checkstack(L, 4, "array too large");
+    /* sort elements a[l], a[(l+u)/2] and a[u] */
+    lua_rawgeti(L, 1, u);
+    if (sort_comp(L, l, 0))  /* a[u] < a[l]? */
+      swap(L, l, u);
+    lua_pop(L, 1);
+    if (u-l == 1) break;  /* only 2 elements */
+    i = (l+u)/2;
+    lua_rawgeti(L, 1, i);  /* Pivot = a[i] */
+    if (sort_comp(L, l, 0))  /* a[i]<a[l]? */
+      swap(L, l, i);
+    else {
+      if (sort_comp(L, u, 1))  /* a[u]<a[i]? */
+        swap(L, i, u);
+    }
+    lua_pop(L, 1);  /* pop old a[i] */
+    if (u-l == 2) break;  /* only 3 elements */
+    lua_rawgeti(L, 1, i);  /* Pivot */
+    swap(L, i, u-1);  /* put median element as pivot (a[u-1]) */
+    /* a[l] <= P == a[u-1] <= a[u], only needs to sort from l+1 to u-2 */
+    i = l; j = u-1;
+    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
+      /* repeat i++ until a[i] >= P */
+      while (sort_comp(L, ++i, 1))
+        if (i>u) lua_error(L, "invalid order function for sorting");
+      /* repeat j-- until a[j] <= P */
+      while (sort_comp(L, --j, 0))
+        if (j<l) lua_error(L, "invalid order function for sorting");
+      if (j<i) break;
+      swap(L, i, j);
+    }
+    swap(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;
+    }
+    lua_pop(L, 1);  /* remove pivot from stack */
+    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;
+  luaL_checktype(L, 1, "table");
+  n = lua_getn(L, 1);
+  if (!lua_isnull(L, 2))  /* is there a 2nd argument? */
+    luaL_checktype(L, 2, "function");
+  lua_settop(L, 2);  /* make sure there is two arguments */
+  auxsort(L, 1, n);
+  return 0;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Deprecated functions to manipulate global environment.
+** =======================================================
+*/
+
+
+#define num_deprecated	4
+
+static const struct luaL_reg deprecated_names [num_deprecated] = {
+  {"foreachvar", luaB_foreach},
+  {"nextvar", luaB_next},
+  {"rawgetglobal", luaB_rawget},
+  {"rawsetglobal", luaB_rawset}
+};
+
+
+#ifdef LUA_DEPRECATETFUNCS
+
+/*
+** call corresponding function inserting `globals' as first argument
+*/
+static int deprecated_func (lua_State *L) {
+  lua_insert(L, 1);  /* upvalue is the function to be called */
+  lua_getglobals(L);
+  lua_insert(L, 2);  /* table of globals is 1o argument */
+  lua_rawcall(L, lua_gettop(L)-1, LUA_MULTRET);
+  return lua_gettop(L);  /* return all results */
+}
+
+
+static void deprecated_funcs (lua_State *L) {
+  int i;
+  for (i=0; i<num_deprecated; i++) {
+    lua_pushcfunction(L, deprecated_names[i].func);
+    lua_pushcclosure(L, deprecated_func, 1);
+    lua_setglobal(L, deprecated_names[i].name);
+  }
+}
+
+
+#else
+
+/*
+** gives an explicit error in any attempt to call a deprecated function
+*/
+static int deprecated_func (lua_State *L) {
+  luaL_verror(L, "function `%.20s' is deprecated", lua_tostring(L, -1));
+  return 0;  /* to avoid warnings */
+}
+
+
+static void deprecated_funcs (lua_State *L) {
+  int i;
+  for (i=0; i<num_deprecated; i++) {
+    lua_pushstring(L, deprecated_names[i].name);
+    lua_pushcclosure(L, deprecated_func, 1);
+    lua_setglobal(L, deprecated_names[i].name);
+  }
+}
+
+#endif
+
+/* }====================================================== */
+
+static const struct luaL_reg base_funcs[] = {
+  {LUA_ALERT, luaB__ALERT},
+  {LUA_ERRORMESSAGE, luaB__ERRORMESSAGE},
+  {"call", luaB_call},
+  {"collectgarbage", luaB_collectgarbage},
+  {"copytagmethods", luaB_copytagmethods},
+  {"dofile", luaB_dofile},
+  {"dostring", luaB_dostring},
+  {"error", luaB_error},
+  {"foreach", luaB_foreach},
+  {"foreachi", luaB_foreachi},
+  {"getglobal", luaB_getglobal},
+  {"gettagmethod", luaB_gettagmethod},
+  {"globals", luaB_globals},
+  {"newtag", luaB_newtag},
+  {"next", luaB_next},
+  {"print", luaB_print},
+  {"rawget", luaB_rawget},
+  {"rawset", luaB_rawset},
+  {"rawgettable", luaB_rawget},  /* for compatibility */
+  {"rawsettable", luaB_rawset},  /* for compatibility */
+  {"setglobal", luaB_setglobal},
+  {"settag", luaB_settag},
+  {"settagmethod", luaB_settagmethod},
+  {"tag", luaB_tag},
+  {"tonumber", luaB_tonumber},
+  {"tostring", luaB_tostring},
+  {"type", luaB_type},
+  {"assert", luaB_assert},
+  {"getn", luaB_getn},
+  {"sort", luaB_sort},
+  {"tinsert", luaB_tinsert},
+  {"tremove", luaB_tremove}
+};
+
+
+
+void lua_baselibopen (lua_State *L) {
+  luaL_openl(L, base_funcs);
+  lua_pushstring(L, LUA_VERSION);
+  lua_setglobal(L, "_VERSION");
+  deprecated_funcs(L);
+}
+

lbuffer.c

@@ -1,75 +0,0 @@
-/*
-** $Id: lbuffer.c,v 1.8 1999/02/25 19:20:40 roberto Exp roberto $
-** Auxiliary functions for building Lua libraries
-** See Copyright Notice in lua.h
-*/
-
-
-#include <stdio.h>
-
-#include "lauxlib.h"
-#include "lmem.h"
-#include "lstate.h"
-
-
-/*-------------------------------------------------------
-**  Auxiliary buffer
--------------------------------------------------------*/
-
-
-#define EXTRABUFF	32
-
-
-#define openspace(size)  if (L->Mbuffnext+(size) > L->Mbuffsize) Openspace(size)
-
-static void Openspace (int size) {
-  lua_State *l = L;  /* to optimize */
-  size += EXTRABUFF;
-  l->Mbuffsize = l->Mbuffnext+size;
-  luaM_growvector(l->Mbuffer, l->Mbuffnext, size, char, arrEM, MAX_INT);
-}
-
-
-char *luaL_openspace (int size) {
-  openspace(size);
-  return L->Mbuffer+L->Mbuffnext;
-}
-
-
-void luaL_addchar (int c) {
-  openspace(1);
-  L->Mbuffer[L->Mbuffnext++] = (char)c;
-}
-
-
-void luaL_resetbuffer (void) {
-  L->Mbuffnext = L->Mbuffbase;
-}
-
-
-void luaL_addsize (int n) {
-  L->Mbuffnext += n;
-}
-
-int luaL_getsize (void) {
-  return L->Mbuffnext-L->Mbuffbase;
-}
-
-int luaL_newbuffer (int size) {
-  int old = L->Mbuffbase;
-  openspace(size);
-  L->Mbuffbase = L->Mbuffnext;
-  return old;
-}
-
-
-void luaL_oldbuffer (int old) {
-  L->Mbuffnext = L->Mbuffbase;
-  L->Mbuffbase = old;
-}
-
-
-char *luaL_buffer (void) {
-  return L->Mbuffer+L->Mbuffbase;
-}
-

lbuiltin.c

@@ -1,726 +0,0 @@
-/*
-** $Id: lbuiltin.c,v 1.55 1999/03/01 20:22:16 roberto Exp roberto $
-** Built-in functions
-** See Copyright Notice in lua.h
-*/
-
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lapi.h"
-#include "lauxlib.h"
-#include "lbuiltin.h"
-#include "ldo.h"
-#include "lfunc.h"
-#include "lmem.h"
-#include "lobject.h"
-#include "lstate.h"
-#include "lstring.h"
-#include "ltable.h"
-#include "ltm.h"
-#include "lua.h"
-#include "lundump.h"
-#include "lvm.h"
-
-
-
-/*
-** {======================================================
-** Auxiliary functions
-** =======================================================
-*/
-
-
-static void pushtagstring (TaggedString *s) {
-  TObject o;
-  o.ttype = LUA_T_STRING;
-  o.value.ts = s;
-  luaA_pushobject(&o);
-}
-
-
-static real getsize (Hash *h) {
-  real max = 0;
-  int i;
-  for (i = 0; i<nhash(h); i++) {
-    Node *n = h->node+i;
-    if (ttype(ref(n)) == LUA_T_NUMBER && 
-        ttype(val(n)) != LUA_T_NIL &&
-        nvalue(ref(n)) > max)
-      max = nvalue(ref(n));
-  }
-  return max;
-}
-
-
-static real getnarg (Hash *a) {
-  TObject index;
-  TObject *value;
-  /* value = table.n */
-  ttype(&index) = LUA_T_STRING;
-  tsvalue(&index) = luaS_new("n");
-  value = luaH_get(a, &index);
-  return (ttype(value) == LUA_T_NUMBER) ? nvalue(value) : getsize(a);
-}
-
-
-static Hash *gethash (int arg) {
-  return avalue(luaA_Address(luaL_tablearg(arg)));
-}
-
-/* }====================================================== */
-
-
-/*
-** {======================================================
-** Functions that use only the official API
-** =======================================================
-*/
-
-
-/*
-** If your system does not support "stderr", redefine this function, or
-** redefine _ERRORMESSAGE so that it won't need _ALERT.
-*/
-static void luaB_alert (void) {
-  fputs(luaL_check_string(1), stderr);
-}
-
-
-/*
-** Standard implementation of _ERRORMESSAGE.
-** The library "iolib" redefines _ERRORMESSAGE for better error information.
-*/
-static void error_message (void) {
-  lua_Object al = lua_rawgetglobal("_ALERT");
-  if (lua_isfunction(al)) {  /* avoid error loop if _ALERT is not defined */
-    char buff[600];
-    sprintf(buff, "lua error: %.500s\n", luaL_check_string(1));
-    lua_pushstring(buff);
-    lua_callfunction(al);
-  }
-}
-
-
-/*
-** If your system does not support "stdout", just remove this function.
-** If you need, you can define your own "print" function, following this
-** model but changing "fputs" to put the strings at a proper place
-** (a console window or a log file, for instance).
-*/
-#define MAXPRINT	40
-static void luaB_print (void) {
-  lua_Object args[MAXPRINT];
-  lua_Object obj;
-  int n = 0;
-  int i;
-  while ((obj = lua_getparam(n+1)) != LUA_NOOBJECT) {
-    luaL_arg_check(n < MAXPRINT, n+1, "too many arguments");
-    args[n++] = obj;
-  }
-  for (i=0; i<n; i++) {
-    lua_pushobject(args[i]);
-    if (lua_call("tostring"))
-      lua_error("error in `tostring' called by `print'");
-    obj = lua_getresult(1);
-    if (!lua_isstring(obj))
-      lua_error("`tostring' must return a string to `print'");
-    if (i>0) fputs("\t", stdout);
-    fputs(lua_getstring(obj), stdout);
-  }
-  fputs("\n", stdout);
-}
-
-
-static void luaB_tonumber (void) {
-  int base = luaL_opt_int(2, 10);
-  if (base == 10) {  /* standard conversion */
-    lua_Object o = lua_getparam(1);
-    if (lua_isnumber(o)) lua_pushnumber(lua_getnumber(o));
-    else lua_pushnil();  /* not a number */
-  }
-  else {
-    char *s = luaL_check_string(1);
-    long n;
-    luaL_arg_check(0 <= base && base <= 36, 2, "base out of range");
-    n = strtol(s, &s, base);
-    while (isspace((unsigned char)*s)) s++;  /* skip trailing spaces */
-    if (*s) lua_pushnil();  /* invalid format: return nil */
-    else lua_pushnumber(n);
-  }
-}
-
-
-static void luaB_error (void) {
-  lua_error(lua_getstring(lua_getparam(1)));
-}
-
-static void luaB_setglobal (void) {
-  char *n = luaL_check_string(1);
-  lua_Object value = luaL_nonnullarg(2);
-  lua_pushobject(value);
-  lua_setglobal(n);
-  lua_pushobject(value);  /* return given value */
-}
-
-static void luaB_rawsetglobal (void) {
-  char *n = luaL_check_string(1);
-  lua_Object value = luaL_nonnullarg(2);
-  lua_pushobject(value);
-  lua_rawsetglobal(n);
-  lua_pushobject(value);  /* return given value */
-}
-
-static void luaB_getglobal (void) {
-  lua_pushobject(lua_getglobal(luaL_check_string(1)));
-}
-
-static void luaB_rawgetglobal (void) {
-  lua_pushobject(lua_rawgetglobal(luaL_check_string(1)));
-}
-
-static void luaB_luatag (void) {
-  lua_pushnumber(lua_tag(lua_getparam(1)));
-}
-
-static void luaB_settag (void) {
-  lua_Object o = luaL_tablearg(1);
-  lua_pushobject(o);
-  lua_settag(luaL_check_int(2));
-  lua_pushobject(o);  /* return first argument */
-}
-
-static void luaB_newtag (void) {
-  lua_pushnumber(lua_newtag());
-}
-
-static void luaB_copytagmethods (void) {
-  lua_pushnumber(lua_copytagmethods(luaL_check_int(1),
-                                    luaL_check_int(2)));
-}
-
-static void luaB_rawgettable (void) {
-  lua_pushobject(luaL_nonnullarg(1));
-  lua_pushobject(luaL_nonnullarg(2));
-  lua_pushobject(lua_rawgettable());
-}
-
-static void luaB_rawsettable (void) {
-  lua_pushobject(luaL_nonnullarg(1));
-  lua_pushobject(luaL_nonnullarg(2));
-  lua_pushobject(luaL_nonnullarg(3));
-  lua_rawsettable();
-}
-
-static void luaB_settagmethod (void) {
-  lua_Object nf = luaL_nonnullarg(3);
-  lua_pushobject(nf);
-  lua_pushobject(lua_settagmethod(luaL_check_int(1), luaL_check_string(2)));
-}
-
-static void luaB_gettagmethod (void) {
-  lua_pushobject(lua_gettagmethod(luaL_check_int(1), luaL_check_string(2)));
-}
-
-static void luaB_seterrormethod (void) {
-  lua_Object nf = luaL_functionarg(1);
-  lua_pushobject(nf);
-  lua_pushobject(lua_seterrormethod());
-}
-
-static void luaB_collectgarbage (void) {
-  lua_pushnumber(lua_collectgarbage(luaL_opt_int(1, 0)));
-}
-
-/* }====================================================== */
-
-
-/*
-** {======================================================
-** Functions that could use only the official API but
-** do not, for efficiency.
-** =======================================================
-*/
-
-static void luaB_dostring (void) {
-  long l;
-  char *s = luaL_check_lstr(1, &l);
-  if (*s == ID_CHUNK)
-    lua_error("`dostring' cannot run pre-compiled code");
-  if (lua_dobuffer(s, l, luaL_opt_string(2, s)) == 0)
-    if (luaA_passresults() == 0)
-      lua_pushuserdata(NULL);  /* at least one result to signal no errors */
-}
-
-
-static void luaB_dofile (void) {
-  char *fname = luaL_opt_string(1, NULL);
-  if (lua_dofile(fname) == 0)
-    if (luaA_passresults() == 0)
-      lua_pushuserdata(NULL);  /* at least one result to signal no errors */
-}
-
-
-static void luaB_call (void) {
-  lua_Object f = luaL_nonnullarg(1);
-  Hash *arg = gethash(2);
-  char *options = luaL_opt_string(3, "");
-  lua_Object err = lua_getparam(4);
-  int narg = (int)getnarg(arg);
-  int i, status;
-  if (err != LUA_NOOBJECT) {  /* set new error method */
-    lua_pushobject(err);
-    err = lua_seterrormethod();
-  }
-  /* push arg[1...n] */
-  luaD_checkstack(narg);
-  for (i=0; i<narg; i++)
-    *(L->stack.top++) = *luaH_getint(arg, i+1);
-  status = lua_callfunction(f);
-  if (err != LUA_NOOBJECT) {  /* restore old error method */
-    lua_pushobject(err);
-    lua_seterrormethod();
-  }
-  if (status != 0) {  /* error in call? */
-    if (strchr(options, 'x')) {
-      lua_pushnil();
-      return;  /* return nil to signal the error */
-    }
-    else
-      lua_error(NULL);
-  }
-  else {  /* no errors */
-    if (strchr(options, 'p'))
-      luaA_packresults();
-    else
-      luaA_passresults();
-  }
-}
-
-
-static void luaB_nextvar (void) {
-  TObject *o = luaA_Address(luaL_nonnullarg(1));
-  TaggedString *g;
-  if (ttype(o) == LUA_T_NIL)
-    g = NULL;
-  else {
-    luaL_arg_check(ttype(o) == LUA_T_STRING, 1, "variable name expected");
-    g = tsvalue(o);
-  }
-  if (!luaA_nextvar(g))
-    lua_pushnil();
-}
-
-
-static void luaB_next (void) {
-  Hash *a = gethash(1);
-  TObject *k = luaA_Address(luaL_nonnullarg(2));
-  int i = (ttype(k) == LUA_T_NIL) ? 0 : luaH_pos(a, k)+1;
-  if (luaA_next(a, i) == 0)
-    lua_pushnil();
-}
-
-
-static void luaB_tostring (void) {
-  lua_Object obj = lua_getparam(1);
-  TObject *o = luaA_Address(obj);
-  char buff[64];
-  switch (ttype(o)) {
-    case LUA_T_NUMBER:
-      lua_pushstring(lua_getstring(obj));
-      return;
-    case LUA_T_STRING:
-      lua_pushobject(obj);
-      return;
-    case LUA_T_ARRAY:
-      sprintf(buff, "table: %p", (void *)o->value.a);
-      break;
-    case LUA_T_CLOSURE:
-      sprintf(buff, "function: %p", (void *)o->value.cl);
-      break;
-    case LUA_T_PROTO:
-      sprintf(buff, "function: %p", (void *)o->value.tf);
-      break;
-    case LUA_T_CPROTO:
-      sprintf(buff, "function: %p", (void *)o->value.f);
-      break;
-    case LUA_T_USERDATA:
-      sprintf(buff, "userdata: %p", o->value.ts->u.d.v);
-      break;
-    case LUA_T_NIL:
-      lua_pushstring("nil");
-      return;
-    default:
-      LUA_INTERNALERROR("invalid type");
-  }
-  lua_pushstring(buff);
-}
-
-
-static void luaB_type (void) {
-  lua_Object o = luaL_nonnullarg(1);
-  lua_pushstring(luaO_typename(luaA_Address(o)));
-  lua_pushnumber(lua_tag(o));
-}
-
-/* }====================================================== */
-
-
-
-/*
-** {======================================================
-** "Extra" functions
-** These functions can be written in Lua, so you can
-**  delete them if you need a tiny Lua implementation.
-** If you delete them, remove their entries in array
-** "builtin_funcs".
-** =======================================================
-*/
-
-static void luaB_assert (void) {
-  lua_Object p = lua_getparam(1);
-  if (p == LUA_NOOBJECT || lua_isnil(p))
-    luaL_verror("assertion failed!  %.100s", luaL_opt_string(2, ""));
-}
-
-
-static void luaB_foreachi (void) {
-  Hash *t = gethash(1);
-  TObject *f = luaA_Address(luaL_functionarg(2));
-  int i;
-  int n = (int)getnarg(t);
-  luaD_checkstack(3);  /* for f, ref, and val */
-  for (i=1; i<=n; i++) {
-    *(L->stack.top++) = *f;
-    ttype(L->stack.top) = LUA_T_NUMBER; nvalue(L->stack.top++) = i;
-    *(L->stack.top++) = *luaH_getint(t, i);
-    luaD_calln(2, 1);
-    if (ttype(L->stack.top-1) != LUA_T_NIL)
-      return;
-    L->stack.top--;
-  }
-}
-
-
-static void luaB_foreach (void) {
-  Hash *a = gethash(1);
-  TObject *f = luaA_Address(luaL_functionarg(2));
-  int i;
-  luaD_checkstack(3);  /* for f, ref, and val */
-  for (i=0; i<a->nhash; i++) {
-    Node *nd = &(a->node[i]);
-    if (ttype(val(nd)) != LUA_T_NIL) {
-      *(L->stack.top++) = *f;
-      *(L->stack.top++) = *ref(nd);
-      *(L->stack.top++) = *val(nd);
-      luaD_calln(2, 1);
-      if (ttype(L->stack.top-1) != LUA_T_NIL)
-        return;
-      L->stack.top--;  /* remove result */
-    }
-  }
-}
-
-
-static void luaB_foreachvar (void) {
-  TObject *f = luaA_Address(luaL_functionarg(1));
-  GCnode *g;
-  luaD_checkstack(4);  /* for extra var name, f, var name, and globalval */
-  for (g = L->rootglobal.next; g; g = g->next) {
-    TaggedString *s = (TaggedString *)g;
-    if (s->u.s.globalval.ttype != LUA_T_NIL) {
-      pushtagstring(s);  /* keep (extra) s on stack to avoid GC */
-      *(L->stack.top++) = *f;
-      pushtagstring(s);
-      *(L->stack.top++) = s->u.s.globalval;
-      luaD_calln(2, 1);
-      if (ttype(L->stack.top-1) != LUA_T_NIL) {
-        L->stack.top--;
-        *(L->stack.top-1) = *L->stack.top;  /* remove extra s */
-        return;
-      }
-      L->stack.top-=2;  /* remove result and extra s */
-    }
-  }
-}
-
-
-static void luaB_getn (void) {
-  lua_pushnumber(getnarg(gethash(1)));
-}
-
-
-static void luaB_tinsert (void) {
-  Hash *a = gethash(1);
-  lua_Object v = lua_getparam(3);
-  int n = (int)getnarg(a);
-  int pos;
-  if (v != LUA_NOOBJECT)
-    pos = luaL_check_int(2);
-  else {  /* called with only 2 arguments */
-    v = luaL_nonnullarg(2);
-    pos = n+1;
-  }
-  luaV_setn(a, n+1);  /* increment field "n" */
-  for ( ;n>=pos; n--)
-    luaH_move(a, n, n+1);
-  luaH_setint(a, pos, luaA_Address(v));
-}
-
-
-static void luaB_tremove (void) {
-  Hash *a = gethash(1);
-  int n = (int)getnarg(a);
-  int pos = luaL_opt_int(2, n);
-  if (n <= 0) return;  /* table is "empty" */
-  luaA_pushobject(luaH_getint(a, pos));  /* push result */
-  luaV_setn(a, n-1);  /* decrement field "n" */
-  for ( ;pos<n; pos++)
-    luaH_move(a, pos+1, pos);
-}
-
-
-/* {
-** Quicksort
-*/
-
-static void swap (Hash *a, int i, int j) {
-  TObject temp;
-  temp = *luaH_getint(a, i);
-  luaH_move(a, j, i);
-  luaH_setint(a, j, &temp);
-}
-
-static int sort_comp (TObject *f, TObject *a, TObject *b) {
-  /* notice: the caller (auxsort) must check stack space */
-  if (f) {
-    *(L->stack.top) = *f;
-    *(L->stack.top+1) = *a;
-    *(L->stack.top+2) = *b;
-    L->stack.top += 3;
-    luaD_calln(2, 1);
-  }
-  else {  /* a < b? */
-    *(L->stack.top) = *a;
-    *(L->stack.top+1) = *b;
-    L->stack.top += 2;
-    luaV_comparison(LUA_T_NUMBER, LUA_T_NIL, LUA_T_NIL, IM_LT);
-  }
-  return ttype(--(L->stack.top)) != LUA_T_NIL;
-}
-
-static void auxsort (Hash *a, int l, int u, TObject *f) {
-  while (l < u) {  /* for tail recursion */
-    TObject *P;
-    int i, j;
-    /* sort elements a[l], a[(l+u)/2] and a[u] */
-    if (sort_comp(f, luaH_getint(a, u), luaH_getint(a, l)))  /* a[l]>a[u]? */
-      swap(a, l, u);
-    if (u-l == 1) break;  /* only 2 elements */
-    i = (l+u)/2;
-    P = luaH_getint(a, i);
-    if (sort_comp(f, P, luaH_getint(a, l)))  /* a[l]>a[i]? */
-      swap(a, l, i);
-    else if (sort_comp(f, luaH_getint(a, u), P))  /* a[i]>a[u]? */
-      swap(a, i, u);
-    if (u-l == 2) break;  /* only 3 elements */
-    P = L->stack.top++;
-    *P = *luaH_getint(a, i);  /* save pivot on stack (for GC) */
-    swap(a, i, u-1);  /* put median element as pivot (a[u-1]) */
-    /* a[l] <= P == a[u-1] <= a[u], only needs to sort from l+1 to u-2 */
-    i = l; j = u-1;
-    for  (;;) {
-      /* invariant: a[l..i] <= P <= a[j..u] */
-      while (sort_comp(f, luaH_getint(a, ++i), P))  /* stop when a[i] >= P */
-        if (i>u) lua_error("invalid order function for sorting");
-      while (sort_comp(f, P, luaH_getint(a, --j)))  /* stop when a[j] <= P */
-        if (j<l) lua_error("invalid order function for sorting");
-      if (j<i) break;
-      swap(a, i, j);
-    }
-    swap(a, u-1, i);  /* swap pivot (a[u-1]) with a[i] */
-    L->stack.top--;  /* remove pivot from stack */
-    /* 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(a, j, i, f);  /* call recursively the smaller one */
-  }  /* repeat the routine for the larger one */
-}
-
-static void luaB_sort (void) {
-  lua_Object t = lua_getparam(1);
-  Hash *a = gethash(1);
-  int n = (int)getnarg(a);
-  lua_Object func = lua_getparam(2);
-  TObject *f = luaA_Address(func);
-  luaL_arg_check(!f || lua_isfunction(func), 2, "function expected");
-  luaD_checkstack(4);  /* for Pivot, f, a, b (sort_comp) */
-  auxsort(a, 1, n, f);
-  lua_pushobject(t);
-}
-
-/* }}===================================================== */
-
-
-/*
-** ====================================================== */
-
-
-
-#ifdef DEBUG
-/*
-** {======================================================
-** some DEBUG functions
-** =======================================================
-*/
-
-static void mem_query (void) {
-  lua_pushnumber(totalmem);
-  lua_pushnumber(numblocks);
-}
-
-
-static void query_strings (void) {
-  lua_pushnumber(L->string_root[luaL_check_int(1)].nuse);
-}
-
-
-static void countlist (void) {
-  char *s = luaL_check_string(1);
-  GCnode *l = (s[0]=='t') ? L->roottable.next : (s[0]=='c') ? L->rootcl.next :
-              (s[0]=='p') ? L->rootproto.next : L->rootglobal.next;
-  int i=0;
-  while (l) {
-    i++;
-    l = l->next;
-  }
-  lua_pushnumber(i);
-}
-
-
-static void testC (void) {
-#define getnum(s)	((*s++) - '0')
-#define getname(s)	(nome[0] = *s++, nome)
-
-  static int locks[10];
-  lua_Object reg[10];
-  char nome[2];
-  char *s = luaL_check_string(1);
-  nome[1] = 0;
-  for (;;) {
-    switch (*s++) {
-      case '0': case '1': case '2': case '3': case '4':
-      case '5': case '6': case '7': case '8': case '9':
-        lua_pushnumber(*(s-1) - '0');
-        break;
-
-      case 'c': reg[getnum(s)] = lua_createtable(); break;
-      case 'C': { lua_CFunction f = lua_getcfunction(lua_getglobal(getname(s)));
-                  lua_pushcclosure(f, getnum(s));
-                  break;
-                }
-      case 'P': reg[getnum(s)] = lua_pop(); break;
-      case 'g': { int n=getnum(s); reg[n]=lua_getglobal(getname(s)); break; }
-      case 'G': { int n = getnum(s);
-                  reg[n] = lua_rawgetglobal(getname(s));
-                  break;
-                }
-      case 'l': locks[getnum(s)] = lua_ref(1); break;
-      case 'L': locks[getnum(s)] = lua_ref(0); break;
-      case 'r': { int n=getnum(s); reg[n]=lua_getref(locks[getnum(s)]); break; }
-      case 'u': lua_unref(locks[getnum(s)]); break;
-      case 'p': { int n = getnum(s); reg[n] = lua_getparam(getnum(s)); break; }
-      case '=': lua_setglobal(getname(s)); break;
-      case 's': lua_pushstring(getname(s)); break;
-      case 'o': lua_pushobject(reg[getnum(s)]); break;
-      case 'f': lua_call(getname(s)); break;
-      case 'i': reg[getnum(s)] = lua_gettable(); break;
-      case 'I': reg[getnum(s)] = lua_rawgettable(); break;
-      case 't': lua_settable(); break;
-      case 'T': lua_rawsettable(); break;
-      case 'N' : lua_pushstring(lua_nextvar(lua_getstring(reg[getnum(s)])));
-                 break;
-      case 'n' : { int n=getnum(s);
-                   n=lua_next(reg[n], (int)lua_getnumber(reg[getnum(s)]));
-                   lua_pushnumber(n); break;
-                 }
-      default: luaL_verror("unknown command in `testC': %c", *(s-1));
-    }
-  if (*s == 0) return;
-  if (*s++ != ' ') lua_error("missing ` ' between commands in `testC'");
-  }
-}
-
-/* }====================================================== */
-#endif
-
-
-
-static struct luaL_reg builtin_funcs[] = {
-#ifdef LUA_COMPAT2_5
-  {"setfallback", luaT_setfallback},
-#endif
-#ifdef DEBUG
-  {"testC", testC},
-  {"totalmem", mem_query},
-  {"count", countlist},
-  {"querystr", query_strings},
-#endif
-  {"_ALERT", luaB_alert},
-  {"_ERRORMESSAGE", error_message},
-  {"call", luaB_call},
-  {"collectgarbage", luaB_collectgarbage},
-  {"copytagmethods", luaB_copytagmethods},
-  {"dofile", luaB_dofile},
-  {"dostring", luaB_dostring},
-  {"error", luaB_error},
-  {"getglobal", luaB_getglobal},
-  {"gettagmethod", luaB_gettagmethod},
-  {"newtag", luaB_newtag},
-  {"next", luaB_next},
-  {"nextvar", luaB_nextvar},
-  {"print", luaB_print},
-  {"rawgetglobal", luaB_rawgetglobal},
-  {"rawgettable", luaB_rawgettable},
-  {"rawsetglobal", luaB_rawsetglobal},
-  {"rawsettable", luaB_rawsettable},
-  {"seterrormethod", luaB_seterrormethod},
-  {"setglobal", luaB_setglobal},
-  {"settag", luaB_settag},
-  {"settagmethod", luaB_settagmethod},
-  {"tag", luaB_luatag},
-  {"tonumber", luaB_tonumber},
-  {"tostring", luaB_tostring},
-  {"type", luaB_type},
-  /* "Extra" functions */
-  {"assert", luaB_assert},
-  {"foreach", luaB_foreach},
-  {"foreachi", luaB_foreachi},
-  {"foreachvar", luaB_foreachvar},
-  {"getn", luaB_getn},
-  {"sort", luaB_sort},
-  {"tinsert", luaB_tinsert},
-  {"tremove", luaB_tremove}
-};
-
-
-#define INTFUNCSIZE (sizeof(builtin_funcs)/sizeof(builtin_funcs[0]))
-
-
-void luaB_predefine (void) {
-  /* pre-register mem error messages, to avoid loop when error arises */
-  luaS_newfixedstring(tableEM);
-  luaS_newfixedstring(memEM);
-  luaL_openlib(builtin_funcs, (sizeof(builtin_funcs)/sizeof(builtin_funcs[0])));
-  lua_pushstring(LUA_VERSION);
-  lua_setglobal("_VERSION");
-}
-

lbuiltin.h

@@ -1,14 +0,0 @@
-/*
-** $Id: $
-** Built-in functions
-** See Copyright Notice in lua.h
-*/
-
-#ifndef lbuiltin_h
-#define lbuiltin_h
-
-
-void luaB_predefine (void);
-
-
-#endif

lcode.c

@@ -0,0 +1,700 @@
+/*
+** $Id: lcode.c,v 1.49 2000/08/15 13:18:28 roberto Exp roberto $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+
+#include "stdlib.h"
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldo.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+
+
+void luaK_error (LexState *ls, const 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 CREATE_0(OP_END);  /* no optimizations after an `END' */
+}
+
+
+int luaK_jump (FuncState *fs) {
+  int j = luaK_code1(fs, OP_JMP, 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;
+  }
+  return j;
+}
+
+
+static void luaK_fixjump (FuncState *fs, int pc, int dest) {
+  Instruction *jmp = &fs->f->code[pc];
+  if (dest == NO_JUMP)
+    SETARG_S(*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_S)
+      luaK_error(fs->ls, "control structure too long");
+    SETARG_S(*jmp, offset);
+  }
+}
+
+
+static int luaK_getjump (FuncState *fs, int pc) {
+  int offset = GETARG_S(fs->f->code[pc]);
+  if (offset == NO_JUMP)  /* point to itself represents end of list */
+    return NO_JUMP;  /* end of list */
+  else
+    return (pc+1)+offset;  /* turn offset into absolute position */
+}
+
+
+/*
+** 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) */
+  }
+  return fs->pc;
+}
+
+
+void luaK_deltastack (FuncState *fs, int delta) {
+  fs->stacklevel += delta;
+  if (fs->stacklevel > fs->f->maxstacksize) {
+    if (fs->stacklevel > MAXSTACK)
+      luaK_error(fs->ls, "function or expression too complex");
+    fs->f->maxstacksize = fs->stacklevel;
+  }
+}
+
+
+void luaK_kstr (LexState *ls, int c) {
+  luaK_code1(ls->fs, OP_PUSHSTRING, c);
+}
+
+
+static int number_constant (FuncState *fs, Number r) {
+  /* check whether `r' has appeared within the last LOOKBACKNUMS entries */
+  Proto *f = fs->f;
+  int c = f->nknum;
+  int lim = c < LOOKBACKNUMS ? 0 : c-LOOKBACKNUMS;
+  while (--c >= lim)
+    if (f->knum[c] == r) return c;
+  /* not found; create a new entry */
+  luaM_growvector(fs->L, f->knum, f->nknum, 1, Number,
+                  "constant table overflow", MAXARG_U);
+  c = f->nknum++;
+  f->knum[c] = r;
+  return c;
+}
+
+
+void luaK_number (FuncState *fs, Number f) {
+  if (f <= (Number)MAXARG_S && (Number)(int)f == f)
+    luaK_code1(fs, OP_PUSHINT, (int)f);  /* f has a short integer value */
+  else
+    luaK_code1(fs, OP_PUSHNUM, number_constant(fs, f));
+}
+
+
+void luaK_adjuststack (FuncState *fs, int n) {
+  if (n > 0)
+    luaK_code1(fs, OP_POP, n);
+  else
+    luaK_code1(fs, OP_PUSHNIL, -n);
+}
+
+
+int luaK_lastisopen (FuncState *fs) {
+  /* check whether last instruction is an open function call */
+  Instruction i = previous_instruction(fs);
+  if (GET_OPCODE(i) == OP_CALL && GETARG_B(i) == MULT_RET)
+    return 1;
+  else return 0;
+}
+
+
+void luaK_setcallreturns (FuncState *fs, int nresults) {
+  if (luaK_lastisopen(fs)) {  /* expression is an open function call? */
+    SETARG_B(fs->f->code[fs->pc-1], nresults);  /* set number of results */
+    luaK_deltastack(fs, nresults);  /* push results */
+  }
+}
+
+
+static int discharge (FuncState *fs, expdesc *var) {
+  switch (var->k) {
+    case VLOCAL:
+      luaK_code1(fs, OP_GETLOCAL, var->u.index);
+      break;
+    case VGLOBAL:
+      luaK_code1(fs, OP_GETGLOBAL, var->u.index);
+      break;
+    case VINDEXED:
+      luaK_code0(fs, OP_GETTABLE);
+      break;
+    case VEXP:
+      return 0;  /* nothing to do */
+  }
+  var->k = VEXP;
+  var->u.l.t = var->u.l.f = NO_JUMP;
+  return 1;
+}
+
+
+static void discharge1 (FuncState *fs, expdesc *var) {
+  discharge(fs, var);
+ /* if it has jumps then it is already discharged */
+  if (var->u.l.t == NO_JUMP && var->u.l.f  == NO_JUMP)
+    luaK_setcallreturns(fs, 1);  /* call must return 1 value */
+}
+
+
+void luaK_storevar (LexState *ls, const expdesc *var) {
+  FuncState *fs = ls->fs;
+  switch (var->k) {
+    case VLOCAL:
+      luaK_code1(fs, OP_SETLOCAL, var->u.index);
+      break;
+    case VGLOBAL:
+      luaK_code1(fs, OP_SETGLOBAL, var->u.index);
+      break;
+    case VINDEXED:  /* table is at top-3; pop 3 elements after operation */
+      luaK_code2(fs, OP_SETTABLE, 3, 3);
+      break;
+    default:
+      LUA_INTERNALERROR("invalid var kind to store");
+  }
+}
+
+
+static OpCode invertjump (OpCode op) {
+  switch (op) {
+    case OP_JMPNE: return OP_JMPEQ;
+    case OP_JMPEQ: return OP_JMPNE;
+    case OP_JMPLT: return OP_JMPGE;
+    case OP_JMPLE: return OP_JMPGT;
+    case OP_JMPGT: return OP_JMPLE;
+    case OP_JMPGE: return OP_JMPLT;
+    case OP_JMPT: case OP_JMPONT:  return OP_JMPF;
+    case OP_JMPF: case OP_JMPONF:  return OP_JMPT;
+    default:
+      LUA_INTERNALERROR("invalid jump instruction");
+      return OP_END;  /* to avoid warnings */
+  }
+}
+
+
+static void luaK_patchlistaux (FuncState *fs, int list, int target,
+                               OpCode special, int special_target) {
+  Instruction *code = fs->f->code;
+  while (list != NO_JUMP) {
+    int next = luaK_getjump(fs, list);
+    Instruction *i = &code[list];
+    OpCode op = GET_OPCODE(*i);
+    if (op == special)  /* this `op' already has a value */
+      luaK_fixjump(fs, list, special_target);
+    else {
+      luaK_fixjump(fs, list, target);  /* do the patch */
+      if (op == OP_JMPONT)  /* remove eventual values */
+        SET_OPCODE(*i, OP_JMPT);
+      else if (op == OP_JMPONF)
+        SET_OPCODE(*i, OP_JMPF);
+    }
+    list = next;
+  }
+}
+
+
+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
+    luaK_patchlistaux(fs, list, target, OP_END, 0);
+}
+
+
+static int need_value (FuncState *fs, int list, OpCode hasvalue) {
+  /* check whether list has a jump without a value */
+  for (; list != NO_JUMP; list = luaK_getjump(fs, list))
+    if (GET_OPCODE(fs->f->code[list]) != hasvalue) return 1;
+  return 0;  /* not found */
+}
+
+
+void luaK_concat (FuncState *fs, int *l1, int l2) {
+  if (*l1 == NO_JUMP)
+    *l1 = l2;
+  else {
+    int list = *l1;
+    for (;;) {  /* traverse `l1' */
+      int next = luaK_getjump(fs, list);
+      if (next == NO_JUMP) {  /* end of list? */
+        luaK_fixjump(fs, list, l2);
+        return;
+      }
+      list = next;
+    }
+  }
+}
+
+
+static void luaK_testgo (FuncState *fs, expdesc *v, int invert, OpCode jump) {
+  int prevpos;  /* position of last instruction */
+  Instruction *previous;
+  int *golist, *exitlist;
+  if (!invert) {
+    golist = &v->u.l.f;    /* go if false */
+    exitlist = &v->u.l.t;  /* exit if true */
+  }
+  else {
+    golist = &v->u.l.t;    /* go if true */
+    exitlist = &v->u.l.f;  /* exit if false */
+  }
+  discharge1(fs, v);
+  prevpos = fs->pc-1;
+  previous = &fs->f->code[prevpos];
+  LUA_ASSERT(*previous==previous_instruction(fs), "no jump allowed here");
+  if (!ISJUMP(GET_OPCODE(*previous)))
+    prevpos = luaK_code1(fs, jump, NO_JUMP);
+  else {  /* last instruction is already a jump */
+    if (invert)
+      SET_OPCODE(*previous, invertjump(GET_OPCODE(*previous)));
+  }
+  luaK_concat(fs, exitlist, prevpos);  /* insert last jump in `exitlist' */
+  luaK_patchlist(fs, *golist, luaK_getlabel(fs));
+  *golist = NO_JUMP;
+}
+
+
+void luaK_goiftrue (FuncState *fs, expdesc *v, int keepvalue) {
+  luaK_testgo(fs, v, 1, keepvalue ? OP_JMPONF : OP_JMPF);
+}
+
+
+static void luaK_goiffalse (FuncState *fs, expdesc *v, int keepvalue) {
+  luaK_testgo(fs, v, 0, keepvalue ? OP_JMPONT : OP_JMPT);
+}
+
+
+static int code_label (FuncState *fs, OpCode op, int arg) {
+  luaK_getlabel(fs);  /* those instructions may be jump targets */
+  return luaK_code1(fs, op, arg);
+}
+
+
+void luaK_tostack (LexState *ls, expdesc *v, int onlyone) {
+  FuncState *fs = ls->fs;
+  if (!discharge(fs, v)) {  /* `v' is an expression? */
+    OpCode previous = GET_OPCODE(fs->f->code[fs->pc-1]);
+    if (!ISJUMP(previous) && v->u.l.f == NO_JUMP && v->u.l.t == NO_JUMP) {
+      /* expression has no jumps */
+      if (onlyone)
+        luaK_setcallreturns(fs, 1);  /* call must return 1 value */
+    }
+    else {  /* expression has jumps */
+      int final;  /* position after whole expression */
+      int j = NO_JUMP;  /*  eventual  jump over values */
+      int p_nil = NO_JUMP;  /* position of an eventual PUSHNIL */
+      int p_1 = NO_JUMP;  /* position of an eventual PUSHINT */
+      if (ISJUMP(previous) || need_value(fs, v->u.l.f, OP_JMPONF)
+                           || need_value(fs, v->u.l.t, OP_JMPONT)) {
+        /* expression needs values */
+        if (ISJUMP(previous))
+          luaK_concat(fs, &v->u.l.t, fs->pc-1);  /* put `previous' in t. list */
+        else {
+          j = code_label(fs, OP_JMP, NO_JUMP);  /* to jump over both pushes */
+          /* correct stack for compiler and symbolic execution */
+          luaK_adjuststack(fs, 1);
+        }
+        p_nil = code_label(fs, OP_PUSHNILJMP, 0);
+        p_1 = code_label(fs, OP_PUSHINT, 1);
+        luaK_patchlist(fs, j, luaK_getlabel(fs));
+      }
+      final = luaK_getlabel(fs);
+      luaK_patchlistaux(fs, v->u.l.f, p_nil, OP_JMPONF, final);
+      luaK_patchlistaux(fs, v->u.l.t, p_1, OP_JMPONT, final);
+      v->u.l.f = v->u.l.t = NO_JUMP;
+    }
+  }
+}
+
+
+void luaK_prefix (LexState *ls, UnOpr op, expdesc *v) {
+  FuncState *fs = ls->fs;
+  if (op == OPR_MINUS) {
+    luaK_tostack(ls, v, 1);
+    luaK_code0(fs, OP_MINUS);
+  }
+  else {  /* op == NOT */
+    Instruction *previous;
+    discharge1(fs, v);
+    previous = &fs->f->code[fs->pc-1];
+    if (ISJUMP(GET_OPCODE(*previous)))
+      SET_OPCODE(*previous, invertjump(GET_OPCODE(*previous)));
+    else
+      luaK_code0(fs, OP_NOT);
+    /* interchange true and false lists */
+    { int temp = v->u.l.f; v->u.l.f = v->u.l.t; v->u.l.t = temp; }
+  }
+}
+
+
+void luaK_infix (LexState *ls, BinOpr op, expdesc *v) {
+  FuncState *fs = ls->fs;
+  switch (op) {
+    case OPR_AND:
+      luaK_goiftrue(fs, v, 1);
+      break;
+    case OPR_OR:
+      luaK_goiffalse(fs, v, 1);
+      break;
+    default:
+      luaK_tostack(ls, v, 1);  /* all other binary operators need a value */
+  }
+}
+
+
+
+static const struct {
+  OpCode opcode;  /* opcode for each binary operator */
+  int arg;        /* default argument for the opcode */
+} codes[] = {  /* ORDER OPR */
+      {OP_ADD, 0}, {OP_SUB, 0}, {OP_MULT, 0}, {OP_DIV, 0},
+      {OP_POW, 0}, {OP_CONCAT, 2},
+      {OP_JMPNE, NO_JUMP}, {OP_JMPEQ, NO_JUMP},
+      {OP_JMPLT, NO_JUMP}, {OP_JMPLE, NO_JUMP},
+      {OP_JMPGT, NO_JUMP}, {OP_JMPGE, NO_JUMP}
+};
+
+
+void luaK_posfix (LexState *ls, BinOpr op, expdesc *v1, expdesc *v2) {
+  FuncState *fs = ls->fs;
+  switch (op) {
+    case OPR_AND: {
+      LUA_ASSERT(v1->u.l.t == NO_JUMP, "list must be closed");
+      discharge1(fs, v2);
+      v1->u.l.t = v2->u.l.t;
+      luaK_concat(fs, &v1->u.l.f, v2->u.l.f);
+      break;
+    }
+    case OPR_OR: {
+      LUA_ASSERT(v1->u.l.f == NO_JUMP, "list must be closed");
+      discharge1(fs, v2);
+      v1->u.l.f = v2->u.l.f;
+      luaK_concat(fs, &v1->u.l.t, v2->u.l.t);
+      break;
+    }
+    default: {
+      luaK_tostack(ls, v2, 1);  /* `v2' must be a value */
+      luaK_code1(fs, codes[op].opcode, codes[op].arg);
+    }
+  }
+}
+
+
+static void codelineinfo (FuncState *fs) {
+  LexState *ls = fs->ls;
+  if (ls->lastline > fs->lastline) {
+    luaM_growvector(fs->L, fs->f->lineinfo, fs->nlineinfo, 2, int,
+                    "line info overflow", MAX_INT);
+    if (ls->lastline > fs->lastline+1)
+      fs->f->lineinfo[fs->nlineinfo++] = -(ls->lastline - (fs->lastline+1));
+    fs->f->lineinfo[fs->nlineinfo++] = fs->pc;
+    fs->lastline = ls->lastline;
+  }
+}
+
+
+int luaK_code0 (FuncState *fs, OpCode o) {
+  return luaK_code2(fs, o, 0, 0);
+}
+
+
+int luaK_code1 (FuncState *fs, OpCode o, int arg1) {
+  return luaK_code2(fs, o, arg1, 0);
+}
+
+
+int luaK_code2 (FuncState *fs, OpCode o, int arg1, int arg2) {
+  Instruction i = previous_instruction(fs);
+  int delta = luaK_opproperties[o].push - luaK_opproperties[o].pop;
+  int optm = 0;  /* 1 when there is an optimization */
+  switch (o) {
+    case OP_CLOSURE: {
+      delta = -arg2+1;
+      break;
+    }
+    case OP_SETTABLE: {
+      delta = -arg2;
+      break;
+    }
+    case OP_SETLIST: {
+      if (arg2 == 0) return NO_JUMP;  /* nothing to do */
+      delta = -arg2;
+      break;
+    }
+    case OP_SETMAP: {
+      if (arg1 == 0) return NO_JUMP;  /* nothing to do */
+      delta = -2*arg1;
+      break;
+    }
+    case OP_RETURN: {
+      if (GET_OPCODE(i) == OP_CALL && GETARG_B(i) == MULT_RET) {
+        SET_OPCODE(i, OP_TAILCALL);
+        SETARG_B(i, arg1);
+        optm = 1;
+      }
+      break;
+    }
+    case OP_PUSHNIL: {
+      if (arg1 == 0) return NO_JUMP;  /* nothing to do */
+      delta = arg1;
+      switch(GET_OPCODE(i)) {
+        case OP_PUSHNIL: SETARG_U(i, GETARG_U(i)+arg1); optm = 1; break;
+        default: break;
+      }
+      break;
+    }
+    case OP_POP: {
+      if (arg1 == 0) return NO_JUMP;  /* nothing to do */
+      delta = -arg1;
+      switch(GET_OPCODE(i)) {
+        case OP_SETTABLE: SETARG_B(i, GETARG_B(i)+arg1); optm = 1; break;
+        default: break;
+      }
+      break;
+    }
+    case OP_GETTABLE: {
+      switch(GET_OPCODE(i)) {
+        case OP_PUSHSTRING:  /* `t.x' */
+          SET_OPCODE(i, OP_GETDOTTED);
+          optm = 1;
+          break;
+        case OP_GETLOCAL:  /* `t[i]' */
+          SET_OPCODE(i, OP_GETINDEXED);
+          optm = 1;
+          break;
+        default: break;
+      }
+      break;
+    }
+    case OP_ADD: {
+      switch(GET_OPCODE(i)) {
+        case OP_PUSHINT: SET_OPCODE(i, OP_ADDI); optm = 1; break;  /* `a+k' */
+        default: break;
+      }
+      break;
+    }
+    case OP_SUB: {
+      switch(GET_OPCODE(i)) {
+        case OP_PUSHINT:  /* `a-k' */
+          i = CREATE_S(OP_ADDI, -GETARG_S(i));
+          optm = 1;
+          break;
+        default: break;
+      }
+      break;
+    }
+    case OP_CONCAT: {
+      delta = -arg1+1;
+      switch(GET_OPCODE(i)) {
+        case OP_CONCAT:  /* `a..b..c' */
+          SETARG_U(i, GETARG_U(i)+1);
+          optm = 1;
+          break;
+        default: break;
+      }
+      break;
+    }
+    case OP_MINUS: {
+      switch(GET_OPCODE(i)) {
+        case OP_PUSHINT:  /* `-k' */
+          SETARG_S(i, -GETARG_S(i));
+          optm = 1;
+          break;
+        case OP_PUSHNUM:  /* `-k' */
+          SET_OPCODE(i, OP_PUSHNEGNUM);
+          optm = 1;
+          break;
+        default: break;
+      }
+      break;
+    }
+    case OP_JMPNE: {
+      if (i == CREATE_U(OP_PUSHNIL, 1)) {  /* `a~=nil' */
+        i = CREATE_S(OP_JMPT, NO_JUMP);
+        optm = 1;
+      }
+      break;
+    }
+    case OP_JMPEQ: {
+      if (i == CREATE_U(OP_PUSHNIL, 1)) {  /* `a==nil' */
+        i = CREATE_0(OP_NOT);
+        delta = -1;  /* just undo effect of previous PUSHNIL */
+        optm = 1;
+      }
+      break;
+    }
+    case OP_JMPT:
+    case OP_JMPONT: {
+      switch (GET_OPCODE(i)) {
+        case OP_NOT: {
+          i = CREATE_S(OP_JMPF, NO_JUMP);
+          optm = 1;
+          break;
+        }
+        case OP_PUSHINT: {
+          if (o == OP_JMPT) {  /* JMPONT must keep original integer value */
+            i = CREATE_S(OP_JMP, NO_JUMP);
+            optm = 1;
+          }
+          break;
+        }
+        case OP_PUSHNIL: {
+          if (GETARG_U(i) == 1) {
+            fs->pc--;  /* erase previous instruction */
+            luaK_deltastack(fs, -1);  /* correct stack */
+            return NO_JUMP; 
+          }
+          break;
+        }
+        default: break;
+      }
+      break;
+    }
+    case OP_JMPF:
+    case OP_JMPONF: {
+      switch (GET_OPCODE(i)) {
+        case OP_NOT: {
+          i = CREATE_S(OP_JMPT, NO_JUMP);
+          optm = 1;
+          break;
+        }
+        case OP_PUSHINT: {  /* `while 1 do ...' */
+          fs->pc--;  /* erase previous instruction */
+          luaK_deltastack(fs, -1);  /* correct stack */
+          return NO_JUMP; 
+        }
+        case OP_PUSHNIL: {  /* `repeat ... until nil' */
+          if (GETARG_U(i) == 1) {
+            i = CREATE_S(OP_JMP, NO_JUMP);
+            optm = 1;
+          }
+          break;
+        }
+        default: break;
+      }
+      break;
+    }
+    case OP_GETDOTTED:
+    case OP_GETINDEXED:
+    case OP_TAILCALL:
+    case OP_ADDI: {
+      LUA_INTERNALERROR("instruction used only for optimizations");
+      break;
+    }
+    default: {
+      LUA_ASSERT(delta != VD, "invalid delta");
+      break;
+    }
+  }
+  luaK_deltastack(fs, delta);
+  if (optm) {  /* optimize: put instruction in place of last one */
+      fs->f->code[fs->pc-1] = i;  /* change previous instruction */
+      return fs->pc-1;  /* do not generate new instruction */
+  }
+  /* else build new instruction */
+  switch ((enum Mode)luaK_opproperties[o].mode) {
+    case iO: i = CREATE_0(o); break;
+    case iU: i = CREATE_U(o, arg1); break;
+    case iS: i = CREATE_S(o, arg1); break;
+    case iAB: i = CREATE_AB(o, arg1, arg2); break;
+  }
+  codelineinfo(fs);
+  /* put new instruction in code array */
+  luaM_growvector(fs->L, fs->f->code, fs->pc, 1, Instruction,
+                  "code size overflow", MAX_INT);
+  fs->f->code[fs->pc] = i;
+  return fs->pc++;
+}
+
+
+const struct OpProperties luaK_opproperties[NUM_OPCODES] = {
+  {iO, 0, 0},	/* OP_END */
+  {iU, 0, 0},	/* OP_RETURN */
+  {iAB, 0, 0},	/* OP_CALL */
+  {iAB, 0, 0},	/* OP_TAILCALL */
+  {iU, VD, 0},	/* OP_PUSHNIL */
+  {iU, VD, 0},	/* OP_POP */
+  {iS, 1, 0},	/* OP_PUSHINT */
+  {iU, 1, 0},	/* OP_PUSHSTRING */
+  {iU, 1, 0},	/* OP_PUSHNUM */
+  {iU, 1, 0},	/* OP_PUSHNEGNUM */
+  {iU, 1, 0},	/* OP_PUSHUPVALUE */
+  {iU, 1, 0},	/* OP_GETLOCAL */
+  {iU, 1, 0},	/* OP_GETGLOBAL */
+  {iO, 1, 2},	/* OP_GETTABLE */
+  {iU, 1, 1},	/* OP_GETDOTTED */
+  {iU, 1, 1},	/* OP_GETINDEXED */
+  {iU, 2, 1},	/* OP_PUSHSELF */
+  {iU, 1, 0},	/* OP_CREATETABLE */
+  {iU, 0, 1},	/* OP_SETLOCAL */
+  {iU, 0, 1},	/* OP_SETGLOBAL */
+  {iAB, VD, 0},	/* OP_SETTABLE */
+  {iAB, VD, 0},	/* OP_SETLIST */
+  {iU, VD, 0},	/* OP_SETMAP */
+  {iO, 1, 2},	/* OP_ADD */
+  {iS, 1, 1},	/* OP_ADDI */
+  {iO, 1, 2},	/* OP_SUB */
+  {iO, 1, 2},	/* OP_MULT */
+  {iO, 1, 2},	/* OP_DIV */
+  {iO, 1, 2},	/* OP_POW */
+  {iU, VD, 0},	/* OP_CONCAT */
+  {iO, 1, 1},	/* OP_MINUS */
+  {iO, 1, 1},	/* OP_NOT */
+  {iS, 0, 2},	/* OP_JMPNE */
+  {iS, 0, 2},	/* OP_JMPEQ */
+  {iS, 0, 2},	/* OP_JMPLT */
+  {iS, 0, 2},	/* OP_JMPLE */
+  {iS, 0, 2},	/* OP_JMPGT */
+  {iS, 0, 2},	/* OP_JMPGE */
+  {iS, 0, 1},	/* OP_JMPT */
+  {iS, 0, 1},	/* OP_JMPF */
+  {iS, 0, 1},	/* OP_JMPONT */
+  {iS, 0, 1},	/* OP_JMPONF */
+  {iS, 0, 0},	/* OP_JMP */
+  {iO, 0, 0},	/* OP_PUSHNILJMP */
+  {iS, 0, 0},	/* OP_FORPREP */
+  {iS, 0, 3},	/* OP_FORLOOP */
+  {iS, 2, 0},	/* OP_LFORPREP */
+  {iS, 0, 3},	/* OP_LFORLOOP */
+  {iAB, VD, 0}	/* OP_CLOSURE */
+};
+

lcode.h

@@ -0,0 +1,70 @@
+/*
+** $Id: lcode.h,v 1.15 2000/06/28 20:20:36 roberto Exp roberto $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lcode_h
+#define lcode_h
+
+#include "llex.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+
+
+/*
+** Marks the end of a patch list. It is an invalid value both as an absolute
+** address, and as a list link (would link an element to itself).
+*/
+#define NO_JUMP (-1)
+
+
+/*
+** grep "ORDER OPR" if you change these enums
+*/
+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_AND, OPR_OR,
+  OPR_NOBINOPR
+} BinOpr;
+
+typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_NOUNOPR } UnOpr;
+
+
+enum Mode {iO, iU, iS, iAB};  /* instruction format */
+
+#define VD	100	/* flag for variable delta */
+
+extern const struct OpProperties {
+  char mode;
+  unsigned char push;
+  unsigned char pop;
+} luaK_opproperties[];
+
+
+void luaK_error (LexState *ls, const char *msg);
+int luaK_code0 (FuncState *fs, OpCode o);
+int luaK_code1 (FuncState *fs, OpCode o, int arg1);
+int luaK_code2 (FuncState *fs, OpCode o, int arg1, int arg2);
+int luaK_jump (FuncState *fs);
+void luaK_patchlist (FuncState *fs, int list, int target);
+void luaK_concat (FuncState *fs, int *l1, int l2);
+void luaK_goiftrue (FuncState *fs, expdesc *v, int keepvalue);
+int luaK_getlabel (FuncState *fs);
+void luaK_deltastack (FuncState *fs, int delta);
+void luaK_kstr (LexState *ls, int c);
+void luaK_number (FuncState *fs, Number f);
+void luaK_adjuststack (FuncState *fs, int n);
+int luaK_lastisopen (FuncState *fs);
+void luaK_setcallreturns (FuncState *fs, int nresults);
+void luaK_tostack (LexState *ls, expdesc *v, int onlyone);
+void luaK_storevar (LexState *ls, const expdesc *var);
+void luaK_prefix (LexState *ls, UnOpr op, expdesc *v);
+void luaK_infix (LexState *ls, BinOpr op, expdesc *v);
+void luaK_posfix (LexState *ls, BinOpr op, expdesc *v1, expdesc *v2);
+
+
+#endif

ldblib.c

@@ -1,217 +1,180 @@
 /*
-** $Id: ldblib.c,v 1.4 1999/02/04 17:47:59 roberto Exp roberto $
+** $Id: ldblib.c,v 1.20 2000/09/05 19:33:32 roberto Exp roberto $
 ** Interface from Lua to its debug API
 ** See Copyright Notice in lua.h
 */
 
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lauxlib.h"
 #include "lua.h"
+
+#include "lauxlib.h"
 #include "luadebug.h"
 #include "lualib.h"
 
 
 
-static void settabss (lua_Object t, char *i, char *v) {
-  lua_pushobject(t);
-  lua_pushstring(i);
-  lua_pushstring(v);
-  lua_settable();
+static void settabss (lua_State *L, const char *i, const char *v) {
+  lua_pushstring(L, i);
+  lua_pushstring(L, v);
+  lua_settable(L, -3);
 }
 
 
-static void settabsi (lua_Object t, char *i, int v) {
-  lua_pushobject(t);
-  lua_pushstring(i);
-  lua_pushnumber(v);
-  lua_settable();
+static void settabsi (lua_State *L, const char *i, int v) {
+  lua_pushstring(L, i);
+  lua_pushnumber(L, v);
+  lua_settable(L, -3);
 }
 
 
-static lua_Object getfuncinfo (lua_Object func) {
-  lua_Object result = lua_createtable();
-  char *str;
-  int line;
-  lua_funcinfo(func, &str, &line);
-  if (line == -1)  /* C function? */
-    settabss(result, "kind", "C");
-  else if (line == 0) {  /* "main"? */
-      settabss(result, "kind", "chunk");
-      settabss(result, "source", str);
-    }
-  else {  /* Lua function */
-    settabss(result, "kind", "Lua");
-    settabsi(result, "def_line", line);
-    settabss(result, "source", str);
-  }
-  if (line != 0) {  /* is it not a "main"? */
-    char *kind = lua_getobjname(func, &str);
-    if (*kind) {
-      settabss(result, "name", str);
-      settabss(result, "where", kind);
+static int getinfo (lua_State *L) {
+  lua_Debug ar;
+  const char *options = luaL_opt_string(L, 2, "flnSu");
+  char buff[20];
+  if (lua_isnumber(L, 1)) {
+    if (!lua_getstack(L, (int)lua_tonumber(L, 1), &ar)) {
+      lua_pushnil(L);  /* level out of range */
+      return 1;
     }
   }
-  return result;
-}
-
-
-static void getstack (void) {
-  lua_Object func = lua_stackedfunction(luaL_check_int(1));
-  if (func == LUA_NOOBJECT)  /* level out of range? */
-    return;
-  else {
-    lua_Object result = getfuncinfo(func);
-    int currline = lua_currentline(func);
-    if (currline > 0)
-      settabsi(result, "current", currline);
-    lua_pushobject(result);
-    lua_pushstring("func");
-    lua_pushobject(func);
-    lua_settable();  /* result.func = func */
-    lua_pushobject(result);
+  else if (lua_isfunction(L, 1)) {
+    lua_pushvalue(L, 1);
+    sprintf(buff, ">%.10s", options);
+    options = buff;
   }
-}
-
-
-static void funcinfo (void) {
-  lua_pushobject(getfuncinfo(luaL_functionarg(1)));
-}
-
-
-static int findlocal (lua_Object func, int arg) {
-  lua_Object v = lua_getparam(arg);
-  if (lua_isnumber(v))
-    return (int)lua_getnumber(v);
-  else {
-    char *name = luaL_check_string(arg);
-    int i = 0;
-    int result = -1;
-    char *vname;
-    while (lua_getlocal(func, ++i, &vname) != LUA_NOOBJECT) {
-      if (strcmp(name, vname) == 0)
-        result = i;  /* keep looping to get the last var with this name */
-    }
-    if (result == -1)
-      luaL_verror("no local variable `%.50s' at given level", name);
-    return result;
-  }
-}
-
-
-static void getlocal (void) {
-  lua_Object func = lua_stackedfunction(luaL_check_int(1));
-  lua_Object val;
-  char *name;
-  if (func == LUA_NOOBJECT)  /* level out of range? */
-    return;  /* return nil */
-  else if (lua_getparam(2) != LUA_NOOBJECT) {  /* 2nd argument? */
-    if ((val = lua_getlocal(func, findlocal(func, 2), &name)) != LUA_NOOBJECT) {
-      lua_pushobject(val);
-      lua_pushstring(name);
-    }
-    /* else return nil */
-  }
-  else {  /* collect all locals in a table */
-    lua_Object result = lua_createtable();
-    int i;
-    for (i=1; ;i++) {
-      if ((val = lua_getlocal(func, i, &name)) == LUA_NOOBJECT)
+  else
+    luaL_argerror(L, 1, "function or level expected");
+  if (!lua_getinfo(L, options, &ar))
+    luaL_argerror(L, 2, "invalid option");
+  lua_newtable(L);
+  for (; *options; options++) {
+    switch (*options) {
+      case 'S':
+        settabss(L, "source", ar.source);
+        if (ar.source)
+          settabss(L, "short_src", ar.short_src);
+        settabsi(L, "linedefined", ar.linedefined);
+        settabss(L, "what", ar.what);
+        break;
+      case 'l':
+        settabsi(L, "currentline", ar.currentline);
+        break;
+      case 'u':
+        settabsi(L, "nups", ar.nups);
+        break;
+      case 'n':
+        settabss(L, "name", ar.name);
+        settabss(L, "namewhat", ar.namewhat);
+        break;
+      case 'f':
+        lua_pushstring(L, "func");
+        lua_pushvalue(L, -3);
+        lua_settable(L, -3);
         break;
-      lua_pushobject(result);
-      lua_pushstring(name);
-      lua_pushobject(val);
-      lua_settable();  /* result[name] = value */
     }
-    lua_pushobject(result);
   }
+  return 1;  /* return table */
 }
+    
 
-
-static void setlocal (void) {
-  lua_Object func = lua_stackedfunction(luaL_check_int(1));
-  int numvar;
-  luaL_arg_check(func != LUA_NOOBJECT, 1, "level out of range");
-  numvar = findlocal(func, 2);
-  lua_pushobject(luaL_nonnullarg(3));
-  if (!lua_setlocal(func, numvar))
-    lua_error("no such local variable");
-}
-
-
-
-static int linehook = -1;  /* Lua reference to line hook function */
-static int callhook = -1;  /* Lua reference to call hook function */
-
-
-static void dohook (int ref) {
-  lua_LHFunction oldlinehook = lua_setlinehook(NULL);
-  lua_CHFunction oldcallhook = lua_setcallhook(NULL);
-  lua_callfunction(lua_getref(ref));
-  lua_setlinehook(oldlinehook);
-  lua_setcallhook(oldcallhook);
-}
-
-
-static void linef (int line) {
-  lua_pushnumber(line);
-  dohook(linehook);
-}
-
-
-static void callf (lua_Function func, char *file, int line) {
-  if (func != LUA_NOOBJECT) {
-    lua_pushobject(func);
-    lua_pushstring(file);
-    lua_pushnumber(line);
-  }
-  dohook(callhook);
-}
-
-
-static void setcallhook (void) {
-  lua_Object f = lua_getparam(1);
-  lua_unref(callhook);
-  if (f == LUA_NOOBJECT) {
-    callhook = -1;
-    lua_setcallhook(NULL);
+static int getlocal (lua_State *L) {
+  lua_Debug ar;
+  const char *name;
+  if (!lua_getstack(L, luaL_check_int(L, 1), &ar))  /* level out of range? */
+    luaL_argerror(L, 1, "level out of range");
+  name = lua_getlocal(L, &ar, luaL_check_int(L, 2));
+  if (name) {
+    lua_pushstring(L, name);
+    lua_pushvalue(L, -2);
+    return 2;
   }
   else {
-    lua_pushobject(f);
-    callhook = lua_ref(1);
-    lua_setcallhook(callf);
+    lua_pushnil(L);
+    return 1;
   }
 }
 
 
-static void setlinehook (void) {
-  lua_Object f = lua_getparam(1);
-  lua_unref(linehook);
-  if (f == LUA_NOOBJECT) {
-    linehook = -1;
-    lua_setlinehook(NULL);
+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, "level out of range");
+  luaL_checktype(L, 3, "any");
+  lua_pushstring(L, lua_setlocal(L, &ar, luaL_check_int(L, 2)));
+  return 1;
+}
+
+
+/*
+** because of these variables, this module is not reentrant, and should
+** not be used in multiple states
+*/
+
+static int linehook = LUA_NOREF;  /* Lua reference to line hook function */
+static int callhook = LUA_NOREF;  /* Lua reference to call hook function */
+
+
+
+static void linef (lua_State *L, lua_Debug *ar) {
+  if (linehook != LUA_NOREF) {
+    lua_getref(L, linehook);
+    lua_pushnumber(L, ar->currentline);
+    lua_call(L, 1, 0);
+  }
+}
+
+
+static void callf (lua_State *L, lua_Debug *ar) {
+  if (callhook != LUA_NOREF) {
+    lua_getref(L, callhook);
+    lua_pushstring(L, ar->event);
+    lua_call(L, 1, 0);
+  }
+}
+
+
+static int setcallhook (lua_State *L) {
+  lua_unref(L, callhook);
+  if (lua_isnull(L, 1)) {
+    callhook = LUA_NOREF;
+    lua_setcallhook(L, NULL);
   }
   else {
-    lua_pushobject(f);
-    linehook = lua_ref(1);
-    lua_setlinehook(linef);
+    callhook = lua_ref(L, 1);
+    lua_setcallhook(L, callf);
   }
+  return 0;
 }
 
 
-static struct luaL_reg dblib[] = {
-  {"funcinfo", funcinfo},
+static int setlinehook (lua_State *L) {
+  lua_unref(L, linehook);
+  if (lua_isnull(L, 1)) {
+    linehook = LUA_NOREF;
+    lua_setlinehook(L, NULL);
+  }
+  else {
+    linehook = lua_ref(L, 1);
+    lua_setlinehook(L, linef);
+  }
+  return 0;
+}
+
+
+static const struct luaL_reg dblib[] = {
   {"getlocal", getlocal},
-  {"getstack", getstack},
+  {"getinfo", getinfo},
   {"setcallhook", setcallhook},
   {"setlinehook", setlinehook},
   {"setlocal", setlocal}
 };
 
 
-void lua_dblibopen (void) {
-  luaL_openlib(dblib, (sizeof(dblib)/sizeof(dblib[0])));
+void lua_dblibopen (lua_State *L) {
+  luaL_openl(L, dblib);
 }
 

ldebug.c

@@ -0,0 +1,460 @@
+/*
+** $Id: ldebug.c,v 1.41 2000/09/12 18:38:02 roberto Exp roberto $
+** Debug Interface
+** See Copyright Notice in lua.h
+*/
+
+
+#include <stdlib.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "luadebug.h"
+
+
+static const char *getfuncname (lua_State *L, StkId f, const char **name);
+
+
+static void setnormalized (TObject *d, const TObject *s) {
+  switch (s->ttype) {
+    case TAG_CMARK: {
+      clvalue(d) = clvalue(s);
+      ttype(d) = TAG_CCLOSURE;
+      break;
+    }
+    case TAG_LMARK: {
+      clvalue(d) = infovalue(s)->func;
+      ttype(d) = TAG_LCLOSURE;
+      break;
+    }
+    default: *d = *s;
+  }
+}
+
+
+lua_Hook lua_setcallhook (lua_State *L, lua_Hook func) {
+  lua_Hook oldhook = L->callhook;
+  L->callhook = func;
+  return oldhook;
+}
+
+
+lua_Hook lua_setlinehook (lua_State *L, lua_Hook func) {
+  lua_Hook oldhook = L->linehook;
+  L->linehook = func;
+  return oldhook;
+}
+
+
+static StkId aux_stackedfunction (lua_State *L, int level, StkId top) {
+  int i;
+  for (i = (top-1) - L->stack; i>=0; i--) {
+    if (is_T_MARK(L->stack[i].ttype)) {
+      if (level == 0)
+        return L->stack+i;
+      level--;
+    }
+  }
+  return NULL;
+}
+
+
+int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
+  StkId f = aux_stackedfunction(L, level, L->top);
+  if (f == NULL) return 0;  /* there is no such level */
+  else {
+    ar->_func = f;
+    return 1;
+  }
+}
+
+
+static int lua_nups (StkId f) {
+  switch (ttype(f)) {
+    case TAG_LCLOSURE:  case TAG_CCLOSURE: case TAG_CMARK:
+      return clvalue(f)->nupvalues;
+    case TAG_LMARK:
+      return infovalue(f)->func->nupvalues;
+    default:
+      return 0;
+  }
+}
+
+
+int luaG_getline (int *lineinfo, int pc, int refline, int *prefi) {
+  int refi;
+  if (lineinfo == NULL) return -1;  /* no line info */
+  else if (pc == -1) return refline;  /* function preamble */
+  refi = prefi ? *prefi : 0;
+  if (lineinfo[refi] < 0)
+    refline += -lineinfo[refi++]; 
+  LUA_ASSERT(lineinfo[refi] >= 0, "invalid line info");
+  while (lineinfo[refi] > pc) {
+    refline--;
+    refi--;
+    if (lineinfo[refi] < 0)
+      refline -= -lineinfo[refi--]; 
+    LUA_ASSERT(lineinfo[refi] >= 0, "invalid line info");
+  }
+  for (;;) {
+    int nextline = refline + 1;
+    int nextref = refi + 1;
+    if (lineinfo[nextref] < 0)
+      nextline += -lineinfo[nextref++]; 
+    LUA_ASSERT(lineinfo[nextref] >= 0, "invalid line info");
+    if (lineinfo[nextref] > pc)
+      break;
+    refline = nextline;
+    refi = nextref;
+  }
+  if (prefi) *prefi = refi;
+  return refline;
+}
+
+
+static int lua_currentpc (StkId f) {
+  CallInfo *ci = infovalue(f);
+  LUA_ASSERT(ttype(f) == TAG_LMARK, "function has no pc");
+  return (*ci->pc - ci->func->f.l->code) - 1;
+}
+
+
+static int lua_currentline (StkId f) {
+  if (ttype(f) != TAG_LMARK)
+    return -1;  /* only active lua functions have current-line information */
+  else {
+    CallInfo *ci = infovalue(f);
+    int *lineinfo = ci->func->f.l->lineinfo;
+    return luaG_getline(lineinfo, lua_currentpc(f), 1, NULL);
+  }
+}
+
+
+
+static Proto *getluaproto (StkId f) {
+  return (ttype(f) == TAG_LMARK) ?  infovalue(f)->func->f.l : NULL;
+}
+
+
+const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int localnum) {
+  const char *name;
+  StkId f = ar->_func;
+  Proto *fp = getluaproto(f);
+  if (!fp) return NULL;  /* `f' is not a Lua function? */
+  name = luaF_getlocalname(fp, localnum, lua_currentpc(f));
+  if (!name) return NULL;
+  luaA_pushobject(L, (f+1)+(localnum-1));  /* push value */
+  return name;
+}
+
+
+const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int localnum) {
+  const char *name;
+  StkId f = ar->_func;
+  Proto *fp = getluaproto(f);
+  L->top--;  /* pop new value */
+  if (!fp) return NULL;  /* `f' is not a Lua function? */
+  name = luaF_getlocalname(fp, localnum, lua_currentpc(f));
+  if (!name || name[0] == '*') return NULL;  /* `*' starts private locals */
+  *((f+1)+(localnum-1)) = *L->top;
+  return name;
+}
+
+
+static void infoLproto (lua_Debug *ar, Proto *f) {
+  ar->source = f->source->str;
+  ar->linedefined = f->lineDefined;
+  ar->what = "Lua";
+}
+
+
+static void lua_funcinfo (lua_Debug *ar, StkId func) {
+  switch (ttype(func)) {
+    case TAG_LCLOSURE:
+      infoLproto(ar, clvalue(func)->f.l);
+      break;
+    case TAG_LMARK:
+      infoLproto(ar, infovalue(func)->func->f.l);
+      break;
+    case TAG_CCLOSURE:  case TAG_CMARK:
+      ar->source = "(C)";
+      ar->linedefined = -1;
+      ar->what = "C";
+      break;
+    default:
+      LUA_INTERNALERROR("invalid `func' value");
+  }
+  luaO_chunkid(ar->short_src, ar->source, sizeof(ar->short_src));
+  if (ar->linedefined == 0)
+    ar->what = "main";
+}
+
+
+static const char *travtagmethods (lua_State *L, const TObject *o) {
+  int e;
+  for (e=0; e<IM_N; e++) {
+    int t;
+    for (t=0; t<=L->last_tag; t++)
+      if (luaO_equalObj(o, luaT_getim(L, t,e)))
+        return luaT_eventname[e];
+  }
+  return NULL;
+}
+
+
+static const 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))) == TAG_STRING) 
+      return tsvalue(key(node(g, i)))->str;
+  }
+  return NULL;
+}
+
+
+static void lua_getname (lua_State *L, StkId f, lua_Debug *ar) {
+  TObject o;
+  setnormalized(&o, f);
+  /* try to find a name for given function */
+  if ((ar->name = travglobals(L, &o)) != NULL)
+    ar->namewhat = "global";
+  /* not found: try tag methods */
+  else if ((ar->name = travtagmethods(L, &o)) != NULL)
+    ar->namewhat = "tag-method";
+  else ar->namewhat = "";  /* not found at all */
+}
+
+
+int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
+  StkId func;
+  int isactive = (*what != '>');
+  if (isactive)
+    func = ar->_func;
+  else {
+    what++;  /* skip the '>' */
+    func = L->top - 1;
+  }
+  for (; *what; what++) {
+    switch (*what) {
+      case 'S': {
+        lua_funcinfo(ar, func);
+        break;
+      }
+      case 'l': {
+        ar->currentline = lua_currentline(func);
+        break;
+      }
+      case 'u': {
+        ar->nups = lua_nups(func);
+        break;
+      }
+      case 'n': {
+        ar->namewhat = (isactive) ? getfuncname(L, func, &ar->name) : NULL;
+        if (ar->namewhat == NULL)
+          lua_getname(L, func, ar);
+        break;
+      }
+      case 'f': {
+        setnormalized(L->top, func);
+        incr_top;  /* push function */
+        break;
+      }
+      default: return 0;  /* invalid option */
+    }
+  }
+  if (!isactive) L->top--;  /* pop function */
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Symbolic Execution
+** =======================================================
+*/
+
+
+static int pushpc (int *stack, int pc, int top, int n) {
+  while (n--)
+    stack[top++] = pc-1;
+  return top;
+}
+
+
+static Instruction luaG_symbexec (const Proto *pt, int lastpc, int stackpos) {
+  int stack[MAXSTACK];  /* stores last instruction that changed a stack entry */
+  const Instruction *code = pt->code;
+  int top = pt->numparams;
+  int pc = 0;
+  if (pt->is_vararg)  /* varargs? */
+    top++;  /* `arg' */
+  while (pc < lastpc) {
+    const Instruction i = code[pc++];
+    LUA_ASSERT(0 <= top && top <= pt->maxstacksize, "wrong stack");
+    switch (GET_OPCODE(i)) {
+      case OP_RETURN: {
+        LUA_ASSERT(top >= GETARG_U(i), "wrong stack");
+        top = GETARG_U(i);
+        break;
+      }
+      case OP_TAILCALL: {
+        LUA_ASSERT(top >= GETARG_A(i), "wrong stack");
+        top = GETARG_B(i);
+        break;
+      }
+      case OP_CALL: {
+        int nresults = GETARG_B(i);
+        if (nresults == MULT_RET) nresults = 1;
+        LUA_ASSERT(top >= GETARG_A(i), "wrong stack");
+        top = pushpc(stack, pc, GETARG_A(i), nresults);
+        break;
+      }
+      case OP_PUSHNIL: {
+        top = pushpc(stack, pc, top, GETARG_U(i));
+        break;
+      }
+      case OP_POP: {
+        top -= GETARG_U(i);
+        break;
+      }
+      case OP_SETTABLE:
+      case OP_SETLIST: {
+        top -= GETARG_B(i);
+        break;
+      }
+      case OP_SETMAP: {
+        top -= 2*GETARG_U(i);
+        break;
+      }
+      case OP_CONCAT: {
+        top -= GETARG_U(i);
+        stack[top++] = pc-1;
+        break;
+      }
+      case OP_CLOSURE: {
+        top -= GETARG_B(i);
+        stack[top++] = pc-1;
+        break;
+      }
+      case OP_JMPONT:
+      case OP_JMPONF: {
+        int newpc = pc + GETARG_S(i);
+        /* jump is forward and do not skip `lastpc'? */
+        if (pc < newpc && newpc <= lastpc) {
+          stack[top-1] = pc-1;  /* value comes from `and'/`or' */
+          pc = newpc;  /* do the jump */
+        }
+        else
+          top--;  /* do not jump; pop value */
+        break;
+      }
+      default: {
+        OpCode op = GET_OPCODE(i);
+        LUA_ASSERT(luaK_opproperties[op].push != VD,
+                   "invalid opcode for default");
+        top -= luaK_opproperties[op].pop;
+        LUA_ASSERT(top >= 0, "wrong stack");
+        top = pushpc(stack, pc, top, luaK_opproperties[op].push);
+      }
+    }
+  }
+  return code[stack[stackpos]];
+}
+
+
+static const char *getobjname (lua_State *L, StkId obj, const char **name) {
+  StkId func = aux_stackedfunction(L, 0, obj);
+  if (func == NULL || ttype(func) != TAG_LMARK)
+    return NULL;  /* not a Lua function */
+  else {
+    Proto *p = infovalue(func)->func->f.l;
+    int pc = lua_currentpc(func);
+    int stackpos = obj - (func+1);  /* func+1 == function base */
+    Instruction i = luaG_symbexec(p, pc, stackpos);
+    LUA_ASSERT(pc != -1, "function must be active");
+    switch (GET_OPCODE(i)) {
+      case OP_GETGLOBAL: {
+        *name = p->kstr[GETARG_U(i)]->str;
+        return "global";
+      }
+      case OP_GETLOCAL: {
+        *name = luaF_getlocalname(p, GETARG_U(i)+1, pc);
+        LUA_ASSERT(*name, "local must exist");
+        return "local";
+      }
+      case OP_PUSHSELF:
+      case OP_GETDOTTED: {
+        *name = p->kstr[GETARG_U(i)]->str;
+        return "field";
+      }
+      default:
+        return NULL;  /* no useful name found */
+    }
+  }
+}
+
+
+static const char *getfuncname (lua_State *L, StkId f, const char **name) {
+  StkId func = aux_stackedfunction(L, 0, f);  /* calling function */
+  if (func == NULL || ttype(func) != TAG_LMARK)
+    return NULL;  /* not a Lua function */
+  else {
+    Proto *p = infovalue(func)->func->f.l;
+    int pc = lua_currentpc(func);
+    Instruction i;
+    if (pc == -1) return NULL;  /* function is not activated */
+    i = p->code[pc];
+    switch (GET_OPCODE(i)) {
+      case OP_CALL: case OP_TAILCALL:
+        return getobjname(L, (func+1)+GETARG_A(i), name);
+      default:
+        return NULL;  /* no useful name found */
+    }
+  }
+}
+
+
+/* }====================================================== */
+
+
+void luaG_typeerror (lua_State *L, StkId o, const char *op) {
+  const char *name;
+  const char *kind = getobjname(L, o, &name);
+  const char *t = luaO_typename(o);
+  if (kind)
+    luaO_verror(L, "attempt to %.30s %.20s `%.40s' (a %.10s value)",
+                op, kind, name, t);
+  else
+    luaO_verror(L, "attempt to %.30s a %.10s value", op, t);
+}
+
+
+void luaG_binerror (lua_State *L, StkId p1, lua_Type t, const char *op) {
+  if (ttype(p1) == t) p1++;
+  LUA_ASSERT(ttype(p1) != t, "must be an error");
+  luaG_typeerror(L, p1, op);
+}
+
+
+void luaG_ordererror (lua_State *L, StkId top) {
+  const char *t1 = luaO_typename(top-2);
+  const char *t2 = luaO_typename(top-1);
+  if (t1[2] == t2[2])
+    luaO_verror(L, "attempt to compare two %.10s values", t1);
+  else
+    luaO_verror(L, "attempt to compare %.10s with %.10s", t1, t2);
+}
+

ldebug.h

@@ -0,0 +1,21 @@
+/*
+** $Id: ldebug.h,v 1.4 2000/08/10 19:50:47 roberto Exp roberto $
+** Auxiliary functions from Debug Interface module
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldebug_h
+#define ldebug_h
+
+
+#include "lstate.h"
+#include "luadebug.h"
+
+
+void luaG_typeerror (lua_State *L, StkId o, const char *op);
+void luaG_binerror (lua_State *L, StkId p1, lua_Type t, const char *op);
+int luaG_getline (int *lineinfo, int pc, int refline, int *refi);
+void luaG_ordererror (lua_State *L, StkId top);
+
+
+#endif

ldo.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.c,v 1.40 1999/03/10 14:23:07 roberto Exp roberto $
+** $Id: ldo.c,v 1.95 2000/09/11 20:29:27 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -10,386 +10,332 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lauxlib.h"
+#include "lua.h"
+
+#include "ldebug.h"
 #include "ldo.h"
-#include "lfunc.h"
 #include "lgc.h"
 #include "lmem.h"
 #include "lobject.h"
 #include "lparser.h"
 #include "lstate.h"
 #include "lstring.h"
+#include "ltable.h"
 #include "ltm.h"
-#include "lua.h"
-#include "luadebug.h"
 #include "lundump.h"
 #include "lvm.h"
 #include "lzio.h"
 
 
-
-#ifndef STACK_LIMIT
-#define STACK_LIMIT     6000
-#endif
+/* space to handle stack overflow errors */
+#define EXTRA_STACK	(2*LUA_MINSTACK)
 
 
-
-#define STACK_UNIT	128
-
-
-void luaD_init (void) {
-  L->stack.stack = luaM_newvector(STACK_UNIT, TObject);
-  L->stack.top = L->stack.stack;
-  L->stack.last = L->stack.stack+(STACK_UNIT-1);
+void luaD_init (lua_State *L, int stacksize) {
+  L->stack = luaM_newvector(L, stacksize+EXTRA_STACK, TObject);
+  L->stack_last = L->stack+(stacksize-1);
+  L->stacksize = stacksize;
+  L->Cbase = L->top = L->stack;
 }
 
 
-void luaD_checkstack (int n) {
-  struct Stack *S = &L->stack;
-  if (S->last-S->top <= n) {
-    StkId top = S->top-S->stack;
-    int stacksize = (S->last-S->stack)+STACK_UNIT+n;
-    luaM_reallocvector(S->stack, stacksize, TObject);
-    S->last = S->stack+(stacksize-1);
-    S->top = S->stack + top;
-    if (stacksize >= STACK_LIMIT) {  /* stack overflow? */
-      if (lua_stackedfunction(100) == LUA_NOOBJECT)  /* 100 funcs on stack? */
-        lua_error("Lua2C - C2Lua overflow"); /* doesn't look like a rec. loop */
-      else
-        lua_error("stack size overflow");
+void luaD_checkstack (lua_State *L, int n) {
+  if (L->stack_last-L->top <= n) {  /* stack overflow? */
+    if (L->stack_last-L->stack > (L->stacksize-1)) {
+      /* overflow while handling overflow: do what?? */
+      L->top -= EXTRA_STACK;
+      lua_error(L, "BAD STACK OVERFLOW! DATA CORRUPTED!");
+    }
+    else {
+      L->stack_last += EXTRA_STACK;  /* to be used by error message */
+      lua_error(L, "stack overflow");
     }
   }
 }
 
 
+static void restore_stack_limit (lua_State *L) {
+  if (L->top - L->stack < L->stacksize - 1)
+    L->stack_last = L->stack + (L->stacksize-1);
+}
+
+
 /*
-** Adjust stack. Set top to the given value, pushing NILs if needed.
+** Adjust stack. Set top to base+extra, pushing NILs if needed.
+** (we cannot add base+extra unless we are sure it fits in the stack;
+**  otherwise the result of such operation on pointers is undefined)
 */
-void luaD_adjusttop (StkId newtop) {
-  int diff = newtop-(L->stack.top-L->stack.stack);
+void luaD_adjusttop (lua_State *L, StkId base, int extra) {
+  int diff = extra-(L->top-base);
   if (diff <= 0)
-    L->stack.top += diff;
+    L->top = base+extra;
   else {
-    luaD_checkstack(diff);
+    luaD_checkstack(L, diff);
     while (diff--)
-      ttype(L->stack.top++) = LUA_T_NIL;
+      ttype(L->top++) = TAG_NIL;
   }
 }
 
 
 /*
-** Open a hole below "nelems" from the L->stack.top.
+** Open a hole inside the stack at `pos'
 */
-void luaD_openstack (int nelems)
-{
-  luaO_memup(L->stack.top-nelems+1, L->stack.top-nelems,
-             nelems*sizeof(TObject));
+static void luaD_openstack (lua_State *L, StkId pos) {
+  int i = L->top-pos; 
+  while (i--) pos[i+1] = pos[i];
   incr_top;
 }
 
 
-void luaD_lineHook (int line)
-{
-  struct C_Lua_Stack oldCLS = L->Cstack;
-  StkId old_top = L->Cstack.lua2C = L->Cstack.base = L->stack.top-L->stack.stack;
-  L->Cstack.num = 0;
-  (*L->linehook)(line);
-  L->stack.top = L->stack.stack+old_top;
-  L->Cstack = oldCLS;
+static void dohook (lua_State *L, lua_Debug *ar, lua_Hook hook) {
+  StkId old_Cbase = L->Cbase;
+  StkId old_top = L->Cbase = L->top;
+  luaD_checkstack(L, LUA_MINSTACK);  /* assures minimum stack size */
+  L->allowhooks = 0;  /* cannot call hooks inside a hook */
+  (*hook)(L, ar);
+  LUA_ASSERT(L->allowhooks == 0, "invalid allow");
+  L->allowhooks = 1;
+  L->top = old_top;
+  L->Cbase = old_Cbase;
 }
 
 
-void luaD_callHook (StkId base, TProtoFunc *tf, int isreturn)
-{
-  struct C_Lua_Stack oldCLS = L->Cstack;
-  StkId old_top = L->Cstack.lua2C = L->Cstack.base = L->stack.top-L->stack.stack;
-  L->Cstack.num = 0;
-  if (isreturn)
-    (*L->callhook)(LUA_NOOBJECT, "(return)", 0);
-  else {
-    TObject *f = L->stack.stack+base-1;
-    if (tf)
-      (*L->callhook)(Ref(f), tf->source->str, tf->lineDefined);
-    else
-      (*L->callhook)(Ref(f), "(C)", -1);
+void luaD_lineHook (lua_State *L, StkId func, int line, lua_Hook linehook) {
+  if (L->allowhooks) {
+    lua_Debug ar;
+    ar._func = func;
+    ar.event = "line";
+    ar.currentline = line;
+    dohook(L, &ar, linehook);
   }
-  L->stack.top = L->stack.stack+old_top;
-  L->Cstack = oldCLS;
+}
+
+
+static void luaD_callHook (lua_State *L, StkId func, lua_Hook callhook,
+                    const char *event) {
+  if (L->allowhooks) {
+    lua_Debug ar;
+    ar._func = func;
+    ar.event = event;
+    dohook(L, &ar, callhook);
+  }
+}
+
+
+static StkId callCclosure (lua_State *L, const struct Closure *cl, StkId base) {
+  int nup = cl->nupvalues;  /* number of upvalues */
+  StkId old_Cbase = L->Cbase;
+  int n;
+  L->Cbase = base;       /* new base for C function */
+  luaD_checkstack(L, nup+LUA_MINSTACK);  /* assures minimum stack size */
+  for (n=0; n<nup; n++)  /* copy upvalues as extra arguments */
+    *(L->top++) = cl->upvalue[n];
+  n = (*cl->f.c)(L);  /* do the actual call */
+  L->Cbase = old_Cbase;  /* restore old C base */
+  return L->top - n;  /* return index of first result */
+}
+
+
+void luaD_callTM (lua_State *L, const TObject *f, int nParams, int nResults) {
+  StkId base = L->top - nParams;
+  luaD_openstack(L, base);
+  *base = *f;
+  luaD_call(L, base, nResults);
 }
 
 
 /*
-** Call a C function.
-** Cstack.num is the number of arguments; Cstack.lua2C points to the
-** first argument. Returns an index to the first result from C.
-*/
-static StkId callC (lua_CFunction f, StkId base)
-{
-  struct C_Lua_Stack *CS = &L->Cstack;
-  struct C_Lua_Stack oldCLS = *CS;
+** Call a function (C or Lua). The function to be called is at *func.
+** The arguments are on the stack, right after the function.
+** When returns, the results are on the stack, starting at the original
+** function position.
+** The number of results is nResults, unless nResults=LUA_MULTRET.
+*/ 
+void luaD_call (lua_State *L, StkId func, int nResults) {
   StkId firstResult;
-  int numarg = (L->stack.top-L->stack.stack) - base;
-  CS->num = numarg;
-  CS->lua2C = base;
-  CS->base = base+numarg;  /* == top-stack */
-  if (L->callhook)
-    luaD_callHook(base, NULL, 0);
-  (*f)();  /* do the actual call */
-  if (L->callhook)  /* func may have changed callhook */
-    luaD_callHook(base, NULL, 1);
-  firstResult = CS->base;
-  *CS = oldCLS;
-  return firstResult;
-}
-
-
-static StkId callCclosure (struct Closure *cl, lua_CFunction f, StkId base)
-{
-  TObject *pbase;
-  int nup = cl->nelems;  /* number of upvalues */
-  luaD_checkstack(nup);
-  pbase = L->stack.stack+base;  /* care: previous call may change this */
-  /* open space for upvalues as extra arguments */
-  luaO_memup(pbase+nup, pbase, (L->stack.top-pbase)*sizeof(TObject));
-  /* copy upvalues into stack */
-  memcpy(pbase, cl->consts+1, nup*sizeof(TObject));
-  L->stack.top += nup;
-  return callC(f, base);
-}
-
-
-void luaD_callTM (TObject *f, int nParams, int nResults) {
-  luaD_openstack(nParams);
-  *(L->stack.top-nParams-1) = *f;
-  luaD_calln(nParams, nResults);
-}
-
-
-/*
-** Call a function (C or Lua). The parameters must be on the L->stack.stack,
-** between [L->stack.stack+base,L->stack.top). The function to be called is at L->stack.stack+base-1.
-** When returns, the results are on the L->stack.stack, between [L->stack.stack+base-1,L->stack.top).
-** The number of results is nResults, unless nResults=MULT_RET.
-*/
-void luaD_call (StkId base, int nResults)
-{
-  StkId firstResult;
-  TObject *func = L->stack.stack+base-1;
-  int i;
+  lua_Hook callhook = L->callhook;
+  retry:  /* for `function' tag method */
   switch (ttype(func)) {
-    case LUA_T_CPROTO:
-      ttype(func) = LUA_T_CMARK;
-      firstResult = callC(fvalue(func), base);
-      break;
-    case LUA_T_PROTO:
-      ttype(func) = LUA_T_PMARK;
-      firstResult = luaV_execute(NULL, tfvalue(func), base);
-      break;
-    case LUA_T_CLOSURE: {
-      Closure *c = clvalue(func);
-      TObject *proto = &(c->consts[0]);
-      ttype(func) = LUA_T_CLMARK;
-      firstResult = (ttype(proto) == LUA_T_CPROTO) ?
-                       callCclosure(c, fvalue(proto), base) :
-                       luaV_execute(c, tfvalue(proto), base);
+    case TAG_LCLOSURE: {
+      CallInfo ci;
+      ci.func = clvalue(func);
+      ci.line = 0;
+      ttype(func) = TAG_LMARK;
+      infovalue(func) = &ci;
+      if (callhook)
+        luaD_callHook(L, func, callhook, "call");
+      firstResult = luaV_execute(L, ci.func, func+1);
       break;
     }
-    default: { /* func is not a function */
-      /* Check the tag method for invalid functions */
-      TObject *im = luaT_getimbyObj(func, IM_FUNCTION);
-      if (ttype(im) == LUA_T_NIL)
-        lua_error("call expression not a function");
-      luaD_callTM(im, (L->stack.top-L->stack.stack)-(base-1), nResults);
-      return;
+    case TAG_CCLOSURE: {
+      ttype(func) = TAG_CMARK;
+      if (callhook)
+        luaD_callHook(L, func, callhook, "call");
+      firstResult = callCclosure(L, clvalue(func), func+1);
+      break;
+    }
+    default: { /* `func' is not a function; check the `function' tag method */
+      const TObject *im = luaT_getimbyObj(L, func, IM_FUNCTION);
+      if (ttype(im) == TAG_NIL)
+        luaG_typeerror(L, func, "call");
+      luaD_openstack(L, func);
+      *func = *im;  /* tag method is the new function to be called */
+      goto retry;   /* retry the call */
     }
   }
+  if (callhook)  /* same hook that was active at entry */
+    luaD_callHook(L, func, callhook, "return");
   /* adjust the number of results */
-  if (nResults != MULT_RET)
-    luaD_adjusttop(firstResult+nResults);
-  /* move results to base-1 (to erase parameters and function) */
-  base--;
-  nResults = L->stack.top - (L->stack.stack+firstResult);  /* actual number of results */
-  for (i=0; i<nResults; i++)
-    *(L->stack.stack+base+i) = *(L->stack.stack+firstResult+i);
-  L->stack.top -= firstResult-base;
+  if (nResults == LUA_MULTRET)
+    nResults = L->top - firstResult;
+  else
+    luaD_adjusttop(L, firstResult, nResults);
+  /* move results to `func' (to erase parameters and function) */
+  while (nResults) {
+    *func++ = *(L->top - nResults);
+    nResults--;
+  }
+  L->top = func;
 }
 
 
-void luaD_calln (int nArgs, int nResults) {
-    luaD_call((L->stack.top-L->stack.stack)-nArgs, nResults);
-}
-
-
-/*
-** Traverse all objects on L->stack.stack
-*/
-void luaD_travstack (int (*fn)(TObject *))
-{
-  StkId i;
-  for (i = (L->stack.top-1)-L->stack.stack; i>=0; i--)
-    fn(L->stack.stack+i);
-}
-
-
-
-static void message (char *s) {
-  TObject *em = &(luaS_new("_ERRORMESSAGE")->u.s.globalval);
-  if (ttype(em) == LUA_T_PROTO || ttype(em) == LUA_T_CPROTO ||
-      ttype(em) == LUA_T_CLOSURE) {
-    *L->stack.top = *em;
+static void message (lua_State *L, const char *s) {
+  const TObject *em = luaH_getglobal(L, LUA_ERRORMESSAGE);
+  if (*luaO_typename(em) == 'f') {
+    *L->top = *em;
     incr_top;
-    lua_pushstring(s);
-    luaD_calln(1, 0);
+    lua_pushstring(L, s);
+    luaD_call(L, L->top-2, 0);
   }
 }
 
-/*
-** Reports an error, and jumps up to the available recover label
-*/
-void lua_error (char *s) {
-  if (s) message(s);
-  if (L->errorJmp)
-    longjmp(*((jmp_buf *)L->errorJmp), 1);
+
+void luaD_breakrun (lua_State *L, int errcode) {
+  if (L->errorJmp) {
+    L->errorJmp->status = errcode;
+    longjmp(L->errorJmp->b, 1);
+  }
   else {
-    message("exit(1). Unable to recover.\n");
-    exit(1);
+    if (errcode != LUA_ERRMEM)
+      message(L, "unable to recover; exiting\n");
+    exit(EXIT_FAILURE);
   }
 }
 
 /*
-** Call the function at L->Cstack.base, and incorporate results on
-** the Lua2C structure.
+** Reports an error, and jumps up to the available recovery label
 */
-static void do_callinc (int nResults)
-{
-  StkId base = L->Cstack.base;
-  luaD_call(base+1, nResults);
-  L->Cstack.lua2C = base;  /* position of the new results */
-  L->Cstack.num = (L->stack.top-L->stack.stack) - base;  /* number of results */
-  L->Cstack.base = base + L->Cstack.num;  /* incorporate results on stack */
+void lua_error (lua_State *L, const char *s) {
+  if (s) message(L, s);
+  luaD_breakrun(L, LUA_ERRRUN);
+}
+
+
+static void chain_longjmp (lua_State *L, struct lua_longjmp *lj) {
+  lj->status = 0;
+  lj->base = L->Cbase;
+  lj->previous = L->errorJmp;
+  L->errorJmp = lj;
+}
+
+
+static int restore_longjmp (lua_State *L, struct lua_longjmp *lj) {
+  L->Cbase = lj->base;
+  L->errorJmp = lj->previous;
+  return lj->status;
 }
 
 
 /*
-** Execute a protected call. Assumes that function is at L->Cstack.base and
-** parameters are on top of it. Leave nResults on the stack.
+** Execute a protected call.
 */
-int luaD_protectedrun (int nResults) {
-  volatile struct C_Lua_Stack oldCLS = L->Cstack;
-  jmp_buf myErrorJmp;
-  volatile int status;
-  jmp_buf *volatile oldErr = L->errorJmp;
-  L->errorJmp = &myErrorJmp;
-  if (setjmp(myErrorJmp) == 0) {
-    do_callinc(nResults);
-    status = 0;
+int lua_call (lua_State *L, int nargs, int nresults) {
+  StkId func = L->top - (nargs+1);  /* function to be called */
+  struct lua_longjmp myErrorJmp;
+  chain_longjmp(L, &myErrorJmp);
+  if (setjmp(myErrorJmp.b) == 0) {
+    luaD_call(L, func, nresults);
   }
-  else {  /* an error occurred: restore L->Cstack and L->stack.top */
-    L->Cstack = oldCLS;
-    L->stack.top = L->stack.stack+L->Cstack.base;
-    status = 1;
+  else {  /* an error occurred: restore the state */
+    L->top = func;  /* remove garbage from the stack */
+    restore_stack_limit(L);
   }
-  L->errorJmp = oldErr;
-  return status;
+  return restore_longjmp(L, &myErrorJmp);
 }
 
 
-/*
-** returns 0 = chunk loaded; 1 = error; 2 = no more chunks to load
-*/
-static int protectedparser (ZIO *z, int bin) {
-  volatile struct C_Lua_Stack oldCLS = L->Cstack;
-  jmp_buf myErrorJmp;
-  volatile int status;
-  TProtoFunc *volatile tf;
-  jmp_buf *volatile oldErr = L->errorJmp;
-  L->errorJmp = &myErrorJmp;
-  if (setjmp(myErrorJmp) == 0) {
-    tf = bin ? luaU_undump1(z) : luaY_parser(z);
-    status = 0;
+static int protectedparser (lua_State *L, ZIO *z, int bin) {
+  struct lua_longjmp myErrorJmp;
+  unsigned long old_blocks;
+  luaC_checkGC(L);
+  old_blocks = L->nblocks;
+  chain_longjmp(L, &myErrorJmp);
+  if (setjmp(myErrorJmp.b) == 0) {
+    Proto *tf = bin ? luaU_undump(L, z) : luaY_parser(L, z);
+    luaV_Lclosure(L, tf, 0);
   }
-  else {  /* an error occurred: restore L->Cstack and L->stack.top */
-    L->Cstack = oldCLS;
-    L->stack.top = L->stack.stack+L->Cstack.base;
-    tf = NULL;
-    status = 1;
+  else {  /* an error occurred: correct error code */
+    if (myErrorJmp.status == LUA_ERRRUN)
+      myErrorJmp.status = LUA_ERRSYNTAX;
   }
-  L->errorJmp = oldErr;
-  if (status) return 1;  /* error code */
-  if (tf == NULL) return 2;  /* 'natural' end */
-  luaD_adjusttop(L->Cstack.base+1);  /* one slot for the pseudo-function */
-  L->stack.stack[L->Cstack.base].ttype = LUA_T_PROTO;
-  L->stack.stack[L->Cstack.base].value.tf = tf;
-  luaV_closure(0);
-  return 0;
+  /* add new memory to threshould (as it probably will stay) */
+  L->GCthreshold += (L->nblocks - old_blocks);
+  return restore_longjmp(L, &myErrorJmp);  /* error code */
 }
 
 
-static int do_main (ZIO *z, int bin) {
-  int status;
-  int debug = L->debug;  /* save debug status */
-  do {
-    long old_blocks = (luaC_checkGC(), L->nblocks);
-    status = protectedparser(z, bin);
-    if (status == 1) return 1;  /* error */
-    else if (status == 2) return 0;  /* 'natural' end */
-    else {
-      unsigned long newelems2 = 2*(L->nblocks-old_blocks);
-      L->GCthreshold += newelems2;
-      status = luaD_protectedrun(MULT_RET);
-      L->GCthreshold -= newelems2;
-    }
-  } while (bin && status == 0);
-  L->debug = debug;  /* restore debug status */
-  return status;
-}
-
-
-void luaD_gcIM (TObject *o)
-{
-  TObject *im = luaT_getimbyObj(o, IM_GC);
-  if (ttype(im) != LUA_T_NIL) {
-    *L->stack.top = *o;
-    incr_top;
-    luaD_callTM(im, 1, 0);
-  }
-}
-
-
-#define	MAXFILENAME	260	/* maximum part of a file name kept */
-
-int lua_dofile (char *filename) {
+static int parse_file (lua_State *L, const char *filename) {
   ZIO z;
-  int status;
-  int c;
-  int bin;
   char source[MAXFILENAME];
+  int status;
+  int bin;  /* flag for file mode */
+  int c;    /* look ahead char */
   FILE *f = (filename == NULL) ? stdin : fopen(filename, "r");
-  if (f == NULL)
-    return 2;
+  if (f == NULL) return LUA_ERRFILE;  /* unable to open file */
+  if (filename == NULL) filename = "(stdin)";
+  sprintf(source, "@%.*s", (int)sizeof(source)-2, filename);
   c = fgetc(f);
   ungetc(c, f);
   bin = (c == ID_CHUNK);
-  if (bin)
+  if (bin && f != stdin) {
     f = freopen(filename, "rb", f);  /* set binary mode */
-  luaL_filesource(source, filename, sizeof(source));
+    if (f == NULL) return LUA_ERRFILE;  /* unable to reopen file */
+  }
   luaZ_Fopen(&z, f, source);
-  status = do_main(&z, bin);
+  status = protectedparser(L, &z, bin);
   if (f != stdin)
     fclose(f);
   return status;
 }
 
 
-int lua_dostring (char *str) {
-  return lua_dobuffer(str, strlen(str), str);
+int lua_dofile (lua_State *L, const char *filename) {
+  int status = parse_file(L, filename);
+  if (status == 0)  /* parse OK? */
+    status = lua_call(L, 0, LUA_MULTRET);  /* call main */
+  return status;
 }
 
 
-int lua_dobuffer (char *buff, int size, char *name) {
+static int parse_buffer (lua_State *L, const char *buff, size_t size,
+                         const char *name) {
   ZIO z;
   if (!name) name = "?";
   luaZ_mopen(&z, buff, size, name);
-  return do_main(&z, buff[0]==ID_CHUNK);
+  return protectedparser(L, &z, buff[0]==ID_CHUNK);
+}
+
+
+int lua_dobuffer (lua_State *L, const char *buff, size_t size,
+                  const char *name) {
+  int status = parse_buffer(L, buff, size, name);
+  if (status == 0)  /* parse OK? */
+    status = lua_call(L, 0, LUA_MULTRET);  /* call main */
+  return status;
+}
+
+
+int lua_dostring (lua_State *L, const char *str) {
+  return lua_dobuffer(L, str, strlen(str), str);
 }
 

ldo.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.h,v 1.4 1997/12/15 16:17:20 roberto Exp roberto $
+** $Id: ldo.h,v 1.23 2000/08/28 17:57:04 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -12,36 +12,20 @@
 #include "lstate.h"
 
 
-#define MULT_RET        255
-
-
-
 /*
 ** macro to increment stack top.
 ** There must be always an empty slot at the L->stack.top
 */
-#define incr_top { if (L->stack.top >= L->stack.last) luaD_checkstack(1); \
-                   L->stack.top++; }
+#define incr_top {if (L->top == L->stack_last) luaD_checkstack(L, 1); L->top++;}
 
 
-/* macros to convert from lua_Object to (TObject *) and back */
-
-#define Address(lo)     ((lo)+L->stack.stack-1)
-#define Ref(st)         ((st)-L->stack.stack+1)
-
-
-void luaD_init (void);
-void luaD_adjusttop (StkId newtop);
-void luaD_openstack (int nelems);
-void luaD_lineHook (int line);
-void luaD_callHook (StkId base, TProtoFunc *tf, int isreturn);
-void luaD_call (StkId base, int nResults);
-void luaD_calln (int nArgs, int nResults);
-void luaD_callTM (TObject *f, int nParams, int nResults);
-int luaD_protectedrun (int nResults);
-void luaD_gcIM (TObject *o);
-void luaD_travstack (int (*fn)(TObject *));
-void luaD_checkstack (int n);
+void luaD_init (lua_State *L, int stacksize);
+void luaD_adjusttop (lua_State *L, StkId base, int extra);
+void luaD_lineHook (lua_State *L, StkId func, int line, lua_Hook linehook);
+void luaD_call (lua_State *L, StkId func, int nResults);
+void luaD_callTM (lua_State *L, const TObject *f, int nParams, int nResults);
+void luaD_breakrun (lua_State *L, int errcode);
+void luaD_checkstack (lua_State *L, int n);
 
 
 #endif

lfunc.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lfunc.c,v 1.9 1998/06/19 16:14:09 roberto Exp roberto $
+** $Id: lfunc.c,v 1.29 2000/08/09 19:16:57 roberto Exp roberto $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
@@ -7,92 +7,82 @@
 
 #include <stdlib.h>
 
+#include "lua.h"
+
 #include "lfunc.h"
 #include "lmem.h"
 #include "lstate.h"
 
-#define gcsizeproto(p)	5  /* approximate "weight" for a prototype */
-#define gcsizeclosure(c) 1  /* approximate "weight" for a closure */
+#define gcsizeproto(L, p)	numblocks(L, 0, sizeof(Proto))
+#define gcsizeclosure(L, c)	numblocks(L, c->nupvalues, sizeof(Closure))
 
 
 
-Closure *luaF_newclosure (int nelems)
-{
-  Closure *c = (Closure *)luaM_malloc(sizeof(Closure)+nelems*sizeof(TObject));
-  luaO_insertlist(&(L->rootcl), (GCnode *)c);
-  L->nblocks += gcsizeclosure(c);
-  c->nelems = nelems;
+Closure *luaF_newclosure (lua_State *L, int nelems) {
+  Closure *c = (Closure *)luaM_malloc(L, sizeof(Closure) +
+                                         (lint32)sizeof(TObject)*(nelems-1));
+  c->next = L->rootcl;
+  L->rootcl = c;
+  c->mark = c;
+  c->nupvalues = nelems;
+  L->nblocks += gcsizeclosure(L, c);
   return c;
 }
 
 
-TProtoFunc *luaF_newproto (void)
-{
-  TProtoFunc *f = luaM_new(TProtoFunc);
+Proto *luaF_newproto (lua_State *L) {
+  Proto *f = luaM_new(L, Proto);
   f->code = NULL;
+  f->lineinfo = NULL;
   f->lineDefined = 0;
   f->source = NULL;
-  f->consts = NULL;
-  f->nconsts = 0;
+  f->kstr = NULL;
+  f->nkstr = 0;
+  f->knum = NULL;
+  f->nknum = 0;
+  f->kproto = NULL;
+  f->nkproto = 0;
   f->locvars = NULL;
-  luaO_insertlist(&(L->rootproto), (GCnode *)f);
-  L->nblocks += gcsizeproto(f);
+  f->nlocvars = 0;
+  f->next = L->rootproto;
+  L->rootproto = f;
+  f->marked = 0;
+  L->nblocks += gcsizeproto(L, f);
   return f;
 }
 
 
-
-static void freefunc (TProtoFunc *f)
-{
-  luaM_free(f->code);
-  luaM_free(f->locvars);
-  luaM_free(f->consts);
-  luaM_free(f);
+void luaF_freeproto (lua_State *L, Proto *f) {
+  L->nblocks -= gcsizeproto(L, f);
+  luaM_free(L, f->code);
+  luaM_free(L, f->locvars);
+  luaM_free(L, f->kstr);
+  luaM_free(L, f->knum);
+  luaM_free(L, f->kproto);
+  luaM_free(L, f->lineinfo);
+  luaM_free(L, f);
 }
 
 
-void luaF_freeproto (TProtoFunc *l)
-{
-  while (l) {
-    TProtoFunc *next = (TProtoFunc *)l->head.next;
-    L->nblocks -= gcsizeproto(l);
-    freefunc(l);
-    l = next;
-  }
-}
-
-
-void luaF_freeclosure (Closure *l)
-{
-  while (l) {
-    Closure *next = (Closure *)l->head.next;
-    L->nblocks -= gcsizeclosure(l);
-    luaM_free(l);
-    l = next;
-  }
+void luaF_freeclosure (lua_State *L, Closure *c) {
+  L->nblocks -= gcsizeclosure(L, c);
+  luaM_free(L, c);
 }
 
 
 /*
-** Look for n-th local variable at line "line" in function "func".
+** Look for n-th local variable at line `line' in function `func'.
 ** Returns NULL if not found.
 */
-char *luaF_getlocalname (TProtoFunc *func, int local_number, int line)
-{
-  int count = 0;
-  char *varname = NULL;
-  LocVar *lv = func->locvars;
-  if (lv == NULL)
-    return NULL;
-  for (; lv->line != -1 && lv->line < line; lv++) {
-    if (lv->varname) {  /* register */
-      if (++count == local_number)
-        varname = lv->varname->str;
+const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
+  int i;
+  for (i = 0; i<f->nlocvars && f->locvars[i].startpc <= pc; i++) {
+    if (pc < f->locvars[i].endpc) {  /* is variable active? */
+      local_number--;
+      if (local_number == 0)
+        return f->locvars[i].varname->str;
     }
-    else  /* unregister */
-      if (--count < local_number)
-        varname = NULL;
   }
-  return varname;
+  return NULL;  /* not found */
 }
 

lfunc.h

@@ -1,6 +1,6 @@
 /*
-** $Id: lfunc.h,v 1.4 1997/11/19 17:29:23 roberto Exp roberto $
-** Lua Function structures
+** $Id: lfunc.h,v 1.11 2000/03/10 18:37:44 roberto Exp roberto $
+** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
 
@@ -12,12 +12,12 @@
 
 
 
-TProtoFunc *luaF_newproto (void);
-Closure *luaF_newclosure (int nelems);
-void luaF_freeproto (TProtoFunc *l);
-void luaF_freeclosure (Closure *l);
+Proto *luaF_newproto (lua_State *L);
+Closure *luaF_newclosure (lua_State *L, int nelems);
+void luaF_freeproto (lua_State *L, Proto *f);
+void luaF_freeclosure (lua_State *L, Closure *c);
 
-char *luaF_getlocalname (TProtoFunc *func, int local_number, int line);
+const char *luaF_getlocalname (const Proto *func, int local_number, int pc);
 
 
 #endif

lgc.c

@@ -1,9 +1,10 @@
 /*
-** $Id: lgc.c,v 1.22 1999/02/26 15:48:55 roberto Exp roberto $
+** $Id: lgc.c,v 1.65 2000/09/11 17:38:42 roberto Exp roberto $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
 
+#include "lua.h"
 
 #include "ldo.h"
 #include "lfunc.h"
@@ -14,262 +15,344 @@
 #include "lstring.h"
 #include "ltable.h"
 #include "ltm.h"
-#include "lua.h"
+
+
+typedef struct GCState {
+  Hash *tmark;  /* list of marked tables to be visited */
+  Closure *cmark;  /* list of marked closures to be visited */
+} GCState;
 
 
 
-static int markobject (TObject *o);
+static int markobject (GCState *st, TObject *o);
+
+
+/* mark a string; marks larger than 1 cannot be changed */
+#define strmark(s)    {if ((s)->marked == 0) (s)->marked = 1;}
 
 
 
-/*
-** =======================================================
-** REF mechanism
-** =======================================================
-*/
-
-
-int luaC_ref (TObject *o, int lock) {
-  int ref;
-  if (ttype(o) == LUA_T_NIL)
-    ref = -1;   /* special ref for nil */
-  else {
-    for (ref=0; ref<L->refSize; ref++)
-      if (L->refArray[ref].status == FREE)
-        break;
-    if (ref == L->refSize) {  /* no more empty spaces? */
-      luaM_growvector(L->refArray, L->refSize, 1, struct ref, refEM, MAX_INT);
-      L->refSize++;
-    }
-    L->refArray[ref].o = *o;
-    L->refArray[ref].status = lock ? LOCK : HOLD;
-  }
-  return ref;
-}
-
-
-void lua_unref (int ref)
-{
-  if (ref >= 0 && ref < L->refSize)
-    L->refArray[ref].status = FREE;
-}
-
-
-TObject* luaC_getref (int ref)
-{
-  if (ref == -1)
-    return &luaO_nilobject;
-  if (ref >= 0 && ref < L->refSize &&
-      (L->refArray[ref].status == LOCK || L->refArray[ref].status == HOLD))
-    return &L->refArray[ref].o;
-  else
-    return NULL;
-}
-
-
-static void travlock (void)
-{
-  int i;
-  for (i=0; i<L->refSize; i++)
-    if (L->refArray[i].status == LOCK)
-      markobject(&L->refArray[i].o);
-}
-
-
-static int ismarked (TObject *o)
-{
-  /* valid only for locked objects */
-  switch (o->ttype) {
-    case LUA_T_STRING: case LUA_T_USERDATA:
-      return o->value.ts->head.marked;
-    case LUA_T_ARRAY:
-      return o->value.a->head.marked;
-    case LUA_T_CLOSURE:
-      return o->value.cl->head.marked;
-    case LUA_T_PROTO:
-      return o->value.tf->head.marked;
-#ifdef DEBUG
-    case LUA_T_LINE: case LUA_T_CLMARK:
-    case LUA_T_CMARK: case LUA_T_PMARK:
-      LUA_INTERNALERROR("invalid type");
-#endif
-    default:  /* nil, number or cproto */
-      return 1;
-  }
-}
-
-
-static void invalidaterefs (void)
-{
-  int i;
-  for (i=0; i<L->refSize; i++)
-    if (L->refArray[i].status == HOLD && !ismarked(&L->refArray[i].o))
-      L->refArray[i].status = COLLECTED;
-}
-
-
-
-void luaC_hashcallIM (Hash *l)
-{
-  TObject t;
-  ttype(&t) = LUA_T_ARRAY;
-  for (; l; l=(Hash *)l->head.next) {
-    avalue(&t) = l;
-    luaD_gcIM(&t);
-  }
-}
-
-
-void luaC_strcallIM (TaggedString *l)
-{
-  TObject o;
-  ttype(&o) = LUA_T_USERDATA;
-  for (; l; l=(TaggedString *)l->head.next)
-    if (l->constindex == -1) {  /* is userdata? */
-      tsvalue(&o) = l;
-      luaD_gcIM(&o);
-    }
-}
-
-
-
-static GCnode *listcollect (GCnode *l)
-{
-  GCnode *frees = NULL;
-  while (l) {
-    GCnode *next = l->next;
-    l->marked = 0;
-    while (next && !next->marked) {
-      l->next = next->next;
-      next->next = frees;
-      frees = next;
-      next = l->next;
-    }
-    l = next;
-  }
-  return frees;
-}
-
-
-static void strmark (TaggedString *s)
-{
-  if (!s->head.marked)
-    s->head.marked = 1;
-}
-
-
-static void protomark (TProtoFunc *f) {
-  if (!f->head.marked) {
+static void protomark (Proto *f) {
+  if (!f->marked) {
     int i;
-    f->head.marked = 1;
+    f->marked = 1;
     strmark(f->source);
-    for (i=0; i<f->nconsts; i++)
-      markobject(&f->consts[i]);
+    for (i=0; i<f->nkstr; i++)
+      strmark(f->kstr[i]);
+    for (i=0; i<f->nkproto; i++)
+      protomark(f->kproto[i]);
+    for (i=0; i<f->nlocvars; i++)  /* mark local-variable names */
+      strmark(f->locvars[i].varname);
   }
 }
 
 
-static void closuremark (Closure *f)
-{
-  if (!f->head.marked) {
-    int i;
-    f->head.marked = 1;
-    for (i=f->nelems; i>=0; i--)
-      markobject(&f->consts[i]);
+static void markstack (lua_State *L, GCState *st) {
+  StkId o;
+  for (o=L->stack; o<L->top; o++)
+    markobject(st, o);
+}
+
+
+static void marklock (lua_State *L, GCState *st) {
+  int i;
+  for (i=0; i<L->refSize; i++) {
+    if (L->refArray[i].st == LOCK)
+      markobject(st, &L->refArray[i].o);
   }
 }
 
 
-static void hashmark (Hash *h)
-{
-  if (!h->head.marked) {
-    int i;
-    h->head.marked = 1;
-    for (i=0; i<nhash(h); i++) {
-      Node *n = node(h,i);
-      if (ttype(ref(n)) != LUA_T_NIL) {
-        markobject(&n->ref);
-        markobject(&n->val);
-      }
-    }
+static void marktagmethods (lua_State *L, GCState *st) {
+  int e;
+  for (e=0; e<IM_N; e++) {
+    int t;
+    for (t=0; t<=L->last_tag; t++)
+      markobject(st, luaT_getim(L, t,e));
   }
 }
 
 
-static void globalmark (void)
-{
-  TaggedString *g;
-  for (g=(TaggedString *)L->rootglobal.next; g; g=(TaggedString *)g->head.next){
-    LUA_ASSERT(g->constindex >= 0, "userdata in global list");
-    if (g->u.s.globalval.ttype != LUA_T_NIL) {
-      markobject(&g->u.s.globalval);
-      strmark(g);  /* cannot collect non nil global variables */
-    }
-  }
-}
-
-
-static int markobject (TObject *o)
-{
+static int markobject (GCState *st, TObject *o) {
   switch (ttype(o)) {
-    case LUA_T_USERDATA:  case LUA_T_STRING:
+    case TAG_USERDATA:  case TAG_STRING:
       strmark(tsvalue(o));
       break;
-    case LUA_T_ARRAY:
-      hashmark(avalue(o));
+    case TAG_TABLE: {
+      if (!ismarked(hvalue(o))) {
+        hvalue(o)->mark = st->tmark;  /* chain it in list of marked */
+        st->tmark = hvalue(o);
+      }
       break;
-    case LUA_T_CLOSURE:  case LUA_T_CLMARK:
-      closuremark(o->value.cl);
+    }
+    case TAG_LMARK: {
+      Closure *cl = infovalue(o)->func;
+      if (!ismarked(cl)) {
+        protomark(cl->f.l);
+        cl->mark = st->cmark;  /* chain it for later traversal */
+        st->cmark = cl;
+      }
       break;
-    case LUA_T_PROTO: case LUA_T_PMARK:
-      protomark(o->value.tf);
+    }
+    case TAG_LCLOSURE:
+      protomark(clvalue(o)->f.l);
+      /* go through */
+    case TAG_CCLOSURE:  case TAG_CMARK:
+      if (!ismarked(clvalue(o))) {
+        clvalue(o)->mark = st->cmark;  /* chain it for later traversal */
+        st->cmark = clvalue(o);
+      }
       break;
-    default: break;  /* numbers, cprotos, etc */
+    default: break;  /* numbers, etc */
   }
   return 0;
 }
 
 
-
-static void markall (void)
-{
-  luaD_travstack(markobject); /* mark stack objects */
-  globalmark();  /* mark global variable values and names */
-  travlock(); /* mark locked objects */
-  luaT_travtagmethods(markobject);  /* mark fallbacks */
+static void markall (lua_State *L) {
+  GCState st;
+  st.cmark = NULL;
+  st.tmark = L->gt;  /* put table of globals in mark list */
+  L->gt->mark = NULL;
+  marktagmethods(L, &st);  /* mark tag methods */
+  markstack(L, &st); /* mark stack objects */
+  marklock(L, &st); /* mark locked objects */
+  for (;;) {  /* mark tables and closures */
+    if (st.cmark) {
+      int i;
+      Closure *f = st.cmark;  /* get first closure from list */
+      st.cmark = f->mark;  /* remove it from list */
+      for (i=0; i<f->nupvalues; i++)  /* mark its upvalues */
+        markobject(&st, &f->upvalue[i]);
+    }
+    else if (st.tmark) {
+      int i;
+      Hash *h = st.tmark;  /* get first table from list */
+      st.tmark = h->mark;  /* remove it from list */
+      for (i=0; i<h->size; i++) {
+        Node *n = node(h, i);
+        if (ttype(key(n)) != TAG_NIL) {
+          if (ttype(val(n)) == TAG_NIL)
+            luaH_remove(h, key(n));  /* dead element; try to remove it */
+          markobject(&st, &n->key);
+          markobject(&st, &n->val);
+        }
+      }
+    }
+    else break;  /* nothing else to mark */
+  }
 }
 
 
-long lua_collectgarbage (long limit)
-{
-  unsigned long recovered = L->nblocks;  /* to subtract nblocks after gc */
-  Hash *freetable;
-  TaggedString *freestr;
-  TProtoFunc *freefunc;
-  Closure *freeclos;
-  markall();
-  invalidaterefs();
-  freestr = luaS_collector();
-  freetable = (Hash *)listcollect(&(L->roottable));
-  freefunc = (TProtoFunc *)listcollect(&(L->rootproto));
-  freeclos = (Closure *)listcollect(&(L->rootcl));
+static int hasmark (const TObject *o) {
+  /* valid only for locked objects */
+  switch (o->ttype) {
+    case TAG_STRING: case TAG_USERDATA:
+      return tsvalue(o)->marked;
+    case TAG_TABLE:
+      return ismarked(hvalue(o));
+    case TAG_LCLOSURE:  case TAG_CCLOSURE:
+      return ismarked(clvalue(o)->mark);
+    default:  /* number */
+      return 1;
+  }
+}
+
+
+/* macro for internal debugging; check if a link of free refs is valid */
+#define VALIDLINK(L, st,n)      (NONEXT <= (st) && (st) < (n))
+
+static void invalidaterefs (lua_State *L) {
+  int n = L->refSize;
+  int i;
+  for (i=0; i<n; i++) {
+    struct Ref *r = &L->refArray[i];
+    if (r->st == HOLD && !hasmark(&r->o))
+      r->st = COLLECTED;
+    LUA_ASSERT((r->st == LOCK && hasmark(&r->o)) ||
+               (r->st == HOLD && hasmark(&r->o)) ||
+                r->st == COLLECTED ||
+                r->st == NONEXT ||
+               (r->st < n && VALIDLINK(L, L->refArray[r->st].st, n)),
+               "inconsistent ref table");
+  }
+  LUA_ASSERT(VALIDLINK(L, L->refFree, n), "inconsistent ref table");
+}
+
+
+
+static void collectproto (lua_State *L) {
+  Proto **p = &L->rootproto;
+  Proto *next;
+  while ((next = *p) != NULL) {
+    if (next->marked) {
+      next->marked = 0;
+      p = &next->next;
+    }
+    else {
+      *p = next->next;
+      luaF_freeproto(L, next);
+    }
+  }
+}
+
+
+static void collectclosure (lua_State *L) {
+  Closure **p = &L->rootcl;
+  Closure *next;
+  while ((next = *p) != NULL) {
+    if (ismarked(next)) {
+      next->mark = next;  /* unmark */
+      p = &next->next;
+    }
+    else {
+      *p = next->next;
+      luaF_freeclosure(L, next);
+    }
+  }
+}
+
+
+static void collecttable (lua_State *L) {
+  Hash **p = &L->roottable;
+  Hash *next;
+  while ((next = *p) != NULL) {
+    if (ismarked(next)) {
+      next->mark = next;  /* unmark */
+      p = &next->next;
+    }
+    else {
+      *p = next->next;
+      luaH_free(L, next);
+    }
+  }
+}
+
+
+static void checktab (lua_State *L, stringtable *tb) {
+  if (tb->nuse < (lint32)(tb->size/4) && tb->size > 10)
+    luaS_resize(L, tb, tb->size/2);  /* table is too big */
+}
+
+
+/*
+** collect all elements with `marked' <= `limit'.
+** with limit=0, that means all unmarked elements;
+** with limit=MAX_INT, that means all elements.
+*/
+static void collectstringtab (lua_State *L, int limit) {
+  int i;
+  for (i=0; i<L->strt.size; i++) {  /* for each list */
+    TString **p = &L->strt.hash[i];
+    TString *next;
+    while ((next = *p) != NULL) {
+      if ((int)next->marked > limit) {  /* preserve? */
+        if (next->marked < FIXMARK)  /* does not change FIXMARKs */
+          next->marked = 0;
+        p = &next->nexthash;
+      } 
+      else {  /* collect */
+        *p = next->nexthash;
+        L->strt.nuse--;
+        L->nblocks -= gcsizestring(L, next->u.s.len);
+        luaM_free(L, next);
+      }
+    }
+  }
+  checktab(L, &L->strt);
+}
+
+
+static void collectudatatab (lua_State *L, int all) {
+  int i;
+  for (i=0; i<L->udt.size; i++) {  /* for each list */
+    TString **p = &L->udt.hash[i];
+    TString *next;
+    while ((next = *p) != NULL) {
+      LUA_ASSERT(next->marked <= 1, "udata cannot be fixed");
+      if ((int)next->marked > all) {  /* preserve? */
+        next->marked = 0;
+        p = &next->nexthash;
+      } 
+      else {  /* collect */
+        int tag = next->u.d.tag;
+        if (tag > L->last_tag) tag = TAG_USERDATA;
+        *p = next->nexthash;
+        next->nexthash = L->IMtable[tag].collected;  /* chain udata */
+        L->IMtable[tag].collected = next;
+        L->nblocks -= gcsizeudata;
+        L->udt.nuse--;
+      }
+    }
+  }
+  checktab(L, &L->udt);
+}
+
+
+static void callgcTM (lua_State *L, const TObject *o) {
+  const TObject *im = luaT_getimbyObj(L, o, IM_GC);
+  if (ttype(im) != TAG_NIL) {
+    luaD_checkstack(L, 2);
+    *(L->top) = *im;
+    *(L->top+1) = *o;
+    L->top += 2;
+    luaD_call(L, L->top-2, 0);
+  }
+}
+
+
+static void callgcTMudata (lua_State *L) {
+  int tag;
+  TObject o;
+  ttype(&o) = TAG_USERDATA;
+  for (tag=L->last_tag; tag>=0; tag--) {
+    TString *udata = L->IMtable[tag].collected;
+    L->IMtable[tag].collected = NULL;
+    while (udata) {
+      TString *next = udata->nexthash;
+      tsvalue(&o) = udata;
+      callgcTM(L, &o);
+      luaM_free(L, udata);
+      udata = next;
+    }
+  }
+}
+
+
+void luaC_collect (lua_State *L, int all) {
+  int oldah = L->allowhooks;
+  L->allowhooks = 0;  /* stop debug hooks during GC */
   L->GCthreshold *= 4;  /* to avoid GC during GC */
-  luaC_hashcallIM(freetable);  /* GC tag methods for tables */
-  luaC_strcallIM(freestr);  /* GC tag methods for userdata */
-  luaD_gcIM(&luaO_nilobject);  /* GC tag method for nil (signal end of GC) */
-  luaH_free(freetable);
-  luaS_free(freestr);
-  luaF_freeproto(freefunc);
-  luaF_freeclosure(freeclos);
-  recovered = recovered-L->nblocks;
+  collectudatatab(L, all);
+  callgcTMudata(L);
+  collectstringtab(L, all?MAX_INT:0);
+  collecttable(L);
+  collectproto(L);
+  collectclosure(L);
+  L->allowhooks = oldah;  /* restore hooks */
+}
+
+
+#define MINBUFFER	256
+
+long lua_collectgarbage (lua_State *L, long limit) {
+  unsigned long recovered = L->nblocks;  /* to subtract `nblocks' after gc */
+  markall(L);
+  invalidaterefs(L);
+  luaC_collect(L, 0);
+  recovered = recovered - L->nblocks;
   L->GCthreshold = (limit == 0) ? 2*L->nblocks : L->nblocks+limit;
+  if (L->Mbuffsize > MINBUFFER*2) {  /* is buffer too big? */
+    L->Mbuffsize /= 2;  /* still larger than MINBUFFER */
+    luaM_reallocvector(L, L->Mbuffer, L->Mbuffsize, char);
+  }
+  callgcTM(L, &luaO_nilobject);
   return recovered;
 }
 
 
-void luaC_checkGC (void)
-{
+void luaC_checkGC (lua_State *L) {
   if (L->nblocks >= L->GCthreshold)
-    lua_collectgarbage(0);
+    lua_collectgarbage(L, 0);
 }
 

lgc.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.h,v 1.3 1997/11/19 17:29:23 roberto Exp roberto $
+** $Id: lgc.h,v 1.6 1999/10/04 17:51:04 roberto Exp roberto $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
@@ -11,11 +11,8 @@
 #include "lobject.h"
 
 
-void luaC_checkGC (void);
-TObject* luaC_getref (int ref);
-int luaC_ref (TObject *o, int lock);
-void luaC_hashcallIM (Hash *l);
-void luaC_strcallIM (TaggedString *l);
+void luaC_checkGC (lua_State *L);
+void luaC_collect (lua_State *L, int all);
 
 
 #endif

linit.c

@@ -1,17 +1,8 @@
 /*
-** $Id: linit.c,v 1.1 1999/01/08 16:47:44 roberto Exp $
+** $Id: linit.c,v 1.5 2000/06/16 17:22:43 roberto Exp roberto $
 ** Initialization of libraries for lua.c
 ** See Copyright Notice in lua.h
 */
 
-#include "lua.h"
-#include "lualib.h"
-
-
-void lua_userinit (void) {
-  lua_iolibopen();
-  lua_strlibopen();
-  lua_mathlibopen();
-  lua_dblibopen();
-}
+>>>>>>> This module is now obsolete, and is not part of Lua. <<<<<<<<<
 

llex.c

@@ -1,222 +1,115 @@
 /*
-** $Id: llex.c,v 1.33 1999/03/11 18:59:19 roberto Exp roberto $
+** $Id: llex.c,v 1.69 2000/09/11 17:38:42 roberto Exp roberto $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
 
 
 #include <ctype.h>
+#include <stdio.h>
 #include <string.h>
 
-#include "lauxlib.h"
+#include "lua.h"
+
 #include "llex.h"
 #include "lmem.h"
 #include "lobject.h"
 #include "lparser.h"
 #include "lstate.h"
 #include "lstring.h"
+#include "ltable.h"
 #include "luadebug.h"
 #include "lzio.h"
 
 
 
-#define next(LS) (LS->current = zgetc(LS->lex_z))
+#define next(LS) (LS->current = zgetc(LS->z))
 
 
-#define save(c)	luaL_addchar(c)
-#define save_and_next(LS)  (save(LS->current), next(LS))
+
+/* ORDER RESERVED */
+static const char *const token2string [] = {
+    "and", "break", "do", "else", "elseif", "end", "for",
+    "function", "if", "local", "nil", "not", "or", "repeat", "return", "then",
+    "until", "while", "", "..", "...", "==", ">=", "<=", "~=", "", "", "<eof>"};
 
 
-char *reserved [] = {"and", "do", "else", "elseif", "end", "function",
-    "if", "local", "nil", "not", "or", "repeat", "return", "then",
-    "until", "while"};
-
-
-void luaX_init (void) {
+void luaX_init (lua_State *L) {
   int i;
-  for (i=0; i<(sizeof(reserved)/sizeof(reserved[0])); i++) {
-    TaggedString *ts = luaS_new(reserved[i]);
-    ts->head.marked = FIRST_RESERVED+i;  /* reserved word  (always > 255) */
+  for (i=0; i<NUM_RESERVED; i++) {
+    TString *ts = luaS_new(L, token2string[i]);
+    ts->marked = (unsigned char)(RESERVEDMARK+i);  /* reserved word */
   }
 }
 
 
-#define MAXSRC          40
+#define MAXSRC          80
 
-void luaX_syntaxerror (LexState *ls, char *s, char *token) {
+
+void luaX_checklimit (LexState *ls, int val, int limit, const char *msg) {
+  if (val > limit) {
+    char buff[100];
+    sprintf(buff, "too many %.50s (limit=%d)", msg, limit);
+    luaX_error(ls, buff, ls->t.token);
+  }
+}
+
+
+void luaX_syntaxerror (LexState *ls, const char *s, const char *token) {
   char buff[MAXSRC];
-  luaL_chunkid(buff, zname(ls->lex_z), sizeof(buff));
-  if (token[0] == '\0')
-    token = "<eof>";
-  luaL_verror("%.100s;\n  last token read: `%.50s' at line %d in %.50s",
+  luaO_chunkid(buff, ls->source->str, sizeof(buff));
+  luaO_verror(ls->L, "%.100s;\n  last token read: `%.50s' at line %d in %.80s",
               s, token, ls->linenumber, buff);
 }
 
 
-void luaX_error (LexState *ls, char *s) {
-  save('\0');
-  luaX_syntaxerror(ls, s, luaL_buffer());
+void luaX_error (LexState *ls, const char *s, int token) {
+  char buff[TOKEN_LEN];
+  luaX_token2str(token, buff);
+  if (buff[0] == '\0')
+    luaX_syntaxerror(ls, s, ls->L->Mbuffer);
+  else
+    luaX_syntaxerror(ls, s, buff);
 }
 
 
 void luaX_token2str (int token, char *s) {
-  if (token < 255) {
+  if (token < 256) {
     s[0] = (char)token;
     s[1] = '\0';
   }
   else
-    strcpy(s, reserved[token-FIRST_RESERVED]);
+    strcpy(s, token2string[token-FIRST_RESERVED]);
 }
 
 
 static void luaX_invalidchar (LexState *ls, int c) {
-  char buff[10];
+  char buff[8];
   sprintf(buff, "0x%02X", c);
   luaX_syntaxerror(ls, "invalid control char", buff);
 }
 
 
-static void firstline (LexState *LS)
-{
-  int c = zgetc(LS->lex_z);
-  if (c == '#')
-    while ((c=zgetc(LS->lex_z)) != '\n' && c != EOZ) /* skip first line */;
-  zungetc(LS->lex_z);
-}
-
-
-void luaX_setinput (LexState *LS, ZIO *z)
-{
-  LS->current = '\n';
-  LS->linenumber = 0;
-  LS->iflevel = 0;
-  LS->ifstate[0].skip = 0;
-  LS->ifstate[0].elsepart = 1;  /* to avoid a free $else */
-  LS->lex_z = z;
-  LS->fs = NULL;
-  firstline(LS);
-  luaL_resetbuffer();
-}
-
-
-
-/*
-** =======================================================
-** PRAGMAS
-** =======================================================
-*/
-
-#define PRAGMASIZE	20
-
-static void skipspace (LexState *LS)
-{
-  while (LS->current == ' ' || LS->current == '\t' || LS->current == '\r')
-    next(LS);
-}
-
-
-static int checkcond (LexState *LS, char *buff)
-{
-  static char *opts[] = {"nil", "1", NULL};
-  int i = luaL_findstring(buff, opts);
-  if (i >= 0) return i;
-  else if (isalpha((unsigned char)buff[0]) || buff[0] == '_')
-    return luaS_globaldefined(buff);
-  else {
-    luaX_syntaxerror(LS, "invalid $if condition", buff);
-    return 0;  /* to avoid warnings */
-  }
-}
-
-
-static void readname (LexState *LS, char *buff)
-{
-  int i = 0;
-  skipspace(LS);
-  while (isalnum(LS->current) || LS->current == '_') {
-    if (i >= PRAGMASIZE) {
-      buff[PRAGMASIZE] = 0;
-      luaX_syntaxerror(LS, "pragma too long", buff);
-    }
-    buff[i++] = (char)LS->current;
-    next(LS);
-  }
-  buff[i] = 0;
-}
-
-
-static void inclinenumber (LexState *LS);
-
-
-static void ifskip (LexState *LS)
-{
-  while (LS->ifstate[LS->iflevel].skip) {
-    if (LS->current == '\n')
-      inclinenumber(LS);
-    else if (LS->current == EOZ)
-      luaX_error(LS, "input ends inside a $if");
-    else next(LS);
-  }
-}
-
-
-static void inclinenumber (LexState *LS)
-{
-  static char *pragmas [] =
-    {"debug", "nodebug", "endinput", "end", "ifnot", "if", "else", NULL};
+static void inclinenumber (LexState *LS) {
   next(LS);  /* skip '\n' */
   ++LS->linenumber;
-  if (LS->current == '$') {  /* is a pragma? */
-    char buff[PRAGMASIZE+1];
-    int ifnot = 0;
-    int skip = LS->ifstate[LS->iflevel].skip;
-    next(LS);  /* skip $ */
-    readname(LS, buff);
-    switch (luaL_findstring(buff, pragmas)) {
-      case 0:  /* debug */
-        if (!skip) L->debug = 1;
-        break;
-      case 1:  /* nodebug */
-        if (!skip) L->debug = 0;
-        break;
-      case 2:  /* endinput */
-        if (!skip) {
-          LS->current = EOZ;
-          LS->iflevel = 0;  /* to allow $endinput inside a $if */
-        }
-        break;
-      case 3:  /* end */
-        if (LS->iflevel-- == 0)
-          luaX_syntaxerror(LS, "unmatched $end", "$end");
-        break;
-      case 4:  /* ifnot */
-        ifnot = 1;
-        /* go through */
-      case 5:  /* if */
-        if (LS->iflevel == MAX_IFS-1)
-          luaX_syntaxerror(LS, "too many nested $ifs", "$if");
-        readname(LS, buff);
-        LS->iflevel++;
-        LS->ifstate[LS->iflevel].elsepart = 0;
-        LS->ifstate[LS->iflevel].condition = checkcond(LS, buff) ? !ifnot : ifnot;
-        LS->ifstate[LS->iflevel].skip = skip || !LS->ifstate[LS->iflevel].condition;
-        break;
-      case 6:  /* else */
-        if (LS->ifstate[LS->iflevel].elsepart)
-          luaX_syntaxerror(LS, "unmatched $else", "$else");
-        LS->ifstate[LS->iflevel].elsepart = 1;
-        LS->ifstate[LS->iflevel].skip = LS->ifstate[LS->iflevel-1].skip ||
-                                      LS->ifstate[LS->iflevel].condition;
-        break;
-      default:
-        luaX_syntaxerror(LS, "unknown pragma", buff);
-    }
-    skipspace(LS);
-    if (LS->current == '\n')  /* pragma must end with a '\n' ... */
-      inclinenumber(LS);
-    else if (LS->current != EOZ)  /* or eof */
-      luaX_syntaxerror(LS, "invalid pragma format", buff);
-    ifskip(LS);
+  luaX_checklimit(LS, LS->linenumber, MAX_INT, "lines in a chunk");
+}
+
+
+void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source) {
+  LS->L = L;
+  LS->lookahead.token = TK_EOS;  /* no look-ahead token */
+  LS->z = z;
+  LS->fs = NULL;
+  LS->linenumber = 1;
+  LS->lastline = 1;
+  LS->source = source;
+  next(LS);  /* read first char */
+  if (LS->current == '#') {
+    do {  /* skip first line */
+      next(LS);
+    } while (LS->current != '\n' && LS->current != EOZ);
   }
 }
 
@@ -224,55 +117,172 @@ static void inclinenumber (LexState *LS)
 
 /*
 ** =======================================================
-** LEXICAL ANALIZER
+** LEXICAL ANALYZER
 ** =======================================================
 */
 
 
+/* use Mbuffer to store names, literal strings and numbers */
 
-static int read_long_string (LexState *LS) {
+#define EXTRABUFF	128
+#define checkbuffer(L, n, len)	if ((len)+(n) > L->Mbuffsize) \
+                                  luaO_openspace(L, (len)+(n)+EXTRABUFF)
+
+#define save(L, c, l)	(L->Mbuffer[l++] = (char)c)
+#define save_and_next(L, LS, l)  (save(L, LS->current, l), next(LS))
+
+
+static const char *readname (LexState *LS) {
+  lua_State *L = LS->L;
+  size_t l = 0;
+  checkbuffer(L, 10, l);
+  do {
+    checkbuffer(L, 10, l);
+    save_and_next(L, LS, l);
+  } while (isalnum(LS->current) || LS->current == '_');
+  save(L, '\0', l);
+  return L->Mbuffer;
+}
+
+
+/* LUA_NUMBER */
+static void read_number (LexState *LS, int comma) {
+  lua_State *L = LS->L;
+  size_t l = 0;
+  checkbuffer(L, 10, l);
+  if (comma) save(L, '.', l);
+  while (isdigit(LS->current)) {
+    checkbuffer(L, 10, l);
+    save_and_next(L, LS, l);
+  }
+  if (LS->current == '.') {
+    save_and_next(L, LS, l);
+    if (LS->current == '.') {
+      save_and_next(L, LS, l);
+      save(L, '\0', l);
+      luaX_error(LS, "ambiguous syntax"
+           " (decimal point x string concatenation)", TK_NUMBER);
+    }
+  }
+  while (isdigit(LS->current)) {
+    checkbuffer(L, 10, l);
+    save_and_next(L, LS, l);
+  }
+  if (LS->current == 'e' || LS->current == 'E') {
+    save_and_next(L, LS, l);  /* read 'E' */
+    if (LS->current == '+' || LS->current == '-')
+      save_and_next(L, LS, l);  /* optional exponent sign */
+    while (isdigit(LS->current)) {
+      checkbuffer(L, 10, l);
+      save_and_next(L, LS, l);
+    }
+  }
+  save(L, '\0', l);
+  if (!luaO_str2d(L->Mbuffer, &LS->t.seminfo.r))
+    luaX_error(LS, "malformed number", TK_NUMBER);
+}
+
+
+static void read_long_string (LexState *LS) {
+  lua_State *L = LS->L;
   int cont = 0;
+  size_t l = 0;
+  checkbuffer(L, 10, l);
+  save(L, '[', l);  /* save first '[' */
+  save_and_next(L, LS, l);  /* pass the second '[' */
   for (;;) {
+    checkbuffer(L, 10, l);
     switch (LS->current) {
       case EOZ:
-        luaX_error(LS, "unfinished long string");
-        return EOS;  /* to avoid warnings */
+        save(L, '\0', l);
+        luaX_error(LS, "unfinished long string", TK_STRING);
+        break;  /* to avoid warnings */
       case '[':
-        save_and_next(LS);
+        save_and_next(L, LS, l);
         if (LS->current == '[') {
           cont++;
-          save_and_next(LS);
+          save_and_next(L, LS, l);
         }
         continue;
       case ']':
-        save_and_next(LS);
+        save_and_next(L, LS, l);
         if (LS->current == ']') {
           if (cont == 0) goto endloop;
           cont--;
-          save_and_next(LS);
+          save_and_next(L, LS, l);
         }
         continue;
       case '\n':
-        save('\n');
+        save(L, '\n', l);
         inclinenumber(LS);
         continue;
       default:
-        save_and_next(LS);
+        save_and_next(L, LS, l);
     }
   } endloop:
-  save_and_next(LS);  /* skip the second ']' */
-  LS->seminfo.ts = luaS_newlstr(L->Mbuffer+(L->Mbuffbase+2),
-                          L->Mbuffnext-L->Mbuffbase-4);
-  return STRING;
+  save_and_next(L, LS, l);  /* skip the second ']' */
+  save(L, '\0', l);
+  LS->t.seminfo.ts = luaS_newlstr(L, L->Mbuffer+2, l-5);
+}
+
+
+static void read_string (LexState *LS, int del) {
+  lua_State *L = LS->L;
+  size_t l = 0;
+  checkbuffer(L, 10, l);
+  save_and_next(L, LS, l);
+  while (LS->current != del) {
+    checkbuffer(L, 10, l);
+    switch (LS->current) {
+      case EOZ:  case '\n':
+        save(L, '\0', l);
+        luaX_error(LS, "unfinished string", TK_STRING);
+        break;  /* to avoid warnings */
+      case '\\':
+        next(LS);  /* do not save the '\' */
+        switch (LS->current) {
+          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 '0': case '1': case '2': case '3': case '4':
+          case '5': case '6': case '7': case '8': case '9': {
+            int c = 0;
+            int i = 0;
+            do {
+              c = 10*c + (LS->current-'0');
+              next(LS);
+            } while (++i<3 && isdigit(LS->current));
+            if (c != (unsigned char)c) {
+              save(L, '\0', l);
+              luaX_error(LS, "escape sequence too large", TK_STRING);
+            }
+            save(L, c, l);
+            break;
+          }
+          default:  /* handles \\, \", \', and \? */
+            save_and_next(L, LS, l);
+        }
+        break;
+      default:
+        save_and_next(L, LS, l);
+    }
+  }
+  save_and_next(L, LS, l);  /* skip delimiter */
+  save(L, '\0', l);
+  LS->t.seminfo.ts = luaS_newlstr(L, L->Mbuffer+1, l-3);
 }
 
 
 int luaX_lex (LexState *LS) {
-  luaL_resetbuffer();
   for (;;) {
     switch (LS->current) {
 
-      case ' ': case '\t': case '\r':  /* CR: to avoid problems with DOS */
+      case ' ': case '\t': case '\r':  /* `\r' to avoid problems with DOS */
         next(LS);
         continue;
 
@@ -280,159 +290,89 @@ int luaX_lex (LexState *LS) {
         inclinenumber(LS);
         continue;
 
+      case '$':
+        luaX_error(LS, "unexpected `$' (pragmas are no longer supported)", '$');
+        break;
+
       case '-':
-        save_and_next(LS);
+        next(LS);
         if (LS->current != '-') return '-';
         do { next(LS); } while (LS->current != '\n' && LS->current != EOZ);
-        luaL_resetbuffer();
         continue;
 
       case '[':
-        save_and_next(LS);
+        next(LS);
         if (LS->current != '[') return '[';
         else {
-          save_and_next(LS);  /* pass the second '[' */
-          return read_long_string(LS);
+          read_long_string(LS);
+          return TK_STRING;
         }
 
       case '=':
-        save_and_next(LS);
+        next(LS);
         if (LS->current != '=') return '=';
-        else { save_and_next(LS); return EQ; }
+        else { next(LS); return TK_EQ; }
 
       case '<':
-        save_and_next(LS);
+        next(LS);
         if (LS->current != '=') return '<';
-        else { save_and_next(LS); return LE; }
+        else { next(LS); return TK_LE; }
 
       case '>':
-        save_and_next(LS);
+        next(LS);
         if (LS->current != '=') return '>';
-        else { save_and_next(LS); return GE; }
+        else { next(LS); return TK_GE; }
 
       case '~':
-        save_and_next(LS);
+        next(LS);
         if (LS->current != '=') return '~';
-        else { save_and_next(LS); return NE; }
+        else { next(LS); return TK_NE; }
 
       case '"':
-      case '\'': {
-        int del = LS->current;
-        save_and_next(LS);
-        while (LS->current != del) {
-          switch (LS->current) {
-            case EOZ:
-            case '\n':
-              luaX_error(LS, "unfinished string");
-              return EOS;  /* to avoid warnings */
-            case '\\':
-              next(LS);  /* do not save the '\' */
-              switch (LS->current) {
-                case 'a': save('\a'); next(LS); break;
-                case 'b': save('\b'); next(LS); break;
-                case 'f': save('\f'); next(LS); break;
-                case 'n': save('\n'); next(LS); break;
-                case 'r': save('\r'); next(LS); break;
-                case 't': save('\t'); next(LS); break;
-                case 'v': save('\v'); next(LS); break;
-                case '\n': save('\n'); inclinenumber(LS); break;
-                default : {
-                  if (isdigit(LS->current)) {
-                    int c = 0;
-                    int i = 0;
-                    do {
-                      c = 10*c + (LS->current-'0');
-                      next(LS);
-                    } while (++i<3 && isdigit(LS->current));
-                    if (c != (unsigned char)c)
-                      luaX_error(LS, "escape sequence too large");
-                    save(c);
-                  }
-                  else {  /* handles \, ", ', and ? */
-                    save(LS->current);
-                    next(LS);
-                  }
-                  break;
-                }
-              }
-              break;
-            default:
-              save_and_next(LS);
-          }
-        }
-        save_and_next(LS);  /* skip delimiter */
-        LS->seminfo.ts = luaS_newlstr(L->Mbuffer+(L->Mbuffbase+1),
-                                L->Mbuffnext-L->Mbuffbase-2);
-        return STRING;
-      }
+      case '\'':
+        read_string(LS, LS->current);
+        return TK_STRING;
 
       case '.':
-        save_and_next(LS);
-        if (LS->current == '.')
-        {
-          save_and_next(LS);
-          if (LS->current == '.')
-          {
-            save_and_next(LS);
-            return DOTS;   /* ... */
+        next(LS);
+        if (LS->current == '.') {
+          next(LS);
+          if (LS->current == '.') {
+            next(LS);
+            return TK_DOTS;   /* ... */
           }
-          else return CONC;   /* .. */
+          else return TK_CONCAT;   /* .. */
         }
         else if (!isdigit(LS->current)) return '.';
-        goto fraction;  /* LS->current is a digit: goes through to number */
+        else {
+          read_number(LS, 1);
+          return TK_NUMBER;
+        }
 
       case '0': case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9':
-        do {
-          save_and_next(LS);
-        } while (isdigit(LS->current));
-        if (LS->current == '.') {
-          save_and_next(LS);
-          if (LS->current == '.') {
-            save('.');
-            luaX_error(LS, 
-              "ambiguous syntax (decimal point x string concatenation)");
-          }
-        }
-      fraction:
-        while (isdigit(LS->current))
-          save_and_next(LS);
-        if (toupper(LS->current) == 'E') {
-          save_and_next(LS);  /* read 'E' */
-          save_and_next(LS);  /* read '+', '-' or first digit */
-          while (isdigit(LS->current))
-            save_and_next(LS);
-        }
-        save('\0');
-        LS->seminfo.r = luaO_str2d(L->Mbuffer+L->Mbuffbase);
-        if (LS->seminfo.r < 0)
-          luaX_error(LS, "invalid numeric format");
-        return NUMBER;
+        read_number(LS, 0);
+        return TK_NUMBER;
 
       case EOZ:
-        if (LS->iflevel > 0)
-          luaX_error(LS, "input ends inside a $if");
-        return EOS;
+        return TK_EOS;
+
+      case '_': goto tname;
 
       default:
-        if (LS->current != '_' && !isalpha(LS->current)) {
+        if (!isalpha(LS->current)) {
           int c = LS->current;
           if (iscntrl(c))
             luaX_invalidchar(LS, c);
-          save_and_next(LS);
+          next(LS);
           return c;
         }
-        else {  /* identifier or reserved word */
-          TaggedString *ts;
-          do {
-            save_and_next(LS);
-          } while (isalnum(LS->current) || LS->current == '_');
-          save('\0');
-          ts = luaS_new(L->Mbuffer+L->Mbuffbase);
-          if (ts->head.marked >= FIRST_RESERVED)
-            return ts->head.marked;  /* reserved word */
-          LS->seminfo.ts = ts;
-          return NAME;
+        tname: {  /* identifier or reserved word */
+          TString *ts = luaS_new(LS->L, readname(LS));
+          if (ts->marked >= RESERVEDMARK)  /* reserved word? */
+            return ts->marked-RESERVEDMARK+FIRST_RESERVED;
+          LS->t.seminfo.ts = ts;
+          return TK_NAME;
         }
     }
   }

llex.h

@@ -1,5 +1,5 @@
 /*
-** $Id: llex.h,v 1.10 1998/07/24 18:02:38 roberto Exp roberto $
+** $Id: llex.h,v 1.29 2000/06/19 18:05:14 roberto Exp roberto $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
@@ -11,51 +11,57 @@
 #include "lzio.h"
 
 
-#define FIRST_RESERVED	260
+#define FIRST_RESERVED	257
 
-/* maximum length of a reserved word (+1 for terminal 0) */
+/* maximum length of a reserved word (+1 for final 0) */
 #define TOKEN_LEN	15
 
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER RESERVED"
+*/
 enum RESERVED {
   /* terminal symbols denoted by reserved words */
-  AND = FIRST_RESERVED,
-  DO, ELSE, ELSEIF, END, FUNCTION, IF, LOCAL, NIL, NOT, OR,
-  REPEAT, RETURN, THEN, UNTIL, WHILE,
+  TK_AND = FIRST_RESERVED, TK_BREAK,
+  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FOR, TK_FUNCTION, TK_IF, TK_LOCAL,
+  TK_NIL, TK_NOT, TK_OR, TK_REPEAT, TK_RETURN, TK_THEN, TK_UNTIL, TK_WHILE,
   /* other terminal symbols */
-  NAME, CONC, DOTS, EQ, GE, LE, NE, NUMBER, STRING, EOS};
-
-
-#define MAX_IFS 5
-
-/* "ifstate" keeps the state of each nested $if the lexical is dealing with. */
-
-struct ifState {
-  int elsepart;  /* true if it's in the $else part */
-  int condition;  /* true if $if condition is true */
-  int skip;  /* true if part must be skipped */
+  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))
+
+
+typedef struct Token {
+  int token;
+  union {
+    Number r;
+    TString *ts;
+  } seminfo;  /* semantics information */
+} Token;
 
 typedef struct LexState {
-  int current;  /* look ahead character */
-  int token;  /* look ahead token */
-  struct FuncState *fs;  /* 'FuncState' is private for the parser */
-  union {
-    real r;
-    TaggedString *ts;
-  } seminfo;  /* semantics information */
-  struct zio *lex_z;  /* input stream */
+  int current;  /* current character */
+  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 iflevel;  /* level of nested $if's (for lexical analysis) */
-  struct ifState ifstate[MAX_IFS];
+  int lastline;  /* line of last token `consumed' */
+  TString *source;  /* current source name */
 } LexState;
 
 
-void luaX_init (void);
-void luaX_setinput (LexState *LS, ZIO *z);
+void luaX_init (lua_State *L);
+void luaX_setinput (lua_State *L, LexState *LS, ZIO *z, TString *source);
 int luaX_lex (LexState *LS);
-void luaX_syntaxerror (LexState *ls, char *s, char *token);
-void luaX_error (LexState *ls, char *s);
+void luaX_checklimit (LexState *ls, int val, int limit, const char *msg);
+void luaX_syntaxerror (LexState *ls, const char *s, const char *token);
+void luaX_error (LexState *ls, const char *s, int token);
 void luaX_token2str (int token, char *s);
 
 

llimits.h

@@ -0,0 +1,204 @@
+/*
+** $Id: llimits.h,v 1.13 2000/08/28 17:57:04 roberto Exp roberto $
+** Limits, basic types, and some other "installation-dependent" definitions
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llimits_h
+#define llimits_h
+
+
+#include <limits.h>
+#include <stddef.h>
+
+
+
+/*
+** try to find number of bits in an integer
+*/
+#ifndef BITS_INT
+/* avoid overflows in comparison */
+#if INT_MAX-20 < 32760
+#define	BITS_INT	16
+#else
+#if INT_MAX > 2147483640L
+/* machine has at least 32 bits */
+#define BITS_INT	32
+#else
+#error "you must define BITS_INT with number of bits in an integer"
+#endif
+#endif
+#endif
+
+
+/*
+** Define the type `number' of Lua
+** GREP LUA_NUMBER to change that
+*/
+#ifndef LUA_NUM_TYPE
+#define LUA_NUM_TYPE double
+#endif
+
+typedef LUA_NUM_TYPE Number;
+
+
+typedef unsigned long lint32;  /* unsigned int with at least 32 bits */
+
+
+#define MAX_SIZET	((size_t)(~(size_t)0)-2)
+
+
+#define MAX_INT (INT_MAX-2)  /* maximum value of an int (-2 for safety) */
+
+/*
+** conversion of pointer to int (for hashing only)
+** (the shift removes bits that are usually 0 because of alignment)
+*/
+#define IntPoint(p)  (((unsigned long)(p)) >> 3)
+
+
+/*
+** number of `blocks' for garbage collection: each reference to other
+** objects count 1, and each 32 bytes of `raw' memory count 1; we add
+** 2 to the total as a minimum (and also to count the overhead of malloc)
+*/
+#define numblocks(L, o,b)       ((o)+((b)>>5)+2)
+
+
+#define MINPOWER2       4       /* minimum size for "growing" vectors */
+
+
+
+#ifndef DEFAULT_STACK_SIZE
+#define DEFAULT_STACK_SIZE      1024
+#endif
+
+
+
+/*
+** type for virtual-machine instructions
+** must be an unsigned with 4 bytes (see details in lopcodes.h)
+** For a very small machine, you may change that to 2 bytes (and adjust
+** the following limits accordingly)
+*/
+typedef unsigned long Instruction;
+
+
+/*
+** size and position of opcode arguments.
+** For an instruction with 2 bytes, size is 16, and size_b can be 5
+** (accordingly, size_u will be 10, and size_a will be 5)
+*/
+#define SIZE_INSTRUCTION        32
+#define SIZE_B          9
+
+#define SIZE_OP         6
+#define SIZE_U          (SIZE_INSTRUCTION-SIZE_OP)
+#define POS_U           SIZE_OP
+#define POS_B           SIZE_OP
+#define SIZE_A          (SIZE_INSTRUCTION-(SIZE_OP+SIZE_B))
+#define POS_A           (SIZE_OP+SIZE_B)
+
+
+/*
+** limits for opcode arguments.
+** we use (signed) int to manipulate most arguments,
+** so they must fit in BITS_INT-1 bits (-1 for signal)
+*/
+#if SIZE_U < BITS_INT-1
+#define MAXARG_U        ((1<<SIZE_U)-1)
+#define MAXARG_S        (MAXARG_U>>1)		/* `S' is signed */
+#else
+#define MAXARG_U        MAX_INT
+#define MAXARG_S        MAX_INT
+#endif
+
+#if SIZE_A < BITS_INT-1
+#define MAXARG_A        ((1<<SIZE_A)-1)
+#else
+#define MAXARG_A        MAX_INT
+#endif
+
+#if SIZE_B < BITS_INT-1
+#define MAXARG_B        ((1<<SIZE_B)-1)
+#else
+#define MAXARG_B        MAX_INT
+#endif
+
+
+/* maximum stack size in a function */
+#ifndef MAXSTACK
+#define MAXSTACK	250
+#endif
+
+#if MAXSTACK > MAXARG_B
+#undef MAXSTACK
+#define MAXSTACK	MAXARG_B
+#endif
+
+
+/* maximum number of local variables */
+#ifndef MAXLOCALS
+#define MAXLOCALS 200           /* arbitrary limit (<MAXSTACK) */
+#endif
+#if MAXLOCALS>=MAXSTACK
+#undef MAXLOCALS
+#define MAXLOCALS	(MAXSTACK-1)
+#endif
+
+
+/* maximum number of upvalues */
+#ifndef MAXUPVALUES
+#define MAXUPVALUES 32          /* arbitrary limit (<=MAXARG_B) */
+#endif
+#if MAXUPVALUES>MAXARG_B
+#undef MAXUPVALUES
+#define MAXUPVALUES	MAXARG_B
+#endif
+
+
+/* maximum number of variables in the left side of an assignment */
+#ifndef MAXVARSLH
+#define MAXVARSLH 100           /* arbitrary limit (<MULT_RET) */
+#endif
+#if MAXVARSLH>=MULT_RET
+#undef MAXVARSLH
+#define MAXVARSLH	(MULT_RET-1)
+#endif
+
+
+/* maximum number of parameters in a function */
+#ifndef MAXPARAMS
+#define MAXPARAMS 100           /* arbitrary limit (<MAXLOCALS) */
+#endif
+#if MAXPARAMS>=MAXLOCALS
+#undef MAXPARAMS
+#define MAXPARAMS	(MAXLOCALS-1)
+#endif
+
+
+/* number of list items to accumulate before a SETLIST instruction */
+#define LFIELDS_PER_FLUSH	64
+#if LFIELDS_PER_FLUSH>(MAXSTACK/4)
+#undef LFIELDS_PER_FLUSH
+#define LFIELDS_PER_FLUSH	(MAXSTACK/4)
+#endif
+
+/* number of record items to accumulate before a SETMAP instruction */
+/* (each item counts 2 elements on the stack: an index and a value) */
+#define RFIELDS_PER_FLUSH	(LFIELDS_PER_FLUSH/2)
+
+
+/* maximum lookback to find a real constant (for code generation) */
+#ifndef LOOKBACKNUMS
+#define LOOKBACKNUMS    20      /* arbitrary constant */
+#endif
+
+
+/* maximum part of a file name kept for error messages */
+#ifndef MAXFILENAME
+#define	MAXFILENAME	260
+#endif
+
+
+#endif

lmathlib.c

@@ -1,6 +1,6 @@
 /*
-** $Id: lmathlib.c,v 1.15 1999/01/04 12:41:12 roberto Exp roberto $
-** Lua standard mathematical library
+** $Id: lmathlib.c,v 1.27 2000/08/28 17:57:04 roberto Exp roberto $
+** Standard mathematical library
 ** See Copyright Notice in lua.h
 */
 
@@ -8,13 +8,15 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "lauxlib.h"
 #include "lua.h"
+
+#include "lauxlib.h"
 #include "lualib.h"
 
 
-#define PI	(3.14159265358979323846)
-#define RADIANS_PER_DEGREE	(PI/180.0)
+#undef PI
+#define PI (3.14159265358979323846)
+#define RADIANS_PER_DEGREE (PI/180.0)
 
 
 
@@ -31,139 +33,173 @@
 #endif
 
 
-static void math_abs (void) {
-  lua_pushnumber(fabs(luaL_check_number(1)));
+static int math_abs (lua_State *L) {
+  lua_pushnumber(L, fabs(luaL_check_number(L, 1)));
+  return 1;
 }
 
-static void math_sin (void) {
-  lua_pushnumber(sin(TORAD(luaL_check_number(1))));
+static int math_sin (lua_State *L) {
+  lua_pushnumber(L, sin(TORAD(luaL_check_number(L, 1))));
+  return 1;
 }
 
-static void math_cos (void) {
-  lua_pushnumber(cos(TORAD(luaL_check_number(1))));
+static int math_cos (lua_State *L) {
+  lua_pushnumber(L, cos(TORAD(luaL_check_number(L, 1))));
+  return 1;
 }
 
-static void math_tan (void) {
-  lua_pushnumber(tan(TORAD(luaL_check_number(1))));
+static int math_tan (lua_State *L) {
+  lua_pushnumber(L, tan(TORAD(luaL_check_number(L, 1))));
+  return 1;
 }
 
-static void math_asin (void) {
-  lua_pushnumber(FROMRAD(asin(luaL_check_number(1))));
+static int math_asin (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(asin(luaL_check_number(L, 1))));
+  return 1;
 }
 
-static void math_acos (void) {
-  lua_pushnumber(FROMRAD(acos(luaL_check_number(1))));
+static int math_acos (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(acos(luaL_check_number(L, 1))));
+  return 1;
 }
 
-static void math_atan (void) {
-  lua_pushnumber(FROMRAD(atan(luaL_check_number(1))));
+static int math_atan (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(atan(luaL_check_number(L, 1))));
+  return 1;
 }
 
-static void math_atan2 (void) {
-  lua_pushnumber(FROMRAD(atan2(luaL_check_number(1), luaL_check_number(2))));
+static int math_atan2 (lua_State *L) {
+  lua_pushnumber(L, FROMRAD(atan2(luaL_check_number(L, 1), luaL_check_number(L, 2))));
+  return 1;
 }
 
-static void math_ceil (void) {
-  lua_pushnumber(ceil(luaL_check_number(1)));
+static int math_ceil (lua_State *L) {
+  lua_pushnumber(L, ceil(luaL_check_number(L, 1)));
+  return 1;
 }
 
-static void math_floor (void) {
-  lua_pushnumber(floor(luaL_check_number(1)));
+static int math_floor (lua_State *L) {
+  lua_pushnumber(L, floor(luaL_check_number(L, 1)));
+  return 1;
 }
 
-static void math_mod (void) {
-  lua_pushnumber(fmod(luaL_check_number(1), luaL_check_number(2)));
+static int math_mod (lua_State *L) {
+  lua_pushnumber(L, fmod(luaL_check_number(L, 1), luaL_check_number(L, 2)));
+  return 1;
 }
 
-static void math_sqrt (void) {
-  lua_pushnumber(sqrt(luaL_check_number(1)));
+static int math_sqrt (lua_State *L) {
+  lua_pushnumber(L, sqrt(luaL_check_number(L, 1)));
+  return 1;
 }
 
-static void math_pow (void) {
-  lua_pushnumber(pow(luaL_check_number(1), luaL_check_number(2)));
+static int math_pow (lua_State *L) {
+  lua_pushnumber(L, pow(luaL_check_number(L, 1), luaL_check_number(L, 2)));
+  return 1;
 }
 
-static void math_log (void) {
-  lua_pushnumber(log(luaL_check_number(1)));
+static int math_log (lua_State *L) {
+  lua_pushnumber(L, log(luaL_check_number(L, 1)));
+  return 1;
 }
 
-static void math_log10 (void) {
-  lua_pushnumber(log10(luaL_check_number(1)));
+static int math_log10 (lua_State *L) {
+  lua_pushnumber(L, log10(luaL_check_number(L, 1)));
+  return 1;
 }
 
-static void math_exp (void) {
-  lua_pushnumber(exp(luaL_check_number(1)));
+static int math_exp (lua_State *L) {
+  lua_pushnumber(L, exp(luaL_check_number(L, 1)));
+  return 1;
 }
 
-static void math_deg (void) {
-  lua_pushnumber(luaL_check_number(1)/RADIANS_PER_DEGREE);
+static int math_deg (lua_State *L) {
+  lua_pushnumber(L, luaL_check_number(L, 1)/RADIANS_PER_DEGREE);
+  return 1;
 }
 
-static void math_rad (void) {
-  lua_pushnumber(luaL_check_number(1)*RADIANS_PER_DEGREE);
+static int math_rad (lua_State *L) {
+  lua_pushnumber(L, luaL_check_number(L, 1)*RADIANS_PER_DEGREE);
+  return 1;
 }
 
-static void math_frexp (void) {
+static int math_frexp (lua_State *L) {
   int e;
-  lua_pushnumber(frexp(luaL_check_number(1), &e));
-  lua_pushnumber(e);
+  lua_pushnumber(L, frexp(luaL_check_number(L, 1), &e));
+  lua_pushnumber(L, e);
+  return 2;
 }
 
-static void math_ldexp (void) {
-  lua_pushnumber(ldexp(luaL_check_number(1), luaL_check_int(2)));
+static int math_ldexp (lua_State *L) {
+  lua_pushnumber(L, ldexp(luaL_check_number(L, 1), luaL_check_int(L, 2)));
+  return 1;
 }
 
 
 
-static void math_min (void) {
-  int i = 1;
-  double dmin = luaL_check_number(i);
-  while (lua_getparam(++i) != LUA_NOOBJECT) {
-    double d = luaL_check_number(i);
+static int math_min (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  double dmin = luaL_check_number(L, 1);
+  int i;
+  for (i=2; i<=n; i++) {
+    double d = luaL_check_number(L, i);
     if (d < dmin)
       dmin = d;
   }
-  lua_pushnumber(dmin);
+  lua_pushnumber(L, dmin);
+  return 1;
 }
 
 
-static void math_max (void) {
-  int i = 1;
-  double dmax = luaL_check_number(i);
-  while (lua_getparam(++i) != LUA_NOOBJECT) {
-    double d = luaL_check_number(i);
+static int math_max (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  double dmax = luaL_check_number(L, 1);
+  int i;
+  for (i=2; i<=n; i++) {
+    double d = luaL_check_number(L, i);
     if (d > dmax)
       dmax = d;
   }
-  lua_pushnumber(dmax);
+  lua_pushnumber(L, dmax);
+  return 1;
 }
 
 
-static void math_random (void) {
+static int math_random (lua_State *L) {
   /* the '%' avoids the (rare) case of r==1, and is needed also because on
-     some systems (SunOS!) "rand()" may return a value bigger than RAND_MAX */
+     some systems (SunOS!) "rand()" may return a value larger than RAND_MAX */
   double r = (double)(rand()%RAND_MAX) / (double)RAND_MAX;
-  int l = luaL_opt_int(1, 0);
-  if (l == 0)
-    lua_pushnumber(r);
-  else {
-    int u = luaL_opt_int(2, 0);
-    if (u == 0) {
-      u = l;
-      l = 1;
+  switch (lua_gettop(L)) {  /* check number of arguments */
+    case 0: {  /* no arguments */
+      lua_pushnumber(L, r);  /* Number between 0 and 1 */
+      break;
     }
-    luaL_arg_check(l<=u, 1, "interval is empty");
-    lua_pushnumber((int)(r*(u-l+1))+l);
+    case 1: {  /* only upper limit */
+      int u = luaL_check_int(L, 1);
+      luaL_arg_check(L, 1<=u, 1, "interval is empty");
+      lua_pushnumber(L, (int)(r*u)+1);  /* integer 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, "interval is empty");
+      lua_pushnumber(L, (int)(r*(u-l+1))+l);  /* integer between `l' and `u' */
+      break;
+    }
+    default: lua_error(L, "wrong number of arguments");
   }
+  return 1;
 }
 
 
-static void math_randomseed (void) {
-  srand(luaL_check_int(1));
+static int math_randomseed (lua_State *L) {
+  srand(luaL_check_int(L, 1));
+  return 0;
 }
 
 
-static struct luaL_reg mathlib[] = {
+static const struct luaL_reg mathlib[] = {
 {"abs",   math_abs},
 {"sin",   math_sin},
 {"cos",   math_cos},
@@ -192,11 +228,12 @@ static struct luaL_reg mathlib[] = {
 /*
 ** Open math library
 */
-void lua_mathlibopen (void) {
-  luaL_openlib(mathlib, (sizeof(mathlib)/sizeof(mathlib[0])));
-  lua_pushcfunction(math_pow);
-  lua_pushnumber(0);  /* to get its tag */
-  lua_settagmethod(lua_tag(lua_pop()), "pow");
-  lua_pushnumber(PI); lua_setglobal("PI");
+void lua_mathlibopen (lua_State *L) {
+  luaL_openl(L, mathlib);
+  lua_pushnumber(L, 0);  /* to get its tag */
+  lua_pushcfunction(L, math_pow);
+  lua_settagmethod(L, lua_tag(L, -2), "pow");
+  lua_pop(L, 1);  /* remove number */
+  lua_pushnumber(L, PI); lua_setglobal(L, "PI");
 }
 

lmem.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.c,v 1.13 1999/02/26 15:50:10 roberto Exp roberto $
+** $Id: lmem.c,v 1.35 2000/08/04 19:38:35 roberto Exp roberto $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
@@ -7,14 +7,17 @@
 
 #include <stdlib.h>
 
-#include "lmem.h"
-#include "lstate.h"
 #include "lua.h"
 
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
 
 /*
-** real ANSI systems do not need these tests;
-** but some systems (Sun OS) are not that ANSI...
+** Real ISO (ANSI) systems do not need these tests;
+** but some systems (Sun OS) are not that ISO...
 */
 #ifdef OLD_ANSI
 #define realloc(b,s)	((b) == NULL ? malloc(s) : (realloc)(b, s))
@@ -22,114 +25,129 @@
 #endif
 
 
-#define MINSIZE	16	/* minimum size for "growing" vectors */
+
+#ifdef DEBUG
+/*
+** {======================================================================
+** Controlled version for realloc.
+** =======================================================================
+*/
 
 
+#include <assert.h>
+#include <limits.h>
+#include <string.h>
 
-#ifndef DEBUG
+#undef realloc
+#undef malloc
+#undef free
+#define realloc(b, s)	debug_realloc(b, s)
+#define malloc(b)	debug_realloc(NULL, 0)
+#define free(b)		debug_realloc(b, 0)
 
 
-static unsigned long power2 (unsigned long n) {
-  unsigned long p = MINSIZE;
-  while (p<=n) p<<=1;
-  return p;
+/* ensures maximum alignment for HEADER */
+union L_U { double d; char *s; long l; };
+#define HEADER	(sizeof(union L_U))
+
+#define MARKSIZE	16
+#define MARK		0x55  /* 01010101 (a nice pattern) */
+
+
+#define blocksize(b)	((unsigned long *)((char *)(b) - HEADER))
+
+unsigned long memdebug_numblocks = 0;
+unsigned long memdebug_total = 0;
+unsigned long memdebug_maxmem = 0;
+unsigned long memdebug_memlimit = LONG_MAX;
+
+
+static void *checkblock (void *block) {
+  unsigned long *b = blocksize(block);
+  unsigned long size = *b;
+  int i;
+  for (i=0;i<MARKSIZE;i++)
+    assert(*(((char *)b)+HEADER+size+i) == MARK+i);  /* corrupted block? */
+  memdebug_numblocks--;
+  memdebug_total -= size;
+  return b;
 }
 
 
-void *luaM_growaux (void *block, unsigned long nelems, int inc, int size,
-                       char *errormsg, unsigned long limit) {
-  unsigned long newn = nelems+inc;
-  if ((newn ^ nelems) <= nelems ||  /* still the same power of 2 limit? */
-       (nelems > 0 && newn < MINSIZE))  /* or block already is MINSIZE? */
-      return block;  /* do not need to reallocate */
-  else {  /* it crossed a power of 2 boundary; grow to next power */
-    if (newn >= limit)
-      lua_error(errormsg);
-    newn = power2(newn);
-    if (newn > limit)
-      newn = limit;
-    return luaM_realloc(block, newn*size);
+static void freeblock (void *block) {
+  if (block) {
+    size_t size = *blocksize(block);
+    block = checkblock(block);
+    memset(block, -1, size+HEADER+MARKSIZE);  /* erase block */
+    (free)(block);  /* free original block */
   }
 }
 
 
+static void *debug_realloc (void *block, size_t size) {
+  if (size == 0) {
+    freeblock(block);
+    return NULL;
+  }
+  else if (memdebug_total+size > memdebug_memlimit)
+    return NULL;  /* to test memory allocation errors */
+  else {
+    size_t realsize = HEADER+size+MARKSIZE;
+    char *newblock = (char *)(malloc)(realsize);  /* alloc a new block */
+    int i;
+    if (realsize < size) return NULL;  /* overflow! */
+    if (newblock == NULL) return NULL;
+    if (block) {
+      size_t oldsize = *blocksize(block);
+      if (oldsize > size) oldsize = size;
+      memcpy(newblock+HEADER, block, oldsize);
+      freeblock(block);  /* erase (and check) old copy */
+    }
+    memdebug_total += size;
+    if (memdebug_total > memdebug_maxmem) memdebug_maxmem = memdebug_total;
+    memdebug_numblocks++;
+    *(unsigned long *)newblock = size;
+    for (i=0;i<MARKSIZE;i++)
+      *(newblock+HEADER+size+i) = (char)(MARK+i);
+    return newblock+HEADER;
+  }
+}
+
+
+/* }====================================================================== */
+#endif
+
+
+
+void *luaM_growaux (lua_State *L, void *block, size_t nelems,
+               int inc, size_t size, const char *errormsg, size_t limit) {
+  size_t newn = nelems+inc;
+  if (nelems >= limit-inc) lua_error(L, errormsg);
+  if ((newn ^ nelems) <= nelems ||  /* still the same power-of-2 limit? */
+       (nelems > 0 && newn < MINPOWER2))  /* or block already is MINPOWER2? */
+      return block;  /* do not need to reallocate */
+  else  /* it crossed a power-of-2 boundary; grow to next power */
+    return luaM_realloc(L, block, luaO_power2(newn)*size);
+}
+
+
 /*
 ** generic allocation routine.
 */
-void *luaM_realloc (void *block, unsigned long size) {
-  size_t s = (size_t)size;
-  if (s != size)
-    lua_error("memory allocation error: block too big");
+void *luaM_realloc (lua_State *L, void *block, lint32 size) {
   if (size == 0) {
-    free(block);  /* block may be NULL, that is OK for free */
+    free(block);  /* block may be NULL; that is OK for free */
     return NULL;
   }
-  block = realloc(block, s);
-  if (block == NULL)
-    lua_error(memEM);
+  else if (size >= MAX_SIZET)
+    lua_error(L, "memory allocation error: block too big");
+  block = realloc(block, size);
+  if (block == NULL) {
+    if (L)
+      luaD_breakrun(L, LUA_ERRMEM);  /* break run without error message */
+    else return NULL;  /* error before creating state! */
+  }
   return block;
 }
 
 
-
-#else
-/* DEBUG */
-
-#include <string.h>
-
-
-void *luaM_growaux (void *block, unsigned long nelems, int inc, int size,
-                       char *errormsg, unsigned long limit) {
-  unsigned long newn = nelems+inc;
-  if (newn >= limit)
-    lua_error(errormsg);
-  return luaM_realloc(block, newn*size);
-}
-
-
-#define HEADER	(sizeof(double))
-
-#define MARK    55
-
-unsigned long numblocks = 0;
-unsigned long totalmem = 0;
-
-
-static void *checkblock (void *block) {
-  unsigned long *b = (unsigned long *)((char *)block - HEADER);
-  unsigned long size = *b;
-  LUA_ASSERT(*(((char *)b)+size+HEADER) == MARK, 
-             "corrupted block");
-  numblocks--;
-  totalmem -= size;
-  return b;
-}
-
-
-void *luaM_realloc (void *block, unsigned long size) {
-  unsigned long realsize = HEADER+size+1;
-  if (realsize != (size_t)realsize)
-    lua_error("memory allocation error: block too big");
-  if (size == 0) {
-    if (block) {
-      unsigned long *b = (unsigned long *)((char *)block - HEADER);
-      memset(block, -1, *b);  /* erase block */
-      block = checkblock(block);
-    }
-    free(block);
-    return NULL;
-  }
-  if (block)
-    block = checkblock(block);
-  block = (unsigned long *)realloc(block, realsize);
-  if (block == NULL)
-    lua_error(memEM);
-  totalmem += size;
-  numblocks++;
-  *(unsigned long *)block = size;
-  *(((char *)block)+size+HEADER) = MARK;
-  return (unsigned long *)((char *)block+HEADER);
-}
-
-
-#endif

lmem.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.h,v 1.7 1999/02/25 15:16:26 roberto Exp roberto $
+** $Id: lmem.h,v 1.14 2000/05/24 13:54:49 roberto Exp roberto $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
@@ -8,32 +8,33 @@
 #define lmem_h
 
 
-#include <stdlib.h>
+#include <stddef.h>
 
-/* memory error messages */
-#define codeEM   "code size overflow"
-#define constantEM   "constant table overflow"
-#define refEM   "reference table overflow"
-#define tableEM  "table overflow"
-#define memEM "not enough memory"
-#define arrEM	"internal array bigger than `int' limit"
+#include "llimits.h"
+#include "lua.h"
 
-void *luaM_realloc (void *oldblock, unsigned long size);
-void *luaM_growaux (void *block, unsigned long nelems, int inc, int size,
-                       char *errormsg, unsigned long limit);
+void *luaM_realloc (lua_State *L, void *oldblock, lint32 size);
+void *luaM_growaux (lua_State *L, void *block, size_t nelems,
+                    int inc, size_t size, const char *errormsg,
+                    size_t limit);
 
-#define luaM_free(b)	luaM_realloc((b), 0)
-#define luaM_malloc(t)	luaM_realloc(NULL, (t))
-#define luaM_new(t)          ((t *)luaM_malloc(sizeof(t)))
-#define luaM_newvector(n,t)  ((t *)luaM_malloc((n)*sizeof(t)))
-#define luaM_growvector(v,nelems,inc,t,e,l) \
-          ((v)=(t *)luaM_growaux(v,nelems,inc,sizeof(t),e,l))
-#define luaM_reallocvector(v,n,t) ((v)=(t *)luaM_realloc(v,(n)*sizeof(t)))
+#define luaM_free(L, b)		luaM_realloc(L, (b), 0)
+#define luaM_malloc(L, t)	luaM_realloc(L, NULL, (t))
+#define luaM_new(L, t)          ((t *)luaM_malloc(L, sizeof(t)))
+#define luaM_newvector(L, n,t)  ((t *)luaM_malloc(L, (n)*(lint32)sizeof(t)))
+
+#define luaM_growvector(L, v,nelems,inc,t,e,l) \
+          ((v)=(t *)luaM_growaux(L, v,nelems,inc,sizeof(t),e,l))
+
+#define luaM_reallocvector(L, v,n,t) \
+	((v)=(t *)luaM_realloc(L, v,(n)*(lint32)sizeof(t)))
 
 
 #ifdef DEBUG
-extern unsigned long numblocks;
-extern unsigned long totalmem;
+extern unsigned long memdebug_numblocks;
+extern unsigned long memdebug_total;
+extern unsigned long memdebug_maxmem;
+extern unsigned long memdebug_memlimit;
 #endif
 
 

lobject.c

@@ -1,84 +1,72 @@
 /*
-** $Id: lobject.c,v 1.18 1999/02/26 15:48:30 roberto Exp roberto $
+** $Id: lobject.c,v 1.47 2000/09/11 20:29:27 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>
 
-#include "lobject.h"
 #include "lua.h"
 
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
 
-char *luaO_typenames[] = { /* ORDER LUA_T */
-    "userdata", "number", "string", "table", "function", "function",
-    "nil", "function", "mark", "mark", "mark", "line", NULL
+
+/*
+** you can use the fact that the 3rd letter or each name is always different
+** (e-m-r-b-n-l) to compare and switch these strings
+*/
+const char *const luaO_typenames[] = { /* ORDER LUA_T */
+    "userdata", "number", "string", "table", "function", "function", "nil",
+    "function", "function"
 };
 
 
-TObject luaO_nilobject = {LUA_T_NIL, {NULL}};
+const TObject luaO_nilobject = {TAG_NIL, {NULL}};
 
 
-
-/* hash dimensions values */
-static long dimensions[] =
- {5L, 11L, 23L, 47L, 97L, 197L, 397L, 797L, 1597L, 3203L, 6421L,
-  12853L, 25717L, 51437L, 102811L, 205619L, 411233L, 822433L,
-  1644817L, 3289613L, 6579211L, 13158023L, MAX_INT};
-
-
-int luaO_redimension (int oldsize)
-{
-  int i;
-  for (i=0; dimensions[i]<MAX_INT; i++) {
-    if (dimensions[i] > oldsize)
-      return dimensions[i];
-  }
-  lua_error("tableEM");
-  return 0;  /* to avoid warnings */
+/*
+** returns smaller power of 2 larger than `n' (minimum is MINPOWER2) 
+*/
+lint32 luaO_power2 (lint32 n) {
+  lint32 p = MINPOWER2;
+  while (p<=n) p<<=1;
+  return p;
 }
 
 
-int luaO_equalval (TObject *t1, TObject *t2) {
+int luaO_equalObj (const TObject *t1, const TObject *t2) {
+  if (ttype(t1) != ttype(t2)) return 0;
   switch (ttype(t1)) {
-    case LUA_T_NIL: return 1;
-    case LUA_T_NUMBER: return nvalue(t1) == nvalue(t2);
-    case LUA_T_STRING: case LUA_T_USERDATA: return svalue(t1) == svalue(t2);
-    case LUA_T_ARRAY: return avalue(t1) == avalue(t2);
-    case LUA_T_PROTO: return tfvalue(t1)  == tfvalue(t2);
-    case LUA_T_CPROTO: return fvalue(t1)  == fvalue(t2);
-    case LUA_T_CLOSURE: return t1->value.cl == t2->value.cl;
+    case TAG_NUMBER:
+      return nvalue(t1) == nvalue(t2);
+    case TAG_STRING: case TAG_USERDATA:
+      return tsvalue(t1) == tsvalue(t2);
+    case TAG_TABLE: 
+      return hvalue(t1) == hvalue(t2);
+    case TAG_CCLOSURE: case TAG_LCLOSURE:
+      return clvalue(t1) == clvalue(t2);
     default:
-     LUA_INTERNALERROR("invalid type");
-     return 0; /* UNREACHABLE */
+      LUA_ASSERT(ttype(t1) == TAG_NIL, "invalid type");
+      return 1; /* TAG_NIL */
   }
 }
 
 
-void luaO_insertlist (GCnode *root, GCnode *node)
-{
-  node->next = root->next;
-  root->next = node;
-  node->marked = 0;
+char *luaO_openspace (lua_State *L, size_t n) {
+  if (n > L->Mbuffsize) {
+    luaM_reallocvector(L, L->Mbuffer, n, char);
+    L->Mbuffsize = n;
+  }
+  return L->Mbuffer;
 }
 
 
-#ifdef OLD_ANSI
-void luaO_memup (void *dest, void *src, int size) {
-  while (size--)
-    ((char *)dest)[size]=((char *)src)[size];
-}
-
-void luaO_memdown (void *dest, void *src, int size) {
-  int i;
-  for (i=0; i<size; i++)
-    ((char *)dest)[i]=((char *)src)[i];
-}
-#endif
-
-
-
 static double expten (unsigned int e) {
   double exp = 10.0;
   double res = 1.0;
@@ -90,12 +78,21 @@ static double expten (unsigned int e) {
 }
 
 
-double luaO_str2d (char *s) {  /* LUA_NUMBER */
+int luaO_str2d (const char *s, Number *result) {  /* LUA_NUMBER */
   double a = 0.0;
-  int point = 0;
-  while (isdigit((unsigned char)*s)) {
-    a = 10.0*a + (*(s++)-'0');
+  int point = 0;  /* number of decimal digits */
+  int sig;
+  while (isspace((unsigned char)*s)) s++;
+  sig = 0;
+  switch (*s) {
+    case '-': sig = 1;  /* go through */
+    case '+': s++;
   }
+  if (! (isdigit((unsigned char)*s) ||
+          (*s == '.' && isdigit((unsigned char)*(s+1)))))
+    return 0;  /* not (at least one digit before or after the point) */
+  while (isdigit((unsigned char)*s))
+    a = 10.0*a + (*(s++)-'0');
   if (*s == '.') {
     s++;
     while (isdigit((unsigned char)*s)) {
@@ -103,27 +100,61 @@ double luaO_str2d (char *s) {  /* LUA_NUMBER */
       point++;
     }
   }
-  if (toupper((unsigned char)*s) == 'E') {
+  if (sig) a = -a;
+  if (*s == 'e' || *s == 'E') {
     int e = 0;
-    int sig = 1;
     s++;
-    if (*s == '-') {
-      s++;
-      sig = -1;
+    sig = 0;
+    switch (*s) {
+      case '-': sig = 1;  /* go through */
+      case '+': s++;
     }
-    else if (*s == '+') s++;
-    if (!isdigit((unsigned char)*s)) return -1;  /* no digit in the exponent? */
+    if (!isdigit((unsigned char)*s)) return 0;  /* no digit in the exponent? */
     do {
       e = 10*e + (*(s++)-'0');
     } while (isdigit((unsigned char)*s));
-    point -= sig*e;
+    if (sig) e = -e;
+    point -= e;
   }
   while (isspace((unsigned char)*s)) s++;
-  if (*s != '\0') return -1;  /* invalid trailing characters? */
-  if (point > 0)
-    a /= expten(point);
-  else if (point < 0)
-    a *= expten(-point);
-  return a;
+  if (*s != '\0') return 0;  /* invalid trailing characters? */
+  if (point != 0) {
+    if (point > 0) a /= expten(point);
+    else           a *= expten(-point);
+  }
+  *result = a;
+  return 1;
 }
 
+
+/* this function needs to handle only '%d' and '%.XXXs' formats */
+void luaO_verror (lua_State *L, const char *fmt, ...) {
+  char buff[500];
+  va_list argp;
+  va_start(argp, fmt);
+  vsprintf(buff, fmt, argp);
+  va_end(argp);
+  lua_error(L, buff);
+}
+
+
+#define EXTRALEN	sizeof("string \"...\"0")
+
+void luaO_chunkid (char *out, const char *source, int len) {
+  if (*source == '(') {
+    strncpy(out, source+1, len-1);  /* remove first char */
+    out[len-1] = '\0';  /* make sure `out' has an end */
+    out[strlen(out)-1] = '\0';  /* remove last char */
+  }
+  else {
+    len -= EXTRALEN;
+    if (*source == '@')
+      sprintf(out, "file `%.*s'", len, source+1);
+    else {
+      const char *b = strchr(source , '\n');  /* stop at first new line */
+      int lim = (b && (b-source)<len) ? b-source : len;
+      sprintf(out, "string \"%.*s\"", lim, source);
+      strcpy(out+lim+(EXTRALEN-sizeof("...\"0")), "...\"");
+    }
+  }
+}

lobject.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lobject.h,v 1.27 1999/03/04 21:17:26 roberto Exp roberto $
+** $Id: lobject.h,v 1.75 2000/09/11 17:38:42 roberto Exp roberto $
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
@@ -8,197 +8,198 @@
 #define lobject_h
 
 
-#include <limits.h>
-
+#include "llimits.h"
 #include "lua.h"
 
 
 #ifdef DEBUG
-#include "lauxlib.h"
-#define LUA_INTERNALERROR(s)	\
-	luaL_verror("INTERNAL ERROR - %s [%s:%d]",(s),__FILE__,__LINE__)
-#define LUA_ASSERT(c,s) { if (!(c)) LUA_INTERNALERROR(s); }
+#undef NDEBUG
+#include <assert.h>
+#define LUA_INTERNALERROR(s)	assert(((void)s,0))
+#define LUA_ASSERT(c,s)		assert(((void)s,(c)))
 #else
-#define LUA_INTERNALERROR(s)  /* empty */
-#define LUA_ASSERT(c,s)  /* empty */
+#define LUA_INTERNALERROR(s)	/* empty */
+#define LUA_ASSERT(c,s)		/* empty */
 #endif
 
 
-/*
-** "real" is the type "number" of Lua
-** GREP LUA_NUMBER to change that
-*/
-#ifndef LUA_NUM_TYPE
-#define LUA_NUM_TYPE double
+#ifdef DEBUG
+/* to avoid warnings, and make sure value is really unused */
+#define UNUSED(x)	(x=0, (void)(x))
+#else
+#define UNUSED(x)	((void)(x))	/* to avoid warnings */
 #endif
 
 
-typedef LUA_NUM_TYPE real;
-
-#define Byte lua_Byte	/* some systems have Byte as a predefined type */
-typedef unsigned char  Byte;  /* unsigned 8 bits */
-
-
-#define MAX_INT   (INT_MAX-2)  /* maximum value of an int (-2 for safety) */
-
-typedef unsigned int IntPoint; /* unsigned with same size as a pointer (for hashing) */
-
-
 /*
 ** Lua TYPES
 ** WARNING: if you change the order of this enumeration,
 ** grep "ORDER LUA_T"
 */
 typedef enum {
-  LUA_T_USERDATA =  0,  /* tag default for userdata */
-  LUA_T_NUMBER   = -1,  /* fixed tag for numbers */
-  LUA_T_STRING   = -2,  /* fixed tag for strings */
-  LUA_T_ARRAY    = -3,  /* tag default for tables (or arrays) */
-  LUA_T_PROTO    = -4,  /* fixed tag for functions */
-  LUA_T_CPROTO   = -5,  /* fixed tag for Cfunctions */
-  LUA_T_NIL      = -6,  /* last "pre-defined" tag */
-  LUA_T_CLOSURE  = -7,
-  LUA_T_CLMARK   = -8,  /* mark for closures */
-  LUA_T_PMARK    = -9,  /* mark for Lua prototypes */
-  LUA_T_CMARK    = -10, /* mark for C prototypes */
-  LUA_T_LINE     = -11
+  TAG_USERDATA  =  0, /* default tag for userdata */
+  TAG_NUMBER,	/* fixed tag for numbers */
+  TAG_STRING,	/* fixed tag for strings */
+  TAG_TABLE,	/* default tag for tables */
+  TAG_LCLOSURE,	/* fixed tag for Lua closures */
+  TAG_CCLOSURE,	/* fixed tag for C closures */
+  TAG_NIL,	/* last "pre-defined" tag */
+
+  TAG_LMARK,	/* mark for Lua closures */
+  TAG_CMARK	/* mark for C closures */
+
 } lua_Type;
 
-#define NUM_TAGS  7
+/* tags for values visible from Lua == first user-created tag */
+#define NUM_TAGS	7
+
+
+/*
+** check whether `t' is a mark
+*/
+#define is_T_MARK(t)	((t) == TAG_LMARK || (t) == TAG_CMARK)
 
 
 typedef union {
-  lua_CFunction f;  /* LUA_T_CPROTO, LUA_T_CMARK */
-  real n;  /* LUA_T_NUMBER */
-  struct TaggedString *ts;  /* LUA_T_STRING, LUA_T_USERDATA */
-  struct TProtoFunc *tf;  /* LUA_T_PROTO, LUA_T_PMARK */
-  struct Closure *cl;  /* LUA_T_CLOSURE, LUA_T_CLMARK */
-  struct Hash *a;  /* LUA_T_ARRAY */
-  int i;  /* LUA_T_LINE */
+  struct TString *ts;	/* TAG_STRING, TAG_USERDATA */
+  struct Closure *cl;	/* TAG_[CL]CLOSURE, TAG_CMARK */
+  struct Hash *a;	/* TAG_TABLE */
+  struct CallInfo *i;	/* TAG_LMARK */
+  Number n;		/* TAG_NUMBER */
 } Value;
 
 
-typedef struct TObject {
+/* Macros to access values */
+#define ttype(o)        ((o)->ttype)
+#define nvalue(o)       ((o)->value.n)
+#define tsvalue(o)      ((o)->value.ts)
+#define clvalue(o)      ((o)->value.cl)
+#define hvalue(o)       ((o)->value.a)
+#define infovalue(o)	((o)->value.i)
+#define svalue(o)       (tsvalue(o)->str)
+
+
+typedef struct lua_TObject {
   lua_Type ttype;
   Value value;
 } TObject;
 
 
-
-/*
-** generic header for garbage collector lists
-*/
-typedef struct GCnode {
-  struct GCnode *next;
-  int marked;
-} GCnode;
-
-
 /*
 ** String headers for string table
 */
-
-typedef struct TaggedString {
-  GCnode head;
-  unsigned long hash;
-  int constindex;  /* hint to reuse constants (= -1 if this is a userdata) */
+typedef struct TString {
   union {
-    struct {
-      TObject globalval;
-      long len;  /* if this is a string, here is its length */
+    struct {  /* for strings */
+      unsigned long hash;
+      size_t len;
+      int constindex;  /* hint to reuse constants */
     } s;
-    struct {
+    struct {  /* for userdata */
       int tag;
-      void *v;  /* if this is a userdata, here is its value */
+      void *value;
     } d;
   } u;
-  char str[1];   /* \0 byte already reserved */
-} TaggedString;
-
-
+  struct TString *nexthash;  /* chain for hash table */
+  unsigned char marked;
+  char str[1];   /* variable length string!! must be the last field! */
+} TString;
 
 
 /*
 ** Function Prototypes
 */
-typedef struct TProtoFunc {
-  GCnode head;
-  struct TObject *consts;
-  int nconsts;
-  Byte *code;  /* ends with opcode ENDCODE */
+typedef struct Proto {
+  Number *knum;  /* Number numbers used by the function */
+  int nknum;  /* size of `knum' */
+  struct TString **kstr;  /* strings used by the function */
+  int nkstr;  /* size of `kstr' */
+  struct Proto **kproto;  /* functions defined inside the function */
+  int nkproto;  /* size of `kproto' */
+  Instruction *code;  /* ends with opcode ENDCODE */
+  int numparams;
+  int is_vararg;
+  int maxstacksize;
+  struct Proto *next;
+  int marked;
+  /* debug information */
+  int *lineinfo;  /* map from opcodes to source lines */
+  int nlocvars;
+  struct LocVar *locvars;  /* information about local variables */
   int lineDefined;
-  TaggedString  *source;
-  struct LocVar *locvars;  /* ends with line = -1 */
-} TProtoFunc;
+  TString  *source;
+} Proto;
+
 
 typedef struct LocVar {
-  TaggedString *varname;           /* NULL signals end of scope */
-  int line;
+  TString *varname;
+  int startpc;  /* first point where variable is active */
+  int endpc;    /* first point where variable is dead */
 } LocVar;
 
 
-
-
-
-/* Macros to access structure members */
-#define ttype(o)        ((o)->ttype)
-#define nvalue(o)       ((o)->value.n)
-#define svalue(o)       ((o)->value.ts->str)
-#define tsvalue(o)      ((o)->value.ts)
-#define clvalue(o)      ((o)->value.cl)
-#define avalue(o)       ((o)->value.a)
-#define fvalue(o)       ((o)->value.f)
-#define tfvalue(o)	((o)->value.tf)
-
-#define protovalue(o)	((o)->value.cl->consts)
-
-
 /*
 ** Closures
 */
 typedef struct Closure {
-  GCnode head;
-  int nelems;  /* not included the first one (always the prototype) */
-  TObject consts[1];  /* at least one for prototype */
+  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) */
+  int nupvalues;
+  TObject upvalue[1];
 } Closure;
 
 
-
-typedef struct node {
-  TObject ref;
+typedef struct Node {
+  TObject key;
   TObject val;
+  struct Node *next;  /* for chaining */
 } Node;
 
 typedef struct Hash {
-  GCnode head;
   Node *node;
-  int nhash;
-  int nuse;
   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) */
 } Hash;
 
 
-extern char *luaO_typenames[];
-
-#define luaO_typename(o)        luaO_typenames[-ttype(o)]
+/* unmarked tables and closures are represented by pointing `mark' to
+** themselves
+*/
+#define ismarked(x)	((x)->mark != (x))
 
 
-extern TObject luaO_nilobject;
+/*
+** informations about a call (for debugging)
+*/
+typedef struct CallInfo {
+  struct Closure *func;  /* function being called */
+  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 luaO_equalObj(t1,t2)	((ttype(t1) != ttype(t2)) ? 0 \
-                                      : luaO_equalval(t1,t2))
-int luaO_equalval (TObject *t1, TObject *t2);
-int luaO_redimension (int oldsize);
-void luaO_insertlist (GCnode *root, GCnode *node);
-double luaO_str2d (char *s);
 
-#ifdef OLD_ANSI
-void luaO_memup (void *dest, void *src, int size);
-void luaO_memdown (void *dest, void *src, int size);
-#else
-#include <string.h>
-#define luaO_memup(d,s,n)	memmove(d,s,n)
-#define luaO_memdown(d,s,n)	memmove(d,s,n)
-#endif
+extern const char *const luaO_typenames[];
+extern const TObject luaO_nilobject;
+
+#define luaO_typename(o)        luaO_typenames[ttype(o)]
+
+lint32 luaO_power2 (lint32 n);
+char *luaO_openspace (lua_State *L, size_t n);
+
+int luaO_equalObj (const TObject *t1, const TObject *t2);
+int luaO_str2d (const char *s, Number *result);
+
+void luaO_verror (lua_State *L, const char *fmt, ...);
+void luaO_chunkid (char *out, const char *source, int len);
+
 
 #endif

lopcodes.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.h,v 1.31 1999/03/05 21:16:07 roberto Exp roberto $
+** $Id: lopcodes.h,v 1.66 2000/08/15 18:28:48 roberto Exp roberto $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -7,132 +7,162 @@
 #ifndef lopcodes_h
 #define lopcodes_h
 
+#include "llimits.h"
+
+
+/*===========================================================================
+  We assume that instructions are unsigned numbers.
+  All instructions have an opcode in the first 6 bits. Moreover,
+  an instruction can have 0, 1, or 2 arguments. Instructions can
+  have the following types:
+  type 0: no arguments
+  type 1: 1 unsigned argument in the higher bits (called `U')
+  type 2: 1 signed argument in the higher bits          (`S')
+  type 3: 1st unsigned argument in the higher bits      (`A')
+          2nd unsigned argument in the middle bits      (`B')
+
+  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
+  for that argument (so that -max is represented by 0, and +max is
+  represented by 2*max), which is half the maximum for the corresponding
+  unsigned argument.
+
+  The size of each argument is defined in `llimits.h'. The usual is an
+  instruction with 32 bits, U arguments with 26 bits (32-6), B arguments
+  with 9 bits, and A arguments with 17 bits (32-6-9). For small
+  installations, the instruction size can be 16, so U has 10 bits,
+  and A and B have 5 bits each.
+===========================================================================*/
+
+
+
+
+/* creates a mask with `n' 1 bits at position `p' */
+#define MASK1(n,p)	((~((~(Instruction)0)<<n))<<p)
+
+/* creates a mask with `n' 0 bits at position `p' */
+#define MASK0(n,p)	(~MASK1(n,p))
 
 /*
-** NOTICE: variants of the same opcode must be consecutive: First, those
-** with word parameter, then with byte parameter.
+** the following macros help to manipulate instructions
 */
 
+#define CREATE_0(o)	 ((Instruction)(o))
+#define GET_OPCODE(i)	((OpCode)((i)&MASK1(SIZE_OP,0)))
+#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,0)) | (Instruction)(o)))
+
+#define CREATE_U(o,u)	 ((Instruction)(o) | ((Instruction)(u)<<POS_U))
+#define GETARG_U(i)	((int)((i)>>POS_U))
+#define SETARG_U(i,u)	((i) = (((i)&MASK0(SIZE_U,POS_U)) | \
+                               ((Instruction)(u)<<POS_U)))
+
+#define CREATE_S(o,s)	CREATE_U((o),(s)+MAXARG_S)
+#define GETARG_S(i)	(GETARG_U(i)-MAXARG_S)
+#define SETARG_S(i,s)	SETARG_U((i),(s)+MAXARG_S)
+
+
+#define CREATE_AB(o,a,b) ((Instruction)(o) | ((Instruction)(a)<<POS_A) \
+                                           |  ((Instruction)(b)<<POS_B))
+#define GETARG_A(i)	((int)((i)>>POS_A))
+#define SETARG_A(i,a)	((i) = (((i)&MASK0(SIZE_A,POS_A)) | \
+                               ((Instruction)(a)<<POS_A)))
+#define GETARG_B(i)	((int)(((i)>>POS_B) & MASK1(SIZE_B,0)))
+#define SETARG_B(i,b)	((i) = (((i)&MASK0(SIZE_B,POS_B)) | \
+                               ((Instruction)(b)<<POS_B)))
+
+
+/*
+** K = U argument used as index to `kstr'
+** J = S argument used as jump offset (relative to pc of next instruction)
+** L = unsigned argument used as index of local variable
+** N = U argument used as index to `knum'
+*/
 
 typedef enum {
-/* name          parm    before          after           side effect
------------------------------------------------------------------------------*/
-ENDCODE,/*	-	-		(return)			*/
-RETCODE,/*	b	-		(return)			*/
+/*----------------------------------------------------------------------
+name		args	stack before	stack after	side effects
+------------------------------------------------------------------------*/
+OP_END,/*	-	-		(return)	no results	*/
+OP_RETURN,/*	U	v_n-v_x(at u)	(return)	returns v_x-v_n	*/
 
-CALL,/*		b c	v_c...v_1 f	r_b...r_1	f(v1,...,v_c)	*/
+OP_CALL,/*	A B	v_n-v_1 f(at a)	r_b-r_1		f(v1,...,v_n)	*/
+OP_TAILCALL,/*	A B	v_n-v_1 f(at a)	(return)	f(v1,...,v_n)	*/
 
-TAILCALL,/*	b c	v_c...v_1 f	(return)	f(v1,...,v_c)	*/
+OP_PUSHNIL,/*	U	-		nil_1-nil_u			*/
+OP_POP,/*	U	a_u-a_1		-				*/
 
-PUSHNIL,/*	b	-		nil_0...nil_b			*/
-POP,/*		b	a_b...a_1	-				*/
+OP_PUSHINT,/*	S	-		(Number)s				*/
+OP_PUSHSTRING,/* K	-		KSTR[k]				*/
+OP_PUSHNUM,/*	N	-		KNUM[n]				*/
+OP_PUSHNEGNUM,/* N	-		-KNUM[n]			*/
 
-PUSHNUMBERW,/*	w	-		(float)w			*/
-PUSHNUMBER,/*	b	-		(float)b			*/
+OP_PUSHUPVALUE,/* U	-		Closure[u]			*/
 
-PUSHNUMBERNEGW,/* w	-		(float)-w			*/
-PUSHNUMBERNEG,/* b	-		(float)-b			*/
+OP_GETLOCAL,/*	L	-		LOC[l]				*/
+OP_GETGLOBAL,/*	K	-		VAR[KSTR[k]]			*/
 
-PUSHCONSTANTW,/*w	-		CNST[w]				*/
-PUSHCONSTANT,/*	b	-		CNST[b]				*/
+OP_GETTABLE,/*	-	i t		t[i]				*/
+OP_GETDOTTED,/*	K	t		t[KSTR[k]]			*/
+OP_GETINDEXED,/* L	t		t[LOC[l]]			*/
+OP_PUSHSELF,/*	K	t		t t[KSTR[k]]			*/
 
-PUSHUPVALUE,/*	b	-		Closure[b]			*/
+OP_CREATETABLE,/* U	-		newarray(size = u)		*/
 
-PUSHLOCAL,/*	b	-		LOC[b]				*/
+OP_SETLOCAL,/*	L	x		-		LOC[l]=x	*/
+OP_SETGLOBAL,/*	K	x		-		VAR[KSTR[k]]=x	*/
+OP_SETTABLE,/*	A B	v a_a-a_1 i t	(pops b values)	t[i]=v		*/
 
-GETGLOBALW,/*	w	-		VAR[CNST[w]]			*/
-GETGLOBAL,/*	b	-		VAR[CNST[b]]			*/
+OP_SETLIST,/*	A B	v_b-v_1 t	t		t[i+a*FPF]=v_i	*/
+OP_SETMAP,/*	U	v_u k_u - v_1 k_1 t	t	t[k_i]=v_i	*/
 
-GETTABLE,/*	-	i t		t[i]				*/
+OP_ADD,/*	-	y x		x+y				*/
+OP_ADDI,/*	S	x		x+s				*/
+OP_SUB,/*	-	y x		x-y				*/
+OP_MULT,/*	-	y x		x*y				*/
+OP_DIV,/*	-	y x		x/y				*/
+OP_POW,/*	-	y x		x^y				*/
+OP_CONCAT,/*	U	v_u-v_1		v1..-..v_u			*/
+OP_MINUS,/*	-	x		-x				*/
+OP_NOT,/*	-	x		(x==nil)? 1 : nil		*/
 
-GETDOTTEDW,/*	w	t		t[CNST[w]]			*/
-GETDOTTED,/*	b	t		t[CNST[b]]			*/
+OP_JMPNE,/*	J	y x		-		(x~=y)? PC+=s	*/
+OP_JMPEQ,/*	J	y x		-		(x==y)? PC+=s	*/
+OP_JMPLT,/*	J	y x		-		(x<y)? PC+=s	*/
+OP_JMPLE,/*	J	y x		-		(x<y)? PC+=s	*/
+OP_JMPGT,/*	J	y x		-		(x>y)? PC+=s	*/
+OP_JMPGE,/*	J	y x		-		(x>=y)? PC+=s	*/
 
-PUSHSELFW,/*	w	t		t t[CNST[w]]			*/
-PUSHSELF,/*	b	t		t t[CNST[b]]			*/
+OP_JMPT,/*	J	x		-		(x~=nil)? PC+=s	*/
+OP_JMPF,/*	J	x		-		(x==nil)? PC+=s	*/
+OP_JMPONT,/*	J	x		(x~=nil)? x : -	(x~=nil)? PC+=s	*/
+OP_JMPONF,/*	J	x		(x==nil)? x : -	(x==nil)? PC+=s	*/
+OP_JMP,/*	J	-		-		PC+=s		*/
 
-CREATEARRAYW,/*	w	-		newarray(size = w)		*/
-CREATEARRAY,/*	b	-		newarray(size = b)		*/
+OP_PUSHNILJMP,/* -	-		nil		PC++;		*/
 
-SETLOCAL,/*	b	x		-		LOC[b]=x	*/
+OP_FORPREP,/*	J							*/
+OP_FORLOOP,/*	J							*/
 
-SETGLOBALW,/*	w	x		-		VAR[CNST[w]]=x	*/
-SETGLOBAL,/*	b	x		-		VAR[CNST[b]]=x	*/
+OP_LFORPREP,/*	J							*/
+OP_LFORLOOP,/*	J							*/
 
-SETTABLEPOP,/*	-	v i t		-		t[i]=v		*/
-
-SETTABLE,/*	b	v a_b...a_1 i t	 a_b...a_1 i t	  t[i]=v	*/
-
-SETLISTW,/*	w c	v_c...v_1 t	t		t[i+w*FPF]=v_i	*/
-SETLIST,/*	b c	v_c...v_1 t	t		t[i+b*FPF]=v_i	*/
-
-SETMAP,/*	b	v_b k_b ...v_0 k_0 t	t	t[k_i]=v_i	*/
-
-NEQOP,/*	-	y x		(x~=y)? 1 : nil			*/
-EQOP,/*		-	y x		(x==y)? 1 : nil			*/
-LTOP,/*		-	y x		(x<y)? 1 : nil			*/
-LEOP,/*		-	y x		(x<y)? 1 : nil			*/
-GTOP,/*		-	y x		(x>y)? 1 : nil			*/
-GEOP,/*		-	y x		(x>=y)? 1 : nil			*/
-ADDOP,/*	-	y x		x+y				*/
-SUBOP,/*	-	y x		x-y				*/
-MULTOP,/*	-	y x		x*y				*/
-DIVOP,/*	-	y x		x/y				*/
-POWOP,/*	-	y x		x^y				*/
-CONCOP,/*	-	y x		x..y				*/
-MINUSOP,/*	-	x		-x				*/
-NOTOP,/*	-	x		(x==nil)? 1 : nil		*/
-
-ONTJMPW,/*	w	x		(x!=nil)? x : -	(x!=nil)? PC+=w	*/
-ONTJMP,/*	b	x		(x!=nil)? x : -	(x!=nil)? PC+=b	*/
-ONFJMPW,/*	w	x		(x==nil)? x : -	(x==nil)? PC+=w	*/
-ONFJMP,/*	b	x		(x==nil)? x : -	(x==nil)? PC+=b	*/
-JMPW,/*		w	-		-		PC+=w		*/
-JMP,/*		b	-		-		PC+=b		*/
-IFFJMPW,/*	w	x		-		(x==nil)? PC+=w	*/
-IFFJMP,/*	b	x		-		(x==nil)? PC+=b	*/
-IFTUPJMPW,/*	w	x		-		(x!=nil)? PC-=w	*/
-IFTUPJMP,/*	b	x		-		(x!=nil)? PC-=b	*/
-IFFUPJMPW,/*	w	x		-		(x==nil)? PC-=w	*/
-IFFUPJMP,/*	b	x		-		(x==nil)? PC-=b	*/
-
-CLOSUREW,/*	w c	v_c...v_1	closure(CNST[w], v_c...v_1)	*/
-CLOSURE,/*	b c	v_c...v_1	closure(CNST[b], v_c...v_1)	*/
-
-SETLINEW,/*	w	-		-		LINE=w		*/
-SETLINE,/*	b	-		-		LINE=b		*/
-
-LONGARGW,/*	w	(add w*(1<<16) to arg of next instruction)	*/
-LONGARG,/*	b	(add b*(1<<16) to arg of next instruction)	*/
-
-CHECKSTACK /*	b  (assert #temporaries == b; only for internal debuging!) */
+OP_CLOSURE/*	A B	v_b-v_1		closure(KPROTO[a], v_1-v_b)	*/
 
 } OpCode;
 
-
-#define RFIELDS_PER_FLUSH 32	/* records (SETMAP) */
-#define LFIELDS_PER_FLUSH 64    /* FPF - lists (SETLIST) */
-
-#define ZEROVARARG	64
+#define NUM_OPCODES	((int)OP_CLOSURE+1)
 
 
-/* maximum value of an arg of 3 bytes; must fit in an "int" */
-#if MAX_INT < (1<<24)
-#define MAX_ARG	MAX_INT
-#else
-#define MAX_ARG	((1<<24)-1)
-#endif
+#define ISJUMP(o)	(OP_JMPNE <= (o) && (o) <= OP_JMP)
 
-/* maximum value of a word of 2 bytes; cannot be bigger than MAX_ARG */
-#if MAX_ARG < (1<<16)
-#define MAX_WORD	MAX_ARG
-#else
-#define MAX_WORD	((1<<16)-1)
+
+
+/* special code to fit a LUA_MULTRET inside an argB */
+#define MULT_RET        255	/* (<=MAXARG_B) */
+#if MULT_RET>MAXARG_B
+#undef MULT_RET
+#define MULT_RET	MAXARG_B
 #endif
 
 
-/* maximum value of a byte */
-#define MAX_BYTE	((1<<8)-1)
-
-
 #endif

lparser.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lparser.h,v 1.2 1997/12/22 20:57:18 roberto Exp roberto $
+** $Id: lparser.h,v 1.23 2000/08/22 17:44:17 roberto Exp roberto $
 ** LL(1) Parser and code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -11,10 +11,51 @@
 #include "lzio.h"
 
 
-void luaY_codedebugline (int line);
-TProtoFunc *luaY_parser (ZIO *z);
-void luaY_error (char *s);
-void luaY_syntaxerror (char *s, char *token);
+/*
+** Expression descriptor
+*/
+
+typedef enum {
+  VGLOBAL,
+  VLOCAL,
+  VINDEXED,
+  VEXP
+} expkind;
+
+typedef struct expdesc {
+  expkind k;
+  union {
+    int index;  /* VGLOBAL: `kstr' index of global name; VLOCAL: stack index */
+    struct {
+      int t;  /* patch list of `exit when true' */
+      int f;  /* patch list of `exit when false' */
+    } l;
+  } u;
+} expdesc;
+
+
+
+/* state needed to generate code for a given function */
+typedef struct FuncState {
+  Proto *f;  /* current function header */
+  struct FuncState *prev;  /* enclosing function */
+  struct LexState *ls;  /* lexical state */
+  struct lua_State *L;  /* copy of the Lua state */
+  int pc;  /* next position to code */
+  int lasttarget;   /* `pc' of last `jump target' */
+  int jlt;  /* list of jumps to `lasttarget' */
+  int stacklevel;  /* number of values on activation register */
+  int nactloc;  /* number of active local variables */
+  int nupvalues;  /* number of upvalues */
+  int lastline;  /* line where last `lineinfo' was generated */
+  int nlineinfo;  /* index of next `lineinfo' to be generated */
+  struct Breaklabel *bl;  /* chain of breakable blocks */
+  expdesc upvalues[MAXUPVALUES];  /* upvalues */
+  int actloc[MAXLOCALS];  /* local-variable stack (indices to locvars) */
+} FuncState;
+
+
+Proto *luaY_parser (lua_State *L, ZIO *z);
 
 
 #endif

lstate.c

@@ -1,13 +1,15 @@
 /*
-** $Id: lstate.c,v 1.9 1999/02/25 15:17:01 roberto Exp roberto $
+** $Id: lstate.c,v 1.39 2000/09/12 18:42:32 roberto Exp roberto $
 ** Global State
 ** See Copyright Notice in lua.h
 */
 
 
-#include "lbuiltin.h"
+#include <stdio.h>
+
+#include "lua.h"
+
 #include "ldo.h"
-#include "lfunc.h"
 #include "lgc.h"
 #include "llex.h"
 #include "lmem.h"
@@ -17,68 +19,85 @@
 #include "ltm.h"
 
 
-lua_State *lua_state = NULL;
+#ifdef DEBUG
+extern lua_State *lua_state;
+void luaB_opentests (lua_State *L);
+#endif
 
 
-void lua_open (void)
-{
-  if (lua_state) return;
-  lua_state = luaM_new(lua_State);
-  L->Cstack.base = 0;
-  L->Cstack.lua2C = 0;
-  L->Cstack.num = 0;
-  L->errorJmp = NULL;
+/*
+** built-in implementation for ERRORMESSAGE. In a "correct" environment
+** ERRORMESSAGE should have an external definition, and so this function
+** would not be used.
+*/
+static int errormessage (lua_State *L) {
+  const char *s = lua_tostring(L, 1);
+  if (s == NULL) s = "(no message)";
+  fprintf(stderr, "error: %s\n", s);
+  return 0;
+}
+
+
+lua_State *lua_open (int stacksize) {
+  struct lua_longjmp myErrorJmp;
+  lua_State *L = luaM_new(NULL, lua_State);
+  if (L == NULL) return NULL;  /* memory allocation error */
+  L->stack = NULL;
+  L->strt.size = L->udt.size = 0;
+  L->strt.nuse = L->udt.nuse = 0;
+  L->strt.hash = NULL;
+  L->udt.hash = NULL;
   L->Mbuffer = NULL;
-  L->Mbuffbase = 0;
   L->Mbuffsize = 0;
-  L->Mbuffnext = 0;
-  L->numCblocks = 0;
-  L->debug = 0;
-  L->callhook = NULL;
-  L->linehook = NULL;
-  L->rootproto.next = NULL;
-  L->rootproto.marked = 0;
-  L->rootcl.next = NULL;
-  L->rootcl.marked = 0;
-  L->rootglobal.next = NULL;
-  L->rootglobal.marked = 0;
-  L->roottable.next = NULL;
-  L->roottable.marked = 0;
+  L->rootproto = NULL;
+  L->rootcl = NULL;
+  L->roottable = NULL;
   L->IMtable = NULL;
+  L->last_tag = -1;
   L->refArray = NULL;
   L->refSize = 0;
-  L->GCthreshold = GARBAGE_BLOCK;
+  L->refFree = NONEXT;
   L->nblocks = 0;
-  luaD_init();
-  luaS_init();
-  luaX_init();
-  luaT_init();
-  luaB_predefine();
-}
-
-
-void lua_close (void)
-{
-  TaggedString *alludata = luaS_collectudata();
-  L->GCthreshold = MAX_INT;  /* to avoid GC during GC */
-  luaC_hashcallIM((Hash *)L->roottable.next);  /* GC t.methods for tables */
-  luaC_strcallIM(alludata);  /* GC tag methods for userdata */
-  luaD_gcIM(&luaO_nilobject);  /* GC tag method for nil (signal end of GC) */
-  luaH_free((Hash *)L->roottable.next);
-  luaF_freeproto((TProtoFunc *)L->rootproto.next);
-  luaF_freeclosure((Closure *)L->rootcl.next);
-  luaS_free(alludata);
-  luaS_freeall();
-  luaM_free(L->stack.stack);
-  luaM_free(L->IMtable);
-  luaM_free(L->refArray);
-  luaM_free(L->Mbuffer);
-  luaM_free(L);
-  L = NULL;
+  L->GCthreshold = MAX_INT;  /* to avoid GC during pre-definitions */
+  L->callhook = NULL;
+  L->linehook = NULL;
+  L->allowhooks = 1;
+  L->errorJmp = &myErrorJmp;
+  if (setjmp(myErrorJmp.b) == 0) {  /* to catch memory allocation errors */
+    L->gt = luaH_new(L, 10);
+    luaD_init(L, (stacksize == 0) ? DEFAULT_STACK_SIZE :
+                                    stacksize+LUA_MINSTACK);
+    luaS_init(L);
+    luaX_init(L);
+    luaT_init(L);
+    lua_register(L, LUA_ERRORMESSAGE, errormessage);
 #ifdef DEBUG
-  printf("total de blocos: %ld\n", numblocks);
-  printf("total de memoria: %ld\n", totalmem);
+    luaB_opentests(L);
 #endif
+    L->GCthreshold = L->nblocks*4;
+    L->errorJmp = NULL;
+    return L;
+  }
+  else {  /* memory allocation error: free partial state */
+    lua_close(L);
+    return NULL;
+  }
 }
 
 
+void lua_close (lua_State *L) {
+  luaC_collect(L, 1);  /* collect all elements */
+  LUA_ASSERT(L->rootproto == NULL, "list should be empty");
+  LUA_ASSERT(L->rootcl == NULL, "list should be empty");
+  LUA_ASSERT(L->roottable == NULL, "list should be empty");
+  luaS_freeall(L);
+  luaM_free(L, L->stack);
+  luaM_free(L, L->IMtable);
+  luaM_free(L, L->refArray);
+  luaM_free(L, L->Mbuffer);
+  LUA_ASSERT(L->nblocks == 0, "wrong count for nblocks");
+  luaM_free(L, L);
+  LUA_ASSERT(L != lua_state || memdebug_numblocks == 0, "memory leak!");
+  LUA_ASSERT(L != lua_state || memdebug_total == 0,"memory leak!");
+}
+

lstate.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstate.h,v 1.15 1999/02/25 15:17:01 roberto Exp roberto $
+** $Id: lstate.h,v 1.37 2000/08/28 17:57:04 roberto Exp roberto $
 ** Global State
 ** See Copyright Notice in lua.h
 */
@@ -14,73 +14,73 @@
 #include "luadebug.h"
 
 
-#define MAX_C_BLOCKS 10
 
-#define GARBAGE_BLOCK 150
+typedef TObject *StkId;  /* index to stack elements */
 
 
-typedef int StkId;  /* index to stack elements */
+/*
+** marks for Reference array
+*/
+#define NONEXT          -1      /* to end the free list */
+#define HOLD            -2
+#define COLLECTED       -3
+#define LOCK            -4
 
-struct Stack {
-  TObject *top;
-  TObject *stack;
-  TObject *last;
-};
 
-struct C_Lua_Stack {
-  StkId base;  /* when Lua calls C or C calls Lua, points to */
-               /* the first slot after the last parameter. */
-  StkId lua2C; /* points to first element of "array" lua2C */
-  int num;     /* size of "array" lua2C */
+struct Ref {
+  TObject o;
+  int st;  /* can be LOCK, HOLD, COLLECTED, or next (for free list) */
 };
 
 
-typedef struct {
+/*
+** chain list of long jumps
+*/
+struct lua_longjmp {
+  jmp_buf b;
+  struct lua_longjmp *previous;
+  volatile int status;  /* error code */
+  StkId base;
+};
+
+
+typedef struct stringtable {
   int size;
-  int nuse;  /* number of elements (including EMPTYs) */
-  TaggedString **hash;
+  lint32 nuse;  /* number of elements */
+  TString **hash;
 } stringtable;
 
 
-enum Status {LOCK, HOLD, FREE, COLLECTED};
-
-struct ref {
-  TObject o;
-  enum Status status;
-};
-
 
 struct lua_State {
   /* thread-specific state */
-  struct Stack stack;  /* Lua stack */
-  struct C_Lua_Stack Cstack;  /* C2lua struct */
-  jmp_buf *errorJmp;  /* current error recover point */
+  StkId top;  /* first free slot in the stack */
+  StkId stack;  /* stack base */
+  StkId stack_last;  /* last free slot in the stack */
+  int stacksize;
+  StkId Cbase;  /* base for current C function */
+  struct lua_longjmp *errorJmp;  /* current error recover point */
   char *Mbuffer;  /* global buffer */
-  int Mbuffbase;  /* current first position of Mbuffer */
-  int Mbuffsize;  /* size of Mbuffer */
-  int Mbuffnext;  /* next position to fill in Mbuffer */
-  struct C_Lua_Stack Cblocks[MAX_C_BLOCKS];
-  int numCblocks;  /* number of nested Cblocks */
-  int debug;
-  lua_CHFunction callhook;
-  lua_LHFunction linehook;
+  size_t Mbuffsize;  /* size of Mbuffer */
   /* global state */
-  GCnode rootproto;  /* list of all prototypes */
-  GCnode rootcl;  /* list of all closures */
-  GCnode roottable;  /* list of all tables */
-  GCnode rootglobal;  /* list of strings with global values */
-  stringtable *string_root;  /* array of hash tables for strings and udata */
+  Proto *rootproto;  /* list of all prototypes */
+  Closure *rootcl;  /* list of all closures */
+  Hash *roottable;  /* list of all tables */
+  stringtable strt;  /* hash table for strings */
+  stringtable udt;   /* hash table for udata */
+  Hash *gt;  /* table for globals */
   struct IM *IMtable;  /* table for tag methods */
   int last_tag;  /* last used tag in IMtable */
-  struct ref *refArray;  /* locked objects */
+  struct Ref *refArray;  /* locked objects */
   int refSize;  /* size of refArray */
+  int refFree;  /* list of free positions in refArray */
   unsigned long GCthreshold;
-  unsigned long nblocks;  /* number of 'blocks' currently allocated */
+  unsigned long nblocks;  /* number of `blocks' currently allocated */
+  lua_Hook callhook;
+  lua_Hook linehook;
+  int allowhooks;
 };
 
 
-#define L	lua_state
-
-
 #endif
 

lstring.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.c,v 1.18 1999/02/08 16:28:48 roberto Exp roberto $
+** $Id: lstring.c,v 1.41 2000/08/04 19:38:35 roberto Exp roberto $
 ** String table (keeps all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -7,292 +7,126 @@
 
 #include <string.h>
 
+#include "lua.h"
+
 #include "lmem.h"
 #include "lobject.h"
 #include "lstate.h"
 #include "lstring.h"
-#include "lua.h"
-
-
-#define NUM_HASHSTR	31
-#define NUM_HASHUDATA	31
-#define NUM_HASHS  (NUM_HASHSTR+NUM_HASHUDATA)
-
-
-#define gcsizestring(l)	(1+(l/64))  /* "weight" for a string with length 'l' */
 
 
 
-static TaggedString EMPTY = {{NULL, 2}, 0L, 0,
-                            {{{LUA_T_NIL, {NULL}}, 0L}}, {0}};
-
-
-void luaS_init (void) {
-  int i;
-  L->string_root = luaM_newvector(NUM_HASHS, stringtable);
-  for (i=0; i<NUM_HASHS; i++) {
-    L->string_root[i].size = 0;
-    L->string_root[i].nuse = 0;
-    L->string_root[i].hash = NULL;
-  }
+void luaS_init (lua_State *L) {
+  L->strt.hash = luaM_newvector(L, 1, TString *);
+  L->udt.hash = luaM_newvector(L, 1, TString *);
+  L->strt.size = L->udt.size = 1;
+  L->strt.nuse = L->udt.nuse = 0;
+  L->strt.hash[0] = L->udt.hash[0] = NULL;
 }
 
 
-static unsigned long hash_s (char *s, long l) {
-  unsigned long h = 0;  /* seed */
-  while (l--)
-      h = h ^ ((h<<5)+(h>>2)+(unsigned char)*(s++));
+void luaS_freeall (lua_State *L) {
+  LUA_ASSERT(L->strt.nuse==0, "non-empty string table");
+  luaM_free(L, L->strt.hash);
+  LUA_ASSERT(L->udt.nuse==0, "non-empty udata table");
+  luaM_free(L, L->udt.hash);
+}
+
+
+static unsigned long hash_s (const char *s, size_t l) {
+  unsigned long h = l;  /* seed */
+  size_t step = (l>>5)|1;  /* if string is too long, don't hash all its chars */
+  for (; l>=step; l-=step)
+    h = h ^ ((h<<5)+(h>>2)+(unsigned char)*(s++));
   return h;
 }
 
-static int newsize (stringtable *tb) {
-  int size = tb->size;
-  int realuse = 0;
-  int i;
-  /* count how many entries are really in use */
-  for (i=0; i<size; i++)
-    if (tb->hash[i] != NULL && tb->hash[i] != &EMPTY)
-      realuse++;
-  return luaO_redimension((realuse+1)*2);  /* +1 is the new element */
-}
 
-
-static void grow (stringtable *tb) {
-  int ns = newsize(tb);
-  TaggedString **newhash = luaM_newvector(ns, TaggedString *);
+void luaS_resize (lua_State *L, stringtable *tb, int newsize) {
+  TString **newhash = luaM_newvector(L, newsize, TString *);
   int i;
-  for (i=0; i<ns; i++)
-    newhash[i] = NULL;
+  for (i=0; i<newsize; i++) newhash[i] = NULL;
   /* rehash */
-  tb->nuse = 0;
   for (i=0; i<tb->size; i++) {
-    if (tb->hash[i] != NULL && tb->hash[i] != &EMPTY) {
-      unsigned long h = tb->hash[i]->hash;
-      int h1 = h%ns;
-      while (newhash[h1]) {
-        h1 += (h&(ns-2)) + 1;  /* double hashing */
-        if (h1 >= ns) h1 -= ns;
-      }
-      newhash[h1] = tb->hash[i];
-      tb->nuse++;
+    TString *p = tb->hash[i];
+    while (p) {  /* for each node in the list */
+      TString *next = p->nexthash;  /* save next */
+      unsigned long h = (tb == &L->strt) ? p->u.s.hash : IntPoint(p->u.d.value);
+      int h1 = h&(newsize-1);  /* new position */
+      LUA_ASSERT(h%newsize == (h&(newsize-1)),
+                    "a&(x-1) == a%x, for x power of 2");
+      p->nexthash = newhash[h1];  /* chain it in new position */
+      newhash[h1] = p;
+      p = next;
     }
   }
-  luaM_free(tb->hash);
-  tb->size = ns;
+  luaM_free(L, tb->hash);
+  tb->size = newsize;
   tb->hash = newhash;
 }
 
 
-static TaggedString *newone_s (char *str, long l, unsigned long h) {
-  TaggedString *ts = (TaggedString *)luaM_malloc(sizeof(TaggedString)+l);
+static void newentry (lua_State *L, stringtable *tb, TString *ts, int h) {
+  ts->nexthash = tb->hash[h];  /* chain new entry */
+  tb->hash[h] = ts;
+  tb->nuse++;
+  if (tb->nuse > (lint32)tb->size && tb->size < MAX_INT/2)  /* too crowded? */
+    luaS_resize(L, tb, tb->size*2);
+}
+
+
+
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
+  unsigned long h = hash_s(str, l);
+  int h1 = h&(L->strt.size-1);
+  TString *ts;
+  for (ts = L->strt.hash[h1]; ts; ts = ts->nexthash) {
+    if (ts->u.s.len == l && (memcmp(str, ts->str, l) == 0))
+      return ts;
+  }
+  /* not found */
+  ts = (TString *)luaM_malloc(L, sizeof(TString)+(lint32)l*sizeof(char));
+  ts->marked = 0;
+  ts->nexthash = NULL;
+  ts->u.s.len = l;
+  ts->u.s.hash = h;
+  ts->u.s.constindex = 0;
   memcpy(ts->str, str, l);
   ts->str[l] = 0;  /* ending 0 */
-  ts->u.s.globalval.ttype = LUA_T_NIL;  /* initialize global value */
-  ts->u.s.len = l;
-  ts->constindex = 0;
-  L->nblocks += gcsizestring(l);
-  ts->head.marked = 0;
-  ts->head.next = (GCnode *)ts;  /* signal it is in no list */
-  ts->hash = h;
+  L->nblocks += gcsizestring(L, l);
+  newentry(L, &L->strt, ts, h1);  /* insert it on table */
   return ts;
 }
 
-static TaggedString *newone_u (char *buff, int tag, unsigned long h) {
-  TaggedString *ts = luaM_new(TaggedString);
-  ts->u.d.v = buff;
+
+TString *luaS_createudata (lua_State *L, void *udata, int tag) {
+  unsigned long h = IntPoint(udata);
+  int h1 = h&(L->udt.size-1);
+  TString *ts;
+  for (ts = L->udt.hash[h1]; ts; ts = ts->nexthash) {
+    if (udata == ts->u.d.value && (tag == ts->u.d.tag || tag == LUA_ANYTAG))
+      return ts;
+  }
+  /* not found */
+  ts = luaM_new(L, TString);
+  ts->marked = 0;
+  ts->nexthash = NULL;
+  ts->u.d.value = udata;
   ts->u.d.tag = (tag == LUA_ANYTAG) ? 0 : tag;
-  ts->constindex = -1;  /* tag -> this is a userdata */
-  L->nblocks++;
-  ts->head.marked = 0;
-  ts->head.next = (GCnode *)ts;  /* signal it is in no list */
-  ts->hash = h;
-  return ts;
-}
-
-static TaggedString *insert_s (char *str, long l, stringtable *tb) {
-  TaggedString *ts;
-  unsigned long h = hash_s(str, l);
-  int size = tb->size;
-  int j = -1;
-  int h1;
-  if ((long)tb->nuse*3 >= (long)size*2) {
-    grow(tb);
-    size = tb->size;
-  }
-  h1 = h%size;
-  while ((ts = tb->hash[h1]) != NULL) {
-    if (ts == &EMPTY)
-      j = h1;
-    else if (ts->u.s.len == l && (memcmp(str, ts->str, l) == 0))
-      return ts;
-    h1 += (h&(size-2)) + 1;  /* double hashing */
-    if (h1 >= size) h1 -= size;
-  }
-  /* not found */
-  if (j != -1)  /* is there an EMPTY space? */
-    h1 = j;
-  else
-    tb->nuse++;
-  ts = tb->hash[h1] = newone_s(str, l, h);
+  L->nblocks += gcsizeudata;
+  newentry(L, &L->udt, ts, h1);  /* insert it on table */
   return ts;
 }
 
 
-static TaggedString *insert_u (void *buff, int tag, stringtable *tb) {
-  TaggedString *ts;
-  unsigned long h = (unsigned long)buff;
-  int size = tb->size;
-  int j = -1;
-  int h1;
-  if ((long)tb->nuse*3 >= (long)size*2) {
-    grow(tb);
-    size = tb->size;
-  }
-  h1 = h%size;
-  while ((ts = tb->hash[h1]) != NULL) {
-    if (ts == &EMPTY)
-      j = h1;
-    else if ((tag == ts->u.d.tag || tag == LUA_ANYTAG) && buff == ts->u.d.v)
-      return ts;
-    h1 += (h&(size-2)) + 1;  /* double hashing */
-    if (h1 >= size) h1 -= size;
-  }
-  /* not found */
-  if (j != -1)  /* is there an EMPTY space? */
-    h1 = j;
-  else
-    tb->nuse++;
-  ts = tb->hash[h1] = newone_u(buff, tag, h);
+TString *luaS_new (lua_State *L, const char *str) {
+  return luaS_newlstr(L, str, strlen(str));
+}
+
+
+TString *luaS_newfixed (lua_State *L, const char *str) {
+  TString *ts = luaS_new(L, str);
+  if (ts->marked == 0) ts->marked = FIXMARK;  /* avoid GC */
   return ts;
 }
 
-
-TaggedString *luaS_createudata (void *udata, int tag) {
-  int t = ((unsigned)udata%NUM_HASHUDATA)+NUM_HASHSTR;
-  return insert_u(udata, tag, &L->string_root[t]);
-}
-
-TaggedString *luaS_newlstr (char *str, long l) {
-  int t = (l==0) ? 0 : ((int)((unsigned char)str[0]*l))%NUM_HASHSTR;
-  return insert_s(str, l, &L->string_root[t]);
-}
-
-TaggedString *luaS_new (char *str) {
-  return luaS_newlstr(str, strlen(str));
-}
-
-TaggedString *luaS_newfixedstring (char *str) {
-  TaggedString *ts = luaS_new(str);
-  if (ts->head.marked == 0)
-    ts->head.marked = 2;  /* avoid GC */
-  return ts;
-}
-
-
-void luaS_free (TaggedString *l) {
-  while (l) {
-    TaggedString *next = (TaggedString *)l->head.next;
-    L->nblocks -= (l->constindex == -1) ? 1 : gcsizestring(l->u.s.len);
-    luaM_free(l);
-    l = next;
-  }
-}
-
-
-/*
-** Garbage collection functions.
-*/
-
-static void remove_from_list (GCnode *l) {
-  while (l) {
-    GCnode *next = l->next;
-    while (next && !next->marked)
-      next = l->next = next->next;
-    l = next;
-  }
-}
-
-
-TaggedString *luaS_collector (void) {
-  TaggedString *frees = NULL;
-  int i;
-  remove_from_list(&(L->rootglobal));
-  for (i=0; i<NUM_HASHS; i++) {
-    stringtable *tb = &L->string_root[i];
-    int j;
-    for (j=0; j<tb->size; j++) {
-      TaggedString *t = tb->hash[j];
-      if (t == NULL) continue;
-      if (t->head.marked == 1)
-        t->head.marked = 0;
-      else if (!t->head.marked) {
-        t->head.next = (GCnode *)frees;
-        frees = t;
-        tb->hash[j] = &EMPTY;
-      }
-    }
-  }
-  return frees;
-}
-
-
-TaggedString *luaS_collectudata (void) {
-  TaggedString *frees = NULL;
-  int i;
-  L->rootglobal.next = NULL;  /* empty list of globals */
-  for (i=NUM_HASHSTR; i<NUM_HASHS; i++) {
-    stringtable *tb = &L->string_root[i];
-    int j;
-    for (j=0; j<tb->size; j++) {
-      TaggedString *t = tb->hash[j];
-      if (t == NULL || t == &EMPTY)
-        continue;
-      LUA_ASSERT(t->constindex == -1, "must be userdata");
-      t->head.next = (GCnode *)frees;
-      frees = t;
-      tb->hash[j] = &EMPTY;
-    }
-  }
-  return frees;
-}
-
-
-void luaS_freeall (void) {
-  int i;
-  for (i=0; i<NUM_HASHS; i++) {
-    stringtable *tb = &L->string_root[i];
-    int j;
-    for (j=0; j<tb->size; j++) {
-      TaggedString *t = tb->hash[j];
-      if (t == &EMPTY) continue;
-      luaM_free(t);
-    }
-    luaM_free(tb->hash);
-  }
-  luaM_free(L->string_root);
-}
-
-
-void luaS_rawsetglobal (TaggedString *ts, TObject *newval) {
-  ts->u.s.globalval = *newval;
-  if (ts->head.next == (GCnode *)ts) {  /* is not in list? */
-    ts->head.next = L->rootglobal.next;
-    L->rootglobal.next = (GCnode *)ts;
-  }
-}
-
-
-char *luaS_travsymbol (int (*fn)(TObject *)) {
-  TaggedString *g;
-  for (g=(TaggedString *)L->rootglobal.next; g; g=(TaggedString *)g->head.next)
-    if (fn(&g->u.s.globalval))
-      return g->str;
-  return NULL;
-}
-
-
-int luaS_globaldefined (char *name) {
-  TaggedString *ts = luaS_new(name);
-  return ts->u.s.globalval.ttype != LUA_T_NIL;
-}
-

lstring.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.h,v 1.6 1997/12/01 20:31:25 roberto Exp roberto $
+** $Id: lstring.h,v 1.20 2000/05/10 16:33:20 roberto Exp roberto $
 ** String table (keep all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -9,20 +9,28 @@
 
 
 #include "lobject.h"
+#include "lstate.h"
 
 
-void luaS_init (void);
-TaggedString *luaS_createudata (void *udata, int tag);
-TaggedString *luaS_collector (void);
-void luaS_free (TaggedString *l);
-TaggedString *luaS_newlstr (char *str, long l);
-TaggedString *luaS_new (char *str);
-TaggedString *luaS_newfixedstring (char *str);
-void luaS_rawsetglobal (TaggedString *ts, TObject *newval);
-char *luaS_travsymbol (int (*fn)(TObject *));
-int luaS_globaldefined (char *name);
-TaggedString *luaS_collectudata (void);
-void luaS_freeall (void);
+/*
+** any TString with mark>=FIXMARK is never collected.
+** Marks>=RESERVEDMARK are used to identify reserved words.
+*/
+#define FIXMARK		2
+#define RESERVEDMARK	3
+
+
+#define gcsizestring(L, l)      numblocks(L, 0, sizeof(TString)+l)
+#define gcsizeudata             gcsizestring(L, 0)
+
+
+void luaS_init (lua_State *L);
+void luaS_resize (lua_State *L, stringtable *tb, int newsize);
+TString *luaS_createudata (lua_State *L, void *udata, int tag);
+void luaS_freeall (lua_State *L);
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+TString *luaS_new (lua_State *L, const char *str);
+TString *luaS_newfixed (lua_State *L, const char *str);
 
 
 #endif

lstrlib.c

@@ -1,112 +1,111 @@
 /*
-** $Id: lstrlib.c,v 1.27 1999/02/25 19:13:56 roberto Exp roberto $
-** Standard library for strings and pattern-matching
+** $Id: lstrlib.c,v 1.52 2000/09/11 17:38:42 roberto Exp roberto $
+** Standard library for string operations and pattern-matching
 ** See Copyright Notice in lua.h
 */
 
 
 #include <ctype.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lauxlib.h"
 #include "lua.h"
+
+#include "lauxlib.h"
 #include "lualib.h"
 
 
 
-static void addnchar (char *s, int n)
-{
-  char *b = luaL_openspace(n);
-  memcpy(b, s, n);
-  luaL_addsize(n);
+static int str_len (lua_State *L) {
+  size_t l;
+  luaL_check_lstr(L, 1, &l);
+  lua_pushnumber(L, l);
+  return 1;
 }
 
 
-static void str_len (void)
-{
-  long l;
-  luaL_check_lstr(1, &l);
-  lua_pushnumber(l);
-}
-
-
-static void closeandpush (void) {
-  lua_pushlstring(luaL_buffer(), luaL_getsize());
-}
-
-
-static long posrelat (long pos, long len) {
+static long posrelat (long pos, size_t len) {
   /* relative string position: negative means back from end */
-  return (pos>=0) ? pos : len+pos+1;
+  return (pos>=0) ? pos : (long)len+pos+1;
 }
 
 
-static void str_sub (void) {
-  long l;
-  char *s = luaL_check_lstr(1, &l);
-  long start = posrelat(luaL_check_long(2), l);
-  long end = posrelat(luaL_opt_long(3, -1), l);
+static int str_sub (lua_State *L) {
+  size_t l;
+  const char *s = luaL_check_lstr(L, 1, &l);
+  long start = posrelat(luaL_check_long(L, 2), l);
+  long end = posrelat(luaL_opt_long(L, 3, -1), l);
   if (start < 1) start = 1;
-  if (end > l) end = l;
+  if (end > (long)l) end = l;
   if (start <= end)
-    lua_pushlstring(s+start-1, end-start+1);
-  else lua_pushstring("");
+    lua_pushlstring(L, s+start-1, end-start+1);
+  else lua_pushstring(L, "");
+  return 1;
 }
 
 
-static void str_lower (void) {
-  long l;
-  int i;
-  char *s = luaL_check_lstr(1, &l);
-  luaL_resetbuffer();
+static int str_lower (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_check_lstr(L, 1, &l);
+  luaL_buffinit(L, &b);
   for (i=0; i<l; i++)
-    luaL_addchar(tolower((unsigned char)(s[i])));
-  closeandpush();
+    luaL_putchar(&b, tolower((unsigned char)(s[i])));
+  luaL_pushresult(&b);
+  return 1;
 }
 
 
-static void str_upper (void) {
-  long l;
-  int i;
-  char *s = luaL_check_lstr(1, &l);
-  luaL_resetbuffer();
+static int str_upper (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_check_lstr(L, 1, &l);
+  luaL_buffinit(L, &b);
   for (i=0; i<l; i++)
-    luaL_addchar(toupper((unsigned char)(s[i])));
-  closeandpush();
+    luaL_putchar(&b, toupper((unsigned char)(s[i])));
+  luaL_pushresult(&b);
+  return 1;
 }
 
-static void str_rep (void)
-{
-  long l;
-  char *s = luaL_check_lstr(1, &l);
-  int n = luaL_check_int(2);
-  luaL_resetbuffer();
+static int str_rep (lua_State *L) {
+  size_t l;
+  luaL_Buffer b;
+  const char *s = luaL_check_lstr(L, 1, &l);
+  int n = luaL_check_int(L, 2);
+  luaL_buffinit(L, &b);
   while (n-- > 0)
-    addnchar(s, l);
-  closeandpush();
+    luaL_addlstring(&b, s, l);
+  luaL_pushresult(&b);
+  return 1;
 }
 
 
-static void str_byte (void) {
-  long l;
-  char *s = luaL_check_lstr(1, &l);
-  long pos = posrelat(luaL_opt_long(2, 1), l);
-  luaL_arg_check(0<pos && pos<=l, 2,  "out of range");
-  lua_pushnumber((unsigned char)s[pos-1]);
+static int str_byte (lua_State *L) {
+  size_t l;
+  const char *s = luaL_check_lstr(L, 1, &l);
+  long pos = posrelat(luaL_opt_long(L, 2, 1), l);
+  luaL_arg_check(L, 0<pos && (size_t)pos<=l, 2,  "out of range");
+  lua_pushnumber(L, (unsigned char)s[pos-1]);
+  return 1;
 }
 
 
-static void str_char (void) {
-  int i = 0;
-  luaL_resetbuffer();
-  while (lua_getparam(++i) != LUA_NOOBJECT) {
-    double c = luaL_check_number(i);
-    luaL_arg_check((unsigned char)c == c, i, "invalid value");
-    luaL_addchar((unsigned char)c);
+static int str_char (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  for (i=1; i<=n; i++) {
+    int c = luaL_check_int(L, i);
+    luaL_arg_check(L, (unsigned char)c == c, i, "invalid value");
+    luaL_putchar(&b, (unsigned char)c);
   }
-  closeandpush();
+  luaL_pushresult(&b);
+  return 1;
 }
 
 
@@ -117,55 +116,61 @@ static void str_char (void) {
 ** =======================================================
 */
 
-#define MAX_CAPT 9
+#ifndef MAX_CAPTURES
+#define MAX_CAPTURES 32  /* arbitrary limit */
+#endif
+
 
 struct Capture {
-  char *src_end;  /* end ('\0') of source string */
+  const char *src_end;  /* end ('\0') of source string */
   int level;  /* total number of captures (finished or unfinished) */
   struct {
-    char *init;
-    int len;  /* -1 signals unfinished capture */
-  } capture[MAX_CAPT];
+    const char *init;
+    long len;  /* -1 signals unfinished capture */
+  } capture[MAX_CAPTURES];
 };
 
 
-#define ESC	'%'
-#define SPECIALS  "^$*?.([%-"
+#define ESC		'%'
+#define SPECIALS	"^$*+?.([%-"
 
 
-static void push_captures (struct Capture *cap) {
-  int i;
-  for (i=0; i<cap->level; i++) {
-    int l = cap->capture[i].len;
-    if (l == -1) lua_error("unfinished capture");
-    lua_pushlstring(cap->capture[i].init, l);
-  }
-}
-
-
-static int check_cap (int l, struct Capture *cap) {
+static int check_capture (lua_State *L, int l, struct Capture *cap) {
   l -= '1';
   if (!(0 <= l && l < cap->level && cap->capture[l].len != -1))
-    lua_error("invalid capture index");
+    lua_error(L, "invalid capture index");
   return l;
 }
 
 
-static int capture_to_close (struct Capture *cap) {
+static int capture_to_close (lua_State *L, struct Capture *cap) {
   int level = cap->level;
   for (level--; level>=0; level--)
     if (cap->capture[level].len == -1) return level;
-  lua_error("invalid pattern capture");
+  lua_error(L, "invalid pattern capture");
   return 0;  /* to avoid warnings */
 }
 
 
-static char *bracket_end (char *p) {
-  return (*p == 0) ? NULL : strchr((*p=='^') ? p+2 : p+1, ']');
+const char *luaI_classend (lua_State *L, const char *p) {
+  switch (*p++) {
+    case ESC:
+      if (*p == '\0') lua_error(L, "malformed pattern (ends with `%')");
+      return p+1;
+    case '[':
+      if (*p == '^') p++;
+      do {  /* look for a ']' */
+        if (*p == '\0') lua_error(L, "malformed pattern (missing `]')");
+        if (*(p++) == ESC && *p != '\0') p++;  /* skip escapes (e.g. '%]') */
+      } while (*p != ']');
+      return p+1;
+    default:
+      return p;
+  }
 }
 
 
-static int matchclass (int c, int cl) {
+static int match_class (int c, int cl) {
   int res;
   switch (tolower(cl)) {
     case 'a' : res = isalpha(c); break;
@@ -184,48 +189,57 @@ static int matchclass (int c, int cl) {
 }
 
 
-int luaI_singlematch (int c, char *p, char **ep) {
+
+static int matchbracketclass (int c, const char *p, const char *endclass) {
+  int sig = 1;
+  if (*(p+1) == '^') {
+    sig = 0;
+    p++;  /* skip the '^' */
+  }
+  while (++p < endclass) {
+    if (*p == ESC) {
+      p++;
+      if (match_class(c, (unsigned char)*p))
+        return sig;
+    }
+    else if ((*(p+1) == '-') && (p+2 < endclass)) {
+      p+=2;
+      if ((int)(unsigned char)*(p-2) <= c && c <= (int)(unsigned char)*p)
+        return sig;
+    }
+    else if ((int)(unsigned char)*p == c) return sig;
+  }
+  return !sig;
+}
+
+
+
+int luaI_singlematch (int c, const char *p, const char *ep) {
   switch (*p) {
     case '.':  /* matches any char */
-      *ep = p+1;
       return 1;
-    case '\0':  /* end of pattern; matches nothing */
-      *ep = p;
-      return 0;
     case ESC:
-      if (*(++p) == '\0')
-        luaL_verror("incorrect pattern (ends with `%c')", ESC);
-      *ep = p+1;
-      return matchclass(c, (unsigned char)*p);
-    case '[': {
-      char *end = bracket_end(p+1);
-      int sig = *(p+1) == '^' ? (p++, 0) : 1;
-      if (end == NULL) lua_error("incorrect pattern (missing `]')");
-      *ep = end+1;
-      while (++p < end) {
-        if (*p == ESC) {
-          if (((p+1) < end) && matchclass(c, (unsigned char)*++p))
-            return sig;
-        }
-        else if ((*(p+1) == '-') && (p+2 < end)) {
-          p+=2;
-          if ((int)(unsigned char)*(p-2) <= c && c <= (int)(unsigned char)*p)
-            return sig;
-        }
-        else if ((unsigned char)*p == c) return sig;
-      }
-      return !sig;
-    }
+      return match_class(c, (unsigned char)*(p+1));
+    case '[':
+      return matchbracketclass(c, p, ep-1);
     default:
-      *ep = p+1;
       return ((unsigned char)*p == c);
   }
 }
 
 
-static char *matchbalance (char *s, int b, int e, struct Capture *cap) {
-  if (*s != b) return NULL;
+static const char *match (lua_State *L, const char *s, const char *p,
+                          struct Capture *cap);
+
+
+static const char *matchbalance (lua_State *L, const char *s, const char *p,
+                                 struct Capture *cap) {
+  if (*p == 0 || *(p+1) == 0)
+    lua_error(L, "unbalanced pattern");
+  if (*s != *p) return NULL;
   else {
+    int b = *p;
+    int e = *(p+1);
     int cont = 1;
     while (++s < cap->src_end) {
       if (*s == e) {
@@ -238,241 +252,299 @@ static char *matchbalance (char *s, int b, int e, struct Capture *cap) {
 }
 
 
-static char *matchitem (char *s, char *p, struct Capture *cap, char **ep) {
-  if (*p == ESC) {
-    p++;
-    if (isdigit((unsigned char)*p)) {  /* capture */
-      int l = check_cap(*p, cap);
-      int len = cap->capture[l].len;
-      *ep = p+1;
-      if (cap->src_end-s >= len && memcmp(cap->capture[l].init, s, len) == 0)
-        return s+len;
-      else return NULL;
-    }
-    else if (*p == 'b') {  /* balanced string */
-      p++;
-      if (*p == 0 || *(p+1) == 0)
-        lua_error("unbalanced pattern");
-      *ep = p+2;
-      return matchbalance(s, *p, *(p+1), cap);
-    }
-    else p--;  /* and go through */
+static const char *max_expand (lua_State *L, const char *s, const char *p,
+                               const char *ep, struct Capture *cap) {
+  long i = 0;  /* counts maximum expand for item */
+  while ((s+i)<cap->src_end && luaI_singlematch((unsigned char)*(s+i), p, ep))
+    i++;
+  /* keeps trying to match with the maximum repetitions */
+  while (i>=0) {
+    const char *res = match(L, (s+i), ep+1, cap);
+    if (res) return res;
+    i--;  /* else didn't match; reduce 1 repetition to try again */
   }
-  /* "luaI_singlematch" sets "ep" (so must be called even at the end of "s" */
-  return (luaI_singlematch((unsigned char)*s, p, ep) && s<cap->src_end) ?
-                    s+1 : NULL;
+  return NULL;
 }
 
 
-static char *match (char *s, char *p, struct Capture *cap) {
+static const char *min_expand (lua_State *L, const char *s, const char *p,
+                               const char *ep, struct Capture *cap) {
+  for (;;) {
+    const char *res = match(L, s, ep+1, cap);
+    if (res != NULL)
+      return res;
+    else if (s<cap->src_end && luaI_singlematch((unsigned char)*s, p, ep))
+      s++;  /* try with one more repetition */
+    else return NULL;
+  }
+}
+
+
+static const char *start_capture (lua_State *L, const char *s, const char *p,
+                                  struct Capture *cap) {
+  const char *res;
+  int level = cap->level;
+  if (level >= MAX_CAPTURES) lua_error(L, "too many captures");
+  cap->capture[level].init = s;
+  cap->capture[level].len = -1;
+  cap->level = level+1;
+  if ((res=match(L, s, p+1, cap)) == NULL)  /* match failed? */
+    cap->level--;  /* undo capture */
+  return res;
+}
+
+
+static const char *end_capture (lua_State *L, const char *s, const char *p,
+                                struct Capture *cap) {
+  int l = capture_to_close(L, cap);
+  const char *res;
+  cap->capture[l].len = s - cap->capture[l].init;  /* close capture */
+  if ((res = match(L, s, p+1, cap)) == NULL)  /* match failed? */
+    cap->capture[l].len = -1;  /* undo capture */
+  return res;
+}
+
+
+static const char *match_capture (lua_State *L, const char *s, int level,
+                                  struct Capture *cap) {
+  int l = check_capture(L, level, cap);
+  size_t len = cap->capture[l].len;
+  if ((size_t)(cap->src_end-s) >= len &&
+      memcmp(cap->capture[l].init, s, len) == 0)
+    return s+len;
+  else return NULL;
+}
+
+
+static const char *match (lua_State *L, const char *s, const char *p,
+                          struct Capture *cap) {
   init: /* using goto's to optimize tail recursion */
   switch (*p) {
-    case '(': {  /* start capture */
-      char *res;
-      if (cap->level >= MAX_CAPT) lua_error("too many captures");
-      cap->capture[cap->level].init = s;
-      cap->capture[cap->level].len = -1;
-      cap->level++;
-      if ((res=match(s, p+1, cap)) == NULL)  /* match failed? */
-        cap->level--;  /* undo capture */
-      return res;
-    }
-    case ')': {  /* end capture */
-      int l = capture_to_close(cap);
-      char *res;
-      cap->capture[l].len = s - cap->capture[l].init;  /* close capture */
-      if ((res = match(s, p+1, cap)) == NULL)  /* match failed? */
-        cap->capture[l].len = -1;  /* undo capture */
-      return res;
-    }
-    case '\0': case '$':  /* (possibly) end of pattern */
-      if (*p == 0 || (*(p+1) == 0 && s == cap->src_end))
-        return s;
-      /* else go through */
-    default: {  /* it is a pattern item */
-      char *ep;  /* will point to what is next */
-      char *s1 = matchitem(s, p, cap, &ep);
+    case '(':  /* start capture */
+      return start_capture(L, s, p, cap);
+    case ')':  /* end capture */
+      return end_capture(L, s, p, cap);
+    case ESC:  /* may be %[0-9] or %b */
+      if (isdigit((unsigned char)(*(p+1)))) {  /* capture? */
+        s = match_capture(L, s, *(p+1), cap);
+        if (s == NULL) return NULL;
+        p+=2; goto init;  /* else return match(L, s, p+2, cap) */
+      }
+      else if (*(p+1) == 'b') {  /* balanced string? */
+        s = matchbalance(L, s, p+2, cap);
+        if (s == NULL) return NULL;
+        p+=4; goto init;  /* else return match(L, s, p+4, cap); */
+      }
+      else goto dflt;  /* case default */
+    case '\0':  /* end of pattern */
+      return s;  /* match succeeded */
+    case '$':
+      if (*(p+1) == '\0')  /* is the '$' the last char in pattern? */
+        return (s == cap->src_end) ? s : NULL;  /* check end of string */
+      else goto dflt;
+    default: dflt: {  /* it is a pattern item */
+      const char *ep = luaI_classend(L, p);  /* points to what is next */
+      int m = s<cap->src_end && luaI_singlematch((unsigned char)*s, p, ep);
       switch (*ep) {
-        case '*': {  /* repetition */
-          char *res;
-          if (s1 && s1>s && ((res=match(s1, p, cap)) != NULL))
-            return res;
-          p=ep+1; goto init;  /* else return match(s, ep+1, cap); */
-        }
         case '?': {  /* optional */
-          char *res;
-          if (s1 && ((res=match(s1, ep+1, cap)) != NULL))
+          const char *res;
+          if (m && ((res=match(L, s+1, ep+1, cap)) != NULL))
             return res;
-          p=ep+1; goto init;  /* else return match(s, ep+1, cap); */
-        }
-        case '-': {  /* repetition */
-          char *res;
-          if ((res = match(s, ep+1, cap)) != NULL)
-            return res;
-          else if (s1 && s1>s) {
-            s = s1;
-            goto init;  /* return match(s1, p, cap); */
-          }
-          else
-            return NULL;
+          p=ep+1; goto init;  /* else return match(L, s, ep+1, cap); */
         }
+        case '*':  /* 0 or more repetitions */
+          return max_expand(L, s, p, ep, cap);
+        case '+':  /* 1 or more repetitions */
+          return (m ? max_expand(L, s+1, p, ep, cap) : NULL);
+        case '-':  /* 0 or more repetitions (minimum) */
+          return min_expand(L, s, p, ep, cap);
         default:
-          if (s1) { s=s1; p=ep; goto init; }  /* return match(s1, ep, cap); */
-          else return NULL;
+          if (!m) return NULL;
+          s++; p=ep; goto init;  /* else return match(L, s+1, ep, cap); */
       }
     }
   }
 }
 
 
-static void str_find (void) {
-  long l;
-  char *s = luaL_check_lstr(1, &l);
-  char *p = luaL_check_string(2);
-  long init = posrelat(luaL_opt_long(3, 1), l) - 1;
+
+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 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 char *)memchr(s1, *s2, l1)) != NULL) {
+      init++;   /* 1st char is already checked */
+      if (memcmp(init, s2+1, l2) == 0)
+        return init-1;
+      else {  /* correct `l1' and `s1' to try again */
+        l1 -= init-s1;
+        s1 = init;
+      }
+    }
+    return NULL;  /* not found */
+  }
+}
+
+
+static int push_captures (lua_State *L, struct Capture *cap) {
+  int i;
+  luaL_checkstack(L, cap->level, "too many captures");
+  for (i=0; i<cap->level; i++) {
+    int l = cap->capture[i].len;
+    if (l == -1) lua_error(L, "unfinished capture");
+    lua_pushlstring(L, cap->capture[i].init, l);
+  }
+  return cap->level;  /* number of strings pushed */
+}
+
+
+static int str_find (lua_State *L) {
+  size_t l1, l2;
+  const char *s = luaL_check_lstr(L, 1, &l1);
+  const char *p = luaL_check_lstr(L, 2, &l2);
+  long init = posrelat(luaL_opt_long(L, 3, 1), l1) - 1;
   struct Capture cap;
-  luaL_arg_check(0 <= init && init <= l, 3, "out of range");
-  if (lua_getparam(4) != LUA_NOOBJECT ||
-      strpbrk(p, SPECIALS) == NULL) {  /* no special characters? */
-    char *s2 = strstr(s+init, p);
+  luaL_arg_check(L, 0 <= init && (size_t)init <= l1, 3, "out of range");
+  if (lua_gettop(L) > 3 ||  /* extra argument? */
+      strpbrk(p, SPECIALS) == NULL) {  /* or no special characters? */
+    const char *s2 = lmemfind(s+init, l1-init, p, l2);
     if (s2) {
-      lua_pushnumber(s2-s+1);
-      lua_pushnumber(s2-s+strlen(p));
-      return;
+      lua_pushnumber(L, s2-s+1);
+      lua_pushnumber(L, s2-s+l2);
+      return 2;
     }
   }
   else {
     int anchor = (*p == '^') ? (p++, 1) : 0;
-    char *s1=s+init;
-    cap.src_end = s+l;
+    const char *s1=s+init;
+    cap.src_end = s+l1;
     do {
-      char *res;
+      const char *res;
       cap.level = 0;
-      if ((res=match(s1, p, &cap)) != NULL) {
-        lua_pushnumber(s1-s+1);  /* start */
-        lua_pushnumber(res-s);   /* end */
-        push_captures(&cap);
-        return;
+      if ((res=match(L, s1, p, &cap)) != NULL) {
+        lua_pushnumber(L, s1-s+1);  /* start */
+        lua_pushnumber(L, res-s);   /* end */
+        return push_captures(L, &cap) + 2;
       }
     } while (s1++<cap.src_end && !anchor);
   }
-  lua_pushnil();  /* if arrives here, it didn't find */
+  lua_pushnil(L);  /* not found */
+  return 1;
 }
 
 
-static void add_s (lua_Object newp, struct Capture *cap) {
-  if (lua_isstring(newp)) {
-    char *news = lua_getstring(newp);
-    int l = lua_strlen(newp);
-    int i;
+static void add_s (lua_State *L, luaL_Buffer *b, struct Capture *cap) {
+  if (lua_isstring(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++) {
       if (news[i] != ESC)
-        luaL_addchar(news[i]);
+        luaL_putchar(b, news[i]);
       else {
         i++;  /* skip ESC */
         if (!isdigit((unsigned char)news[i]))
-          luaL_addchar(news[i]);
+          luaL_putchar(b, news[i]);
         else {
-          int level = check_cap(news[i], cap);
-          addnchar(cap->capture[level].init, cap->capture[level].len);
+          int level = check_capture(L, news[i], cap);
+          luaL_addlstring(b, cap->capture[level].init, cap->capture[level].len);
         }
       }
     }
   }
   else {  /* is a function */
-    lua_Object res;
-    int status;
-    int oldbuff;
-    lua_beginblock();
-    push_captures(cap);
-    /* function may use buffer, so save it and create a new one */
-    oldbuff = luaL_newbuffer(0);
-    status = lua_callfunction(newp);
-    /* restore old buffer */
-    luaL_oldbuffer(oldbuff);
-    if (status != 0) {
-      lua_endblock();
-      lua_error(NULL);
-    }
-    res = lua_getresult(1);
-    if (lua_isstring(res))
-      addnchar(lua_getstring(res), lua_strlen(res));
-    lua_endblock();
+    int n;
+    lua_pushvalue(L, 3);
+    n = push_captures(L, cap);
+    lua_rawcall(L, n, 1);
+    if (lua_isstring(L, -1))
+      luaL_addvalue(b);  /* add return to accumulated result */
+    else
+      lua_pop(L, 1);  /* function result is not a string: pop it */
   }
 }
 
 
-static void str_gsub (void) {
-  long srcl;
-  char *src = luaL_check_lstr(1, &srcl);
-  char *p = luaL_check_string(2);
-  lua_Object newp = lua_getparam(3);
-  int max_s = luaL_opt_int(4, srcl+1);
+static int str_gsub (lua_State *L) {
+  size_t srcl;
+  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 == '^') ? (p++, 1) : 0;
   int n = 0;
   struct Capture cap;
-  luaL_arg_check(lua_isstring(newp) || lua_isfunction(newp), 3,
-                 "string or function expected");
-  luaL_resetbuffer();
+  luaL_Buffer b;
+  luaL_arg_check(L,
+    lua_gettop(L) >= 3 && (lua_isstring(L, 3) || lua_isfunction(L, 3)),
+    3, "string or function expected");
+  luaL_buffinit(L, &b);
   cap.src_end = src+srcl;
   while (n < max_s) {
-    char *e;
+    const char *e;
     cap.level = 0;
-    e = match(src, p, &cap);
+    e = match(L, src, p, &cap);
     if (e) {
       n++;
-      add_s(newp, &cap);
+      add_s(L, &b, &cap);
     }
     if (e && e>src) /* non empty match? */
       src = e;  /* skip it */
     else if (src < cap.src_end)
-      luaL_addchar(*src++);
+      luaL_putchar(&b, *src++);
     else break;
     if (anchor) break;
   }
-  addnchar(src, cap.src_end-src);
-  closeandpush();
-  lua_pushnumber(n);  /* number of substitutions */
+  luaL_addlstring(&b, src, cap.src_end-src);
+  luaL_pushresult(&b);
+  lua_pushnumber(L, n);  /* number of substitutions */
+  return 2;
 }
 
 /* }====================================================== */
 
 
-static void luaI_addquoted (int arg) {
-  long l;
-  char *s = luaL_check_lstr(arg, &l);
-  luaL_addchar('"');
+static void luaI_addquoted (lua_State *L, luaL_Buffer *b, int arg) {
+  size_t l;
+  const char *s = luaL_check_lstr(L, arg, &l);
+  luaL_putchar(b, '"');
   while (l--) {
     switch (*s) {
       case '"':  case '\\':  case '\n':
-        luaL_addchar('\\');
-        luaL_addchar(*s);
+        luaL_putchar(b, '\\');
+        luaL_putchar(b, *s);
         break;
-      case '\0': addnchar("\\000", 4); break;
-      default: luaL_addchar(*s);
+      case '\0': luaL_addlstring(b, "\\000", 4); break;
+      default: luaL_putchar(b, *s);
     }
     s++;
   }
-  luaL_addchar('"');
+  luaL_putchar(b, '"');
 }
 
+/* maximum size of each formated item (> len(format('%99.99f', -1e308))) */
+#define MAX_ITEM	512
 /* maximum size of each format specification (such as '%-099.99d') */
-#define MAX_FORMAT 20
+#define MAX_FORMAT	20
 
-static void str_format (void) {
+static int str_format (lua_State *L) {
   int arg = 1;
-  char *strfrmt = luaL_check_string(arg);
-  luaL_resetbuffer();
+  const char *strfrmt = luaL_check_string(L, arg);
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
   while (*strfrmt) {
     if (*strfrmt != '%')
-      luaL_addchar(*strfrmt++);
+      luaL_putchar(&b, *strfrmt++);
     else if (*++strfrmt == '%')
-      luaL_addchar(*strfrmt++);  /* %% */
+      luaL_putchar(&b, *strfrmt++);  /* %% */
     else { /* format item */
       struct Capture cap;
       char form[MAX_FORMAT];  /* to store the format ('%...') */
-      char *buff;  /* to store the formatted item */
-      char *initf = strfrmt;
+      char buff[MAX_ITEM];  /* to store the formatted item */
+      const char *initf = strfrmt;
       form[0] = '%';
       if (isdigit((unsigned char)*initf) && *(initf+1) == '$') {
         arg = *initf - '0';
@@ -481,33 +553,33 @@ static void str_format (void) {
       arg++;
       cap.src_end = strfrmt+strlen(strfrmt)+1;
       cap.level = 0;
-      strfrmt = match(initf, "[-+ #0]*(%d*)%.?(%d*)", &cap);
+      strfrmt = match(L, initf, "[-+ #0]*(%d*)%.?(%d*)", &cap);
       if (cap.capture[0].len > 2 || cap.capture[1].len > 2 ||  /* < 100? */
           strfrmt-initf > MAX_FORMAT-2)
-        lua_error("invalid format (width or precision too long)");
+        lua_error(L, "invalid format (width or precision too long)");
       strncpy(form+1, initf, strfrmt-initf+1); /* +1 to include conversion */
       form[strfrmt-initf+2] = 0;
-      buff = luaL_openspace(512);  /* 512 > soid luaI_addquot99.99f', -1e308) */
       switch (*strfrmt++) {
         case 'c':  case 'd':  case 'i':
-          sprintf(buff, form, luaL_check_int(arg));
+          sprintf(buff, form, luaL_check_int(L, arg));
           break;
         case 'o':  case 'u':  case 'x':  case 'X':
-          sprintf(buff, form, (unsigned int)luaL_check_number(arg));
+          sprintf(buff, form, (unsigned int)luaL_check_number(L, arg));
           break;
         case 'e':  case 'E': case 'f': case 'g': case 'G':
-          sprintf(buff, form, luaL_check_number(arg));
+          sprintf(buff, form, luaL_check_number(L, arg));
           break;
         case 'q':
-          luaI_addquoted(arg);
+          luaI_addquoted(L, &b, arg);
           continue;  /* skip the "addsize" at the end */
         case 's': {
-          long l;
-          char *s = luaL_check_lstr(arg, &l);
+          size_t l;
+          const char *s = luaL_check_lstr(L, arg, &l);
           if (cap.capture[1].len == 0 && l >= 100) {
-            /* no precision and string is too big to be formatted;
+            /* no precision and string is too long to be formatted;
                keep original string */
-            addnchar(s, l);
+            lua_pushvalue(L, arg);
+            luaL_addvalue(&b);
             continue;  /* skip the "addsize" at the end */
           }
           else {
@@ -516,16 +588,17 @@ static void str_format (void) {
           }
         }
         default:  /* also treat cases 'pnLlh' */
-          lua_error("invalid option in `format'");
+          lua_error(L, "invalid option in `format'");
       }
-      luaL_addsize(strlen(buff));
+      luaL_addlstring(&b, buff, strlen(buff));
     }
   }
-  closeandpush();  /* push the result */
+  luaL_pushresult(&b);
+  return 1;
 }
 
 
-static struct luaL_reg strlib[] = {
+static const struct luaL_reg strlib[] = {
 {"strlen", str_len},
 {"strsub", str_sub},
 {"strlower", str_lower},
@@ -543,7 +616,6 @@ static struct luaL_reg strlib[] = {
 /*
 ** Open string library
 */
-void strlib_open (void)
-{
-  luaL_openlib(strlib, (sizeof(strlib)/sizeof(strlib[0])));
+void lua_strlibopen (lua_State *L) {
+  luaL_openl(L, strlib);
 }

ltable.c

@@ -1,176 +1,303 @@
 /*
-** $Id: ltable.c,v 1.20 1999/01/25 17:41:19 roberto Exp roberto $
+** $Id: ltable.c,v 1.54 2000/08/31 14:08:27 roberto Exp roberto $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
 
-#include <stdlib.h>
 
-#include "lauxlib.h"
+/*
+** Implementation of tables (aka arrays, objects, or hash tables);
+** 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.
+** In other words, there are collisions only when two elements have the
+** same main position (i.e. the same hash values for that table size).
+** Because of that, the load factor of these tables can be 100% without
+** performance penalties.
+*/
+
+
+#include "lua.h"
+
 #include "lmem.h"
 #include "lobject.h"
 #include "lstate.h"
+#include "lstring.h"
 #include "ltable.h"
-#include "lua.h"
 
 
-#define gcsize(n)	(1+(n/16))
-
-#define nuse(t)		((t)->nuse)
-#define nodevector(t)	((t)->node)
-
-
-#define TagDefault LUA_T_ARRAY;
+#define gcsize(L, n)	numblocks(L, n*2, sizeof(Hash))
 
 
 
-static long int hashindex (TObject *ref) {
-  long int h;
-  switch (ttype(ref)) {
-    case LUA_T_NUMBER:
-      h = (long int)nvalue(ref);
+#define TagDefault TAG_TABLE
+
+
+
+/*
+** 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) {
+  unsigned long h;
+  switch (ttype(key)) {
+    case TAG_NUMBER:
+      h = (unsigned long)(long)nvalue(key);
       break;
-    case LUA_T_STRING: case LUA_T_USERDATA:
-      h = (IntPoint)tsvalue(ref);
+    case TAG_STRING:
+      h = tsvalue(key)->u.s.hash;
       break;
-    case LUA_T_ARRAY:
-      h = (IntPoint)avalue(ref);
+    case TAG_USERDATA:
+      h = IntPoint(tsvalue(key));
       break;
-    case LUA_T_PROTO:
-      h = (IntPoint)tfvalue(ref);
+    case TAG_TABLE:
+      h = IntPoint(hvalue(key));
       break;
-    case LUA_T_CPROTO:
-      h = (IntPoint)fvalue(ref);
-      break;
-    case LUA_T_CLOSURE:
-      h = (IntPoint)clvalue(ref);
+    case TAG_LCLOSURE:  case TAG_CCLOSURE:
+      h = IntPoint(clvalue(key));
       break;
     default:
-      lua_error("unexpected type to index table");
-      h = 0;  /* to avoid warnings */
+      return NULL;  /* invalid key */
   }
-  return (h >= 0 ? h : -(h+1));
+  LUA_ASSERT(h%(unsigned int)t->size == (h&((unsigned int)t->size-1)),
+            "a&(x-1) == a%x, for x power of 2");
+  return &t->node[h&(t->size-1)];
 }
 
 
-Node *luaH_present (Hash *t, TObject *key) {
-  int tsize = nhash(t);
-  long int h = hashindex(key);
-  int h1 = h%tsize;
-  Node *n = node(t, h1);
-  /* keep looking until an entry with "ref" equal to key or nil */
-  while ((ttype(ref(n)) == ttype(key)) ? !luaO_equalval(key, ref(n))
-                                       : ttype(ref(n)) != LUA_T_NIL) {
-    h1 += (h&(tsize-2)) + 1;  /* double hashing */
-    if (h1 >= tsize) h1 -= tsize;
-    n = node(t, h1);
-  }
-  return n;
+static const TObject *luaH_getany (lua_State *L, const Hash *t,
+                                   const TObject *key) {
+  Node *n = luaH_mainposition(t, key);
+  if (!n)
+    lua_error(L, "table index is nil");
+  else do {
+    if (luaO_equalObj(key, &n->key))
+      return &n->val;
+    n = n->next;
+  } while (n);
+  return &luaO_nilobject;  /* key not found */
 }
 
 
-void luaH_free (Hash *frees) {
-  while (frees) {
-    Hash *next = (Hash *)frees->head.next;
-    L->nblocks -= gcsize(frees->nhash);
-    luaM_free(nodevector(frees));
-    luaM_free(frees);
-    frees = next;
+/* specialized version for numbers */
+const TObject *luaH_getnum (const Hash *t, Number key) {
+  Node *n = &t->node[(unsigned long)(long)key&(t->size-1)];
+  do {
+    if (ttype(&n->key) == TAG_NUMBER && nvalue(&n->key) == key)
+      return &n->val;
+    n = n->next;
+  } while (n);
+  return &luaO_nilobject;  /* key not found */
+}
+
+
+/* specialized version for strings */
+const TObject *luaH_getstr (const Hash *t, TString *key) {
+  Node *n = &t->node[key->u.s.hash&(t->size-1)];
+  do {
+    if (ttype(&n->key) == TAG_STRING && tsvalue(&n->key) == key)
+      return &n->val;
+    n = n->next;
+  } while (n);
+  return &luaO_nilobject;  /* key not found */
+}
+
+
+const TObject *luaH_get (lua_State *L, const Hash *t, const TObject *key) {
+  switch (ttype(key)) {
+    case TAG_NUMBER: return luaH_getnum(t, nvalue(key));
+    case TAG_STRING: return luaH_getstr(t, tsvalue(key));
+    default:         return luaH_getany(L, t, key);
   }
 }
 
 
-static Node *hashnodecreate (int nhash) {
-  Node *v = luaM_newvector(nhash, Node);
+Node *luaH_next (lua_State *L, const Hash *t, const TObject *key) {
   int i;
-  for (i=0; i<nhash; i++)
-    ttype(ref(&v[i])) = ttype(val(&v[i])) = LUA_T_NIL;
-  return v;
+  if (ttype(key) == TAG_NIL)
+    i = 0;  /* first iteration */
+  else {
+    const TObject *v = luaH_get(L, t, key);
+    if (v == &luaO_nilobject)
+      lua_error(L, "invalid key for `next'");
+    i = (int)(((const char *)v -
+               (const char *)(&t->node[0].val)) / sizeof(Node)) + 1;
+  }
+  for (; i<t->size; i++) {
+    Node *n = node(t, i);
+    if (ttype(val(n)) != TAG_NIL)
+      return n;
+  }
+  return NULL;  /* no more elements */
 }
 
 
-Hash *luaH_new (int nhash) {
-  Hash *t = luaM_new(Hash);
-  nhash = luaO_redimension(nhash*3/2);
-  nodevector(t) = hashnodecreate(nhash);
-  nhash(t) = nhash;
-  nuse(t) = 0;
+/*
+** try to remove a key without value from a table. To avoid problems with
+** hash, change `key' for a number with the same hash.
+*/
+void luaH_remove (Hash *t, TObject *key) {
+  if (ttype(key) == TAG_NUMBER ||
+       (ttype(key) == TAG_STRING && tsvalue(key)->u.s.len <= 30))
+  return;  /* do not remove numbers nor small strings */
+  else {
+    /* try to find a number `n' with the same hash as `key' */
+    Node *mp = luaH_mainposition(t, key);
+    int n = mp - &t->node[0];
+    /* make sure `n' is not in `t' */
+    while (luaH_getnum(t, n) != &luaO_nilobject) {
+      if (n >= MAX_INT - t->size)
+        return;  /* give up; (to avoid overflow) */
+      n += t->size;
+    }
+    ttype(key) = TAG_NUMBER;
+    nvalue(key) = n;
+    LUA_ASSERT(luaH_mainposition(t, key) == mp, "cannot change hash");
+  }
+}
+
+
+static void setnodevector (lua_State *L, Hash *t, lint32 size) {
+  int i;
+  if (size > MAX_INT)
+    lua_error(L, "table overflow");
+  t->node = luaM_newvector(L, size, Node);
+  for (i=0; i<(int)size; i++) {
+    ttype(&t->node[i].key) = ttype(&t->node[i].val) = TAG_NIL;
+    t->node[i].next = NULL;
+  }
+  L->nblocks += gcsize(L, size) - gcsize(L, t->size);
+  t->size = size;
+  t->firstfree = &t->node[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;
-  luaO_insertlist(&(L->roottable), (GCnode *)t);
-  L->nblocks += gcsize(nhash);
+  t->next = L->roottable;
+  L->roottable = t;
+  t->mark = t;
+  t->size = 0;
+  L->nblocks += gcsize(L, 0);
+  t->node = NULL;
+  setnodevector(L, t, luaO_power2(size));
   return t;
 }
 
 
-static int newsize (Hash *t) {
+void luaH_free (lua_State *L, Hash *t) {
+  L->nblocks -= gcsize(L, t->size);
+  luaM_free(L, t->node);
+  luaM_free(L, t);
+}
+
+
+static int numuse (const Hash *t) {
   Node *v = t->node;
-  int size = nhash(t);
+  int size = t->size;
   int realuse = 0;
   int i;
   for (i=0; i<size; i++) {
-    if (ttype(val(v+i)) != LUA_T_NIL)
+    if (ttype(&v[i].val) != TAG_NIL)
       realuse++;
   }
-  return luaO_redimension((realuse+1)*2);  /* +1 is the new element */
+  return realuse;
 }
 
 
-static void rehash (Hash *t) {
-  int nold = nhash(t);
-  Node *vold = nodevector(t);
-  int nnew = newsize(t);
+static void rehash (lua_State *L, Hash *t) {
+  int oldsize = t->size;
+  Node *nold = t->node;
+  int nelems = numuse(t);
   int i;
-  nodevector(t) = hashnodecreate(nnew);
-  nhash(t) = nnew;
-  nuse(t) = 0;
-  for (i=0; i<nold; i++) {
-    Node *n = vold+i;
-    if (ttype(val(n)) != LUA_T_NIL) {
-      *luaH_present(t, ref(n)) = *n;  /* copy old node to new hash */
-      nuse(t)++;
+  LUA_ASSERT(nelems<=oldsize, "wrong count");
+  if (nelems >= oldsize-oldsize/4)  /* using more than 3/4? */
+    setnodevector(L, t, (lint32)oldsize*2);
+  else if (nelems <= oldsize/4 &&  /* less than 1/4? */
+           oldsize > MINPOWER2)
+    setnodevector(L, t, oldsize/2);
+  else
+    setnodevector(L, t, oldsize);
+  for (i=0; i<oldsize; i++) {
+    Node *old = nold+i;
+    if (ttype(&old->val) != TAG_NIL)
+      *luaH_set(L, t, &old->key) = old->val;
+  }
+  luaM_free(L, nold);  /* free old array */
+}
+
+
+/*
+** inserts a key into a hash table; first, check whether key is
+** already present; if not, check whether key's main position is free;
+** if not, check whether colliding node is in its main position or not;
+** if it is not, move colliding node to an empty place and put new key
+** in its main position; otherwise (colliding node is in its main position),
+** new key goes to an empty position.
+*/
+TObject *luaH_set (lua_State *L, Hash *t, const TObject *key) {
+  Node *mp = luaH_mainposition(t, key);
+  Node *n = mp;
+  if (!mp)
+    lua_error(L, "table index is nil");
+  do {  /* check whether `key' is somewhere in the chain */
+    if (luaO_equalObj(key, &n->key))
+      return &n->val;  /* that's all */
+    else n = n->next;
+  } while (n);
+  /* `key' not found; must insert it */
+  if (ttype(&mp->key) != TAG_NIL) {  /* main position is not free? */
+    Node *othern;  /* main position of colliding node */
+    n = t->firstfree;  /* get a free place */
+    /* is colliding node out of its main position? (can only happens if
+       its position is after "firstfree") */
+    if (mp > n && (othern=luaH_mainposition(t, &mp->key)) != mp) {
+      /* yes; move colliding node into free position */
+      while (othern->next != mp) othern = othern->next;  /* find previous */
+      othern->next = n;  /* redo the chain with `n' in place of `mp' */
+      *n = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+      mp->next = NULL;  /* now `mp' is free */
+    }
+    else {  /* colliding node is in its own main position */
+      /* new node will go into free position */
+      n->next = mp->next;  /* chain new position */
+      mp->next = n;
+      mp = n;
     }
   }
-  L->nblocks += gcsize(nnew)-gcsize(nold);
-  luaM_free(vold);
-}
-
-
-void luaH_set (Hash *t, TObject *ref, TObject *val) {
-  Node *n = luaH_present(t, ref);
-  if (ttype(ref(n)) != LUA_T_NIL)
-    *val(n) = *val;
-  else {
-    TObject buff = *val;  /* rehash may invalidate this address */
-    if ((long)nuse(t)*3L > (long)nhash(t)*2L) {
-      rehash(t);
-      n = luaH_present(t, ref);
-    }
-    nuse(t)++;
-    *ref(n) = *ref;
-    *val(n) = buff;
+  mp->key = *key;
+  for (;;) {  /* correct `firstfree' */
+    if (ttype(&t->firstfree->key) == TAG_NIL)
+      return &mp->val;  /* 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 */
 }
 
 
-int luaH_pos (Hash *t, TObject *r) {
-  Node *n = luaH_present(t, r);
-  luaL_arg_check(ttype(val(n)) != LUA_T_NIL, 2, "key not found");
-  return n-(t->node);
-}
-
-
-void luaH_setint (Hash *t, int ref, TObject *val) {
+TObject *luaH_setint (lua_State *L, Hash *t, int key) {
   TObject index;
-  ttype(&index) = LUA_T_NUMBER;
-  nvalue(&index) = ref;
-  luaH_set(t, &index, val);
+  ttype(&index) = TAG_NUMBER;
+  nvalue(&index) = key;
+  return luaH_set(L, t, &index);
 }
 
 
-TObject *luaH_getint (Hash *t, int ref) {
-  TObject index;
-  ttype(&index) = LUA_T_NUMBER;
-  nvalue(&index) = ref;
-  return luaH_get(t, &index);
+void luaH_setstrnum (lua_State *L, Hash *t, TString *key, Number val) {
+  TObject *value, index;
+  ttype(&index) = TAG_STRING;
+  tsvalue(&index) = key;
+  value = luaH_set(L, t, &index);
+  ttype(value) = TAG_NUMBER;
+  nvalue(value) = val;
+}
+
+
+const TObject *luaH_getglobal (lua_State *L, const char *name) {
+  return luaH_getstr(L->gt, luaS_new(L, name));
 }
 

ltable.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.h,v 1.10 1999/01/25 17:40:10 roberto Exp roberto $
+** $Id: ltable.h,v 1.23 2000/06/06 16:31:41 roberto Exp roberto $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
@@ -10,21 +10,25 @@
 #include "lobject.h"
 
 
-#define node(t,i)       (&(t)->node[i])
-#define ref(n)		(&(n)->ref)
+#define node(t,i)	(&(t)->node[i])
+#define key(n)		(&(n)->key)
 #define val(n)		(&(n)->val)
-#define nhash(t)	((t)->nhash)
 
-#define luaH_get(t,ref)	(val(luaH_present((t), (ref))))
-#define luaH_move(t,from,to)	(luaH_setint(t, to, luaH_getint(t, from)))
+Hash *luaH_new (lua_State *L, int nhash);
+void luaH_free (lua_State *L, Hash *t);
+const TObject *luaH_get (lua_State *L, const Hash *t, const TObject *key);
+const TObject *luaH_getnum (const Hash *t, Number key);
+const TObject *luaH_getstr (const Hash *t, TString *key);
+void luaH_remove (Hash *t, TObject *key);
+TObject *luaH_set (lua_State *L, Hash *t, const TObject *key);
+Node * luaH_next (lua_State *L, const Hash *t, const TObject *r);
+TObject *luaH_setint (lua_State *L, Hash *t, int key);
+void luaH_setstrnum (lua_State *L, Hash *t, TString *key, Number val);
+unsigned long luaH_hash (lua_State *L, const TObject *key);
+const TObject *luaH_getglobal (lua_State *L, const char *name);
 
-Hash *luaH_new (int nhash);
-void luaH_free (Hash *frees);
-Node *luaH_present (Hash *t, TObject *key);
-void luaH_set (Hash *t, TObject *ref, TObject *val);
-int luaH_pos (Hash *t, TObject *r);
-void luaH_setint (Hash *t, int ref, TObject *val);
-TObject *luaH_getint (Hash *t, int ref);
+/* exported only for debugging */
+Node *luaH_mainposition (const Hash *t, const TObject *key);
 
 
 #endif

ltests.c

@@ -0,0 +1,470 @@
+/*
+** $Id: ltests.c,v 1.41 2000/09/11 19:42:57 roberto Exp roberto $
+** Internal Module for Debugging of the Lua Implementation
+** See Copyright Notice in lua.h
+*/
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "lauxlib.h"
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lmem.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "luadebug.h"
+#include "lualib.h"
+
+
+void luaB_opentests (lua_State *L);
+
+
+/*
+** The whole module only makes sense with DEBUG on
+*/
+#ifdef DEBUG
+
+
+
+static void setnameval (lua_State *L, const char *name, int val) {
+  lua_pushstring(L, name);
+  lua_pushnumber(L, val);
+  lua_settable(L, -3);
+}
+
+
+/*
+** {======================================================
+** Disassembler
+** =======================================================
+*/
+
+
+static const char *const instrname[NUM_OPCODES] = {
+  "END", "RETURN", "CALL", "TAILCALL", "PUSHNIL", "POP", "PUSHINT", 
+  "PUSHSTRING", "PUSHNUM", "PUSHNEGNUM", "PUSHUPVALUE", "GETLOCAL", 
+  "GETGLOBAL", "GETTABLE", "GETDOTTED", "GETINDEXED", "PUSHSELF", 
+  "CREATETABLE", "SETLOCAL", "SETGLOBAL", "SETTABLE", "SETLIST", "SETMAP", 
+  "ADD", "ADDI", "SUB", "MULT", "DIV", "POW", "CONCAT", "MINUS", "NOT", 
+  "JMPNE", "JMPEQ", "JMPLT", "JMPLE", "JMPGT", "JMPGE", "JMPT", "JMPF", 
+  "JMPONT", "JMPONF", "JMP", "PUSHNILJMP", "FORPREP", "FORLOOP", "LFORPREP", 
+  "LFORLOOP", "CLOSURE"
+};
+
+
+static int pushop (lua_State *L, Proto *p, int pc) {
+  char buff[100];
+  Instruction i = p->code[pc];
+  OpCode o = GET_OPCODE(i);
+  const char *name = instrname[o];
+  sprintf(buff, "%5d - ", luaG_getline(p->lineinfo, pc, 1, NULL));
+  switch ((enum Mode)luaK_opproperties[o].mode) {  
+    case iO:
+      sprintf(buff+8, "%s", name);
+      break;
+    case iU:
+      sprintf(buff+8, "%-12s%4u", name, GETARG_U(i));
+      break;
+    case iS:
+      sprintf(buff+8, "%-12s%4d", name, GETARG_S(i));
+      break;
+    case iAB:
+      sprintf(buff+8, "%-12s%4d %4d", name, GETARG_A(i), GETARG_B(i));
+      break;
+  }
+  lua_pushstring(L, buff);
+  return (o != OP_END);
+}
+
+
+static int listcode (lua_State *L) {
+  int pc;
+  Proto *p;
+  int res;
+  luaL_arg_check(L, lua_tag(L, 1) == TAG_LCLOSURE, 1, "Lua function expected");
+  p = clvalue(luaA_index(L, 1))->f.l;
+  lua_newtable(L);
+  setnameval(L, "maxstack", p->maxstacksize);
+  setnameval(L, "numparams", p->numparams);
+  pc = 0;
+  do {
+    lua_pushnumber(L, pc+1);
+    res = pushop(L, p, pc++);
+    lua_settable(L, -3);
+  } while (res);
+  return 1;
+}
+
+
+static int liststrings (lua_State *L) {
+  Proto *p;
+  int i;
+  luaL_arg_check(L, lua_tag(L, 1) == TAG_LCLOSURE, 1, "Lua function expected");
+  p = clvalue(luaA_index(L, 1))->f.l;
+  lua_newtable(L);
+  for (i=0; i<p->nkstr; i++) {
+    lua_pushnumber(L, i+1);
+    lua_pushstring(L, p->kstr[i]->str);
+    lua_settable(L, -3);
+  }
+  return 1;
+}
+
+
+static int listlocals (lua_State *L) {
+  Proto *p;
+  int pc = luaL_check_int(L, 2) - 1;
+  int i = 0;
+  const char *name;
+  luaL_arg_check(L, lua_tag(L, 1) == TAG_LCLOSURE, 1, "Lua function expected");
+  p = clvalue(luaA_index(L, 1))->f.l;
+  while ((name = luaF_getlocalname(p, ++i, pc)) != NULL)
+    lua_pushstring(L, name);
+  return i-1;
+}
+
+/* }====================================================== */
+
+
+
+static int get_limits (lua_State *L) {
+  lua_newtable(L);
+  setnameval(L, "BITS_INT", BITS_INT);
+  setnameval(L, "LFPF", LFIELDS_PER_FLUSH);
+  setnameval(L, "MAXARG_A", MAXARG_A);
+  setnameval(L, "MAXARG_B", MAXARG_B);
+  setnameval(L, "MAXARG_S", MAXARG_S);
+  setnameval(L, "MAXARG_U", MAXARG_U);
+  setnameval(L, "MAXLOCALS", MAXLOCALS);
+  setnameval(L, "MAXPARAMS", MAXPARAMS);
+  setnameval(L, "MAXSTACK", MAXSTACK);
+  setnameval(L, "MAXUPVALUES", MAXUPVALUES);
+  setnameval(L, "MAXVARSLH", MAXVARSLH);
+  setnameval(L, "RFPF", RFIELDS_PER_FLUSH);
+  setnameval(L, "SIZE_A", SIZE_A);
+  setnameval(L, "SIZE_B", SIZE_B);
+  setnameval(L, "SIZE_OP", SIZE_OP);
+  setnameval(L, "SIZE_U", SIZE_U);
+  return 1;
+}
+
+
+static int mem_query (lua_State *L) {
+  if (lua_isnull(L, 1)) {
+    lua_pushnumber(L, memdebug_total);
+    lua_pushnumber(L, memdebug_numblocks);
+    lua_pushnumber(L, memdebug_maxmem);
+    return 3;
+  }
+  else {
+    memdebug_memlimit = luaL_check_int(L, 1);
+    return 0;
+  }
+}
+
+
+static int hash_query (lua_State *L) {
+  if (lua_isnull(L, 2)) {
+    luaL_arg_check(L, lua_tag(L, 1) == TAG_STRING, 1, "string expected");
+    lua_pushnumber(L, tsvalue(luaA_index(L, 1))->u.s.hash);
+  }
+  else {
+    Hash *t;
+    luaL_checktype(L, 2, "table");
+    t = hvalue(luaA_index(L, 2));
+    lua_pushnumber(L, luaH_mainposition(t, luaA_index(L, 1)) - t->node);
+  }
+  return 1;
+}
+
+
+static int table_query (lua_State *L) {
+  const Hash *t;
+  int i = luaL_opt_int(L, 2, -1);
+  luaL_checktype(L, 1, "table");
+  t = hvalue(luaA_index(L, 1));
+  if (i == -1) {
+    lua_pushnumber(L, t->size);
+    lua_pushnumber(L, t->firstfree - t->node);
+    return 2;
+  }
+  else if (i < t->size) {
+    luaA_pushobject(L, &t->node[i].key);
+    luaA_pushobject(L, &t->node[i].val);
+    if (t->node[i].next) {
+      lua_pushnumber(L, t->node[i].next - t->node);
+      return 3;
+    }
+    else
+      return 2;
+  }
+  return 0;
+}
+
+
+static int string_query (lua_State *L) {
+  stringtable *tb = (*luaL_check_string(L, 1) == 's') ? &L->strt : &L->udt;
+  int s = luaL_opt_int(L, 2, 0) - 1;
+  if (s==-1) {
+    lua_pushnumber(L ,tb->nuse);
+    lua_pushnumber(L ,tb->size);
+    return 2;
+  }
+  else if (s < tb->size) {
+    TString *ts;
+    int n = 0;
+    for (ts = tb->hash[s]; ts; ts = ts->nexthash) {
+      ttype(L->top) = TAG_STRING;
+      tsvalue(L->top) = ts;
+      incr_top;
+      n++;
+    }
+    return n;
+  }
+  return 0;
+}
+
+
+static int tref (lua_State *L) {
+  luaL_checktype(L, 1, "any");
+  lua_pushvalue(L, 1);
+  lua_pushnumber(L, lua_ref(L, luaL_opt_int(L, 2, 1)));
+  return 1;
+}
+
+static int getref (lua_State *L) {
+  if (lua_getref(L, luaL_check_int(L, 1)))
+    return 1;
+  else
+    return 0;
+}
+
+static int unref (lua_State *L) {
+  lua_unref(L, luaL_check_int(L, 1));
+  return 0;
+}
+
+static int newuserdata (lua_State *L) {
+  lua_pushusertag(L, (void *)luaL_check_int(L, 1), luaL_check_int(L, 2));
+  return 1;
+}
+
+static int udataval (lua_State *L) {
+  luaL_checktype(L, 1, "userdata");
+  lua_pushnumber(L, (int)lua_touserdata(L, 1));
+  return 1;
+}
+
+static int newstate (lua_State *L) {
+  lua_State *L1 = lua_open(luaL_check_int(L, 1));
+  if (L1)
+    lua_pushuserdata(L, L1);
+  else
+    lua_pushnil(L);
+  return 1;
+}
+
+static int loadlib (lua_State *L) {
+  lua_State *L1 = (lua_State *)lua_touserdata(L, 1);
+  switch (*luaL_check_string(L, 2)) {
+    case 'm': lua_mathlibopen(L1); break;
+    case 's': lua_strlibopen(L1); break;
+    case 'i': lua_iolibopen(L1); break;
+    case 'd': lua_dblibopen(L1); break;
+    case 'b': lua_baselibopen(L1); break;
+    default: luaL_argerror(L, 2, "invalid option");
+  }
+  return 0;
+}
+
+static int closestate (lua_State *L) {
+  luaL_checktype(L, 1, "userdata");
+  lua_close((lua_State *)lua_touserdata(L, 1));
+  return 0;
+}
+
+static int doremote (lua_State *L) {
+  lua_State *L1;
+  const char *code = luaL_check_string(L, 2);
+  int status;
+  luaL_checktype(L, 1, "userdata");
+  L1 = (lua_State *)lua_touserdata(L, 1);
+  status = lua_dostring(L1, code);
+  if (status != 0) {
+    lua_pushnil(L);
+    lua_pushnumber(L, status);
+    return 2;
+  }
+  else {
+    int i = 0;
+    while (!lua_isnull(L1, ++i))
+      lua_pushstring(L, lua_tostring(L1, i));
+    return i-1;
+  }
+}
+
+static int settagmethod (lua_State *L) {
+  luaL_checktype(L, 3, "any");
+  lua_settagmethod(L, luaL_check_int(L, 1), luaL_check_string(L, 2));
+  return 1;
+}
+
+static int pushbool (lua_State *L, int b) {
+  if (b) lua_pushnumber(L, 1);
+  else lua_pushnil(L);
+  return 1;
+}
+
+static int equal (lua_State *L) {
+  return pushbool(L, lua_equal(L, 1, 2));
+}
+
+  
+
+/*
+** {======================================================
+** function to test the API with C. It interprets a kind of "assembler"
+** language with calls to the API, so the test can be driven by Lua code
+** =======================================================
+*/
+
+static const char *const delimits = " \t\n,;";
+
+static void skip (const char **pc) {
+  while (**pc != '\0' && strchr(delimits, **pc)) (*pc)++;
+}
+
+static int getnum (lua_State *L, const char **pc) {
+  int res = 0;
+  int sig = 1;
+  skip(pc);
+  if (**pc == '.') {
+    res = (int)lua_tonumber(L, -1);
+    lua_pop(L, 1);
+    (*pc)++;
+    return res;
+  }
+  else if (**pc == '-') {
+    sig = -1;
+    (*pc)++;
+  }
+  while (isdigit(**pc)) res = res*10 + (*(*pc)++) - '0';
+  return sig*res;
+}
+  
+static const char *getname (char *buff, const char **pc) {
+  int i = 0;
+  skip(pc);
+  while (**pc != '\0' && !strchr(delimits, **pc))
+    buff[i++] = *(*pc)++;
+  buff[i] = '\0';
+  return buff;
+}
+
+
+#define EQ(s1)	(strcmp(s1, inst) == 0)
+
+#define getnum	((getnum)(L, &pc))
+#define getname	((getname)(buff, &pc))
+
+
+static int testC (lua_State *L) {
+  char buff[30];
+  const char *pc = luaL_check_string(L, 1);
+  for (;;) {
+    const char *inst = getname;
+    if EQ("") return 0;
+    else if EQ("return") {
+      return getnum;
+    }
+    else if EQ("gettop") {
+      lua_pushnumber(L, lua_gettop(L));
+    }
+    else if EQ("settop") {
+      lua_settop(L, getnum);
+    }
+    else if EQ("pop") {
+      lua_pop(L, getnum);
+    }
+    else if EQ("pushnum") {
+      lua_pushnumber(L, getnum);
+    }
+    else if EQ("pushvalue") {
+      lua_pushvalue(L, getnum);
+    }
+    else if EQ("remove") {
+      lua_remove(L, getnum);
+    }
+    else if EQ("insert") {
+      lua_insert(L, getnum);
+    }
+    else if EQ("next") {
+      lua_next(L, -2);
+    }
+    else if EQ("concat") {
+      lua_concat(L, getnum);
+    }
+    else if EQ("call") {
+      int narg = getnum;
+      int nres = getnum;
+      lua_rawcall(L, narg, nres);
+    }
+    else if EQ("type") {
+      lua_pushstring(L, lua_type(L, getnum));
+    }
+    else luaL_verror(L, "unknown instruction %.30s", buff);
+  }
+  return 0;
+}
+
+/* }====================================================== */
+
+
+
+static const struct luaL_reg tests_funcs[] = {
+  {"hash", hash_query},
+  {"limits", get_limits},
+  {"listcode", listcode},
+  {"liststrings", liststrings},
+  {"listlocals", listlocals},
+  {"loadlib", loadlib},
+  {"querystr", string_query},
+  {"querytab", table_query},
+  {"testC", testC},
+  {"ref", tref},
+  {"getref", getref},
+  {"unref", unref},
+  {"newuserdata", newuserdata},
+  {"udataval", udataval},
+  {"newstate", newstate},
+  {"closestate", closestate},
+  {"doremote", doremote},
+  {"settagmethod", settagmethod},
+  {"equal", equal},
+  {"totalmem", mem_query}
+};
+
+
+void luaB_opentests (lua_State *L) {
+  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, "T");  /* set new table as global T */
+}
+
+#endif

ltm.c

@@ -1,5 +1,5 @@
 /*
-** $Id: ltm.c,v 1.23 1999/02/25 19:13:56 roberto Exp roberto $
+** $Id: ltm.c,v 1.48 2000/09/11 19:45:27 roberto Exp roberto $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
@@ -8,240 +8,152 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lauxlib.h"
+#include "lua.h"
+
+#include "ldo.h"
 #include "lmem.h"
 #include "lobject.h"
 #include "lstate.h"
 #include "ltm.h"
 
 
-char *luaT_eventname[] = {  /* ORDER IM */
-  "gettable", "settable", "index", "getglobal", "setglobal", "add",
-  "sub", "mul", "div", "pow", "unm", "lt", "le", "gt", "ge",
-  "concat", "gc", "function", NULL
+const char *const luaT_eventname[] = {  /* ORDER IM */
+  "gettable", "settable", "index", "getglobal", "setglobal", "add", "sub",
+  "mul", "div", "pow", "unm", "lt", "concat", "gc", "function",
+  "le", "gt", "ge",  /* deprecated options!! */
+  NULL
 };
 
 
-static int luaI_checkevent (char *name, char *list[]) {
-  int e = luaL_findstring(name, list);
+static int findevent (const 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 char *name, int t) {
+  int e = findevent(name);
+  if (e >= IM_N)
+    luaO_verror(L, "event `%.50s' is deprecated", name);
+  if (e == IM_GC && t == TAG_TABLE)
+    luaO_verror(L, "event `gc' for tables is deprecated");
   if (e < 0)
-    luaL_verror("`%.50s' is not a valid event name", name);
+    luaO_verror(L, "`%.50s' is not a valid event name", name);
   return e;
 }
 
 
 
-/* events in LUA_T_NIL are all allowed, since this is used as a
+/* events in TAG_NIL are all allowed, since this is used as a
 *  'placeholder' for "default" fallbacks
 */
-static char luaT_validevents[NUM_TAGS][IM_N] = { /* ORDER LUA_T, ORDER IM */
-{1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},  /* LUA_T_USERDATA */
-{1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1},  /* LUA_T_NUMBER */
-{1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},  /* LUA_T_STRING */
-{0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},  /* LUA_T_ARRAY */
-{1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},  /* LUA_T_PROTO */
-{1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},  /* LUA_T_CPROTO */
-{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}   /* LUA_T_NIL */
+/* ORDER LUA_T, ORDER IM */
+static const char luaT_validevents[NUM_TAGS][IM_N] = {
+  {1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},  /* TAG_USERDATA */
+  {1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1},  /* TAG_NUMBER */
+  {1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},  /* TAG_STRING */
+  {0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1},  /* TAG_TABLE */
+  {1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},  /* TAG_LCLOSURE */
+  {1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},  /* TAG_CCLOSURE */
+  {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}   /* TAG_NIL */
 };
 
-static int luaT_validevent (int t, int e) {  /* ORDER LUA_T */
-  return (t < LUA_T_NIL) ?  1 : luaT_validevents[-t][e];
+int luaT_validevent (int t, int e) {  /* ORDER LUA_T */
+  return (t > TAG_NIL) ?  1 : luaT_validevents[t][e];
 }
 
 
-static void init_entry (int tag) {
+static void init_entry (lua_State *L, int tag) {
   int i;
   for (i=0; i<IM_N; i++)
-    ttype(luaT_getim(tag, i)) = LUA_T_NIL;
+    ttype(luaT_getim(L, tag, i)) = TAG_NIL;
+  L->IMtable[tag].collected = NULL;
 }
 
 
-void luaT_init (void) {
+void luaT_init (lua_State *L) {
   int t;
-  L->last_tag = -(NUM_TAGS-1);
-  luaM_growvector(L->IMtable, 0, NUM_TAGS, struct IM, arrEM, MAX_INT);
-  for (t=L->last_tag; t<=0; t++)
-    init_entry(t);
+  luaM_growvector(L, L->IMtable, 0, NUM_TAGS, struct IM, "", MAX_INT);
+  L->last_tag = NUM_TAGS-1;
+  for (t=0; t<=L->last_tag; t++)
+    init_entry(L, t);
 }
 
 
-int lua_newtag (void) {
-  --L->last_tag;
-  luaM_growvector(L->IMtable, -(L->last_tag), 1, struct IM, arrEM, MAX_INT);
-  init_entry(L->last_tag);
+int lua_newtag (lua_State *L) {
+  luaM_growvector(L, L->IMtable, L->last_tag, 1, struct IM,
+                  "tag table overflow", MAX_INT);
+  L->last_tag++;
+  init_entry(L, L->last_tag);
   return L->last_tag;
 }
 
 
-static void checktag (int tag) {
-  if (!(L->last_tag <= tag && tag <= 0))
-    luaL_verror("%d is not a valid tag", tag);
+static void checktag (lua_State *L, int tag) {
+  if (!(0 <= tag && tag <= L->last_tag))
+    luaO_verror(L, "%d is not a valid tag", tag);
 }
 
-void luaT_realtag (int tag) {
-  if (!(L->last_tag <= tag && tag < LUA_T_NIL))
-    luaL_verror("tag %d was not created by `newtag'", tag);
+void luaT_realtag (lua_State *L, int tag) {
+  if (!(NUM_TAGS <= tag && tag <= L->last_tag))
+    luaO_verror(L, "tag %d was not created by `newtag'", tag);
 }
 
 
-int lua_copytagmethods (int tagto, int tagfrom) {
+int lua_copytagmethods (lua_State *L, int tagto, int tagfrom) {
   int e;
-  checktag(tagto);
-  checktag(tagfrom);
+  checktag(L, tagto);
+  checktag(L, tagfrom);
   for (e=0; e<IM_N; e++) {
     if (luaT_validevent(tagto, e))
-      *luaT_getim(tagto, e) = *luaT_getim(tagfrom, e);
+      *luaT_getim(L, tagto, e) = *luaT_getim(L, tagfrom, e);
   }
   return tagto;
 }
 
 
-int luaT_effectivetag (TObject *o) {
-  int t;
-  switch (t = ttype(o)) {
-    case LUA_T_ARRAY:
-      return o->value.a->htag;
-    case LUA_T_USERDATA: {
-      int tag = o->value.ts->u.d.tag;
-      return (tag >= 0) ? LUA_T_USERDATA : tag;
+int luaT_effectivetag (lua_State *L, const TObject *o) {
+  lua_Type t = ttype(o);
+  switch (t) {
+    case TAG_USERDATA: {
+      int tag = tsvalue(o)->u.d.tag;
+      return (tag > L->last_tag) ? TAG_USERDATA : tag;  /* deprecated test */
     }
-    case LUA_T_CLOSURE:
-      return o->value.cl->consts[0].ttype;
-#ifdef DEBUG
-    case LUA_T_PMARK: case LUA_T_CMARK:
-    case LUA_T_CLMARK: case LUA_T_LINE:
-      LUA_INTERNALERROR("invalid type");
-#endif
-    default:
-      return t;
+    case TAG_TABLE: return hvalue(o)->htag;
+    default: return t;
   }
 }
 
 
-TObject *luaT_gettagmethod (int t, char *event) {
-  int e = luaI_checkevent(event, luaT_eventname);
-  checktag(t);
-  if (luaT_validevent(t, e))
-    return luaT_getim(t,e);
-  else
-    return &luaO_nilobject;
-}
-
-
-void luaT_settagmethod (int t, char *event, TObject *func) {
-  TObject temp = *func;
-  int e = luaI_checkevent(event, luaT_eventname);
-  checktag(t);
-  if (!luaT_validevent(t, e))
-    luaL_verror("cannot change tag method `%.20s' for type `%.20s'%.20s",
-                luaT_eventname[e], luaO_typenames[-t],
-                (t == LUA_T_ARRAY || t == LUA_T_USERDATA) ? " with default tag"
-                                                          : "");
-  *func = *luaT_getim(t,e);
-  *luaT_getim(t, e) = temp;
-}
-
-
-char *luaT_travtagmethods (int (*fn)(TObject *)) {  /* ORDER IM */
+void lua_gettagmethod (lua_State *L, int t, const char *event) {
   int e;
-  for (e=IM_GETTABLE; e<=IM_FUNCTION; e++) {
-    int t;
-    for (t=0; t>=L->last_tag; t--)
-      if (fn(luaT_getim(t,e)))
-        return luaT_eventname[e];
-  }
-  return NULL;
-}
-
-
-/*
-* ===================================================================
-* compatibility with old fallback system
-*/
-#ifdef LUA_COMPAT2_5
-
-#include "lapi.h"
-#include "lstring.h"
-
-static void errorFB (void)
-{
-  lua_Object o = lua_getparam(1);
-  if (lua_isstring(o))
-    fprintf(stderr, "lua: %s\n", lua_getstring(o));
+  e = luaI_checkevent(L, event, t);
+  checktag(L, t);
+  if (luaT_validevent(t, e))
+    *L->top = *luaT_getim(L, t,e);
   else
-    fprintf(stderr, "lua: unknown error\n");
+    ttype(L->top) = TAG_NIL;
+  incr_top;
 }
 
 
-static void nilFB (void) { }
-
-
-static void typeFB (void) {
-  lua_error("unexpected type");
+void lua_settagmethod (lua_State *L, int t, const char *event) {
+  TObject temp;
+  int e;
+  LUA_ASSERT(lua_isnil(L, -1) || lua_isfunction(L, -1),
+             "function or nil expected");
+  e = luaI_checkevent(L, event, t);
+  checktag(L, t);
+  if (!luaT_validevent(t, e))
+    luaO_verror(L, "cannot change `%.20s' tag method for type `%.20s'%.20s",
+                luaT_eventname[e], luaO_typenames[t],
+                (t == TAG_TABLE || t == TAG_USERDATA) ? " with default tag"
+                                                          : "");
+  temp = *(L->top - 1);
+  *(L->top - 1) = *luaT_getim(L, t,e);
+  *luaT_getim(L, t, e) = temp;
 }
 
-
-static void fillvalids (IMS e, TObject *func) {
-  int t;
-  for (t=LUA_T_NIL; t<=LUA_T_USERDATA; t++)
-    if (luaT_validevent(t, e))
-      *luaT_getim(t, e) = *func;
-}
-
-
-void luaT_setfallback (void) {
-  static char *oldnames [] = {"error", "getglobal", "arith", "order", NULL};
-  TObject oldfunc;
-  lua_CFunction replace;
-  char *name = luaL_check_string(1);
-  lua_Object func = lua_getparam(2);
-  luaL_arg_check(lua_isfunction(func), 2, "function expected");
-  switch (luaL_findstring(name, oldnames)) {
-    case 0: {  /* old error fallback */
-      TObject *em = &(luaS_new("_ERRORMESSAGE")->u.s.globalval);
-      oldfunc = *em;
-      *em = *luaA_Address(func);
-      replace = errorFB;
-      break;
-    }
-    case 1:  /* old getglobal fallback */
-      oldfunc = *luaT_getim(LUA_T_NIL, IM_GETGLOBAL);
-      *luaT_getim(LUA_T_NIL, IM_GETGLOBAL) = *luaA_Address(func);
-      replace = nilFB;
-      break;
-    case 2: {  /* old arith fallback */
-      int i;
-      oldfunc = *luaT_getim(LUA_T_NUMBER, IM_POW);
-      for (i=IM_ADD; i<=IM_UNM; i++)  /* ORDER IM */
-        fillvalids(i, luaA_Address(func));
-      replace = typeFB;
-      break;
-    }
-    case 3: {  /* old order fallback */
-      int i;
-      oldfunc = *luaT_getim(LUA_T_NIL, IM_LT);
-      for (i=IM_LT; i<=IM_GE; i++)  /* ORDER IM */
-        fillvalids(i, luaA_Address(func));
-      replace = typeFB;
-      break;
-    }
-    default: {
-      int e;
-      if ((e = luaL_findstring(name, luaT_eventname)) >= 0) {
-        oldfunc = *luaT_getim(LUA_T_NIL, e);
-        fillvalids(e, luaA_Address(func));
-        replace = (e == IM_GC || e == IM_INDEX) ? nilFB : typeFB;
-      }
-      else {
-        luaL_verror("`%.50s' is not a valid fallback name", name);
-        replace = NULL;  /* to avoid warnings */
-      }
-    }
-  }
-  if (oldfunc.ttype != LUA_T_NIL)
-    luaA_pushobject(&oldfunc);
-  else
-    lua_pushcfunction(replace);
-}
-#endif
-

ltm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltm.h,v 1.4 1997/11/26 18:53:45 roberto Exp roberto $
+** $Id: ltm.h,v 1.14 2000/08/07 20:21:34 roberto Exp roberto $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
@@ -28,35 +28,29 @@ typedef enum {
   IM_POW,
   IM_UNM,
   IM_LT,
-  IM_LE,
-  IM_GT,
-  IM_GE,
   IM_CONCAT,
   IM_GC,
-  IM_FUNCTION
+  IM_FUNCTION,
+  IM_N		/* number of elements in the enum */
 } IMS;
 
-#define IM_N 18
-
 
 struct IM {
   TObject int_method[IM_N];
+  TString *collected;  /* list of G. collected udata with this tag */
 };
 
 
-#define luaT_getim(tag,event) (&L->IMtable[-(tag)].int_method[event])
-#define luaT_getimbyObj(o,e)  (luaT_getim(luaT_effectivetag(o),(e)))
+#define luaT_getim(L,tag,event) (&L->IMtable[tag].int_method[event])
+#define luaT_getimbyObj(L,o,e)  (luaT_getim(L, luaT_effectivetag(L, o),(e)))
 
-extern char *luaT_eventname[];
+extern const char *const luaT_eventname[];
 
 
-void luaT_init (void);
-void luaT_realtag (int tag);
-int luaT_effectivetag (TObject *o);
-void luaT_settagmethod (int t, char *event, TObject *func);
-TObject *luaT_gettagmethod (int t, char *event);
-char *luaT_travtagmethods (int (*fn)(TObject *));
+void luaT_init (lua_State *L);
+void luaT_realtag (lua_State *L, int tag);
+int luaT_effectivetag (lua_State *L, const TObject *o);
+int luaT_validevent (int t, int e);  /* used by compatibility module */
 
-void luaT_setfallback (void);  /* only if LUA_COMPAT2_5 */
 
 #endif

lua.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lua.c,v 1.18 1999/01/26 11:50:58 roberto Exp roberto $
+** $Id: lua.c,v 1.50 2000/09/05 19:33:32 roberto Exp roberto $
 ** Lua stand-alone interpreter
 ** See Copyright Notice in lua.h
 */
@@ -11,30 +11,56 @@
 #include <string.h>
 
 #include "lua.h"
+
 #include "luadebug.h"
 #include "lualib.h"
 
 
-#ifndef OLD_ANSI
-#include <locale.h>
-#else
-#define setlocale(a,b)  0
+lua_State *lua_state = NULL;
+#define L	lua_state
+
+
+#ifndef PROMPT
+#define PROMPT		"> "
 #endif
 
 #ifdef _POSIX_SOURCE
 #include <unistd.h>
 #else
-#define isatty(x)       (x==0)  /* assume stdin is a tty */
+static int isatty (int x) { return x==0; }  /* assume stdin is a tty */
 #endif
 
 
+/*
+** global options
+*/
+struct Options {
+  int toclose;
+  int stacksize;
+};
+
+
 typedef void (*handler)(int);  /* type for signal actions */
 
 static void laction (int i);
 
 
-static lua_LHFunction old_linehook = NULL;
-static lua_CHFunction old_callhook = NULL;
+static lua_Hook old_linehook = NULL;
+static lua_Hook old_callhook = NULL;
+
+
+#ifdef USERINIT
+extern void USERINIT (void);
+#else
+#define USERINIT	userinit
+static void userinit (void) {
+  lua_baselibopen(L);
+  lua_iolibopen(L);
+  lua_strlibopen(L);
+  lua_mathlibopen(L);
+  lua_dblibopen(L);
+}
+#endif
 
 
 static handler lreset (void) {
@@ -43,64 +69,123 @@ static handler lreset (void) {
 
 
 static void lstop (void) {
-  lua_setlinehook(old_linehook);
-  lua_setcallhook(old_callhook);
+  lua_setlinehook(L, old_linehook);
+  lua_setcallhook(L, old_callhook);
   lreset();
-  lua_error("interrupted!");
+  lua_error(L, "interrupted!");
 }
 
 
 static void laction (int i) {
-  old_linehook = lua_setlinehook((lua_LHFunction)lstop);
-  old_callhook = lua_setcallhook((lua_CHFunction)lstop);
+  (void)i;  /* to avoid warnings */
+  signal(SIGINT, 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);
 }
 
 
-static int ldo (int (*f)(char *), char *name) {
+static int ldo (int (*f)(lua_State *l, const char *), const char *name) {
   int res;
   handler h = lreset();
-  res = f(name);  /* dostring | dofile */
+  int top = lua_gettop(L);
+  res = f(L, name);  /* dostring | dofile */
+  lua_settop(L, top);  /* remove eventual results */
   signal(SIGINT, h);  /* restore old action */
+  if (res == LUA_ERRMEM) {
+    /* Lua gives no message in such case, so lua.c provides one */
+    fprintf(stderr, "lua: memory allocation error\n");
+  }
   return res;
 }
 
 
 static void print_message (void) {
   fprintf(stderr,
-"Lua: command line options:\n"
-"  -v       print version information\n"
-"  -d       turn debug on\n"
-"  -e stat  dostring `stat'\n"
-"  -q       interactive mode without prompt\n"
-"  -i       interactive mode with prompt\n"
-"  -        executes stdin as a file\n"
-"  a=b      sets global `a' with string `b'\n"
-"  name     dofile `name'\n\n");
+  "usage: lua [options].  Available options are:\n"
+  "  -        execute stdin as a file\n"
+  "  -c       close Lua when exiting\n"
+  "  -e stat  execute string `stat'\n"
+  "  -f name  execute file `name' with remaining arguments in table `arg'\n"
+  "  -i       enter interactive mode with prompt\n"
+  "  -q       enter interactive mode without prompt\n"
+  "  -sNUM    set stack size to NUM (must be the first option)\n"
+  "  -v       print version information\n"
+  "  a=b      set global `a' to string `b'\n"
+  "  name     execute file `name'\n"
+);
+}
+
+
+static void print_version (void) {
+  printf("%s  %s\n", LUA_VERSION, LUA_COPYRIGHT);
 }
 
 
 static void assign (char *arg) {
-  if (strlen(arg) >= 500)
-    fprintf(stderr, "lua: shell argument too long");
-  else {
-    char buffer[500];
-    char *eq = strchr(arg, '=');
-    lua_pushstring(eq+1);
-    strncpy(buffer, arg, eq-arg);
-    buffer[eq-arg] = 0;
-    lua_setglobal(buffer);
-  }
+  char *eq = strchr(arg, '=');
+  *eq = '\0';  /* spilt `arg' in two strings (name & value) */
+  lua_pushstring(L, eq+1);
+  lua_setglobal(L, arg);
 }
 
 
-static void manual_input (int prompt) {
+static void getargs (char *argv[]) {
+  int i;
+  lua_newtable(L);
+  for (i=0; argv[i]; i++) {
+    /* arg[i] = argv[i] */
+    lua_pushnumber(L, i);
+    lua_pushstring(L, argv[i]);
+    lua_settable(L, -3);
+  }
+  /* arg.n = maximum index in table `arg' */
+  lua_pushstring(L, "n");
+  lua_pushnumber(L, i-1);
+  lua_settable(L, -3);
+}
+
+
+static int l_getargs (lua_State *l) {
+  char **argv = (char **)lua_touserdata(l, -1);
+  getargs(argv);
+  return 1;
+}
+
+
+static int file_input (const char *argv) {
+  int result = ldo(lua_dofile, argv);
+  if (result) {
+    if (result == LUA_ERRFILE) {
+      fprintf(stderr, "lua: cannot execute file ");
+      perror(argv);
+    }
+    return EXIT_FAILURE;
+  }
+  else
+    return EXIT_SUCCESS;
+}
+
+
+/* maximum length of an input string */
+#ifndef MAXINPUT
+#define MAXINPUT	BUFSIZ
+#endif
+
+static void manual_input (int version, int prompt) {
   int cont = 1;
+  if (version) print_version();
   while (cont) {
-    char buffer[BUFSIZ];
+    char buffer[MAXINPUT];
     int i = 0;
-    lua_beginblock();
-    if (prompt)
-      printf("%s", lua_getstring(lua_getglobal("_PROMPT")));
+    if (prompt) {
+      const char *s;
+      lua_getglobal(L, "_PROMPT");
+      s = lua_tostring(L, -1);
+      if (!s) s = PROMPT;
+      fputs(s, stdout);
+      lua_pop(L, 1);  /* remove global */
+    }
     for(;;) {
       int c = getchar();
       if (c == EOF) {
@@ -112,82 +197,129 @@ static void manual_input (int prompt) {
           buffer[i-1] = '\n';
         else break;
       }
-      else if (i >= BUFSIZ-1) {
-        fprintf(stderr, "lua: argument line too long\n");
+      else if (i >= MAXINPUT-1) {
+        fprintf(stderr, "lua: input line too long\n");
         break;
       }
       else buffer[i++] = (char)c;
     }
     buffer[i] = '\0';
     ldo(lua_dostring, buffer);
-    lua_endblock();
+    lua_settop(L, 0);  /* remove eventual results */
   }
   printf("\n");
 }
 
 
-int main (int argc, char *argv[])
-{
-  int i;
-  lua_open();
-  lua_pushstring("> "); lua_setglobal("_PROMPT");
-  setlocale(LC_ALL, "");
-  lua_userinit();
-  if (argc < 2) {  /* no arguments? */
+static int handle_argv (char *argv[], struct Options *opt) {
+  if (opt->stacksize > 0) argv++;  /* skip option `-s' (if present) */
+  if (*argv == NULL) {  /* no more arguments? */
     if (isatty(0)) {
-      printf("%s  %s\n", LUA_VERSION, LUA_COPYRIGHT);
-      manual_input(1);
+      manual_input(1, 1);
     }
     else
       ldo(lua_dofile, NULL);  /* executes stdin as a file */
   }
-  else for (i=1; i<argc; i++) {
-    if (argv[i][0] == '-') {  /* option? */
-      switch (argv[i][1]) {
-        case 0:
-          ldo(lua_dofile, NULL);  /* executes stdin as a file */
-          break;
-        case 'i':
-          manual_input(1);
-          break;
-        case 'q':
-          manual_input(0);
-          break;
-        case 'd':
-          lua_setdebug(1);
-          break;
-        case 'v':
-          printf("%s  %s\n(written by %s)\n\n",
-                 LUA_VERSION, LUA_COPYRIGHT, LUA_AUTHORS);
-          break;
-        case 'e':
-          i++;
-          if (ldo(lua_dostring, argv[i]) != 0) {
-            fprintf(stderr, "lua: error running argument `%s'\n", argv[i]);
-            return 1;
-          }
-          break;
-        default:
-          print_message();
-          exit(1);
-      }
-    }
-    else if (strchr(argv[i], '='))
-      assign(argv[i]);
-    else {
-      int result = ldo(lua_dofile, argv[i]);
-      if (result) {
-        if (result == 2) {
-          fprintf(stderr, "lua: cannot execute file ");
-          perror(argv[i]);
+  else {  /* other arguments; loop over them */
+    int i;
+    for (i = 0; argv[i] != NULL; i++) {
+      if (argv[i][0] != '-') {  /* not an option? */
+        if (strchr(argv[i], '='))
+          assign(argv[i]);
+        else
+          if (file_input(argv[i]) != EXIT_SUCCESS)
+            return EXIT_FAILURE;  /* stop if file fails */
+        }
+        else switch (argv[i][1]) {  /* option */
+          case 0: {
+            ldo(lua_dofile, NULL);  /* executes stdin as a file */
+            break;
+          }
+          case 'i': {
+            manual_input(0, 1);
+            break;
+          }
+          case 'q': {
+            manual_input(0, 0);
+            break;
+          }
+          case 'c': {
+            opt->toclose = 1;
+            break;
+          }
+          case 'v': {
+            print_version();
+            break;
+          }
+          case 'e': {
+            i++;
+            if (argv[i] == NULL) {
+              print_message();
+              return EXIT_FAILURE;
+            }
+            if (ldo(lua_dostring, argv[i]) != 0) {
+              fprintf(stderr, "lua: error running argument `%s'\n", argv[i]);
+              return EXIT_FAILURE;
+            }
+            break;
+          }
+          case 'f': {
+            i++;
+            if (argv[i] == NULL) {
+              print_message();
+              return EXIT_FAILURE;
+            }
+            getargs(argv+i);  /* collect remaining arguments */
+            lua_setglobal(L, "arg");
+            return file_input(argv[i]);  /* stop scanning arguments */
+          }
+          case 's': {
+            fprintf(stderr, "lua: stack size (`-s') must be the first option\n");
+            return EXIT_FAILURE;
+          }
+          default: {
+            print_message();
+            return EXIT_FAILURE;
+          }
         }
-        exit(1);
-      }
     }
   }
-#ifdef DEBUG
-  lua_close();
-#endif
-  return 0;
+  return EXIT_SUCCESS;
+}
+
+
+static void getstacksize (int argc, char *argv[], struct Options *opt) {
+  if (argc >= 2 && argv[1][0] == '-' && argv[1][1] == 's') {
+    int stacksize = atoi(&argv[1][2]);
+    if (stacksize <= 0) {
+      fprintf(stderr, "lua: invalid stack size ('%s')\n", &argv[1][2]);
+      exit(EXIT_FAILURE);
+    }
+    opt->stacksize = stacksize;
+  }
+  else
+    opt->stacksize = 0;  /* no stack size */
+}
+
+
+static void register_getargs (char *argv[]) {
+  lua_pushuserdata(L, argv);
+  lua_pushcclosure(L, l_getargs, 1);
+  lua_setglobal(L, "getargs");
+}
+
+
+int main (int argc, char *argv[]) {
+  struct Options opt;
+  int status;
+  opt.toclose = 0;
+  getstacksize(argc, argv, &opt);  /* handle option `-s' */
+  L = lua_open(opt.stacksize);  /* create state */
+  USERINIT();  /* open libraries */
+  register_getargs(argv);  /* create `getargs' function */
+  status = handle_argv(argv+1, &opt);
+  if (opt.toclose)
+    lua_close(L);
+  return status;
 }
 

lua.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.30 1999/02/25 19:13:56 roberto Exp roberto $
+** $Id: lua.h,v 1.69 2000/09/14 14:09:31 roberto Exp roberto $
 ** Lua - An Extensible Extension Language
 ** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil
 ** e-mail: lua@tecgraf.puc-rio.br
@@ -11,154 +11,175 @@
 #ifndef lua_h
 #define lua_h
 
-#define LUA_VERSION	"Lua 3.2 (beta)"
-#define LUA_COPYRIGHT	"Copyright (C) 1994-1999 TeCGraf, PUC-Rio"
+
+/* definition of `size_t' */
+#include <stddef.h>
+
+
+#define LUA_VERSION	"Lua 4.0 (beta)"
+#define LUA_COPYRIGHT	"Copyright (C) 1994-2000 TeCGraf, PUC-Rio"
 #define LUA_AUTHORS 	"W. Celes, R. Ierusalimschy & L. H. de Figueiredo"
 
 
-#define LUA_NOOBJECT  0
+#define LUA_ERRORMESSAGE	"_ERRORMESSAGE"
+
+
+#define LUA_NOREF	(-2)
+#define LUA_REFNIL	(-1)
+
+#define LUA_ANYTAG	(-1)
+#define LUA_NOTAG	(-2)
+
+#define LUA_MULTRET	(-1)
+
+
+#define LUA_MINSTACK	20
+
+
+/* error codes for lua_do* */
+#define LUA_ERRRUN	1
+#define LUA_ERRFILE	2
+#define LUA_ERRSYNTAX	3
+#define LUA_ERRMEM	4
 
-#define LUA_ANYTAG    (-1)
 
 typedef struct lua_State lua_State;
-extern lua_State *lua_state;
 
-typedef void (*lua_CFunction) (void);
-typedef unsigned int lua_Object;
-
-void	       lua_open			(void);
-void           lua_close		(void);
-lua_State      *lua_setstate		(lua_State *st);
-
-lua_Object     lua_settagmethod	(int tag, char *event); /* In: new method */
-lua_Object     lua_gettagmethod	(int tag, char *event);
-
-int            lua_newtag		(void);
-int            lua_copytagmethods	(int tagto, int tagfrom);
-void           lua_settag		(int tag); /* In: object */
-
-void           lua_error		(char *s);
-int            lua_dofile 		(char *filename); /* Out: returns */
-int            lua_dostring 		(char *string); /* Out: returns */
-int            lua_dobuffer		(char *buff, int size, char *name);
-					  /* Out: returns */
-int            lua_callfunction		(lua_Object f);
-					  /* In: parameters; Out: returns */
-
-void	       lua_beginblock		(void);
-void	       lua_endblock		(void);
-
-lua_Object     lua_lua2C 		(int number);
-#define	       lua_getparam(_)		lua_lua2C(_)
-#define	       lua_getresult(_)		lua_lua2C(_)
-
-int            lua_isnil                (lua_Object object);
-int            lua_istable              (lua_Object object);
-int            lua_isuserdata           (lua_Object object);
-int            lua_iscfunction          (lua_Object object);
-int            lua_isnumber             (lua_Object object);
-int            lua_isstring             (lua_Object object);
-int            lua_isfunction           (lua_Object object);
-
-double         lua_getnumber 		(lua_Object object);
-char          *lua_getstring 		(lua_Object object);
-long           lua_strlen 		(lua_Object object);
-lua_CFunction  lua_getcfunction 	(lua_Object object);
-void	      *lua_getuserdata		(lua_Object object);
+typedef int (*lua_CFunction) (lua_State *L);
 
 
-void 	       lua_pushnil 		(void);
-void           lua_pushnumber 		(double n);
-void           lua_pushlstring		(char *s, long len);
-void           lua_pushstring 		(char *s);
-void           lua_pushcclosure		(lua_CFunction fn, int n);
-void           lua_pushusertag          (void *u, int tag);
-void           lua_pushobject       	(lua_Object object);
-
-lua_Object     lua_pop			(void);
-
-lua_Object     lua_getglobal 		(char *name);
-lua_Object     lua_rawgetglobal		(char *name);
-void           lua_setglobal		(char *name); /* In: value */
-void           lua_rawsetglobal		(char *name); /* In: value */
-
-void           lua_settable	(void); /* In: table, index, value */
-void           lua_rawsettable	(void); /* In: table, index, value */
-lua_Object     lua_gettable 		(void); /* In: table, index */
-lua_Object     lua_rawgettable		(void); /* In: table, index */
-
-int            lua_tag			(lua_Object object);
-
-char          *lua_nextvar		(char *varname);  /* Out: value */
-int            lua_next			(lua_Object o, int i);
-						/* Out: ref, value */ 
-
-int            lua_ref			(int lock); /* In: value */
-lua_Object     lua_getref		(int ref);
-void	       lua_unref		(int ref);
-
-lua_Object     lua_createtable		(void);
-
-long	       lua_collectgarbage	(long limit);
+/*
+** state manipulation
+*/
+lua_State     *lua_open (int stacksize);
+void           lua_close (lua_State *L);
 
 
-/* =============================================================== */
-/* some useful macros/functions */
+/*
+** basic stack manipulation
+*/
+int            lua_gettop (lua_State *L);
+void           lua_settop (lua_State *L, int index);
+void           lua_pushvalue (lua_State *L, int index);
+void           lua_remove (lua_State *L, int index);
+void           lua_insert (lua_State *L, int index);
+int            lua_stackspace (lua_State *L);
 
-#define lua_call(name)		lua_callfunction(lua_getglobal(name))
 
-#define lua_pushref(ref)	lua_pushobject(lua_getref(ref))
-
-#define lua_refobject(o,l)	(lua_pushobject(o), lua_ref(l))
-
-#define lua_register(n,f)	(lua_pushcfunction(f), lua_setglobal(n))
-
-#define lua_pushuserdata(u)     lua_pushusertag(u, 0)
-
-#define lua_pushcfunction(f)	lua_pushcclosure(f, 0)
-
-#define lua_clonetag(t)		lua_copytagmethods(lua_newtag(), (t))
-
-lua_Object     lua_seterrormethod (void);  /* In: new method */
-
-/* ==========================================================================
-** for compatibility with old versions. Avoid using these macros/functions
-** If your program does need any of these, define LUA_COMPAT2_5
+/*
+** access functions (stack -> C)
 */
 
+const char    *lua_type (lua_State *L, int index);
+int            lua_isnumber (lua_State *L, int index);
+int            lua_iscfunction (lua_State *L, int index);
+int            lua_tag (lua_State *L, int index);
 
-#ifdef LUA_COMPAT2_5
+int            lua_equal (lua_State *L, int index1, int index2);
+int            lua_lessthan (lua_State *L, int index1, int index2);
+
+double         lua_tonumber (lua_State *L, int index);
+const char    *lua_tostring (lua_State *L, int index);
+size_t         lua_strlen (lua_State *L, int index);
+lua_CFunction  lua_tocfunction (lua_State *L, int index);
+void	      *lua_touserdata (lua_State *L, int index);
+const void    *lua_topointer (lua_State *L, int index);
 
 
-lua_Object     lua_setfallback		(char *event, lua_CFunction fallback);
+/*
+** push functions (C -> stack)
+*/
+void           lua_pushnil (lua_State *L);
+void           lua_pushnumber (lua_State *L, double n);
+void           lua_pushlstring (lua_State *L, const char *s, size_t len);
+void           lua_pushstring (lua_State *L, const char *s);
+void           lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);
+void           lua_pushusertag (lua_State *L, void *u, int tag);
 
-#define lua_storeglobal		lua_setglobal
-#define lua_type		lua_tag
 
-#define lua_lockobject(o)  lua_refobject(o,1)
-#define	lua_lock() lua_ref(1)
-#define lua_getlocked lua_getref
-#define	lua_pushlocked lua_pushref
-#define	lua_unlock lua_unref
+/*
+** get functions (Lua -> stack)
+*/
+void           lua_getglobal (lua_State *L, const char *name);
+void           lua_gettable (lua_State *L, int index);
+void           lua_rawget (lua_State *L, int index);
+void           lua_rawgeti (lua_State *L, int index, int n);
+void           lua_getglobals (lua_State *L);
+void           lua_gettagmethod (lua_State *L, int tag, const char *event);
 
-#define lua_pushliteral(o)  lua_pushstring(o)
+int            lua_getref (lua_State *L, int ref);
 
-#define lua_getindexed(o,n) (lua_pushobject(o), lua_pushnumber(n), lua_gettable())
-#define lua_getfield(o,f)   (lua_pushobject(o), lua_pushstring(f), lua_gettable())
+void           lua_newtable (lua_State *L);
 
-#define lua_copystring(o) (strdup(lua_getstring(o)))
 
-#define lua_getsubscript  lua_gettable
-#define lua_storesubscript  lua_settable
+/*
+** set functions (stack -> Lua)
+*/
+void           lua_setglobal (lua_State *L, const char *name);
+void           lua_settable (lua_State *L, int index);
+void           lua_rawset (lua_State *L, int index);
+void           lua_rawseti (lua_State *L, int index, int n);
+void           lua_setglobals (lua_State *L);
+void           lua_settagmethod (lua_State *L, int tag, const char *event);
+int            lua_ref (lua_State *L, int lock);
 
-#endif
+
+/*
+** "do" functions (run Lua code)
+*/
+int            lua_call (lua_State *L, int nargs, int nresults);
+void           lua_rawcall (lua_State *L, int nargs, int nresults);
+int            lua_dofile (lua_State *L, const char *filename);
+int            lua_dostring (lua_State *L, const char *str);
+int            lua_dobuffer (lua_State *L, const char *buff, size_t size,
+                             const char *name);
+
+
+/*
+** miscellaneous functions
+*/
+int            lua_newtag (lua_State *L);
+int            lua_copytagmethods (lua_State *L, int tagto, int tagfrom);
+void           lua_settag (lua_State *L, int tag);
+
+void           lua_error (lua_State *L, const char *s);
+
+void	       lua_unref (lua_State *L, int ref);
+
+long	       lua_collectgarbage (lua_State *L, long limit);
+
+int            lua_next (lua_State *L, int index);
+int            lua_getn (lua_State *L, int index);
+
+void           lua_concat (lua_State *L, int n);
+
+
+/* 
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
+
+#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_pushuserdata(L,u)	lua_pushusertag(L, u, 0)
+#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_type(L,n) == 'f')
+#define lua_isstring(L,n)	(lua_tostring(L,n) != 0)
+#define lua_istable(L,n)	(*lua_type(L,n) == 't')
+#define lua_isuserdata(L,n)	(*lua_type(L,n) == 'u')
+#define lua_isnil(L,n)		(lua_type(L,n)[2] == 'l')
+#define lua_isnull(L,n)		(*lua_type(L,n) == 'N')
 
 #endif
 
 
 
 /******************************************************************************
-* Copyright (c) 1994-1999 TeCGraf, PUC-Rio.  All rights reserved.
+* Copyright (C) 1994-2000 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

luadebug.h

@@ -1,5 +1,5 @@
 /*
-** $Id: luadebug.h,v 1.5 1999/02/04 17:47:59 roberto Exp roberto $
+** $Id: luadebug.h,v 1.14 2000/09/11 20:29:27 roberto Exp roberto $
 ** Debugging API
 ** See Copyright Notice in lua.h
 */
@@ -11,24 +11,36 @@
 
 #include "lua.h"
 
-typedef lua_Object lua_Function;
+typedef struct lua_Debug lua_Debug;  /* activation record */
+typedef struct lua_Localvar lua_Localvar;
 
-typedef void (*lua_LHFunction) (int line);
-typedef void (*lua_CHFunction) (lua_Function func, char *file, int line);
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
 
-lua_Function lua_stackedfunction (int level);
-void lua_funcinfo (lua_Object func, char **source, int *linedefined);
-int lua_currentline (lua_Function func);
-char *lua_getobjname (lua_Object o, char **name);
 
-lua_Object lua_getlocal (lua_Function func, int local_number, char **name);
-int lua_setlocal (lua_Function func, int local_number);
+int lua_getstack (lua_State *L, int level, lua_Debug *ar);
+int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar);
+const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int localnum);
+const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int localnum);
 
-int lua_nups (lua_Function func);
+lua_Hook lua_setcallhook (lua_State *L, lua_Hook func);
+lua_Hook lua_setlinehook (lua_State *L, lua_Hook func);
 
-lua_LHFunction lua_setlinehook (lua_LHFunction func);
-lua_CHFunction lua_setcallhook (lua_CHFunction func);
-int lua_setdebug (int debug);
+
+#define LUA_IDSIZE	60
+
+struct lua_Debug {
+  const char *event;     /* `call', `return' */
+  int currentline;       /* (l) */
+  const char *name;      /* (n) */
+  const char *namewhat;  /* (n) `global', `tag method', `local', `field' */
+  int nups;              /* (u) number of upvalues */
+  int linedefined;       /* (S) */
+  const char *what;      /* (S) `Lua' function, `C' function, Lua `main' */
+  const char *source;    /* (S) */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  struct lua_TObject *_func;  /* active function */
+};
 
 
 #endif

lualib.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lualib.h,v 1.4 1998/06/19 16:14:09 roberto Exp roberto $
+** $Id: lualib.h,v 1.11 2000/09/05 19:33:32 roberto Exp roberto $
 ** Lua standard libraries
 ** See Copyright Notice in lua.h
 */
@@ -10,26 +10,20 @@
 
 #include "lua.h"
 
-void lua_iolibopen   (void);
-void lua_strlibopen  (void);
-void lua_mathlibopen (void);
-void lua_dblibopen   (void);
 
+#define LUA_ALERT               "_ALERT"
 
-void lua_userinit (void);
-
-
-/* To keep compatibility with old versions */
-
-#define iolib_open	lua_iolibopen
-#define strlib_open	lua_strlibopen
-#define mathlib_open	lua_mathlibopen
+void lua_baselibopen (lua_State *L);
+void lua_iolibopen (lua_State *L);
+void lua_strlibopen (lua_State *L);
+void lua_mathlibopen (lua_State *L);
+void lua_dblibopen (lua_State *L);
 
 
 
 /* Auxiliary functions (private) */
 
-int luaI_singlematch (int c, char *p, char **ep);
+const char *luaI_classend (lua_State *L, const char *p);
+int luaI_singlematch (int c, const char *p, const char *ep);
 
 #endif
-

lundump.c

@@ -1,234 +1,244 @@
 /*
-** $Id: lundump.c,v 1.18 1999/04/09 03:10:40 lhf Exp lhf $
+** $Id: lundump.c,v 1.32 2000/09/21 03:15:36 lhf Exp $
 ** load bytecodes from files
 ** See Copyright Notice in lua.h
 */
 
 #include <stdio.h>
 #include <string.h>
-#include "lauxlib.h"
+
 #include "lfunc.h"
 #include "lmem.h"
 #include "lopcodes.h"
 #include "lstring.h"
 #include "lundump.h"
 
-#define	LoadBlock(b,size,Z)	ezread(Z,b,size)
+#define	LoadByte		ezgetc
 
-#if LUAC_NATIVE
-	#define doLoadNumber(x,Z)	LoadBlock(&x,sizeof(x),Z)
-#else
-	#define doLoadNumber(x,Z)	x=LoadNumber(Z)
-#endif
-
-static void unexpectedEOZ (ZIO* Z)
+static const char* ZNAME (ZIO* Z)
 {
- luaL_verror("unexpected end of file in %s",zname(Z));
+ const char* s=zname(Z);
+ return (*s=='@') ? s+1 : s;
 }
 
-static int ezgetc (ZIO* Z)
+static void unexpectedEOZ (lua_State* L, ZIO* Z)
+{
+ luaO_verror(L,"unexpected end of file in `%.255s'",ZNAME(Z));
+}
+
+static int ezgetc (lua_State* L, ZIO* Z)
 {
  int c=zgetc(Z);
- if (c==EOZ) unexpectedEOZ(Z);
+ if (c==EOZ) unexpectedEOZ(L,Z);
  return c;
 }
 
-static void ezread (ZIO* Z, void* b, int n)
+static void ezread (lua_State* L, ZIO* Z, void* b, int n)
 {
  int r=zread(Z,b,n);
- if (r!=0) unexpectedEOZ(Z);
+ if (r!=0) unexpectedEOZ(L,Z);
 }
 
-static unsigned int LoadWord (ZIO* Z)
+static void LoadBlock (lua_State* L, void* b, size_t size, ZIO* Z, int swap)
 {
- unsigned int hi=ezgetc(Z);
- unsigned int lo=ezgetc(Z);
- return (hi<<8)|lo;
-}
-
-static unsigned long LoadLong (ZIO* Z)
-{
- unsigned long hi=LoadWord(Z);
- unsigned long lo=LoadWord(Z);
- return (hi<<16)|lo;
-}
-
-static real LoadNumber (ZIO* Z)
-{
- char b[256];
- int size=ezgetc(Z);
- LoadBlock(b,size,Z);
- b[size]=0;
- if (b[0]=='-')
-  return -luaO_str2d(b+1);
+ if (swap)
+ {
+  char *p=(char *) b+size-1;
+  int n=size;
+  while (n--) *p--=(char)ezgetc(L,Z);
+ }
  else
-  return luaO_str2d(b);
+  ezread(L,Z,b,size);
 }
 
-static int LoadInt (ZIO* Z, char* message)
+static void LoadVector (lua_State* L, void* b, int m, size_t size, ZIO* Z, int swap)
 {
- unsigned long l=LoadLong(Z);
- unsigned int i=l;
- if (i!=l) luaL_verror(message,l,zname(Z));
- return i;
+ if (swap)
+ {
+  char *q=(char *) b;
+  while (m--)
+  {
+   char *p=q+size-1;
+   int n=size;
+   while (n--) *p--=(char)ezgetc(L,Z);
+   q+=size;
+  }
+ }
+ else
+  ezread(L,Z,b,m*size);
 }
 
-#define PAD	5			/* two word operands plus opcode */
-
-static Byte* LoadCode (ZIO* Z)
+static int LoadInt (lua_State* L, ZIO* Z, int swap)
 {
- int size=LoadInt(Z,"code too long (%ld bytes) in %s");
- Byte* b=luaM_malloc(size+PAD);
- LoadBlock(b,size,Z);
- if (b[size-1]!=ENDCODE) luaL_verror("bad code in %s",zname(Z));
- memset(b+size,ENDCODE,PAD);		/* pad code for safety */
- return b;
+ int x;
+ LoadBlock(L,&x,sizeof(x),Z,swap);
+ return x;
 }
 
-static TaggedString* LoadTString (ZIO* Z)
+static size_t LoadSize (lua_State* L, ZIO* Z, int swap)
 {
- long size=LoadLong(Z);
+ size_t x;
+ LoadBlock(L,&x,sizeof(x),Z,swap);
+ return x;
+}
+
+static Number LoadNumber (lua_State* L, ZIO* Z, int swap)
+{
+ Number x;
+ LoadBlock(L,&x,sizeof(x),Z,swap);
+ return x;
+}
+
+static TString* LoadString (lua_State* L, ZIO* Z, int swap)
+{
+ size_t size=LoadSize(L,Z,swap);
  if (size==0)
   return NULL;
  else
  {
-  char* s=luaL_openspace(size);
-  LoadBlock(s,size,Z);
-  return luaS_newlstr(s,size-1);
+  char* s=luaO_openspace(L,size);
+  LoadBlock(L,s,size,Z,0);
+  return luaS_newlstr(L,s,size-1);	/* remove trailing '\0' */
  }
 }
 
-static void LoadLocals (TProtoFunc* tf, ZIO* Z)
+static void LoadCode (lua_State* L, Proto* tf, ZIO* Z, int swap)
 {
- int i,n=LoadInt(Z,"too many locals (%ld) in %s");
- if (n==0) return;
- tf->locvars=luaM_newvector(n+1,LocVar);
+ int size=LoadInt(L,Z,swap);
+ tf->code=luaM_newvector(L,size,Instruction);
+ LoadVector(L,tf->code,size,sizeof(*tf->code),Z,swap);
+ if (tf->code[size-1]!=OP_END) luaO_verror(L,"bad code in `%.255s'",ZNAME(Z));
+}
+
+static void LoadLocals (lua_State* L, Proto* tf, ZIO* Z, int swap)
+{
+ int i,n;
+ tf->nlocvars=n=LoadInt(L,Z,swap);
+ tf->locvars=luaM_newvector(L,n,LocVar);
  for (i=0; i<n; i++)
  {
-  tf->locvars[i].line=LoadInt(Z,"too many lines (%ld) in %s");
-  tf->locvars[i].varname=LoadTString(Z);
+  tf->locvars[i].varname=LoadString(L,Z,swap);
+  tf->locvars[i].startpc=LoadInt(L,Z,swap);
+  tf->locvars[i].endpc=LoadInt(L,Z,swap);
  }
- tf->locvars[i].line=-1;		/* flag end of vector */
- tf->locvars[i].varname=NULL;
 }
 
-static TProtoFunc* LoadFunction (ZIO* Z);
-
-static void LoadConstants (TProtoFunc* tf, ZIO* Z)
+static void LoadLines (lua_State* L, Proto* tf, ZIO* Z, int swap)
 {
- int i,n=LoadInt(Z,"too many constants (%ld) in %s");
- tf->nconsts=n;
+ int n=LoadInt(L,Z,swap);
  if (n==0) return;
- tf->consts=luaM_newvector(n,TObject);
- for (i=0; i<n; i++)
- {
-  TObject* o=tf->consts+i;
-  ttype(o)=-ezgetc(Z);			/* ttype(o) is negative - ORDER LUA_T */
-  switch (ttype(o))
-  {
-   case LUA_T_NUMBER:
-	doLoadNumber(nvalue(o),Z);
-	break;
-   case LUA_T_STRING:
-	tsvalue(o)=LoadTString(Z);
-	break;
-   case LUA_T_PROTO:
-	tfvalue(o)=LoadFunction(Z);
-	break;
-   case LUA_T_NIL:
-	break;
-   default:				/* cannot happen */
-	luaU_badconstant("load",i,o,tf);
-	break;
-  }
- }
+ tf->lineinfo=luaM_newvector(L,n,int);
+ LoadVector(L,tf->lineinfo,n,sizeof(*tf->lineinfo),Z,swap);
 }
 
-static TProtoFunc* LoadFunction (ZIO* Z)
+static Proto* LoadFunction (lua_State* L, ZIO* Z, int swap);
+
+static void LoadConstants (lua_State* L, Proto* tf, ZIO* Z, int swap)
 {
- TProtoFunc* tf=luaF_newproto();
- tf->lineDefined=LoadInt(Z,"lineDefined too large (%ld) in %s");
- tf->source=LoadTString(Z);
- if (tf->source==NULL) tf->source=luaS_new(zname(Z));
- tf->code=LoadCode(Z);
- LoadLocals(tf,Z);
- LoadConstants(tf,Z);
+ int i,n;
+ tf->nkstr=n=LoadInt(L,Z,swap);
+ tf->kstr=luaM_newvector(L,n,TString*);
+ for (i=0; i<n; i++)
+  tf->kstr[i]=LoadString(L,Z,swap);
+ tf->nknum=n=LoadInt(L,Z,swap);
+ tf->knum=luaM_newvector(L,n,Number);
+ LoadVector(L,tf->knum,n,sizeof(*tf->knum),Z,swap);
+ tf->nkproto=n=LoadInt(L,Z,swap);
+ tf->kproto=luaM_newvector(L,n,Proto*);
+ for (i=0; i<n; i++)
+  tf->kproto[i]=LoadFunction(L,Z,swap);
+}
+
+static Proto* LoadFunction (lua_State* L, ZIO* Z, int swap)
+{
+ Proto* tf=luaF_newproto(L);
+ tf->source=LoadString(L,Z,swap);
+ tf->lineDefined=LoadInt(L,Z,swap);
+ tf->numparams=LoadInt(L,Z,swap);
+ tf->is_vararg=LoadByte(L,Z);
+ tf->maxstacksize=LoadInt(L,Z,swap);
+ LoadCode(L,tf,Z,swap);
+ LoadLocals(L,tf,Z,swap);
+ LoadLines(L,tf,Z,swap);
+ LoadConstants(L,tf,Z,swap);
  return tf;
 }
 
-static void LoadSignature (ZIO* Z)
+static void LoadSignature (lua_State* L, ZIO* Z)
 {
- char* s=SIGNATURE;
- while (*s!=0 && ezgetc(Z)==*s)
+ const char* s=SIGNATURE;
+ while (*s!=0 && ezgetc(L,Z)==*s)
   ++s;
- if (*s!=0) luaL_verror("bad signature in %s",zname(Z));
+ if (*s!=0) luaO_verror(L,"bad signature in `%.255s'",ZNAME(Z));
 }
 
-static void LoadHeader (ZIO* Z)
+static void TestSize (lua_State* L, int s, const char* what, ZIO* Z)
 {
- int version,sizeofR;
- LoadSignature(Z);
- version=ezgetc(Z);
+ int r=ezgetc(L,Z);
+ if (r!=s)
+  luaO_verror(L,"virtual machine mismatch in `%.255s':\n"
+	"  %s is %d but read %d",ZNAME(Z),what,s,r);
+}
+
+#define TESTSIZE(s)	TestSize(L,s,#s,Z)
+#define V(v)	v/16,v%16
+
+static int LoadHeader (lua_State* L, ZIO* Z)
+{
+ int version,swap;
+ Number f=0,tf=TEST_NUMBER;
+ LoadSignature(L,Z);
+ version=ezgetc(L,Z);
  if (version>VERSION)
-  luaL_verror(
-	"%s too new: version=0x%02x; expected at most 0x%02x",
-	zname(Z),version,VERSION);
+  luaO_verror(L,"`%.255s' too new:\n"
+	"  read version %d.%d; expected at most %d.%d",
+	ZNAME(Z),V(version),V(VERSION));
  if (version<VERSION0)			/* check last major change */
-  luaL_verror(
-	"%s too old: version=0x%02x; expected at least 0x%02x",
-	zname(Z),version,VERSION0);
- sizeofR=ezgetc(Z);			/* test number representation */
-#if LUAC_NATIVE
- if (sizeofR==0)
-  luaL_verror("cannot read numbers in %s: "
-	"support for decimal format not enabled",
-	zname(Z));
- if (sizeofR!=sizeof(real))
-  luaL_verror("unknown number size in %s: read %d; expected %d",
-	zname(Z),sizeofR,sizeof(real));
- else
- {
- real f=-TEST_NUMBER,tf=TEST_NUMBER;
- doLoadNumber(f,Z);
- if (f!=tf)
-  luaL_verror("unknown number representation in %s: "
-	"read " NUMBER_FMT "; expected " NUMBER_FMT,
-	zname(Z),f,tf);
- }
-#else
- if (sizeofR!=0)
-  luaL_verror("cannot read numbers in %s: "
-	"support for native format not enabled",
-	zname(Z));
-#endif
+  luaO_verror(L,"`%.255s' too old:\n"
+	"  read version %d.%d; expected at least %d.%d",
+	ZNAME(Z),V(version),V(VERSION));
+ swap=(luaU_endianess()!=ezgetc(L,Z));	/* need to swap bytes? */
+ TESTSIZE(sizeof(int));
+ TESTSIZE(sizeof(size_t));
+ TESTSIZE(sizeof(Instruction));
+ TESTSIZE(SIZE_INSTRUCTION);
+ TESTSIZE(SIZE_OP);
+ TESTSIZE(SIZE_B);
+ TESTSIZE(sizeof(Number));
+ f=LoadNumber(L,Z,swap);
+ if ((long)f!=(long)tf)		/* disregard errors in last bit of fraction */
+  luaO_verror(L,"unknown number format in `%.255s':\n"
+      "  read " NUMBER_FMT "; expected " NUMBER_FMT,
+      ZNAME(Z),f,tf);
+ return swap;
 }
 
-static TProtoFunc* LoadChunk (ZIO* Z)
+static Proto* LoadChunk (lua_State* L, ZIO* Z)
 {
- LoadHeader(Z);
- return LoadFunction(Z);
+ return LoadFunction(L,Z,LoadHeader(L,Z));
 }
 
 /*
 ** load one chunk from a file or buffer
 ** return main if ok and NULL at EOF
 */
-TProtoFunc* luaU_undump1 (ZIO* Z)
+Proto* luaU_undump (lua_State* L, ZIO* Z)
 {
+ Proto* tf=NULL;
  int c=zgetc(Z);
  if (c==ID_CHUNK)
-  return LoadChunk(Z);
- else if (c!=EOZ)
-  luaL_verror("%s is not a Lua binary file",zname(Z));
- return NULL;
+  tf=LoadChunk(L,Z);
+ c=zgetc(Z);
+ if (c!=EOZ)
+  luaO_verror(L,"`%.255s' apparently contains more than one chunk",ZNAME(Z));
+ return tf;
 }
 
 /*
-* handle constants that cannot happen
+** find byte order
 */
-void luaU_badconstant (char* s, int i, TObject* o, TProtoFunc* tf)
+int luaU_endianess (void)
 {
- int t=ttype(o);
- char* name= (t>0 || t<LUA_T_LINE) ? "?" : luaO_typenames[-t];
- luaL_verror("cannot %s constant #%d: type=%d [%s]" IN,s,i,t,name,INLOC);
+ int x=1;
+ return *(char*)&x;
 }

lundump.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lundump.h,v 1.13 1999/03/29 16:16:18 lhf Exp lhf $
+** $Id: lundump.h,v 1.19 2000/04/24 17:32:29 lhf Exp lhf $
 ** load pre-compiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -10,18 +10,22 @@
 #include "lobject.h"
 #include "lzio.h"
 
-TProtoFunc* luaU_undump1 (ZIO* Z);	/* load one chunk */
-void luaU_badconstant (char* s, int i, TObject* o, TProtoFunc* tf);
-					/* handle cases that cannot happen */
+/* load one chunk */
+Proto* luaU_undump (lua_State* L, ZIO* Z);
+#define luaU_undump1 luaU_undump
+
+/* find byte order */
+int luaU_endianess (void);
 
 /* definitions for headers of binary files */
-#define	VERSION		0x32		/* last format change was in 3.2 */
-#define	VERSION0	0x32		/* last major  change was in 3.2 */
+#define	VERSION		0x40		/* last format change was in 4.0 */
+#define	VERSION0	0x40		/* last major  change was in 4.0 */
 #define ID_CHUNK	27		/* binary files start with ESC... */
 #define	SIGNATURE	"Lua"		/* ...followed by this signature */
 
 /* formats for error messages */
-#define SOURCE		"<%s:%d>"
+#define xSOURCE		"<%d:%.255s>"
+#define SOURCE		"<%.255s:%d>"
 #define IN		" in %p " SOURCE
 #define INLOC		tf,tf->source->str,tf->lineDefined
 
@@ -30,19 +34,8 @@ void luaU_badconstant (char* s, int i, TObject* o, TProtoFunc* tf);
 #define NUMBER_FMT	"%.16g"		/* LUA_NUMBER */
 #endif
 
-/* LUA_NUMBER
-* by default, numbers are stored in precompiled chunks as decimal strings.
-* this is completely portable and fast enough for most applications.
-* if you want to use this default, do nothing.
-* if you want additional speed at the expense of portability, move the line
-* below out of this comment.
-#define LUAC_NATIVE
-*/
-
-#ifdef LUAC_NATIVE
-/* a multiple of PI for testing number representation */
+/* a multiple of PI for testing native format */
 /* multiplying by 1E8 gives non-trivial integer values */
 #define	TEST_NUMBER	3.14159265358979323846E8
-#endif
 
 #endif

lvm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.h,v 1.7 1998/12/30 17:26:49 roberto Exp roberto $
+** $Id: lvm.h,v 1.25 2000/08/31 21:02:55 roberto Exp roberto $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -13,22 +13,20 @@
 #include "ltm.h"
 
 
-#define tonumber(o) ((ttype(o) != LUA_T_NUMBER) && (luaV_tonumber(o) != 0))
-#define tostring(o) ((ttype(o) != LUA_T_STRING) && (luaV_tostring(o) != 0))
+#define tonumber(o)   ((ttype(o) != TAG_NUMBER) && (luaV_tonumber(o) != 0))
+#define tostring(L,o) ((ttype(o) != TAG_STRING) && (luaV_tostring(L, o) != 0))
 
 
-void luaV_pack (StkId firstel, int nvararg, TObject *tab);
 int luaV_tonumber (TObject *obj);
-int luaV_tostring (TObject *obj);
-void luaV_setn (Hash *t, int val);
-void luaV_gettable (void);
-void luaV_settable (TObject *t);
-void luaV_rawsettable (TObject *t);
-void luaV_getglobal (TaggedString *ts);
-void luaV_setglobal (TaggedString *ts);
-StkId luaV_execute (Closure *cl, TProtoFunc *tf, StkId base);
-void luaV_closure (int nelems);
-void luaV_comparison (lua_Type ttype_less, lua_Type ttype_equal,
-                      lua_Type ttype_great, IMS op);
+int luaV_tostring (lua_State *L, TObject *obj);
+const TObject *luaV_gettable (lua_State *L, StkId t);
+void luaV_settable (lua_State *L, StkId t, StkId key);
+const TObject *luaV_getglobal (lua_State *L, TString *s);
+void luaV_setglobal (lua_State *L, TString *s);
+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, StkId top);
+void luaV_strconc (lua_State *L, int total, StkId top);
 
 #endif

lzio.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lzio.c,v 1.6 1999/03/04 14:49:18 roberto Exp roberto $
+** $Id: lzio.c,v 1.12 2000/05/24 13:54:49 roberto Exp roberto $
 ** a generic input stream interface
 ** See Copyright Notice in lua.h
 */
@@ -9,6 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "lua.h"
+
 #include "lzio.h"
 
 
@@ -16,62 +18,60 @@
 /* ----------------------------------------------------- memory buffers --- */
 
 static int zmfilbuf (ZIO* z) {
- return EOZ;
+  (void)z;  /* to avoid warnings */
+  return EOZ;
 }
 
 
-ZIO* zmopen (ZIO* z, char* b, int size, char *name)
-{
- if (b==NULL) return NULL;
- z->n=size;
- z->p= (unsigned char *)b;
- z->filbuf=zmfilbuf;
- z->u=NULL;
- z->name=name;
- return z;
+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, char* s, char *name)
-{
- if (s==NULL) return NULL;
- return zmopen(z,s,strlen(s),name);
+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) {
- int n;
- if (feof((FILE *)z->u)) return EOZ;
- n=fread(z->buffer,1,ZBSIZE,z->u);
- if (n==0) return EOZ;
- z->n=n-1;
- z->p=z->buffer;
- return *(z->p++);
+  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;
+  return *(z->p++);
 }
 
 
-ZIO* zFopen (ZIO* z, FILE* f, char *name)
-{
- if (f==NULL) return NULL;
- z->n=0;
- z->p=z->buffer;
- z->filbuf=zffilbuf;
- z->u=f;
- z->name=name;
- return z;
+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;
+  z->name = name;
+  return z;
 }
 
 
 /* --------------------------------------------------------------- read --- */
-int zread (ZIO *z, void *b, int n) {
+size_t zread (ZIO *z, void *b, size_t n) {
   while (n) {
-    int m;
+    size_t m;
     if (z->n == 0) {
       if (z->filbuf(z) == EOZ)
         return n;  /* return number of missing bytes */
-      zungetc(z);  /* put result from 'filbuf' in the buffer */
+      zungetc(z);  /* put result from `filbuf' in the buffer */
     }
     m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
     memcpy(b, z->p, m);

lzio.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lzio.h,v 1.3 1997/12/22 20:57:18 roberto Exp roberto $
+** $Id: lzio.h,v 1.5 1999/08/16 20:52:00 roberto Exp roberto $
 ** Buffered streams
 ** See Copyright Notice in lua.h
 */
@@ -22,13 +22,13 @@
 
 typedef struct zio ZIO;
 
-ZIO* zFopen (ZIO* z, FILE* f, char *name);		/* open FILEs */
-ZIO* zsopen (ZIO* z, char* s, char *name);		/* string */
-ZIO* zmopen (ZIO* z, char* b, int size, char *name);	/* memory */
+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 */
 
-int zread (ZIO* z, void* b, int n);	/* read next n bytes */
+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 zgetc(z)	(((z)->n--)>0 ? ((int)*(z)->p++): (z)->filbuf(z))
 #define zungetc(z)	(++(z)->n,--(z)->p)
 #define zname(z)	((z)->name)
 
@@ -38,12 +38,12 @@ int zread (ZIO* z, void* b, int n);	/* read next n bytes */
 #define ZBSIZE	256			/* buffer size */
 
 struct zio {
- int n;					/* bytes still unread */
- unsigned char* p;			/* current position in buffer */
- int (*filbuf)(ZIO* z);
- void* u;				/* additional data */
- char *name;
- unsigned char buffer[ZBSIZE];		/* buffer */
+  size_t n;				/* bytes still unread */
+  const unsigned char* p;		/* current position in buffer */
+  int (*filbuf)(ZIO* z);
+  void* u;				/* additional data */
+  const char *name;
+  unsigned char buffer[ZBSIZE];		/* buffer */
 };
 
 

makefile

@@ -1,5 +1,5 @@
 #
-## $Id: makefile,v 1.18 1999/02/23 15:01:29 roberto Exp roberto $
+## $Id: makefile,v 1.27 2000/09/11 20:29:27 roberto Exp roberto $
 ## Makefile
 ## See Copyright Notice in lua.h
 #
@@ -15,20 +15,34 @@
 # facilities (e.g. strerror, locale.h, memmove). SunOS does not comply;
 # so, add "-DOLD_ANSI" on SunOS
 #
-# define LUA_COMPAT2_5 if yous system does need to be compatible with
-# version 2.5 (or older)
-#
 # 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.
 #
+# define LUA_COMPAT_READPATTERN if you need read patterns
+# (only for compatibility with previous versions)
+# define LUA_COMPAT_ARGRET for compatibility in the way function results
+# are passed as arguments 
+# define LUA_DEPRECATETFUNCS to include obsolete functions
 
 CONFIG = -DPOPEN -D_POSIX_SOURCE
-#CONFIG = -DLUA_COMPAT2_5 -DOLD_ANSI -DDEBUG
+#CONFIG = -DOLD_ANSI -DDEBUG -DLUA_COMPAT_READPATTERN -DLUA_COMPAT_ARGRET
+# -DLUA_DEPRECATETFUNCS
 
 
 # Compilation parameters
 CC = gcc
-CWARNS = -Wall -Wmissing-prototypes -Wshadow -pedantic -Wpointer-arith -Wcast-align -Waggregate-return
+CWARNS = -Wall -W -pedantic \
+	-Waggregate-return \
+	-Wcast-align \
+	-Wmissing-prototypes \
+	-Wnested-externs \
+	-Wpointer-arith \
+	-Wshadow \
+	-Wwrite-strings
+#	-Wcast-qual
+#	-Wtraditional
+
 CFLAGS = $(CONFIG) $(CWARNS) -ansi -O2
 
 
@@ -42,31 +56,32 @@ ARFLAGS	= rvl
 
 # Aplication modules
 LUAOBJS = \
-	lapi.o \
-	lauxlib.o \
-	lbuffer.o \
-	lbuiltin.o \
-	ldo.o \
-	lfunc.o \
-	lgc.o \
-	llex.o \
-	lmem.o \
-	lobject.o \
-	lparser.o \
 	lstate.o \
+	lapi.o \
+	lmem.o \
 	lstring.o \
 	ltable.o \
 	ltm.o \
 	lvm.o \
+	ldo.o \
+	lobject.o \
+	lfunc.o \
+	lgc.o \
+	lcode.o \
+	lparser.o \
+	llex.o \
 	lundump.o \
-	lzio.o
+	lzio.o \
+	ldebug.o \
+	ltests.o
 
 LIBOBJS = 	\
+	lauxlib.o \
+	lbaselib.o \
 	liolib.o \
 	lmathlib.o \
 	lstrlib.o \
-	ldblib.o \
-	linit.o
+	ldblib.o
 
 
 lua : lua.o liblua.a liblualib.a
@@ -86,9 +101,7 @@ liblua.so.1.0 : lua.o
 
 clear	:
 	rcsclean
-	rm -f *.o
-	rm -f
-	co $(CO_OPTIONS) lua.h lualib.h luadebug.h
+	rm -f *.o *.a
 
 
 %.h : RCS/%.h,v
@@ -98,43 +111,50 @@ clear	:
 	co $(CO_OPTIONS) $@
 
 
-lapi.o: lapi.c lapi.h lua.h lobject.h lauxlib.h ldo.h lstate.h \
+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 lauxlib.h lua.h luadebug.h
-lbuffer.o: lbuffer.c lauxlib.h lua.h lmem.h lstate.h lobject.h \
+lauxlib.o: lauxlib.c lua.h lauxlib.h luadebug.h
+lbaselib.o: lbaselib.c lua.h lauxlib.h luadebug.h lualib.h
+lcode.o: lcode.c /usr/include/stdlib.h lua.h lcode.h llex.h lobject.h \
+ llimits.h lzio.h lopcodes.h lparser.h ldo.h lstate.h luadebug.h \
+ lmem.h
+ldblib.o: ldblib.c lua.h lauxlib.h luadebug.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
+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 \
+ lundump.h lvm.h
+lfunc.o: lfunc.c lua.h lfunc.h lobject.h llimits.h lmem.h lstate.h \
  luadebug.h
-lbuiltin.o: lbuiltin.c lapi.h lua.h lobject.h lauxlib.h lbuiltin.h \
- ldo.h lstate.h luadebug.h lfunc.h lmem.h lstring.h ltable.h ltm.h \
- lundump.h lzio.h lvm.h
-ldblib.o: ldblib.c lauxlib.h lua.h luadebug.h lualib.h
-ldo.o: ldo.c ldo.h lobject.h lua.h lstate.h luadebug.h lfunc.h lgc.h \
- lmem.h lparser.h lzio.h lstring.h ltm.h lundump.h lvm.h
-lfunc.o: lfunc.c lfunc.h lobject.h lua.h lmem.h lstate.h luadebug.h
-lgc.o: lgc.c ldo.h lobject.h lua.h lstate.h luadebug.h lfunc.h lgc.h \
- lmem.h lstring.h ltable.h ltm.h
-linit.o: linit.c lua.h lualib.h
-liolib.o: liolib.c lauxlib.h lua.h luadebug.h lualib.h
-llex.o: llex.c lauxlib.h lua.h llex.h lobject.h lzio.h lmem.h \
- lparser.h lstate.h luadebug.h lstring.h
-lmathlib.o: lmathlib.c lauxlib.h lua.h lualib.h
-lmem.o: lmem.c lmem.h lstate.h lobject.h lua.h luadebug.h
-lobject.o: lobject.c lobject.h lua.h
-lparser.o: lparser.c lauxlib.h lua.h ldo.h lobject.h lstate.h \
- luadebug.h lfunc.h llex.h lzio.h lmem.h lopcodes.h lparser.h \
- lstring.h
-lstate.o: lstate.c lbuiltin.h ldo.h lobject.h lua.h lstate.h \
- luadebug.h lfunc.h lgc.h llex.h lzio.h lmem.h lstring.h ltable.h \
- ltm.h
-lstring.o: lstring.c lmem.h lobject.h lua.h lstate.h luadebug.h \
- lstring.h
-lstrlib.o: lstrlib.c lauxlib.h lua.h lualib.h
-ltable.o: ltable.c lauxlib.h lua.h lmem.h lobject.h lstate.h \
- luadebug.h ltable.h
-ltm.o: ltm.c lauxlib.h lua.h lmem.h lobject.h lstate.h luadebug.h \
- ltm.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 lmem.h \
+ lparser.h lstate.h luadebug.h lstring.h ltable.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 lmem.h llimits.h lobject.h lstate.h \
+ luadebug.h
+lparser.o: lparser.c lua.h lcode.h llex.h lobject.h llimits.h lzio.h \
+ lopcodes.h lparser.h lfunc.h lmem.h lstate.h luadebug.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 lmem.h llimits.h lobject.h lstate.h \
+ luadebug.h lstring.h ltable.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 ltm.h
 lua.o: lua.c lua.h luadebug.h lualib.h
-lundump.o: lundump.c lauxlib.h lua.h lfunc.h lobject.h lmem.h \
- lstring.h lundump.h lzio.h
-lvm.o: lvm.c lauxlib.h lua.h ldo.h lobject.h lstate.h luadebug.h \
- lfunc.h lgc.h lmem.h lopcodes.h lstring.h ltable.h ltm.h lvm.h
-lzio.o: lzio.c lzio.h
+lundump.o: lundump.c lfunc.h lobject.h llimits.h lua.h lmem.h \
+ lopcodes.h lstring.h lstate.h luadebug.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