corrected year (2014 -> 2015) for release 5.2.4.

their stack space

.gitignore

@@ -1,15 +0,0 @@
-.gitattributes
-
-*.so
-*.o
-*.a
-
-manual/manual.html
-
-testes/time.txt
-testes/time-debug.txt
-
-testes/libs/all
-
-temp
-lua

README.md

@@ -1,7 +0,0 @@
-# Lua
-
-This is the repository of Lua development code, as seen by the Lua team. It contains the full history of all commits but is mirrored irregularly. For complete information about Lua, visit [Lua.org](https://www.lua.org/).
-
-Please **do not** send pull requests. To report issues, post a message to the [Lua mailing list](https://www.lua.org/lua-l.html).
-
-Download official Lua releases from [Lua.org](https://www.lua.org/download.html).

all

@@ -1,9 +0,0 @@
-make -s -j
-cd testes/libs; make -s
-cd ..     # back to directory 'testes'
-ulimit -S -s 1100
-if { ../lua -W all.lua; } then
-  echo -e "\n\n    final OK!!!!\n\n"
-else
-  echo -e "\n\n    >>>> BUG!!!!\n\n"
-fi

lapi.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.h $
+** $Id: lapi.h,v 2.7 2009/11/27 15:37:59 roberto Exp $
 ** Auxiliary functions from Lua API
 ** See Copyright Notice in lua.h
 */
@@ -11,42 +11,14 @@
 #include "llimits.h"
 #include "lstate.h"
 
+#define api_incr_top(L)   {L->top++; api_check(L, L->top <= L->ci->top, \
+				"stack overflow");}
 
-/* Increments 'L->top.p', checking for stack overflows */
-#define api_incr_top(L)	{L->top.p++; \
-			 api_check(L, L->top.p <= L->ci->top.p, \
-					"stack overflow");}
-
-
-/*
-** If a call returns too many multiple returns, the callee may not have
-** stack space to accommodate all results. In this case, this macro
-** increases its stack space ('L->ci->top.p').
-*/
 #define adjustresults(L,nres) \
-    { if ((nres) <= LUA_MULTRET && L->ci->top.p < L->top.p) \
-	L->ci->top.p = L->top.p; }
+    { if ((nres) == LUA_MULTRET && L->ci->top < L->top) L->ci->top = L->top; }
 
+#define api_checknelems(L,n)	api_check(L, (n) < (L->top - L->ci->func), \
+				  "not enough elements in the stack")
 
-/* Ensure the stack has at least 'n' elements */
-#define api_checknelems(L,n) \
-	api_check(L, (n) < (L->top.p - L->ci->func.p), \
-			  "not enough elements in the stack")
-
-
-/*
-** To reduce the overhead of returning from C functions, the presence of
-** to-be-closed variables in these functions is coded in the CallInfo's
-** field 'nresults', in a way that functions with no to-be-closed variables
-** with zero, one, or "all" wanted results have no overhead. Functions
-** with other number of wanted results, as well as functions with
-** variables to be closed, have an extra check.
-*/
-
-#define hastocloseCfunc(n)	((n) < LUA_MULTRET)
-
-/* Map [-1, inf) (range of 'nresults') into (-inf, -2] */
-#define codeNresults(n)		(-(n) - 3)
-#define decodeNresults(n)	(-(n) - 3)
 
 #endif

lauxlib.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.h $
+** $Id: lauxlib.h,v 1.120 2011/11/29 15:55:08 roberto Exp $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -12,60 +12,44 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "luaconf.h"
 #include "lua.h"
 
 
-/* global table */
-#define LUA_GNAME	"_G"
 
-
-typedef struct luaL_Buffer luaL_Buffer;
-
-
-/* extra error code for 'luaL_loadfilex' */
+/* extra error code for `luaL_load' */
 #define LUA_ERRFILE     (LUA_ERRERR+1)
 
 
-/* key, in the registry, for table of loaded modules */
-#define LUA_LOADED_TABLE	"_LOADED"
-
-
-/* key, in the registry, for table of preloaded loaders */
-#define LUA_PRELOAD_TABLE	"_PRELOAD"
-
-
 typedef struct luaL_Reg {
   const char *name;
   lua_CFunction func;
 } luaL_Reg;
 
 
-#define LUAL_NUMSIZES	(sizeof(lua_Integer)*16 + sizeof(lua_Number))
-
-LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
-#define luaL_checkversion(L)  \
-	  luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)
+LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver);
+#define luaL_checkversion(L)	luaL_checkversion_(L, LUA_VERSION_NUM)
 
 LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
 LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
 LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
-LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg);
-LUALIB_API int (luaL_typeerror) (lua_State *L, int arg, const char *tname);
-LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
+LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
+LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg,
                                                           size_t *l);
-LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg,
+LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
                                           const char *def, size_t *l);
-LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg);
-LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
+LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
+LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
 
-LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg);
-LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
+LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
+LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
                                           lua_Integer def);
+LUALIB_API lua_Unsigned (luaL_checkunsigned) (lua_State *L, int numArg);
+LUALIB_API lua_Unsigned (luaL_optunsigned) (lua_State *L, int numArg,
+                                            lua_Unsigned def);
 
 LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
-LUALIB_API void (luaL_checktype) (lua_State *L, int arg, int t);
-LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
+LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
+LUALIB_API void (luaL_checkany) (lua_State *L, int narg);
 
 LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
 LUALIB_API void  (luaL_setmetatable) (lua_State *L, const char *tname);
@@ -75,14 +59,13 @@ LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
 LUALIB_API void (luaL_where) (lua_State *L, int lvl);
 LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
 
-LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def,
+LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
                                    const char *const lst[]);
 
 LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
 LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
 
-
-/* predefined references */
+/* pre-defined references */
 #define LUA_NOREF       (-2)
 #define LUA_REFNIL      (-1)
 
@@ -100,12 +83,10 @@ LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
 
 LUALIB_API lua_State *(luaL_newstate) (void);
 
-LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx);
+LUALIB_API int (luaL_len) (lua_State *L, int idx);
 
-LUALIB_API void (luaL_addgsub) (luaL_Buffer *b, const char *s,
-                                     const char *p, const char *r);
-LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s,
-                                    const char *p, const char *r);
+LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
+                                                  const char *r);
 
 LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
 
@@ -127,17 +108,16 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
 #define luaL_newlibtable(L,l)	\
   lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
 
-#define luaL_newlib(L,l)  \
-  (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
-
-#define luaL_argcheck(L, cond,arg,extramsg)	\
-	((void)(luai_likely(cond) || luaL_argerror(L, (arg), (extramsg))))
-
-#define luaL_argexpected(L,cond,arg,tname)	\
-	((void)(luai_likely(cond) || luaL_typeerror(L, (arg), (tname))))
+#define luaL_newlib(L,l)	(luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
 
+#define luaL_argcheck(L, cond,numarg,extramsg)	\
+		((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
 #define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
 #define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
+#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
+#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
+#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
+#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
 
 #define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
 
@@ -154,54 +134,19 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
 #define luaL_loadbuffer(L,s,sz,n)	luaL_loadbufferx(L,s,sz,n,NULL)
 
 
-/*
-** Perform arithmetic operations on lua_Integer values with wrap-around
-** semantics, as the Lua core does.
-*/
-#define luaL_intop(op,v1,v2)  \
-	((lua_Integer)((lua_Unsigned)(v1) op (lua_Unsigned)(v2)))
-
-
-/* push the value used to represent failure/error */
-#define luaL_pushfail(L)	lua_pushnil(L)
-
-
-/*
-** Internal assertions for in-house debugging
-*/
-#if !defined(lua_assert)
-
-#if defined LUAI_ASSERT
-  #include <assert.h>
-  #define lua_assert(c)		assert(c)
-#else
-  #define lua_assert(c)		((void)0)
-#endif
-
-#endif
-
-
-
 /*
 ** {======================================================
 ** Generic Buffer manipulation
 ** =======================================================
 */
 
-struct luaL_Buffer {
+typedef struct luaL_Buffer {
   char *b;  /* buffer address */
   size_t size;  /* buffer size */
   size_t n;  /* number of characters in buffer */
   lua_State *L;
-  union {
-    LUAI_MAXALIGN;  /* ensure maximum alignment for buffer */
-    char b[LUAL_BUFFERSIZE];  /* initial buffer */
-  } init;
-};
-
-
-#define luaL_bufflen(bf)	((bf)->n)
-#define luaL_buffaddr(bf)	((bf)->b)
+  char initb[LUAL_BUFFERSIZE];  /* initial buffer */
+} luaL_Buffer;
 
 
 #define luaL_addchar(B,c) \
@@ -210,8 +155,6 @@ struct luaL_Buffer {
 
 #define luaL_addsize(B,s)	((B)->n += (s))
 
-#define luaL_buffsub(B,s)	((B)->n -= (s))
-
 LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
 LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
 LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
@@ -249,51 +192,19 @@ typedef struct luaL_Stream {
 
 /* }====================================================== */
 
-/*
-** {==================================================================
-** "Abstraction Layer" for basic report of messages and errors
-** ===================================================================
-*/
-
-/* print a string */
-#if !defined(lua_writestring)
-#define lua_writestring(s,l)   fwrite((s), sizeof(char), (l), stdout)
-#endif
-
-/* print a newline and flush the output */
-#if !defined(lua_writeline)
-#define lua_writeline()        (lua_writestring("\n", 1), fflush(stdout))
-#endif
-
-/* print an error message */
-#if !defined(lua_writestringerror)
-#define lua_writestringerror(s,p) \
-        (fprintf(stderr, (s), (p)), fflush(stderr))
-#endif
-
-/* }================================================================== */
 
 
-/*
-** {============================================================
-** Compatibility with deprecated conversions
-** =============================================================
-*/
-#if defined(LUA_COMPAT_APIINTCASTS)
+/* compatibility with old module system */
+#if defined(LUA_COMPAT_MODULE)
 
-#define luaL_checkunsigned(L,a)	((lua_Unsigned)luaL_checkinteger(L,a))
-#define luaL_optunsigned(L,a,d)	\
-	((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d)))
+LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
+                                   int sizehint);
+LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
+                                const luaL_Reg *l, int nup);
 
-#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
-#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
-
-#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
-#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
+#define luaL_register(L,n,l)	(luaL_openlib(L,(n),(l),0))
 
 #endif
-/* }============================================================ */
-
 
 
 #endif

lbaselib.c

@@ -1,13 +1,9 @@
 /*
-** $Id: lbaselib.c $
+** $Id: lbaselib.c,v 1.276 2013/02/21 13:44:53 roberto Exp $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
 
-#define lbaselib_c
-#define LUA_LIB
-
-#include "lprefix.h"
 
 
 #include <ctype.h>
@@ -15,6 +11,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define lbaselib_c
+#define LUA_LIB
+
 #include "lua.h"
 
 #include "lauxlib.h"
@@ -24,98 +23,74 @@
 static int luaB_print (lua_State *L) {
   int n = lua_gettop(L);  /* number of arguments */
   int i;
-  for (i = 1; i <= n; i++) {  /* for each argument */
+  lua_getglobal(L, "tostring");
+  for (i=1; i<=n; i++) {
+    const char *s;
     size_t l;
-    const char *s = luaL_tolstring(L, i, &l);  /* convert it to string */
-    if (i > 1)  /* not the first element? */
-      lua_writestring("\t", 1);  /* add a tab before it */
-    lua_writestring(s, l);  /* print it */
+    lua_pushvalue(L, -1);  /* function to be called */
+    lua_pushvalue(L, i);   /* value to print */
+    lua_call(L, 1, 1);
+    s = lua_tolstring(L, -1, &l);  /* get result */
+    if (s == NULL)
+      return luaL_error(L,
+         LUA_QL("tostring") " must return a string to " LUA_QL("print"));
+    if (i>1) luai_writestring("\t", 1);
+    luai_writestring(s, l);
     lua_pop(L, 1);  /* pop result */
   }
-  lua_writeline();
-  return 0;
-}
-
-
-/*
-** Creates a warning with all given arguments.
-** Check first for errors; otherwise an error may interrupt
-** the composition of a warning, leaving it unfinished.
-*/
-static int luaB_warn (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  int i;
-  luaL_checkstring(L, 1);  /* at least one argument */
-  for (i = 2; i <= n; i++)
-    luaL_checkstring(L, i);  /* make sure all arguments are strings */
-  for (i = 1; i < n; i++)  /* compose warning */
-    lua_warning(L, lua_tostring(L, i), 1);
-  lua_warning(L, lua_tostring(L, n), 0);  /* close warning */
+  luai_writeline();
   return 0;
 }
 
 
 #define SPACECHARS	" \f\n\r\t\v"
 
-static const char *b_str2int (const char *s, int base, lua_Integer *pn) {
-  lua_Unsigned n = 0;
-  int neg = 0;
-  s += strspn(s, SPACECHARS);  /* skip initial spaces */
-  if (*s == '-') { s++; neg = 1; }  /* handle sign */
-  else if (*s == '+') s++;
-  if (!isalnum((unsigned char)*s))  /* no digit? */
-    return NULL;
-  do {
-    int digit = (isdigit((unsigned char)*s)) ? *s - '0'
-                   : (toupper((unsigned char)*s) - 'A') + 10;
-    if (digit >= base) return NULL;  /* invalid numeral */
-    n = n * base + digit;
-    s++;
-  } while (isalnum((unsigned char)*s));
-  s += strspn(s, SPACECHARS);  /* skip trailing spaces */
-  *pn = (lua_Integer)((neg) ? (0u - n) : n);
-  return s;
-}
-
-
 static int luaB_tonumber (lua_State *L) {
-  if (lua_isnoneornil(L, 2)) {  /* standard conversion? */
-    if (lua_type(L, 1) == LUA_TNUMBER) {  /* already a number? */
-      lua_settop(L, 1);  /* yes; return it */
+  if (lua_isnoneornil(L, 2)) {  /* standard conversion */
+    int isnum;
+    lua_Number n = lua_tonumberx(L, 1, &isnum);
+    if (isnum) {
+      lua_pushnumber(L, n);
       return 1;
-    }
-    else {
-      size_t l;
-      const char *s = lua_tolstring(L, 1, &l);
-      if (s != NULL && lua_stringtonumber(L, s) == l + 1)
-        return 1;  /* successful conversion to number */
-      /* else not a number */
-      luaL_checkany(L, 1);  /* (but there must be some parameter) */
-    }
+    }  /* else not a number; must be something */
+    luaL_checkany(L, 1);
   }
   else {
     size_t l;
-    const char *s;
-    lua_Integer n = 0;  /* to avoid warnings */
-    lua_Integer base = luaL_checkinteger(L, 2);
-    luaL_checktype(L, 1, LUA_TSTRING);  /* no numbers as strings */
-    s = lua_tolstring(L, 1, &l);
+    const char *s = luaL_checklstring(L, 1, &l);
+    const char *e = s + l;  /* end point for 's' */
+    int base = luaL_checkint(L, 2);
+    int neg = 0;
     luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
-    if (b_str2int(s, (int)base, &n) == s + l) {
-      lua_pushinteger(L, n);
-      return 1;
+    s += strspn(s, SPACECHARS);  /* skip initial spaces */
+    if (*s == '-') { s++; neg = 1; }  /* handle signal */
+    else if (*s == '+') s++;
+    if (isalnum((unsigned char)*s)) {
+      lua_Number n = 0;
+      do {
+        int digit = (isdigit((unsigned char)*s)) ? *s - '0'
+                       : toupper((unsigned char)*s) - 'A' + 10;
+        if (digit >= base) break;  /* invalid numeral; force a fail */
+        n = n * (lua_Number)base + (lua_Number)digit;
+        s++;
+      } while (isalnum((unsigned char)*s));
+      s += strspn(s, SPACECHARS);  /* skip trailing spaces */
+      if (s == e) {  /* no invalid trailing characters? */
+        lua_pushnumber(L, (neg) ? -n : n);
+        return 1;
+      }  /* else not a number */
     }  /* else not a number */
-  }  /* else not a number */
-  luaL_pushfail(L);  /* not a number */
+  }
+  lua_pushnil(L);  /* not a number */
   return 1;
 }
 
 
 static int luaB_error (lua_State *L) {
-  int level = (int)luaL_optinteger(L, 2, 1);
+  int level = luaL_optint(L, 2, 1);
   lua_settop(L, 1);
-  if (lua_type(L, 1) == LUA_TSTRING && level > 0) {
-    luaL_where(L, level);   /* add extra information */
+  if (lua_isstring(L, 1) && level > 0) {  /* add extra information? */
+    luaL_where(L, level);
     lua_pushvalue(L, 1);
     lua_concat(L, 2);
   }
@@ -137,8 +112,9 @@ static int luaB_getmetatable (lua_State *L) {
 static int luaB_setmetatable (lua_State *L) {
   int t = lua_type(L, 2);
   luaL_checktype(L, 1, LUA_TTABLE);
-  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
-  if (l_unlikely(luaL_getmetafield(L, 1, "__metatable") != LUA_TNIL))
+  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+                    "nil or table expected");
+  if (luaL_getmetafield(L, 1, "__metatable"))
     return luaL_error(L, "cannot change a protected metatable");
   lua_settop(L, 2);
   lua_setmetatable(L, 1);
@@ -156,8 +132,8 @@ static int luaB_rawequal (lua_State *L) {
 
 static int luaB_rawlen (lua_State *L) {
   int t = lua_type(L, 1);
-  luaL_argexpected(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
-                      "table or string");
+  luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
+                   "table or string expected");
   lua_pushinteger(L, lua_rawlen(L, 1));
   return 1;
 }
@@ -181,89 +157,59 @@ static int luaB_rawset (lua_State *L) {
 }
 
 
-static int pushmode (lua_State *L, int oldmode) {
-  if (oldmode == -1)
-    luaL_pushfail(L);  /* invalid call to 'lua_gc' */
-  else
-    lua_pushstring(L, (oldmode == LUA_GCINC) ? "incremental"
-                                             : "generational");
-  return 1;
-}
-
-
-/*
-** check whether call to 'lua_gc' was valid (not inside a finalizer)
-*/
-#define checkvalres(res) { if (res == -1) break; }
-
 static int luaB_collectgarbage (lua_State *L) {
   static const char *const opts[] = {"stop", "restart", "collect",
     "count", "step", "setpause", "setstepmul",
-    "isrunning", "generational", "incremental", NULL};
+    "setmajorinc", "isrunning", "generational", "incremental", NULL};
   static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
     LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
-    LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
+    LUA_GCSETMAJORINC, LUA_GCISRUNNING, LUA_GCGEN, LUA_GCINC};
   int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
+  int ex = luaL_optint(L, 2, 0);
+  int res = lua_gc(L, o, ex);
   switch (o) {
     case LUA_GCCOUNT: {
-      int k = lua_gc(L, o);
-      int b = lua_gc(L, LUA_GCCOUNTB);
-      checkvalres(k);
-      lua_pushnumber(L, (lua_Number)k + ((lua_Number)b/1024));
-      return 1;
+      int b = lua_gc(L, LUA_GCCOUNTB, 0);
+      lua_pushnumber(L, res + ((lua_Number)b/1024));
+      lua_pushinteger(L, b);
+      return 2;
     }
-    case LUA_GCSTEP: {
-      int step = (int)luaL_optinteger(L, 2, 0);
-      int res = lua_gc(L, o, step);
-      checkvalres(res);
+    case LUA_GCSTEP: case LUA_GCISRUNNING: {
       lua_pushboolean(L, res);
       return 1;
     }
-    case LUA_GCSETPAUSE:
-    case LUA_GCSETSTEPMUL: {
-      int p = (int)luaL_optinteger(L, 2, 0);
-      int previous = lua_gc(L, o, p);
-      checkvalres(previous);
-      lua_pushinteger(L, previous);
-      return 1;
-    }
-    case LUA_GCISRUNNING: {
-      int res = lua_gc(L, o);
-      checkvalres(res);
-      lua_pushboolean(L, res);
-      return 1;
-    }
-    case LUA_GCGEN: {
-      int minormul = (int)luaL_optinteger(L, 2, 0);
-      int majormul = (int)luaL_optinteger(L, 3, 0);
-      return pushmode(L, lua_gc(L, o, minormul, majormul));
-    }
-    case LUA_GCINC: {
-      int pause = (int)luaL_optinteger(L, 2, 0);
-      int stepmul = (int)luaL_optinteger(L, 3, 0);
-      int stepsize = (int)luaL_optinteger(L, 4, 0);
-      return pushmode(L, lua_gc(L, o, pause, stepmul, stepsize));
-    }
     default: {
-      int res = lua_gc(L, o);
-      checkvalres(res);
       lua_pushinteger(L, res);
       return 1;
     }
   }
-  luaL_pushfail(L);  /* invalid call (inside a finalizer) */
-  return 1;
 }
 
 
 static int luaB_type (lua_State *L) {
-  int t = lua_type(L, 1);
-  luaL_argcheck(L, t != LUA_TNONE, 1, "value expected");
-  lua_pushstring(L, lua_typename(L, t));
+  luaL_checkany(L, 1);
+  lua_pushstring(L, luaL_typename(L, 1));
   return 1;
 }
 
 
+static int pairsmeta (lua_State *L, const char *method, int iszero,
+                      lua_CFunction iter) {
+  if (!luaL_getmetafield(L, 1, method)) {  /* no metamethod? */
+    luaL_checktype(L, 1, LUA_TTABLE);  /* argument must be a table */
+    lua_pushcfunction(L, iter);  /* will return generator, */
+    lua_pushvalue(L, 1);  /* state, */
+    if (iszero) lua_pushinteger(L, 0);  /* and initial value */
+    else lua_pushnil(L);
+  }
+  else {
+    lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
+    lua_call(L, 1, 3);  /* get 3 values from metamethod */
+  }
+  return 3;
+}
+
+
 static int luaB_next (lua_State *L) {
   luaL_checktype(L, 1, LUA_TTABLE);
   lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
@@ -276,52 +222,28 @@ static int luaB_next (lua_State *L) {
 }
 
 
-static int pairscont (lua_State *L, int status, lua_KContext k) {
-  (void)L; (void)status; (void)k;  /* unused */
-  return 3;
-}
-
 static int luaB_pairs (lua_State *L) {
-  luaL_checkany(L, 1);
-  if (luaL_getmetafield(L, 1, "__pairs") == LUA_TNIL) {  /* no metamethod? */
-    lua_pushcfunction(L, luaB_next);  /* will return generator, */
-    lua_pushvalue(L, 1);  /* state, */
-    lua_pushnil(L);  /* and initial value */
-  }
-  else {
-    lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
-    lua_callk(L, 1, 3, 0, pairscont);  /* get 3 values from metamethod */
-  }
-  return 3;
+  return pairsmeta(L, "__pairs", 0, luaB_next);
 }
 
 
-/*
-** Traversal function for 'ipairs'
-*/
 static int ipairsaux (lua_State *L) {
-  lua_Integer i = luaL_checkinteger(L, 2);
-  i = luaL_intop(+, i, 1);
+  int i = luaL_checkint(L, 2);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  i++;  /* next value */
   lua_pushinteger(L, i);
-  return (lua_geti(L, 1, i) == LUA_TNIL) ? 1 : 2;
+  lua_rawgeti(L, 1, i);
+  return (lua_isnil(L, -1)) ? 1 : 2;
 }
 
 
-/*
-** 'ipairs' function. Returns 'ipairsaux', given "table", 0.
-** (The given "table" may not be a table.)
-*/
 static int luaB_ipairs (lua_State *L) {
-  luaL_checkany(L, 1);
-  lua_pushcfunction(L, ipairsaux);  /* iteration function */
-  lua_pushvalue(L, 1);  /* state */
-  lua_pushinteger(L, 0);  /* initial value */
-  return 3;
+  return pairsmeta(L, "__ipairs", 1, ipairsaux);
 }
 
 
 static int load_aux (lua_State *L, int status, int envidx) {
-  if (l_likely(status == LUA_OK)) {
+  if (status == LUA_OK) {
     if (envidx != 0) {  /* 'env' parameter? */
       lua_pushvalue(L, envidx);  /* environment for loaded function */
       if (!lua_setupvalue(L, -2, 1))  /* set it as 1st upvalue */
@@ -330,9 +252,9 @@ static int load_aux (lua_State *L, int status, int envidx) {
     return 1;
   }
   else {  /* error (message is on top of the stack) */
-    luaL_pushfail(L);
+    lua_pushnil(L);
     lua_insert(L, -2);  /* put before error message */
-    return 2;  /* return fail plus error message */
+    return 2;  /* return nil plus error message */
   }
 }
 
@@ -362,7 +284,7 @@ static int luaB_loadfile (lua_State *L) {
 
 
 /*
-** Reader for generic 'load' function: 'lua_load' uses the
+** Reader for generic `load' function: `lua_load' uses the
 ** stack for internal stuff, so the reader cannot change the
 ** stack top. Instead, it keeps its resulting string in a
 ** reserved slot inside the stack.
@@ -377,7 +299,7 @@ static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
     *size = 0;
     return NULL;
   }
-  else if (l_unlikely(!lua_isstring(L, -1)))
+  else if (!lua_isstring(L, -1))
     luaL_error(L, "reader function must return a string");
   lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
   return lua_tolstring(L, RESERVEDSLOT, size);
@@ -406,8 +328,7 @@ static int luaB_load (lua_State *L) {
 /* }====================================================== */
 
 
-static int dofilecont (lua_State *L, int d1, lua_KContext d2) {
-  (void)d1;  (void)d2;  /* only to match 'lua_Kfunction' prototype */
+static int dofilecont (lua_State *L) {
   return lua_gettop(L) - 1;
 }
 
@@ -415,23 +336,17 @@ static int dofilecont (lua_State *L, int d1, lua_KContext d2) {
 static int luaB_dofile (lua_State *L) {
   const char *fname = luaL_optstring(L, 1, NULL);
   lua_settop(L, 1);
-  if (l_unlikely(luaL_loadfile(L, fname) != LUA_OK))
+  if (luaL_loadfile(L, fname) != LUA_OK)
     return lua_error(L);
   lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
-  return dofilecont(L, 0, 0);
+  return dofilecont(L);
 }
 
 
 static int luaB_assert (lua_State *L) {
-  if (l_likely(lua_toboolean(L, 1)))  /* condition is true? */
-    return lua_gettop(L);  /* return all arguments */
-  else {  /* error */
-    luaL_checkany(L, 1);  /* there must be a condition */
-    lua_remove(L, 1);  /* remove it */
-    lua_pushliteral(L, "assertion failed!");  /* default message */
-    lua_settop(L, 1);  /* leave only message (default if no other one) */
-    return luaB_error(L);  /* call 'error' */
-  }
+  if (!lua_toboolean(L, 1))
+    return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
+  return lua_gettop(L);
 }
 
 
@@ -442,57 +357,53 @@ static int luaB_select (lua_State *L) {
     return 1;
   }
   else {
-    lua_Integer i = luaL_checkinteger(L, 1);
+    int i = luaL_checkint(L, 1);
     if (i < 0) i = n + i;
     else if (i > n) i = n;
     luaL_argcheck(L, 1 <= i, 1, "index out of range");
-    return n - (int)i;
+    return n - i;
   }
 }
 
 
-/*
-** Continuation function for 'pcall' and 'xpcall'. Both functions
-** already pushed a 'true' before doing the call, so in case of success
-** 'finishpcall' only has to return everything in the stack minus
-** 'extra' values (where 'extra' is exactly the number of items to be
-** ignored).
-*/
-static int finishpcall (lua_State *L, int status, lua_KContext extra) {
-  if (l_unlikely(status != LUA_OK && status != LUA_YIELD)) {  /* error? */
-    lua_pushboolean(L, 0);  /* first result (false) */
-    lua_pushvalue(L, -2);  /* error message */
+static int finishpcall (lua_State *L, int status) {
+  if (!lua_checkstack(L, 1)) {  /* no space for extra boolean? */
+    lua_settop(L, 0);  /* create space for return values */
+    lua_pushboolean(L, 0);
+    lua_pushstring(L, "stack overflow");
     return 2;  /* return false, msg */
   }
-  else
-    return lua_gettop(L) - (int)extra;  /* return all results */
+  lua_pushboolean(L, status);  /* first result (status) */
+  lua_replace(L, 1);  /* put first result in first slot */
+  return lua_gettop(L);
+}
+
+
+static int pcallcont (lua_State *L) {
+  int status = lua_getctx(L, NULL);
+  return finishpcall(L, (status == LUA_YIELD));
 }
 
 
 static int luaB_pcall (lua_State *L) {
   int status;
   luaL_checkany(L, 1);
-  lua_pushboolean(L, 1);  /* first result if no errors */
-  lua_insert(L, 1);  /* put it in place */
-  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, finishpcall);
-  return finishpcall(L, status, 0);
+  lua_pushnil(L);
+  lua_insert(L, 1);  /* create space for status result */
+  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont);
+  return finishpcall(L, (status == LUA_OK));
 }
 
 
-/*
-** Do a protected call with error handling. After 'lua_rotate', the
-** stack will have <f, err, true, f, [args...]>; so, the function passes
-** 2 to 'finishpcall' to skip the 2 first values when returning results.
-*/
 static int luaB_xpcall (lua_State *L) {
   int status;
   int n = lua_gettop(L);
-  luaL_checktype(L, 2, LUA_TFUNCTION);  /* check error function */
-  lua_pushboolean(L, 1);  /* first result */
-  lua_pushvalue(L, 1);  /* function */
-  lua_rotate(L, 3, 2);  /* move them below function's arguments */
-  status = lua_pcallk(L, n - 2, LUA_MULTRET, 2, 2, finishpcall);
-  return finishpcall(L, status, 2);
+  luaL_argcheck(L, n >= 2, 2, "value expected");
+  lua_pushvalue(L, 1);  /* exchange function... */
+  lua_copy(L, 2, 1);  /* ...and error handler */
+  lua_replace(L, 2);
+  status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont);
+  return finishpcall(L, (status == LUA_OK));
 }
 
 
@@ -512,11 +423,13 @@ static const luaL_Reg base_funcs[] = {
   {"ipairs", luaB_ipairs},
   {"loadfile", luaB_loadfile},
   {"load", luaB_load},
+#if defined(LUA_COMPAT_LOADSTRING)
+  {"loadstring", luaB_load},
+#endif
   {"next", luaB_next},
   {"pairs", luaB_pairs},
   {"pcall", luaB_pcall},
   {"print", luaB_print},
-  {"warn", luaB_warn},
   {"rawequal", luaB_rawequal},
   {"rawlen", luaB_rawlen},
   {"rawget", luaB_rawget},
@@ -527,23 +440,19 @@ static const luaL_Reg base_funcs[] = {
   {"tostring", luaB_tostring},
   {"type", luaB_type},
   {"xpcall", luaB_xpcall},
-  /* placeholders */
-  {LUA_GNAME, NULL},
-  {"_VERSION", NULL},
   {NULL, NULL}
 };
 
 
 LUAMOD_API int luaopen_base (lua_State *L) {
-  /* open lib into global table */
-  lua_pushglobaltable(L);
-  luaL_setfuncs(L, base_funcs, 0);
   /* set global _G */
-  lua_pushvalue(L, -1);
-  lua_setfield(L, -2, LUA_GNAME);
-  /* set global _VERSION */
+  lua_pushglobaltable(L);
+  lua_pushglobaltable(L);
+  lua_setfield(L, -2, "_G");
+  /* open lib into global table */
+  luaL_setfuncs(L, base_funcs, 0);
   lua_pushliteral(L, LUA_VERSION);
-  lua_setfield(L, -2, "_VERSION");
+  lua_setfield(L, -2, "_VERSION");  /* set global _VERSION */
   return 1;
 }
 

lbitlib.c

@@ -0,0 +1,212 @@
+/*
+** $Id: lbitlib.c,v 1.18.1.1 2013/04/12 18:48:47 roberto Exp roberto $
+** Standard library for bitwise operations
+** See Copyright Notice in lua.h
+*/
+
+#define lbitlib_c
+#define LUA_LIB
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/* number of bits to consider in a number */
+#if !defined(LUA_NBITS)
+#define LUA_NBITS	32
+#endif
+
+
+#define ALLONES		(~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1))
+
+/* macro to trim extra bits */
+#define trim(x)		((x) & ALLONES)
+
+
+/* builds a number with 'n' ones (1 <= n <= LUA_NBITS) */
+#define mask(n)		(~((ALLONES << 1) << ((n) - 1)))
+
+
+typedef lua_Unsigned b_uint;
+
+
+
+static b_uint andaux (lua_State *L) {
+  int i, n = lua_gettop(L);
+  b_uint r = ~(b_uint)0;
+  for (i = 1; i <= n; i++)
+    r &= luaL_checkunsigned(L, i);
+  return trim(r);
+}
+
+
+static int b_and (lua_State *L) {
+  b_uint r = andaux(L);
+  lua_pushunsigned(L, r);
+  return 1;
+}
+
+
+static int b_test (lua_State *L) {
+  b_uint r = andaux(L);
+  lua_pushboolean(L, r != 0);
+  return 1;
+}
+
+
+static int b_or (lua_State *L) {
+  int i, n = lua_gettop(L);
+  b_uint r = 0;
+  for (i = 1; i <= n; i++)
+    r |= luaL_checkunsigned(L, i);
+  lua_pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_xor (lua_State *L) {
+  int i, n = lua_gettop(L);
+  b_uint r = 0;
+  for (i = 1; i <= n; i++)
+    r ^= luaL_checkunsigned(L, i);
+  lua_pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_not (lua_State *L) {
+  b_uint r = ~luaL_checkunsigned(L, 1);
+  lua_pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_shift (lua_State *L, b_uint r, int i) {
+  if (i < 0) {  /* shift right? */
+    i = -i;
+    r = trim(r);
+    if (i >= LUA_NBITS) r = 0;
+    else r >>= i;
+  }
+  else {  /* shift left */
+    if (i >= LUA_NBITS) r = 0;
+    else r <<= i;
+    r = trim(r);
+  }
+  lua_pushunsigned(L, r);
+  return 1;
+}
+
+
+static int b_lshift (lua_State *L) {
+  return b_shift(L, luaL_checkunsigned(L, 1), luaL_checkint(L, 2));
+}
+
+
+static int b_rshift (lua_State *L) {
+  return b_shift(L, luaL_checkunsigned(L, 1), -luaL_checkint(L, 2));
+}
+
+
+static int b_arshift (lua_State *L) {
+  b_uint r = luaL_checkunsigned(L, 1);
+  int i = luaL_checkint(L, 2);
+  if (i < 0 || !(r & ((b_uint)1 << (LUA_NBITS - 1))))
+    return b_shift(L, r, -i);
+  else {  /* arithmetic shift for 'negative' number */
+    if (i >= LUA_NBITS) r = ALLONES;
+    else
+      r = trim((r >> i) | ~(~(b_uint)0 >> i));  /* add signal bit */
+    lua_pushunsigned(L, r);
+    return 1;
+  }
+}
+
+
+static int b_rot (lua_State *L, int i) {
+  b_uint r = luaL_checkunsigned(L, 1);
+  i &= (LUA_NBITS - 1);  /* i = i % NBITS */
+  r = trim(r);
+  if (i != 0)  /* avoid undefined shift of LUA_NBITS when i == 0 */
+    r = (r << i) | (r >> (LUA_NBITS - i));
+  lua_pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_lrot (lua_State *L) {
+  return b_rot(L, luaL_checkint(L, 2));
+}
+
+
+static int b_rrot (lua_State *L) {
+  return b_rot(L, -luaL_checkint(L, 2));
+}
+
+
+/*
+** get field and width arguments for field-manipulation functions,
+** checking whether they are valid.
+** ('luaL_error' called without 'return' to avoid later warnings about
+** 'width' being used uninitialized.)
+*/
+static int fieldargs (lua_State *L, int farg, int *width) {
+  int f = luaL_checkint(L, farg);
+  int w = luaL_optint(L, farg + 1, 1);
+  luaL_argcheck(L, 0 <= f, farg, "field cannot be negative");
+  luaL_argcheck(L, 0 < w, farg + 1, "width must be positive");
+  if (f + w > LUA_NBITS)
+    luaL_error(L, "trying to access non-existent bits");
+  *width = w;
+  return f;
+}
+
+
+static int b_extract (lua_State *L) {
+  int w;
+  b_uint r = luaL_checkunsigned(L, 1);
+  int f = fieldargs(L, 2, &w);
+  r = (r >> f) & mask(w);
+  lua_pushunsigned(L, r);
+  return 1;
+}
+
+
+static int b_replace (lua_State *L) {
+  int w;
+  b_uint r = luaL_checkunsigned(L, 1);
+  b_uint v = luaL_checkunsigned(L, 2);
+  int f = fieldargs(L, 3, &w);
+  int m = mask(w);
+  v &= m;  /* erase bits outside given width */
+  r = (r & ~(m << f)) | (v << f);
+  lua_pushunsigned(L, r);
+  return 1;
+}
+
+
+static const luaL_Reg bitlib[] = {
+  {"arshift", b_arshift},
+  {"band", b_and},
+  {"bnot", b_not},
+  {"bor", b_or},
+  {"bxor", b_xor},
+  {"btest", b_test},
+  {"extract", b_extract},
+  {"lrotate", b_lrot},
+  {"lshift", b_lshift},
+  {"replace", b_replace},
+  {"rrotate", b_rrot},
+  {"rshift", b_rshift},
+  {NULL, NULL}
+};
+
+
+
+LUAMOD_API int luaopen_bit32 (lua_State *L) {
+  luaL_newlib(L, bitlib);
+  return 1;
+}
+

lcode.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.h $
+** $Id: lcode.h,v 1.58 2011/08/30 16:26:41 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -24,53 +24,35 @@
 ** grep "ORDER OPR" if you change these enums  (ORDER OP)
 */
 typedef enum BinOpr {
-  /* arithmetic operators */
-  OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW,
-  OPR_DIV, OPR_IDIV,
-  /* bitwise operators */
-  OPR_BAND, OPR_BOR, OPR_BXOR,
-  OPR_SHL, OPR_SHR,
-  /* string operator */
+  OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
   OPR_CONCAT,
-  /* comparison operators */
   OPR_EQ, OPR_LT, OPR_LE,
   OPR_NE, OPR_GT, OPR_GE,
-  /* logical operators */
   OPR_AND, OPR_OR,
   OPR_NOBINOPR
 } BinOpr;
 
 
-/* true if operation is foldable (that is, it is arithmetic or bitwise) */
-#define foldbinop(op)	((op) <= OPR_SHR)
+typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
 
 
-#define luaK_codeABC(fs,o,a,b,c)	luaK_codeABCk(fs,o,a,b,c,0)
-
-
-typedef enum UnOpr { OPR_MINUS, OPR_BNOT, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
-
-
-/* get (pointer to) instruction of given 'expdesc' */
-#define getinstruction(fs,e)	((fs)->f->code[(e)->u.info])
+#define getcode(fs,e)	((fs)->f->code[(e)->u.info])
 
+#define luaK_codeAsBx(fs,o,A,sBx)	luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx)
 
 #define luaK_setmultret(fs,e)	luaK_setreturns(fs, e, LUA_MULTRET)
 
 #define luaK_jumpto(fs,t)	luaK_patchlist(fs, luaK_jump(fs), t)
 
-LUAI_FUNC int luaK_code (FuncState *fs, Instruction i);
 LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
-LUAI_FUNC int luaK_codeAsBx (FuncState *fs, OpCode o, int A, int Bx);
-LUAI_FUNC int luaK_codeABCk (FuncState *fs, OpCode o, int A,
-                                            int B, int C, int k);
-LUAI_FUNC int luaK_isKint (expdesc *e);
-LUAI_FUNC int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v);
+LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
+LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k);
 LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
 LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
 LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
 LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
-LUAI_FUNC void luaK_int (FuncState *fs, int reg, lua_Integer n);
+LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s);
+LUAI_FUNC int luaK_numberK (FuncState *fs, lua_Number r);
 LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
 LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
 LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
@@ -88,17 +70,14 @@ LUAI_FUNC int luaK_jump (FuncState *fs);
 LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
 LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
 LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
+LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level);
 LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
 LUAI_FUNC int luaK_getlabel (FuncState *fs);
 LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line);
 LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
 LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1,
                             expdesc *v2, int line);
-LUAI_FUNC void luaK_settablesize (FuncState *fs, int pc,
-                                  int ra, int asize, int hsize);
 LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
-LUAI_FUNC void luaK_finish (FuncState *fs);
-LUAI_FUNC l_noret luaK_semerror (LexState *ls, const char *msg);
 
 
 #endif

lcorolib.c

@@ -1,44 +1,37 @@
 /*
-** $Id: lcorolib.c $
+** $Id: lcorolib.c,v 1.5 2013/02/21 13:44:53 roberto Exp $
 ** Coroutine Library
 ** See Copyright Notice in lua.h
 */
 
-#define lcorolib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
 
 #include <stdlib.h>
 
+
+#define lcorolib_c
+#define LUA_LIB
+
 #include "lua.h"
 
 #include "lauxlib.h"
 #include "lualib.h"
 
 
-static lua_State *getco (lua_State *L) {
-  lua_State *co = lua_tothread(L, 1);
-  luaL_argexpected(L, co, 1, "thread");
-  return co;
-}
-
-
-/*
-** Resumes a coroutine. Returns the number of results for non-error
-** cases or -1 for errors.
-*/
 static int auxresume (lua_State *L, lua_State *co, int narg) {
-  int status, nres;
-  if (l_unlikely(!lua_checkstack(co, narg))) {
+  int status;
+  if (!lua_checkstack(co, narg)) {
     lua_pushliteral(L, "too many arguments to resume");
     return -1;  /* error flag */
   }
+  if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) {
+    lua_pushliteral(L, "cannot resume dead coroutine");
+    return -1;  /* error flag */
+  }
   lua_xmove(L, co, narg);
-  status = lua_resume(co, L, narg, &nres);
-  if (l_likely(status == LUA_OK || status == LUA_YIELD)) {
-    if (l_unlikely(!lua_checkstack(L, nres + 1))) {
+  status = lua_resume(co, L, narg);
+  if (status == LUA_OK || status == LUA_YIELD) {
+    int nres = lua_gettop(co);
+    if (!lua_checkstack(L, nres + 1)) {
       lua_pop(co, nres);  /* remove results anyway */
       lua_pushliteral(L, "too many results to resume");
       return -1;  /* error flag */
@@ -54,10 +47,11 @@ static int auxresume (lua_State *L, lua_State *co, int narg) {
 
 
 static int luaB_coresume (lua_State *L) {
-  lua_State *co = getco(L);
+  lua_State *co = lua_tothread(L, 1);
   int r;
+  luaL_argcheck(L, co, 1, "coroutine expected");
   r = auxresume(L, co, lua_gettop(L) - 1);
-  if (l_unlikely(r < 0)) {
+  if (r < 0) {
     lua_pushboolean(L, 0);
     lua_insert(L, -2);
     return 2;  /* return false + error message */
@@ -65,7 +59,7 @@ static int luaB_coresume (lua_State *L) {
   else {
     lua_pushboolean(L, 1);
     lua_insert(L, -(r + 1));
-    return r + 1;  /* return true + 'resume' returns */
+    return r + 1;  /* return true + `resume' returns */
   }
 }
 
@@ -73,16 +67,9 @@ static int luaB_coresume (lua_State *L) {
 static int luaB_auxwrap (lua_State *L) {
   lua_State *co = lua_tothread(L, lua_upvalueindex(1));
   int r = auxresume(L, co, lua_gettop(L));
-  if (l_unlikely(r < 0)) {  /* error? */
-    int stat = lua_status(co);
-    if (stat != LUA_OK && stat != LUA_YIELD) {  /* error in the coroutine? */
-      stat = lua_closethread(co, L);  /* close its tbc variables */
-      lua_assert(stat != LUA_OK);
-      lua_xmove(co, L, 1);  /* move error message to the caller */
-    }
-    if (stat != LUA_ERRMEM &&  /* not a memory error and ... */
-        lua_type(L, -1) == LUA_TSTRING) {  /* ... error object is a string? */
-      luaL_where(L, 1);  /* add extra info, if available */
+  if (r < 0) {
+    if (lua_isstring(L, -1)) {  /* error object is a string? */
+      luaL_where(L, 1);  /* add extra info */
       lua_insert(L, -2);
       lua_concat(L, 2);
     }
@@ -114,48 +101,30 @@ static int luaB_yield (lua_State *L) {
 }
 
 
-#define COS_RUN		0
-#define COS_DEAD	1
-#define COS_YIELD	2
-#define COS_NORM	3
-
-
-static const char *const statname[] =
-  {"running", "dead", "suspended", "normal"};
-
-
-static int auxstatus (lua_State *L, lua_State *co) {
-  if (L == co) return COS_RUN;
+static int luaB_costatus (lua_State *L) {
+  lua_State *co = lua_tothread(L, 1);
+  luaL_argcheck(L, co, 1, "coroutine expected");
+  if (L == co) lua_pushliteral(L, "running");
   else {
     switch (lua_status(co)) {
       case LUA_YIELD:
-        return COS_YIELD;
+        lua_pushliteral(L, "suspended");
+        break;
       case LUA_OK: {
         lua_Debug ar;
-        if (lua_getstack(co, 0, &ar))  /* does it have frames? */
-          return COS_NORM;  /* it is running */
+        if (lua_getstack(co, 0, &ar) > 0)  /* does it have frames? */
+          lua_pushliteral(L, "normal");  /* it is running */
         else if (lua_gettop(co) == 0)
-            return COS_DEAD;
+            lua_pushliteral(L, "dead");
         else
-          return COS_YIELD;  /* initial state */
+          lua_pushliteral(L, "suspended");  /* initial state */
+        break;
       }
       default:  /* some error occurred */
-        return COS_DEAD;
+        lua_pushliteral(L, "dead");
+        break;
     }
   }
-}
-
-
-static int luaB_costatus (lua_State *L) {
-  lua_State *co = getco(L);
-  lua_pushstring(L, statname[auxstatus(L, co)]);
-  return 1;
-}
-
-
-static int luaB_yieldable (lua_State *L) {
-  lua_State *co = lua_isnone(L, 1) ? L : getco(L);
-  lua_pushboolean(L, lua_isyieldable(co));
   return 1;
 }
 
@@ -167,28 +136,6 @@ static int luaB_corunning (lua_State *L) {
 }
 
 
-static int luaB_close (lua_State *L) {
-  lua_State *co = getco(L);
-  int status = auxstatus(L, co);
-  switch (status) {
-    case COS_DEAD: case COS_YIELD: {
-      status = lua_closethread(co, L);
-      if (status == LUA_OK) {
-        lua_pushboolean(L, 1);
-        return 1;
-      }
-      else {
-        lua_pushboolean(L, 0);
-        lua_xmove(co, L, 1);  /* move error message */
-        return 2;
-      }
-    }
-    default:  /* normal or running coroutine */
-      return luaL_error(L, "cannot close a %s coroutine", statname[status]);
-  }
-}
-
-
 static const luaL_Reg co_funcs[] = {
   {"create", luaB_cocreate},
   {"resume", luaB_coresume},
@@ -196,8 +143,6 @@ static const luaL_Reg co_funcs[] = {
   {"status", luaB_costatus},
   {"wrap", luaB_cowrap},
   {"yield", luaB_yield},
-  {"isyieldable", luaB_yieldable},
-  {"close", luaB_close},
   {NULL, NULL}
 };
 

lctype.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lctype.c $
+** $Id: lctype.c,v 1.11 2011/10/03 16:19:23 roberto Exp $
 ** 'ctype' functions for Lua
 ** See Copyright Notice in lua.h
 */
@@ -7,24 +7,12 @@
 #define lctype_c
 #define LUA_CORE
 
-#include "lprefix.h"
-
-
 #include "lctype.h"
 
 #if !LUA_USE_CTYPE	/* { */
 
 #include <limits.h>
 
-
-#if defined (LUA_UCID)		/* accept UniCode IDentifiers? */
-/* consider all non-ascii codepoints to be alphabetic */
-#define NONA		0x01
-#else
-#define NONA		0x00	/* default */
-#endif
-
-
 LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
   0x00,  /* EOZ */
   0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 0. */
@@ -43,22 +31,22 @@ LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
   0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
   0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 7. */
   0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 8. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 9. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* a. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* b. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  0x00,  0x00,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* c. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* d. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* e. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
-  NONA,  NONA,  NONA,  NONA,  NONA,  0x00,  0x00,  0x00,	/* f. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 8. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 9. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* a. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* b. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* c. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* d. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* e. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* f. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
 };
 
 #endif			/* } */

lctype.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lctype.h $
+** $Id: lctype.h,v 1.12 2011/07/15 12:50:29 roberto Exp $
 ** 'ctype' functions for Lua
 ** See Copyright Notice in lua.h
 */
@@ -13,7 +13,7 @@
 /*
 ** WARNING: the functions defined here do not necessarily correspond
 ** to the similar functions in the standard C ctype.h. They are
-** optimized for the specific needs of Lua.
+** optimized for the specific needs of Lua
 */
 
 #if !defined(LUA_USE_CTYPE)
@@ -61,20 +61,14 @@
 #define lisprint(c)	testprop(c, MASK(PRINTBIT))
 #define lisxdigit(c)	testprop(c, MASK(XDIGITBIT))
 
-
 /*
-** In ASCII, this 'ltolower' is correct for alphabetic characters and
-** for '.'. That is enough for Lua needs. ('check_exp' ensures that
-** the character either is an upper-case letter or is unchanged by
-** the transformation, which holds for lower-case letters and '.'.)
+** this 'ltolower' only works for alphabetic characters
 */
-#define ltolower(c)  \
-  check_exp(('A' <= (c) && (c) <= 'Z') || (c) == ((c) | ('A' ^ 'a')),  \
-            (c) | ('A' ^ 'a'))
+#define ltolower(c)	((c) | ('A' ^ 'a'))
 
 
-/* one entry for each character and for -1 (EOZ) */
-LUAI_DDEC(const lu_byte luai_ctype_[UCHAR_MAX + 2];)
+/* two more entries for 0 and -1 (EOZ) */
+LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2];
 
 
 #else			/* }{ */

ldblib.c

@@ -1,39 +1,28 @@
 /*
-** $Id: ldblib.c $
+** $Id: ldblib.c,v 1.132.1.1 2013/04/12 18:48:47 roberto Exp roberto $
 ** Interface from Lua to its debug API
 ** See Copyright Notice in lua.h
 */
 
-#define ldblib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#define ldblib_c
+#define LUA_LIB
+
 #include "lua.h"
 
 #include "lauxlib.h"
 #include "lualib.h"
 
 
-/*
-** The hook table at registry[HOOKKEY] maps threads to their current
-** hook function.
-*/
-static const char *const HOOKKEY = "_HOOKKEY";
+#define HOOKKEY		"_HKEY"
 
 
-/*
-** If L1 != L, L1 can be in any state, and therefore there are no
-** guarantees about its stack space; any push in L1 must be
-** checked.
-*/
 static void checkstack (lua_State *L, lua_State *L1, int n) {
-  if (l_unlikely(L != L1 && !lua_checkstack(L1, n)))
+  if (L != L1 && !lua_checkstack(L1, n))
     luaL_error(L, "stack overflow");
 }
 
@@ -55,7 +44,8 @@ static int db_getmetatable (lua_State *L) {
 
 static int db_setmetatable (lua_State *L) {
   int t = lua_type(L, 2);
-  luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
+  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+                    "nil or table expected");
   lua_settop(L, 2);
   lua_setmetatable(L, 1);
   return 1;  /* return 1st argument */
@@ -63,34 +53,44 @@ static int db_setmetatable (lua_State *L) {
 
 
 static int db_getuservalue (lua_State *L) {
-  int n = (int)luaL_optinteger(L, 2, 1);
   if (lua_type(L, 1) != LUA_TUSERDATA)
-    luaL_pushfail(L);
-  else if (lua_getiuservalue(L, 1, n) != LUA_TNONE) {
-    lua_pushboolean(L, 1);
-    return 2;
-  }
+    lua_pushnil(L);
+  else
+    lua_getuservalue(L, 1);
   return 1;
 }
 
 
 static int db_setuservalue (lua_State *L) {
-  int n = (int)luaL_optinteger(L, 3, 1);
+  if (lua_type(L, 1) == LUA_TLIGHTUSERDATA)
+    luaL_argerror(L, 1, "full userdata expected, got light userdata");
   luaL_checktype(L, 1, LUA_TUSERDATA);
-  luaL_checkany(L, 2);
+  if (!lua_isnoneornil(L, 2))
+    luaL_checktype(L, 2, LUA_TTABLE);
   lua_settop(L, 2);
-  if (!lua_setiuservalue(L, 1, n))
-    luaL_pushfail(L);
+  lua_setuservalue(L, 1);
   return 1;
 }
 
 
-/*
-** Auxiliary function used by several library functions: check for
-** an optional thread as function's first argument and set 'arg' with
-** 1 if this argument is present (so that functions can skip it to
-** access their other arguments)
-*/
+static void settabss (lua_State *L, const char *i, const char *v) {
+  lua_pushstring(L, v);
+  lua_setfield(L, -2, i);
+}
+
+
+static void settabsi (lua_State *L, const char *i, int v) {
+  lua_pushinteger(L, v);
+  lua_setfield(L, -2, i);
+}
+
+
+static void settabsb (lua_State *L, const char *i, int v) {
+  lua_pushboolean(L, v);
+  lua_setfield(L, -2, i);
+}
+
+
 static lua_State *getthread (lua_State *L, int *arg) {
   if (lua_isthread(L, 1)) {
     *arg = 1;
@@ -98,78 +98,47 @@ static lua_State *getthread (lua_State *L, int *arg) {
   }
   else {
     *arg = 0;
-    return L;  /* function will operate over current thread */
+    return L;
   }
 }
 
 
-/*
-** Variations of 'lua_settable', used by 'db_getinfo' to put results
-** from 'lua_getinfo' into result table. Key is always a string;
-** value can be a string, an int, or a boolean.
-*/
-static void settabss (lua_State *L, const char *k, const char *v) {
-  lua_pushstring(L, v);
-  lua_setfield(L, -2, k);
-}
-
-static void settabsi (lua_State *L, const char *k, int v) {
-  lua_pushinteger(L, v);
-  lua_setfield(L, -2, k);
-}
-
-static void settabsb (lua_State *L, const char *k, int v) {
-  lua_pushboolean(L, v);
-  lua_setfield(L, -2, k);
-}
-
-
-/*
-** In function 'db_getinfo', the call to 'lua_getinfo' may push
-** results on the stack; later it creates the result table to put
-** these objects. Function 'treatstackoption' puts the result from
-** 'lua_getinfo' on top of the result table so that it can call
-** 'lua_setfield'.
-*/
 static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
-  if (L == L1)
-    lua_rotate(L, -2, 1);  /* exchange object and table */
+  if (L == L1) {
+    lua_pushvalue(L, -2);
+    lua_remove(L, -3);
+  }
   else
-    lua_xmove(L1, L, 1);  /* move object to the "main" stack */
-  lua_setfield(L, -2, fname);  /* put object into table */
+    lua_xmove(L1, L, 1);
+  lua_setfield(L, -2, fname);
 }
 
 
-/*
-** Calls 'lua_getinfo' and collects all results in a new table.
-** L1 needs stack space for an optional input (function) plus
-** two optional outputs (function and line table) from function
-** 'lua_getinfo'.
-*/
 static int db_getinfo (lua_State *L) {
   lua_Debug ar;
   int arg;
   lua_State *L1 = getthread(L, &arg);
-  const char *options = luaL_optstring(L, arg+2, "flnSrtu");
+  const char *options = luaL_optstring(L, arg+2, "flnStu");
   checkstack(L, L1, 3);
-  luaL_argcheck(L, options[0] != '>', arg + 2, "invalid option '>'");
-  if (lua_isfunction(L, arg + 1)) {  /* info about a function? */
-    options = lua_pushfstring(L, ">%s", options);  /* add '>' to 'options' */
-    lua_pushvalue(L, arg + 1);  /* move function to 'L1' stack */
-    lua_xmove(L, L1, 1);
-  }
-  else {  /* stack level */
-    if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar)) {
-      luaL_pushfail(L);  /* level out of range */
+  if (lua_isnumber(L, arg+1)) {
+    if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) {
+      lua_pushnil(L);  /* level out of range */
       return 1;
     }
   }
+  else if (lua_isfunction(L, arg+1)) {
+    lua_pushfstring(L, ">%s", options);
+    options = lua_tostring(L, -1);
+    lua_pushvalue(L, arg+1);
+    lua_xmove(L, L1, 1);
+  }
+  else
+    return luaL_argerror(L, arg+1, "function or level expected");
   if (!lua_getinfo(L1, options, &ar))
     return luaL_argerror(L, arg+2, "invalid option");
-  lua_newtable(L);  /* table to collect results */
+  lua_createtable(L, 0, 2);
   if (strchr(options, 'S')) {
-    lua_pushlstring(L, ar.source, ar.srclen);
-    lua_setfield(L, -2, "source");
+    settabss(L, "source", ar.source);
     settabss(L, "short_src", ar.short_src);
     settabsi(L, "linedefined", ar.linedefined);
     settabsi(L, "lastlinedefined", ar.lastlinedefined);
@@ -186,10 +155,6 @@ static int db_getinfo (lua_State *L) {
     settabss(L, "name", ar.name);
     settabss(L, "namewhat", ar.namewhat);
   }
-  if (strchr(options, 'r')) {
-    settabsi(L, "ftransfer", ar.ftransfer);
-    settabsi(L, "ntransfer", ar.ntransfer);
-  }
   if (strchr(options, 't'))
     settabsb(L, "istailcall", ar.istailcall);
   if (strchr(options, 'L'))
@@ -203,28 +168,27 @@ static int db_getinfo (lua_State *L) {
 static int db_getlocal (lua_State *L) {
   int arg;
   lua_State *L1 = getthread(L, &arg);
-  int nvar = (int)luaL_checkinteger(L, arg + 2);  /* local-variable index */
+  lua_Debug ar;
+  const char *name;
+  int nvar = luaL_checkint(L, arg+2);  /* local-variable index */
   if (lua_isfunction(L, arg + 1)) {  /* function argument? */
     lua_pushvalue(L, arg + 1);  /* push function */
     lua_pushstring(L, lua_getlocal(L, NULL, nvar));  /* push local name */
-    return 1;  /* return only name (there is no value) */
+    return 1;
   }
   else {  /* stack-level argument */
-    lua_Debug ar;
-    const char *name;
-    int level = (int)luaL_checkinteger(L, arg + 1);
-    if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
+    if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar))  /* out of range? */
       return luaL_argerror(L, arg+1, "level out of range");
     checkstack(L, L1, 1);
     name = lua_getlocal(L1, &ar, nvar);
     if (name) {
-      lua_xmove(L1, L, 1);  /* move local value */
+      lua_xmove(L1, L, 1);  /* push local value */
       lua_pushstring(L, name);  /* push name */
-      lua_rotate(L, -2, 1);  /* re-order */
+      lua_pushvalue(L, -2);  /* re-order */
       return 2;
     }
     else {
-      luaL_pushfail(L);  /* no name (nor value) */
+      lua_pushnil(L);  /* no name (nor value) */
       return 1;
     }
   }
@@ -233,36 +197,27 @@ static int db_getlocal (lua_State *L) {
 
 static int db_setlocal (lua_State *L) {
   int arg;
-  const char *name;
   lua_State *L1 = getthread(L, &arg);
   lua_Debug ar;
-  int level = (int)luaL_checkinteger(L, arg + 1);
-  int nvar = (int)luaL_checkinteger(L, arg + 2);
-  if (l_unlikely(!lua_getstack(L1, level, &ar)))  /* out of range? */
+  if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar))  /* out of range? */
     return luaL_argerror(L, arg+1, "level out of range");
   luaL_checkany(L, arg+3);
   lua_settop(L, arg+3);
   checkstack(L, L1, 1);
   lua_xmove(L, L1, 1);
-  name = lua_setlocal(L1, &ar, nvar);
-  if (name == NULL)
-    lua_pop(L1, 1);  /* pop value (if not popped by 'lua_setlocal') */
-  lua_pushstring(L, name);
+  lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2)));
   return 1;
 }
 
 
-/*
-** get (if 'get' is true) or set an upvalue from a closure
-*/
 static int auxupvalue (lua_State *L, int get) {
   const char *name;
-  int n = (int)luaL_checkinteger(L, 2);  /* upvalue index */
-  luaL_checktype(L, 1, LUA_TFUNCTION);  /* closure */
+  int n = luaL_checkint(L, 2);
+  luaL_checktype(L, 1, LUA_TFUNCTION);
   name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
   if (name == NULL) return 0;
   lua_pushstring(L, name);
-  lua_insert(L, -(get+1));  /* no-op if get is false */
+  lua_insert(L, -(get+1));
   return get + 1;
 }
 
@@ -278,37 +233,27 @@ static int db_setupvalue (lua_State *L) {
 }
 
 
-/*
-** Check whether a given upvalue from a given closure exists and
-** returns its index
-*/
-static void *checkupval (lua_State *L, int argf, int argnup, int *pnup) {
-  void *id;
-  int nup = (int)luaL_checkinteger(L, argnup);  /* upvalue index */
-  luaL_checktype(L, argf, LUA_TFUNCTION);  /* closure */
-  id = lua_upvalueid(L, argf, nup);
-  if (pnup) {
-    luaL_argcheck(L, id != NULL, argnup, "invalid upvalue index");
-    *pnup = nup;
-  }
-  return id;
+static int checkupval (lua_State *L, int argf, int argnup) {
+  lua_Debug ar;
+  int nup = luaL_checkint(L, argnup);
+  luaL_checktype(L, argf, LUA_TFUNCTION);
+  lua_pushvalue(L, argf);
+  lua_getinfo(L, ">u", &ar);
+  luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index");
+  return nup;
 }
 
 
 static int db_upvalueid (lua_State *L) {
-  void *id = checkupval(L, 1, 2, NULL);
-  if (id != NULL)
-    lua_pushlightuserdata(L, id);
-  else
-    luaL_pushfail(L);
+  int n = checkupval(L, 1, 2);
+  lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
   return 1;
 }
 
 
 static int db_upvaluejoin (lua_State *L) {
-  int n1, n2;
-  checkupval(L, 1, 2, &n1);
-  checkupval(L, 3, 4, &n2);
+  int n1 = checkupval(L, 1, 2);
+  int n2 = checkupval(L, 3, 4);
   luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
   luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
   lua_upvaluejoin(L, 1, n1, 3, n2);
@@ -316,29 +261,26 @@ static int db_upvaluejoin (lua_State *L) {
 }
 
 
-/*
-** Call hook function registered at hook table for the current
-** thread (if there is one)
-*/
+#define gethooktable(L)	luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
+
+
 static void hookf (lua_State *L, lua_Debug *ar) {
   static const char *const hooknames[] =
     {"call", "return", "line", "count", "tail call"};
-  lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
+  gethooktable(L);
   lua_pushthread(L);
-  if (lua_rawget(L, -2) == LUA_TFUNCTION) {  /* is there a hook function? */
-    lua_pushstring(L, hooknames[(int)ar->event]);  /* push event name */
+  lua_rawget(L, -2);
+  if (lua_isfunction(L, -1)) {
+    lua_pushstring(L, hooknames[(int)ar->event]);
     if (ar->currentline >= 0)
-      lua_pushinteger(L, ar->currentline);  /* push current line */
+      lua_pushinteger(L, ar->currentline);
     else lua_pushnil(L);
     lua_assert(lua_getinfo(L, "lS", ar));
-    lua_call(L, 2, 0);  /* call hook function */
+    lua_call(L, 2, 0);
   }
 }
 
 
-/*
-** Convert a string mask (for 'sethook') into a bit mask
-*/
 static int makemask (const char *smask, int count) {
   int mask = 0;
   if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
@@ -349,9 +291,6 @@ static int makemask (const char *smask, int count) {
 }
 
 
-/*
-** Convert a bit mask (for 'gethook') into a string mask
-*/
 static char *unmakemask (int mask, char *smask) {
   int i = 0;
   if (mask & LUA_MASKCALL) smask[i++] = 'c';
@@ -366,28 +305,27 @@ static int db_sethook (lua_State *L) {
   int arg, mask, count;
   lua_Hook func;
   lua_State *L1 = getthread(L, &arg);
-  if (lua_isnoneornil(L, arg+1)) {  /* no hook? */
+  if (lua_isnoneornil(L, arg+1)) {
     lua_settop(L, arg+1);
     func = NULL; mask = 0; count = 0;  /* turn off hooks */
   }
   else {
     const char *smask = luaL_checkstring(L, arg+2);
     luaL_checktype(L, arg+1, LUA_TFUNCTION);
-    count = (int)luaL_optinteger(L, arg + 3, 0);
+    count = luaL_optint(L, arg+3, 0);
     func = hookf; mask = makemask(smask, count);
   }
-  if (!luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)) {
-    /* table just created; initialize it */
-    lua_pushliteral(L, "k");
+  if (gethooktable(L) == 0) {  /* creating hook table? */
+    lua_pushstring(L, "k");
     lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
     lua_pushvalue(L, -1);
-    lua_setmetatable(L, -2);  /* metatable(hooktable) = hooktable */
+    lua_setmetatable(L, -2);  /* setmetatable(hooktable) = hooktable */
   }
   checkstack(L, L1, 1);
-  lua_pushthread(L1); lua_xmove(L1, L, 1);  /* key (thread) */
-  lua_pushvalue(L, arg + 1);  /* value (hook function) */
-  lua_rawset(L, -3);  /* hooktable[L1] = new Lua hook */
-  lua_sethook(L1, func, mask, count);
+  lua_pushthread(L1); lua_xmove(L1, L, 1);
+  lua_pushvalue(L, arg+1);
+  lua_rawset(L, -3);  /* set new hook */
+  lua_sethook(L1, func, mask, count);  /* set hooks */
   return 0;
 }
 
@@ -398,21 +336,17 @@ static int db_gethook (lua_State *L) {
   char buff[5];
   int mask = lua_gethookmask(L1);
   lua_Hook hook = lua_gethook(L1);
-  if (hook == NULL) {  /* no hook? */
-    luaL_pushfail(L);
-    return 1;
-  }
-  else if (hook != hookf)  /* external hook? */
+  if (hook != NULL && hook != hookf)  /* external hook? */
     lua_pushliteral(L, "external hook");
-  else {  /* hook table must exist */
-    lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
+  else {
+    gethooktable(L);
     checkstack(L, L1, 1);
     lua_pushthread(L1); lua_xmove(L1, L, 1);
-    lua_rawget(L, -2);   /* 1st result = hooktable[L1] */
+    lua_rawget(L, -2);   /* get hook */
     lua_remove(L, -2);  /* remove hook table */
   }
-  lua_pushstring(L, unmakemask(mask, buff));  /* 2nd result = mask */
-  lua_pushinteger(L, lua_gethookcount(L1));  /* 3rd result = count */
+  lua_pushstring(L, unmakemask(mask, buff));
+  lua_pushinteger(L, lua_gethookcount(L1));
   return 3;
 }
 
@@ -420,13 +354,13 @@ static int db_gethook (lua_State *L) {
 static int db_debug (lua_State *L) {
   for (;;) {
     char buffer[250];
-    lua_writestringerror("%s", "lua_debug> ");
-    if (fgets(buffer, sizeof(buffer), stdin) == NULL ||
+    luai_writestringerror("%s", "lua_debug> ");
+    if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
         strcmp(buffer, "cont\n") == 0)
       return 0;
     if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
         lua_pcall(L, 0, 0, 0))
-      lua_writestringerror("%s\n", luaL_tolstring(L, -1, NULL));
+      luai_writestringerror("%s\n", lua_tostring(L, -1));
     lua_settop(L, 0);  /* remove eventual returns */
   }
 }
@@ -439,21 +373,13 @@ static int db_traceback (lua_State *L) {
   if (msg == NULL && !lua_isnoneornil(L, arg + 1))  /* non-string 'msg'? */
     lua_pushvalue(L, arg + 1);  /* return it untouched */
   else {
-    int level = (int)luaL_optinteger(L, arg + 2, (L == L1) ? 1 : 0);
+    int level = luaL_optint(L, arg + 2, (L == L1) ? 1 : 0);
     luaL_traceback(L, L1, msg, level);
   }
   return 1;
 }
 
 
-static int db_setcstacklimit (lua_State *L) {
-  int limit = (int)luaL_checkinteger(L, 1);
-  int res = lua_setcstacklimit(L, limit);
-  lua_pushinteger(L, res);
-  return 1;
-}
-
-
 static const luaL_Reg dblib[] = {
   {"debug", db_debug},
   {"getuservalue", db_getuservalue},
@@ -471,7 +397,6 @@ static const luaL_Reg dblib[] = {
   {"setmetatable", db_setmetatable},
   {"setupvalue", db_setupvalue},
   {"traceback", db_traceback},
-  {"setcstacklimit", db_setcstacklimit},
   {NULL, NULL}
 };
 

ldebug.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.h $
+** $Id: ldebug.h,v 2.7 2011/10/07 20:45:19 roberto Exp $
 ** Auxiliary functions from Debug Interface module
 ** See Copyright Notice in lua.h
 */
@@ -11,53 +11,24 @@
 #include "lstate.h"
 
 
-#define pcRel(pc, p)	(cast_int((pc) - (p)->code) - 1)
-
-
-/* Active Lua function (given call info) */
-#define ci_func(ci)		(clLvalue(s2v((ci)->func.p)))
+#define pcRel(pc, p)	(cast(int, (pc) - (p)->code) - 1)
 
+#define getfuncline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
 
 #define resethookcount(L)	(L->hookcount = L->basehookcount)
 
-/*
-** mark for entries in 'lineinfo' array that has absolute information in
-** 'abslineinfo' array
-*/
-#define ABSLINEINFO	(-0x80)
+/* Active Lua function (given call info) */
+#define ci_func(ci)		(clLvalue((ci)->func))
 
 
-/*
-** MAXimum number of successive Instructions WiTHout ABSolute line
-** information. (A power of two allows fast divisions.)
-*/
-#if !defined(MAXIWTHABS)
-#define MAXIWTHABS	128
-#endif
-
-
-LUAI_FUNC int luaG_getfuncline (const Proto *f, int pc);
-LUAI_FUNC const char *luaG_findlocal (lua_State *L, CallInfo *ci, int n,
-                                                    StkId *pos);
 LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o,
                                                 const char *opname);
-LUAI_FUNC l_noret luaG_callerror (lua_State *L, const TValue *o);
-LUAI_FUNC l_noret luaG_forerror (lua_State *L, const TValue *o,
-                                               const char *what);
-LUAI_FUNC l_noret luaG_concaterror (lua_State *L, const TValue *p1,
-                                                  const TValue *p2);
-LUAI_FUNC l_noret luaG_opinterror (lua_State *L, const TValue *p1,
-                                                 const TValue *p2,
-                                                 const char *msg);
-LUAI_FUNC l_noret luaG_tointerror (lua_State *L, const TValue *p1,
+LUAI_FUNC l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2);
+LUAI_FUNC l_noret luaG_aritherror (lua_State *L, const TValue *p1,
                                                  const TValue *p2);
 LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1,
                                                  const TValue *p2);
 LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...);
-LUAI_FUNC const char *luaG_addinfo (lua_State *L, const char *msg,
-                                                  TString *src, int line);
 LUAI_FUNC l_noret luaG_errormsg (lua_State *L);
-LUAI_FUNC int luaG_traceexec (lua_State *L, const Instruction *pc);
-
 
 #endif

ldo.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.h $
+** $Id: ldo.h,v 2.20 2011/11/29 15:55:08 roberto Exp $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -8,78 +8,36 @@
 #define ldo_h
 
 
-#include "llimits.h"
 #include "lobject.h"
 #include "lstate.h"
 #include "lzio.h"
 
 
-/*
-** Macro to check stack size and grow stack if needed.  Parameters
-** 'pre'/'pos' allow the macro to preserve a pointer into the
-** stack across reallocations, doing the work only when needed.
-** It also allows the running of one GC step when the stack is
-** reallocated.
-** 'condmovestack' is used in heavy tests to force a stack reallocation
-** at every check.
-*/
-#define luaD_checkstackaux(L,n,pre,pos)  \
-	if (l_unlikely(L->stack_last.p - L->top.p <= (n))) \
-	  { pre; luaD_growstack(L, n, 1); pos; } \
-        else { condmovestack(L,pre,pos); }
-
-/* In general, 'pre'/'pos' are empty (nothing to save) */
-#define luaD_checkstack(L,n)	luaD_checkstackaux(L,n,(void)0,(void)0)
+#define luaD_checkstack(L,n)	if (L->stack_last - L->top <= (n)) \
+				    luaD_growstack(L, n); else condmovestack(L);
 
 
+#define incr_top(L) {L->top++; luaD_checkstack(L,0);}
 
-#define savestack(L,pt)		(cast_charp(pt) - cast_charp(L->stack.p))
-#define restorestack(L,n)	cast(StkId, cast_charp(L->stack.p) + (n))
+#define savestack(L,p)		((char *)(p) - (char *)L->stack)
+#define restorestack(L,n)	((TValue *)((char *)L->stack + (n)))
 
 
-/* macro to check stack size, preserving 'p' */
-#define checkstackp(L,n,p)  \
-  luaD_checkstackaux(L, n, \
-    ptrdiff_t t__ = savestack(L, p),  /* save 'p' */ \
-    p = restorestack(L, t__))  /* 'pos' part: restore 'p' */
-
-
-/* macro to check stack size and GC, preserving 'p' */
-#define checkstackGCp(L,n,p)  \
-  luaD_checkstackaux(L, n, \
-    ptrdiff_t t__ = savestack(L, p);  /* save 'p' */ \
-    luaC_checkGC(L),  /* stack grow uses memory */ \
-    p = restorestack(L, t__))  /* 'pos' part: restore 'p' */
-
-
-/* macro to check stack size and GC */
-#define checkstackGC(L,fsize)  \
-	luaD_checkstackaux(L, (fsize), luaC_checkGC(L), (void)0)
-
-
-/* type of protected functions, to be ran by 'runprotected' */
+/* type of protected functions, to be ran by `runprotected' */
 typedef void (*Pfunc) (lua_State *L, void *ud);
 
-LUAI_FUNC void luaD_seterrorobj (lua_State *L, int errcode, StkId oldtop);
 LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
                                                   const char *mode);
-LUAI_FUNC void luaD_hook (lua_State *L, int event, int line,
-                                        int fTransfer, int nTransfer);
-LUAI_FUNC void luaD_hookcall (lua_State *L, CallInfo *ci);
-LUAI_FUNC int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
-                                              int narg1, int delta);
-LUAI_FUNC CallInfo *luaD_precall (lua_State *L, StkId func, int nResults);
-LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults);
-LUAI_FUNC void luaD_callnoyield (lua_State *L, StkId func, int nResults);
-LUAI_FUNC StkId luaD_tryfuncTM (lua_State *L, StkId func);
-LUAI_FUNC int luaD_closeprotected (lua_State *L, ptrdiff_t level, int status);
+LUAI_FUNC void luaD_hook (lua_State *L, int event, int line);
+LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults);
+LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults,
+                                        int allowyield);
 LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
                                         ptrdiff_t oldtop, ptrdiff_t ef);
-LUAI_FUNC void luaD_poscall (lua_State *L, CallInfo *ci, int nres);
-LUAI_FUNC int luaD_reallocstack (lua_State *L, int newsize, int raiseerror);
-LUAI_FUNC int luaD_growstack (lua_State *L, int n, int raiseerror);
+LUAI_FUNC int luaD_poscall (lua_State *L, StkId firstResult);
+LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
+LUAI_FUNC void luaD_growstack (lua_State *L, int n);
 LUAI_FUNC void luaD_shrinkstack (lua_State *L);
-LUAI_FUNC void luaD_inctop (lua_State *L);
 
 LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode);
 LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);

ldump.c

@@ -1,230 +1,173 @@
 /*
-** $Id: ldump.c $
+** $Id: ldump.c,v 2.17 2012/01/23 23:02:10 roberto Exp $
 ** save precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
 
+#include <stddef.h>
+
 #define ldump_c
 #define LUA_CORE
 
-#include "lprefix.h"
-
-
-#include <limits.h>
-#include <stddef.h>
-
 #include "lua.h"
 
 #include "lobject.h"
 #include "lstate.h"
 #include "lundump.h"
 
-
 typedef struct {
-  lua_State *L;
-  lua_Writer writer;
-  void *data;
-  int strip;
-  int status;
+ lua_State* L;
+ lua_Writer writer;
+ void* data;
+ int strip;
+ int status;
 } DumpState;
 
+#define DumpMem(b,n,size,D)	DumpBlock(b,(n)*(size),D)
+#define DumpVar(x,D)		DumpMem(&x,1,sizeof(x),D)
 
-/*
-** All high-level dumps go through dumpVector; you can change it to
-** change the endianness of the result
-*/
-#define dumpVector(D,v,n)	dumpBlock(D,v,(n)*sizeof((v)[0]))
+static void DumpBlock(const void* b, size_t size, DumpState* D)
+{
+ if (D->status==0)
+ {
+  lua_unlock(D->L);
+  D->status=(*D->writer)(D->L,b,size,D->data);
+  lua_lock(D->L);
+ }
+}
 
-#define dumpLiteral(D, s)	dumpBlock(D,s,sizeof(s) - sizeof(char))
+static void DumpChar(int y, DumpState* D)
+{
+ char x=(char)y;
+ DumpVar(x,D);
+}
 
+static void DumpInt(int x, DumpState* D)
+{
+ DumpVar(x,D);
+}
 
-static void dumpBlock (DumpState *D, const void *b, size_t size) {
-  if (D->status == 0 && size > 0) {
-    lua_unlock(D->L);
-    D->status = (*D->writer)(D->L, b, size, D->data);
-    lua_lock(D->L);
+static void DumpNumber(lua_Number x, DumpState* D)
+{
+ DumpVar(x,D);
+}
+
+static void DumpVector(const void* b, int n, size_t size, DumpState* D)
+{
+ DumpInt(n,D);
+ DumpMem(b,n,size,D);
+}
+
+static void DumpString(const TString* s, DumpState* D)
+{
+ if (s==NULL)
+ {
+  size_t size=0;
+  DumpVar(size,D);
+ }
+ else
+ {
+  size_t size=s->tsv.len+1;		/* include trailing '\0' */
+  DumpVar(size,D);
+  DumpBlock(getstr(s),size*sizeof(char),D);
+ }
+}
+
+#define DumpCode(f,D)	 DumpVector(f->code,f->sizecode,sizeof(Instruction),D)
+
+static void DumpFunction(const Proto* f, DumpState* D);
+
+static void DumpConstants(const Proto* f, DumpState* D)
+{
+ int i,n=f->sizek;
+ DumpInt(n,D);
+ for (i=0; i<n; i++)
+ {
+  const TValue* o=&f->k[i];
+  DumpChar(ttypenv(o),D);
+  switch (ttypenv(o))
+  {
+   case LUA_TNIL:
+	break;
+   case LUA_TBOOLEAN:
+	DumpChar(bvalue(o),D);
+	break;
+   case LUA_TNUMBER:
+	DumpNumber(nvalue(o),D);
+	break;
+   case LUA_TSTRING:
+	DumpString(rawtsvalue(o),D);
+	break;
+    default: lua_assert(0);
   }
+ }
+ n=f->sizep;
+ DumpInt(n,D);
+ for (i=0; i<n; i++) DumpFunction(f->p[i],D);
 }
 
-
-#define dumpVar(D,x)		dumpVector(D,&x,1)
-
-
-static void dumpByte (DumpState *D, int y) {
-  lu_byte x = (lu_byte)y;
-  dumpVar(D, x);
+static void DumpUpvalues(const Proto* f, DumpState* D)
+{
+ int i,n=f->sizeupvalues;
+ DumpInt(n,D);
+ for (i=0; i<n; i++)
+ {
+  DumpChar(f->upvalues[i].instack,D);
+  DumpChar(f->upvalues[i].idx,D);
+ }
 }
 
-
-/*
-** 'dumpSize' buffer size: each byte can store up to 7 bits. (The "+6"
-** rounds up the division.)
-*/
-#define DIBS    ((sizeof(size_t) * CHAR_BIT + 6) / 7)
-
-static void dumpSize (DumpState *D, size_t x) {
-  lu_byte buff[DIBS];
-  int n = 0;
-  do {
-    buff[DIBS - (++n)] = x & 0x7f;  /* fill buffer in reverse order */
-    x >>= 7;
-  } while (x != 0);
-  buff[DIBS - 1] |= 0x80;  /* mark last byte */
-  dumpVector(D, buff + DIBS - n, n);
+static void DumpDebug(const Proto* f, DumpState* D)
+{
+ int i,n;
+ DumpString((D->strip) ? NULL : f->source,D);
+ n= (D->strip) ? 0 : f->sizelineinfo;
+ DumpVector(f->lineinfo,n,sizeof(int),D);
+ n= (D->strip) ? 0 : f->sizelocvars;
+ DumpInt(n,D);
+ for (i=0; i<n; i++)
+ {
+  DumpString(f->locvars[i].varname,D);
+  DumpInt(f->locvars[i].startpc,D);
+  DumpInt(f->locvars[i].endpc,D);
+ }
+ n= (D->strip) ? 0 : f->sizeupvalues;
+ DumpInt(n,D);
+ for (i=0; i<n; i++) DumpString(f->upvalues[i].name,D);
 }
 
-
-static void dumpInt (DumpState *D, int x) {
-  dumpSize(D, x);
+static void DumpFunction(const Proto* f, DumpState* D)
+{
+ DumpInt(f->linedefined,D);
+ DumpInt(f->lastlinedefined,D);
+ DumpChar(f->numparams,D);
+ DumpChar(f->is_vararg,D);
+ DumpChar(f->maxstacksize,D);
+ DumpCode(f,D);
+ DumpConstants(f,D);
+ DumpUpvalues(f,D);
+ DumpDebug(f,D);
 }
 
-
-static void dumpNumber (DumpState *D, lua_Number x) {
-  dumpVar(D, x);
+static void DumpHeader(DumpState* D)
+{
+ lu_byte h[LUAC_HEADERSIZE];
+ luaU_header(h);
+ DumpBlock(h,LUAC_HEADERSIZE,D);
 }
 
-
-static void dumpInteger (DumpState *D, lua_Integer x) {
-  dumpVar(D, x);
-}
-
-
-static void dumpString (DumpState *D, const TString *s) {
-  if (s == NULL)
-    dumpSize(D, 0);
-  else {
-    size_t size = tsslen(s);
-    const char *str = getstr(s);
-    dumpSize(D, size + 1);
-    dumpVector(D, str, size);
-  }
-}
-
-
-static void dumpCode (DumpState *D, const Proto *f) {
-  dumpInt(D, f->sizecode);
-  dumpVector(D, f->code, f->sizecode);
-}
-
-
-static void dumpFunction(DumpState *D, const Proto *f, TString *psource);
-
-static void dumpConstants (DumpState *D, const Proto *f) {
-  int i;
-  int n = f->sizek;
-  dumpInt(D, n);
-  for (i = 0; i < n; i++) {
-    const TValue *o = &f->k[i];
-    int tt = ttypetag(o);
-    dumpByte(D, tt);
-    switch (tt) {
-      case LUA_VNUMFLT:
-        dumpNumber(D, fltvalue(o));
-        break;
-      case LUA_VNUMINT:
-        dumpInteger(D, ivalue(o));
-        break;
-      case LUA_VSHRSTR:
-      case LUA_VLNGSTR:
-        dumpString(D, tsvalue(o));
-        break;
-      default:
-        lua_assert(tt == LUA_VNIL || tt == LUA_VFALSE || tt == LUA_VTRUE);
-    }
-  }
-}
-
-
-static void dumpProtos (DumpState *D, const Proto *f) {
-  int i;
-  int n = f->sizep;
-  dumpInt(D, n);
-  for (i = 0; i < n; i++)
-    dumpFunction(D, f->p[i], f->source);
-}
-
-
-static void dumpUpvalues (DumpState *D, const Proto *f) {
-  int i, n = f->sizeupvalues;
-  dumpInt(D, n);
-  for (i = 0; i < n; i++) {
-    dumpByte(D, f->upvalues[i].instack);
-    dumpByte(D, f->upvalues[i].idx);
-    dumpByte(D, f->upvalues[i].kind);
-  }
-}
-
-
-static void dumpDebug (DumpState *D, const Proto *f) {
-  int i, n;
-  n = (D->strip) ? 0 : f->sizelineinfo;
-  dumpInt(D, n);
-  dumpVector(D, f->lineinfo, n);
-  n = (D->strip) ? 0 : f->sizeabslineinfo;
-  dumpInt(D, n);
-  for (i = 0; i < n; i++) {
-    dumpInt(D, f->abslineinfo[i].pc);
-    dumpInt(D, f->abslineinfo[i].line);
-  }
-  n = (D->strip) ? 0 : f->sizelocvars;
-  dumpInt(D, n);
-  for (i = 0; i < n; i++) {
-    dumpString(D, f->locvars[i].varname);
-    dumpInt(D, f->locvars[i].startpc);
-    dumpInt(D, f->locvars[i].endpc);
-  }
-  n = (D->strip) ? 0 : f->sizeupvalues;
-  dumpInt(D, n);
-  for (i = 0; i < n; i++)
-    dumpString(D, f->upvalues[i].name);
-}
-
-
-static void dumpFunction (DumpState *D, const Proto *f, TString *psource) {
-  if (D->strip || f->source == psource)
-    dumpString(D, NULL);  /* no debug info or same source as its parent */
-  else
-    dumpString(D, f->source);
-  dumpInt(D, f->linedefined);
-  dumpInt(D, f->lastlinedefined);
-  dumpByte(D, f->numparams);
-  dumpByte(D, f->is_vararg);
-  dumpByte(D, f->maxstacksize);
-  dumpCode(D, f);
-  dumpConstants(D, f);
-  dumpUpvalues(D, f);
-  dumpProtos(D, f);
-  dumpDebug(D, f);
-}
-
-
-static void dumpHeader (DumpState *D) {
-  dumpLiteral(D, LUA_SIGNATURE);
-  dumpByte(D, LUAC_VERSION);
-  dumpByte(D, LUAC_FORMAT);
-  dumpLiteral(D, LUAC_DATA);
-  dumpByte(D, sizeof(Instruction));
-  dumpByte(D, sizeof(lua_Integer));
-  dumpByte(D, sizeof(lua_Number));
-  dumpInteger(D, LUAC_INT);
-  dumpNumber(D, LUAC_NUM);
-}
-
-
 /*
 ** dump Lua function as precompiled chunk
 */
-int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data,
-              int strip) {
-  DumpState D;
-  D.L = L;
-  D.writer = w;
-  D.data = data;
-  D.strip = strip;
-  D.status = 0;
-  dumpHeader(&D);
-  dumpByte(&D, f->sizeupvalues);
-  dumpFunction(&D, f, NULL);
-  return D.status;
+int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip)
+{
+ DumpState D;
+ D.L=L;
+ D.writer=w;
+ D.data=data;
+ D.strip=strip;
+ D.status=0;
+ DumpHeader(&D);
+ DumpFunction(f,&D);
+ return D.status;
 }
-

lfunc.c

@@ -1,21 +1,17 @@
 /*
-** $Id: lfunc.c $
+** $Id: lfunc.c,v 2.30 2012/10/03 12:36:46 roberto Exp $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
 
-#define lfunc_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
 
 #include <stddef.h>
 
+#define lfunc_c
+#define LUA_CORE
+
 #include "lua.h"
 
-#include "ldebug.h"
-#include "ldo.h"
 #include "lfunc.h"
 #include "lgc.h"
 #include "lmem.h"
@@ -24,232 +20,104 @@
 
 
 
-CClosure *luaF_newCclosure (lua_State *L, int nupvals) {
-  GCObject *o = luaC_newobj(L, LUA_VCCL, sizeCclosure(nupvals));
-  CClosure *c = gco2ccl(o);
-  c->nupvalues = cast_byte(nupvals);
+Closure *luaF_newCclosure (lua_State *L, int n) {
+  Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl;
+  c->c.nupvalues = cast_byte(n);
   return c;
 }
 
 
-LClosure *luaF_newLclosure (lua_State *L, int nupvals) {
-  GCObject *o = luaC_newobj(L, LUA_VLCL, sizeLclosure(nupvals));
-  LClosure *c = gco2lcl(o);
-  c->p = NULL;
-  c->nupvalues = cast_byte(nupvals);
-  while (nupvals--) c->upvals[nupvals] = NULL;
+Closure *luaF_newLclosure (lua_State *L, int n) {
+  Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl;
+  c->l.p = NULL;
+  c->l.nupvalues = cast_byte(n);
+  while (n--) c->l.upvals[n] = NULL;
   return c;
 }
 
 
-/*
-** fill a closure with new closed upvalues
-*/
-void luaF_initupvals (lua_State *L, LClosure *cl) {
-  int i;
-  for (i = 0; i < cl->nupvalues; i++) {
-    GCObject *o = luaC_newobj(L, LUA_VUPVAL, sizeof(UpVal));
-    UpVal *uv = gco2upv(o);
-    uv->v.p = &uv->u.value;  /* make it closed */
-    setnilvalue(uv->v.p);
-    cl->upvals[i] = uv;
-    luaC_objbarrier(L, cl, uv);
-  }
-}
-
-
-/*
-** Create a new upvalue at the given level, and link it to the list of
-** open upvalues of 'L' after entry 'prev'.
-**/
-static UpVal *newupval (lua_State *L, StkId level, UpVal **prev) {
-  GCObject *o = luaC_newobj(L, LUA_VUPVAL, sizeof(UpVal));
-  UpVal *uv = gco2upv(o);
-  UpVal *next = *prev;
-  uv->v.p = s2v(level);  /* current value lives in the stack */
-  uv->u.open.next = next;  /* link it to list of open upvalues */
-  uv->u.open.previous = prev;
-  if (next)
-    next->u.open.previous = &uv->u.open.next;
-  *prev = uv;
-  if (!isintwups(L)) {  /* thread not in list of threads with upvalues? */
-    L->twups = G(L)->twups;  /* link it to the list */
-    G(L)->twups = L;
-  }
+UpVal *luaF_newupval (lua_State *L) {
+  UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv;
+  uv->v = &uv->u.value;
+  setnilvalue(uv->v);
   return uv;
 }
 
 
-/*
-** Find and reuse, or create if it does not exist, an upvalue
-** at the given level.
-*/
 UpVal *luaF_findupval (lua_State *L, StkId level) {
-  UpVal **pp = &L->openupval;
+  global_State *g = G(L);
+  GCObject **pp = &L->openupval;
   UpVal *p;
-  lua_assert(isintwups(L) || L->openupval == NULL);
-  while ((p = *pp) != NULL && uplevel(p) >= level) {  /* search for it */
-    lua_assert(!isdead(G(L), p));
-    if (uplevel(p) == level)  /* corresponding upvalue? */
-      return p;  /* return it */
-    pp = &p->u.open.next;
-  }
-  /* not found: create a new upvalue after 'pp' */
-  return newupval(L, level, pp);
-}
-
-
-/*
-** Call closing method for object 'obj' with error message 'err'. The
-** boolean 'yy' controls whether the call is yieldable.
-** (This function assumes EXTRA_STACK.)
-*/
-static void callclosemethod (lua_State *L, TValue *obj, TValue *err, int yy) {
-  StkId top = L->top.p;
-  const TValue *tm = luaT_gettmbyobj(L, obj, TM_CLOSE);
-  setobj2s(L, top, tm);  /* will call metamethod... */
-  setobj2s(L, top + 1, obj);  /* with 'self' as the 1st argument */
-  setobj2s(L, top + 2, err);  /* and error msg. as 2nd argument */
-  L->top.p = top + 3;  /* add function and arguments */
-  if (yy)
-    luaD_call(L, top, 0);
-  else
-    luaD_callnoyield(L, top, 0);
-}
-
-
-/*
-** Check whether object at given level has a close metamethod and raise
-** an error if not.
-*/
-static void checkclosemth (lua_State *L, StkId level) {
-  const TValue *tm = luaT_gettmbyobj(L, s2v(level), TM_CLOSE);
-  if (ttisnil(tm)) {  /* no metamethod? */
-    int idx = cast_int(level - L->ci->func.p);  /* variable index */
-    const char *vname = luaG_findlocal(L, L->ci, idx, NULL);
-    if (vname == NULL) vname = "?";
-    luaG_runerror(L, "variable '%s' got a non-closable value", vname);
-  }
-}
-
-
-/*
-** Prepare and call a closing method.
-** If status is CLOSEKTOP, the call to the closing method will be pushed
-** at the top of the stack. Otherwise, values can be pushed right after
-** the 'level' of the upvalue being closed, as everything after that
-** won't be used again.
-*/
-static void prepcallclosemth (lua_State *L, StkId level, int status, int yy) {
-  TValue *uv = s2v(level);  /* value being closed */
-  TValue *errobj;
-  if (status == CLOSEKTOP)
-    errobj = &G(L)->nilvalue;  /* error object is nil */
-  else {  /* 'luaD_seterrorobj' will set top to level + 2 */
-    errobj = s2v(level + 1);  /* error object goes after 'uv' */
-    luaD_seterrorobj(L, status, level + 1);  /* set error object */
-  }
-  callclosemethod(L, uv, errobj, yy);
-}
-
-
-/*
-** Maximum value for deltas in 'tbclist', dependent on the type
-** of delta. (This macro assumes that an 'L' is in scope where it
-** is used.)
-*/
-#define MAXDELTA  \
-	((256ul << ((sizeof(L->stack.p->tbclist.delta) - 1) * 8)) - 1)
-
-
-/*
-** Insert a variable in the list of to-be-closed variables.
-*/
-void luaF_newtbcupval (lua_State *L, StkId level) {
-  lua_assert(level > L->tbclist.p);
-  if (l_isfalse(s2v(level)))
-    return;  /* false doesn't need to be closed */
-  checkclosemth(L, level);  /* value must have a close method */
-  while (cast_uint(level - L->tbclist.p) > MAXDELTA) {
-    L->tbclist.p += MAXDELTA;  /* create a dummy node at maximum delta */
-    L->tbclist.p->tbclist.delta = 0;
-  }
-  level->tbclist.delta = cast(unsigned short, level - L->tbclist.p);
-  L->tbclist.p = level;
-}
-
-
-void luaF_unlinkupval (UpVal *uv) {
-  lua_assert(upisopen(uv));
-  *uv->u.open.previous = uv->u.open.next;
-  if (uv->u.open.next)
-    uv->u.open.next->u.open.previous = uv->u.open.previous;
-}
-
-
-/*
-** Close all upvalues up to the given stack level.
-*/
-void luaF_closeupval (lua_State *L, StkId level) {
   UpVal *uv;
-  StkId upl;  /* stack index pointed by 'uv' */
-  while ((uv = L->openupval) != NULL && (upl = uplevel(uv)) >= level) {
-    TValue *slot = &uv->u.value;  /* new position for value */
-    lua_assert(uplevel(uv) < L->top.p);
-    luaF_unlinkupval(uv);  /* remove upvalue from 'openupval' list */
-    setobj(L, slot, uv->v.p);  /* move value to upvalue slot */
-    uv->v.p = slot;  /* now current value lives here */
-    if (!iswhite(uv)) {  /* neither white nor dead? */
-      nw2black(uv);  /* closed upvalues cannot be gray */
-      luaC_barrier(L, uv, slot);
+  while (*pp != NULL && (p = gco2uv(*pp))->v >= level) {
+    GCObject *o = obj2gco(p);
+    lua_assert(p->v != &p->u.value);
+    lua_assert(!isold(o) || isold(obj2gco(L)));
+    if (p->v == level) {  /* found a corresponding upvalue? */
+      if (isdead(g, o))  /* is it dead? */
+        changewhite(o);  /* resurrect it */
+      return p;
+    }
+    pp = &p->next;
+  }
+  /* not found: create a new one */
+  uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), pp, 0)->uv;
+  uv->v = level;  /* current value lives in the stack */
+  uv->u.l.prev = &g->uvhead;  /* double link it in `uvhead' list */
+  uv->u.l.next = g->uvhead.u.l.next;
+  uv->u.l.next->u.l.prev = uv;
+  g->uvhead.u.l.next = uv;
+  lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+  return uv;
+}
+
+
+static void unlinkupval (UpVal *uv) {
+  lua_assert(uv->u.l.next->u.l.prev == uv && uv->u.l.prev->u.l.next == uv);
+  uv->u.l.next->u.l.prev = uv->u.l.prev;  /* remove from `uvhead' list */
+  uv->u.l.prev->u.l.next = uv->u.l.next;
+}
+
+
+void luaF_freeupval (lua_State *L, UpVal *uv) {
+  if (uv->v != &uv->u.value)  /* is it open? */
+    unlinkupval(uv);  /* remove from open list */
+  luaM_free(L, uv);  /* free upvalue */
+}
+
+
+void luaF_close (lua_State *L, StkId level) {
+  UpVal *uv;
+  global_State *g = G(L);
+  while (L->openupval != NULL && (uv = gco2uv(L->openupval))->v >= level) {
+    GCObject *o = obj2gco(uv);
+    lua_assert(!isblack(o) && uv->v != &uv->u.value);
+    L->openupval = uv->next;  /* remove from `open' list */
+    if (isdead(g, o))
+      luaF_freeupval(L, uv);  /* free upvalue */
+    else {
+      unlinkupval(uv);  /* remove upvalue from 'uvhead' list */
+      setobj(L, &uv->u.value, uv->v);  /* move value to upvalue slot */
+      uv->v = &uv->u.value;  /* now current value lives here */
+      gch(o)->next = g->allgc;  /* link upvalue into 'allgc' list */
+      g->allgc = o;
+      luaC_checkupvalcolor(g, uv);
     }
   }
 }
 
 
-/*
-** Remove first element from the tbclist plus its dummy nodes.
-*/
-static void poptbclist (lua_State *L) {
-  StkId tbc = L->tbclist.p;
-  lua_assert(tbc->tbclist.delta > 0);  /* first element cannot be dummy */
-  tbc -= tbc->tbclist.delta;
-  while (tbc > L->stack.p && tbc->tbclist.delta == 0)
-    tbc -= MAXDELTA;  /* remove dummy nodes */
-  L->tbclist.p = tbc;
-}
-
-
-/*
-** Close all upvalues and to-be-closed variables up to the given stack
-** level. Return restored 'level'.
-*/
-StkId luaF_close (lua_State *L, StkId level, int status, int yy) {
-  ptrdiff_t levelrel = savestack(L, level);
-  luaF_closeupval(L, level);  /* first, close the upvalues */
-  while (L->tbclist.p >= level) {  /* traverse tbc's down to that level */
-    StkId tbc = L->tbclist.p;  /* get variable index */
-    poptbclist(L);  /* remove it from list */
-    prepcallclosemth(L, tbc, status, yy);  /* close variable */
-    level = restorestack(L, levelrel);
-  }
-  return level;
-}
-
-
 Proto *luaF_newproto (lua_State *L) {
-  GCObject *o = luaC_newobj(L, LUA_VPROTO, sizeof(Proto));
-  Proto *f = gco2p(o);
+  Proto *f = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p;
   f->k = NULL;
   f->sizek = 0;
   f->p = NULL;
   f->sizep = 0;
   f->code = NULL;
+  f->cache = NULL;
   f->sizecode = 0;
   f->lineinfo = NULL;
   f->sizelineinfo = 0;
-  f->abslineinfo = NULL;
-  f->sizeabslineinfo = 0;
   f->upvalues = NULL;
   f->sizeupvalues = 0;
   f->numparams = 0;
@@ -269,7 +137,6 @@ void luaF_freeproto (lua_State *L, Proto *f) {
   luaM_freearray(L, f->p, f->sizep);
   luaM_freearray(L, f->k, f->sizek);
   luaM_freearray(L, f->lineinfo, f->sizelineinfo);
-  luaM_freearray(L, f->abslineinfo, f->sizeabslineinfo);
   luaM_freearray(L, f->locvars, f->sizelocvars);
   luaM_freearray(L, f->upvalues, f->sizeupvalues);
   luaM_free(L, f);
@@ -277,7 +144,7 @@ void luaF_freeproto (lua_State *L, Proto *f) {
 
 
 /*
-** 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.
 */
 const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {

lfunc.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lfunc.h $
+** $Id: lfunc.h,v 2.8 2012/05/08 13:53:33 roberto Exp $
 ** Auxiliary functions to manipulate prototypes and closures
 ** See Copyright Notice in lua.h
 */
@@ -11,52 +11,21 @@
 #include "lobject.h"
 
 
-#define sizeCclosure(n)	(cast_int(offsetof(CClosure, upvalue)) + \
-                         cast_int(sizeof(TValue)) * (n))
+#define sizeCclosure(n)	(cast(int, sizeof(CClosure)) + \
+                         cast(int, sizeof(TValue)*((n)-1)))
 
-#define sizeLclosure(n)	(cast_int(offsetof(LClosure, upvals)) + \
-                         cast_int(sizeof(TValue *)) * (n))
-
-
-/* test whether thread is in 'twups' list */
-#define isintwups(L)	(L->twups != L)
-
-
-/*
-** maximum number of upvalues in a closure (both C and Lua). (Value
-** must fit in a VM register.)
-*/
-#define MAXUPVAL	255
-
-
-#define upisopen(up)	((up)->v.p != &(up)->u.value)
-
-
-#define uplevel(up)	check_exp(upisopen(up), cast(StkId, (up)->v.p))
-
-
-/*
-** maximum number of misses before giving up the cache of closures
-** in prototypes
-*/
-#define MAXMISS		10
-
-
-
-/* special status to close upvalues preserving the top of the stack */
-#define CLOSEKTOP	(-1)
+#define sizeLclosure(n)	(cast(int, sizeof(LClosure)) + \
+                         cast(int, sizeof(TValue *)*((n)-1)))
 
 
 LUAI_FUNC Proto *luaF_newproto (lua_State *L);
-LUAI_FUNC CClosure *luaF_newCclosure (lua_State *L, int nupvals);
-LUAI_FUNC LClosure *luaF_newLclosure (lua_State *L, int nupvals);
-LUAI_FUNC void luaF_initupvals (lua_State *L, LClosure *cl);
+LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems);
+LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems);
+LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
 LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
-LUAI_FUNC void luaF_newtbcupval (lua_State *L, StkId level);
-LUAI_FUNC void luaF_closeupval (lua_State *L, StkId level);
-LUAI_FUNC StkId luaF_close (lua_State *L, StkId level, int status, int yy);
-LUAI_FUNC void luaF_unlinkupval (UpVal *uv);
+LUAI_FUNC void luaF_close (lua_State *L, StkId level);
 LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
+LUAI_FUNC void luaF_freeupval (lua_State *L, UpVal *uv);
 LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
                                          int pc);
 

lgc.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.h $
+** $Id: lgc.h,v 2.58 2012/09/11 12:53:08 roberto Exp $
 ** Garbage Collector
 ** See Copyright Notice in lua.h
 */
@@ -12,52 +12,68 @@
 #include "lstate.h"
 
 /*
-** Collectable objects may have one of three colors: white, which means
-** the object is not marked; gray, which means the object is marked, but
-** its references may be not marked; and black, which means that the
-** object and all its references are marked.  The main invariant of the
-** garbage collector, while marking objects, is that a black object can
-** never point to a white one. Moreover, any gray object must be in a
-** "gray list" (gray, grayagain, weak, allweak, ephemeron) so that it
-** can be visited again before finishing the collection cycle. (Open
-** upvalues are an exception to this rule.)  These lists have no meaning
-** when the invariant is not being enforced (e.g., sweep phase).
+** Collectable objects may have one of three colors: white, which
+** means the object is not marked; gray, which means the
+** object is marked, but its references may be not marked; and
+** black, which means that the object and all its references are marked.
+** The main invariant of the garbage collector, while marking objects,
+** is that a black object can never point to a white one. Moreover,
+** any gray object must be in a "gray list" (gray, grayagain, weak,
+** allweak, ephemeron) so that it can be visited again before finishing
+** the collection cycle. These lists have no meaning when the invariant
+** is not being enforced (e.g., sweep phase).
 */
 
 
+
+/* how much to allocate before next GC step */
+#if !defined(GCSTEPSIZE)
+/* ~100 small strings */
+#define GCSTEPSIZE	(cast_int(100 * sizeof(TString)))
+#endif
+
+
 /*
 ** Possible states of the Garbage Collector
 */
 #define GCSpropagate	0
-#define GCSenteratomic	1
-#define GCSatomic	2
-#define GCSswpallgc	3
-#define GCSswpfinobj	4
-#define GCSswptobefnz	5
-#define GCSswpend	6
-#define GCScallfin	7
-#define GCSpause	8
+#define GCSatomic	1
+#define GCSsweepstring	2
+#define GCSsweepudata	3
+#define GCSsweep	4
+#define GCSpause	5
 
 
 #define issweepphase(g)  \
-	(GCSswpallgc <= (g)->gcstate && (g)->gcstate <= GCSswpend)
+	(GCSsweepstring <= (g)->gcstate && (g)->gcstate <= GCSsweep)
+
+#define isgenerational(g)	((g)->gckind == KGC_GEN)
+
+/*
+** macros to tell when main invariant (white objects cannot point to black
+** ones) must be kept. During a non-generational collection, the sweep
+** phase may break the invariant, as objects turned white may point to
+** still-black objects. The invariant is restored when sweep ends and
+** all objects are white again. During a generational collection, the
+** invariant must be kept all times.
+*/
+
+#define keepinvariant(g)	(isgenerational(g) || g->gcstate <= GCSatomic)
 
 
 /*
-** macro to tell when main invariant (white objects cannot point to black
-** ones) must be kept. During a collection, the sweep
-** phase may break the invariant, as objects turned white may point to
-** still-black objects. The invariant is restored when sweep ends and
-** all objects are white again.
+** Outside the collector, the state in generational mode is kept in
+** 'propagate', so 'keepinvariant' is always true.
 */
-
-#define keepinvariant(g)	((g)->gcstate <= GCSatomic)
+#define keepinvariantout(g)  \
+  check_exp(g->gcstate == GCSpropagate || !isgenerational(g),  \
+            g->gcstate <= GCSatomic)
 
 
 /*
 ** some useful bit tricks
 */
-#define resetbits(x,m)		((x) &= cast_byte(~(m)))
+#define resetbits(x,m)		((x) &= cast(lu_byte, ~(m)))
 #define setbits(x,m)		((x) |= (m))
 #define testbits(x,m)		((x) & (m))
 #define bitmask(b)		(1<<(b))
@@ -67,136 +83,75 @@
 #define testbit(x,b)		testbits(x, bitmask(b))
 
 
-/*
-** Layout for bit use in 'marked' field. First three bits are
-** used for object "age" in generational mode. Last bit is used
-** by tests.
-*/
-#define WHITE0BIT	3  /* object is white (type 0) */
-#define WHITE1BIT	4  /* object is white (type 1) */
-#define BLACKBIT	5  /* object is black */
-#define FINALIZEDBIT	6  /* object has been marked for finalization */
-
-#define TESTBIT		7
-
-
+/* Layout for bit use in `marked' field: */
+#define WHITE0BIT	0  /* object is white (type 0) */
+#define WHITE1BIT	1  /* object is white (type 1) */
+#define BLACKBIT	2  /* object is black */
+#define FINALIZEDBIT	3  /* object has been separated for finalization */
+#define SEPARATED	4  /* object is in 'finobj' list or in 'tobefnz' */
+#define FIXEDBIT	5  /* object is fixed (should not be collected) */
+#define OLDBIT		6  /* object is old (only in generational mode) */
+/* bit 7 is currently used by tests (luaL_checkmemory) */
 
 #define WHITEBITS	bit2mask(WHITE0BIT, WHITE1BIT)
 
 
-#define iswhite(x)      testbits((x)->marked, WHITEBITS)
-#define isblack(x)      testbit((x)->marked, BLACKBIT)
+#define iswhite(x)      testbits((x)->gch.marked, WHITEBITS)
+#define isblack(x)      testbit((x)->gch.marked, BLACKBIT)
 #define isgray(x)  /* neither white nor black */  \
-	(!testbits((x)->marked, WHITEBITS | bitmask(BLACKBIT)))
+	(!testbits((x)->gch.marked, WHITEBITS | bitmask(BLACKBIT)))
 
-#define tofinalize(x)	testbit((x)->marked, FINALIZEDBIT)
+#define isold(x)	testbit((x)->gch.marked, OLDBIT)
 
-#define otherwhite(g)	((g)->currentwhite ^ WHITEBITS)
-#define isdeadm(ow,m)	((m) & (ow))
-#define isdead(g,v)	isdeadm(otherwhite(g), (v)->marked)
+/* MOVE OLD rule: whenever an object is moved to the beginning of
+   a GC list, its old bit must be cleared */
+#define resetoldbit(o)	resetbit((o)->gch.marked, OLDBIT)
 
-#define changewhite(x)	((x)->marked ^= WHITEBITS)
-#define nw2black(x)  \
-	check_exp(!iswhite(x), l_setbit((x)->marked, BLACKBIT))
+#define otherwhite(g)	(g->currentwhite ^ WHITEBITS)
+#define isdeadm(ow,m)	(!(((m) ^ WHITEBITS) & (ow)))
+#define isdead(g,v)	isdeadm(otherwhite(g), (v)->gch.marked)
 
-#define luaC_white(g)	cast_byte((g)->currentwhite & WHITEBITS)
+#define changewhite(x)	((x)->gch.marked ^= WHITEBITS)
+#define gray2black(x)	l_setbit((x)->gch.marked, BLACKBIT)
+
+#define valiswhite(x)	(iscollectable(x) && iswhite(gcvalue(x)))
+
+#define luaC_white(g)	cast(lu_byte, (g)->currentwhite & WHITEBITS)
 
 
-/* object age in generational mode */
-#define G_NEW		0	/* created in current cycle */
-#define G_SURVIVAL	1	/* created in previous cycle */
-#define G_OLD0		2	/* marked old by frw. barrier in this cycle */
-#define G_OLD1		3	/* first full cycle as old */
-#define G_OLD		4	/* really old object (not to be visited) */
-#define G_TOUCHED1	5	/* old object touched this cycle */
-#define G_TOUCHED2	6	/* old object touched in previous cycle */
-
-#define AGEBITS		7  /* all age bits (111) */
-
-#define getage(o)	((o)->marked & AGEBITS)
-#define setage(o,a)  ((o)->marked = cast_byte(((o)->marked & (~AGEBITS)) | a))
-#define isold(o)	(getage(o) > G_SURVIVAL)
-
-#define changeage(o,f,t)  \
-	check_exp(getage(o) == (f), (o)->marked ^= ((f)^(t)))
+#define luaC_condGC(L,c) \
+	{if (G(L)->GCdebt > 0) {c;}; condchangemem(L);}
+#define luaC_checkGC(L)		luaC_condGC(L, luaC_step(L);)
 
 
-/* Default Values for GC parameters */
-#define LUAI_GENMAJORMUL         100
-#define LUAI_GENMINORMUL         20
+#define luaC_barrier(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
+	luaC_barrier_(L,obj2gco(p),gcvalue(v)); }
 
-/* wait memory to double before starting new cycle */
-#define LUAI_GCPAUSE    200
+#define luaC_barrierback(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
+	luaC_barrierback_(L,p); }
 
-/*
-** some gc parameters are stored divided by 4 to allow a maximum value
-** up to 1023 in a 'lu_byte'.
-*/
-#define getgcparam(p)	((p) * 4)
-#define setgcparam(p,v)	((p) = (v) / 4)
+#define luaC_objbarrier(L,p,o)  \
+	{ if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \
+		luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
 
-#define LUAI_GCMUL      100
+#define luaC_objbarrierback(L,p,o)  \
+   { if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) luaC_barrierback_(L,p); }
 
-/* how much to allocate before next GC step (log2) */
-#define LUAI_GCSTEPSIZE 13      /* 8 KB */
+#define luaC_barrierproto(L,p,c) \
+   { if (isblack(obj2gco(p))) luaC_barrierproto_(L,p,c); }
 
-
-/*
-** Check whether the declared GC mode is generational. While in
-** generational mode, the collector can go temporarily to incremental
-** mode to improve performance. This is signaled by 'g->lastatomic != 0'.
-*/
-#define isdecGCmodegen(g)	(g->gckind == KGC_GEN || g->lastatomic != 0)
-
-
-/*
-** Control when GC is running:
-*/
-#define GCSTPUSR	1  /* bit true when GC stopped by user */
-#define GCSTPGC		2  /* bit true when GC stopped by itself */
-#define GCSTPCLS	4  /* bit true when closing Lua state */
-#define gcrunning(g)	((g)->gcstp == 0)
-
-
-/*
-** Does one step of collection when debt becomes positive. 'pre'/'pos'
-** allows some adjustments to be done only when needed. macro
-** 'condchangemem' is used only for heavy tests (forcing a full
-** GC cycle on every opportunity)
-*/
-#define luaC_condGC(L,pre,pos) \
-	{ if (G(L)->GCdebt > 0) { pre; luaC_step(L); pos;}; \
-	  condchangemem(L,pre,pos); }
-
-/* more often than not, 'pre'/'pos' are empty */
-#define luaC_checkGC(L)		luaC_condGC(L,(void)0,(void)0)
-
-
-#define luaC_objbarrier(L,p,o) (  \
-	(isblack(p) && iswhite(o)) ? \
-	luaC_barrier_(L,obj2gco(p),obj2gco(o)) : cast_void(0))
-
-#define luaC_barrier(L,p,v) (  \
-	iscollectable(v) ? luaC_objbarrier(L,p,gcvalue(v)) : cast_void(0))
-
-#define luaC_objbarrierback(L,p,o) (  \
-	(isblack(p) && iswhite(o)) ? luaC_barrierback_(L,p) : cast_void(0))
-
-#define luaC_barrierback(L,p,v) (  \
-	iscollectable(v) ? luaC_objbarrierback(L, p, gcvalue(v)) : cast_void(0))
-
-LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o);
 LUAI_FUNC void luaC_freeallobjects (lua_State *L);
 LUAI_FUNC void luaC_step (lua_State *L);
+LUAI_FUNC void luaC_forcestep (lua_State *L);
 LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask);
 LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency);
-LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz);
-LUAI_FUNC GCObject *luaC_newobjdt (lua_State *L, int tt, size_t sz,
-                                                 size_t offset);
+LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz,
+                                 GCObject **list, int offset);
 LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v);
 LUAI_FUNC void luaC_barrierback_ (lua_State *L, GCObject *o);
+LUAI_FUNC void luaC_barrierproto_ (lua_State *L, Proto *p, Closure *c);
 LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt);
-LUAI_FUNC void luaC_changemode (lua_State *L, int newmode);
-
+LUAI_FUNC void luaC_checkupvalcolor (global_State *g, UpVal *uv);
+LUAI_FUNC void luaC_changemode (lua_State *L, int mode);
 
 #endif

linit.c

@@ -1,33 +1,20 @@
 /*
-** $Id: linit.c $
+** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $
 ** Initialization of libraries for lua.c and other clients
 ** See Copyright Notice in lua.h
 */
 
 
-#define linit_c
-#define LUA_LIB
-
 /*
 ** If you embed Lua in your program and need to open the standard
 ** libraries, call luaL_openlibs in your program. If you need a
 ** different set of libraries, copy this file to your project and edit
 ** it to suit your needs.
-**
-** You can also *preload* libraries, so that a later 'require' can
-** open the library, which is already linked to the application.
-** For that, do the following code:
-**
-**  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
-**  lua_pushcfunction(L, luaopen_modname);
-**  lua_setfield(L, -2, modname);
-**  lua_pop(L, 1);  // remove PRELOAD table
 */
 
-#include "lprefix.h"
 
-
-#include <stddef.h>
+#define linit_c
+#define LUA_LIB
 
 #include "lua.h"
 
@@ -40,26 +27,41 @@
 ** program
 */
 static const luaL_Reg loadedlibs[] = {
-  {LUA_GNAME, luaopen_base},
+  {"_G", luaopen_base},
   {LUA_LOADLIBNAME, luaopen_package},
   {LUA_COLIBNAME, luaopen_coroutine},
   {LUA_TABLIBNAME, luaopen_table},
   {LUA_IOLIBNAME, luaopen_io},
   {LUA_OSLIBNAME, luaopen_os},
   {LUA_STRLIBNAME, luaopen_string},
+  {LUA_BITLIBNAME, luaopen_bit32},
   {LUA_MATHLIBNAME, luaopen_math},
-  {LUA_UTF8LIBNAME, luaopen_utf8},
   {LUA_DBLIBNAME, luaopen_debug},
   {NULL, NULL}
 };
 
 
+/*
+** these libs are preloaded and must be required before used
+*/
+static const luaL_Reg preloadedlibs[] = {
+  {NULL, NULL}
+};
+
+
 LUALIB_API void luaL_openlibs (lua_State *L) {
   const luaL_Reg *lib;
-  /* "require" functions from 'loadedlibs' and set results to global table */
+  /* call open functions from 'loadedlibs' and set results to global table */
   for (lib = loadedlibs; lib->func; lib++) {
     luaL_requiref(L, lib->name, lib->func, 1);
     lua_pop(L, 1);  /* remove lib */
   }
+  /* add open functions from 'preloadedlibs' into 'package.preload' table */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+  for (lib = preloadedlibs; lib->func; lib++) {
+    lua_pushcfunction(L, lib->func);
+    lua_setfield(L, -2, lib->name);
+  }
+  lua_pop(L, 1);  /* remove _PRELOAD table */
 }
 

liolib.c

@@ -1,153 +1,120 @@
 /*
-** $Id: liolib.c $
+** $Id: liolib.c,v 2.112 2013/04/11 18:34:06 roberto Exp $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
 
-#define liolib_c
-#define LUA_LIB
 
-#include "lprefix.h"
+/*
+** This definition must come before the inclusion of 'stdio.h'; it
+** should not affect non-POSIX systems
+*/
+#if !defined(_FILE_OFFSET_BITS)
+#define	_LARGEFILE_SOURCE	1
+#define _FILE_OFFSET_BITS	64
+#endif
 
 
-#include <ctype.h>
 #include <errno.h>
-#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#define liolib_c
+#define LUA_LIB
+
 #include "lua.h"
 
 #include "lauxlib.h"
 #include "lualib.h"
 
 
-
+#if !defined(lua_checkmode)
 
 /*
+** Check whether 'mode' matches '[rwa]%+?b?'.
 ** Change this macro to accept other modes for 'fopen' besides
 ** the standard ones.
 */
-#if !defined(l_checkmode)
-
-/* accepted extensions to 'mode' in 'fopen' */
-#if !defined(L_MODEEXT)
-#define L_MODEEXT	"b"
-#endif
-
-/* Check whether 'mode' matches '[rwa]%+?[L_MODEEXT]*' */
-static int l_checkmode (const char *mode) {
-  return (*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&
-         (*mode != '+' || ((void)(++mode), 1)) &&  /* skip if char is '+' */
-         (strspn(mode, L_MODEEXT) == strlen(mode)));  /* check extensions */
-}
+#define lua_checkmode(mode) \
+	(*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&	\
+	(*mode != '+' || ++mode) &&  /* skip if char is '+' */	\
+	(*mode != 'b' || ++mode) &&  /* skip if char is 'b' */	\
+	(*mode == '\0'))
 
 #endif
 
 /*
 ** {======================================================
-** l_popen spawns a new process connected to the current
+** lua_popen spawns a new process connected to the current
 ** one through the file streams.
 ** =======================================================
 */
 
-#if !defined(l_popen)		/* { */
+#if !defined(lua_popen)	/* { */
 
-#if defined(LUA_USE_POSIX)	/* { */
+#if defined(LUA_USE_POPEN)	/* { */
 
-#define l_popen(L,c,m)		(fflush(NULL), popen(c,m))
-#define l_pclose(L,file)	(pclose(file))
+#define lua_popen(L,c,m)	((void)L, fflush(NULL), popen(c,m))
+#define lua_pclose(L,file)	((void)L, pclose(file))
 
-#elif defined(LUA_USE_WINDOWS)	/* }{ */
+#elif defined(LUA_WIN)		/* }{ */
 
-#define l_popen(L,c,m)		(_popen(c,m))
-#define l_pclose(L,file)	(_pclose(file))
+#define lua_popen(L,c,m)		((void)L, _popen(c,m))
+#define lua_pclose(L,file)		((void)L, _pclose(file))
 
-#if !defined(l_checkmodep)
-/* Windows accepts "[rw][bt]?" as valid modes */
-#define l_checkmodep(m)	((m[0] == 'r' || m[0] == 'w') && \
-  (m[1] == '\0' || ((m[1] == 'b' || m[1] == 't') && m[2] == '\0')))
-#endif
 
 #else				/* }{ */
 
-/* ISO C definitions */
-#define l_popen(L,c,m)  \
-	  ((void)c, (void)m, \
-	  luaL_error(L, "'popen' not supported"), \
-	  (FILE*)0)
-#define l_pclose(L,file)		((void)L, (void)file, -1)
+#define lua_popen(L,c,m)		((void)((void)c, m),  \
+		luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
+#define lua_pclose(L,file)		((void)((void)L, file), -1)
+
 
 #endif				/* } */
 
-#endif				/* } */
-
-
-#if !defined(l_checkmodep)
-/* By default, Lua accepts only "r" or "w" as valid modes */
-#define l_checkmodep(m)        ((m[0] == 'r' || m[0] == 'w') && m[1] == '\0')
-#endif
+#endif			/* } */
 
 /* }====================================================== */
 
 
-#if !defined(l_getc)		/* { */
-
-#if defined(LUA_USE_POSIX)
-#define l_getc(f)		getc_unlocked(f)
-#define l_lockfile(f)		flockfile(f)
-#define l_unlockfile(f)		funlockfile(f)
-#else
-#define l_getc(f)		getc(f)
-#define l_lockfile(f)		((void)0)
-#define l_unlockfile(f)		((void)0)
-#endif
-
-#endif				/* } */
-
-
 /*
 ** {======================================================
-** l_fseek: configuration for longer offsets
+** lua_fseek: configuration for longer offsets
 ** =======================================================
 */
 
-#if !defined(l_fseek)		/* { */
+#if !defined(lua_fseek)	&& !defined(LUA_ANSI)	/* { */
 
 #if defined(LUA_USE_POSIX)	/* { */
 
-#include <sys/types.h>
-
 #define l_fseek(f,o,w)		fseeko(f,o,w)
 #define l_ftell(f)		ftello(f)
 #define l_seeknum		off_t
 
-#elif defined(LUA_USE_WINDOWS) && !defined(_CRTIMP_TYPEINFO) \
+#elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \
    && defined(_MSC_VER) && (_MSC_VER >= 1400)	/* }{ */
-
 /* Windows (but not DDK) and Visual C++ 2005 or higher */
+
 #define l_fseek(f,o,w)		_fseeki64(f,o,w)
 #define l_ftell(f)		_ftelli64(f)
 #define l_seeknum		__int64
 
-#else				/* }{ */
+#endif	/* } */
 
-/* ISO C definitions */
+#endif			/* } */
+
+
+#if !defined(l_fseek)		/* default definitions */
 #define l_fseek(f,o,w)		fseek(f,o,w)
 #define l_ftell(f)		ftell(f)
 #define l_seeknum		long
-
-#endif				/* } */
-
-#endif				/* } */
+#endif
 
 /* }====================================================== */
 
 
-
 #define IO_PREFIX	"_IO_"
-#define IOPREF_LEN	(sizeof(IO_PREFIX)/sizeof(char) - 1)
 #define IO_INPUT	(IO_PREFIX "input")
 #define IO_OUTPUT	(IO_PREFIX "output")
 
@@ -165,7 +132,7 @@ static int io_type (lua_State *L) {
   luaL_checkany(L, 1);
   p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
   if (p == NULL)
-    luaL_pushfail(L);  /* not a file */
+    lua_pushnil(L);  /* not a file */
   else if (isclosed(p))
     lua_pushliteral(L, "closed file");
   else
@@ -186,7 +153,7 @@ static int f_tostring (lua_State *L) {
 
 static FILE *tofile (lua_State *L) {
   LStream *p = tolstream(L);
-  if (l_unlikely(isclosed(p)))
+  if (isclosed(p))
     luaL_error(L, "attempt to use a closed file");
   lua_assert(p->f);
   return p->f;
@@ -194,41 +161,31 @@ static FILE *tofile (lua_State *L) {
 
 
 /*
-** When creating file handles, always creates a 'closed' file handle
+** When creating file handles, always creates a `closed' file handle
 ** before opening the actual file; so, if there is a memory error, the
-** handle is in a consistent state.
+** file is not left opened.
 */
 static LStream *newprefile (lua_State *L) {
-  LStream *p = (LStream *)lua_newuserdatauv(L, sizeof(LStream), 0);
+  LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
   p->closef = NULL;  /* mark file handle as 'closed' */
   luaL_setmetatable(L, LUA_FILEHANDLE);
   return p;
 }
 
 
-/*
-** Calls the 'close' function from a file handle. The 'volatile' avoids
-** a bug in some versions of the Clang compiler (e.g., clang 3.0 for
-** 32 bits).
-*/
 static int aux_close (lua_State *L) {
   LStream *p = tolstream(L);
-  volatile lua_CFunction cf = p->closef;
+  lua_CFunction cf = p->closef;
   p->closef = NULL;  /* mark stream as closed */
   return (*cf)(L);  /* close it */
 }
 
 
-static int f_close (lua_State *L) {
-  tofile(L);  /* make sure argument is an open stream */
-  return aux_close(L);
-}
-
-
 static int io_close (lua_State *L) {
   if (lua_isnone(L, 1))  /* no argument? */
-    lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use default output */
-  return f_close(L);
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use standard output */
+  tofile(L);  /* make sure argument is an open stream */
+  return aux_close(L);
 }
 
 
@@ -261,8 +218,8 @@ static LStream *newfile (lua_State *L) {
 static void opencheck (lua_State *L, const char *fname, const char *mode) {
   LStream *p = newfile(L);
   p->f = fopen(fname, mode);
-  if (l_unlikely(p->f == NULL))
-    luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
+  if (p->f == NULL)
+    luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno));
 }
 
 
@@ -271,7 +228,7 @@ static int io_open (lua_State *L) {
   const char *mode = luaL_optstring(L, 2, "r");
   LStream *p = newfile(L);
   const char *md = mode;  /* to traverse/check mode */
-  luaL_argcheck(L, l_checkmode(md), 2, "invalid mode");
+  luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode");
   p->f = fopen(filename, mode);
   return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
 }
@@ -282,8 +239,7 @@ static int io_open (lua_State *L) {
 */
 static int io_pclose (lua_State *L) {
   LStream *p = tolstream(L);
-  errno = 0;
-  return luaL_execresult(L, l_pclose(L, p->f));
+  return luaL_execresult(L, lua_pclose(L, p->f));
 }
 
 
@@ -291,8 +247,7 @@ static int io_popen (lua_State *L) {
   const char *filename = luaL_checkstring(L, 1);
   const char *mode = luaL_optstring(L, 2, "r");
   LStream *p = newprefile(L);
-  luaL_argcheck(L, l_checkmodep(mode), 2, "invalid mode");
-  p->f = l_popen(L, filename, mode);
+  p->f = lua_popen(L, filename, mode);
   p->closef = &io_pclose;
   return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
 }
@@ -309,8 +264,8 @@ static FILE *getiofile (lua_State *L, const char *findex) {
   LStream *p;
   lua_getfield(L, LUA_REGISTRYINDEX, findex);
   p = (LStream *)lua_touserdata(L, -1);
-  if (l_unlikely(isclosed(p)))
-    luaL_error(L, "default %s file is closed", findex + IOPREF_LEN);
+  if (isclosed(p))
+    luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX));
   return p->f;
 }
 
@@ -345,28 +300,15 @@ static int io_output (lua_State *L) {
 static int io_readline (lua_State *L);
 
 
-/*
-** maximum number of arguments to 'f:lines'/'io.lines' (it + 3 must fit
-** in the limit for upvalues of a closure)
-*/
-#define MAXARGLINE	250
-
-/*
-** Auxiliary function to create the iteration function for 'lines'.
-** The iteration function is a closure over 'io_readline', with
-** the following upvalues:
-** 1) The file being read (first value in the stack)
-** 2) the number of arguments to read
-** 3) a boolean, true iff file has to be closed when finished ('toclose')
-** *) a variable number of format arguments (rest of the stack)
-*/
 static void aux_lines (lua_State *L, int toclose) {
+  int i;
   int n = lua_gettop(L) - 1;  /* number of arguments to read */
-  luaL_argcheck(L, n <= MAXARGLINE, MAXARGLINE + 2, "too many arguments");
-  lua_pushvalue(L, 1);  /* file */
+  /* ensure that arguments will fit here and into 'io_readline' stack */
+  luaL_argcheck(L, n <= LUA_MINSTACK - 3, LUA_MINSTACK - 3, "too many options");
+  lua_pushvalue(L, 1);  /* file handle */
   lua_pushinteger(L, n);  /* number of arguments to read */
   lua_pushboolean(L, toclose);  /* close/not close file when finished */
-  lua_rotate(L, 2, 3);  /* move the three values to their positions */
+  for (i = 1; i <= n; i++) lua_pushvalue(L, i + 1);  /* copy arguments */
   lua_pushcclosure(L, io_readline, 3 + n);
 }
 
@@ -378,11 +320,6 @@ static int f_lines (lua_State *L) {
 }
 
 
-/*
-** Return an iteration function for 'io.lines'. If file has to be
-** closed, also returns the file itself as a second result (to be
-** closed as the state at the exit of a generic for).
-*/
 static int io_lines (lua_State *L) {
   int toclose;
   if (lua_isnone(L, 1)) lua_pushnil(L);  /* at least one argument */
@@ -398,15 +335,8 @@ static int io_lines (lua_State *L) {
     lua_replace(L, 1);  /* put file at index 1 */
     toclose = 1;  /* close it after iteration */
   }
-  aux_lines(L, toclose);  /* push iteration function */
-  if (toclose) {
-    lua_pushnil(L);  /* state */
-    lua_pushnil(L);  /* control */
-    lua_pushvalue(L, 1);  /* file is the to-be-closed variable (4th result) */
-    return 4;
-  }
-  else
-    return 1;
+  aux_lines(L, toclose);
+  return 1;
 }
 
 
@@ -417,91 +347,13 @@ static int io_lines (lua_State *L) {
 */
 
 
-/* maximum length of a numeral */
-#if !defined (L_MAXLENNUM)
-#define L_MAXLENNUM     200
-#endif
-
-
-/* auxiliary structure used by 'read_number' */
-typedef struct {
-  FILE *f;  /* file being read */
-  int c;  /* current character (look ahead) */
-  int n;  /* number of elements in buffer 'buff' */
-  char buff[L_MAXLENNUM + 1];  /* +1 for ending '\0' */
-} RN;
-
-
-/*
-** Add current char to buffer (if not out of space) and read next one
-*/
-static int nextc (RN *rn) {
-  if (l_unlikely(rn->n >= L_MAXLENNUM)) {  /* buffer overflow? */
-    rn->buff[0] = '\0';  /* invalidate result */
-    return 0;  /* fail */
-  }
-  else {
-    rn->buff[rn->n++] = rn->c;  /* save current char */
-    rn->c = l_getc(rn->f);  /* read next one */
+static int read_number (lua_State *L, FILE *f) {
+  lua_Number d;
+  if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
+    lua_pushnumber(L, d);
     return 1;
   }
-}
-
-
-/*
-** Accept current char if it is in 'set' (of size 2)
-*/
-static int test2 (RN *rn, const char *set) {
-  if (rn->c == set[0] || rn->c == set[1])
-    return nextc(rn);
-  else return 0;
-}
-
-
-/*
-** Read a sequence of (hex)digits
-*/
-static int readdigits (RN *rn, int hex) {
-  int count = 0;
-  while ((hex ? isxdigit(rn->c) : isdigit(rn->c)) && nextc(rn))
-    count++;
-  return count;
-}
-
-
-/*
-** Read a number: first reads a valid prefix of a numeral into a buffer.
-** Then it calls 'lua_stringtonumber' to check whether the format is
-** correct and to convert it to a Lua number.
-*/
-static int read_number (lua_State *L, FILE *f) {
-  RN rn;
-  int count = 0;
-  int hex = 0;
-  char decp[2];
-  rn.f = f; rn.n = 0;
-  decp[0] = lua_getlocaledecpoint();  /* get decimal point from locale */
-  decp[1] = '.';  /* always accept a dot */
-  l_lockfile(rn.f);
-  do { rn.c = l_getc(rn.f); } while (isspace(rn.c));  /* skip spaces */
-  test2(&rn, "-+");  /* optional sign */
-  if (test2(&rn, "00")) {
-    if (test2(&rn, "xX")) hex = 1;  /* numeral is hexadecimal */
-    else count = 1;  /* count initial '0' as a valid digit */
-  }
-  count += readdigits(&rn, hex);  /* integral part */
-  if (test2(&rn, decp))  /* decimal point? */
-    count += readdigits(&rn, hex);  /* fractional part */
-  if (count > 0 && test2(&rn, (hex ? "pP" : "eE"))) {  /* exponent mark? */
-    test2(&rn, "-+");  /* exponent sign */
-    readdigits(&rn, 0);  /* exponent digits */
-  }
-  ungetc(rn.c, rn.f);  /* unread look-ahead char */
-  l_unlockfile(rn.f);
-  rn.buff[rn.n] = '\0';  /* finish string */
-  if (l_likely(lua_stringtonumber(L, rn.buff)))
-    return 1;  /* ok, it is a valid number */
-  else {  /* invalid format */
+  else {
    lua_pushnil(L);  /* "result" to be removed */
    return 0;  /* read fails */
   }
@@ -510,42 +362,48 @@ static int read_number (lua_State *L, FILE *f) {
 
 static int test_eof (lua_State *L, FILE *f) {
   int c = getc(f);
-  ungetc(c, f);  /* no-op when c == EOF */
-  lua_pushliteral(L, "");
+  ungetc(c, f);
+  lua_pushlstring(L, NULL, 0);
   return (c != EOF);
 }
 
 
 static int read_line (lua_State *L, FILE *f, int chop) {
   luaL_Buffer b;
-  int c;
   luaL_buffinit(L, &b);
-  do {  /* may need to read several chunks to get whole line */
-    char *buff = luaL_prepbuffer(&b);  /* preallocate buffer space */
-    int i = 0;
-    l_lockfile(f);  /* no memory errors can happen inside the lock */
-    while (i < LUAL_BUFFERSIZE && (c = l_getc(f)) != EOF && c != '\n')
-      buff[i++] = c;  /* read up to end of line or buffer limit */
-    l_unlockfile(f);
-    luaL_addsize(&b, i);
-  } while (c != EOF && c != '\n');  /* repeat until end of line */
-  if (!chop && c == '\n')  /* want a newline and have one? */
-    luaL_addchar(&b, c);  /* add ending newline to result */
-  luaL_pushresult(&b);  /* close buffer */
-  /* return ok if read something (either a newline or something else) */
-  return (c == '\n' || lua_rawlen(L, -1) > 0);
+  for (;;) {
+    size_t l;
+    char *p = luaL_prepbuffer(&b);
+    if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) {  /* eof? */
+      luaL_pushresult(&b);  /* close buffer */
+      return (lua_rawlen(L, -1) > 0);  /* check whether read something */
+    }
+    l = strlen(p);
+    if (l == 0 || p[l-1] != '\n')
+      luaL_addsize(&b, l);
+    else {
+      luaL_addsize(&b, l - chop);  /* chop 'eol' if needed */
+      luaL_pushresult(&b);  /* close buffer */
+      return 1;  /* read at least an `eol' */
+    }
+  }
 }
 
 
+#define MAX_SIZE_T	(~(size_t)0)
+
 static void read_all (lua_State *L, FILE *f) {
-  size_t nr;
+  size_t rlen = LUAL_BUFFERSIZE;  /* how much to read in each cycle */
   luaL_Buffer b;
   luaL_buffinit(L, &b);
-  do {  /* read file in chunks of LUAL_BUFFERSIZE bytes */
-    char *p = luaL_prepbuffer(&b);
-    nr = fread(p, sizeof(char), LUAL_BUFFERSIZE, f);
+  for (;;) {
+    char *p = luaL_prepbuffsize(&b, rlen);
+    size_t nr = fread(p, sizeof(char), rlen, f);
     luaL_addsize(&b, nr);
-  } while (nr == LUAL_BUFFERSIZE);
+    if (nr < rlen) break;  /* eof? */
+    else if (rlen <= (MAX_SIZE_T / 4))  /* avoid buffers too large */
+      rlen *= 2;  /* double buffer size at each iteration */
+  }
   luaL_pushresult(&b);  /* close buffer */
 }
 
@@ -565,25 +423,25 @@ static int read_chars (lua_State *L, FILE *f, size_t n) {
 
 static int g_read (lua_State *L, FILE *f, int first) {
   int nargs = lua_gettop(L) - 1;
-  int n, success;
+  int success;
+  int n;
   clearerr(f);
   if (nargs == 0) {  /* no arguments? */
     success = read_line(L, f, 1);
-    n = first + 1;  /* to return 1 result */
+    n = first+1;  /* to return 1 result */
   }
-  else {
-    /* ensure stack space for all results and for auxlib's buffer */
+  else {  /* ensure stack space for all results and for auxlib's buffer */
     luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
     success = 1;
     for (n = first; nargs-- && success; n++) {
       if (lua_type(L, n) == LUA_TNUMBER) {
-        size_t l = (size_t)luaL_checkinteger(L, n);
+        size_t l = (size_t)lua_tointeger(L, n);
         success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
       }
       else {
-        const char *p = luaL_checkstring(L, n);
-        if (*p == '*') p++;  /* skip optional '*' (for compatibility) */
-        switch (*p) {
+        const char *p = lua_tostring(L, n);
+        luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
+        switch (p[1]) {
           case 'n':  /* number */
             success = read_number(L, f);
             break;
@@ -607,7 +465,7 @@ static int g_read (lua_State *L, FILE *f, int first) {
     return luaL_fileresult(L, 0, NULL);
   if (!success) {
     lua_pop(L, 1);  /* remove last result */
-    luaL_pushfail(L);  /* push nil instead */
+    lua_pushnil(L);  /* push nil instead */
   }
   return n - first;
 }
@@ -623,9 +481,6 @@ static int f_read (lua_State *L) {
 }
 
 
-/*
-** Iteration function for 'lines'.
-*/
 static int io_readline (lua_State *L) {
   LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
   int i;
@@ -633,21 +488,20 @@ static int io_readline (lua_State *L) {
   if (isclosed(p))  /* file is already closed? */
     return luaL_error(L, "file is already closed");
   lua_settop(L , 1);
-  luaL_checkstack(L, n, "too many arguments");
   for (i = 1; i <= n; i++)  /* push arguments to 'g_read' */
     lua_pushvalue(L, lua_upvalueindex(3 + i));
   n = g_read(L, p->f, 2);  /* 'n' is number of results */
   lua_assert(n > 0);  /* should return at least a nil */
-  if (lua_toboolean(L, -n))  /* read at least one value? */
+  if (!lua_isnil(L, -n))  /* read at least one value? */
     return n;  /* return them */
-  else {  /* first result is false: EOF or error */
+  else {  /* first result is nil: EOF or error */
     if (n > 1) {  /* is there error information? */
       /* 2nd result is error message */
       return luaL_error(L, "%s", lua_tostring(L, -n + 1));
     }
     if (lua_toboolean(L, lua_upvalueindex(3))) {  /* generator created file? */
-      lua_settop(L, 0);  /* clear stack */
-      lua_pushvalue(L, lua_upvalueindex(1));  /* push file at index 1 */
+      lua_settop(L, 0);
+      lua_pushvalue(L, lua_upvalueindex(1));
       aux_close(L);  /* close it */
     }
     return 0;
@@ -663,12 +517,8 @@ static int g_write (lua_State *L, FILE *f, int arg) {
   for (; nargs--; arg++) {
     if (lua_type(L, arg) == LUA_TNUMBER) {
       /* optimization: could be done exactly as for strings */
-      int len = lua_isinteger(L, arg)
-                ? fprintf(f, LUA_INTEGER_FMT,
-                             (LUAI_UACINT)lua_tointeger(L, arg))
-                : fprintf(f, LUA_NUMBER_FMT,
-                             (LUAI_UACNUMBER)lua_tonumber(L, arg));
-      status = status && (len > 0);
+      status = status &&
+          fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
     }
     else {
       size_t l;
@@ -676,8 +526,7 @@ static int g_write (lua_State *L, FILE *f, int arg) {
       status = status && (fwrite(s, sizeof(char), l, f) == l);
     }
   }
-  if (l_likely(status))
-    return 1;  /* file handle already on stack top */
+  if (status) return 1;  /* file handle already on stack top */
   else return luaL_fileresult(L, status, NULL);
 }
 
@@ -699,15 +548,15 @@ static int f_seek (lua_State *L) {
   static const char *const modenames[] = {"set", "cur", "end", NULL};
   FILE *f = tofile(L);
   int op = luaL_checkoption(L, 2, "cur", modenames);
-  lua_Integer p3 = luaL_optinteger(L, 3, 0);
+  lua_Number p3 = luaL_optnumber(L, 3, 0);
   l_seeknum offset = (l_seeknum)p3;
-  luaL_argcheck(L, (lua_Integer)offset == p3, 3,
+  luaL_argcheck(L, (lua_Number)offset == p3, 3,
                   "not an integer in proper range");
   op = l_fseek(f, offset, mode[op]);
-  if (l_unlikely(op))
+  if (op)
     return luaL_fileresult(L, 0, NULL);  /* error */
   else {
-    lua_pushinteger(L, (lua_Integer)l_ftell(f));
+    lua_pushnumber(L, (lua_Number)l_ftell(f));
     return 1;
   }
 }
@@ -719,7 +568,7 @@ static int f_setvbuf (lua_State *L) {
   FILE *f = tofile(L);
   int op = luaL_checkoption(L, 2, NULL, modenames);
   lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
-  int res = setvbuf(f, NULL, mode[op], (size_t)sz);
+  int res = setvbuf(f, NULL, mode[op], sz);
   return luaL_fileresult(L, res == 0, NULL);
 }
 
@@ -757,37 +606,26 @@ static const luaL_Reg iolib[] = {
 /*
 ** methods for file handles
 */
-static const luaL_Reg meth[] = {
-  {"read", f_read},
-  {"write", f_write},
-  {"lines", f_lines},
+static const luaL_Reg flib[] = {
+  {"close", io_close},
   {"flush", f_flush},
+  {"lines", f_lines},
+  {"read", f_read},
   {"seek", f_seek},
-  {"close", f_close},
   {"setvbuf", f_setvbuf},
-  {NULL, NULL}
-};
-
-
-/*
-** metamethods for file handles
-*/
-static const luaL_Reg metameth[] = {
-  {"__index", NULL},  /* place holder */
+  {"write", f_write},
   {"__gc", f_gc},
-  {"__close", f_gc},
   {"__tostring", f_tostring},
   {NULL, NULL}
 };
 
 
 static void createmeta (lua_State *L) {
-  luaL_newmetatable(L, LUA_FILEHANDLE);  /* metatable for file handles */
-  luaL_setfuncs(L, metameth, 0);  /* add metamethods to new metatable */
-  luaL_newlibtable(L, meth);  /* create method table */
-  luaL_setfuncs(L, meth, 0);  /* add file methods to method table */
-  lua_setfield(L, -2, "__index");  /* metatable.__index = method table */
-  lua_pop(L, 1);  /* pop metatable */
+  luaL_newmetatable(L, LUA_FILEHANDLE);  /* create metatable for file handles */
+  lua_pushvalue(L, -1);  /* push metatable */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = metatable */
+  luaL_setfuncs(L, flib, 0);  /* add file methods to new metatable */
+  lua_pop(L, 1);  /* pop new metatable */
 }
 
 
@@ -797,7 +635,7 @@ static void createmeta (lua_State *L) {
 static int io_noclose (lua_State *L) {
   LStream *p = tolstream(L);
   p->closef = &io_noclose;  /* keep file opened */
-  luaL_pushfail(L);
+  lua_pushnil(L);
   lua_pushliteral(L, "cannot close standard file");
   return 2;
 }

ljumptab.h

@@ -1,112 +0,0 @@
-/*
-** $Id: ljumptab.h $
-** Jump Table for the Lua interpreter
-** See Copyright Notice in lua.h
-*/
-
-
-#undef vmdispatch
-#undef vmcase
-#undef vmbreak
-
-#define vmdispatch(x)     goto *disptab[x];
-
-#define vmcase(l)     L_##l:
-
-#define vmbreak		vmfetch(); vmdispatch(GET_OPCODE(i));
-
-
-static const void *const disptab[NUM_OPCODES] = {
-
-#if 0
-** you can update the following list with this command:
-**
-**  sed -n '/^OP_/\!d; s/OP_/\&\&L_OP_/ ; s/,.*/,/ ; s/\/.*// ; p'  lopcodes.h
-**
-#endif
-
-&&L_OP_MOVE,
-&&L_OP_LOADI,
-&&L_OP_LOADF,
-&&L_OP_LOADK,
-&&L_OP_LOADKX,
-&&L_OP_LOADFALSE,
-&&L_OP_LFALSESKIP,
-&&L_OP_LOADTRUE,
-&&L_OP_LOADNIL,
-&&L_OP_GETUPVAL,
-&&L_OP_SETUPVAL,
-&&L_OP_GETTABUP,
-&&L_OP_GETTABLE,
-&&L_OP_GETI,
-&&L_OP_GETFIELD,
-&&L_OP_SETTABUP,
-&&L_OP_SETTABLE,
-&&L_OP_SETI,
-&&L_OP_SETFIELD,
-&&L_OP_NEWTABLE,
-&&L_OP_SELF,
-&&L_OP_ADDI,
-&&L_OP_ADDK,
-&&L_OP_SUBK,
-&&L_OP_MULK,
-&&L_OP_MODK,
-&&L_OP_POWK,
-&&L_OP_DIVK,
-&&L_OP_IDIVK,
-&&L_OP_BANDK,
-&&L_OP_BORK,
-&&L_OP_BXORK,
-&&L_OP_SHRI,
-&&L_OP_SHLI,
-&&L_OP_ADD,
-&&L_OP_SUB,
-&&L_OP_MUL,
-&&L_OP_MOD,
-&&L_OP_POW,
-&&L_OP_DIV,
-&&L_OP_IDIV,
-&&L_OP_BAND,
-&&L_OP_BOR,
-&&L_OP_BXOR,
-&&L_OP_SHL,
-&&L_OP_SHR,
-&&L_OP_MMBIN,
-&&L_OP_MMBINI,
-&&L_OP_MMBINK,
-&&L_OP_UNM,
-&&L_OP_BNOT,
-&&L_OP_NOT,
-&&L_OP_LEN,
-&&L_OP_CONCAT,
-&&L_OP_CLOSE,
-&&L_OP_TBC,
-&&L_OP_JMP,
-&&L_OP_EQ,
-&&L_OP_LT,
-&&L_OP_LE,
-&&L_OP_EQK,
-&&L_OP_EQI,
-&&L_OP_LTI,
-&&L_OP_LEI,
-&&L_OP_GTI,
-&&L_OP_GEI,
-&&L_OP_TEST,
-&&L_OP_TESTSET,
-&&L_OP_CALL,
-&&L_OP_TAILCALL,
-&&L_OP_RETURN,
-&&L_OP_RETURN0,
-&&L_OP_RETURN1,
-&&L_OP_FORLOOP,
-&&L_OP_FORPREP,
-&&L_OP_TFORPREP,
-&&L_OP_TFORCALL,
-&&L_OP_TFORLOOP,
-&&L_OP_SETLIST,
-&&L_OP_CLOSURE,
-&&L_OP_VARARG,
-&&L_OP_VARARGPREP,
-&&L_OP_EXTRAARG
-
-};

llex.c

@@ -1,24 +1,20 @@
 /*
-** $Id: llex.c $
+** $Id: llex.c,v 2.63.1.2 2013/08/30 15:49:41 roberto Exp roberto $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
 
-#define llex_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
 
 #include <locale.h>
 #include <string.h>
 
+#define llex_c
+#define LUA_CORE
+
 #include "lua.h"
 
 #include "lctype.h"
-#include "ldebug.h"
 #include "ldo.h"
-#include "lgc.h"
 #include "llex.h"
 #include "lobject.h"
 #include "lparser.h"
@@ -29,7 +25,7 @@
 
 
 
-#define next(ls)	(ls->current = zgetc(ls->z))
+#define next(ls) (ls->current = zgetc(ls->z))
 
 
 
@@ -42,9 +38,8 @@ static const char *const luaX_tokens [] = {
     "end", "false", "for", "function", "goto", "if",
     "in", "local", "nil", "not", "or", "repeat",
     "return", "then", "true", "until", "while",
-    "//", "..", "...", "==", ">=", "<=", "~=",
-    "<<", ">>", "::", "<eof>",
-    "<number>", "<integer>", "<name>", "<string>"
+    "..", "...", "==", ">=", "<=", "~=", "::", "<eof>",
+    "<number>", "<name>", "<string>"
 };
 
 
@@ -58,38 +53,35 @@ static void save (LexState *ls, int c) {
   Mbuffer *b = ls->buff;
   if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
     size_t newsize;
-    if (luaZ_sizebuffer(b) >= MAX_SIZE/2)
+    if (luaZ_sizebuffer(b) >= MAX_SIZET/2)
       lexerror(ls, "lexical element too long", 0);
     newsize = luaZ_sizebuffer(b) * 2;
     luaZ_resizebuffer(ls->L, b, newsize);
   }
-  b->buffer[luaZ_bufflen(b)++] = cast_char(c);
+  b->buffer[luaZ_bufflen(b)++] = cast(char, c);
 }
 
 
 void luaX_init (lua_State *L) {
   int i;
-  TString *e = luaS_newliteral(L, LUA_ENV);  /* create env name */
-  luaC_fix(L, obj2gco(e));  /* never collect this name */
   for (i=0; i<NUM_RESERVED; i++) {
     TString *ts = luaS_new(L, luaX_tokens[i]);
-    luaC_fix(L, obj2gco(ts));  /* reserved words are never collected */
-    ts->extra = cast_byte(i+1);  /* reserved word */
+    luaS_fix(ts);  /* reserved words are never collected */
+    ts->tsv.extra = cast_byte(i+1);  /* reserved word */
   }
 }
 
 
 const char *luaX_token2str (LexState *ls, int token) {
   if (token < FIRST_RESERVED) {  /* single-byte symbols? */
-    if (lisprint(token))
-      return luaO_pushfstring(ls->L, "'%c'", token);
-    else  /* control character */
-      return luaO_pushfstring(ls->L, "'<\\%d>'", token);
+    lua_assert(token == cast(unsigned char, token));
+    return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) :
+                              luaO_pushfstring(ls->L, "char(%d)", token);
   }
   else {
     const char *s = luaX_tokens[token - FIRST_RESERVED];
     if (token < TK_EOS)  /* fixed format (symbols and reserved words)? */
-      return luaO_pushfstring(ls->L, "'%s'", s);
+      return luaO_pushfstring(ls->L, LUA_QS, s);
     else  /* names, strings, and numerals */
       return s;
   }
@@ -98,10 +90,11 @@ const char *luaX_token2str (LexState *ls, int token) {
 
 static const char *txtToken (LexState *ls, int token) {
   switch (token) {
-    case TK_NAME: case TK_STRING:
-    case TK_FLT: case TK_INT:
+    case TK_NAME:
+    case TK_STRING:
+    case TK_NUMBER:
       save(ls, '\0');
-      return luaO_pushfstring(ls->L, "'%s'", luaZ_buffer(ls->buff));
+      return luaO_pushfstring(ls->L, LUA_QS, luaZ_buffer(ls->buff));
     default:
       return luaX_token2str(ls, token);
   }
@@ -109,7 +102,9 @@ static const char *txtToken (LexState *ls, int token) {
 
 
 static l_noret lexerror (LexState *ls, const char *msg, int token) {
-  msg = luaG_addinfo(ls->L, msg, ls->source, ls->linenumber);
+  char buff[LUA_IDSIZE];
+  luaO_chunkid(buff, getstr(ls->source), LUA_IDSIZE);
+  msg = luaO_pushfstring(ls->L, "%s:%d: %s", buff, ls->linenumber, msg);
   if (token)
     luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
   luaD_throw(ls->L, LUA_ERRSYNTAX);
@@ -122,29 +117,26 @@ l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
 
 
 /*
-** Creates a new string and anchors it in scanner's table so that it
-** will not be collected until the end of the compilation; by that time
-** it should be anchored somewhere. It also internalizes long strings,
-** ensuring there is only one copy of each unique string.  The table
-** here is used as a set: the string enters as the key, while its value
-** is irrelevant. We use the string itself as the value only because it
-** is a TValue readily available. Later, the code generation can change
-** this value.
+** creates a new string and anchors it in function's table so that
+** it will not be collected until the end of the function's compilation
+** (by that time it should be anchored in function's prototype)
 */
 TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
   lua_State *L = ls->L;
+  TValue *o;  /* entry for `str' */
   TString *ts = luaS_newlstr(L, str, l);  /* create new string */
-  const TValue *o = luaH_getstr(ls->h, ts);
-  if (!ttisnil(o))  /* string already present? */
-    ts = keystrval(nodefromval(o));  /* get saved copy */
-  else {  /* not in use yet */
-    TValue *stv = s2v(L->top.p++);  /* reserve stack space for string */
-    setsvalue(L, stv, ts);  /* temporarily anchor the string */
-    luaH_finishset(L, ls->h, stv, o, stv);  /* t[string] = string */
-    /* table is not a metatable, so it does not need to invalidate cache */
+  setsvalue2s(L, L->top++, ts);  /* temporarily anchor it in stack */
+  o = luaH_set(L, ls->fs->h, L->top - 1);
+  if (ttisnil(o)) {  /* not in use yet? (see 'addK') */
+    /* boolean value does not need GC barrier;
+       table has no metatable, so it does not need to invalidate cache */
+    setbvalue(o, 1);  /* t[string] = true */
     luaC_checkGC(L);
-    L->top.p--;  /* remove string from stack */
   }
+  else {  /* string already present */
+    ts = rawtsvalue(keyfromval(o));  /* re-use value previously stored */
+  }
+  L->top--;  /* remove string from stack */
   return ts;
 }
 
@@ -156,9 +148,9 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
 static void inclinenumber (LexState *ls) {
   int old = ls->current;
   lua_assert(currIsNewline(ls));
-  next(ls);  /* skip '\n' or '\r' */
+  next(ls);  /* skip `\n' or `\r' */
   if (currIsNewline(ls) && ls->current != old)
-    next(ls);  /* skip '\n\r' or '\r\n' */
+    next(ls);  /* skip `\n\r' or `\r\n' */
   if (++ls->linenumber >= MAX_INT)
     lexerror(ls, "chunk has too many lines", 0);
 }
@@ -166,7 +158,7 @@ static void inclinenumber (LexState *ls) {
 
 void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
                     int firstchar) {
-  ls->t.token = 0;
+  ls->decpoint = '.';
   ls->L = L;
   ls->current = firstchar;
   ls->lookahead.token = TK_EOS;  /* no look-ahead token */
@@ -175,7 +167,8 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
   ls->linenumber = 1;
   ls->lastline = 1;
   ls->source = source;
-  ls->envn = luaS_newliteral(L, LUA_ENV);  /* get env name */
+  ls->envn = luaS_new(L, LUA_ENV);  /* create env name */
+  luaS_fix(ls->envn);  /* never collect this name */
   luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER);  /* initialize buffer */
 }
 
@@ -188,82 +181,81 @@ void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
 */
 
 
-static int check_next1 (LexState *ls, int c) {
-  if (ls->current == c) {
-    next(ls);
-    return 1;
-  }
-  else return 0;
+
+static int check_next (LexState *ls, const char *set) {
+  if (ls->current == '\0' || !strchr(set, ls->current))
+    return 0;
+  save_and_next(ls);
+  return 1;
 }
 
 
 /*
-** Check whether current char is in set 'set' (with two chars) and
-** saves it
+** change all characters 'from' in buffer to 'to'
 */
-static int check_next2 (LexState *ls, const char *set) {
-  lua_assert(set[2] == '\0');
-  if (ls->current == set[0] || ls->current == set[1]) {
-    save_and_next(ls);
-    return 1;
+static void buffreplace (LexState *ls, char from, char to) {
+  size_t n = luaZ_bufflen(ls->buff);
+  char *p = luaZ_buffer(ls->buff);
+  while (n--)
+    if (p[n] == from) p[n] = to;
+}
+
+
+#if !defined(getlocaledecpoint)
+#define getlocaledecpoint()	(localeconv()->decimal_point[0])
+#endif
+
+
+#define buff2d(b,e)	luaO_str2d(luaZ_buffer(b), luaZ_bufflen(b) - 1, e)
+
+/*
+** in case of format error, try to change decimal point separator to
+** the one defined in the current locale and check again
+*/
+static void trydecpoint (LexState *ls, SemInfo *seminfo) {
+  char old = ls->decpoint;
+  ls->decpoint = getlocaledecpoint();
+  buffreplace(ls, old, ls->decpoint);  /* try new decimal separator */
+  if (!buff2d(ls->buff, &seminfo->r)) {
+    /* format error with correct decimal point: no more options */
+    buffreplace(ls, ls->decpoint, '.');  /* undo change (for error message) */
+    lexerror(ls, "malformed number", TK_NUMBER);
   }
-  else return 0;
 }
 
 
 /* LUA_NUMBER */
 /*
-** This function is quite liberal in what it accepts, as 'luaO_str2num'
-** will reject ill-formed numerals. Roughly, it accepts the following
-** pattern:
-**
-**   %d(%x|%.|([Ee][+-]?))* | 0[Xx](%x|%.|([Pp][+-]?))*
-**
-** The only tricky part is to accept [+-] only after a valid exponent
-** mark, to avoid reading '3-4' or '0xe+1' as a single number.
-**
-** The caller might have already read an initial dot.
+** this function is quite liberal in what it accepts, as 'luaO_str2d'
+** will reject ill-formed numerals.
 */
-static int read_numeral (LexState *ls, SemInfo *seminfo) {
-  TValue obj;
+static void read_numeral (LexState *ls, SemInfo *seminfo) {
   const char *expo = "Ee";
   int first = ls->current;
   lua_assert(lisdigit(ls->current));
   save_and_next(ls);
-  if (first == '0' && check_next2(ls, "xX"))  /* hexadecimal? */
+  if (first == '0' && check_next(ls, "Xx"))  /* hexadecimal? */
     expo = "Pp";
   for (;;) {
-    if (check_next2(ls, expo))  /* exponent mark? */
-      check_next2(ls, "-+");  /* optional exponent sign */
-    else if (lisxdigit(ls->current) || ls->current == '.')  /* '%x|%.' */
+    if (check_next(ls, expo))  /* exponent part? */
+      check_next(ls, "+-");  /* optional exponent sign */
+    if (lisxdigit(ls->current) || ls->current == '.')
       save_and_next(ls);
-    else break;
+    else  break;
   }
-  if (lislalpha(ls->current))  /* is numeral touching a letter? */
-    save_and_next(ls);  /* force an error */
   save(ls, '\0');
-  if (luaO_str2num(luaZ_buffer(ls->buff), &obj) == 0)  /* format error? */
-    lexerror(ls, "malformed number", TK_FLT);
-  if (ttisinteger(&obj)) {
-    seminfo->i = ivalue(&obj);
-    return TK_INT;
-  }
-  else {
-    lua_assert(ttisfloat(&obj));
-    seminfo->r = fltvalue(&obj);
-    return TK_FLT;
-  }
+  buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
+  if (!buff2d(ls->buff, &seminfo->r))  /* format error? */
+    trydecpoint(ls, seminfo); /* try to update decimal point separator */
 }
 
 
 /*
-** read a sequence '[=*[' or ']=*]', leaving the last bracket. If
-** sequence is well formed, return its number of '='s + 2; otherwise,
-** return 1 if it is a single bracket (no '='s and no 2nd bracket);
-** otherwise (an unfinished '[==...') return 0.
+** skip a sequence '[=*[' or ']=*]' and return its number of '='s or
+** -1 if sequence is malformed
 */
-static size_t skip_sep (LexState *ls) {
-  size_t count = 0;
+static int skip_sep (LexState *ls) {
+  int count = 0;
   int s = ls->current;
   lua_assert(s == '[' || s == ']');
   save_and_next(ls);
@@ -271,29 +263,23 @@ static size_t skip_sep (LexState *ls) {
     save_and_next(ls);
     count++;
   }
-  return (ls->current == s) ? count + 2
-         : (count == 0) ? 1
-         : 0;
+  return (ls->current == s) ? count : (-count) - 1;
 }
 
 
-static void read_long_string (LexState *ls, SemInfo *seminfo, size_t sep) {
-  int line = ls->linenumber;  /* initial line (for error message) */
-  save_and_next(ls);  /* skip 2nd '[' */
+static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
+  save_and_next(ls);  /* skip 2nd `[' */
   if (currIsNewline(ls))  /* string starts with a newline? */
     inclinenumber(ls);  /* skip it */
   for (;;) {
     switch (ls->current) {
-      case EOZ: {  /* error */
-        const char *what = (seminfo ? "string" : "comment");
-        const char *msg = luaO_pushfstring(ls->L,
-                     "unfinished long %s (starting at line %d)", what, line);
-        lexerror(ls, msg, TK_EOS);
+      case EOZ:
+        lexerror(ls, (seminfo) ? "unfinished long string" :
+                                 "unfinished long comment", TK_EOS);
         break;  /* to avoid warnings */
-      }
       case ']': {
         if (skip_sep(ls) == sep) {
-          save_and_next(ls);  /* skip 2nd ']' */
+          save_and_next(ls);  /* skip 2nd `]' */
           goto endloop;
         }
         break;
@@ -311,70 +297,45 @@ static void read_long_string (LexState *ls, SemInfo *seminfo, size_t sep) {
     }
   } endloop:
   if (seminfo)
-    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + sep,
-                                     luaZ_bufflen(ls->buff) - 2 * sep);
+    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
+                                     luaZ_bufflen(ls->buff) - 2*(2 + sep));
 }
 
 
-static void esccheck (LexState *ls, int c, const char *msg) {
-  if (!c) {
-    if (ls->current != EOZ)
-      save_and_next(ls);  /* add current to buffer for error message */
-    lexerror(ls, msg, TK_STRING);
-  }
-}
-
-
-static int gethexa (LexState *ls) {
-  save_and_next(ls);
-  esccheck (ls, lisxdigit(ls->current), "hexadecimal digit expected");
-  return luaO_hexavalue(ls->current);
+static void escerror (LexState *ls, int *c, int n, const char *msg) {
+  int i;
+  luaZ_resetbuffer(ls->buff);  /* prepare error message */
+  save(ls, '\\');
+  for (i = 0; i < n && c[i] != EOZ; i++)
+    save(ls, c[i]);
+  lexerror(ls, msg, TK_STRING);
 }
 
 
 static int readhexaesc (LexState *ls) {
-  int r = gethexa(ls);
-  r = (r << 4) + gethexa(ls);
-  luaZ_buffremove(ls->buff, 2);  /* remove saved chars from buffer */
-  return r;
-}
-
-
-static unsigned long readutf8esc (LexState *ls) {
-  unsigned long r;
-  int i = 4;  /* chars to be removed: '\', 'u', '{', and first digit */
-  save_and_next(ls);  /* skip 'u' */
-  esccheck(ls, ls->current == '{', "missing '{'");
-  r = gethexa(ls);  /* must have at least one digit */
-  while (cast_void(save_and_next(ls)), lisxdigit(ls->current)) {
-    i++;
-    esccheck(ls, r <= (0x7FFFFFFFu >> 4), "UTF-8 value too large");
-    r = (r << 4) + luaO_hexavalue(ls->current);
+  int c[3], i;  /* keep input for error message */
+  int r = 0;  /* result accumulator */
+  c[0] = 'x';  /* for error message */
+  for (i = 1; i < 3; i++) {  /* read two hexadecimal digits */
+    c[i] = next(ls);
+    if (!lisxdigit(c[i]))
+      escerror(ls, c, i + 1, "hexadecimal digit expected");
+    r = (r << 4) + luaO_hexavalue(c[i]);
   }
-  esccheck(ls, ls->current == '}', "missing '}'");
-  next(ls);  /* skip '}' */
-  luaZ_buffremove(ls->buff, i);  /* remove saved chars from buffer */
   return r;
 }
 
 
-static void utf8esc (LexState *ls) {
-  char buff[UTF8BUFFSZ];
-  int n = luaO_utf8esc(buff, readutf8esc(ls));
-  for (; n > 0; n--)  /* add 'buff' to string */
-    save(ls, buff[UTF8BUFFSZ - n]);
-}
-
-
 static int readdecesc (LexState *ls) {
-  int i;
+  int c[3], i;
   int r = 0;  /* result accumulator */
   for (i = 0; i < 3 && lisdigit(ls->current); i++) {  /* read up to 3 digits */
-    r = 10*r + ls->current - '0';
-    save_and_next(ls);
+    c[i] = ls->current;
+    r = 10*r + c[i] - '0';
+    next(ls);
   }
-  esccheck(ls, r <= UCHAR_MAX, "decimal escape too large");
-  luaZ_buffremove(ls->buff, i);  /* remove read digits from buffer */
+  if (r > UCHAR_MAX)
+    escerror(ls, c, i, "decimal escape too large");
   return r;
 }
 
@@ -392,7 +353,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
         break;  /* to avoid warnings */
       case '\\': {  /* escape sequences */
         int c;  /* final character to be saved */
-        save_and_next(ls);  /* keep '\\' for error messages */
+        next(ls);  /* do not save the `\' */
         switch (ls->current) {
           case 'a': c = '\a'; goto read_save;
           case 'b': c = '\b'; goto read_save;
@@ -402,14 +363,12 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
           case 't': c = '\t'; goto read_save;
           case 'v': c = '\v'; goto read_save;
           case 'x': c = readhexaesc(ls); goto read_save;
-          case 'u': utf8esc(ls);  goto no_save;
           case '\n': case '\r':
             inclinenumber(ls); c = '\n'; goto only_save;
           case '\\': case '\"': case '\'':
             c = ls->current; goto read_save;
           case EOZ: goto no_save;  /* will raise an error next loop */
           case 'z': {  /* zap following span of spaces */
-            luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
             next(ls);  /* skip the 'z' */
             while (lisspace(ls->current)) {
               if (currIsNewline(ls)) inclinenumber(ls);
@@ -418,18 +377,15 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
             goto no_save;
           }
           default: {
-            esccheck(ls, lisdigit(ls->current), "invalid escape sequence");
-            c = readdecesc(ls);  /* digital escape '\ddd' */
+            if (!lisdigit(ls->current))
+              escerror(ls, &ls->current, 1, "invalid escape sequence");
+            /* digital escape \ddd */
+            c = readdecesc(ls);
             goto only_save;
           }
         }
-       read_save:
-         next(ls);
-         /* go through */
-       only_save:
-         luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
-         save(ls, c);
-         /* go through */
+       read_save: next(ls);  /* read next character */
+       only_save: save(ls, c);  /* save 'c' */
        no_save: break;
       }
       default:
@@ -460,9 +416,9 @@ static int llex (LexState *ls, SemInfo *seminfo) {
         /* else is a comment */
         next(ls);
         if (ls->current == '[') {  /* long comment? */
-          size_t sep = skip_sep(ls);
-          luaZ_resetbuffer(ls->buff);  /* 'skip_sep' may dirty the buffer */
-          if (sep >= 2) {
+          int sep = skip_sep(ls);
+          luaZ_resetbuffer(ls->buff);  /* `skip_sep' may dirty the buffer */
+          if (sep >= 0) {
             read_long_string(ls, NULL, sep);  /* skip long comment */
             luaZ_resetbuffer(ls->buff);  /* previous call may dirty the buff. */
             break;
@@ -474,46 +430,38 @@ static int llex (LexState *ls, SemInfo *seminfo) {
         break;
       }
       case '[': {  /* long string or simply '[' */
-        size_t sep = skip_sep(ls);
-        if (sep >= 2) {
+        int sep = skip_sep(ls);
+        if (sep >= 0) {
           read_long_string(ls, seminfo, sep);
           return TK_STRING;
         }
-        else if (sep == 0)  /* '[=...' missing second bracket? */
-          lexerror(ls, "invalid long string delimiter", TK_STRING);
-        return '[';
+        else if (sep == -1) return '[';
+        else lexerror(ls, "invalid long string delimiter", TK_STRING);
       }
       case '=': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_EQ;  /* '==' */
-        else return '=';
+        if (ls->current != '=') return '=';
+        else { next(ls); return TK_EQ; }
       }
       case '<': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_LE;  /* '<=' */
-        else if (check_next1(ls, '<')) return TK_SHL;  /* '<<' */
-        else return '<';
+        if (ls->current != '=') return '<';
+        else { next(ls); return TK_LE; }
       }
       case '>': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_GE;  /* '>=' */
-        else if (check_next1(ls, '>')) return TK_SHR;  /* '>>' */
-        else return '>';
-      }
-      case '/': {
-        next(ls);
-        if (check_next1(ls, '/')) return TK_IDIV;  /* '//' */
-        else return '/';
+        if (ls->current != '=') return '>';
+        else { next(ls); return TK_GE; }
       }
       case '~': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_NE;  /* '~=' */
-        else return '~';
+        if (ls->current != '=') return '~';
+        else { next(ls); return TK_NE; }
       }
       case ':': {
         next(ls);
-        if (check_next1(ls, ':')) return TK_DBCOLON;  /* '::' */
-        else return ':';
+        if (ls->current != ':') return ':';
+        else { next(ls); return TK_DBCOLON; }
       }
       case '"': case '\'': {  /* short literal strings */
         read_string(ls, ls->current, seminfo);
@@ -521,17 +469,18 @@ static int llex (LexState *ls, SemInfo *seminfo) {
       }
       case '.': {  /* '.', '..', '...', or number */
         save_and_next(ls);
-        if (check_next1(ls, '.')) {
-          if (check_next1(ls, '.'))
+        if (check_next(ls, ".")) {
+          if (check_next(ls, "."))
             return TK_DOTS;   /* '...' */
           else return TK_CONCAT;   /* '..' */
         }
         else if (!lisdigit(ls->current)) return '.';
-        else return read_numeral(ls, seminfo);
+        /* else go through */
       }
       case '0': case '1': case '2': case '3': case '4':
       case '5': case '6': case '7': case '8': case '9': {
-        return read_numeral(ls, seminfo);
+        read_numeral(ls, seminfo);
+        return TK_NUMBER;
       }
       case EOZ: {
         return TK_EOS;
@@ -546,12 +495,12 @@ static int llex (LexState *ls, SemInfo *seminfo) {
                                   luaZ_bufflen(ls->buff));
           seminfo->ts = ts;
           if (isreserved(ts))  /* reserved word? */
-            return ts->extra - 1 + FIRST_RESERVED;
+            return ts->tsv.extra - 1 + FIRST_RESERVED;
           else {
             return TK_NAME;
           }
         }
-        else {  /* single-char tokens ('+', '*', '%', '{', '}', ...) */
+        else {  /* single-char tokens (+ - / ...) */
           int c = ls->current;
           next(ls);
           return c;

llex.h

@@ -1,5 +1,5 @@
 /*
-** $Id: llex.h $
+** $Id: llex.h,v 1.72 2011/11/30 12:43:51 roberto Exp $
 ** Lexical Analyzer
 ** See Copyright Notice in lua.h
 */
@@ -7,23 +7,13 @@
 #ifndef llex_h
 #define llex_h
 
-#include <limits.h>
-
 #include "lobject.h"
 #include "lzio.h"
 
 
-/*
-** Single-char tokens (terminal symbols) are represented by their own
-** numeric code. Other tokens start at the following value.
-*/
-#define FIRST_RESERVED	(UCHAR_MAX + 1)
+#define FIRST_RESERVED	257
 
 
-#if !defined(LUA_ENV)
-#define LUA_ENV		"_ENV"
-#endif
-
 
 /*
 * WARNING: if you change the order of this enumeration,
@@ -36,19 +26,16 @@ enum RESERVED {
   TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
   TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
   /* other terminal symbols */
-  TK_IDIV, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE,
-  TK_SHL, TK_SHR,
-  TK_DBCOLON, TK_EOS,
-  TK_FLT, TK_INT, TK_NAME, TK_STRING
+  TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_DBCOLON, TK_EOS,
+  TK_NUMBER, TK_NAME, TK_STRING
 };
 
 /* number of reserved words */
-#define NUM_RESERVED	(cast_int(TK_WHILE-FIRST_RESERVED + 1))
+#define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
 
 
 typedef union {
   lua_Number r;
-  lua_Integer i;
   TString *ts;
 } SemInfo;  /* semantics information */
 
@@ -64,17 +51,17 @@ typedef struct Token {
 typedef struct LexState {
   int current;  /* current character (charint) */
   int linenumber;  /* input line counter */
-  int lastline;  /* line of last token 'consumed' */
+  int lastline;  /* line of last token `consumed' */
   Token t;  /* current token */
   Token lookahead;  /* look ahead token */
   struct FuncState *fs;  /* current function (parser) */
   struct lua_State *L;
   ZIO *z;  /* input stream */
   Mbuffer *buff;  /* buffer for tokens */
-  Table *h;  /* to avoid collection/reuse strings */
   struct Dyndata *dyd;  /* dynamic structures used by the parser */
   TString *source;  /* current source name */
   TString *envn;  /* environment variable name */
+  char decpoint;  /* locale decimal point */
 } LexState;
 
 

llimits.h

@@ -1,6 +1,6 @@
 /*
-** $Id: llimits.h $
-** Limits, basic types, and some other 'installation-dependent' definitions
+** $Id: llimits.h,v 1.103 2013/02/20 14:08:56 roberto Exp $
+** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
 
@@ -15,101 +15,53 @@
 #include "lua.h"
 
 
-/*
-** 'lu_mem' and 'l_mem' are unsigned/signed integers big enough to count
-** the total memory used by Lua (in bytes). Usually, 'size_t' and
-** 'ptrdiff_t' should work, but we use 'long' for 16-bit machines.
-*/
-#if defined(LUAI_MEM)		/* { external definitions? */
+typedef unsigned LUA_INT32 lu_int32;
+
 typedef LUAI_UMEM lu_mem;
+
 typedef LUAI_MEM l_mem;
-#elif LUAI_IS32INT	/* }{ */
-typedef size_t lu_mem;
-typedef ptrdiff_t l_mem;
-#else  /* 16-bit ints */	/* }{ */
-typedef unsigned long lu_mem;
-typedef long l_mem;
-#endif				/* } */
 
 
-/* chars used as small naturals (so that 'char' is reserved for characters) */
+
+/* chars used as small naturals (so that `char' is reserved for characters) */
 typedef unsigned char lu_byte;
-typedef signed char ls_byte;
 
 
-/* maximum value for size_t */
-#define MAX_SIZET	((size_t)(~(size_t)0))
+#define MAX_SIZET	((size_t)(~(size_t)0)-2)
 
-/* maximum size visible for Lua (must be representable in a lua_Integer) */
-#define MAX_SIZE	(sizeof(size_t) < sizeof(lua_Integer) ? MAX_SIZET \
-                          : (size_t)(LUA_MAXINTEGER))
+#define MAX_LUMEM	((lu_mem)(~(lu_mem)0)-2)
+
+#define MAX_LMEM	((l_mem) ((MAX_LUMEM >> 1) - 2))
 
 
-#define MAX_LUMEM	((lu_mem)(~(lu_mem)0))
-
-#define MAX_LMEM	((l_mem)(MAX_LUMEM >> 1))
-
-
-#define MAX_INT		INT_MAX  /* maximum value of an int */
-
+#define MAX_INT (INT_MAX-2)  /* maximum value of an int (-2 for safety) */
 
 /*
-** floor of the log2 of the maximum signed value for integral type 't'.
-** (That is, maximum 'n' such that '2^n' fits in the given signed type.)
+** conversion of pointer to integer
+** this is for hashing only; there is no problem if the integer
+** cannot hold the whole pointer value
 */
-#define log2maxs(t)	(sizeof(t) * 8 - 2)
+#define IntPoint(p)  ((unsigned int)(lu_mem)(p))
 
 
-/*
-** test whether an unsigned value is a power of 2 (or zero)
-*/
-#define ispow2(x)	(((x) & ((x) - 1)) == 0)
 
-
-/* number of chars of a literal string without the ending \0 */
-#define LL(x)   (sizeof(x)/sizeof(char) - 1)
-
-
-/*
-** conversion of pointer to unsigned integer: this is for hashing only;
-** there is no problem if the integer cannot hold the whole pointer
-** value. (In strict ISO C this may cause undefined behavior, but no
-** actual machine seems to bother.)
-*/
-#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
-    __STDC_VERSION__ >= 199901L
-#include <stdint.h>
-#if defined(UINTPTR_MAX)  /* even in C99 this type is optional */
-#define L_P2I	uintptr_t
-#else  /* no 'intptr'? */
-#define L_P2I	uintmax_t  /* use the largest available integer */
-#endif
-#else  /* C89 option */
-#define L_P2I	size_t
+/* type to ensure maximum alignment */
+#if !defined(LUAI_USER_ALIGNMENT_T)
+#define LUAI_USER_ALIGNMENT_T	union { double u; void *s; long l; }
 #endif
 
-#define point2uint(p)	((unsigned int)((L_P2I)(p) & UINT_MAX))
+typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
 
 
-
-/* types of 'usual argument conversions' for lua_Number and lua_Integer */
+/* result of a `usual argument conversion' over lua_Number */
 typedef LUAI_UACNUMBER l_uacNumber;
-typedef LUAI_UACINT l_uacInt;
 
 
-/*
-** Internal assertions for in-house debugging
-*/
-#if defined LUAI_ASSERT
-#undef NDEBUG
-#include <assert.h>
-#define lua_assert(c)           assert(c)
-#endif
-
+/* internal assertions for in-house debugging */
 #if defined(lua_assert)
 #define check_exp(c,e)		(lua_assert(c), (e))
 /* to avoid problems with conditions too long */
-#define lua_longassert(c)	((c) ? (void)0 : lua_assert(0))
+#define lua_longassert(c)	{ if (!(c)) lua_assert(0); }
 #else
 #define lua_assert(c)		((void)0)
 #define check_exp(c,e)		(e)
@@ -120,122 +72,76 @@ typedef LUAI_UACINT l_uacInt;
 ** assertion for checking API calls
 */
 #if !defined(luai_apicheck)
-#define luai_apicheck(l,e)	((void)l, lua_assert(e))
+
+#if defined(LUA_USE_APICHECK)
+#include <assert.h>
+#define luai_apicheck(L,e)	assert(e)
+#else
+#define luai_apicheck(L,e)	lua_assert(e)
+#endif
+
 #endif
 
 #define api_check(l,e,msg)	luai_apicheck(l,(e) && msg)
 
 
-/* macro to avoid warnings about unused variables */
 #if !defined(UNUSED)
-#define UNUSED(x)	((void)(x))
+#define UNUSED(x)	((void)(x))	/* to avoid warnings */
 #endif
 
 
-/* type casts (a macro highlights casts in the code) */
 #define cast(t, exp)	((t)(exp))
 
-#define cast_void(i)	cast(void, (i))
-#define cast_voidp(i)	cast(void *, (i))
+#define cast_byte(i)	cast(lu_byte, (i))
 #define cast_num(i)	cast(lua_Number, (i))
 #define cast_int(i)	cast(int, (i))
-#define cast_uint(i)	cast(unsigned int, (i))
-#define cast_byte(i)	cast(lu_byte, (i))
 #define cast_uchar(i)	cast(unsigned char, (i))
-#define cast_char(i)	cast(char, (i))
-#define cast_charp(i)	cast(char *, (i))
-#define cast_sizet(i)	cast(size_t, (i))
-
-
-/* cast a signed lua_Integer to lua_Unsigned */
-#if !defined(l_castS2U)
-#define l_castS2U(i)	((lua_Unsigned)(i))
-#endif
-
-/*
-** cast a lua_Unsigned to a signed lua_Integer; this cast is
-** not strict ISO C, but two-complement architectures should
-** work fine.
-*/
-#if !defined(l_castU2S)
-#define l_castU2S(i)	((lua_Integer)(i))
-#endif
 
 
 /*
 ** non-return type
 */
-#if !defined(l_noret)
-
 #if defined(__GNUC__)
 #define l_noret		void __attribute__((noreturn))
-#elif defined(_MSC_VER) && _MSC_VER >= 1200
+#elif defined(_MSC_VER)
 #define l_noret		void __declspec(noreturn)
 #else
 #define l_noret		void
 #endif
 
-#endif
 
 
 /*
-** Inline functions
+** maximum depth for nested C calls and syntactical nested non-terminals
+** in a program. (Value must fit in an unsigned short int.)
 */
-#if !defined(LUA_USE_C89)
-#define l_inline	inline
-#elif defined(__GNUC__)
-#define l_inline	__inline__
-#else
-#define l_inline	/* empty */
+#if !defined(LUAI_MAXCCALLS)
+#define LUAI_MAXCCALLS		200
 #endif
 
-#define l_sinline	static l_inline
+/*
+** maximum number of upvalues in a closure (both C and Lua). (Value
+** must fit in an unsigned char.)
+*/
+#define MAXUPVAL	UCHAR_MAX
 
 
 /*
-** type for virtual-machine instructions;
+** type for virtual-machine instructions
 ** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
 */
-#if LUAI_IS32INT
-typedef unsigned int l_uint32;
-#else
-typedef unsigned long l_uint32;
-#endif
-
-typedef l_uint32 Instruction;
+typedef lu_int32 Instruction;
 
 
 
-/*
-** Maximum length for short strings, that is, strings that are
-** internalized. (Cannot be smaller than reserved words or tags for
-** metamethods, as these strings must be internalized;
-** #("function") = 8, #("__newindex") = 10.)
-*/
-#if !defined(LUAI_MAXSHORTLEN)
-#define LUAI_MAXSHORTLEN	40
-#endif
+/* maximum stack for a Lua function */
+#define MAXSTACK	250
 
 
-/*
-** Initial size for the string table (must be power of 2).
-** The Lua core alone registers ~50 strings (reserved words +
-** metaevent keys + a few others). Libraries would typically add
-** a few dozens more.
-*/
+
+/* minimum size for the string table (must be power of 2) */
 #if !defined(MINSTRTABSIZE)
-#define MINSTRTABSIZE	128
-#endif
-
-
-/*
-** Size of cache for strings in the API. 'N' is the number of
-** sets (better be a prime) and "M" is the size of each set (M == 1
-** makes a direct cache.)
-*/
-#if !defined(STRCACHE_N)
-#define STRCACHE_N		53
-#define STRCACHE_M		2
+#define MINSTRTABSIZE	32
 #endif
 
 
@@ -245,37 +151,19 @@ typedef l_uint32 Instruction;
 #endif
 
 
-/*
-** Maximum depth for nested C calls, syntactical nested non-terminals,
-** and other features implemented through recursion in C. (Value must
-** fit in a 16-bit unsigned integer. It must also be compatible with
-** the size of the C stack.)
-*/
-#if !defined(LUAI_MAXCCALLS)
-#define LUAI_MAXCCALLS		200
-#endif
-
-
-/*
-** macros that are executed whenever program enters the Lua core
-** ('lua_lock') and leaves the core ('lua_unlock')
-*/
 #if !defined(lua_lock)
-#define lua_lock(L)	((void) 0)
-#define lua_unlock(L)	((void) 0)
+#define lua_lock(L)     ((void) 0)
+#define lua_unlock(L)   ((void) 0)
 #endif
 
-/*
-** macro executed during Lua functions at points where the
-** function can yield.
-*/
 #if !defined(luai_threadyield)
-#define luai_threadyield(L)	{lua_unlock(L); lua_lock(L);}
+#define luai_threadyield(L)     {lua_unlock(L); lua_lock(L);}
 #endif
 
 
 /*
-** these macros allow user-specific actions when a thread is
+** these macros allow user-specific actions on threads when you defined
+** LUAI_EXTRASPACE and need to do something extra when a thread is
 ** created/deleted/resumed/yielded.
 */
 #if !defined(luai_userstateopen)
@@ -295,86 +183,127 @@ typedef l_uint32 Instruction;
 #endif
 
 #if !defined(luai_userstateresume)
-#define luai_userstateresume(L,n)	((void)L)
+#define luai_userstateresume(L,n)       ((void)L)
 #endif
 
 #if !defined(luai_userstateyield)
-#define luai_userstateyield(L,n)	((void)L)
-#endif
-
-
-
-/*
-** The luai_num* macros define the primitive operations over numbers.
-*/
-
-/* floor division (defined as 'floor(a/b)') */
-#if !defined(luai_numidiv)
-#define luai_numidiv(L,a,b)     ((void)L, l_floor(luai_numdiv(L,a,b)))
-#endif
-
-/* float division */
-#if !defined(luai_numdiv)
-#define luai_numdiv(L,a,b)      ((a)/(b))
+#define luai_userstateyield(L,n)        ((void)L)
 #endif
 
 /*
-** modulo: defined as 'a - floor(a/b)*b'; the direct computation
-** using this definition has several problems with rounding errors,
-** so it is better to use 'fmod'. 'fmod' gives the result of
-** 'a - trunc(a/b)*b', and therefore must be corrected when
-** 'trunc(a/b) ~= floor(a/b)'. That happens when the division has a
-** non-integer negative result: non-integer result is equivalent to
-** a non-zero remainder 'm'; negative result is equivalent to 'a' and
-** 'b' with different signs, or 'm' and 'b' with different signs
-** (as the result 'm' of 'fmod' has the same sign of 'a').
+** lua_number2int is a macro to convert lua_Number to int.
+** lua_number2integer is a macro to convert lua_Number to lua_Integer.
+** lua_number2unsigned is a macro to convert a lua_Number to a lua_Unsigned.
+** lua_unsigned2number is a macro to convert a lua_Unsigned to a lua_Number.
+** luai_hashnum is a macro to hash a lua_Number value into an integer.
+** The hash must be deterministic and give reasonable values for
+** both small and large values (outside the range of integers).
 */
-#if !defined(luai_nummod)
-#define luai_nummod(L,a,b,m)  \
-  { (void)L; (m) = l_mathop(fmod)(a,b); \
-    if (((m) > 0) ? (b) < 0 : ((m) < 0 && (b) > 0)) (m) += (b); }
+
+#if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK)	/* { */
+/* trick with Microsoft assembler for X86 */
+
+#define lua_number2int(i,n)  __asm {__asm fld n   __asm fistp i}
+#define lua_number2integer(i,n)		lua_number2int(i, n)
+#define lua_number2unsigned(i,n)  \
+  {__int64 l; __asm {__asm fld n   __asm fistp l} i = (unsigned int)l;}
+
+
+#elif defined(LUA_IEEE754TRICK)		/* }{ */
+/* the next trick should work on any machine using IEEE754 with
+   a 32-bit int type */
+
+union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
+
+#if !defined(LUA_IEEEENDIAN)	/* { */
+#define LUAI_EXTRAIEEE	\
+  static const union luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)};
+#define LUA_IEEEENDIANLOC	(ieeeendian.l_p[1] == 33)
+#else
+#define LUA_IEEEENDIANLOC	LUA_IEEEENDIAN
+#define LUAI_EXTRAIEEE		/* empty */
+#endif				/* } */
+
+#define lua_number2int32(i,n,t) \
+  { LUAI_EXTRAIEEE \
+    volatile union luai_Cast u; u.l_d = (n) + 6755399441055744.0; \
+    (i) = (t)u.l_p[LUA_IEEEENDIANLOC]; }
+
+#define luai_hashnum(i,n)  \
+  { volatile union luai_Cast u; u.l_d = (n) + 1.0;  /* avoid -0 */ \
+    (i) = u.l_p[0]; (i) += u.l_p[1]; }  /* add double bits for his hash */
+
+#define lua_number2int(i,n)		lua_number2int32(i, n, int)
+#define lua_number2unsigned(i,n)	lua_number2int32(i, n, lua_Unsigned)
+
+/* the trick can be expanded to lua_Integer when it is a 32-bit value */
+#if defined(LUA_IEEELL)
+#define lua_number2integer(i,n)		lua_number2int32(i, n, lua_Integer)
 #endif
 
-/* exponentiation */
-#if !defined(luai_numpow)
-#define luai_numpow(L,a,b)  \
-  ((void)L, (b == 2) ? (a)*(a) : l_mathop(pow)(a,b))
+#endif				/* } */
+
+
+/* the following definitions always work, but may be slow */
+
+#if !defined(lua_number2int)
+#define lua_number2int(i,n)	((i)=(int)(n))
 #endif
 
-/* the others are quite standard operations */
-#if !defined(luai_numadd)
-#define luai_numadd(L,a,b)      ((a)+(b))
-#define luai_numsub(L,a,b)      ((a)-(b))
-#define luai_nummul(L,a,b)      ((a)*(b))
-#define luai_numunm(L,a)        (-(a))
-#define luai_numeq(a,b)         ((a)==(b))
-#define luai_numlt(a,b)         ((a)<(b))
-#define luai_numle(a,b)         ((a)<=(b))
-#define luai_numgt(a,b)         ((a)>(b))
-#define luai_numge(a,b)         ((a)>=(b))
-#define luai_numisnan(a)        (!luai_numeq((a), (a)))
+#if !defined(lua_number2integer)
+#define lua_number2integer(i,n)	((i)=(lua_Integer)(n))
+#endif
+
+#if !defined(lua_number2unsigned)	/* { */
+/* the following definition assures proper modulo behavior */
+#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_NUMBER_FLOAT)
+#include <math.h>
+#define SUPUNSIGNED	((lua_Number)(~(lua_Unsigned)0) + 1)
+#define lua_number2unsigned(i,n)  \
+	((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED))
+#else
+#define lua_number2unsigned(i,n)	((i)=(lua_Unsigned)(n))
+#endif
+#endif				/* } */
+
+
+#if !defined(lua_unsigned2number)
+/* on several machines, coercion from unsigned to double is slow,
+   so it may be worth to avoid */
+#define lua_unsigned2number(u)  \
+    (((u) <= (lua_Unsigned)INT_MAX) ? (lua_Number)(int)(u) : (lua_Number)(u))
 #endif
 
 
 
+#if defined(ltable_c) && !defined(luai_hashnum)
+
+#include <float.h>
+#include <math.h>
+
+#define luai_hashnum(i,n) { int e;  \
+  n = l_mathop(frexp)(n, &e) * (lua_Number)(INT_MAX - DBL_MAX_EXP);  \
+  lua_number2int(i, n); i += e; }
+
+#endif
+
 
 
 /*
 ** macro to control inclusion of some hard tests on stack reallocation
 */
 #if !defined(HARDSTACKTESTS)
-#define condmovestack(L,pre,pos)	((void)0)
+#define condmovestack(L)	((void)0)
 #else
 /* realloc stack keeping its size */
-#define condmovestack(L,pre,pos)  \
-  { int sz_ = stacksize(L); pre; luaD_reallocstack((L), sz_, 0); pos; }
+#define condmovestack(L)	luaD_reallocstack((L), (L)->stacksize)
 #endif
 
 #if !defined(HARDMEMTESTS)
-#define condchangemem(L,pre,pos)	((void)0)
+#define condchangemem(L)	condmovestack(L)
 #else
-#define condchangemem(L,pre,pos)  \
-	{ if (gcrunning(G(L))) { pre; luaC_fullgc(L, 0); pos; } }
+#define condchangemem(L)  \
+	((void)(!(G(L)->gcrunning) || (luaC_fullgc(L, 0), 1)))
 #endif
 
 #endif

lmathlib.c

@@ -1,21 +1,16 @@
 /*
-** $Id: lmathlib.c $
+** $Id: lmathlib.c,v 1.83 2013/03/07 18:21:32 roberto Exp $
 ** Standard mathematical library
 ** See Copyright Notice in lua.h
 */
 
+
+#include <stdlib.h>
+#include <math.h>
+
 #define lmathlib_c
 #define LUA_LIB
 
-#include "lprefix.h"
-
-
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-#include <time.h>
-
 #include "lua.h"
 
 #include "lauxlib.h"
@@ -23,17 +18,13 @@
 
 
 #undef PI
-#define PI	(l_mathop(3.141592653589793238462643383279502884))
+#define PI	((lua_Number)(3.1415926535897932384626433832795))
+#define RADIANS_PER_DEGREE	((lua_Number)(PI/180.0))
+
 
 
 static int math_abs (lua_State *L) {
-  if (lua_isinteger(L, 1)) {
-    lua_Integer n = lua_tointeger(L, 1);
-    if (n < 0) n = (lua_Integer)(0u - (lua_Unsigned)n);
-    lua_pushinteger(L, n);
-  }
-  else
-    lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
+  lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
   return 1;
 }
 
@@ -42,16 +33,31 @@ static int math_sin (lua_State *L) {
   return 1;
 }
 
+static int math_sinh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
 static int math_cos (lua_State *L) {
   lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
   return 1;
 }
 
+static int math_cosh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
 static int math_tan (lua_State *L) {
   lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
   return 1;
 }
 
+static int math_tanh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
 static int math_asin (lua_State *L) {
   lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
   return 1;
@@ -63,106 +69,49 @@ static int math_acos (lua_State *L) {
 }
 
 static int math_atan (lua_State *L) {
-  lua_Number y = luaL_checknumber(L, 1);
-  lua_Number x = luaL_optnumber(L, 2, 1);
-  lua_pushnumber(L, l_mathop(atan2)(y, x));
+  lua_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1)));
   return 1;
 }
 
-
-static int math_toint (lua_State *L) {
-  int valid;
-  lua_Integer n = lua_tointegerx(L, 1, &valid);
-  if (l_likely(valid))
-    lua_pushinteger(L, n);
-  else {
-    luaL_checkany(L, 1);
-    luaL_pushfail(L);  /* value is not convertible to integer */
-  }
+static int math_atan2 (lua_State *L) {
+  lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1),
+                                luaL_checknumber(L, 2)));
   return 1;
 }
 
-
-static void pushnumint (lua_State *L, lua_Number d) {
-  lua_Integer n;
-  if (lua_numbertointeger(d, &n))  /* does 'd' fit in an integer? */
-    lua_pushinteger(L, n);  /* result is integer */
-  else
-    lua_pushnumber(L, d);  /* result is float */
-}
-
-
-static int math_floor (lua_State *L) {
-  if (lua_isinteger(L, 1))
-    lua_settop(L, 1);  /* integer is its own floor */
-  else {
-    lua_Number d = l_mathop(floor)(luaL_checknumber(L, 1));
-    pushnumint(L, d);
-  }
-  return 1;
-}
-
-
 static int math_ceil (lua_State *L) {
-  if (lua_isinteger(L, 1))
-    lua_settop(L, 1);  /* integer is its own ceil */
-  else {
-    lua_Number d = l_mathop(ceil)(luaL_checknumber(L, 1));
-    pushnumint(L, d);
-  }
+  lua_pushnumber(L, l_mathop(ceil)(luaL_checknumber(L, 1)));
   return 1;
 }
 
+static int math_floor (lua_State *L) {
+  lua_pushnumber(L, l_mathop(floor)(luaL_checknumber(L, 1)));
+  return 1;
+}
 
 static int math_fmod (lua_State *L) {
-  if (lua_isinteger(L, 1) && lua_isinteger(L, 2)) {
-    lua_Integer d = lua_tointeger(L, 2);
-    if ((lua_Unsigned)d + 1u <= 1u) {  /* special cases: -1 or 0 */
-      luaL_argcheck(L, d != 0, 2, "zero");
-      lua_pushinteger(L, 0);  /* avoid overflow with 0x80000... / -1 */
-    }
-    else
-      lua_pushinteger(L, lua_tointeger(L, 1) % d);
-  }
-  else
-    lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
-                                     luaL_checknumber(L, 2)));
+  lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
+                               luaL_checknumber(L, 2)));
   return 1;
 }
 
-
-/*
-** next function does not use 'modf', avoiding problems with 'double*'
-** (which is not compatible with 'float*') when lua_Number is not
-** 'double'.
-*/
 static int math_modf (lua_State *L) {
-  if (lua_isinteger(L ,1)) {
-    lua_settop(L, 1);  /* number is its own integer part */
-    lua_pushnumber(L, 0);  /* no fractional part */
-  }
-  else {
-    lua_Number n = luaL_checknumber(L, 1);
-    /* integer part (rounds toward zero) */
-    lua_Number ip = (n < 0) ? l_mathop(ceil)(n) : l_mathop(floor)(n);
-    pushnumint(L, ip);
-    /* fractional part (test needed for inf/-inf) */
-    lua_pushnumber(L, (n == ip) ? l_mathop(0.0) : (n - ip));
-  }
+  lua_Number ip;
+  lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip);
+  lua_pushnumber(L, ip);
+  lua_pushnumber(L, fp);
   return 2;
 }
 
-
 static int math_sqrt (lua_State *L) {
   lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
   return 1;
 }
 
-
-static int math_ult (lua_State *L) {
-  lua_Integer a = luaL_checkinteger(L, 1);
-  lua_Integer b = luaL_checkinteger(L, 2);
-  lua_pushboolean(L, (lua_Unsigned)a < (lua_Unsigned)b);
+static int math_pow (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  lua_Number y = luaL_checknumber(L, 2);
+  lua_pushnumber(L, l_mathop(pow)(x, y));
   return 1;
 }
 
@@ -173,508 +122,32 @@ static int math_log (lua_State *L) {
     res = l_mathop(log)(x);
   else {
     lua_Number base = luaL_checknumber(L, 2);
-#if !defined(LUA_USE_C89)
-    if (base == l_mathop(2.0))
-      res = l_mathop(log2)(x);
-    else
-#endif
-    if (base == l_mathop(10.0))
-      res = l_mathop(log10)(x);
-    else
-      res = l_mathop(log)(x)/l_mathop(log)(base);
+    if (base == (lua_Number)10.0) res = l_mathop(log10)(x);
+    else res = l_mathop(log)(x)/l_mathop(log)(base);
   }
   lua_pushnumber(L, res);
   return 1;
 }
 
+#if defined(LUA_COMPAT_LOG10)
+static int math_log10 (lua_State *L) {
+  lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
+  return 1;
+}
+#endif
+
 static int math_exp (lua_State *L) {
   lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
   return 1;
 }
 
 static int math_deg (lua_State *L) {
-  lua_pushnumber(L, luaL_checknumber(L, 1) * (l_mathop(180.0) / PI));
+  lua_pushnumber(L, luaL_checknumber(L, 1)/RADIANS_PER_DEGREE);
   return 1;
 }
 
 static int math_rad (lua_State *L) {
-  lua_pushnumber(L, luaL_checknumber(L, 1) * (PI / l_mathop(180.0)));
-  return 1;
-}
-
-
-static int math_min (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  int imin = 1;  /* index of current minimum value */
-  int i;
-  luaL_argcheck(L, n >= 1, 1, "value expected");
-  for (i = 2; i <= n; i++) {
-    if (lua_compare(L, i, imin, LUA_OPLT))
-      imin = i;
-  }
-  lua_pushvalue(L, imin);
-  return 1;
-}
-
-
-static int math_max (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  int imax = 1;  /* index of current maximum value */
-  int i;
-  luaL_argcheck(L, n >= 1, 1, "value expected");
-  for (i = 2; i <= n; i++) {
-    if (lua_compare(L, imax, i, LUA_OPLT))
-      imax = i;
-  }
-  lua_pushvalue(L, imax);
-  return 1;
-}
-
-
-static int math_type (lua_State *L) {
-  if (lua_type(L, 1) == LUA_TNUMBER)
-    lua_pushstring(L, (lua_isinteger(L, 1)) ? "integer" : "float");
-  else {
-    luaL_checkany(L, 1);
-    luaL_pushfail(L);
-  }
-  return 1;
-}
-
-
-
-/*
-** {==================================================================
-** Pseudo-Random Number Generator based on 'xoshiro256**'.
-** ===================================================================
-*/
-
-/* number of binary digits in the mantissa of a float */
-#define FIGS	l_floatatt(MANT_DIG)
-
-#if FIGS > 64
-/* there are only 64 random bits; use them all */
-#undef FIGS
-#define FIGS	64
-#endif
-
-
-/*
-** LUA_RAND32 forces the use of 32-bit integers in the implementation
-** of the PRN generator (mainly for testing).
-*/
-#if !defined(LUA_RAND32) && !defined(Rand64)
-
-/* try to find an integer type with at least 64 bits */
-
-#if ((ULONG_MAX >> 31) >> 31) >= 3
-
-/* 'long' has at least 64 bits */
-#define Rand64		unsigned long
-
-#elif !defined(LUA_USE_C89) && defined(LLONG_MAX)
-
-/* there is a 'long long' type (which must have at least 64 bits) */
-#define Rand64		unsigned long long
-
-#elif ((LUA_MAXUNSIGNED >> 31) >> 31) >= 3
-
-/* 'lua_Unsigned' has at least 64 bits */
-#define Rand64		lua_Unsigned
-
-#endif
-
-#endif
-
-
-#if defined(Rand64)  /* { */
-
-/*
-** Standard implementation, using 64-bit integers.
-** If 'Rand64' has more than 64 bits, the extra bits do not interfere
-** with the 64 initial bits, except in a right shift. Moreover, the
-** final result has to discard the extra bits.
-*/
-
-/* avoid using extra bits when needed */
-#define trim64(x)	((x) & 0xffffffffffffffffu)
-
-
-/* rotate left 'x' by 'n' bits */
-static Rand64 rotl (Rand64 x, int n) {
-  return (x << n) | (trim64(x) >> (64 - n));
-}
-
-static Rand64 nextrand (Rand64 *state) {
-  Rand64 state0 = state[0];
-  Rand64 state1 = state[1];
-  Rand64 state2 = state[2] ^ state0;
-  Rand64 state3 = state[3] ^ state1;
-  Rand64 res = rotl(state1 * 5, 7) * 9;
-  state[0] = state0 ^ state3;
-  state[1] = state1 ^ state2;
-  state[2] = state2 ^ (state1 << 17);
-  state[3] = rotl(state3, 45);
-  return res;
-}
-
-
-/* must take care to not shift stuff by more than 63 slots */
-
-
-/*
-** Convert bits from a random integer into a float in the
-** interval [0,1), getting the higher FIG bits from the
-** random unsigned integer and converting that to a float.
-*/
-
-/* must throw out the extra (64 - FIGS) bits */
-#define shift64_FIG	(64 - FIGS)
-
-/* to scale to [0, 1), multiply by scaleFIG = 2^(-FIGS) */
-#define scaleFIG	(l_mathop(0.5) / ((Rand64)1 << (FIGS - 1)))
-
-static lua_Number I2d (Rand64 x) {
-  return (lua_Number)(trim64(x) >> shift64_FIG) * scaleFIG;
-}
-
-/* convert a 'Rand64' to a 'lua_Unsigned' */
-#define I2UInt(x)	((lua_Unsigned)trim64(x))
-
-/* convert a 'lua_Unsigned' to a 'Rand64' */
-#define Int2I(x)	((Rand64)(x))
-
-
-#else	/* no 'Rand64'   }{ */
-
-/* get an integer with at least 32 bits */
-#if LUAI_IS32INT
-typedef unsigned int lu_int32;
-#else
-typedef unsigned long lu_int32;
-#endif
-
-
-/*
-** Use two 32-bit integers to represent a 64-bit quantity.
-*/
-typedef struct Rand64 {
-  lu_int32 h;  /* higher half */
-  lu_int32 l;  /* lower half */
-} Rand64;
-
-
-/*
-** If 'lu_int32' has more than 32 bits, the extra bits do not interfere
-** with the 32 initial bits, except in a right shift and comparisons.
-** Moreover, the final result has to discard the extra bits.
-*/
-
-/* avoid using extra bits when needed */
-#define trim32(x)	((x) & 0xffffffffu)
-
-
-/*
-** basic operations on 'Rand64' values
-*/
-
-/* build a new Rand64 value */
-static Rand64 packI (lu_int32 h, lu_int32 l) {
-  Rand64 result;
-  result.h = h;
-  result.l = l;
-  return result;
-}
-
-/* return i << n */
-static Rand64 Ishl (Rand64 i, int n) {
-  lua_assert(n > 0 && n < 32);
-  return packI((i.h << n) | (trim32(i.l) >> (32 - n)), i.l << n);
-}
-
-/* i1 ^= i2 */
-static void Ixor (Rand64 *i1, Rand64 i2) {
-  i1->h ^= i2.h;
-  i1->l ^= i2.l;
-}
-
-/* return i1 + i2 */
-static Rand64 Iadd (Rand64 i1, Rand64 i2) {
-  Rand64 result = packI(i1.h + i2.h, i1.l + i2.l);
-  if (trim32(result.l) < trim32(i1.l))  /* carry? */
-    result.h++;
-  return result;
-}
-
-/* return i * 5 */
-static Rand64 times5 (Rand64 i) {
-  return Iadd(Ishl(i, 2), i);  /* i * 5 == (i << 2) + i */
-}
-
-/* return i * 9 */
-static Rand64 times9 (Rand64 i) {
-  return Iadd(Ishl(i, 3), i);  /* i * 9 == (i << 3) + i */
-}
-
-/* return 'i' rotated left 'n' bits */
-static Rand64 rotl (Rand64 i, int n) {
-  lua_assert(n > 0 && n < 32);
-  return packI((i.h << n) | (trim32(i.l) >> (32 - n)),
-               (trim32(i.h) >> (32 - n)) | (i.l << n));
-}
-
-/* for offsets larger than 32, rotate right by 64 - offset */
-static Rand64 rotl1 (Rand64 i, int n) {
-  lua_assert(n > 32 && n < 64);
-  n = 64 - n;
-  return packI((trim32(i.h) >> n) | (i.l << (32 - n)),
-               (i.h << (32 - n)) | (trim32(i.l) >> n));
-}
-
-/*
-** implementation of 'xoshiro256**' algorithm on 'Rand64' values
-*/
-static Rand64 nextrand (Rand64 *state) {
-  Rand64 res = times9(rotl(times5(state[1]), 7));
-  Rand64 t = Ishl(state[1], 17);
-  Ixor(&state[2], state[0]);
-  Ixor(&state[3], state[1]);
-  Ixor(&state[1], state[2]);
-  Ixor(&state[0], state[3]);
-  Ixor(&state[2], t);
-  state[3] = rotl1(state[3], 45);
-  return res;
-}
-
-
-/*
-** Converts a 'Rand64' into a float.
-*/
-
-/* an unsigned 1 with proper type */
-#define UONE		((lu_int32)1)
-
-
-#if FIGS <= 32
-
-/* 2^(-FIGS) */
-#define scaleFIG       (l_mathop(0.5) / (UONE << (FIGS - 1)))
-
-/*
-** get up to 32 bits from higher half, shifting right to
-** throw out the extra bits.
-*/
-static lua_Number I2d (Rand64 x) {
-  lua_Number h = (lua_Number)(trim32(x.h) >> (32 - FIGS));
-  return h * scaleFIG;
-}
-
-#else	/* 32 < FIGS <= 64 */
-
-/* must take care to not shift stuff by more than 31 slots */
-
-/* 2^(-FIGS) = 1.0 / 2^30 / 2^3 / 2^(FIGS-33) */
-#define scaleFIG  \
-    (l_mathop(1.0) / (UONE << 30) / l_mathop(8.0) / (UONE << (FIGS - 33)))
-
-/*
-** use FIGS - 32 bits from lower half, throwing out the other
-** (32 - (FIGS - 32)) = (64 - FIGS) bits
-*/
-#define shiftLOW	(64 - FIGS)
-
-/*
-** higher 32 bits go after those (FIGS - 32) bits: shiftHI = 2^(FIGS - 32)
-*/
-#define shiftHI		((lua_Number)(UONE << (FIGS - 33)) * l_mathop(2.0))
-
-
-static lua_Number I2d (Rand64 x) {
-  lua_Number h = (lua_Number)trim32(x.h) * shiftHI;
-  lua_Number l = (lua_Number)(trim32(x.l) >> shiftLOW);
-  return (h + l) * scaleFIG;
-}
-
-#endif
-
-
-/* convert a 'Rand64' to a 'lua_Unsigned' */
-static lua_Unsigned I2UInt (Rand64 x) {
-  return (((lua_Unsigned)trim32(x.h) << 31) << 1) | (lua_Unsigned)trim32(x.l);
-}
-
-/* convert a 'lua_Unsigned' to a 'Rand64' */
-static Rand64 Int2I (lua_Unsigned n) {
-  return packI((lu_int32)((n >> 31) >> 1), (lu_int32)n);
-}
-
-#endif  /* } */
-
-
-/*
-** A state uses four 'Rand64' values.
-*/
-typedef struct {
-  Rand64 s[4];
-} RanState;
-
-
-/*
-** Project the random integer 'ran' into the interval [0, n].
-** Because 'ran' has 2^B possible values, the projection can only be
-** uniform when the size of the interval is a power of 2 (exact
-** division). Otherwise, to get a uniform projection into [0, n], we
-** first compute 'lim', the smallest Mersenne number not smaller than
-** 'n'. We then project 'ran' into the interval [0, lim].  If the result
-** is inside [0, n], we are done. Otherwise, we try with another 'ran',
-** until we have a result inside the interval.
-*/
-static lua_Unsigned project (lua_Unsigned ran, lua_Unsigned n,
-                             RanState *state) {
-  if ((n & (n + 1)) == 0)  /* is 'n + 1' a power of 2? */
-    return ran & n;  /* no bias */
-  else {
-    lua_Unsigned lim = n;
-    /* compute the smallest (2^b - 1) not smaller than 'n' */
-    lim |= (lim >> 1);
-    lim |= (lim >> 2);
-    lim |= (lim >> 4);
-    lim |= (lim >> 8);
-    lim |= (lim >> 16);
-#if (LUA_MAXUNSIGNED >> 31) >= 3
-    lim |= (lim >> 32);  /* integer type has more than 32 bits */
-#endif
-    lua_assert((lim & (lim + 1)) == 0  /* 'lim + 1' is a power of 2, */
-      && lim >= n  /* not smaller than 'n', */
-      && (lim >> 1) < n);  /* and it is the smallest one */
-    while ((ran &= lim) > n)  /* project 'ran' into [0..lim] */
-      ran = I2UInt(nextrand(state->s));  /* not inside [0..n]? try again */
-    return ran;
-  }
-}
-
-
-static int math_random (lua_State *L) {
-  lua_Integer low, up;
-  lua_Unsigned p;
-  RanState *state = (RanState *)lua_touserdata(L, lua_upvalueindex(1));
-  Rand64 rv = nextrand(state->s);  /* next pseudo-random value */
-  switch (lua_gettop(L)) {  /* check number of arguments */
-    case 0: {  /* no arguments */
-      lua_pushnumber(L, I2d(rv));  /* float between 0 and 1 */
-      return 1;
-    }
-    case 1: {  /* only upper limit */
-      low = 1;
-      up = luaL_checkinteger(L, 1);
-      if (up == 0) {  /* single 0 as argument? */
-        lua_pushinteger(L, I2UInt(rv));  /* full random integer */
-        return 1;
-      }
-      break;
-    }
-    case 2: {  /* lower and upper limits */
-      low = luaL_checkinteger(L, 1);
-      up = luaL_checkinteger(L, 2);
-      break;
-    }
-    default: return luaL_error(L, "wrong number of arguments");
-  }
-  /* random integer in the interval [low, up] */
-  luaL_argcheck(L, low <= up, 1, "interval is empty");
-  /* project random integer into the interval [0, up - low] */
-  p = project(I2UInt(rv), (lua_Unsigned)up - (lua_Unsigned)low, state);
-  lua_pushinteger(L, p + (lua_Unsigned)low);
-  return 1;
-}
-
-
-static void setseed (lua_State *L, Rand64 *state,
-                     lua_Unsigned n1, lua_Unsigned n2) {
-  int i;
-  state[0] = Int2I(n1);
-  state[1] = Int2I(0xff);  /* avoid a zero state */
-  state[2] = Int2I(n2);
-  state[3] = Int2I(0);
-  for (i = 0; i < 16; i++)
-    nextrand(state);  /* discard initial values to "spread" seed */
-  lua_pushinteger(L, n1);
-  lua_pushinteger(L, n2);
-}
-
-
-/*
-** Set a "random" seed. To get some randomness, use the current time
-** and the address of 'L' (in case the machine does address space layout
-** randomization).
-*/
-static void randseed (lua_State *L, RanState *state) {
-  lua_Unsigned seed1 = (lua_Unsigned)time(NULL);
-  lua_Unsigned seed2 = (lua_Unsigned)(size_t)L;
-  setseed(L, state->s, seed1, seed2);
-}
-
-
-static int math_randomseed (lua_State *L) {
-  RanState *state = (RanState *)lua_touserdata(L, lua_upvalueindex(1));
-  if (lua_isnone(L, 1)) {
-    randseed(L, state);
-  }
-  else {
-    lua_Integer n1 = luaL_checkinteger(L, 1);
-    lua_Integer n2 = luaL_optinteger(L, 2, 0);
-    setseed(L, state->s, n1, n2);
-  }
-  return 2;  /* return seeds */
-}
-
-
-static const luaL_Reg randfuncs[] = {
-  {"random", math_random},
-  {"randomseed", math_randomseed},
-  {NULL, NULL}
-};
-
-
-/*
-** Register the random functions and initialize their state.
-*/
-static void setrandfunc (lua_State *L) {
-  RanState *state = (RanState *)lua_newuserdatauv(L, sizeof(RanState), 0);
-  randseed(L, state);  /* initialize with a "random" seed */
-  lua_pop(L, 2);  /* remove pushed seeds */
-  luaL_setfuncs(L, randfuncs, 1);
-}
-
-/* }================================================================== */
-
-
-/*
-** {==================================================================
-** Deprecated functions (for compatibility only)
-** ===================================================================
-*/
-#if defined(LUA_COMPAT_MATHLIB)
-
-static int math_cosh (lua_State *L) {
-  lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
-  return 1;
-}
-
-static int math_sinh (lua_State *L) {
-  lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
-  return 1;
-}
-
-static int math_tanh (lua_State *L) {
-  lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
-  return 1;
-}
-
-static int math_pow (lua_State *L) {
-  lua_Number x = luaL_checknumber(L, 1);
-  lua_Number y = luaL_checknumber(L, 2);
-  lua_pushnumber(L, l_mathop(pow)(x, y));
+  lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
   return 1;
 }
 
@@ -687,60 +160,107 @@ static int math_frexp (lua_State *L) {
 
 static int math_ldexp (lua_State *L) {
   lua_Number x = luaL_checknumber(L, 1);
-  int ep = (int)luaL_checkinteger(L, 2);
+  int ep = luaL_checkint(L, 2);
   lua_pushnumber(L, l_mathop(ldexp)(x, ep));
   return 1;
 }
 
-static int math_log10 (lua_State *L) {
-  lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
+
+
+static int math_min (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  lua_Number dmin = luaL_checknumber(L, 1);
+  int i;
+  for (i=2; i<=n; i++) {
+    lua_Number d = luaL_checknumber(L, i);
+    if (d < dmin)
+      dmin = d;
+  }
+  lua_pushnumber(L, dmin);
   return 1;
 }
 
-#endif
-/* }================================================================== */
 
+static int math_max (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  lua_Number dmax = luaL_checknumber(L, 1);
+  int i;
+  for (i=2; i<=n; i++) {
+    lua_Number d = luaL_checknumber(L, i);
+    if (d > dmax)
+      dmax = d;
+  }
+  lua_pushnumber(L, dmax);
+  return 1;
+}
+
+
+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 larger than RAND_MAX */
+  lua_Number r = (lua_Number)(rand()%RAND_MAX) / (lua_Number)RAND_MAX;
+  switch (lua_gettop(L)) {  /* check number of arguments */
+    case 0: {  /* no arguments */
+      lua_pushnumber(L, r);  /* Number between 0 and 1 */
+      break;
+    }
+    case 1: {  /* only upper limit */
+      lua_Number u = luaL_checknumber(L, 1);
+      luaL_argcheck(L, (lua_Number)1.0 <= u, 1, "interval is empty");
+      lua_pushnumber(L, l_mathop(floor)(r*u) + (lua_Number)(1.0));  /* [1, u] */
+      break;
+    }
+    case 2: {  /* lower and upper limits */
+      lua_Number l = luaL_checknumber(L, 1);
+      lua_Number u = luaL_checknumber(L, 2);
+      luaL_argcheck(L, l <= u, 2, "interval is empty");
+      lua_pushnumber(L, l_mathop(floor)(r*(u-l+1)) + l);  /* [l, u] */
+      break;
+    }
+    default: return luaL_error(L, "wrong number of arguments");
+  }
+  return 1;
+}
+
+
+static int math_randomseed (lua_State *L) {
+  srand(luaL_checkunsigned(L, 1));
+  (void)rand(); /* discard first value to avoid undesirable correlations */
+  return 0;
+}
 
 
 static const luaL_Reg mathlib[] = {
   {"abs",   math_abs},
   {"acos",  math_acos},
   {"asin",  math_asin},
+  {"atan2", math_atan2},
   {"atan",  math_atan},
   {"ceil",  math_ceil},
+  {"cosh",   math_cosh},
   {"cos",   math_cos},
   {"deg",   math_deg},
   {"exp",   math_exp},
-  {"tointeger", math_toint},
   {"floor", math_floor},
   {"fmod",   math_fmod},
-  {"ult",   math_ult},
+  {"frexp", math_frexp},
+  {"ldexp", math_ldexp},
+#if defined(LUA_COMPAT_LOG10)
+  {"log10", math_log10},
+#endif
   {"log",   math_log},
   {"max",   math_max},
   {"min",   math_min},
   {"modf",   math_modf},
+  {"pow",   math_pow},
   {"rad",   math_rad},
+  {"random",     math_random},
+  {"randomseed", math_randomseed},
+  {"sinh",   math_sinh},
   {"sin",   math_sin},
   {"sqrt",  math_sqrt},
-  {"tan",   math_tan},
-  {"type", math_type},
-#if defined(LUA_COMPAT_MATHLIB)
-  {"atan2", math_atan},
-  {"cosh",   math_cosh},
-  {"sinh",   math_sinh},
   {"tanh",   math_tanh},
-  {"pow",   math_pow},
-  {"frexp", math_frexp},
-  {"ldexp", math_ldexp},
-  {"log10", math_log10},
-#endif
-  /* placeholders */
-  {"random", NULL},
-  {"randomseed", NULL},
-  {"pi", NULL},
-  {"huge", NULL},
-  {"maxinteger", NULL},
-  {"mininteger", NULL},
+  {"tan",   math_tan},
   {NULL, NULL}
 };
 
@@ -752,13 +272,8 @@ LUAMOD_API int luaopen_math (lua_State *L) {
   luaL_newlib(L, mathlib);
   lua_pushnumber(L, PI);
   lua_setfield(L, -2, "pi");
-  lua_pushnumber(L, (lua_Number)HUGE_VAL);
+  lua_pushnumber(L, HUGE_VAL);
   lua_setfield(L, -2, "huge");
-  lua_pushinteger(L, LUA_MAXINTEGER);
-  lua_setfield(L, -2, "maxinteger");
-  lua_pushinteger(L, LUA_MININTEGER);
-  lua_setfield(L, -2, "mininteger");
-  setrandfunc(L);
   return 1;
 }
 

lmem.c

@@ -1,17 +1,15 @@
 /*
-** $Id: lmem.c $
+** $Id: lmem.c,v 1.84 2012/05/23 15:41:53 roberto Exp $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
 
-#define lmem_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
 
 #include <stddef.h>
 
+#define lmem_c
+#define LUA_CORE
+
 #include "lua.h"
 
 #include "ldebug.h"
@@ -25,191 +23,77 @@
 
 /*
 ** About the realloc function:
-** void *frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
-** ('osize' is the old size, 'nsize' is the new size)
+** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
+** (`osize' is the old size, `nsize' is the new size)
 **
-** - frealloc(ud, p, x, 0) frees the block 'p' and returns NULL.
-** Particularly, frealloc(ud, NULL, 0, 0) does nothing,
-** which is equivalent to free(NULL) in ISO C.
+** * frealloc(ud, NULL, x, s) creates a new block of size `s' (no
+** matter 'x').
 **
-** - frealloc(ud, NULL, x, s) creates a new block of size 's'
-** (no matter 'x'). Returns NULL if it cannot create the new block.
+** * frealloc(ud, p, x, 0) frees the block `p'
+** (in this specific case, frealloc must return NULL);
+** particularly, frealloc(ud, NULL, 0, 0) does nothing
+** (which is equivalent to free(NULL) in ANSI C)
 **
-** - otherwise, frealloc(ud, b, x, y) reallocates the block 'b' from
-** size 'x' to size 'y'. Returns NULL if it cannot reallocate the
-** block to the new size.
+** frealloc returns NULL if it cannot create or reallocate the area
+** (any reallocation to an equal or smaller size cannot fail!)
 */
 
 
-/*
-** Macro to call the allocation function.
-*/
-#define callfrealloc(g,block,os,ns)    ((*g->frealloc)(g->ud, block, os, ns))
 
-
-/*
-** When an allocation fails, it will try again after an emergency
-** collection, except when it cannot run a collection.  The GC should
-** not be called while the state is not fully built, as the collector
-** is not yet fully initialized. Also, it should not be called when
-** 'gcstopem' is true, because then the interpreter is in the middle of
-** a collection step.
-*/
-#define cantryagain(g)	(completestate(g) && !g->gcstopem)
-
-
-
-
-#if defined(EMERGENCYGCTESTS)
-/*
-** First allocation will fail except when freeing a block (frees never
-** fail) and when it cannot try again; this fail will trigger 'tryagain'
-** and a full GC cycle at every allocation.
-*/
-static void *firsttry (global_State *g, void *block, size_t os, size_t ns) {
-  if (ns > 0 && cantryagain(g))
-    return NULL;  /* fail */
-  else  /* normal allocation */
-    return callfrealloc(g, block, os, ns);
-}
-#else
-#define firsttry(g,block,os,ns)    callfrealloc(g, block, os, ns)
-#endif
-
-
-
-
-
-/*
-** {==================================================================
-** Functions to allocate/deallocate arrays for the Parser
-** ===================================================================
-*/
-
-/*
-** Minimum size for arrays during parsing, to avoid overhead of
-** reallocating to size 1, then 2, and then 4. All these arrays
-** will be reallocated to exact sizes or erased when parsing ends.
-*/
 #define MINSIZEARRAY	4
 
 
-void *luaM_growaux_ (lua_State *L, void *block, int nelems, int *psize,
-                     int size_elems, int limit, const char *what) {
+void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
+                     int limit, const char *what) {
   void *newblock;
-  int size = *psize;
-  if (nelems + 1 <= size)  /* does one extra element still fit? */
-    return block;  /* nothing to be done */
-  if (size >= limit / 2) {  /* cannot double it? */
-    if (l_unlikely(size >= limit))  /* cannot grow even a little? */
+  int newsize;
+  if (*size >= limit/2) {  /* cannot double it? */
+    if (*size >= limit)  /* cannot grow even a little? */
       luaG_runerror(L, "too many %s (limit is %d)", what, limit);
-    size = limit;  /* still have at least one free place */
+    newsize = limit;  /* still have at least one free place */
   }
   else {
-    size *= 2;
-    if (size < MINSIZEARRAY)
-      size = MINSIZEARRAY;  /* minimum size */
+    newsize = (*size)*2;
+    if (newsize < MINSIZEARRAY)
+      newsize = MINSIZEARRAY;  /* minimum size */
   }
-  lua_assert(nelems + 1 <= size && size <= limit);
-  /* 'limit' ensures that multiplication will not overflow */
-  newblock = luaM_saferealloc_(L, block, cast_sizet(*psize) * size_elems,
-                                         cast_sizet(size) * size_elems);
-  *psize = size;  /* update only when everything else is OK */
+  newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
+  *size = newsize;  /* update only when everything else is OK */
   return newblock;
 }
 
 
-/*
-** In prototypes, the size of the array is also its number of
-** elements (to save memory). So, if it cannot shrink an array
-** to its number of elements, the only option is to raise an
-** error.
-*/
-void *luaM_shrinkvector_ (lua_State *L, void *block, int *size,
-                          int final_n, int size_elem) {
-  void *newblock;
-  size_t oldsize = cast_sizet((*size) * size_elem);
-  size_t newsize = cast_sizet(final_n * size_elem);
-  lua_assert(newsize <= oldsize);
-  newblock = luaM_saferealloc_(L, block, oldsize, newsize);
-  *size = final_n;
-  return newblock;
-}
-
-/* }================================================================== */
-
-
 l_noret luaM_toobig (lua_State *L) {
   luaG_runerror(L, "memory allocation error: block too big");
 }
 
 
-/*
-** Free memory
-*/
-void luaM_free_ (lua_State *L, void *block, size_t osize) {
-  global_State *g = G(L);
-  lua_assert((osize == 0) == (block == NULL));
-  callfrealloc(g, block, osize, 0);
-  g->GCdebt -= osize;
-}
-
 
 /*
-** In case of allocation fail, this function will do an emergency
-** collection to free some memory and then try the allocation again.
-*/
-static void *tryagain (lua_State *L, void *block,
-                       size_t osize, size_t nsize) {
-  global_State *g = G(L);
-  if (cantryagain(g)) {
-    luaC_fullgc(L, 1);  /* try to free some memory... */
-    return callfrealloc(g, block, osize, nsize);  /* try again */
-  }
-  else return NULL;  /* cannot run an emergency collection */
-}
-
-
-/*
-** Generic allocation routine.
+** generic allocation routine.
 */
 void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
   void *newblock;
   global_State *g = G(L);
-  lua_assert((osize == 0) == (block == NULL));
-  newblock = firsttry(g, block, osize, nsize);
-  if (l_unlikely(newblock == NULL && nsize > 0)) {
-    newblock = tryagain(L, block, osize, nsize);
-    if (newblock == NULL)  /* still no memory? */
-      return NULL;  /* do not update 'GCdebt' */
+  size_t realosize = (block) ? osize : 0;
+  lua_assert((realosize == 0) == (block == NULL));
+#if defined(HARDMEMTESTS)
+  if (nsize > realosize && g->gcrunning)
+    luaC_fullgc(L, 1);  /* force a GC whenever possible */
+#endif
+  newblock = (*g->frealloc)(g->ud, block, osize, nsize);
+  if (newblock == NULL && nsize > 0) {
+    api_check(L, nsize > realosize,
+                 "realloc cannot fail when shrinking a block");
+    if (g->gcrunning) {
+      luaC_fullgc(L, 1);  /* try to free some memory... */
+      newblock = (*g->frealloc)(g->ud, block, osize, nsize);  /* try again */
+    }
+    if (newblock == NULL)
+      luaD_throw(L, LUA_ERRMEM);
   }
   lua_assert((nsize == 0) == (newblock == NULL));
-  g->GCdebt = (g->GCdebt + nsize) - osize;
+  g->GCdebt = (g->GCdebt + nsize) - realosize;
   return newblock;
 }
 
-
-void *luaM_saferealloc_ (lua_State *L, void *block, size_t osize,
-                                                    size_t nsize) {
-  void *newblock = luaM_realloc_(L, block, osize, nsize);
-  if (l_unlikely(newblock == NULL && nsize > 0))  /* allocation failed? */
-    luaM_error(L);
-  return newblock;
-}
-
-
-void *luaM_malloc_ (lua_State *L, size_t size, int tag) {
-  if (size == 0)
-    return NULL;  /* that's all */
-  else {
-    global_State *g = G(L);
-    void *newblock = firsttry(g, NULL, tag, size);
-    if (l_unlikely(newblock == NULL)) {
-      newblock = tryagain(L, NULL, tag, size);
-      if (newblock == NULL)
-        luaM_error(L);
-    }
-    g->GCdebt += size;
-    return newblock;
-  }
-}

lmem.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.h $
+** $Id: lmem.h,v 1.40 2013/02/20 14:08:21 roberto Exp $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
@@ -14,80 +14,44 @@
 #include "lua.h"
 
 
-#define luaM_error(L)	luaD_throw(L, LUA_ERRMEM)
-
-
 /*
-** This macro tests whether it is safe to multiply 'n' by the size of
-** type 't' without overflows. Because 'e' is always constant, it avoids
-** the runtime division MAX_SIZET/(e).
-** (The macro is somewhat complex to avoid warnings:  The 'sizeof'
-** comparison avoids a runtime comparison when overflow cannot occur.
-** The compiler should be able to optimize the real test by itself, but
-** when it does it, it may give a warning about "comparison is always
-** false due to limited range of data type"; the +1 tricks the compiler,
-** avoiding this warning but also this optimization.)
+** This macro avoids the runtime division MAX_SIZET/(e), as 'e' is
+** always constant.
+** The macro is somewhat complex to avoid warnings:
+** +1 avoids warnings of "comparison has constant result";
+** cast to 'void' avoids warnings of "value unused".
 */
-#define luaM_testsize(n,e)  \
-	(sizeof(n) >= sizeof(size_t) && cast_sizet((n)) + 1 > MAX_SIZET/(e))
+#define luaM_reallocv(L,b,on,n,e) \
+  (cast(void, \
+     (cast(size_t, (n)+1) > MAX_SIZET/(e)) ? (luaM_toobig(L), 0) : 0), \
+   luaM_realloc_(L, (b), (on)*(e), (n)*(e)))
 
-#define luaM_checksize(L,n,e)  \
-	(luaM_testsize(n,e) ? luaM_toobig(L) : cast_void(0))
+#define luaM_freemem(L, b, s)	luaM_realloc_(L, (b), (s), 0)
+#define luaM_free(L, b)		luaM_realloc_(L, (b), sizeof(*(b)), 0)
+#define luaM_freearray(L, b, n)   luaM_reallocv(L, (b), n, 0, sizeof((b)[0]))
 
+#define luaM_malloc(L,s)	luaM_realloc_(L, NULL, 0, (s))
+#define luaM_new(L,t)		cast(t *, luaM_malloc(L, sizeof(t)))
+#define luaM_newvector(L,n,t) \
+		cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t)))
 
-/*
-** Computes the minimum between 'n' and 'MAX_SIZET/sizeof(t)', so that
-** the result is not larger than 'n' and cannot overflow a 'size_t'
-** when multiplied by the size of type 't'. (Assumes that 'n' is an
-** 'int' or 'unsigned int' and that 'int' is not larger than 'size_t'.)
-*/
-#define luaM_limitN(n,t)  \
-  ((cast_sizet(n) <= MAX_SIZET/sizeof(t)) ? (n) :  \
-     cast_uint((MAX_SIZET/sizeof(t))))
-
-
-/*
-** Arrays of chars do not need any test
-*/
-#define luaM_reallocvchar(L,b,on,n)  \
-  cast_charp(luaM_saferealloc_(L, (b), (on)*sizeof(char), (n)*sizeof(char)))
-
-#define luaM_freemem(L, b, s)	luaM_free_(L, (b), (s))
-#define luaM_free(L, b)		luaM_free_(L, (b), sizeof(*(b)))
-#define luaM_freearray(L, b, n)   luaM_free_(L, (b), (n)*sizeof(*(b)))
-
-#define luaM_new(L,t)		cast(t*, luaM_malloc_(L, sizeof(t), 0))
-#define luaM_newvector(L,n,t)	cast(t*, luaM_malloc_(L, (n)*sizeof(t), 0))
-#define luaM_newvectorchecked(L,n,t) \
-  (luaM_checksize(L,n,sizeof(t)), luaM_newvector(L,n,t))
-
-#define luaM_newobject(L,tag,s)	luaM_malloc_(L, (s), tag)
+#define luaM_newobject(L,tag,s)	luaM_realloc_(L, NULL, tag, (s))
 
 #define luaM_growvector(L,v,nelems,size,t,limit,e) \
-	((v)=cast(t *, luaM_growaux_(L,v,nelems,&(size),sizeof(t), \
-                         luaM_limitN(limit,t),e)))
+          if ((nelems)+1 > (size)) \
+            ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e)))
 
 #define luaM_reallocvector(L, v,oldn,n,t) \
-   (cast(t *, luaM_realloc_(L, v, cast_sizet(oldn) * sizeof(t), \
-                                  cast_sizet(n) * sizeof(t))))
-
-#define luaM_shrinkvector(L,v,size,fs,t) \
-   ((v)=cast(t *, luaM_shrinkvector_(L, v, &(size), fs, sizeof(t))))
+   ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
 
 LUAI_FUNC l_noret luaM_toobig (lua_State *L);
 
 /* not to be called directly */
 LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
                                                           size_t size);
-LUAI_FUNC void *luaM_saferealloc_ (lua_State *L, void *block, size_t oldsize,
-                                                              size_t size);
-LUAI_FUNC void luaM_free_ (lua_State *L, void *block, size_t osize);
-LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int nelems,
-                               int *size, int size_elem, int limit,
+LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
+                               size_t size_elem, int limit,
                                const char *what);
-LUAI_FUNC void *luaM_shrinkvector_ (lua_State *L, void *block, int *nelem,
-                                    int final_n, int size_elem);
-LUAI_FUNC void *luaM_malloc_ (lua_State *L, size_t size, int tag);
 
 #endif
 

loadlib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: loadlib.c $
+** $Id: loadlib.c,v 1.111 2012/05/30 12:33:44 roberto Exp $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
@@ -8,16 +8,22 @@
 ** systems.
 */
 
-#define loadlib_c
-#define LUA_LIB
 
-#include "lprefix.h"
+/*
+** if needed, includes windows header before everything else
+*/
+#if defined(_WIN32)
+#include <windows.h>
+#endif
 
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+
+#define loadlib_c
+#define LUA_LIB
+
 #include "lua.h"
 
 #include "lauxlib.h"
@@ -25,9 +31,40 @@
 
 
 /*
+** LUA_PATH and LUA_CPATH are the names of the environment
+** variables that Lua check to set its paths.
+*/
+#if !defined(LUA_PATH)
+#define LUA_PATH	"LUA_PATH"
+#endif
+
+#if !defined(LUA_CPATH)
+#define LUA_CPATH	"LUA_CPATH"
+#endif
+
+#define LUA_PATHSUFFIX		"_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+
+#define LUA_PATHVERSION		LUA_PATH LUA_PATHSUFFIX
+#define LUA_CPATHVERSION	LUA_CPATH LUA_PATHSUFFIX
+
+/*
+** LUA_PATH_SEP is the character that separates templates in a path.
+** LUA_PATH_MARK is the string that marks the substitution points in a
+** template.
+** LUA_EXEC_DIR in a Windows path is replaced by the executable's
+** directory.
 ** LUA_IGMARK is a mark to ignore all before it when building the
 ** luaopen_ function name.
 */
+#if !defined (LUA_PATH_SEP)
+#define LUA_PATH_SEP		";"
+#endif
+#if !defined (LUA_PATH_MARK)
+#define LUA_PATH_MARK		"?"
+#endif
+#if !defined (LUA_EXEC_DIR)
+#define LUA_EXEC_DIR		"!"
+#endif
 #if !defined (LUA_IGMARK)
 #define LUA_IGMARK		"-"
 #endif
@@ -55,53 +92,29 @@
 #define LUA_OFSEP	"_"
 
 
-/*
-** key for table in the registry that keeps handles
-** for all loaded C libraries
-*/
-static const char *const CLIBS = "_CLIBS";
+/* table (in the registry) that keeps handles for all loaded C libraries */
+#define CLIBS		"_CLIBS"
 
 #define LIB_FAIL	"open"
 
 
-#define setprogdir(L)           ((void)0)
+/* error codes for ll_loadfunc */
+#define ERRLIB		1
+#define ERRFUNC		2
 
-
-/*
-** Special type equivalent to '(void*)' for functions in gcc
-** (to suppress warnings when converting function pointers)
-*/
-typedef void (*voidf)(void);
+#define setprogdir(L)		((void)0)
 
 
 /*
 ** system-dependent functions
 */
-
-/*
-** unload library 'lib'
-*/
-static void lsys_unloadlib (void *lib);
-
-/*
-** load C library in file 'path'. If 'seeglb', load with all names in
-** the library global.
-** Returns the library; in case of error, returns NULL plus an
-** error string in the stack.
-*/
-static void *lsys_load (lua_State *L, const char *path, int seeglb);
-
-/*
-** Try to find a function named 'sym' in library 'lib'.
-** Returns the function; in case of error, returns NULL plus an
-** error string in the stack.
-*/
-static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym);
+static void ll_unloadlib (void *lib);
+static void *ll_load (lua_State *L, const char *path, int seeglb);
+static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym);
 
 
 
-
-#if defined(LUA_USE_DLOPEN)	/* { */
+#if defined(LUA_USE_DLOPEN)
 /*
 ** {========================================================================
 ** This is an implementation of loadlib based on the dlfcn interface.
@@ -113,35 +126,21 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym);
 
 #include <dlfcn.h>
 
-/*
-** Macro to convert pointer-to-void* to pointer-to-function. This cast
-** is undefined according to ISO C, but POSIX assumes that it works.
-** (The '__extension__' in gnu compilers is only to avoid warnings.)
-*/
-#if defined(__GNUC__)
-#define cast_func(p) (__extension__ (lua_CFunction)(p))
-#else
-#define cast_func(p) ((lua_CFunction)(p))
-#endif
-
-
-static void lsys_unloadlib (void *lib) {
+static void ll_unloadlib (void *lib) {
   dlclose(lib);
 }
 
 
-static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+static void *ll_load (lua_State *L, const char *path, int seeglb) {
   void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
-  if (l_unlikely(lib == NULL))
-    lua_pushstring(L, dlerror());
+  if (lib == NULL) lua_pushstring(L, dlerror());
   return lib;
 }
 
 
-static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = cast_func(dlsym(lib, sym));
-  if (l_unlikely(f == NULL))
-    lua_pushstring(L, dlerror());
+static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
+  if (f == NULL) lua_pushstring(L, dlerror());
   return f;
 }
 
@@ -149,15 +148,14 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
 
 
 
-#elif defined(LUA_DL_DLL)	/* }{ */
+#elif defined(LUA_DL_DLL)
 /*
 ** {======================================================================
 ** This is an implementation of loadlib for Windows using native functions.
 ** =======================================================================
 */
 
-#include <windows.h>
-
+#undef setprogdir
 
 /*
 ** optional flags for LoadLibraryEx
@@ -167,30 +165,21 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
 #endif
 
 
-#undef setprogdir
-
-
-/*
-** Replace in the path (on the top of the stack) any occurrence
-** of LUA_EXEC_DIR with the executable's path.
-*/
 static void setprogdir (lua_State *L) {
   char buff[MAX_PATH + 1];
   char *lb;
   DWORD nsize = sizeof(buff)/sizeof(char);
-  DWORD n = GetModuleFileNameA(NULL, buff, nsize);  /* get exec. name */
+  DWORD n = GetModuleFileNameA(NULL, buff, nsize);
   if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
     luaL_error(L, "unable to get ModuleFileName");
   else {
-    *lb = '\0';  /* cut name on the last '\\' to get the path */
+    *lb = '\0';
     luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
     lua_remove(L, -2);  /* remove original string */
   }
 }
 
 
-
-
 static void pusherror (lua_State *L) {
   int error = GetLastError();
   char buffer[128];
@@ -201,12 +190,12 @@ static void pusherror (lua_State *L) {
     lua_pushfstring(L, "system error %d\n", error);
 }
 
-static void lsys_unloadlib (void *lib) {
+static void ll_unloadlib (void *lib) {
   FreeLibrary((HMODULE)lib);
 }
 
 
-static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+static void *ll_load (lua_State *L, const char *path, int seeglb) {
   HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
   (void)(seeglb);  /* not used: symbols are 'global' by default */
   if (lib == NULL) pusherror(L);
@@ -214,8 +203,8 @@ static void *lsys_load (lua_State *L, const char *path, int seeglb) {
 }
 
 
-static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = (lua_CFunction)(voidf)GetProcAddress((HMODULE)lib, sym);
+static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
   if (f == NULL) pusherror(L);
   return f;
 }
@@ -223,7 +212,7 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
 /* }====================================================== */
 
 
-#else				/* }{ */
+#else
 /*
 ** {======================================================
 ** Fallback for other systems
@@ -237,102 +226,29 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
 #define DLMSG	"dynamic libraries not enabled; check your Lua installation"
 
 
-static void lsys_unloadlib (void *lib) {
+static void ll_unloadlib (void *lib) {
   (void)(lib);  /* not used */
 }
 
 
-static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+static void *ll_load (lua_State *L, const char *path, int seeglb) {
   (void)(path); (void)(seeglb);  /* not used */
   lua_pushliteral(L, DLMSG);
   return NULL;
 }
 
 
-static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
   (void)(lib); (void)(sym);  /* not used */
   lua_pushliteral(L, DLMSG);
   return NULL;
 }
 
 /* }====================================================== */
-#endif				/* } */
-
-
-/*
-** {==================================================================
-** Set Paths
-** ===================================================================
-*/
-
-/*
-** LUA_PATH_VAR and LUA_CPATH_VAR are the names of the environment
-** variables that Lua check to set its paths.
-*/
-#if !defined(LUA_PATH_VAR)
-#define LUA_PATH_VAR    "LUA_PATH"
-#endif
-
-#if !defined(LUA_CPATH_VAR)
-#define LUA_CPATH_VAR   "LUA_CPATH"
 #endif
 
 
-
-/*
-** return registry.LUA_NOENV as a boolean
-*/
-static int noenv (lua_State *L) {
-  int b;
-  lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
-  b = lua_toboolean(L, -1);
-  lua_pop(L, 1);  /* remove value */
-  return b;
-}
-
-
-/*
-** Set a path
-*/
-static void setpath (lua_State *L, const char *fieldname,
-                                   const char *envname,
-                                   const char *dft) {
-  const char *dftmark;
-  const char *nver = lua_pushfstring(L, "%s%s", envname, LUA_VERSUFFIX);
-  const char *path = getenv(nver);  /* try versioned name */
-  if (path == NULL)  /* no versioned environment variable? */
-    path = getenv(envname);  /* try unversioned name */
-  if (path == NULL || noenv(L))  /* no environment variable? */
-    lua_pushstring(L, dft);  /* use default */
-  else if ((dftmark = strstr(path, LUA_PATH_SEP LUA_PATH_SEP)) == NULL)
-    lua_pushstring(L, path);  /* nothing to change */
-  else {  /* path contains a ";;": insert default path in its place */
-    size_t len = strlen(path);
-    luaL_Buffer b;
-    luaL_buffinit(L, &b);
-    if (path < dftmark) {  /* is there a prefix before ';;'? */
-      luaL_addlstring(&b, path, dftmark - path);  /* add it */
-      luaL_addchar(&b, *LUA_PATH_SEP);
-    }
-    luaL_addstring(&b, dft);  /* add default */
-    if (dftmark < path + len - 2) {  /* is there a suffix after ';;'? */
-      luaL_addchar(&b, *LUA_PATH_SEP);
-      luaL_addlstring(&b, dftmark + 2, (path + len - 2) - dftmark);
-    }
-    luaL_pushresult(&b);
-  }
-  setprogdir(L);
-  lua_setfield(L, -3, fieldname);  /* package[fieldname] = path value */
-  lua_pop(L, 1);  /* pop versioned variable name ('nver') */
-}
-
-/* }================================================================== */
-
-
-/*
-** return registry.CLIBS[path]
-*/
-static void *checkclib (lua_State *L, const char *path) {
+static void *ll_checkclib (lua_State *L, const char *path) {
   void *plib;
   lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
   lua_getfield(L, -1, path);
@@ -342,11 +258,7 @@ static void *checkclib (lua_State *L, const char *path) {
 }
 
 
-/*
-** registry.CLIBS[path] = plib        -- for queries
-** registry.CLIBS[#CLIBS + 1] = plib  -- also keep a list of all libraries
-*/
-static void addtoclib (lua_State *L, const char *path, void *plib) {
+static void ll_addtoclib (lua_State *L, const char *path, void *plib) {
   lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
   lua_pushlightuserdata(L, plib);
   lua_pushvalue(L, -1);
@@ -357,49 +269,33 @@ static void addtoclib (lua_State *L, const char *path, void *plib) {
 
 
 /*
-** __gc tag method for CLIBS table: calls 'lsys_unloadlib' for all lib
+** __gc tag method for CLIBS table: calls 'll_unloadlib' for all lib
 ** handles in list CLIBS
 */
 static int gctm (lua_State *L) {
-  lua_Integer n = luaL_len(L, 1);
+  int n = luaL_len(L, 1);
   for (; n >= 1; n--) {  /* for each handle, in reverse order */
     lua_rawgeti(L, 1, n);  /* get handle CLIBS[n] */
-    lsys_unloadlib(lua_touserdata(L, -1));
+    ll_unloadlib(lua_touserdata(L, -1));
     lua_pop(L, 1);  /* pop handle */
   }
   return 0;
 }
 
 
-
-/* error codes for 'lookforfunc' */
-#define ERRLIB		1
-#define ERRFUNC		2
-
-/*
-** Look for a C function named 'sym' in a dynamically loaded library
-** 'path'.
-** First, check whether the library is already loaded; if not, try
-** to load it.
-** Then, if 'sym' is '*', return true (as library has been loaded).
-** Otherwise, look for symbol 'sym' in the library and push a
-** C function with that symbol.
-** Return 0 and 'true' or a function in the stack; in case of
-** errors, return an error code and an error message in the stack.
-*/
-static int lookforfunc (lua_State *L, const char *path, const char *sym) {
-  void *reg = checkclib(L, path);  /* check loaded C libraries */
+static int ll_loadfunc (lua_State *L, const char *path, const char *sym) {
+  void *reg = ll_checkclib(L, path);  /* check loaded C libraries */
   if (reg == NULL) {  /* must load library? */
-    reg = lsys_load(L, path, *sym == '*');  /* global symbols if 'sym'=='*' */
+    reg = ll_load(L, path, *sym == '*');
     if (reg == NULL) return ERRLIB;  /* unable to load library */
-    addtoclib(L, path, reg);
+    ll_addtoclib(L, path, reg);
   }
   if (*sym == '*') {  /* loading only library (no function)? */
     lua_pushboolean(L, 1);  /* return 'true' */
     return 0;  /* no errors */
   }
   else {
-    lua_CFunction f = lsys_sym(L, reg, sym);
+    lua_CFunction f = ll_sym(L, reg, sym);
     if (f == NULL)
       return ERRFUNC;  /* unable to find function */
     lua_pushcfunction(L, f);  /* else create new function */
@@ -411,14 +307,14 @@ static int lookforfunc (lua_State *L, const char *path, const char *sym) {
 static int ll_loadlib (lua_State *L) {
   const char *path = luaL_checkstring(L, 1);
   const char *init = luaL_checkstring(L, 2);
-  int stat = lookforfunc(L, path, init);
-  if (l_likely(stat == 0))  /* no errors? */
+  int stat = ll_loadfunc(L, path, init);
+  if (stat == 0)  /* no errors? */
     return 1;  /* return the loaded function */
   else {  /* error; error message is on stack top */
-    luaL_pushfail(L);
+    lua_pushnil(L);
     lua_insert(L, -2);
     lua_pushstring(L, (stat == ERRLIB) ?  LIB_FAIL : "init");
-    return 3;  /* return fail, error message, and where */
+    return 3;  /* return nil, error message, and where */
   }
 }
 
@@ -439,42 +335,14 @@ static int readable (const char *filename) {
 }
 
 
-/*
-** Get the next name in '*path' = 'name1;name2;name3;...', changing
-** the ending ';' to '\0' to create a zero-terminated string. Return
-** NULL when list ends.
-*/
-static const char *getnextfilename (char **path, char *end) {
-  char *sep;
-  char *name = *path;
-  if (name == end)
-    return NULL;  /* no more names */
-  else if (*name == '\0') {  /* from previous iteration? */
-    *name = *LUA_PATH_SEP;  /* restore separator */
-    name++;  /* skip it */
-  }
-  sep = strchr(name, *LUA_PATH_SEP);  /* find next separator */
-  if (sep == NULL)  /* separator not found? */
-    sep = end;  /* name goes until the end */
-  *sep = '\0';  /* finish file name */
-  *path = sep;  /* will start next search from here */
-  return name;
-}
-
-
-/*
-** Given a path such as ";blabla.so;blublu.so", pushes the string
-**
-** no file 'blabla.so'
-**	no file 'blublu.so'
-*/
-static void pusherrornotfound (lua_State *L, const char *path) {
-  luaL_Buffer b;
-  luaL_buffinit(L, &b);
-  luaL_addstring(&b, "no file '");
-  luaL_addgsub(&b, path, LUA_PATH_SEP, "'\n\tno file '");
-  luaL_addstring(&b, "'");
-  luaL_pushresult(&b);
+static const char *pushnexttemplate (lua_State *L, const char *path) {
+  const char *l;
+  while (*path == *LUA_PATH_SEP) path++;  /* skip separators */
+  if (*path == '\0') return NULL;  /* no more templates */
+  l = strchr(path, *LUA_PATH_SEP);  /* find next separator */
+  if (l == NULL) l = path + strlen(path);
+  lua_pushlstring(L, path, l - path);  /* template */
+  return l;
 }
 
 
@@ -482,25 +350,21 @@ static const char *searchpath (lua_State *L, const char *name,
                                              const char *path,
                                              const char *sep,
                                              const char *dirsep) {
-  luaL_Buffer buff;
-  char *pathname;  /* path with name inserted */
-  char *endpathname;  /* its end */
-  const char *filename;
-  /* separator is non-empty and appears in 'name'? */
-  if (*sep != '\0' && strchr(name, *sep) != NULL)
+  luaL_Buffer msg;  /* to build error message */
+  luaL_buffinit(L, &msg);
+  if (*sep != '\0')  /* non-empty separator? */
     name = luaL_gsub(L, name, sep, dirsep);  /* replace it by 'dirsep' */
-  luaL_buffinit(L, &buff);
-  /* add path to the buffer, replacing marks ('?') with the file name */
-  luaL_addgsub(&buff, path, LUA_PATH_MARK, name);
-  luaL_addchar(&buff, '\0');
-  pathname = luaL_buffaddr(&buff);  /* writable list of file names */
-  endpathname = pathname + luaL_bufflen(&buff) - 1;
-  while ((filename = getnextfilename(&pathname, endpathname)) != NULL) {
+  while ((path = pushnexttemplate(L, path)) != NULL) {
+    const char *filename = luaL_gsub(L, lua_tostring(L, -1),
+                                     LUA_PATH_MARK, name);
+    lua_remove(L, -2);  /* remove path template */
     if (readable(filename))  /* does file exist and is readable? */
-      return lua_pushstring(L, filename);  /* save and return name */
+      return filename;  /* return that file name */
+    lua_pushfstring(L, "\n\tno file " LUA_QS, filename);
+    lua_remove(L, -2);  /* remove file name */
+    luaL_addvalue(&msg);  /* concatenate error msg. entry */
   }
-  luaL_pushresult(&buff);  /* push path to create error message */
-  pusherrornotfound(L, lua_tostring(L, -1));  /* create error message */
+  luaL_pushresult(&msg);  /* create error message */
   return NULL;  /* not found */
 }
 
@@ -512,9 +376,9 @@ static int ll_searchpath (lua_State *L) {
                                 luaL_optstring(L, 4, LUA_DIRSEP));
   if (f != NULL) return 1;
   else {  /* error message is on top of the stack */
-    luaL_pushfail(L);
+    lua_pushnil(L);
     lua_insert(L, -2);
-    return 2;  /* return fail + error message */
+    return 2;  /* return nil + error message */
   }
 }
 
@@ -525,19 +389,20 @@ static const char *findfile (lua_State *L, const char *name,
   const char *path;
   lua_getfield(L, lua_upvalueindex(1), pname);
   path = lua_tostring(L, -1);
-  if (l_unlikely(path == NULL))
-    luaL_error(L, "'package.%s' must be a string", pname);
+  if (path == NULL)
+    luaL_error(L, LUA_QL("package.%s") " must be a string", pname);
   return searchpath(L, name, path, ".", dirsep);
 }
 
 
 static int checkload (lua_State *L, int stat, const char *filename) {
-  if (l_likely(stat)) {  /* module loaded successfully? */
+  if (stat) {  /* module loaded successfully? */
     lua_pushstring(L, filename);  /* will be 2nd argument to module */
     return 2;  /* return open function and file name */
   }
   else
-    return luaL_error(L, "error loading module '%s' from file '%s':\n\t%s",
+    return luaL_error(L, "error loading module " LUA_QS
+                         " from file " LUA_QS ":\n\t%s",
                           lua_tostring(L, 1), filename, lua_tostring(L, -1));
 }
 
@@ -551,29 +416,21 @@ static int searcher_Lua (lua_State *L) {
 }
 
 
-/*
-** Try to find a load function for module 'modname' at file 'filename'.
-** First, change '.' to '_' in 'modname'; then, if 'modname' has
-** the form X-Y (that is, it has an "ignore mark"), build a function
-** name "luaopen_X" and look for it. (For compatibility, if that
-** fails, it also tries "luaopen_Y".) If there is no ignore mark,
-** look for a function named "luaopen_modname".
-*/
 static int loadfunc (lua_State *L, const char *filename, const char *modname) {
-  const char *openfunc;
+  const char *funcname;
   const char *mark;
   modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
   mark = strchr(modname, *LUA_IGMARK);
   if (mark) {
     int stat;
-    openfunc = lua_pushlstring(L, modname, mark - modname);
-    openfunc = lua_pushfstring(L, LUA_POF"%s", openfunc);
-    stat = lookforfunc(L, filename, openfunc);
+    funcname = lua_pushlstring(L, modname, mark - modname);
+    funcname = lua_pushfstring(L, LUA_POF"%s", funcname);
+    stat = ll_loadfunc(L, filename, funcname);
     if (stat != ERRFUNC) return stat;
     modname = mark + 1;  /* else go ahead and try old-style name */
   }
-  openfunc = lua_pushfstring(L, LUA_POF"%s", modname);
-  return lookforfunc(L, filename, openfunc);
+  funcname = lua_pushfstring(L, LUA_POF"%s", modname);
+  return ll_loadfunc(L, filename, funcname);
 }
 
 
@@ -598,7 +455,8 @@ static int searcher_Croot (lua_State *L) {
     if (stat != ERRFUNC)
       return checkload(L, 0, filename);  /* real error */
     else {  /* open function not found */
-      lua_pushfstring(L, "no module '%s' in file '%s'", name, filename);
+      lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS,
+                         name, filename);
       return 1;
     }
   }
@@ -609,34 +467,29 @@ static int searcher_Croot (lua_State *L) {
 
 static int searcher_preload (lua_State *L) {
   const char *name = luaL_checkstring(L, 1);
-  lua_getfield(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
-  if (lua_getfield(L, -1, name) == LUA_TNIL) {  /* not found? */
-    lua_pushfstring(L, "no field package.preload['%s']", name);
-    return 1;
-  }
-  else {
-    lua_pushliteral(L, ":preload:");
-    return 2;
-  }
+  lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD");
+  lua_getfield(L, -1, name);
+  if (lua_isnil(L, -1))  /* not found? */
+    lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
+  return 1;
 }
 
 
 static void findloader (lua_State *L, const char *name) {
   int i;
   luaL_Buffer msg;  /* to build error message */
-  /* push 'package.searchers' to index 3 in the stack */
-  if (l_unlikely(lua_getfield(L, lua_upvalueindex(1), "searchers")
-                 != LUA_TTABLE))
-    luaL_error(L, "'package.searchers' must be a table");
   luaL_buffinit(L, &msg);
+  lua_getfield(L, lua_upvalueindex(1), "searchers");  /* will be at index 3 */
+  if (!lua_istable(L, 3))
+    luaL_error(L, LUA_QL("package.searchers") " must be a table");
   /*  iterate over available searchers to find a loader */
   for (i = 1; ; i++) {
-    luaL_addstring(&msg, "\n\t");  /* error-message prefix */
-    if (l_unlikely(lua_rawgeti(L, 3, i) == LUA_TNIL)) {  /* no more searchers? */
+    lua_rawgeti(L, 3, i);  /* get a searcher */
+    if (lua_isnil(L, -1)) {  /* no more searchers? */
       lua_pop(L, 1);  /* remove nil */
-      luaL_buffsub(&msg, 2);  /* remove prefix */
       luaL_pushresult(&msg);  /* create error message */
-      luaL_error(L, "module '%s' not found:%s", name, lua_tostring(L, -1));
+      luaL_error(L, "module " LUA_QS " not found:%s",
+                    name, lua_tostring(L, -1));
     }
     lua_pushstring(L, name);
     lua_call(L, 1, 2);  /* call it */
@@ -646,117 +499,222 @@ static void findloader (lua_State *L, const char *name) {
       lua_pop(L, 1);  /* remove extra return */
       luaL_addvalue(&msg);  /* concatenate error message */
     }
-    else {  /* no error message */
+    else
       lua_pop(L, 2);  /* remove both returns */
-      luaL_buffsub(&msg, 2);  /* remove prefix */
-    }
   }
 }
 
 
 static int ll_require (lua_State *L) {
   const char *name = luaL_checkstring(L, 1);
-  lua_settop(L, 1);  /* LOADED table will be at index 2 */
-  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
-  lua_getfield(L, 2, name);  /* LOADED[name] */
+  lua_settop(L, 1);  /* _LOADED table will be at index 2 */
+  lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
+  lua_getfield(L, 2, name);  /* _LOADED[name] */
   if (lua_toboolean(L, -1))  /* is it there? */
     return 1;  /* package is already loaded */
   /* else must load package */
   lua_pop(L, 1);  /* remove 'getfield' result */
   findloader(L, name);
-  lua_rotate(L, -2, 1);  /* function <-> loader data */
-  lua_pushvalue(L, 1);  /* name is 1st argument to module loader */
-  lua_pushvalue(L, -3);  /* loader data is 2nd argument */
-  /* stack: ...; loader data; loader function; mod. name; loader data */
+  lua_pushstring(L, name);  /* pass name as argument to module loader */
+  lua_insert(L, -2);  /* name is 1st argument (before search data) */
   lua_call(L, 2, 1);  /* run loader to load module */
-  /* stack: ...; loader data; result from loader */
   if (!lua_isnil(L, -1))  /* non-nil return? */
-    lua_setfield(L, 2, name);  /* LOADED[name] = returned value */
-  else
-    lua_pop(L, 1);  /* pop nil */
-  if (lua_getfield(L, 2, name) == LUA_TNIL) {   /* module set no value? */
+    lua_setfield(L, 2, name);  /* _LOADED[name] = returned value */
+  lua_getfield(L, 2, name);
+  if (lua_isnil(L, -1)) {   /* module did not set a value? */
     lua_pushboolean(L, 1);  /* use true as result */
-    lua_copy(L, -1, -2);  /* replace loader result */
-    lua_setfield(L, 2, name);  /* LOADED[name] = true */
+    lua_pushvalue(L, -1);  /* extra copy to be returned */
+    lua_setfield(L, 2, name);  /* _LOADED[name] = true */
   }
-  lua_rotate(L, -2, 1);  /* loader data <-> module result  */
-  return 2;  /* return module result and loader data */
+  return 1;
 }
 
 /* }====================================================== */
 
 
 
+/*
+** {======================================================
+** 'module' function
+** =======================================================
+*/
+#if defined(LUA_COMPAT_MODULE)
+
+/*
+** changes the environment variable of calling function
+*/
+static void set_env (lua_State *L) {
+  lua_Debug ar;
+  if (lua_getstack(L, 1, &ar) == 0 ||
+      lua_getinfo(L, "f", &ar) == 0 ||  /* get calling function */
+      lua_iscfunction(L, -1))
+    luaL_error(L, LUA_QL("module") " not called from a Lua function");
+  lua_pushvalue(L, -2);  /* copy new environment table to top */
+  lua_setupvalue(L, -2, 1);
+  lua_pop(L, 1);  /* remove function */
+}
+
+
+static void dooptions (lua_State *L, int n) {
+  int i;
+  for (i = 2; i <= n; i++) {
+    if (lua_isfunction(L, i)) {  /* avoid 'calling' extra info. */
+      lua_pushvalue(L, i);  /* get option (a function) */
+      lua_pushvalue(L, -2);  /* module */
+      lua_call(L, 1, 0);
+    }
+  }
+}
+
+
+static void modinit (lua_State *L, const char *modname) {
+  const char *dot;
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -2, "_M");  /* module._M = module */
+  lua_pushstring(L, modname);
+  lua_setfield(L, -2, "_NAME");
+  dot = strrchr(modname, '.');  /* look for last dot in module name */
+  if (dot == NULL) dot = modname;
+  else dot++;
+  /* set _PACKAGE as package name (full module name minus last part) */
+  lua_pushlstring(L, modname, dot - modname);
+  lua_setfield(L, -2, "_PACKAGE");
+}
+
+
+static int ll_module (lua_State *L) {
+  const char *modname = luaL_checkstring(L, 1);
+  int lastarg = lua_gettop(L);  /* last parameter */
+  luaL_pushmodule(L, modname, 1);  /* get/create module table */
+  /* check whether table already has a _NAME field */
+  lua_getfield(L, -1, "_NAME");
+  if (!lua_isnil(L, -1))  /* is table an initialized module? */
+    lua_pop(L, 1);
+  else {  /* no; initialize it */
+    lua_pop(L, 1);
+    modinit(L, modname);
+  }
+  lua_pushvalue(L, -1);
+  set_env(L);
+  dooptions(L, lastarg);
+  return 1;
+}
+
+
+static int ll_seeall (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  if (!lua_getmetatable(L, 1)) {
+    lua_createtable(L, 0, 1); /* create new metatable */
+    lua_pushvalue(L, -1);
+    lua_setmetatable(L, 1);
+  }
+  lua_pushglobaltable(L);
+  lua_setfield(L, -2, "__index");  /* mt.__index = _G */
+  return 0;
+}
+
+#endif
+/* }====================================================== */
+
+
+
+/* auxiliary mark (for internal use) */
+#define AUXMARK		"\1"
+
+
+/*
+** return registry.LUA_NOENV as a boolean
+*/
+static int noenv (lua_State *L) {
+  int b;
+  lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+  b = lua_toboolean(L, -1);
+  lua_pop(L, 1);  /* remove value */
+  return b;
+}
+
+
+static void setpath (lua_State *L, const char *fieldname, const char *envname1,
+                                   const char *envname2, const char *def) {
+  const char *path = getenv(envname1);
+  if (path == NULL)  /* no environment variable? */
+    path = getenv(envname2);  /* try alternative name */
+  if (path == NULL || noenv(L))  /* no environment variable? */
+    lua_pushstring(L, def);  /* use default */
+  else {
+    /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */
+    path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
+                              LUA_PATH_SEP AUXMARK LUA_PATH_SEP);
+    luaL_gsub(L, path, AUXMARK, def);
+    lua_remove(L, -2);
+  }
+  setprogdir(L);
+  lua_setfield(L, -2, fieldname);
+}
+
 
 static const luaL_Reg pk_funcs[] = {
   {"loadlib", ll_loadlib},
   {"searchpath", ll_searchpath},
-  /* placeholders */
-  {"preload", NULL},
-  {"cpath", NULL},
-  {"path", NULL},
-  {"searchers", NULL},
-  {"loaded", NULL},
+#if defined(LUA_COMPAT_MODULE)
+  {"seeall", ll_seeall},
+#endif
   {NULL, NULL}
 };
 
 
 static const luaL_Reg ll_funcs[] = {
+#if defined(LUA_COMPAT_MODULE)
+  {"module", ll_module},
+#endif
   {"require", ll_require},
   {NULL, NULL}
 };
 
 
 static void createsearcherstable (lua_State *L) {
-  static const lua_CFunction searchers[] = {
-    searcher_preload,
-    searcher_Lua,
-    searcher_C,
-    searcher_Croot,
-    NULL
-  };
+  static const lua_CFunction searchers[] =
+    {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
   int i;
   /* create 'searchers' table */
   lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
-  /* fill it with predefined searchers */
+  /* fill it with pre-defined searchers */
   for (i=0; searchers[i] != NULL; i++) {
     lua_pushvalue(L, -2);  /* set 'package' as upvalue for all searchers */
     lua_pushcclosure(L, searchers[i], 1);
     lua_rawseti(L, -2, i+1);
   }
-  lua_setfield(L, -2, "searchers");  /* put it in field 'searchers' */
-}
-
-
-/*
-** create table CLIBS to keep track of loaded C libraries,
-** setting a finalizer to close all libraries when closing state.
-*/
-static void createclibstable (lua_State *L) {
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);  /* create CLIBS table */
-  lua_createtable(L, 0, 1);  /* create metatable for CLIBS */
-  lua_pushcfunction(L, gctm);
-  lua_setfield(L, -2, "__gc");  /* set finalizer for CLIBS table */
-  lua_setmetatable(L, -2);
 }
 
 
 LUAMOD_API int luaopen_package (lua_State *L) {
-  createclibstable(L);
-  luaL_newlib(L, pk_funcs);  /* create 'package' table */
+  /* create table CLIBS to keep track of loaded C libraries */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, CLIBS);
+  lua_createtable(L, 0, 1);  /* metatable for CLIBS */
+  lua_pushcfunction(L, gctm);
+  lua_setfield(L, -2, "__gc");  /* set finalizer for CLIBS table */
+  lua_setmetatable(L, -2);
+  /* create `package' table */
+  luaL_newlib(L, pk_funcs);
   createsearcherstable(L);
-  /* set paths */
-  setpath(L, "path", LUA_PATH_VAR, LUA_PATH_DEFAULT);
-  setpath(L, "cpath", LUA_CPATH_VAR, LUA_CPATH_DEFAULT);
+#if defined(LUA_COMPAT_LOADERS)
+  lua_pushvalue(L, -1);  /* make a copy of 'searchers' table */
+  lua_setfield(L, -3, "loaders");  /* put it in field `loaders' */
+#endif
+  lua_setfield(L, -2, "searchers");  /* put it in field 'searchers' */
+  /* set field 'path' */
+  setpath(L, "path", LUA_PATHVERSION, LUA_PATH, LUA_PATH_DEFAULT);
+  /* set field 'cpath' */
+  setpath(L, "cpath", LUA_CPATHVERSION, LUA_CPATH, LUA_CPATH_DEFAULT);
   /* store config information */
   lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
                      LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
   lua_setfield(L, -2, "config");
-  /* set field 'loaded' */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  /* set field `loaded' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
   lua_setfield(L, -2, "loaded");
-  /* set field 'preload' */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  /* set field `preload' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
   lua_setfield(L, -2, "preload");
   lua_pushglobaltable(L);
   lua_pushvalue(L, -2);  /* set 'package' as upvalue for next lib */

lobject.c

@@ -1,22 +1,17 @@
 /*
-** $Id: lobject.c $
+** $Id: lobject.c,v 2.58 2013/02/20 14:08:56 roberto Exp $
 ** Some generic functions over Lua objects
 ** See Copyright Notice in lua.h
 */
 
-#define lobject_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
-
-#include <locale.h>
-#include <math.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#define lobject_c
+#define LUA_CORE
+
 #include "lua.h"
 
 #include "lctype.h"
@@ -29,11 +24,36 @@
 #include "lvm.h"
 
 
+
+LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
+
+
 /*
-** Computes ceil(log2(x))
+** converts an integer to a "floating point byte", represented as
+** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if
+** eeeee != 0 and (xxx) otherwise.
 */
+int luaO_int2fb (unsigned int x) {
+  int e = 0;  /* exponent */
+  if (x < 8) return x;
+  while (x >= 0x10) {
+    x = (x+1) >> 1;
+    e++;
+  }
+  return ((e+1) << 3) | (cast_int(x) - 8);
+}
+
+
+/* converts back */
+int luaO_fb2int (int x) {
+  int e = (x >> 3) & 0x1f;
+  if (e == 0) return x;
+  else return ((x & 7) + 8) << (e - 1);
+}
+
+
 int luaO_ceillog2 (unsigned int x) {
-  static const lu_byte log_2[256] = {  /* log_2[i] = ceil(log2(i - 1)) */
+  static const lu_byte log_2[256] = {
     0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
     6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
     7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
@@ -50,94 +70,31 @@ int luaO_ceillog2 (unsigned int x) {
 }
 
 
-static lua_Integer intarith (lua_State *L, int op, lua_Integer v1,
-                                                   lua_Integer v2) {
+lua_Number luaO_arith (int op, lua_Number v1, lua_Number v2) {
   switch (op) {
-    case LUA_OPADD: return intop(+, v1, v2);
-    case LUA_OPSUB:return intop(-, v1, v2);
-    case LUA_OPMUL:return intop(*, v1, v2);
-    case LUA_OPMOD: return luaV_mod(L, v1, v2);
-    case LUA_OPIDIV: return luaV_idiv(L, v1, v2);
-    case LUA_OPBAND: return intop(&, v1, v2);
-    case LUA_OPBOR: return intop(|, v1, v2);
-    case LUA_OPBXOR: return intop(^, v1, v2);
-    case LUA_OPSHL: return luaV_shiftl(v1, v2);
-    case LUA_OPSHR: return luaV_shiftr(v1, v2);
-    case LUA_OPUNM: return intop(-, 0, v1);
-    case LUA_OPBNOT: return intop(^, ~l_castS2U(0), v1);
+    case LUA_OPADD: return luai_numadd(NULL, v1, v2);
+    case LUA_OPSUB: return luai_numsub(NULL, v1, v2);
+    case LUA_OPMUL: return luai_nummul(NULL, v1, v2);
+    case LUA_OPDIV: return luai_numdiv(NULL, v1, v2);
+    case LUA_OPMOD: return luai_nummod(NULL, v1, v2);
+    case LUA_OPPOW: return luai_numpow(NULL, v1, v2);
+    case LUA_OPUNM: return luai_numunm(NULL, v1);
     default: lua_assert(0); return 0;
   }
 }
 
 
-static lua_Number numarith (lua_State *L, int op, lua_Number v1,
-                                                  lua_Number v2) {
-  switch (op) {
-    case LUA_OPADD: return luai_numadd(L, v1, v2);
-    case LUA_OPSUB: return luai_numsub(L, v1, v2);
-    case LUA_OPMUL: return luai_nummul(L, v1, v2);
-    case LUA_OPDIV: return luai_numdiv(L, v1, v2);
-    case LUA_OPPOW: return luai_numpow(L, v1, v2);
-    case LUA_OPIDIV: return luai_numidiv(L, v1, v2);
-    case LUA_OPUNM: return luai_numunm(L, v1);
-    case LUA_OPMOD: return luaV_modf(L, v1, v2);
-    default: lua_assert(0); return 0;
-  }
-}
-
-
-int luaO_rawarith (lua_State *L, int op, const TValue *p1, const TValue *p2,
-                   TValue *res) {
-  switch (op) {
-    case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
-    case LUA_OPSHL: case LUA_OPSHR:
-    case LUA_OPBNOT: {  /* operate only on integers */
-      lua_Integer i1; lua_Integer i2;
-      if (tointegerns(p1, &i1) && tointegerns(p2, &i2)) {
-        setivalue(res, intarith(L, op, i1, i2));
-        return 1;
-      }
-      else return 0;  /* fail */
-    }
-    case LUA_OPDIV: case LUA_OPPOW: {  /* operate only on floats */
-      lua_Number n1; lua_Number n2;
-      if (tonumberns(p1, n1) && tonumberns(p2, n2)) {
-        setfltvalue(res, numarith(L, op, n1, n2));
-        return 1;
-      }
-      else return 0;  /* fail */
-    }
-    default: {  /* other operations */
-      lua_Number n1; lua_Number n2;
-      if (ttisinteger(p1) && ttisinteger(p2)) {
-        setivalue(res, intarith(L, op, ivalue(p1), ivalue(p2)));
-        return 1;
-      }
-      else if (tonumberns(p1, n1) && tonumberns(p2, n2)) {
-        setfltvalue(res, numarith(L, op, n1, n2));
-        return 1;
-      }
-      else return 0;  /* fail */
-    }
-  }
-}
-
-
-void luaO_arith (lua_State *L, int op, const TValue *p1, const TValue *p2,
-                 StkId res) {
-  if (!luaO_rawarith(L, op, p1, p2, s2v(res))) {
-    /* could not perform raw operation; try metamethod */
-    luaT_trybinTM(L, p1, p2, res, cast(TMS, (op - LUA_OPADD) + TM_ADD));
-  }
-}
-
-
 int luaO_hexavalue (int c) {
   if (lisdigit(c)) return c - '0';
-  else return (ltolower(c) - 'a') + 10;
+  else return ltolower(c) - 'a' + 10;
 }
 
 
+#if !defined(lua_strx2number)
+
+#include <math.h>
+
+
 static int isneg (const char **s) {
   if (**s == '-') { (*s)++; return 1; }
   else if (**s == '+') (*s)++;
@@ -145,404 +102,131 @@ static int isneg (const char **s) {
 }
 
 
+static lua_Number readhexa (const char **s, lua_Number r, int *count) {
+  for (; lisxdigit(cast_uchar(**s)); (*s)++) {  /* read integer part */
+    r = (r * cast_num(16.0)) + cast_num(luaO_hexavalue(cast_uchar(**s)));
+    (*count)++;
+  }
+  return r;
+}
+
 
 /*
-** {==================================================================
-** Lua's implementation for 'lua_strx2number'
-** ===================================================================
-*/
-
-#if !defined(lua_strx2number)
-
-/* maximum number of significant digits to read (to avoid overflows
-   even with single floats) */
-#define MAXSIGDIG	30
-
-/*
-** convert a hexadecimal numeric string to a number, following
+** convert an hexadecimal numeric string to a number, following
 ** C99 specification for 'strtod'
 */
 static lua_Number lua_strx2number (const char *s, char **endptr) {
-  int dot = lua_getlocaledecpoint();
-  lua_Number r = l_mathop(0.0);  /* result (accumulator) */
-  int sigdig = 0;  /* number of significant digits */
-  int nosigdig = 0;  /* number of non-significant digits */
-  int e = 0;  /* exponent correction */
-  int neg;  /* 1 if number is negative */
-  int hasdot = 0;  /* true after seen a dot */
-  *endptr = cast_charp(s);  /* nothing is valid yet */
+  lua_Number r = 0.0;
+  int e = 0, i = 0;
+  int neg = 0;  /* 1 if number is negative */
+  *endptr = cast(char *, s);  /* nothing is valid yet */
   while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
-  neg = isneg(&s);  /* check sign */
+  neg = isneg(&s);  /* check signal */
   if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X')))  /* check '0x' */
-    return l_mathop(0.0);  /* invalid format (no '0x') */
-  for (s += 2; ; s++) {  /* skip '0x' and read numeral */
-    if (*s == dot) {
-      if (hasdot) break;  /* second dot? stop loop */
-      else hasdot = 1;
-    }
-    else if (lisxdigit(cast_uchar(*s))) {
-      if (sigdig == 0 && *s == '0')  /* non-significant digit (zero)? */
-        nosigdig++;
-      else if (++sigdig <= MAXSIGDIG)  /* can read it without overflow? */
-          r = (r * l_mathop(16.0)) + luaO_hexavalue(*s);
-      else e++; /* too many digits; ignore, but still count for exponent */
-      if (hasdot) e--;  /* decimal digit? correct exponent */
-    }
-    else break;  /* neither a dot nor a digit */
+    return 0.0;  /* invalid format (no '0x') */
+  s += 2;  /* skip '0x' */
+  r = readhexa(&s, r, &i);  /* read integer part */
+  if (*s == '.') {
+    s++;  /* skip dot */
+    r = readhexa(&s, r, &e);  /* read fractional part */
   }
-  if (nosigdig + sigdig == 0)  /* no digits? */
-    return l_mathop(0.0);  /* invalid format */
-  *endptr = cast_charp(s);  /* valid up to here */
-  e *= 4;  /* each digit multiplies/divides value by 2^4 */
+  if (i == 0 && e == 0)
+    return 0.0;  /* invalid format (no digit) */
+  e *= -4;  /* each fractional digit divides value by 2^-4 */
+  *endptr = cast(char *, s);  /* valid up to here */
   if (*s == 'p' || *s == 'P') {  /* exponent part? */
-    int exp1 = 0;  /* exponent value */
-    int neg1;  /* exponent sign */
+    int exp1 = 0;
+    int neg1;
     s++;  /* skip 'p' */
-    neg1 = isneg(&s);  /* sign */
+    neg1 = isneg(&s);  /* signal */
     if (!lisdigit(cast_uchar(*s)))
-      return l_mathop(0.0);  /* invalid; must have at least one digit */
+      goto ret;  /* must have at least one digit */
     while (lisdigit(cast_uchar(*s)))  /* read exponent */
       exp1 = exp1 * 10 + *(s++) - '0';
     if (neg1) exp1 = -exp1;
     e += exp1;
-    *endptr = cast_charp(s);  /* valid up to here */
   }
+  *endptr = cast(char *, s);  /* valid up to here */
+ ret:
   if (neg) r = -r;
   return l_mathop(ldexp)(r, e);
 }
 
 #endif
-/* }====================================================== */
 
 
-/* maximum length of a numeral to be converted to a number */
-#if !defined (L_MAXLENNUM)
-#define L_MAXLENNUM	200
-#endif
-
-/*
-** Convert string 's' to a Lua number (put in 'result'). Return NULL on
-** fail or the address of the ending '\0' on success. ('mode' == 'x')
-** means a hexadecimal numeral.
-*/
-static const char *l_str2dloc (const char *s, lua_Number *result, int mode) {
+int luaO_str2d (const char *s, size_t len, lua_Number *result) {
   char *endptr;
-  *result = (mode == 'x') ? lua_strx2number(s, &endptr)  /* try to convert */
-                          : lua_str2number(s, &endptr);
-  if (endptr == s) return NULL;  /* nothing recognized? */
-  while (lisspace(cast_uchar(*endptr))) endptr++;  /* skip trailing spaces */
-  return (*endptr == '\0') ? endptr : NULL;  /* OK iff no trailing chars */
-}
-
-
-/*
-** Convert string 's' to a Lua number (put in 'result') handling the
-** current locale.
-** This function accepts both the current locale or a dot as the radix
-** mark. If the conversion fails, it may mean number has a dot but
-** locale accepts something else. In that case, the code copies 's'
-** to a buffer (because 's' is read-only), changes the dot to the
-** current locale radix mark, and tries to convert again.
-** The variable 'mode' checks for special characters in the string:
-** - 'n' means 'inf' or 'nan' (which should be rejected)
-** - 'x' means a hexadecimal numeral
-** - '.' just optimizes the search for the common case (no special chars)
-*/
-static const char *l_str2d (const char *s, lua_Number *result) {
-  const char *endptr;
-  const char *pmode = strpbrk(s, ".xXnN");  /* look for special chars */
-  int mode = pmode ? ltolower(cast_uchar(*pmode)) : 0;
-  if (mode == 'n')  /* reject 'inf' and 'nan' */
-    return NULL;
-  endptr = l_str2dloc(s, result, mode);  /* try to convert */
-  if (endptr == NULL) {  /* failed? may be a different locale */
-    char buff[L_MAXLENNUM + 1];
-    const char *pdot = strchr(s, '.');
-    if (pdot == NULL || strlen(s) > L_MAXLENNUM)
-      return NULL;  /* string too long or no dot; fail */
-    strcpy(buff, s);  /* copy string to buffer */
-    buff[pdot - s] = lua_getlocaledecpoint();  /* correct decimal point */
-    endptr = l_str2dloc(buff, result, mode);  /* try again */
-    if (endptr != NULL)
-      endptr = s + (endptr - buff);  /* make relative to 's' */
-  }
-  return endptr;
-}
-
-
-#define MAXBY10		cast(lua_Unsigned, LUA_MAXINTEGER / 10)
-#define MAXLASTD	cast_int(LUA_MAXINTEGER % 10)
-
-static const char *l_str2int (const char *s, lua_Integer *result) {
-  lua_Unsigned a = 0;
-  int empty = 1;
-  int neg;
-  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
-  neg = isneg(&s);
-  if (s[0] == '0' &&
-      (s[1] == 'x' || s[1] == 'X')) {  /* hex? */
-    s += 2;  /* skip '0x' */
-    for (; lisxdigit(cast_uchar(*s)); s++) {
-      a = a * 16 + luaO_hexavalue(*s);
-      empty = 0;
-    }
-  }
-  else {  /* decimal */
-    for (; lisdigit(cast_uchar(*s)); s++) {
-      int d = *s - '0';
-      if (a >= MAXBY10 && (a > MAXBY10 || d > MAXLASTD + neg))  /* overflow? */
-        return NULL;  /* do not accept it (as integer) */
-      a = a * 10 + d;
-      empty = 0;
-    }
-  }
-  while (lisspace(cast_uchar(*s))) s++;  /* skip trailing spaces */
-  if (empty || *s != '\0') return NULL;  /* something wrong in the numeral */
-  else {
-    *result = l_castU2S((neg) ? 0u - a : a);
-    return s;
-  }
-}
-
-
-size_t luaO_str2num (const char *s, TValue *o) {
-  lua_Integer i; lua_Number n;
-  const char *e;
-  if ((e = l_str2int(s, &i)) != NULL) {  /* try as an integer */
-    setivalue(o, i);
-  }
-  else if ((e = l_str2d(s, &n)) != NULL) {  /* else try as a float */
-    setfltvalue(o, n);
-  }
+  if (strpbrk(s, "nN"))  /* reject 'inf' and 'nan' */
+    return 0;
+  else if (strpbrk(s, "xX"))  /* hexa? */
+    *result = lua_strx2number(s, &endptr);
   else
-    return 0;  /* conversion failed */
-  return (e - s) + 1;  /* success; return string size */
-}
-
-
-int luaO_utf8esc (char *buff, unsigned long x) {
-  int n = 1;  /* number of bytes put in buffer (backwards) */
-  lua_assert(x <= 0x7FFFFFFFu);
-  if (x < 0x80)  /* ascii? */
-    buff[UTF8BUFFSZ - 1] = cast_char(x);
-  else {  /* need continuation bytes */
-    unsigned int mfb = 0x3f;  /* maximum that fits in first byte */
-    do {  /* add continuation bytes */
-      buff[UTF8BUFFSZ - (n++)] = cast_char(0x80 | (x & 0x3f));
-      x >>= 6;  /* remove added bits */
-      mfb >>= 1;  /* now there is one less bit available in first byte */
-    } while (x > mfb);  /* still needs continuation byte? */
-    buff[UTF8BUFFSZ - n] = cast_char((~mfb << 1) | x);  /* add first byte */
-  }
-  return n;
-}
-
-
-/*
-** Maximum length of the conversion of a number to a string. Must be
-** enough to accommodate both LUA_INTEGER_FMT and LUA_NUMBER_FMT.
-** (For a long long int, this is 19 digits plus a sign and a final '\0',
-** adding to 21. For a long double, it can go to a sign, 33 digits,
-** the dot, an exponent letter, an exponent sign, 5 exponent digits,
-** and a final '\0', adding to 43.)
-*/
-#define MAXNUMBER2STR	44
-
-
-/*
-** Convert a number object to a string, adding it to a buffer
-*/
-static int tostringbuff (TValue *obj, char *buff) {
-  int len;
-  lua_assert(ttisnumber(obj));
-  if (ttisinteger(obj))
-    len = lua_integer2str(buff, MAXNUMBER2STR, ivalue(obj));
-  else {
-    len = lua_number2str(buff, MAXNUMBER2STR, fltvalue(obj));
-    if (buff[strspn(buff, "-0123456789")] == '\0') {  /* looks like an int? */
-      buff[len++] = lua_getlocaledecpoint();
-      buff[len++] = '0';  /* adds '.0' to result */
-    }
-  }
-  return len;
-}
-
-
-/*
-** Convert a number object to a Lua string, replacing the value at 'obj'
-*/
-void luaO_tostring (lua_State *L, TValue *obj) {
-  char buff[MAXNUMBER2STR];
-  int len = tostringbuff(obj, buff);
-  setsvalue(L, obj, luaS_newlstr(L, buff, len));
+    *result = lua_str2number(s, &endptr);
+  if (endptr == s) return 0;  /* nothing recognized */
+  while (lisspace(cast_uchar(*endptr))) endptr++;
+  return (endptr == s + len);  /* OK if no trailing characters */
 }
 
 
 
-
-/*
-** {==================================================================
-** 'luaO_pushvfstring'
-** ===================================================================
-*/
-
-/*
-** Size for buffer space used by 'luaO_pushvfstring'. It should be
-** (LUA_IDSIZE + MAXNUMBER2STR) + a minimal space for basic messages,
-** so that 'luaG_addinfo' can work directly on the buffer.
-*/
-#define BUFVFS		(LUA_IDSIZE + MAXNUMBER2STR + 95)
-
-/* buffer used by 'luaO_pushvfstring' */
-typedef struct BuffFS {
-  lua_State *L;
-  int pushed;  /* true if there is a part of the result on the stack */
-  int blen;  /* length of partial string in 'space' */
-  char space[BUFVFS];  /* holds last part of the result */
-} BuffFS;
-
-
-/*
-** Push given string to the stack, as part of the result, and
-** join it to previous partial result if there is one.
-** It may call 'luaV_concat' while using one slot from EXTRA_STACK.
-** This call cannot invoke metamethods, as both operands must be
-** strings. It can, however, raise an error if the result is too
-** long. In that case, 'luaV_concat' frees the extra slot before
-** raising the error.
-*/
-static void pushstr (BuffFS *buff, const char *str, size_t lstr) {
-  lua_State *L = buff->L;
-  setsvalue2s(L, L->top.p, luaS_newlstr(L, str, lstr));
-  L->top.p++;  /* may use one slot from EXTRA_STACK */
-  if (!buff->pushed)  /* no previous string on the stack? */
-    buff->pushed = 1;  /* now there is one */
-  else  /* join previous string with new one */
-    luaV_concat(L, 2);
+static void pushstr (lua_State *L, const char *str, size_t l) {
+  setsvalue2s(L, L->top++, luaS_newlstr(L, str, l));
 }
 
 
-/*
-** empty the buffer space into the stack
-*/
-static void clearbuff (BuffFS *buff) {
-  pushstr(buff, buff->space, buff->blen);  /* push buffer contents */
-  buff->blen = 0;  /* space now is empty */
-}
-
-
-/*
-** Get a space of size 'sz' in the buffer. If buffer has not enough
-** space, empty it. 'sz' must fit in an empty buffer.
-*/
-static char *getbuff (BuffFS *buff, int sz) {
-  lua_assert(buff->blen <= BUFVFS); lua_assert(sz <= BUFVFS);
-  if (sz > BUFVFS - buff->blen)  /* not enough space? */
-    clearbuff(buff);
-  return buff->space + buff->blen;
-}
-
-
-#define addsize(b,sz)	((b)->blen += (sz))
-
-
-/*
-** Add 'str' to the buffer. If string is larger than the buffer space,
-** push the string directly to the stack.
-*/
-static void addstr2buff (BuffFS *buff, const char *str, size_t slen) {
-  if (slen <= BUFVFS) {  /* does string fit into buffer? */
-    char *bf = getbuff(buff, cast_int(slen));
-    memcpy(bf, str, slen);  /* add string to buffer */
-    addsize(buff, cast_int(slen));
-  }
-  else {  /* string larger than buffer */
-    clearbuff(buff);  /* string comes after buffer's content */
-    pushstr(buff, str, slen);  /* push string */
-  }
-}
-
-
-/*
-** Add a numeral to the buffer.
-*/
-static void addnum2buff (BuffFS *buff, TValue *num) {
-  char *numbuff = getbuff(buff, MAXNUMBER2STR);
-  int len = tostringbuff(num, numbuff);  /* format number into 'numbuff' */
-  addsize(buff, len);
-}
-
-
-/*
-** this function handles only '%d', '%c', '%f', '%p', '%s', and '%%'
-   conventional formats, plus Lua-specific '%I' and '%U'
-*/
+/* this function handles only `%d', `%c', %f, %p, and `%s' formats */
 const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
-  BuffFS buff;  /* holds last part of the result */
-  const char *e;  /* points to next '%' */
-  buff.pushed = buff.blen = 0;
-  buff.L = L;
-  while ((e = strchr(fmt, '%')) != NULL) {
-    addstr2buff(&buff, fmt, e - fmt);  /* add 'fmt' up to '%' */
-    switch (*(e + 1)) {  /* conversion specifier */
-      case 's': {  /* zero-terminated string */
+  int n = 0;
+  for (;;) {
+    const char *e = strchr(fmt, '%');
+    if (e == NULL) break;
+    luaD_checkstack(L, 2);  /* fmt + item */
+    pushstr(L, fmt, e - fmt);
+    switch (*(e+1)) {
+      case 's': {
         const char *s = va_arg(argp, char *);
         if (s == NULL) s = "(null)";
-        addstr2buff(&buff, s, strlen(s));
+        pushstr(L, s, strlen(s));
         break;
       }
-      case 'c': {  /* an 'int' as a character */
-        char c = cast_uchar(va_arg(argp, int));
-        addstr2buff(&buff, &c, sizeof(char));
+      case 'c': {
+        char buff;
+        buff = cast(char, va_arg(argp, int));
+        pushstr(L, &buff, 1);
         break;
       }
-      case 'd': {  /* an 'int' */
-        TValue num;
-        setivalue(&num, va_arg(argp, int));
-        addnum2buff(&buff, &num);
+      case 'd': {
+        setnvalue(L->top++, cast_num(va_arg(argp, int)));
         break;
       }
-      case 'I': {  /* a 'lua_Integer' */
-        TValue num;
-        setivalue(&num, cast(lua_Integer, va_arg(argp, l_uacInt)));
-        addnum2buff(&buff, &num);
+      case 'f': {
+        setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber)));
         break;
       }
-      case 'f': {  /* a 'lua_Number' */
-        TValue num;
-        setfltvalue(&num, cast_num(va_arg(argp, l_uacNumber)));
-        addnum2buff(&buff, &num);
-        break;
-      }
-      case 'p': {  /* a pointer */
-        const int sz = 3 * sizeof(void*) + 8; /* enough space for '%p' */
-        char *bf = getbuff(&buff, sz);
-        void *p = va_arg(argp, void *);
-        int len = lua_pointer2str(bf, sz, p);
-        addsize(&buff, len);
-        break;
-      }
-      case 'U': {  /* a 'long' as a UTF-8 sequence */
-        char bf[UTF8BUFFSZ];
-        int len = luaO_utf8esc(bf, va_arg(argp, long));
-        addstr2buff(&buff, bf + UTF8BUFFSZ - len, len);
+      case 'p': {
+        char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
+        int l = sprintf(buff, "%p", va_arg(argp, void *));
+        pushstr(L, buff, l);
         break;
       }
       case '%': {
-        addstr2buff(&buff, "%", 1);
+        pushstr(L, "%", 1);
         break;
       }
       default: {
-        luaG_runerror(L, "invalid option '%%%c' to 'lua_pushfstring'",
-                         *(e + 1));
+        luaG_runerror(L,
+            "invalid option " LUA_QL("%%%c") " to " LUA_QL("lua_pushfstring"),
+            *(e + 1));
       }
     }
-    fmt = e + 2;  /* skip '%' and the specifier */
+    n += 2;
+    fmt = e+2;
   }
-  addstr2buff(&buff, fmt, strlen(fmt));  /* rest of 'fmt' */
-  clearbuff(&buff);  /* empty buffer into the stack */
-  lua_assert(buff.pushed == 1);
-  return svalue(s2v(L->top.p - 1));
+  luaD_checkstack(L, 1);
+  pushstr(L, fmt, strlen(fmt));
+  if (n > 0) luaV_concat(L, n + 1);
+  return svalue(L->top - 1);
 }
 
 
@@ -555,8 +239,9 @@ const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
   return msg;
 }
 
-/* }================================================================== */
 
+/* number of chars of a literal string without the ending \0 */
+#define LL(x)	(sizeof(x)/sizeof(char) - 1)
 
 #define RETS	"..."
 #define PRE	"[string \""
@@ -564,36 +249,36 @@ const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
 
 #define addstr(a,b,l)	( memcpy(a,b,(l) * sizeof(char)), a += (l) )
 
-void luaO_chunkid (char *out, const char *source, size_t srclen) {
-  size_t bufflen = LUA_IDSIZE;  /* free space in buffer */
+void luaO_chunkid (char *out, const char *source, size_t bufflen) {
+  size_t l = strlen(source);
   if (*source == '=') {  /* 'literal' source */
-    if (srclen <= bufflen)  /* small enough? */
-      memcpy(out, source + 1, srclen * sizeof(char));
+    if (l <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, l * sizeof(char));
     else {  /* truncate it */
       addstr(out, source + 1, bufflen - 1);
       *out = '\0';
     }
   }
   else if (*source == '@') {  /* file name */
-    if (srclen <= bufflen)  /* small enough? */
-      memcpy(out, source + 1, srclen * sizeof(char));
+    if (l <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, l * sizeof(char));
     else {  /* add '...' before rest of name */
       addstr(out, RETS, LL(RETS));
       bufflen -= LL(RETS);
-      memcpy(out, source + 1 + srclen - bufflen, bufflen * sizeof(char));
+      memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char));
     }
   }
   else {  /* string; format as [string "source"] */
     const char *nl = strchr(source, '\n');  /* find first new line (if any) */
     addstr(out, PRE, LL(PRE));  /* add prefix */
     bufflen -= LL(PRE RETS POS) + 1;  /* save space for prefix+suffix+'\0' */
-    if (srclen < bufflen && nl == NULL) {  /* small one-line source? */
-      addstr(out, source, srclen);  /* keep it */
+    if (l < bufflen && nl == NULL) {  /* small one-line source? */
+      addstr(out, source, l);  /* keep it */
     }
     else {
-      if (nl != NULL) srclen = nl - source;  /* stop at first newline */
-      if (srclen > bufflen) srclen = bufflen;
-      addstr(out, source, srclen);
+      if (nl != NULL) l = nl - source;  /* stop at first newline */
+      if (l > bufflen) l = bufflen;
+      addstr(out, source, l);
       addstr(out, RETS, LL(RETS));
     }
     memcpy(out, POS, (LL(POS) + 1) * sizeof(char));

lopcodes.c

@@ -1,104 +1,107 @@
 /*
-** $Id: lopcodes.c $
+** $Id: lopcodes.c,v 1.49 2012/05/14 13:34:18 roberto Exp $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
 
+
 #define lopcodes_c
 #define LUA_CORE
 
-#include "lprefix.h"
-
 
 #include "lopcodes.h"
 
 
 /* ORDER OP */
 
-LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
-/*       MM OT IT T  A  mode		   opcode  */
-  opmode(0, 0, 0, 0, 1, iABC)		/* OP_MOVE */
- ,opmode(0, 0, 0, 0, 1, iAsBx)		/* OP_LOADI */
- ,opmode(0, 0, 0, 0, 1, iAsBx)		/* OP_LOADF */
- ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADK */
- ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_LOADKX */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADFALSE */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LFALSESKIP */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADTRUE */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LOADNIL */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETUPVAL */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETUPVAL */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETTABUP */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETTABLE */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETI */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_GETFIELD */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETTABUP */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETTABLE */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETI */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_SETFIELD */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_NEWTABLE */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SELF */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADDI */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADDK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SUBK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MULK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MODK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_POWK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_DIVK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_IDIVK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BANDK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BORK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BXORK */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHRI */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHLI */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_ADD */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SUB */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MUL */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_MOD */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_POW */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_DIV */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_IDIV */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BAND */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BOR */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BXOR */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHL */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_SHR */
- ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBIN */
- ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBINI*/
- ,opmode(1, 0, 0, 0, 0, iABC)		/* OP_MMBINK*/
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_UNM */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_BNOT */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_NOT */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_LEN */
- ,opmode(0, 0, 0, 0, 1, iABC)		/* OP_CONCAT */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_CLOSE */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_TBC */
- ,opmode(0, 0, 0, 0, 0, isJ)		/* OP_JMP */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQ */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LT */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LE */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQK */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_EQI */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LTI */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_LEI */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_GTI */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_GEI */
- ,opmode(0, 0, 0, 1, 0, iABC)		/* OP_TEST */
- ,opmode(0, 0, 0, 1, 1, iABC)		/* OP_TESTSET */
- ,opmode(0, 1, 1, 0, 1, iABC)		/* OP_CALL */
- ,opmode(0, 1, 1, 0, 1, iABC)		/* OP_TAILCALL */
- ,opmode(0, 0, 1, 0, 0, iABC)		/* OP_RETURN */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_RETURN0 */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_RETURN1 */
- ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_FORLOOP */
- ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_FORPREP */
- ,opmode(0, 0, 0, 0, 0, iABx)		/* OP_TFORPREP */
- ,opmode(0, 0, 0, 0, 0, iABC)		/* OP_TFORCALL */
- ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_TFORLOOP */
- ,opmode(0, 0, 1, 0, 0, iABC)		/* OP_SETLIST */
- ,opmode(0, 0, 0, 0, 1, iABx)		/* OP_CLOSURE */
- ,opmode(0, 1, 0, 0, 1, iABC)		/* OP_VARARG */
- ,opmode(0, 0, 1, 0, 1, iABC)		/* OP_VARARGPREP */
- ,opmode(0, 0, 0, 0, 0, iAx)		/* OP_EXTRAARG */
+LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
+  "MOVE",
+  "LOADK",
+  "LOADKX",
+  "LOADBOOL",
+  "LOADNIL",
+  "GETUPVAL",
+  "GETTABUP",
+  "GETTABLE",
+  "SETTABUP",
+  "SETUPVAL",
+  "SETTABLE",
+  "NEWTABLE",
+  "SELF",
+  "ADD",
+  "SUB",
+  "MUL",
+  "DIV",
+  "MOD",
+  "POW",
+  "UNM",
+  "NOT",
+  "LEN",
+  "CONCAT",
+  "JMP",
+  "EQ",
+  "LT",
+  "LE",
+  "TEST",
+  "TESTSET",
+  "CALL",
+  "TAILCALL",
+  "RETURN",
+  "FORLOOP",
+  "FORPREP",
+  "TFORCALL",
+  "TFORLOOP",
+  "SETLIST",
+  "CLOSURE",
+  "VARARG",
+  "EXTRAARG",
+  NULL
+};
+
+
+#define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m))
+
+LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
+/*       T  A    B       C     mode		   opcode	*/
+  opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_MOVE */
+ ,opmode(0, 1, OpArgK, OpArgN, iABx)		/* OP_LOADK */
+ ,opmode(0, 1, OpArgN, OpArgN, iABx)		/* OP_LOADKX */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_LOADBOOL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_LOADNIL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_GETUPVAL */
+ ,opmode(0, 1, OpArgU, OpArgK, iABC)		/* OP_GETTABUP */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_GETTABLE */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC)		/* OP_SETTABUP */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_SETUPVAL */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC)		/* OP_SETTABLE */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_NEWTABLE */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_SELF */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_ADD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_SUB */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MUL */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_DIV */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MOD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_POW */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_UNM */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_NOT */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_LEN */
+ ,opmode(0, 1, OpArgR, OpArgR, iABC)		/* OP_CONCAT */
+ ,opmode(0, 0, OpArgR, OpArgN, iAsBx)		/* OP_JMP */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_EQ */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LT */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LE */
+ ,opmode(1, 0, OpArgN, OpArgU, iABC)		/* OP_TEST */
+ ,opmode(1, 1, OpArgR, OpArgU, iABC)		/* OP_TESTSET */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_CALL */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_TAILCALL */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_RETURN */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORLOOP */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORPREP */
+ ,opmode(0, 0, OpArgN, OpArgU, iABC)		/* OP_TFORCALL */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_TFORLOOP */
+ ,opmode(0, 0, OpArgU, OpArgU, iABC)		/* OP_SETLIST */
+ ,opmode(0, 1, OpArgU, OpArgN, iABx)		/* OP_CLOSURE */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_VARARG */
+ ,opmode(0, 0, OpArgU, OpArgU, iAx)		/* OP_EXTRAARG */
 };
 

lopcodes.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.h $
+** $Id: lopcodes.h,v 1.142.1.1 2013/04/12 18:48:47 roberto Exp roberto $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -11,100 +11,75 @@
 
 
 /*===========================================================================
-  We assume that instructions are unsigned 32-bit integers.
-  All instructions have an opcode in the first 7 bits.
-  Instructions can have the following formats:
+  We assume that instructions are unsigned numbers.
+  All instructions have an opcode in the first 6 bits.
+  Instructions can have the following fields:
+	`A' : 8 bits
+	`B' : 9 bits
+	`C' : 9 bits
+	'Ax' : 26 bits ('A', 'B', and 'C' together)
+	`Bx' : 18 bits (`B' and `C' together)
+	`sBx' : signed Bx
 
-        3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
-        1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-iABC          C(8)     |      B(8)     |k|     A(8)      |   Op(7)     |
-iABx                Bx(17)               |     A(8)      |   Op(7)     |
-iAsBx              sBx (signed)(17)      |     A(8)      |   Op(7)     |
-iAx                           Ax(25)                     |   Op(7)     |
-isJ                           sJ (signed)(25)            |   Op(7)     |
-
-  A signed argument is represented in excess K: the represented value is
-  the written unsigned value minus K, where K is half the maximum for the
-  corresponding unsigned argument.
+  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.
 ===========================================================================*/
 
 
-enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
+enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
 
 
 /*
 ** size and position of opcode arguments.
 */
-#define SIZE_C		8
-#define SIZE_B		8
-#define SIZE_Bx		(SIZE_C + SIZE_B + 1)
+#define SIZE_C		9
+#define SIZE_B		9
+#define SIZE_Bx		(SIZE_C + SIZE_B)
 #define SIZE_A		8
-#define SIZE_Ax		(SIZE_Bx + SIZE_A)
-#define SIZE_sJ		(SIZE_Bx + SIZE_A)
+#define SIZE_Ax		(SIZE_C + SIZE_B + SIZE_A)
 
-#define SIZE_OP		7
+#define SIZE_OP		6
 
 #define POS_OP		0
-
 #define POS_A		(POS_OP + SIZE_OP)
-#define POS_k		(POS_A + SIZE_A)
-#define POS_B		(POS_k + 1)
-#define POS_C		(POS_B + SIZE_B)
-
-#define POS_Bx		POS_k
-
+#define POS_C		(POS_A + SIZE_A)
+#define POS_B		(POS_C + SIZE_C)
+#define POS_Bx		POS_C
 #define POS_Ax		POS_A
 
-#define POS_sJ		POS_A
-
 
 /*
 ** limits for opcode arguments.
-** we use (signed) 'int' to manipulate most arguments,
-** so they must fit in ints.
+** we use (signed) int to manipulate most arguments,
+** so they must fit in LUAI_BITSINT-1 bits (-1 for sign)
 */
-
-/* Check whether type 'int' has at least 'b' bits ('b' < 32) */
-#define L_INTHASBITS(b)		((UINT_MAX >> ((b) - 1)) >= 1)
-
-
-#if L_INTHASBITS(SIZE_Bx)
-#define MAXARG_Bx	((1<<SIZE_Bx)-1)
+#if SIZE_Bx < LUAI_BITSINT-1
+#define MAXARG_Bx        ((1<<SIZE_Bx)-1)
+#define MAXARG_sBx        (MAXARG_Bx>>1)         /* `sBx' is signed */
 #else
-#define MAXARG_Bx	MAX_INT
+#define MAXARG_Bx        MAX_INT
+#define MAXARG_sBx        MAX_INT
 #endif
 
-#define OFFSET_sBx	(MAXARG_Bx>>1)         /* 'sBx' is signed */
-
-
-#if L_INTHASBITS(SIZE_Ax)
+#if SIZE_Ax < LUAI_BITSINT-1
 #define MAXARG_Ax	((1<<SIZE_Ax)-1)
 #else
 #define MAXARG_Ax	MAX_INT
 #endif
 
-#if L_INTHASBITS(SIZE_sJ)
-#define MAXARG_sJ	((1 << SIZE_sJ) - 1)
-#else
-#define MAXARG_sJ	MAX_INT
-#endif
 
-#define OFFSET_sJ	(MAXARG_sJ >> 1)
+#define MAXARG_A        ((1<<SIZE_A)-1)
+#define MAXARG_B        ((1<<SIZE_B)-1)
+#define MAXARG_C        ((1<<SIZE_C)-1)
 
 
-#define MAXARG_A	((1<<SIZE_A)-1)
-#define MAXARG_B	((1<<SIZE_B)-1)
-#define MAXARG_C	((1<<SIZE_C)-1)
-#define OFFSET_sC	(MAXARG_C >> 1)
-
-#define int2sC(i)	((i) + OFFSET_sC)
-#define sC2int(i)	((i) - OFFSET_sC)
-
-
-/* creates a mask with 'n' 1 bits at position 'p' */
+/* 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' */
+/* creates a mask with `n' 0 bits at position `p' */
 #define MASK0(n,p)	(~MASK1(n,p))
 
 /*
@@ -115,49 +90,33 @@ enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
 #define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
 		((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
 
-#define checkopm(i,m)	(getOpMode(GET_OPCODE(i)) == m)
-
-
-#define getarg(i,pos,size)	(cast_int(((i)>>(pos)) & MASK1(size,0)))
+#define getarg(i,pos,size)	(cast(int, ((i)>>pos) & MASK1(size,0)))
 #define setarg(i,v,pos,size)	((i) = (((i)&MASK0(size,pos)) | \
                 ((cast(Instruction, v)<<pos)&MASK1(size,pos))))
 
 #define GETARG_A(i)	getarg(i, POS_A, SIZE_A)
 #define SETARG_A(i,v)	setarg(i, v, POS_A, SIZE_A)
 
-#define GETARG_B(i)	check_exp(checkopm(i, iABC), getarg(i, POS_B, SIZE_B))
-#define GETARG_sB(i)	sC2int(GETARG_B(i))
+#define GETARG_B(i)	getarg(i, POS_B, SIZE_B)
 #define SETARG_B(i,v)	setarg(i, v, POS_B, SIZE_B)
 
-#define GETARG_C(i)	check_exp(checkopm(i, iABC), getarg(i, POS_C, SIZE_C))
-#define GETARG_sC(i)	sC2int(GETARG_C(i))
+#define GETARG_C(i)	getarg(i, POS_C, SIZE_C)
 #define SETARG_C(i,v)	setarg(i, v, POS_C, SIZE_C)
 
-#define TESTARG_k(i)	check_exp(checkopm(i, iABC), (cast_int(((i) & (1u << POS_k)))))
-#define GETARG_k(i)	check_exp(checkopm(i, iABC), getarg(i, POS_k, 1))
-#define SETARG_k(i,v)	setarg(i, v, POS_k, 1)
-
-#define GETARG_Bx(i)	check_exp(checkopm(i, iABx), getarg(i, POS_Bx, SIZE_Bx))
+#define GETARG_Bx(i)	getarg(i, POS_Bx, SIZE_Bx)
 #define SETARG_Bx(i,v)	setarg(i, v, POS_Bx, SIZE_Bx)
 
-#define GETARG_Ax(i)	check_exp(checkopm(i, iAx), getarg(i, POS_Ax, SIZE_Ax))
+#define GETARG_Ax(i)	getarg(i, POS_Ax, SIZE_Ax)
 #define SETARG_Ax(i,v)	setarg(i, v, POS_Ax, SIZE_Ax)
 
-#define GETARG_sBx(i)  \
-	check_exp(checkopm(i, iAsBx), getarg(i, POS_Bx, SIZE_Bx) - OFFSET_sBx)
-#define SETARG_sBx(i,b)	SETARG_Bx((i),cast_uint((b)+OFFSET_sBx))
-
-#define GETARG_sJ(i)  \
-	check_exp(checkopm(i, isJ), getarg(i, POS_sJ, SIZE_sJ) - OFFSET_sJ)
-#define SETARG_sJ(i,j) \
-	setarg(i, cast_uint((j)+OFFSET_sJ), POS_sJ, SIZE_sJ)
+#define GETARG_sBx(i)	(GETARG_Bx(i)-MAXARG_sBx)
+#define SETARG_sBx(i,b)	SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_sBx))
 
 
-#define CREATE_ABCk(o,a,b,c,k)	((cast(Instruction, o)<<POS_OP) \
+#define CREATE_ABC(o,a,b,c)	((cast(Instruction, o)<<POS_OP) \
 			| (cast(Instruction, a)<<POS_A) \
 			| (cast(Instruction, b)<<POS_B) \
-			| (cast(Instruction, c)<<POS_C) \
-			| (cast(Instruction, k)<<POS_k))
+			| (cast(Instruction, c)<<POS_C))
 
 #define CREATE_ABx(o,a,bc)	((cast(Instruction, o)<<POS_OP) \
 			| (cast(Instruction, a)<<POS_A) \
@@ -166,14 +125,24 @@ enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
 #define CREATE_Ax(o,a)		((cast(Instruction, o)<<POS_OP) \
 			| (cast(Instruction, a)<<POS_Ax))
 
-#define CREATE_sJ(o,j,k)	((cast(Instruction, o) << POS_OP) \
-			| (cast(Instruction, j) << POS_sJ) \
-			| (cast(Instruction, k) << POS_k))
 
+/*
+** Macros to operate RK indices
+*/
 
-#if !defined(MAXINDEXRK)  /* (for debugging only) */
-#define MAXINDEXRK	MAXARG_B
-#endif
+/* this bit 1 means constant (0 means register) */
+#define BITRK		(1 << (SIZE_B - 1))
+
+/* test whether value is a constant */
+#define ISK(x)		((x) & BITRK)
+
+/* gets the index of the constant */
+#define INDEXK(r)	((int)(r) & ~BITRK)
+
+#define MAXINDEXRK	(BITRK - 1)
+
+/* code a constant index as a RK value */
+#define RKASK(x)	((x) | BITRK)
 
 
 /*
@@ -183,223 +152,137 @@ enum OpMode {iABC, iABx, iAsBx, iAx, isJ};  /* basic instruction formats */
 
 
 /*
-** R[x] - register
-** K[x] - constant (in constant table)
-** RK(x) == if k(i) then K[x] else R[x]
+** R(x) - register
+** Kst(x) - constant (in constant table)
+** RK(x) == if ISK(x) then Kst(INDEXK(x)) else R(x)
 */
 
 
 /*
-** Grep "ORDER OP" if you change these enums. Opcodes marked with a (*)
-** has extra descriptions in the notes after the enumeration.
+** grep "ORDER OP" if you change these enums
 */
 
 typedef enum {
 /*----------------------------------------------------------------------
-  name		args	description
+name		args	description
 ------------------------------------------------------------------------*/
-OP_MOVE,/*	A B	R[A] := R[B]					*/
-OP_LOADI,/*	A sBx	R[A] := sBx					*/
-OP_LOADF,/*	A sBx	R[A] := (lua_Number)sBx				*/
-OP_LOADK,/*	A Bx	R[A] := K[Bx]					*/
-OP_LOADKX,/*	A	R[A] := K[extra arg]				*/
-OP_LOADFALSE,/*	A	R[A] := false					*/
-OP_LFALSESKIP,/*A	R[A] := false; pc++	(*)			*/
-OP_LOADTRUE,/*	A	R[A] := true					*/
-OP_LOADNIL,/*	A B	R[A], R[A+1], ..., R[A+B] := nil		*/
-OP_GETUPVAL,/*	A B	R[A] := UpValue[B]				*/
-OP_SETUPVAL,/*	A B	UpValue[B] := R[A]				*/
+OP_MOVE,/*	A B	R(A) := R(B)					*/
+OP_LOADK,/*	A Bx	R(A) := Kst(Bx)					*/
+OP_LOADKX,/*	A 	R(A) := Kst(extra arg)				*/
+OP_LOADBOOL,/*	A B C	R(A) := (Bool)B; if (C) pc++			*/
+OP_LOADNIL,/*	A B	R(A), R(A+1), ..., R(A+B) := nil		*/
+OP_GETUPVAL,/*	A B	R(A) := UpValue[B]				*/
 
-OP_GETTABUP,/*	A B C	R[A] := UpValue[B][K[C]:string]			*/
-OP_GETTABLE,/*	A B C	R[A] := R[B][R[C]]				*/
-OP_GETI,/*	A B C	R[A] := R[B][C]					*/
-OP_GETFIELD,/*	A B C	R[A] := R[B][K[C]:string]			*/
+OP_GETTABUP,/*	A B C	R(A) := UpValue[B][RK(C)]			*/
+OP_GETTABLE,/*	A B C	R(A) := R(B)[RK(C)]				*/
 
-OP_SETTABUP,/*	A B C	UpValue[A][K[B]:string] := RK(C)		*/
-OP_SETTABLE,/*	A B C	R[A][R[B]] := RK(C)				*/
-OP_SETI,/*	A B C	R[A][B] := RK(C)				*/
-OP_SETFIELD,/*	A B C	R[A][K[B]:string] := RK(C)			*/
+OP_SETTABUP,/*	A B C	UpValue[A][RK(B)] := RK(C)			*/
+OP_SETUPVAL,/*	A B	UpValue[B] := R(A)				*/
+OP_SETTABLE,/*	A B C	R(A)[RK(B)] := RK(C)				*/
 
-OP_NEWTABLE,/*	A B C k	R[A] := {}					*/
+OP_NEWTABLE,/*	A B C	R(A) := {} (size = B,C)				*/
 
-OP_SELF,/*	A B C	R[A+1] := R[B]; R[A] := R[B][RK(C):string]	*/
+OP_SELF,/*	A B C	R(A+1) := R(B); R(A) := R(B)[RK(C)]		*/
 
-OP_ADDI,/*	A B sC	R[A] := R[B] + sC				*/
+OP_ADD,/*	A B C	R(A) := RK(B) + RK(C)				*/
+OP_SUB,/*	A B C	R(A) := RK(B) - RK(C)				*/
+OP_MUL,/*	A B C	R(A) := RK(B) * RK(C)				*/
+OP_DIV,/*	A B C	R(A) := RK(B) / RK(C)				*/
+OP_MOD,/*	A B C	R(A) := RK(B) % RK(C)				*/
+OP_POW,/*	A B C	R(A) := RK(B) ^ RK(C)				*/
+OP_UNM,/*	A B	R(A) := -R(B)					*/
+OP_NOT,/*	A B	R(A) := not R(B)				*/
+OP_LEN,/*	A B	R(A) := length of R(B)				*/
 
-OP_ADDK,/*	A B C	R[A] := R[B] + K[C]:number			*/
-OP_SUBK,/*	A B C	R[A] := R[B] - K[C]:number			*/
-OP_MULK,/*	A B C	R[A] := R[B] * K[C]:number			*/
-OP_MODK,/*	A B C	R[A] := R[B] % K[C]:number			*/
-OP_POWK,/*	A B C	R[A] := R[B] ^ K[C]:number			*/
-OP_DIVK,/*	A B C	R[A] := R[B] / K[C]:number			*/
-OP_IDIVK,/*	A B C	R[A] := R[B] // K[C]:number			*/
+OP_CONCAT,/*	A B C	R(A) := R(B).. ... ..R(C)			*/
 
-OP_BANDK,/*	A B C	R[A] := R[B] & K[C]:integer			*/
-OP_BORK,/*	A B C	R[A] := R[B] | K[C]:integer			*/
-OP_BXORK,/*	A B C	R[A] := R[B] ~ K[C]:integer			*/
+OP_JMP,/*	A sBx	pc+=sBx; if (A) close all upvalues >= R(A - 1)	*/
+OP_EQ,/*	A B C	if ((RK(B) == RK(C)) ~= A) then pc++		*/
+OP_LT,/*	A B C	if ((RK(B) <  RK(C)) ~= A) then pc++		*/
+OP_LE,/*	A B C	if ((RK(B) <= RK(C)) ~= A) then pc++		*/
 
-OP_SHRI,/*	A B sC	R[A] := R[B] >> sC				*/
-OP_SHLI,/*	A B sC	R[A] := sC << R[B]				*/
+OP_TEST,/*	A C	if not (R(A) <=> C) then pc++			*/
+OP_TESTSET,/*	A B C	if (R(B) <=> C) then R(A) := R(B) else pc++	*/
 
-OP_ADD,/*	A B C	R[A] := R[B] + R[C]				*/
-OP_SUB,/*	A B C	R[A] := R[B] - R[C]				*/
-OP_MUL,/*	A B C	R[A] := R[B] * R[C]				*/
-OP_MOD,/*	A B C	R[A] := R[B] % R[C]				*/
-OP_POW,/*	A B C	R[A] := R[B] ^ R[C]				*/
-OP_DIV,/*	A B C	R[A] := R[B] / R[C]				*/
-OP_IDIV,/*	A B C	R[A] := R[B] // R[C]				*/
+OP_CALL,/*	A B C	R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
+OP_TAILCALL,/*	A B C	return R(A)(R(A+1), ... ,R(A+B-1))		*/
+OP_RETURN,/*	A B	return R(A), ... ,R(A+B-2)	(see note)	*/
 
-OP_BAND,/*	A B C	R[A] := R[B] & R[C]				*/
-OP_BOR,/*	A B C	R[A] := R[B] | R[C]				*/
-OP_BXOR,/*	A B C	R[A] := R[B] ~ R[C]				*/
-OP_SHL,/*	A B C	R[A] := R[B] << R[C]				*/
-OP_SHR,/*	A B C	R[A] := R[B] >> R[C]				*/
+OP_FORLOOP,/*	A sBx	R(A)+=R(A+2);
+			if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
+OP_FORPREP,/*	A sBx	R(A)-=R(A+2); pc+=sBx				*/
 
-OP_MMBIN,/*	A B C	call C metamethod over R[A] and R[B]	(*)	*/
-OP_MMBINI,/*	A sB C k	call C metamethod over R[A] and sB	*/
-OP_MMBINK,/*	A B C k		call C metamethod over R[A] and K[B]	*/
+OP_TFORCALL,/*	A C	R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));	*/
+OP_TFORLOOP,/*	A sBx	if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
 
-OP_UNM,/*	A B	R[A] := -R[B]					*/
-OP_BNOT,/*	A B	R[A] := ~R[B]					*/
-OP_NOT,/*	A B	R[A] := not R[B]				*/
-OP_LEN,/*	A B	R[A] := #R[B] (length operator)			*/
+OP_SETLIST,/*	A B C	R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B	*/
 
-OP_CONCAT,/*	A B	R[A] := R[A].. ... ..R[A + B - 1]		*/
+OP_CLOSURE,/*	A Bx	R(A) := closure(KPROTO[Bx])			*/
 
-OP_CLOSE,/*	A	close all upvalues >= R[A]			*/
-OP_TBC,/*	A	mark variable A "to be closed"			*/
-OP_JMP,/*	sJ	pc += sJ					*/
-OP_EQ,/*	A B k	if ((R[A] == R[B]) ~= k) then pc++		*/
-OP_LT,/*	A B k	if ((R[A] <  R[B]) ~= k) then pc++		*/
-OP_LE,/*	A B k	if ((R[A] <= R[B]) ~= k) then pc++		*/
-
-OP_EQK,/*	A B k	if ((R[A] == K[B]) ~= k) then pc++		*/
-OP_EQI,/*	A sB k	if ((R[A] == sB) ~= k) then pc++		*/
-OP_LTI,/*	A sB k	if ((R[A] < sB) ~= k) then pc++			*/
-OP_LEI,/*	A sB k	if ((R[A] <= sB) ~= k) then pc++		*/
-OP_GTI,/*	A sB k	if ((R[A] > sB) ~= k) then pc++			*/
-OP_GEI,/*	A sB k	if ((R[A] >= sB) ~= k) then pc++		*/
-
-OP_TEST,/*	A k	if (not R[A] == k) then pc++			*/
-OP_TESTSET,/*	A B k	if (not R[B] == k) then pc++ else R[A] := R[B] (*) */
-
-OP_CALL,/*	A B C	R[A], ... ,R[A+C-2] := R[A](R[A+1], ... ,R[A+B-1]) */
-OP_TAILCALL,/*	A B C k	return R[A](R[A+1], ... ,R[A+B-1])		*/
-
-OP_RETURN,/*	A B C k	return R[A], ... ,R[A+B-2]	(see note)	*/
-OP_RETURN0,/*		return						*/
-OP_RETURN1,/*	A	return R[A]					*/
-
-OP_FORLOOP,/*	A Bx	update counters; if loop continues then pc-=Bx; */
-OP_FORPREP,/*	A Bx	<check values and prepare counters>;
-                        if not to run then pc+=Bx+1;			*/
-
-OP_TFORPREP,/*	A Bx	create upvalue for R[A + 3]; pc+=Bx		*/
-OP_TFORCALL,/*	A C	R[A+4], ... ,R[A+3+C] := R[A](R[A+1], R[A+2]);	*/
-OP_TFORLOOP,/*	A Bx	if R[A+2] ~= nil then { R[A]=R[A+2]; pc -= Bx }	*/
-
-OP_SETLIST,/*	A B C k	R[A][C+i] := R[A+i], 1 <= i <= B		*/
-
-OP_CLOSURE,/*	A Bx	R[A] := closure(KPROTO[Bx])			*/
-
-OP_VARARG,/*	A C	R[A], R[A+1], ..., R[A+C-2] = vararg		*/
-
-OP_VARARGPREP,/*A	(adjust vararg parameters)			*/
+OP_VARARG,/*	A B	R(A), R(A+1), ..., R(A+B-2) = vararg		*/
 
 OP_EXTRAARG/*	Ax	extra (larger) argument for previous opcode	*/
 } OpCode;
 
 
-#define NUM_OPCODES	((int)(OP_EXTRAARG) + 1)
+#define NUM_OPCODES	(cast(int, OP_EXTRAARG) + 1)
 
 
 
 /*===========================================================================
   Notes:
+  (*) In OP_CALL, if (B == 0) then B = top. If (C == 0), then `top' is
+  set to last_result+1, so next open instruction (OP_CALL, OP_RETURN,
+  OP_SETLIST) may use `top'.
 
-  (*) Opcode OP_LFALSESKIP is used to convert a condition to a boolean
-  value, in a code equivalent to (not cond ? false : true).  (It
-  produces false and skips the next instruction producing true.)
-
-  (*) Opcodes OP_MMBIN and variants follow each arithmetic and
-  bitwise opcode. If the operation succeeds, it skips this next
-  opcode. Otherwise, this opcode calls the corresponding metamethod.
-
-  (*) Opcode OP_TESTSET is used in short-circuit expressions that need
-  both to jump and to produce a value, such as (a = b or c).
-
-  (*) In OP_CALL, if (B == 0) then B = top - A. If (C == 0), then
-  'top' is set to last_result+1, so next open instruction (OP_CALL,
-  OP_RETURN*, OP_SETLIST) may use 'top'.
-
-  (*) In OP_VARARG, if (C == 0) then use actual number of varargs and
+  (*) In OP_VARARG, if (B == 0) then use actual number of varargs and
   set top (like in OP_CALL with C == 0).
 
-  (*) In OP_RETURN, if (B == 0) then return up to 'top'.
+  (*) In OP_RETURN, if (B == 0) then return up to `top'.
 
-  (*) In OP_LOADKX and OP_NEWTABLE, the next instruction is always
-  OP_EXTRAARG.
+  (*) In OP_SETLIST, if (B == 0) then B = `top'; if (C == 0) then next
+  'instruction' is EXTRAARG(real C).
 
-  (*) In OP_SETLIST, if (B == 0) then real B = 'top'; if k, then
-  real C = EXTRAARG _ C (the bits of EXTRAARG concatenated with the
-  bits of C).
+  (*) In OP_LOADKX, the next 'instruction' is always EXTRAARG.
 
-  (*) In OP_NEWTABLE, B is log2 of the hash size (which is always a
-  power of 2) plus 1, or zero for size zero. If not k, the array size
-  is C. Otherwise, the array size is EXTRAARG _ C.
-
-  (*) For comparisons, k specifies what condition the test should accept
+  (*) For comparisons, A specifies what condition the test should accept
   (true or false).
 
-  (*) In OP_MMBINI/OP_MMBINK, k means the arguments were flipped
-   (the constant is the first operand).
-
-  (*) All 'skips' (pc++) assume that next instruction is a jump.
-
-  (*) In instructions OP_RETURN/OP_TAILCALL, 'k' specifies that the
-  function builds upvalues, which may need to be closed. C > 0 means
-  the function is vararg, so that its 'func' must be corrected before
-  returning; in this case, (C - 1) is its number of fixed parameters.
-
-  (*) In comparisons with an immediate operand, C signals whether the
-  original operand was a float. (It must be corrected in case of
-  metamethods.)
+  (*) All `skips' (pc++) assume that next instruction is a jump.
 
 ===========================================================================*/
 
 
 /*
 ** masks for instruction properties. The format is:
-** bits 0-2: op mode
-** bit 3: instruction set register A
-** bit 4: operator is a test (next instruction must be a jump)
-** bit 5: instruction uses 'L->top' set by previous instruction (when B == 0)
-** bit 6: instruction sets 'L->top' for next instruction (when C == 0)
-** bit 7: instruction is an MM instruction (call a metamethod)
+** bits 0-1: op mode
+** bits 2-3: C arg mode
+** bits 4-5: B arg mode
+** bit 6: instruction set register A
+** bit 7: operator is a test (next instruction must be a jump)
 */
 
-LUAI_DDEC(const lu_byte luaP_opmodes[NUM_OPCODES];)
+enum OpArgMask {
+  OpArgN,  /* argument is not used */
+  OpArgU,  /* argument is used */
+  OpArgR,  /* argument is a register or a jump offset */
+  OpArgK   /* argument is a constant or register/constant */
+};
 
-#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 7))
-#define testAMode(m)	(luaP_opmodes[m] & (1 << 3))
-#define testTMode(m)	(luaP_opmodes[m] & (1 << 4))
-#define testITMode(m)	(luaP_opmodes[m] & (1 << 5))
-#define testOTMode(m)	(luaP_opmodes[m] & (1 << 6))
-#define testMMMode(m)	(luaP_opmodes[m] & (1 << 7))
+LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
 
-/* "out top" (set top for next instruction) */
-#define isOT(i)  \
-	((testOTMode(GET_OPCODE(i)) && GETARG_C(i) == 0) || \
-          GET_OPCODE(i) == OP_TAILCALL)
+#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 3))
+#define getBMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3))
+#define getCMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3))
+#define testAMode(m)	(luaP_opmodes[m] & (1 << 6))
+#define testTMode(m)	(luaP_opmodes[m] & (1 << 7))
 
-/* "in top" (uses top from previous instruction) */
-#define isIT(i)		(testITMode(GET_OPCODE(i)) && GETARG_B(i) == 0)
 
-#define opmode(mm,ot,it,t,a,m)  \
-    (((mm) << 7) | ((ot) << 6) | ((it) << 5) | ((t) << 4) | ((a) << 3) | (m))
+LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
 
 
 /* number of list items to accumulate before a SETLIST instruction */
 #define LFIELDS_PER_FLUSH	50
 
+
 #endif

lopnames.h

@@ -1,103 +0,0 @@
-/*
-** $Id: lopnames.h $
-** Opcode names
-** See Copyright Notice in lua.h
-*/
-
-#if !defined(lopnames_h)
-#define lopnames_h
-
-#include <stddef.h>
-
-
-/* ORDER OP */
-
-static const char *const opnames[] = {
-  "MOVE",
-  "LOADI",
-  "LOADF",
-  "LOADK",
-  "LOADKX",
-  "LOADFALSE",
-  "LFALSESKIP",
-  "LOADTRUE",
-  "LOADNIL",
-  "GETUPVAL",
-  "SETUPVAL",
-  "GETTABUP",
-  "GETTABLE",
-  "GETI",
-  "GETFIELD",
-  "SETTABUP",
-  "SETTABLE",
-  "SETI",
-  "SETFIELD",
-  "NEWTABLE",
-  "SELF",
-  "ADDI",
-  "ADDK",
-  "SUBK",
-  "MULK",
-  "MODK",
-  "POWK",
-  "DIVK",
-  "IDIVK",
-  "BANDK",
-  "BORK",
-  "BXORK",
-  "SHRI",
-  "SHLI",
-  "ADD",
-  "SUB",
-  "MUL",
-  "MOD",
-  "POW",
-  "DIV",
-  "IDIV",
-  "BAND",
-  "BOR",
-  "BXOR",
-  "SHL",
-  "SHR",
-  "MMBIN",
-  "MMBINI",
-  "MMBINK",
-  "UNM",
-  "BNOT",
-  "NOT",
-  "LEN",
-  "CONCAT",
-  "CLOSE",
-  "TBC",
-  "JMP",
-  "EQ",
-  "LT",
-  "LE",
-  "EQK",
-  "EQI",
-  "LTI",
-  "LEI",
-  "GTI",
-  "GEI",
-  "TEST",
-  "TESTSET",
-  "CALL",
-  "TAILCALL",
-  "RETURN",
-  "RETURN0",
-  "RETURN1",
-  "FORLOOP",
-  "FORPREP",
-  "TFORPREP",
-  "TFORCALL",
-  "TFORLOOP",
-  "SETLIST",
-  "CLOSURE",
-  "VARARG",
-  "VARARGPREP",
-  "EXTRAARG",
-  NULL
-};
-
-#endif
-

loslib.c

@@ -1,14 +1,9 @@
 /*
-** $Id: loslib.c $
+** $Id: loslib.c,v 1.40 2012/10/19 15:54:02 roberto Exp $
 ** Standard Operating System library
 ** See Copyright Notice in lua.h
 */
 
-#define loslib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
 
 #include <errno.h>
 #include <locale.h>
@@ -16,6 +11,9 @@
 #include <string.h>
 #include <time.h>
 
+#define loslib_c
+#define LUA_LIB
+
 #include "lua.h"
 
 #include "lauxlib.h"
@@ -23,127 +21,65 @@
 
 
 /*
-** {==================================================================
-** List of valid conversion specifiers for the 'strftime' function;
-** options are grouped by length; group of length 2 start with '||'.
-** ===================================================================
+** list of valid conversion specifiers for the 'strftime' function
 */
-#if !defined(LUA_STRFTIMEOPTIONS)	/* { */
+#if !defined(LUA_STRFTIMEOPTIONS)
+
+#if !defined(LUA_USE_POSIX)
+#define LUA_STRFTIMEOPTIONS	{ "aAbBcdHIjmMpSUwWxXyYz%", "" }
+#else
+#define LUA_STRFTIMEOPTIONS \
+	{ "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%", "" \
+	  "", "E", "cCxXyY",  \
+	  "O", "deHImMSuUVwWy" }
+#endif
 
-#if defined(LUA_USE_WINDOWS)
-#define LUA_STRFTIMEOPTIONS  "aAbBcdHIjmMpSUwWxXyYzZ%" \
-    "||" "#c#x#d#H#I#j#m#M#S#U#w#W#y#Y"  /* two-char options */
-#elif defined(LUA_USE_C89)  /* ANSI C 89 (only 1-char options) */
-#define LUA_STRFTIMEOPTIONS  "aAbBcdHIjmMpSUwWxXyYZ%"
-#else  /* C99 specification */
-#define LUA_STRFTIMEOPTIONS  "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%" \
-    "||" "EcECExEXEyEY" "OdOeOHOIOmOMOSOuOUOVOwOWOy"  /* two-char options */
 #endif
 
-#endif					/* } */
-/* }================================================================== */
 
 
 /*
-** {==================================================================
-** Configuration for time-related stuff
-** ===================================================================
+** By default, Lua uses tmpnam except when POSIX is available, where it
+** uses mkstemp.
 */
-
-/*
-** type to represent time_t in Lua
-*/
-#if !defined(LUA_NUMTIME)	/* { */
-
-#define l_timet			lua_Integer
-#define l_pushtime(L,t)		lua_pushinteger(L,(lua_Integer)(t))
-#define l_gettime(L,arg)	luaL_checkinteger(L, arg)
-
-#else				/* }{ */
-
-#define l_timet			lua_Number
-#define l_pushtime(L,t)		lua_pushnumber(L,(lua_Number)(t))
-#define l_gettime(L,arg)	luaL_checknumber(L, arg)
-
-#endif				/* } */
-
-
-#if !defined(l_gmtime)		/* { */
-/*
-** By default, Lua uses gmtime/localtime, except when POSIX is available,
-** where it uses gmtime_r/localtime_r
-*/
-
-#if defined(LUA_USE_POSIX)	/* { */
-
-#define l_gmtime(t,r)		gmtime_r(t,r)
-#define l_localtime(t,r)	localtime_r(t,r)
-
-#else				/* }{ */
-
-/* ISO C definitions */
-#define l_gmtime(t,r)		((void)(r)->tm_sec, gmtime(t))
-#define l_localtime(t,r)	((void)(r)->tm_sec, localtime(t))
-
-#endif				/* } */
-
-#endif				/* } */
-
-/* }================================================================== */
-
-
-/*
-** {==================================================================
-** Configuration for 'tmpnam':
-** By default, Lua uses tmpnam except when POSIX is available, where
-** it uses mkstemp.
-** ===================================================================
-*/
-#if !defined(lua_tmpnam)	/* { */
-
-#if defined(LUA_USE_POSIX)	/* { */
-
+#if defined(LUA_USE_MKSTEMP)
 #include <unistd.h>
-
 #define LUA_TMPNAMBUFSIZE	32
-
-#if !defined(LUA_TMPNAMTEMPLATE)
-#define LUA_TMPNAMTEMPLATE	"/tmp/lua_XXXXXX"
-#endif
-
 #define lua_tmpnam(b,e) { \
-        strcpy(b, LUA_TMPNAMTEMPLATE); \
+        strcpy(b, "/tmp/lua_XXXXXX"); \
         e = mkstemp(b); \
         if (e != -1) close(e); \
         e = (e == -1); }
 
-#else				/* }{ */
+#elif !defined(lua_tmpnam)
 
-/* ISO C definitions */
 #define LUA_TMPNAMBUFSIZE	L_tmpnam
 #define lua_tmpnam(b,e)		{ e = (tmpnam(b) == NULL); }
 
-#endif				/* } */
-
-#endif				/* } */
-/* }================================================================== */
-
-
-#if !defined(l_system)
-#if defined(LUA_USE_IOS)
-/* Despite claiming to be ISO C, iOS does not implement 'system'. */
-#define l_system(cmd) ((cmd) == NULL ? 0 : -1)
-#else
-#define l_system(cmd)	system(cmd)  /* default definition */
 #endif
+
+
+/*
+** By default, Lua uses gmtime/localtime, except when POSIX is available,
+** where it uses gmtime_r/localtime_r
+*/
+#if defined(LUA_USE_GMTIME_R)
+
+#define l_gmtime(t,r)		gmtime_r(t,r)
+#define l_localtime(t,r)	localtime_r(t,r)
+
+#elif !defined(l_gmtime)
+
+#define l_gmtime(t,r)		((void)r, gmtime(t))
+#define l_localtime(t,r)  	((void)r, localtime(t))
+
 #endif
 
 
+
 static int os_execute (lua_State *L) {
   const char *cmd = luaL_optstring(L, 1, NULL);
-  int stat;
-  errno = 0;
-  stat = l_system(cmd);
+  int stat = system(cmd);
   if (cmd != NULL)
     return luaL_execresult(L, stat);
   else {
@@ -170,7 +106,7 @@ static int os_tmpname (lua_State *L) {
   char buff[LUA_TMPNAMBUFSIZE];
   int err;
   lua_tmpnam(buff, err);
-  if (l_unlikely(err))
+  if (err)
     return luaL_error(L, "unable to generate a unique filename");
   lua_pushstring(L, buff);
   return 1;
@@ -197,25 +133,11 @@ static int os_clock (lua_State *L) {
 ** =======================================================
 */
 
-/*
-** About the overflow check: an overflow cannot occur when time
-** is represented by a lua_Integer, because either lua_Integer is
-** large enough to represent all int fields or it is not large enough
-** to represent a time that cause a field to overflow.  However, if
-** times are represented as doubles and lua_Integer is int, then the
-** time 0x1.e1853b0d184f6p+55 would cause an overflow when adding 1900
-** to compute the year.
-*/
-static void setfield (lua_State *L, const char *key, int value, int delta) {
-  #if (defined(LUA_NUMTIME) && LUA_MAXINTEGER <= INT_MAX)
-    if (l_unlikely(value > LUA_MAXINTEGER - delta))
-      luaL_error(L, "field '%s' is out-of-bound", key);
-  #endif
-  lua_pushinteger(L, (lua_Integer)value + delta);
+static void setfield (lua_State *L, const char *key, int value) {
+  lua_pushinteger(L, value);
   lua_setfield(L, -2, key);
 }
 
-
 static void setboolfield (lua_State *L, const char *key, int value) {
   if (value < 0)  /* undefined? */
     return;  /* does not set field */
@@ -223,63 +145,45 @@ static void setboolfield (lua_State *L, const char *key, int value) {
   lua_setfield(L, -2, key);
 }
 
-
-/*
-** Set all fields from structure 'tm' in the table on top of the stack
-*/
-static void setallfields (lua_State *L, struct tm *stm) {
-  setfield(L, "year", stm->tm_year, 1900);
-  setfield(L, "month", stm->tm_mon, 1);
-  setfield(L, "day", stm->tm_mday, 0);
-  setfield(L, "hour", stm->tm_hour, 0);
-  setfield(L, "min", stm->tm_min, 0);
-  setfield(L, "sec", stm->tm_sec, 0);
-  setfield(L, "yday", stm->tm_yday, 1);
-  setfield(L, "wday", stm->tm_wday, 1);
-  setboolfield(L, "isdst", stm->tm_isdst);
-}
-
-
 static int getboolfield (lua_State *L, const char *key) {
   int res;
-  res = (lua_getfield(L, -1, key) == LUA_TNIL) ? -1 : lua_toboolean(L, -1);
+  lua_getfield(L, -1, key);
+  res = lua_isnil(L, -1) ? -1 : lua_toboolean(L, -1);
   lua_pop(L, 1);
   return res;
 }
 
 
-static int getfield (lua_State *L, const char *key, int d, int delta) {
-  int isnum;
-  int t = lua_getfield(L, -1, key);  /* get field and its type */
-  lua_Integer res = lua_tointegerx(L, -1, &isnum);
-  if (!isnum) {  /* field is not an integer? */
-    if (l_unlikely(t != LUA_TNIL))  /* some other value? */
-      return luaL_error(L, "field '%s' is not an integer", key);
-    else if (l_unlikely(d < 0))  /* absent field; no default? */
-      return luaL_error(L, "field '%s' missing in date table", key);
+static int getfield (lua_State *L, const char *key, int d) {
+  int res, isnum;
+  lua_getfield(L, -1, key);
+  res = (int)lua_tointegerx(L, -1, &isnum);
+  if (!isnum) {
+    if (d < 0)
+      return luaL_error(L, "field " LUA_QS " missing in date table", key);
     res = d;
   }
-  else {
-    if (!(res >= 0 ? res - delta <= INT_MAX : INT_MIN + delta <= res))
-      return luaL_error(L, "field '%s' is out-of-bound", key);
-    res -= delta;
-  }
   lua_pop(L, 1);
-  return (int)res;
+  return res;
 }
 
 
-static const char *checkoption (lua_State *L, const char *conv,
-                                ptrdiff_t convlen, char *buff) {
-  const char *option = LUA_STRFTIMEOPTIONS;
-  int oplen = 1;  /* length of options being checked */
-  for (; *option != '\0' && oplen <= convlen; option += oplen) {
-    if (*option == '|')  /* next block? */
-      oplen++;  /* will check options with next length (+1) */
-    else if (memcmp(conv, option, oplen) == 0) {  /* match? */
-      memcpy(buff, conv, oplen);  /* copy valid option to buffer */
-      buff[oplen] = '\0';
-      return conv + oplen;  /* return next item */
+static const char *checkoption (lua_State *L, const char *conv, char *buff) {
+  static const char *const options[] = LUA_STRFTIMEOPTIONS;
+  unsigned int i;
+  for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) {
+    if (*conv != '\0' && strchr(options[i], *conv) != NULL) {
+      buff[1] = *conv;
+      if (*options[i + 1] == '\0') {  /* one-char conversion specifier? */
+        buff[2] = '\0';  /* end buffer */
+        return conv + 1;
+      }
+      else if (*(conv + 1) != '\0' &&
+               strchr(options[i + 1], *(conv + 1)) != NULL) {
+        buff[2] = *(conv + 1);  /* valid two-char conversion specifier */
+        buff[3] = '\0';  /* end buffer */
+        return conv + 2;
+      }
     }
   }
   luaL_argerror(L, 1,
@@ -288,51 +192,44 @@ static const char *checkoption (lua_State *L, const char *conv,
 }
 
 
-static time_t l_checktime (lua_State *L, int arg) {
-  l_timet t = l_gettime(L, arg);
-  luaL_argcheck(L, (time_t)t == t, arg, "time out-of-bounds");
-  return (time_t)t;
-}
-
-
-/* maximum size for an individual 'strftime' item */
-#define SIZETIMEFMT	250
-
-
 static int os_date (lua_State *L) {
-  size_t slen;
-  const char *s = luaL_optlstring(L, 1, "%c", &slen);
-  time_t t = luaL_opt(L, l_checktime, 2, time(NULL));
-  const char *se = s + slen;  /* 's' end */
+  const char *s = luaL_optstring(L, 1, "%c");
+  time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL));
   struct tm tmr, *stm;
   if (*s == '!') {  /* UTC? */
     stm = l_gmtime(&t, &tmr);
-    s++;  /* skip '!' */
+    s++;  /* skip `!' */
   }
   else
     stm = l_localtime(&t, &tmr);
   if (stm == NULL)  /* invalid date? */
-    return luaL_error(L,
-                 "date result cannot be represented in this installation");
-  if (strcmp(s, "*t") == 0) {
+    lua_pushnil(L);
+  else if (strcmp(s, "*t") == 0) {
     lua_createtable(L, 0, 9);  /* 9 = number of fields */
-    setallfields(L, stm);
+    setfield(L, "sec", stm->tm_sec);
+    setfield(L, "min", stm->tm_min);
+    setfield(L, "hour", stm->tm_hour);
+    setfield(L, "day", stm->tm_mday);
+    setfield(L, "month", stm->tm_mon+1);
+    setfield(L, "year", stm->tm_year+1900);
+    setfield(L, "wday", stm->tm_wday+1);
+    setfield(L, "yday", stm->tm_yday+1);
+    setboolfield(L, "isdst", stm->tm_isdst);
   }
   else {
-    char cc[4];  /* buffer for individual conversion specifiers */
+    char cc[4];
     luaL_Buffer b;
     cc[0] = '%';
     luaL_buffinit(L, &b);
-    while (s < se) {
-      if (*s != '%')  /* not a conversion specifier? */
+    while (*s) {
+      if (*s != '%')  /* no conversion specifier? */
         luaL_addchar(&b, *s++);
       else {
         size_t reslen;
-        char *buff = luaL_prepbuffsize(&b, SIZETIMEFMT);
-        s++;  /* skip '%' */
-        s = checkoption(L, s, se - s, cc + 1);  /* copy specifier to 'cc' */
-        reslen = strftime(buff, SIZETIMEFMT, cc, stm);
-        luaL_addsize(&b, reslen);
+        char buff[200];  /* should be big enough for any conversion result */
+        s = checkoption(L, s + 1, cc);
+        reslen = strftime(buff, sizeof(buff), cc, stm);
+        luaL_addlstring(&b, buff, reslen);
       }
     }
     luaL_pushresult(&b);
@@ -349,28 +246,26 @@ static int os_time (lua_State *L) {
     struct tm ts;
     luaL_checktype(L, 1, LUA_TTABLE);
     lua_settop(L, 1);  /* make sure table is at the top */
-    ts.tm_year = getfield(L, "year", -1, 1900);
-    ts.tm_mon = getfield(L, "month", -1, 1);
-    ts.tm_mday = getfield(L, "day", -1, 0);
-    ts.tm_hour = getfield(L, "hour", 12, 0);
-    ts.tm_min = getfield(L, "min", 0, 0);
-    ts.tm_sec = getfield(L, "sec", 0, 0);
+    ts.tm_sec = getfield(L, "sec", 0);
+    ts.tm_min = getfield(L, "min", 0);
+    ts.tm_hour = getfield(L, "hour", 12);
+    ts.tm_mday = getfield(L, "day", -1);
+    ts.tm_mon = getfield(L, "month", -1) - 1;
+    ts.tm_year = getfield(L, "year", -1) - 1900;
     ts.tm_isdst = getboolfield(L, "isdst");
     t = mktime(&ts);
-    setallfields(L, &ts);  /* update fields with normalized values */
   }
-  if (t != (time_t)(l_timet)t || t == (time_t)(-1))
-    return luaL_error(L,
-                  "time result cannot be represented in this installation");
-  l_pushtime(L, t);
+  if (t == (time_t)(-1))
+    lua_pushnil(L);
+  else
+    lua_pushnumber(L, (lua_Number)t);
   return 1;
 }
 
 
 static int os_difftime (lua_State *L) {
-  time_t t1 = l_checktime(L, 1);
-  time_t t2 = l_checktime(L, 2);
-  lua_pushnumber(L, (lua_Number)difftime(t1, t2));
+  lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
+                             (time_t)(luaL_optnumber(L, 2, 0))));
   return 1;
 }
 
@@ -394,7 +289,7 @@ static int os_exit (lua_State *L) {
   if (lua_isboolean(L, 1))
     status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
   else
-    status = (int)luaL_optinteger(L, 1, EXIT_SUCCESS);
+    status = luaL_optint(L, 1, EXIT_SUCCESS);
   if (lua_toboolean(L, 2))
     lua_close(L);
   if (L) exit(status);  /* 'if' to avoid warnings for unreachable 'return' */

lparser.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lparser.h $
+** $Id: lparser.h,v 1.70 2012/05/08 13:53:33 roberto Exp $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
@@ -13,106 +13,58 @@
 
 
 /*
-** Expression and variable descriptor.
-** Code generation for variables and expressions can be delayed to allow
-** optimizations; An 'expdesc' structure describes a potentially-delayed
-** variable/expression. It has a description of its "main" value plus a
-** list of conditional jumps that can also produce its value (generated
-** by short-circuit operators 'and'/'or').
+** Expression descriptor
 */
 
-/* kinds of variables/expressions */
 typedef enum {
-  VVOID,  /* when 'expdesc' describes the last expression of a list,
-             this kind means an empty list (so, no expression) */
-  VNIL,  /* constant nil */
-  VTRUE,  /* constant true */
-  VFALSE,  /* constant false */
-  VK,  /* constant in 'k'; info = index of constant in 'k' */
-  VKFLT,  /* floating constant; nval = numerical float value */
-  VKINT,  /* integer constant; ival = numerical integer value */
-  VKSTR,  /* string constant; strval = TString address;
-             (string is fixed by the lexer) */
-  VNONRELOC,  /* expression has its value in a fixed register;
-                 info = result register */
-  VLOCAL,  /* local variable; var.ridx = register index;
-              var.vidx = relative index in 'actvar.arr'  */
-  VUPVAL,  /* upvalue variable; info = index of upvalue in 'upvalues' */
-  VCONST,  /* compile-time <const> variable;
-              info = absolute index in 'actvar.arr'  */
-  VINDEXED,  /* indexed variable;
-                ind.t = table register;
-                ind.idx = key's R index */
-  VINDEXUP,  /* indexed upvalue;
-                ind.t = table upvalue;
-                ind.idx = key's K index */
-  VINDEXI, /* indexed variable with constant integer;
-                ind.t = table register;
-                ind.idx = key's value */
-  VINDEXSTR, /* indexed variable with literal string;
-                ind.t = table register;
-                ind.idx = key's K index */
-  VJMP,  /* expression is a test/comparison;
-            info = pc of corresponding jump instruction */
-  VRELOC,  /* expression can put result in any register;
-              info = instruction pc */
-  VCALL,  /* expression is a function call; info = instruction pc */
-  VVARARG  /* vararg expression; info = instruction pc */
+  VVOID,	/* no value */
+  VNIL,
+  VTRUE,
+  VFALSE,
+  VK,		/* info = index of constant in `k' */
+  VKNUM,	/* nval = numerical value */
+  VNONRELOC,	/* info = result register */
+  VLOCAL,	/* info = local register */
+  VUPVAL,       /* info = index of upvalue in 'upvalues' */
+  VINDEXED,	/* t = table register/upvalue; idx = index R/K */
+  VJMP,		/* info = instruction pc */
+  VRELOCABLE,	/* info = instruction pc */
+  VCALL,	/* info = instruction pc */
+  VVARARG	/* info = instruction pc */
 } expkind;
 
 
-#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXSTR)
-#define vkisindexed(k)	(VINDEXED <= (k) && (k) <= VINDEXSTR)
-
+#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXED)
+#define vkisinreg(k)	((k) == VNONRELOC || (k) == VLOCAL)
 
 typedef struct expdesc {
   expkind k;
   union {
-    lua_Integer ival;    /* for VKINT */
-    lua_Number nval;  /* for VKFLT */
-    TString *strval;  /* for VKSTR */
-    int info;  /* for generic use */
-    struct {  /* for indexed variables */
-      short idx;  /* index (R or "long" K) */
+    struct {  /* for indexed variables (VINDEXED) */
+      short idx;  /* index (R/K) */
       lu_byte t;  /* table (register or upvalue) */
+      lu_byte vt;  /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */
     } ind;
-    struct {  /* for local variables */
-      lu_byte ridx;  /* register holding the variable */
-      unsigned short vidx;  /* compiler index (in 'actvar.arr')  */
-    } var;
+    int info;  /* for generic use */
+    lua_Number nval;  /* for VKNUM */
   } u;
-  int t;  /* patch list of 'exit when true' */
-  int f;  /* patch list of 'exit when false' */
+  int t;  /* patch list of `exit when true' */
+  int f;  /* patch list of `exit when false' */
 } expdesc;
 
 
-/* kinds of variables */
-#define VDKREG		0   /* regular */
-#define RDKCONST	1   /* constant */
-#define RDKTOCLOSE	2   /* to-be-closed */
-#define RDKCTC		3   /* compile-time constant */
-
-/* description of an active local variable */
-typedef union Vardesc {
-  struct {
-    TValuefields;  /* constant value (if it is a compile-time constant) */
-    lu_byte kind;
-    lu_byte ridx;  /* register holding the variable */
-    short pidx;  /* index of the variable in the Proto's 'locvars' array */
-    TString *name;  /* variable name */
-  } vd;
-  TValue k;  /* constant value (if any) */
+/* description of active local variable */
+typedef struct Vardesc {
+  short idx;  /* variable index in stack */
 } Vardesc;
 
 
-
 /* description of pending goto statements and label statements */
 typedef struct Labeldesc {
   TString *name;  /* label identifier */
   int pc;  /* position in code */
   int line;  /* line where it appeared */
-  lu_byte nactvar;  /* number of active variables in that position */
-  lu_byte close;  /* goto that escapes upvalues */
+  lu_byte nactvar;  /* local level where it appears in current block */
 } Labeldesc;
 
 
@@ -126,7 +78,7 @@ typedef struct Labellist {
 
 /* dynamic structures used by the parser */
 typedef struct Dyndata {
-  struct {  /* list of all active local variables */
+  struct {  /* list of active local variables */
     Vardesc *arr;
     int n;
     int size;
@@ -143,29 +95,25 @@ struct BlockCnt;  /* defined in lparser.c */
 /* state needed to generate code for a given function */
 typedef struct FuncState {
   Proto *f;  /* current function header */
+  Table *h;  /* table to find (and reuse) elements in `k' */
   struct FuncState *prev;  /* enclosing function */
   struct LexState *ls;  /* lexical state */
   struct BlockCnt *bl;  /* chain of current blocks */
-  int pc;  /* next position to code (equivalent to 'ncode') */
+  int pc;  /* next position to code (equivalent to `ncode') */
   int lasttarget;   /* 'label' of last 'jump label' */
-  int previousline;  /* last line that was saved in 'lineinfo' */
-  int nk;  /* number of elements in 'k' */
-  int np;  /* number of elements in 'p' */
-  int nabslineinfo;  /* number of elements in 'abslineinfo' */
+  int jpc;  /* list of pending jumps to `pc' */
+  int nk;  /* number of elements in `k' */
+  int np;  /* number of elements in `p' */
   int firstlocal;  /* index of first local var (in Dyndata array) */
-  int firstlabel;  /* index of first label (in 'dyd->label->arr') */
-  short ndebugvars;  /* number of elements in 'f->locvars' */
+  short nlocvars;  /* number of elements in 'f->locvars' */
   lu_byte nactvar;  /* number of active local variables */
   lu_byte nups;  /* number of upvalues */
   lu_byte freereg;  /* first free register */
-  lu_byte iwthabs;  /* instructions issued since last absolute line info */
-  lu_byte needclose;  /* function needs to close upvalues when returning */
 } FuncState;
 
 
-LUAI_FUNC int luaY_nvarstack (FuncState *fs);
-LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
-                                 Dyndata *dyd, const char *name, int firstchar);
+LUAI_FUNC Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                                Dyndata *dyd, const char *name, int firstchar);
 
 
 #endif

lprefix.h

@@ -1,45 +0,0 @@
-/*
-** $Id: lprefix.h $
-** Definitions for Lua code that must come before any other header file
-** See Copyright Notice in lua.h
-*/
-
-#ifndef lprefix_h
-#define lprefix_h
-
-
-/*
-** Allows POSIX/XSI stuff
-*/
-#if !defined(LUA_USE_C89)	/* { */
-
-#if !defined(_XOPEN_SOURCE)
-#define _XOPEN_SOURCE           600
-#elif _XOPEN_SOURCE == 0
-#undef _XOPEN_SOURCE  /* use -D_XOPEN_SOURCE=0 to undefine it */
-#endif
-
-/*
-** Allows manipulation of large files in gcc and some other compilers
-*/
-#if !defined(LUA_32BITS) && !defined(_FILE_OFFSET_BITS)
-#define _LARGEFILE_SOURCE       1
-#define _FILE_OFFSET_BITS       64
-#endif
-
-#endif				/* } */
-
-
-/*
-** Windows stuff
-*/
-#if defined(_WIN32)	/* { */
-
-#if !defined(_CRT_SECURE_NO_WARNINGS)
-#define _CRT_SECURE_NO_WARNINGS  /* avoid warnings about ISO C functions */
-#endif
-
-#endif			/* } */
-
-#endif
-

lstate.c

@@ -1,18 +1,16 @@
 /*
-** $Id: lstate.c $
+** $Id: lstate.c,v 2.99.1.1 2013/04/12 18:48:47 roberto Exp roberto $
 ** Global State
 ** See Copyright Notice in lua.h
 */
 
-#define lstate_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
 
 #include <stddef.h>
 #include <string.h>
 
+#define lstate_c
+#define LUA_CORE
+
 #include "lua.h"
 
 #include "lapi.h"
@@ -28,12 +26,40 @@
 #include "ltm.h"
 
 
+#if !defined(LUAI_GCPAUSE)
+#define LUAI_GCPAUSE	200  /* 200% */
+#endif
+
+#if !defined(LUAI_GCMAJOR)
+#define LUAI_GCMAJOR	200  /* 200% */
+#endif
+
+#if !defined(LUAI_GCMUL)
+#define LUAI_GCMUL	200 /* GC runs 'twice the speed' of memory allocation */
+#endif
+
+
+#define MEMERRMSG	"not enough memory"
+
+
+/*
+** a macro to help the creation of a unique random seed when a state is
+** created; the seed is used to randomize hashes.
+*/
+#if !defined(luai_makeseed)
+#include <time.h>
+#define luai_makeseed()		cast(unsigned int, time(NULL))
+#endif
+
+
 
 /*
 ** thread state + extra space
 */
 typedef struct LX {
-  lu_byte extra_[LUA_EXTRASPACE];
+#if defined(LUAI_EXTRASPACE)
+  char buff[LUAI_EXTRASPACE];
+#endif
   lua_State l;
 } LX;
 
@@ -52,73 +78,47 @@ typedef struct LG {
 
 
 /*
-** A macro to create a "random" seed when a state is created;
-** the seed is used to randomize string hashes.
-*/
-#if !defined(luai_makeseed)
-
-#include <time.h>
-
-/*
-** Compute an initial seed with some level of randomness.
-** Rely on Address Space Layout Randomization (if present) and
-** current time.
+** Compute an initial seed as random as possible. In ANSI, rely on
+** Address Space Layout Randomization (if present) to increase
+** randomness..
 */
 #define addbuff(b,p,e) \
-  { size_t t = cast_sizet(e); \
-    memcpy(b + p, &t, sizeof(t)); p += sizeof(t); }
+  { size_t t = cast(size_t, e); \
+    memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); }
 
-static unsigned int luai_makeseed (lua_State *L) {
-  char buff[3 * sizeof(size_t)];
-  unsigned int h = cast_uint(time(NULL));
+static unsigned int makeseed (lua_State *L) {
+  char buff[4 * sizeof(size_t)];
+  unsigned int h = luai_makeseed();
   int p = 0;
   addbuff(buff, p, L);  /* heap variable */
   addbuff(buff, p, &h);  /* local variable */
+  addbuff(buff, p, luaO_nilobject);  /* global variable */
   addbuff(buff, p, &lua_newstate);  /* public function */
   lua_assert(p == sizeof(buff));
   return luaS_hash(buff, p, h);
 }
 
-#endif
-
 
 /*
 ** set GCdebt to a new value keeping the value (totalbytes + GCdebt)
-** invariant (and avoiding underflows in 'totalbytes')
+** invariant
 */
 void luaE_setdebt (global_State *g, l_mem debt) {
-  l_mem tb = gettotalbytes(g);
-  lua_assert(tb > 0);
-  if (debt < tb - MAX_LMEM)
-    debt = tb - MAX_LMEM;  /* will make 'totalbytes == MAX_LMEM' */
-  g->totalbytes = tb - debt;
+  g->totalbytes -= (debt - g->GCdebt);
   g->GCdebt = debt;
 }
 
 
-LUA_API int lua_setcstacklimit (lua_State *L, unsigned int limit) {
-  UNUSED(L); UNUSED(limit);
-  return LUAI_MAXCCALLS;  /* warning?? */
-}
-
-
 CallInfo *luaE_extendCI (lua_State *L) {
-  CallInfo *ci;
-  lua_assert(L->ci->next == NULL);
-  ci = luaM_new(L, CallInfo);
+  CallInfo *ci = luaM_new(L, CallInfo);
   lua_assert(L->ci->next == NULL);
   L->ci->next = ci;
   ci->previous = L->ci;
   ci->next = NULL;
-  ci->u.l.trap = 0;
-  L->nci++;
   return ci;
 }
 
 
-/*
-** free all CallInfo structures not in use by a thread
-*/
 void luaE_freeCI (lua_State *L) {
   CallInfo *ci = L->ci;
   CallInfo *next = ci->next;
@@ -126,87 +126,36 @@ void luaE_freeCI (lua_State *L) {
   while ((ci = next) != NULL) {
     next = ci->next;
     luaM_free(L, ci);
-    L->nci--;
   }
 }
 
 
-/*
-** free half of the CallInfo structures not in use by a thread,
-** keeping the first one.
-*/
-void luaE_shrinkCI (lua_State *L) {
-  CallInfo *ci = L->ci->next;  /* first free CallInfo */
-  CallInfo *next;
-  if (ci == NULL)
-    return;  /* no extra elements */
-  while ((next = ci->next) != NULL) {  /* two extra elements? */
-    CallInfo *next2 = next->next;  /* next's next */
-    ci->next = next2;  /* remove next from the list */
-    L->nci--;
-    luaM_free(L, next);  /* free next */
-    if (next2 == NULL)
-      break;  /* no more elements */
-    else {
-      next2->previous = ci;
-      ci = next2;  /* continue */
-    }
-  }
-}
-
-
-/*
-** Called when 'getCcalls(L)' larger or equal to LUAI_MAXCCALLS.
-** If equal, raises an overflow error. If value is larger than
-** LUAI_MAXCCALLS (which means it is handling an overflow) but
-** not much larger, does not report an error (to allow overflow
-** handling to work).
-*/
-void luaE_checkcstack (lua_State *L) {
-  if (getCcalls(L) == LUAI_MAXCCALLS)
-    luaG_runerror(L, "C stack overflow");
-  else if (getCcalls(L) >= (LUAI_MAXCCALLS / 10 * 11))
-    luaD_throw(L, LUA_ERRERR);  /* error while handling stack error */
-}
-
-
-LUAI_FUNC void luaE_incCstack (lua_State *L) {
-  L->nCcalls++;
-  if (l_unlikely(getCcalls(L) >= LUAI_MAXCCALLS))
-    luaE_checkcstack(L);
-}
-
-
 static void stack_init (lua_State *L1, lua_State *L) {
   int i; CallInfo *ci;
   /* initialize stack array */
-  L1->stack.p = luaM_newvector(L, BASIC_STACK_SIZE + EXTRA_STACK, StackValue);
-  L1->tbclist.p = L1->stack.p;
-  for (i = 0; i < BASIC_STACK_SIZE + EXTRA_STACK; i++)
-    setnilvalue(s2v(L1->stack.p + i));  /* erase new stack */
-  L1->top.p = L1->stack.p;
-  L1->stack_last.p = L1->stack.p + BASIC_STACK_SIZE;
+  L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
+  L1->stacksize = BASIC_STACK_SIZE;
+  for (i = 0; i < BASIC_STACK_SIZE; i++)
+    setnilvalue(L1->stack + i);  /* erase new stack */
+  L1->top = L1->stack;
+  L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK;
   /* initialize first ci */
   ci = &L1->base_ci;
   ci->next = ci->previous = NULL;
-  ci->callstatus = CIST_C;
-  ci->func.p = L1->top.p;
-  ci->u.c.k = NULL;
-  ci->nresults = 0;
-  setnilvalue(s2v(L1->top.p));  /* 'function' entry for this 'ci' */
-  L1->top.p++;
-  ci->top.p = L1->top.p + LUA_MINSTACK;
+  ci->callstatus = 0;
+  ci->func = L1->top;
+  setnilvalue(L1->top++);  /* 'function' entry for this 'ci' */
+  ci->top = L1->top + LUA_MINSTACK;
   L1->ci = ci;
 }
 
 
 static void freestack (lua_State *L) {
-  if (L->stack.p == NULL)
+  if (L->stack == NULL)
     return;  /* stack not completely built yet */
   L->ci = &L->base_ci;  /* free the entire 'ci' list */
   luaE_freeCI(L);
-  lua_assert(L->nci == 0);
-  luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK);  /* free stack */
+  luaM_freearray(L, L->stack, L->stacksize);  /* free stack array */
 }
 
 
@@ -214,69 +163,71 @@ static void freestack (lua_State *L) {
 ** Create registry table and its predefined values
 */
 static void init_registry (lua_State *L, global_State *g) {
+  TValue mt;
   /* create registry */
   Table *registry = luaH_new(L);
   sethvalue(L, &g->l_registry, registry);
   luaH_resize(L, registry, LUA_RIDX_LAST, 0);
   /* registry[LUA_RIDX_MAINTHREAD] = L */
-  setthvalue(L, &registry->array[LUA_RIDX_MAINTHREAD - 1], L);
-  /* registry[LUA_RIDX_GLOBALS] = new table (table of globals) */
-  sethvalue(L, &registry->array[LUA_RIDX_GLOBALS - 1], luaH_new(L));
+  setthvalue(L, &mt, L);
+  luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt);
+  /* registry[LUA_RIDX_GLOBALS] = table of globals */
+  sethvalue(L, &mt, luaH_new(L));
+  luaH_setint(L, registry, LUA_RIDX_GLOBALS, &mt);
 }
 
 
 /*
-** open parts of the state that may cause memory-allocation errors.
+** open parts of the state that may cause memory-allocation errors
 */
 static void f_luaopen (lua_State *L, void *ud) {
   global_State *g = G(L);
   UNUSED(ud);
   stack_init(L, L);  /* init stack */
   init_registry(L, g);
-  luaS_init(L);
+  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
   luaT_init(L);
   luaX_init(L);
-  g->gcstp = 0;  /* allow gc */
-  setnilvalue(&g->nilvalue);  /* now state is complete */
+  /* pre-create memory-error message */
+  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+  luaS_fix(g->memerrmsg);  /* it should never be collected */
+  g->gcrunning = 1;  /* allow gc */
+  g->version = lua_version(NULL);
   luai_userstateopen(L);
 }
 
 
 /*
-** preinitialize a thread with consistent values without allocating
+** preinitialize a state with consistent values without allocating
 ** any memory (to avoid errors)
 */
-static void preinit_thread (lua_State *L, global_State *g) {
+static void preinit_state (lua_State *L, global_State *g) {
   G(L) = g;
-  L->stack.p = NULL;
+  L->stack = NULL;
   L->ci = NULL;
-  L->nci = 0;
-  L->twups = L;  /* thread has no upvalues */
-  L->nCcalls = 0;
+  L->stacksize = 0;
   L->errorJmp = NULL;
+  L->nCcalls = 0;
   L->hook = NULL;
   L->hookmask = 0;
   L->basehookcount = 0;
   L->allowhook = 1;
   resethookcount(L);
   L->openupval = NULL;
+  L->nny = 1;
   L->status = LUA_OK;
   L->errfunc = 0;
-  L->oldpc = 0;
 }
 
 
 static void close_state (lua_State *L) {
   global_State *g = G(L);
-  if (!completestate(g))  /* closing a partially built state? */
-    luaC_freeallobjects(L);  /* just collect its objects */
-  else {  /* closing a fully built state */
-    L->ci = &L->base_ci;  /* unwind CallInfo list */
-    luaD_closeprotected(L, 1, LUA_OK);  /* close all upvalues */
-    luaC_freeallobjects(L);  /* collect all objects */
+  luaF_close(L, L->stack);  /* close all upvalues for this thread */
+  luaC_freeallobjects(L);  /* collect all objects */
+  if (g->version)  /* closing a fully built state? */
     luai_userstateclose(L);
-  }
   luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
+  luaZ_freebuffer(L, &g->buff);
   freestack(L);
   lua_assert(gettotalbytes(g) == sizeof(LG));
   (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0);  /* free main block */
@@ -284,25 +235,17 @@ static void close_state (lua_State *L) {
 
 
 LUA_API lua_State *lua_newthread (lua_State *L) {
-  global_State *g = G(L);
-  GCObject *o;
   lua_State *L1;
   lua_lock(L);
   luaC_checkGC(L);
-  /* create new thread */
-  o = luaC_newobjdt(L, LUA_TTHREAD, sizeof(LX), offsetof(LX, l));
-  L1 = gco2th(o);
-  /* anchor it on L stack */
-  setthvalue2s(L, L->top.p, L1);
+  L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th;
+  setthvalue(L, L->top, L1);
   api_incr_top(L);
-  preinit_thread(L1, g);
+  preinit_state(L1, G(L));
   L1->hookmask = L->hookmask;
   L1->basehookcount = L->basehookcount;
   L1->hook = L->hook;
   resethookcount(L1);
-  /* initialize L1 extra space */
-  memcpy(lua_getextraspace(L1), lua_getextraspace(g->mainthread),
-         LUA_EXTRASPACE);
   luai_userstatethread(L, L1);
   stack_init(L1, L);  /* init stack */
   lua_unlock(L);
@@ -312,7 +255,7 @@ LUA_API lua_State *lua_newthread (lua_State *L) {
 
 void luaE_freethread (lua_State *L, lua_State *L1) {
   LX *l = fromstate(L1);
-  luaF_closeupval(L1, L1->stack.p);  /* close all upvalues */
+  luaF_close(L1, L1->stack);  /* close all upvalues for this thread */
   lua_assert(L1->openupval == NULL);
   luai_userstatefree(L, L1);
   freestack(L1);
@@ -320,43 +263,6 @@ void luaE_freethread (lua_State *L, lua_State *L1) {
 }
 
 
-int luaE_resetthread (lua_State *L, int status) {
-  CallInfo *ci = L->ci = &L->base_ci;  /* unwind CallInfo list */
-  setnilvalue(s2v(L->stack.p));  /* 'function' entry for basic 'ci' */
-  ci->func.p = L->stack.p;
-  ci->callstatus = CIST_C;
-  if (status == LUA_YIELD)
-    status = LUA_OK;
-  L->status = LUA_OK;  /* so it can run __close metamethods */
-  status = luaD_closeprotected(L, 1, status);
-  if (status != LUA_OK)  /* errors? */
-    luaD_seterrorobj(L, status, L->stack.p + 1);
-  else
-    L->top.p = L->stack.p + 1;
-  ci->top.p = L->top.p + LUA_MINSTACK;
-  luaD_reallocstack(L, cast_int(ci->top.p - L->stack.p), 0);
-  return status;
-}
-
-
-LUA_API int lua_closethread (lua_State *L, lua_State *from) {
-  int status;
-  lua_lock(L);
-  L->nCcalls = (from) ? getCcalls(from) : 0;
-  status = luaE_resetthread(L, L->status);
-  lua_unlock(L);
-  return status;
-}
-
-
-/*
-** Deprecated! Use 'lua_closethread' instead.
-*/
-LUA_API int lua_resetthread (lua_State *L) {
-  return lua_closethread(L, NULL);
-}
-
-
 LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
   int i;
   lua_State *L;
@@ -365,44 +271,39 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
   if (l == NULL) return NULL;
   L = &l->l.l;
   g = &l->g;
-  L->tt = LUA_VTHREAD;
-  g->currentwhite = bitmask(WHITE0BIT);
-  L->marked = luaC_white(g);
-  preinit_thread(L, g);
-  g->allgc = obj2gco(L);  /* by now, only object is the main thread */
   L->next = NULL;
-  incnny(L);  /* main thread is always non yieldable */
+  L->tt = LUA_TTHREAD;
+  g->currentwhite = bit2mask(WHITE0BIT, FIXEDBIT);
+  L->marked = luaC_white(g);
+  g->gckind = KGC_NORMAL;
+  preinit_state(L, g);
   g->frealloc = f;
   g->ud = ud;
-  g->warnf = NULL;
-  g->ud_warn = NULL;
   g->mainthread = L;
-  g->seed = luai_makeseed(L);
-  g->gcstp = GCSTPGC;  /* no GC while building state */
-  g->strt.size = g->strt.nuse = 0;
+  g->seed = makeseed(L);
+  g->uvhead.u.l.prev = &g->uvhead;
+  g->uvhead.u.l.next = &g->uvhead;
+  g->gcrunning = 0;  /* no GC while building state */
+  g->GCestimate = 0;
+  g->strt.size = 0;
+  g->strt.nuse = 0;
   g->strt.hash = NULL;
   setnilvalue(&g->l_registry);
+  luaZ_initbuffer(L, &g->buff);
   g->panic = NULL;
+  g->version = NULL;
   g->gcstate = GCSpause;
-  g->gckind = KGC_INC;
-  g->gcstopem = 0;
-  g->gcemergency = 0;
-  g->finobj = g->tobefnz = g->fixedgc = NULL;
-  g->firstold1 = g->survival = g->old1 = g->reallyold = NULL;
-  g->finobjsur = g->finobjold1 = g->finobjrold = NULL;
-  g->sweepgc = NULL;
+  g->allgc = NULL;
+  g->finobj = NULL;
+  g->tobefnz = NULL;
+  g->sweepgc = g->sweepfin = NULL;
   g->gray = g->grayagain = NULL;
   g->weak = g->ephemeron = g->allweak = NULL;
-  g->twups = NULL;
   g->totalbytes = sizeof(LG);
   g->GCdebt = 0;
-  g->lastatomic = 0;
-  setivalue(&g->nilvalue, 0);  /* to signal that state is not yet built */
-  setgcparam(g->gcpause, LUAI_GCPAUSE);
-  setgcparam(g->gcstepmul, LUAI_GCMUL);
-  g->gcstepsize = LUAI_GCSTEPSIZE;
-  setgcparam(g->genmajormul, LUAI_GENMAJORMUL);
-  g->genminormul = LUAI_GENMINORMUL;
+  g->gcpause = LUAI_GCPAUSE;
+  g->gcmajorinc = LUAI_GCMAJOR;
+  g->gcstepmul = LUAI_GCMUL;
   for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
   if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
     /* memory allocation error: free partial state */
@@ -414,32 +315,9 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
 
 
 LUA_API void lua_close (lua_State *L) {
-  lua_lock(L);
   L = G(L)->mainthread;  /* only the main thread can be closed */
+  lua_lock(L);
   close_state(L);
 }
 
 
-void luaE_warning (lua_State *L, const char *msg, int tocont) {
-  lua_WarnFunction wf = G(L)->warnf;
-  if (wf != NULL)
-    wf(G(L)->ud_warn, msg, tocont);
-}
-
-
-/*
-** Generate a warning from an error message
-*/
-void luaE_warnerror (lua_State *L, const char *where) {
-  TValue *errobj = s2v(L->top.p - 1);  /* error object */
-  const char *msg = (ttisstring(errobj))
-                  ? svalue(errobj)
-                  : "error object is not a string";
-  /* produce warning "error in %s (%s)" (where, msg) */
-  luaE_warning(L, "error in ", 1);
-  luaE_warning(L, where, 1);
-  luaE_warning(L, " (", 1);
-  luaE_warning(L, msg, 1);
-  luaE_warning(L, ")", 0);
-}
-

lstate.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstate.h $
+** $Id: lstate.h,v 2.82 2012/07/02 13:37:04 roberto Exp $
 ** Global State
 ** See Copyright Notice in lua.h
 */
@@ -9,400 +9,219 @@
 
 #include "lua.h"
 
-
-/* Some header files included here need this definition */
-typedef struct CallInfo CallInfo;
-
-
 #include "lobject.h"
 #include "ltm.h"
 #include "lzio.h"
 
 
 /*
-** Some notes about garbage-collected objects: All objects in Lua must
-** be kept somehow accessible until being freed, so all objects always
-** belong to one (and only one) of these lists, using field 'next' of
-** the 'CommonHeader' for the link:
+
+** Some notes about garbage-collected objects:  All objects in Lua must
+** be kept somehow accessible until being freed.
 **
-** 'allgc': all objects not marked for finalization;
-** 'finobj': all objects marked for finalization;
-** 'tobefnz': all objects ready to be finalized;
-** 'fixedgc': all objects that are not to be collected (currently
-** only small strings, such as reserved words).
+** Lua keeps most objects linked in list g->allgc. The link uses field
+** 'next' of the CommonHeader.
 **
-** For the generational collector, some of these lists have marks for
-** generations. Each mark points to the first element in the list for
-** that particular generation; that generation goes until the next mark.
+** Strings are kept in several lists headed by the array g->strt.hash.
 **
-** 'allgc' -> 'survival': new objects;
-** 'survival' -> 'old': objects that survived one collection;
-** 'old1' -> 'reallyold': objects that became old in last collection;
-** 'reallyold' -> NULL: objects old for more than one cycle.
+** Open upvalues are not subject to independent garbage collection. They
+** are collected together with their respective threads. Lua keeps a
+** double-linked list with all open upvalues (g->uvhead) so that it can
+** mark objects referred by them. (They are always gray, so they must
+** be remarked in the atomic step. Usually their contents would be marked
+** when traversing the respective threads, but the thread may already be
+** dead, while the upvalue is still accessible through closures.)
 **
-** 'finobj' -> 'finobjsur': new objects marked for finalization;
-** 'finobjsur' -> 'finobjold1': survived   """";
-** 'finobjold1' -> 'finobjrold': just old  """";
-** 'finobjrold' -> NULL: really old       """".
+** Objects with finalizers are kept in the list g->finobj.
 **
-** All lists can contain elements older than their main ages, due
-** to 'luaC_checkfinalizer' and 'udata2finalize', which move
-** objects between the normal lists and the "marked for finalization"
-** lists. Moreover, barriers can age young objects in young lists as
-** OLD0, which then become OLD1. However, a list never contains
-** elements younger than their main ages.
-**
-** The generational collector also uses a pointer 'firstold1', which
-** points to the first OLD1 object in the list. It is used to optimize
-** 'markold'. (Potentially OLD1 objects can be anywhere between 'allgc'
-** and 'reallyold', but often the list has no OLD1 objects or they are
-** after 'old1'.) Note the difference between it and 'old1':
-** 'firstold1': no OLD1 objects before this point; there can be all
-**   ages after it.
-** 'old1': no objects younger than OLD1 after this point.
+** The list g->tobefnz links all objects being finalized.
+
 */
 
-/*
-** Moreover, there is another set of lists that control gray objects.
-** These lists are linked by fields 'gclist'. (All objects that
-** can become gray have such a field. The field is not the same
-** in all objects, but it always has this name.)  Any gray object
-** must belong to one of these lists, and all objects in these lists
-** must be gray (with two exceptions explained below):
-**
-** 'gray': regular gray objects, still waiting to be visited.
-** 'grayagain': objects that must be revisited at the atomic phase.
-**   That includes
-**   - black objects got in a write barrier;
-**   - all kinds of weak tables during propagation phase;
-**   - all threads.
-** 'weak': tables with weak values to be cleared;
-** 'ephemeron': ephemeron tables with white->white entries;
-** 'allweak': tables with weak keys and/or weak values to be cleared.
-**
-** The exceptions to that "gray rule" are:
-** - TOUCHED2 objects in generational mode stay in a gray list (because
-** they must be visited again at the end of the cycle), but they are
-** marked black because assignments to them must activate barriers (to
-** move them back to TOUCHED1).
-** - Open upvales are kept gray to avoid barriers, but they stay out
-** of gray lists. (They don't even have a 'gclist' field.)
-*/
-
-
-
-/*
-** About 'nCcalls':  This count has two parts: the lower 16 bits counts
-** the number of recursive invocations in the C stack; the higher
-** 16 bits counts the number of non-yieldable calls in the stack.
-** (They are together so that we can change and save both with one
-** instruction.)
-*/
-
-
-/* true if this thread does not have non-yieldable calls in the stack */
-#define yieldable(L)		(((L)->nCcalls & 0xffff0000) == 0)
-
-/* real number of C calls */
-#define getCcalls(L)	((L)->nCcalls & 0xffff)
-
-
-/* Increment the number of non-yieldable calls */
-#define incnny(L)	((L)->nCcalls += 0x10000)
-
-/* Decrement the number of non-yieldable calls */
-#define decnny(L)	((L)->nCcalls -= 0x10000)
-
-/* Non-yieldable call increment */
-#define nyci	(0x10000 | 1)
-
-
-
 
 struct lua_longjmp;  /* defined in ldo.c */
 
 
-/*
-** Atomic type (relative to signals) to better ensure that 'lua_sethook'
-** is thread safe
-*/
-#if !defined(l_signalT)
-#include <signal.h>
-#define l_signalT	sig_atomic_t
-#endif
 
-
-/*
-** Extra stack space to handle TM calls and some other extras. This
-** space is not included in 'stack_last'. It is used only to avoid stack
-** checks, either because the element will be promptly popped or because
-** there will be a stack check soon after the push. Function frames
-** never use this extra space, so it does not need to be kept clean.
-*/
+/* extra stack space to handle TM calls and some other extras */
 #define EXTRA_STACK   5
 
 
 #define BASIC_STACK_SIZE        (2*LUA_MINSTACK)
 
-#define stacksize(th)	cast_int((th)->stack_last.p - (th)->stack.p)
-
 
 /* kinds of Garbage Collection */
-#define KGC_INC		0	/* incremental gc */
-#define KGC_GEN		1	/* generational gc */
+#define KGC_NORMAL	0
+#define KGC_EMERGENCY	1	/* gc was forced by an allocation failure */
+#define KGC_GEN		2	/* generational collection */
 
 
 typedef struct stringtable {
-  TString **hash;
-  int nuse;  /* number of elements */
+  GCObject **hash;
+  lu_int32 nuse;  /* number of elements */
   int size;
 } stringtable;
 
 
 /*
-** Information about a call.
-** About union 'u':
-** - field 'l' is used only for Lua functions;
-** - field 'c' is used only for C functions.
-** About union 'u2':
-** - field 'funcidx' is used only by C functions while doing a
-** protected call;
-** - field 'nyield' is used only while a function is "doing" an
-** yield (from the yield until the next resume);
-** - field 'nres' is used only while closing tbc variables when
-** returning from a function;
-** - field 'transferinfo' is used only during call/returnhooks,
-** before the function starts or after it ends.
+** information about a call
 */
-struct CallInfo {
-  StkIdRel func;  /* function index in the stack */
-  StkIdRel	top;  /* top for this function */
+typedef struct CallInfo {
+  StkId func;  /* function index in the stack */
+  StkId	top;  /* top for this function */
   struct CallInfo *previous, *next;  /* dynamic call link */
+  short nresults;  /* expected number of results from this function */
+  lu_byte callstatus;
+  ptrdiff_t extra;
   union {
     struct {  /* only for Lua functions */
+      StkId base;  /* base for this function */
       const Instruction *savedpc;
-      volatile l_signalT trap;
-      int nextraargs;  /* # of extra arguments in vararg functions */
     } l;
     struct {  /* only for C functions */
-      lua_KFunction k;  /* continuation in case of yields */
+      int ctx;  /* context info. in case of yields */
+      lua_CFunction k;  /* continuation in case of yields */
       ptrdiff_t old_errfunc;
-      lua_KContext ctx;  /* context info. in case of yields */
+      lu_byte old_allowhook;
+      lu_byte status;
     } c;
   } u;
-  union {
-    int funcidx;  /* called-function index */
-    int nyield;  /* number of values yielded */
-    int nres;  /* number of values returned */
-    struct {  /* info about transferred values (for call/return hooks) */
-      unsigned short ftransfer;  /* offset of first value transferred */
-      unsigned short ntransfer;  /* number of values transferred */
-    } transferinfo;
-  } u2;
-  short nresults;  /* expected number of results from this function */
-  unsigned short callstatus;
-};
+} CallInfo;
 
 
 /*
 ** Bits in CallInfo status
 */
-#define CIST_OAH	(1<<0)	/* original value of 'allowhook' */
-#define CIST_C		(1<<1)	/* call is running a C function */
-#define CIST_FRESH	(1<<2)	/* call is on a fresh "luaV_execute" frame */
-#define CIST_HOOKED	(1<<3)	/* call is running a debug hook */
-#define CIST_YPCALL	(1<<4)	/* doing a yieldable protected call */
-#define CIST_TAIL	(1<<5)	/* call was tail called */
-#define CIST_HOOKYIELD	(1<<6)	/* last hook called yielded */
-#define CIST_FIN	(1<<7)	/* function "called" a finalizer */
-#define CIST_TRAN	(1<<8)	/* 'ci' has transfer information */
-#define CIST_CLSRET	(1<<9)  /* function is closing tbc variables */
-/* Bits 10-12 are used for CIST_RECST (see below) */
-#define CIST_RECST	10
-#if defined(LUA_COMPAT_LT_LE)
-#define CIST_LEQ	(1<<13)  /* using __lt for __le */
-#endif
+#define CIST_LUA	(1<<0)	/* call is running a Lua function */
+#define CIST_HOOKED	(1<<1)	/* call is running a debug hook */
+#define CIST_REENTRY	(1<<2)	/* call is running on same invocation of
+                                   luaV_execute of previous call */
+#define CIST_YIELDED	(1<<3)	/* call reentered after suspension */
+#define CIST_YPCALL	(1<<4)	/* call is a yieldable protected call */
+#define CIST_STAT	(1<<5)	/* call has an error status (pcall) */
+#define CIST_TAIL	(1<<6)	/* call was tail called */
+#define CIST_HOOKYIELD	(1<<7)	/* last hook called yielded */
+
+
+#define isLua(ci)	((ci)->callstatus & CIST_LUA)
 
 
 /*
-** Field CIST_RECST stores the "recover status", used to keep the error
-** status while closing to-be-closed variables in coroutines, so that
-** Lua can correctly resume after an yield from a __close method called
-** because of an error.  (Three bits are enough for error status.)
-*/
-#define getcistrecst(ci)     (((ci)->callstatus >> CIST_RECST) & 7)
-#define setcistrecst(ci,st)  \
-  check_exp(((st) & 7) == (st),   /* status must fit in three bits */  \
-            ((ci)->callstatus = ((ci)->callstatus & ~(7 << CIST_RECST))  \
-                                                  | ((st) << CIST_RECST)))
-
-
-/* active function is a Lua function */
-#define isLua(ci)	(!((ci)->callstatus & CIST_C))
-
-/* call is running Lua code (not a hook) */
-#define isLuacode(ci)	(!((ci)->callstatus & (CIST_C | CIST_HOOKED)))
-
-/* assume that CIST_OAH has offset 0 and that 'v' is strictly 0/1 */
-#define setoah(st,v)	((st) = ((st) & ~CIST_OAH) | (v))
-#define getoah(st)	((st) & CIST_OAH)
-
-
-/*
-** 'global state', shared by all threads of this state
+** `global state', shared by all threads of this state
 */
 typedef struct global_State {
   lua_Alloc frealloc;  /* function to reallocate memory */
-  void *ud;         /* auxiliary data to 'frealloc' */
-  l_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
+  void *ud;         /* auxiliary data to `frealloc' */
+  lu_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
   l_mem GCdebt;  /* bytes allocated not yet compensated by the collector */
+  lu_mem GCmemtrav;  /* memory traversed by the GC */
   lu_mem GCestimate;  /* an estimate of the non-garbage memory in use */
-  lu_mem lastatomic;  /* see function 'genstep' in file 'lgc.c' */
   stringtable strt;  /* hash table for strings */
   TValue l_registry;
-  TValue nilvalue;  /* a nil value */
   unsigned int seed;  /* randomized seed for hashes */
   lu_byte currentwhite;
   lu_byte gcstate;  /* state of garbage collector */
   lu_byte gckind;  /* kind of GC running */
-  lu_byte gcstopem;  /* stops emergency collections */
-  lu_byte genminormul;  /* control for minor generational collections */
-  lu_byte genmajormul;  /* control for major generational collections */
-  lu_byte gcstp;  /* control whether GC is running */
-  lu_byte gcemergency;  /* true if this is an emergency collection */
-  lu_byte gcpause;  /* size of pause between successive GCs */
-  lu_byte gcstepmul;  /* GC "speed" */
-  lu_byte gcstepsize;  /* (log2 of) GC granularity */
+  lu_byte gcrunning;  /* true if GC is running */
+  int sweepstrgc;  /* position of sweep in `strt' */
   GCObject *allgc;  /* list of all collectable objects */
-  GCObject **sweepgc;  /* current position of sweep in list */
   GCObject *finobj;  /* list of collectable objects with finalizers */
+  GCObject **sweepgc;  /* current position of sweep in list 'allgc' */
+  GCObject **sweepfin;  /* current position of sweep in list 'finobj' */
   GCObject *gray;  /* list of gray objects */
   GCObject *grayagain;  /* list of objects to be traversed atomically */
   GCObject *weak;  /* list of tables with weak values */
   GCObject *ephemeron;  /* list of ephemeron tables (weak keys) */
   GCObject *allweak;  /* list of all-weak tables */
   GCObject *tobefnz;  /* list of userdata to be GC */
-  GCObject *fixedgc;  /* list of objects not to be collected */
-  /* fields for generational collector */
-  GCObject *survival;  /* start of objects that survived one GC cycle */
-  GCObject *old1;  /* start of old1 objects */
-  GCObject *reallyold;  /* objects more than one cycle old ("really old") */
-  GCObject *firstold1;  /* first OLD1 object in the list (if any) */
-  GCObject *finobjsur;  /* list of survival objects with finalizers */
-  GCObject *finobjold1;  /* list of old1 objects with finalizers */
-  GCObject *finobjrold;  /* list of really old objects with finalizers */
-  struct lua_State *twups;  /* list of threads with open upvalues */
+  UpVal uvhead;  /* head of double-linked list of all open upvalues */
+  Mbuffer buff;  /* temporary buffer for string concatenation */
+  int gcpause;  /* size of pause between successive GCs */
+  int gcmajorinc;  /* pause between major collections (only in gen. mode) */
+  int gcstepmul;  /* GC `granularity' */
   lua_CFunction panic;  /* to be called in unprotected errors */
   struct lua_State *mainthread;
-  TString *memerrmsg;  /* message for memory-allocation errors */
+  const lua_Number *version;  /* pointer to version number */
+  TString *memerrmsg;  /* memory-error message */
   TString *tmname[TM_N];  /* array with tag-method names */
-  struct Table *mt[LUA_NUMTYPES];  /* metatables for basic types */
-  TString *strcache[STRCACHE_N][STRCACHE_M];  /* cache for strings in API */
-  lua_WarnFunction warnf;  /* warning function */
-  void *ud_warn;         /* auxiliary data to 'warnf' */
+  struct Table *mt[LUA_NUMTAGS];  /* metatables for basic types */
 } global_State;
 
 
 /*
-** 'per thread' state
+** `per thread' state
 */
 struct lua_State {
   CommonHeader;
   lu_byte status;
-  lu_byte allowhook;
-  unsigned short nci;  /* number of items in 'ci' list */
-  StkIdRel top;  /* first free slot in the stack */
+  StkId top;  /* first free slot in the stack */
   global_State *l_G;
   CallInfo *ci;  /* call info for current function */
-  StkIdRel stack_last;  /* end of stack (last element + 1) */
-  StkIdRel stack;  /* stack base */
-  UpVal *openupval;  /* list of open upvalues in this stack */
-  StkIdRel tbclist;  /* list of to-be-closed variables */
-  GCObject *gclist;
-  struct lua_State *twups;  /* list of threads with open upvalues */
-  struct lua_longjmp *errorJmp;  /* current error recover point */
-  CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
-  volatile lua_Hook hook;
-  ptrdiff_t errfunc;  /* current error handling function (stack index) */
-  l_uint32 nCcalls;  /* number of nested (non-yieldable | C)  calls */
-  int oldpc;  /* last pc traced */
+  const Instruction *oldpc;  /* last pc traced */
+  StkId stack_last;  /* last free slot in the stack */
+  StkId stack;  /* stack base */
+  int stacksize;
+  unsigned short nny;  /* number of non-yieldable calls in stack */
+  unsigned short nCcalls;  /* number of nested C calls */
+  lu_byte hookmask;
+  lu_byte allowhook;
   int basehookcount;
   int hookcount;
-  volatile l_signalT hookmask;
+  lua_Hook hook;
+  GCObject *openupval;  /* list of open upvalues in this stack */
+  GCObject *gclist;
+  struct lua_longjmp *errorJmp;  /* current error recover point */
+  ptrdiff_t errfunc;  /* current error handling function (stack index) */
+  CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
 };
 
 
 #define G(L)	(L->l_G)
 
-/*
-** 'g->nilvalue' being a nil value flags that the state was completely
-** build.
-*/
-#define completestate(g)	ttisnil(&g->nilvalue)
-
 
 /*
-** Union of all collectable objects (only for conversions)
-** ISO C99, 6.5.2.3 p.5:
-** "if a union contains several structures that share a common initial
-** sequence [...], and if the union object currently contains one
-** of these structures, it is permitted to inspect the common initial
-** part of any of them anywhere that a declaration of the complete type
-** of the union is visible."
+** Union of all collectable objects
 */
-union GCUnion {
-  GCObject gc;  /* common header */
-  struct TString ts;
-  struct Udata u;
+union GCObject {
+  GCheader gch;  /* common header */
+  union TString ts;
+  union Udata u;
   union Closure cl;
   struct Table h;
   struct Proto p;
+  struct UpVal uv;
   struct lua_State th;  /* thread */
-  struct UpVal upv;
 };
 
 
-/*
-** ISO C99, 6.7.2.1 p.14:
-** "A pointer to a union object, suitably converted, points to each of
-** its members [...], and vice versa."
-*/
-#define cast_u(o)	cast(union GCUnion *, (o))
+#define gch(o)		(&(o)->gch)
 
 /* macros to convert a GCObject into a specific value */
-#define gco2ts(o)  \
-	check_exp(novariant((o)->tt) == LUA_TSTRING, &((cast_u(o))->ts))
-#define gco2u(o)  check_exp((o)->tt == LUA_VUSERDATA, &((cast_u(o))->u))
-#define gco2lcl(o)  check_exp((o)->tt == LUA_VLCL, &((cast_u(o))->cl.l))
-#define gco2ccl(o)  check_exp((o)->tt == LUA_VCCL, &((cast_u(o))->cl.c))
+#define rawgco2ts(o)  \
+	check_exp(novariant((o)->gch.tt) == LUA_TSTRING, &((o)->ts))
+#define gco2ts(o)	(&rawgco2ts(o)->tsv)
+#define rawgco2u(o)	check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u))
+#define gco2u(o)	(&rawgco2u(o)->uv)
+#define gco2lcl(o)	check_exp((o)->gch.tt == LUA_TLCL, &((o)->cl.l))
+#define gco2ccl(o)	check_exp((o)->gch.tt == LUA_TCCL, &((o)->cl.c))
 #define gco2cl(o)  \
-	check_exp(novariant((o)->tt) == LUA_TFUNCTION, &((cast_u(o))->cl))
-#define gco2t(o)  check_exp((o)->tt == LUA_VTABLE, &((cast_u(o))->h))
-#define gco2p(o)  check_exp((o)->tt == LUA_VPROTO, &((cast_u(o))->p))
-#define gco2th(o)  check_exp((o)->tt == LUA_VTHREAD, &((cast_u(o))->th))
-#define gco2upv(o)	check_exp((o)->tt == LUA_VUPVAL, &((cast_u(o))->upv))
+	check_exp(novariant((o)->gch.tt) == LUA_TFUNCTION, &((o)->cl))
+#define gco2t(o)	check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h))
+#define gco2p(o)	check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p))
+#define gco2uv(o)	check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv))
+#define gco2th(o)	check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th))
 
-
-/*
-** macro to convert a Lua object into a GCObject
-** (The access to 'tt' tries to ensure that 'v' is actually a Lua object.)
-*/
-#define obj2gco(v)	check_exp((v)->tt >= LUA_TSTRING, &(cast_u(v)->gc))
+/* macro to convert any Lua object into a GCObject */
+#define obj2gco(v)	(cast(GCObject *, (v)))
 
 
 /* actual number of total bytes allocated */
-#define gettotalbytes(g)	cast(lu_mem, (g)->totalbytes + (g)->GCdebt)
+#define gettotalbytes(g)	((g)->totalbytes + (g)->GCdebt)
 
 LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt);
 LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
 LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L);
 LUAI_FUNC void luaE_freeCI (lua_State *L);
-LUAI_FUNC void luaE_shrinkCI (lua_State *L);
-LUAI_FUNC void luaE_checkcstack (lua_State *L);
-LUAI_FUNC void luaE_incCstack (lua_State *L);
-LUAI_FUNC void luaE_warning (lua_State *L, const char *msg, int tocont);
-LUAI_FUNC void luaE_warnerror (lua_State *L, const char *where);
-LUAI_FUNC int luaE_resetthread (lua_State *L, int status);
 
 
 #endif

lstring.c

@@ -1,21 +1,17 @@
 /*
-** $Id: lstring.c $
+** $Id: lstring.c,v 2.26 2013/01/08 13:50:10 roberto Exp $
 ** String table (keeps all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
 
-#define lstring_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
 
 #include <string.h>
 
+#define lstring_c
+#define LUA_CORE
+
 #include "lua.h"
 
-#include "ldebug.h"
-#include "ldo.h"
 #include "lmem.h"
 #include "lobject.h"
 #include "lstate.h"
@@ -23,195 +19,134 @@
 
 
 /*
-** Maximum size for string table.
+** Lua will use at most ~(2^LUAI_HASHLIMIT) bytes from a string to
+** compute its hash
 */
-#define MAXSTRTB	cast_int(luaM_limitN(MAX_INT, TString*))
+#if !defined(LUAI_HASHLIMIT)
+#define LUAI_HASHLIMIT		5
+#endif
 
 
 /*
 ** equality for long strings
 */
 int luaS_eqlngstr (TString *a, TString *b) {
-  size_t len = a->u.lnglen;
-  lua_assert(a->tt == LUA_VLNGSTR && b->tt == LUA_VLNGSTR);
+  size_t len = a->tsv.len;
+  lua_assert(a->tsv.tt == LUA_TLNGSTR && b->tsv.tt == LUA_TLNGSTR);
   return (a == b) ||  /* same instance or... */
-    ((len == b->u.lnglen) &&  /* equal length and ... */
+    ((len == b->tsv.len) &&  /* equal length and ... */
      (memcmp(getstr(a), getstr(b), len) == 0));  /* equal contents */
 }
 
 
+/*
+** equality for strings
+*/
+int luaS_eqstr (TString *a, TString *b) {
+  return (a->tsv.tt == b->tsv.tt) &&
+         (a->tsv.tt == LUA_TSHRSTR ? eqshrstr(a, b) : luaS_eqlngstr(a, b));
+}
+
+
 unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
-  unsigned int h = seed ^ cast_uint(l);
-  for (; l > 0; l--)
-    h ^= ((h<<5) + (h>>2) + cast_byte(str[l - 1]));
+  unsigned int h = seed ^ cast(unsigned int, l);
+  size_t l1;
+  size_t step = (l >> LUAI_HASHLIMIT) + 1;
+  for (l1 = l; l1 >= step; l1 -= step)
+    h = h ^ ((h<<5) + (h>>2) + cast_byte(str[l1 - 1]));
   return h;
 }
 
 
-unsigned int luaS_hashlongstr (TString *ts) {
-  lua_assert(ts->tt == LUA_VLNGSTR);
-  if (ts->extra == 0) {  /* no hash? */
-    size_t len = ts->u.lnglen;
-    ts->hash = luaS_hash(getstr(ts), len, ts->hash);
-    ts->extra = 1;  /* now it has its hash */
-  }
-  return ts->hash;
-}
-
-
-static void tablerehash (TString **vect, int osize, int nsize) {
+/*
+** resizes the string table
+*/
+void luaS_resize (lua_State *L, int newsize) {
   int i;
-  for (i = osize; i < nsize; i++)  /* clear new elements */
-    vect[i] = NULL;
-  for (i = 0; i < osize; i++) {  /* rehash old part of the array */
-    TString *p = vect[i];
-    vect[i] = NULL;
-    while (p) {  /* for each string in the list */
-      TString *hnext = p->u.hnext;  /* save next */
-      unsigned int h = lmod(p->hash, nsize);  /* new position */
-      p->u.hnext = vect[h];  /* chain it into array */
-      vect[h] = p;
-      p = hnext;
+  stringtable *tb = &G(L)->strt;
+  /* cannot resize while GC is traversing strings */
+  luaC_runtilstate(L, ~bitmask(GCSsweepstring));
+  if (newsize > tb->size) {
+    luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
+    for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL;
+  }
+  /* rehash */
+  for (i=0; i<tb->size; i++) {
+    GCObject *p = tb->hash[i];
+    tb->hash[i] = NULL;
+    while (p) {  /* for each node in the list */
+      GCObject *next = gch(p)->next;  /* save next */
+      unsigned int h = lmod(gco2ts(p)->hash, newsize);  /* new position */
+      gch(p)->next = tb->hash[h];  /* chain it */
+      tb->hash[h] = p;
+      resetoldbit(p);  /* see MOVE OLD rule */
+      p = next;
     }
   }
-}
-
-
-/*
-** Resize the string table. If allocation fails, keep the current size.
-** (This can degrade performance, but any non-zero size should work
-** correctly.)
-*/
-void luaS_resize (lua_State *L, int nsize) {
-  stringtable *tb = &G(L)->strt;
-  int osize = tb->size;
-  TString **newvect;
-  if (nsize < osize)  /* shrinking table? */
-    tablerehash(tb->hash, osize, nsize);  /* depopulate shrinking part */
-  newvect = luaM_reallocvector(L, tb->hash, osize, nsize, TString*);
-  if (l_unlikely(newvect == NULL)) {  /* reallocation failed? */
-    if (nsize < osize)  /* was it shrinking table? */
-      tablerehash(tb->hash, nsize, osize);  /* restore to original size */
-    /* leave table as it was */
-  }
-  else {  /* allocation succeeded */
-    tb->hash = newvect;
-    tb->size = nsize;
-    if (nsize > osize)
-      tablerehash(newvect, osize, nsize);  /* rehash for new size */
+  if (newsize < tb->size) {
+    /* shrinking slice must be empty */
+    lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL);
+    luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
   }
+  tb->size = newsize;
 }
 
 
-/*
-** Clear API string cache. (Entries cannot be empty, so fill them with
-** a non-collectable string.)
-*/
-void luaS_clearcache (global_State *g) {
-  int i, j;
-  for (i = 0; i < STRCACHE_N; i++)
-    for (j = 0; j < STRCACHE_M; j++) {
-      if (iswhite(g->strcache[i][j]))  /* will entry be collected? */
-        g->strcache[i][j] = g->memerrmsg;  /* replace it with something fixed */
-    }
-}
-
-
-/*
-** Initialize the string table and the string cache
-*/
-void luaS_init (lua_State *L) {
-  global_State *g = G(L);
-  int i, j;
-  stringtable *tb = &G(L)->strt;
-  tb->hash = luaM_newvector(L, MINSTRTABSIZE, TString*);
-  tablerehash(tb->hash, 0, MINSTRTABSIZE);  /* clear array */
-  tb->size = MINSTRTABSIZE;
-  /* pre-create memory-error message */
-  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
-  luaC_fix(L, obj2gco(g->memerrmsg));  /* it should never be collected */
-  for (i = 0; i < STRCACHE_N; i++)  /* fill cache with valid strings */
-    for (j = 0; j < STRCACHE_M; j++)
-      g->strcache[i][j] = g->memerrmsg;
-}
-
-
-
 /*
 ** creates a new string object
 */
-static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
+static TString *createstrobj (lua_State *L, const char *str, size_t l,
+                              int tag, unsigned int h, GCObject **list) {
   TString *ts;
-  GCObject *o;
   size_t totalsize;  /* total size of TString object */
-  totalsize = sizelstring(l);
-  o = luaC_newobj(L, tag, totalsize);
-  ts = gco2ts(o);
-  ts->hash = h;
-  ts->extra = 0;
-  getstr(ts)[l] = '\0';  /* ending 0 */
+  totalsize = sizeof(TString) + ((l + 1) * sizeof(char));
+  ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts;
+  ts->tsv.len = l;
+  ts->tsv.hash = h;
+  ts->tsv.extra = 0;
+  memcpy(ts+1, str, l*sizeof(char));
+  ((char *)(ts+1))[l] = '\0';  /* ending 0 */
   return ts;
 }
 
 
-TString *luaS_createlngstrobj (lua_State *L, size_t l) {
-  TString *ts = createstrobj(L, l, LUA_VLNGSTR, G(L)->seed);
-  ts->u.lnglen = l;
-  return ts;
-}
-
-
-void luaS_remove (lua_State *L, TString *ts) {
-  stringtable *tb = &G(L)->strt;
-  TString **p = &tb->hash[lmod(ts->hash, tb->size)];
-  while (*p != ts)  /* find previous element */
-    p = &(*p)->u.hnext;
-  *p = (*p)->u.hnext;  /* remove element from its list */
-  tb->nuse--;
-}
-
-
-static void growstrtab (lua_State *L, stringtable *tb) {
-  if (l_unlikely(tb->nuse == MAX_INT)) {  /* too many strings? */
-    luaC_fullgc(L, 1);  /* try to free some... */
-    if (tb->nuse == MAX_INT)  /* still too many? */
-      luaM_error(L);  /* cannot even create a message... */
-  }
-  if (tb->size <= MAXSTRTB / 2)  /* can grow string table? */
-    luaS_resize(L, tb->size * 2);
-}
-
-
 /*
-** Checks whether short string exists and reuses it or creates a new one.
+** creates a new short string, inserting it into string table
+*/
+static TString *newshrstr (lua_State *L, const char *str, size_t l,
+                                       unsigned int h) {
+  GCObject **list;  /* (pointer to) list where it will be inserted */
+  stringtable *tb = &G(L)->strt;
+  TString *s;
+  if (tb->nuse >= cast(lu_int32, tb->size) && tb->size <= MAX_INT/2)
+    luaS_resize(L, tb->size*2);  /* too crowded */
+  list = &tb->hash[lmod(h, tb->size)];
+  s = createstrobj(L, str, l, LUA_TSHRSTR, h, list);
+  tb->nuse++;
+  return s;
+}
+
+
+/*
+** checks whether short string exists and reuses it or creates a new one
 */
 static TString *internshrstr (lua_State *L, const char *str, size_t l) {
-  TString *ts;
+  GCObject *o;
   global_State *g = G(L);
-  stringtable *tb = &g->strt;
   unsigned int h = luaS_hash(str, l, g->seed);
-  TString **list = &tb->hash[lmod(h, tb->size)];
-  lua_assert(str != NULL);  /* otherwise 'memcmp'/'memcpy' are undefined */
-  for (ts = *list; ts != NULL; ts = ts->u.hnext) {
-    if (l == ts->shrlen && (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
-      /* found! */
-      if (isdead(g, ts))  /* dead (but not collected yet)? */
-        changewhite(ts);  /* resurrect it */
+  for (o = g->strt.hash[lmod(h, g->strt.size)];
+       o != NULL;
+       o = gch(o)->next) {
+    TString *ts = rawgco2ts(o);
+    if (h == ts->tsv.hash &&
+        l == ts->tsv.len &&
+        (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
+      if (isdead(G(L), o))  /* string is dead (but was not collected yet)? */
+        changewhite(o);  /* resurrect it */
       return ts;
     }
   }
-  /* else must create a new string */
-  if (tb->nuse >= tb->size) {  /* need to grow string table? */
-    growstrtab(L, tb);
-    list = &tb->hash[lmod(h, tb->size)];  /* rehash with new size */
-  }
-  ts = createstrobj(L, l, LUA_VSHRSTR, h);
-  memcpy(getstr(ts), str, l * sizeof(char));
-  ts->shrlen = cast_byte(l);
-  ts->u.hnext = *list;
-  *list = ts;
-  tb->nuse++;
-  return ts;
+  return newshrstr(L, str, l, h);  /* not found; create a new string */
 }
 
 
@@ -222,52 +157,29 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
   if (l <= LUAI_MAXSHORTLEN)  /* short string? */
     return internshrstr(L, str, l);
   else {
-    TString *ts;
-    if (l_unlikely(l >= (MAX_SIZE - sizeof(TString))/sizeof(char)))
+    if (l + 1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
       luaM_toobig(L);
-    ts = luaS_createlngstrobj(L, l);
-    memcpy(getstr(ts), str, l * sizeof(char));
-    return ts;
+    return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL);
   }
 }
 
 
 /*
-** Create or reuse a zero-terminated string, first checking in the
-** cache (using the string address as a key). The cache can contain
-** only zero-terminated strings, so it is safe to use 'strcmp' to
-** check hits.
+** new zero-terminated string
 */
 TString *luaS_new (lua_State *L, const char *str) {
-  unsigned int i = point2uint(str) % STRCACHE_N;  /* hash */
-  int j;
-  TString **p = G(L)->strcache[i];
-  for (j = 0; j < STRCACHE_M; j++) {
-    if (strcmp(str, getstr(p[j])) == 0)  /* hit? */
-      return p[j];  /* that is it */
-  }
-  /* normal route */
-  for (j = STRCACHE_M - 1; j > 0; j--)
-    p[j] = p[j - 1];  /* move out last element */
-  /* new element is first in the list */
-  p[0] = luaS_newlstr(L, str, strlen(str));
-  return p[0];
+  return luaS_newlstr(L, str, strlen(str));
 }
 
 
-Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue) {
+Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
   Udata *u;
-  int i;
-  GCObject *o;
-  if (l_unlikely(s > MAX_SIZE - udatamemoffset(nuvalue)))
+  if (s > MAX_SIZET - sizeof(Udata))
     luaM_toobig(L);
-  o = luaC_newobj(L, LUA_VUSERDATA, sizeudata(nuvalue, s));
-  u = gco2u(o);
-  u->len = s;
-  u->nuvalue = nuvalue;
-  u->metatable = NULL;
-  for (i = 0; i < nuvalue; i++)
-    setnilvalue(&u->uv[i].uv);
+  u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u;
+  u->uv.len = s;
+  u->uv.metatable = NULL;
+  u->uv.env = e;
   return u;
 }
 

lstring.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.h $
+** $Id: lstring.h,v 1.49 2012/02/01 21:57:15 roberto Exp $
 ** String table (keep all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -12,46 +12,35 @@
 #include "lstate.h"
 
 
-/*
-** Memory-allocation error message must be preallocated (it cannot
-** be created after memory is exhausted)
-*/
-#define MEMERRMSG       "not enough memory"
+#define sizestring(s)	(sizeof(union TString)+((s)->len+1)*sizeof(char))
 
-
-/*
-** Size of a TString: Size of the header plus space for the string
-** itself (including final '\0').
-*/
-#define sizelstring(l)  (offsetof(TString, contents) + ((l) + 1) * sizeof(char))
+#define sizeudata(u)	(sizeof(union Udata)+(u)->len)
 
 #define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
                                  (sizeof(s)/sizeof(char))-1))
 
+#define luaS_fix(s)	l_setbit((s)->tsv.marked, FIXEDBIT)
+
 
 /*
 ** test whether a string is a reserved word
 */
-#define isreserved(s)	((s)->tt == LUA_VSHRSTR && (s)->extra > 0)
+#define isreserved(s)	((s)->tsv.tt == LUA_TSHRSTR && (s)->tsv.extra > 0)
 
 
 /*
 ** equality for short strings, which are always internalized
 */
-#define eqshrstr(a,b)	check_exp((a)->tt == LUA_VSHRSTR, (a) == (b))
+#define eqshrstr(a,b)	check_exp((a)->tsv.tt == LUA_TSHRSTR, (a) == (b))
 
 
 LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed);
-LUAI_FUNC unsigned int luaS_hashlongstr (TString *ts);
 LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b);
+LUAI_FUNC int luaS_eqstr (TString *a, TString *b);
 LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
-LUAI_FUNC void luaS_clearcache (global_State *g);
-LUAI_FUNC void luaS_init (lua_State *L);
-LUAI_FUNC void luaS_remove (lua_State *L, TString *ts);
-LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, int nuvalue);
+LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
 LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
 LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
-LUAI_FUNC TString *luaS_createlngstrobj (lua_State *L, size_t l);
 
 
 #endif

ltable.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.h $
+** $Id: ltable.h,v 2.16.1.1 2013/04/12 18:48:47 roberto Exp roberto $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
@@ -11,54 +11,34 @@
 
 
 #define gnode(t,i)	(&(t)->node[i])
+#define gkey(n)		(&(n)->i_key.tvk)
 #define gval(n)		(&(n)->i_val)
-#define gnext(n)	((n)->u.next)
+#define gnext(n)	((n)->i_key.nk.next)
+
+#define invalidateTMcache(t)	((t)->flags = 0)
+
+/* returns the key, given the value of a table entry */
+#define keyfromval(v) \
+  (gkey(cast(Node *, cast(char *, (v)) - offsetof(Node, i_val))))
 
 
-/*
-** Clear all bits of fast-access metamethods, which means that the table
-** may have any of these metamethods. (First access that fails after the
-** clearing will set the bit again.)
-*/
-#define invalidateTMcache(t)	((t)->flags &= ~maskflags)
-
-
-/* true when 't' is using 'dummynode' as its hash part */
-#define isdummy(t)		((t)->lastfree == NULL)
-
-
-/* allocated size for hash nodes */
-#define allocsizenode(t)	(isdummy(t) ? 0 : sizenode(t))
-
-
-/* returns the Node, given the value of a table entry */
-#define nodefromval(v)	cast(Node *, (v))
-
-
-LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
-LUAI_FUNC void luaH_setint (lua_State *L, Table *t, lua_Integer key,
-                                                    TValue *value);
-LUAI_FUNC const TValue *luaH_getshortstr (Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_getint (Table *t, int key);
+LUAI_FUNC void luaH_setint (lua_State *L, Table *t, int key, TValue *value);
 LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
 LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
-LUAI_FUNC void luaH_newkey (lua_State *L, Table *t, const TValue *key,
-                                                    TValue *value);
-LUAI_FUNC void luaH_set (lua_State *L, Table *t, const TValue *key,
-                                                 TValue *value);
-LUAI_FUNC void luaH_finishset (lua_State *L, Table *t, const TValue *key,
-                                       const TValue *slot, TValue *value);
+LUAI_FUNC TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key);
+LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key);
 LUAI_FUNC Table *luaH_new (lua_State *L);
-LUAI_FUNC void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
-                                                    unsigned int nhsize);
-LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize);
+LUAI_FUNC void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize);
+LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, int nasize);
 LUAI_FUNC void luaH_free (lua_State *L, Table *t);
 LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key);
-LUAI_FUNC lua_Unsigned luaH_getn (Table *t);
-LUAI_FUNC unsigned int luaH_realasize (const Table *t);
+LUAI_FUNC int luaH_getn (Table *t);
 
 
 #if defined(LUA_DEBUG)
 LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key);
+LUAI_FUNC int luaH_isdummy (Node *n);
 #endif
 
 

ltablib.c

@@ -1,18 +1,15 @@
 /*
-** $Id: ltablib.c $
+** $Id: ltablib.c,v 1.65.1.1 2013/04/12 18:48:47 roberto Exp roberto $
 ** Library for Table Manipulation
 ** See Copyright Notice in lua.h
 */
 
-#define ltablib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
 
 #include <limits.h>
 #include <stddef.h>
-#include <string.h>
+
+#define ltablib_c
+#define LUA_LIB
 
 #include "lua.h"
 
@@ -20,146 +17,88 @@
 #include "lualib.h"
 
 
-/*
-** Operations that an object must define to mimic a table
-** (some functions only need some of them)
-*/
-#define TAB_R	1			/* read */
-#define TAB_W	2			/* write */
-#define TAB_L	4			/* length */
-#define TAB_RW	(TAB_R | TAB_W)		/* read/write */
+#define aux_getn(L,n)	(luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
 
 
-#define aux_getn(L,n,w)	(checktab(L, n, (w) | TAB_L), luaL_len(L, n))
 
-
-static int checkfield (lua_State *L, const char *key, int n) {
-  lua_pushstring(L, key);
-  return (lua_rawget(L, -n) != LUA_TNIL);
-}
-
-
-/*
-** Check that 'arg' either is a table or can behave like one (that is,
-** has a metatable with the required metamethods)
-*/
-static void checktab (lua_State *L, int arg, int what) {
-  if (lua_type(L, arg) != LUA_TTABLE) {  /* is it not a table? */
-    int n = 1;  /* number of elements to pop */
-    if (lua_getmetatable(L, arg) &&  /* must have metatable */
-        (!(what & TAB_R) || checkfield(L, "__index", ++n)) &&
-        (!(what & TAB_W) || checkfield(L, "__newindex", ++n)) &&
-        (!(what & TAB_L) || checkfield(L, "__len", ++n))) {
-      lua_pop(L, n);  /* pop metatable and tested metamethods */
+#if defined(LUA_COMPAT_MAXN)
+static int maxn (lua_State *L) {
+  lua_Number max = 0;
+  luaL_checktype(L, 1, LUA_TTABLE);
+  lua_pushnil(L);  /* first key */
+  while (lua_next(L, 1)) {
+    lua_pop(L, 1);  /* remove value */
+    if (lua_type(L, -1) == LUA_TNUMBER) {
+      lua_Number v = lua_tonumber(L, -1);
+      if (v > max) max = v;
     }
-    else
-      luaL_checktype(L, arg, LUA_TTABLE);  /* force an error */
   }
+  lua_pushnumber(L, max);
+  return 1;
 }
+#endif
 
 
 static int tinsert (lua_State *L) {
-  lua_Integer pos;  /* where to insert new element */
-  lua_Integer e = aux_getn(L, 1, TAB_RW);
-  e = luaL_intop(+, e, 1);  /* first empty element */
+  int e = aux_getn(L, 1) + 1;  /* first empty element */
+  int pos;  /* where to insert new element */
   switch (lua_gettop(L)) {
     case 2: {  /* called with only 2 arguments */
       pos = e;  /* insert new element at the end */
       break;
     }
     case 3: {
-      lua_Integer i;
-      pos = luaL_checkinteger(L, 2);  /* 2nd argument is the position */
-      /* check whether 'pos' is in [1, e] */
-      luaL_argcheck(L, (lua_Unsigned)pos - 1u < (lua_Unsigned)e, 2,
-                       "position out of bounds");
+      int i;
+      pos = luaL_checkint(L, 2);  /* 2nd argument is the position */
+      luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
       for (i = e; i > pos; i--) {  /* move up elements */
-        lua_geti(L, 1, i - 1);
-        lua_seti(L, 1, i);  /* t[i] = t[i - 1] */
+        lua_rawgeti(L, 1, i-1);
+        lua_rawseti(L, 1, i);  /* t[i] = t[i-1] */
       }
       break;
     }
     default: {
-      return luaL_error(L, "wrong number of arguments to 'insert'");
+      return luaL_error(L, "wrong number of arguments to " LUA_QL("insert"));
     }
   }
-  lua_seti(L, 1, pos);  /* t[pos] = v */
+  lua_rawseti(L, 1, pos);  /* t[pos] = v */
   return 0;
 }
 
 
 static int tremove (lua_State *L) {
-  lua_Integer size = aux_getn(L, 1, TAB_RW);
-  lua_Integer pos = luaL_optinteger(L, 2, size);
+  int size = aux_getn(L, 1);
+  int pos = luaL_optint(L, 2, size);
   if (pos != size)  /* validate 'pos' if given */
-    /* check whether 'pos' is in [1, size + 1] */
-    luaL_argcheck(L, (lua_Unsigned)pos - 1u <= (lua_Unsigned)size, 2,
-                     "position out of bounds");
-  lua_geti(L, 1, pos);  /* result = t[pos] */
+    luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
+  lua_rawgeti(L, 1, pos);  /* result = t[pos] */
   for ( ; pos < size; pos++) {
-    lua_geti(L, 1, pos + 1);
-    lua_seti(L, 1, pos);  /* t[pos] = t[pos + 1] */
+    lua_rawgeti(L, 1, pos+1);
+    lua_rawseti(L, 1, pos);  /* t[pos] = t[pos+1] */
   }
   lua_pushnil(L);
-  lua_seti(L, 1, pos);  /* remove entry t[pos] */
+  lua_rawseti(L, 1, pos);  /* t[pos] = nil */
   return 1;
 }
 
 
-/*
-** Copy elements (1[f], ..., 1[e]) into (tt[t], tt[t+1], ...). Whenever
-** possible, copy in increasing order, which is better for rehashing.
-** "possible" means destination after original range, or smaller
-** than origin, or copying to another table.
-*/
-static int tmove (lua_State *L) {
-  lua_Integer f = luaL_checkinteger(L, 2);
-  lua_Integer e = luaL_checkinteger(L, 3);
-  lua_Integer t = luaL_checkinteger(L, 4);
-  int tt = !lua_isnoneornil(L, 5) ? 5 : 1;  /* destination table */
-  checktab(L, 1, TAB_R);
-  checktab(L, tt, TAB_W);
-  if (e >= f) {  /* otherwise, nothing to move */
-    lua_Integer n, i;
-    luaL_argcheck(L, f > 0 || e < LUA_MAXINTEGER + f, 3,
-                  "too many elements to move");
-    n = e - f + 1;  /* number of elements to move */
-    luaL_argcheck(L, t <= LUA_MAXINTEGER - n + 1, 4,
-                  "destination wrap around");
-    if (t > e || t <= f || (tt != 1 && !lua_compare(L, 1, tt, LUA_OPEQ))) {
-      for (i = 0; i < n; i++) {
-        lua_geti(L, 1, f + i);
-        lua_seti(L, tt, t + i);
-      }
-    }
-    else {
-      for (i = n - 1; i >= 0; i--) {
-        lua_geti(L, 1, f + i);
-        lua_seti(L, tt, t + i);
-      }
-    }
-  }
-  lua_pushvalue(L, tt);  /* return destination table */
-  return 1;
-}
-
-
-static void addfield (lua_State *L, luaL_Buffer *b, lua_Integer i) {
-  lua_geti(L, 1, i);
-  if (l_unlikely(!lua_isstring(L, -1)))
-    luaL_error(L, "invalid value (%s) at index %I in table for 'concat'",
-                  luaL_typename(L, -1), (LUAI_UACINT)i);
+static void addfield (lua_State *L, luaL_Buffer *b, int i) {
+  lua_rawgeti(L, 1, i);
+  if (!lua_isstring(L, -1))
+    luaL_error(L, "invalid value (%s) at index %d in table for "
+                  LUA_QL("concat"), luaL_typename(L, -1), i);
   luaL_addvalue(b);
 }
 
 
 static int tconcat (lua_State *L) {
   luaL_Buffer b;
-  lua_Integer last = aux_getn(L, 1, TAB_R);
   size_t lsep;
+  int i, last;
   const char *sep = luaL_optlstring(L, 2, "", &lsep);
-  lua_Integer i = luaL_optinteger(L, 3, 1);
-  last = luaL_optinteger(L, 4, last);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  i = luaL_optint(L, 3, 1);
+  last = luaL_opt(L, luaL_checkint, 4, luaL_len(L, 1));
   luaL_buffinit(L, &b);
   for (; i < last; i++) {
     addfield(L, &b, i);
@@ -178,33 +117,37 @@ static int tconcat (lua_State *L) {
 ** =======================================================
 */
 
-static int tpack (lua_State *L) {
-  int i;
+static int pack (lua_State *L) {
   int n = lua_gettop(L);  /* number of elements to pack */
   lua_createtable(L, n, 1);  /* create result table */
-  lua_insert(L, 1);  /* put it at index 1 */
-  for (i = n; i >= 1; i--)  /* assign elements */
-    lua_seti(L, 1, i);
   lua_pushinteger(L, n);
-  lua_setfield(L, 1, "n");  /* t.n = number of elements */
+  lua_setfield(L, -2, "n");  /* t.n = number of elements */
+  if (n > 0) {  /* at least one element? */
+    int i;
+    lua_pushvalue(L, 1);
+    lua_rawseti(L, -2, 1);  /* insert first element */
+    lua_replace(L, 1);  /* move table into index 1 */
+    for (i = n; i >= 2; i--)  /* assign other elements */
+      lua_rawseti(L, 1, i);
+  }
   return 1;  /* return table */
 }
 
 
-static int tunpack (lua_State *L) {
-  lua_Unsigned n;
-  lua_Integer i = luaL_optinteger(L, 2, 1);
-  lua_Integer e = luaL_opt(L, luaL_checkinteger, 3, luaL_len(L, 1));
+static int unpack (lua_State *L) {
+  int i, e;
+  unsigned int n;
+  luaL_checktype(L, 1, LUA_TTABLE);
+  i = luaL_optint(L, 2, 1);
+  e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1));
   if (i > e) return 0;  /* empty range */
-  n = (lua_Unsigned)e - i;  /* number of elements minus 1 (avoid overflows) */
-  if (l_unlikely(n >= (unsigned int)INT_MAX  ||
-                 !lua_checkstack(L, (int)(++n))))
+  n = (unsigned int)e - (unsigned int)i;  /* number of elements minus 1 */
+  if (n > (INT_MAX - 10) || !lua_checkstack(L, ++n))
     return luaL_error(L, "too many results to unpack");
-  for (; i < e; i++) {  /* push arg[i..e - 1] (to avoid overflows) */
-    lua_geti(L, 1, i);
-  }
-  lua_geti(L, 1, e);  /* push last element */
-  return (int)n;
+  lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
+  while (i++ < e)  /* push arg[i + 1...e] */
+    lua_rawgeti(L, 1, i);
+  return n;
 }
 
 /* }====================================================== */
@@ -214,197 +157,102 @@ static int tunpack (lua_State *L) {
 /*
 ** {======================================================
 ** Quicksort
-** (based on 'Algorithms in MODULA-3', Robert Sedgewick;
+** (based on `Algorithms in MODULA-3', Robert Sedgewick;
 **  Addison-Wesley, 1993.)
 ** =======================================================
 */
 
 
-/* type for array indices */
-typedef unsigned int IdxT;
-
-
-/*
-** Produce a "random" 'unsigned int' to randomize pivot choice. This
-** macro is used only when 'sort' detects a big imbalance in the result
-** of a partition. (If you don't want/need this "randomness", ~0 is a
-** good choice.)
-*/
-#if !defined(l_randomizePivot)		/* { */
-
-#include <time.h>
-
-/* size of 'e' measured in number of 'unsigned int's */
-#define sof(e)		(sizeof(e) / sizeof(unsigned int))
-
-/*
-** Use 'time' and 'clock' as sources of "randomness". Because we don't
-** know the types 'clock_t' and 'time_t', we cannot cast them to
-** anything without risking overflows. A safe way to use their values
-** is to copy them to an array of a known type and use the array values.
-*/
-static unsigned int l_randomizePivot (void) {
-  clock_t c = clock();
-  time_t t = time(NULL);
-  unsigned int buff[sof(c) + sof(t)];
-  unsigned int i, rnd = 0;
-  memcpy(buff, &c, sof(c) * sizeof(unsigned int));
-  memcpy(buff + sof(c), &t, sof(t) * sizeof(unsigned int));
-  for (i = 0; i < sof(buff); i++)
-    rnd += buff[i];
-  return rnd;
+static void set2 (lua_State *L, int i, int j) {
+  lua_rawseti(L, 1, i);
+  lua_rawseti(L, 1, j);
 }
 
-#endif					/* } */
-
-
-/* arrays larger than 'RANLIMIT' may use randomized pivots */
-#define RANLIMIT	100u
-
-
-static void set2 (lua_State *L, IdxT i, IdxT j) {
-  lua_seti(L, 1, i);
-  lua_seti(L, 1, j);
-}
-
-
-/*
-** Return true iff value at stack index 'a' is less than the value at
-** index 'b' (according to the order of the sort).
-*/
 static int sort_comp (lua_State *L, int a, int b) {
-  if (lua_isnil(L, 2))  /* no function? */
-    return lua_compare(L, a, b, LUA_OPLT);  /* a < b */
-  else {  /* function */
+  if (!lua_isnil(L, 2)) {  /* function? */
     int res;
-    lua_pushvalue(L, 2);    /* push function */
+    lua_pushvalue(L, 2);
     lua_pushvalue(L, a-1);  /* -1 to compensate function */
-    lua_pushvalue(L, b-2);  /* -2 to compensate function and 'a' */
-    lua_call(L, 2, 1);      /* call function */
-    res = lua_toboolean(L, -1);  /* get result */
-    lua_pop(L, 1);          /* pop result */
+    lua_pushvalue(L, b-2);  /* -2 to compensate function and `a' */
+    lua_call(L, 2, 1);
+    res = lua_toboolean(L, -1);
+    lua_pop(L, 1);
     return res;
   }
+  else  /* a < b? */
+    return lua_compare(L, a, b, LUA_OPLT);
 }
 
-
-/*
-** Does the partition: Pivot P is at the top of the stack.
-** precondition: a[lo] <= P == a[up-1] <= a[up],
-** so it only needs to do the partition from lo + 1 to up - 2.
-** Pos-condition: a[lo .. i - 1] <= a[i] == P <= a[i + 1 .. up]
-** returns 'i'.
-*/
-static IdxT partition (lua_State *L, IdxT lo, IdxT up) {
-  IdxT i = lo;  /* will be incremented before first use */
-  IdxT j = up - 1;  /* will be decremented before first use */
-  /* loop invariant: a[lo .. i] <= P <= a[j .. up] */
-  for (;;) {
-    /* next loop: repeat ++i while a[i] < P */
-    while ((void)lua_geti(L, 1, ++i), sort_comp(L, -1, -2)) {
-      if (l_unlikely(i == up - 1))  /* a[i] < P  but a[up - 1] == P  ?? */
-        luaL_error(L, "invalid order function for sorting");
-      lua_pop(L, 1);  /* remove a[i] */
-    }
-    /* after the loop, a[i] >= P and a[lo .. i - 1] < P */
-    /* next loop: repeat --j while P < a[j] */
-    while ((void)lua_geti(L, 1, --j), sort_comp(L, -3, -1)) {
-      if (l_unlikely(j < i))  /* j < i  but  a[j] > P ?? */
-        luaL_error(L, "invalid order function for sorting");
-      lua_pop(L, 1);  /* remove a[j] */
-    }
-    /* after the loop, a[j] <= P and a[j + 1 .. up] >= P */
-    if (j < i) {  /* no elements out of place? */
-      /* a[lo .. i - 1] <= P <= a[j + 1 .. i .. up] */
-      lua_pop(L, 1);  /* pop a[j] */
-      /* swap pivot (a[up - 1]) with a[i] to satisfy pos-condition */
-      set2(L, up - 1, i);
-      return i;
-    }
-    /* otherwise, swap a[i] - a[j] to restore invariant and repeat */
-    set2(L, i, j);
-  }
-}
-
-
-/*
-** Choose an element in the middle (2nd-3th quarters) of [lo,up]
-** "randomized" by 'rnd'
-*/
-static IdxT choosePivot (IdxT lo, IdxT up, unsigned int rnd) {
-  IdxT r4 = (up - lo) / 4;  /* range/4 */
-  IdxT p = rnd % (r4 * 2) + (lo + r4);
-  lua_assert(lo + r4 <= p && p <= up - r4);
-  return p;
-}
-
-
-/*
-** Quicksort algorithm (recursive function)
-*/
-static void auxsort (lua_State *L, IdxT lo, IdxT up,
-                                   unsigned int rnd) {
-  while (lo < up) {  /* loop for tail recursion */
-    IdxT p;  /* Pivot index */
-    IdxT n;  /* to be used later */
-    /* sort elements 'lo', 'p', and 'up' */
-    lua_geti(L, 1, lo);
-    lua_geti(L, 1, up);
-    if (sort_comp(L, -1, -2))  /* a[up] < a[lo]? */
-      set2(L, lo, up);  /* swap a[lo] - a[up] */
+static void auxsort (lua_State *L, int l, int u) {
+  while (l < u) {  /* for tail recursion */
+    int i, j;
+    /* sort elements a[l], a[(l+u)/2] and a[u] */
+    lua_rawgeti(L, 1, l);
+    lua_rawgeti(L, 1, u);
+    if (sort_comp(L, -1, -2))  /* a[u] < a[l]? */
+      set2(L, l, u);  /* swap a[l] - a[u] */
     else
-      lua_pop(L, 2);  /* remove both values */
-    if (up - lo == 1)  /* only 2 elements? */
-      return;  /* already sorted */
-    if (up - lo < RANLIMIT || rnd == 0)  /* small interval or no randomize? */
-      p = (lo + up)/2;  /* middle element is a good pivot */
-    else  /* for larger intervals, it is worth a random pivot */
-      p = choosePivot(lo, up, rnd);
-    lua_geti(L, 1, p);
-    lua_geti(L, 1, lo);
-    if (sort_comp(L, -2, -1))  /* a[p] < a[lo]? */
-      set2(L, p, lo);  /* swap a[p] - a[lo] */
+      lua_pop(L, 2);
+    if (u-l == 1) break;  /* only 2 elements */
+    i = (l+u)/2;
+    lua_rawgeti(L, 1, i);
+    lua_rawgeti(L, 1, l);
+    if (sort_comp(L, -2, -1))  /* a[i]<a[l]? */
+      set2(L, i, l);
     else {
-      lua_pop(L, 1);  /* remove a[lo] */
-      lua_geti(L, 1, up);
-      if (sort_comp(L, -1, -2))  /* a[up] < a[p]? */
-        set2(L, p, up);  /* swap a[up] - a[p] */
+      lua_pop(L, 1);  /* remove a[l] */
+      lua_rawgeti(L, 1, u);
+      if (sort_comp(L, -1, -2))  /* a[u]<a[i]? */
+        set2(L, i, u);
       else
         lua_pop(L, 2);
     }
-    if (up - lo == 2)  /* only 3 elements? */
-      return;  /* already sorted */
-    lua_geti(L, 1, p);  /* get middle element (Pivot) */
-    lua_pushvalue(L, -1);  /* push Pivot */
-    lua_geti(L, 1, up - 1);  /* push a[up - 1] */
-    set2(L, p, up - 1);  /* swap Pivot (a[p]) with a[up - 1] */
-    p = partition(L, lo, up);
-    /* a[lo .. p - 1] <= a[p] == P <= a[p + 1 .. up] */
-    if (p - lo < up - p) {  /* lower interval is smaller? */
-      auxsort(L, lo, p - 1, rnd);  /* call recursively for lower interval */
-      n = p - lo;  /* size of smaller interval */
-      lo = p + 1;  /* tail call for [p + 1 .. up] (upper interval) */
+    if (u-l == 2) break;  /* only 3 elements */
+    lua_rawgeti(L, 1, i);  /* Pivot */
+    lua_pushvalue(L, -1);
+    lua_rawgeti(L, 1, u-1);
+    set2(L, i, u-1);
+    /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
+    i = l; j = u-1;
+    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
+      /* repeat ++i until a[i] >= P */
+      while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
+        if (i>=u) luaL_error(L, "invalid order function for sorting");
+        lua_pop(L, 1);  /* remove a[i] */
+      }
+      /* repeat --j until a[j] <= P */
+      while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
+        if (j<=l) luaL_error(L, "invalid order function for sorting");
+        lua_pop(L, 1);  /* remove a[j] */
+      }
+      if (j<i) {
+        lua_pop(L, 3);  /* pop pivot, a[i], a[j] */
+        break;
+      }
+      set2(L, i, j);
+    }
+    lua_rawgeti(L, 1, u-1);
+    lua_rawgeti(L, 1, i);
+    set2(L, u-1, i);  /* swap pivot (a[u-1]) with a[i] */
+    /* a[l..i-1] <= a[i] == P <= a[i+1..u] */
+    /* adjust so that smaller half is in [j..i] and larger one in [l..u] */
+    if (i-l < u-i) {
+      j=l; i=i-1; l=i+2;
     }
     else {
-      auxsort(L, p + 1, up, rnd);  /* call recursively for upper interval */
-      n = up - p;  /* size of smaller interval */
-      up = p - 1;  /* tail call for [lo .. p - 1]  (lower interval) */
+      j=i+1; i=u; u=j-2;
     }
-    if ((up - lo) / 128 > n) /* partition too imbalanced? */
-      rnd = l_randomizePivot();  /* try a new randomization */
-  }  /* tail call auxsort(L, lo, up, rnd) */
+    auxsort(L, j, i);  /* call recursively the smaller one */
+  }  /* repeat the routine for the larger one */
 }
 
-
 static int sort (lua_State *L) {
-  lua_Integer n = aux_getn(L, 1, TAB_RW);
-  if (n > 1) {  /* non-trivial interval? */
-    luaL_argcheck(L, n < INT_MAX, 1, "array too big");
-    if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
-      luaL_checktype(L, 2, LUA_TFUNCTION);  /* must be a function */
-    lua_settop(L, 2);  /* make sure there are two arguments */
-    auxsort(L, 1, (IdxT)n, 0);
-  }
+  int n = aux_getn(L, 1);
+  luaL_checkstack(L, 40, "");  /* assume array is smaller than 2^40 */
+  if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+    luaL_checktype(L, 2, LUA_TFUNCTION);
+  lua_settop(L, 2);  /* make sure there is two arguments */
+  auxsort(L, 1, n);
   return 0;
 }
 
@@ -413,11 +261,13 @@ static int sort (lua_State *L) {
 
 static const luaL_Reg tab_funcs[] = {
   {"concat", tconcat},
+#if defined(LUA_COMPAT_MAXN)
+  {"maxn", maxn},
+#endif
   {"insert", tinsert},
-  {"pack", tpack},
-  {"unpack", tunpack},
+  {"pack", pack},
+  {"unpack", unpack},
   {"remove", tremove},
-  {"move", tmove},
   {"sort", sort},
   {NULL, NULL}
 };
@@ -425,6 +275,11 @@ static const luaL_Reg tab_funcs[] = {
 
 LUAMOD_API int luaopen_table (lua_State *L) {
   luaL_newlib(L, tab_funcs);
+#if defined(LUA_COMPAT_UNPACK)
+  /* _G.unpack = table.unpack */
+  lua_getfield(L, -1, "unpack");
+  lua_setglobal(L, "unpack");
+#endif
   return 1;
 }
 

ltests.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltests.h $
+** $Id: ltests.h,v 2.33 2010/07/28 15:51:59 roberto Exp $
 ** Internal Header for Debugging of the Lua Implementation
 ** See Copyright Notice in lua.h
 */
@@ -8,54 +8,32 @@
 #define ltests_h
 
 
-#include <stdio.h>
 #include <stdlib.h>
 
-/* test Lua with compatibility code */
-#define LUA_COMPAT_MATHLIB
-#define LUA_COMPAT_LT_LE
-
+/* do not use compatibility macros in Lua code */
+#undef LUA_COMPAT_API
 
 #define LUA_DEBUG
 
-
-/* turn on assertions */
-#define LUAI_ASSERT
+#undef NDEBUG
+#include <assert.h>
+#define lua_assert(c)           assert(c)
 
 
 /* to avoid warnings, and to make sure value is really unused */
 #define UNUSED(x)       (x=0, (void)(x))
 
 
-/* test for sizes in 'l_sprintf' (make sure whole buffer is available) */
-#undef l_sprintf
-#if !defined(LUA_USE_C89)
-#define l_sprintf(s,sz,f,i)	(memset(s,0xAB,sz), snprintf(s,sz,f,i))
-#else
-#define l_sprintf(s,sz,f,i)	(memset(s,0xAB,sz), sprintf(s,f,i))
-#endif
-
-
-/* get a chance to test code without jump tables */
-#define LUA_USE_JUMPTABLE	0
-
-
-/* use 32-bit integers in random generator */
-#define LUA_RAND32
-
-
-/* memory-allocator control variables */
+/* memory allocator control variables */
 typedef struct Memcontrol {
-  int failnext;
   unsigned long numblocks;
   unsigned long total;
   unsigned long maxmem;
   unsigned long memlimit;
-  unsigned long countlimit;
-  unsigned long objcount[LUA_NUMTYPES];
+  unsigned long objcount[LUA_NUMTAGS];
 } Memcontrol;
 
-LUA_API Memcontrol l_memcontrol;
+extern Memcontrol l_memcontrol;
 
 
 /*
@@ -64,49 +42,39 @@ LUA_API Memcontrol l_memcontrol;
 extern void *l_Trick;
 
 
+void *debug_realloc (void *ud, void *block, size_t osize, size_t nsize);
 
-/*
-** Function to traverse and check all memory used by Lua
-*/
-LUAI_FUNC int lua_checkmemory (lua_State *L);
 
-/*
-** Function to print an object GC-friendly
-*/
-struct GCObject;
-LUAI_FUNC void lua_printobj (lua_State *L, struct GCObject *o);
+typedef struct CallInfo *pCallInfo;
+
+int lua_checkmemory (lua_State *L);
 
 
 /* test for lock/unlock */
+#undef luai_userstateopen
+#undef luai_userstatethread
+#undef lua_lock
+#undef lua_unlock
 
 struct L_EXTRA { int lock; int *plock; };
-#undef LUA_EXTRASPACE
-#define LUA_EXTRASPACE	sizeof(struct L_EXTRA)
-#define getlock(l)	cast(struct L_EXTRA*, lua_getextraspace(l))
+#define LUAI_EXTRASPACE		sizeof(struct L_EXTRA)
+#define getlock(l)	(cast(struct L_EXTRA *, l) - 1)
 #define luai_userstateopen(l)  \
 	(getlock(l)->lock = 0, getlock(l)->plock = &(getlock(l)->lock))
-#define luai_userstateclose(l)  \
-  lua_assert(getlock(l)->lock == 1 && getlock(l)->plock == &(getlock(l)->lock))
-#define luai_userstatethread(l,l1) \
-  lua_assert(getlock(l1)->plock == getlock(l)->plock)
+#define luai_userstatethread(l,l1)  (getlock(l1)->plock = getlock(l)->plock)
 #define luai_userstatefree(l,l1) \
   lua_assert(getlock(l)->plock == getlock(l1)->plock)
 #define lua_lock(l)     lua_assert((*getlock(l)->plock)++ == 0)
 #define lua_unlock(l)   lua_assert(--(*getlock(l)->plock) == 0)
 
 
+int luaB_opentests (lua_State *L);
 
-LUA_API int luaB_opentests (lua_State *L);
-
-LUA_API void *debug_realloc (void *ud, void *block,
-                             size_t osize, size_t nsize);
 
 #if defined(lua_c)
 #define luaL_newstate()		lua_newstate(debug_realloc, &l_memcontrol)
 #define luaL_openlibs(L)  \
-  { (luaL_openlibs)(L); \
-     luaL_requiref(L, "T", luaB_opentests, 1); \
-     lua_pop(L, 1); }
+  { (luaL_openlibs)(L); luaL_requiref(L, "T", luaB_opentests, 1); }
 #endif
 
 
@@ -116,36 +84,10 @@ LUA_API void *debug_realloc (void *ud, void *block,
 #undef LUAL_BUFFERSIZE
 #define LUAL_BUFFERSIZE		23
 #define MINSTRTABSIZE		2
-#define MAXIWTHABS		3
 
-#define STRCACHE_N	23
-#define STRCACHE_M	5
 
 #undef LUAI_USER_ALIGNMENT_T
-#define LUAI_USER_ALIGNMENT_T   union { char b[sizeof(void*) * 8]; }
-
-
-/*
-** This one is not compatible with tests for opcode optimizations,
-** as it blocks some optimizations
-#define MAXINDEXRK	0
-*/
-
-
-/* make stack-overflow tests run faster */
-#undef LUAI_MAXSTACK
-#define LUAI_MAXSTACK   50000
-
-
-/* test mode uses more stack space */
-#undef LUAI_MAXCCALLS
-#define LUAI_MAXCCALLS	180
-
-
-/* force Lua to use its own implementations */
-#undef lua_strx2number
-#undef lua_number2strx
+#define LUAI_USER_ALIGNMENT_T   union { char b[32]; }
 
 
 #endif
-

ltm.c

@@ -1,37 +1,31 @@
 /*
-** $Id: ltm.c $
+** $Id: ltm.c,v 2.14 2011/06/02 19:31:40 roberto Exp $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
 
-#define ltm_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
 
 #include <string.h>
 
+#define ltm_c
+#define LUA_CORE
+
 #include "lua.h"
 
-#include "ldebug.h"
-#include "ldo.h"
-#include "lgc.h"
 #include "lobject.h"
 #include "lstate.h"
 #include "lstring.h"
 #include "ltable.h"
 #include "ltm.h"
-#include "lvm.h"
 
 
 static const char udatatypename[] = "userdata";
 
-LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTYPES] = {
+LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = {
   "no value",
   "nil", "boolean", udatatypename, "number",
   "string", "table", "function", udatatypename, "thread",
-  "upvalue", "proto" /* these last cases are used for tests only */
+  "proto", "upval"  /* these last two cases are used for tests only */
 };
 
 
@@ -39,16 +33,14 @@ void luaT_init (lua_State *L) {
   static const char *const luaT_eventname[] = {  /* ORDER TM */
     "__index", "__newindex",
     "__gc", "__mode", "__len", "__eq",
-    "__add", "__sub", "__mul", "__mod", "__pow",
-    "__div", "__idiv",
-    "__band", "__bor", "__bxor", "__shl", "__shr",
-    "__unm", "__bnot", "__lt", "__le",
-    "__concat", "__call", "__close"
+    "__add", "__sub", "__mul", "__div", "__mod",
+    "__pow", "__unm", "__lt", "__le",
+    "__concat", "__call"
   };
   int i;
   for (i=0; i<TM_N; i++) {
     G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
-    luaC_fix(L, obj2gco(G(L)->tmname[i]));  /* never collect these names */
+    luaS_fix(G(L)->tmname[i]);  /* never collect these names */
   }
 }
 
@@ -58,9 +50,9 @@ void luaT_init (lua_State *L) {
 ** tag methods
 */
 const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
-  const TValue *tm = luaH_getshortstr(events, ename);
+  const TValue *tm = luaH_getstr(events, ename);
   lua_assert(event <= TM_EQ);
-  if (notm(tm)) {  /* no tag method? */
+  if (ttisnil(tm)) {  /* no tag method? */
     events->flags |= cast_byte(1u<<event);  /* cache this fact */
     return NULL;
   }
@@ -70,7 +62,7 @@ const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
 
 const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
   Table *mt;
-  switch (ttype(o)) {
+  switch (ttypenv(o)) {
     case LUA_TTABLE:
       mt = hvalue(o)->metatable;
       break;
@@ -78,194 +70,8 @@ const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
       mt = uvalue(o)->metatable;
       break;
     default:
-      mt = G(L)->mt[ttype(o)];
+      mt = G(L)->mt[ttypenv(o)];
   }
-  return (mt ? luaH_getshortstr(mt, G(L)->tmname[event]) : &G(L)->nilvalue);
-}
-
-
-/*
-** Return the name of the type of an object. For tables and userdata
-** with metatable, use their '__name' metafield, if present.
-*/
-const char *luaT_objtypename (lua_State *L, const TValue *o) {
-  Table *mt;
-  if ((ttistable(o) && (mt = hvalue(o)->metatable) != NULL) ||
-      (ttisfulluserdata(o) && (mt = uvalue(o)->metatable) != NULL)) {
-    const TValue *name = luaH_getshortstr(mt, luaS_new(L, "__name"));
-    if (ttisstring(name))  /* is '__name' a string? */
-      return getstr(tsvalue(name));  /* use it as type name */
-  }
-  return ttypename(ttype(o));  /* else use standard type name */
-}
-
-
-void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
-                  const TValue *p2, const TValue *p3) {
-  StkId func = L->top.p;
-  setobj2s(L, func, f);  /* push function (assume EXTRA_STACK) */
-  setobj2s(L, func + 1, p1);  /* 1st argument */
-  setobj2s(L, func + 2, p2);  /* 2nd argument */
-  setobj2s(L, func + 3, p3);  /* 3rd argument */
-  L->top.p = func + 4;
-  /* metamethod may yield only when called from Lua code */
-  if (isLuacode(L->ci))
-    luaD_call(L, func, 0);
-  else
-    luaD_callnoyield(L, func, 0);
-}
-
-
-void luaT_callTMres (lua_State *L, const TValue *f, const TValue *p1,
-                     const TValue *p2, StkId res) {
-  ptrdiff_t result = savestack(L, res);
-  StkId func = L->top.p;
-  setobj2s(L, func, f);  /* push function (assume EXTRA_STACK) */
-  setobj2s(L, func + 1, p1);  /* 1st argument */
-  setobj2s(L, func + 2, p2);  /* 2nd argument */
-  L->top.p += 3;
-  /* metamethod may yield only when called from Lua code */
-  if (isLuacode(L->ci))
-    luaD_call(L, func, 1);
-  else
-    luaD_callnoyield(L, func, 1);
-  res = restorestack(L, result);
-  setobjs2s(L, res, --L->top.p);  /* move result to its place */
-}
-
-
-static int callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
-                      StkId res, TMS event) {
-  const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
-  if (notm(tm))
-    tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
-  if (notm(tm)) return 0;
-  luaT_callTMres(L, tm, p1, p2, res);
-  return 1;
-}
-
-
-void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
-                    StkId res, TMS event) {
-  if (l_unlikely(!callbinTM(L, p1, p2, res, event))) {
-    switch (event) {
-      case TM_BAND: case TM_BOR: case TM_BXOR:
-      case TM_SHL: case TM_SHR: case TM_BNOT: {
-        if (ttisnumber(p1) && ttisnumber(p2))
-          luaG_tointerror(L, p1, p2);
-        else
-          luaG_opinterror(L, p1, p2, "perform bitwise operation on");
-      }
-      /* calls never return, but to avoid warnings: *//* FALLTHROUGH */
-      default:
-        luaG_opinterror(L, p1, p2, "perform arithmetic on");
-    }
-  }
-}
-
-
-void luaT_tryconcatTM (lua_State *L) {
-  StkId top = L->top.p;
-  if (l_unlikely(!callbinTM(L, s2v(top - 2), s2v(top - 1), top - 2,
-                               TM_CONCAT)))
-    luaG_concaterror(L, s2v(top - 2), s2v(top - 1));
-}
-
-
-void luaT_trybinassocTM (lua_State *L, const TValue *p1, const TValue *p2,
-                                       int flip, StkId res, TMS event) {
-  if (flip)
-    luaT_trybinTM(L, p2, p1, res, event);
-  else
-    luaT_trybinTM(L, p1, p2, res, event);
-}
-
-
-void luaT_trybiniTM (lua_State *L, const TValue *p1, lua_Integer i2,
-                                   int flip, StkId res, TMS event) {
-  TValue aux;
-  setivalue(&aux, i2);
-  luaT_trybinassocTM(L, p1, &aux, flip, res, event);
-}
-
-
-/*
-** Calls an order tag method.
-** For lessequal, LUA_COMPAT_LT_LE keeps compatibility with old
-** behavior: if there is no '__le', try '__lt', based on l <= r iff
-** !(r < l) (assuming a total order). If the metamethod yields during
-** this substitution, the continuation has to know about it (to negate
-** the result of r<l); bit CIST_LEQ in the call status keeps that
-** information.
-*/
-int luaT_callorderTM (lua_State *L, const TValue *p1, const TValue *p2,
-                      TMS event) {
-  if (callbinTM(L, p1, p2, L->top.p, event))  /* try original event */
-    return !l_isfalse(s2v(L->top.p));
-#if defined(LUA_COMPAT_LT_LE)
-  else if (event == TM_LE) {
-      /* try '!(p2 < p1)' for '(p1 <= p2)' */
-      L->ci->callstatus |= CIST_LEQ;  /* mark it is doing 'lt' for 'le' */
-      if (callbinTM(L, p2, p1, L->top.p, TM_LT)) {
-        L->ci->callstatus ^= CIST_LEQ;  /* clear mark */
-        return l_isfalse(s2v(L->top.p));
-      }
-      /* else error will remove this 'ci'; no need to clear mark */
-  }
-#endif
-  luaG_ordererror(L, p1, p2);  /* no metamethod found */
-  return 0;  /* to avoid warnings */
-}
-
-
-int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
-                       int flip, int isfloat, TMS event) {
-  TValue aux; const TValue *p2;
-  if (isfloat) {
-    setfltvalue(&aux, cast_num(v2));
-  }
-  else
-    setivalue(&aux, v2);
-  if (flip) {  /* arguments were exchanged? */
-    p2 = p1; p1 = &aux;  /* correct them */
-  }
-  else
-    p2 = &aux;
-  return luaT_callorderTM(L, p1, p2, event);
-}
-
-
-void luaT_adjustvarargs (lua_State *L, int nfixparams, CallInfo *ci,
-                         const Proto *p) {
-  int i;
-  int actual = cast_int(L->top.p - ci->func.p) - 1;  /* number of arguments */
-  int nextra = actual - nfixparams;  /* number of extra arguments */
-  ci->u.l.nextraargs = nextra;
-  luaD_checkstack(L, p->maxstacksize + 1);
-  /* copy function to the top of the stack */
-  setobjs2s(L, L->top.p++, ci->func.p);
-  /* move fixed parameters to the top of the stack */
-  for (i = 1; i <= nfixparams; i++) {
-    setobjs2s(L, L->top.p++, ci->func.p + i);
-    setnilvalue(s2v(ci->func.p + i));  /* erase original parameter (for GC) */
-  }
-  ci->func.p += actual + 1;
-  ci->top.p += actual + 1;
-  lua_assert(L->top.p <= ci->top.p && ci->top.p <= L->stack_last.p);
-}
-
-
-void luaT_getvarargs (lua_State *L, CallInfo *ci, StkId where, int wanted) {
-  int i;
-  int nextra = ci->u.l.nextraargs;
-  if (wanted < 0) {
-    wanted = nextra;  /* get all extra arguments available */
-    checkstackGCp(L, nextra, where);  /* ensure stack space */
-    L->top.p = where + nextra;  /* next instruction will need top */
-  }
-  for (i = 0; i < wanted && i < nextra; i++)
-    setobjs2s(L, where + i, ci->func.p - nextra + i);
-  for (; i < wanted; i++)   /* complete required results with nil */
-    setnilvalue(s2v(where + i));
+  return (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
 }
 

ltm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltm.h $
+** $Id: ltm.h,v 2.11 2011/02/28 17:32:10 roberto Exp $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
@@ -9,12 +9,11 @@
 
 
 #include "lobject.h"
-#include "lstate.h"
 
 
 /*
 * WARNING: if you change the order of this enumeration,
-* grep "ORDER TM" and "ORDER OP"
+* grep "ORDER TM"
 */
 typedef enum {
   TM_INDEX,
@@ -22,45 +21,22 @@ typedef enum {
   TM_GC,
   TM_MODE,
   TM_LEN,
-  TM_EQ,  /* last tag method with fast access */
+  TM_EQ,  /* last tag method with `fast' access */
   TM_ADD,
   TM_SUB,
   TM_MUL,
+  TM_DIV,
   TM_MOD,
   TM_POW,
-  TM_DIV,
-  TM_IDIV,
-  TM_BAND,
-  TM_BOR,
-  TM_BXOR,
-  TM_SHL,
-  TM_SHR,
   TM_UNM,
-  TM_BNOT,
   TM_LT,
   TM_LE,
   TM_CONCAT,
   TM_CALL,
-  TM_CLOSE,
   TM_N		/* number of elements in the enum */
 } TMS;
 
 
-/*
-** Mask with 1 in all fast-access methods. A 1 in any of these bits
-** in the flag of a (meta)table means the metatable does not have the
-** corresponding metamethod field. (Bit 7 of the flag is used for
-** 'isrealasize'.)
-*/
-#define maskflags	(~(~0u << (TM_EQ + 1)))
-
-
-/*
-** Test whether there is no tagmethod.
-** (Because tagmethods use raw accesses, the result may be an "empty" nil.)
-*/
-#define notm(tm)	ttisnil(tm)
-
 
 #define gfasttm(g,et,e) ((et) == NULL ? NULL : \
   ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
@@ -68,37 +44,14 @@ typedef enum {
 #define fasttm(l,et,e)	gfasttm(G(l), et, e)
 
 #define ttypename(x)	luaT_typenames_[(x) + 1]
+#define objtypename(x)	ttypename(ttypenv(x))
 
-LUAI_DDEC(const char *const luaT_typenames_[LUA_TOTALTYPES];)
+LUAI_DDEC const char *const luaT_typenames_[LUA_TOTALTAGS];
 
 
-LUAI_FUNC const char *luaT_objtypename (lua_State *L, const TValue *o);
-
 LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
 LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
                                                        TMS event);
 LUAI_FUNC void luaT_init (lua_State *L);
 
-LUAI_FUNC void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
-                            const TValue *p2, const TValue *p3);
-LUAI_FUNC void luaT_callTMres (lua_State *L, const TValue *f,
-                            const TValue *p1, const TValue *p2, StkId p3);
-LUAI_FUNC void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
-                              StkId res, TMS event);
-LUAI_FUNC void luaT_tryconcatTM (lua_State *L);
-LUAI_FUNC void luaT_trybinassocTM (lua_State *L, const TValue *p1,
-       const TValue *p2, int inv, StkId res, TMS event);
-LUAI_FUNC void luaT_trybiniTM (lua_State *L, const TValue *p1, lua_Integer i2,
-                               int inv, StkId res, TMS event);
-LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
-                                const TValue *p2, TMS event);
-LUAI_FUNC int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
-                                 int inv, int isfloat, TMS event);
-
-LUAI_FUNC void luaT_adjustvarargs (lua_State *L, int nfixparams,
-                                   CallInfo *ci, const Proto *p);
-LUAI_FUNC void luaT_getvarargs (lua_State *L, CallInfo *ci,
-                                              StkId where, int wanted);
-
-
 #endif

lua.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h $
+** $Id: lua.h,v 1.285.1.3 2014/05/07 14:15:55 roberto Exp roberto $
 ** Lua - A Scripting Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
@@ -17,31 +17,27 @@
 
 
 #define LUA_VERSION_MAJOR	"5"
-#define LUA_VERSION_MINOR	"4"
-#define LUA_VERSION_RELEASE	"6"
-
-#define LUA_VERSION_NUM			504
-#define LUA_VERSION_RELEASE_NUM		(LUA_VERSION_NUM * 100 + 6)
+#define LUA_VERSION_MINOR	"2"
+#define LUA_VERSION_NUM		502
+#define LUA_VERSION_RELEASE	"4"
 
 #define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
 #define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
-#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2023 Lua.org, PUC-Rio"
+#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2015 Lua.org, PUC-Rio"
 #define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
 
 
 /* mark for precompiled code ('<esc>Lua') */
-#define LUA_SIGNATURE	"\x1bLua"
+#define LUA_SIGNATURE	"\033Lua"
 
 /* option for multiple returns in 'lua_pcall' and 'lua_call' */
 #define LUA_MULTRET	(-1)
 
 
 /*
-** Pseudo-indices
-** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty
-** space after that to help overflow detection)
+** pseudo-indices
 */
-#define LUA_REGISTRYINDEX	(-LUAI_MAXSTACK - 1000)
+#define LUA_REGISTRYINDEX	LUAI_FIRSTPSEUDOIDX
 #define lua_upvalueindex(i)	(LUA_REGISTRYINDEX - (i))
 
 
@@ -51,11 +47,28 @@
 #define LUA_ERRRUN	2
 #define LUA_ERRSYNTAX	3
 #define LUA_ERRMEM	4
-#define LUA_ERRERR	5
+#define LUA_ERRGCMM	5
+#define LUA_ERRERR	6
 
 
 typedef struct lua_State lua_State;
 
+typedef int (*lua_CFunction) (lua_State *L);
+
+
+/*
+** functions that read/write blocks when loading/dumping Lua chunks
+*/
+typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
+
+typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud);
+
+
+/*
+** prototype for memory-allocation functions
+*/
+typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
+
 
 /*
 ** basic types
@@ -72,7 +85,7 @@ typedef struct lua_State lua_State;
 #define LUA_TUSERDATA		7
 #define LUA_TTHREAD		8
 
-#define LUA_NUMTYPES		9
+#define LUA_NUMTAGS		9
 
 
 
@@ -96,51 +109,6 @@ typedef LUA_INTEGER lua_Integer;
 /* unsigned integer type */
 typedef LUA_UNSIGNED lua_Unsigned;
 
-/* type for continuation-function contexts */
-typedef LUA_KCONTEXT lua_KContext;
-
-
-/*
-** Type for C functions registered with Lua
-*/
-typedef int (*lua_CFunction) (lua_State *L);
-
-/*
-** Type for continuation functions
-*/
-typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
-
-
-/*
-** Type for functions that read/write blocks when loading/dumping Lua chunks
-*/
-typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
-
-typedef int (*lua_Writer) (lua_State *L, const void *p, size_t sz, void *ud);
-
-
-/*
-** Type for memory-allocation functions
-*/
-typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
-
-
-/*
-** Type for warning functions
-*/
-typedef void (*lua_WarnFunction) (void *ud, const char *msg, int tocont);
-
-
-/*
-** Type used by the debug API to collect debug information
-*/
-typedef struct lua_Debug lua_Debug;
-
-
-/*
-** Functions to be called by the debugger in specific events
-*/
-typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
 
 
 /*
@@ -163,13 +131,11 @@ extern const char lua_ident[];
 LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
 LUA_API void       (lua_close) (lua_State *L);
 LUA_API lua_State *(lua_newthread) (lua_State *L);
-LUA_API int        (lua_closethread) (lua_State *L, lua_State *from);
-LUA_API int        (lua_resetthread) (lua_State *L);  /* Deprecated! */
 
 LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
 
 
-LUA_API lua_Number (lua_version) (lua_State *L);
+LUA_API const lua_Number *(lua_version) (lua_State *L);
 
 
 /*
@@ -179,9 +145,11 @@ LUA_API int   (lua_absindex) (lua_State *L, int idx);
 LUA_API int   (lua_gettop) (lua_State *L);
 LUA_API void  (lua_settop) (lua_State *L, int idx);
 LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
-LUA_API void  (lua_rotate) (lua_State *L, int idx, int n);
+LUA_API void  (lua_remove) (lua_State *L, int idx);
+LUA_API void  (lua_insert) (lua_State *L, int idx);
+LUA_API void  (lua_replace) (lua_State *L, int idx);
 LUA_API void  (lua_copy) (lua_State *L, int fromidx, int toidx);
-LUA_API int   (lua_checkstack) (lua_State *L, int n);
+LUA_API int   (lua_checkstack) (lua_State *L, int sz);
 
 LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
 
@@ -193,16 +161,16 @@ LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
 LUA_API int             (lua_isnumber) (lua_State *L, int idx);
 LUA_API int             (lua_isstring) (lua_State *L, int idx);
 LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
-LUA_API int             (lua_isinteger) (lua_State *L, int idx);
 LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
 LUA_API int             (lua_type) (lua_State *L, int idx);
 LUA_API const char     *(lua_typename) (lua_State *L, int tp);
 
 LUA_API lua_Number      (lua_tonumberx) (lua_State *L, int idx, int *isnum);
 LUA_API lua_Integer     (lua_tointegerx) (lua_State *L, int idx, int *isnum);
+LUA_API lua_Unsigned    (lua_tounsignedx) (lua_State *L, int idx, int *isnum);
 LUA_API int             (lua_toboolean) (lua_State *L, int idx);
 LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
-LUA_API lua_Unsigned    (lua_rawlen) (lua_State *L, int idx);
+LUA_API size_t          (lua_rawlen) (lua_State *L, int idx);
 LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
 LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
 LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
@@ -213,20 +181,13 @@ LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
 ** Comparison and arithmetic functions
 */
 
-#define LUA_OPADD	0	/* ORDER TM, ORDER OP */
+#define LUA_OPADD	0	/* ORDER TM */
 #define LUA_OPSUB	1
 #define LUA_OPMUL	2
-#define LUA_OPMOD	3
-#define LUA_OPPOW	4
-#define LUA_OPDIV	5
-#define LUA_OPIDIV	6
-#define LUA_OPBAND	7
-#define LUA_OPBOR	8
-#define LUA_OPBXOR	9
-#define LUA_OPSHL	10
-#define LUA_OPSHR	11
-#define LUA_OPUNM	12
-#define LUA_OPBNOT	13
+#define LUA_OPDIV	3
+#define LUA_OPMOD	4
+#define LUA_OPPOW	5
+#define LUA_OPUNM	6
 
 LUA_API void  (lua_arith) (lua_State *L, int op);
 
@@ -244,7 +205,8 @@ LUA_API int   (lua_compare) (lua_State *L, int idx1, int idx2, int op);
 LUA_API void        (lua_pushnil) (lua_State *L);
 LUA_API void        (lua_pushnumber) (lua_State *L, lua_Number n);
 LUA_API void        (lua_pushinteger) (lua_State *L, lua_Integer n);
-LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t len);
+LUA_API void        (lua_pushunsigned) (lua_State *L, lua_Unsigned n);
+LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t l);
 LUA_API const char *(lua_pushstring) (lua_State *L, const char *s);
 LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
                                                       va_list argp);
@@ -258,70 +220,59 @@ LUA_API int   (lua_pushthread) (lua_State *L);
 /*
 ** get functions (Lua -> stack)
 */
-LUA_API int (lua_getglobal) (lua_State *L, const char *name);
-LUA_API int (lua_gettable) (lua_State *L, int idx);
-LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
-LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n);
-LUA_API int (lua_rawget) (lua_State *L, int idx);
-LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
-LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
-
+LUA_API void  (lua_getglobal) (lua_State *L, const char *var);
+LUA_API void  (lua_gettable) (lua_State *L, int idx);
+LUA_API void  (lua_getfield) (lua_State *L, int idx, const char *k);
+LUA_API void  (lua_rawget) (lua_State *L, int idx);
+LUA_API void  (lua_rawgeti) (lua_State *L, int idx, int n);
+LUA_API void  (lua_rawgetp) (lua_State *L, int idx, const void *p);
 LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
-LUA_API void *(lua_newuserdatauv) (lua_State *L, size_t sz, int nuvalue);
+LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
 LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
-LUA_API int  (lua_getiuservalue) (lua_State *L, int idx, int n);
+LUA_API void  (lua_getuservalue) (lua_State *L, int idx);
 
 
 /*
 ** set functions (stack -> Lua)
 */
-LUA_API void  (lua_setglobal) (lua_State *L, const char *name);
+LUA_API void  (lua_setglobal) (lua_State *L, const char *var);
 LUA_API void  (lua_settable) (lua_State *L, int idx);
 LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
-LUA_API void  (lua_seti) (lua_State *L, int idx, lua_Integer n);
 LUA_API void  (lua_rawset) (lua_State *L, int idx);
-LUA_API void  (lua_rawseti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawseti) (lua_State *L, int idx, int n);
 LUA_API void  (lua_rawsetp) (lua_State *L, int idx, const void *p);
 LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
-LUA_API int   (lua_setiuservalue) (lua_State *L, int idx, int n);
+LUA_API void  (lua_setuservalue) (lua_State *L, int idx);
 
 
 /*
 ** 'load' and 'call' functions (load and run Lua code)
 */
-LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults,
-                           lua_KContext ctx, lua_KFunction k);
+LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults, int ctx,
+                           lua_CFunction k);
 #define lua_call(L,n,r)		lua_callk(L, (n), (r), 0, NULL)
 
+LUA_API int   (lua_getctx) (lua_State *L, int *ctx);
+
 LUA_API int   (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
-                            lua_KContext ctx, lua_KFunction k);
+                            int ctx, lua_CFunction k);
 #define lua_pcall(L,n,r,f)	lua_pcallk(L, (n), (r), (f), 0, NULL)
 
 LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
-                          const char *chunkname, const char *mode);
+                                        const char *chunkname,
+                                        const char *mode);
 
-LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
+LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
 
 
 /*
 ** coroutine functions
 */
-LUA_API int  (lua_yieldk)     (lua_State *L, int nresults, lua_KContext ctx,
-                               lua_KFunction k);
-LUA_API int  (lua_resume)     (lua_State *L, lua_State *from, int narg,
-                               int *nres);
-LUA_API int  (lua_status)     (lua_State *L);
-LUA_API int (lua_isyieldable) (lua_State *L);
-
+LUA_API int  (lua_yieldk) (lua_State *L, int nresults, int ctx,
+                           lua_CFunction k);
 #define lua_yield(L,n)		lua_yieldk(L, (n), 0, NULL)
-
-
-/*
-** Warning-related functions
-*/
-LUA_API void (lua_setwarnf) (lua_State *L, lua_WarnFunction f, void *ud);
-LUA_API void (lua_warning)  (lua_State *L, const char *msg, int tocont);
-
+LUA_API int  (lua_resume) (lua_State *L, lua_State *from, int narg);
+LUA_API int  (lua_status) (lua_State *L);
 
 /*
 ** garbage-collection function and options
@@ -335,11 +286,12 @@ LUA_API void (lua_warning)  (lua_State *L, const char *msg, int tocont);
 #define LUA_GCSTEP		5
 #define LUA_GCSETPAUSE		6
 #define LUA_GCSETSTEPMUL	7
+#define LUA_GCSETMAJORINC	8
 #define LUA_GCISRUNNING		9
 #define LUA_GCGEN		10
 #define LUA_GCINC		11
 
-LUA_API int (lua_gc) (lua_State *L, int what, ...);
+LUA_API int (lua_gc) (lua_State *L, int what, int data);
 
 
 /*
@@ -353,25 +305,20 @@ LUA_API int   (lua_next) (lua_State *L, int idx);
 LUA_API void  (lua_concat) (lua_State *L, int n);
 LUA_API void  (lua_len)    (lua_State *L, int idx);
 
-LUA_API size_t   (lua_stringtonumber) (lua_State *L, const char *s);
-
 LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
 LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
 
-LUA_API void (lua_toclose) (lua_State *L, int idx);
-LUA_API void (lua_closeslot) (lua_State *L, int idx);
 
 
 /*
-** {==============================================================
+** ===============================================================
 ** some useful macros
 ** ===============================================================
 */
 
-#define lua_getextraspace(L)	((void *)((char *)(L) - LUA_EXTRASPACE))
-
-#define lua_tonumber(L,i)	lua_tonumberx(L,(i),NULL)
-#define lua_tointeger(L,i)	lua_tointegerx(L,(i),NULL)
+#define lua_tonumber(L,i)	lua_tonumberx(L,i,NULL)
+#define lua_tointeger(L,i)	lua_tointegerx(L,i,NULL)
+#define lua_tounsigned(L,i)	lua_tounsignedx(L,i,NULL)
 
 #define lua_pop(L,n)		lua_settop(L, -(n)-1)
 
@@ -390,43 +337,15 @@ LUA_API void (lua_closeslot) (lua_State *L, int idx);
 #define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
 #define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
 
-#define lua_pushliteral(L, s)	lua_pushstring(L, "" s)
+#define lua_pushliteral(L, s)	\
+	lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
 
 #define lua_pushglobaltable(L)  \
-	((void)lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS))
+	lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS)
 
 #define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
 
 
-#define lua_insert(L,idx)	lua_rotate(L, (idx), 1)
-
-#define lua_remove(L,idx)	(lua_rotate(L, (idx), -1), lua_pop(L, 1))
-
-#define lua_replace(L,idx)	(lua_copy(L, -1, (idx)), lua_pop(L, 1))
-
-/* }============================================================== */
-
-
-/*
-** {==============================================================
-** compatibility macros
-** ===============================================================
-*/
-#if defined(LUA_COMPAT_APIINTCASTS)
-
-#define lua_pushunsigned(L,n)	lua_pushinteger(L, (lua_Integer)(n))
-#define lua_tounsignedx(L,i,is)	((lua_Unsigned)lua_tointegerx(L,i,is))
-#define lua_tounsigned(L,i)	lua_tounsignedx(L,(i),NULL)
-
-#endif
-
-#define lua_newuserdata(L,s)	lua_newuserdatauv(L,s,1)
-#define lua_getuservalue(L,idx)	lua_getiuservalue(L,idx,1)
-#define lua_setuservalue(L,idx)	lua_setiuservalue(L,idx,1)
-
-#define LUA_NUMTAGS		LUA_NUMTYPES
-
-/* }============================================================== */
 
 /*
 ** {======================================================================
@@ -453,6 +372,12 @@ LUA_API void (lua_closeslot) (lua_State *L, int idx);
 #define LUA_MASKLINE	(1 << LUA_HOOKLINE)
 #define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
 
+typedef struct lua_Debug lua_Debug;  /* activation record */
+
+
+/* Functions to be called by the debugger in specific events */
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+
 
 LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
 LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
@@ -465,12 +390,11 @@ LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n);
 LUA_API void  (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
                                                int fidx2, int n2);
 
-LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
+LUA_API int (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
 LUA_API lua_Hook (lua_gethook) (lua_State *L);
 LUA_API int (lua_gethookmask) (lua_State *L);
 LUA_API int (lua_gethookcount) (lua_State *L);
 
-LUA_API int (lua_setcstacklimit) (lua_State *L, unsigned int limit);
 
 struct lua_Debug {
   int event;
@@ -478,7 +402,6 @@ struct lua_Debug {
   const char *namewhat;	/* (n) 'global', 'local', 'field', 'method' */
   const char *what;	/* (S) 'Lua', 'C', 'main', 'tail' */
   const char *source;	/* (S) */
-  size_t srclen;	/* (S) */
   int currentline;	/* (l) */
   int linedefined;	/* (S) */
   int lastlinedefined;	/* (S) */
@@ -486,8 +409,6 @@ struct lua_Debug {
   unsigned char nparams;/* (u) number of parameters */
   char isvararg;        /* (u) */
   char istailcall;	/* (t) */
-  unsigned short ftransfer;   /* (r) index of first value transferred */
-  unsigned short ntransfer;   /* (r) number of transferred values */
   char short_src[LUA_IDSIZE]; /* (S) */
   /* private part */
   struct CallInfo *i_ci;  /* active function */
@@ -497,7 +418,7 @@ struct lua_Debug {
 
 
 /******************************************************************************
-* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
+* Copyright (C) 1994-2015 Lua.org, PUC-Rio.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the

lualib.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lualib.h $
+** $Id: lualib.h,v 1.43 2011/12/08 12:11:37 roberto Exp $
 ** Lua standard libraries
 ** See Copyright Notice in lua.h
 */
@@ -11,9 +11,6 @@
 #include "lua.h"
 
 
-/* version suffix for environment variable names */
-#define LUA_VERSUFFIX          "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
-
 
 LUAMOD_API int (luaopen_base) (lua_State *L);
 
@@ -32,8 +29,8 @@ LUAMOD_API int (luaopen_os) (lua_State *L);
 #define LUA_STRLIBNAME	"string"
 LUAMOD_API int (luaopen_string) (lua_State *L);
 
-#define LUA_UTF8LIBNAME	"utf8"
-LUAMOD_API int (luaopen_utf8) (lua_State *L);
+#define LUA_BITLIBNAME	"bit32"
+LUAMOD_API int (luaopen_bit32) (lua_State *L);
 
 #define LUA_MATHLIBNAME	"math"
 LUAMOD_API int (luaopen_math) (lua_State *L);
@@ -49,4 +46,10 @@ LUAMOD_API int (luaopen_package) (lua_State *L);
 LUALIB_API void (luaL_openlibs) (lua_State *L);
 
 
+
+#if !defined(lua_assert)
+#define lua_assert(x)	((void)0)
+#endif
+
+
 #endif

lundump.c

@@ -1,18 +1,14 @@
 /*
-** $Id: lundump.c $
+** $Id: lundump.c,v 2.22 2012/05/08 13:53:33 roberto Exp $
 ** load precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
 
+#include <string.h>
+
 #define lundump_c
 #define LUA_CORE
 
-#include "lprefix.h"
-
-
-#include <limits.h>
-#include <string.h>
-
 #include "lua.h"
 
 #include "ldebug.h"
@@ -24,312 +20,239 @@
 #include "lundump.h"
 #include "lzio.h"
 
-
-#if !defined(luai_verifycode)
-#define luai_verifycode(L,f)  /* empty */
-#endif
-
-
 typedef struct {
-  lua_State *L;
-  ZIO *Z;
-  const char *name;
+ lua_State* L;
+ ZIO* Z;
+ Mbuffer* b;
+ const char* name;
 } LoadState;
 
-
-static l_noret error (LoadState *S, const char *why) {
-  luaO_pushfstring(S->L, "%s: bad binary format (%s)", S->name, why);
-  luaD_throw(S->L, LUA_ERRSYNTAX);
+static l_noret error(LoadState* S, const char* why)
+{
+ luaO_pushfstring(S->L,"%s: %s precompiled chunk",S->name,why);
+ luaD_throw(S->L,LUA_ERRSYNTAX);
 }
 
+#define LoadMem(S,b,n,size)	LoadBlock(S,b,(n)*(size))
+#define LoadByte(S)		(lu_byte)LoadChar(S)
+#define LoadVar(S,x)		LoadMem(S,&x,1,sizeof(x))
+#define LoadVector(S,b,n,size)	LoadMem(S,b,n,size)
+
+#if !defined(luai_verifycode)
+#define luai_verifycode(L,b,f)	/* empty */
+#endif
+
+static void LoadBlock(LoadState* S, void* b, size_t size)
+{
+ if (luaZ_read(S->Z,b,size)!=0) error(S,"truncated");
+}
+
+static int LoadChar(LoadState* S)
+{
+ char x;
+ LoadVar(S,x);
+ return x;
+}
+
+static int LoadInt(LoadState* S)
+{
+ int x;
+ LoadVar(S,x);
+ if (x<0) error(S,"corrupted");
+ return x;
+}
+
+static lua_Number LoadNumber(LoadState* S)
+{
+ lua_Number x;
+ LoadVar(S,x);
+ return x;
+}
+
+static TString* LoadString(LoadState* S)
+{
+ size_t size;
+ LoadVar(S,size);
+ if (size==0)
+  return NULL;
+ else
+ {
+  char* s=luaZ_openspace(S->L,S->b,size);
+  LoadBlock(S,s,size*sizeof(char));
+  return luaS_newlstr(S->L,s,size-1);		/* remove trailing '\0' */
+ }
+}
+
+static void LoadCode(LoadState* S, Proto* f)
+{
+ int n=LoadInt(S);
+ f->code=luaM_newvector(S->L,n,Instruction);
+ f->sizecode=n;
+ LoadVector(S,f->code,n,sizeof(Instruction));
+}
+
+static void LoadFunction(LoadState* S, Proto* f);
+
+static void LoadConstants(LoadState* S, Proto* f)
+{
+ int i,n;
+ n=LoadInt(S);
+ f->k=luaM_newvector(S->L,n,TValue);
+ f->sizek=n;
+ for (i=0; i<n; i++) setnilvalue(&f->k[i]);
+ for (i=0; i<n; i++)
+ {
+  TValue* o=&f->k[i];
+  int t=LoadChar(S);
+  switch (t)
+  {
+   case LUA_TNIL:
+	setnilvalue(o);
+	break;
+   case LUA_TBOOLEAN:
+	setbvalue(o,LoadChar(S));
+	break;
+   case LUA_TNUMBER:
+	setnvalue(o,LoadNumber(S));
+	break;
+   case LUA_TSTRING:
+	setsvalue2n(S->L,o,LoadString(S));
+	break;
+    default: lua_assert(0);
+  }
+ }
+ n=LoadInt(S);
+ f->p=luaM_newvector(S->L,n,Proto*);
+ f->sizep=n;
+ for (i=0; i<n; i++) f->p[i]=NULL;
+ for (i=0; i<n; i++)
+ {
+  f->p[i]=luaF_newproto(S->L);
+  LoadFunction(S,f->p[i]);
+ }
+}
+
+static void LoadUpvalues(LoadState* S, Proto* f)
+{
+ int i,n;
+ n=LoadInt(S);
+ f->upvalues=luaM_newvector(S->L,n,Upvaldesc);
+ f->sizeupvalues=n;
+ for (i=0; i<n; i++) f->upvalues[i].name=NULL;
+ for (i=0; i<n; i++)
+ {
+  f->upvalues[i].instack=LoadByte(S);
+  f->upvalues[i].idx=LoadByte(S);
+ }
+}
+
+static void LoadDebug(LoadState* S, Proto* f)
+{
+ int i,n;
+ f->source=LoadString(S);
+ n=LoadInt(S);
+ f->lineinfo=luaM_newvector(S->L,n,int);
+ f->sizelineinfo=n;
+ LoadVector(S,f->lineinfo,n,sizeof(int));
+ n=LoadInt(S);
+ f->locvars=luaM_newvector(S->L,n,LocVar);
+ f->sizelocvars=n;
+ for (i=0; i<n; i++) f->locvars[i].varname=NULL;
+ for (i=0; i<n; i++)
+ {
+  f->locvars[i].varname=LoadString(S);
+  f->locvars[i].startpc=LoadInt(S);
+  f->locvars[i].endpc=LoadInt(S);
+ }
+ n=LoadInt(S);
+ for (i=0; i<n; i++) f->upvalues[i].name=LoadString(S);
+}
+
+static void LoadFunction(LoadState* S, Proto* f)
+{
+ f->linedefined=LoadInt(S);
+ f->lastlinedefined=LoadInt(S);
+ f->numparams=LoadByte(S);
+ f->is_vararg=LoadByte(S);
+ f->maxstacksize=LoadByte(S);
+ LoadCode(S,f);
+ LoadConstants(S,f);
+ LoadUpvalues(S,f);
+ LoadDebug(S,f);
+}
+
+/* the code below must be consistent with the code in luaU_header */
+#define N0	LUAC_HEADERSIZE
+#define N1	(sizeof(LUA_SIGNATURE)-sizeof(char))
+#define N2	N1+2
+#define N3	N2+6
+
+static void LoadHeader(LoadState* S)
+{
+ lu_byte h[LUAC_HEADERSIZE];
+ lu_byte s[LUAC_HEADERSIZE];
+ luaU_header(h);
+ memcpy(s,h,sizeof(char));			/* first char already read */
+ LoadBlock(S,s+sizeof(char),LUAC_HEADERSIZE-sizeof(char));
+ if (memcmp(h,s,N0)==0) return;
+ if (memcmp(h,s,N1)!=0) error(S,"not a");
+ if (memcmp(h,s,N2)!=0) error(S,"version mismatch in");
+ if (memcmp(h,s,N3)!=0) error(S,"incompatible"); else error(S,"corrupted");
+}
 
 /*
-** All high-level loads go through loadVector; you can change it to
-** adapt to the endianness of the input
+** load precompiled chunk
 */
-#define loadVector(S,b,n)	loadBlock(S,b,(n)*sizeof((b)[0]))
-
-static void loadBlock (LoadState *S, void *b, size_t size) {
-  if (luaZ_read(S->Z, b, size) != 0)
-    error(S, "truncated chunk");
-}
-
-
-#define loadVar(S,x)		loadVector(S,&x,1)
-
-
-static lu_byte loadByte (LoadState *S) {
-  int b = zgetc(S->Z);
-  if (b == EOZ)
-    error(S, "truncated chunk");
-  return cast_byte(b);
-}
-
-
-static size_t loadUnsigned (LoadState *S, size_t limit) {
-  size_t x = 0;
-  int b;
-  limit >>= 7;
-  do {
-    b = loadByte(S);
-    if (x >= limit)
-      error(S, "integer overflow");
-    x = (x << 7) | (b & 0x7f);
-  } while ((b & 0x80) == 0);
-  return x;
-}
-
-
-static size_t loadSize (LoadState *S) {
-  return loadUnsigned(S, ~(size_t)0);
-}
-
-
-static int loadInt (LoadState *S) {
-  return cast_int(loadUnsigned(S, INT_MAX));
-}
-
-
-static lua_Number loadNumber (LoadState *S) {
-  lua_Number x;
-  loadVar(S, x);
-  return x;
-}
-
-
-static lua_Integer loadInteger (LoadState *S) {
-  lua_Integer x;
-  loadVar(S, x);
-  return x;
+Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
+{
+ LoadState S;
+ Closure* cl;
+ if (*name=='@' || *name=='=')
+  S.name=name+1;
+ else if (*name==LUA_SIGNATURE[0])
+  S.name="binary string";
+ else
+  S.name=name;
+ S.L=L;
+ S.Z=Z;
+ S.b=buff;
+ LoadHeader(&S);
+ cl=luaF_newLclosure(L,1);
+ setclLvalue(L,L->top,cl); incr_top(L);
+ cl->l.p=luaF_newproto(L);
+ LoadFunction(&S,cl->l.p);
+ if (cl->l.p->sizeupvalues != 1)
+ {
+  Proto* p=cl->l.p;
+  cl=luaF_newLclosure(L,cl->l.p->sizeupvalues);
+  cl->l.p=p;
+  setclLvalue(L,L->top-1,cl);
+ }
+ luai_verifycode(L,buff,cl->l.p);
+ return cl;
 }
 
+#define MYINT(s)	(s[0]-'0')
+#define VERSION		MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR)
+#define FORMAT		0		/* this is the official format */
 
 /*
-** Load a nullable string into prototype 'p'.
+* make header for precompiled chunks
+* if you change the code below be sure to update LoadHeader and FORMAT above
+* and LUAC_HEADERSIZE in lundump.h
 */
-static TString *loadStringN (LoadState *S, Proto *p) {
-  lua_State *L = S->L;
-  TString *ts;
-  size_t size = loadSize(S);
-  if (size == 0)  /* no string? */
-    return NULL;
-  else if (--size <= LUAI_MAXSHORTLEN) {  /* short string? */
-    char buff[LUAI_MAXSHORTLEN];
-    loadVector(S, buff, size);  /* load string into buffer */
-    ts = luaS_newlstr(L, buff, size);  /* create string */
-  }
-  else {  /* long string */
-    ts = luaS_createlngstrobj(L, size);  /* create string */
-    setsvalue2s(L, L->top.p, ts);  /* anchor it ('loadVector' can GC) */
-    luaD_inctop(L);
-    loadVector(S, getstr(ts), size);  /* load directly in final place */
-    L->top.p--;  /* pop string */
-  }
-  luaC_objbarrier(L, p, ts);
-  return ts;
+void luaU_header (lu_byte* h)
+{
+ int x=1;
+ memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-sizeof(char));
+ h+=sizeof(LUA_SIGNATURE)-sizeof(char);
+ *h++=cast_byte(VERSION);
+ *h++=cast_byte(FORMAT);
+ *h++=cast_byte(*(char*)&x);			/* endianness */
+ *h++=cast_byte(sizeof(int));
+ *h++=cast_byte(sizeof(size_t));
+ *h++=cast_byte(sizeof(Instruction));
+ *h++=cast_byte(sizeof(lua_Number));
+ *h++=cast_byte(((lua_Number)0.5)==0);		/* is lua_Number integral? */
+ memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char));
 }
-
-
-/*
-** Load a non-nullable string into prototype 'p'.
-*/
-static TString *loadString (LoadState *S, Proto *p) {
-  TString *st = loadStringN(S, p);
-  if (st == NULL)
-    error(S, "bad format for constant string");
-  return st;
-}
-
-
-static void loadCode (LoadState *S, Proto *f) {
-  int n = loadInt(S);
-  f->code = luaM_newvectorchecked(S->L, n, Instruction);
-  f->sizecode = n;
-  loadVector(S, f->code, n);
-}
-
-
-static void loadFunction(LoadState *S, Proto *f, TString *psource);
-
-
-static void loadConstants (LoadState *S, Proto *f) {
-  int i;
-  int n = loadInt(S);
-  f->k = luaM_newvectorchecked(S->L, n, TValue);
-  f->sizek = n;
-  for (i = 0; i < n; i++)
-    setnilvalue(&f->k[i]);
-  for (i = 0; i < n; i++) {
-    TValue *o = &f->k[i];
-    int t = loadByte(S);
-    switch (t) {
-      case LUA_VNIL:
-        setnilvalue(o);
-        break;
-      case LUA_VFALSE:
-        setbfvalue(o);
-        break;
-      case LUA_VTRUE:
-        setbtvalue(o);
-        break;
-      case LUA_VNUMFLT:
-        setfltvalue(o, loadNumber(S));
-        break;
-      case LUA_VNUMINT:
-        setivalue(o, loadInteger(S));
-        break;
-      case LUA_VSHRSTR:
-      case LUA_VLNGSTR:
-        setsvalue2n(S->L, o, loadString(S, f));
-        break;
-      default: lua_assert(0);
-    }
-  }
-}
-
-
-static void loadProtos (LoadState *S, Proto *f) {
-  int i;
-  int n = loadInt(S);
-  f->p = luaM_newvectorchecked(S->L, n, Proto *);
-  f->sizep = n;
-  for (i = 0; i < n; i++)
-    f->p[i] = NULL;
-  for (i = 0; i < n; i++) {
-    f->p[i] = luaF_newproto(S->L);
-    luaC_objbarrier(S->L, f, f->p[i]);
-    loadFunction(S, f->p[i], f->source);
-  }
-}
-
-
-/*
-** Load the upvalues for a function. The names must be filled first,
-** because the filling of the other fields can raise read errors and
-** the creation of the error message can call an emergency collection;
-** in that case all prototypes must be consistent for the GC.
-*/
-static void loadUpvalues (LoadState *S, Proto *f) {
-  int i, n;
-  n = loadInt(S);
-  f->upvalues = luaM_newvectorchecked(S->L, n, Upvaldesc);
-  f->sizeupvalues = n;
-  for (i = 0; i < n; i++)  /* make array valid for GC */
-    f->upvalues[i].name = NULL;
-  for (i = 0; i < n; i++) {  /* following calls can raise errors */
-    f->upvalues[i].instack = loadByte(S);
-    f->upvalues[i].idx = loadByte(S);
-    f->upvalues[i].kind = loadByte(S);
-  }
-}
-
-
-static void loadDebug (LoadState *S, Proto *f) {
-  int i, n;
-  n = loadInt(S);
-  f->lineinfo = luaM_newvectorchecked(S->L, n, ls_byte);
-  f->sizelineinfo = n;
-  loadVector(S, f->lineinfo, n);
-  n = loadInt(S);
-  f->abslineinfo = luaM_newvectorchecked(S->L, n, AbsLineInfo);
-  f->sizeabslineinfo = n;
-  for (i = 0; i < n; i++) {
-    f->abslineinfo[i].pc = loadInt(S);
-    f->abslineinfo[i].line = loadInt(S);
-  }
-  n = loadInt(S);
-  f->locvars = luaM_newvectorchecked(S->L, n, LocVar);
-  f->sizelocvars = n;
-  for (i = 0; i < n; i++)
-    f->locvars[i].varname = NULL;
-  for (i = 0; i < n; i++) {
-    f->locvars[i].varname = loadStringN(S, f);
-    f->locvars[i].startpc = loadInt(S);
-    f->locvars[i].endpc = loadInt(S);
-  }
-  n = loadInt(S);
-  if (n != 0)  /* does it have debug information? */
-    n = f->sizeupvalues;  /* must be this many */
-  for (i = 0; i < n; i++)
-    f->upvalues[i].name = loadStringN(S, f);
-}
-
-
-static void loadFunction (LoadState *S, Proto *f, TString *psource) {
-  f->source = loadStringN(S, f);
-  if (f->source == NULL)  /* no source in dump? */
-    f->source = psource;  /* reuse parent's source */
-  f->linedefined = loadInt(S);
-  f->lastlinedefined = loadInt(S);
-  f->numparams = loadByte(S);
-  f->is_vararg = loadByte(S);
-  f->maxstacksize = loadByte(S);
-  loadCode(S, f);
-  loadConstants(S, f);
-  loadUpvalues(S, f);
-  loadProtos(S, f);
-  loadDebug(S, f);
-}
-
-
-static void checkliteral (LoadState *S, const char *s, const char *msg) {
-  char buff[sizeof(LUA_SIGNATURE) + sizeof(LUAC_DATA)]; /* larger than both */
-  size_t len = strlen(s);
-  loadVector(S, buff, len);
-  if (memcmp(s, buff, len) != 0)
-    error(S, msg);
-}
-
-
-static void fchecksize (LoadState *S, size_t size, const char *tname) {
-  if (loadByte(S) != size)
-    error(S, luaO_pushfstring(S->L, "%s size mismatch", tname));
-}
-
-
-#define checksize(S,t)	fchecksize(S,sizeof(t),#t)
-
-static void checkHeader (LoadState *S) {
-  /* skip 1st char (already read and checked) */
-  checkliteral(S, &LUA_SIGNATURE[1], "not a binary chunk");
-  if (loadByte(S) != LUAC_VERSION)
-    error(S, "version mismatch");
-  if (loadByte(S) != LUAC_FORMAT)
-    error(S, "format mismatch");
-  checkliteral(S, LUAC_DATA, "corrupted chunk");
-  checksize(S, Instruction);
-  checksize(S, lua_Integer);
-  checksize(S, lua_Number);
-  if (loadInteger(S) != LUAC_INT)
-    error(S, "integer format mismatch");
-  if (loadNumber(S) != LUAC_NUM)
-    error(S, "float format mismatch");
-}
-
-
-/*
-** Load precompiled chunk.
-*/
-LClosure *luaU_undump(lua_State *L, ZIO *Z, const char *name) {
-  LoadState S;
-  LClosure *cl;
-  if (*name == '@' || *name == '=')
-    S.name = name + 1;
-  else if (*name == LUA_SIGNATURE[0])
-    S.name = "binary string";
-  else
-    S.name = name;
-  S.L = L;
-  S.Z = Z;
-  checkHeader(&S);
-  cl = luaF_newLclosure(L, loadByte(&S));
-  setclLvalue2s(L, L->top.p, cl);
-  luaD_inctop(L);
-  cl->p = luaF_newproto(L);
-  luaC_objbarrier(L, cl, cl->p);
-  loadFunction(&S, cl->p, NULL);
-  lua_assert(cl->nupvalues == cl->p->sizeupvalues);
-  luai_verifycode(L, cl->p);
-  return cl;
-}
-

lundump.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lundump.h $
+** $Id: lundump.h,v 1.39 2012/05/08 13:53:33 roberto Exp $
 ** load precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -7,30 +7,22 @@
 #ifndef lundump_h
 #define lundump_h
 
-#include "llimits.h"
 #include "lobject.h"
 #include "lzio.h"
 
-
-/* data to catch conversion errors */
-#define LUAC_DATA	"\x19\x93\r\n\x1a\n"
-
-#define LUAC_INT	0x5678
-#define LUAC_NUM	cast_num(370.5)
-
-/*
-** Encode major-minor version in one byte, one nibble for each
-*/
-#define MYINT(s)	(s[0]-'0')  /* assume one-digit numerals */
-#define LUAC_VERSION	(MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR))
-
-#define LUAC_FORMAT	0	/* this is the official format */
-
 /* load one chunk; from lundump.c */
-LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name);
+LUAI_FUNC Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name);
+
+/* make header; from lundump.c */
+LUAI_FUNC void luaU_header (lu_byte* h);
 
 /* dump one chunk; from ldump.c */
-LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w,
-                         void* data, int strip);
+LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
+
+/* data to catch conversion errors */
+#define LUAC_TAIL		"\x19\x93\r\n\x1a\n"
+
+/* size in bytes of header of binary files */
+#define LUAC_HEADERSIZE		(sizeof(LUA_SIGNATURE)-sizeof(char)+2+6+sizeof(LUAC_TAIL)-sizeof(char))
 
 #endif

lutf8lib.c

@@ -1,291 +0,0 @@
-/*
-** $Id: lutf8lib.c $
-** Standard library for UTF-8 manipulation
-** See Copyright Notice in lua.h
-*/
-
-#define lutf8lib_c
-#define LUA_LIB
-
-#include "lprefix.h"
-
-
-#include <assert.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lua.h"
-
-#include "lauxlib.h"
-#include "lualib.h"
-
-
-#define MAXUNICODE	0x10FFFFu
-
-#define MAXUTF		0x7FFFFFFFu
-
-
-#define MSGInvalid	"invalid UTF-8 code"
-
-/*
-** Integer type for decoded UTF-8 values; MAXUTF needs 31 bits.
-*/
-#if (UINT_MAX >> 30) >= 1
-typedef unsigned int utfint;
-#else
-typedef unsigned long utfint;
-#endif
-
-
-#define iscont(c)	(((c) & 0xC0) == 0x80)
-#define iscontp(p)	iscont(*(p))
-
-
-/* from strlib */
-/* translate a relative string position: negative means back from end */
-static lua_Integer u_posrelat (lua_Integer pos, size_t len) {
-  if (pos >= 0) return pos;
-  else if (0u - (size_t)pos > len) return 0;
-  else return (lua_Integer)len + pos + 1;
-}
-
-
-/*
-** Decode one UTF-8 sequence, returning NULL if byte sequence is
-** invalid.  The array 'limits' stores the minimum value for each
-** sequence length, to check for overlong representations. Its first
-** entry forces an error for non-ascii bytes with no continuation
-** bytes (count == 0).
-*/
-static const char *utf8_decode (const char *s, utfint *val, int strict) {
-  static const utfint limits[] =
-        {~(utfint)0, 0x80, 0x800, 0x10000u, 0x200000u, 0x4000000u};
-  unsigned int c = (unsigned char)s[0];
-  utfint res = 0;  /* final result */
-  if (c < 0x80)  /* ascii? */
-    res = c;
-  else {
-    int count = 0;  /* to count number of continuation bytes */
-    for (; c & 0x40; c <<= 1) {  /* while it needs continuation bytes... */
-      unsigned int cc = (unsigned char)s[++count];  /* read next byte */
-      if (!iscont(cc))  /* not a continuation byte? */
-        return NULL;  /* invalid byte sequence */
-      res = (res << 6) | (cc & 0x3F);  /* add lower 6 bits from cont. byte */
-    }
-    res |= ((utfint)(c & 0x7F) << (count * 5));  /* add first byte */
-    if (count > 5 || res > MAXUTF || res < limits[count])
-      return NULL;  /* invalid byte sequence */
-    s += count;  /* skip continuation bytes read */
-  }
-  if (strict) {
-    /* check for invalid code points; too large or surrogates */
-    if (res > MAXUNICODE || (0xD800u <= res && res <= 0xDFFFu))
-      return NULL;
-  }
-  if (val) *val = res;
-  return s + 1;  /* +1 to include first byte */
-}
-
-
-/*
-** utf8len(s [, i [, j [, lax]]]) --> number of characters that
-** start in the range [i,j], or nil + current position if 's' is not
-** well formed in that interval
-*/
-static int utflen (lua_State *L) {
-  lua_Integer n = 0;  /* counter for the number of characters */
-  size_t len;  /* string length in bytes */
-  const char *s = luaL_checklstring(L, 1, &len);
-  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
-  lua_Integer posj = u_posrelat(luaL_optinteger(L, 3, -1), len);
-  int lax = lua_toboolean(L, 4);
-  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 2,
-                   "initial position out of bounds");
-  luaL_argcheck(L, --posj < (lua_Integer)len, 3,
-                   "final position out of bounds");
-  while (posi <= posj) {
-    const char *s1 = utf8_decode(s + posi, NULL, !lax);
-    if (s1 == NULL) {  /* conversion error? */
-      luaL_pushfail(L);  /* return fail ... */
-      lua_pushinteger(L, posi + 1);  /* ... and current position */
-      return 2;
-    }
-    posi = s1 - s;
-    n++;
-  }
-  lua_pushinteger(L, n);
-  return 1;
-}
-
-
-/*
-** codepoint(s, [i, [j [, lax]]]) -> returns codepoints for all
-** characters that start in the range [i,j]
-*/
-static int codepoint (lua_State *L) {
-  size_t len;
-  const char *s = luaL_checklstring(L, 1, &len);
-  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
-  lua_Integer pose = u_posrelat(luaL_optinteger(L, 3, posi), len);
-  int lax = lua_toboolean(L, 4);
-  int n;
-  const char *se;
-  luaL_argcheck(L, posi >= 1, 2, "out of bounds");
-  luaL_argcheck(L, pose <= (lua_Integer)len, 3, "out of bounds");
-  if (posi > pose) return 0;  /* empty interval; return no values */
-  if (pose - posi >= INT_MAX)  /* (lua_Integer -> int) overflow? */
-    return luaL_error(L, "string slice too long");
-  n = (int)(pose -  posi) + 1;  /* upper bound for number of returns */
-  luaL_checkstack(L, n, "string slice too long");
-  n = 0;  /* count the number of returns */
-  se = s + pose;  /* string end */
-  for (s += posi - 1; s < se;) {
-    utfint code;
-    s = utf8_decode(s, &code, !lax);
-    if (s == NULL)
-      return luaL_error(L, MSGInvalid);
-    lua_pushinteger(L, code);
-    n++;
-  }
-  return n;
-}
-
-
-static void pushutfchar (lua_State *L, int arg) {
-  lua_Unsigned code = (lua_Unsigned)luaL_checkinteger(L, arg);
-  luaL_argcheck(L, code <= MAXUTF, arg, "value out of range");
-  lua_pushfstring(L, "%U", (long)code);
-}
-
-
-/*
-** utfchar(n1, n2, ...)  -> char(n1)..char(n2)...
-*/
-static int utfchar (lua_State *L) {
-  int n = lua_gettop(L);  /* number of arguments */
-  if (n == 1)  /* optimize common case of single char */
-    pushutfchar(L, 1);
-  else {
-    int i;
-    luaL_Buffer b;
-    luaL_buffinit(L, &b);
-    for (i = 1; i <= n; i++) {
-      pushutfchar(L, i);
-      luaL_addvalue(&b);
-    }
-    luaL_pushresult(&b);
-  }
-  return 1;
-}
-
-
-/*
-** offset(s, n, [i])  -> index where n-th character counting from
-**   position 'i' starts; 0 means character at 'i'.
-*/
-static int byteoffset (lua_State *L) {
-  size_t len;
-  const char *s = luaL_checklstring(L, 1, &len);
-  lua_Integer n  = luaL_checkinteger(L, 2);
-  lua_Integer posi = (n >= 0) ? 1 : len + 1;
-  posi = u_posrelat(luaL_optinteger(L, 3, posi), len);
-  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 3,
-                   "position out of bounds");
-  if (n == 0) {
-    /* find beginning of current byte sequence */
-    while (posi > 0 && iscontp(s + posi)) posi--;
-  }
-  else {
-    if (iscontp(s + posi))
-      return luaL_error(L, "initial position is a continuation byte");
-    if (n < 0) {
-       while (n < 0 && posi > 0) {  /* move back */
-         do {  /* find beginning of previous character */
-           posi--;
-         } while (posi > 0 && iscontp(s + posi));
-         n++;
-       }
-     }
-     else {
-       n--;  /* do not move for 1st character */
-       while (n > 0 && posi < (lua_Integer)len) {
-         do {  /* find beginning of next character */
-           posi++;
-         } while (iscontp(s + posi));  /* (cannot pass final '\0') */
-         n--;
-       }
-     }
-  }
-  if (n == 0)  /* did it find given character? */
-    lua_pushinteger(L, posi + 1);
-  else  /* no such character */
-    luaL_pushfail(L);
-  return 1;
-}
-
-
-static int iter_aux (lua_State *L, int strict) {
-  size_t len;
-  const char *s = luaL_checklstring(L, 1, &len);
-  lua_Unsigned n = (lua_Unsigned)lua_tointeger(L, 2);
-  if (n < len) {
-    while (iscontp(s + n)) n++;  /* go to next character */
-  }
-  if (n >= len)  /* (also handles original 'n' being negative) */
-    return 0;  /* no more codepoints */
-  else {
-    utfint code;
-    const char *next = utf8_decode(s + n, &code, strict);
-    if (next == NULL || iscontp(next))
-      return luaL_error(L, MSGInvalid);
-    lua_pushinteger(L, n + 1);
-    lua_pushinteger(L, code);
-    return 2;
-  }
-}
-
-
-static int iter_auxstrict (lua_State *L) {
-  return iter_aux(L, 1);
-}
-
-static int iter_auxlax (lua_State *L) {
-  return iter_aux(L, 0);
-}
-
-
-static int iter_codes (lua_State *L) {
-  int lax = lua_toboolean(L, 2);
-  const char *s = luaL_checkstring(L, 1);
-  luaL_argcheck(L, !iscontp(s), 1, MSGInvalid);
-  lua_pushcfunction(L, lax ? iter_auxlax : iter_auxstrict);
-  lua_pushvalue(L, 1);
-  lua_pushinteger(L, 0);
-  return 3;
-}
-
-
-/* pattern to match a single UTF-8 character */
-#define UTF8PATT	"[\0-\x7F\xC2-\xFD][\x80-\xBF]*"
-
-
-static const luaL_Reg funcs[] = {
-  {"offset", byteoffset},
-  {"codepoint", codepoint},
-  {"char", utfchar},
-  {"len", utflen},
-  {"codes", iter_codes},
-  /* placeholders */
-  {"charpattern", NULL},
-  {NULL, NULL}
-};
-
-
-LUAMOD_API int luaopen_utf8 (lua_State *L) {
-  luaL_newlib(L, funcs);
-  lua_pushlstring(L, UTF8PATT, sizeof(UTF8PATT)/sizeof(char) - 1);
-  lua_setfield(L, -2, "charpattern");
-  return 1;
-}
-

lvm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.h $
+** $Id: lvm.h,v 2.18 2013/01/08 14:06:55 roberto Exp $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -13,129 +13,32 @@
 #include "ltm.h"
 
 
-#if !defined(LUA_NOCVTN2S)
-#define cvt2str(o)	ttisnumber(o)
-#else
-#define cvt2str(o)	0	/* no conversion from numbers to strings */
-#endif
+#define tostring(L,o) (ttisstring(o) || (luaV_tostring(L, o)))
+
+#define tonumber(o,n)	(ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL))
+
+#define equalobj(L,o1,o2)  (ttisequal(o1, o2) && luaV_equalobj_(L, o1, o2))
+
+#define luaV_rawequalobj(o1,o2)		equalobj(NULL,o1,o2)
 
 
-#if !defined(LUA_NOCVTS2N)
-#define cvt2num(o)	ttisstring(o)
-#else
-#define cvt2num(o)	0	/* no conversion from strings to numbers */
-#endif
+/* not to called directly */
+LUAI_FUNC int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2);
 
 
-/*
-** You can define LUA_FLOORN2I if you want to convert floats to integers
-** by flooring them (instead of raising an error if they are not
-** integral values)
-*/
-#if !defined(LUA_FLOORN2I)
-#define LUA_FLOORN2I		F2Ieq
-#endif
-
-
-/*
-** Rounding modes for float->integer coercion
- */
-typedef enum {
-  F2Ieq,     /* no rounding; accepts only integral values */
-  F2Ifloor,  /* takes the floor of the number */
-  F2Iceil    /* takes the ceil of the number */
-} F2Imod;
-
-
-/* convert an object to a float (including string coercion) */
-#define tonumber(o,n) \
-	(ttisfloat(o) ? (*(n) = fltvalue(o), 1) : luaV_tonumber_(o,n))
-
-
-/* convert an object to a float (without string coercion) */
-#define tonumberns(o,n) \
-	(ttisfloat(o) ? ((n) = fltvalue(o), 1) : \
-	(ttisinteger(o) ? ((n) = cast_num(ivalue(o)), 1) : 0))
-
-
-/* convert an object to an integer (including string coercion) */
-#define tointeger(o,i) \
-  (l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
-                          : luaV_tointeger(o,i,LUA_FLOORN2I))
-
-
-/* convert an object to an integer (without string coercion) */
-#define tointegerns(o,i) \
-  (l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
-                          : luaV_tointegerns(o,i,LUA_FLOORN2I))
-
-
-#define intop(op,v1,v2) l_castU2S(l_castS2U(v1) op l_castS2U(v2))
-
-#define luaV_rawequalobj(t1,t2)		luaV_equalobj(NULL,t1,t2)
-
-
-/*
-** fast track for 'gettable': if 't' is a table and 't[k]' is present,
-** return 1 with 'slot' pointing to 't[k]' (position of final result).
-** Otherwise, return 0 (meaning it will have to check metamethod)
-** with 'slot' pointing to an empty 't[k]' (if 't' is a table) or NULL
-** (otherwise). 'f' is the raw get function to use.
-*/
-#define luaV_fastget(L,t,k,slot,f) \
-  (!ttistable(t)  \
-   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
-   : (slot = f(hvalue(t), k),  /* else, do raw access */  \
-      !isempty(slot)))  /* result not empty? */
-
-
-/*
-** Special case of 'luaV_fastget' for integers, inlining the fast case
-** of 'luaH_getint'.
-*/
-#define luaV_fastgeti(L,t,k,slot) \
-  (!ttistable(t)  \
-   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
-   : (slot = (l_castS2U(k) - 1u < hvalue(t)->alimit) \
-              ? &hvalue(t)->array[k - 1] : luaH_getint(hvalue(t), k), \
-      !isempty(slot)))  /* result not empty? */
-
-
-/*
-** Finish a fast set operation (when fast get succeeds). In that case,
-** 'slot' points to the place to put the value.
-*/
-#define luaV_finishfastset(L,t,slot,v) \
-    { setobj2t(L, cast(TValue *,slot), v); \
-      luaC_barrierback(L, gcvalue(t), v); }
-
-
-/*
-** Shift right is the same as shift left with a negative 'y'
-*/
-#define luaV_shiftr(x,y)	luaV_shiftl(x,intop(-, 0, y))
-
-
-
-LUAI_FUNC int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2);
 LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
 LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
-LUAI_FUNC int luaV_tonumber_ (const TValue *obj, lua_Number *n);
-LUAI_FUNC int luaV_tointeger (const TValue *obj, lua_Integer *p, F2Imod mode);
-LUAI_FUNC int luaV_tointegerns (const TValue *obj, lua_Integer *p,
-                                F2Imod mode);
-LUAI_FUNC int luaV_flttointeger (lua_Number n, lua_Integer *p, F2Imod mode);
-LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
-                               StkId val, const TValue *slot);
-LUAI_FUNC void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
-                               TValue *val, const TValue *slot);
+LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
+LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
+LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key,
+                                            StkId val);
+LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key,
+                                            StkId val);
 LUAI_FUNC void luaV_finishOp (lua_State *L);
-LUAI_FUNC void luaV_execute (lua_State *L, CallInfo *ci);
+LUAI_FUNC void luaV_execute (lua_State *L);
 LUAI_FUNC void luaV_concat (lua_State *L, int total);
-LUAI_FUNC lua_Integer luaV_idiv (lua_State *L, lua_Integer x, lua_Integer y);
-LUAI_FUNC lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y);
-LUAI_FUNC lua_Number luaV_modf (lua_State *L, lua_Number x, lua_Number y);
-LUAI_FUNC lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y);
+LUAI_FUNC void luaV_arith (lua_State *L, StkId ra, const TValue *rb,
+                           const TValue *rc, TMS op);
 LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb);
 
 #endif

lzio.c

@@ -1,17 +1,15 @@
 /*
-** $Id: lzio.c $
+** $Id: lzio.c,v 1.35 2012/05/14 13:34:18 roberto Exp $
 ** Buffered streams
 ** See Copyright Notice in lua.h
 */
 
-#define lzio_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
 
 #include <string.h>
 
+#define lzio_c
+#define LUA_CORE
+
 #include "lua.h"
 
 #include "llimits.h"
@@ -66,3 +64,13 @@ size_t luaZ_read (ZIO *z, void *b, size_t n) {
   return 0;
 }
 
+/* ------------------------------------------------------------------------ */
+char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n) {
+  if (n > buff->buffsize) {
+    if (n < LUA_MINBUFFER) n = LUA_MINBUFFER;
+    luaZ_resizebuffer(L, buff, n);
+  }
+  return buff->buffer;
+}
+
+

lzio.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lzio.h $
+** $Id: lzio.h,v 1.26 2011/07/15 12:48:03 roberto Exp $
 ** Buffered streams
 ** See Copyright Notice in lua.h
 */
@@ -32,21 +32,20 @@ typedef struct Mbuffer {
 #define luaZ_sizebuffer(buff)	((buff)->buffsize)
 #define luaZ_bufflen(buff)	((buff)->n)
 
-#define luaZ_buffremove(buff,i)	((buff)->n -= (i))
 #define luaZ_resetbuffer(buff) ((buff)->n = 0)
 
 
 #define luaZ_resizebuffer(L, buff, size) \
-	((buff)->buffer = luaM_reallocvchar(L, (buff)->buffer, \
-				(buff)->buffsize, size), \
+	(luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
 	(buff)->buffsize = size)
 
 #define luaZ_freebuffer(L, buff)	luaZ_resizebuffer(L, buff, 0)
 
 
+LUAI_FUNC char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
 LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
                                         void *data);
-LUAI_FUNC size_t luaZ_read (ZIO* z, void *b, size_t n);	/* read next n bytes */
+LUAI_FUNC size_t luaZ_read (ZIO* z, void* b, size_t n);	/* read next n bytes */
 
 
 
@@ -56,7 +55,7 @@ struct Zio {
   size_t n;			/* bytes still unread */
   const char *p;		/* current position in buffer */
   lua_Reader reader;		/* reader function */
-  void *data;			/* additional data */
+  void* data;			/* additional data */
   lua_State *L;			/* Lua state (for reader) */
 };
 

makefile

@@ -1,86 +1,38 @@
-# Developer's makefile for building Lua
-# see luaconf.h for further customization
+# makefile for building Lua
+# see INSTALL for installation instructions
+# see ../Makefile and luaconf.h for further customization
 
 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
 
-# Warnings valid for both C and C++
-CWARNSCPP= \
-	-Wfatal-errors \
-	-Wextra \
-	-Wshadow \
-	-Wundef \
-	-Wwrite-strings \
-	-Wredundant-decls \
-	-Wdisabled-optimization \
-	-Wdouble-promotion \
-	-Wmissing-declarations \
-        # the next warnings might be useful sometimes,
-	# but usually they generate too much noise
-	# -Werror \
-	# -pedantic   # warns if we use jump tables \
-	# -Wconversion  \
-	# -Wsign-conversion \
-	# -Wstrict-overflow=2 \
-	# -Wformat=2 \
-	# -Wcast-qual \
-
-
-# Warnings for gcc, not valid for clang
-CWARNGCC= \
-	-Wlogical-op \
-	-Wno-aggressive-loop-optimizations \
-
-
-# The next warnings are neither valid nor needed for C++
-CWARNSC= -Wdeclaration-after-statement \
-	-Wmissing-prototypes \
-	-Wnested-externs \
-	-Wstrict-prototypes \
-	-Wc++-compat \
-	-Wold-style-definition \
-
-
-CWARNS= $(CWARNSCPP) $(CWARNSC) $(CWARNGCC)
-
-# Some useful compiler options for internal tests:
-# -DLUAI_ASSERT turns on all assertions inside Lua.
-# -DHARDSTACKTESTS forces a reallocation of the stack at every point where
-# the stack can be reallocated.
-# -DHARDMEMTESTS forces a full collection at all points where the collector
-# can run.
-# -DEMERGENCYGCTESTS forces an emergency collection at every single allocation.
-# -DEXTERNMEMCHECK removes internal consistency checking of blocks being
-# deallocated (useful when an external tool like valgrind does the check).
-# -DMAXINDEXRK=k limits range of constants in RK instruction operands.
-# -DLUA_COMPAT_5_3
-
-# -pg -malign-double
-# -DLUA_USE_CTYPE -DLUA_USE_APICHECK
-
-# The following options help detect "undefined behavior"s that seldom
-# create problems; some are only available in newer gcc versions. To
-# use some of them, we also have to define an environment variable
-# ASAN_OPTIONS="detect_invalid_pointer_pairs=2".
-# -fsanitize=undefined
-# -fsanitize=pointer-subtract -fsanitize=address -fsanitize=pointer-compare
-# TESTS= -DLUA_USER_H='"ltests.h"' -O0 -g
+CWARNS= -pedantic -Waggregate-return -Wcast-align \
+        -Wmissing-prototypes -Wpointer-arith -Wshadow \
+        -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings
+# -Wcast-qual
 
+# -DEXTERNMEMCHECK -DHARDSTACKTESTS
+# -g -DLUA_USER_H='"ltests.h"'
+# -fomit-frame-pointer #-pg -malign-double
+TESTS= -g -DLUA_USER_H='"ltests.h"'
 
 LOCAL = $(TESTS) $(CWARNS)
 
 
-# enable Linux goodies
-MYCFLAGS= $(LOCAL) -std=c99 -DLUA_USE_LINUX -DLUA_USE_READLINE
-MYLDFLAGS= $(LOCAL) -Wl,-E
-MYLIBS= -ldl -lreadline
-
-
 CC= gcc
-CFLAGS= -Wall -O2 $(MYCFLAGS) -fno-stack-protector -fno-common -march=native
-AR= ar rc
+CFLAGS= -Wall $(MYCFLAGS) -O2
+AR= ar rcu
 RANLIB= ranlib
 RM= rm -f
 
+MYCFLAGS= $(LOCAL)
+MYLDFLAGS=
+MYLIBS=
+
+
+# enable Linux goodies
+MYCFLAGS= $(LOCAL) -DLUA_USE_LINUX
+MYLDFLAGS= -Wl,-E
+MYLIBS= -ldl -lreadline -lhistory -lncurses
+
 
 
 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
@@ -89,23 +41,24 @@ RM= rm -f
 LIBS = -lm
 
 CORE_T=	liblua.a
-CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
-	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
-	ltm.o lundump.o lvm.o lzio.o ltests.o
+CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+	lundump.o lvm.o lzio.o ltests.o
 AUX_O=	lauxlib.o
 LIB_O=	lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o lstrlib.o \
-	lutf8lib.o loadlib.o lcorolib.o linit.o
+	loadlib.o linit.o
 
 LUA_T=	lua
 LUA_O=	lua.o
 
+LUAC_T=	luac
+LUAC_O=	luac.o print.o
 
-ALL_T= $(CORE_T) $(LUA_T)
-ALL_O= $(CORE_O) $(LUA_O) $(AUX_O) $(LIB_O)
+ALL_T= $(CORE_T) $(LUA_T) $(LUAC_T)
+ALL_O= $(CORE_O) $(LUA_O) $(LUAC_O) $(AUX_O) $(LIB_O)
 ALL_A= $(CORE_T)
 
 all:	$(ALL_T)
-	touch all
 
 o:	$(ALL_O)
 
@@ -118,8 +71,11 @@ $(CORE_T): $(CORE_O) $(AUX_O) $(LIB_O)
 $(LUA_T): $(LUA_O) $(CORE_T)
 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(CORE_T) $(LIBS) $(MYLIBS) $(DL)
 
+$(LUAC_T): $(LUAC_O) $(CORE_T)
+	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(CORE_T) $(LIBS) $(MYLIBS)
 
 clean:
+	rcsclean -u
 	$(RM) $(ALL_T) $(ALL_O)
 
 depend:
@@ -136,75 +92,64 @@ echo:
 	@echo "MYLIBS = $(MYLIBS)"
 	@echo "DL = $(DL)"
 
-$(ALL_O): makefile ltests.h
+# DO NOT DELETE
 
-# DO NOT EDIT
-# automatically made with 'gcc -MM l*.c'
-
-lapi.o: lapi.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \
- lobject.h ltm.h lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lstring.h \
- ltable.h lundump.h lvm.h
-lauxlib.o: lauxlib.c lprefix.h lua.h luaconf.h lauxlib.h
-lbaselib.o: lbaselib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-lcode.o: lcode.c lprefix.h lua.h luaconf.h lcode.h llex.h lobject.h \
- llimits.h lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h \
- ldo.h lgc.h lstring.h ltable.h lvm.h
-lcorolib.o: lcorolib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-lctype.o: lctype.c lprefix.h lctype.h lua.h luaconf.h llimits.h
-ldblib.o: ldblib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-ldebug.o: ldebug.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \
- lobject.h ltm.h lzio.h lmem.h lcode.h llex.h lopcodes.h lparser.h \
- ldebug.h ldo.h lfunc.h lstring.h lgc.h ltable.h lvm.h
-ldo.o: ldo.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \
- lobject.h ltm.h lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h lopcodes.h \
- lparser.h lstring.h ltable.h lundump.h lvm.h
-ldump.o: ldump.c lprefix.h lua.h luaconf.h lobject.h llimits.h lstate.h \
- ltm.h lzio.h lmem.h lundump.h
-lfunc.o: lfunc.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h
-lgc.o: lgc.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h
-linit.o: linit.c lprefix.h lua.h luaconf.h lualib.h lauxlib.h
-liolib.o: liolib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-llex.o: llex.c lprefix.h lua.h luaconf.h lctype.h llimits.h ldebug.h \
- lstate.h lobject.h ltm.h lzio.h lmem.h ldo.h lgc.h llex.h lparser.h \
- lstring.h ltable.h
-lmathlib.o: lmathlib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-lmem.o: lmem.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- llimits.h ltm.h lzio.h lmem.h ldo.h lgc.h
-loadlib.o: loadlib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-lobject.o: lobject.c lprefix.h lua.h luaconf.h lctype.h llimits.h \
- ldebug.h lstate.h lobject.h ltm.h lzio.h lmem.h ldo.h lstring.h lgc.h \
- lvm.h
-lopcodes.o: lopcodes.c lprefix.h lopcodes.h llimits.h lua.h luaconf.h
-loslib.o: loslib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-lparser.o: lparser.c lprefix.h lua.h luaconf.h lcode.h llex.h lobject.h \
- llimits.h lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h \
- ldo.h lfunc.h lstring.h lgc.h ltable.h
-lstate.o: lstate.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \
- lobject.h ltm.h lzio.h lmem.h ldebug.h ldo.h lfunc.h lgc.h llex.h \
- lstring.h ltable.h
-lstring.o: lstring.c lprefix.h lua.h luaconf.h ldebug.h lstate.h \
- lobject.h llimits.h ltm.h lzio.h lmem.h ldo.h lstring.h lgc.h
-lstrlib.o: lstrlib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-ltable.o: ltable.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- llimits.h ltm.h lzio.h lmem.h ldo.h lgc.h lstring.h ltable.h lvm.h
-ltablib.o: ltablib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-ltests.o: ltests.c lprefix.h lua.h luaconf.h lapi.h llimits.h lstate.h \
- lobject.h ltm.h lzio.h lmem.h lauxlib.h lcode.h llex.h lopcodes.h \
- lparser.h lctype.h ldebug.h ldo.h lfunc.h lopnames.h lstring.h lgc.h \
- ltable.h lualib.h
-ltm.o: ltm.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- llimits.h ltm.h lzio.h lmem.h ldo.h lgc.h lstring.h ltable.h lvm.h
-lua.o: lua.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-lundump.o: lundump.c lprefix.h lua.h luaconf.h ldebug.h lstate.h \
- lobject.h llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h \
- lundump.h
-lutf8lib.o: lutf8lib.c lprefix.h lua.h luaconf.h lauxlib.h lualib.h
-lvm.o: lvm.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
- llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h \
- ltable.h lvm.h ljumptab.h
-lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
- lobject.h ltm.h lzio.h
+lapi.o: lapi.c lua.h luaconf.h lapi.h lobject.h llimits.h ldebug.h \
+  lstate.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h \
+  lundump.h lvm.h
+lauxlib.o: lauxlib.c lua.h luaconf.h lauxlib.h
+lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h
+lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
+  lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h \
+  ldo.h lgc.h
+ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h
+ldebug.o: ldebug.c lua.h luaconf.h lapi.h lobject.h llimits.h lcode.h \
+  llex.h lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h \
+  ltm.h ldo.h lfunc.h lstring.h lgc.h lvm.h
+ldo.o: ldo.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+  lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h ltable.h \
+  lstring.h lundump.h lvm.h
+ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lopcodes.h lstate.h \
+  ltm.h lzio.h lmem.h lundump.h
+lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h lmem.h \
+  lstate.h ltm.h lzio.h
+lgc.o: lgc.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+  lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h
+linit.o: linit.c lua.h luaconf.h lualib.h lauxlib.h
+liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h
+llex.o: llex.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h ltm.h \
+  lzio.h lmem.h llex.h lparser.h ltable.h lstring.h lgc.h
+lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h
+lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+  ltm.h lzio.h lmem.h ldo.h
+loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h
+lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \
+  ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h
+lopcodes.o: lopcodes.c lua.h luaconf.h lobject.h llimits.h lopcodes.h
+loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h
+lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
+  lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h lstate.h ltm.h \
+  ldo.h lfunc.h lstring.h lgc.h
+lstate.o: lstate.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+  ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h llex.h lstring.h ltable.h
+lstring.o: lstring.c lua.h luaconf.h lmem.h llimits.h lobject.h lstate.h \
+  ltm.h lzio.h lstring.h lgc.h
+lstrlib.o: lstrlib.c lua.h luaconf.h lauxlib.h lualib.h
+ltable.o: ltable.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+  ltm.h lzio.h lmem.h ldo.h lgc.h ltable.h
+ltablib.o: ltablib.c lua.h luaconf.h lauxlib.h lualib.h
+ltests.o: ltests.c lua.h luaconf.h lapi.h lobject.h llimits.h lauxlib.h \
+  lcode.h llex.h lzio.h lmem.h lopcodes.h lparser.h ltable.h ldebug.h \
+  lstate.h ltm.h ldo.h lfunc.h lstring.h lgc.h lualib.h
+ltm.o: ltm.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h lzio.h \
+  lmem.h lstring.h lgc.h ltable.h
+lua.o: lua.c lua.h luaconf.h lauxlib.h lualib.h
+lundump.o: lundump.c lua.h luaconf.h ldebug.h lstate.h lobject.h \
+  llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lopcodes.h lstring.h lgc.h \
+  lundump.h
+lvm.o: lvm.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+  lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h
+lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
+  lzio.h
 
 # (end of Makefile)

manual/2html

@@ -1,519 +0,0 @@
-#!/usr/bin/env lua5.3
-
-
--- special marks:
--- \1 - paragraph (empty line)
--- \4 - remove spaces around it
--- \3 - ref (followed by label|)
-
----------------------------------------------------------------
-header = [[
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-
-<head>
-<title>Lua 5.4 Reference Manual</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-<link rel="stylesheet" href="lua.css">
-<link rel="stylesheet" href="manual.css">
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<hr>
-<h1>
-<a href="http://www.lua.org/home.html"><img src="logo.gif" alt="[Lua logo]" border="0"></a>
-Lua 5.4 Reference Manual
-</h1>
-
-by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes
-<p>
-<small>
-<a href="http://www.lua.org/copyright.html">Copyright</a>
-&copy; 2023 Lua.org, PUC-Rio.  All rights reserved.
-</small>
-<hr>
-
-<!-- ====================================================================== -->
-<p>
-
-]]
-
-footer = "\n\n</body></html>\n\n"
-
-local seefmt = '(see %s)'
-
-if arg[1] == 'port' then
-  seefmt = '(ver %s)'
-  header = string.gsub(header, "by (.-)\n",
-  "%1\n<p>Tradu&ccedil;&atilde;o: S&eacute;rgio Queiroz de Medeiros", 1)
-  header = string.gsub(header, "Lua (%d+.%d+) Reference Manual",
-                               "Manual de Refer&ecirc;ncia de Lua %1")
-  header = string.gsub(header, "All rights reserved",
-                               "Todos os direitos reservados")
-end
-
-
----------------------------------------------------------------
-
-local function compose (f,g)
-  assert(f and g)
-  return function (s) return g(f(s)) end
-end
-
-local function concat (f, g)
-  assert(f and g)
-  return function (s) return f(s) .. g(s) end
-end
-
-
-local Tag = {}
-
-
-setmetatable(Tag, {
-  __index = function (t, tag)
-      local v = function (n, att)
-        local e = ""
-        if type(att) == "table" then
-          for k,v in pairs(att) do e = string.format('%s %s="%s"', e, k, v) end
-        end
-        if n then
-          return string.format("<%s%s>%s</%s>", tag, e, n, tag)
-        else
-          return string.format("<%s%s>", tag, e)
-        end
-      end
-      t[tag] = v
-      return v
-  end
-})
-
-
-
----------------------------------------------------------------
-local labels = {}
-
-
-local function anchor (text, label, link, textlink)
-  if labels[label] then
-    error("label " .. label .. " already defined")
-  end
-  labels[label] = {text = textlink, link = link}
-  return Tag.a(text, {name=link})
-end
-
-local function makeref (label)
-  assert(not string.find(label, "|"))
-  return string.format("\3%s\3", label)
-end
-
-local function ref (label)
-  local l = labels[label]
-  if not l then
-    io.stderr:write("label ", label, " undefined\n")
-    return "@@@@@@@"
-  else
-    return Tag.a(l.text, {href="#"..l.link})
-  end
-end
-
----------------------------------------------------------------
-local function nopara (t)
-  t = string.gsub(t, "\1", "\n\n")
-  t = string.gsub(t, "<p>%s*</p>", "")
-  return t
-end
-
-local function fixpara (t)
-  t = string.gsub(t, "\1", "\n</p>\n\n<p>\n")
-  t = string.gsub(t, "<p>%s*</p>", "")
-  return t
-end
-
-local function antipara (t)
-  return "</p>\n" .. t .. "<p>"
-end
-
-
-Tag.pre = compose(Tag.pre, antipara)
-Tag.ul = compose(Tag.ul, antipara)
-
----------------------------------------------------------------
-local Gfoots = 0
-local footnotes = {}
-
-local line = Tag.hr(nil)
-
-local function dischargefoots ()
-  if #footnotes == 0 then return "" end
-  local fn = table.concat(footnotes)
-  footnotes = {}
-  return line .. Tag.h3"footnotes:" .. fn .. line
-end
-
-
-local Glists = 0
-local listings = {}
-
-local function dischargelist ()
-  if #listings == 0 then return "" end
-  local l = listings
-  listings = {}
-  return line .. table.concat(l, line..line) .. line
-end
-
----------------------------------------------------------------
-local counters = {
-h1 = {val = 1},
-h2 = {father = "h1", val = 1},
-h3 = {father = "h2", val = 1},
-listing = {father = "h1", val = 1},
-}
-
-local function inccounter (count)
-  counters[count].val = counters[count].val + 1
-  for c, v in pairs(counters) do
-    if v.father == count then v.val = 1 end
-  end
-end
-
-local function getcounter (count)
-  local c = counters[count]
-  if c.father then
-    return getcounter(c.father) .. "." .. c.val
-  else
-    return c.val .. ""
-  end
-end
----------------------------------------------------------------
-
-
-local function fixed (x)
-  return function () return x end
-end
-
-local function id (x) return x end
-
-
-local function prepos (x, y)
-  assert(x and y)
-  return function (s) return string.format("%s%s%s", x, s, y) end
-end
-
-
-local rw = Tag.b
-
-
-
-
-local function LuaName (name)
-  return Tag.code(name)
-end
-
-
-local function getparam (s)
-  local i, e = string.find(s, "^[^%s@|]+|")
-  if not i then return nil, s
-  else return string.sub(s, i, e - 1), string.sub(s, e + 1)
-  end
-end
-
-
-local function gettitle (h)
-  local title, p = assert(string.match(h, "<title>(.-)</title>()"))
-  return title, string.sub(h, p)
-end
-
-local function getparamtitle (what, h, nonum)
-    local label, title, c, count
-    label, h = getparam(h)
-    title, h = gettitle(h)
-    if not nonum then
-      count = getcounter(what)
-      inccounter(what)
-      c = string.format("%s &ndash; ", count)
-    else
-      c = ""
-    end
-    label = label or count
-    if label then
-      title = anchor(title, label, count, "&sect;"..count)
-    end
-    title = string.format("%s%s", c, title)
-    return title, h
-end
-
-local function section (what, nonum)
-  return function (h)
-    local title
-    title, h = getparamtitle(what, h, nonum)
-    local fn = what == "h1" and dischargefoots() or ""
-    h = fixpara(Tag.p(h))
-    return "</p>\n" .. Tag[what](title) .. h .. fn ..
-           dischargelist() .. "<p>"
-  end
-end
-
-
-local function verbatim (s)
-  s = nopara(s)
-  s = string.gsub(s, "\n", "\n     ")
-  s = string.gsub(s, "\n%s*$", "\n")
-  return Tag.pre(s)
-end
-
-
-local function verb (s)
-  return Tag.code(s)
-end
-
-
-local function lua2link (e)
-  return string.find(e, "luaL?_") and e or "pdf-"..e
-end
-
-
-local verbfixed = verb
-
-
-local Tex = {
-
-ANSI = function (func)
-           return "ISO&nbsp;C function " .. Tag.code(func)
-         end,
-At = fixed"@",
-B = Tag.b,
-bigskip = fixed"",
-bignum = id,
-C = fixed"",
-Ci = prepos("<!-- ", " -->"),
-CId = function (func)
-        return "C&nbsp;function " .. Tag.code(func)
-      end,
-chapter = section"h1",
-Char = compose(verbfixed, prepos("'", "'")),
-Cdots = fixed"&middot;&middot;&middot;",
-Close = fixed"}",
-col = Tag.td,
-defid = function (name)
-          local l = lua2link(name)
-          local c = Tag.code(name)
-          return anchor(c, l, l, c)
-        end,
-def = Tag.em,
-description = compose(nopara, Tag.ul),
-Em = fixed("\4" .. "&mdash;" .. "\4"),
-emph = Tag.em,
-emphx = Tag.em,    -- emphasis plus index (if there was an index)
-En = fixed("&ndash;"),
-format = fixed"",
-["false"] = fixed(Tag.b"false"),
-id = Tag.code,
-idx = Tag.code,
-index = fixed"",
-Lidx = fixed"",  -- Tag.code,
-ldots = fixed"...",
-x = id,
-itemize = compose(nopara, Tag.ul),
-leq = fixed"&le;",
-Lid = function (s)
-        return makeref(lua2link(s))
-      end,
-M = Tag.em,
-N = function (s) return (string.gsub(s, " ", "&nbsp;")) end,
-NE = id,        -- tag"foreignphrase",
-num = id,
-["nil"] = fixed(Tag.b"nil"),
-fail = fixed(Tag.b"fail"),
-Open = fixed"{",
-part = section("h1", true),
-Pat = compose(verbfixed, prepos("'", "'")),
-preface = section("h1", true),
-psect = section("h2", true),
-Q = prepos('"', '"'),
-refchp = makeref,
-refcode = makeref,
-refsec = makeref,
-
-pi = fixed"&pi;",
-rep = Tag.em,  -- compose(prepos("&lt;", "&gt;"), Tag.em),
-Rw = rw,
-rw = rw,
-sb = Tag.sub,
-sp = Tag.sup,
-St = compose(verbfixed, prepos('"', '"')),
-sect1 = section"h1",
-sect2 = section"h2",
-sect3 = section"h3",
-sect4 = section("h4", true),
-simplesect = id,
-Tab2 = function (s) return Tag.table(s, {border=1}) end,
-row = Tag.tr,
-title = Tag.title,
-todo = Tag.todo,
-["true"] = fixed(Tag.b"true"),
-T = verb,
-
-item = function (s)
-         local t, p = string.match(s, "^([^\n|]+)|()")
-         if t then
-           s = string.sub(s, p)
-           s = Tag.b(t..": ") .. s
-         end
-         return Tag.li(fixpara(s))
-       end,
-
-verbatim = verbatim,
-
-manual = id,
-
-
--- for the manual
-
-link =function (s)
-  local l, t = getparam(s)
-  assert(l)
-  return string.format("%s (%s)", t, makeref(l))
-end,
-
-see = function (s) return string.format(seefmt, makeref(s)) end,
-See = makeref,
-seeC = function (s)
-         return string.format(seefmt, makeref(s))
-       end,
-
-seeF = function (s)
-         return string.format(seefmt, makeref(lua2link(s)))
-       end,
-
-APIEntry = function (e)
-  local h, name
-  h, e = string.match(e, "^%s*(.-)%s*|(.*)$")
-  name = string.match(h, "(luaL?_[%w_]+)%)? +%(") or
-         string.match(h, "luaL?_[%w_]+")
-  local a = anchor(Tag.code(name), name, name, Tag.code(name))
-  local apiicmd, ne = string.match(e, "^(.-</span>)(.*)")
---io.stderr:write(e)
-  if not apiicmd then
-    return antipara(Tag.hr() .. Tag.h3(a)) .. Tag.pre(h) .. e
-  else
-    return antipara(Tag.hr() .. Tag.h3(a)) .. apiicmd .. Tag.pre(h) .. ne
-  end
-end,
-
-LibEntry = function (e)
-  local h, name
-  h, e = string.match(e, "^(.-)|(.*)$")
-  name = string.gsub(h, " (.+", "")
-  local l = lua2link(name)
-  local a = anchor(Tag.code(h), l, l, Tag.code(name))
-  return Tag.hr() .. Tag.h3(a) .. e
-end,
-
-Produc = compose(nopara, Tag.pre),
-producname = prepos("\t", " ::= "),
-Or = fixed" | ",
-VerBar = fixed"&#124;",  -- vertical bar
-OrNL = fixed" | \4",
-bnfNter = prepos("", ""),
-bnfopt = prepos("[", "]"),
-bnfrep = prepos("{", "}"),
-bnfter = compose(Tag.b, prepos("&lsquo;", "&rsquo;")),
-producbody = function (s)
-           s = string.gsub(s, "%s+", " ")
-           s = string.gsub(s, "\4", "\n\t\t")
-           return s
-         end,
-
-apii = function (s)
-        local pop,push,err = string.match(s, "^(.-),(.-),(.*)$")
-        if pop ~= "?" and string.find(pop, "%W") then
-          pop = "(" .. pop .. ")"
-        end
-        if push ~= "?" and string.find(push, "%W") then
-          push = "(" .. push .. ")"
-        end
-        err = (err == "-") and "&ndash;" or Tag.em(err)
-        return Tag.span(
-                 string.format("[-%s, +%s, %s]", pop, push, err),
-                 {class="apii"}
-               )
-      end,
-}
-
-local others = prepos("?? "," ??")
-
-local function trata (t)
-  t = string.gsub(t, "@(%w+)(%b{})", function (w, f)
-        f = trata(string.sub(f, 2, -2))
-        if type(Tex[w]) ~= "function" then
-         io.stderr:write(w .. "\n")
-         return others(f)
-        else
-         return Tex[w](f, w)
-        end
-      end)
-  return t
-end
-
-
----------------------------------------------------------------------
----------------------------------------------------------------------
-
--- read whole book
-t = io.read"*a"
-
-t = string.gsub(t, "[<>&\128-\255]",
-  {["<"] = "&lt;",
-   [">"] = "&gt;",
-   ["&"] = "&amp;",
-   ["\170"] = "&ordf;",
-   ["\186"] = "&ordm;",
-   ["\192"] = "&Agrave;",
-   ["\193"] = "&Aacute;",
-   ["\194"] = "&Acirc;",
-   ["\195"] = "&Atilde;",
-   ["\199"] = "&Ccedil;",
-   ["\201"] = "&Eacute;",
-   ["\202"] = "&Ecirc;",
-   ["\205"] = "&Iacute;",
-   ["\211"] = "&Oacute;",
-   ["\212"] = "&Ocirc;",
-   ["\218"] = "&Uacute;",
-   ["\224"] = "&agrave;",
-   ["\225"] = "&aacute;",
-   ["\226"] = "&acirc;",
-   ["\227"] = "&atilde;",
-   ["\231"] = "&ccedil;",
-   ["\233"] = "&eacute;",
-   ["\234"] = "&ecirc;",
-   ["\237"] = "&iacute;",
-   ["\243"] = "&oacute;",
-   ["\244"] = "&ocirc;",
-   ["\245"] = "&otilde;",
-   ["\250"] = "&uacute;",
-   ["\252"] = "&uuml;"
-  })
-
-t = string.gsub(t, "\n\n+", "\1")
-
-
-
--- complete macros with no arguments
-t = string.gsub(t, "(@%w+)([^{%w])", "%1{}%2")
-
-t = trata(t)
-
--- correct references
-t = string.gsub(t, "\3(.-)\3", ref)
-
--- remove extra space (??)
-t = string.gsub(t, "%s*\4%s*", "")
-
-t = nopara(t)
-
--- HTML 3.2 does not need </p> (but complains when it is in wrong places :)
-t = string.gsub(t, "</p>", "")
-
-io.write(header, t, footer)
-

onelua.c

@@ -1,121 +0,0 @@
-/*
-** Lua core, libraries, and interpreter in a single file.
-** Compiling just this file generates a complete Lua stand-alone
-** program:
-**
-** $ gcc -O2 -std=c99 -o lua onelua.c -lm
-**
-** or
-**
-** $ gcc -O2 -std=c89 -DLUA_USE_C89 -o lua onelua.c -lm
-**
-*/
-
-/* default is to build the full interpreter */
-#ifndef MAKE_LIB
-#ifndef MAKE_LUAC
-#ifndef MAKE_LUA
-#define MAKE_LUA
-#endif
-#endif
-#endif
-
-
-/*
-** Choose suitable platform-specific features. Default is no
-** platform-specific features. Some of these options may need extra
-** libraries such as -ldl -lreadline -lncurses
-*/
-#if 0
-#define LUA_USE_LINUX
-#define LUA_USE_MACOSX
-#define LUA_USE_POSIX
-#define LUA_ANSI
-#endif
-
-
-/* no need to change anything below this line ----------------------------- */
-
-#include "lprefix.h"
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <float.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-
-/* setup for luaconf.h */
-#define LUA_CORE
-#define LUA_LIB
-#define ltable_c
-#define lvm_c
-#include "luaconf.h"
-
-/* do not export internal symbols */
-#undef LUAI_FUNC
-#undef LUAI_DDEC
-#undef LUAI_DDEF
-#define LUAI_FUNC	static
-#define LUAI_DDEC(def)	/* empty */
-#define LUAI_DDEF	static
-
-/* core -- used by all */
-#include "lzio.c"
-#include "lctype.c"
-#include "lopcodes.c"
-#include "lmem.c"
-#include "lundump.c"
-#include "ldump.c"
-#include "lstate.c"
-#include "lgc.c"
-#include "llex.c"
-#include "lcode.c"
-#include "lparser.c"
-#include "ldebug.c"
-#include "lfunc.c"
-#include "lobject.c"
-#include "ltm.c"
-#include "lstring.c"
-#include "ltable.c"
-#include "ldo.c"
-#include "lvm.c"
-#include "lapi.c"
-
-/* auxiliary library -- used by all */
-#include "lauxlib.c"
-
-/* standard library  -- not used by luac */
-#ifndef MAKE_LUAC
-#include "lbaselib.c"
-#include "lcorolib.c"
-#include "ldblib.c"
-#include "liolib.c"
-#include "lmathlib.c"
-#include "loadlib.c"
-#include "loslib.c"
-#include "lstrlib.c"
-#include "ltablib.c"
-#include "lutf8lib.c"
-#include "linit.c"
-#endif
-
-/* lua */
-#ifdef MAKE_LUA
-#include "lua.c"
-#endif
-
-/* luac */
-#ifdef MAKE_LUAC
-#include "luac.c"
-#endif

testes/all.lua

@@ -1,312 +0,0 @@
-#!../lua
--- $Id: testes/all.lua $
--- See Copyright Notice at the end of this file
-
-
-local version = "Lua 5.4"
-if _VERSION ~= version then
-  io.stderr:write("This test suite is for ", version,
-                  ", not for ", _VERSION, "\nExiting tests")
-  return
-end
-
-
-_G.ARG = arg   -- save arg for other tests
-
-
--- next variables control the execution of some tests
--- true means no test (so an undefined variable does not skip a test)
--- defaults are for Linux; test everything.
--- Make true to avoid long or memory consuming tests
-_soft = rawget(_G, "_soft") or false
--- Make true to avoid non-portable tests
-_port = rawget(_G, "_port") or false
--- Make true to avoid messages about tests not performed
-_nomsg = rawget(_G, "_nomsg") or false
-
-
-local usertests = rawget(_G, "_U")
-
-if usertests then
-  -- tests for sissies ;)  Avoid problems
-  _soft = true
-  _port = true
-  _nomsg = true
-end
-
--- tests should require debug when needed
-debug = nil
-
-
-if usertests then
-  T = nil    -- no "internal" tests for user tests
-else
-  T = rawget(_G, "T")  -- avoid problems with 'strict' module
-end
-
-
---[=[
-  example of a long [comment],
-  [[spanning several [lines]]]
-
-]=]
-
-print("\n\tStarting Tests")
-
-do
-  -- set random seed
-  local random_x, random_y = math.randomseed()
-  print(string.format("random seeds: %d, %d", random_x, random_y))
-end
-
-print("current path:\n****" .. package.path .. "****\n")
-
-
-local initclock = os.clock()
-local lastclock = initclock
-local walltime = os.time()
-
-local collectgarbage = collectgarbage
-
-do   -- (
-
--- track messages for tests not performed
-local msgs = {}
-function Message (m)
-  if not _nomsg then
-    print(m)
-    msgs[#msgs+1] = string.sub(m, 3, -3)
-  end
-end
-
-assert(os.setlocale"C")
-
-local T,print,format,write,assert,type,unpack,floor =
-      T,print,string.format,io.write,assert,type,table.unpack,math.floor
-
--- use K for 1000 and M for 1000000 (not 2^10 -- 2^20)
-local function F (m)
-  local function round (m)
-    m = m + 0.04999
-    return format("%.1f", m)      -- keep one decimal digit
-  end
-  if m < 1000 then return m
-  else
-    m = m / 1000
-    if m < 1000 then return round(m).."K"
-    else
-      return round(m/1000).."M"
-    end
-  end
-end
-
-local Cstacklevel
-
-local showmem
-if not T then
-  local max = 0
-  showmem = function ()
-    local m = collectgarbage("count") * 1024
-    max = (m > max) and m or max
-    print(format("    ---- total memory: %s, max memory: %s ----\n",
-          F(m), F(max)))
-  end
-  Cstacklevel = function () return 0 end   -- no info about stack level
-else
-  showmem = function ()
-    T.checkmemory()
-    local total, numblocks, maxmem = T.totalmem()
-    local count = collectgarbage("count")
-    print(format(
-      "\n    ---- total memory: %s (%.0fK), max use: %s,  blocks: %d\n",
-      F(total), count, F(maxmem), numblocks))
-    print(format("\t(strings:  %d, tables: %d, functions: %d, "..
-                 "\n\tudata: %d, threads: %d)",
-                 T.totalmem"string", T.totalmem"table", T.totalmem"function",
-                 T.totalmem"userdata", T.totalmem"thread"))
-  end
-
-  Cstacklevel = function ()
-    local _, _, ncalls = T.stacklevel()
-    return ncalls    -- number of C calls
-  end
-end
-
-
-local Cstack = Cstacklevel()
-
---
--- redefine dofile to run files through dump/undump
---
-local function report (n) print("\n***** FILE '"..n.."'*****") end
-local olddofile = dofile
-local dofile = function (n, strip)
-  showmem()
-  local c = os.clock()
-  print(string.format("time: %g (+%g)", c - initclock, c - lastclock))
-  lastclock = c
-  report(n)
-  local f = assert(loadfile(n))
-  local b = string.dump(f, strip)
-  f = assert(load(b))
-  return f()
-end
-
-dofile('main.lua')
-
--- trace GC cycles
-require"tracegc".start()
-
-report"gc.lua"
-local f = assert(loadfile('gc.lua'))
-f()
-
-dofile('db.lua')
-assert(dofile('calls.lua') == deep and deep)
-_G.deep = nil
-olddofile('strings.lua')
-olddofile('literals.lua')
-dofile('tpack.lua')
-assert(dofile('attrib.lua') == 27)
-dofile('gengc.lua')
-assert(dofile('locals.lua') == 5)
-dofile('constructs.lua')
-dofile('code.lua', true)
-if not _G._soft then
-  report('big.lua')
-  local f = coroutine.wrap(assert(loadfile('big.lua')))
-  assert(f() == 'b')
-  assert(f() == 'a')
-end
-dofile('cstack.lua')
-dofile('nextvar.lua')
-dofile('pm.lua')
-dofile('utf8.lua')
-dofile('api.lua')
-assert(dofile('events.lua') == 12)
-dofile('vararg.lua')
-dofile('closure.lua')
-dofile('coroutine.lua')
-dofile('goto.lua', true)
-dofile('errors.lua')
-dofile('math.lua')
-dofile('sort.lua', true)
-dofile('bitwise.lua')
-assert(dofile('verybig.lua', true) == 10); collectgarbage()
-dofile('files.lua')
-
-if #msgs > 0 then
-  local m = table.concat(msgs, "\n  ")
-  warn("#tests not performed:\n  ", m, "\n")
-end
-
-print("(there should be two warnings now)")
-warn("@on")
-warn("#This is ", "an expected", " warning")
-warn("@off")
-warn("******** THIS WARNING SHOULD NOT APPEAR **********")
-warn("******** THIS WARNING ALSO SHOULD NOT APPEAR **********")
-warn("@on")
-warn("#This is", " another one")
-
--- no test module should define 'debug'
-assert(debug == nil)
-
-local debug = require "debug"
-
-print(string.format("%d-bit integers, %d-bit floats",
-        string.packsize("j") * 8, string.packsize("n") * 8))
-
-debug.sethook(function (a) assert(type(a) == 'string') end, "cr")
-
--- to survive outside block
-_G.showmem = showmem
-
-
-assert(Cstack == Cstacklevel(),
-  "should be at the same C-stack level it was when started the tests")
-
-end   --)
-
-local _G, showmem, print, format, clock, time, difftime,
-      assert, open, warn =
-      _G, showmem, print, string.format, os.clock, os.time, os.difftime,
-      assert, io.open, warn
-
--- file with time of last performed test
-local fname = T and "time-debug.txt" or "time.txt"
-local lasttime
-
-if not usertests then
-  -- open file with time of last performed test
-  local f = io.open(fname)
-  if f then
-    lasttime = assert(tonumber(f:read'a'))
-    f:close();
-  else   -- no such file; assume it is recording time for first time
-    lasttime = nil
-  end
-end
-
--- erase (almost) all globals
-print('cleaning all!!!!')
-for n in pairs(_G) do
-  if not ({___Glob = 1, tostring = 1})[n] then
-    _G[n] = undef
-  end
-end
-
-
-collectgarbage()
-collectgarbage()
-collectgarbage()
-collectgarbage()
-collectgarbage()
-collectgarbage();showmem()
-
-local clocktime = clock() - initclock
-walltime = difftime(time(), walltime)
-
-print(format("\n\ntotal time: %.2fs (wall time: %gs)\n", clocktime, walltime))
-
-if not usertests then
-  lasttime = lasttime or clocktime    -- if no last time, ignore difference
-  -- check whether current test time differs more than 5% from last time
-  local diff = (clocktime - lasttime) / lasttime
-  local tolerance = 0.05    -- 5%
-  if (diff >= tolerance or diff <= -tolerance) then
-    warn(format("#time difference from previous test: %+.1f%%",
-                  diff * 100))
-  end
-  assert(open(fname, "w")):write(clocktime):close()
-end
-
-print("final OK !!!")
-
-
-
---[[
-*****************************************************************************
-* Copyright (C) 1994-2016 Lua.org, PUC-Rio.
-*
-* Permission is hereby granted, free of charge, to any person obtaining
-* a copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to
-* permit persons to whom the Software is furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice shall be
-* included in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*****************************************************************************
-]]
-

testes/attrib.lua

@@ -1,527 +0,0 @@
--- $Id: testes/attrib.lua $
--- See Copyright Notice in file all.lua
-
-print "testing require"
-
-assert(require"string" == string)
-assert(require"math" == math)
-assert(require"table" == table)
-assert(require"io" == io)
-assert(require"os" == os)
-assert(require"coroutine" == coroutine)
-
-assert(type(package.path) == "string")
-assert(type(package.cpath) == "string")
-assert(type(package.loaded) == "table")
-assert(type(package.preload) == "table")
-
-assert(type(package.config) == "string")
-print("package config: "..string.gsub(package.config, "\n", "|"))
-
-do
-  -- create a path with 'max' templates,
-  -- each with 1-10 repetitions of '?'
-  local max = _soft and 100 or 2000
-  local t = {}
-  for i = 1,max do t[i] = string.rep("?", i%10 + 1) end
-  t[#t + 1] = ";"    -- empty template
-  local path = table.concat(t, ";")
-  -- use that path in a search
-  local s, err = package.searchpath("xuxu", path)
-  -- search fails; check that message has an occurrence of
-  -- '??????????' with ? replaced by xuxu and at least 'max' lines
-  assert(not s and
-         string.find(err, string.rep("xuxu", 10)) and
-         #string.gsub(err, "[^\n]", "") >= max)
-  -- path with one very long template
-  local path = string.rep("?", max)
-  local s, err = package.searchpath("xuxu", path)
-  assert(not s and string.find(err, string.rep('xuxu', max)))
-end
-
-do
-  local oldpath = package.path
-  package.path = {}
-  local s, err = pcall(require, "no-such-file")
-  assert(not s and string.find(err, "package.path"))
-  package.path = oldpath
-end
-
-
-do  print"testing 'require' message"
-  local oldpath = package.path
-  local oldcpath = package.cpath
-
-  package.path = "?.lua;?/?"
-  package.cpath = "?.so;?/init"
-
-  local st, msg = pcall(require, 'XXX')
-
-  local expected = [[module 'XXX' not found:
-	no field package.preload['XXX']
-	no file 'XXX.lua'
-	no file 'XXX/XXX'
-	no file 'XXX.so'
-	no file 'XXX/init']]
-
-  assert(msg == expected)
-
-  package.path = oldpath
-  package.cpath = oldcpath
-end
-
-print('+')
-
-
--- The next tests for 'require' assume some specific directories and
--- libraries.
-
-if not _port then --[
-
-local dirsep = string.match(package.config, "^([^\n]+)\n")
-
--- auxiliary directory with C modules and temporary files
-local DIR = "libs" .. dirsep
-
--- prepend DIR to a name and correct directory separators
-local function D (x)
-  local x = string.gsub(x, "/", dirsep)
-  return DIR .. x
-end
-
--- prepend DIR and pospend proper C lib. extension to a name
-local function DC (x)
-  local ext = (dirsep == '\\') and ".dll" or ".so"
-  return D(x .. ext)
-end
-
-
-local function createfiles (files, preextras, posextras)
-  for n,c in pairs(files) do
-    io.output(D(n))
-    io.write(string.format(preextras, n))
-    io.write(c)
-    io.write(string.format(posextras, n))
-    io.close(io.output())
-  end
-end
-
-local function removefiles (files)
-  for n in pairs(files) do
-    os.remove(D(n))
-  end
-end
-
-local files = {
-  ["names.lua"] = "do return {...} end\n",
-  ["err.lua"] = "B = 15; a = a + 1;",
-  ["synerr.lua"] = "B =",
-  ["A.lua"] = "",
-  ["B.lua"] = "assert(...=='B');require 'A'",
-  ["A.lc"] = "",
-  ["A"] = "",
-  ["L"] = "",
-  ["XXxX"] = "",
-  ["C.lua"] = "package.loaded[...] = 25; require'C'",
-}
-
-AA = nil
-local extras = [[
-NAME = '%s'
-REQUIRED = ...
-return AA]]
-
-createfiles(files, "", extras)
-
--- testing explicit "dir" separator in 'searchpath'
-assert(package.searchpath("C.lua", D"?", "", "") == D"C.lua")
-assert(package.searchpath("C.lua", D"?", ".", ".") == D"C.lua")
-assert(package.searchpath("--x-", D"?", "-", "X") == D"XXxX")
-assert(package.searchpath("---xX", D"?", "---", "XX") == D"XXxX")
-assert(package.searchpath(D"C.lua", "?", dirsep) == D"C.lua")
-assert(package.searchpath(".\\C.lua", D"?", "\\") == D"./C.lua")
-
-local oldpath = package.path
-
-package.path = string.gsub("D/?.lua;D/?.lc;D/?;D/??x?;D/L", "D/", DIR)
-
-local try = function (p, n, r, ext)
-  NAME = nil
-  local rr, x = require(p)
-  assert(NAME == n)
-  assert(REQUIRED == p)
-  assert(rr == r)
-  assert(ext == x)
-end
-
-local a = require"names"
-assert(a[1] == "names" and a[2] == D"names.lua")
-
-local st, msg = pcall(require, "err")
-assert(not st and string.find(msg, "arithmetic") and B == 15)
-st, msg = pcall(require, "synerr")
-assert(not st and string.find(msg, "error loading module"))
-
-assert(package.searchpath("C", package.path) == D"C.lua")
-assert(require"C" == 25)
-assert(require"C" == 25)
-AA = nil
-try('B', 'B.lua', true, "libs/B.lua")
-assert(package.loaded.B)
-assert(require"B" == true)
-assert(package.loaded.A)
-assert(require"C" == 25)
-package.loaded.A = nil
-try('B', nil, true, nil)   -- should not reload package
-try('A', 'A.lua', true, "libs/A.lua")
-package.loaded.A = nil
-os.remove(D'A.lua')
-AA = {}
-try('A', 'A.lc', AA, "libs/A.lc")  -- now must find second option
-assert(package.searchpath("A", package.path) == D"A.lc")
-assert(require("A") == AA)
-AA = false
-try('K', 'L', false, "libs/L")     -- default option
-try('K', 'L', false, "libs/L")     -- default option (should reload it)
-assert(rawget(_G, "_REQUIREDNAME") == nil)
-
-AA = "x"
-try("X", "XXxX", AA, "libs/XXxX")
-
-
-removefiles(files)
-NAME, REQUIRED, AA, B = nil
-
-
--- testing require of sub-packages
-
-local _G = _G
-
-package.path = string.gsub("D/?.lua;D/?/init.lua", "D/", DIR)
-
-files = {
-  ["P1/init.lua"] = "AA = 10",
-  ["P1/xuxu.lua"] = "AA = 20",
-}
-
-createfiles(files, "_ENV = {}\n", "\nreturn _ENV\n")
-AA = 0
-
-local m, ext = assert(require"P1")
-assert(ext == "libs/P1/init.lua")
-assert(AA == 0 and m.AA == 10)
-assert(require"P1" == m)
-assert(require"P1" == m)
-
-assert(package.searchpath("P1.xuxu", package.path) == D"P1/xuxu.lua")
-m.xuxu, ext = assert(require"P1.xuxu")
-assert(AA == 0 and m.xuxu.AA == 20)
-assert(ext == "libs/P1/xuxu.lua")
-assert(require"P1.xuxu" == m.xuxu)
-assert(require"P1.xuxu" == m.xuxu)
-assert(require"P1" == m and m.AA == 10)
-
-
-removefiles(files)
-AA = nil
-
-package.path = ""
-assert(not pcall(require, "file_does_not_exist"))
-package.path = "??\0?"
-assert(not pcall(require, "file_does_not_exist1"))
-
-package.path = oldpath
-
--- check 'require' error message
-local fname = "file_does_not_exist2"
-local m, err = pcall(require, fname)
-for t in string.gmatch(package.path..";"..package.cpath, "[^;]+") do
-  t = string.gsub(t, "?", fname)
-  assert(string.find(err, t, 1, true))
-end
-
-do  -- testing 'package.searchers' not being a table
-  local searchers = package.searchers
-  package.searchers = 3
-  local st, msg = pcall(require, 'a')
-  assert(not st and string.find(msg, "must be a table"))
-  package.searchers = searchers
-end
-
-local function import(...)
-  local f = {...}
-  return function (m)
-    for i=1, #f do m[f[i]] = _G[f[i]] end
-  end
-end
-
--- cannot change environment of a C function
-assert(not pcall(module, 'XUXU'))
-
-
-
--- testing require of C libraries
-
-
-local p = ""   -- On Mac OS X, redefine this to "_"
-
--- check whether loadlib works in this system
-local st, err, when = package.loadlib(DC"lib1", "*")
-if not st then
-  local f, err, when = package.loadlib("donotexist", p.."xuxu")
-  assert(not f and type(err) == "string" and when == "absent")
-  ;(Message or print)('\n >>> cannot load dynamic library <<<\n')
-  print(err, when)
-else
-  -- tests for loadlib
-  local f = assert(package.loadlib(DC"lib1", p.."onefunction"))
-  local a, b = f(15, 25)
-  assert(a == 25 and b == 15)
-
-  f = assert(package.loadlib(DC"lib1", p.."anotherfunc"))
-  assert(f(10, 20) == "10%20\n")
-
-  -- check error messages
-  local f, err, when = package.loadlib(DC"lib1", p.."xuxu")
-  assert(not f and type(err) == "string" and when == "init")
-  f, err, when = package.loadlib("donotexist", p.."xuxu")
-  assert(not f and type(err) == "string" and when == "open")
-
-  -- symbols from 'lib1' must be visible to other libraries
-  f = assert(package.loadlib(DC"lib11", p.."luaopen_lib11"))
-  assert(f() == "exported")
-
-  -- test C modules with prefixes in names
-  package.cpath = DC"?"
-  local lib2, ext = require"lib2-v2"
-  assert(string.find(ext, "libs/lib2-v2", 1, true))
-  -- check correct access to global environment and correct
-  -- parameters
-  assert(_ENV.x == "lib2-v2" and _ENV.y == DC"lib2-v2")
-  assert(lib2.id("x") == true)   -- a different "id" implementation
-
-  -- test C submodules
-  local fs, ext = require"lib1.sub"
-  assert(_ENV.x == "lib1.sub" and _ENV.y == DC"lib1")
-  assert(string.find(ext, "libs/lib1", 1, true))
-  assert(fs.id(45) == 45)
-  _ENV.x, _ENV.y = nil
-end
-
-_ENV = _G
-
-
--- testing preload
-
-do
-  local p = package
-  package = {}
-  p.preload.pl = function (...)
-    local _ENV = {...}
-    function xuxu (x) return x+20 end
-    return _ENV
-  end
-
-  local pl, ext = require"pl"
-  assert(require"pl" == pl)
-  assert(pl.xuxu(10) == 30)
-  assert(pl[1] == "pl" and pl[2] == ":preload:" and ext == ":preload:")
-
-  package = p
-  assert(type(package.path) == "string")
-end
-
-print('+')
-
-end  --]
-
-print("testing assignments, logical operators, and constructors")
-
-local res, res2 = 27
-
-local a, b = 1, 2+3
-assert(a==1 and b==5)
-a={}
-local function f() return 10, 11, 12 end
-a.x, b, a[1] = 1, 2, f()
-assert(a.x==1 and b==2 and a[1]==10)
-a[f()], b, a[f()+3] = f(), a, 'x'
-assert(a[10] == 10 and b == a and a[13] == 'x')
-
-do
-  local f = function (n) local x = {}; for i=1,n do x[i]=i end;
-                         return table.unpack(x) end;
-  local a,b,c
-  a,b = 0, f(1)
-  assert(a == 0 and b == 1)
-  a,b = 0, f(1)
-  assert(a == 0 and b == 1)
-  a,b,c = 0,5,f(4)
-  assert(a==0 and b==5 and c==1)
-  a,b,c = 0,5,f(0)
-  assert(a==0 and b==5 and c==nil)
-end
-
-local a, b, c, d = 1 and nil, 1 or nil, (1 and (nil or 1)), 6
-assert(not a and b and c and d==6)
-
-d = 20
-a, b, c, d = f()
-assert(a==10 and b==11 and c==12 and d==nil)
-a,b = f(), 1, 2, 3, f()
-assert(a==10 and b==1)
-
-assert(a<b == false and a>b == true)
-assert((10 and 2) == 2)
-assert((10 or 2) == 10)
-assert((10 or assert(nil)) == 10)
-assert(not (nil and assert(nil)))
-assert((nil or "alo") == "alo")
-assert((nil and 10) == nil)
-assert((false and 10) == false)
-assert((true or 10) == true)
-assert((false or 10) == 10)
-assert(false ~= nil)
-assert(nil ~= false)
-assert(not nil == true)
-assert(not not nil == false)
-assert(not not 1 == true)
-assert(not not a == true)
-assert(not not (6 or nil) == true)
-assert(not not (nil and 56) == false)
-assert(not not (nil and true) == false)
-assert(not 10 == false)
-assert(not {} == false)
-assert(not 0.5 == false)
-assert(not "x" == false)
-
-assert({} ~= {})
-print('+')
-
-a = {}
-a[true] = 20
-a[false] = 10
-assert(a[1<2] == 20 and a[1>2] == 10)
-
-function f(a) return a end
-
-local a = {}
-for i=3000,-3000,-1 do a[i + 0.0] = i; end
-a[10e30] = "alo"; a[true] = 10; a[false] = 20
-assert(a[10e30] == 'alo' and a[not 1] == 20 and a[10<20] == 10)
-for i=3000,-3000,-1 do assert(a[i] == i); end
-a[print] = assert
-a[f] = print
-a[a] = a
-assert(a[a][a][a][a][print] == assert)
-a[print](a[a[f]] == a[print])
-assert(not pcall(function () local a = {}; a[nil] = 10 end))
-assert(not pcall(function () local a = {[nil] = 10} end))
-assert(a[nil] == undef)
-a = nil
-
-local a, b, c
-a = {10,9,8,7,6,5,4,3,2; [-3]='a', [f]=print, a='a', b='ab'}
-a, a.x, a.y = a, a[-3]
-assert(a[1]==10 and a[-3]==a.a and a[f]==print and a.x=='a' and not a.y)
-a[1], f(a)[2], b, c = {['alo']=assert}, 10, a[1], a[f], 6, 10, 23, f(a), 2
-a[1].alo(a[2]==10 and b==10 and c==print)
-
-a.aVeryLongName012345678901234567890123456789012345678901234567890123456789 = 10
-local function foo ()
-  return a.aVeryLongName012345678901234567890123456789012345678901234567890123456789
-end
-assert(foo() == 10 and
-a.aVeryLongName012345678901234567890123456789012345678901234567890123456789 ==
-10)
-
-
-do
-  -- _ENV constant
-  local function foo ()
-    local _ENV <const> = 11
-    X = "hi"
-  end
-  local st, msg = pcall(foo)
-  assert(not st and string.find(msg, "number"))
-end
-
-
--- test of large float/integer indices 
-
--- compute maximum integer where all bits fit in a float
-local maxint = math.maxinteger
-
--- trim (if needed) to fit in a float
-while maxint ~= (maxint + 0.0) or (maxint - 1) ~= (maxint - 1.0) do
-  maxint = maxint // 2
-end
-
-local maxintF = maxint + 0.0   -- float version
-
-assert(maxintF == maxint and math.type(maxintF) == "float" and
-       maxintF >= 2.0^14)
-
--- floats and integers must index the same places
-a[maxintF] = 10; a[maxintF - 1.0] = 11;
-a[-maxintF] = 12; a[-maxintF + 1.0] = 13;
-
-assert(a[maxint] == 10 and a[maxint - 1] == 11 and
-       a[-maxint] == 12 and a[-maxint + 1] == 13)
-
-a[maxint] = 20
-a[-maxint] = 22
-
-assert(a[maxintF] == 20 and a[maxintF - 1.0] == 11 and
-       a[-maxintF] == 22 and a[-maxintF + 1.0] == 13)
-
-a = nil
-
-
--- test conflicts in multiple assignment
-do
-  local a,i,j,b
-  a = {'a', 'b'}; i=1; j=2; b=a
-  i, a[i], a, j, a[j], a[i+j] = j, i, i, b, j, i
-  assert(i == 2 and b[1] == 1 and a == 1 and j == b and b[2] == 2 and
-         b[3] == 1)
-  a = {}
-  local function foo ()    -- assigining to upvalues
-    b, a.x, a = a, 10, 20
-  end
-  foo()
-  assert(a == 20 and b.x == 10)
-end
-
--- repeat test with upvalues
-do
-  local a,i,j,b
-  a = {'a', 'b'}; i=1; j=2; b=a
-  local function foo ()
-    i, a[i], a, j, a[j], a[i+j] = j, i, i, b, j, i
-  end
-  foo()
-  assert(i == 2 and b[1] == 1 and a == 1 and j == b and b[2] == 2 and
-         b[3] == 1)
-  local t = {}
-  (function (a) t[a], a = 10, 20  end)(1);
-  assert(t[1] == 10)
-end
-
--- bug in 5.2 beta
-local function foo ()
-  local a
-  return function ()
-    local b
-    a, b = 3, 14    -- local and upvalue have same index
-    return a, b
-  end
-end
-
-local a, b = foo()()
-assert(a == 3 and b == 14)
-
-print('OK')
-
-return res
-

testes/big.lua

@@ -1,82 +0,0 @@
--- $Id: testes/big.lua $
--- See Copyright Notice in file all.lua
-
-if _soft then
-  return 'a'
-end
-
-print "testing large tables"
-
-local debug = require"debug" 
-
-local lim = 2^18 + 1000
-local prog = { "local y = {0" }
-for i = 1, lim do prog[#prog + 1] = i  end
-prog[#prog + 1] = "}\n"
-prog[#prog + 1] = "X = y\n"
-prog[#prog + 1] = ("assert(X[%d] == %d)"):format(lim - 1, lim - 2)
-prog[#prog + 1] = "return 0"
-prog = table.concat(prog, ";")
-
-local env = {string = string, assert = assert}
-local f = assert(load(prog, nil, nil, env))
-
-f()
-assert(env.X[lim] == lim - 1 and env.X[lim + 1] == lim)
-for k in pairs(env) do env[k] = undef end
-
--- yields during accesses larger than K (in RK)
-setmetatable(env, {
-  __index = function (t, n) coroutine.yield('g'); return _G[n] end,
-  __newindex = function (t, n, v) coroutine.yield('s'); _G[n] = v end,
-})
-
-X = nil
-local co = coroutine.wrap(f)
-assert(co() == 's')
-assert(co() == 'g')
-assert(co() == 'g')
-assert(co() == 0)
-
-assert(X[lim] == lim - 1 and X[lim + 1] == lim)
-
--- errors in accesses larger than K (in RK)
-getmetatable(env).__index = function () end
-getmetatable(env).__newindex = function () end
-local e, m = pcall(f)
-assert(not e and m:find("global 'X'"))
-
--- errors in metamethods 
-getmetatable(env).__newindex = function () error("hi") end
-local e, m = xpcall(f, debug.traceback)
-assert(not e and m:find("'newindex'"))
-
-f, X = nil
-
-coroutine.yield'b'
-
-if 2^32 == 0 then   -- (small integers) {   
-
-print "testing string length overflow"
-
-local repstrings = 192          -- number of strings to be concatenated
-local ssize = math.ceil(2.0^32 / repstrings) + 1   -- size of each string
-
-assert(repstrings * ssize > 2.0^32)  -- it should be larger than maximum size
-
-local longs = string.rep("\0", ssize)   -- create one long string
-
--- create function to concatenate 'repstrings' copies of its argument
-local rep = assert(load(
-  "local a = ...; return " .. string.rep("a", repstrings, "..")))
-
-local a, b = pcall(rep, longs)   -- call that function
-
--- it should fail without creating string (result would be too large)
-assert(not a and string.find(b, "overflow"))
-
-end   -- }
-
-print'OK'
-
-return 'a'

testes/bitwise.lua

@@ -1,363 +0,0 @@
--- $Id: testes/bitwise.lua $
--- See Copyright Notice in file all.lua
-
-print("testing bitwise operations")
-
-require "bwcoercion"
-
-local numbits = string.packsize('j') * 8
-
-assert(~0 == -1)
-
-assert((1 << (numbits - 1)) == math.mininteger)
-
--- basic tests for bitwise operators;
--- use variables to avoid constant folding
-local a, b, c, d
-a = 0xFFFFFFFFFFFFFFFF
-assert(a == -1 and a & -1 == a and a & 35 == 35)
-a = 0xF0F0F0F0F0F0F0F0
-assert(a | -1 == -1)
-assert(a ~ a == 0 and a ~ 0 == a and a ~ ~a == -1)
-assert(a >> 4 == ~a)
-a = 0xF0; b = 0xCC; c = 0xAA; d = 0xFD
-assert(a | b ~ c & d == 0xF4)
-
-a = 0xF0.0; b = 0xCC.0; c = "0xAA.0"; d = "0xFD.0"
-assert(a | b ~ c & d == 0xF4)
-
-a = 0xF0000000; b = 0xCC000000;
-c = 0xAA000000; d = 0xFD000000
-assert(a | b ~ c & d == 0xF4000000)
-assert(~~a == a and ~a == -1 ~ a and -d == ~d + 1)
-
-a = a << 32
-b = b << 32
-c = c << 32
-d = d << 32
-assert(a | b ~ c & d == 0xF4000000 << 32)
-assert(~~a == a and ~a == -1 ~ a and -d == ~d + 1)
-
-
-do   -- constant folding
-  local code = string.format("return -1 >> %d", math.maxinteger)
-  assert(load(code)() == 0)
-  local code = string.format("return -1 >> %d", math.mininteger)
-  assert(load(code)() == 0)
-  local code = string.format("return -1 << %d", math.maxinteger)
-  assert(load(code)() == 0)
-  local code = string.format("return -1 << %d", math.mininteger)
-  assert(load(code)() == 0)
-end
-
-assert(-1 >> 1 == (1 << (numbits - 1)) - 1 and 1 << 31 == 0x80000000)
-assert(-1 >> (numbits - 1) == 1)
-assert(-1 >> numbits == 0 and
-       -1 >> -numbits == 0 and
-       -1 << numbits == 0 and
-       -1 << -numbits == 0)
-
-assert(1 >> math.mininteger == 0)
-assert(1 >> math.maxinteger == 0)
-assert(1 << math.mininteger == 0)
-assert(1 << math.maxinteger == 0)
-
-assert((2^30 - 1) << 2^30 == 0)
-assert((2^30 - 1) >> 2^30 == 0)
-
-assert(1 >> -3 == 1 << 3 and 1000 >> 5 == 1000 << -5)
-
-
--- coercion from strings to integers
-assert("0xffffffffffffffff" | 0 == -1)
-assert("0xfffffffffffffffe" & "-1" == -2)
-assert(" \t-0xfffffffffffffffe\n\t" & "-1" == 2)
-assert("   \n  -45  \t " >> "  -2  " == -45 * 4)
-assert("1234.0" << "5.0" == 1234 * 32)
-assert("0xffff.0" ~ "0xAAAA" == 0x5555)
-assert(~"0x0.000p4" == -1)
-
-assert(("7" .. 3) << 1 == 146)
-assert(0xffffffff >> (1 .. "9") == 0x1fff)
-assert(10 | (1 .. "9") == 27)
-
-do
-  local st, msg = pcall(function () return 4 & "a" end)
-  assert(string.find(msg, "'band'"))
-
-  local st, msg = pcall(function () return ~"a" end)
-  assert(string.find(msg, "'bnot'"))
-end
-
-
--- out of range number
-assert(not pcall(function () return "0xffffffffffffffff.0" | 0 end))
-
--- embedded zeros
-assert(not pcall(function () return "0xffffffffffffffff\0" | 0 end))
-
-print'+'
-
-
-package.preload.bit32 = function ()     --{
-
--- no built-in 'bit32' library: implement it using bitwise operators
-
-local bit = {}
-
-function bit.bnot (a)
-  return ~a & 0xFFFFFFFF
-end
-
-
---
--- in all vararg functions, avoid creating 'arg' table when there are
--- only 2 (or less) parameters, as 2 parameters is the common case
---
-
-function bit.band (x, y, z, ...)
-  if not z then
-    return ((x or -1) & (y or -1)) & 0xFFFFFFFF
-  else
-    local arg = {...}
-    local res = x & y & z
-    for i = 1, #arg do res = res & arg[i] end
-    return res & 0xFFFFFFFF
-  end
-end
-
-function bit.bor (x, y, z, ...)
-  if not z then
-    return ((x or 0) | (y or 0)) & 0xFFFFFFFF
-  else
-    local arg = {...}
-    local res = x | y | z
-    for i = 1, #arg do res = res | arg[i] end
-    return res & 0xFFFFFFFF
-  end
-end
-
-function bit.bxor (x, y, z, ...)
-  if not z then
-    return ((x or 0) ~ (y or 0)) & 0xFFFFFFFF
-  else
-    local arg = {...}
-    local res = x ~ y ~ z
-    for i = 1, #arg do res = res ~ arg[i] end
-    return res & 0xFFFFFFFF
-  end
-end
-
-function bit.btest (...)
-  return bit.band(...) ~= 0
-end
-
-function bit.lshift (a, b)
-  return ((a & 0xFFFFFFFF) << b) & 0xFFFFFFFF
-end
-
-function bit.rshift (a, b)
-  return ((a & 0xFFFFFFFF) >> b) & 0xFFFFFFFF
-end
-
-function bit.arshift (a, b)
-  a = a & 0xFFFFFFFF
-  if b <= 0 or (a & 0x80000000) == 0 then
-    return (a >> b) & 0xFFFFFFFF
-  else
-    return ((a >> b) | ~(0xFFFFFFFF >> b)) & 0xFFFFFFFF
-  end
-end
-
-function bit.lrotate (a ,b)
-  b = b & 31
-  a = a & 0xFFFFFFFF
-  a = (a << b) | (a >> (32 - b))
-  return a & 0xFFFFFFFF
-end
-
-function bit.rrotate (a, b)
-  return bit.lrotate(a, -b)
-end
-
-local function checkfield (f, w)
-  w = w or 1
-  assert(f >= 0, "field cannot be negative")
-  assert(w > 0, "width must be positive")
-  assert(f + w <= 32, "trying to access non-existent bits")
-  return f, ~(-1 << w)
-end
-
-function bit.extract (a, f, w)
-  local f, mask = checkfield(f, w)
-  return (a >> f) & mask
-end
-
-function bit.replace (a, v, f, w)
-  local f, mask = checkfield(f, w)
-  v = v & mask
-  a = (a & ~(mask << f)) | (v << f)
-  return a & 0xFFFFFFFF
-end
-
-return bit
-
-end  --}
-
-
-print("testing bitwise library")
-
-local bit32 = require'bit32'
-
-assert(bit32.band() == bit32.bnot(0))
-assert(bit32.btest() == true)
-assert(bit32.bor() == 0)
-assert(bit32.bxor() == 0)
-
-assert(bit32.band() == bit32.band(0xffffffff))
-assert(bit32.band(1,2) == 0)
-
-
--- out-of-range numbers
-assert(bit32.band(-1) == 0xffffffff)
-assert(bit32.band((1 << 33) - 1) == 0xffffffff)
-assert(bit32.band(-(1 << 33) - 1) == 0xffffffff)
-assert(bit32.band((1 << 33) + 1) == 1)
-assert(bit32.band(-(1 << 33) + 1) == 1)
-assert(bit32.band(-(1 << 40)) == 0)
-assert(bit32.band(1 << 40) == 0)
-assert(bit32.band(-(1 << 40) - 2) == 0xfffffffe)
-assert(bit32.band((1 << 40) - 4) == 0xfffffffc)
-
-assert(bit32.lrotate(0, -1) == 0)
-assert(bit32.lrotate(0, 7) == 0)
-assert(bit32.lrotate(0x12345678, 0) == 0x12345678)
-assert(bit32.lrotate(0x12345678, 32) == 0x12345678)
-assert(bit32.lrotate(0x12345678, 4) == 0x23456781)
-assert(bit32.rrotate(0x12345678, -4) == 0x23456781)
-assert(bit32.lrotate(0x12345678, -8) == 0x78123456)
-assert(bit32.rrotate(0x12345678, 8) == 0x78123456)
-assert(bit32.lrotate(0xaaaaaaaa, 2) == 0xaaaaaaaa)
-assert(bit32.lrotate(0xaaaaaaaa, -2) == 0xaaaaaaaa)
-for i = -50, 50 do
-  assert(bit32.lrotate(0x89abcdef, i) == bit32.lrotate(0x89abcdef, i%32))
-end
-
-assert(bit32.lshift(0x12345678, 4) == 0x23456780)
-assert(bit32.lshift(0x12345678, 8) == 0x34567800)
-assert(bit32.lshift(0x12345678, -4) == 0x01234567)
-assert(bit32.lshift(0x12345678, -8) == 0x00123456)
-assert(bit32.lshift(0x12345678, 32) == 0)
-assert(bit32.lshift(0x12345678, -32) == 0)
-assert(bit32.rshift(0x12345678, 4) == 0x01234567)
-assert(bit32.rshift(0x12345678, 8) == 0x00123456)
-assert(bit32.rshift(0x12345678, 32) == 0)
-assert(bit32.rshift(0x12345678, -32) == 0)
-assert(bit32.arshift(0x12345678, 0) == 0x12345678)
-assert(bit32.arshift(0x12345678, 1) == 0x12345678 // 2)
-assert(bit32.arshift(0x12345678, -1) == 0x12345678 * 2)
-assert(bit32.arshift(-1, 1) == 0xffffffff)
-assert(bit32.arshift(-1, 24) == 0xffffffff)
-assert(bit32.arshift(-1, 32) == 0xffffffff)
-assert(bit32.arshift(-1, -1) == bit32.band(-1 * 2, 0xffffffff))
-
-assert(0x12345678 << 4 == 0x123456780)
-assert(0x12345678 << 8 == 0x1234567800)
-assert(0x12345678 << -4 == 0x01234567)
-assert(0x12345678 << -8 == 0x00123456)
-assert(0x12345678 << 32 == 0x1234567800000000)
-assert(0x12345678 << -32 == 0)
-assert(0x12345678 >> 4 == 0x01234567)
-assert(0x12345678 >> 8 == 0x00123456)
-assert(0x12345678 >> 32 == 0)
-assert(0x12345678 >> -32 == 0x1234567800000000)
-
-print("+")
--- some special cases
-local c = {0, 1, 2, 3, 10, 0x80000000, 0xaaaaaaaa, 0x55555555,
-           0xffffffff, 0x7fffffff}
-
-for _, b in pairs(c) do
-  assert(bit32.band(b) == b)
-  assert(bit32.band(b, b) == b)
-  assert(bit32.band(b, b, b, b) == b)
-  assert(bit32.btest(b, b) == (b ~= 0))
-  assert(bit32.band(b, b, b) == b)
-  assert(bit32.band(b, b, b, ~b) == 0)
-  assert(bit32.btest(b, b, b) == (b ~= 0))
-  assert(bit32.band(b, bit32.bnot(b)) == 0)
-  assert(bit32.bor(b, bit32.bnot(b)) == bit32.bnot(0))
-  assert(bit32.bor(b) == b)
-  assert(bit32.bor(b, b) == b)
-  assert(bit32.bor(b, b, b) == b)
-  assert(bit32.bor(b, b, 0, ~b) == 0xffffffff)
-  assert(bit32.bxor(b) == b)
-  assert(bit32.bxor(b, b) == 0)
-  assert(bit32.bxor(b, b, b) == b)
-  assert(bit32.bxor(b, b, b, b) == 0)
-  assert(bit32.bxor(b, 0) == b)
-  assert(bit32.bnot(b) ~= b)
-  assert(bit32.bnot(bit32.bnot(b)) == b)
-  assert(bit32.bnot(b) == (1 << 32) - 1 - b)
-  assert(bit32.lrotate(b, 32) == b)
-  assert(bit32.rrotate(b, 32) == b)
-  assert(bit32.lshift(bit32.lshift(b, -4), 4) == bit32.band(b, bit32.bnot(0xf)))
-  assert(bit32.rshift(bit32.rshift(b, 4), -4) == bit32.band(b, bit32.bnot(0xf)))
-end
-
--- for this test, use at most 24 bits (mantissa of a single float)
-c = {0, 1, 2, 3, 10, 0x800000, 0xaaaaaa, 0x555555, 0xffffff, 0x7fffff}
-for _, b in pairs(c) do
-  for i = -40, 40 do
-    local x = bit32.lshift(b, i)
-    local y = math.floor(math.fmod(b * 2.0^i, 2.0^32))
-    assert(math.fmod(x - y, 2.0^32) == 0)
-  end
-end
-
-assert(not pcall(bit32.band, {}))
-assert(not pcall(bit32.bnot, "a"))
-assert(not pcall(bit32.lshift, 45))
-assert(not pcall(bit32.lshift, 45, print))
-assert(not pcall(bit32.rshift, 45, print))
-
-print("+")
-
-
--- testing extract/replace
-
-assert(bit32.extract(0x12345678, 0, 4) == 8)
-assert(bit32.extract(0x12345678, 4, 4) == 7)
-assert(bit32.extract(0xa0001111, 28, 4) == 0xa)
-assert(bit32.extract(0xa0001111, 31, 1) == 1)
-assert(bit32.extract(0x50000111, 31, 1) == 0)
-assert(bit32.extract(0xf2345679, 0, 32) == 0xf2345679)
-
-assert(not pcall(bit32.extract, 0, -1))
-assert(not pcall(bit32.extract, 0, 32))
-assert(not pcall(bit32.extract, 0, 0, 33))
-assert(not pcall(bit32.extract, 0, 31, 2))
-
-assert(bit32.replace(0x12345678, 5, 28, 4) == 0x52345678)
-assert(bit32.replace(0x12345678, 0x87654321, 0, 32) == 0x87654321)
-assert(bit32.replace(0, 1, 2) == 2^2)
-assert(bit32.replace(0, -1, 4) == 2^4)
-assert(bit32.replace(-1, 0, 31) == (1 << 31) - 1)
-assert(bit32.replace(-1, 0, 1, 2) == (1 << 32) - 7)
-
-
--- testing conversion of floats
-
-assert(bit32.bor(3.0) == 3)
-assert(bit32.bor(-4.0) == 0xfffffffc)
-
--- large floats and large-enough integers?
-if 2.0^50 < 2.0^50 + 1.0 and 2.0^50 < (-1 >> 1) then
-  assert(bit32.bor(2.0^32 - 5.0) == 0xfffffffb)
-  assert(bit32.bor(-2.0^32 - 6.0) == 0xfffffffa)
-  assert(bit32.bor(2.0^48 - 5.0) == 0xfffffffb)
-  assert(bit32.bor(-2.0^48 - 6.0) == 0xfffffffa)
-end
-
-print'OK'
-

testes/bwcoercion.lua

@@ -1,78 +0,0 @@
-local tonumber, tointeger = tonumber, math.tointeger
-local type, getmetatable, rawget, error = type, getmetatable, rawget, error
-local strsub = string.sub
-
-local print = print
-
-_ENV = nil
-
--- Try to convert a value to an integer, without assuming any coercion.
-local function toint (x)
-  x = tonumber(x)   -- handle numerical strings
-  if not x then
-    return false    -- not coercible to a number
-  end
-  return tointeger(x)
-end
-
-
--- If operation fails, maybe second operand has a metamethod that should
--- have been called if not for this string metamethod, so try to
--- call it.
-local function trymt (x, y, mtname)
-  if type(y) ~= "string" then    -- avoid recalling original metamethod
-    local mt = getmetatable(y)
-    local mm = mt and rawget(mt, mtname)
-    if mm then
-      return mm(x, y)
-    end
-  end
-  -- if any test fails, there is no other metamethod to be called
-  error("attempt to '" .. strsub(mtname, 3) ..
-        "' a " .. type(x) .. " with a " .. type(y), 4)
-end
-
-
-local function checkargs (x, y, mtname)
-  local xi = toint(x)
-  local yi = toint(y)
-  if xi and yi then
-    return xi, yi
-  else
-    return trymt(x, y, mtname), nil
-  end
-end
-
-
-local smt = getmetatable("")
-
-smt.__band = function (x, y)
-  local x, y = checkargs(x, y, "__band")
-  return y and x & y or x
-end
-
-smt.__bor = function (x, y)
-  local x, y = checkargs(x, y, "__bor")
-  return y and x | y or x
-end
-
-smt.__bxor = function (x, y)
-  local x, y = checkargs(x, y, "__bxor")
-  return y and x ~ y or x
-end
-
-smt.__shl = function (x, y)
-  local x, y = checkargs(x, y, "__shl")
-  return y and x << y or x
-end
-
-smt.__shr = function (x, y)
-  local x, y = checkargs(x, y, "__shr")
-  return y and x >> y or x
-end
-
-smt.__bnot = function (x)
-  local x, y = checkargs(x, x, "__bnot")
-  return y and ~x or x
-end
-

testes/calls.lua

@@ -1,511 +0,0 @@
--- $Id: testes/calls.lua $
--- See Copyright Notice in file all.lua
-
-print("testing functions and calls")
-
-local debug = require "debug"
-
--- get the opportunity to test 'type' too ;)
-
-assert(type(1<2) == 'boolean')
-assert(type(true) == 'boolean' and type(false) == 'boolean')
-assert(type(nil) == 'nil'
-   and type(-3) == 'number'
-   and type'x' == 'string'
-   and type{} == 'table'
-   and type(type) == 'function')
-
-assert(type(assert) == type(print))
-local function f (x) return a:x (x) end
-assert(type(f) == 'function')
-assert(not pcall(type))
-
-
--- testing local-function recursion
-fact = false
-do
-  local res = 1
-  local function fact (n)
-    if n==0 then return res
-    else return n*fact(n-1)
-    end
-  end
-  assert(fact(5) == 120)
-end
-assert(fact == false)
-fact = nil
-
--- testing declarations
-local a = {i = 10}
-local self = 20
-function a:x (x) return x+self.i end
-function a.y (x) return x+self end
-
-assert(a:x(1)+10 == a.y(1))
-
-a.t = {i=-100}
-a["t"].x = function (self, a,b) return self.i+a+b end
-
-assert(a.t:x(2,3) == -95)
-
-do
-  local a = {x=0}
-  function a:add (x) self.x, a.y = self.x+x, 20; return self end
-  assert(a:add(10):add(20):add(30).x == 60 and a.y == 20)
-end
-
-local a = {b={c={}}}
-
-function a.b.c.f1 (x) return x+1 end
-function a.b.c:f2 (x,y) self[x] = y end
-assert(a.b.c.f1(4) == 5)
-a.b.c:f2('k', 12); assert(a.b.c.k == 12)
-
-print('+')
-
-t = nil   -- 'declare' t
-function f(a,b,c) local d = 'a'; t={a,b,c,d} end
-
-f(      -- this line change must be valid
-  1,2)
-assert(t[1] == 1 and t[2] == 2 and t[3] == nil and t[4] == 'a')
-f(1,2,   -- this one too
-      3,4)
-assert(t[1] == 1 and t[2] == 2 and t[3] == 3 and t[4] == 'a')
-
-t = nil   -- delete 't'
-
-function fat(x)
-  if x <= 1 then return 1
-  else return x*load("return fat(" .. x-1 .. ")", "")()
-  end
-end
-
-assert(load "load 'assert(fat(6)==720)' () ")()
-a = load('return fat(5), 3')
-local a,b = a()
-assert(a == 120 and b == 3)
-fat = nil
-print('+')
-
-local function err_on_n (n)
-  if n==0 then error(); exit(1);
-  else err_on_n (n-1); exit(1);
-  end
-end
-
-do
-  local function dummy (n)
-    if n > 0 then
-      assert(not pcall(err_on_n, n))
-      dummy(n-1)
-    end
-  end
-
-  dummy(10)
-end
-
-_G.deep = nil   -- "declaration"  (used by 'all.lua')
-
-function deep (n)
-  if n>0 then deep(n-1) end
-end
-deep(10)
-deep(180)
-
-
-print"testing tail calls"
-
-function deep (n) if n>0 then return deep(n-1) else return 101 end end
-assert(deep(30000) == 101)
-a = {}
-function a:deep (n) if n>0 then return self:deep(n-1) else return 101 end end
-assert(a:deep(30000) == 101)
-
-do   -- tail calls x varargs
-  local function foo (x, ...) local a = {...}; return x, a[1], a[2] end
-
-  local function foo1 (x) return foo(10, x, x + 1) end
-
-  local a, b, c = foo1(-2)
-  assert(a == 10 and b == -2 and c == -1)
-
-  -- tail calls x metamethods
-  local t = setmetatable({}, {__call = foo})
-  local function foo2 (x) return t(10, x) end
-  a, b, c = foo2(100)
-  assert(a == t and b == 10 and c == 100)
-
-  a, b = (function () return foo() end)()
-  assert(a == nil and b == nil)
-
-  local X, Y, A
-  local function foo (x, y, ...) X = x; Y = y; A = {...} end
-  local function foo1 (...) return foo(...) end
-
-  local a, b, c = foo1()
-  assert(X == nil and Y == nil and #A == 0)
-
-  a, b, c = foo1(10)
-  assert(X == 10 and Y == nil and #A == 0)
-
-  a, b, c = foo1(10, 20)
-  assert(X == 10 and Y == 20 and #A == 0)
-
-  a, b, c = foo1(10, 20, 30)
-  assert(X == 10 and Y == 20 and #A == 1 and A[1] == 30)
-end
-
-
-do   -- C-stack overflow while handling C-stack overflow
-  local function loop ()
-    assert(pcall(loop))
-  end
-
-  local err, msg = xpcall(loop, loop)
-  assert(not err and string.find(msg, "error"))
-end
-
-
-
-do   -- tail calls x chain of __call
-  local n = 10000   -- depth
-
-  local function foo ()
-    if n == 0 then return 1023
-    else n = n - 1; return foo()
-    end
-  end
-
-  -- build a chain of __call metamethods ending in function 'foo'
-  for i = 1, 100 do
-    foo = setmetatable({}, {__call = foo})
-  end
-
-  -- call the first one as a tail call in a new coroutine
-  -- (to ensure stack is not preallocated)
-  assert(coroutine.wrap(function() return foo() end)() == 1023)
-end
-
-print('+')
-
-
-do  -- testing chains of '__call'
-  local N = 20
-  local u = table.pack
-  for i = 1, N do
-    u = setmetatable({i}, {__call = u})
-  end
-
-  local Res = u("a", "b", "c")
-
-  assert(Res.n == N + 3)
-  for i = 1, N do
-    assert(Res[i][1] == i)
-  end
-  assert(Res[N + 1] == "a" and Res[N + 2] == "b" and Res[N + 3] == "c")
-end
-
-
-a = nil
-(function (x) a=x end)(23)
-assert(a == 23 and (function (x) return x*2 end)(20) == 40)
-
-
--- testing closures
-
--- fixed-point operator
-local Z = function (le)
-      local function a (f)
-        return le(function (x) return f(f)(x) end)
-      end
-      return a(a)
-    end
-
-
--- non-recursive factorial
-
-local F = function (f)
-      return function (n)
-               if n == 0 then return 1
-               else return n*f(n-1) end
-             end
-    end
-
-local fat = Z(F)
-
-assert(fat(0) == 1 and fat(4) == 24 and Z(F)(5)==5*Z(F)(4))
-
-local function g (z)
-  local function f (a,b,c,d)
-    return function (x,y) return a+b+c+d+a+x+y+z end
-  end
-  return f(z,z+1,z+2,z+3)
-end
-
-local f = g(10)
-assert(f(9, 16) == 10+11+12+13+10+9+16+10)
-
-print('+')
-
--- testing multiple returns
-
-local function unlpack (t, i)
-  i = i or 1
-  if (i <= #t) then
-    return t[i], unlpack(t, i+1)
-  end
-end
-
-local function equaltab (t1, t2)
-  assert(#t1 == #t2)
-  for i = 1, #t1 do
-    assert(t1[i] == t2[i])
-  end
-end
-
-local pack = function (...) return (table.pack(...)) end
-
-local function f() return 1,2,30,4 end
-local function ret2 (a,b) return a,b end
-
-local a,b,c,d = unlpack{1,2,3}
-assert(a==1 and b==2 and c==3 and d==nil)
-a = {1,2,3,4,false,10,'alo',false,assert}
-equaltab(pack(unlpack(a)), a)
-equaltab(pack(unlpack(a), -1), {1,-1})
-a,b,c,d = ret2(f()), ret2(f())
-assert(a==1 and b==1 and c==2 and d==nil)
-a,b,c,d = unlpack(pack(ret2(f()), ret2(f())))
-assert(a==1 and b==1 and c==2 and d==nil)
-a,b,c,d = unlpack(pack(ret2(f()), (ret2(f()))))
-assert(a==1 and b==1 and c==nil and d==nil)
-
-a = ret2{ unlpack{1,2,3}, unlpack{3,2,1}, unlpack{"a", "b"}}
-assert(a[1] == 1 and a[2] == 3 and a[3] == "a" and a[4] == "b")
-
-
--- testing calls with 'incorrect' arguments
-rawget({}, "x", 1)
-rawset({}, "x", 1, 2)
-assert(math.sin(1,2) == math.sin(1))
-table.sort({10,9,8,4,19,23,0,0}, function (a,b) return a<b end, "extra arg")
-
-
--- test for generic load
-local x = "-- a comment\0\0\0\n  x = 10 + \n23; \
-     local a = function () x = 'hi' end; \
-     return '\0'"
-local function read1 (x)
-  local i = 0
-  return function ()
-    collectgarbage()
-    i=i+1
-    return string.sub(x, i, i)
-  end
-end
-
-local function cannotload (msg, a,b)
-  assert(not a and string.find(b, msg))
-end
-
-a = assert(load(read1(x), "modname", "t", _G))
-assert(a() == "\0" and _G.x == 33)
-assert(debug.getinfo(a).source == "modname")
--- cannot read text in binary mode
-cannotload("attempt to load a text chunk", load(read1(x), "modname", "b", {}))
-cannotload("attempt to load a text chunk", load(x, "modname", "b"))
-
-a = assert(load(function () return nil end))
-a()  -- empty chunk
-
-assert(not load(function () return true end))
-
-
--- small bug
-local t = {nil, "return ", "3"}
-f, msg = load(function () return table.remove(t, 1) end)
-assert(f() == nil)   -- should read the empty chunk
-
--- another small bug (in 5.2.1)
-f = load(string.dump(function () return 1 end), nil, "b", {})
-assert(type(f) == "function" and f() == 1)
-
-
-do   -- another bug (in 5.4.0)
-  -- loading a binary long string interrupted by GC cycles
-  local f = string.dump(function ()
-    return '01234567890123456789012345678901234567890123456789'
-  end)
-  f = load(read1(f))
-  assert(f() == '01234567890123456789012345678901234567890123456789')
-end
-
-
-do   -- another bug (since 5.2)
-  -- corrupted binary dump: list of upvalue names is larger than number
-  -- of upvalues, overflowing the array of upvalues.
-  local code =
-   "\x1b\x4c\x75\x61\x54\x00\x19\x93\x0d\x0a\x1a\x0a\x04\x08\x08\x78\x56\z
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x28\x77\x40\x00\x86\x40\z
-    \x74\x65\x6d\x70\x81\x81\x01\x00\x02\x82\x48\x00\x02\x00\xc7\x00\x01\z
-    \x00\x80\x80\x80\x82\x00\x00\x80\x81\x82\x78\x80\x82\x81\x86\x40\x74\z
-    \x65\x6d\x70"
-
-  assert(load(code))   -- segfaults in previous versions
-end
-
-
-x = string.dump(load("x = 1; return x"))
-a = assert(load(read1(x), nil, "b"))
-assert(a() == 1 and _G.x == 1)
-cannotload("attempt to load a binary chunk", load(read1(x), nil, "t"))
-cannotload("attempt to load a binary chunk", load(x, nil, "t"))
-_G.x = nil
-
-assert(not pcall(string.dump, print))  -- no dump of C functions
-
-cannotload("unexpected symbol", load(read1("*a = 123")))
-cannotload("unexpected symbol", load("*a = 123"))
-cannotload("hhi", load(function () error("hhi") end))
-
--- any value is valid for _ENV
-assert(load("return _ENV", nil, nil, 123)() == 123)
-
-
--- load when _ENV is not first upvalue
-local x; XX = 123
-local function h ()
-  local y=x   -- use 'x', so that it becomes 1st upvalue
-  return XX   -- global name
-end
-local d = string.dump(h)
-x = load(d, "", "b")
-assert(debug.getupvalue(x, 2) == '_ENV')
-debug.setupvalue(x, 2, _G)
-assert(x() == 123)
-
-assert(assert(load("return XX + ...", nil, nil, {XX = 13}))(4) == 17)
-XX = nil
-
--- test generic load with nested functions
-x = [[
-  return function (x)
-    return function (y)
-     return function (z)
-       return x+y+z
-     end
-   end
-  end
-]]
-a = assert(load(read1(x), "read", "t"))
-assert(a()(2)(3)(10) == 15)
-
--- repeat the test loading a binary chunk
-x = string.dump(a)
-a = assert(load(read1(x), "read", "b"))
-assert(a()(2)(3)(10) == 15)
-
-
--- test for dump/undump with upvalues
-local a, b = 20, 30
-x = load(string.dump(function (x)
-  if x == "set" then a = 10+b; b = b+1 else
-  return a
-  end
-end), "", "b", nil)
-assert(x() == nil)
-assert(debug.setupvalue(x, 1, "hi") == "a")
-assert(x() == "hi")
-assert(debug.setupvalue(x, 2, 13) == "b")
-assert(not debug.setupvalue(x, 3, 10))   -- only 2 upvalues
-x("set")
-assert(x() == 23)
-x("set")
-assert(x() == 24)
-
--- test for dump/undump with many upvalues
-do
-  local nup = 200    -- maximum number of local variables
-  local prog = {"local a1"}
-  for i = 2, nup do prog[#prog + 1] = ", a" .. i end
-  prog[#prog + 1] = " = 1"
-  for i = 2, nup do prog[#prog + 1] = ", " .. i end
-  local sum = 1
-  prog[#prog + 1] = "; return function () return a1"
-  for i = 2, nup do prog[#prog + 1] = " + a" .. i; sum = sum + i end
-  prog[#prog + 1] = " end"
-  prog = table.concat(prog)
-  local f = assert(load(prog))()
-  assert(f() == sum)
-
-  f = load(string.dump(f))   -- main chunk now has many upvalues
-  local a = 10
-  local h = function () return a end
-  for i = 1, nup do
-    debug.upvaluejoin(f, i, h, 1)
-  end
-  assert(f() == 10 * nup)
-end
-
--- test for long method names
-do
-  local t = {x = 1}
-  function t:_012345678901234567890123456789012345678901234567890123456789 ()
-    return self.x
-  end
-  assert(t:_012345678901234567890123456789012345678901234567890123456789() == 1)
-end
-
-
--- test for bug in parameter adjustment
-assert((function () return nil end)(4) == nil)
-assert((function () local a; return a end)(4) == nil)
-assert((function (a) return a end)() == nil)
-
-
-print("testing binary chunks")
-do
-  local header = string.pack("c4BBc6BBB",
-    "\27Lua",                                  -- signature
-    0x54,                                      -- version 5.4 (0x54)
-    0,                                         -- format
-    "\x19\x93\r\n\x1a\n",                      -- data
-    4,                                         -- size of instruction
-    string.packsize("j"),                      -- sizeof(lua integer)
-    string.packsize("n")                       -- sizeof(lua number)
-  )
-  local c = string.dump(function ()
-    local a = 1; local b = 3;
-    local f = function () return a + b + _ENV.c; end    -- upvalues
-    local s1 = "a constant"
-    local s2 = "another constant"
-    return a + b * 3
-  end)
-
-  assert(assert(load(c))() == 10)
-
-  -- check header
-  assert(string.sub(c, 1, #header) == header)
-  -- check LUAC_INT and LUAC_NUM
-  local ci, cn = string.unpack("jn", c, #header + 1)
-  assert(ci == 0x5678 and cn == 370.5)
-
-  -- corrupted header
-  for i = 1, #header do
-    local s = string.sub(c, 1, i - 1) ..
-              string.char(string.byte(string.sub(c, i, i)) + 1) ..
-              string.sub(c, i + 1, -1)
-    assert(#s == #c)
-    assert(not load(s))
-  end
-
-  -- loading truncated binary chunks
-  for i = 1, #c - 1 do
-    local st, msg = load(string.sub(c, 1, i))
-    assert(not st and string.find(msg, "truncated"))
-  end
-end
-
-print('OK')
-return deep

testes/closure.lua

@@ -1,272 +0,0 @@
--- $Id: testes/closure.lua $
--- See Copyright Notice in file all.lua
-
-print "testing closures"
-
-local A,B = 0,{g=10}
-local function f(x)
-  local a = {}
-  for i=1,1000 do
-    local y = 0
-    do
-      a[i] = function () B.g = B.g+1; y = y+x; return y+A end
-    end
-  end
-  local dummy = function () return a[A] end
-  collectgarbage()
-  A = 1; assert(dummy() == a[1]); A = 0;
-  assert(a[1]() == x)
-  assert(a[3]() == x)
-  collectgarbage()
-  assert(B.g == 12)
-  return a
-end
-
-local a = f(10)
--- force a GC in this level
-local x = {[1] = {}}   -- to detect a GC
-setmetatable(x, {__mode = 'kv'})
-while x[1] do   -- repeat until GC
-  local a = A..A..A..A  -- create garbage
-  A = A+1
-end
-assert(a[1]() == 20+A)
-assert(a[1]() == 30+A)
-assert(a[2]() == 10+A)
-collectgarbage()
-assert(a[2]() == 20+A)
-assert(a[2]() == 30+A)
-assert(a[3]() == 20+A)
-assert(a[8]() == 10+A)
-assert(getmetatable(x).__mode == 'kv')
-assert(B.g == 19)
-
-
--- testing equality
-a = {}
-
-for i = 1, 5 do  a[i] = function (x) return i + a + _ENV end  end
-assert(a[3] ~= a[4] and a[4] ~= a[5])
-
-do
-  local a = function (x)  return math.sin(_ENV[x])  end
-  local function f()
-    return a
-  end
-  assert(f() == f())
-end
-
-
--- testing closures with 'for' control variable
-a = {}
-for i=1,10 do
-  a[i] = {set = function(x) i=x end, get = function () return i end}
-  if i == 3 then break end
-end
-assert(a[4] == undef)
-a[1].set(10)
-assert(a[2].get() == 2)
-a[2].set('a')
-assert(a[3].get() == 3)
-assert(a[2].get() == 'a')
-
-a = {}
-local t = {"a", "b"}
-for i = 1, #t do
-  local k = t[i]
-  a[i] = {set = function(x, y) i=x; k=y end,
-          get = function () return i, k end}
-  if i == 2 then break end
-end
-a[1].set(10, 20)
-local r,s = a[2].get()
-assert(r == 2 and s == 'b')
-r,s = a[1].get()
-assert(r == 10 and s == 20)
-a[2].set('a', 'b')
-r,s = a[2].get()
-assert(r == "a" and s == "b")
-
-
--- testing closures with 'for' control variable x break
-local f
-for i=1,3 do
-  f = function () return i end
-  break
-end
-assert(f() == 1)
-
-for k = 1, #t do
-  local v = t[k]
-  f = function () return k, v end
-  break
-end
-assert(({f()})[1] == 1)
-assert(({f()})[2] == "a")
-
-
--- testing closure x break x return x errors
-
-local b
-function f(x)
-  local first = 1
-  while 1 do
-    if x == 3 and not first then return end
-    local a = 'xuxu'
-    b = function (op, y)
-          if op == 'set' then
-            a = x+y
-          else
-            return a
-          end
-        end
-    if x == 1 then do break end
-    elseif x == 2 then return
-    else if x ~= 3 then error() end
-    end
-    first = nil
-  end
-end
-
-for i=1,3 do
-  f(i)
-  assert(b('get') == 'xuxu')
-  b('set', 10); assert(b('get') == 10+i)
-  b = nil
-end
-
-pcall(f, 4);
-assert(b('get') == 'xuxu')
-b('set', 10); assert(b('get') == 14)
-
-
-local y, w
--- testing multi-level closure
-function f(x)
-  return function (y)
-    return function (z) return w+x+y+z end
-  end
-end
-
-y = f(10)
-w = 1.345
-assert(y(20)(30) == 60+w)
-
-
--- testing closures x break
-do
-  local X, Y
-  local a = math.sin(0)
-
-  while a do
-    local b = 10
-    X = function () return b end   -- closure with upvalue
-    if a then break end
-  end
-  
-  do
-    local b = 20
-    Y = function () return b end   -- closure with upvalue
-  end
-
-  -- upvalues must be different
-  assert(X() == 10 and Y() == 20)
-end
-
-  
--- testing closures x repeat-until
-
-local a = {}
-local i = 1
-repeat
-  local x = i
-  a[i] = function () i = x+1; return x end
-until i > 10 or a[i]() ~= x
-assert(i == 11 and a[1]() == 1 and a[3]() == 3 and i == 4)
-
-
--- testing closures created in 'then' and 'else' parts of 'if's
-a = {}
-for i = 1, 10 do
-  if i % 3 == 0 then
-    local y = 0
-    a[i] = function (x) local t = y; y = x; return t end
-  elseif i % 3 == 1 then
-    goto L1
-    error'not here'
-  ::L1::
-    local y = 1
-    a[i] = function (x) local t = y; y = x; return t end
-  elseif i % 3 == 2 then
-    local t
-    goto l4
-    ::l4a:: a[i] = t; goto l4b
-    error("should never be here!")
-    ::l4::
-    local y = 2
-    t = function (x) local t = y; y = x; return t end
-    goto l4a
-    error("should never be here!")
-    ::l4b::
-  end
-end
-
-for i = 1, 10 do
-  assert(a[i](i * 10) == i % 3 and a[i]() == i * 10)
-end
-
-print'+'
-
-
--- test for correctly closing upvalues in tail calls of vararg functions
-local function t ()
-  local function c(a,b) assert(a=="test" and b=="OK") end
-  local function v(f, ...) c("test", f() ~= 1 and "FAILED" or "OK") end
-  local x = 1
-  return v(function() return x end)
-end
-t()
-
-
--- test for debug manipulation of upvalues
-local debug = require'debug'
-
-local foo1, foo2, foo3
-do
-  local a , b, c = 3, 5, 7
-  foo1 = function () return a+b end;
-  foo2 = function () return b+a end;
-  do
-    local a = 10
-    foo3 = function () return a+b end;
-  end
-end
-
-assert(debug.upvalueid(foo1, 1))
-assert(debug.upvalueid(foo1, 2))
-assert(not debug.upvalueid(foo1, 3))
-assert(debug.upvalueid(foo1, 1) == debug.upvalueid(foo2, 2))
-assert(debug.upvalueid(foo1, 2) == debug.upvalueid(foo2, 1))
-assert(debug.upvalueid(foo3, 1))
-assert(debug.upvalueid(foo1, 1) ~= debug.upvalueid(foo3, 1))
-assert(debug.upvalueid(foo1, 2) == debug.upvalueid(foo3, 2))
-
-assert(debug.upvalueid(string.gmatch("x", "x"), 1) ~= nil)
-
-assert(foo1() == 3 + 5 and foo2() == 5 + 3)
-debug.upvaluejoin(foo1, 2, foo2, 2)
-assert(foo1() == 3 + 3 and foo2() == 5 + 3)
-assert(foo3() == 10 + 5)
-debug.upvaluejoin(foo3, 2, foo2, 1)
-assert(foo3() == 10 + 5)
-debug.upvaluejoin(foo3, 2, foo2, 2)
-assert(foo3() == 10 + 3)
-
-assert(not pcall(debug.upvaluejoin, foo1, 3, foo2, 1))
-assert(not pcall(debug.upvaluejoin, foo1, 1, foo2, 3))
-assert(not pcall(debug.upvaluejoin, foo1, 0, foo2, 1))
-assert(not pcall(debug.upvaluejoin, print, 1, foo2, 1))
-assert(not pcall(debug.upvaluejoin, {}, 1, foo2, 1))
-assert(not pcall(debug.upvaluejoin, foo1, 1, print, 1))
-
-print'OK'

testes/code.lua

@@ -1,449 +0,0 @@
--- $Id: testes/code.lua $
--- See Copyright Notice in file all.lua
-
-if T==nil then
-  (Message or print)('\n >>> testC not active: skipping opcode tests <<<\n')
-  return
-end
-print "testing code generation and optimizations"
-
--- to test constant propagation
-local k0aux <const> = 0
-local k0 <const> = k0aux
-local k1 <const> = 1
-local k3 <const> = 3
-local k6 <const> = k3 + (k3 << k0)
-local kFF0 <const> = 0xFF0
-local k3_78 <const> = 3.78
-local x, k3_78_4 <const> = 10, k3_78 / 4
-assert(x == 10)
-
-local kx <const> = "x"
-
-local kTrue <const> = true
-local kFalse <const> = false
-
-local kNil <const> = nil
-
--- this code gave an error for the code checker
-do
-  local function f (a)
-  for k,v,w in a do end
-  end
-end
-
-
--- testing reuse in constant table
-local function checkKlist (func, list)
-  local k = T.listk(func)
-  assert(#k == #list)
-  for i = 1, #k do
-    assert(k[i] == list[i] and math.type(k[i]) == math.type(list[i]))
-  end
-end
-
-local function foo ()
-  local a
-  a = k3;
-  a = 0; a = 0.0; a = -7 + 7
-  a = k3_78/4; a = k3_78_4
-  a = -k3_78/4; a = k3_78/4; a = -3.78/4
-  a = -3.79/4; a = 0.0; a = -0;
-  a = k3; a = 3.0; a = 3; a = 3.0
-end
-
-checkKlist(foo, {3.78/4, -3.78/4, -3.79/4})
-
-
-foo = function (f, a)
-        f(100 * 1000)
-        f(100.0 * 1000)
-        f(-100 * 1000)
-        f(-100 * 1000.0)
-        f(100000)
-        f(100000.0)
-        f(-100000)
-        f(-100000.0)
-      end
-
-checkKlist(foo, {100000, 100000.0, -100000, -100000.0})
-
-
--- floats x integers
-foo = function (t, a)
-  t[a] = 1; t[a] = 1.0
-  t[a] = 1; t[a] = 1.0
-  t[a] = 2; t[a] = 2.0
-  t[a] = 0; t[a] = 0.0
-  t[a] = 1; t[a] = 1.0
-  t[a] = 2; t[a] = 2.0
-  t[a] = 0; t[a] = 0.0
-end
-
-checkKlist(foo, {1, 1.0, 2, 2.0, 0, 0.0})
-
-
--- testing opcodes
-
--- check that 'f' opcodes match '...'
-local function check (f, ...)
-  local arg = {...}
-  local c = T.listcode(f)
-  for i=1, #arg do
-    local opcode = string.match(c[i], "%u%w+")
-    -- print(arg[i], opcode)
-    assert(arg[i] == opcode)
-  end
-  assert(c[#arg+2] == undef)
-end
-
-
--- check that 'f' opcodes match '...' and that 'f(p) == r'.
-local function checkR (f, p, r, ...)
-  local r1 = f(p)
-  assert(r == r1 and math.type(r) == math.type(r1))
-  check(f, ...)
-end
-
-
--- check that 'a' and 'b' has the same opcodes
-local function checkequal (a, b)
-  a = T.listcode(a)
-  b = T.listcode(b)
-  assert(#a == #b)
-  for i = 1, #a do
-    a[i] = string.gsub(a[i], '%b()', '')   -- remove line number
-    b[i] = string.gsub(b[i], '%b()', '')   -- remove line number
-    assert(a[i] == b[i])
-  end
-end
-
-
--- some basic instructions
-check(function ()   -- function does not create upvalues
-  (function () end){f()}
-end, 'CLOSURE', 'NEWTABLE', 'EXTRAARG', 'GETTABUP', 'CALL',
-     'SETLIST', 'CALL', 'RETURN0')
-
-check(function (x)   -- function creates upvalues
-  (function () return x end){f()}
-end, 'CLOSURE', 'NEWTABLE', 'EXTRAARG', 'GETTABUP', 'CALL',
-     'SETLIST', 'CALL', 'RETURN')
-
-
--- sequence of LOADNILs
-check(function ()
-  local kNil <const> = nil
-  local a,b,c
-  local d; local e;
-  local f,g,h;
-  d = nil; d=nil; b=nil; a=kNil; c=nil;
-end, 'LOADNIL', 'RETURN0')
-
-check(function ()
-  local a,b,c,d = 1,1,1,1
-  d=nil;c=nil;b=nil;a=nil
-end, 'LOADI', 'LOADI', 'LOADI', 'LOADI', 'LOADNIL', 'RETURN0')
-
-do
-  local a,b,c,d = 1,1,1,1
-  d=nil;c=nil;b=nil;a=nil
-  assert(a == nil and b == nil and c == nil and d == nil)
-end
-
-
--- single return
-check (function (a,b,c) return a end, 'RETURN1')
-
-
--- infinite loops
-check(function () while kTrue do local a = -1 end end,
-'LOADI', 'JMP', 'RETURN0')
-
-check(function () while 1 do local a = -1 end end,
-'LOADI', 'JMP', 'RETURN0')
-
-check(function () repeat local x = 1 until true end,
-'LOADI', 'RETURN0')
-
-
--- concat optimization
-check(function (a,b,c,d) return a..b..c..d end,
-  'MOVE', 'MOVE', 'MOVE', 'MOVE', 'CONCAT', 'RETURN1')
-
--- not
-check(function () return not not nil end, 'LOADFALSE', 'RETURN1')
-check(function () return not not kFalse end, 'LOADFALSE', 'RETURN1')
-check(function () return not not true end, 'LOADTRUE', 'RETURN1')
-check(function () return not not k3 end, 'LOADTRUE', 'RETURN1')
-
--- direct access to locals
-check(function ()
-  local a,b,c,d
-  a = b*a
-  c.x, a[b] = -((a + d/b - a[b]) ^ a.x), b
-end,
-  'LOADNIL',
-  'MUL', 'MMBIN',
-  'DIV', 'MMBIN', 'ADD', 'MMBIN', 'GETTABLE', 'SUB', 'MMBIN',
-  'GETFIELD', 'POW', 'MMBIN', 'UNM', 'SETTABLE', 'SETFIELD', 'RETURN0')
-
-
--- direct access to constants
-check(function ()
-  local a,b
-  local c = kNil
-  a[kx] = 3.2
-  a.x = b
-  a[b] = 'x'
-end,
-  'LOADNIL', 'SETFIELD', 'SETFIELD', 'SETTABLE', 'RETURN0')
-
--- "get/set table" with numeric indices
-check(function (a)
-  local k255 <const> = 255
-  a[1] = a[100]
-  a[k255] = a[256]
-  a[256] = 5
-end,
-  'GETI', 'SETI',
-  'LOADI', 'GETTABLE', 'SETI',
-  'LOADI', 'SETTABLE',  'RETURN0')
-
-check(function ()
-  local a,b
-  a = a - a
-  b = a/a
-  b = 5-4
-end,
-  'LOADNIL', 'SUB', 'MMBIN', 'DIV', 'MMBIN', 'LOADI', 'RETURN0')
-
-check(function ()
-  local a,b
-  a[kTrue] = false
-end,
-  'LOADNIL', 'LOADTRUE', 'SETTABLE', 'RETURN0')
-
-
--- equalities
-checkR(function (a) if a == 1 then return 2 end end, 1, 2,
-  'EQI', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if -4.0 == a then return 2 end end, -4, 2,
-  'EQI', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if a == "hi" then return 2 end end, 10, nil,
-  'EQK', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if a == 10000 then return 2 end end, 1, nil,
-  'EQK', 'JMP', 'LOADI', 'RETURN1')   -- number too large
-
-checkR(function (a) if -10000 == a then return 2 end end, -10000, 2,
-  'EQK', 'JMP', 'LOADI', 'RETURN1')   -- number too large
-
--- comparisons
-
-checkR(function (a) if -10 <= a then return 2 end end, -10, 2,
-  'GEI', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if 128.0 > a then return 2 end end, 129, nil,
-  'LTI', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if -127.0 < a then return 2 end end, -127, nil,
-  'GTI', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if 10 < a then return 2 end end, 11, 2,
-  'GTI', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if 129 < a then return 2 end end, 130, 2,
-  'LOADI', 'LT', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if a >= 23.0 then return 2 end end, 25, 2,
-  'GEI', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if a >= 23.1 then return 2 end end, 0, nil,
-  'LOADK', 'LE', 'JMP', 'LOADI', 'RETURN1')
-
-checkR(function (a) if a > 2300.0 then return 2 end end, 0, nil,
-  'LOADF', 'LT', 'JMP', 'LOADI', 'RETURN1')
-
-
--- constant folding
-local function checkK (func, val)
-  check(func, 'LOADK', 'RETURN1')
-  checkKlist(func, {val})
-  assert(func() == val)
-end
-
-local function checkI (func, val)
-  check(func, 'LOADI', 'RETURN1')
-  checkKlist(func, {})
-  assert(func() == val)
-end
-
-local function checkF (func, val)
-  check(func, 'LOADF', 'RETURN1')
-  checkKlist(func, {})
-  assert(func() == val)
-end
-
-checkF(function () return 0.0 end, 0.0)
-checkI(function () return k0 end, 0)
-checkI(function () return -k0//1 end, 0)
-checkK(function () return 3^-1 end, 1/3)
-checkK(function () return (1 + 1)^(50 + 50) end, 2^100)
-checkK(function () return (-2)^(31 - 2) end, -0x20000000 + 0.0)
-checkF(function () return (-k3^0 + 5) // 3.0 end, 1.0)
-checkI(function () return -k3 % 5 end, 2)
-checkF(function () return -((2.0^8 + -(-1)) % 8)/2 * 4 - 3 end, -5.0)
-checkF(function () return -((2^8 + -(-1)) % 8)//2 * 4 - 3 end, -7.0)
-checkI(function () return 0xF0.0 | 0xCC.0 ~ 0xAA & 0xFD end, 0xF4)
-checkI(function () return ~(~kFF0 | kFF0) end, 0)
-checkI(function () return ~~-1024.0 end, -1024)
-checkI(function () return ((100 << k6) << -4) >> 2 end, 100)
-
--- borders around MAXARG_sBx ((((1 << 17) - 1) >> 1) == 65535)
-local a = 17; local sbx = ((1 << a) - 1) >> 1   -- avoid folding
-local border <const> = 65535
-checkI(function () return border end, sbx)
-checkI(function () return -border end, -sbx)
-checkI(function () return border + 1 end, sbx + 1)
-checkK(function () return border + 2 end, sbx + 2)
-checkK(function () return -(border + 1) end, -(sbx + 1))
-
-local border <const> = 65535.0
-checkF(function () return border end, sbx + 0.0)
-checkF(function () return -border end, -sbx + 0.0)
-checkF(function () return border + 1 end, (sbx + 1.0))
-checkK(function () return border + 2 end, (sbx + 2.0))
-checkK(function () return -(border + 1) end, -(sbx + 1.0))
-
-
--- immediate operands
-checkR(function (x) return x + k1 end, 10, 11, 'ADDI', 'MMBINI', 'RETURN1')
-checkR(function (x) return x - 127 end, 10, -117, 'ADDI', 'MMBINI', 'RETURN1')
-checkR(function (x) return 128 + x end, 0.0, 128.0,
-         'ADDI', 'MMBINI', 'RETURN1')
-checkR(function (x) return x * -127 end, -1.0, 127.0,
-         'MULK', 'MMBINK', 'RETURN1')
-checkR(function (x) return 20 * x end, 2, 40, 'MULK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x ^ -2 end, 2, 0.25, 'POWK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x / 40 end, 40, 1.0, 'DIVK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x // 1 end, 10.0, 10.0,
-         'IDIVK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x % (100 - 10) end, 91, 1,
-         'MODK', 'MMBINK', 'RETURN1')
-checkR(function (x) return k1 << x end, 3, 8, 'SHLI', 'MMBINI', 'RETURN1')
-checkR(function (x) return x << 127 end, 10, 0, 'SHRI', 'MMBINI', 'RETURN1')
-checkR(function (x) return x << -127 end, 10, 0, 'SHRI', 'MMBINI', 'RETURN1')
-checkR(function (x) return x >> 128 end, 8, 0, 'SHRI', 'MMBINI', 'RETURN1')
-checkR(function (x) return x >> -127 end, 8, 0, 'SHRI', 'MMBINI', 'RETURN1')
-checkR(function (x) return x & 1 end, 9, 1, 'BANDK', 'MMBINK', 'RETURN1')
-checkR(function (x) return 10 | x end, 1, 11, 'BORK', 'MMBINK', 'RETURN1')
-checkR(function (x) return -10 ~ x end, -1, 9, 'BXORK', 'MMBINK', 'RETURN1')
-
--- K operands in arithmetic operations
-checkR(function (x) return x + 0.0 end, 1, 1.0, 'ADDK', 'MMBINK', 'RETURN1')
---  check(function (x) return 128 + x end, 'ADDK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x * -10000 end, 2, -20000,
-         'MULK', 'MMBINK', 'RETURN1')
---  check(function (x) return 20 * x end, 'MULK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x ^ 0.5 end, 4, 2.0, 'POWK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x / 2.0 end, 4, 2.0, 'DIVK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x // 10000 end, 10000, 1,
-         'IDIVK', 'MMBINK', 'RETURN1')
-checkR(function (x) return x % (100.0 - 10) end, 91, 1.0,
-         'MODK', 'MMBINK', 'RETURN1')
-
--- no foldings (and immediate operands)
-check(function () return -0.0 end, 'LOADF', 'UNM', 'RETURN1')
-check(function () return k3/0 end, 'LOADI', 'DIVK', 'MMBINK', 'RETURN1')
-check(function () return 0%0 end, 'LOADI', 'MODK', 'MMBINK', 'RETURN1')
-check(function () return -4//0 end, 'LOADI', 'IDIVK', 'MMBINK', 'RETURN1')
-check(function (x) return x >> 2.0 end, 'LOADF', 'SHR', 'MMBIN', 'RETURN1')
-check(function (x) return x << 128 end, 'LOADI', 'SHL', 'MMBIN', 'RETURN1')
-check(function (x) return x & 2.0 end, 'LOADF', 'BAND', 'MMBIN', 'RETURN1')
-
--- basic 'for' loops
-check(function () for i = -10, 10.5 do end end,
-'LOADI', 'LOADK', 'LOADI', 'FORPREP', 'FORLOOP', 'RETURN0')
-check(function () for i = 0xfffffff, 10.0, 1 do end end,
-'LOADK', 'LOADF', 'LOADI', 'FORPREP', 'FORLOOP', 'RETURN0')
-
--- bug in constant folding for 5.1
-check(function () return -nil end, 'LOADNIL', 'UNM', 'RETURN1')
-
-
-check(function ()
-  local a,b,c
-  b[c], a = c, b
-  b[a], a = c, b
-  a, b = c, a
-  a = a
-end,
-  'LOADNIL',
-  'MOVE', 'MOVE', 'SETTABLE',
-  'MOVE', 'MOVE', 'MOVE', 'SETTABLE',
-  'MOVE', 'MOVE', 'MOVE',
-  -- no code for a = a
-  'RETURN0')
-
-
--- x == nil , x ~= nil
--- checkequal(function (b) if (a==nil) then a=1 end; if a~=nil then a=1 end end,
---            function () if (a==9) then a=1 end; if a~=9 then a=1 end end)
-
--- check(function () if a==nil then a='a' end end,
--- 'GETTABUP', 'EQ', 'JMP', 'SETTABUP', 'RETURN')
-
-do   -- tests for table access in upvalues
-  local t
-  check(function () t[kx] = t.y end, 'GETTABUP', 'SETTABUP')
-  check(function (a) t[a()] = t[a()] end,
-  'MOVE', 'CALL', 'GETUPVAL', 'MOVE', 'CALL',
-  'GETUPVAL', 'GETTABLE', 'SETTABLE')
-end
-
--- de morgan
-checkequal(function () local a; if not (a or b) then b=a end end,
-           function () local a; if (not a and not b) then b=a end end)
-
-checkequal(function (l) local a; return 0 <= a and a <= l end,
-           function (l) local a; return not (not(a >= 0) or not(a <= l)) end)
-
-
--- if-break optimizations
-check(function (a, b)
-        while a do
-          if b then break else a = a + 1 end
-        end
-      end,
-'TEST', 'JMP', 'TEST', 'JMP', 'ADDI', 'MMBINI', 'JMP', 'RETURN0')
-
-checkequal(function () return 6 or true or nil end,
-           function () return k6 or kTrue or kNil end)
-
-checkequal(function () return 6 and true or nil end,
-           function () return k6 and kTrue or kNil end)
-
-
-do   -- string constants
-  local k0 <const> = "00000000000000000000000000000000000000000000000000"
-  local function f1 ()
-    local k <const> = k0
-    return function ()
-             return function () return k end
-           end
-  end
-
-  local f2 = f1()
-  local f3 = f2()
-  assert(f3() == k0)
-  checkK(f3, k0)
-  -- string is not needed by other functions
-  assert(T.listk(f1)[1] == nil)
-  assert(T.listk(f2)[1] == nil)
-end
-
-print 'OK'
-

testes/constructs.lua

@@ -1,406 +0,0 @@
--- $Id: testes/constructs.lua $
--- See Copyright Notice in file all.lua
-
-;;print "testing syntax";;
-
-local debug = require "debug"
-
-
-local function checkload (s, msg)
-  assert(string.find(select(2, load(s)), msg))
-end
-
--- testing semicollons
-local a
-do ;;; end
-; do ; a = 3; assert(a == 3) end;
-;
-
-
--- invalid operations should not raise errors when not executed
-if false then a = 3 // 0; a = 0 % 0 end
-
-
--- testing priorities
-
-assert(2^3^2 == 2^(3^2));
-assert(2^3*4 == (2^3)*4);
-assert(2.0^-2 == 1/4 and -2^- -2 == - - -4);
-assert(not nil and 2 and not(2>3 or 3<2));
-assert(-3-1-5 == 0+0-9);
-assert(-2^2 == -4 and (-2)^2 == 4 and 2*2-3-1 == 0);
-assert(-3%5 == 2 and -3+5 == 2)
-assert(2*1+3/3 == 3 and 1+2 .. 3*1 == "33");
-assert(not(2+1 > 3*1) and "a".."b" > "a");
-
-assert(0xF0 | 0xCC ~ 0xAA & 0xFD == 0xF4)
-assert(0xFD & 0xAA ~ 0xCC | 0xF0 == 0xF4)
-assert(0xF0 & 0x0F + 1 == 0x10)
-
-assert(3^4//2^3//5 == 2)
-
-assert(-3+4*5//2^3^2//9+4%10/3 == (-3)+(((4*5)//(2^(3^2)))//9)+((4%10)/3))
-
-assert(not ((true or false) and nil))
-assert(      true or false  and nil)
-
--- old bug
-assert((((1 or false) and true) or false) == true)
-assert((((nil and true) or false) and true) == false)
-
-local a,b = 1,nil;
-assert(-(1 or 2) == -1 and (1 and 2)+(-1.25 or -4) == 0.75);
-local x = ((b or a)+1 == 2 and (10 or a)+1 == 11); assert(x);
-x = (((2<3) or 1) == true and (2<3 and 4) == 4); assert(x);
-
-local x, y = 1, 2;
-assert((x>y) and x or y == 2);
-x,y=2,1;
-assert((x>y) and x or y == 2);
-
-assert(1234567890 == tonumber('1234567890') and 1234567890+1 == 1234567891)
-
-do   -- testing operators with diffent kinds of constants
-  -- operands to consider:
-  --  * fit in register
-  --  * constant doesn't fit in register
-  --  * floats with integral values
-  local operand = {3, 100, 5.0, -10, -5.0, 10000, -10000}
-  local operator = {"+", "-", "*", "/", "//", "%", "^",
-                    "&", "|", "^", "<<", ">>",
-                    "==", "~=", "<", ">", "<=", ">=",}
-  for _, op in ipairs(operator) do
-    local f = assert(load(string.format([[return function (x,y)
-                return x %s y
-              end]], op)))();
-    for _, o1 in ipairs(operand) do
-      for _, o2 in ipairs(operand) do
-        local gab = f(o1, o2)
-
-        _ENV.XX = o1
-        local code = string.format("return XX %s %s", op, o2)
-        local res = assert(load(code))()
-        assert(res == gab)
-
-        _ENV.XX = o2
-        code = string.format("return (%s) %s XX", o1, op)
-        res = assert(load(code))()
-        assert(res == gab)
-
-        code = string.format("return (%s) %s %s", o1, op, o2)
-        res = assert(load(code))()
-        assert(res == gab)
-      end
-    end
-  end
-  _ENV.XX = nil
-end
-
-
--- silly loops
-repeat until 1; repeat until true;
-while false do end; while nil do end;
-
-do  -- test old bug (first name could not be an `upvalue')
- local a; local function f(x) x={a=1}; x={x=1}; x={G=1} end
-end
-
-
-do   -- bug since 5.4.0
-  -- create code with a table using more than 256 constants
-  local code = {"local x = {"}
-  for i = 1, 257 do
-    code[#code + 1] = i .. ".1,"
-  end
-  code[#code + 1] = "};"
-  code = table.concat(code)
-
-  -- add "ret" to the end of that code and checks that
-  -- it produces the expected value "val"
-  local function check (ret, val)
-    local code = code .. ret
-    code = load(code)
-    assert(code() == val)
-  end
-
-  check("return (1 ~ (2 or 3))", 1 ~ 2)
-  check("return (1 | (2 or 3))", 1 | 2)
-  check("return (1 + (2 or 3))", 1 + 2)
-  check("return (1 << (2 or 3))", 1 << 2)
-end
-
-
-local function f (i)
-  if type(i) ~= 'number' then return i,'jojo'; end;
-  if i > 0 then return i, f(i-1); end;
-end
-
-x = {f(3), f(5), f(10);};
-assert(x[1] == 3 and x[2] == 5 and x[3] == 10 and x[4] == 9 and x[12] == 1);
-assert(x[nil] == nil)
-x = {f'alo', f'xixi', nil};
-assert(x[1] == 'alo' and x[2] == 'xixi' and x[3] == nil);
-x = {f'alo'..'xixi'};
-assert(x[1] == 'aloxixi')
-x = {f{}}
-assert(x[2] == 'jojo' and type(x[1]) == 'table')
-
-
-local f = function (i)
-  if i < 10 then return 'a';
-  elseif i < 20 then return 'b';
-  elseif i < 30 then return 'c';
-  end;
-end
-
-assert(f(3) == 'a' and f(12) == 'b' and f(26) == 'c' and f(100) == nil)
-
-for i=1,1000 do break; end;
-local n=100;
-local i=3;
-local t = {};
-local a=nil
-while not a do
-  a=0; for i=1,n do for i=i,1,-1 do a=a+1; t[i]=1; end; end;
-end
-assert(a == n*(n+1)/2 and i==3);
-assert(t[1] and t[n] and not t[0] and not t[n+1])
-
-function f(b)
-  local x = 1;
-  repeat
-    local a;
-    if b==1 then local b=1; x=10; break
-    elseif b==2 then x=20; break;
-    elseif b==3 then x=30;
-    else local a,b,c,d=math.sin(1); x=x+1;
-    end
-  until x>=12;
-  return x;
-end;
-
-assert(f(1) == 10 and f(2) == 20 and f(3) == 30 and f(4)==12)
-
-
-local f = function (i)
-  if i < 10 then return 'a'
-  elseif i < 20 then return 'b'
-  elseif i < 30 then return 'c'
-  else return 8
-  end
-end
-
-assert(f(3) == 'a' and f(12) == 'b' and f(26) == 'c' and f(100) == 8)
-
-local a, b = nil, 23
-x = {f(100)*2+3 or a, a or b+2}
-assert(x[1] == 19 and x[2] == 25)
-x = {f=2+3 or a, a = b+2}
-assert(x.f == 5 and x.a == 25)
-
-a={y=1}
-x = {a.y}
-assert(x[1] == 1)
-
-local function f (i)
-  while 1 do
-    if i>0 then i=i-1;
-    else return; end;
-  end;
-end;
-
-local function g(i)
-  while 1 do
-    if i>0 then i=i-1
-    else return end
-  end
-end
-
-f(10); g(10);
-
-do
-  function f () return 1,2,3; end
-  local a, b, c = f();
-  assert(a==1 and b==2 and c==3)
-  a, b, c = (f());
-  assert(a==1 and b==nil and c==nil)
-end
-
-local a,b = 3 and f();
-assert(a==1 and b==nil)
-
-function g() f(); return; end;
-assert(g() == nil)
-function g() return nil or f() end
-a,b = g()
-assert(a==1 and b==nil)
-
-print'+';
-
-do   -- testing constants
-  local prog <const> = [[local x <XXX> = 10]]
-  checkload(prog, "unknown attribute 'XXX'")
-
-  checkload([[local xxx <const> = 20; xxx = 10]],
-             ":1: attempt to assign to const variable 'xxx'")
-
-  checkload([[
-    local xx;
-    local xxx <const> = 20;
-    local yyy;
-    local function foo ()
-      local abc = xx + yyy + xxx;
-      return function () return function () xxx = yyy end end
-    end
-  ]], ":6: attempt to assign to const variable 'xxx'")
-
-  checkload([[
-    local x <close> = nil
-    x = io.open()
-  ]], ":2: attempt to assign to const variable 'x'")
-end
-
-f = [[
-return function ( a , b , c , d , e )
-  local x = a >= b or c or ( d and e ) or nil
-  return x
-end , { a = 1 , b = 2 >= 1 , } or { 1 };
-]]
-f = string.gsub(f, "%s+", "\n");   -- force a SETLINE between opcodes
-f,a = load(f)();
-assert(a.a == 1 and a.b)
-
-function g (a,b,c,d,e)
-  if not (a>=b or c or d and e or nil) then return 0; else return 1; end;
-end
-
-local function h (a,b,c,d,e)
-  while (a>=b or c or (d and e) or nil) do return 1; end;
-  return 0;
-end;
-
-assert(f(2,1) == true and g(2,1) == 1 and h(2,1) == 1)
-assert(f(1,2,'a') == 'a' and g(1,2,'a') == 1 and h(1,2,'a') == 1)
-assert(f(1,2,'a')
-~=          -- force SETLINE before nil
-nil, "")
-assert(f(1,2,'a') == 'a' and g(1,2,'a') == 1 and h(1,2,'a') == 1)
-assert(f(1,2,nil,1,'x') == 'x' and g(1,2,nil,1,'x') == 1 and
-                                   h(1,2,nil,1,'x') == 1)
-assert(f(1,2,nil,nil,'x') == nil and g(1,2,nil,nil,'x') == 0 and
-                                     h(1,2,nil,nil,'x') == 0)
-assert(f(1,2,nil,1,nil) == nil and g(1,2,nil,1,nil) == 0 and
-                                   h(1,2,nil,1,nil) == 0)
-
-assert(1 and 2<3 == true and 2<3 and 'a'<'b' == true)
-x = 2<3 and not 3; assert(x==false)
-x = 2<1 or (2>1 and 'a'); assert(x=='a')
-
-
-do
-  local a; if nil then a=1; else a=2; end;    -- this nil comes as PUSHNIL 2
-  assert(a==2)
-end
-
-local function F (a)
-  assert(debug.getinfo(1, "n").name == 'F')
-  return a,2,3
-end
-
-a,b = F(1)~=nil; assert(a == true and b == nil);
-a,b = F(nil)==nil; assert(a == true and b == nil)
-
-----------------------------------------------------------------
-------------------------------------------------------------------
-
--- sometimes will be 0, sometimes will not...
-_ENV.GLOB1 = math.random(0, 1)
-
--- basic expressions with their respective values
-local basiccases = {
-  {"nil", nil},
-  {"false", false},
-  {"true", true},
-  {"10", 10},
-  {"(0==_ENV.GLOB1)", 0 == _ENV.GLOB1},
-}
-
-local prog
-
-if _ENV.GLOB1 == 0 then
-  basiccases[2][1] = "F"   -- constant false
-
-  prog = [[
-    local F <const> = false
-    if %s then IX = true end
-    return %s
-]]
-else
-  basiccases[4][1] = "k10"   -- constant 10
-
-  prog = [[
-    local k10 <const> = 10
-    if %s then IX = true end
-    return %s
-  ]]
-end
-
-print('testing short-circuit optimizations (' .. _ENV.GLOB1 .. ')')
-
-
--- operators with their respective values
-local binops <const> = {
-  {" and ", function (a,b) if not a then return a else return b end end},
-  {" or ", function (a,b) if a then return a else return b end end},
-}
-
-local cases <const> = {}
-
--- creates all combinations of '(cases[i] op cases[n-i])' plus
--- 'not(cases[i] op cases[n-i])' (syntax + value)
-local function createcases (n)
-  local res = {}
-  for i = 1, n - 1 do
-    for _, v1 in ipairs(cases[i]) do
-      for _, v2 in ipairs(cases[n - i]) do
-        for _, op in ipairs(binops) do
-            local t = {
-              "(" .. v1[1] .. op[1] .. v2[1] .. ")",
-              op[2](v1[2], v2[2])
-            }
-            res[#res + 1] = t
-            res[#res + 1] = {"not" .. t[1], not t[2]}
-        end
-      end
-    end
-  end
-  return res
-end
-
--- do not do too many combinations for soft tests
-local level = _soft and 3 or 4
-
-cases[1] = basiccases
-for i = 2, level do cases[i] = createcases(i) end
-print("+")
-
-local i = 0
-for n = 1, level do
-  for _, v in pairs(cases[n]) do
-    local s = v[1]
-    local p = load(string.format(prog, s, s), "")
-    IX = false
-    assert(p() == v[2] and IX == not not v[2])
-    i = i + 1
-    if i % 60000 == 0 then print('+') end
-  end
-end
-IX = nil
-_G.GLOB1 = nil
-------------------------------------------------------------------
-
--- testing some syntax errors (chosen through 'gcov')
-checkload("for x do", "expected")
-checkload("x:call", "expected")
-
-print'OK'

testes/cstack.lua

@@ -1,197 +0,0 @@
--- $Id: testes/cstack.lua $
--- See Copyright Notice in file all.lua
-
-
-local tracegc = require"tracegc"
-
-print"testing stack overflow detection"
-
--- Segmentation faults in these tests probably result from a C-stack
--- overflow. To avoid these errors, you should set a smaller limit for
--- the use of C stack by Lua, by changing the constant 'LUAI_MAXCCALLS'.
--- Alternatively, you can ensure a larger stack for the program.
-
-
-local function checkerror (msg, f, ...)
-  local s, err = pcall(f, ...)
-  assert(not s and string.find(err, msg))
-end
-
-do  print("testing stack overflow in message handling")
-  local count = 0
-  local function loop (x, y, z)
-    count = count + 1
-    return 1 + loop(x, y, z)
-  end
-  tracegc.stop()    -- __gc should not be called with a full stack
-  local res, msg = xpcall(loop, loop)
-  tracegc.start()
-  assert(msg == "error in error handling")
-  print("final count: ", count)
-end
-
-
--- bug since 2.5 (C-stack overflow in recursion inside pattern matching)
-do  print("testing recursion inside pattern matching")
-  local function f (size)
-    local s = string.rep("a", size)
-    local p = string.rep(".?", size)
-    return string.match(s, p)
-  end
-  local m = f(80)
-  assert(#m == 80)
-  checkerror("too complex", f, 2000)
-end
-
-
-do  print("testing stack-overflow in recursive 'gsub'")
-  local count = 0
-  local function foo ()
-    count = count + 1
-    string.gsub("a", ".", foo)
-  end
-  checkerror("stack overflow", foo)
-  print("final count: ", count)
-
-  print("testing stack-overflow in recursive 'gsub' with metatables")
-  local count = 0
-  local t = setmetatable({}, {__index = foo})
-  foo = function ()
-    count = count + 1
-    string.gsub("a", ".", t)
-  end
-  checkerror("stack overflow", foo)
-  print("final count: ", count)
-end
-
-
-do   -- bug in 5.4.0
-  print("testing limits in coroutines inside deep calls")
-  local count = 0
-  local lim = 1000
-  local function stack (n)
-    if n > 0 then return stack(n - 1) + 1
-    else coroutine.wrap(function ()
-           count = count + 1
-           stack(lim)
-         end)()
-    end
-  end
-
-  local st, msg = xpcall(stack, function () return "ok" end, lim)
-  assert(not st and msg == "ok")
-  print("final count: ", count)
-end
-
-
-do    -- bug since 5.4.0
-  local count = 0
-  print("chain of 'coroutine.close'")
-  -- create N coroutines forming a list so that each one, when closed,
-  -- closes the previous one. (With a large enough N, previous Lua
-  -- versions crash in this test.)
-  local coro = false
-  for i = 1, 1000 do
-    local previous = coro
-    coro = coroutine.create(function()
-      local cc <close> = setmetatable({}, {__close=function()
-        count = count + 1
-        if previous then
-          assert(coroutine.close(previous))
-        end
-      end})
-      coroutine.yield()   -- leaves 'cc' pending to be closed
-    end)
-    assert(coroutine.resume(coro))  -- start it and run until it yields
-  end
-  local st, msg = coroutine.close(coro)
-  assert(not st and string.find(msg, "C stack overflow"))
-  print("final count: ", count)
-end
-
-
-do
-  print("nesting of resuming yielded coroutines")
-  local count = 0
-
-  local function body ()
-    coroutine.yield()
-    local f = coroutine.wrap(body)
-    f();  -- start new coroutine (will stop in previous yield)
-    count = count + 1
-    f()   -- call it recursively
-  end
-
-  local f = coroutine.wrap(body)
-  f()
-  assert(not pcall(f))
-  print("final count: ", count)
-end
-
-
-do    -- bug in 5.4.2
-  print("nesting coroutines running after recoverable errors")
-  local count = 0
-  local function foo()
-    count = count + 1
-    pcall(1)   -- create an error
-    -- running now inside 'precover' ("protected recover")
-    coroutine.wrap(foo)()   -- call another coroutine
-  end
-  checkerror("C stack overflow", foo)
-  print("final count: ", count)
-end
-
-
-if T then
-  print("testing stack recovery")
-  local N = 0      -- trace number of calls
-  local LIM = -1   -- will store N just before stack overflow
-
-  -- trace stack size; after stack overflow, it should be
-  -- the maximum allowed stack size.
-  local stack1
-  local dummy
-
-  local function err(msg)
-    assert(string.find(msg, "stack overflow"))
-    local _, stacknow = T.stacklevel()
-    assert(stacknow == stack1 + 200)
-  end
-
-  -- When LIM==-1, the 'if' is not executed, so this function only
-  -- counts and stores the stack limits up to overflow.  Then, LIM
-  -- becomes N, and then the 'if' code is run when the stack is
-  -- full. Then, there is a stack overflow inside 'xpcall', after which
-  -- the stack must have been restored back to its maximum normal size.
-  local function f()
-    dummy, stack1 = T.stacklevel()
-    if N == LIM then
-      xpcall(f, err)
-      local _, stacknow = T.stacklevel()
-      assert(stacknow == stack1)
-      return
-    end
-    N = N + 1
-    f()
-  end
-
-  local topB, sizeB   -- top and size Before overflow
-  local topA, sizeA   -- top and size After overflow
-  topB, sizeB = T.stacklevel()
-  tracegc.stop()    -- __gc should not be called with a full stack
-  xpcall(f, err)
-  tracegc.start()
-  topA, sizeA = T.stacklevel()
-  -- sizes should be comparable
-  assert(topA == topB and sizeA < sizeB * 2)
-  print(string.format("maximum stack size: %d", stack1))
-  LIM = N      -- will stop recursion at maximum level
-  N = 0        -- to count again
-  tracegc.stop()    -- __gc should not be called with a full stack
-  f()
-  tracegc.start()
-  print"+"
-end
-
-print'OK'

testes/errors.lua

@@ -1,680 +0,0 @@
--- $Id: testes/errors.lua $
--- See Copyright Notice in file all.lua
-
-print("testing errors")
-
-local debug = require"debug"
-
--- avoid problems with 'strict' module (which may generate other error messages)
-local mt = getmetatable(_G) or {}
-local oldmm = mt.__index
-mt.__index = nil
-
-local function checkerr (msg, f, ...)
-  local st, err = pcall(f, ...)
-  assert(not st and string.find(err, msg))
-end
-
-
-local function doit (s)
-  local f, msg = load(s)
-  if not f then return msg end
-  local cond, msg = pcall(f)
-  return (not cond) and msg
-end
-
-
-local function checkmessage (prog, msg, debug)
-  local m = doit(prog)
-  if debug then print(m, msg) end
-  assert(string.find(m, msg, 1, true))
-end
-
-local function checksyntax (prog, extra, token, line)
-  local msg = doit(prog)
-  if not string.find(token, "^<%a") and not string.find(token, "^char%(")
-    then token = "'"..token.."'" end
-  token = string.gsub(token, "(%p)", "%%%1")
-  local pt = string.format([[^%%[string ".*"%%]:%d: .- near %s$]],
-                           line, token)
-  assert(string.find(msg, pt))
-  assert(string.find(msg, msg, 1, true))
-end
-
-
--- test error message with no extra info
-assert(doit("error('hi', 0)") == 'hi')
-
--- test error message with no info
-assert(doit("error()") == nil)
-
-
--- test common errors/errors that crashed in the past
-assert(doit("table.unpack({}, 1, n=2^30)"))
-assert(doit("a=math.sin()"))
-assert(not doit("tostring(1)") and doit("tostring()"))
-assert(doit"tonumber()")
-assert(doit"repeat until 1; a")
-assert(doit"return;;")
-assert(doit"assert(false)")
-assert(doit"assert(nil)")
-assert(doit("function a (... , ...) end"))
-assert(doit("function a (, ...) end"))
-assert(doit("local t={}; t = t[#t] + 1"))
-
-checksyntax([[
-  local a = {4
-
-]], "'}' expected (to close '{' at line 1)", "<eof>", 3)
-
-
-do   -- testing errors in goto/break
-  local function checksyntax (prog, msg, line)
-    local st, err = load(prog)
-    assert(string.find(err, "line " .. line))
-    assert(string.find(err, msg, 1, true))
-  end
-
-  checksyntax([[
-    ::A:: a = 1
-    ::A::
-  ]], "label 'A' already defined", 1)
-
-  checksyntax([[
-    a = 1
-    goto A
-    do ::A:: end
-  ]], "no visible label 'A'", 2)
-
-end
-
-
-if not T then
-  (Message or print)
-    ('\n >>> testC not active: skipping memory message test <<<\n')
-else
-  print "testing memory error message"
-  local a = {}
-  for i = 1, 10000 do a[i] = true end   -- preallocate array
-  collectgarbage()
-  T.totalmem(T.totalmem() + 10000)
-  -- force a memory error (by a small margin)
-  local st, msg = pcall(function()
-    for i = 1, 100000 do a[i] = tostring(i) end
-  end)
-  T.totalmem(0)
-  assert(not st and msg == "not enough" .. " memory")
-end
-
-
--- tests for better error messages
-
-checkmessage("a = {} + 1", "arithmetic")
-checkmessage("a = {} | 1", "bitwise operation")
-checkmessage("a = {} < 1", "attempt to compare")
-checkmessage("a = {} <= 1", "attempt to compare")
-
-checkmessage("aaa=1; bbbb=2; aaa=math.sin(3)+bbbb(3)", "global 'bbbb'")
-checkmessage("aaa={}; do local aaa=1 end aaa:bbbb(3)", "method 'bbbb'")
-checkmessage("local a={}; a.bbbb(3)", "field 'bbbb'")
-assert(not string.find(doit"aaa={13}; local bbbb=1; aaa[bbbb](3)", "'bbbb'"))
-checkmessage("aaa={13}; local bbbb=1; aaa[bbbb](3)", "number")
-checkmessage("aaa=(1)..{}", "a table value")
-
-_G.aaa, _G.bbbb = nil
-
--- calls
-checkmessage("local a; a(13)", "local 'a'")
-checkmessage([[
-  local a = setmetatable({}, {__add = 34})
-  a = a + 1
-]], "metamethod 'add'")
-checkmessage([[
-  local a = setmetatable({}, {__lt = {}})
-  a = a > a
-]], "metamethod 'lt'")
-
--- tail calls
-checkmessage("local a={}; return a.bbbb(3)", "field 'bbbb'")
-checkmessage("aaa={}; do local aaa=1 end; return aaa:bbbb(3)", "method 'bbbb'")
-
-checkmessage("aaa = #print", "length of a function value")
-checkmessage("aaa = #3", "length of a number value")
-
-_G.aaa = nil
-
-checkmessage("aaa.bbb:ddd(9)", "global 'aaa'")
-checkmessage("local aaa={bbb=1}; aaa.bbb:ddd(9)", "field 'bbb'")
-checkmessage("local aaa={bbb={}}; aaa.bbb:ddd(9)", "method 'ddd'")
-checkmessage("local a,b,c; (function () a = b+1.1 end)()", "upvalue 'b'")
-assert(not doit"local aaa={bbb={ddd=next}}; aaa.bbb:ddd(nil)")
-
--- upvalues being indexed do not go to the stack
-checkmessage("local a,b,cc; (function () a = cc[1] end)()", "upvalue 'cc'")
-checkmessage("local a,b,cc; (function () a.x = 1 end)()", "upvalue 'a'")
-
-checkmessage("local _ENV = {x={}}; a = a + 1", "global 'a'")
-
-checkmessage("BB=1; local aaa={}; x=aaa+BB", "local 'aaa'")
-checkmessage("aaa={}; x=3.3/aaa", "global 'aaa'")
-checkmessage("aaa=2; BB=nil;x=aaa*BB", "global 'BB'")
-checkmessage("aaa={}; x=-aaa", "global 'aaa'")
-
--- short circuit
-checkmessage("aaa=1; local aaa,bbbb=2,3; aaa = math.sin(1) and bbbb(3)",
-       "local 'bbbb'")
-checkmessage("aaa=1; local aaa,bbbb=2,3; aaa = bbbb(1) or aaa(3)",
-             "local 'bbbb'")
-checkmessage("local a,b,c,f = 1,1,1; f((a and b) or c)", "local 'f'")
-checkmessage("local a,b,c = 1,1,1; ((a and b) or c)()", "call a number value")
-assert(not string.find(doit"aaa={}; x=(aaa or aaa)+(aaa and aaa)", "'aaa'"))
-assert(not string.find(doit"aaa={}; (aaa or aaa)()", "'aaa'"))
-
-checkmessage("print(print < 10)", "function with number")
-checkmessage("print(print < print)", "two function values")
-checkmessage("print('10' < 10)", "string with number")
-checkmessage("print(10 < '23')", "number with string")
-
--- float->integer conversions
-checkmessage("local a = 2.0^100; x = a << 2", "local a")
-checkmessage("local a = 1 >> 2.0^100", "has no integer representation")
-checkmessage("local a = 10.1 << 2.0^100", "has no integer representation")
-checkmessage("local a = 2.0^100 & 1", "has no integer representation")
-checkmessage("local a = 2.0^100 & 1e100", "has no integer representation")
-checkmessage("local a = 2.0 | 1e40", "has no integer representation")
-checkmessage("local a = 2e100 ~ 1", "has no integer representation")
-checkmessage("string.sub('a', 2.0^100)", "has no integer representation")
-checkmessage("string.rep('a', 3.3)", "has no integer representation")
-checkmessage("return 6e40 & 7", "has no integer representation")
-checkmessage("return 34 << 7e30", "has no integer representation")
-checkmessage("return ~-3e40", "has no integer representation")
-checkmessage("return ~-3.009", "has no integer representation")
-checkmessage("return 3.009 & 1", "has no integer representation")
-checkmessage("return 34 >> {}", "table value")
-checkmessage("aaa = 24 // 0", "divide by zero")
-checkmessage("aaa = 1 % 0", "'n%0'")
-
-
--- type error for an object which is neither in an upvalue nor a register.
--- The following code will try to index the value 10 that is stored in
--- the metatable, without moving it to a register.
-checkmessage("local a = setmetatable({}, {__index = 10}).x",
-             "attempt to index a number value")
-
-
--- numeric for loops
-checkmessage("for i = {}, 10 do end", "table")
-checkmessage("for i = io.stdin, 10 do end", "FILE")
-checkmessage("for i = {}, 10 do end", "initial value")
-checkmessage("for i = 1, 'x', 10 do end", "string")
-checkmessage("for i = 1, {}, 10 do end", "limit")
-checkmessage("for i = 1, {} do end", "limit")
-checkmessage("for i = 1, 10, print do end", "step")
-checkmessage("for i = 1, 10, print do end", "function")
-
--- passing light userdata instead of full userdata
-_G.D = debug
-checkmessage([[
-  -- create light udata
-  local x = D.upvalueid(function () return debug end, 1)
-  D.setuservalue(x, {})
-]], "light userdata")
-_G.D = nil
-
-do   -- named objects (field '__name')
-  checkmessage("math.sin(io.input())", "(number expected, got FILE*)")
-  _G.XX = setmetatable({}, {__name = "My Type"})
-  assert(string.find(tostring(XX), "^My Type"))
-  checkmessage("io.input(XX)", "(FILE* expected, got My Type)")
-  checkmessage("return XX + 1", "on a My Type value")
-  checkmessage("return ~io.stdin", "on a FILE* value")
-  checkmessage("return XX < XX", "two My Type values")
-  checkmessage("return {} < XX", "table with My Type")
-  checkmessage("return XX < io.stdin", "My Type with FILE*")
-  _G.XX = nil
-
-  if T then   -- extra tests for 'luaL_tolstring'
-    -- bug in 5.4.3; 'luaL_tolstring' with negative indices
-    local x = setmetatable({}, {__name="TABLE"})
-    assert(T.testC("Ltolstring -1; return 1", x) == tostring(x))
-
-    local a, b = T.testC("pushint 10; Ltolstring -2; return 2", x)
-    assert(a == 10 and b == tostring(x))
-
-    setmetatable(x, {__tostring=function (o)
-      assert(o == x)
-      return "ABC"
-    end})
-    local a, b, c = T.testC("pushint 10; Ltolstring -2; return 3", x)
-    assert(a == x and b == 10 and c == "ABC")
-  end
-end
-
--- global functions
-checkmessage("(io.write or print){}", "io.write")
-checkmessage("(collectgarbage or print){}", "collectgarbage")
-
--- errors in functions without debug info
-do
-  local f = function (a) return a + 1 end
-  f = assert(load(string.dump(f, true)))
-  assert(f(3) == 4)
-  checkerr("^%?:%-1:", f, {})
-
-  -- code with a move to a local var ('OP_MOV A B' with A<B)
-  f = function () local a; a = {}; return a + 2 end
-  -- no debug info (so that 'a' is unknown)
-  f = assert(load(string.dump(f, true)))
-  -- symbolic execution should not get lost
-  checkerr("^%?:%-1:.*table value", f)
-end
-
-
--- tests for field accesses after RK limit
-local t = {}
-for i = 1, 1000 do
-  t[i] = "aaa = x" .. i
-end
-local s = table.concat(t, "; ")
-t = nil
-checkmessage(s.."; aaa = bbb + 1", "global 'bbb'")
-checkmessage("local _ENV=_ENV;"..s.."; aaa = bbb + 1", "global 'bbb'")
-checkmessage(s.."; local t = {}; aaa = t.bbb + 1", "field 'bbb'")
-checkmessage(s.."; local t = {}; t:bbb()", "method 'bbb'")
-
-checkmessage([[aaa=9
-repeat until 3==3
-local x=math.sin(math.cos(3))
-if math.sin(1) == x then return math.sin(1) end   -- tail call
-local a,b = 1, {
-  {x='a'..'b'..'c', y='b', z=x},
-  {1,2,3,4,5} or 3+3<=3+3,
-  3+1>3+1,
-  {d = x and aaa[x or y]}}
-]], "global 'aaa'")
-
-checkmessage([[
-local x,y = {},1
-if math.sin(1) == 0 then return 3 end    -- return
-x.a()]], "field 'a'")
-
-checkmessage([[
-prefix = nil
-insert = nil
-while 1 do
-  local a
-  if nil then break end
-  insert(prefix, a)
-end]], "global 'insert'")
-
-checkmessage([[  -- tail call
-  return math.sin("a")
-]], "sin")
-
-checkmessage([[collectgarbage("nooption")]], "invalid option")
-
-checkmessage([[x = print .. "a"]], "concatenate")
-checkmessage([[x = "a" .. false]], "concatenate")
-checkmessage([[x = {} .. 2]], "concatenate")
-
-checkmessage("getmetatable(io.stdin).__gc()", "no value")
-
-checkmessage([[
-local Var
-local function main()
-  NoSuchName (function() Var=0 end)
-end
-main()
-]], "global 'NoSuchName'")
-print'+'
-
-aaa = {}; setmetatable(aaa, {__index = string})
-checkmessage("aaa:sub()", "bad self")
-checkmessage("string.sub('a', {})", "#2")
-checkmessage("('a'):sub{}", "#1")
-
-checkmessage("table.sort({1,2,3}, table.sort)", "'table.sort'")
-checkmessage("string.gsub('s', 's', setmetatable)", "'setmetatable'")
-
-_G.aaa = nil
-
-
--- tests for errors in coroutines
-
-local function f (n)
-  local c = coroutine.create(f)
-  local a,b = coroutine.resume(c)
-  return b
-end
-assert(string.find(f(), "C stack overflow"))
-
-checkmessage("coroutine.yield()", "outside a coroutine")
-
-f = coroutine.wrap(function () table.sort({1,2,3}, coroutine.yield) end)
-checkerr("yield across", f)
-
-
--- testing size of 'source' info; size of buffer for that info is
--- LUA_IDSIZE, declared as 60 in luaconf. Get one position for '\0'.
-local idsize = 60 - 1
-local function checksize (source)
-  -- syntax error
-  local _, msg = load("x", source)
-  msg = string.match(msg, "^([^:]*):")   -- get source (1st part before ':')
-  assert(msg:len() <= idsize)
-end
-
-for i = 60 - 10, 60 + 10 do   -- check border cases around 60
-  checksize("@" .. string.rep("x", i))   -- file names
-  checksize(string.rep("x", i - 10))     -- string sources
-  checksize("=" .. string.rep("x", i))   -- exact sources
-end
-
-
--- testing line error
-
-local function lineerror (s, l)
-  local err,msg = pcall(load(s))
-  local line = tonumber(string.match(msg, ":(%d+):"))
-  assert(line == l or (not line and not l))
-end
-
-lineerror("local a\n for i=1,'a' do \n print(i) \n end", 2)
-lineerror("\n local a \n for k,v in 3 \n do \n print(k) \n end", 3)
-lineerror("\n\n for k,v in \n 3 \n do \n print(k) \n end", 4)
-lineerror("function a.x.y ()\na=a+1\nend", 1)
-
-lineerror("a = \na\n+\n{}", 3)
-lineerror("a = \n3\n+\n(\n4\n/\nprint)", 6)
-lineerror("a = \nprint\n+\n(\n4\n/\n7)", 3)
-
-lineerror("a\n=\n-\n\nprint\n;", 3)
-
-lineerror([[
-a
-(
-23)
-]], 1)
-
-lineerror([[
-local a = {x = 13}
-a
-.
-x
-(
-23
-)
-]], 2)
-
-lineerror([[
-local a = {x = 13}
-a
-.
-x
-(
-23 + a
-)
-]], 6)
-
-local p = [[
-  function g() f() end
-  function f(x) error('a', XX) end
-g()
-]]
-XX=3;lineerror((p), 3)
-XX=0;lineerror((p), false)
-XX=1;lineerror((p), 2)
-XX=2;lineerror((p), 1)
-_G.XX, _G.g, _G.f = nil
-
-
-lineerror([[
-local b = false
-if not b then
-  error 'test'
-end]], 3)
-
-lineerror([[
-local b = false
-if not b then
-  if not b then
-    if not b then
-      error 'test'
-    end
-  end
-end]], 5)
-
-
--- bug in 5.4.0
-lineerror([[
-  local a = 0
-  local b = 1
-  local c = b % a
-]], 3)
-
-do
-  -- Force a negative estimate for base line. Error in instruction 2
-  -- (after VARARGPREP, GETGLOBAL), with first absolute line information
-  -- (forced by too many lines) in instruction 0.
-  local s = string.format("%s return __A.x", string.rep("\n", 300))
-  lineerror(s, 301)
-end
-
-
-if not _soft then
-  -- several tests that exaust the Lua stack
-  collectgarbage()
-  print"testing stack overflow"
-  local C = 0
-  -- get line where stack overflow will happen
-  local l = debug.getinfo(1, "l").currentline + 1
-  local function auxy () C=C+1; auxy() end     -- produce a stack overflow
-  function YY ()
-    collectgarbage("stop")   -- avoid running finalizers without stack space
-    auxy()
-    collectgarbage("restart")
-  end
-
-  local function checkstackmessage (m)
-    print("(expected stack overflow after " .. C .. " calls)")
-    C = 0    -- prepare next count
-    return (string.find(m, "stack overflow"))
-  end
-  -- repeated stack overflows (to check stack recovery)
-  assert(checkstackmessage(doit('YY()')))
-  assert(checkstackmessage(doit('YY()')))
-  assert(checkstackmessage(doit('YY()')))
-
-  _G.YY = nil
-
-
-  -- error lines in stack overflow
-  local l1
-  local function g(x)
-    l1 = debug.getinfo(x, "l").currentline + 2
-    collectgarbage("stop")   -- avoid running finalizers without stack space
-    auxy()
-    collectgarbage("restart")
-  end
-  local _, stackmsg = xpcall(g, debug.traceback, 1)
-  print('+')
-  local stack = {}
-  for line in string.gmatch(stackmsg, "[^\n]*") do
-    local curr = string.match(line, ":(%d+):")
-    if curr then table.insert(stack, tonumber(curr)) end
-  end
-  local i=1
-  while stack[i] ~= l1 do
-    assert(stack[i] == l)
-    i = i+1
-  end
-  assert(i > 15)
-
-
-  -- error in error handling
-  local res, msg = xpcall(error, error)
-  assert(not res and type(msg) == 'string')
-  print('+')
-
-  local function f (x)
-    if x==0 then error('a\n')
-    else
-      local aux = function () return f(x-1) end
-      local a,b = xpcall(aux, aux)
-      return a,b
-    end
-  end
-  f(3)
-
-  local function loop (x,y,z) return 1 + loop(x, y, z) end
- 
-  local res, msg = xpcall(loop, function (m)
-    assert(string.find(m, "stack overflow"))
-    checkerr("error handling", loop)
-    assert(math.sin(0) == 0)
-    return 15
-  end)
-  assert(msg == 15)
-
-  local f = function ()
-    for i = 999900, 1000000, 1 do table.unpack({}, 1, i) end
-  end
-  checkerr("too many results", f)
-
-end
-
-
-do
-  -- non string messages
-  local t = {}
-  local res, msg = pcall(function () error(t) end)
-  assert(not res and msg == t)
-
-  res, msg = pcall(function () error(nil) end)
-  assert(not res and msg == nil)
-
-  local function f() error{msg='x'} end
-  res, msg = xpcall(f, function (r) return {msg=r.msg..'y'} end)
-  assert(msg.msg == 'xy')
-
-  -- 'assert' with extra arguments
-  res, msg = pcall(assert, false, "X", t)
-  assert(not res and msg == "X")
- 
-  -- 'assert' with no message
-  res, msg = pcall(function () assert(false) end)
-  local line = string.match(msg, "%w+%.lua:(%d+): assertion failed!$")
-  assert(tonumber(line) == debug.getinfo(1, "l").currentline - 2)
-
-  -- 'assert' with non-string messages
-  res, msg = pcall(assert, false, t)
-  assert(not res and msg == t)
-
-  res, msg = pcall(assert, nil, nil)
-  assert(not res and msg == nil)
-
-  -- 'assert' without arguments
-  res, msg = pcall(assert)
-  assert(not res and string.find(msg, "value expected"))
-end
-
--- xpcall with arguments
-local a, b, c = xpcall(string.find, error, "alo", "al")
-assert(a and b == 1 and c == 2)
-a, b, c = xpcall(string.find, function (x) return {} end, true, "al")
-assert(not a and type(b) == "table" and c == nil)
-
-
-print("testing tokens in error messages")
-checksyntax("syntax error", "", "error", 1)
-checksyntax("1.000", "", "1.000", 1)
-checksyntax("[[a]]", "", "[[a]]", 1)
-checksyntax("'aa'", "", "'aa'", 1)
-checksyntax("while << do end", "", "<<", 1)
-checksyntax("for >> do end", "", ">>", 1)
-
--- test invalid non-printable char in a chunk
-checksyntax("a\1a = 1", "", "<\\1>", 1)
-
--- test 255 as first char in a chunk
-checksyntax("\255a = 1", "", "<\\255>", 1)
-
-doit('I = load("a=9+"); aaa=3')
-assert(_G.aaa==3 and not _G.I)
-_G.I,_G.aaa = nil
-print('+')
-
-local lim = 1000
-if _soft then lim = 100 end
-for i=1,lim do
-  doit('a = ')
-  doit('a = 4+nil')
-end
-
-
--- testing syntax limits
-
-local function testrep (init, rep, close, repc, finalresult)
-  local s = init .. string.rep(rep, 100) .. close .. string.rep(repc, 100)
-  local res, msg = load(s)
-  assert(res)   -- 100 levels is OK
-  if (finalresult) then
-    assert(res() == finalresult)
-  end
-  s = init .. string.rep(rep, 500)
-  local res, msg = load(s)   -- 500 levels not ok
-  assert(not res and (string.find(msg, "too many") or
-                      string.find(msg, "overflow")))
-end
-
-testrep("local a; a", ",a", "= 1", ",1")    -- multiple assignment
-testrep("local a; a=", "{", "0", "}")
-testrep("return ", "(", "2", ")", 2)
-testrep("local function a (x) return x end; return ", "a(", "2.2", ")", 2.2)
-testrep("", "do ", "", " end")
-testrep("", "while a do ", "", " end")
-testrep("local a; ", "if a then else ", "", " end")
-testrep("", "function foo () ", "", " end")
-testrep("local a = ''; return ", "a..", "'a'", "", "a")
-testrep("local a = 1; return ", "a^", "a", "", 1)
-
-checkmessage("a = f(x" .. string.rep(",x", 260) .. ")", "too many registers")
-
-
--- testing other limits
-
--- upvalues
-local lim = 127
-local  s = "local function fooA ()\n  local "
-for j = 1,lim do
-  s = s.."a"..j..", "
-end
-s = s.."b,c\n"
-s = s.."local function fooB ()\n  local "
-for j = 1,lim do
-  s = s.."b"..j..", "
-end
-s = s.."b\n"
-s = s.."function fooC () return b+c"
-local c = 1+2
-for j = 1,lim do
-  s = s.."+a"..j.."+b"..j
-  c = c + 2
-end
-s = s.."\nend  end end"
-local a,b = load(s)
-assert(c > 255 and string.find(b, "too many upvalues") and
-       string.find(b, "line 5"))
-
--- local variables
-s = "\nfunction foo ()\n  local "
-for j = 1,300 do
-  s = s.."a"..j..", "
-end
-s = s.."b\n"
-local a,b = load(s)
-assert(string.find(b, "line 2") and string.find(b, "too many local variables"))
-
-mt.__index = oldmm
-
-print('OK')

testes/events.lua

@@ -1,491 +0,0 @@
--- $Id: testes/events.lua $
--- See Copyright Notice in file all.lua
-
-print('testing metatables')
-
-local debug = require'debug'
-
-X = 20; B = 30
-
-_ENV = setmetatable({}, {__index=_G})
-
-collectgarbage()
-
-X = X+10
-assert(X == 30 and _G.X == 20)
-B = false
-assert(B == false)
-_ENV["B"] = undef
-assert(B == 30)
-
-assert(getmetatable{} == nil)
-assert(getmetatable(4) == nil)
-assert(getmetatable(nil) == nil)
-a={name = "NAME"}; setmetatable(a, {__metatable = "xuxu",
-                    __tostring=function(x) return x.name end})
-assert(getmetatable(a) == "xuxu")
-assert(tostring(a) == "NAME")
--- cannot change a protected metatable
-assert(pcall(setmetatable, a, {}) == false)
-a.name = "gororoba"
-assert(tostring(a) == "gororoba")
-
-local a, t = {10,20,30; x="10", y="20"}, {}
-assert(setmetatable(a,t) == a)
-assert(getmetatable(a) == t)
-assert(setmetatable(a,nil) == a)
-assert(getmetatable(a) == nil)
-assert(setmetatable(a,t) == a)
-
-
-function f (t, i, e)
-  assert(not e)
-  local p = rawget(t, "parent")
-  return (p and p[i]+3), "dummy return"
-end
-
-t.__index = f
-
-a.parent = {z=25, x=12, [4] = 24}
-assert(a[1] == 10 and a.z == 28 and a[4] == 27 and a.x == "10")
-
-collectgarbage()
-
-a = setmetatable({}, t)
-function f(t, i, v) rawset(t, i, v-3) end
-setmetatable(t, t)   -- causes a bug in 5.1 !
-t.__newindex = f
-a[1] = 30; a.x = "101"; a[5] = 200
-assert(a[1] == 27 and a.x == 98 and a[5] == 197)
-
-do    -- bug in Lua 5.3.2
-  local mt = {}
-  mt.__newindex = mt
-  local t = setmetatable({}, mt)
-  t[1] = 10     -- will segfault on some machines
-  assert(mt[1] == 10)
-end
-
-
-local c = {}
-a = setmetatable({}, t)
-t.__newindex = c
-t.__index = c
-a[1] = 10; a[2] = 20; a[3] = 90;
-for i = 4, 20 do a[i] = i * 10 end
-assert(a[1] == 10 and a[2] == 20 and a[3] == 90)
-for i = 4, 20 do assert(a[i] == i * 10) end
-assert(next(a) == nil)
-
-
-do
-  local a;
-  a = setmetatable({}, {__index = setmetatable({},
-                     {__index = setmetatable({},
-                     {__index = function (_,n) return a[n-3]+4, "lixo" end})})})
-  a[0] = 20
-  for i=0,10 do
-    assert(a[i*3] == 20 + i*4)
-  end
-end
-
-
-do  -- newindex
-  local foi
-  local a = {}
-  for i=1,10 do a[i] = 0; a['a'..i] = 0; end
-  setmetatable(a, {__newindex = function (t,k,v) foi=true; rawset(t,k,v) end})
-  foi = false; a[1]=0; assert(not foi)
-  foi = false; a['a1']=0; assert(not foi)
-  foi = false; a['a11']=0; assert(foi)
-  foi = false; a[11]=0; assert(foi)
-  foi = false; a[1]=undef; assert(not foi)
-  a[1] = undef
-  foi = false; a[1]=nil; assert(foi)
-end
-
-
-setmetatable(t, nil)
-function f (t, ...) return t, {...} end
-t.__call = f
-
-do
-  local x,y = a(table.unpack{'a', 1})
-  assert(x==a and y[1]=='a' and y[2]==1 and y[3]==undef)
-  x,y = a()
-  assert(x==a and y[1]==undef)
-end
-
-
-local b = setmetatable({}, t)
-setmetatable(b,t)
-
-function f(op)
-  return function (...) cap = {[0] = op, ...} ; return (...) end
-end
-t.__add = f("add")
-t.__sub = f("sub")
-t.__mul = f("mul")
-t.__div = f("div")
-t.__idiv = f("idiv")
-t.__mod = f("mod")
-t.__unm = f("unm")
-t.__pow = f("pow")
-t.__len = f("len")
-t.__band = f("band")
-t.__bor = f("bor")
-t.__bxor = f("bxor")
-t.__shl = f("shl")
-t.__shr = f("shr")
-t.__bnot = f("bnot")
-t.__lt = f("lt")
-t.__le = f("le")
-
-
-local function checkcap (t)
-  assert(#cap + 1 == #t)
-  for i = 1, #t do
-    assert(cap[i - 1] == t[i])
-    assert(math.type(cap[i - 1]) == math.type(t[i]))
-  end
-end
-
--- Some tests are done inside small anonymous functions to ensure
--- that constants go to constant table even in debug compilation,
--- when the constant table is very small.
-assert(b+5 == b); checkcap{"add", b, 5}
-assert(5.2 + b == 5.2); checkcap{"add", 5.2, b}
-assert(b+'5' == b); checkcap{"add", b, '5'}
-assert(5+b == 5); checkcap{"add", 5, b}
-assert('5'+b == '5'); checkcap{"add", '5', b}
-b=b-3; assert(getmetatable(b) == t); checkcap{"sub", b, 3}
-assert(5-a == 5); checkcap{"sub", 5, a}
-assert('5'-a == '5'); checkcap{"sub", '5', a}
-assert(a*a == a); checkcap{"mul", a, a}
-assert(a/0 == a); checkcap{"div", a, 0}
-assert(a/0.0 == a); checkcap{"div", a, 0.0}
-assert(a%2 == a); checkcap{"mod", a, 2}
-assert(a // (1/0) == a); checkcap{"idiv", a, 1/0}
-;(function () assert(a & "hi" == a) end)(); checkcap{"band", a, "hi"}
-;(function () assert(10 & a  == 10) end)(); checkcap{"band", 10, a}
-;(function () assert(a | 10  == a) end)(); checkcap{"bor", a, 10}
-assert(a | "hi" == a); checkcap{"bor", a, "hi"}
-assert("hi" ~ a == "hi"); checkcap{"bxor", "hi", a}
-;(function () assert(10 ~ a == 10) end)(); checkcap{"bxor", 10, a}
-assert(-a == a); checkcap{"unm", a, a}
-assert(a^4.0 == a); checkcap{"pow", a, 4.0}
-assert(a^'4' == a); checkcap{"pow", a, '4'}
-assert(4^a == 4); checkcap{"pow", 4, a}
-assert('4'^a == '4'); checkcap{"pow", '4', a}
-assert(#a == a); checkcap{"len", a, a}
-assert(~a == a); checkcap{"bnot", a, a}
-assert(a << 3 == a); checkcap{"shl", a, 3}
-assert(1.5 >> a == 1.5); checkcap{"shr", 1.5, a}
-
--- for comparison operators, all results are true
-assert(5.0 > a); checkcap{"lt", a, 5.0}
-assert(a >= 10); checkcap{"le", 10, a}
-assert(a <= -10.0); checkcap{"le", a, -10.0}
-assert(a < -10); checkcap{"lt", a, -10}
-
-
--- test for rawlen
-t = setmetatable({1,2,3}, {__len = function () return 10 end})
-assert(#t == 10 and rawlen(t) == 3)
-assert(rawlen"abc" == 3)
-assert(not pcall(rawlen, io.stdin))
-assert(not pcall(rawlen, 34))
-assert(not pcall(rawlen))
-
--- rawlen for long strings
-assert(rawlen(string.rep('a', 1000)) == 1000)
-
-
-t = {}
-t.__lt = function (a,b,c)
-  collectgarbage()
-  assert(c == nil)
-  if type(a) == 'table' then a = a.x end
-  if type(b) == 'table' then b = b.x end
- return a<b, "dummy"
-end
-
-t.__le = function (a,b,c)
-  assert(c == nil)
-  if type(a) == 'table' then a = a.x end
-  if type(b) == 'table' then b = b.x end
- return a<=b, "dummy"
-end
-
-t.__eq = function (a,b,c)
-  assert(c == nil)
-  if type(a) == 'table' then a = a.x end
-  if type(b) == 'table' then b = b.x end
- return a == b, "dummy"
-end
-
-function Op(x) return setmetatable({x=x}, t) end
-
-local function test (a, b, c)
-  assert(not(Op(1)<Op(1)) and (Op(1)<Op(2)) and not(Op(2)<Op(1)))
-  assert(not(1 < Op(1)) and (Op(1) < 2) and not(2 < Op(1)))
-  assert(not(Op('a')<Op('a')) and (Op('a')<Op('b')) and not(Op('b')<Op('a')))
-  assert(not('a' < Op('a')) and (Op('a') < 'b') and not(Op('b') < Op('a')))
-  assert((Op(1)<=Op(1)) and (Op(1)<=Op(2)) and not(Op(2)<=Op(1)))
-  assert((Op('a')<=Op('a')) and (Op('a')<=Op('b')) and not(Op('b')<=Op('a')))
-  assert(not(Op(1)>Op(1)) and not(Op(1)>Op(2)) and (Op(2)>Op(1)))
-  assert(not(Op('a')>Op('a')) and not(Op('a')>Op('b')) and (Op('b')>Op('a')))
-  assert((Op(1)>=Op(1)) and not(Op(1)>=Op(2)) and (Op(2)>=Op(1)))
-  assert((1 >= Op(1)) and not(1 >= Op(2)) and (Op(2) >= 1))
-  assert((Op('a')>=Op('a')) and not(Op('a')>=Op('b')) and (Op('b')>=Op('a')))
-  assert(('a' >= Op('a')) and not(Op('a') >= 'b') and (Op('b') >= Op('a')))
-  assert(Op(1) == Op(1) and Op(1) ~= Op(2))
-  assert(Op('a') == Op('a') and Op('a') ~= Op('b'))
-  assert(a == a and a ~= b)
-  assert(Op(3) == c)
-end
-
-test(Op(1), Op(2), Op(3))
-
-
--- test `partial order'
-
-local function rawSet(x)
-  local y = {}
-  for _,k in pairs(x) do y[k] = 1 end
-  return y
-end
-
-local function Set(x)
-  return setmetatable(rawSet(x), t)
-end
-
-t.__lt = function (a,b)
-  for k in pairs(a) do
-    if not b[k] then return false end
-    b[k] = undef
-  end
-  return next(b) ~= nil
-end
-
-t.__le = function (a,b)
-  for k in pairs(a) do
-    if not b[k] then return false end
-  end
-  return true
-end
-
-assert(Set{1,2,3} < Set{1,2,3,4})
-assert(not(Set{1,2,3,4} < Set{1,2,3,4}))
-assert((Set{1,2,3,4} <= Set{1,2,3,4}))
-assert((Set{1,2,3,4} >= Set{1,2,3,4}))
-assert(not (Set{1,3} <= Set{3,5}))
-assert(not(Set{1,3} <= Set{3,5}))
-assert(not(Set{1,3} >= Set{3,5}))
-
-
-t.__eq = function (a,b)
-  for k in pairs(a) do
-    if not b[k] then return false end
-    b[k] = undef
-  end
-  return next(b) == nil
-end
-
-local s = Set{1,3,5}
-assert(s == Set{3,5,1})
-assert(not rawequal(s, Set{3,5,1}))
-assert(rawequal(s, s))
-assert(Set{1,3,5,1} == rawSet{3,5,1})
-assert(rawSet{1,3,5,1} == Set{3,5,1})
-assert(Set{1,3,5} ~= Set{3,5,1,6})
-
--- '__eq' is not used for table accesses
-t[Set{1,3,5}] = 1
-assert(t[Set{1,3,5}] == undef)
-
-
-do   -- test invalidating flags
-  local mt = {__eq = true}
-  local a = setmetatable({10}, mt)
-  local b = setmetatable({10}, mt)
-  mt.__eq = nil
-  assert(a ~= b)   -- no metamethod
-  mt.__eq = function (x,y) return x[1] == y[1] end
-  assert(a == b)   -- must use metamethod now
-end
-
-
-if not T then
-  (Message or print)('\n >>> testC not active: skipping tests for \z
-userdata <<<\n')
-else
-  local u1 = T.newuserdata(0, 1)
-  local u2 = T.newuserdata(0, 1)
-  local u3 = T.newuserdata(0, 1)
-  assert(u1 ~= u2 and u1 ~= u3)
-  debug.setuservalue(u1, 1);
-  debug.setuservalue(u2, 2);
-  debug.setuservalue(u3, 1);
-  debug.setmetatable(u1, {__eq = function (a, b)
-    return debug.getuservalue(a) == debug.getuservalue(b)
-  end})
-  debug.setmetatable(u2, {__eq = function (a, b)
-    return true
-  end})
-  assert(u1 == u3 and u3 == u1 and u1 ~= u2)
-  assert(u2 == u1 and u2 == u3 and u3 == u2)
-  assert(u2 ~= {})   -- different types cannot be equal
-  assert(rawequal(u1, u1) and not rawequal(u1, u3))
-
-  local mirror = {}
-  debug.setmetatable(u3, {__index = mirror, __newindex = mirror})
-  for i = 1, 10 do u3[i] = i end
-  for i = 1, 10 do assert(u3[i] == i) end
-end
-
-
-t.__concat = function (a,b,c)
-  assert(c == nil)
-  if type(a) == 'table' then a = a.val end
-  if type(b) == 'table' then b = b.val end
-  if A then return a..b
-  else
-    return setmetatable({val=a..b}, t)
-  end
-end
-
-c = {val="c"}; setmetatable(c, t)
-d = {val="d"}; setmetatable(d, t)
-
-A = true
-assert(c..d == 'cd')
-assert(0 .."a".."b"..c..d.."e".."f"..(5+3).."g" == "0abcdef8g")
-
-A = false
-assert((c..d..c..d).val == 'cdcd')
-x = c..d
-assert(getmetatable(x) == t and x.val == 'cd')
-x = 0 .."a".."b"..c..d.."e".."f".."g"
-assert(x.val == "0abcdefg")
-
-
--- concat metamethod x numbers (bug in 5.1.1)
-c = {}
-local x
-setmetatable(c, {__concat = function (a,b)
-  assert(type(a) == "number" and b == c or type(b) == "number" and a == c)
-  return c
-end})
-assert(c..5 == c and 5 .. c == c)
-assert(4 .. c .. 5 == c and 4 .. 5 .. 6 .. 7 .. c == c)
-
-
--- test comparison compatibilities
-local t1, t2, c, d
-t1 = {};  c = {}; setmetatable(c, t1)
-d = {}
-t1.__eq = function () return true end
-t1.__lt = function () return true end
-t1.__le = function () return false end
-setmetatable(d, t1)
-assert(c == d and c < d and not(d <= c))
-t2 = {}
-t2.__eq = t1.__eq
-t2.__lt = t1.__lt
-setmetatable(d, t2)
-assert(c == d and c < d and not(d <= c))
-
-
-
--- test for several levels of calls
-local i
-local tt = {
-  __call = function (t, ...)
-    i = i+1
-    if t.f then return t.f(...)
-    else return {...}
-    end
-  end
-}
-
-local a = setmetatable({}, tt)
-local b = setmetatable({f=a}, tt)
-local c = setmetatable({f=b}, tt)
-
-i = 0
-x = c(3,4,5)
-assert(i == 3 and x[1] == 3 and x[3] == 5)
-
-
-assert(_G.X == 20)
-
-_G.X, _G.B = nil
-
-
-print'+'
-
-local _g = _G
-_ENV = setmetatable({}, {__index=function (_,k) return _g[k] end})
-
-
-a = {}
-rawset(a, "x", 1, 2, 3)
-assert(a.x == 1 and rawget(a, "x", 3) == 1)
-
-print '+'
-
--- testing metatables for basic types
-mt = {__index = function (a,b) return a+b end,
-      __len = function (x) return math.floor(x) end}
-debug.setmetatable(10, mt)
-assert(getmetatable(-2) == mt)
-assert((10)[3] == 13)
-assert((10)["3"] == 13)
-assert(#3.45 == 3)
-debug.setmetatable(23, nil)
-assert(getmetatable(-2) == nil)
-
-debug.setmetatable(true, mt)
-assert(getmetatable(false) == mt)
-mt.__index = function (a,b) return a or b end
-assert((true)[false] == true)
-assert((false)[false] == false)
-debug.setmetatable(false, nil)
-assert(getmetatable(true) == nil)
-
-debug.setmetatable(nil, mt)
-assert(getmetatable(nil) == mt)
-mt.__add = function (a,b) return (a or 1) + (b or 2) end
-assert(10 + nil == 12)
-assert(nil + 23 == 24)
-assert(nil + nil == 3)
-debug.setmetatable(nil, nil)
-assert(getmetatable(nil) == nil)
-
-debug.setmetatable(nil, {})
-
-
--- loops in delegation
-a = {}; setmetatable(a, a); a.__index = a; a.__newindex = a
-assert(not pcall(function (a,b) return a[b] end, a, 10))
-assert(not pcall(function (a,b,c) a[b] = c end, a, 10, true))
-
--- bug in 5.1
-T, K, V = nil
-grandparent = {}
-grandparent.__newindex = function(t,k,v) T=t; K=k; V=v end
-
-parent = {}
-parent.__newindex = parent
-setmetatable(parent, grandparent)
-
-child = setmetatable({}, parent)
-child.foo = 10      --> CRASH (on some machines)
-assert(T == parent and K == "foo" and V == 10)
-
-print 'OK'
-
-return 12
-
-

testes/files.lua

@@ -1,951 +0,0 @@
--- $Id: testes/files.lua $
--- See Copyright Notice in file all.lua
-
-local debug = require "debug"
-
-local maxint = math.maxinteger
-
-assert(type(os.getenv"PATH") == "string")
-
-assert(io.input(io.stdin) == io.stdin)
-assert(not pcall(io.input, "non-existent-file"))
-assert(io.output(io.stdout) == io.stdout)
-
-
-local function testerr (msg, f, ...)
-  local stat, err = pcall(f, ...)
-  return (not stat and string.find(err, msg, 1, true))
-end
-
-
-local function checkerr (msg, f, ...)
-  assert(testerr(msg, f, ...))
-end
-
-
--- cannot close standard files
-assert(not io.close(io.stdin) and
-       not io.stdout:close() and
-       not io.stderr:close())
-
--- cannot call close method without an argument (new in 5.3.5)
-checkerr("got no value", io.stdin.close)
-
-
-assert(type(io.input()) == "userdata" and io.type(io.output()) == "file")
-assert(type(io.stdin) == "userdata" and io.type(io.stderr) == "file")
-assert(not io.type(8))
-local a = {}; setmetatable(a, {})
-assert(not io.type(a))
-
-assert(getmetatable(io.input()).__name == "FILE*")
-
-local a,b,c = io.open('xuxu_nao_existe')
-assert(not a and type(b) == "string" and type(c) == "number")
-
-a,b,c = io.open('/a/b/c/d', 'w')
-assert(not a and type(b) == "string" and type(c) == "number")
-
-local file = os.tmpname()
-local f, msg = io.open(file, "w")
-if not f then
-  (Message or print)("'os.tmpname' file cannot be open; skipping file tests")
-
-else  --{  most tests here need tmpname
-f:close()
-
-print('testing i/o')
-
-local otherfile = os.tmpname()
-
-checkerr("invalid mode", io.open, file, "rw")
-checkerr("invalid mode", io.open, file, "rb+")
-checkerr("invalid mode", io.open, file, "r+bk")
-checkerr("invalid mode", io.open, file, "")
-checkerr("invalid mode", io.open, file, "+")
-checkerr("invalid mode", io.open, file, "b")
-assert(io.open(file, "r+b")):close()
-assert(io.open(file, "r+")):close()
-assert(io.open(file, "rb")):close()
-
-assert(os.setlocale('C', 'all'))
-
-io.input(io.stdin); io.output(io.stdout);
-
-os.remove(file)
-assert(not loadfile(file))
-checkerr("", dofile, file)
-assert(not io.open(file))
-io.output(file)
-assert(io.output() ~= io.stdout)
-
-if not _port then   -- invalid seek
-  local status, msg, code = io.stdin:seek("set", 1000)
-  assert(not status and type(msg) == "string" and type(code) == "number")
-end
-
-assert(io.output():seek() == 0)
-assert(io.write("alo alo"):seek() == string.len("alo alo"))
-assert(io.output():seek("cur", -3) == string.len("alo alo")-3)
-assert(io.write("joao"))
-assert(io.output():seek("end") == string.len("alo joao"))
-
-assert(io.output():seek("set") == 0)
-
-assert(io.write('"álo"', "{a}\n", "second line\n", "third line \n"))
-assert(io.write('çfourth_line'))
-io.output(io.stdout)
-collectgarbage()  -- file should be closed by GC
-assert(io.input() == io.stdin and rawequal(io.output(), io.stdout))
-print('+')
-
--- test GC for files
-collectgarbage()
-for i=1,120 do
-  for i=1,5 do
-    io.input(file)
-    assert(io.open(file, 'r'))
-    io.lines(file)
-  end
-  collectgarbage()
-end
-
-io.input():close()
-io.close()
-
-assert(os.rename(file, otherfile))
-assert(not os.rename(file, otherfile))
-
-io.output(io.open(otherfile, "ab"))
-assert(io.write("\n\n\t\t  ", 3450, "\n"));
-io.close()
-
-
-do
-  -- closing file by scope
-  local F = nil
-  do
-    local f <close> = assert(io.open(file, "w"))
-    F = f
-  end
-  assert(tostring(F) == "file (closed)")
-end
-assert(os.remove(file))
-
-
-do
-  -- test writing/reading numbers
-  local f <close> = assert(io.open(file, "w"))
-  f:write(maxint, '\n')
-  f:write(string.format("0X%x\n", maxint))
-  f:write("0xABCp-3", '\n')
-  f:write(0, '\n')
-  f:write(-maxint, '\n')
-  f:write(string.format("0x%X\n", -maxint))
-  f:write("-0xABCp-3", '\n')
-  assert(f:close())
-  local f <close> = assert(io.open(file, "r"))
-  assert(f:read("n") == maxint)
-  assert(f:read("n") == maxint)
-  assert(f:read("n") == 0xABCp-3)
-  assert(f:read("n") == 0)
-  assert(f:read("*n") == -maxint)            -- test old format (with '*')
-  assert(f:read("n") == -maxint)
-  assert(f:read("*n") == -0xABCp-3)            -- test old format (with '*')
-end
-assert(os.remove(file))
-
-
--- testing multiple arguments to io.read
-do
-  local f <close> = assert(io.open(file, "w"))
-  f:write[[
-a line
-another line
-1234
-3.45
-one
-two
-three
-]]
-  local l1, l2, l3, l4, n1, n2, c, dummy
-  assert(f:close())
-  local f <close> = assert(io.open(file, "r"))
-  l1, l2, n1, n2, dummy = f:read("l", "L", "n", "n")
-  assert(l1 == "a line" and l2 == "another line\n" and
-         n1 == 1234 and n2 == 3.45 and dummy == nil)
-  assert(f:close())
-  local f <close> = assert(io.open(file, "r"))
-  l1, l2, n1, n2, c, l3, l4, dummy = f:read(7, "l", "n", "n", 1, "l", "l")
-  assert(l1 == "a line\n" and l2 == "another line" and c == '\n' and
-         n1 == 1234 and n2 == 3.45 and l3 == "one" and l4 == "two"
-         and dummy == nil)
-  assert(f:close())
-  local f <close> = assert(io.open(file, "r"))
-  -- second item failing
-  l1, n1, n2, dummy = f:read("l", "n", "n", "l")
-  assert(l1 == "a line" and not n1)
-end
-assert(os.remove(file))
-
-
-
--- test yielding during 'dofile'
-f = assert(io.open(file, "w"))
-f:write[[
-local x, z = coroutine.yield(10)
-local y = coroutine.yield(20)
-return x + y * z
-]]
-assert(f:close())
-f = coroutine.wrap(dofile)
-assert(f(file) == 10)
-assert(f(100, 101) == 20)
-assert(f(200) == 100 + 200 * 101)
-assert(os.remove(file))
-
-
-f = assert(io.open(file, "w"))
--- test number termination
-f:write[[
--12.3-	-0xffff+  .3|5.E-3X  +234e+13E 0xDEADBEEFDEADBEEFx
-0x1.13Ap+3e
-]]
--- very long number
-f:write("1234"); for i = 1, 1000 do f:write("0") end;  f:write("\n")
--- invalid sequences (must read and discard valid prefixes)
-f:write[[
-.e+	0.e;	--;  0xX;
-]]
-assert(f:close())
-f = assert(io.open(file, "r"))
-assert(f:read("n") == -12.3); assert(f:read(1) == "-")
-assert(f:read("n") == -0xffff); assert(f:read(2) == "+ ")
-assert(f:read("n") == 0.3); assert(f:read(1) == "|")
-assert(f:read("n") == 5e-3); assert(f:read(1) == "X")
-assert(f:read("n") == 234e13); assert(f:read(1) == "E")
-assert(f:read("n") == 0Xdeadbeefdeadbeef); assert(f:read(2) == "x\n")
-assert(f:read("n") == 0x1.13aP3); assert(f:read(1) == "e")
-
-do   -- attempt to read too long number
-  assert(not f:read("n"))  -- fails
-  local s = f:read("L")   -- read rest of line
-  assert(string.find(s, "^00*\n$"))  -- lots of 0's left
-end
-
-assert(not f:read("n")); assert(f:read(2) == "e+")
-assert(not f:read("n")); assert(f:read(1) == ";")
-assert(not f:read("n")); assert(f:read(2) == "-;")
-assert(not f:read("n")); assert(f:read(1) == "X")
-assert(not f:read("n")); assert(f:read(1) == ";")
-assert(not f:read("n")); assert(not f:read(0))   -- end of file
-assert(f:close())
-assert(os.remove(file))
-
-
--- test line generators
-assert(not pcall(io.lines, "non-existent-file"))
-assert(os.rename(otherfile, file))
-io.output(otherfile)
-local n = 0
-local f = io.lines(file)
-while f() do n = n + 1 end;
-assert(n == 6)   -- number of lines in the file
-checkerr("file is already closed", f)
-checkerr("file is already closed", f)
--- copy from file to otherfile
-n = 0
-for l in io.lines(file) do io.write(l, "\n"); n = n + 1 end
-io.close()
-assert(n == 6)
--- copy from otherfile back to file
-local f = assert(io.open(otherfile))
-assert(io.type(f) == "file")
-io.output(file)
-assert(not io.output():read())
-n = 0
-for l in f:lines() do io.write(l, "\n"); n = n + 1 end
-assert(tostring(f):sub(1, 5) == "file ")
-assert(f:close()); io.close()
-assert(n == 6)
-checkerr("closed file", io.close, f)
-assert(tostring(f) == "file (closed)")
-assert(io.type(f) == "closed file")
-io.input(file)
-f = io.open(otherfile):lines()
-n = 0
-for l in io.lines() do assert(l == f()); n = n + 1 end
-f = nil; collectgarbage()
-assert(n == 6)
-assert(os.remove(otherfile))
-
-do  -- bug in 5.3.1
-  io.output(otherfile)
-  io.write(string.rep("a", 300), "\n")
-  io.close()
-  local t ={}; for i = 1, 250 do t[i] = 1 end
-  t = {io.lines(otherfile, table.unpack(t))()}
-  -- everything ok here
-  assert(#t == 250 and t[1] == 'a' and t[#t] == 'a')
-  t[#t + 1] = 1    -- one too many
-  checkerr("too many arguments", io.lines, otherfile, table.unpack(t))
-  collectgarbage()   -- ensure 'otherfile' is closed
-  assert(os.remove(otherfile))
-end
-
-io.input(file)
-do  -- test error returns
-  local a,b,c = io.input():write("xuxu")
-  assert(not a and type(b) == "string" and type(c) == "number")
-end
-checkerr("invalid format", io.read, "x")
-assert(io.read(0) == "")   -- not eof
-assert(io.read(5, 'l') == '"álo"')
-assert(io.read(0) == "")
-assert(io.read() == "second line")
-local x = io.input():seek()
-assert(io.read() == "third line ")
-assert(io.input():seek("set", x))
-assert(io.read('L') == "third line \n")
-assert(io.read(1) == "ç")
-assert(io.read(string.len"fourth_line") == "fourth_line")
-assert(io.input():seek("cur", -string.len"fourth_line"))
-assert(io.read() == "fourth_line")
-assert(io.read() == "")  -- empty line
-assert(io.read('n') == 3450)
-assert(io.read(1) == '\n')
-assert(not io.read(0))  -- end of file
-assert(not io.read(1))  -- end of file
-assert(not io.read(30000))  -- end of file
-assert(({io.read(1)})[2] == undef)
-assert(not io.read())  -- end of file
-assert(({io.read()})[2] == undef)
-assert(not io.read('n'))  -- end of file
-assert(({io.read('n')})[2] == undef)
-assert(io.read('a') == '')  -- end of file (OK for 'a')
-assert(io.read('a') == '')  -- end of file (OK for 'a')
-collectgarbage()
-print('+')
-io.close(io.input())
-checkerr(" input file is closed", io.read)
-
-assert(os.remove(file))
-
-local t = '0123456789'
-for i=1,10 do t = t..t; end
-assert(string.len(t) == 10*2^10)
-
-io.output(file)
-io.write("alo"):write("\n")
-io.close()
-checkerr(" output file is closed", io.write)
-local f = io.open(file, "a+b")
-io.output(f)
-collectgarbage()
-
-assert(io.write(' ' .. t .. ' '))
-assert(io.write(';', 'end of file\n'))
-f:flush(); io.flush()
-f:close()
-print('+')
-
-io.input(file)
-assert(io.read() == "alo")
-assert(io.read(1) == ' ')
-assert(io.read(string.len(t)) == t)
-assert(io.read(1) == ' ')
-assert(io.read(0))
-assert(io.read('a') == ';end of file\n')
-assert(not io.read(0))
-assert(io.close(io.input()))
-
-
--- test errors in read/write
-do
-  local function ismsg (m)
-    -- error message is not a code number
-    return (type(m) == "string" and not tonumber(m))
-  end
-
-  -- read
-  local f = io.open(file, "w")
-  local r, m, c = f:read()
-  assert(not r and ismsg(m) and type(c) == "number")
-  assert(f:close())
-  -- write
-  f = io.open(file, "r")
-  r, m, c = f:write("whatever")
-  assert(not r and ismsg(m) and type(c) == "number")
-  assert(f:close())
-  -- lines
-  f = io.open(file, "w")
-  r, m = pcall(f:lines())
-  assert(r == false and ismsg(m))
-  assert(f:close())
-end
-
-assert(os.remove(file))
-
--- test for L format
-io.output(file); io.write"\n\nline\nother":close()
-io.input(file)
-assert(io.read"L" == "\n")
-assert(io.read"L" == "\n")
-assert(io.read"L" == "line\n")
-assert(io.read"L" == "other")
-assert(not io.read"L")
-io.input():close()
-
-local f = assert(io.open(file))
-local s = ""
-for l in f:lines("L") do s = s .. l end
-assert(s == "\n\nline\nother")
-f:close()
-
-io.input(file)
-s = ""
-for l in io.lines(nil, "L") do s = s .. l end
-assert(s == "\n\nline\nother")
-io.input():close()
-
-s = ""
-for l in io.lines(file, "L") do s = s .. l end
-assert(s == "\n\nline\nother")
-
-s = ""
-for l in io.lines(file, "l") do s = s .. l end
-assert(s == "lineother")
-
-io.output(file); io.write"a = 10 + 34\na = 2*a\na = -a\n":close()
-local t = {}
-assert(load(io.lines(file, "L"), nil, nil, t))()
-assert(t.a == -((10 + 34) * 2))
-
-
-do   -- testing closing file in line iteration
-
-  -- get the to-be-closed variable from a loop
-  local function gettoclose (lv)
-    lv = lv + 1
-    local stvar = 0   -- to-be-closed is 4th state variable in the loop
-    for i = 1, 1000 do
-      local n, v = debug.getlocal(lv, i)
-      if n == "(for state)" then
-        stvar = stvar + 1
-        if stvar == 4 then return v end
-      end
-    end
-  end
-
-  local f
-  for l in io.lines(file) do
-    f = gettoclose(1)
-    assert(io.type(f) == "file")
-    break
-  end
-  assert(io.type(f) == "closed file")
-
-  f = nil
-  local function foo (name)
-    for l in io.lines(name) do
-      f = gettoclose(1)
-      assert(io.type(f) == "file")
-      error(f)   -- exit loop with an error
-    end
-  end
-  local st, msg = pcall(foo, file)
-  assert(st == false and io.type(msg) == "closed file")
-
-end
-
-
--- test for multipe arguments in 'lines'
-io.output(file); io.write"0123456789\n":close()
-for a,b in io.lines(file, 1, 1) do
-  if a == "\n" then assert(not b)
-  else assert(tonumber(a) == tonumber(b) - 1)
-  end
-end
-
-for a,b,c in io.lines(file, 1, 2, "a") do
-  assert(a == "0" and b == "12" and c == "3456789\n")
-end
-
-for a,b,c in io.lines(file, "a", 0, 1) do
-  if a == "" then break end
-  assert(a == "0123456789\n" and not b and not c)
-end
-collectgarbage()   -- to close file in previous iteration
-
-io.output(file); io.write"00\n10\n20\n30\n40\n":close()
-for a, b in io.lines(file, "n", "n") do
-  if a == 40 then assert(not b)
-  else assert(a == b - 10)
-  end
-end
-
-
--- test load x lines
-io.output(file);
-io.write[[
-local y
-= X
-X =
-X *
-2 +
-X;
-X =
-X
--                                   y;
-]]:close()
-_G.X = 1
-assert(not load((io.lines(file))))
-collectgarbage()   -- to close file in previous iteration
-load((io.lines(file, "L")))()
-assert(_G.X == 2)
-load((io.lines(file, 1)))()
-assert(_G.X == 4)
-load((io.lines(file, 3)))()
-assert(_G.X == 8)
-_G.X = nil
-
-print('+')
-
-local x1 = "string\n\n\\com \"\"''coisas [[estranhas]] ]]'"
-io.output(file)
-assert(io.write(string.format("X2 = %q\n-- comment without ending EOS", x1)))
-io.close()
-assert(loadfile(file))()
-assert(x1 == _G.X2)
-_G.X2 = nil
-print('+')
-assert(os.remove(file))
-assert(not os.remove(file))
-assert(not os.remove(otherfile))
-
--- testing loadfile
-local function testloadfile (s, expres)
-  io.output(file)
-  if s then io.write(s) end
-  io.close()
-  local res = assert(loadfile(file))()
-  assert(os.remove(file))
-  assert(res == expres)
-end
-
--- loading empty file
-testloadfile(nil, nil)
-
--- loading file with initial comment without end of line
-testloadfile("# a non-ending comment", nil)
-
-
--- checking Unicode BOM in files
-testloadfile("\xEF\xBB\xBF# some comment\nreturn 234", 234)
-testloadfile("\xEF\xBB\xBFreturn 239", 239)
-testloadfile("\xEF\xBB\xBF", nil)   -- empty file with a BOM
-
-
--- checking line numbers in files with initial comments
-testloadfile("# a comment\nreturn require'debug'.getinfo(1).currentline", 2)
-
-
--- loading binary file
-io.output(io.open(file, "wb"))
-assert(io.write(string.dump(function () return 10, '\0alo\255', 'hi' end)))
-io.close()
-a, b, c = assert(loadfile(file))()
-assert(a == 10 and b == "\0alo\255" and c == "hi")
-assert(os.remove(file))
-
--- bug in 5.2.1
-do
-  io.output(io.open(file, "wb"))
-  -- save function with no upvalues
-  assert(io.write(string.dump(function () return 1 end)))
-  io.close()
-  f = assert(loadfile(file, "b", {}))
-  assert(type(f) == "function" and f() == 1)
-  assert(os.remove(file))
-end
-
--- loading binary file with initial comment
-io.output(io.open(file, "wb"))
-assert(io.write("#this is a comment for a binary file\0\n",
-                string.dump(function () return 20, '\0\0\0' end)))
-io.close()
-a, b, c = assert(loadfile(file))()
-assert(a == 20 and b == "\0\0\0" and c == nil)
-assert(os.remove(file))
-
-
--- 'loadfile' with 'env'
-do
-  local f = io.open(file, 'w')
-  f:write[[
-    if (...) then a = 15; return b, c, d
-    else return _ENV
-    end
-  ]]
-  f:close()
-  local t = {b = 12, c = "xuxu", d = print}
-  local f = assert(loadfile(file, 't', t))
-  local b, c, d = f(1)
-  assert(t.a == 15 and b == 12 and c == t.c and d == print)
-  assert(f() == t)
-  f = assert(loadfile(file, 't', nil))
-  assert(f() == nil)
-  f = assert(loadfile(file))
-  assert(f() == _G)
-  assert(os.remove(file))
-end
-
-
--- 'loadfile' x modes
-do
-  io.open(file, 'w'):write("return 10"):close()
-  local s, m = loadfile(file, 'b')
-  assert(not s and string.find(m, "a text chunk"))
-  io.open(file, 'w'):write("\27 return 10"):close()
-  local s, m = loadfile(file, 't')
-  assert(not s and string.find(m, "a binary chunk"))
-  assert(os.remove(file))
-end
-
-
-io.output(file)
-assert(io.write("qualquer coisa\n"))
-assert(io.write("mais qualquer coisa"))
-io.close()
-assert(io.output(assert(io.open(otherfile, 'wb')))
-       :write("outra coisa\0\1\3\0\0\0\0\255\0")
-       :close())
-
-local filehandle = assert(io.open(file, 'r+'))
-local otherfilehandle = assert(io.open(otherfile, 'rb'))
-assert(filehandle ~= otherfilehandle)
-assert(type(filehandle) == "userdata")
-assert(filehandle:read('l') == "qualquer coisa")
-io.input(otherfilehandle)
-assert(io.read(string.len"outra coisa") == "outra coisa")
-assert(filehandle:read('l') == "mais qualquer coisa")
-filehandle:close();
-assert(type(filehandle) == "userdata")
-io.input(otherfilehandle)
-assert(io.read(4) == "\0\1\3\0")
-assert(io.read(3) == "\0\0\0")
-assert(io.read(0) == "")        -- 255 is not eof
-assert(io.read(1) == "\255")
-assert(io.read('a') == "\0")
-assert(not io.read(0))
-assert(otherfilehandle == io.input())
-otherfilehandle:close()
-assert(os.remove(file))
-assert(os.remove(otherfile))
-collectgarbage()
-
-io.output(file)
-  :write[[
- 123.4	-56e-2  not a number
-second line
-third line
-
-and the rest of the file
-]]
-  :close()
-io.input(file)
-local _,a,b,c,d,e,h,__ = io.read(1, 'n', 'n', 'l', 'l', 'l', 'a', 10)
-assert(io.close(io.input()))
-assert(_ == ' ' and not __)
-assert(type(a) == 'number' and a==123.4 and b==-56e-2)
-assert(d=='second line' and e=='third line')
-assert(h==[[
-
-and the rest of the file
-]])
-assert(os.remove(file))
-collectgarbage()
-
--- testing buffers
-do
-  local f = assert(io.open(file, "w"))
-  local fr = assert(io.open(file, "r"))
-  assert(f:setvbuf("full", 2000))
-  f:write("x")
-  assert(fr:read("all") == "")  -- full buffer; output not written yet
-  f:close()
-  fr:seek("set")
-  assert(fr:read("all") == "x")   -- `close' flushes it
-  f = assert(io.open(file), "w")
-  assert(f:setvbuf("no"))
-  f:write("x")
-  fr:seek("set")
-  assert(fr:read("all") == "x")  -- no buffer; output is ready
-  f:close()
-  f = assert(io.open(file, "a"))
-  assert(f:setvbuf("line"))
-  f:write("x")
-  fr:seek("set", 1)
-  assert(fr:read("all") == "")   -- line buffer; no output without `\n'
-  f:write("a\n"):seek("set", 1)
-  assert(fr:read("all") == "xa\n")  -- now we have a whole line
-  f:close(); fr:close()
-  assert(os.remove(file))
-end
-
-
-if not _soft then
-  print("testing large files (> BUFSIZ)")
-  io.output(file)
-  for i=1,5001 do io.write('0123456789123') end
-  io.write('\n12346'):close()
-  io.input(file)
-  local x = io.read('a')
-  io.input():seek('set', 0)
-  local y = io.read(30001)..io.read(1005)..io.read(0)..
-            io.read(1)..io.read(100003)
-  assert(x == y and string.len(x) == 5001*13 + 6)
-  io.input():seek('set', 0)
-  y = io.read()  -- huge line
-  assert(x == y..'\n'..io.read())
-  assert(not io.read())
-  io.close(io.input())
-  assert(os.remove(file))
-  x = nil; y = nil
-end
-
-if not _port then
-  local progname
-  do  -- get name of running executable
-    local arg = arg or ARG
-    local i = 0
-    while arg[i] do i = i - 1 end
-    progname = '"' .. arg[i + 1] .. '"'
-  end
-  print("testing popen/pclose and execute")
-  -- invalid mode for popen
-  checkerr("invalid mode", io.popen, "cat", "")
-  checkerr("invalid mode", io.popen, "cat", "r+")
-  checkerr("invalid mode", io.popen, "cat", "rw")
-  do  -- basic tests for popen
-    local file = os.tmpname()
-    local f = assert(io.popen("cat - > " .. file, "w"))
-    f:write("a line")
-    assert(f:close())
-    local f = assert(io.popen("cat - < " .. file, "r"))
-    assert(f:read("a") == "a line")
-    assert(f:close())
-    assert(os.remove(file))
-  end
-
-  local tests = {
-    -- command,   what,  code
-    {"ls > /dev/null", "ok"},
-    {"not-to-be-found-command", "exit"},
-    {"exit 3", "exit", 3},
-    {"exit 129", "exit", 129},
-    {"kill -s HUP $$", "signal", 1},
-    {"kill -s KILL $$", "signal", 9},
-    {"sh -c 'kill -s HUP $$'", "exit"},
-    {progname .. ' -e " "', "ok"},
-    {progname .. ' -e "os.exit(0, true)"', "ok"},
-    {progname .. ' -e "os.exit(20, true)"', "exit", 20},
-  }
-  print("\n(some error messages are expected now)")
-  for _, v in ipairs(tests) do
-    local x, y, z = io.popen(v[1]):close()
-    local x1, y1, z1 = os.execute(v[1])
-    assert(x == x1 and y == y1 and z == z1)
-    if v[2] == "ok" then
-      assert(x and y == 'exit' and z == 0)
-    else
-      assert(not x and y == v[2])   -- correct status and 'what'
-      -- correct code if known (but always different from 0)
-      assert((v[3] == nil and z > 0) or v[3] == z)
-    end
-  end
-end
-
-
--- testing tmpfile
-f = io.tmpfile()
-assert(io.type(f) == "file")
-f:write("alo")
-f:seek("set")
-assert(f:read"a" == "alo")
-
-end --}
-
-print'+'
-
-print("testing date/time")
-
-assert(os.date("") == "")
-assert(os.date("!") == "")
-assert(os.date("\0\0") == "\0\0")
-assert(os.date("!\0\0") == "\0\0")
-local x = string.rep("a", 10000)
-assert(os.date(x) == x)
-local t = os.time()
-D = os.date("*t", t)
-assert(os.date(string.rep("%d", 1000), t) ==
-       string.rep(os.date("%d", t), 1000))
-assert(os.date(string.rep("%", 200)) == string.rep("%", 100))
-
-local function checkDateTable (t)
-  _G.D = os.date("*t", t)
-  assert(os.time(D) == t)
-  load(os.date([[assert(D.year==%Y and D.month==%m and D.day==%d and
-    D.hour==%H and D.min==%M and D.sec==%S and
-    D.wday==%w+1 and D.yday==%j)]], t))()
-  _G.D = nil
-end
-
-checkDateTable(os.time())
-if not _port then
-  -- assume that time_t can represent these values
-  checkDateTable(0)
-  checkDateTable(1)
-  checkDateTable(1000)
-  checkDateTable(0x7fffffff)
-  checkDateTable(0x80000000)
-end
-
-checkerr("invalid conversion specifier", os.date, "%")
-checkerr("invalid conversion specifier", os.date, "%9")
-checkerr("invalid conversion specifier", os.date, "%")
-checkerr("invalid conversion specifier", os.date, "%O")
-checkerr("invalid conversion specifier", os.date, "%E")
-checkerr("invalid conversion specifier", os.date, "%Ea")
-
-checkerr("not an integer", os.time, {year=1000, month=1, day=1, hour='x'})
-checkerr("not an integer", os.time, {year=1000, month=1, day=1, hour=1.5})
-
-checkerr("missing", os.time, {hour = 12})   -- missing date
-
-
-if string.packsize("i") == 4 then   -- 4-byte ints
-  checkerr("field 'year' is out-of-bound", os.time,
-              {year = -(1 << 31) + 1899, month = 1, day = 1})
-
-  checkerr("field 'year' is out-of-bound", os.time,
-              {year = -(1 << 31), month = 1, day = 1})
-
-  if math.maxinteger > 2^31 then   -- larger lua_integer?
-    checkerr("field 'year' is out-of-bound", os.time,
-                {year = (1 << 31) + 1900, month = 1, day = 1})
-  end
-end
-
-
-if not _port then
-  -- test Posix-specific modifiers
-  assert(type(os.date("%Ex")) == 'string')
-  assert(type(os.date("%Oy")) == 'string')
-
-  -- test large dates (assume at least 4-byte ints and time_t)
-  local t0 = os.time{year = 1970, month = 1, day = 0}
-  local t1 = os.time{year = 1970, month = 1, day = 0, sec = (1 << 31) - 1}
-  assert(t1 - t0 == (1 << 31) - 1)
-  t0 = os.time{year = 1970, month = 1, day = 1}
-  t1 = os.time{year = 1970, month = 1, day = 1, sec = -(1 << 31)}
-  assert(t1 - t0 == -(1 << 31))
-
-  -- test out-of-range dates (at least for Unix)
-  if maxint >= 2^62 then  -- cannot do these tests in Small Lua
-    -- no arith overflows
-    checkerr("out-of-bound", os.time, {year = -maxint, month = 1, day = 1})
-    if string.packsize("i") == 4 then   -- 4-byte ints
-      if testerr("out-of-bound", os.date, "%Y", 2^40) then
-        -- time_t has 4 bytes and therefore cannot represent year 4000
-        print("  4-byte time_t")
-        checkerr("cannot be represented", os.time, {year=4000, month=1, day=1})
-      else
-        -- time_t has 8 bytes; an int year cannot represent a huge time
-        print("  8-byte time_t")
-        checkerr("cannot be represented", os.date, "%Y", 2^60)
-
-        -- this is the maximum year
-        assert(tonumber(os.time
-          {year=(1 << 31) + 1899, month=12, day=31, hour=23, min=59, sec=59}))
-
-        -- this is too much
-        checkerr("represented", os.time,
-          {year=(1 << 31) + 1899, month=12, day=31, hour=23, min=59, sec=60})
-      end
-
-      -- internal 'int' fields cannot hold these values
-      checkerr("field 'day' is out-of-bound", os.time,
-                  {year = 0, month = 1, day = 2^32})
-
-      checkerr("field 'month' is out-of-bound", os.time,
-                  {year = 0, month = -((1 << 31) + 1), day = 1})
-
-      checkerr("field 'year' is out-of-bound", os.time,
-                  {year = (1 << 31) + 1900, month = 1, day = 1})
-
-    else    -- 8-byte ints
-      -- assume time_t has 8 bytes too
-      print("  8-byte time_t")
-      assert(tonumber(os.date("%Y", 2^60)))
-
-      -- but still cannot represent a huge year
-      checkerr("cannot be represented", os.time, {year=2^60, month=1, day=1})
-    end
-  end
-end
-
-do
-  local D = os.date("*t")
-  local t = os.time(D)
-  if D.isdst == nil then
-    print("no daylight saving information")
-  else
-    assert(type(D.isdst) == 'boolean')
-  end
-  D.isdst = nil
-  local t1 = os.time(D)
-  assert(t == t1)   -- if isdst is absent uses correct default
-end
-
-local D = os.date("*t")
-t = os.time(D)
-D.year = D.year-1;
-local t1 = os.time(D)
--- allow for leap years
-assert(math.abs(os.difftime(t,t1)/(24*3600) - 365) < 2)
-
--- should not take more than 1 second to execute these two lines
-t = os.time()
-t1 = os.time(os.date("*t"))
-local diff = os.difftime(t1,t)
-assert(0 <= diff and diff <= 1)
-diff = os.difftime(t,t1)
-assert(-1 <= diff and diff <= 0)
-
-local t1 = os.time{year=2000, month=10, day=1, hour=23, min=12}
-local t2 = os.time{year=2000, month=10, day=1, hour=23, min=10, sec=19}
-assert(os.difftime(t1,t2) == 60*2-19)
-
--- since 5.3.3, 'os.time' normalizes table fields
-t1 = {year = 2005, month = 1, day = 1, hour = 1, min = 0, sec = -3602}
-os.time(t1)
-assert(t1.day == 31 and t1.month == 12 and t1.year == 2004 and
-       t1.hour == 23 and t1.min == 59 and t1.sec == 58 and
-       t1.yday == 366)
-
-io.output(io.stdout)
-local t = os.date('%d %m %Y %H %M %S')
-local d, m, a, h, min, s = string.match(t,
-                             "(%d+) (%d+) (%d+) (%d+) (%d+) (%d+)")
-d = tonumber(d)
-m = tonumber(m)
-a = tonumber(a)
-h = tonumber(h)
-min = tonumber(min)
-s = tonumber(s)
-io.write(string.format('test done on %2.2d/%2.2d/%d', d, m, a))
-io.write(string.format(', at %2.2d:%2.2d:%2.2d\n', h, min, s))
-io.write(string.format('%s\n', _VERSION))
-
-

testes/gc.lua

@@ -1,695 +0,0 @@
--- $Id: testes/gc.lua $
--- See Copyright Notice in file all.lua
-
-print('testing incremental garbage collection')
-
-local debug = require"debug"
-
-assert(collectgarbage("isrunning"))
-
-collectgarbage()
-
-local oldmode = collectgarbage("incremental")
-
--- changing modes should return previous mode
-assert(collectgarbage("generational") == "incremental")
-assert(collectgarbage("generational") == "generational")
-assert(collectgarbage("incremental") == "generational")
-assert(collectgarbage("incremental") == "incremental")
-
-
-local function nop () end
-
-local function gcinfo ()
-  return collectgarbage"count" * 1024
-end
-
-
--- test weird parameters to 'collectgarbage'
-do
-  -- save original parameters
-  local a = collectgarbage("setpause", 200)
-  local b = collectgarbage("setstepmul", 200)
-  local t = {0, 2, 10, 90, 500, 5000, 30000, 0x7ffffffe}
-  for i = 1, #t do
-    local p = t[i]
-    for j = 1, #t do
-      local m = t[j]
-      collectgarbage("setpause", p)
-      collectgarbage("setstepmul", m)
-      collectgarbage("step", 0)
-      collectgarbage("step", 10000)
-    end
-  end
-  -- restore original parameters
-  collectgarbage("setpause", a)
-  collectgarbage("setstepmul", b)
-  collectgarbage()
-end
-
-
-_G["while"] = 234
-
-
---
--- tests for GC activation when creating different kinds of objects
---
-local function GC1 ()
-  local u
-  local b     -- (above 'u' it in the stack)
-  local finish = false
-  u = setmetatable({}, {__gc = function () finish = true end})
-  b = {34}
-  repeat u = {} until finish
-  assert(b[1] == 34)   -- 'u' was collected, but 'b' was not
-
-  finish = false; local i = 1
-  u = setmetatable({}, {__gc = function () finish = true end})
-  repeat i = i + 1; u = tostring(i) .. tostring(i) until finish
-  assert(b[1] == 34)   -- 'u' was collected, but 'b' was not
-
-  finish = false
-  u = setmetatable({}, {__gc = function () finish = true end})
-  repeat local i; u = function () return i end until finish
-  assert(b[1] == 34)   -- 'u' was collected, but 'b' was not
-end
-
-local function GC2 ()
-  local u
-  local finish = false
-  u = {setmetatable({}, {__gc = function () finish = true end})}
-  local b = {34}
-  repeat u = {{}} until finish
-  assert(b[1] == 34)   -- 'u' was collected, but 'b' was not
-
-  finish = false; local i = 1
-  u = {setmetatable({}, {__gc = function () finish = true end})}
-  repeat i = i + 1; u = {tostring(i) .. tostring(i)} until finish
-  assert(b[1] == 34)   -- 'u' was collected, but 'b' was not
-
-  finish = false
-  u = {setmetatable({}, {__gc = function () finish = true end})}
-  repeat local i; u = {function () return i end} until finish
-  assert(b[1] == 34)   -- 'u' was collected, but 'b' was not
-end
-
-local function GC()  GC1(); GC2() end
-
-
-do
-  print("creating many objects")
-
-  local limit = 5000
-
-  for i = 1, limit do
-    local a = {}; a = nil
-  end
-
-  local a = "a"
-
-  for i = 1, limit do
-    a = i .. "b";
-    a = string.gsub(a, '(%d%d*)', "%1 %1")
-    a = "a"
-  end
-
-
-
-  a = {}
-
-  function a:test ()
-    for i = 1, limit do
-      load(string.format("function temp(a) return 'a%d' end", i), "")()
-      assert(temp() == string.format('a%d', i))
-    end
-  end
-
-  a:test()
-  _G.temp = nil
-end
-
-
--- collection of functions without locals, globals, etc.
-do local f = function () end end
-
-
-print("functions with errors")
-local prog = [[
-do
-  a = 10;
-  function foo(x,y)
-    a = sin(a+0.456-0.23e-12);
-    return function (z) return sin(%x+z) end
-  end
-  local x = function (w) a=a+w; end
-end
-]]
-do
-  local step = 1
-  if _soft then step = 13 end
-  for i=1, string.len(prog), step do
-    for j=i, string.len(prog), step do
-      pcall(load(string.sub(prog, i, j), ""))
-    end
-  end
-end
-rawset(_G, "a", nil)
-_G.x = nil
-
-do
-  foo = nil
-  print('long strings')
-  local x = "01234567890123456789012345678901234567890123456789012345678901234567890123456789"
-  assert(string.len(x)==80)
-  local s = ''
-  local k = math.min(300, (math.maxinteger // 80) // 2)
-  for n = 1, k do s = s..x; local j=tostring(n)  end
-  assert(string.len(s) == k*80)
-  s = string.sub(s, 1, 10000)
-  local s, i = string.gsub(s, '(%d%d%d%d)', '')
-  assert(i==10000 // 4)
-
-  assert(_G["while"] == 234)
-  _G["while"] = nil
-end
-
-
---
--- test the "size" of basic GC steps (whatever they mean...)
---
-do
-print("steps")
-
-  print("steps (2)")
-
-  local function dosteps (siz)
-    collectgarbage()
-    local a = {}
-    for i=1,100 do a[i] = {{}}; local b = {} end
-    local x = gcinfo()
-    local i = 0
-    repeat   -- do steps until it completes a collection cycle
-      i = i+1
-    until collectgarbage("step", siz)
-    assert(gcinfo() < x)
-    return i    -- number of steps
-  end
-
-  collectgarbage"stop"
-
-  if not _port then
-    assert(dosteps(10) < dosteps(2))
-  end
-
-  -- collector should do a full collection with so many steps
-  assert(dosteps(20000) == 1)
-  assert(collectgarbage("step", 20000) == true)
-  assert(collectgarbage("step", 20000) == true)
-
-  assert(not collectgarbage("isrunning"))
-  collectgarbage"restart"
-  assert(collectgarbage("isrunning"))
-
-end
-
-
-if not _port then
-  -- test the pace of the collector
-  collectgarbage(); collectgarbage()
-  local x = gcinfo()
-  collectgarbage"stop"
-  repeat
-    local a = {}
-  until gcinfo() > 3 * x
-  collectgarbage"restart"
-  assert(collectgarbage("isrunning"))
-  repeat
-    local a = {}
-  until gcinfo() <= x * 2
-end
-
-
-print("clearing tables")
-local lim = 15
-local a = {}
--- fill a with `collectable' indices
-for i=1,lim do a[{}] = i end
-b = {}
-for k,v in pairs(a) do b[k]=v end
--- remove all indices and collect them
-for n in pairs(b) do
-  a[n] = undef
-  assert(type(n) == 'table' and next(n) == nil)
-  collectgarbage()
-end
-b = nil
-collectgarbage()
-for n in pairs(a) do error'cannot be here' end
-for i=1,lim do a[i] = i end
-for i=1,lim do assert(a[i] == i) end
-
-
-print('weak tables')
-a = {}; setmetatable(a, {__mode = 'k'});
--- fill a with some `collectable' indices
-for i=1,lim do a[{}] = i end
--- and some non-collectable ones
-for i=1,lim do a[i] = i end
-for i=1,lim do local s=string.rep('@', i); a[s] = s..'#' end
-collectgarbage()
-local i = 0
-for k,v in pairs(a) do assert(k==v or k..'#'==v); i=i+1 end
-assert(i == 2*lim)
-
-a = {}; setmetatable(a, {__mode = 'v'});
-a[1] = string.rep('b', 21)
-collectgarbage()
-assert(a[1])   -- strings are *values*
-a[1] = undef
--- fill a with some `collectable' values (in both parts of the table)
-for i=1,lim do a[i] = {} end
-for i=1,lim do a[i..'x'] = {} end
--- and some non-collectable ones
-for i=1,lim do local t={}; a[t]=t end
-for i=1,lim do a[i+lim]=i..'x' end
-collectgarbage()
-local i = 0
-for k,v in pairs(a) do assert(k==v or k-lim..'x' == v); i=i+1 end
-assert(i == 2*lim)
-
-a = {}; setmetatable(a, {__mode = 'kv'});
-local x, y, z = {}, {}, {}
--- keep only some items
-a[1], a[2], a[3] = x, y, z
-a[string.rep('$', 11)] = string.rep('$', 11)
--- fill a with some `collectable' values
-for i=4,lim do a[i] = {} end
-for i=1,lim do a[{}] = i end
-for i=1,lim do local t={}; a[t]=t end
-collectgarbage()
-assert(next(a) ~= nil)
-local i = 0
-for k,v in pairs(a) do
-  assert((k == 1 and v == x) or
-         (k == 2 and v == y) or
-         (k == 3 and v == z) or k==v);
-  i = i+1
-end
-assert(i == 4)
-x,y,z=nil
-collectgarbage()
-assert(next(a) == string.rep('$', 11))
-
-
--- 'bug' in 5.1
-a = {}
-local t = {x = 10}
-local C = setmetatable({key = t}, {__mode = 'v'})
-local C1 = setmetatable({[t] = 1}, {__mode = 'k'})
-a.x = t  -- this should not prevent 't' from being removed from
-         -- weak table 'C' by the time 'a' is finalized
-
-setmetatable(a, {__gc = function (u)
-                          assert(C.key == nil)
-                          assert(type(next(C1)) == 'table')
-                          end})
-
-a, t = nil
-collectgarbage()
-collectgarbage()
-assert(next(C) == nil and next(C1) == nil)
-C, C1 = nil
-
-
--- ephemerons
-local mt = {__mode = 'k'}
-a = {{10},{20},{30},{40}}; setmetatable(a, mt)
-x = nil
-for i = 1, 100 do local n = {}; a[n] = {k = {x}}; x = n end
-GC()
-local n = x
-local i = 0
-while n do n = a[n].k[1]; i = i + 1 end
-assert(i == 100)
-x = nil
-GC()
-for i = 1, 4 do assert(a[i][1] == i * 10); a[i] = undef end
-assert(next(a) == nil)
-
-local K = {}
-a[K] = {}
-for i=1,10 do a[K][i] = {}; a[a[K][i]] = setmetatable({}, mt) end
-x = nil
-local k = 1
-for j = 1,100 do
-  local n = {}; local nk = k%10 + 1
-  a[a[K][nk]][n] = {x, k = k}; x = n; k = nk
-end
-GC()
-local n = x
-local i = 0
-while n do local t = a[a[K][k]][n]; n = t[1]; k = t.k; i = i + 1 end
-assert(i == 100)
-K = nil
-GC()
--- assert(next(a) == nil)
-
-
--- testing errors during GC
-if T then
-  collectgarbage("stop")   -- stop collection
-  local u = {}
-  local s = {}; setmetatable(s, {__mode = 'k'})
-  setmetatable(u, {__gc = function (o)
-    local i = s[o]
-    s[i] = true
-    assert(not s[i - 1])   -- check proper finalization order
-    if i == 8 then error("@expected@") end   -- error during GC
-  end})
-
-  for i = 6, 10 do
-    local n = setmetatable({}, getmetatable(u))
-    s[n] = i
-  end
-
-  warn("@on"); warn("@store")
-  collectgarbage()
-  assert(string.find(_WARN, "error in __gc"))
-  assert(string.match(_WARN, "@(.-)@") == "expected"); _WARN = false
-  for i = 8, 10 do assert(s[i]) end
-
-  for i = 1, 5 do
-    local n = setmetatable({}, getmetatable(u))
-    s[n] = i
-  end
-
-  collectgarbage()
-  for i = 1, 10 do assert(s[i]) end
-
-  getmetatable(u).__gc = nil
-  warn("@normal")
-
-end
-print '+'
-
-
--- testing userdata
-if T==nil then
-  (Message or print)('\n >>> testC not active: skipping userdata GC tests <<<\n')
-
-else
-
-  local function newproxy(u)
-    return debug.setmetatable(T.newuserdata(0), debug.getmetatable(u))
-  end
-
-  collectgarbage("stop")   -- stop collection
-  local u = newproxy(nil)
-  debug.setmetatable(u, {__gc = true})
-  local s = 0
-  local a = {[u] = 0}; setmetatable(a, {__mode = 'vk'})
-  for i=1,10 do a[newproxy(u)] = i end
-  for k in pairs(a) do assert(getmetatable(k) == getmetatable(u)) end
-  local a1 = {}; for k,v in pairs(a) do a1[k] = v end
-  for k,v in pairs(a1) do a[v] = k end
-  for i =1,10 do assert(a[i]) end
-  getmetatable(u).a = a1
-  getmetatable(u).u = u
-  do
-    local u = u
-    getmetatable(u).__gc = function (o)
-      assert(a[o] == 10-s)
-      assert(a[10-s] == undef) -- udata already removed from weak table
-      assert(getmetatable(o) == getmetatable(u))
-    assert(getmetatable(o).a[o] == 10-s)
-      s=s+1
-    end
-  end
-  a1, u = nil
-  assert(next(a) ~= nil)
-  collectgarbage()
-  assert(s==11)
-  collectgarbage()
-  assert(next(a) == nil)  -- finalized keys are removed in two cycles
-end
-
-
--- __gc x weak tables
-local u = setmetatable({}, {__gc = true})
--- __gc metamethod should be collected before running
-setmetatable(getmetatable(u), {__mode = "v"})
-getmetatable(u).__gc = function (o) os.exit(1) end  -- cannot happen
-u = nil
-collectgarbage()
-
-local u = setmetatable({}, {__gc = true})
-local m = getmetatable(u)
-m.x = {[{0}] = 1; [0] = {1}}; setmetatable(m.x, {__mode = "kv"});
-m.__gc = function (o)
-  assert(next(getmetatable(o).x) == nil)
-  m = 10
-end
-u, m = nil
-collectgarbage()
-assert(m==10)
-
-do   -- tests for string keys in weak tables
-  collectgarbage(); collectgarbage()
-  local m = collectgarbage("count")         -- current memory
-  local a = setmetatable({}, {__mode = "kv"})
-  a[string.rep("a", 2^22)] = 25   -- long string key -> number value
-  a[string.rep("b", 2^22)] = {}   -- long string key -> colectable value
-  a[{}] = 14                     -- colectable key
-  assert(collectgarbage("count") > m + 2^13)    -- 2^13 == 2 * 2^22 in KB
-  collectgarbage()
-  assert(collectgarbage("count") >= m + 2^12 and
-        collectgarbage("count") < m + 2^13)    -- one key was collected
-  local k, v = next(a)   -- string key with number value preserved
-  assert(k == string.rep("a", 2^22) and v == 25)
-  assert(next(a, k) == nil)  -- everything else cleared
-  assert(a[string.rep("b", 2^22)] == undef)
-  a[k] = undef        -- erase this last entry
-  k = nil
-  collectgarbage()
-  assert(next(a) == nil)
-  -- make sure will not try to compare with dead key
-  assert(a[string.rep("b", 100)] == undef)
-  assert(collectgarbage("count") <= m + 1)   -- eveything collected
-end
-
-
--- errors during collection
-if T then
-  warn("@store")
-  u = setmetatable({}, {__gc = function () error "@expected error" end})
-  u = nil
-  collectgarbage()
-  assert(string.find(_WARN, "@expected error")); _WARN = false
-  warn("@normal")
-end
-
-
-if not _soft then
-  print("long list")
-  local a = {}
-  for i = 1,200000 do
-    a = {next = a}
-  end
-  a = nil
-  collectgarbage()
-end
-
--- create many threads with self-references and open upvalues
-print("self-referenced threads")
-local thread_id = 0
-local threads = {}
-
-local function fn (thread)
-    local x = {}
-    threads[thread_id] = function()
-                             thread = x
-                         end
-    coroutine.yield()
-end
-
-while thread_id < 1000 do
-    local thread = coroutine.create(fn)
-    coroutine.resume(thread, thread)
-    thread_id = thread_id + 1
-end
-
-
--- Create a closure (function inside 'f') with an upvalue ('param') that
--- points (through a table) to the closure itself and to the thread
--- ('co' and the initial value of 'param') where closure is running.
--- Then, assert that table (and therefore everything else) will be
--- collected.
-do
-  local collected = false   -- to detect collection
-  collectgarbage(); collectgarbage("stop")
-  do
-    local function f (param)
-      ;(function ()
-        assert(type(f) == 'function' and type(param) == 'thread')
-        param = {param, f}
-        setmetatable(param, {__gc = function () collected = true end})
-        coroutine.yield(100)
-      end)()
-    end
-    local co = coroutine.create(f)
-    assert(coroutine.resume(co, co))
-  end
-  -- Now, thread and closure are not reacheable any more.
-  collectgarbage()
-  assert(collected)
-  collectgarbage("restart")
-end
-
-
-do
-  collectgarbage()
-  collectgarbage"stop"
-  collectgarbage("step", 0)   -- steps should not unblock the collector
-  local x = gcinfo()
-  repeat
-    for i=1,1000 do _ENV.a = {} end   -- no collection during the loop
-  until gcinfo() > 2 * x
-  collectgarbage"restart"
-  _ENV.a = nil
-end
-
-
-if T then   -- tests for weird cases collecting upvalues
-
-  local function foo ()
-    local a = {x = 20}
-    coroutine.yield(function () return a.x end)  -- will run collector
-    assert(a.x == 20)   -- 'a' is 'ok'
-    a = {x = 30}   -- create a new object
-    assert(T.gccolor(a) == "white")   -- of course it is new...
-    coroutine.yield(100)   -- 'a' is still local to this thread
-  end
-
-  local t = setmetatable({}, {__mode = "kv"})
-  collectgarbage(); collectgarbage('stop')
-  -- create coroutine in a weak table, so it will never be marked
-  t.co = coroutine.wrap(foo)
-  local f = t.co()   -- create function to access local 'a'
-  T.gcstate("atomic")   -- ensure all objects are traversed
-  assert(T.gcstate() == "atomic")
-  assert(t.co() == 100)   -- resume coroutine, creating new table for 'a'
-  assert(T.gccolor(t.co) == "white")  -- thread was not traversed
-  T.gcstate("pause")   -- collect thread, but should mark 'a' before that
-  assert(t.co == nil and f() == 30)   -- ensure correct access to 'a'
-
-  collectgarbage("restart")
-
-  -- test barrier in sweep phase (backing userdata to gray)
-  local u = T.newuserdata(0, 1)   -- create a userdata
-  collectgarbage()
-  collectgarbage"stop"
-  local a = {}     -- avoid 'u' as first element in 'allgc'
-  T.gcstate"atomic"
-  T.gcstate"sweepallgc"
-  local x = {}
-  assert(T.gccolor(u) == "black")   -- userdata is "old" (black)
-  assert(T.gccolor(x) == "white")   -- table is "new" (white)
-  debug.setuservalue(u, x)          -- trigger barrier
-  assert(T.gccolor(u) == "gray")   -- userdata changed back to gray
-  collectgarbage"restart"
-
-  print"+"
-end
-
-
-if T then
-  local debug = require "debug"
-  collectgarbage("stop")
-  local x = T.newuserdata(0)
-  local y = T.newuserdata(0)
-  debug.setmetatable(y, {__gc = nop})   -- bless the new udata before...
-  debug.setmetatable(x, {__gc = nop})   -- ...the old one
-  assert(T.gccolor(y) == "white")
-  T.checkmemory()
-  collectgarbage("restart")
-end
-
-
-if T then
-  print("emergency collections")
-  collectgarbage()
-  collectgarbage()
-  T.totalmem(T.totalmem() + 200)
-  for i=1,200 do local a = {} end
-  T.totalmem(0)
-  collectgarbage()
-  local t = T.totalmem("table")
-  local a = {{}, {}, {}}   -- create 4 new tables
-  assert(T.totalmem("table") == t + 4)
-  t = T.totalmem("function")
-  a = function () end   -- create 1 new closure
-  assert(T.totalmem("function") == t + 1)
-  t = T.totalmem("thread")
-  a = coroutine.create(function () end)   -- create 1 new coroutine
-  assert(T.totalmem("thread") == t + 1)
-end
-
-
--- create an object to be collected when state is closed
-do
-  local setmetatable,assert,type,print,getmetatable =
-        setmetatable,assert,type,print,getmetatable
-  local tt = {}
-  tt.__gc = function (o)
-    assert(getmetatable(o) == tt)
-    -- create new objects during GC
-    local a = 'xuxu'..(10+3)..'joao', {}
-    ___Glob = o  -- ressurrect object!
-    setmetatable({}, tt)  -- creates a new one with same metatable
-    print(">>> closing state " .. "<<<\n")
-  end
-  local u = setmetatable({}, tt)
-  ___Glob = {u}   -- avoid object being collected before program end
-end
-
--- create several objects to raise errors when collected while closing state
-if T then
-  local error, assert, find, warn = error, assert, string.find, warn
-  local n = 0
-  local lastmsg
-  local mt = {__gc = function (o)
-    n = n + 1
-    assert(n == o[1])
-    if n == 1 then
-      _WARN = false
-    elseif n == 2 then
-      assert(find(_WARN, "@expected warning"))
-      lastmsg = _WARN    -- get message from previous error (first 'o')
-    else
-      assert(lastmsg == _WARN)  -- subsequent error messages are equal
-    end
-    warn("@store"); _WARN = false
-    error"@expected warning"
-  end}
-  for i = 10, 1, -1 do
-    -- create object and preserve it until the end
-    table.insert(___Glob, setmetatable({i}, mt))
-  end
-end
-
--- just to make sure
-assert(collectgarbage'isrunning')
-
-do    -- check that the collector is not reentrant in incremental mode
-  local res = true
-  setmetatable({}, {__gc = function ()
-    res = collectgarbage()
-  end})
-  collectgarbage()
-  assert(not res)
-end
-
-
-collectgarbage(oldmode)
-
-print('OK')

testes/gengc.lua

@@ -1,172 +0,0 @@
--- $Id: testes/gengc.lua $
--- See Copyright Notice in file all.lua
-
-print('testing generational garbage collection')
-
-local debug = require"debug"
-
-assert(collectgarbage("isrunning"))
-
-collectgarbage()
-
-local oldmode = collectgarbage("generational")
-
-
--- ensure that table barrier evolves correctly
-do
-  local U = {}
-  -- full collection makes 'U' old
-  collectgarbage()
-  assert(not T or T.gcage(U) == "old")
-
-  -- U refers to a new table, so it becomes 'touched1'
-  U[1] = {x = {234}}
-  assert(not T or (T.gcage(U) == "touched1" and T.gcage(U[1]) == "new"))
-
-  -- both U and the table survive one more collection
-  collectgarbage("step", 0)
-  assert(not T or (T.gcage(U) == "touched2" and T.gcage(U[1]) == "survival"))
-
-  -- both U and the table survive yet another collection
-  -- now everything is old
-  collectgarbage("step", 0)
-  assert(not T or (T.gcage(U) == "old" and T.gcage(U[1]) == "old1"))
-
-  -- data was not corrupted
-  assert(U[1].x[1] == 234)
-end
-
-
-do
-  -- ensure that 'firstold1' is corrected when object is removed from
-  -- the 'allgc' list
-  local function foo () end
-  local old = {10}
-  collectgarbage()    -- make 'old' old
-  assert(not T or T.gcage(old) == "old")
-  setmetatable(old, {})    -- new table becomes OLD0 (barrier)
-  assert(not T or T.gcage(getmetatable(old)) == "old0")
-  collectgarbage("step", 0)   -- new table becomes OLD1 and firstold1
-  assert(not T or T.gcage(getmetatable(old)) == "old1")
-  setmetatable(getmetatable(old), {__gc = foo})  -- get it out of allgc list
-  collectgarbage("step", 0)   -- should not seg. fault
-end
-
-
-do   -- bug in 5.4.0
--- When an object aged OLD1 is finalized, it is moved from the list
--- 'finobj' to the *beginning* of the list 'allgc', but that part of the
--- list was not being visited by 'markold'.
-  local A = {}
-  A[1] = false     -- old anchor for object
-
-  -- obj finalizer
-  local function gcf (obj)
-    A[1] = obj     -- anchor object
-    assert(not T or T.gcage(obj) == "old1")
-    obj = nil      -- remove it from the stack
-    collectgarbage("step", 0)   -- do a young collection
-    print(getmetatable(A[1]).x)   -- metatable was collected
-  end
-
-  collectgarbage()   -- make A old
-  local obj = {}     -- create a new object
-  collectgarbage("step", 0)   -- make it a survival
-  assert(not T or T.gcage(obj) == "survival")
-  setmetatable(obj, {__gc = gcf, x = "+"})   -- create its metatable
-  assert(not T or T.gcage(getmetatable(obj)) == "new")
-  obj = nil   -- clear object
-  collectgarbage("step", 0)   -- will call obj's finalizer
-end
-
-
-do   -- another bug in 5.4.0
-  local old = {10}
-  collectgarbage()   -- make 'old' old
-  local co = coroutine.create(
-    function ()
-      local x = nil
-      local f = function ()
-                  return x[1]
-                end
-      x = coroutine.yield(f)
-      coroutine.yield()
-    end
-  )
-  local _, f = coroutine.resume(co)   -- create closure over 'x' in coroutine
-  collectgarbage("step", 0)   -- make upvalue a survival
-  old[1] = {"hello"}    -- 'old' go to grayagain as 'touched1'
-  coroutine.resume(co, {123})     -- its value will be new
-  co = nil
-  collectgarbage("step", 0)   -- hit the barrier
-  assert(f() == 123 and old[1][1] == "hello")
-  collectgarbage("step", 0)   -- run the collector once more
-  -- make sure old[1] was not collected
-  assert(f() == 123 and old[1][1] == "hello")
-end
-
-
-do   -- bug introduced in commit 9cf3299fa
-  local t = setmetatable({}, {__mode = "kv"})   -- all-weak table
-  collectgarbage()   -- full collection
-  assert(not T or T.gcage(t) == "old")
-  t[1] = {10}
-  assert(not T or (T.gcage(t) == "touched1" and T.gccolor(t) == "gray"))
-  collectgarbage("step", 0)   -- minor collection
-  assert(not T or (T.gcage(t) == "touched2" and T.gccolor(t) == "black"))
-  collectgarbage("step", 0)   -- minor collection
-  assert(not T or T.gcage(t) == "old")   -- t should be black, but it was gray
-  t[1] = {10}      -- no barrier here, so t was still old
-  collectgarbage("step", 0)   -- minor collection
-  -- t, being old, is ignored by the collection, so it is not cleared
-  assert(t[1] == nil)   -- fails with the bug
-end
-
-
-if T == nil then
-  (Message or print)('\n >>> testC not active: \z
-                             skipping some generational tests <<<\n')
-  print 'OK'
-  return
-end
-
-
--- ensure that userdata barrier evolves correctly
-do
-  local U = T.newuserdata(0, 1)
-  -- full collection makes 'U' old
-  collectgarbage()
-  assert(T.gcage(U) == "old")
-
-  -- U refers to a new table, so it becomes 'touched1'
-  debug.setuservalue(U, {x = {234}})
-  assert(T.gcage(U) == "touched1" and
-         T.gcage(debug.getuservalue(U)) == "new")
-
-  -- both U and the table survive one more collection
-  collectgarbage("step", 0)
-  assert(T.gcage(U) == "touched2" and
-         T.gcage(debug.getuservalue(U)) == "survival")
-
-  -- both U and the table survive yet another collection
-  -- now everything is old
-  collectgarbage("step", 0)
-  assert(T.gcage(U) == "old" and
-         T.gcage(debug.getuservalue(U)) == "old1")
-
-  -- data was not corrupted
-  assert(debug.getuservalue(U).x[1] == 234)
-end
-
--- just to make sure
-assert(collectgarbage'isrunning')
-
-
-
--- just to make sure
-assert(collectgarbage'isrunning')
-
-collectgarbage(oldmode)
-
-print('OK')
-

testes/goto.lua

@@ -1,271 +0,0 @@
--- $Id: testes/goto.lua $
--- See Copyright Notice in file all.lua
-
-collectgarbage()
-
-local function errmsg (code, m)
-  local st, msg = load(code)
-  assert(not st and string.find(msg, m))
-end
-
--- cannot see label inside block
-errmsg([[ goto l1; do ::l1:: end ]], "label 'l1'")
-errmsg([[ do ::l1:: end goto l1; ]], "label 'l1'")
-
--- repeated label
-errmsg([[ ::l1:: ::l1:: ]], "label 'l1'")
-errmsg([[ ::l1:: do ::l1:: end]], "label 'l1'")
-
-
--- undefined label
-errmsg([[ goto l1; local aa ::l1:: ::l2:: print(3) ]], "local 'aa'")
-
--- jumping over variable definition
-errmsg([[
-do local bb, cc; goto l1; end
-local aa
-::l1:: print(3)
-]], "local 'aa'")
-
--- jumping into a block
-errmsg([[ do ::l1:: end goto l1 ]], "label 'l1'")
-errmsg([[ goto l1 do ::l1:: end ]], "label 'l1'")
-
--- cannot continue a repeat-until with variables
-errmsg([[
-  repeat
-    if x then goto cont end
-    local xuxu = 10
-    ::cont::
-  until xuxu < x
-]], "local 'xuxu'")
-
--- simple gotos
-local x
-do
-  local y = 12
-  goto l1
-  ::l2:: x = x + 1; goto l3
-  ::l1:: x = y; goto l2
-end
-::l3:: ::l3_1:: assert(x == 13)
-
-
--- long labels
-do
-  local prog = [[
-  do
-    local a = 1
-    goto l%sa; a = a + 1
-   ::l%sa:: a = a + 10
-    goto l%sb; a = a + 2
-   ::l%sb:: a = a + 20
-    return a
-  end
-  ]]
-  local label = string.rep("0123456789", 40)
-  prog = string.format(prog, label, label, label, label)
-  assert(assert(load(prog))() == 31)
-end
-
-
--- ok to jump over local dec. to end of block
-do
-  goto l1
-  local a = 23
-  x = a
-  ::l1::;
-end
-
-while true do
-  goto l4
-  goto l1  -- ok to jump over local dec. to end of block
-  goto l1  -- multiple uses of same label
-  local x = 45
-  ::l1:: ;;;
-end
-::l4:: assert(x == 13)
-
-if print then
-  goto l1   -- ok to jump over local dec. to end of block
-  error("should not be here")
-  goto l2   -- ok to jump over local dec. to end of block
-  local x
-  ::l1:: ; ::l2:: ;;
-else end
-
--- to repeat a label in a different function is OK
-local function foo ()
-  local a = {}
-  goto l3
-  ::l1:: a[#a + 1] = 1; goto l2;
-  ::l2:: a[#a + 1] = 2; goto l5;
-  ::l3::
-  ::l3a:: a[#a + 1] = 3; goto l1;
-  ::l4:: a[#a + 1] = 4; goto l6;
-  ::l5:: a[#a + 1] = 5; goto l4;
-  ::l6:: assert(a[1] == 3 and a[2] == 1 and a[3] == 2 and
-              a[4] == 5 and a[5] == 4)
-  if not a[6] then a[6] = true; goto l3a end   -- do it twice
-end
-
-::l6:: foo()
-
-
-do   -- bug in 5.2 -> 5.3.2
-  local x
-  ::L1::
-  local y             -- cannot join this SETNIL with previous one
-  assert(y == nil)
-  y = true
-  if x == nil then
-    x = 1
-    goto L1
-  else
-    x = x + 1
-  end
-  assert(x == 2 and y == true)
-end
-
--- bug in 5.3
-do
-  local first = true
-  local a = false
-  if true then
-    goto LBL
-    ::loop::
-    a = true
-    ::LBL::
-    if first then
-      first = false
-      goto loop
-    end
-  end
-  assert(a)
-end
-
-do   -- compiling infinite loops
-  goto escape   -- do not run the infinite loops
-  ::a:: goto a
-  ::b:: goto c
-  ::c:: goto b
-end
-::escape::
---------------------------------------------------------------------------------
--- testing closing of upvalues
-
-local debug = require 'debug'
-
-local function foo ()
-  local t = {}
-  do
-  local i = 1
-  local a, b, c, d
-  t[1] = function () return a, b, c, d end
-  ::l1::
-  local b
-  do
-    local c
-    t[#t + 1] = function () return a, b, c, d end    -- t[2], t[4], t[6]
-    if i > 2 then goto l2 end
-    do
-      local d
-      t[#t + 1] = function () return a, b, c, d end   -- t[3], t[5]
-      i = i + 1
-      local a
-      goto l1
-    end
-  end
-  end
-  ::l2:: return t
-end
-
-local a = foo()
-assert(#a == 6)
-
--- all functions share same 'a'
-for i = 2, 6 do
-  assert(debug.upvalueid(a[1], 1) == debug.upvalueid(a[i], 1))
-end
-
--- 'b' and 'c' are shared among some of them
-for i = 2, 6 do
-  -- only a[1] uses external 'b'/'b'
-  assert(debug.upvalueid(a[1], 2) ~= debug.upvalueid(a[i], 2))
-  assert(debug.upvalueid(a[1], 3) ~= debug.upvalueid(a[i], 3))
-end
-
-for i = 3, 5, 2 do
-  -- inner functions share 'b'/'c' with previous ones
-  assert(debug.upvalueid(a[i], 2) == debug.upvalueid(a[i - 1], 2))
-  assert(debug.upvalueid(a[i], 3) == debug.upvalueid(a[i - 1], 3))
-  -- but not with next ones
-  assert(debug.upvalueid(a[i], 2) ~= debug.upvalueid(a[i + 1], 2))
-  assert(debug.upvalueid(a[i], 3) ~= debug.upvalueid(a[i + 1], 3))
-end
-
--- only external 'd' is shared
-for i = 2, 6, 2 do
-  assert(debug.upvalueid(a[1], 4) == debug.upvalueid(a[i], 4))
-end
-
--- internal 'd's are all different
-for i = 3, 5, 2 do
-  for j = 1, 6 do
-    assert((debug.upvalueid(a[i], 4) == debug.upvalueid(a[j], 4))
-      == (i == j))
-  end
-end
-
---------------------------------------------------------------------------------
--- testing if x goto optimizations
-
-local function testG (a)
-  if a == 1 then
-    goto l1
-    error("should never be here!")
-  elseif a == 2 then goto l2
-  elseif a == 3 then goto l3
-  elseif a == 4 then
-    goto l1  -- go to inside the block
-    error("should never be here!")
-    ::l1:: a = a + 1   -- must go to 'if' end
-  else
-    goto l4
-    ::l4a:: a = a * 2; goto l4b
-    error("should never be here!")
-    ::l4:: goto l4a
-    error("should never be here!")
-    ::l4b::
-  end
-  do return a end
-  ::l2:: do return "2" end
-  ::l3:: do return "3" end
-  ::l1:: return "1"
-end
-
-assert(testG(1) == "1")
-assert(testG(2) == "2")
-assert(testG(3) == "3")
-assert(testG(4) == 5)
-assert(testG(5) == 10)
-
-do
-  -- if x back goto out of scope of upvalue
-  local X
-  goto L1
-
-  ::L2:: goto L3
-
-  ::L1:: do
-    local a <close> = setmetatable({}, {__close = function () X = true end})
-    assert(X == nil)
-    if a then goto L2 end   -- jumping back out of scope of 'a'
-  end
-
-  ::L3:: assert(X == true)   -- checks that 'a' was correctly closed
-end
---------------------------------------------------------------------------------
-
-
-print'OK'

testes/heavy.lua

@@ -1,173 +0,0 @@
--- $Id: heavy.lua,v 1.7 2017/12/29 15:42:15 roberto Exp $
--- See Copyright Notice in file all.lua
-
-local function teststring ()
-  print("creating a string too long")
-  do
-    local a = "x"
-    local st, msg = pcall(function ()
-      while true do
-        a = a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         .. a .. a.. a.. a.. a.. a.. a.. a.. a.. a
-         print(string.format("string with %d bytes", #a))
-      end
-    end)
-    assert(not st and
-      (string.find(msg, "string length overflow") or
-       string.find(msg, "not enough memory")))
-    print("string length overflow with " .. #a * 100)
-  end
-  print('+')
-end
-
-local function loadrep (x, what)
-  local p = 1<<20
-  local s = string.rep(x, p)
-  local count = 0
-  local function f()
-    count = count + p
-    if count % (0x80*p) == 0 then
-      io.stderr:write("(", count // 2^20, " M)")
-    end
-    return s
-  end
-  local st, msg = load(f, "=big")
-  print("\nmemory: ", collectgarbage'count' * 1024)
-  msg = string.match(msg, "^[^\n]+")    -- get only first line
-  print(string.format("total: 0x%x %s ('%s')", count, what, msg))
-  return st, msg
-end
-
-
-function controlstruct ()
-  print("control structure too long")
-  local lim = ((1 << 24) - 2) // 3
-  local s = string.rep("a = a + 1\n", lim)
-  s = "while true do " .. s .. "end"
-  assert(load(s))
-  print("ok with " .. lim .. " lines")
-  lim = lim + 3
-  s = string.rep("a = a + 1\n", lim)
-  s = "while true do " .. s .. "end"
-  local st, msg = load(s)
-  assert(not st and string.find(msg, "too long"))
-  print(msg)
-end
-
-
-function manylines ()
-  print("loading chunk with too many lines")
-  local st, msg = loadrep("\n", "lines")
-  assert(not st and string.find(msg, "too many lines"))
-  print('+')
-end
-
-
-function hugeid ()
-  print("loading chunk with huge identifier")
-  local st, msg = loadrep("a", "chars")
-  assert(not st and 
-    (string.find(msg, "lexical element too long") or
-     string.find(msg, "not enough memory")))
-  print('+')
-end
-
-function toomanyinst ()
-  print("loading chunk with too many instructions")
-  local st, msg = loadrep("a = 10; ", "instructions")
-  print('+')
-end
-
-
-local function loadrepfunc (prefix, f)
-  local count = -1
-  local function aux ()
-    count = count + 1
-    if count == 0 then
-      return prefix
-    else
-      if count % (0x100000) == 0 then
-        io.stderr:write("(", count // 2^20, " M)")
-      end
-      return f(count)
-    end
-  end
-  local st, msg = load(aux, "k")
-  print("\nmemory: ", collectgarbage'count' * 1024)
-  msg = string.match(msg, "^[^\n]+")    -- get only first line
-  print("expected error: ", msg)
-end
-
-
-function toomanyconst ()
-  print("loading function with too many constants")
-  loadrepfunc("function foo () return {0,",
-      function (n)
-        -- convert 'n' to a string in the format [["...",]],
-        -- where '...' is a kind of number in base 128
-        -- (in a range that does not include either the double quote
-        -- and the escape.)
-        return string.char(34,
-          ((n // 128^0) & 127) + 128,
-          ((n // 128^1) & 127) + 128,
-          ((n // 128^2) & 127) + 128,
-          ((n // 128^3) & 127) + 128,
-          ((n // 128^4) & 127) + 128,
-          34, 44)
-      end)
-end
-
-
-function toomanystr ()
-  local a = {}
-  local st, msg = pcall(function ()
-    for i = 1, math.huge do
-      if i % (0x100000) == 0 then
-        io.stderr:write("(", i // 2^20, " M)")
-      end
-      a[i] = string.pack("I", i)
-     end
-  end)
-  local size = #a
-  a = collectgarbage'count'
-  print("\nmemory:", a * 1024)
-  print("expected error:", msg)
-  print("size:", size)
-end
-
-
-function toomanyidx ()
-  local a = {}
-  local st, msg = pcall(function ()
-    for i = 1, math.huge do
-      if i % (0x100000) == 0 then
-        io.stderr:write("(", i // 2^20, " M)")
-      end
-      a[i] = i
-     end
-  end)
-  print("\nmemory: ", collectgarbage'count' * 1024)
-  print("expected error: ", msg)
-  print("size:", #a)
-end
-  
-
-
--- teststring()
--- controlstruct()
--- manylines()
--- hugeid()
--- toomanyinst()
--- toomanyconst()
--- toomanystr()
-toomanyidx()
-
-print "OK"

testes/libs/P1/dummy

@@ -1,2 +0,0 @@
-# This is a dummy file just to make git keep the otherwise empty
-# directory 'P1' in the repository.

testes/libs/lib1.c

@@ -1,44 +0,0 @@
-#include "lua.h"
-#include "lauxlib.h"
-
-static int id (lua_State *L) {
-  return lua_gettop(L);
-}
-
-
-static const struct luaL_Reg funcs[] = {
-  {"id", id},
-  {NULL, NULL}
-};
-
-
-/* function used by lib11.c */
-LUAMOD_API int lib1_export (lua_State *L) {
-  lua_pushstring(L, "exported");
-  return 1;
-}
-
-
-LUAMOD_API int onefunction (lua_State *L) {
-  luaL_checkversion(L);
-  lua_settop(L, 2);
-  lua_pushvalue(L, 1);
-  return 2;
-}
-
-
-LUAMOD_API int anotherfunc (lua_State *L) {
-  luaL_checkversion(L);
-  lua_pushfstring(L, "%d%%%d\n", (int)lua_tointeger(L, 1),
-                                 (int)lua_tointeger(L, 2));
-  return 1;
-} 
-
-
-LUAMOD_API int luaopen_lib1_sub (lua_State *L) {
-  lua_setglobal(L, "y");  /* 2nd arg: extra value (file name) */
-  lua_setglobal(L, "x");  /* 1st arg: module name */
-  luaL_newlib(L, funcs);
-  return 1;
-}
-

testes/libs/lib11.c

@@ -1,10 +0,0 @@
-#include "lua.h"
-
-/* function from lib1.c */
-int lib1_export (lua_State *L);
-
-LUAMOD_API int luaopen_lib11 (lua_State *L) {
-  return lib1_export(L);
-}
-
-

testes/libs/lib2.c

@@ -1,23 +0,0 @@
-#include "lua.h"
-#include "lauxlib.h"
-
-static int id (lua_State *L) {
-  return lua_gettop(L);
-}
-
-
-static const struct luaL_Reg funcs[] = {
-  {"id", id},
-  {NULL, NULL}
-};
-
-
-LUAMOD_API int luaopen_lib2 (lua_State *L) {
-  lua_settop(L, 2);
-  lua_setglobal(L, "y");  /* y gets 2nd parameter */
-  lua_setglobal(L, "x");  /* x gets 1st parameter */
-  luaL_newlib(L, funcs);
-  return 1;
-}
-
-

testes/libs/lib21.c

@@ -1,10 +0,0 @@
-#include "lua.h"
-
-
-int luaopen_lib2 (lua_State *L);
-
-LUAMOD_API int luaopen_lib21 (lua_State *L) {
-  return luaopen_lib2(L);
-}
-
-

testes/libs/lib22.c

@@ -1,25 +0,0 @@
-#include "lua.h"
-#include "lauxlib.h"
-
-static int id (lua_State *L) {
-  lua_pushboolean(L, 1);
-  lua_insert(L, 1);
-  return lua_gettop(L);
-}
-
-
-static const struct luaL_Reg funcs[] = {
-  {"id", id},
-  {NULL, NULL}
-};
-
-
-LUAMOD_API int luaopen_lib2 (lua_State *L) {
-  lua_settop(L, 2);
-  lua_setglobal(L, "y");  /* y gets 2nd parameter */
-  lua_setglobal(L, "x");  /* x gets 1st parameter */
-  luaL_newlib(L, funcs);
-  return 1;
-}
-
-

testes/libs/makefile

@@ -1,27 +0,0 @@
-# change this variable to point to the directory with Lua headers
-# of the version being tested
-LUA_DIR = ../../
-
-CC = gcc
-
-# compilation should generate Dynamic-Link Libraries
-CFLAGS = -Wall -std=gnu99 -O2 -I$(LUA_DIR) -fPIC -shared
-
-# libraries used by the tests
-all: lib1.so lib11.so lib2.so lib21.so lib2-v2.so
-	touch all
-
-lib1.so: lib1.c $(LUA_DIR)/luaconf.h $(LUA_DIR)/lua.h
-	$(CC) $(CFLAGS) -o lib1.so lib1.c
-
-lib11.so: lib11.c $(LUA_DIR)/luaconf.h $(LUA_DIR)/lua.h
-	$(CC) $(CFLAGS) -o lib11.so lib11.c
-
-lib2.so: lib2.c $(LUA_DIR)/luaconf.h $(LUA_DIR)/lua.h
-	$(CC) $(CFLAGS) -o lib2.so lib2.c
-
-lib21.so: lib21.c $(LUA_DIR)/luaconf.h $(LUA_DIR)/lua.h
-	$(CC) $(CFLAGS) -o lib21.so lib21.c
-
-lib2-v2.so: lib21.c $(LUA_DIR)/luaconf.h $(LUA_DIR)/lua.h
-	$(CC) $(CFLAGS) -o lib2-v2.so lib22.c

testes/literals.lua

@@ -1,343 +0,0 @@
--- $Id: testes/literals.lua $
--- See Copyright Notice in file all.lua
-
-print('testing scanner')
-
-local debug = require "debug"
-
-
-local function dostring (x) return assert(load(x), "")() end
-
-dostring("x \v\f = \t\r 'a\0a' \v\f\f")
-assert(x == 'a\0a' and string.len(x) == 3)
-_G.x = nil
-
--- escape sequences
-assert('\n\"\'\\' == [[
-
-"'\]])
-
-assert(string.find("\a\b\f\n\r\t\v", "^%c%c%c%c%c%c%c$"))
-
--- assume ASCII just for tests:
-assert("\09912" == 'c12')
-assert("\99ab" == 'cab')
-assert("\099" == '\99')
-assert("\099\n" == 'c\10')
-assert('\0\0\0alo' == '\0' .. '\0\0' .. 'alo')
-
-assert(010 .. 020 .. -030 == "1020-30")
-
--- hexadecimal escapes
-assert("\x00\x05\x10\x1f\x3C\xfF\xe8" == "\0\5\16\31\60\255\232")
-
-local function lexstring (x, y, n)
-  local f = assert(load('return ' .. x ..
-            ', require"debug".getinfo(1).currentline', ''))
-  local s, l = f()
-  assert(s == y and l == n)
-end
-
-lexstring("'abc\\z  \n   efg'", "abcefg", 2)
-lexstring("'abc\\z  \n\n\n'", "abc", 4)
-lexstring("'\\z  \n\t\f\v\n'",  "", 3)
-lexstring("[[\nalo\nalo\n\n]]", "alo\nalo\n\n", 5)
-lexstring("[[\nalo\ralo\n\n]]", "alo\nalo\n\n", 5)
-lexstring("[[\nalo\ralo\r\n]]", "alo\nalo\n", 4)
-lexstring("[[\ralo\n\ralo\r\n]]", "alo\nalo\n", 4)
-lexstring("[[alo]\n]alo]]", "alo]\n]alo", 2)
-
-assert("abc\z
-        def\z
-        ghi\z
-       " == 'abcdefghi')
-
-
--- UTF-8 sequences
-assert("\u{0}\u{00000000}\x00\0" == string.char(0, 0, 0, 0))
-
--- limits for 1-byte sequences
-assert("\u{0}\u{7F}" == "\x00\x7F")
-
--- limits for 2-byte sequences
-assert("\u{80}\u{7FF}" == "\xC2\x80\xDF\xBF")
-
--- limits for 3-byte sequences
-assert("\u{800}\u{FFFF}" ==   "\xE0\xA0\x80\xEF\xBF\xBF")
-
--- limits for 4-byte sequences
-assert("\u{10000}\u{1FFFFF}" == "\xF0\x90\x80\x80\xF7\xBF\xBF\xBF")
-
--- limits for 5-byte sequences
-assert("\u{200000}\u{3FFFFFF}" == "\xF8\x88\x80\x80\x80\xFB\xBF\xBF\xBF\xBF")
-
--- limits for 6-byte sequences
-assert("\u{4000000}\u{7FFFFFFF}" ==
-       "\xFC\x84\x80\x80\x80\x80\xFD\xBF\xBF\xBF\xBF\xBF")
-
-
--- Error in escape sequences
-local function lexerror (s, err)
-  local st, msg = load('return ' .. s, '')
-  if err ~= '<eof>' then err = err .. "'" end
-  assert(not st and string.find(msg, "near .-" .. err))
-end
-
-lexerror([["abc\x"]], [[\x"]])
-lexerror([["abc\x]], [[\x]])
-lexerror([["\x]], [[\x]])
-lexerror([["\x5"]], [[\x5"]])
-lexerror([["\x5]], [[\x5]])
-lexerror([["\xr"]], [[\xr]])
-lexerror([["\xr]], [[\xr]])
-lexerror([["\x.]], [[\x.]])
-lexerror([["\x8%"]], [[\x8%%]])
-lexerror([["\xAG]], [[\xAG]])
-lexerror([["\g"]], [[\g]])
-lexerror([["\g]], [[\g]])
-lexerror([["\."]], [[\%.]])
-
-lexerror([["\999"]], [[\999"]])
-lexerror([["xyz\300"]], [[\300"]])
-lexerror([["   \256"]], [[\256"]])
-
--- errors in UTF-8 sequences
-lexerror([["abc\u{100000000}"]], [[abc\u{100000000]])   -- too large
-lexerror([["abc\u11r"]], [[abc\u1]])    -- missing '{'
-lexerror([["abc\u"]], [[abc\u"]])    -- missing '{'
-lexerror([["abc\u{11r"]], [[abc\u{11r]])    -- missing '}'
-lexerror([["abc\u{11"]], [[abc\u{11"]])    -- missing '}'
-lexerror([["abc\u{11]], [[abc\u{11]])    -- missing '}'
-lexerror([["abc\u{r"]], [[abc\u{r]])     -- no digits
-
--- unfinished strings
-lexerror("[=[alo]]", "<eof>")
-lexerror("[=[alo]=", "<eof>")
-lexerror("[=[alo]", "<eof>")
-lexerror("'alo", "<eof>")
-lexerror("'alo \\z  \n\n", "<eof>")
-lexerror("'alo \\z", "<eof>")
-lexerror([['alo \98]], "<eof>")
-
--- valid characters in variable names
-for i = 0, 255 do
-  local s = string.char(i)
-  assert(not string.find(s, "[a-zA-Z_]") == not load(s .. "=1", ""))
-  assert(not string.find(s, "[a-zA-Z_0-9]") ==
-         not load("a" .. s .. "1 = 1", ""))
-end
-
-
--- long variable names
-
-local var1 = string.rep('a', 15000) .. '1'
-local var2 = string.rep('a', 15000) .. '2'
-local prog = string.format([[
-  %s = 5
-  %s = %s + 1
-  return function () return %s - %s end
-]], var1, var2, var1, var1, var2)
-local f = dostring(prog)
-assert(_G[var1] == 5 and _G[var2] == 6 and f() == -1)
-_G[var1], _G[var2] = nil
-print('+')
-
--- escapes --
-assert("\n\t" == [[
-
-	]])
-assert([[
-
- $debug]] == "\n $debug")
-assert([[ [ ]] ~= [[ ] ]])
--- long strings --
-local b = "001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789"
-assert(string.len(b) == 960)
-prog = [=[
-print('+')
-
-local a1 = [["this is a 'string' with several 'quotes'"]]
-local a2 = "'quotes'"
-
-assert(string.find(a1, a2) == 34)
-print('+')
-
-a1 = [==[temp = [[an arbitrary value]]; ]==]
-assert(load(a1))()
-assert(temp == 'an arbitrary value')
-_G.temp = nil
--- long strings --
-local b = "001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789001234567890123456789012345678901234567891234567890123456789012345678901234567890012345678901234567890123456789012345678912345678901234567890123456789012345678900123456789012345678901234567890123456789123456789012345678901234567890123456789"
-assert(string.len(b) == 960)
-print('+')
-
-local a = [[00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-00123456789012345678901234567890123456789123456789012345678901234567890123456789
-]]
-assert(string.len(a) == 1863)
-assert(string.sub(a, 1, 40) == string.sub(b, 1, 40))
-x = 1
-]=]
-
-print('+')
-_G.x = nil
-dostring(prog)
-assert(x)
-_G.x = nil
-
-
-
-do  -- reuse of long strings
-
-  -- get the address of a string
-  local function getadd (s) return string.format("%p", s) end
-
-  local s1 <const> = "01234567890123456789012345678901234567890123456789"
-  local s2 <const> = "01234567890123456789012345678901234567890123456789"
-  local s3 = "01234567890123456789012345678901234567890123456789"
-  local function foo() return s1 end
-  local function foo1() return s3 end
-  local function foo2()
-    return "01234567890123456789012345678901234567890123456789"
-  end
-  local a1 = getadd(s1)
-  assert(a1 == getadd(s2))
-  assert(a1 == getadd(foo()))
-  assert(a1 == getadd(foo1()))
-  assert(a1 == getadd(foo2()))
-
-  local sd = "0123456789" .. "0123456789012345678901234567890123456789"
-  assert(sd == s1 and getadd(sd) ~= a1)
-end
-
-
--- testing line ends
-prog = [[
-local a = 1        -- a comment
-local b = 2
-
-
-x = [=[
-hi
-]=]
-y = "\
-hello\r\n\
-"
-return require"debug".getinfo(1).currentline
-]]
-
-for _, n in pairs{"\n", "\r", "\n\r", "\r\n"} do
-  local prog, nn = string.gsub(prog, "\n", n)
-  assert(dostring(prog) == nn)
-  assert(_G.x == "hi\n" and _G.y == "\nhello\r\n\n")
-end
-_G.x, _G.y = nil
-
-
--- testing comments and strings with long brackets
-local a = [==[]=]==]
-assert(a == "]=")
-
-a = [==[[===[[=[]]=][====[]]===]===]==]
-assert(a == "[===[[=[]]=][====[]]===]===")
-
-a = [====[[===[[=[]]=][====[]]===]===]====]
-assert(a == "[===[[=[]]=][====[]]===]===")
-
-a = [=[]]]]]]]]]=]
-assert(a == "]]]]]]]]")
-
-
---[===[
-x y z [==[ blu foo
-]==
-]
-]=]==]
-error error]=]===]
-
--- generate all strings of four of these chars
-local x = {"=", "[", "]", "\n"}
-local len = 4
-local function gen (c, n)
-  if n==0 then coroutine.yield(c)
-  else
-    for _, a in pairs(x) do
-      gen(c..a, n-1)
-    end
-  end
-end
-
-for s in coroutine.wrap(function () gen("", len) end) do
-  assert(s == load("return [====[\n"..s.."]====]", "")())
-end
-
-
--- testing decimal point locale
-if os.setlocale("pt_BR") or os.setlocale("ptb") then
-  assert(tonumber("3,4") == 3.4 and tonumber"3.4" == 3.4)
-  assert(tonumber("  -.4  ") == -0.4)
-  assert(tonumber("  +0x.41  ") == 0X0.41)
-  assert(not load("a = (3,4)"))
-  assert(assert(load("return 3.4"))() == 3.4)
-  assert(assert(load("return .4,3"))() == .4)
-  assert(assert(load("return 4."))() == 4.)
-  assert(assert(load("return 4.+.5"))() == 4.5)
-
-  assert(" 0x.1 " + " 0x,1" + "-0X.1\t" == 0x0.1)
-
-  assert(not tonumber"inf" and not tonumber"NAN")
-
-  assert(assert(load(string.format("return %q", 4.51)))() == 4.51)
-
-  local a,b = load("return 4.5.")
-  assert(string.find(b, "'4%.5%.'"))
-
-  assert(os.setlocale("C"))
-else
-  (Message or print)(
-   '\n >>> pt_BR locale not available: skipping decimal point tests <<<\n')
-end
-
-
--- testing %q x line ends
-local s = "a string with \r and \n and \r\n and \n\r"
-local c = string.format("return %q", s)
-assert(assert(load(c))() == s)
-
--- testing errors
-assert(not load"a = 'non-ending string")
-assert(not load"a = 'non-ending string\n'")
-assert(not load"a = '\\345'")
-assert(not load"a = [=x]")
-
-local function malformednum (n, exp)
-  local s, msg = load("return " .. n)
-  assert(not s and string.find(msg, exp))
-end
-
-malformednum("0xe-", "near <eof>")
-malformednum("0xep-p", "malformed number")
-malformednum("1print()", "malformed number")
-
-print('OK')

testes/main.lua

@@ -1,553 +0,0 @@
-# testing special comment on first line
--- $Id: testes/main.lua $
--- See Copyright Notice in file all.lua
-
--- most (all?) tests here assume a reasonable "Unix-like" shell
-if _port then return end
-
--- use only "double quotes" inside shell scripts (better change to
--- run on Windows)
-
-
-print ("testing stand-alone interpreter")
-
-assert(os.execute())   -- machine has a system command
-
-local arg = arg or ARG
-
-local prog = os.tmpname()
-local otherprog = os.tmpname()
-local out = os.tmpname()
-
-local progname
-do
-  local i = 0
-  while arg[i] do i=i-1 end
-  progname = arg[i+1]
-end
-print("progname: "..progname)
-
-local prepfile = function (s, p)
-  p = p or prog
-  io.output(p)
-  io.write(s)
-  assert(io.close())
-end
-
-local function getoutput ()
-  io.input(out)
-  local t = io.read("a")
-  io.input():close()
-  assert(os.remove(out))
-  return t
-end
-
-local function checkprogout (s)
-  -- expected result must end with new line
-  assert(string.sub(s, -1) == "\n")
-  local t = getoutput()
-  for line in string.gmatch(s, ".-\n") do
-    assert(string.find(t, line, 1, true))
-  end
-end
-
-local function checkout (s)
-  local t = getoutput()
-  if s ~= t then print(string.format("'%s' - '%s'\n", s, t)) end
-  assert(s == t)
-  return t
-end
-
-
-local function RUN (p, ...)
-  p = string.gsub(p, "lua", '"'..progname..'"', 1)
-  local s = string.format(p, ...)
-  assert(os.execute(s))
-end
-
-local function NoRun (msg, p, ...)
-  p = string.gsub(p, "lua", '"'..progname..'"', 1)
-  local s = string.format(p, ...)
-  s = string.format("%s 2> %s", s, out)  -- will send error to 'out'
-  assert(not os.execute(s))
-  assert(string.find(getoutput(), msg, 1, true))  -- check error message
-end
-
-RUN('lua -v')
-
-print(string.format("(temporary program file used in these tests: %s)", prog))
-
--- running stdin as a file
-prepfile""
-RUN('lua - < %s > %s', prog, out)
-checkout("")
-
-prepfile[[
-  print(
-1, a
-)
-]]
-RUN('lua - < %s > %s', prog, out)
-checkout("1\tnil\n")
-
-RUN('echo "print(10)\nprint(2)\n" | lua > %s', out)
-checkout("10\n2\n")
-
-
--- testing BOM
-prepfile("\xEF\xBB\xBF")
-RUN('lua %s > %s', prog, out)
-checkout("")
-
-prepfile("\xEF\xBB\xBFprint(3)")
-RUN('lua %s > %s', prog, out)
-checkout("3\n")
-
-prepfile("\xEF\xBB\xBF# comment!!\nprint(3)")
-RUN('lua %s > %s', prog, out)
-checkout("3\n")
-
--- bad BOMs
-prepfile("\xEF")
-NoRun("unexpected symbol", 'lua %s > %s', prog, out)
-
-prepfile("\xEF\xBB")
-NoRun("unexpected symbol", 'lua %s > %s', prog, out)
-
-prepfile("\xEFprint(3)")
-NoRun("unexpected symbol", 'lua %s > %s', prog, out)
-
-prepfile("\xEF\xBBprint(3)")
-NoRun("unexpected symbol", 'lua %s > %s', prog, out)
-
-
--- test option '-'
-RUN('echo "print(arg[1])" | lua - -h > %s', out)
-checkout("-h\n")
-
--- test environment variables used by Lua
-
-prepfile("print(package.path)")
-
--- test LUA_PATH
-RUN('env LUA_INIT= LUA_PATH=x lua %s > %s', prog, out)
-checkout("x\n")
-
--- test LUA_PATH_version
-RUN('env LUA_INIT= LUA_PATH_5_4=y LUA_PATH=x lua %s > %s', prog, out)
-checkout("y\n")
-
--- test LUA_CPATH
-prepfile("print(package.cpath)")
-RUN('env LUA_INIT= LUA_CPATH=xuxu lua %s > %s', prog, out)
-checkout("xuxu\n")
-
--- test LUA_CPATH_version
-RUN('env LUA_INIT= LUA_CPATH_5_4=yacc LUA_CPATH=x lua %s > %s', prog, out)
-checkout("yacc\n")
-
--- test LUA_INIT (and its access to 'arg' table)
-prepfile("print(X)")
-RUN('env LUA_INIT="X=tonumber(arg[1])" lua %s 3.2 > %s', prog, out)
-checkout("3.2\n")
-
--- test LUA_INIT_version
-prepfile("print(X)")
-RUN('env LUA_INIT_5_4="X=10" LUA_INIT="X=3" lua %s > %s', prog, out)
-checkout("10\n")
-
--- test LUA_INIT for files
-prepfile("x = x or 10; print(x); x = x + 1")
-RUN('env LUA_INIT="@%s" lua %s > %s', prog, prog, out)
-checkout("10\n11\n")
-
--- test errors in LUA_INIT
-NoRun('LUA_INIT:1: msg', 'env LUA_INIT="error(\'msg\')" lua')
-
--- test option '-E'
-local defaultpath, defaultCpath
-
-do
-  prepfile("print(package.path, package.cpath)")
-  RUN('env LUA_INIT="error(10)" LUA_PATH=xxx LUA_CPATH=xxx lua -E %s > %s',
-       prog, out)
-  local output = getoutput()
-  defaultpath = string.match(output, "^(.-)\t")
-  defaultCpath = string.match(output, "\t(.-)$")
-
-  -- running with an empty environment
-  RUN('env -i lua %s > %s', prog, out)
-  local out = getoutput()
-  assert(defaultpath == string.match(output, "^(.-)\t"))
-  assert(defaultCpath == string.match(output, "\t(.-)$"))
-end
-
--- paths did not change
-assert(not string.find(defaultpath, "xxx") and
-       string.find(defaultpath, "lua") and
-       not string.find(defaultCpath, "xxx") and
-       string.find(defaultCpath, "lua"))
-
-
--- test replacement of ';;' to default path
-local function convert (p)
-  prepfile("print(package.path)")
-  RUN('env LUA_PATH="%s" lua %s > %s', p, prog, out)
-  local expected = getoutput()
-  expected = string.sub(expected, 1, -2)   -- cut final end of line
-  if string.find(p, ";;") then
-    p = string.gsub(p, ";;", ";"..defaultpath..";")
-    p = string.gsub(p, "^;", "")   -- remove ';' at the beginning
-    p = string.gsub(p, ";$", "")   -- remove ';' at the end
-  end
-  assert(p == expected)
-end
-
-convert(";")
-convert(";;")
-convert("a;;b")
-convert(";;b")
-convert("a;;")
-convert("a;b;;c")
-
-
--- test -l over multiple libraries
-prepfile("print(1); a=2; return {x=15}")
-prepfile(("print(a); print(_G['%s'].x)"):format(prog), otherprog)
-RUN('env LUA_PATH="?;;" lua -l %s -l%s -lstring -l io %s > %s', prog, otherprog, otherprog, out)
-checkout("1\n2\n15\n2\n15\n")
-
--- test explicit global names in -l
-prepfile("print(str.upper'alo alo', m.max(10, 20))")
-RUN("lua -l 'str=string' '-lm=math' -e 'print(m.sin(0))' %s > %s", prog, out)
-checkout("0.0\nALO ALO\t20\n")
-
--- test 'arg' table
-local a = [[
-  assert(#arg == 3 and arg[1] == 'a' and
-         arg[2] == 'b' and arg[3] == 'c')
-  assert(arg[-1] == '--' and arg[-2] == "-e " and arg[-3] == '%s')
-  assert(arg[4] == undef and arg[-4] == undef)
-  local a, b, c = ...
-  assert(... == 'a' and a == 'a' and b == 'b' and c == 'c')
-]]
-a = string.format(a, progname)
-prepfile(a)
-RUN('lua "-e " -- %s a b c', prog)   -- "-e " runs an empty command
-
--- test 'arg' availability in libraries
-prepfile"assert(arg)"
-prepfile("assert(arg)", otherprog)
-RUN('env LUA_PATH="?;;" lua -l%s - < %s', prog, otherprog)
-
--- test messing up the 'arg' table
-RUN('echo "print(...)" | lua -e "arg[1] = 100" - > %s', out)
-checkout("100\n")
-NoRun("'arg' is not a table", 'echo "" | lua -e "arg = 1" -')
-
--- test error in 'print'
-RUN('echo 10 | lua -e "print=nil" -i > /dev/null 2> %s', out)
-assert(string.find(getoutput(), "error calling 'print'"))
-
--- test 'debug.debug'
-RUN('echo "io.stderr:write(1000)\ncont" | lua -e "require\'debug\'.debug()" 2> %s', out)
-checkout("lua_debug> 1000lua_debug> ")
-
-
-print("testing warnings")
-
--- no warnings by default
-RUN('echo "io.stderr:write(1); warn[[XXX]]" | lua 2> %s', out)
-checkout("1")
-
-prepfile[[
-warn("@allow")               -- unknown control, ignored
-warn("@off", "XXX", "@off")  -- these are not control messages
-warn("@off")                 -- this one is
-warn("@on", "YYY", "@on")    -- not control, but warn is off
-warn("@off")                 -- keep it off
-warn("@on")                  -- restart warnings
-warn("", "@on")              -- again, no control, real warning
-warn("@on")                  -- keep it "started"
-warn("Z", "Z", "Z")          -- common warning
-]]
-RUN('lua -W %s 2> %s', prog, out)
-checkout[[
-Lua warning: @offXXX@off
-Lua warning: @on
-Lua warning: ZZZ
-]]
-
-prepfile[[
-warn("@allow")
--- create two objects to be finalized when closing state
--- the errors in the finalizers must generate warnings
-u1 = setmetatable({}, {__gc = function () error("XYZ") end})
-u2 = setmetatable({}, {__gc = function () error("ZYX") end})
-]]
-RUN('lua -W %s 2> %s', prog, out)
-checkprogout("ZYX)\nXYZ)\n")
-
--- bug since 5.2: finalizer called when closing a state could
--- subvert finalization order
-prepfile[[
--- should be called last
-print("creating 1")
-setmetatable({}, {__gc = function () print(1) end})
-
-print("creating 2")
-setmetatable({}, {__gc = function ()
-  print("2")
-  print("creating 3")
-  -- this finalizer should not be called, as object will be
-  -- created after 'lua_close' has been called
-  setmetatable({}, {__gc = function () print(3) end})
-  print(collectgarbage())    -- cannot call collector here
-  os.exit(0, true)
-end})
-]]
-RUN('lua -W %s > %s', prog, out)
-checkout[[
-creating 1
-creating 2
-2
-creating 3
-nil
-1
-]]
-
-
--- test many arguments
-prepfile[[print(({...})[30])]]
-RUN('lua %s %s > %s', prog, string.rep(" a", 30), out)
-checkout("a\n")
-
-RUN([[lua "-eprint(1)" -ea=3 -e "print(a)" > %s]], out)
-checkout("1\n3\n")
-
--- test iteractive mode
-prepfile[[
-(6*2-6) -- ===
-a =
-10
-print(a)
-a]]
-RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out)
-checkprogout("6\n10\n10\n\n")
-
-prepfile("a = [[b\nc\nd\ne]]\n=a")
-RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out)
-checkprogout("b\nc\nd\ne\n\n")
-
-local prompt = "alo"
-prepfile[[ --
-a = 2
-]]
-RUN([[lua "-e_PROMPT='%s'" -i < %s > %s]], prompt, prog, out)
-local t = getoutput()
-assert(string.find(t, prompt .. ".*" .. prompt .. ".*" .. prompt))
-
--- using the prompt default
-prepfile[[ --
-a = 2
-]]
-RUN([[lua -i < %s > %s]], prog, out)
-local t = getoutput()
-prompt = "> "    -- the default
-assert(string.find(t, prompt .. ".*" .. prompt .. ".*" .. prompt))
-
-
--- non-string prompt
-prompt =
-  "local C = 0;\z
-   _PROMPT=setmetatable({},{__tostring = function () \z
-     C = C + 1; return C end})"
-prepfile[[ --
-a = 2
-]]
-RUN([[lua -e "%s" -i < %s > %s]], prompt, prog, out)
-local t = getoutput()
-assert(string.find(t, [[
-1 --
-2a = 2
-3
-]], 1, true))
-
-
--- test for error objects
-prepfile[[
-debug = require "debug"
-m = {x=0}
-setmetatable(m, {__tostring = function(x)
-  return tostring(debug.getinfo(4).currentline + x.x)
-end})
-error(m)
-]]
-NoRun(progname .. ": 6\n", [[lua %s]], prog)
-
-prepfile("error{}")
-NoRun("error object is a table value", [[lua %s]], prog)
-
-
--- chunk broken in many lines
-local s = [=[ --
-function f ( x )
-  local a = [[
-xuxu
-]]
-  local b = "\
-xuxu\n"
-  if x == 11 then return 1 + 12 , 2 + 20 end  --[[ test multiple returns ]]
-  return x + 1
-  --\\
-end
-return( f( 100 ) )
-assert( a == b )
-do return f( 11 ) end  ]=]
-s = string.gsub(s, ' ', '\n\n')   -- change all spaces for newlines
-prepfile(s)
-RUN([[lua -e"_PROMPT='' _PROMPT2=''" -i < %s > %s]], prog, out)
-checkprogout("101\n13\t22\n\n")
-
-prepfile[[#comment in 1st line without \n at the end]]
-RUN('lua %s', prog)
-
--- first-line comment with binary file
-prepfile("#comment\n" .. string.dump(load("print(3)")))
-RUN('lua %s > %s', prog, out)
-checkout('3\n')
-
--- close Lua with an open file
-prepfile(string.format([[io.output(%q); io.write('alo')]], out))
-RUN('lua %s', prog)
-checkout('alo')
-
--- bug in 5.2 beta (extra \0 after version line)
-RUN([[lua -v  -e"print'hello'" > %s]], out)
-t = getoutput()
-assert(string.find(t, "PUC%-Rio\nhello"))
-
-
--- testing os.exit
-prepfile("os.exit(nil, true)")
-RUN('lua %s', prog)
-prepfile("os.exit(0, true)")
-RUN('lua %s', prog)
-prepfile("os.exit(true, true)")
-RUN('lua %s', prog)
-prepfile("os.exit(1, true)")
-NoRun("", "lua %s", prog)   -- no message
-prepfile("os.exit(false, true)")
-NoRun("", "lua %s", prog)   -- no message
-
-
--- to-be-closed variables in main chunk
-prepfile[[
-  local x <close> = setmetatable({},
-        {__close = function (self, err)
-                     assert(err == nil)
-                     print("Ok")
-                   end})
-  local e1 <close> = setmetatable({}, {__close = function () print(120) end})
-  os.exit(true, true)
-]]
-RUN('lua %s > %s', prog, out)
-checkprogout("120\nOk\n")
-
-
--- remove temporary files
-assert(os.remove(prog))
-assert(os.remove(otherprog))
-assert(not os.remove(out))
-
--- invalid options
-NoRun("unrecognized option '-h'", "lua -h")
-NoRun("unrecognized option '---'", "lua ---")
-NoRun("unrecognized option '-Ex'", "lua -Ex")
-NoRun("unrecognized option '-vv'", "lua -vv")
-NoRun("unrecognized option '-iv'", "lua -iv")
-NoRun("'-e' needs argument", "lua -e")
-NoRun("syntax error", "lua -e a")
-NoRun("'-l' needs argument", "lua -l")
-
-
-if T then   -- test library?
-  print("testing 'not enough memory' to create a state")
-  NoRun("not enough memory", "env MEMLIMIT=100 lua")
-
-  -- testing 'warn'
-  warn("@store")
-  warn("@123", "456", "789")
-  assert(_WARN == "@123456789"); _WARN = false
-
-  warn("zip", "", " ", "zap")
-  assert(_WARN == "zip zap"); _WARN = false
-  warn("ZIP", "", " ", "ZAP")
-  assert(_WARN == "ZIP ZAP"); _WARN = false
-  warn("@normal")
-end
-
-do
-  -- 'warn' must get at least one argument
-  local st, msg = pcall(warn)
-  assert(string.find(msg, "string expected"))
-
-  -- 'warn' does not leave unfinished warning in case of errors
-  -- (message would appear in next warning)
-  st, msg = pcall(warn, "SHOULD NOT APPEAR", {})
-  assert(string.find(msg, "string expected"))
-end
-
-print('+')
-
-print('testing Ctrl C')
-do
-  -- interrupt a script
-  local function kill (pid)
-    return os.execute(string.format('kill -INT %s 2> /dev/null', pid))
-  end
-
-  -- function to run a script in background, returning its output file
-  -- descriptor and its pid
-  local function runback (luaprg)
-    -- shell script to run 'luaprg' in background and echo its pid
-    local shellprg = string.format('%s -e "%s" & echo $!', progname, luaprg)
-    local f = io.popen(shellprg, "r")   -- run shell script
-    local pid = f:read()   -- get pid for Lua script
-    print("(if test fails now, it may leave a Lua script running in \z
-            background, pid " .. pid .. ")")
-    return f, pid
-  end
-
-  -- Lua script that runs protected infinite loop and then prints '42'
-  local f, pid = runback[[
-    pcall(function () print(12); while true do end end); print(42)]]
-  -- wait until script is inside 'pcall'
-  assert(f:read() == "12")
-  kill(pid)  -- send INT signal to Lua script
-  -- check that 'pcall' captured the exception and script continued running
-  assert(f:read() == "42")  -- expected output
-  assert(f:close())
-  print("done")
-
-  -- Lua script in a long unbreakable search
-  local f, pid = runback[[
-    print(15); string.find(string.rep('a', 100000), '.*b')]]
-  -- wait (so script can reach the loop)
-  assert(f:read() == "15")
-  assert(os.execute("sleep 1"))
-  -- must send at least two INT signals to stop this Lua script
-  local n = 100
-  for i = 0, 100 do   -- keep sending signals
-    if not kill(pid) then   -- until it fails
-      n = i   -- number of non-failed kills
-      break
-    end
-  end
-  assert(f:close())
-  assert(n >= 2)
-  print(string.format("done (with %d kills)", n))
-
-end
-
-print("OK")