1 files changed, 446 insertions, 232 deletions

diff --git a/apps/plugins/lua/luaconf.h b/apps/plugins/lua/luaconf.h
index ed83e8f640..109e680a17 100644
--- a/apps/plugins/lua/luaconf.h
+++ b/apps/plugins/lua/luaconf.h
@@ -1,5 +1,5 @@
 /*
-** $Id: luaconf.h,v 1.176.1.1 2013/04/12 18:48:47 roberto Exp $
+** $Id$
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
@@ -24,44 +24,30 @@
 ** CHANGE it (define it) if you want Lua to avoid the use of any
 ** non-ansi feature or library.
 */
-#if !defined(LUA_ANSI) && defined(__STRICT_ANSI__)
+#if defined(__STRICT_ANSI__)
 #define LUA_ANSI
 #endif
 
 
-#if !defined(LUA_ANSI) && defined(_WIN32) && !defined(_WIN32_WCE)
-#define LUA_WIN         /* enable goodies for regular Windows platforms */
+#if !defined(LUA_ANSI) && defined(_WIN32)
+#define LUA_WIN
 #endif
 
-#if defined(LUA_WIN)
-#define LUA_DL_DLL
-#define LUA_USE_AFORMAT         /* assume 'printf' handles 'aA' specifiers */
-#endif
-
-
-
 #if defined(LUA_USE_LINUX)
 #define LUA_USE_POSIX
 #define LUA_USE_DLOPEN          /* needs an extra library: -ldl */
 #define LUA_USE_READLINE        /* needs some extra libraries */
-#define LUA_USE_STRTODHEX       /* assume 'strtod' handles hex formats */
-#define LUA_USE_AFORMAT         /* assume 'printf' handles 'aA' specifiers */
-#define LUA_USE_LONGLONG        /* assume support for long long */
 #endif
 
 #if defined(LUA_USE_MACOSX)
 #define LUA_USE_POSIX
-#define LUA_USE_DLOPEN          /* does not need -ldl */
-#define LUA_USE_READLINE        /* needs an extra library: -lreadline */
-#define LUA_USE_STRTODHEX       /* assume 'strtod' handles hex formats */
-#define LUA_USE_AFORMAT         /* assume 'printf' handles 'aA' specifiers */
-#define LUA_USE_LONGLONG        /* assume support for long long */
+#define LUA_DL_DYLD             /* does not need extra library */
 #endif
 
 
 
 /*
-@@ LUA_USE_POSIX includes all functionality listed as X/Open System
+@@ LUA_USE_POSIX includes all functionallity listed as X/Open System
 @* Interfaces Extension (XSI).
 ** CHANGE it (define it) if your system is XSI compatible.
 */
@@ -70,10 +56,20 @@
 #define LUA_USE_ISATTY
 #define LUA_USE_POPEN
 #define LUA_USE_ULONGJMP
-#define LUA_USE_GMTIME_R
 #endif
 
 
+/*
+@@ LUA_PATH and LUA_CPATH are the names of the environment variables that
+@* Lua check to set its paths.
+@@ LUA_INIT is the name of the environment variable that Lua
+@* checks for initialization code.
+** CHANGE them if you want different names.
+*/
+#define LUA_PATH        "LUA_PATH"
+#define LUA_CPATH       "LUA_CPATH"
+#define LUA_INIT        "LUA_INIT"
+
 
 /*
 @@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
@@ -84,7 +80,7 @@
 ** hierarchy or if you want to install your libraries in
 ** non-conventional directories.
 */
-#if defined(_WIN32)     /* { */
+#if defined(_WIN32)
 /*
 ** In Windows, any exclamation mark ('!') in the path is replaced by the
 ** path of the directory of the executable file of the current process.
@@ -92,23 +88,21 @@
 #define LUA_LDIR        "!\\lua\\"
 #define LUA_CDIR        "!\\"
 #define LUA_PATH_DEFAULT  \
-                LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
-                LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" ".\\?.lua"
+                ".\\?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
+                             LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua"
 #define LUA_CPATH_DEFAULT \
-                LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
+        ".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
 
-#else                   /* }{ */
-
-#define LUA_VDIR        LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+#else
 #define LUA_ROOT        "/usr/local/"
-#define LUA_LDIR        LUA_ROOT "share/lua/" LUA_VDIR
-#define LUA_CDIR        LUA_ROOT "lib/lua/" LUA_VDIR
+#define LUA_LDIR        LUA_ROOT "share/lua/5.1/"
+#define LUA_CDIR        LUA_ROOT "lib/lua/5.1/"
 #define LUA_PATH_DEFAULT  \
-                LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
-                LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" "./?.lua"
+                "./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+                            LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
 #define LUA_CPATH_DEFAULT \
-                LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
-#endif                  /* } */
+        "./?.so;"  LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+#endif
 
 
 /*
@@ -124,67 +118,79 @@
 
 
 /*
-@@ LUA_ENV is the name of the variable that holds the current
-@@ environment, used to access global names.
-** CHANGE it if you do not like this name.
+@@ LUA_PATHSEP is the character that separates templates in a path.
+@@ LUA_PATH_MARK is the string that marks the substitution points in a
+@* template.
+@@ LUA_EXECDIR in a Windows path is replaced by the executable's
+@* directory.
+@@ LUA_IGMARK is a mark to ignore all before it when bulding the
+@* luaopen_ function name.
+** CHANGE them if for some reason your system cannot use those
+** characters. (E.g., if one of those characters is a common character
+** in file/directory names.) Probably you do not need to change them.
+*/
+#define LUA_PATHSEP     ";"
+#define LUA_PATH_MARK   "?"
+#define LUA_EXECDIR     "!"
+#define LUA_IGMARK      "-"
+
+
+/*
+@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
+** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
+** machines, ptrdiff_t gives a good choice between int or long.)
 */
-#define LUA_ENV         "_ENV"
+#define LUA_INTEGER     ptrdiff_t
 
 
 /*
 @@ LUA_API is a mark for all core API functions.
-@@ LUALIB_API is a mark for all auxiliary library functions.
-@@ LUAMOD_API is a mark for all standard library opening functions.
+@@ LUALIB_API is a mark for all standard library functions.
 ** CHANGE them if you need to define those functions in some special way.
 ** For instance, if you want to create one Windows DLL with the core and
 ** the libraries, you may want to use the following definition (define
 ** LUA_BUILD_AS_DLL to get it).
 */
-#if defined(LUA_BUILD_AS_DLL)   /* { */
+#if defined(LUA_BUILD_AS_DLL)
 
-#if defined(LUA_CORE) || defined(LUA_LIB)       /* { */
+#if defined(LUA_CORE) || defined(LUA_LIB)
 #define LUA_API __declspec(dllexport)
-#else                                           /* }{ */
+#else
 #define LUA_API __declspec(dllimport)
-#endif                                          /* } */
+#endif
 
-#else                           /* }{ */
+#else
 
 #define LUA_API         extern
 
-#endif                          /* } */
-
+#endif
 
 /* more often than not the libs go together with the core */
 #define LUALIB_API      LUA_API
-#define LUAMOD_API      LUALIB_API
 
 
 /*
 @@ LUAI_FUNC is a mark for all extern functions that are not to be
 @* exported to outside modules.
-@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables
-@* that are not to be exported to outside modules (LUAI_DDEF for
-@* definitions and LUAI_DDEC for declarations).
+@@ LUAI_DATA is a mark for all extern (const) variables that are not to
+@* be exported to outside modules.
 ** CHANGE them if you need to mark them in some special way. Elf/gcc
 ** (versions 3.2 and later) mark them as "hidden" to optimize access
-** when Lua is compiled as a shared library. Not all elf targets support
-** this attribute. Unfortunately, gcc does not offer a way to check
-** whether the target offers that support, and those without support
-** give a warning about it. To avoid these warnings, change to the
-** default definition.
-*/
-#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
-    defined(__ELF__)            /* { */
+** when Lua is compiled as a shared library.
+*/
+#if defined(luaall_c)
+#define LUAI_FUNC       static
+#define LUAI_DATA       /* empty */
+
+#elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
+      defined(__ELF__)
 #define LUAI_FUNC       __attribute__((visibility("hidden"))) extern
-#define LUAI_DDEC       LUAI_FUNC
-#define LUAI_DDEF       /* empty */
+#define LUAI_DATA       LUAI_FUNC
 
-#else                           /* }{ */
+#else
 #define LUAI_FUNC       extern
-#define LUAI_DDEC       extern
-#define LUAI_DDEF       /* empty */
-#endif                          /* } */
+#define LUAI_DATA       extern
+#endif
 
 
 
@@ -205,108 +211,175 @@
 
 
 /*
-@@ luai_writestring/luai_writeline define how 'print' prints its results.
-** They are only used in libraries and the stand-alone program. (The #if
-** avoids including 'stdio.h' everywhere.)
+** {==================================================================
+** Stand-alone configuration
+** ===================================================================
 */
-#if defined(LUA_LIB) || defined(lua_c)
-#define luai_writestring(s,l)   DEBUGF("%s", (s))
-#define luai_writeline()        luai_writestring("\n", 1)
-#endif
+
+#if defined(lua_c) || defined(luaall_c)
 
 /*
-@@ luai_writestringerror defines how to print error messages.
-** (A format string with one argument is enough for Lua...)
+@@ lua_stdin_is_tty detects whether the standard input is a 'tty' (that
+@* is, whether we're running lua interactively).
+** CHANGE it if you have a better definition for non-POSIX/non-Windows
+** systems.
 */
-#define luai_writestringerror(s,p) \
-        (fprintf(stderr, (s), (p)), fflush(stderr))
+#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
 
 
 /*
-@@ LUAI_MAXSHORTLEN is the maximum length for short strings, that is,
-** strings that are internalized. (Cannot be smaller than reserved words
-** or tags for metamethods, as these strings must be internalized;
-** #("function") = 8, #("__newindex") = 10.)
+@@ LUA_PROMPT is the default prompt used by stand-alone Lua.
+@@ LUA_PROMPT2 is the default continuation prompt used by stand-alone Lua.
+** CHANGE them if you want different prompts. (You can also change the
+** prompts dynamically, assigning to globals _PROMPT/_PROMPT2.)
 */
-#define LUAI_MAXSHORTLEN        40
-
+#define LUA_PROMPT              "> "
+#define LUA_PROMPT2             ">> "
 
 
 /*
-** {==================================================================
-** Compatibility with previous versions
-** ===================================================================
+@@ LUA_PROGNAME is the default name for the stand-alone Lua program.
+** CHANGE it if your stand-alone interpreter has a different name and
+** your system is not able to detect that name automatically.
 */
+#define LUA_PROGNAME            "lua"
+
 
 /*
-@@ LUA_COMPAT_ALL controls all compatibility options.
-** You can define it to get all options, or change specific options
-** to fit your specific needs.
+@@ LUA_MAXINPUT is the maximum length for an input line in the
+@* stand-alone interpreter.
+** CHANGE it if you need longer lines.
 */
-#if defined(LUA_COMPAT_ALL)     /* { */
+#define LUA_MAXINPUT    512
+
 
 /*
-@@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'.
-** You can replace it with 'table.unpack'.
+@@ 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.
+** CHANGE them if you want to improve this functionality (e.g., by using
+** GNU readline and history facilities).
 */
-#define LUA_COMPAT_UNPACK
+#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_strlen(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))
+#else
+#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
+
+#endif
+
+/* }================================================================== */
+
 
 /*
-@@ LUA_COMPAT_LOADERS controls the presence of table 'package.loaders'.
-** You can replace it with 'package.searchers'.
+@@ LUAI_GCPAUSE defines the default pause between garbage-collector cycles
+@* as a percentage.
+** CHANGE it if you want the GC to run faster or slower (higher values
+** mean larger pauses which mean slower collection.) You can also change
+** this value dynamically.
 */
-#define LUA_COMPAT_LOADERS
+#define LUAI_GCPAUSE    200  /* 200% (wait memory to double before next GC) */
+
 
 /*
-@@ macro 'lua_cpcall' emulates deprecated function lua_cpcall.
-** You can call your C function directly (with light C functions).
+@@ LUAI_GCMUL defines the default speed of garbage collection relative to
+@* memory allocation as a percentage.
+** CHANGE it if you want to change the granularity of the garbage
+** collection. (Higher values mean coarser collections. 0 represents
+** infinity, where each step performs a full collection.) You can also
+** change this value dynamically.
 */
-#define lua_cpcall(L,f,u)  \
-        (lua_pushcfunction(L, (f)), \
-         lua_pushlightuserdata(L,(u)), \
-         lua_pcall(L,1,0,0))
+#define LUAI_GCMUL      200 /* GC runs 'twice the speed' of memory allocation */
+
 
 
 /*
-@@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library.
-** You can rewrite 'log10(x)' as 'log(x, 10)'.
+@@ LUA_COMPAT_GETN controls compatibility with old getn behavior.
+** CHANGE it (define it) if you want exact compatibility with the
+** behavior of setn/getn in Lua 5.0.
 */
-#define LUA_COMPAT_LOG10
+#undef LUA_COMPAT_GETN
 
 /*
-@@ LUA_COMPAT_LOADSTRING defines the function 'loadstring' in the base
-** library. You can rewrite 'loadstring(s)' as 'load(s)'.
+@@ LUA_COMPAT_LOADLIB controls compatibility about global loadlib.
+** CHANGE it to undefined as soon as you do not need a global 'loadlib'
+** function (the function is still available as 'package.loadlib').
 */
-#define LUA_COMPAT_LOADSTRING
+#undef LUA_COMPAT_LOADLIB
 
 /*
-@@ LUA_COMPAT_MAXN defines the function 'maxn' in the table library.
+@@ LUA_COMPAT_VARARG controls compatibility with old vararg feature.
+** CHANGE it to undefined as soon as your programs use only '...' to
+** access vararg parameters (instead of the old 'arg' table).
 */
-#define LUA_COMPAT_MAXN
+#undef LUA_COMPAT_VARARG
 
 /*
-@@ The following macros supply trivial compatibility for some
-** changes in the API. The macros themselves document how to
-** change your code to avoid using them.
+@@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
+** CHANGE it to undefined as soon as your programs use 'math.fmod' or
+** the new '%' operator instead of 'math.mod'.
 */
-#define lua_strlen(L,i)         lua_rawlen(L, (i))
+#undef LUA_COMPAT_MOD
 
-#define lua_objlen(L,i)         lua_rawlen(L, (i))
+/*
+@@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
+@* facility.
+** CHANGE it to 2 if you want the old behaviour, or undefine it to turn
+** off the advisory error when nesting [[...]].
+*/
+#undef LUA_COMPAT_LSTR
 
-#define lua_equal(L,idx1,idx2)          lua_compare(L,(idx1),(idx2),LUA_OPEQ)
-#define lua_lessthan(L,idx1,idx2)       lua_compare(L,(idx1),(idx2),LUA_OPLT)
+/*
+@@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
+** CHANGE it to undefined as soon as you rename 'string.gfind' to
+** 'string.gmatch'.
+*/
+#undef LUA_COMPAT_GFIND
 
 /*
-@@ LUA_COMPAT_MODULE controls compatibility with previous
-** module functions 'module' (Lua) and 'luaL_register' (C).
+@@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
+@* behavior.
+** CHANGE it to undefined as soon as you replace to 'luaL_registry'
+** your uses of 'luaL_openlib'
 */
-#define LUA_COMPAT_MODULE
+#undef LUA_COMPAT_OPENLIB
 
-#endif                          /* } */
-#define LUA_COMPAT_MODULE
 
-/* }================================================================== */
 
+/*
+@@ luai_apicheck is the assert macro used by the Lua-C API.
+** CHANGE luai_apicheck if you want Lua to perform some checks in the
+** parameters it gets from API calls. This may slow down the interpreter
+** a bit, but may be quite useful when debugging C code that interfaces
+** with Lua. A useful redefinition is to use assert.h.
+*/
+#if defined(LUA_USE_APICHECK)
+#include <assert.h>
+#define luai_apicheck(L,o)      { (void)L; assert(o); }
+#else
+#define luai_apicheck(L,o)      { (void)L; }
+#endif
 
 
 /*
@@ -315,65 +388,108 @@
 ** your machine. Probably you do not need to change this.
 */
 /* avoid overflows in comparison */
-#if INT_MAX-20 < 32760          /* { */
+#if INT_MAX-20 < 32760
 #define LUAI_BITSINT    16
-#elif INT_MAX > 2147483640L     /* }{ */
+#elif INT_MAX > 2147483640L
 /* int has at least 32 bits */
 #define LUAI_BITSINT    32
-#else                           /* }{ */
+#else
 #error "you must define LUA_BITSINT with number of bits in an integer"
-#endif                          /* } */
+#endif
 
 
 /*
-@@ LUA_INT32 is an signed integer with exactly 32 bits.
+@@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
+@@ LUAI_INT32 is an signed integer with at least 32 bits.
 @@ LUAI_UMEM is an unsigned integer big enough to count the total
 @* memory used by Lua.
 @@ LUAI_MEM is a signed integer big enough to count the total memory
 @* used by Lua.
 ** CHANGE here if for some weird reason the default definitions are not
-** good enough for your machine. Probably you do not need to change
-** this.
+** good enough for your machine. (The definitions in the 'else'
+** part always works, but may waste space on machines with 64-bit
+** longs.) Probably you do not need to change this.
 */
-#if LUAI_BITSINT >= 32          /* { */
-#define LUA_INT32       int
+#if LUAI_BITSINT >= 32
+#define LUAI_UINT32     unsigned int
+#define LUAI_INT32      int
+#define LUAI_MAXINT32   INT_MAX
 #define LUAI_UMEM       size_t
 #define LUAI_MEM        ptrdiff_t
-#else                           /* }{ */
+#else
 /* 16-bit ints */
-#define LUA_INT32       long
+#define LUAI_UINT32     unsigned long
+#define LUAI_INT32      long
+#define LUAI_MAXINT32   LONG_MAX
 #define LUAI_UMEM       unsigned long
 #define LUAI_MEM        long
-#endif                          /* } */
+#endif
 
 
 /*
-@@ LUAI_MAXSTACK limits the size of the Lua stack.
-** CHANGE it if you need a different limit. This limit is arbitrary;
-** its only purpose is to stop Lua to consume unlimited stack
-** space (and to reserve some numbers for pseudo-indices).
+@@ LUAI_MAXCALLS limits the number of nested calls.
+** CHANGE it if you need really deep recursive calls. This limit is
+** arbitrary; its only purpose is to stop infinite recursion before
+** exhausting memory.
 */
-#if LUAI_BITSINT >= 32
-#define LUAI_MAXSTACK           1000000
-#else
-#define LUAI_MAXSTACK           15000
-#endif
+#define LUAI_MAXCALLS   20000
+
+
+/*
+@@ LUAI_MAXCSTACK limits the number of Lua stack slots that a C function
+@* can use.
+** CHANGE it if you need lots of (Lua) stack space for your C
+** functions. This limit is arbitrary; its only purpose is to stop C
+** functions to consume unlimited stack space. (must be smaller than
+** -LUA_REGISTRYINDEX)
+*/
+#define LUAI_MAXCSTACK 8000
+
+
+
+/*
+** {==================================================================
+** CHANGE (to smaller values) the following definitions if your system
+** has a small C stack. (Or you may want to change them to larger
+** values if your system has a large C stack and these limits are
+** too rigid for you.) Some of these constants control the size of
+** stack-allocated arrays used by the compiler or the interpreter, while
+** others limit the maximum number of recursive calls that the compiler
+** or the interpreter can perform. Values too large may cause a C stack
+** overflow for some forms of deep constructs.
+** ===================================================================
+*/
+
 
-/* reserve some space for error handling */
-#define LUAI_FIRSTPSEUDOIDX     (-LUAI_MAXSTACK - 1000)
+/*
+@@ LUAI_MAXCCALLS is the maximum depth for nested C calls (short) and
+@* syntactical nested non-terminals in a program.
+*/
+#define LUAI_MAXCCALLS          200
 
 
+/*
+@@ LUAI_MAXVARS is the maximum number of local variables per function
+@* (must be smaller than 250).
+*/
+#define LUAI_MAXVARS            200
+
+
+/*
+@@ LUAI_MAXUPVALUES is the maximum number of upvalues per function
+@* (must be smaller than 250).
+*/
+#define LUAI_MAXUPVALUES        60
 
 
 /*
 @@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
-** CHANGE it if it uses too much C-stack space.
 */
 #define LUAL_BUFFERSIZE         1024
 
-#ifndef SIMULATOR
-typedef void FILE;
-#endif
+/* }================================================================== */
+
+
 
 
 /*
@@ -400,138 +516,237 @@ typedef void FILE;
 @@ LUA_NUMBER_FMT is the format for writing numbers.
 @@ lua_number2str converts a number to a string.
 @@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
+@@ lua_str2number converts a string to a number.
 */
 #define LUA_NUMBER_SCAN         "%ld"
 #define LUA_NUMBER_FMT          "%ld"
 #define LUAI_MAXNUMBER2STR      32 /* 16 digits, sign, point, and \0 */
 #define lua_number2str(s,n)     snprintf((s), 32, LUA_NUMBER_FMT, (n))
+#define lua_str2number(s,p)     strtol((s), (p), 10)
 
 
 /*
-@@ l_mathop allows the addition of an 'l' or 'f' to all math operations
+@@ The luai_num* macros define the primitive operations over numbers.
 */
-#define l_mathop(x)             (x)
+#if defined(LUA_CORE)
+extern long rb_pow(long, long);
+#define luai_numadd(a,b)        ((a)+(b))
+#define luai_numsub(a,b)        ((a)-(b))
+#define luai_nummul(a,b)        ((a)*(b))
+#define luai_numdiv(a,b)        ((a)/(b))
+#define luai_nummod(a,b)        ((a)%(b))
+#define luai_numpow(a,b)        (rb_pow(a,b))
+#define luai_numunm(a)          (-(a))
+#define luai_numeq(a,b)         ((a)==(b))
+#define luai_numlt(a,b)         ((a)<(b))
+#define luai_numle(a,b)         ((a)<=(b))
+#define luai_numisnan(a)        (!luai_numeq((a), (a)))
+#endif
 
 
 /*
-@@ lua_str2number converts a decimal numeric string to a number.
-@@ lua_strx2number converts an hexadecimal numeric string to a number.
-** In C99, 'strtod' does both conversions. C89, however, has no function
-** to convert floating hexadecimal strings to numbers. For these
-** systems, you can leave 'lua_strx2number' undefined and Lua will
-** provide its own implementation.
+@@ lua_number2int is a macro to convert lua_Number to int.
+@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
+** CHANGE them if you know a faster way to convert a lua_Number to
+** int (with any rounding method and without throwing errors) in your
+** system. In Pentium machines, a naive typecast from double to int
+** in C is extremely slow, so any alternative is worth trying.
 */
-#define lua_str2number(s,p)     strtol((s), (p), 10)
 
-#define lua_strx2number(s,p)    strtoul((s), (p), 16)
+/* On a Pentium, resort to a trick */
+#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
+    (defined(__i386) || defined (_M_IX86) || defined(__i386__))
 
+/* On a Microsoft compiler, use assembler */
+#if defined(_MSC_VER)
 
-/*
-@@ The luai_num* macros define the primitive operations over numbers.
-*/
+#define lua_number2int(i,d)   __asm fld d   __asm fistp i
+#define lua_number2integer(i,n)         lua_number2int(i, n)
 
+/* the next trick should work on any Pentium, but sometimes clashes
+   with a DirectX idiosyncrasy */
+#else
+
+union luai_Cast { double l_d; long l_l; };
+#define lua_number2int(i,d) \
+  { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
+#define lua_number2integer(i,n)         lua_number2int(i, n)
 
-/* these are quite standard operations */
-#if defined(LUA_CORE)
-extern long rb_pow(long, long);
-#define luai_numadd(L,a,b)      ((a)+(b))
-#define luai_numsub(L,a,b)      ((a)-(b))
-#define luai_nummul(L,a,b)      ((a)*(b))
-#define luai_numdiv(L,a,b)      ((a)/(b))
-#define luai_nummod(L,a,b)      ((a)%(b))
-#define luai_numpow(L,a,b)      (rb_pow(a,b))
-#define luai_numunm(L,a)        (-(a))
-#define luai_numeq(a,b)         ((a)==(b))
-#define luai_numlt(L,a,b)       ((a)<(b))
-#define luai_numle(L,a,b)       ((a)<=(b))
-#define luai_numisnan(L,a)      (!luai_numeq((a), (a)))
 #endif
 
 
+/* this option always works, but may be slow */
+#else
+#define lua_number2int(i,d)     ((i)=(int)(d))
+#define lua_number2integer(i,d) ((i)=(lua_Integer)(d))
+
+#endif
+
+/* }================================================================== */
+
 
 /*
-@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
-** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
-** machines, ptrdiff_t gives a good choice between int or long.)
+@@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
+** CHANGE it if your system requires alignments larger than double. (For
+** instance, if your system supports long doubles and they must be
+** aligned in 16-byte boundaries, then you should add long double in the
+** union.) Probably you do not need to change this.
 */
-#define LUA_INTEGER     ptrdiff_t
+#define LUAI_USER_ALIGNMENT_T   union { void *s; long l; }
+
 
 /*
-@@ LUA_UNSIGNED is the integral type used by lua_pushunsigned/lua_tounsigned.
-** It must have at least 32 bits.
+@@ LUAI_THROW/LUAI_TRY define how Lua does exception handling.
+** CHANGE them if you prefer to use longjmp/setjmp even with C++
+** or if want/don't to use _longjmp/_setjmp instead of regular
+** longjmp/setjmp. By default, Lua handles errors with exceptions when
+** compiling as C++ code, with _longjmp/_setjmp when asked to use them,
+** and with longjmp/setjmp otherwise.
 */
-#define LUA_UNSIGNED    unsigned LUA_INT32
+#if defined(__cplusplus)
+/* C++ exceptions */
+#define LUAI_THROW(L,c) throw(c)
+#define LUAI_TRY(L,c,a) try { a } catch(...) \
+        { if ((c)->status == 0) (c)->status = -1; }
+#define luai_jmpbuf     int  /* dummy variable */
+
+#elif defined(LUA_USE_ULONGJMP)
+/* in Unix, try _longjmp/_setjmp (more efficient) */
+#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf     jmp_buf
+
+#else
+/* default handling with long jumps */
+#define LUAI_THROW(L,c) longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf     jmp_buf
 
+#endif
 
 
 /*
-** Some tricks with doubles
+@@ LUA_MAXCAPTURES is the maximum number of captures that a pattern
+@* can do during pattern-matching.
+** CHANGE it if you need more captures. This limit is arbitrary.
 */
+#define LUA_MAXCAPTURES         32
+
 
-#if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI)    /* { */
 /*
-** The next definitions activate some tricks to speed up the
-** conversion from doubles to integer types, mainly to LUA_UNSIGNED.
-**
-@@ LUA_MSASMTRICK uses Microsoft assembler to avoid clashes with a
-** DirectX idiosyncrasy.
-**
-@@ LUA_IEEE754TRICK uses a trick that should work on any machine
-** using IEEE754 with a 32-bit integer type.
-**
-@@ LUA_IEEELL extends the trick to LUA_INTEGER; should only be
-** defined when LUA_INTEGER is a 32-bit integer.
-**
-@@ LUA_IEEEENDIAN is the endianness of doubles in your machine
-** (0 for little endian, 1 for big endian); if not defined, Lua will
-** check it dynamically for LUA_IEEE754TRICK (but not for LUA_NANTRICK).
-**
-@@ LUA_NANTRICK controls the use of a trick to pack all types into
-** a single double value, using NaN values to represent non-number
-** values. The trick only works on 32-bit machines (ints and pointers
-** are 32-bit values) with numbers represented as IEEE 754-2008 doubles
-** with conventional endianess (12345678 or 87654321), in CPUs that do
-** not produce signaling NaN values (all NaNs are quiet).
+@@ lua_tmpnam is the function that the OS library uses to create a
+@* temporary name.
+@@ LUA_TMPNAMBUFSIZE is the maximum size of a name created by lua_tmpnam.
+** CHANGE them if you have an alternative to tmpnam (which is considered
+** insecure) or if you want the original tmpnam anyway.  By default, Lua
+** uses tmpnam except when POSIX is available, where it uses mkstemp.
 */
+#if defined(loslib_c) || defined(luaall_c)
+
+#if defined(LUA_USE_MKSTEMP)
+#include <unistd.h>
+#define LUA_TMPNAMBUFSIZE       32
+#define lua_tmpnam(b,e) { \
+        strcpy(b, "/tmp/lua_XXXXXX"); \
+        e = mkstemp(b); \
+        if (e != -1) close(e); \
+        e = (e == -1); }
+
+#else
+#define LUA_TMPNAMBUFSIZE       L_tmpnam
+#define lua_tmpnam(b,e)         { e = (tmpnam(b) == NULL); }
+#endif
+
+#endif
+
+
+/*
+@@ lua_popen spawns a new process connected to the current one through
+@* the file streams.
+** CHANGE it if you have a way to implement it in your system.
+*/
+#if defined(LUA_USE_POPEN)
+
+#define lua_popen(L,c,m)        ((void)L, fflush(NULL), popen(c,m))
+#define lua_pclose(L,file)      ((void)L, (pclose(file) != -1))
 
-/* Microsoft compiler on a Pentium (32 bit) ? */
-#if defined(LUA_WIN) && defined(_MSC_VER) && defined(_M_IX86)   /* { */
+#elif defined(LUA_WIN)
 
-#define LUA_MSASMTRICK
-#define LUA_IEEEENDIAN          0
-#define LUA_NANTRICK
+#define lua_popen(L,c,m)        ((void)L, _popen(c,m))
+#define lua_pclose(L,file)      ((void)L, (_pclose(file) != -1))
 
+#else
 
-/* pentium 32 bits? */
-#elif defined(__i386__) || defined(__i386) || defined(__X86__) /* }{ */
+#define lua_popen(L,c,m)        ((void)((void)c, m),  \
+                luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
+#define lua_pclose(L,file)              ((void)((void)L, file), 0)
 
-#define LUA_IEEE754TRICK
-#define LUA_IEEELL
-#define LUA_IEEEENDIAN          0
-#define LUA_NANTRICK
+#endif
 
-/* pentium 64 bits? */
-#elif defined(__x86_64)                                         /* }{ */
+/*
+@@ LUA_DL_* define which dynamic-library system Lua should use.
+** CHANGE here if Lua has problems choosing the appropriate
+** dynamic-library system for your platform (either Windows' DLL, Mac's
+** dyld, or Unix's dlopen). If your system is some kind of Unix, there
+** is a good chance that it has dlopen, so LUA_DL_DLOPEN will work for
+** it.  To use dlopen you also need to adapt the src/Makefile (probably
+** adding -ldl to the linker options), so Lua does not select it
+** automatically.  (When you change the makefile to add -ldl, you must
+** also add -DLUA_USE_DLOPEN.)
+** If you do not want any kind of dynamic library, undefine all these
+** options.
+** By default, _WIN32 gets LUA_DL_DLL and MAC OS X gets LUA_DL_DYLD.
+*/
+#if defined(LUA_USE_DLOPEN)
+#define LUA_DL_DLOPEN
+#endif
 
-#define LUA_IEEE754TRICK
-#define LUA_IEEEENDIAN          0
+#if defined(LUA_WIN)
+#define LUA_DL_DLL
+#endif
 
-#elif defined(__POWERPC__) || defined(__ppc__)                  /* }{ */
 
-#define LUA_IEEE754TRICK
-#define LUA_IEEEENDIAN          1
+/*
+@@ LUAI_EXTRASPACE allows you to add user-specific data in a lua_State
+@* (the data goes just *before* the lua_State pointer).
+** CHANGE (define) this if you really need that. This value must be
+** a multiple of the maximum alignment required for your machine.
+*/
+#define LUAI_EXTRASPACE         0
 
-#else                                                           /* }{ */
 
-/* assume IEEE754 and a 32-bit integer type */
-#define LUA_IEEE754TRICK
+/*
+@@ luai_userstate* allow user-specific actions on threads.
+** CHANGE them if you defined LUAI_EXTRASPACE and need to do something
+** extra when a thread is created/deleted/resumed/yielded.
+*/
+#define luai_userstateopen(L)           ((void)L)
+#define luai_userstateclose(L)          ((void)L)
+#define luai_userstatethread(L,L1)      ((void)L)
+#define luai_userstatefree(L)           ((void)L)
+#define luai_userstateresume(L,n)       ((void)L)
+#define luai_userstateyield(L,n)        ((void)L)
 
-#endif                                                          /* } */
 
-#endif                                                  /* } */
+/*
+@@ LUA_INTFRMLEN is the length modifier for integer conversions
+@* in 'string.format'.
+@@ LUA_INTFRM_T is the integer type correspoding to the previous length
+@* modifier.
+** CHANGE them if your system supports long long or does not support long.
+*/
 
-/* }================================================================== */
+#if defined(LUA_USELONGLONG)
+
+#define LUA_INTFRMLEN           "ll"
+#define LUA_INTFRM_T            long long
 
+#else
+
+#define LUA_INTFRMLEN           "l"
+#define LUA_INTFRM_T            long
+
+#endif
 
 
 
@@ -543,7 +758,6 @@ extern long rb_pow(long, long);
 */
 
 #include "rockconf.h"
-#define LUA_USE_CTYPE           1
 
 #endif