feat: 适配 Lua 5.2.4 (lua_5.2.4 分支)

- lib/lua 替换为 Lua 5.2.4 官方源码; CMakeLists 补 lbitlib.c(5.2 linit 注册 bit32)、删 lutf8lib.c(5.2 无此文件)
- I/O 重定向机制改造: 5.2 无 lua_getextraspace → iopath 指针存入
  Registry 固定索引(IOPATH_REG_IDX=1), 回调经 get_iopath() 取回,
  free_lua 时释放 —— 该方案同样适用于更低版本
- typed interop 版本自适应: capture_result() 的 lua_isinteger 分支用
  #if LUA_VERSION_NUM >= 503 包裹, 5.2 及以下所有数字统一 CJT_NUM
- 测试跨版本适配: PackagePathConfig 接受 require 的两种返回语义;
  typed 数值断言 EXPECT_INT_OR_NUM 宏兼容有无 integer 子类型;
  大整数保真断言仅对 5.3+ 生效(5.2 经 double 必然丢精度)
- 验证: GTest 44/44 通过

lib/lua/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.12)
-project(lua VERSION 5.4.6 LANGUAGES C)
+project(lua VERSION 5.2.4 LANGUAGES C)
 
 # 基础配置
 set(CMAKE_C_STANDARD 99)
@@ -63,7 +63,7 @@ file(GLOB LUA_LIB_SOURCES
     loslib.c
     lstrlib.c
     ltablib.c
-    lutf8lib.c
+    lbitlib.c
     linit.c
 )
 

lib/lua/Makefile

@@ -0,0 +1,187 @@
+# Makefile for building Lua
+# See ../doc/readme.html for installation and customization instructions.
+
+# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+
+# Your platform. See PLATS for possible values.
+PLAT= none
+
+CC= gcc
+CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+LIBS= -lm $(SYSLIBS) $(MYLIBS)
+
+AR= ar rcu
+RANLIB= ranlib
+RM= rm -f
+
+SYSCFLAGS=
+SYSLDFLAGS=
+SYSLIBS=
+
+MYCFLAGS=
+MYLDFLAGS=
+MYLIBS=
+MYOBJS=
+
+# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
+
+PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+LUA_A=	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
+LIB_O=	lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
+	lmathlib.o loslib.o lstrlib.o ltablib.o loadlib.o linit.o
+BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
+
+LUA_T=	lua
+LUA_O=	lua.o
+
+LUAC_T=	luac
+LUAC_O=	luac.o
+
+ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_A= $(LUA_A)
+
+# Targets start here.
+default: $(PLAT)
+
+all:	$(ALL_T)
+
+o:	$(ALL_O)
+
+a:	$(ALL_A)
+
+$(LUA_A): $(BASE_O)
+	$(AR) $@ $(BASE_O)
+	$(RANLIB) $@
+
+$(LUA_T): $(LUA_O) $(LUA_A)
+	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+$(LUAC_T): $(LUAC_O) $(LUA_A)
+	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+
+clean:
+	$(RM) $(ALL_T) $(ALL_O)
+
+depend:
+	@$(CC) $(CFLAGS) -MM l*.c
+
+echo:
+	@echo "PLAT= $(PLAT)"
+	@echo "CC= $(CC)"
+	@echo "CFLAGS= $(CFLAGS)"
+	@echo "LDFLAGS= $(SYSLDFLAGS)"
+	@echo "LIBS= $(LIBS)"
+	@echo "AR= $(AR)"
+	@echo "RANLIB= $(RANLIB)"
+	@echo "RM= $(RM)"
+
+# Convenience targets for popular platforms
+ALL= all
+
+none:
+	@echo "Please do 'make PLATFORM' where PLATFORM is one of these:"
+	@echo "   $(PLATS)"
+
+aix:
+	$(MAKE) $(ALL) CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl" SYSLDFLAGS="-brtl -bexpall"
+
+ansi:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_ANSI"
+
+bsd:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-Wl,-E"
+
+freebsd:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline"
+
+generic: $(ALL)
+
+linux:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
+
+macosx:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc
+
+mingw:
+	$(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \
+	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
+	"SYSCFLAGS=-DLUA_BUILD_AS_DLL" "SYSLIBS=" "SYSLDFLAGS=-s" lua.exe
+	$(MAKE) "LUAC_T=luac.exe" luac.exe
+
+posix:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX"
+
+solaris:
+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl"
+
+# list targets that do not create files (but not all makes understand .PHONY)
+.PHONY: all $(PLATS) default o a clean depend echo none
+
+# DO NOT DELETE
+
+lapi.o: lapi.c 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 lua.h luaconf.h lauxlib.h
+lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h
+lbitlib.o: lbitlib.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 ldebug.h lstate.h ltm.h ldo.h lgc.h \
+ lstring.h ltable.h lvm.h
+lcorolib.o: lcorolib.c lua.h luaconf.h lauxlib.h lualib.h
+lctype.o: lctype.c lctype.h lua.h luaconf.h llimits.h
+ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h
+ldebug.o: ldebug.c 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 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 lua.h luaconf.h lobject.h llimits.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 \
+ lstate.h ltm.h lzio.h lmem.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 lctype.h llimits.h ldo.h lobject.h \
+ lstate.h ltm.h lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.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 lgc.h
+loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h
+lobject.o: lobject.c 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 lopcodes.h llimits.h lua.h luaconf.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 ldebug.h lstate.h ltm.h ldo.h lfunc.h \
+ lstring.h lgc.h ltable.h
+lstate.o: lstate.c 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 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 lstring.h ltable.h lvm.h
+ltablib.o: ltablib.c lua.h luaconf.h lauxlib.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
+luac.o: luac.c lua.h luaconf.h lauxlib.h lobject.h llimits.h lstate.h \
+ ltm.h lzio.h lmem.h lundump.h ldebug.h lopcodes.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 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
+

lib/lua/README

@@ -1,6 +0,0 @@
-
-This is Lua 5.4.8, released on 21 May 2025.
-
-For installation instructions, license details, and
-further information about Lua, see doc/readme.html.
-

lib/lua/lapi.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lapi.h $
+** $Id: lapi.h,v 2.7.1.1 2013/04/12 18:48:47 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) \
+    { if ((nres) == LUA_MULTRET && L->ci->top < L->top) L->ci->top = L->top; }
-	L->ci->top.p = L->top.p; }
 
+#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

lib/lua/lauxlib.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.h $
+** $Id: lauxlib.h,v 1.120.1.1 2013/04/12 18:48:47 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"
 
-
+/* extra error code for `luaL_load' */
-typedef struct luaL_Buffer luaL_Buffer;
-
-
-/* extra error code for 'luaL_loadfilex' */
 #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);
-
+#define luaL_checkversion(L)	luaL_checkversion_(L, LUA_VERSION_NUM)
-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 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_argerror) (lua_State *L, int numarg, 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 numArg,
-LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
                                                           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_checknumber) (lua_State *L, int numArg);
-LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
+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_checkinteger) (lua_State *L, int numArg);
-LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
+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_checktype) (lua_State *L, int narg, int t);
-LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
+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);
 
-
+/* pre-defined references */
-/* predefined 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,
+LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
-                                     const char *p, const char *r);
+                                                  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)  \
+#define luaL_newlib(L,l)	(luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
-  (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_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 {
+  char initb[LUAL_BUFFERSIZE];  /* initial buffer */
-    LUAI_MAXALIGN;  /* ensure maximum alignment for buffer */
+} luaL_Buffer;
-    char b[LUAL_BUFFERSIZE];  /* initial buffer */
-  } init;
-};
-
-
-#define luaL_bufflen(bf)	((bf)->n)
-#define luaL_buffaddr(bf)	((bf)->b)
 
 
 #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 old module system */
-** {============================================================
+#if defined(LUA_COMPAT_MODULE)
-** Compatibility with deprecated conversions
-** =============================================================
-*/
-#if defined(LUA_COMPAT_APIINTCASTS)
 
-#define luaL_checkunsigned(L,a)	((lua_Unsigned)luaL_checkinteger(L,a))
+LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
-#define luaL_optunsigned(L,a,d)	\
+                                   int sizehint);
-	((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d)))
+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_register(L,n,l)	(luaL_openlib(L,(n),(l),0))
-#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)))
 
 #endif
-/* }============================================================ */
-
 
 
 #endif

lib/lua/lbaselib.c

@@ -1,13 +1,9 @@
 /*
-** $Id: lbaselib.c $
+** $Id: lbaselib.c,v 1.276.1.1 2013/04/12 18:48:47 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 */
+    lua_pushvalue(L, -1);  /* function to be called */
-    if (i > 1)  /* not the first element? */
+    lua_pushvalue(L, i);   /* value to print */
-      lua_writestring("\t", 1);  /* add a tab before it */
+    lua_call(L, 1, 1);
-    lua_writestring(s, l);  /* print it */
+    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();
+  luai_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 */
   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_isnoneornil(L, 2)) {  /* standard conversion */
-    if (lua_type(L, 1) == LUA_TNUMBER) {  /* already a number? */
+    int isnum;
-      lua_settop(L, 1);  /* yes; return it */
+    lua_Number n = lua_tonumberx(L, 1, &isnum);
+    if (isnum) {
+      lua_pushnumber(L, n);
       return 1;
-    }
+    }  /* else not a number; must be something */
-    else {
+    luaL_checkany(L, 1);
-      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 {
     size_t l;
-    const char *s;
+    const char *s = luaL_checklstring(L, 1, &l);
-    lua_Integer n = 0;  /* to avoid warnings */
+    const char *e = s + l;  /* end point for 's' */
-    lua_Integer base = luaL_checkinteger(L, 2);
+    int base = luaL_checkint(L, 2);
-    luaL_checktype(L, 1, LUA_TSTRING);  /* no numbers as strings */
+    int neg = 0;
-    s = lua_tolstring(L, 1, &l);
     luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
-    if (b_str2int(s, (int)base, &n) == s + l) {
+    s += strspn(s, SPACECHARS);  /* skip initial spaces */
-      lua_pushinteger(L, n);
+    if (*s == '-') { s++; neg = 1; }  /* handle signal */
-      return 1;
+    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) {
+  if (lua_isstring(L, 1) && level > 0) {  /* add extra information? */
-    luaL_where(L, level);   /* 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");
+  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
-  if (l_unlikely(luaL_getmetafield(L, 1, "__metatable") != LUA_TNIL))
+                    "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,
+  luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
-                      "table or string");
+                   "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, 0);
-      int b = lua_gc(L, LUA_GCCOUNTB);
+      lua_pushnumber(L, res + ((lua_Number)b/1024));
-      checkvalres(k);
+      lua_pushinteger(L, b);
-      lua_pushnumber(L, (lua_Number)k + ((lua_Number)b/1024));
+      return 2;
-      return 1;
     }
-    case LUA_GCSTEP: {
+    case LUA_GCSTEP: case LUA_GCISRUNNING: {
-      int step = (int)luaL_optinteger(L, 2, 0);
-      int res = lua_gc(L, o, step);
-      checkvalres(res);
       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_checkany(L, 1);
-  luaL_argcheck(L, t != LUA_TNONE, 1, "value expected");
+  lua_pushstring(L, luaL_typename(L, 1));
-  lua_pushstring(L, lua_typename(L, t));
   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);
+  return pairsmeta(L, "__pairs", 0, luaB_next);
-  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;
 }
 
 
-/*
-** Traversal function for 'ipairs'
-*/
 static int ipairsaux (lua_State *L) {
-  lua_Integer i = luaL_checkinteger(L, 2);
+  int i = luaL_checkint(L, 2);
-  i = luaL_intop(+, i, 1);
+  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);
+  return pairsmeta(L, "__ipairs", 1, ipairsaux);
-  lua_pushcfunction(L, ipairsaux);  /* iteration function */
-  lua_pushvalue(L, 1);  /* state */
-  lua_pushinteger(L, 0);  /* initial value */
-  return 3;
 }
 
 
 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) {
+static int dofilecont (lua_State *L) {
-  (void)d1;  (void)d2;  /* only to match 'lua_Kfunction' prototype */
   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? */
+  if (!lua_toboolean(L, 1))
-    return lua_gettop(L);  /* return all arguments */
+    return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
-  else {  /* error */
+  return lua_gettop(L);
-    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' */
-  }
 }
 
 
@@ -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;
   }
 }
 
 
-/*
+static int finishpcall (lua_State *L, int status) {
-** Continuation function for 'pcall' and 'xpcall'. Both functions
+  if (!lua_checkstack(L, 1)) {  /* no space for extra boolean? */
-** already pushed a 'true' before doing the call, so in case of success
+    lua_settop(L, 0);  /* create space for return values */
-** 'finishpcall' only has to return everything in the stack minus
+    lua_pushboolean(L, 0);
-** 'extra' values (where 'extra' is exactly the number of items to be
+    lua_pushstring(L, "stack overflow");
-** 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 */
     return 2;  /* return false, msg */
   }
-  else
+  lua_pushboolean(L, status);  /* first result (status) */
-    return lua_gettop(L) - (int)extra;  /* return all results */
+  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_pushnil(L);
-  lua_insert(L, 1);  /* put it in place */
+  lua_insert(L, 1);  /* create space for status result */
-  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, finishpcall);
+  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, pcallcont);
-  return finishpcall(L, status, 0);
+  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 */
+  luaL_argcheck(L, n >= 2, 2, "value expected");
-  lua_pushboolean(L, 1);  /* first result */
+  lua_pushvalue(L, 1);  /* exchange function... */
-  lua_pushvalue(L, 1);  /* function */
+  lua_copy(L, 2, 1);  /* ...and error handler */
-  lua_rotate(L, 3, 2);  /* move them below function's arguments */
+  lua_replace(L, 2);
-  status = lua_pcallk(L, n - 2, LUA_MULTRET, 2, 2, finishpcall);
+  status = lua_pcallk(L, n - 2, LUA_MULTRET, 1, 0, pcallcont);
-  return finishpcall(L, status, 2);
+  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_pushglobaltable(L);
-  lua_setfield(L, -2, LUA_GNAME);
+  lua_pushglobaltable(L);
-  /* set global _VERSION */
+  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;
 }
 

lib/lua/lbitlib.c

@@ -0,0 +1,212 @@
+/*
+** $Id: lbitlib.c,v 1.18.1.2 2013/07/09 18:01:41 roberto Exp $
+** 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;
+}
+

lib/lua/lcode.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.h $
+** $Id: lcode.h,v 1.58.1.1 2013/04/12 18:48:47 roberto Exp $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -24,56 +24,41 @@
 ** grep "ORDER OPR" if you change these enums  (ORDER OP)
 */
 typedef enum BinOpr {
-  /* arithmetic operators */
+  OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
-  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_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) */
+typedef enum UnOpr { OPR_MINUS, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
-#define foldbinop(op)	((op) <= OPR_SHR)
 
 
-#define luaK_codeABC(fs,o,a,b,c)	luaK_codeABCk(fs,o,a,b,c,0)
+#define getcode(fs,e)	((fs)->f->code[(e)->u.info])
-
-
-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 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_codeABCk (FuncState *fs, OpCode o, int A,
+LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
-                                            int B, int C, int k);
+LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k);
-LUAI_FUNC int luaK_exp2const (FuncState *fs, const expdesc *e, TValue *v);
 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);
 LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
 LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
 LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
 LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
 LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
@@ -85,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

lib/lua/lcorolib.c

@@ -1,44 +1,37 @@
 /*
-** $Id: lcorolib.c $
+** $Id: lcorolib.c,v 1.5.1.1 2013/04/12 18:48:47 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;
+  int status;
-  if (l_unlikely(!lua_checkstack(co, narg))) {
+  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);
+  status = lua_resume(co, L, narg);
-  if (l_likely(status == LUA_OK || status == LUA_YIELD)) {
+  if (status == LUA_OK || status == LUA_YIELD) {
-    if (l_unlikely(!lua_checkstack(L, nres + 1))) {
+    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? */
+  if (r < 0) {
-    int stat = lua_status(co);
+    if (lua_isstring(L, -1)) {  /* error object is a string? */
-    if (stat != LUA_OK && stat != LUA_YIELD) {  /* error in the coroutine? */
+      luaL_where(L, 1);  /* add extra info */
-      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 */
       lua_insert(L, -2);
       lua_concat(L, 2);
     }
@@ -114,48 +101,30 @@ static int luaB_yield (lua_State *L) {
 }
 
 
-#define COS_RUN		0
+static int luaB_costatus (lua_State *L) {
-#define COS_DEAD	1
+  lua_State *co = lua_tothread(L, 1);
-#define COS_YIELD	2
+  luaL_argcheck(L, co, 1, "coroutine expected");
-#define COS_NORM	3
+  if (L == co) lua_pushliteral(L, "running");
-
-
-static const char *const statname[] =
-  {"running", "dead", "suspended", "normal"};
-
-
-static int auxstatus (lua_State *L, lua_State *co) {
-  if (L == co) return COS_RUN;
   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? */
+        if (lua_getstack(co, 0, &ar) > 0)  /* does it have frames? */
-          return COS_NORM;  /* it is running */
+          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}
 };
 

lib/lua/lctype.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lctype.c $
+** $Id: lctype.c,v 1.11.1.1 2013/04/12 18:48:47 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. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 8. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* 9. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 9. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* a. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* a. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* b. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* b. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  0x00,  0x00,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* c. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* c. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* d. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* d. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,	/* e. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* e. */
-  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,  NONA,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
-  NONA,  NONA,  NONA,  NONA,  NONA,  0x00,  0x00,  0x00,	/* f. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* f. */
-  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
 };
 
 #endif			/* } */

lib/lua/lctype.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lctype.h $
+** $Id: lctype.h,v 1.12.1.1 2013/04/12 18:48:47 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
+** this 'ltolower' only works for alphabetic characters
-** 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 '.'.)
 */
-#define ltolower(c)  \
+#define ltolower(c)	((c) | ('A' ^ 'a'))
-  check_exp(('A' <= (c) && (c) <= 'Z') || (c) == ((c) | ('A' ^ 'a')),  \
-            (c) | ('A' ^ 'a'))
 
 
-/* one entry for each character and for -1 (EOZ) */
+/* two more entries for 0 and -1 (EOZ) */
-LUAI_DDEC(const lu_byte luai_ctype_[UCHAR_MAX + 2];)
+LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2];
 
 
 #else			/* }{ */

lib/lua/ldblib.c

@@ -1,39 +1,28 @@
 /*
-** $Id: ldblib.c $
+** $Id: ldblib.c,v 1.132.1.2 2015/02/19 17:16:55 roberto Exp $
 ** 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"
 
 
-/*
+#define HOOKKEY		"_HKEY"
-** The hook table at registry[HOOKKEY] maps threads to their current
-** hook function.
-*/
-static const char *const HOOKKEY = "_HOOKKEY";
 
 
-/*
-** 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);
+    lua_pushnil(L);
-  else if (lua_getiuservalue(L, 1, n) != LUA_TNONE) {
+  else
-    lua_pushboolean(L, 1);
+    lua_getuservalue(L, 1);
-    return 2;
-  }
   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))
+  lua_setuservalue(L, 1);
-    luaL_pushfail(L);
   return 1;
 }
 
 
-/*
+static void settabss (lua_State *L, const char *i, const char *v) {
-** Auxiliary function used by several library functions: check for
+  lua_pushstring(L, v);
-** an optional thread as function's first argument and set 'arg' with
+  lua_setfield(L, -2, i);
-** 1 if this argument is present (so that functions can skip it to
+}
-** access their other arguments)
+
-*/
+
+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)
+  if (L == L1) {
-    lua_rotate(L, -2, 1);  /* exchange object and table */
+    lua_pushvalue(L, -2);
+    lua_remove(L, -3);
+  }
   else
-    lua_xmove(L1, L, 1);  /* move object to the "main" stack */
+    lua_xmove(L1, L, 1);
-  lua_setfield(L, -2, fname);  /* put object into table */
+  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_isnumber(L, arg+1)) {
-  if (lua_isfunction(L, arg + 1)) {  /* info about a function? */
+    if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) {
-    options = lua_pushfstring(L, ">%s", options);  /* add '>' to 'options' */
+      lua_pushnil(L);  /* level out of range */
-    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 */
       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);
+    settabss(L, "source", ar.source);
-    lua_setfield(L, -2, "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;
+    if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar))  /* out of range? */
-    const char *name;
-    int level = (int)luaL_checkinteger(L, arg + 1);
-    if (l_unlikely(!lua_getstack(L1, level, &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);
+  if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar))  /* out of range? */
-  int nvar = (int)luaL_checkinteger(L, arg + 2);
-  if (l_unlikely(!lua_getstack(L1, level, &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);
+  lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2)));
-  if (name == NULL)
-    lua_pop(L1, 1);  /* pop value (if not popped by 'lua_setlocal') */
-  lua_pushstring(L, name);
   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 */
+  int n = luaL_checkint(L, 2);
-  luaL_checktype(L, 1, LUA_TFUNCTION);  /* closure */
+  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) {
 }
 
 
-/*
+static int checkupval (lua_State *L, int argf, int argnup) {
-** Check whether a given upvalue from a given closure exists and
+  lua_Debug ar;
-** returns its index
+  int nup = luaL_checkint(L, argnup);
-*/
+  luaL_checktype(L, argf, LUA_TFUNCTION);
-static void *checkupval (lua_State *L, int argf, int argnup, int *pnup) {
+  lua_pushvalue(L, argf);
-  void *id;
+  lua_getinfo(L, ">u", &ar);
-  int nup = (int)luaL_checkinteger(L, argnup);  /* upvalue index */
+  luaL_argcheck(L, 1 <= nup && nup <= ar.nups, argnup, "invalid upvalue index");
-  luaL_checktype(L, argf, LUA_TFUNCTION);  /* closure */
+  return nup;
-  id = lua_upvalueid(L, argf, nup);
-  if (pnup) {
-    luaL_argcheck(L, id != NULL, argnup, "invalid upvalue index");
-    *pnup = nup;
-  }
-  return id;
 }
 
 
 static int db_upvalueid (lua_State *L) {
-  void *id = checkupval(L, 1, 2, NULL);
+  int n = checkupval(L, 1, 2);
-  if (id != NULL)
+  lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
-    lua_pushlightuserdata(L, id);
-  else
-    luaL_pushfail(L);
   return 1;
 }
 
 
 static int db_upvaluejoin (lua_State *L) {
-  int n1, n2;
+  int n1 = checkupval(L, 1, 2);
-  checkupval(L, 1, 2, &n1);
+  int n2 = checkupval(L, 3, 4);
-  checkupval(L, 3, 4, &n2);
   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) {
 }
 
 
-/*
+#define gethooktable(L)	luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)
-** Call hook function registered at hook table for the current
+
-** thread (if there is one)
+
-*/
 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_rawget(L, -2);
-    lua_pushstring(L, hooknames[(int)ar->event]);  /* push event name */
+  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)) {
+  if (gethooktable(L) == 0) {  /* creating hook table? */
-    /* table just created; initialize it */
+    lua_pushstring(L, "k");
-    lua_pushliteral(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_pushthread(L1); lua_xmove(L1, L, 1);
-  lua_pushvalue(L, arg + 1);  /* value (hook function) */
+  lua_pushvalue(L, arg+1);
-  lua_rawset(L, -3);  /* hooktable[L1] = new Lua hook */
+  lua_rawset(L, -3);  /* set new hook */
-  lua_sethook(L1, func, mask, count);
+  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? */
+  if (hook != NULL && hook != hookf)  /* external hook? */
-    luaL_pushfail(L);
-    return 1;
-  }
-  else if (hook != hookf)  /* external hook? */
     lua_pushliteral(L, "external hook");
-  else {  /* hook table must exist */
+  else {
-    lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
+    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_pushstring(L, unmakemask(mask, buff));
-  lua_pushinteger(L, lua_gethookcount(L1));  /* 3rd result = count */
+  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> ");
+    luai_writestringerror("%s", "lua_debug> ");
-    if (fgets(buffer, sizeof(buffer), stdin) == NULL ||
+    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}
 };
 

lib/lua/ldebug.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ldebug.h $
+** $Id: ldebug.h,v 2.7.1.1 2013/04/12 18:48:47 roberto Exp $
 ** Auxiliary functions from Debug Interface module
 ** See Copyright Notice in lua.h
 */
@@ -11,54 +11,24 @@
 #include "lstate.h"
 
 
-#define pcRel(pc, p)	(cast_int((pc) - (p)->code) - 1)
+#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 getfuncline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : 0)
 
 #define resethookcount(L)	(L->hookcount = L->basehookcount)
 
-/*
+/* Active Lua function (given call info) */
-** mark for entries in 'lineinfo' array that has absolute information in
+#define ci_func(ci)		(clLvalue((ci)->func))
-** 'abslineinfo' array
-*/
-#define ABSLINEINFO	(-0x80)
 
 
-/*
-** 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_concaterror (lua_State *L, StkId p1, StkId p2);
-LUAI_FUNC l_noret luaG_forerror (lua_State *L, const TValue *o,
+LUAI_FUNC l_noret luaG_aritherror (lua_State *L, const TValue *p1,
-                                               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,
                                                  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);
-LUAI_FUNC int luaG_tracecall (lua_State *L);
-
 
 #endif

lib/lua/ldo.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.h $
+** $Id: ldo.h,v 2.20.1.1 2013/04/12 18:48:47 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"
 
 
-/*
+#define luaD_checkstack(L,n)	if (L->stack_last - L->top <= (n)) \
-** Macro to check stack size and grow stack if needed.  Parameters
+				    luaD_growstack(L, n); else condmovestack(L);
-** '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 incr_top(L) {L->top++; luaD_checkstack(L,0);}
 
-#define savestack(L,pt)		(cast_charp(pt) - cast_charp(L->stack.p))
+#define savestack(L,p)		((char *)(p) - (char *)L->stack)
-#define restorestack(L,n)	cast(StkId, cast_charp(L->stack.p) + (n))
+#define restorestack(L,n)	((TValue *)((char *)L->stack + (n)))
 
 
-/* macro to check stack size, preserving 'p' */
+/* type of protected functions, to be ran by `runprotected' */
-#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' */
 typedef void (*Pfunc) (lua_State *L, void *ud);
 
-LUAI_FUNC l_noret luaD_errerr (lua_State *L);
-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,
+LUAI_FUNC void luaD_hook (lua_State *L, int event, int line);
-                                        int fTransfer, int nTransfer);
+LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults);
-LUAI_FUNC void luaD_hookcall (lua_State *L, CallInfo *ci);
+LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults,
-LUAI_FUNC int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
+                                        int allowyield);
-                                              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 int luaD_closeprotected (lua_State *L, ptrdiff_t level, int status);
 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_poscall (lua_State *L, StkId firstResult);
-LUAI_FUNC int luaD_reallocstack (lua_State *L, int newsize, int raiseerror);
+LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
-LUAI_FUNC int luaD_growstack (lua_State *L, int n, int raiseerror);
+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);

lib/lua/ldump.c

@@ -1,230 +1,173 @@
 /*
-** $Id: ldump.c $
+** $Id: ldump.c,v 2.17.1.1 2013/04/12 18:48:47 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_State* L;
-  lua_Writer writer;
+ lua_Writer writer;
-  void *data;
+ void* data;
-  int strip;
+ int strip;
-  int status;
+ int status;
 } DumpState;
 
+#define DumpMem(b,n,size,D)	DumpBlock(b,(n)*(size),D)
+#define DumpVar(x,D)		DumpMem(&x,1,sizeof(x),D)
 
-/*
+static void DumpBlock(const void* b, size_t size, DumpState* D)
-** All high-level dumps go through dumpVector; you can change it to
+{
-** change the endianness of the result
+ if (D->status==0)
-*/
+ {
-#define dumpVector(D,v,n)	dumpBlock(D,v,(n)*sizeof((v)[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) {
+static void DumpNumber(lua_Number x, DumpState* D)
-  if (D->status == 0 && size > 0) {
+{
-    lua_unlock(D->L);
+ DumpVar(x,D);
-    D->status = (*D->writer)(D->L, b, size, D->data);
+}
-    lua_lock(D->L);
+
+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);
 }
 
-
+static void DumpUpvalues(const Proto* f, DumpState* D)
-#define dumpVar(D,x)		dumpVector(D,&x,1)
+{
-
+ int i,n=f->sizeupvalues;
-
+ DumpInt(n,D);
-static void dumpByte (DumpState *D, int y) {
+ for (i=0; i<n; i++)
-  lu_byte x = (lu_byte)y;
+ {
-  dumpVar(D, x);
+  DumpChar(f->upvalues[i].instack,D);
+  DumpChar(f->upvalues[i].idx,D);
+ }
 }
 
-
+static void DumpDebug(const Proto* f, DumpState* D)
-/*
+{
-** 'dumpSize' buffer size: each byte can store up to 7 bits. (The "+6"
+ int i,n;
-** rounds up the division.)
+ DumpString((D->strip) ? NULL : f->source,D);
-*/
+ n= (D->strip) ? 0 : f->sizelineinfo;
-#define DIBS    ((sizeof(size_t) * CHAR_BIT + 6) / 7)
+ DumpVector(f->lineinfo,n,sizeof(int),D);
-
+ n= (D->strip) ? 0 : f->sizelocvars;
-static void dumpSize (DumpState *D, size_t x) {
+ DumpInt(n,D);
-  lu_byte buff[DIBS];
+ for (i=0; i<n; i++)
-  int n = 0;
+ {
-  do {
+  DumpString(f->locvars[i].varname,D);
-    buff[DIBS - (++n)] = x & 0x7f;  /* fill buffer in reverse order */
+  DumpInt(f->locvars[i].startpc,D);
-    x >>= 7;
+  DumpInt(f->locvars[i].endpc,D);
-  } while (x != 0);
+ }
-  buff[DIBS - 1] |= 0x80;  /* mark last byte */
+ n= (D->strip) ? 0 : f->sizeupvalues;
-  dumpVector(D, buff + DIBS - n, n);
+ DumpInt(n,D);
+ for (i=0; i<n; i++) DumpString(f->upvalues[i].name,D);
 }
 
-
+static void DumpFunction(const Proto* f, DumpState* D)
-static void dumpInt (DumpState *D, int x) {
+{
-  dumpSize(D, x);
+ 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 DumpHeader(DumpState* D)
-static void dumpNumber (DumpState *D, lua_Number x) {
+{
-  dumpVar(D, x);
+ 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 luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip)
-              int strip) {
+{
-  DumpState D;
+ DumpState D;
-  D.L = L;
+ D.L=L;
-  D.writer = w;
+ D.writer=w;
-  D.data = data;
+ D.data=data;
-  D.strip = strip;
+ D.strip=strip;
-  D.status = 0;
+ D.status=0;
-  dumpHeader(&D);
+ DumpHeader(&D);
-  dumpByte(&D, f->sizeupvalues);
+ DumpFunction(f,&D);
-  dumpFunction(&D, f, NULL);
+ return D.status;
-  return D.status;
 }
-

lib/lua/lfunc.c

@@ -1,21 +1,17 @@
 /*
-** $Id: lfunc.c $
+** $Id: lfunc.c,v 2.30.1.1 2013/04/12 18:48:47 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) {
+Closure *luaF_newCclosure (lua_State *L, int n) {
-  GCObject *o = luaC_newobj(L, LUA_VCCL, sizeCclosure(nupvals));
+  Closure *c = &luaC_newobj(L, LUA_TCCL, sizeCclosure(n), NULL, 0)->cl;
-  CClosure *c = gco2ccl(o);
+  c->c.nupvalues = cast_byte(n);
-  c->nupvalues = cast_byte(nupvals);
   return c;
 }
 
 
-LClosure *luaF_newLclosure (lua_State *L, int nupvals) {
+Closure *luaF_newLclosure (lua_State *L, int n) {
-  GCObject *o = luaC_newobj(L, LUA_VLCL, sizeLclosure(nupvals));
+  Closure *c = &luaC_newobj(L, LUA_TLCL, sizeLclosure(n), NULL, 0)->cl;
-  LClosure *c = gco2lcl(o);
+  c->l.p = NULL;
-  c->p = NULL;
+  c->l.nupvalues = cast_byte(n);
-  c->nupvalues = cast_byte(nupvals);
+  while (n--) c->l.upvals[n] = NULL;
-  while (nupvals--) c->upvals[nupvals] = NULL;
   return c;
 }
 
 
-/*
+UpVal *luaF_newupval (lua_State *L) {
-** fill a closure with new closed upvalues
+  UpVal *uv = &luaC_newobj(L, LUA_TUPVAL, sizeof(UpVal), NULL, 0)->uv;
-*/
+  uv->v = &uv->u.value;
-void luaF_initupvals (lua_State *L, LClosure *cl) {
+  setnilvalue(uv->v);
-  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;
-  }
   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 (*pp != NULL && (p = gco2uv(*pp))->v >= level) {
-  while ((uv = L->openupval) != NULL && (upl = uplevel(uv)) >= level) {
+    GCObject *o = obj2gco(p);
-    TValue *slot = &uv->u.value;  /* new position for value */
+    lua_assert(p->v != &p->u.value);
-    lua_assert(uplevel(uv) < L->top.p);
+    lua_assert(!isold(o) || isold(obj2gco(L)));
-    luaF_unlinkupval(uv);  /* remove upvalue from 'openupval' list */
+    if (p->v == level) {  /* found a corresponding upvalue? */
-    setobj(L, slot, uv->v.p);  /* move value to upvalue slot */
+      if (isdead(g, o))  /* is it dead? */
-    uv->v.p = slot;  /* now current value lives here */
+        changewhite(o);  /* resurrect it */
-    if (!iswhite(uv)) {  /* neither white nor dead? */
+      return p;
-      nw2black(uv);  /* closed upvalues cannot be gray */
+    }
-      luaC_barrier(L, uv, slot);
+    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 = &luaC_newobj(L, LUA_TPROTO, sizeof(Proto), NULL, 0)->p;
-  Proto *f = gco2p(o);
   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) {

lib/lua/lfunc.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lfunc.h $
+** $Id: lfunc.h,v 2.8.1.1 2013/04/12 18:48:47 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)) + \
+#define sizeCclosure(n)	(cast(int, sizeof(CClosure)) + \
-                         cast_int(sizeof(TValue)) * (n))
+                         cast(int, sizeof(TValue)*((n)-1)))
 
-#define sizeLclosure(n)	(cast_int(offsetof(LClosure, upvals)) + \
+#define sizeLclosure(n)	(cast(int, sizeof(LClosure)) + \
-                         cast_int(sizeof(TValue *)) * (n))
+                         cast(int, sizeof(TValue *)*((n)-1)))
-
-
-/* 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)
 
 
 LUAI_FUNC Proto *luaF_newproto (lua_State *L);
-LUAI_FUNC CClosure *luaF_newCclosure (lua_State *L, int nupvals);
+LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems);
-LUAI_FUNC LClosure *luaF_newLclosure (lua_State *L, int nupvals);
+LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems);
-LUAI_FUNC void luaF_initupvals (lua_State *L, LClosure *cl);
+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_close (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_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);
 

lib/lua/lgc.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lgc.h $
+** $Id: lgc.h,v 2.58.1.1 2013/04/12 18:48:47 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
+** Collectable objects may have one of three colors: white, which
-** the object is not marked; gray, which means the object is marked, but
+** means the object is not marked; gray, which means the
-** its references may be not marked; and black, which means that the
+** object is marked, but its references may be not marked; and
-** object and all its references are marked.  The main invariant of the
+** black, which means that the object and all its references are marked.
-** garbage collector, while marking objects, is that a black object can
+** The main invariant of the garbage collector, while marking objects,
-** never point to a white one. Moreover, any gray object must be in a
+** is that a black object can never point to a white one. Moreover,
-** "gray list" (gray, grayagain, weak, allweak, ephemeron) so that it
+** any gray object must be in a "gray list" (gray, grayagain, weak,
-** can be visited again before finishing the collection cycle. (Open
+** allweak, ephemeron) so that it can be visited again before finishing
-** upvalues are an exception to this rule.)  These lists have no meaning
+** the collection cycle. These lists have no meaning when the invariant
-** when the invariant is not being enforced (e.g., sweep phase).
+** 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	1
-#define GCSatomic	2
+#define GCSsweepstring	2
-#define GCSswpallgc	3
+#define GCSsweepudata	3
-#define GCSswpfinobj	4
+#define GCSsweep	4
-#define GCSswptobefnz	5
+#define GCSpause	5
-#define GCSswpend	6
-#define GCScallfin	7
-#define GCSpause	8
 
 
 #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
+** Outside the collector, the state in generational mode is kept in
-** ones) must be kept. During a collection, the sweep
+** 'propagate', so 'keepinvariant' is always true.
-** 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.
 */
-
+#define keepinvariantout(g)  \
-#define keepinvariant(g)	((g)->gcstate <= GCSatomic)
+  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: */
-** Layout for bit use in 'marked' field. First three bits are
+#define WHITE0BIT	0  /* object is white (type 0) */
-** used for object "age" in generational mode. Last bit is used
+#define WHITE1BIT	1  /* object is white (type 1) */
-** by tests.
+#define BLACKBIT	2  /* object is black */
-*/
+#define FINALIZEDBIT	3  /* object has been separated for finalization */
-#define WHITE0BIT	3  /* object is white (type 0) */
+#define SEPARATED	4  /* object is in 'finobj' list or in 'tobefnz' */
-#define WHITE1BIT	4  /* object is white (type 1) */
+#define FIXEDBIT	5  /* object is fixed (should not be collected) */
-#define BLACKBIT	5  /* object is black */
+#define OLDBIT		6  /* object is old (only in generational mode) */
-#define FINALIZEDBIT	6  /* object has been marked for finalization */
+/* bit 7 is currently used by tests (luaL_checkmemory) */
-
-#define TESTBIT		7
-
-
 
 #define WHITEBITS	bit2mask(WHITE0BIT, WHITE1BIT)
 
 
-#define iswhite(x)      testbits((x)->marked, WHITEBITS)
+#define iswhite(x)      testbits((x)->gch.marked, WHITEBITS)
-#define isblack(x)      testbit((x)->marked, BLACKBIT)
+#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)
+/* MOVE OLD rule: whenever an object is moved to the beginning of
-#define isdeadm(ow,m)	((m) & (ow))
+   a GC list, its old bit must be cleared */
-#define isdead(g,v)	isdeadm(otherwhite(g), (v)->marked)
+#define resetoldbit(o)	resetbit((o)->gch.marked, OLDBIT)
 
-#define changewhite(x)	((x)->marked ^= WHITEBITS)
+#define otherwhite(g)	(g->currentwhite ^ WHITEBITS)
-#define nw2black(x)  \
+#define isdeadm(ow,m)	(!(((m) ^ WHITEBITS) & (ow)))
-	check_exp(!iswhite(x), l_setbit((x)->marked, BLACKBIT))
+#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 luaC_condGC(L,c) \
-#define G_NEW		0	/* created in current cycle */
+	{if (G(L)->GCdebt > 0) {c;}; condchangemem(L);}
-#define G_SURVIVAL	1	/* created in previous cycle */
+#define luaC_checkGC(L)		luaC_condGC(L, luaC_step(L);)
-#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)))
 
 
-/* Default Values for GC parameters */
+#define luaC_barrier(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
-#define LUAI_GENMAJORMUL         100
+	luaC_barrier_(L,obj2gco(p),gcvalue(v)); }
-#define LUAI_GENMINORMUL         20
 
-/* wait memory to double before starting new cycle */
+#define luaC_barrierback(L,p,v) { if (valiswhite(v) && isblack(obj2gco(p)))  \
-#define LUAI_GCPAUSE    200
+	luaC_barrierback_(L,p); }
 
-/*
+#define luaC_objbarrier(L,p,o)  \
-** some gc parameters are stored divided by 4 to allow a maximum value
+	{ if (iswhite(obj2gco(o)) && isblack(obj2gco(p))) \
-** up to 1023 in a 'lu_byte'.
+		luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
-*/
-#define getgcparam(p)	((p) * 4)
-#define setgcparam(p,v)	((p) = (v) / 4)
 
-#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 luaC_barrierproto(L,p,c) \
-#define LUAI_GCSTEPSIZE 13      /* 8 KB */
+   { 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_newobj (lua_State *L, int tt, size_t sz,
-LUAI_FUNC GCObject *luaC_newobjdt (lua_State *L, int tt, size_t sz,
+                                 GCObject **list, int offset);
-                                                 size_t 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

lib/lua/linit.c

@@ -1,33 +1,20 @@
 /*
-** $Id: linit.c $
+** $Id: linit.c,v 1.32.1.1 2013/04/12 18:48:47 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"
 
-
+#define linit_c
-#include <stddef.h>
+#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 */
 }
 

lib/lua/liolib.c

@@ -1,153 +1,120 @@
 /*
-** $Id: liolib.c $
+** $Id: liolib.c,v 2.112.1.1 2013/04/12 18:48:47 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)
+#define lua_checkmode(mode) \
-
+	(*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&	\
-/* accepted extensions to 'mode' in 'fopen' */
+	(*mode != '+' || ++mode) &&  /* skip if char is '+' */	\
-#if !defined(L_MODEEXT)
+	(*mode != 'b' || ++mode) &&  /* skip if char is 'b' */	\
-#define L_MODEEXT	"b"
+	(*mode == '\0'))
-#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 */
-}
 
 #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 lua_popen(L,c,m)	((void)L, fflush(NULL), popen(c,m))
-#define l_pclose(L,file)	(pclose(file))
+#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 lua_popen(L,c,m)		((void)L, _popen(c,m))
-#define l_pclose(L,file)	(_pclose(file))
+#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 lua_popen(L,c,m)		((void)((void)c, m),  \
-#define l_popen(L,c,m)  \
+		luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
-	  ((void)c, (void)m, \
+#define lua_pclose(L,file)		((void)((void)L, file), -1)
-	  luaL_error(L, "'popen' not supported"), \
+
-	  (FILE*)0)
-#define l_pclose(L,file)		((void)L, (void)file, -1)
 
 #endif				/* } */
 
-#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
 
 /* }====================================================== */
 
 
-#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 */
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use standard output */
-  return f_close(L);
+  tofile(L);  /* make sure argument is an open stream */
+  return aux_close(L);
 }
 
 
@@ -245,8 +202,8 @@ static int f_gc (lua_State *L) {
 */
 static int io_fclose (lua_State *L) {
   LStream *p = tolstream(L);
-  errno = 0;
+  int res = fclose(p->f);
-  return luaL_fileresult(L, (fclose(p->f) == 0), NULL);
+  return luaL_fileresult(L, (res == 0), NULL);
 }
 
 
@@ -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))
+  if (p->f == NULL)
-    luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
+    luaL_error(L, "cannot open file " LUA_QS " (%s)", fname, strerror(errno));
 }
 
 
@@ -271,8 +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");
-  errno = 0;
   p->f = fopen(filename, mode);
   return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
 }
@@ -283,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, lua_pclose(L, p->f));
-  return luaL_execresult(L, l_pclose(L, p->f));
 }
 
 
@@ -292,9 +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 = lua_popen(L, filename, mode);
-  errno = 0;
-  p->f = l_popen(L, filename, mode);
   p->closef = &io_pclose;
   return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
 }
@@ -302,7 +255,6 @@ static int io_popen (lua_State *L) {
 
 static int io_tmpfile (lua_State *L) {
   LStream *p = newfile(L);
-  errno = 0;
   p->f = tmpfile();
   return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
 }
@@ -312,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)))
+  if (isclosed(p))
-    luaL_error(L, "default %s file is closed", findex + IOPREF_LEN);
+    luaL_error(L, "standard %s file is closed", findex + strlen(IO_PREFIX));
   return p->f;
 }
 
@@ -348,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");
+  /* ensure that arguments will fit here and into 'io_readline' stack */
-  lua_pushvalue(L, 1);  /* file */
+  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);
 }
 
@@ -381,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 */
@@ -401,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 */
+  aux_lines(L, toclose);
-  if (toclose) {
+  return 1;
-    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;
 }
 
 
@@ -420,91 +347,13 @@ static int io_lines (lua_State *L) {
 */
 
 
-/* maximum length of a numeral */
+static int read_number (lua_State *L, FILE *f) {
-#if !defined (L_MAXLENNUM)
+  lua_Number d;
-#define L_MAXLENNUM     200
+  if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
-#endif
+    lua_pushnumber(L, d);
-
-
-/* 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 */
     return 1;
   }
-}
+  else {
-
-
-/*
-** 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 */
    lua_pushnil(L);  /* "result" to be removed */
    return 0;  /* read fails */
   }
@@ -513,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 */
+  ungetc(c, f);
-  lua_pushliteral(L, "");
+  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 */
+  for (;;) {
-    char *buff = luaL_prepbuffer(&b);  /* preallocate buffer space */
+    size_t l;
-    int i = 0;
+    char *p = luaL_prepbuffer(&b);
-    l_lockfile(f);  /* no memory errors can happen inside the lock */
+    if (fgets(p, LUAL_BUFFERSIZE, f) == NULL) {  /* eof? */
-    while (i < LUAL_BUFFERSIZE && (c = l_getc(f)) != EOF && c != '\n')
+      luaL_pushresult(&b);  /* close buffer */
-      buff[i++] = c;  /* read up to end of line or buffer limit */
+      return (lua_rawlen(L, -1) > 0);  /* check whether read something */
-    l_unlockfile(f);
+    }
-    luaL_addsize(&b, i);
+    l = strlen(p);
-  } while (c != EOF && c != '\n');  /* repeat until end of line */
+    if (l == 0 || p[l-1] != '\n')
-  if (!chop && c == '\n')  /* want a newline and have one? */
+      luaL_addsize(&b, l);
-    luaL_addchar(&b, c);  /* add ending newline to result */
+    else {
-  luaL_pushresult(&b);  /* close buffer */
+      luaL_addsize(&b, l - chop);  /* chop 'eol' if needed */
-  /* return ok if read something (either a newline or something else) */
+      luaL_pushresult(&b);  /* close buffer */
-  return (c == '\n' || lua_rawlen(L, -1) > 0);
+      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 */
+  for (;;) {
-    char *p = luaL_prepbuffer(&b);
+    char *p = luaL_prepbuffsize(&b, rlen);
-    nr = fread(p, sizeof(char), LUAL_BUFFERSIZE, f);
+    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 */
 }
 
@@ -568,26 +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);
-  errno = 0;
   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 {
+  else {  /* ensure stack space for all results and for auxlib's buffer */
-    /* 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);
+        const char *p = lua_tostring(L, n);
-        if (*p == '*') p++;  /* skip optional '*' (for compatibility) */
+        luaL_argcheck(L, p && p[0] == '*', n, "invalid option");
-        switch (*p) {
+        switch (p[1]) {
           case 'n':  /* number */
             success = read_number(L, f);
             break;
@@ -611,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;
 }
@@ -627,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;
@@ -637,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_settop(L, 0);
-      lua_pushvalue(L, lua_upvalueindex(1));  /* push file at index 1 */
+      lua_pushvalue(L, lua_upvalueindex(1));
       aux_close(L);  /* close it */
     }
     return 0;
@@ -664,16 +514,11 @@ static int io_readline (lua_State *L) {
 static int g_write (lua_State *L, FILE *f, int arg) {
   int nargs = lua_gettop(L) - arg;
   int status = 1;
-  errno = 0;
   for (; nargs--; arg++) {
     if (lua_type(L, arg) == LUA_TNUMBER) {
       /* optimization: could be done exactly as for strings */
-      int len = lua_isinteger(L, arg)
+      status = status &&
-                ? fprintf(f, LUA_INTEGER_FMT,
+          fprintf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0;
-                             (LUAI_UACINT)lua_tointeger(L, arg))
-                : fprintf(f, LUA_NUMBER_FMT,
-                             (LUAI_UACNUMBER)lua_tonumber(L, arg));
-      status = status && (len > 0);
     }
     else {
       size_t l;
@@ -681,10 +526,8 @@ static int g_write (lua_State *L, FILE *f, int arg) {
       status = status && (fwrite(s, sizeof(char), l, f) == l);
     }
   }
-  if (l_likely(status))
+  if (status) return 1;  /* file handle already on stack top */
-    return 1;  /* file handle already on stack top */
+  else return luaL_fileresult(L, status, NULL);
-  else
-    return luaL_fileresult(L, status, NULL);
 }
 
 
@@ -705,16 +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");
-  errno = 0;
   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;
   }
 }
@@ -726,25 +568,19 @@ 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;
+  int res = setvbuf(f, NULL, mode[op], sz);
-  errno = 0;
-  res = setvbuf(f, NULL, mode[op], (size_t)sz);
   return luaL_fileresult(L, res == 0, NULL);
 }
 
 
 
 static int io_flush (lua_State *L) {
-  FILE *f = getiofile(L, IO_OUTPUT);
+  return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
-  errno = 0;
-  return luaL_fileresult(L, fflush(f) == 0, NULL);
 }
 
 
 static int f_flush (lua_State *L) {
-  FILE *f = tofile(L);
+  return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
-  errno = 0;
-  return luaL_fileresult(L, fflush(f) == 0, NULL);
 }
 
 
@@ -770,37 +606,26 @@ static const luaL_Reg iolib[] = {
 /*
 ** methods for file handles
 */
-static const luaL_Reg meth[] = {
+static const luaL_Reg flib[] = {
-  {"read", f_read},
+  {"close", io_close},
-  {"write", f_write},
-  {"lines", f_lines},
   {"flush", f_flush},
+  {"lines", f_lines},
+  {"read", f_read},
   {"seek", f_seek},
-  {"close", f_close},
   {"setvbuf", f_setvbuf},
-  {NULL, NULL}
+  {"write", f_write},
-};
-
-
-/*
-** metamethods for file handles
-*/
-static const luaL_Reg metameth[] = {
-  {"__index", NULL},  /* placeholder */
   {"__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_newmetatable(L, LUA_FILEHANDLE);  /* create metatable for file handles */
-  luaL_setfuncs(L, metameth, 0);  /* add metamethods to new metatable */
+  lua_pushvalue(L, -1);  /* push metatable */
-  luaL_newlibtable(L, meth);  /* create method table */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = metatable */
-  luaL_setfuncs(L, meth, 0);  /* add file methods to method table */
+  luaL_setfuncs(L, flib, 0);  /* add file methods to new metatable */
-  lua_setfield(L, -2, "__index");  /* metatable.__index = method table */
+  lua_pop(L, 1);  /* pop new metatable */
-  lua_pop(L, 1);  /* pop metatable */
 }
 
 
@@ -810,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;
 }

lib/lua/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
-
-};

lib/lua/llex.c

@@ -1,24 +1,20 @@
 /*
-** $Id: llex.c $
+** $Id: llex.c,v 2.63.1.3 2015/02/09 17:56:34 roberto Exp $
 ** 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>",
-    "<<", ">>", "::", "<eof>",
+    "<number>", "<name>", "<string>"
-    "<number>", "<integer>", "<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 */
+    luaS_fix(ts);  /* reserved words are never collected */
-    ts->extra = cast_byte(i+1);  /* reserved word */
+    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))
+    lua_assert(token == cast(unsigned char, token));
-      return luaO_pushfstring(ls->L, "'%c'", token);
+    return (lisprint(token)) ? luaO_pushfstring(ls->L, LUA_QL("%c"), token) :
-    else  /* control character */
+                              luaO_pushfstring(ls->L, "char(%d)", token);
-      return luaO_pushfstring(ls->L, "'<\\%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_NAME:
-    case TK_FLT: case TK_INT:
+    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
+** creates a new string and anchors it in function's table so that
-** will not be collected until the end of the compilation; by that time
+** it will not be collected until the end of the function's compilation
-** it should be anchored somewhere. It also internalizes long strings,
+** (by that time it should be anchored in function's prototype)
-** 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.
 */
 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);
+  setsvalue2s(L, L->top++, ts);  /* temporarily anchor it in stack */
-  if (!ttisnil(o))  /* string already present? */
+  o = luaH_set(L, ls->fs->h, L->top - 1);
-    ts = keystrval(nodefromval(o));  /* get saved copy */
+  if (ttisnil(o)) {  /* not in use yet? (see 'addK') */
-  else {  /* not in use yet */
+    /* boolean value does not need GC barrier;
-    TValue *stv = s2v(L->top.p++);  /* reserve stack space for string */
+       table has no metatable, so it does not need to invalidate cache */
-    setsvalue(L, stv, ts);  /* temporarily anchor the string */
+    setbvalue(o, 1);  /* t[string] = true */
-    luaH_finishset(L, ls->h, stv, o, stv);  /* t[string] = string */
-    /* table is not a metatable, so it does not need to invalidate cache */
     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) {
+static int check_next (LexState *ls, const char *set) {
-    next(ls);
+  if (ls->current == '\0' || !strchr(set, ls->current))
-    return 1;
+    return 0;
-  }
+  save_and_next(ls);
-  else return 0;
+  return 1;
 }
 
 
 /*
-** Check whether current char is in set 'set' (with two chars) and
+** change all characters 'from' in buffer to 'to'
-** saves it
 */
-static int check_next2 (LexState *ls, const char *set) {
+static void buffreplace (LexState *ls, char from, char to) {
-  lua_assert(set[2] == '\0');
+  size_t n = luaZ_bufflen(ls->buff);
-  if (ls->current == set[0] || ls->current == set[1]) {
+  char *p = luaZ_buffer(ls->buff);
-    save_and_next(ls);
+  while (n--)
-    return 1;
+    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'
+** this function is quite liberal in what it accepts, as 'luaO_str2d'
-** will reject ill-formed numerals. Roughly, it accepts the following
+** will reject ill-formed numerals.
-** 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.
 */
-static int read_numeral (LexState *ls, SemInfo *seminfo) {
+static void read_numeral (LexState *ls, SemInfo *seminfo) {
-  TValue obj;
   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? */
+    if (check_next(ls, expo))  /* exponent part? */
-      check_next2(ls, "-+");  /* optional exponent sign */
+      check_next(ls, "+-");  /* optional exponent sign */
-    else if (lisxdigit(ls->current) || ls->current == '.')  /* '%x|%.' */
+    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? */
+  buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
-    lexerror(ls, "malformed number", TK_FLT);
+  if (!buff2d(ls->buff, &seminfo->r))  /* format error? */
-  if (ttisinteger(&obj)) {
+    trydecpoint(ls, seminfo); /* try to update decimal point separator */
-    seminfo->i = ivalue(&obj);
-    return TK_INT;
-  }
-  else {
-    lua_assert(ttisfloat(&obj));
-    seminfo->r = fltvalue(&obj);
-    return TK_FLT;
-  }
 }
 
 
 /*
-** read a sequence '[=*[' or ']=*]', leaving the last bracket. If
+** skip a sequence '[=*[' or ']=*]' and return its number of '='s or
-** sequence is well formed, return its number of '='s + 2; otherwise,
+** -1 if sequence is malformed
-** return 1 if it is a single bracket (no '='s and no 2nd bracket);
-** otherwise (an unfinished '[==...') return 0.
 */
-static size_t skip_sep (LexState *ls) {
+static int skip_sep (LexState *ls) {
-  size_t count = 0;
+  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
+  return (ls->current == s) ? count : (-count) - 1;
-         : (count == 0) ? 1
-         : 0;
 }
 
 
-static void read_long_string (LexState *ls, SemInfo *seminfo, size_t sep) {
+static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
-  int line = ls->linenumber;  /* initial line (for error message) */
+  save_and_next(ls);  /* skip 2nd `[' */
-  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 */
+      case EOZ:
-        const char *what = (seminfo ? "string" : "comment");
+        lexerror(ls, (seminfo) ? "unfinished long string" :
-        const char *msg = luaO_pushfstring(ls->L,
+                                 "unfinished long comment", TK_EOS);
-                     "unfinished long %s (starting at line %d)", what, line);
-        lexerror(ls, msg, 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,
+    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
-                                     luaZ_bufflen(ls->buff) - 2 * sep);
+                                     luaZ_bufflen(ls->buff) - 2*(2 + sep));
 }
 
 
-static void esccheck (LexState *ls, int c, const char *msg) {
+static void escerror (LexState *ls, int *c, int n, const char *msg) {
-  if (!c) {
+  int i;
-    if (ls->current != EOZ)
+  luaZ_resetbuffer(ls->buff);  /* prepare error message */
-      save_and_next(ls);  /* add current to buffer for error message */
+  save(ls, '\\');
-    lexerror(ls, msg, TK_STRING);
+  for (i = 0; i < n && c[i] != EOZ; i++)
-  }
+    save(ls, c[i]);
-}
+  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 int readhexaesc (LexState *ls) {
-  int r = gethexa(ls);
+  int c[3], i;  /* keep input for error message */
-  r = (r << 4) + gethexa(ls);
+  int r = 0;  /* result accumulator */
-  luaZ_buffremove(ls->buff, 2);  /* remove saved chars from buffer */
+  c[0] = 'x';  /* for error message */
-  return r;
+  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");
-static unsigned long readutf8esc (LexState *ls) {
+    r = (r << 4) + luaO_hexavalue(c[i]);
-  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);
   }
-  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';
+    c[i] = ls->current;
-    save_and_next(ls);
+    r = 10*r + c[i] - '0';
+    next(ls);
   }
-  esccheck(ls, r <= UCHAR_MAX, "decimal escape too large");
+  if (r > UCHAR_MAX)
-  luaZ_buffremove(ls->buff, i);  /* remove read digits from buffer */
+    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");
+            if (!lisdigit(ls->current))
-            c = readdecesc(ls);  /* digital escape '\ddd' */
+              escerror(ls, &ls->current, 1, "invalid escape sequence");
+            /* digital escape \ddd */
+            c = readdecesc(ls);
             goto only_save;
           }
         }
-       read_save:
+       read_save: next(ls);  /* read next character */
-         next(ls);
+       only_save: save(ls, c);  /* save 'c' */
-         /* go through */
-       only_save:
-         luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
-         save(ls, c);
-         /* go through */
        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);
+          int sep = skip_sep(ls);
-          luaZ_resetbuffer(ls->buff);  /* 'skip_sep' may dirty the buffer */
+          luaZ_resetbuffer(ls->buff);  /* `skip_sep' may dirty the buffer */
-          if (sep >= 2) {
+          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);
+        int sep = skip_sep(ls);
-        if (sep >= 2) {
+        if (sep >= 0) {
           read_long_string(ls, seminfo, sep);
           return TK_STRING;
         }
-        else if (sep == 0)  /* '[=...' missing second bracket? */
+        else if (sep == -1) return '[';
-          lexerror(ls, "invalid long string delimiter", TK_STRING);
+        else lexerror(ls, "invalid long string delimiter", TK_STRING);
-        return '[';
       }
       case '=': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_EQ;  /* '==' */
+        if (ls->current != '=') return '=';
-        else return '=';
+        else { next(ls); return TK_EQ; }
       }
       case '<': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_LE;  /* '<=' */
+        if (ls->current != '=') return '<';
-        else if (check_next1(ls, '<')) return TK_SHL;  /* '<<' */
+        else { next(ls); return TK_LE; }
-        else return '<';
       }
       case '>': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_GE;  /* '>=' */
+        if (ls->current != '=') return '>';
-        else if (check_next1(ls, '>')) return TK_SHR;  /* '>>' */
+        else { next(ls); return TK_GE; }
-        else return '>';
-      }
-      case '/': {
-        next(ls);
-        if (check_next1(ls, '/')) return TK_IDIV;  /* '//' */
-        else return '/';
       }
       case '~': {
         next(ls);
-        if (check_next1(ls, '=')) return TK_NE;  /* '~=' */
+        if (ls->current != '=') return '~';
-        else return '~';
+        else { next(ls); return TK_NE; }
       }
       case ':': {
         next(ls);
-        if (check_next1(ls, ':')) return TK_DBCOLON;  /* '::' */
+        if (ls->current != ':') return ':';
-        else 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_next(ls, ".")) {
-          if (check_next1(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;

lib/lua/llex.h

@@ -1,5 +1,5 @@
 /*
-** $Id: llex.h $
+** $Id: llex.h,v 1.72.1.1 2013/04/12 18:48:47 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"
 
 
-/*
+#define FIRST_RESERVED	257
-** 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)
 
 
-#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_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_DBCOLON, TK_EOS,
-  TK_SHL, TK_SHR,
+  TK_NUMBER, TK_NAME, TK_STRING
-  TK_DBCOLON, TK_EOS,
-  TK_FLT, TK_INT, 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;
 
 

lib/lua/llimits.h

@@ -1,6 +1,6 @@
 /*
-** $Id: llimits.h $
+** $Id: llimits.h,v 1.103.1.1 2013/04/12 18:48:47 roberto Exp $
-** Limits, basic types, and some other 'installation-dependent' definitions
+** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
 
@@ -15,101 +15,53 @@
 #include "lua.h"
 
 
-/*
+typedef unsigned LUA_INT32 lu_int32;
-** '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 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)-2)
-#define MAX_SIZET	((size_t)(~(size_t)0))
 
-/* maximum size visible for Lua (must be representable in a lua_Integer) */
+#define MAX_LUMEM	((lu_mem)(~(lu_mem)0)-2)
-#define MAX_SIZE	(sizeof(size_t) < sizeof(lua_Integer) ? MAX_SIZET \
+
-                          : (size_t)(LUA_MAXINTEGER))
+#define MAX_LMEM	((l_mem) ((MAX_LUMEM >> 1) - 2))
 
 
-#define MAX_LUMEM	((lu_mem)(~(lu_mem)0))
+#define MAX_INT (INT_MAX-2)  /* maximum value of an int (-2 for safety) */
-
-#define MAX_LMEM	((l_mem)(MAX_LUMEM >> 1))
-
-
-#define MAX_INT		INT_MAX  /* maximum value of an int */
-
 
 /*
-** floor of the log2 of the maximum signed value for integral type 't'.
+** conversion of pointer to integer
-** (That is, maximum 'n' such that '2^n' fits in the given signed type.)
+** 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)
 
-
+/* type to ensure maximum alignment */
-/* number of chars of a literal string without the ending \0 */
+#if !defined(LUAI_USER_ALIGNMENT_T)
-#define LL(x)   (sizeof(x)/sizeof(char) - 1)
+#define LUAI_USER_ALIGNMENT_T	union { double u; void *s; long l; }
-
-
-/*
-** 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
 #endif
 
-#define point2uint(p)	((unsigned int)((L_P2I)(p) & UINT_MAX))
+typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
 
 
-
+/* result of a `usual argument conversion' over lua_Number */
-/* types of 'usual argument conversions' for lua_Number and lua_Integer */
 typedef LUAI_UACNUMBER l_uacNumber;
-typedef LUAI_UACINT l_uacInt;
 
 
-/*
+/* internal assertions for in-house debugging */
-** Internal assertions for in-house debugging
-*/
-#if defined LUAI_ASSERT
-#undef NDEBUG
-#include <assert.h>
-#define lua_assert(c)           assert(c)
-#endif
-
 #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_byte(i)	cast(lu_byte, (i))
-#define cast_voidp(i)	cast(void *, (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)
+#if !defined(LUAI_MAXCCALLS)
-#define l_inline	inline
+#define LUAI_MAXCCALLS		200
-#elif defined(__GNUC__)
-#define l_inline	__inline__
-#else
-#define l_inline	/* empty */
 #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 lu_int32 Instruction;
-typedef unsigned int l_uint32;
-#else
-typedef unsigned long l_uint32;
-#endif
-
-typedef l_uint32 Instruction;
 
 
 
-/*
+/* maximum stack for a Lua function */
-** Maximum length for short strings, that is, strings that are
+#define MAXSTACK	250
-** 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
 
 
-/*
+
-** Initial size for the string table (must be power of 2).
+/* minimum 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.
-*/
 #if !defined(MINSTRTABSIZE)
-#define MINSTRTABSIZE	128
+#define MINSTRTABSIZE	32
-#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
 #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_lock(L)     ((void) 0)
-#define lua_unlock(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)
+#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))
 #endif
 
 /*
-** modulo: defined as 'a - floor(a/b)*b'; the direct computation
+** lua_number2int is a macro to convert lua_Number to int.
-** using this definition has several problems with rounding errors,
+** lua_number2integer is a macro to convert lua_Number to lua_Integer.
-** so it is better to use 'fmod'. 'fmod' gives the result of
+** lua_number2unsigned is a macro to convert a lua_Number to a lua_Unsigned.
-** 'a - trunc(a/b)*b', and therefore must be corrected when
+** lua_unsigned2number is a macro to convert a lua_Unsigned to a lua_Number.
-** 'trunc(a/b) ~= floor(a/b)'. That happens when the division has a
+** luai_hashnum is a macro to hash a lua_Number value into an integer.
-** non-integer negative result: non-integer result is equivalent to
+** The hash must be deterministic and give reasonable values for
-** a non-zero remainder 'm'; negative result is equivalent to 'a' and
+** both small and large values (outside the range of integers).
-** 'b' with different signs, or 'm' and 'b' with different signs
-** (as the result 'm' of 'fmod' has the same sign of 'a').
 */
-#if !defined(luai_nummod)
+
-#define luai_nummod(L,a,b,m)  \
+#if defined(MS_ASMTRICK) || defined(LUA_MSASMTRICK)	/* { */
-  { (void)L; (m) = l_mathop(fmod)(a,b); \
+/* trick with Microsoft assembler for X86 */
-    if (((m) > 0) ? (b) < 0 : ((m) < 0 && (b) > 0)) (m) += (b); }
+
+#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 */
+#endif				/* } */
-#if !defined(luai_numpow)
+
-#define luai_numpow(L,a,b)  \
+
-  ((void)L, (b == 2) ? (a)*(a) : l_mathop(pow)(a,b))
+/* 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(lua_number2integer)
-#if !defined(luai_numadd)
+#define lua_number2integer(i,n)	((i)=(lua_Integer)(n))
-#define luai_numadd(L,a,b)      ((a)+(b))
+#endif
-#define luai_numsub(L,a,b)      ((a)-(b))
+
-#define luai_nummul(L,a,b)      ((a)*(b))
+#if !defined(lua_number2unsigned)	/* { */
-#define luai_numunm(L,a)        (-(a))
+/* the following definition assures proper modulo behavior */
-#define luai_numeq(a,b)         ((a)==(b))
+#if defined(LUA_NUMBER_DOUBLE) || defined(LUA_NUMBER_FLOAT)
-#define luai_numlt(a,b)         ((a)<(b))
+#include <math.h>
-#define luai_numle(a,b)         ((a)<=(b))
+#define SUPUNSIGNED	((lua_Number)(~(lua_Unsigned)0) + 1)
-#define luai_numgt(a,b)         ((a)>(b))
+#define lua_number2unsigned(i,n)  \
-#define luai_numge(a,b)         ((a)>=(b))
+	((i)=(lua_Unsigned)((n) - floor((n)/SUPUNSIGNED)*SUPUNSIGNED))
-#define luai_numisnan(a)        (!luai_numeq((a), (a)))
+#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)  \
+#define condmovestack(L)	luaD_reallocstack((L), (L)->stacksize)
-  { int sz_ = stacksize(L); pre; luaD_reallocstack((L), sz_, 0); pos; }
 #endif
 
 #if !defined(HARDMEMTESTS)
-#define condchangemem(L,pre,pos)	((void)0)
+#define condchangemem(L)	condmovestack(L)
 #else
-#define condchangemem(L,pre,pos)  \
+#define condchangemem(L)  \
-	{ if (gcrunning(G(L))) { pre; luaC_fullgc(L, 0); pos; } }
+	((void)(!(G(L)->gcrunning) || (luaC_fullgc(L, 0), 1)))
 #endif
 
 #endif

lib/lua/lmathlib.c

@@ -1,21 +1,16 @@
 /*
-** $Id: lmathlib.c $
+** $Id: lmathlib.c,v 1.83.1.1 2013/04/12 18:48:47 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_pushnumber(L, l_mathop(fabs)(luaL_checknumber(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)));
   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_pushnumber(L, l_mathop(atan)(luaL_checknumber(L, 1)));
-  lua_Number x = luaL_optnumber(L, 2, 1);
-  lua_pushnumber(L, l_mathop(atan2)(y, x));
   return 1;
 }
 
-
+static int math_atan2 (lua_State *L) {
-static int math_toint (lua_State *L) {
+  lua_pushnumber(L, l_mathop(atan2)(luaL_checknumber(L, 1),
-  int valid;
+                                luaL_checknumber(L, 2)));
-  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 */
-  }
   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_pushnumber(L, l_mathop(ceil)(luaL_checknumber(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);
-  }
   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_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
-    lua_Integer d = lua_tointeger(L, 2);
+                               luaL_checknumber(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)));
   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_Number ip;
-    lua_settop(L, 1);  /* number is its own integer part */
+  lua_Number fp = l_mathop(modf)(luaL_checknumber(L, 1), &ip);
-    lua_pushnumber(L, 0);  /* no fractional part */
+  lua_pushnumber(L, ip);
-  }
+  lua_pushnumber(L, fp);
-  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));
-  }
   return 2;
 }
 
-
 static int math_sqrt (lua_State *L) {
   lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
   return 1;
 }
 
-
+static int math_pow (lua_State *L) {
-static int math_ult (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
-  lua_Integer a = luaL_checkinteger(L, 1);
+  lua_Number y = luaL_checknumber(L, 2);
-  lua_Integer b = luaL_checkinteger(L, 2);
+  lua_pushnumber(L, l_mathop(pow)(x, y));
-  lua_pushboolean(L, (lua_Unsigned)a < (lua_Unsigned)b);
   return 1;
 }
 
@@ -173,525 +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 == (lua_Number)10.0) res = l_mathop(log10)(x);
-    if (base == l_mathop(2.0))
+    else res = l_mathop(log)(x)/l_mathop(log)(base);
-      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);
   }
   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)));
+  lua_pushnumber(L, luaL_checknumber(L, 1)*RADIANS_PER_DEGREE);
-  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**'.
-** ===================================================================
-*/
-
-/*
-** This code uses lots of shifts. ANSI C does not allow shifts greater
-** than or equal to the width of the type being shifted, so some shifts
-** are written in convoluted ways to match that restriction. For
-** preprocessor tests, it assumes a width of 32 bits, so the maximum
-** shift there is 31 bits.
-*/
-
-
-/* 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
-#define SRand64		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
-#define SRand64		long long
-
-#elif ((LUA_MAXUNSIGNED >> 31) >> 31) >= 3
-
-/* 'lua_Unsigned' has at least 64 bits */
-#define Rand64		lua_Unsigned
-#define SRand64		lua_Integer
-
-#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;
-}
-
-
-/*
-** 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.
-** Some old Microsoft compilers cannot cast an unsigned long
-** to a floating-point number, so we use a signed long as an
-** intermediary. When lua_Number is float or double, the shift ensures
-** that 'sx' is non negative; in that case, a good compiler will remove
-** the correction.
-*/
-
-/* must throw out the extra (64 - FIGS) bits */
-#define shift64_FIG	(64 - FIGS)
-
-/* 2^(-FIGS) == 2^-1 / 2^(FIGS-1) */
-#define scaleFIG	(l_mathop(0.5) / ((Rand64)1 << (FIGS - 1)))
-
-static lua_Number I2d (Rand64 x) {
-  SRand64 sx = (SRand64)(trim64(x) >> shift64_FIG);
-  lua_Number res = (lua_Number)(sx) * scaleFIG;
-  if (sx < 0)
-    res += l_mathop(1.0);  /* correct the two's complement if negative */
-  lua_assert(0 <= res && res < 1);
-  return res;
-}
-
-/* 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 */
-
-/* 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));
   return 1;
 }
 
@@ -704,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},
+  {"tan",   math_tan},
-  {"frexp", math_frexp},
-  {"ldexp", math_ldexp},
-  {"log10", math_log10},
-#endif
-  /* placeholders */
-  {"random", NULL},
-  {"randomseed", NULL},
-  {"pi", NULL},
-  {"huge", NULL},
-  {"maxinteger", NULL},
-  {"mininteger", NULL},
   {NULL, NULL}
 };
 
@@ -769,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;
 }
 

lib/lua/lmem.c

@@ -1,17 +1,15 @@
 /*
-** $Id: lmem.c $
+** $Id: lmem.c,v 1.84.1.1 2013/04/12 18:48:47 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);
+** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
-** ('osize' is the old size, 'nsize' is the new size)
+** (`osize' is the old size, `nsize' is the new size)
 **
-** - frealloc(ud, p, x, 0) frees the block 'p' and returns NULL.
+** * frealloc(ud, NULL, x, s) creates a new block of size `s' (no
-** Particularly, frealloc(ud, NULL, 0, 0) does nothing,
+** matter 'x').
-** which is equivalent to free(NULL) in ISO C.
 **
-** - frealloc(ud, NULL, x, s) creates a new block of size 's'
+** * frealloc(ud, p, x, 0) frees the block `p'
-** (no matter 'x'). Returns NULL if it cannot create the new block.
+** (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
+** frealloc returns NULL if it cannot create or reallocate the area
-** size 'x' to size 'y'. Returns NULL if it cannot reallocate the
+** (any reallocation to an equal or smaller size cannot fail!)
-** block to the new size.
 */
 
 
-/*
-** 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,
+void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
-                     int size_elems, int limit, const char *what) {
+                     int limit, const char *what) {
   void *newblock;
-  int size = *psize;
+  int newsize;
-  if (nelems + 1 <= size)  /* does one extra element still fit? */
+  if (*size >= limit/2) {  /* cannot double it? */
-    return block;  /* nothing to be done */
+    if (*size >= limit)  /* cannot grow even a little? */
-  if (size >= limit / 2) {  /* cannot double it? */
-    if (l_unlikely(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;
+    newsize = (*size)*2;
-    if (size < MINSIZEARRAY)
+    if (newsize < MINSIZEARRAY)
-      size = MINSIZEARRAY;  /* minimum size */
+      newsize = MINSIZEARRAY;  /* minimum size */
   }
-  lua_assert(nelems + 1 <= size && size <= limit);
+  newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
-  /* 'limit' ensures that multiplication will not overflow */
+  *size = newsize;  /* update only when everything else is OK */
-  newblock = luaM_saferealloc_(L, block, cast_sizet(*psize) * size_elems,
-                                         cast_sizet(size) * size_elems);
-  *psize = size;  /* 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
+** generic allocation routine.
-** 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.
 */
 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));
+  size_t realosize = (block) ? osize : 0;
-  newblock = firsttry(g, block, osize, nsize);
+  lua_assert((realosize == 0) == (block == NULL));
-  if (l_unlikely(newblock == NULL && nsize > 0)) {
+#if defined(HARDMEMTESTS)
-    newblock = tryagain(L, block, osize, nsize);
+  if (nsize > realosize && g->gcrunning)
-    if (newblock == NULL)  /* still no memory? */
+    luaC_fullgc(L, 1);  /* force a GC whenever possible */
-      return NULL;  /* do not update 'GCdebt' */
+#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;
-  }
-}

lib/lua/lmem.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.h $
+** $Id: lmem.h,v 1.40.1.1 2013/04/12 18:48:47 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
+** This macro avoids the runtime division MAX_SIZET/(e), as 'e' is
-** type 't' without overflows. Because 'e' is always constant, it avoids
+** always constant.
-** the runtime division MAX_SIZET/(e).
+** The macro is somewhat complex to avoid warnings:
-** (The macro is somewhat complex to avoid warnings:  The 'sizeof'
+** +1 avoids warnings of "comparison has constant result";
-** comparison avoids a runtime comparison when overflow cannot occur.
+** cast to 'void' avoids warnings of "value unused".
-** 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.)
 */
-#define luaM_testsize(n,e)  \
+#define luaM_reallocv(L,b,on,n,e) \
-	(sizeof(n) >= sizeof(size_t) && cast_sizet((n)) + 1 > MAX_SIZET/(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)  \
+#define luaM_freemem(L, b, s)	luaM_realloc_(L, (b), (s), 0)
-	(luaM_testsize(n,e) ? luaM_toobig(L) : cast_void(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)))
 
-/*
+#define luaM_newobject(L,tag,s)	luaM_realloc_(L, NULL, tag, (s))
-** 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_growvector(L,v,nelems,size,t,limit,e) \
-	((v)=cast(t *, luaM_growaux_(L,v,nelems,&(size),sizeof(t), \
+          if ((nelems)+1 > (size)) \
-                         luaM_limitN(limit,t),e)))
+            ((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), \
+   ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, 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))))
 
 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,
+LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
-                                                              size_t size);
+                               size_t size_elem, int limit,
-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,
                                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
 

lib/lua/loadlib.c

@@ -1,5 +1,5 @@
 /*
-** $Id: loadlib.c $
+** $Id: loadlib.c,v 1.111.1.1 2013/04/12 18:48:47 roberto Exp $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
@@ -8,22 +8,68 @@
 ** 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"
 #include "lualib.h"
 
 
+/*
+** 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
+
+
 /*
 ** LUA_CSUBSEP is the character that replaces dots in submodule names
 ** when searching for a C loader.
@@ -46,53 +92,29 @@
 #define LUA_OFSEP	"_"
 
 
-/*
+/* table (in the registry) that keeps handles for all loaded C libraries */
-** key for table in the registry that keeps handles
+#define CLIBS		"_CLIBS"
-** for all loaded C libraries
-*/
-static const char *const CLIBS = "_CLIBS";
 
 #define LIB_FAIL	"open"
 
 
-#define setprogdir(L)           ((void)0)
+/* error codes for ll_loadfunc */
+#define ERRLIB		1
+#define ERRFUNC		2
 
-
+#define setprogdir(L)		((void)0)
-/*
-** Special type equivalent to '(void*)' for functions in gcc
-** (to suppress warnings when converting function pointers)
-*/
-typedef void (*voidf)(void);
 
 
 /*
 ** system-dependent functions
 */
-
+static void ll_unloadlib (void *lib);
-/*
+static void *ll_load (lua_State *L, const char *path, int seeglb);
-** unload library 'lib'
+static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym);
-*/
-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);
 
 
 
-
+#if defined(LUA_USE_DLOPEN)
-#if defined(LUA_USE_DLOPEN)	/* { */
 /*
 ** {========================================================================
 ** This is an implementation of loadlib based on the dlfcn interface.
@@ -104,35 +126,21 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym);
 
 #include <dlfcn.h>
 
-/*
+static void ll_unloadlib (void *lib) {
-** 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) {
   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))
+  if (lib == NULL) lua_pushstring(L, dlerror());
-    lua_pushstring(L, dlerror());
   return lib;
 }
 
 
-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) {
-  lua_CFunction f = cast_func(dlsym(lib, sym));
+  lua_CFunction f = (lua_CFunction)dlsym(lib, sym);
-  if (l_unlikely(f == NULL))
+  if (f == NULL) lua_pushstring(L, dlerror());
-    lua_pushstring(L, dlerror());
   return f;
 }
 
@@ -140,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
@@ -158,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];
@@ -192,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);
@@ -205,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) {
+static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
-  lua_CFunction f = (lua_CFunction)(voidf)GetProcAddress((HMODULE)lib, sym);
+  lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
   if (f == NULL) pusherror(L);
   return f;
 }
@@ -214,7 +212,7 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
 /* }====================================================== */
 
 
-#else				/* }{ */
+#else
 /*
 ** {======================================================
 ** Fallback for other systems
@@ -228,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
 
 
-
+static void *ll_checkclib (lua_State *L, const char *path) {
-/*
-** 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) {
   void *plib;
   lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
   lua_getfield(L, -1, path);
@@ -333,11 +258,7 @@ static void *checkclib (lua_State *L, const char *path) {
 }
 
 
-/*
+static void ll_addtoclib (lua_State *L, const char *path, void *plib) {
-** 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) {
   lua_getfield(L, LUA_REGISTRYINDEX, CLIBS);
   lua_pushlightuserdata(L, plib);
   lua_pushvalue(L, -1);
@@ -348,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;
 }
 
 
-
+static int ll_loadfunc (lua_State *L, const char *path, const char *sym) {
-/* error codes for 'lookforfunc' */
+  void *reg = ll_checkclib(L, path);  /* check loaded C libraries */
-#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 */
   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 */
@@ -402,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);
+  int stat = ll_loadfunc(L, path, init);
-  if (l_likely(stat == 0))  /* no errors? */
+  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 */
   }
 }
 
@@ -430,42 +335,14 @@ static int readable (const char *filename) {
 }
 
 
-/*
+static const char *pushnexttemplate (lua_State *L, const char *path) {
-** Get the next name in '*path' = 'name1;name2;name3;...', changing
+  const char *l;
-** the ending ';' to '\0' to create a zero-terminated string. Return
+  while (*path == *LUA_PATH_SEP) path++;  /* skip separators */
-** NULL when list ends.
+  if (*path == '\0') return NULL;  /* no more templates */
-*/
+  l = strchr(path, *LUA_PATH_SEP);  /* find next separator */
-static const char *getnextfilename (char **path, char *end) {
+  if (l == NULL) l = path + strlen(path);
-  char *sep;
+  lua_pushlstring(L, path, l - path);  /* template */
-  char *name = *path;
+  return l;
-  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);
 }
 
 
@@ -473,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;
+  luaL_Buffer msg;  /* to build error message */
-  char *pathname;  /* path with name inserted */
+  luaL_buffinit(L, &msg);
-  char *endpathname;  /* its end */
+  if (*sep != '\0')  /* non-empty separator? */
-  const char *filename;
-  /* separator is non-empty and appears in 'name'? */
-  if (*sep != '\0' && strchr(name, *sep) != NULL)
     name = luaL_gsub(L, name, sep, dirsep);  /* replace it by 'dirsep' */
-  luaL_buffinit(L, &buff);
+  while ((path = pushnexttemplate(L, path)) != NULL) {
-  /* add path to the buffer, replacing marks ('?') with the file name */
+    const char *filename = luaL_gsub(L, lua_tostring(L, -1),
-  luaL_addgsub(&buff, path, LUA_PATH_MARK, name);
+                                     LUA_PATH_MARK, name);
-  luaL_addchar(&buff, '\0');
+    lua_remove(L, -2);  /* remove path template */
-  pathname = luaL_buffaddr(&buff);  /* writable list of file names */
-  endpathname = pathname + luaL_bufflen(&buff) - 1;
-  while ((filename = getnextfilename(&pathname, endpathname)) != NULL) {
     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 */
+  luaL_pushresult(&msg);  /* create error message */
-  pusherrornotfound(L, lua_tostring(L, -1));  /* create error message */
   return NULL;  /* not found */
 }
 
@@ -503,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 */
   }
 }
 
@@ -516,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))
+  if (path == NULL)
-    luaL_error(L, "'package.%s' must be a string", pname);
+    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));
 }
 
@@ -542,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);
+    funcname = lua_pushlstring(L, modname, mark - modname);
-    openfunc = lua_pushfstring(L, LUA_POF"%s", openfunc);
+    funcname = lua_pushfstring(L, LUA_POF"%s", funcname);
-    stat = lookforfunc(L, filename, openfunc);
+    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);
+  funcname = lua_pushfstring(L, LUA_POF"%s", modname);
-  return lookforfunc(L, filename, openfunc);
+  return ll_loadfunc(L, filename, funcname);
 }
 
 
@@ -589,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;
     }
   }
@@ -600,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);
+  lua_getfield(L, LUA_REGISTRYINDEX, "_PRELOAD");
-  if (lua_getfield(L, -1, name) == LUA_TNIL) {  /* not found? */
+  lua_getfield(L, -1, name);
-    lua_pushfstring(L, "no field package.preload['%s']", name);
+  if (lua_isnil(L, -1))  /* not found? */
-    return 1;
+    lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
-  }
+  return 1;
-  else {
-    lua_pushliteral(L, ":preload:");
-    return 2;
-  }
 }
 
 
 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 */
+    lua_rawgeti(L, 3, i);  /* get a searcher */
-    if (l_unlikely(lua_rawgeti(L, 3, i) == LUA_TNIL)) {  /* no more searchers? */
+    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 */
@@ -637,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_settop(L, 1);  /* _LOADED table will be at index 2 */
-  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
-  lua_getfield(L, 2, name);  /* LOADED[name] */
+  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_pushstring(L, name);  /* pass name as argument to module loader */
-  lua_pushvalue(L, 1);  /* name is 1st argument to module loader */
+  lua_insert(L, -2);  /* name is 1st argument (before search data) */
-  lua_pushvalue(L, -3);  /* loader data is 2nd argument */
-  /* stack: ...; loader data; loader function; mod. name; loader 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 */
+    lua_setfield(L, 2, name);  /* _LOADED[name] = returned value */
-  else
+  lua_getfield(L, 2, name);
-    lua_pop(L, 1);  /* pop nil */
+  if (lua_isnil(L, -1)) {   /* module did not set a value? */
-  if (lua_getfield(L, 2, name) == LUA_TNIL) {   /* module set no value? */
     lua_pushboolean(L, 1);  /* use true as result */
-    lua_copy(L, -1, -2);  /* replace loader result */
+    lua_pushvalue(L, -1);  /* extra copy to be returned */
-    lua_setfield(L, 2, name);  /* LOADED[name] = true */
+    lua_setfield(L, 2, name);  /* _LOADED[name] = true */
   }
-  lua_rotate(L, -2, 1);  /* loader data <-> module result  */
+  return 1;
-  return 2;  /* return module result and loader data */
 }
 
 /* }====================================================== */
 
 
 
+/*
+** {======================================================
+** '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 */
+#if defined(LUA_COMPAT_MODULE)
-  {"preload", NULL},
+  {"seeall", ll_seeall},
-  {"cpath", NULL},
+#endif
-  {"path", NULL},
-  {"searchers", NULL},
-  {"loaded", NULL},
   {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[] = {
+  static const lua_CFunction searchers[] =
-    searcher_preload,
+    {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
-    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);
+  /* create table CLIBS to keep track of loaded C libraries */
-  luaL_newlib(L, pk_funcs);  /* create 'package' table */
+  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 */
+#if defined(LUA_COMPAT_LOADERS)
-  setpath(L, "path", LUA_PATH_VAR, LUA_PATH_DEFAULT);
+  lua_pushvalue(L, -1);  /* make a copy of 'searchers' table */
-  setpath(L, "cpath", LUA_CPATH_VAR, LUA_CPATH_DEFAULT);
+  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' */
+  /* set field `loaded' */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_LOADED");
   lua_setfield(L, -2, "loaded");
-  /* set field 'preload' */
+  /* set field `preload' */
-  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  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 */

lib/lua/lobject.c

@@ -1,22 +1,17 @@
 /*
-** $Id: lobject.c $
+** $Id: lobject.c,v 2.58.1.1 2013/04/12 18:48:47 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_Number luaO_arith (int op, lua_Number v1, lua_Number v2) {
-                                                   lua_Integer v2) {
   switch (op) {
-    case LUA_OPADD: return intop(+, v1, v2);
+    case LUA_OPADD: return luai_numadd(NULL, v1, v2);
-    case LUA_OPSUB:return intop(-, v1, v2);
+    case LUA_OPSUB: return luai_numsub(NULL, v1, v2);
-    case LUA_OPMUL:return intop(*, v1, v2);
+    case LUA_OPMUL: return luai_nummul(NULL, v1, v2);
-    case LUA_OPMOD: return luaV_mod(L, v1, v2);
+    case LUA_OPDIV: return luai_numdiv(NULL, v1, v2);
-    case LUA_OPIDIV: return luaV_idiv(L, v1, v2);
+    case LUA_OPMOD: return luai_nummod(NULL, v1, v2);
-    case LUA_OPBAND: return intop(&, v1, v2);
+    case LUA_OPPOW: return luai_numpow(NULL, v1, v2);
-    case LUA_OPBOR: return intop(|, v1, v2);
+    case LUA_OPUNM: return luai_numunm(NULL, v1);
-    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);
     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;
+}
+
 
 /*
-** {==================================================================
+** convert an hexadecimal numeric string to a number, following
-** 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
 ** C99 specification for 'strtod'
 */
 static lua_Number lua_strx2number (const char *s, char **endptr) {
-  int dot = lua_getlocaledecpoint();
+  lua_Number r = 0.0;
-  lua_Number r = l_mathop(0.0);  /* result (accumulator) */
+  int e = 0, i = 0;
-  int sigdig = 0;  /* number of significant digits */
+  int neg = 0;  /* 1 if number is negative */
-  int nosigdig = 0;  /* number of non-significant digits */
+  *endptr = cast(char *, s);  /* nothing is valid yet */
-  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 */
   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') */
+    return 0.0;  /* invalid format (no '0x') */
-  for (s += 2; ; s++) {  /* skip '0x' and read numeral */
+  s += 2;  /* skip '0x' */
-    if (*s == dot) {
+  r = readhexa(&s, r, &i);  /* read integer part */
-      if (hasdot) break;  /* second dot? stop loop */
+  if (*s == '.') {
-      else hasdot = 1;
+    s++;  /* skip dot */
-    }
+    r = readhexa(&s, r, &e);  /* read fractional part */
-    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 */
   }
-  if (nosigdig + sigdig == 0)  /* no digits? */
+  if (i == 0 && e == 0)
-    return l_mathop(0.0);  /* invalid format */
+    return 0.0;  /* invalid format (no digit) */
-  *endptr = cast_charp(s);  /* valid up to here */
+  e *= -4;  /* each fractional digit divides value by 2^-4 */
-  e *= 4;  /* each digit multiplies/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 exp1 = 0;
-    int neg1;  /* exponent sign */
+    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 */
+int luaO_str2d (const char *s, size_t len, lua_Number *result) {
-#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) {
   char *endptr;
-  *result = (mode == 'x') ? lua_strx2number(s, &endptr)  /* try to convert */
+  if (strpbrk(s, "nN"))  /* reject 'inf' and 'nan' */
-                          : lua_str2number(s, &endptr);
+    return 0;
-  if (endptr == s) return NULL;  /* nothing recognized? */
+  else if (strpbrk(s, "xX"))  /* hexa? */
-  while (lisspace(cast_uchar(*endptr))) endptr++;  /* skip trailing spaces */
+    *result = lua_strx2number(s, &endptr);
-  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);
-  }
   else
-    return 0;  /* conversion failed */
+    *result = lua_str2number(s, &endptr);
-  return (e - s) + 1;  /* success; return string size */
+  if (endptr == s) return 0;  /* nothing recognized */
-}
+  while (lisspace(cast_uchar(*endptr))) endptr++;
-
+  return (endptr == s + len);  /* OK if no trailing characters */
-
-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));
 }
 
 
 
-
+static void pushstr (lua_State *L, const char *str, size_t l) {
-/*
+  setsvalue2s(L, L->top++, luaS_newlstr(L, str, l));
-** {==================================================================
-** '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);
 }
 
 
-/*
+/* this function handles only `%d', `%c', %f, %p, and `%s' formats */
-** 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'
-*/
 const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
-  BuffFS buff;  /* holds last part of the result */
+  int n = 0;
-  const char *e;  /* points to next '%' */
+  for (;;) {
-  buff.pushed = buff.blen = 0;
+    const char *e = strchr(fmt, '%');
-  buff.L = L;
+    if (e == NULL) break;
-  while ((e = strchr(fmt, '%')) != NULL) {
+    luaD_checkstack(L, 2);  /* fmt + item */
-    addstr2buff(&buff, fmt, e - fmt);  /* add 'fmt' up to '%' */
+    pushstr(L, fmt, e - fmt);
-    switch (*(e + 1)) {  /* conversion specifier */
+    switch (*(e+1)) {
-      case 's': {  /* zero-terminated string */
+      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 */
+      case 'c': {
-        char c = cast_uchar(va_arg(argp, int));
+        char buff;
-        addstr2buff(&buff, &c, sizeof(char));
+        buff = cast(char, va_arg(argp, int));
+        pushstr(L, &buff, 1);
         break;
       }
-      case 'd': {  /* an 'int' */
+      case 'd': {
-        TValue num;
+        setnvalue(L->top++, cast_num(va_arg(argp, int)));
-        setivalue(&num, va_arg(argp, int));
-        addnum2buff(&buff, &num);
         break;
       }
-      case 'I': {  /* a 'lua_Integer' */
+      case 'f': {
-        TValue num;
+        setnvalue(L->top++, cast_num(va_arg(argp, l_uacNumber)));
-        setivalue(&num, cast(lua_Integer, va_arg(argp, l_uacInt)));
-        addnum2buff(&buff, &num);
         break;
       }
-      case 'f': {  /* a 'lua_Number' */
+      case 'p': {
-        TValue num;
+        char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
-        setfltvalue(&num, cast_num(va_arg(argp, l_uacNumber)));
+        int l = sprintf(buff, "%p", va_arg(argp, void *));
-        addnum2buff(&buff, &num);
+        pushstr(L, buff, l);
-        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);
         break;
       }
       case '%': {
-        addstr2buff(&buff, "%", 1);
+        pushstr(L, "%", 1);
         break;
       }
       default: {
-        luaG_runerror(L, "invalid option '%%%c' to 'lua_pushfstring'",
+        luaG_runerror(L,
-                         *(e + 1));
+            "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' */
+  luaD_checkstack(L, 1);
-  clearbuff(&buff);  /* empty buffer into the stack */
+  pushstr(L, fmt, strlen(fmt));
-  lua_assert(buff.pushed == 1);
+  if (n > 0) luaV_concat(L, n + 1);
-  return getstr(tsvalue(s2v(L->top.p - 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) {
+void luaO_chunkid (char *out, const char *source, size_t bufflen) {
-  size_t bufflen = LUA_IDSIZE;  /* free space in buffer */
+  size_t l = strlen(source);
   if (*source == '=') {  /* 'literal' source */
-    if (srclen <= bufflen)  /* small enough? */
+    if (l <= bufflen)  /* small enough? */
-      memcpy(out, source + 1, srclen * sizeof(char));
+      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? */
+    if (l <= bufflen)  /* small enough? */
-      memcpy(out, source + 1, srclen * sizeof(char));
+      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? */
+    if (l < bufflen && nl == NULL) {  /* small one-line source? */
-      addstr(out, source, srclen);  /* keep it */
+      addstr(out, source, l);  /* keep it */
     }
     else {
-      if (nl != NULL) srclen = nl - source;  /* stop at first newline */
+      if (nl != NULL) l = nl - source;  /* stop at first newline */
-      if (srclen > bufflen) srclen = bufflen;
+      if (l > bufflen) l = bufflen;
-      addstr(out, source, srclen);
+      addstr(out, source, l);
       addstr(out, RETS, LL(RETS));
     }
     memcpy(out, POS, (LL(POS) + 1) * sizeof(char));

lib/lua/lopcodes.c

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

lib/lua/lopcodes.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.h $
+** $Id: lopcodes.h,v 1.142.1.2 2014/10/20 18:32:09 roberto Exp $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -11,100 +11,75 @@
 
 
 /*===========================================================================
-  We assume that instructions are unsigned 32-bit integers.
+  We assume that instructions are unsigned numbers.
-  All instructions have an opcode in the first 7 bits.
+  All instructions have an opcode in the first 6 bits.
-  Instructions can have the following formats:
+  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
+  A signed argument is represented in excess K; that is, the number
-        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
+  value is the unsigned value minus K. K is exactly the maximum value
-iABC          C(8)     |      B(8)     |k|     A(8)      |   Op(7)     |
+  for that argument (so that -max is represented by 0, and +max is
-iABx                Bx(17)               |     A(8)      |   Op(7)     |
+  represented by 2*max), which is half the maximum for the corresponding
-iAsBx              sBx (signed)(17)      |     A(8)      |   Op(7)     |
+  unsigned argument.
-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.
 ===========================================================================*/
 
 
-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_C		9
-#define SIZE_B		8
+#define SIZE_B		9
-#define SIZE_Bx		(SIZE_C + SIZE_B + 1)
+#define SIZE_Bx		(SIZE_C + SIZE_B)
 #define SIZE_A		8
-#define SIZE_Ax		(SIZE_Bx + SIZE_A)
+#define SIZE_Ax		(SIZE_C + SIZE_B + SIZE_A)
-#define SIZE_sJ		(SIZE_Bx + 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_C		(POS_A + SIZE_A)
-#define POS_B		(POS_k + 1)
+#define POS_B		(POS_C + SIZE_C)
-#define POS_C		(POS_B + SIZE_B)
+#define POS_Bx		POS_C
-
-#define POS_Bx		POS_k
-
 #define POS_Ax		POS_A
 
-#define POS_sJ		POS_A
-
 
 /*
 ** limits for opcode arguments.
-** we use (signed) 'int' to manipulate most arguments,
+** we use (signed) int to manipulate most arguments,
-** so they must fit in ints.
+** so they must fit in LUAI_BITSINT-1 bits (-1 for sign)
 */
-
+#if SIZE_Bx < LUAI_BITSINT-1
-/* Check whether type 'int' has at least 'b' bits ('b' < 32) */
+#define MAXARG_Bx        ((1<<SIZE_Bx)-1)
-#define L_INTHASBITS(b)		((UINT_MAX >> ((b) - 1)) >= 1)
+#define MAXARG_sBx        (MAXARG_Bx>>1)         /* `sBx' is signed */
-
-
-#if L_INTHASBITS(SIZE_Bx)
-#define MAXARG_Bx	((1<<SIZE_Bx)-1)
 #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 SIZE_Ax < LUAI_BITSINT-1
-
-
-#if L_INTHASBITS(SIZE_Ax)
 #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)
+/* creates a mask with `n' 1 bits at position `p' */
-#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' */
 #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_B(i)	getarg(i, POS_B, SIZE_B)
-#define GETARG_sB(i)	sC2int(GETARG_B(i))
 #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_C(i)	getarg(i, POS_C, SIZE_C)
-#define GETARG_sC(i)	sC2int(GETARG_C(i))
 #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_Bx(i)	getarg(i, POS_Bx, SIZE_Bx)
-#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 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)  \
+#define GETARG_sBx(i)	(GETARG_Bx(i)-MAXARG_sBx)
-	check_exp(checkopm(i, iAsBx), getarg(i, POS_Bx, SIZE_Bx) - OFFSET_sBx)
+#define SETARG_sBx(i,b)	SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_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 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, c)<<POS_C))
-			| (cast(Instruction, k)<<POS_k))
 
 #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) */
+/* this bit 1 means constant (0 means register) */
-#define MAXINDEXRK	MAXARG_B
+#define BITRK		(1 << (SIZE_B - 1))
-#endif
+
+/* 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
+** R(x) - register
-** K[x] - constant (in constant table)
+** Kst(x) - constant (in constant table)
-** RK(x) == if k(i) then K[x] else R[x]
+** RK(x) == if ISK(x) then Kst(INDEXK(x)) else R(x)
 */
 
 
 /*
-** Grep "ORDER OP" if you change these enums. Opcodes marked with a (*)
+** grep "ORDER OP" if you change these enums
-** has extra descriptions in the notes after the enumeration.
 */
 
 typedef enum {
 /*----------------------------------------------------------------------
-  name		args	description
+name		args	description
 ------------------------------------------------------------------------*/
-OP_MOVE,/*	A B	R[A] := R[B]					*/
+OP_MOVE,/*	A B	R(A) := R(B)					*/
-OP_LOADI,/*	A sBx	R[A] := sBx					*/
+OP_LOADK,/*	A Bx	R(A) := Kst(Bx)					*/
-OP_LOADF,/*	A sBx	R[A] := (lua_Number)sBx				*/
+OP_LOADKX,/*	A 	R(A) := Kst(extra arg)				*/
-OP_LOADK,/*	A Bx	R[A] := K[Bx]					*/
+OP_LOADBOOL,/*	A B C	R(A) := (Bool)B; if (C) pc++			*/
-OP_LOADKX,/*	A	R[A] := K[extra arg]				*/
+OP_LOADNIL,/*	A B	R(A), R(A+1), ..., R(A+B) := nil		*/
-OP_LOADFALSE,/*	A	R[A] := false					*/
+OP_GETUPVAL,/*	A B	R(A) := UpValue[B]				*/
-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_GETTABUP,/*	A B C	R[A] := UpValue[B][K[C]:shortstring]		*/
+OP_GETTABUP,/*	A B C	R(A) := UpValue[B][RK(C)]			*/
-OP_GETTABLE,/*	A B C	R[A] := R[B][R[C]]				*/
+OP_GETTABLE,/*	A B C	R(A) := R(B)[RK(C)]				*/
-OP_GETI,/*	A B C	R[A] := R[B][C]					*/
-OP_GETFIELD,/*	A B C	R[A] := R[B][K[C]:shortstring]			*/
 
-OP_SETTABUP,/*	A B C	UpValue[A][K[B]:shortstring] := RK(C)		*/
+OP_SETTABUP,/*	A B C	UpValue[A][RK(B)] := RK(C)			*/
-OP_SETTABLE,/*	A B C	R[A][R[B]] := RK(C)				*/
+OP_SETUPVAL,/*	A B	UpValue[B] := R(A)				*/
-OP_SETI,/*	A B C	R[A][B] := RK(C)				*/
+OP_SETTABLE,/*	A B C	R(A)[RK(B)] := RK(C)				*/
-OP_SETFIELD,/*	A B C	R[A][K[B]:shortstring] := 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_CONCAT,/*	A B C	R(A) := R(B).. ... ..R(C)			*/
-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_BANDK,/*	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_BORK,/*	A B C	R[A] := R[B] | K[C]:integer			*/
+OP_EQ,/*	A B C	if ((RK(B) == RK(C)) ~= A) then pc++		*/
-OP_BXORK,/*	A B C	R[A] := R[B] ~ K[C]:integer			*/
+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_TEST,/*	A C	if not (R(A) <=> C) then pc++			*/
-OP_SHLI,/*	A B sC	R[A] := sC << R[B]				*/
+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_CALL,/*	A B C	R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
-OP_SUB,/*	A B C	R[A] := R[B] - R[C]				*/
+OP_TAILCALL,/*	A B C	return R(A)(R(A+1), ... ,R(A+B-1))		*/
-OP_MUL,/*	A B C	R[A] := R[B] * R[C]				*/
+OP_RETURN,/*	A B	return R(A), ... ,R(A+B-2)	(see note)	*/
-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_BAND,/*	A B C	R[A] := R[B] & R[C]				*/
+OP_FORLOOP,/*	A sBx	R(A)+=R(A+2);
-OP_BOR,/*	A B C	R[A] := R[B] | R[C]				*/
+			if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
-OP_BXOR,/*	A B C	R[A] := R[B] ~ R[C]				*/
+OP_FORPREP,/*	A sBx	R(A)-=R(A+2); pc+=sBx				*/
-OP_SHL,/*	A B C	R[A] := R[B] << R[C]				*/
-OP_SHR,/*	A B C	R[A] := R[B] >> R[C]				*/
 
-OP_MMBIN,/*	A B C	call C metamethod over R[A] and R[B]	(*)	*/
+OP_TFORCALL,/*	A C	R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));	*/
-OP_MMBINI,/*	A sB C k	call C metamethod over R[A] and sB	*/
+OP_TFORLOOP,/*	A sBx	if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
-OP_MMBINK,/*	A B C k		call C metamethod over R[A] and K[B]	*/
 
-OP_UNM,/*	A B	R[A] := -R[B]					*/
+OP_SETLIST,/*	A B C	R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= 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_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_VARARG,/*	A B	R(A), R(A+1), ..., R(A+B-2) = vararg		*/
-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_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
+  (*) In OP_VARARG, if (B == 0) then use actual number of varargs and
-  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
   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
+  (*) In OP_SETLIST, if (B == 0) then B = `top'; if (C == 0) then next
-  OP_EXTRAARG.
+  'instruction' is EXTRAARG(real C).
 
-  (*) In OP_SETLIST, if (B == 0) then real B = 'top'; if k, then
+  (*) In OP_LOADKX, the next 'instruction' is always EXTRAARG.
-  real C = EXTRAARG _ C (the bits of EXTRAARG concatenated with the
-  bits of C).
 
-  (*) In OP_NEWTABLE, B is log2 of the hash size (which is always a
+  (*) For comparisons, A specifies what condition the test should accept
-  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
   (true or false).
 
-  (*) In OP_MMBINI/OP_MMBINK, k means the arguments were flipped
+  (*) All `skips' (pc++) assume that next instruction is a jump.
-   (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.)
 
 ===========================================================================*/
 
 
 /*
 ** masks for instruction properties. The format is:
-** bits 0-2: op mode
+** bits 0-1: op mode
-** bit 3: instruction set register A
+** bits 2-3: C arg mode
-** bit 4: operator is a test (next instruction must be a jump)
+** bits 4-5: B arg mode
-** bit 5: instruction uses 'L->top' set by previous instruction (when B == 0)
+** bit 6: instruction set register A
-** bit 6: instruction sets 'L->top' for next instruction (when C == 0)
+** bit 7: operator is a test (next instruction must be a jump)
-** bit 7: instruction is an MM instruction (call a metamethod)
 */
 
-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))
+LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
-#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))
 
-/* "out top" (set top for next instruction) */
+#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 3))
-#define isOT(i)  \
+#define getBMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3))
-	((testOTMode(GET_OPCODE(i)) && GETARG_C(i) == 0) || \
+#define getCMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3))
-          GET_OPCODE(i) == OP_TAILCALL)
+#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)  \
+LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
-    (((mm) << 7) | ((ot) << 6) | ((it) << 5) | ((t) << 4) | ((a) << 3) | (m))
 
 
 /* number of list items to accumulate before a SETLIST instruction */
 #define LFIELDS_PER_FLUSH	50
 
+
 #endif

lib/lua/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
-

lib/lua/loslib.c

@@ -1,14 +1,9 @@
 /*
-** $Id: loslib.c $
+** $Id: loslib.c,v 1.40.1.1 2013/04/12 18:48:47 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
-** List of valid conversion specifiers for the 'strftime' function;
-** options are grouped by length; group of length 2 start with '||'.
-** ===================================================================
 */
-#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					/* } */
-/* }================================================================== */
 
 
 /*
-** {==================================================================
+** By default, Lua uses tmpnam except when POSIX is available, where it
-** Configuration for time-related stuff
+** uses mkstemp.
-** ===================================================================
 */
-
+#if defined(LUA_USE_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)	/* { */
-
 #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;
+  int stat = system(cmd);
-  errno = 0;
-  stat = l_system(cmd);
   if (cmd != NULL)
     return luaL_execresult(L, stat);
   else {
@@ -155,7 +91,6 @@ static int os_execute (lua_State *L) {
 
 static int os_remove (lua_State *L) {
   const char *filename = luaL_checkstring(L, 1);
-  errno = 0;
   return luaL_fileresult(L, remove(filename) == 0, filename);
 }
 
@@ -163,7 +98,6 @@ static int os_remove (lua_State *L) {
 static int os_rename (lua_State *L) {
   const char *fromname = luaL_checkstring(L, 1);
   const char *toname = luaL_checkstring(L, 2);
-  errno = 0;
   return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
 }
 
@@ -172,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;
@@ -199,25 +133,11 @@ static int os_clock (lua_State *L) {
 ** =======================================================
 */
 
-/*
+static void setfield (lua_State *L, const char *key, int value) {
-** About the overflow check: an overflow cannot occur when time
+  lua_pushinteger(L, value);
-** 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);
   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 */
@@ -225,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) {
+static int getfield (lua_State *L, const char *key, int d) {
-  int isnum;
+  int res, isnum;
-  int t = lua_getfield(L, -1, key);  /* get field and its type */
+  lua_getfield(L, -1, key);
-  lua_Integer res = lua_tointegerx(L, -1, &isnum);
+  res = (int)lua_tointegerx(L, -1, &isnum);
-  if (!isnum) {  /* field is not an integer? */
+  if (!isnum) {
-    if (l_unlikely(t != LUA_TNIL))  /* some other value? */
+    if (d < 0)
-      return luaL_error(L, "field '%s' is not an integer", key);
+      return luaL_error(L, "field " LUA_QS " missing in date table", key);
-    else if (l_unlikely(d < 0))  /* absent field; no default? */
-      return luaL_error(L, "field '%s' 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,
+static const char *checkoption (lua_State *L, const char *conv, char *buff) {
-                                ptrdiff_t convlen, char *buff) {
+  static const char *const options[] = LUA_STRFTIMEOPTIONS;
-  const char *option = LUA_STRFTIMEOPTIONS;
+  unsigned int i;
-  int oplen = 1;  /* length of options being checked */
+  for (i = 0; i < sizeof(options)/sizeof(options[0]); i += 2) {
-  for (; *option != '\0' && oplen <= convlen; option += oplen) {
+    if (*conv != '\0' && strchr(options[i], *conv) != NULL) {
-    if (*option == '|')  /* next block? */
+      buff[1] = *conv;
-      oplen++;  /* will check options with next length (+1) */
+      if (*options[i + 1] == '\0') {  /* one-char conversion specifier? */
-    else if (memcmp(conv, option, oplen) == 0) {  /* match? */
+        buff[2] = '\0';  /* end buffer */
-      memcpy(buff, conv, oplen);  /* copy valid option to buffer */
+        return conv + 1;
-      buff[oplen] = '\0';
+      }
-      return conv + oplen;  /* return next item */
+      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,
@@ -290,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_optstring(L, 1, "%c");
-  const char *s = luaL_optlstring(L, 1, "%c", &slen);
+  time_t t = luaL_opt(L, (time_t)luaL_checknumber, 2, time(NULL));
-  time_t t = luaL_opt(L, l_checktime, 2, time(NULL));
-  const char *se = s + slen;  /* 's' end */
   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,
+    lua_pushnil(L);
-                 "date result cannot be represented in this installation");
+  else if (strcmp(s, "*t") == 0) {
-  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) {
+    while (*s) {
-      if (*s != '%')  /* not a conversion specifier? */
+      if (*s != '%')  /* no conversion specifier? */
         luaL_addchar(&b, *s++);
       else {
         size_t reslen;
-        char *buff = luaL_prepbuffsize(&b, SIZETIMEFMT);
+        char buff[200];  /* should be big enough for any conversion result */
-        s++;  /* skip '%' */
+        s = checkoption(L, s + 1, cc);
-        s = checkoption(L, s, se - s, cc + 1);  /* copy specifier to 'cc' */
+        reslen = strftime(buff, sizeof(buff), cc, stm);
-        reslen = strftime(buff, SIZETIMEFMT, cc, stm);
+        luaL_addlstring(&b, buff, reslen);
-        luaL_addsize(&b, reslen);
       }
     }
     luaL_pushresult(&b);
@@ -351,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_sec = getfield(L, "sec", 0);
-    ts.tm_mon = getfield(L, "month", -1, 1);
+    ts.tm_min = getfield(L, "min", 0);
-    ts.tm_mday = getfield(L, "day", -1, 0);
+    ts.tm_hour = getfield(L, "hour", 12);
-    ts.tm_hour = getfield(L, "hour", 12, 0);
+    ts.tm_mday = getfield(L, "day", -1);
-    ts.tm_min = getfield(L, "min", 0, 0);
+    ts.tm_mon = getfield(L, "month", -1) - 1;
-    ts.tm_sec = getfield(L, "sec", 0, 0);
+    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))
+  if (t == (time_t)(-1))
-    return luaL_error(L,
+    lua_pushnil(L);
-                  "time result cannot be represented in this installation");
+  else
-  l_pushtime(L, t);
+    lua_pushnumber(L, (lua_Number)t);
   return 1;
 }
 
 
 static int os_difftime (lua_State *L) {
-  time_t t1 = l_checktime(L, 1);
+  lua_pushnumber(L, difftime((time_t)(luaL_checknumber(L, 1)),
-  time_t t2 = l_checktime(L, 2);
+                             (time_t)(luaL_optnumber(L, 2, 0))));
-  lua_pushnumber(L, (lua_Number)difftime(t1, t2));
   return 1;
 }
 
@@ -396,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' */

lib/lua/lparser.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lparser.h $
+** $Id: lparser.h,v 1.70.1.1 2013/04/12 18:48:47 roberto Exp $
 ** Lua Parser
 ** See Copyright Notice in lua.h
 */
@@ -13,106 +13,58 @@
 
 
 /*
-** Expression and variable descriptor.
+** Expression 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').
 */
 
-/* kinds of variables/expressions */
 typedef enum {
-  VVOID,  /* when 'expdesc' describes the last expression of a list,
+  VVOID,	/* no value */
-             this kind means an empty list (so, no expression) */
+  VNIL,
-  VNIL,  /* constant nil */
+  VTRUE,
-  VTRUE,  /* constant true */
+  VFALSE,
-  VFALSE,  /* constant false */
+  VK,		/* info = index of constant in `k' */
-  VK,  /* constant in 'k'; info = index of constant in 'k' */
+  VKNUM,	/* nval = numerical value */
-  VKFLT,  /* floating constant; nval = numerical float value */
+  VNONRELOC,	/* info = result register */
-  VKINT,  /* integer constant; ival = numerical integer value */
+  VLOCAL,	/* info = local register */
-  VKSTR,  /* string constant; strval = TString address;
+  VUPVAL,       /* info = index of upvalue in 'upvalues' */
-             (string is fixed by the lexer) */
+  VINDEXED,	/* t = table register/upvalue; idx = index R/K */
-  VNONRELOC,  /* expression has its value in a fixed register;
+  VJMP,		/* info = instruction pc */
-                 info = result register */
+  VRELOCABLE,	/* info = instruction pc */
-  VLOCAL,  /* local variable; var.ridx = register index;
+  VCALL,	/* info = instruction pc */
-              var.vidx = relative index in 'actvar.arr'  */
+  VVARARG	/* info = instruction pc */
-  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 */
 } expkind;
 
 
-#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXSTR)
+#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXED)
-#define vkisindexed(k)	(VINDEXED <= (k) && (k) <= VINDEXSTR)
+#define vkisinreg(k)	((k) == VNONRELOC || (k) == VLOCAL)
-
 
 typedef struct expdesc {
   expkind k;
   union {
-    lua_Integer ival;    /* for VKINT */
+    struct {  /* for indexed variables (VINDEXED) */
-    lua_Number nval;  /* for VKFLT */
+      short idx;  /* index (R/K) */
-    TString *strval;  /* for VKSTR */
-    int info;  /* for generic use */
-    struct {  /* for indexed variables */
-      short idx;  /* index (R or "long" K) */
       lu_byte t;  /* table (register or upvalue) */
+      lu_byte vt;  /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */
     } ind;
-    struct {  /* for local variables */
+    int info;  /* for generic use */
-      lu_byte ridx;  /* register holding the variable */
+    lua_Number nval;  /* for VKNUM */
-      unsigned short vidx;  /* compiler index (in 'actvar.arr')  */
-    } var;
   } u;
-  int t;  /* patch list of 'exit when true' */
+  int t;  /* patch list of `exit when true' */
-  int f;  /* patch list of 'exit when false' */
+  int f;  /* patch list of `exit when false' */
 } expdesc;
 
 
-/* kinds of variables */
+/* description of active local variable */
-#define VDKREG		0   /* regular */
+typedef struct Vardesc {
-#define RDKCONST	1   /* constant */
+  short idx;  /* variable index in stack */
-#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) */
 } 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 nactvar;  /* local level where it appears in current block */
-  lu_byte close;  /* goto that escapes upvalues */
 } 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 jpc;  /* list of pending jumps to `pc' */
-  int nk;  /* number of elements in 'k' */
+  int nk;  /* number of elements in `k' */
-  int np;  /* number of elements in 'p' */
+  int np;  /* number of elements in `p' */
-  int nabslineinfo;  /* number of elements in 'abslineinfo' */
   int firstlocal;  /* index of first local var (in Dyndata array) */
-  int firstlabel;  /* index of first label (in 'dyd->label->arr') */
+  short nlocvars;  /* number of elements in 'f->locvars' */
-  short ndebugvars;  /* 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 Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
-LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                                Dyndata *dyd, const char *name, int firstchar);
-                                 Dyndata *dyd, const char *name, int firstchar);
 
 
 #endif

lib/lua/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
-

lib/lua/lstate.c

@@ -1,18 +1,16 @@
 /*
-** $Id: lstate.c $
+** $Id: lstate.c,v 2.99.1.2 2013/11/08 17:45:31 roberto Exp $
 ** 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,161 +78,84 @@ typedef struct LG {
 
 
 /*
-** A macro to create a "random" seed when a state is created;
+** Compute an initial seed as random as possible. In ANSI, rely on
-** the seed is used to randomize string hashes.
+** Address Space Layout Randomization (if present) to increase
-*/
+** randomness..
-#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.
 */
 #define addbuff(b,p,e) \
-  { size_t t = cast_sizet(e); \
+  { size_t t = cast(size_t, e); \
-    memcpy(b + p, &t, sizeof(t)); p += sizeof(t); }
+    memcpy(buff + p, &t, sizeof(t)); p += sizeof(t); }
 
-static unsigned int luai_makeseed (lua_State *L) {
+static unsigned int makeseed (lua_State *L) {
-  char buff[3 * sizeof(size_t)];
+  char buff[4 * sizeof(size_t)];
-  unsigned int h = cast_uint(time(NULL));
+  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);
+  g->totalbytes -= (debt - g->GCdebt);
-  lua_assert(tb > 0);
-  if (debt < tb - MAX_LMEM)
-    debt = tb - MAX_LMEM;  /* will make 'totalbytes == MAX_LMEM' */
-  g->totalbytes = tb - debt;
   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;
+  CallInfo *ci = luaM_new(L, CallInfo);
-  lua_assert(L->ci->next == NULL);
-  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;
 }
 
 
-/*
+void luaE_freeCI (lua_State *L) {
-** free all CallInfo structures not in use by a thread
-*/
-static void freeCI (lua_State *L) {
   CallInfo *ci = L->ci;
   CallInfo *next = ci->next;
   ci->next = NULL;
   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_errerr(L);  /* 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->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
-  L1->tbclist.p = L1->stack.p;
+  L1->stacksize = BASIC_STACK_SIZE;
-  for (i = 0; i < BASIC_STACK_SIZE + EXTRA_STACK; i++)
+  for (i = 0; i < BASIC_STACK_SIZE; i++)
-    setnilvalue(s2v(L1->stack.p + i));  /* erase new stack */
+    setnilvalue(L1->stack + i);  /* erase new stack */
-  L1->top.p = L1->stack.p;
+  L1->top = L1->stack;
-  L1->stack_last.p = L1->stack.p + BASIC_STACK_SIZE;
+  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->callstatus = 0;
-  ci->func.p = L1->top.p;
+  ci->func = L1->top;
-  ci->u.c.k = NULL;
+  setnilvalue(L1->top++);  /* 'function' entry for this 'ci' */
-  ci->nresults = 0;
+  ci->top = L1->top + LUA_MINSTACK;
-  setnilvalue(s2v(L1->top.p));  /* 'function' entry for this 'ci' */
-  L1->top.p++;
-  ci->top.p = L1->top.p + 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 */
-  freeCI(L);
+  luaE_freeCI(L);
-  lua_assert(L->nci == 0);
+  luaM_freearray(L, L->stack, L->stacksize);  /* free stack array */
-  luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK);  /* free stack */
 }
 
 
@@ -214,71 +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);
+  setthvalue(L, &mt, L);
-  /* registry[LUA_RIDX_GLOBALS] = new table (table of globals) */
+  luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &mt);
-  sethvalue(L, &registry->array[LUA_RIDX_GLOBALS - 1], luaH_new(L));
+  /* 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 */
+  /* pre-create memory-error message */
-  setnilvalue(&g->nilvalue);  /* now state is complete */
+  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->stacksize = 0;
-  L->twups = L;  /* thread has no upvalues */
-  L->nCcalls = 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? */
+  luaF_close(L, L->stack);  /* close all upvalues for this thread */
-    luaC_freeallobjects(L);  /* just collect its objects */
+  luaC_freeallobjects(L);  /* collect all objects */
-  else {  /* closing a fully built state */
+  if (g->version)  /* closing a fully built state? */
-    L->ci = &L->base_ci;  /* unwind CallInfo list */
-    L->errfunc = 0;   /* stack unwind can "throw away" the error function */
-    luaD_closeprotected(L, 1, LUA_OK);  /* close all upvalues */
-    L->top.p = L->stack.p + 1;  /* empty the stack to run finalizers */
-    luaC_freeallobjects(L);  /* collect all objects */
     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 */
@@ -286,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 */
+  L1 = &luaC_newobj(L, LUA_TTHREAD, sizeof(LX), NULL, offsetof(LX, l))->th;
-  o = luaC_newobjdt(L, LUA_TTHREAD, sizeof(LX), offsetof(LX, l));
+  setthvalue(L, L->top, L1);
-  L1 = gco2th(o);
-  /* anchor it on L stack */
-  setthvalue2s(L, L->top.p, 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);
@@ -314,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);
@@ -322,44 +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 */
-  L->errfunc = 0;   /* stack unwind can "throw away" the error function */
-  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;
@@ -368,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->seed = makeseed(L);
-  g->gcstp = GCSTPGC;  /* no GC while building state */
+  g->uvhead.u.l.prev = &g->uvhead;
-  g->strt.size = g->strt.nuse = 0;
+  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->allgc = NULL;
-  g->gcstopem = 0;
+  g->finobj = NULL;
-  g->gcemergency = 0;
+  g->tobefnz = NULL;
-  g->finobj = g->tobefnz = g->fixedgc = NULL;
+  g->sweepgc = g->sweepfin = NULL;
-  g->firstold1 = g->survival = g->old1 = g->reallyold = NULL;
-  g->finobjsur = g->finobjold1 = g->finobjrold = NULL;
-  g->sweepgc = 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;
+  g->gcpause = LUAI_GCPAUSE;
-  setivalue(&g->nilvalue, 0);  /* to signal that state is not yet built */
+  g->gcmajorinc = LUAI_GCMAJOR;
-  setgcparam(g->gcpause, LUAI_GCPAUSE);
+  g->gcstepmul = LUAI_GCMUL;
-  setgcparam(g->gcstepmul, LUAI_GCMUL);
-  g->gcstepsize = LUAI_GCSTEPSIZE;
-  setgcparam(g->genmajormul, LUAI_GENMAJORMUL);
-  g->genminormul = LUAI_GENMINORMUL;
   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 */
@@ -417,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))
-                  ? getstr(tsvalue(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);
-}
-

lib/lua/lstate.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstate.h $
+** $Id: lstate.h,v 2.82.1.1 2013/04/12 18:48:47 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
+** Some notes about garbage-collected objects:  All objects in Lua must
-** belong to one (and only one) of these lists, using field 'next' of
+** be kept somehow accessible until being freed.
-** the 'CommonHeader' for the link:
 **
-** 'allgc': all objects not marked for finalization;
+** Lua keeps most objects linked in list g->allgc. The link uses field
-** 'finobj': all objects marked for finalization;
+** 'next' of the CommonHeader.
-** 'tobefnz': all objects ready to be finalized;
-** 'fixedgc': all objects that are not to be collected (currently
-** only small strings, such as reserved words).
 **
-** For the generational collector, some of these lists have marks for
+** Strings are kept in several lists headed by the array g->strt.hash.
-** generations. Each mark points to the first element in the list for
-** that particular generation; that generation goes until the next mark.
 **
-** 'allgc' -> 'survival': new objects;
+** Open upvalues are not subject to independent garbage collection. They
-** 'survival' -> 'old': objects that survived one collection;
+** are collected together with their respective threads. Lua keeps a
-** 'old1' -> 'reallyold': objects that became old in last collection;
+** double-linked list with all open upvalues (g->uvhead) so that it can
-** 'reallyold' -> NULL: objects old for more than one cycle.
+** 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;
+** Objects with finalizers are kept in the list g->finobj.
-** 'finobjsur' -> 'finobjold1': survived   """";
-** 'finobjold1' -> 'finobjrold': just old  """";
-** 'finobjrold' -> NULL: really old       """".
 **
-** All lists can contain elements older than their main ages, due
+** The list g->tobefnz links all objects being finalized.
-** 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.
 */
 
-/*
-** 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 */
-/*
-** 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.
-*/
 #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_NORMAL	0
-#define KGC_GEN		1	/* generational gc */
+#define KGC_EMERGENCY	1	/* gc was forced by an allocation failure */
+#define KGC_GEN		2	/* generational collection */
 
 
 typedef struct stringtable {
-  TString **hash;
+  GCObject **hash;
-  int nuse;  /* number of elements */
+  lu_int32 nuse;  /* number of elements */
   int size;
 } stringtable;
 
 
 /*
-** Information about a call.
+** 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.
 */
-struct CallInfo {
+typedef struct CallInfo {
-  StkIdRel func;  /* function index in the stack */
+  StkId func;  /* function index in the stack */
-  StkIdRel	top;  /* top for this function */
+  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;  /* function is tracing lines/counts */
-      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 {
+} CallInfo;
-    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;
-};
 
 
 /*
 ** Bits in CallInfo status
 */
-#define CIST_OAH	(1<<0)	/* original value of 'allowhook' */
+#define CIST_LUA	(1<<0)	/* call is running a Lua function */
-#define CIST_C		(1<<1)	/* call is running a C function */
+#define CIST_HOOKED	(1<<1)	/* call is running a debug hook */
-#define CIST_FRESH	(1<<2)	/* call is on a fresh "luaV_execute" frame */
+#define CIST_REENTRY	(1<<2)	/* call is running on same invocation of
-#define CIST_HOOKED	(1<<3)	/* call is running a debug hook */
+                                   luaV_execute of previous call */
-#define CIST_YPCALL	(1<<4)	/* doing a yieldable protected call */
+#define CIST_YIELDED	(1<<3)	/* call reentered after suspension */
-#define CIST_TAIL	(1<<5)	/* call was tail called */
+#define CIST_YPCALL	(1<<4)	/* call is a yieldable protected call */
-#define CIST_HOOKYIELD	(1<<6)	/* last hook called yielded */
+#define CIST_STAT	(1<<5)	/* call has an error status (pcall) */
-#define CIST_FIN	(1<<7)	/* function "called" a finalizer */
+#define CIST_TAIL	(1<<6)	/* call was tail called */
-#define CIST_TRAN	(1<<8)	/* 'ci' has transfer information */
+#define CIST_HOOKYIELD	(1<<7)	/* last hook called yielded */
-#define CIST_CLSRET	(1<<9)  /* function is closing tbc variables */
+
-/* Bits 10-12 are used for CIST_RECST (see below) */
+
-#define CIST_RECST	10
+#define isLua(ci)	((ci)->callstatus & CIST_LUA)
-#if defined(LUA_COMPAT_LT_LE)
-#define CIST_LEQ	(1<<13)  /* using __lt for __le */
-#endif
 
 
 /*
-** Field CIST_RECST stores the "recover status", used to keep the error
+** `global state', shared by all threads of this state
-** 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
 */
 typedef struct global_State {
   lua_Alloc frealloc;  /* function to reallocate memory */
-  void *ud;         /* auxiliary data to 'frealloc' */
+  void *ud;         /* auxiliary data to `frealloc' */
-  l_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
+  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 gcrunning;  /* true if GC is running */
-  lu_byte genminormul;  /* control for minor generational collections */
+  int sweepstrgc;  /* position of sweep in `strt' */
-  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 */
   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 */
+  UpVal uvhead;  /* head of double-linked list of all open upvalues */
-  /* fields for generational collector */
+  Mbuffer buff;  /* temporary buffer for string concatenation */
-  GCObject *survival;  /* start of objects that survived one GC cycle */
+  int gcpause;  /* size of pause between successive GCs */
-  GCObject *old1;  /* start of old1 objects */
+  int gcmajorinc;  /* pause between major collections (only in gen. mode) */
-  GCObject *reallyold;  /* objects more than one cycle old ("really old") */
+  int gcstepmul;  /* GC `granularity' */
-  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 */
   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 */
+  struct Table *mt[LUA_NUMTAGS];  /* 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' */
 } global_State;
 
 
 /*
-** 'per thread' state
+** `per thread' state
 */
 struct lua_State {
   CommonHeader;
   lu_byte status;
-  lu_byte allowhook;
+  StkId top;  /* first free slot in the stack */
-  unsigned short nci;  /* number of items in 'ci' list */
-  StkIdRel 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) */
+  const Instruction *oldpc;  /* last pc traced */
-  StkIdRel stack;  /* stack base */
+  StkId stack_last;  /* last free slot in the stack */
-  UpVal *openupval;  /* list of open upvalues in this stack */
+  StkId stack;  /* stack base */
-  StkIdRel tbclist;  /* list of to-be-closed variables */
+  int stacksize;
-  GCObject *gclist;
+  unsigned short nny;  /* number of non-yieldable calls in stack */
-  struct lua_State *twups;  /* list of threads with open upvalues */
+  unsigned short nCcalls;  /* number of nested C calls */
-  struct lua_longjmp *errorJmp;  /* current error recover point */
+  lu_byte hookmask;
-  CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
+  lu_byte allowhook;
-  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 */
   int basehookcount;
   int hookcount;
-  volatile l_signalT hookmask;
+  lua_Hook hook;
-  char iopath[256];
+  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)
+** Union of all collectable objects
-** 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 GCUnion {
+union GCObject {
-  GCObject gc;  /* common header */
+  GCheader gch;  /* common header */
-  struct TString ts;
+  union TString ts;
-  struct Udata u;
+  union Udata u;
   union Closure cl;
   struct Table h;
   struct Proto p;
+  struct UpVal uv;
   struct lua_State th;  /* thread */
-  struct UpVal upv;
 };
 
 
-/*
+#define gch(o)		(&(o)->gch)
-** 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))
 
 /* macros to convert a GCObject into a specific value */
-#define gco2ts(o)  \
+#define rawgco2ts(o)  \
-	check_exp(novariant((o)->tt) == LUA_TSTRING, &((cast_u(o))->ts))
+	check_exp(novariant((o)->gch.tt) == LUA_TSTRING, &((o)->ts))
-#define gco2u(o)  check_exp((o)->tt == LUA_VUSERDATA, &((cast_u(o))->u))
+#define gco2ts(o)	(&rawgco2ts(o)->tsv)
-#define gco2lcl(o)  check_exp((o)->tt == LUA_VLCL, &((cast_u(o))->cl.l))
+#define rawgco2u(o)	check_exp((o)->gch.tt == LUA_TUSERDATA, &((o)->u))
-#define gco2ccl(o)  check_exp((o)->tt == LUA_VCCL, &((cast_u(o))->cl.c))
+#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))
+	check_exp(novariant((o)->gch.tt) == LUA_TFUNCTION, &((o)->cl))
-#define gco2t(o)  check_exp((o)->tt == LUA_VTABLE, &((cast_u(o))->h))
+#define gco2t(o)	check_exp((o)->gch.tt == LUA_TTABLE, &((o)->h))
-#define gco2p(o)  check_exp((o)->tt == LUA_VPROTO, &((cast_u(o))->p))
+#define gco2p(o)	check_exp((o)->gch.tt == LUA_TPROTO, &((o)->p))
-#define gco2th(o)  check_exp((o)->tt == LUA_VTHREAD, &((cast_u(o))->th))
+#define gco2uv(o)	check_exp((o)->gch.tt == LUA_TUPVAL, &((o)->uv))
-#define gco2upv(o)	check_exp((o)->tt == LUA_VUPVAL, &((cast_u(o))->upv))
+#define gco2th(o)	check_exp((o)->gch.tt == LUA_TTHREAD, &((o)->th))
 
-
+/* macro to convert any Lua object into a GCObject */
-/*
+#define obj2gco(v)	(cast(GCObject *, (v)))
-** 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))
 
 
 /* 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_shrinkCI (lua_State *L);
+LUAI_FUNC void luaE_freeCI (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

lib/lua/lstring.c

@@ -1,21 +1,17 @@
 /*
-** $Id: lstring.c $
+** $Id: lstring.c,v 2.26.1.1 2013/04/12 18:48:47 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,196 +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;
+  size_t len = a->tsv.len;
-  lua_assert(a->tt == LUA_VLNGSTR && b->tt == LUA_VLNGSTR);
+  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(getlngstr(a), getlngstr(b), len) == 0));  /* equal contents */
+     (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);
+  unsigned int h = seed ^ cast(unsigned int, l);
-  for (; l > 0; l--)
+  size_t l1;
-    h ^= ((h<<5) + (h>>2) + cast_byte(str[l - 1]));
+  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);
+** resizes the string table
-  if (ts->extra == 0) {  /* no hash? */
+*/
-    size_t len = ts->u.lnglen;
+void luaS_resize (lua_State *L, int newsize) {
-    ts->hash = luaS_hash(getlngstr(ts), len, ts->hash);
-    ts->extra = 1;  /* now it has its hash */
-  }
-  return ts->hash;
-}
-
-
-static void tablerehash (TString **vect, int osize, int nsize) {
   int i;
-  for (i = osize; i < nsize; i++)  /* clear new elements */
+  stringtable *tb = &G(L)->strt;
-    vect[i] = NULL;
+  /* cannot resize while GC is traversing strings */
-  for (i = 0; i < osize; i++) {  /* rehash old part of the array */
+  luaC_runtilstate(L, ~bitmask(GCSsweepstring));
-    TString *p = vect[i];
+  if (newsize > tb->size) {
-    vect[i] = NULL;
+    luaM_reallocvector(L, tb->hash, tb->size, newsize, GCObject *);
-    while (p) {  /* for each string in the list */
+    for (i = tb->size; i < newsize; i++) tb->hash[i] = NULL;
-      TString *hnext = p->u.hnext;  /* save next */
+  }
-      unsigned int h = lmod(p->hash, nsize);  /* new position */
+  /* rehash */
-      p->u.hnext = vect[h];  /* chain it into array */
+  for (i=0; i<tb->size; i++) {
-      vect[h] = p;
+    GCObject *p = tb->hash[i];
-      p = hnext;
+    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;
     }
   }
-}
+  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 *);
-** 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 */
   }
+  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);
+  totalsize = sizeof(TString) + ((l + 1) * sizeof(char));
-  o = luaC_newobj(L, tag, totalsize);
+  ts = &luaC_newobj(L, tag, totalsize, list, 0)->ts;
-  ts = gco2ts(o);
+  ts->tsv.len = l;
-  ts->hash = h;
+  ts->tsv.hash = h;
-  ts->extra = 0;
+  ts->tsv.extra = 0;
-  getstr(ts)[l] = '\0';  /* ending 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;
-  ts->shrlen = 0xFF;  /* signals that it is a long string */
-  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)];
+  for (o = g->strt.hash[lmod(h, g->strt.size)];
-  lua_assert(str != NULL);  /* otherwise 'memcmp'/'memcpy' are undefined */
+       o != NULL;
-  for (ts = *list; ts != NULL; ts = ts->u.hnext) {
+       o = gch(o)->next) {
-    if (l == ts->shrlen && (memcmp(str, getshrstr(ts), l * sizeof(char)) == 0)) {
+    TString *ts = rawgco2ts(o);
-      /* found! */
+    if (h == ts->tsv.hash &&
-      if (isdead(g, ts))  /* dead (but not collected yet)? */
+        l == ts->tsv.len &&
-        changewhite(ts);  /* resurrect it */
+        (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 */
+  return newshrstr(L, str, l, h);  /* not found; 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);
-  ts->shrlen = cast_byte(l);
-  memcpy(getshrstr(ts), str, l * sizeof(char));
-  ts->u.hnext = *list;
-  *list = ts;
-  tb->nuse++;
-  return ts;
 }
 
 
@@ -223,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 + 1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
-    if (l_unlikely(l * sizeof(char) >= (MAX_SIZE - sizeof(TString))))
       luaM_toobig(L);
-    ts = luaS_createlngstrobj(L, l);
+    return createstrobj(L, str, l, LUA_TLNGSTR, G(L)->seed, NULL);
-    memcpy(getlngstr(ts), str, l * sizeof(char));
-    return ts;
   }
 }
 
 
 /*
-** Create or reuse a zero-terminated string, first checking in the
+** new zero-terminated string
-** 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.
 */
 TString *luaS_new (lua_State *L, const char *str) {
-  unsigned int i = point2uint(str) % STRCACHE_N;  /* hash */
+  return luaS_newlstr(L, str, strlen(str));
-  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];
 }
 
 
-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;
+  if (s > MAX_SIZET - sizeof(Udata))
-  GCObject *o;
-  if (l_unlikely(s > MAX_SIZE - udatamemoffset(nuvalue)))
     luaM_toobig(L);
-  o = luaC_newobj(L, LUA_VUSERDATA, sizeudata(nuvalue, s));
+  u = &luaC_newobj(L, LUA_TUSERDATA, sizeof(Udata) + s, NULL, 0)->u;
-  u = gco2u(o);
+  u->uv.len = s;
-  u->len = s;
+  u->uv.metatable = NULL;
-  u->nuvalue = nuvalue;
+  u->uv.env = e;
-  u->metatable = NULL;
-  for (i = 0; i < nuvalue; i++)
-    setnilvalue(&u->uv[i].uv);
   return u;
 }
 

lib/lua/lstring.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lstring.h $
+** $Id: lstring.h,v 1.49.1.1 2013/04/12 18:48:47 roberto Exp $
 ** String table (keep all strings handled by Lua)
 ** See Copyright Notice in lua.h
 */
@@ -12,46 +12,35 @@
 #include "lstate.h"
 
 
-/*
+#define sizestring(s)	(sizeof(union TString)+((s)->len+1)*sizeof(char))
-** Memory-allocation error message must be preallocated (it cannot
-** be created after memory is exhausted)
-*/
-#define MEMERRMSG       "not enough memory"
 
-
+#define sizeudata(u)	(sizeof(union Udata)+(u)->len)
-/*
-** 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 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 Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
-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 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

lib/lua/ltable.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltable.h $
+** $Id: ltable.h,v 2.16.1.2 2013/08/30 15:49:41 roberto Exp $
 ** Lua tables (hash)
 ** See Copyright Notice in lua.h
 */
@@ -11,52 +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))))
 
 
-/*
+LUAI_FUNC const TValue *luaH_getint (Table *t, int key);
-** Clear all bits of fast-access metamethods, which means that the table
+LUAI_FUNC void luaH_setint (lua_State *L, Table *t, int key, TValue *value);
-** 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_getstr (Table *t, TString *key);
 LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
-LUAI_FUNC void luaH_set (lua_State *L, Table *t, const TValue *key,
+LUAI_FUNC TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key);
-                                                 TValue *value);
+LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key);
-LUAI_FUNC void luaH_finishset (lua_State *L, Table *t, const TValue *key,
-                                       const TValue *slot, TValue *value);
 LUAI_FUNC Table *luaH_new (lua_State *L);
-LUAI_FUNC void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
+LUAI_FUNC void luaH_resize (lua_State *L, Table *t, int nasize, int nhsize);
-                                                    unsigned int nhsize);
+LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, int nasize);
-LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, unsigned 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 int luaH_getn (Table *t);
-LUAI_FUNC unsigned int luaH_realasize (const 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
 
 

lib/lua/ltablib.c

@@ -1,18 +1,15 @@
 /*
-** $Id: ltablib.c $
+** $Id: ltablib.c,v 1.65.1.2 2014/05/07 16:32:55 roberto Exp $
 ** 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"
 
 
-/*
+#define aux_getn(L,n)	(luaL_checktype(L, n, LUA_TTABLE), luaL_len(L, n))
-** 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,w)	(checktab(L, n, (w) | TAB_L), luaL_len(L, n))
 
-
+#if defined(LUA_COMPAT_MAXN)
-static int checkfield (lua_State *L, const char *key, int n) {
+static int maxn (lua_State *L) {
-  lua_pushstring(L, key);
+  lua_Number max = 0;
-  return (lua_rawget(L, -n) != LUA_TNIL);
+  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) {
-** Check that 'arg' either is a table or can behave like one (that is,
+      lua_Number v = lua_tonumber(L, -1);
-** has a metatable with the required metamethods)
+      if (v > max) max = v;
-*/
-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 */
     }
-    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 */
+  int e = aux_getn(L, 1) + 1;  /* first empty element */
-  lua_Integer e = aux_getn(L, 1, TAB_RW);
+  int pos;  /* where to insert new element */
-  e = luaL_intop(+, e, 1);  /* first empty 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;
+      int i;
-      pos = luaL_checkinteger(L, 2);  /* 2nd argument is the position */
+      pos = luaL_checkint(L, 2);  /* 2nd argument is the position */
-      /* check whether 'pos' is in [1, e] */
+      luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
-      luaL_argcheck(L, (lua_Unsigned)pos - 1u < (lua_Unsigned)e, 2,
-                       "position out of bounds");
       for (i = e; i > pos; i--) {  /* move up elements */
-        lua_geti(L, 1, i - 1);
+        lua_rawgeti(L, 1, i-1);
-        lua_seti(L, 1, i);  /* t[i] = t[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);
+  int size = aux_getn(L, 1);
-  lua_Integer pos = luaL_optinteger(L, 2, size);
+  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, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
-    luaL_argcheck(L, (lua_Unsigned)pos - 1u <= (lua_Unsigned)size, 2,
+  lua_rawgeti(L, 1, pos);  /* result = t[pos] */
-                     "position out of bounds");
-  lua_geti(L, 1, pos);  /* result = t[pos] */
   for ( ; pos < size; pos++) {
-    lua_geti(L, 1, pos + 1);
+    lua_rawgeti(L, 1, pos+1);
-    lua_seti(L, 1, pos);  /* t[pos] = t[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;
 }
 
 
-/*
+static void addfield (lua_State *L, luaL_Buffer *b, int i) {
-** Copy elements (1[f], ..., 1[e]) into (tt[t], tt[t+1], ...). Whenever
+  lua_rawgeti(L, 1, i);
-** possible, copy in increasing order, which is better for rehashing.
+  if (!lua_isstring(L, -1))
-** "possible" means destination after original range, or smaller
+    luaL_error(L, "invalid value (%s) at index %d in table for "
-** than origin, or copying to another table.
+                  LUA_QL("concat"), luaL_typename(L, -1), i);
-*/
-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);
   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);
+  luaL_checktype(L, 1, LUA_TTABLE);
-  last = luaL_optinteger(L, 4, last);
+  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) {
+static int pack (lua_State *L) {
-  int i;
   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) {
+static int unpack (lua_State *L) {
-  lua_Unsigned n;
+  int i, e;
-  lua_Integer i = luaL_optinteger(L, 2, 1);
+  unsigned int n;
-  lua_Integer e = luaL_opt(L, luaL_checkinteger, 3, luaL_len(L, 1));
+  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) */
+  n = (unsigned int)e - (unsigned int)i;  /* number of elements minus 1 */
-  if (l_unlikely(n >= (unsigned int)INT_MAX  ||
+  if (n > (INT_MAX - 10) || !lua_checkstack(L, ++n))
-                 !lua_checkstack(L, (int)(++n))))
     return luaL_error(L, "too many results to unpack");
-  for (; i < e; i++) {  /* push arg[i..e - 1] (to avoid overflows) */
+  lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
-    lua_geti(L, 1, i);
+  while (i++ < e)  /* push arg[i + 1...e] */
-  }
+    lua_rawgeti(L, 1, i);
-  lua_geti(L, 1, e);  /* push last element */
+  return n;
-  return (int)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 */
+static void set2 (lua_State *L, int i, int j) {
-typedef unsigned int IdxT;
+  lua_rawseti(L, 1, i);
-
+  lua_rawseti(L, 1, j);
-
-/*
-** 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;
 }
 
-#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? */
+  if (!lua_isnil(L, 2)) {  /* function? */
-    return lua_compare(L, a, b, LUA_OPLT);  /* a < b */
-  else {  /* 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_pushvalue(L, b-2);  /* -2 to compensate function and `a' */
-    lua_call(L, 2, 1);      /* call function */
+    lua_call(L, 2, 1);
-    res = lua_toboolean(L, -1);  /* get result */
+    res = lua_toboolean(L, -1);
-    lua_pop(L, 1);          /* pop result */
+    lua_pop(L, 1);
     return res;
   }
+  else  /* a < b? */
+    return lua_compare(L, a, b, LUA_OPLT);
 }
 
-
+static void auxsort (lua_State *L, int l, int u) {
-/*
+  while (l < u) {  /* for tail recursion */
-** Does the partition: Pivot P is at the top of the stack.
+    int i, j;
-** precondition: a[lo] <= P == a[up-1] <= a[up],
+    /* sort elements a[l], a[(l+u)/2] and a[u] */
-** so it only needs to do the partition from lo + 1 to up - 2.
+    lua_rawgeti(L, 1, l);
-** Pos-condition: a[lo .. i - 1] <= a[i] == P <= a[i + 1 .. up]
+    lua_rawgeti(L, 1, u);
-** returns 'i'.
+    if (sort_comp(L, -1, -2))  /* a[u] < a[l]? */
-*/
+      set2(L, l, u);  /* swap a[l] - a[u] */
-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] */
     else
-      lua_pop(L, 2);  /* remove both values */
+      lua_pop(L, 2);
-    if (up - lo == 1)  /* only 2 elements? */
+    if (u-l == 1) break;  /* only 2 elements */
-      return;  /* already sorted */
+    i = (l+u)/2;
-    if (up - lo < RANLIMIT || rnd == 0)  /* small interval or no randomize? */
+    lua_rawgeti(L, 1, i);
-      p = (lo + up)/2;  /* middle element is a good pivot */
+    lua_rawgeti(L, 1, l);
-    else  /* for larger intervals, it is worth a random pivot */
+    if (sort_comp(L, -2, -1))  /* a[i]<a[l]? */
-      p = choosePivot(lo, up, rnd);
+      set2(L, i, l);
-    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] */
     else {
-      lua_pop(L, 1);  /* remove a[lo] */
+      lua_pop(L, 1);  /* remove a[l] */
-      lua_geti(L, 1, up);
+      lua_rawgeti(L, 1, u);
-      if (sort_comp(L, -1, -2))  /* a[up] < a[p]? */
+      if (sort_comp(L, -1, -2))  /* a[u]<a[i]? */
-        set2(L, p, up);  /* swap a[up] - a[p] */
+        set2(L, i, u);
       else
         lua_pop(L, 2);
     }
-    if (up - lo == 2)  /* only 3 elements? */
+    if (u-l == 2) break;  /* only 3 elements */
-      return;  /* already sorted */
+    lua_rawgeti(L, 1, i);  /* Pivot */
-    lua_geti(L, 1, p);  /* get middle element (Pivot) */
+    lua_pushvalue(L, -1);
-    lua_pushvalue(L, -1);  /* push Pivot */
+    lua_rawgeti(L, 1, u-1);
-    lua_geti(L, 1, up - 1);  /* push a[up - 1] */
+    set2(L, i, u-1);
-    set2(L, p, up - 1);  /* swap Pivot (a[p]) with a[up - 1] */
+    /* a[l] <= P == a[u-1] <= a[u], only need to sort from l+1 to u-2 */
-    p = partition(L, lo, up);
+    i = l; j = u-1;
-    /* a[lo .. p - 1] <= a[p] == P <= a[p + 1 .. up] */
+    for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
-    if (p - lo < up - p) {  /* lower interval is smaller? */
+      /* repeat ++i until a[i] >= P */
-      auxsort(L, lo, p - 1, rnd);  /* call recursively for lower interval */
+      while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
-      n = p - lo;  /* size of smaller interval */
+        if (i>=u) luaL_error(L, "invalid order function for sorting");
-      lo = p + 1;  /* tail call for [p + 1 .. up] (upper interval) */
+        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 */
+      j=i+1; i=u; u=j-2;
-      n = up - p;  /* size of smaller interval */
-      up = p - 1;  /* tail call for [lo .. p - 1]  (lower interval) */
     }
-    if ((up - lo) / 128 > n) /* partition too imbalanced? */
+    auxsort(L, j, i);  /* call recursively the smaller one */
-      rnd = l_randomizePivot();  /* try a new randomization */
+  }  /* repeat the routine for the larger one */
-  }  /* tail call auxsort(L, lo, up, rnd) */
 }
 
-
 static int sort (lua_State *L) {
-  lua_Integer n = aux_getn(L, 1, TAB_RW);
+  int n = aux_getn(L, 1);
-  if (n > 1) {  /* non-trivial interval? */
+  luaL_checkstack(L, 40, "");  /* assume array is smaller than 2^40 */
-    luaL_argcheck(L, n < INT_MAX, 1, "array too big");
+  if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
-    if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+    luaL_checktype(L, 2, LUA_TFUNCTION);
-      luaL_checktype(L, 2, LUA_TFUNCTION);  /* must be a function */
+  lua_settop(L, 2);  /* make sure there is two arguments */
-    lua_settop(L, 2);  /* make sure there are two arguments */
+  auxsort(L, 1, n);
-    auxsort(L, 1, (IdxT)n, 0);
-  }
   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},
+  {"pack", pack},
-  {"unpack", tunpack},
+  {"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;
 }
 

lib/lua/ltm.c

@@ -1,37 +1,31 @@
 /*
-** $Id: ltm.c $
+** $Id: ltm.c,v 2.14.1.1 2013/04/12 18:48:47 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",
+    "__add", "__sub", "__mul", "__div", "__mod",
-    "__div", "__idiv",
+    "__pow", "__unm", "__lt", "__le",
-    "__band", "__bor", "__bxor", "__shl", "__shr",
+    "__concat", "__call"
-    "__unm", "__bnot", "__lt", "__le",
-    "__concat", "__call", "__close"
   };
   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 (mt ? luaH_getstr(mt, G(L)->tmname[event]) : luaO_nilobject);
-}
-
-
-/*
-** 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));
 }
 

lib/lua/ltm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: ltm.h $
+** $Id: ltm.h,v 2.11.1.1 2013/04/12 18:48:47 roberto Exp $
 ** Tag methods
 ** See Copyright Notice in lua.h
 */
@@ -13,7 +13,7 @@
 
 /*
 * WARNING: if you change the order of this enumeration,
-* grep "ORDER TM" and "ORDER OP"
+* grep "ORDER TM"
 */
 typedef enum {
   TM_INDEX,
@@ -21,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]))
@@ -67,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,
-                                   struct CallInfo *ci, const Proto *p);
-LUAI_FUNC void luaT_getvarargs (lua_State *L, struct CallInfo *ci,
-                                              StkId where, int wanted);
-
-
 #endif

lib/lua/lua.c

@@ -1,19 +1,16 @@
 /*
-** $Id: lua.c $
+** $Id: lua.c,v 1.206.1.1 2013/04/12 18:48:47 roberto Exp $
 ** Lua stand-alone interpreter
 ** See Copyright Notice in lua.h
 */
 
-#define lua_c
-
-#include "lprefix.h"
-
 
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <signal.h>
+#define lua_c
 
 #include "lua.h"
 
@@ -21,15 +18,71 @@
 #include "lualib.h"
 
 
+#if !defined(LUA_PROMPT)
+#define LUA_PROMPT		"> "
+#define LUA_PROMPT2		">> "
+#endif
+
 #if !defined(LUA_PROGNAME)
 #define LUA_PROGNAME		"lua"
 #endif
 
-#if !defined(LUA_INIT_VAR)
+#if !defined(LUA_MAXINPUT)
-#define LUA_INIT_VAR		"LUA_INIT"
+#define LUA_MAXINPUT		512
 #endif
 
-#define LUA_INITVARVERSION	LUA_INIT_VAR LUA_VERSUFFIX
+#if !defined(LUA_INIT)
+#define LUA_INIT		"LUA_INIT"
+#endif
+
+#define LUA_INITVERSION  \
+	LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+
+
+/*
+** lua_stdin_is_tty detects whether the standard input is a 'tty' (that
+** is, whether we're running lua interactively).
+*/
+#if defined(LUA_USE_ISATTY)
+#include <unistd.h>
+#define lua_stdin_is_tty()	isatty(0)
+#elif defined(LUA_WIN)
+#include <io.h>
+#include <stdio.h>
+#define lua_stdin_is_tty()	_isatty(_fileno(stdin))
+#else
+#define lua_stdin_is_tty()	1  /* assume stdin is a tty */
+#endif
+
+
+/*
+** lua_readline defines how to show a prompt and then read a line from
+** the standard input.
+** lua_saveline defines how to "save" a read line in a "history".
+** lua_freeline defines how to free a line read by lua_readline.
+*/
+#if defined(LUA_USE_READLINE)
+
+#include <stdio.h>
+#include <readline/readline.h>
+#include <readline/history.h>
+#define lua_readline(L,b,p)	((void)L, ((b)=readline(p)) != NULL)
+#define lua_saveline(L,idx) \
+        if (lua_rawlen(L,idx) > 0)  /* non-empty line? */ \
+          add_history(lua_tostring(L, idx));  /* add it to history */
+#define lua_freeline(L,b)	((void)L, free(b))
+
+#elif !defined(lua_readline)
+
+#define lua_readline(L,b,p) \
+        ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
+        fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
+#define lua_saveline(L,idx)	{ (void)L; (void)idx; }
+#define lua_freeline(L,b)	{ (void)L; (void)b; }
+
+#endif
+
+
 
 
 static lua_State *globalL = NULL;
@@ -37,334 +90,330 @@ static lua_State *globalL = NULL;
 static const char *progname = LUA_PROGNAME;
 
 
-#if defined(LUA_USE_POSIX)   /* { */
 
-/*
-** Use 'sigaction' when available.
-*/
-static void setsignal (int sig, void (*handler)(int)) {
-  struct sigaction sa;
-  sa.sa_handler = handler;
-  sa.sa_flags = 0;
-  sigemptyset(&sa.sa_mask);  /* do not mask any signal */
-  sigaction(sig, &sa, NULL);
-}
-
-#else           /* }{ */
-
-#define setsignal            signal
-
-#endif                               /* } */
-
-
-/*
-** Hook set by signal function to stop the interpreter.
-*/
 static void lstop (lua_State *L, lua_Debug *ar) {
   (void)ar;  /* unused arg. */
-  lua_sethook(L, NULL, 0, 0);  /* reset hook */
+  lua_sethook(L, NULL, 0, 0);
   luaL_error(L, "interrupted!");
 }
 
 
-/*
-** Function to be called at a C signal. Because a C signal cannot
-** just change a Lua state (as there is no proper synchronization),
-** this function only sets a hook that, when called, will stop the
-** interpreter.
-*/
 static void laction (int i) {
-  int flag = LUA_MASKCALL | LUA_MASKRET | LUA_MASKLINE | LUA_MASKCOUNT;
+  signal(i, SIG_DFL); /* if another SIGINT happens before lstop,
-  setsignal(i, SIG_DFL); /* if another SIGINT happens, terminate process */
+                              terminate process (default action) */
-  lua_sethook(globalL, lstop, flag, 1);
+  lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
 }
 
 
 static void print_usage (const char *badoption) {
-  lua_writestringerror("%s: ", progname);
+  luai_writestringerror("%s: ", progname);
   if (badoption[1] == 'e' || badoption[1] == 'l')
-    lua_writestringerror("'%s' needs argument\n", badoption);
+    luai_writestringerror("'%s' needs argument\n", badoption);
   else
-    lua_writestringerror("unrecognized option '%s'\n", badoption);
+    luai_writestringerror("unrecognized option '%s'\n", badoption);
-  lua_writestringerror(
+  luai_writestringerror(
   "usage: %s [options] [script [args]]\n"
   "Available options are:\n"
-  "  -e stat   execute string 'stat'\n"
+  "  -e stat  execute string " LUA_QL("stat") "\n"
-  "  -i        enter interactive mode after executing 'script'\n"
+  "  -i       enter interactive mode after executing " LUA_QL("script") "\n"
-  "  -l mod    require library 'mod' into global 'mod'\n"
+  "  -l name  require library " LUA_QL("name") "\n"
-  "  -l g=mod  require library 'mod' into global 'g'\n"
+  "  -v       show version information\n"
-  "  -v        show version information\n"
+  "  -E       ignore environment variables\n"
-  "  -E        ignore environment variables\n"
+  "  --       stop handling options\n"
-  "  -W        turn warnings on\n"
+  "  -        stop handling options and execute stdin\n"
-  "  --        stop handling options\n"
-  "  -         stop handling options and execute stdin\n"
   ,
   progname);
 }
 
 
-/*
-** Prints an error message, adding the program name in front of it
-** (if present)
-*/
 static void l_message (const char *pname, const char *msg) {
-  if (pname) lua_writestringerror("%s: ", pname);
+  if (pname) luai_writestringerror("%s: ", pname);
-  lua_writestringerror("%s\n", msg);
+  luai_writestringerror("%s\n", msg);
 }
 
 
-/*
-** Check whether 'status' is not OK and, if so, prints the error
-** message on the top of the stack.
-*/
 static int report (lua_State *L, int status) {
-  if (status != LUA_OK) {
+  if (status != LUA_OK && !lua_isnil(L, -1)) {
     const char *msg = lua_tostring(L, -1);
-    if (msg == NULL)
+    if (msg == NULL) msg = "(error object is not a string)";
-      msg = "(error message not a string)";
     l_message(progname, msg);
-    lua_pop(L, 1);  /* remove message */
+    lua_pop(L, 1);
+    /* force a complete garbage collection in case of errors */
+    lua_gc(L, LUA_GCCOLLECT, 0);
   }
   return status;
 }
 
 
-/*
+/* the next function is called unprotected, so it must avoid errors */
-** Message handler used to run all chunks
+static void finalreport (lua_State *L, int status) {
-*/
+  if (status != LUA_OK) {
-static int msghandler (lua_State *L) {
+    const char *msg = (lua_type(L, -1) == LUA_TSTRING) ? lua_tostring(L, -1)
-  const char *msg = lua_tostring(L, 1);
+                                                       : NULL;
-  if (msg == NULL) {  /* is error object not a string? */
+    if (msg == NULL) msg = "(error object is not a string)";
-    if (luaL_callmeta(L, 1, "__tostring") &&  /* does it have a metamethod */
+    l_message(progname, msg);
-        lua_type(L, -1) == LUA_TSTRING)  /* that produces a string? */
+    lua_pop(L, 1);
-      return 1;  /* that is the message */
-    else
-      msg = lua_pushfstring(L, "(error object is a %s value)",
-                               luaL_typename(L, 1));
   }
-  luaL_traceback(L, L, msg, 1);  /* append a standard traceback */
-  return 1;  /* return the traceback */
 }
 
 
-/*
+static int traceback (lua_State *L) {
-** Interface to 'lua_pcall', which sets appropriate message function
+  const char *msg = lua_tostring(L, 1);
-** and C-signal handler. Used to run all chunks.
+  if (msg)
-*/
+    luaL_traceback(L, L, msg, 1);
+  else if (!lua_isnoneornil(L, 1)) {  /* is there an error object? */
+    if (!luaL_callmeta(L, 1, "__tostring"))  /* try its 'tostring' metamethod */
+      lua_pushliteral(L, "(no error message)");
+  }
+  return 1;
+}
+
+
 static int docall (lua_State *L, int narg, int nres) {
   int status;
   int base = lua_gettop(L) - narg;  /* function index */
-  lua_pushcfunction(L, msghandler);  /* push message handler */
+  lua_pushcfunction(L, traceback);  /* push traceback function */
-  lua_insert(L, base);  /* put it under function and args */
+  lua_insert(L, base);  /* put it under chunk and args */
   globalL = L;  /* to be available to 'laction' */
-  setsignal(SIGINT, laction);  /* set C-signal handler */
+  signal(SIGINT, laction);
   status = lua_pcall(L, narg, nres, base);
-  setsignal(SIGINT, SIG_DFL); /* reset C-signal handler */
+  signal(SIGINT, SIG_DFL);
-  lua_remove(L, base);  /* remove message handler from the stack */
+  lua_remove(L, base);  /* remove traceback function */
   return status;
 }
 
 
 static void print_version (void) {
-  lua_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
+  luai_writestring(LUA_COPYRIGHT, strlen(LUA_COPYRIGHT));
-  lua_writeline();
+  luai_writeline();
 }
 
 
-/*
+static int getargs (lua_State *L, char **argv, int n) {
-** Create the 'arg' table, which stores all arguments from the
+  int narg;
-** command line ('argv'). It should be aligned so that, at index 0,
+  int i;
-** it has 'argv[script]', which is the script name. The arguments
+  int argc = 0;
-** to the script (everything after 'script') go to positive indices;
+  while (argv[argc]) argc++;  /* count total number of arguments */
-** other arguments (before the script name) go to negative indices.
+  narg = argc - (n + 1);  /* number of arguments to the script */
-** If there is no script name, assume interpreter's name as base.
+  luaL_checkstack(L, narg + 3, "too many arguments to script");
-** (If there is no interpreter's name either, 'script' is -1, so
+  for (i=n+1; i < argc; i++)
-** table sizes are zero.)
-*/
-static void createargtable (lua_State *L, char **argv, int argc, int script) {
-  int i, narg;
-  narg = argc - (script + 1);  /* number of positive indices */
-  lua_createtable(L, narg, script + 1);
-  for (i = 0; i < argc; i++) {
     lua_pushstring(L, argv[i]);
-    lua_rawseti(L, -2, i - script);
+  lua_createtable(L, narg, n + 1);
+  for (i=0; i < argc; i++) {
+    lua_pushstring(L, argv[i]);
+    lua_rawseti(L, -2, i - n);
   }
-  lua_setglobal(L, "arg");
+  return narg;
 }
 
 
-static int dochunk (lua_State *L, int status) {
+static int dofile (lua_State *L, const char *name) {
+  int status = luaL_loadfile(L, name);
   if (status == LUA_OK) status = docall(L, 0, 0);
   return report(L, status);
 }
 
 
-static int dofile (lua_State *L, const char *name) {
-  return dochunk(L, luaL_loadfile(L, name));
-}
-
-
 static int dostring (lua_State *L, const char *s, const char *name) {
-  return dochunk(L, luaL_loadbuffer(L, s, strlen(s), name));
+  int status = luaL_loadbuffer(L, s, strlen(s), name);
-}
+  if (status == LUA_OK) status = docall(L, 0, 0);
-
-
-/*
-** Receives 'globname[=modname]' and runs 'globname = require(modname)'.
-** If there is no explicit modname and globname contains a '-', cut
-** the suffix after '-' (the "version") to make the global name.
-*/
-static int dolibrary (lua_State *L, char *globname) {
-  int status;
-  char *suffix = NULL;
-  char *modname = strchr(globname, '=');
-  if (modname == NULL) {  /* no explicit name? */
-    modname = globname;  /* module name is equal to global name */
-    suffix = strchr(modname, *LUA_IGMARK);  /* look for a suffix mark */
-  }
-  else {
-    *modname = '\0';  /* global name ends here */
-    modname++;  /* module name starts after the '=' */
-  }
-  lua_getglobal(L, "require");
-  lua_pushstring(L, modname);
-  status = docall(L, 1, 1);  /* call 'require(modname)' */
-  if (status == LUA_OK) {
-    if (suffix != NULL)  /* is there a suffix mark? */
-      *suffix = '\0';  /* remove suffix from global name */
-    lua_setglobal(L, globname);  /* globname = require(modname) */
-  }
   return report(L, status);
 }
 
 
-/*
+static int dolibrary (lua_State *L, const char *name) {
-** Push on the stack the contents of table 'arg' from 1 to #arg
+  int status;
-*/
+  lua_getglobal(L, "require");
-static int pushargs (lua_State *L) {
+  lua_pushstring(L, name);
-  int i, n;
+  status = docall(L, 1, 1);  /* call 'require(name)' */
-  if (lua_getglobal(L, "arg") != LUA_TTABLE)
+  if (status == LUA_OK)
-    luaL_error(L, "'arg' is not a table");
+    lua_setglobal(L, name);  /* global[name] = require return */
-  n = (int)luaL_len(L, -1);
+  return report(L, status);
-  luaL_checkstack(L, n + 3, "too many arguments to script");
-  for (i = 1; i <= n; i++)
-    lua_rawgeti(L, -i, i);
-  lua_remove(L, -i);  /* remove table from the stack */
-  return n;
 }
 
 
-static int handle_script (lua_State *L, char **argv) {
+static const char *get_prompt (lua_State *L, int firstline) {
+  const char *p;
+  lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
+  p = lua_tostring(L, -1);
+  if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
+  return p;
+}
+
+/* mark in error messages for incomplete statements */
+#define EOFMARK		"<eof>"
+#define marklen		(sizeof(EOFMARK)/sizeof(char) - 1)
+
+static int incomplete (lua_State *L, int status) {
+  if (status == LUA_ERRSYNTAX) {
+    size_t lmsg;
+    const char *msg = lua_tolstring(L, -1, &lmsg);
+    if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0) {
+      lua_pop(L, 1);
+      return 1;
+    }
+  }
+  return 0;  /* else... */
+}
+
+
+static int pushline (lua_State *L, int firstline) {
+  char buffer[LUA_MAXINPUT];
+  char *b = buffer;
+  size_t l;
+  const char *prmt = get_prompt(L, firstline);
+  int readstatus = lua_readline(L, b, prmt);
+  lua_pop(L, 1);  /* remove result from 'get_prompt' */
+  if (readstatus == 0)
+    return 0;  /* no input */
+  l = strlen(b);
+  if (l > 0 && b[l-1] == '\n')  /* line ends with newline? */
+    b[l-1] = '\0';  /* remove it */
+  if (firstline && b[0] == '=')  /* first line starts with `=' ? */
+    lua_pushfstring(L, "return %s", b+1);  /* change it to `return' */
+  else
+    lua_pushstring(L, b);
+  lua_freeline(L, b);
+  return 1;
+}
+
+
+static int loadline (lua_State *L) {
   int status;
-  const char *fname = argv[0];
+  lua_settop(L, 0);
-  if (strcmp(fname, "-") == 0 && strcmp(argv[-1], "--") != 0)
+  if (!pushline(L, 1))
+    return -1;  /* no input */
+  for (;;) {  /* repeat until gets a complete line */
+    size_t l;
+    const char *line = lua_tolstring(L, 1, &l);
+    status = luaL_loadbuffer(L, line, l, "=stdin");
+    if (!incomplete(L, status)) break;  /* cannot try to add lines? */
+    if (!pushline(L, 0))  /* no more input? */
+      return -1;
+    lua_pushliteral(L, "\n");  /* add a new line... */
+    lua_insert(L, -2);  /* ...between the two lines */
+    lua_concat(L, 3);  /* join them */
+  }
+  lua_saveline(L, 1);
+  lua_remove(L, 1);  /* remove line */
+  return status;
+}
+
+
+static void dotty (lua_State *L) {
+  int status;
+  const char *oldprogname = progname;
+  progname = NULL;
+  while ((status = loadline(L)) != -1) {
+    if (status == LUA_OK) status = docall(L, 0, LUA_MULTRET);
+    report(L, status);
+    if (status == LUA_OK && lua_gettop(L) > 0) {  /* any result to print? */
+      luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
+      lua_getglobal(L, "print");
+      lua_insert(L, 1);
+      if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK)
+        l_message(progname, lua_pushfstring(L,
+                               "error calling " LUA_QL("print") " (%s)",
+                               lua_tostring(L, -1)));
+    }
+  }
+  lua_settop(L, 0);  /* clear stack */
+  luai_writeline();
+  progname = oldprogname;
+}
+
+
+static int handle_script (lua_State *L, char **argv, int n) {
+  int status;
+  const char *fname;
+  int narg = getargs(L, argv, n);  /* collect arguments */
+  lua_setglobal(L, "arg");
+  fname = argv[n];
+  if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0)
     fname = NULL;  /* stdin */
   status = luaL_loadfile(L, fname);
-  if (status == LUA_OK) {
+  lua_insert(L, -(narg+1));
-    int n = pushargs(L);  /* push arguments to script */
+  if (status == LUA_OK)
-    status = docall(L, n, LUA_MULTRET);
+    status = docall(L, narg, LUA_MULTRET);
-  }
+  else
+    lua_pop(L, narg);
   return report(L, status);
 }
 
 
-/* bits of various argument indicators in 'args' */
+/* check that argument has no extra characters at the end */
-#define has_error	1	/* bad option */
+#define noextrachars(x)		{if ((x)[2] != '\0') return -1;}
-#define has_i		2	/* -i */
-#define has_v		4	/* -v */
-#define has_e		8	/* -e */
-#define has_E		16	/* -E */
 
 
-/*
+/* indices of various argument indicators in array args */
-** Traverses all arguments from 'argv', returning a mask with those
+#define has_i		0	/* -i */
-** needed before running any Lua code or an error code if it finds any
+#define has_v		1	/* -v */
-** invalid argument. In case of error, 'first' is the index of the bad
+#define has_e		2	/* -e */
-** argument.  Otherwise, 'first' is -1 if there is no program name,
+#define has_E		3	/* -E */
-** 0 if there is no script name, or the index of the script name.
+
-*/
+#define num_has		4	/* number of 'has_*' */
-static int collectargs (char **argv, int *first) {
+
-  int args = 0;
+
+static int collectargs (char **argv, int *args) {
   int i;
-  if (argv[0] != NULL) {  /* is there a program name? */
+  for (i = 1; argv[i] != NULL; i++) {
-    if (argv[0][0])  /* not empty? */
-      progname = argv[0];  /* save it */
-  }
-  else {  /* no program name */
-    *first = -1;
-    return 0;
-  }
-  for (i = 1; argv[i] != NULL; i++) {  /* handle arguments */
-    *first = i;
     if (argv[i][0] != '-')  /* not an option? */
-        return args;  /* stop handling options */
+        return i;
-    switch (argv[i][1]) {  /* else check option */
+    switch (argv[i][1]) {  /* option */
-      case '-':  /* '--' */
+      case '-':
-        if (argv[i][2] != '\0')  /* extra characters after '--'? */
+        noextrachars(argv[i]);
-          return has_error;  /* invalid option */
+        return (argv[i+1] != NULL ? i+1 : 0);
-        *first = i + 1;
+      case '\0':
-        return args;
+        return i;
-      case '\0':  /* '-' */
-        return args;  /* script "name" is '-' */
       case 'E':
-        if (argv[i][2] != '\0')  /* extra characters? */
+        args[has_E] = 1;
-          return has_error;  /* invalid option */
-        args |= has_E;
-        break;
-      case 'W':
-        if (argv[i][2] != '\0')  /* extra characters? */
-          return has_error;  /* invalid option */
         break;
       case 'i':
-        args |= has_i;  /* (-i implies -v) *//* FALLTHROUGH */
+        noextrachars(argv[i]);
+        args[has_i] = 1;  /* go through */
       case 'v':
-        if (argv[i][2] != '\0')  /* extra characters? */
+        noextrachars(argv[i]);
-          return has_error;  /* invalid option */
+        args[has_v] = 1;
-        args |= has_v;
         break;
       case 'e':
-        args |= has_e;  /* FALLTHROUGH */
+        args[has_e] = 1;  /* go through */
       case 'l':  /* both options need an argument */
         if (argv[i][2] == '\0') {  /* no concatenated argument? */
           i++;  /* try next 'argv' */
           if (argv[i] == NULL || argv[i][0] == '-')
-            return has_error;  /* no next argument or it is another option */
+            return -(i - 1);  /* no next argument or it is another option */
         }
         break;
-      default:  /* invalid option */
+      default:  /* invalid option; return its index... */
-        return has_error;
+        return -i;  /* ...as a negative value */
     }
   }
-  *first = 0;  /* no script name */
+  return 0;
-  return args;
 }
 
 
-/*
-** Processes options 'e' and 'l', which involve running Lua code, and
-** 'W', which also affects the state.
-** Returns 0 if some code raises an error.
-*/
 static int runargs (lua_State *L, char **argv, int n) {
   int i;
   for (i = 1; i < n; i++) {
-    int option = argv[i][1];
+    lua_assert(argv[i][0] == '-');
-    lua_assert(argv[i][0] == '-');  /* already checked */
+    switch (argv[i][1]) {  /* option */
-    switch (option) {
+      case 'e': {
-      case 'e':  case 'l': {
+        const char *chunk = argv[i] + 2;
-        int status;
+        if (*chunk == '\0') chunk = argv[++i];
-        char *extra = argv[i] + 2;  /* both options need an argument */
+        lua_assert(chunk != NULL);
-        if (*extra == '\0') extra = argv[++i];
+        if (dostring(L, chunk, "=(command line)") != LUA_OK)
-        lua_assert(extra != NULL);
+          return 0;
-        status = (option == 'e')
-                 ? dostring(L, extra, "=(command line)")
-                 : dolibrary(L, extra);
-        if (status != LUA_OK) return 0;
         break;
       }
-      case 'W':
+      case 'l': {
-        lua_warning(L, "@on", 0);  /* warnings on */
+        const char *filename = argv[i] + 2;
+        if (*filename == '\0') filename = argv[++i];
+        lua_assert(filename != NULL);
+        if (dolibrary(L, filename) != LUA_OK)
+          return 0;  /* stop if file fails */
         break;
+      }
+      default: break;
     }
   }
   return 1;
@@ -372,10 +421,10 @@ static int runargs (lua_State *L, char **argv, int n) {
 
 
 static int handle_luainit (lua_State *L) {
-  const char *name = "=" LUA_INITVARVERSION;
+  const char *name = "=" LUA_INITVERSION;
   const char *init = getenv(name + 1);
   if (init == NULL) {
-    name = "=" LUA_INIT_VAR;
+    name = "=" LUA_INIT;
     init = getenv(name + 1);  /* try alternative name */
   }
   if (init == NULL) return LUA_OK;
@@ -386,279 +435,40 @@ static int handle_luainit (lua_State *L) {
 }
 
 
-/*
-** {==================================================================
-** Read-Eval-Print Loop (REPL)
-** ===================================================================
-*/
-
-#if !defined(LUA_PROMPT)
-#define LUA_PROMPT		"> "
-#define LUA_PROMPT2		">> "
-#endif
-
-#if !defined(LUA_MAXINPUT)
-#define LUA_MAXINPUT		512
-#endif
-
-
-/*
-** lua_stdin_is_tty detects whether the standard input is a 'tty' (that
-** is, whether we're running lua interactively).
-*/
-#if !defined(lua_stdin_is_tty)	/* { */
-
-#if defined(LUA_USE_POSIX)	/* { */
-
-#include <unistd.h>
-#define lua_stdin_is_tty()	isatty(0)
-
-#elif defined(LUA_USE_WINDOWS)	/* }{ */
-
-#include <io.h>
-#include <windows.h>
-
-#define lua_stdin_is_tty()	_isatty(_fileno(stdin))
-
-#else				/* }{ */
-
-/* ISO C definition */
-#define lua_stdin_is_tty()	1  /* assume stdin is a tty */
-
-#endif				/* } */
-
-#endif				/* } */
-
-
-/*
-** lua_readline defines how to show a prompt and then read a line from
-** the standard input.
-** lua_saveline defines how to "save" a read line in a "history".
-** lua_freeline defines how to free a line read by lua_readline.
-*/
-#if !defined(lua_readline)	/* { */
-
-#if defined(LUA_USE_READLINE)	/* { */
-
-#include <readline/readline.h>
-#include <readline/history.h>
-#define lua_initreadline(L)	((void)L, rl_readline_name="lua")
-#define lua_readline(L,b,p)	((void)L, ((b)=readline(p)) != NULL)
-#define lua_saveline(L,line)	((void)L, add_history(line))
-#define lua_freeline(L,b)	((void)L, free(b))
-
-#else				/* }{ */
-
-#define lua_initreadline(L)  ((void)L)
-#define lua_readline(L,b,p) \
-        ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
-        fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
-#define lua_saveline(L,line)	{ (void)L; (void)line; }
-#define lua_freeline(L,b)	{ (void)L; (void)b; }
-
-#endif				/* } */
-
-#endif				/* } */
-
-
-/*
-** Return the string to be used as a prompt by the interpreter. Leave
-** the string (or nil, if using the default value) on the stack, to keep
-** it anchored.
-*/
-static const char *get_prompt (lua_State *L, int firstline) {
-  if (lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2") == LUA_TNIL)
-    return (firstline ? LUA_PROMPT : LUA_PROMPT2);  /* use the default */
-  else {  /* apply 'tostring' over the value */
-    const char *p = luaL_tolstring(L, -1, NULL);
-    lua_remove(L, -2);  /* remove original value */
-    return p;
-  }
-}
-
-/* mark in error messages for incomplete statements */
-#define EOFMARK		"<eof>"
-#define marklen		(sizeof(EOFMARK)/sizeof(char) - 1)
-
-
-/*
-** Check whether 'status' signals a syntax error and the error
-** message at the top of the stack ends with the above mark for
-** incomplete statements.
-*/
-static int incomplete (lua_State *L, int status) {
-  if (status == LUA_ERRSYNTAX) {
-    size_t lmsg;
-    const char *msg = lua_tolstring(L, -1, &lmsg);
-    if (lmsg >= marklen && strcmp(msg + lmsg - marklen, EOFMARK) == 0)
-      return 1;
-  }
-  return 0;  /* else... */
-}
-
-
-/*
-** Prompt the user, read a line, and push it into the Lua stack.
-*/
-static int pushline (lua_State *L, int firstline) {
-  char buffer[LUA_MAXINPUT];
-  char *b = buffer;
-  size_t l;
-  const char *prmt = get_prompt(L, firstline);
-  int readstatus = lua_readline(L, b, prmt);
-  lua_pop(L, 1);  /* remove prompt */
-  if (readstatus == 0)
-    return 0;  /* no input */
-  l = strlen(b);
-  if (l > 0 && b[l-1] == '\n')  /* line ends with newline? */
-    b[--l] = '\0';  /* remove it */
-  if (firstline && b[0] == '=')  /* for compatibility with 5.2, ... */
-    lua_pushfstring(L, "return %s", b + 1);  /* change '=' to 'return' */
-  else
-    lua_pushlstring(L, b, l);
-  lua_freeline(L, b);
-  return 1;
-}
-
-
-/*
-** Try to compile line on the stack as 'return <line>;'; on return, stack
-** has either compiled chunk or original line (if compilation failed).
-*/
-static int addreturn (lua_State *L) {
-  const char *line = lua_tostring(L, -1);  /* original line */
-  const char *retline = lua_pushfstring(L, "return %s;", line);
-  int status = luaL_loadbuffer(L, retline, strlen(retline), "=stdin");
-  if (status == LUA_OK) {
-    lua_remove(L, -2);  /* remove modified line */
-    if (line[0] != '\0')  /* non empty? */
-      lua_saveline(L, line);  /* keep history */
-  }
-  else
-    lua_pop(L, 2);  /* pop result from 'luaL_loadbuffer' and modified line */
-  return status;
-}
-
-
-/*
-** Read multiple lines until a complete Lua statement
-*/
-static int multiline (lua_State *L) {
-  for (;;) {  /* repeat until gets a complete statement */
-    size_t len;
-    const char *line = lua_tolstring(L, 1, &len);  /* get what it has */
-    int status = luaL_loadbuffer(L, line, len, "=stdin");  /* try it */
-    if (!incomplete(L, status) || !pushline(L, 0)) {
-      lua_saveline(L, line);  /* keep history */
-      return status;  /* should not or cannot try to add continuation line */
-    }
-    lua_remove(L, -2);  /* remove error message (from incomplete line) */
-    lua_pushliteral(L, "\n");  /* add newline... */
-    lua_insert(L, -2);  /* ...between the two lines */
-    lua_concat(L, 3);  /* join them */
-  }
-}
-
-
-/*
-** Read a line and try to load (compile) it first as an expression (by
-** adding "return " in front of it) and second as a statement. Return
-** the final status of load/call with the resulting function (if any)
-** in the top of the stack.
-*/
-static int loadline (lua_State *L) {
-  int status;
-  lua_settop(L, 0);
-  if (!pushline(L, 1))
-    return -1;  /* no input */
-  if ((status = addreturn(L)) != LUA_OK)  /* 'return ...' did not work? */
-    status = multiline(L);  /* try as command, maybe with continuation lines */
-  lua_remove(L, 1);  /* remove line from the stack */
-  lua_assert(lua_gettop(L) == 1);
-  return status;
-}
-
-
-/*
-** Prints (calling the Lua 'print' function) any values on the stack
-*/
-static void l_print (lua_State *L) {
-  int n = lua_gettop(L);
-  if (n > 0) {  /* any result to be printed? */
-    luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
-    lua_getglobal(L, "print");
-    lua_insert(L, 1);
-    if (lua_pcall(L, n, 0, 0) != LUA_OK)
-      l_message(progname, lua_pushfstring(L, "error calling 'print' (%s)",
-                                             lua_tostring(L, -1)));
-  }
-}
-
-
-/*
-** Do the REPL: repeatedly read (load) a line, evaluate (call) it, and
-** print any results.
-*/
-static void doREPL (lua_State *L) {
-  int status;
-  const char *oldprogname = progname;
-  progname = NULL;  /* no 'progname' on errors in interactive mode */
-  lua_initreadline(L);
-  while ((status = loadline(L)) != -1) {
-    if (status == LUA_OK)
-      status = docall(L, 0, LUA_MULTRET);
-    if (status == LUA_OK) l_print(L);
-    else report(L, status);
-  }
-  lua_settop(L, 0);  /* clear stack */
-  lua_writeline();
-  progname = oldprogname;
-}
-
-/* }================================================================== */
-
-
-/*
-** Main body of stand-alone interpreter (to be called in protected mode).
-** Reads the options and handles them all.
-*/
 static int pmain (lua_State *L) {
   int argc = (int)lua_tointeger(L, 1);
   char **argv = (char **)lua_touserdata(L, 2);
   int script;
-  int args = collectargs(argv, &script);
+  int args[num_has];
-  int optlim = (script > 0) ? script : argc; /* first argv not an option */
+  args[has_i] = args[has_v] = args[has_e] = args[has_E] = 0;
-  luaL_checkversion(L);  /* check that interpreter has correct version */
+  if (argv[0] && argv[0][0]) progname = argv[0];
-  if (args == has_error) {  /* bad arg? */
+  script = collectargs(argv, args);
-    print_usage(argv[script]);  /* 'script' has index of bad arg. */
+  if (script < 0) {  /* invalid arg? */
+    print_usage(argv[-script]);
     return 0;
   }
-  if (args & has_v)  /* option '-v'? */
+  if (args[has_v]) print_version();
-    print_version();
+  if (args[has_E]) {  /* option '-E'? */
-  if (args & has_E) {  /* option '-E'? */
     lua_pushboolean(L, 1);  /* signal for libraries to ignore env. vars. */
     lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
   }
-  luaL_openlibs(L);  /* open standard libraries */
+  /* open standard libraries */
-  createargtable(L, argv, argc, script);  /* create table 'arg' */
+  luaL_checkversion(L);
-  lua_gc(L, LUA_GCRESTART);  /* start GC... */
+  lua_gc(L, LUA_GCSTOP, 0);  /* stop collector during initialization */
-  lua_gc(L, LUA_GCGEN, 0, 0);  /* ...in generational mode */
+  luaL_openlibs(L);  /* open libraries */
-  if (!(args & has_E)) {  /* no option '-E'? */
+  lua_gc(L, LUA_GCRESTART, 0);
-    if (handle_luainit(L) != LUA_OK)  /* run LUA_INIT */
+  if (!args[has_E] && handle_luainit(L) != LUA_OK)
-      return 0;  /* error running LUA_INIT */
+    return 0;  /* error running LUA_INIT */
-  }
+  /* execute arguments -e and -l */
-  if (!runargs(L, argv, optlim))  /* execute arguments -e and -l */
+  if (!runargs(L, argv, (script > 0) ? script : argc)) return 0;
-    return 0;  /* something failed */
+  /* execute main script (if there is one) */
-  if (script > 0) {  /* execute main script (if there is one) */
+  if (script && handle_script(L, argv, script) != LUA_OK) return 0;
-    if (handle_script(L, argv + script) != LUA_OK)
+  if (args[has_i])  /* -i option? */
-      return 0;  /* interrupt in case of error */
+    dotty(L);
-  }
+  else if (script == 0 && !args[has_e] && !args[has_v]) {  /* no arguments? */
-  if (args & has_i)  /* -i option? */
+    if (lua_stdin_is_tty()) {
-    doREPL(L);  /* do read-eval-print loop */
-  else if (script < 1 && !(args & (has_e | has_v))) { /* no active option? */
-    if (lua_stdin_is_tty()) {  /* running in interactive mode? */
       print_version();
-      doREPL(L);  /* do read-eval-print loop */
+      dotty(L);
     }
     else dofile(L, NULL);  /* executes stdin as a file */
   }
@@ -674,13 +484,13 @@ int main (int argc, char **argv) {
     l_message(argv[0], "cannot create state: not enough memory");
     return EXIT_FAILURE;
   }
-  lua_gc(L, LUA_GCSTOP);  /* stop GC while building state */
+  /* call 'pmain' in protected mode */
-  lua_pushcfunction(L, &pmain);  /* to call 'pmain' in protected mode */
+  lua_pushcfunction(L, &pmain);
   lua_pushinteger(L, argc);  /* 1st argument */
   lua_pushlightuserdata(L, argv); /* 2nd argument */
-  status = lua_pcall(L, 2, 1, 0);  /* do the call */
+  status = lua_pcall(L, 2, 1, 0);
   result = lua_toboolean(L, -1);  /* get result */
-  report(L, status);
+  finalreport(L, status);
   lua_close(L);
   return (result && status == LUA_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
 }

lib/lua/lua.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h $
+** $Id: lua.h,v 1.285.1.4 2015/02/21 14:04:50 roberto Exp $
 ** 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_MINOR	"2"
-#define LUA_VERSION_RELEASE	"8"
+#define LUA_VERSION_NUM		502
-
+#define LUA_VERSION_RELEASE	"4"
-#define LUA_VERSION_NUM			504
-#define LUA_VERSION_RELEASE_NUM		(LUA_VERSION_NUM * 100 + 8)
 
 #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-2025 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
+** pseudo-indices
-** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty
-** space after that to help overflow detection)
 */
-#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_OPDIV	3
-#define LUA_OPPOW	4
+#define LUA_OPMOD	4
-#define LUA_OPDIV	5
+#define LUA_OPPOW	5
-#define LUA_OPIDIV	6
+#define LUA_OPUNM	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
 
 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 void  (lua_getglobal) (lua_State *L, const char *var);
-LUA_API int (lua_gettable) (lua_State *L, int idx);
+LUA_API void  (lua_gettable) (lua_State *L, int idx);
-LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
+LUA_API void  (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 void  (lua_rawget) (lua_State *L, int idx);
-LUA_API int (lua_rawget) (lua_State *L, int idx);
+LUA_API void  (lua_rawgeti) (lua_State *L, int idx, int n);
-LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawgetp) (lua_State *L, int idx, const void *p);
-LUA_API int (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_API void  (lua_callk) (lua_State *L, int nargs, int nresults, int ctx,
-                           lua_KContext ctx, lua_KFunction k);
+                           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_API int  (lua_yieldk) (lua_State *L, int nresults, int ctx,
-                               lua_KFunction k);
+                           lua_CFunction 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);
-
 #define lua_yield(L,n)		lua_yieldk(L, (n), 0, NULL)
-
+LUA_API int  (lua_resume) (lua_State *L, lua_State *from, int narg);
-
+LUA_API int  (lua_status) (lua_State *L);
-/*
-** 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);
-
 
 /*
 ** 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_tounsigned(L,i)	lua_tounsignedx(L,i,NULL)
-#define lua_tointeger(L,i)	lua_tointegerx(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-2025 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

lib/lua/lua.hpp

@@ -1,13 +1,9 @@
 // lua.hpp
 // Lua header files for C++
 // <<extern "C">> not supplied automatically because Lua also compiles as C++
-#ifdef __cplusplus
+
 extern "C" {
-#endif
 #include "lua.h"
 #include "lualib.h"
 #include "lauxlib.h"
-
-#ifdef __cplusplus
 }
-#endif

lib/lua/luac.c

@@ -1,27 +1,21 @@
 /*
-** $Id: luac.c $
+** $Id: luac.c,v 1.69 2011/11/29 17:46:33 lhf Exp $
-** Lua compiler (saves bytecodes to files; also lists bytecodes)
+** Lua compiler (saves bytecodes to files; also list bytecodes)
 ** See Copyright Notice in lua.h
 */
 
-#define luac_c
-#define LUA_CORE
-
-#include "lprefix.h"
-
-#include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#define luac_c
+#define LUA_CORE
+
 #include "lua.h"
 #include "lauxlib.h"
 
-#include "ldebug.h"
 #include "lobject.h"
-#include "lopcodes.h"
-#include "lopnames.h"
 #include "lstate.h"
 #include "lundump.h"
 
@@ -37,7 +31,6 @@ static int stripping=0;			/* strip debug information? */
 static char Output[]={ OUTPUT };	/* default output file name */
 static const char* output=Output;	/* actual output file name */
 static const char* progname=PROGNAME;	/* actual program name */
-static TString **tmname;
 
 static void fatal(const char* message)
 {
@@ -54,14 +47,14 @@ static void cannot(const char* what)
 static void usage(const char* message)
 {
  if (*message=='-')
-  fprintf(stderr,"%s: unrecognized option '%s'\n",progname,message);
+  fprintf(stderr,"%s: unrecognized option " LUA_QS "\n",progname,message);
  else
   fprintf(stderr,"%s: %s\n",progname,message);
  fprintf(stderr,
   "usage: %s [options] [filenames]\n"
   "Available options are:\n"
   "  -l       list (use -l -l for full listing)\n"
-  "  -o name  output to file 'name' (default is \"%s\")\n"
+  "  -o name  output to file " LUA_QL("name") " (default is \"%s\")\n"
   "  -p       parse only\n"
   "  -s       strip debug information\n"
   "  -v       show version information\n"
@@ -96,7 +89,7 @@ static int doargs(int argc, char* argv[])
   {
    output=argv[++i];
    if (output==NULL || *output==0 || (*output=='-' && output[1]!=0))
-    usage("'-o' needs argument");
+    usage(LUA_QL("-o") " needs argument");
    if (IS("-")) output=NULL;
   }
   else if (IS("-p"))			/* parse only */
@@ -121,9 +114,9 @@ static int doargs(int argc, char* argv[])
  return i;
 }
 
-#define FUNCTION "(function()end)();\n"
+#define FUNCTION "(function()end)();"
 
-static const char* reader(lua_State* L, void* ud, size_t* size)
+static const char* reader(lua_State *L, void *ud, size_t *size)
 {
  UNUSED(L);
  if ((*(int*)ud)--)
@@ -138,7 +131,7 @@ static const char* reader(lua_State* L, void* ud, size_t* size)
  }
 }
 
-#define toproto(L,i) getproto(s2v(L->top.p+(i)))
+#define toproto(L,i) getproto(L->top+(i))
 
 static const Proto* combine(lua_State* L, int n)
 {
@@ -155,6 +148,7 @@ static const Proto* combine(lua_State* L, int n)
    f->p[i]=toproto(L,i-n-1);
    if (f->p[i]->sizeupvalues>0) f->p[i]->upvalues[0].instack=0;
   }
+  f->sizelineinfo=0;
   return f;
  }
 }
@@ -171,7 +165,6 @@ static int pmain(lua_State* L)
  char** argv=(char**)lua_touserdata(L,2);
  const Proto* f;
  int i;
- tmname=G(L)->tmname;
  if (!lua_checkstack(L,argc)) fatal("too many input files");
  for (i=0; i<argc; i++)
  {
@@ -210,126 +203,76 @@ int main(int argc, char* argv[])
 }
 
 /*
+** $Id: print.c,v 1.69 2013/07/04 01:03:46 lhf Exp $
 ** print bytecodes
+** See Copyright Notice in lua.h
 */
 
-#define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
+#include <ctype.h>
-#define VOID(p) ((const void*)(p))
+#include <stdio.h>
-#define eventname(i) (getstr(tmname[i]))
+
+#define luac_c
+#define LUA_CORE
+
+#include "ldebug.h"
+#include "lobject.h"
+#include "lopcodes.h"
+
+#define VOID(p)		((const void*)(p))
 
 static void PrintString(const TString* ts)
 {
  const char* s=getstr(ts);
- size_t i,n=tsslen(ts);
+ size_t i,n=ts->tsv.len;
- printf("\"");
+ printf("%c",'"');
  for (i=0; i<n; i++)
  {
   int c=(int)(unsigned char)s[i];
   switch (c)
   {
-   case '"':
+   case '"':  printf("\\\""); break;
-	printf("\\\"");
+   case '\\': printf("\\\\"); break;
-	break;
+   case '\a': printf("\\a"); break;
-   case '\\':
+   case '\b': printf("\\b"); break;
-	printf("\\\\");
+   case '\f': printf("\\f"); break;
-	break;
+   case '\n': printf("\\n"); break;
-   case '\a':
+   case '\r': printf("\\r"); break;
-	printf("\\a");
+   case '\t': printf("\\t"); break;
-	break;
+   case '\v': printf("\\v"); break;
-   case '\b':
+   default:	if (isprint(c))
-	printf("\\b");
+   			printf("%c",c);
-	break;
+		else
-   case '\f':
+			printf("\\%03d",c);
-	printf("\\f");
-	break;
-   case '\n':
-	printf("\\n");
-	break;
-   case '\r':
-	printf("\\r");
-	break;
-   case '\t':
-	printf("\\t");
-	break;
-   case '\v':
-	printf("\\v");
-	break;
-   default:
-	if (isprint(c)) printf("%c",c); else printf("\\%03d",c);
-	break;
   }
  }
- printf("\"");
+ printf("%c",'"');
-}
-
-static void PrintType(const Proto* f, int i)
-{
- const TValue* o=&f->k[i];
- switch (ttypetag(o))
- {
-  case LUA_VNIL:
-	printf("N");
-	break;
-  case LUA_VFALSE:
-  case LUA_VTRUE:
-	printf("B");
-	break;
-  case LUA_VNUMFLT:
-	printf("F");
-	break;
-  case LUA_VNUMINT:
-	printf("I");
-	break;
-  case LUA_VSHRSTR:
-  case LUA_VLNGSTR:
-	printf("S");
-	break;
-  default:				/* cannot happen */
-	printf("?%d",ttypetag(o));
-	break;
- }
- printf("\t");
 }
 
 static void PrintConstant(const Proto* f, int i)
 {
  const TValue* o=&f->k[i];
- switch (ttypetag(o))
+ switch (ttypenv(o))
  {
-  case LUA_VNIL:
+  case LUA_TNIL:
 	printf("nil");
 	break;
-  case LUA_VFALSE:
+  case LUA_TBOOLEAN:
-	printf("false");
+	printf(bvalue(o) ? "true" : "false");
 	break;
-  case LUA_VTRUE:
+  case LUA_TNUMBER:
-	printf("true");
+	printf(LUA_NUMBER_FMT,nvalue(o));
 	break;
-  case LUA_VNUMFLT:
+  case LUA_TSTRING:
-	{
+	PrintString(rawtsvalue(o));
-	char buff[100];
-	sprintf(buff,LUA_NUMBER_FMT,fltvalue(o));
-	printf("%s",buff);
-	if (buff[strspn(buff,"-0123456789")]=='\0') printf(".0");
-	break;
-	}
-  case LUA_VNUMINT:
-	printf(LUA_INTEGER_FMT,ivalue(o));
-	break;
-  case LUA_VSHRSTR:
-  case LUA_VLNGSTR:
-	PrintString(tsvalue(o));
 	break;
   default:				/* cannot happen */
-	printf("?%d",ttypetag(o));
+	printf("? type=%d",ttype(o));
 	break;
  }
 }
 
-#define COMMENT		"\t; "
+#define UPVALNAME(x) ((f->upvalues[x].name) ? getstr(f->upvalues[x].name) : "-")
-#define EXTRAARG	GETARG_Ax(code[pc+1])
+#define MYK(x)		(-1-(x))
-#define EXTRAARGC	(EXTRAARG*(MAXARG_C+1))
-#define ISK		(isk ? "k" : "")
 
 static void PrintCode(const Proto* f)
 {
@@ -344,324 +287,91 @@ static void PrintCode(const Proto* f)
   int c=GETARG_C(i);
   int ax=GETARG_Ax(i);
   int bx=GETARG_Bx(i);
-  int sb=GETARG_sB(i);
-  int sc=GETARG_sC(i);
   int sbx=GETARG_sBx(i);
-  int isk=GETARG_k(i);
+  int line=getfuncline(f,pc);
-  int line=luaG_getfuncline(f,pc);
   printf("\t%d\t",pc+1);
   if (line>0) printf("[%d]\t",line); else printf("[-]\t");
-  printf("%-9s\t",opnames[o]);
+  printf("%-9s\t",luaP_opnames[o]);
+  switch (getOpMode(o))
+  {
+   case iABC:
+    printf("%d",a);
+    if (getBMode(o)!=OpArgN) printf(" %d",ISK(b) ? (MYK(INDEXK(b))) : b);
+    if (getCMode(o)!=OpArgN) printf(" %d",ISK(c) ? (MYK(INDEXK(c))) : c);
+    break;
+   case iABx:
+    printf("%d",a);
+    if (getBMode(o)==OpArgK) printf(" %d",MYK(bx));
+    if (getBMode(o)==OpArgU) printf(" %d",bx);
+    break;
+   case iAsBx:
+    printf("%d %d",a,sbx);
+    break;
+   case iAx:
+    printf("%d",MYK(ax));
+    break;
+  }
   switch (o)
   {
-   case OP_MOVE:
-	printf("%d %d",a,b);
-	break;
-   case OP_LOADI:
-	printf("%d %d",a,sbx);
-	break;
-   case OP_LOADF:
-	printf("%d %d",a,sbx);
-	break;
    case OP_LOADK:
-	printf("%d %d",a,bx);
+    printf("\t; "); PrintConstant(f,bx);
-	printf(COMMENT); PrintConstant(f,bx);
+    break;
-	break;
-   case OP_LOADKX:
-	printf("%d",a);
-	printf(COMMENT); PrintConstant(f,EXTRAARG);
-	break;
-   case OP_LOADFALSE:
-	printf("%d",a);
-	break;
-   case OP_LFALSESKIP:
-	printf("%d",a);
-	break;
-   case OP_LOADTRUE:
-	printf("%d",a);
-	break;
-   case OP_LOADNIL:
-	printf("%d %d",a,b);
-	printf(COMMENT "%d out",b+1);
-	break;
    case OP_GETUPVAL:
-	printf("%d %d",a,b);
-	printf(COMMENT "%s",UPVALNAME(b));
-	break;
    case OP_SETUPVAL:
-	printf("%d %d",a,b);
+    printf("\t; %s",UPVALNAME(b));
-	printf(COMMENT "%s",UPVALNAME(b));
+    break;
-	break;
    case OP_GETTABUP:
-	printf("%d %d %d",a,b,c);
+    printf("\t; %s",UPVALNAME(b));
-	printf(COMMENT "%s",UPVALNAME(b));
+    if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
-	printf(" "); PrintConstant(f,c);
+    break;
-	break;
-   case OP_GETTABLE:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_GETI:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_GETFIELD:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
    case OP_SETTABUP:
-	printf("%d %d %d%s",a,b,c,ISK);
+    printf("\t; %s",UPVALNAME(a));
-	printf(COMMENT "%s",UPVALNAME(a));
+    if (ISK(b)) { printf(" "); PrintConstant(f,INDEXK(b)); }
-	printf(" "); PrintConstant(f,b);
+    if (ISK(c)) { printf(" "); PrintConstant(f,INDEXK(c)); }
-	if (isk) { printf(" "); PrintConstant(f,c); }
+    break;
-	break;
+   case OP_GETTABLE:
-   case OP_SETTABLE:
-	printf("%d %d %d%s",a,b,c,ISK);
-	if (isk) { printf(COMMENT); PrintConstant(f,c); }
-	break;
-   case OP_SETI:
-	printf("%d %d %d%s",a,b,c,ISK);
-	if (isk) { printf(COMMENT); PrintConstant(f,c); }
-	break;
-   case OP_SETFIELD:
-	printf("%d %d %d%s",a,b,c,ISK);
-	printf(COMMENT); PrintConstant(f,b);
-	if (isk) { printf(" "); PrintConstant(f,c); }
-	break;
-   case OP_NEWTABLE:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT "%d",c+EXTRAARGC);
-	break;
    case OP_SELF:
-	printf("%d %d %d%s",a,b,c,ISK);
+    if (ISK(c)) { printf("\t; "); PrintConstant(f,INDEXK(c)); }
-	if (isk) { printf(COMMENT); PrintConstant(f,c); }
+    break;
-	break;
+   case OP_SETTABLE:
-   case OP_ADDI:
-	printf("%d %d %d",a,b,sc);
-	break;
-   case OP_ADDK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_SUBK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_MULK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_MODK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_POWK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_DIVK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_IDIVK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_BANDK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_BORK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_BXORK:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT); PrintConstant(f,c);
-	break;
-   case OP_SHRI:
-	printf("%d %d %d",a,b,sc);
-	break;
-   case OP_SHLI:
-	printf("%d %d %d",a,b,sc);
-	break;
    case OP_ADD:
-	printf("%d %d %d",a,b,c);
-	break;
    case OP_SUB:
-	printf("%d %d %d",a,b,c);
-	break;
    case OP_MUL:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_MOD:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_POW:
-	printf("%d %d %d",a,b,c);
-	break;
    case OP_DIV:
-	printf("%d %d %d",a,b,c);
+   case OP_POW:
-	break;
-   case OP_IDIV:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_BAND:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_BOR:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_BXOR:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_SHL:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_SHR:
-	printf("%d %d %d",a,b,c);
-	break;
-   case OP_MMBIN:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT "%s",eventname(c));
-	break;
-   case OP_MMBINI:
-	printf("%d %d %d %d",a,sb,c,isk);
-	printf(COMMENT "%s",eventname(c));
-	if (isk) printf(" flip");
-	break;
-   case OP_MMBINK:
-	printf("%d %d %d %d",a,b,c,isk);
-	printf(COMMENT "%s ",eventname(c)); PrintConstant(f,b);
-	if (isk) printf(" flip");
-	break;
-   case OP_UNM:
-	printf("%d %d",a,b);
-	break;
-   case OP_BNOT:
-	printf("%d %d",a,b);
-	break;
-   case OP_NOT:
-	printf("%d %d",a,b);
-	break;
-   case OP_LEN:
-	printf("%d %d",a,b);
-	break;
-   case OP_CONCAT:
-	printf("%d %d",a,b);
-	break;
-   case OP_CLOSE:
-	printf("%d",a);
-	break;
-   case OP_TBC:
-	printf("%d",a);
-	break;
-   case OP_JMP:
-	printf("%d",GETARG_sJ(i));
-	printf(COMMENT "to %d",GETARG_sJ(i)+pc+2);
-	break;
    case OP_EQ:
-	printf("%d %d %d",a,b,isk);
-	break;
    case OP_LT:
-	printf("%d %d %d",a,b,isk);
-	break;
    case OP_LE:
-	printf("%d %d %d",a,b,isk);
+    if (ISK(b) || ISK(c))
-	break;
+    {
-   case OP_EQK:
+     printf("\t; ");
-	printf("%d %d %d",a,b,isk);
+     if (ISK(b)) PrintConstant(f,INDEXK(b)); else printf("-");
-	printf(COMMENT); PrintConstant(f,b);
+     printf(" ");
-	break;
+     if (ISK(c)) PrintConstant(f,INDEXK(c)); else printf("-");
-   case OP_EQI:
+    }
-	printf("%d %d %d",a,sb,isk);
+    break;
-	break;
+   case OP_JMP:
-   case OP_LTI:
-	printf("%d %d %d",a,sb,isk);
-	break;
-   case OP_LEI:
-	printf("%d %d %d",a,sb,isk);
-	break;
-   case OP_GTI:
-	printf("%d %d %d",a,sb,isk);
-	break;
-   case OP_GEI:
-	printf("%d %d %d",a,sb,isk);
-	break;
-   case OP_TEST:
-	printf("%d %d",a,isk);
-	break;
-   case OP_TESTSET:
-	printf("%d %d %d",a,b,isk);
-	break;
-   case OP_CALL:
-	printf("%d %d %d",a,b,c);
-	printf(COMMENT);
-	if (b==0) printf("all in "); else printf("%d in ",b-1);
-	if (c==0) printf("all out"); else printf("%d out",c-1);
-	break;
-   case OP_TAILCALL:
-	printf("%d %d %d%s",a,b,c,ISK);
-	printf(COMMENT "%d in",b-1);
-	break;
-   case OP_RETURN:
-	printf("%d %d %d%s",a,b,c,ISK);
-	printf(COMMENT);
-	if (b==0) printf("all out"); else printf("%d out",b-1);
-	break;
-   case OP_RETURN0:
-	break;
-   case OP_RETURN1:
-	printf("%d",a);
-	break;
    case OP_FORLOOP:
-	printf("%d %d",a,bx);
-	printf(COMMENT "to %d",pc-bx+2);
-	break;
    case OP_FORPREP:
-	printf("%d %d",a,bx);
-	printf(COMMENT "exit to %d",pc+bx+3);
-	break;
-   case OP_TFORPREP:
-	printf("%d %d",a,bx);
-	printf(COMMENT "to %d",pc+bx+2);
-	break;
-   case OP_TFORCALL:
-	printf("%d %d",a,c);
-	break;
    case OP_TFORLOOP:
-	printf("%d %d",a,bx);
+    printf("\t; to %d",sbx+pc+2);
-	printf(COMMENT "to %d",pc-bx+2);
+    break;
-	break;
-   case OP_SETLIST:
-	printf("%d %d %d",a,b,c);
-	if (isk) printf(COMMENT "%d",c+EXTRAARGC);
-	break;
    case OP_CLOSURE:
-	printf("%d %d",a,bx);
+    printf("\t; %p",VOID(f->p[bx]));
-	printf(COMMENT "%p",VOID(f->p[bx]));
+    break;
-	break;
+   case OP_SETLIST:
-   case OP_VARARG:
+    if (c==0) printf("\t; %d",(int)code[++pc]); else printf("\t; %d",c);
-	printf("%d %d",a,c);
+    break;
-	printf(COMMENT);
-	if (c==0) printf("all out"); else printf("%d out",c-1);
-	break;
-   case OP_VARARGPREP:
-	printf("%d",a);
-	break;
    case OP_EXTRAARG:
-	printf("%d",ax);
+    printf("\t; "); PrintConstant(f,ax);
-	break;
+    break;
-#if 0
    default:
-	printf("%d %d %d",a,b,c);
+    break;
-	printf(COMMENT "not handled");
-	break;
-#endif
   }
   printf("\n");
  }
 }
 
-
 #define SS(x)	((x==1)?"":"s")
 #define S(x)	(int)(x),SS(x)
 
@@ -675,7 +385,7 @@ static void PrintHeader(const Proto* f)
  else
   s="(string)";
  printf("\n%s <%s:%d,%d> (%d instruction%s at %p)\n",
-	(f->linedefined==0)?"main":"function",s,
+ 	(f->linedefined==0)?"main":"function",s,
 	f->linedefined,f->lastlinedefined,
 	S(f->sizecode),VOID(f));
  printf("%d%s param%s, %d slot%s, %d upvalue%s, ",
@@ -692,8 +402,7 @@ static void PrintDebug(const Proto* f)
  printf("constants (%d) for %p:\n",n,VOID(f));
  for (i=0; i<n; i++)
  {
-  printf("\t%d\t",i);
+  printf("\t%d\t",i+1);
-  PrintType(f,i);
   PrintConstant(f,i);
   printf("\n");
  }

lib/lua/lualib.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lualib.h $
+** $Id: lualib.h,v 1.43.1.1 2013/04/12 18:48:47 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"
+#define LUA_BITLIBNAME	"bit32"
-LUAMOD_API int (luaopen_utf8) (lua_State *L);
+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

lib/lua/lundump.c

@@ -1,18 +1,14 @@
 /*
-** $Id: lundump.c $
+** $Id: lundump.c,v 2.22.1.1 2013/04/12 18:48:47 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;
+ lua_State* L;
-  ZIO *Z;
+ ZIO* Z;
-  const char *name;
+ Mbuffer* b;
+ const char* name;
 } LoadState;
 
-
+static l_noret error(LoadState* S, const char* why)
-static l_noret error (LoadState *S, const char *why) {
+{
-  luaO_pushfstring(S->L, "%s: bad binary format (%s)", S->name, why);
+ luaO_pushfstring(S->L,"%s: %s precompiled chunk",S->name,why);
-  luaD_throw(S->L, LUA_ERRSYNTAX);
+ 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
+** load precompiled chunk
-** adapt to the endianness of the input
 */
-#define loadVector(S,b,n)	loadBlock(S,b,(n)*sizeof((b)[0]))
+Closure* luaU_undump (lua_State* L, ZIO* Z, Mbuffer* buff, const char* name)
-
+{
-static void loadBlock (LoadState *S, void *b, size_t size) {
+ LoadState S;
-  if (luaZ_read(S->Z, b, size) != 0)
+ Closure* cl;
-    error(S, "truncated chunk");
+ if (*name=='@' || *name=='=')
-}
+  S.name=name+1;
-
+ else if (*name==LUA_SIGNATURE[0])
-
+  S.name="binary string";
-#define loadVar(S,x)		loadVector(S,&x,1)
+ else
-
+  S.name=name;
-
+ S.L=L;
-static lu_byte loadByte (LoadState *S) {
+ S.Z=Z;
-  int b = zgetc(S->Z);
+ S.b=buff;
-  if (b == EOZ)
+ LoadHeader(&S);
-    error(S, "truncated chunk");
+ cl=luaF_newLclosure(L,1);
-  return cast_byte(b);
+ 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)
-static size_t loadUnsigned (LoadState *S, size_t limit) {
+ {
-  size_t x = 0;
+  Proto* p=cl->l.p;
-  int b;
+  cl=luaF_newLclosure(L,cl->l.p->sizeupvalues);
-  limit >>= 7;
+  cl->l.p=p;
-  do {
+  setclLvalue(L,L->top-1,cl);
-    b = loadByte(S);
+ }
-    if (x >= limit)
+ luai_verifycode(L,buff,cl->l.p);
-      error(S, "integer overflow");
+ return cl;
-    x = (x << 7) | (b & 0x7f);
-  } while ((b & 0x80) == 0);
-  return x;
-}
-
-
-static size_t loadSize (LoadState *S) {
-  return loadUnsigned(S, MAX_SIZET);
-}
-
-
-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;
 }
 
+#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) {
+void luaU_header (lu_byte* h)
-  lua_State *L = S->L;
+{
-  TString *ts;
+ int x=1;
-  size_t size = loadSize(S);
+ memcpy(h,LUA_SIGNATURE,sizeof(LUA_SIGNATURE)-sizeof(char));
-  if (size == 0)  /* no string? */
+ h+=sizeof(LUA_SIGNATURE)-sizeof(char);
-    return NULL;
+ *h++=cast_byte(VERSION);
-  else if (--size <= LUAI_MAXSHORTLEN) {  /* short string? */
+ *h++=cast_byte(FORMAT);
-    char buff[LUAI_MAXSHORTLEN];
+ *h++=cast_byte(*(char*)&x);			/* endianness */
-    loadVector(S, buff, size);  /* load string into buffer */
+ *h++=cast_byte(sizeof(int));
-    ts = luaS_newlstr(L, buff, size);  /* create string */
+ *h++=cast_byte(sizeof(size_t));
-  }
+ *h++=cast_byte(sizeof(Instruction));
-  else {  /* long string */
+ *h++=cast_byte(sizeof(lua_Number));
-    ts = luaS_createlngstrobj(L, size);  /* create string */
+ *h++=cast_byte(((lua_Number)0.5)==0);		/* is lua_Number integral? */
-    setsvalue2s(L, L->top.p, ts);  /* anchor it ('loadVector' can GC) */
+ memcpy(h,LUAC_TAIL,sizeof(LUAC_TAIL)-sizeof(char));
-    luaD_inctop(L);
-    loadVector(S, getlngstr(ts), size);  /* load directly in final place */
-    L->top.p--;  /* pop string */
-  }
-  luaC_objbarrier(L, p, ts);
-  return ts;
 }
-
-
-/*
-** 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;
-}
-

lib/lua/lundump.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lundump.h $
+** $Id: lundump.h,v 1.39.1.1 2013/04/12 18:48:47 roberto Exp $
 ** load precompiled Lua chunks
 ** See Copyright Notice in lua.h
 */
@@ -7,29 +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 LUAC_VERSION  (((LUA_VERSION_NUM / 100) * 16) + LUA_VERSION_NUM % 100)
-
-#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,
+LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w, void* data, int strip);
-                         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

lib/lua/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;
-}
-

lib/lua/lvm.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.h $
+** $Id: lvm.h,v 2.18.1.1 2013/04/12 18:48:47 roberto Exp $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -13,129 +13,32 @@
 #include "ltm.h"
 
 
-#if !defined(LUA_NOCVTN2S)
+#define tostring(L,o) (ttisstring(o) || (luaV_tostring(L, o)))
-#define cvt2str(o)	ttisnumber(o)
+
-#else
+#define tonumber(o,n)	(ttisnumber(o) || (((o) = luaV_tonumber(o,n)) != NULL))
-#define cvt2str(o)	0	/* no conversion from numbers to strings */
+
-#endif
+#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)
+/* not to called directly */
-#define cvt2num(o)	ttisstring(o)
+LUAI_FUNC int luaV_equalobj_ (lua_State *L, const TValue *t1, const TValue *t2);
-#else
-#define cvt2num(o)	0	/* no conversion from strings to numbers */
-#endif
 
 
-/*
-** 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 const TValue *luaV_tonumber (const TValue *obj, TValue *n);
-LUAI_FUNC int luaV_tointeger (const TValue *obj, lua_Integer *p, F2Imod mode);
+LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
-LUAI_FUNC int luaV_tointegerns (const TValue *obj, lua_Integer *p,
+LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key,
-                                F2Imod mode);
+                                            StkId val);
-LUAI_FUNC int luaV_flttointeger (lua_Number n, lua_Integer *p, F2Imod mode);
+LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key,
-LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
+                                            StkId val);
-                               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 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 void luaV_arith (lua_State *L, StkId ra, const TValue *rb,
-LUAI_FUNC lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y);
+                           const TValue *rc, TMS op);
-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_objlen (lua_State *L, StkId ra, const TValue *rb);
 
 #endif

lib/lua/lzio.c

@@ -1,17 +1,15 @@
 /*
-** $Id: lzio.c $
+** $Id: lzio.c,v 1.35.1.1 2013/04/12 18:48:47 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;
+}
+
+

lib/lua/lzio.h

@@ -1,5 +1,5 @@
 /*
-** $Id: lzio.h $
+** $Id: lzio.h,v 1.26.1.1 2013/04/12 18:48:47 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, \
+	(luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
-				(buff)->buffsize, size), \
 	(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) */
 };
 

lib/lua_cj_api.cpp

@@ -1,4 +1,9 @@
 #include "lua_cj_api.h"
+#include <new>
+
+// Lua 5.2/5.1 无 lua_getextraspace，改用 Registry 固定索引存储 iopath 指针
+#define IOPATH_REG_IDX  1
+
 extern "C"
 {
     #include <string.h>
@@ -351,15 +356,36 @@ int cleanup(void *selfd)
 int free_lua(void *selfd)
 {
     lua_runner* self = (lua_runner*)selfd;
+    // 释放 Registry 中的 iopath（若存在）
+    Lua_runner *runner = (Lua_runner*)self->lua_obj;
+    if (runner != NULL) {
+        lua_State *L = runner->get_lua_State();
+        if (L != NULL) {
+            lua_rawgeti(L, LUA_REGISTRYINDEX, IOPATH_REG_IDX);
+            iopath *p = (iopath*)lua_touserdata(L, -1);
+            lua_pop(L, 1);
+            delete p;  // NULL 也安全
+        }
+    }
     delete((Lua_runner*)self->lua_obj);
     free(self);
     return 0;
 }
 
 /*-------------重定向io操作------------------------*/
+/* Lua 5.2/5.1 无 lua_getextraspace，改用 Registry 固定索引存储 iopath 指针 */
+
+static iopath *get_iopath(lua_State *L)
+{
+    lua_rawgeti(L, LUA_REGISTRYINDEX, IOPATH_REG_IDX);
+    iopath *r = (iopath *)lua_touserdata(L, -1);
+    lua_pop(L, 1);
+    return r;
+}
+
 static const char *full_path(lua_State *L, int isOut)
 {
-    iopath *r = (iopath *)lua_getextraspace(L);
+    iopath *r = get_iopath(L);
     static char buf[512];
     snprintf(buf, sizeof(buf), "%s/%s", r->iopath, isOut ? "output" : "input");
     return buf;
@@ -368,7 +394,7 @@ static const char *full_path(lua_State *L, int isOut)
 //劫持读取终端输入，触发回调
 static int l_tty_read(lua_State *L)
 {
-    iopath *r = (iopath *)lua_getextraspace(L);
+    iopath *r = get_iopath(L);
     if (r->funcs.io_input) r->funcs.io_input();
     const char *fname = full_path(L, 0);
     FILE *fp = fopen(fname, "rb");
@@ -394,7 +420,7 @@ static int l_tty_read(lua_State *L)
 //劫持到终端输出，输出结束触发回调
 static int l_tty_write(lua_State *L)
 {
-    iopath *r = (iopath *)lua_getextraspace(L);
+    iopath *r = get_iopath(L);
     const char *fname = full_path(L, 1);
     FILE *fp = fopen(fname, "a");
     if (!fp) return luaL_error(L, "tty write open fail: %s", fname);
@@ -406,7 +432,7 @@ static int l_tty_write(lua_State *L)
     return 0;
 }
 static int l_print(lua_State *L) {
-    iopath *r = (iopath *)lua_getextraspace(L);
+    iopath *r = get_iopath(L);
     const char *fname = full_path(L, 1);  // 输出到 output 文件
     FILE *fp = fopen(fname, "a");
     if (!fp) return luaL_error(L, "print redirect open fail: %s", fname);
@@ -475,7 +501,7 @@ int redirecct_path(lua_State *L)
         errno = LUAERR_LUA_STATE;
         return -1;
     }
-    iopath *p = (iopath*)lua_getextraspace(L);
+    iopath *p = get_iopath(L);
     static const luaL_Reg fake_methods[] = {
         {"read",   l_tty_read},
         {"write",  l_tty_write},
@@ -547,15 +573,16 @@ void *init_lua_runner(const char *pathio,const char *pkgpath,int(*input)(),int(*
         errno = LUAERR_LUA_STATE;
         return NULL;
     }
-    iopath *io_path = (iopath*)lua_getextraspace(L);
+    // Lua 5.2/5.1 无 extraspace：new 一个 iopath 存入 Registry
-    //申请额外空间
+    iopath *io_path = new (std::nothrow) iopath();
     if(pathio == NULL)
     {
+        delete io_path;
         goto WITHOUT_REDIRECT;
     }
     
     if(io_path == NULL){
-        errno = LUAERR_CALLBACK;
+        errno = LUAERR_CLASS_LOST;
         return NULL;
     }
 
@@ -564,6 +591,9 @@ void *init_lua_runner(const char *pathio,const char *pkgpath,int(*input)(),int(*
     io_path->funcs.io_output = output;
     //装载重定向路径
     strcpy(io_path->iopath,pathio);
+    //存入 Registry 固定索引供回调取用
+    lua_pushlightuserdata(L, (void*)io_path);
+    lua_rawseti(L, LUA_REGISTRYINDEX, IOPATH_REG_IDX);
     //注册重定向
     if(redirecct_path(L)==-1){
         errno = LUAERR_LUA_STATE;

lib/lua_runner.cpp

@@ -329,7 +329,8 @@ void Lua_runner::capture_result()
         break;
     case LUA_TNUMBER:
     {
-        // lua_isinteger 区分整型和浮点型
+#if LUA_VERSION_NUM >= 503
+        // lua_isinteger 区分整型和浮点型（5.3+ 才有）
         if (lua_isinteger(this->L, -1))
         {
             this->last_result_type = CJT_INT;
@@ -338,7 +339,9 @@ void Lua_runner::capture_result()
             this->last_result_bool = this->last_result_int != 0;
         }
         else
+#endif
         {
+            // 5.2 及以下无 integer 子类型，所有数字按 number 处理
             this->last_result_type = CJT_NUM;
             this->last_result_num = lua_tonumber(this->L, -1);
             this->last_result_int = (long long)this->last_result_num;

src/lua_runner_test.cj

@@ -207,7 +207,11 @@ func testLoadLibOverflow(): Unit {
 func testPackagePathConfig(): Unit {
     let runner = LuaRunner(pkgpath: SCRIPTS_DIR + "/pkgmods/?.lua")
     let res = runner.runScript(scriptPath("pkgpath_require_mylib.lua"), "")
-    @Expect(res, SCRIPTS_DIR + "/pkgmods/mylib.lua")
+    // 跨版本语义：Lua 5.4+ 的 require 返回 2 值，run() 读栈顶得 loader data（文件路径）；
+    // Lua ≤5.3 返回 1 值，得模块本身（"pkgmod-mylib"）。两者都表明 pkgpath 生效。
+    let isPath = res == SCRIPTS_DIR + "/pkgmods/mylib.lua"
+    let isModule = res == "LoadedViaPkgPath"
+    @Expect(isPath || isModule, true)
 }
 
 @Test

test/test_lua_cj_api.cpp

@@ -282,7 +282,12 @@ TEST_F(LuaCjApiTest, PackagePathConfig) {
     
     EXPECT_EQ(ret, 0) << "Require failed, maybe pkgpath not set correctly. Errno: " << get_errno();
     char* res = getresult(runner);
-    EXPECT_STREQ(res, lib_path.c_str());
+    // 跨版本语义适配：
+    //  - Lua 5.3 的 require 返回 1 个值（模块本身），run() 读栈顶得模块返回值 "LoadedViaPkgPath"
+    //  - Lua 5.4+ 的 require 返回 2 个值（模块 + loader data），run() 读栈顶得 loader data（文件路径）
+    // 两者都表明 require 经 pkgpath 成功定位并加载了模块
+    EXPECT_TRUE(strcmp(res, lib_path.c_str()) == 0 || strcmp(res, "LoadedViaPkgPath") == 0)
+        << "unexpected require result: " << (res ? res : "(null)");
 }
 
 // ==================== 新增测试：doString 功能 ====================
@@ -487,13 +492,21 @@ TEST_F(LuaCjApiTest, CallFunctionAfterCleanup) {
 }
 
 // ==================== typed interop 测试（v0.2.2）====================
+// 版本自适应：Lua 5.3+ 有 integer 子类型（CJT_INT），5.2 及以下所有数字均为
+// number（CJT_NUM）。数值断言用 INT_OR_NUM 宏兼容两种情况。
+#if LUA_VERSION_NUM >= 503
+#define EXPECT_INT_OR_NUM(type) EXPECT_EQ(type, CJT_INT)
+#else
+// 5.2 及以下：整型结果也报为 CJT_NUM，且 lua_tostring(10.0) 输出 "10"
+#define EXPECT_INT_OR_NUM(type) EXPECT_EQ(type, CJT_NUM)
+#endif
 
 // 整型参数直通：Lua 收到 integer，返回 integer+1，仓颉侧读回 Int64
 TEST_F(LuaCjApiTest, TypedCallInt) {
     ASSERT_EQ(loadfunction(runner, get_script_path("func_typed_add.lua").c_str(), "inc"), 0);
 
     EXPECT_EQ(callfunction_int(runner, "inc", 41), 0);
-    EXPECT_EQ(result_type(runner), CJT_INT);
+    EXPECT_INT_OR_NUM(result_type(runner));
     EXPECT_EQ(result_int(runner), 42);
     // 字符串形式同步可用（向后兼容）
     EXPECT_STREQ(getresult(runner), "42");
@@ -506,7 +519,12 @@ TEST_F(LuaCjApiTest, TypedCallNum) {
     EXPECT_EQ(callfunction_num(runner, "mul", 4.0), 0);
     EXPECT_EQ(result_type(runner), CJT_NUM);
     EXPECT_DOUBLE_EQ(result_num(runner), 10.0);
+#if LUA_VERSION_NUM >= 503
     EXPECT_STREQ(getresult(runner), "10.0");
+#else
+    // 5.2 的 %.14g 格式化把 10.0 输出为 "10"
+    EXPECT_STREQ(getresult(runner), "10");
+#endif
 }
 
 // 布尔参数直通：返回逻辑非，读回 Bool
@@ -529,7 +547,7 @@ TEST_F(LuaCjApiTest, TypedCallVoid) {
     ASSERT_EQ(loadfunction(runner, get_script_path("func_typed_void.lua").c_str(), "forty_two"), 0);
 
     EXPECT_EQ(callfunction_void(runner, "forty_two"), 0);
-    EXPECT_EQ(result_type(runner), CJT_INT);
+    EXPECT_INT_OR_NUM(result_type(runner));
     EXPECT_EQ(result_int(runner), 42);
 }
 
@@ -539,13 +557,21 @@ TEST_F(LuaCjApiTest, TypedEchoRoundTrip) {
 
     // int 往返
     EXPECT_EQ(callfunction_int(runner, "echo", -123456789LL), 0);
-    EXPECT_EQ(result_type(runner), CJT_INT);
+    EXPECT_INT_OR_NUM(result_type(runner));
     EXPECT_EQ(result_int(runner), -123456789LL);
 
-    // 大整数（超过 double 精确表示范围）往返
+    // 大整数（超过 double 精确表示范围）往返：
+    // 仅 Lua 5.3+（integer 类型）可保真；5.2 及以下经 double 必然丢精度
+#if LUA_VERSION_NUM >= 503
     EXPECT_EQ(callfunction_int(runner, "echo", 9007199254740993LL), 0);
-    EXPECT_EQ(result_type(runner), CJT_INT);
+    EXPECT_INT_OR_NUM(result_type(runner));
     EXPECT_EQ(result_int(runner), 9007199254740993LL);
+#else
+    EXPECT_EQ(callfunction_int(runner, "echo", 9007199254740993LL), 0);
+    EXPECT_EQ(result_type(runner), CJT_NUM);
+    // 经 double 往返，精度丢失为可预期值
+    EXPECT_EQ(result_int(runner), (long long)(double)9007199254740993LL);
+#endif
 
     // num 往返
     EXPECT_EQ(callfunction_num(runner, "echo", 3.14159), 0);
@@ -592,7 +618,7 @@ TEST_F(LuaCjApiTest, TypedRunVariants) {
 
     // int
     EXPECT_EQ(run_int(runner, path.c_str(), 777), 0);
-    EXPECT_EQ(result_type(runner), CJT_INT);
+    EXPECT_INT_OR_NUM(result_type(runner));
     EXPECT_EQ(result_int(runner), 777);
 
     // num
@@ -638,7 +664,7 @@ TEST_F(LuaCjApiTest, TypedAndStringCoexist) {
 TEST_F(LuaCjApiTest, TypedStateAfterCleanup) {
     ASSERT_EQ(loadfunction(runner, get_script_path("func_typed_void.lua").c_str(), "v"), 0);
     EXPECT_EQ(callfunction_void(runner, "v"), 0);
-    EXPECT_EQ(result_type(runner), CJT_INT);
+    EXPECT_INT_OR_NUM(result_type(runner));
 
     EXPECT_EQ(cleanup(runner), 0);