diff options
Diffstat (limited to 'Build/source/libs/lua52')
-rw-r--r-- | Build/source/libs/lua52/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/libs/lua52/configure | 28 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-FreeBSD | 13 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4-PATCHES/ChangeLog (renamed from Build/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog) | 6 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-01-utf-8 (renamed from Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-01-utf-8) | 6 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-02-FreeBSD | 13 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-03-export (renamed from Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-03-export) | 12 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/Makefile (renamed from Build/source/libs/lua52/lua-5.2.3/Makefile) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/README (renamed from Build/source/libs/lua52/lua-5.2.3/README) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/contents.html (renamed from Build/source/libs/lua52/lua-5.2.3/doc/contents.html) | 103 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/logo.gif (renamed from Build/source/libs/lua52/lua-5.2.3/doc/logo.gif) | bin | 4232 -> 4232 bytes | |||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/lua.1 (renamed from Build/source/libs/lua52/lua-5.2.3/doc/lua.1) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/lua.css (renamed from Build/source/libs/lua52/lua-5.2.3/doc/lua.css) | 14 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/luac.1 (renamed from Build/source/libs/lua52/lua-5.2.3/doc/luac.1) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/manual.css (renamed from Build/source/libs/lua52/lua-5.2.3/doc/manual.css) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/manual.html (renamed from Build/source/libs/lua52/lua-5.2.3/doc/manual.html) | 27 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/osi-certified-72x60.png (renamed from Build/source/libs/lua52/lua-5.2.3/doc/osi-certified-72x60.png) | bin | 3774 -> 3774 bytes | |||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/doc/readme.html (renamed from Build/source/libs/lua52/lua-5.2.3/doc/readme.html) | 32 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/Makefile (renamed from Build/source/libs/lua52/lua-5.2.3/src/Makefile) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lapi.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lapi.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lapi.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lapi.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lauxlib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lauxlib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lauxlib.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lauxlib.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lbaselib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lbaselib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lbitlib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lbitlib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lcode.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lcode.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lcode.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lcode.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lcorolib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lcorolib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lctype.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lctype.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lctype.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lctype.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ldblib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/ldblib.c) | 12 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ldebug.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/ldebug.c) | 21 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ldebug.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/ldebug.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ldo.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/ldo.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ldo.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/ldo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ldump.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/ldump.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lfunc.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lfunc.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lfunc.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lfunc.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lgc.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lgc.c) | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lgc.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lgc.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/linit.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/linit.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/liolib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/liolib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/llex.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/llex.c) | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/llex.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/llex.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/llimits.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/llimits.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lmathlib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lmathlib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lmem.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lmem.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lmem.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lmem.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/loadlib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/loadlib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lobject.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lobject.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lobject.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lobject.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lopcodes.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lopcodes.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lopcodes.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lopcodes.h) | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/loslib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/loslib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lparser.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lparser.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lparser.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lparser.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lstate.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lstate.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lstate.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lstate.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lstring.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lstring.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lstring.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lstring.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lstrlib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lstrlib.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ltable.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/ltable.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ltable.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/ltable.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ltablib.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/ltablib.c) | 10 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ltm.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/ltm.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/ltm.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/ltm.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lua.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lua.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lua.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lua.h) | 8 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lua.hpp (renamed from Build/source/libs/lua52/lua-5.2.3/src/lua.hpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/luac.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/luac.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/luaconf.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/luaconf.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lualib.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lualib.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lundump.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lundump.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lundump.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lundump.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lvm.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lvm.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lvm.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lvm.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lzio.c (renamed from Build/source/libs/lua52/lua-5.2.3/src/lzio.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.4/src/lzio.h (renamed from Build/source/libs/lua52/lua-5.2.3/src/lzio.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/version.ac | 4 |
79 files changed, 236 insertions, 106 deletions
diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog index 3e99db59a29..f5524784e38 100644 --- a/Build/source/libs/lua52/ChangeLog +++ b/Build/source/libs/lua52/ChangeLog @@ -1,3 +1,8 @@ +2015-03-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import lua-5.2.4. + * version.ac: Adjust. + 2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use the fragment ../../am/dist_hook.am. diff --git a/Build/source/libs/lua52/configure b/Build/source/libs/lua52/configure index 21b969987e8..187c0a82757 100755 --- a/Build/source/libs/lua52/configure +++ b/Build/source/libs/lua52/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lua52 (TeX Live) 5.2.3. +# Generated by GNU Autoconf 2.69 for lua52 (TeX Live) 5.2.4. # # Report bugs to <tex-k@tug.org>. # @@ -590,12 +590,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='lua52 (TeX Live)' PACKAGE_TARNAME='lua52--tex-live-' -PACKAGE_VERSION='5.2.3' -PACKAGE_STRING='lua52 (TeX Live) 5.2.3' +PACKAGE_VERSION='5.2.4' +PACKAGE_STRING='lua52 (TeX Live) 5.2.4' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="lua-5.2.3/src/lua.c" +ac_unique_file="lua-5.2.4/src/lua.c" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lua52 (TeX Live) 5.2.3 to adapt to many kinds of systems. +\`configure' configures lua52 (TeX Live) 5.2.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1398,7 +1398,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lua52 (TeX Live) 5.2.3:";; + short | recursive ) echo "Configuration of lua52 (TeX Live) 5.2.4:";; esac cat <<\_ACEOF @@ -1515,7 +1515,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lua52 (TeX Live) configure 5.2.3 +lua52 (TeX Live) configure 5.2.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1976,7 +1976,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lua52 (TeX Live) $as_me 5.2.3, which was +It was created by lua52 (TeX Live) $as_me 5.2.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3899,7 +3899,7 @@ fi # Define the identity of the package. PACKAGE='lua52--tex-live-' - VERSION='5.2.3' + VERSION='5.2.4' cat >>confdefs.h <<_ACEOF @@ -4930,10 +4930,10 @@ $as_echo "no, using $LN_S" >&6; } fi -LUA52VERSION=5.2.3 +LUA52VERSION=5.2.4 -LUA52_LT_VERSINFO=7:3:2 +LUA52_LT_VERSINFO=7:4:2 case `pwd` in @@ -13816,7 +13816,7 @@ if test "x$ac_cv_header_stdc" = xyes; then LUA52_DEFINES="$LUA52_DEFINES -DHAVE_UNISTD_H" fi -LUA52_TREE=lua-5.2.3 +LUA52_TREE=lua-5.2.4 ac_config_files="$ac_config_files Makefile include/Makefile texlua52.pc" @@ -14364,7 +14364,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lua52 (TeX Live) $as_me 5.2.3, which was +This file was extended by lua52 (TeX Live) $as_me 5.2.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14430,7 +14430,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lua52 (TeX Live) config.status 5.2.3 +lua52 (TeX Live) config.status 5.2.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-FreeBSD b/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-FreeBSD deleted file mode 100644 index 625480b4732..00000000000 --- a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-02-FreeBSD +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur lua-5.2.3.orig/src/liolib.c lua-5.2.3/src/liolib.c ---- lua-5.2.3.orig/src/liolib.c 2013-04-12 20:48:47.000000000 +0200 -+++ lua-5.2.3/src/liolib.c 2014-03-19 15:03:49.727286832 +0100 -@@ -19,6 +19,9 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#if defined(HAVE_UNISTD_H) -+#include <unistd.h> -+#endif - - #define liolib_c - #define LUA_LIB diff --git a/Build/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog b/Build/source/libs/lua52/lua-5.2.4-PATCHES/ChangeLog index e28c85539bc..a8f1b4d385f 100644 --- a/Build/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog +++ b/Build/source/libs/lua52/lua-5.2.4-PATCHES/ChangeLog @@ -1,3 +1,9 @@ +2015-03-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import lua-5.2.4/ from http://www.lua.org/ftp/lua-5.2.4.tar.gz. + + * patch-01-utf-8, patch-02-FreeBSD, patch-03-export: Adapted. + 2014-10-22 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-03-export (new): Export symbols for LuaTeX (from Luigi). diff --git a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-01-utf-8 b/Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-01-utf-8 index d3f299ce16e..9ad97494106 100644 --- a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-01-utf-8 +++ b/Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-01-utf-8 @@ -1,6 +1,6 @@ -diff -ur lua-5.2.3.orig/src/lctype.h lua-5.2.3/src/lctype.h ---- lua-5.2.3.orig/src/lctype.h 2013-04-12 20:48:47.000000000 +0200 -+++ lua-5.2.3/src/lctype.h 2014-02-13 13:17:33.000000000 +0100 +diff -ur lua-5.2.4.orig/src/lctype.h lua-5.2.4/src/lctype.h +--- lua-5.2.4.orig/src/lctype.h 2013-04-12 20:48:47.000000000 +0200 ++++ lua-5.2.4/src/lctype.h 2014-02-13 13:17:33.000000000 +0100 @@ -7,6 +7,8 @@ #ifndef lctype_h #define lctype_h diff --git a/Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-02-FreeBSD b/Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-02-FreeBSD new file mode 100644 index 00000000000..c9465de9446 --- /dev/null +++ b/Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-02-FreeBSD @@ -0,0 +1,13 @@ +diff -ur lua-5.2.4.orig/src/liolib.c lua-5.2.4/src/liolib.c +--- lua-5.2.4.orig/src/liolib.c 2013-04-12 20:48:47.000000000 +0200 ++++ lua-5.2.4/src/liolib.c 2014-03-19 15:03:49.727286832 +0100 +@@ -19,6 +19,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#if defined(HAVE_UNISTD_H) ++#include <unistd.h> ++#endif + + #define liolib_c + #define LUA_LIB diff --git a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-03-export b/Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-03-export index 7ee71ff93f2..2c2edd01b6a 100644 --- a/Build/source/libs/lua52/lua-5.2.3-PATCHES/patch-03-export +++ b/Build/source/libs/lua52/lua-5.2.4-PATCHES/patch-03-export @@ -1,6 +1,6 @@ -diff -ur lua-5.2.3.orig/src/lopcodes.h lua-5.2.3/src/lopcodes.h ---- lua-5.2.3.orig/src/lopcodes.h 2013-04-12 20:48:47.000000000 +0200 -+++ lua-5.2.3/src/lopcodes.h 2014-10-22 11:14:59.000000000 +0200 +diff -ur lua-5.2.4.orig/src/lopcodes.h lua-5.2.4/src/lopcodes.h +--- lua-5.2.4.orig/src/lopcodes.h 2014-10-20 20:32:09.000000000 +0200 ++++ lua-5.2.4/src/lopcodes.h 2015-03-11 08:31:42.000000000 +0100 @@ -269,7 +269,7 @@ OpArgK /* argument is a constant or register/constant */ }; @@ -19,9 +19,9 @@ diff -ur lua-5.2.3.orig/src/lopcodes.h lua-5.2.3/src/lopcodes.h /* number of list items to accumulate before a SETLIST instruction */ -diff -ur lua-5.2.3.orig/src/lundump.h lua-5.2.3/src/lundump.h ---- lua-5.2.3.orig/src/lundump.h 2013-04-12 20:48:47.000000000 +0200 -+++ lua-5.2.3/src/lundump.h 2014-10-22 11:14:59.000000000 +0200 +diff -ur lua-5.2.4.orig/src/lundump.h lua-5.2.4/src/lundump.h +--- lua-5.2.4.orig/src/lundump.h 2013-04-12 20:48:47.000000000 +0200 ++++ lua-5.2.4/src/lundump.h 2014-10-22 11:14:59.000000000 +0200 @@ -17,7 +17,7 @@ LUAI_FUNC void luaU_header (lu_byte* h); diff --git a/Build/source/libs/lua52/lua-5.2.3/Makefile b/Build/source/libs/lua52/lua-5.2.4/Makefile index d2c7db4a2da..b2a62cfdd1b 100644 --- a/Build/source/libs/lua52/lua-5.2.3/Makefile +++ b/Build/source/libs/lua52/lua-5.2.4/Makefile @@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1 # Lua version and release. V= 5.2 -R= $V.3 +R= $V.4 # Targets start here. all: $(PLAT) diff --git a/Build/source/libs/lua52/lua-5.2.3/README b/Build/source/libs/lua52/lua-5.2.4/README index 49033adb5bf..710e3ee1570 100644 --- a/Build/source/libs/lua52/lua-5.2.3/README +++ b/Build/source/libs/lua52/lua-5.2.4/README @@ -1,5 +1,5 @@ -This is Lua 5.2.3, released on 11 Nov 2013. +This is Lua 5.2.4, released on 25 Feb 2015. For installation instructions, license details, and further information about Lua, see doc/readme.html. diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/contents.html b/Build/source/libs/lua52/lua-5.2.4/doc/contents.html index 0ce297da19c..9d5202fa8e9 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/contents.html +++ b/Build/source/libs/lua52/lua-5.2.4/doc/contents.html @@ -7,7 +7,6 @@ <STYLE TYPE="text/css"> ul { list-style-type: none ; - list-style-position: outside ; } </STYLE> </HEAD> @@ -33,7 +32,7 @@ For a complete introduction to Lua programming, see the book <A HREF="#index">index</A> <HR> <SMALL> -Copyright © 2011–2013 Lua.org, PUC-Rio. +Copyright © 2011–2015 Lua.org, PUC-Rio. Freely available under the terms of the <A HREF="http://www.lua.org/license.html">Lua license</A>. </SMALL> @@ -139,10 +138,10 @@ Freely available under the terms of the <TD> <H3><A NAME="functions">Lua functions</A></H3> <P> +<A HREF="manual.html#6.1">basic</A><BR> <A HREF="manual.html#pdf-_G">_G</A><BR> <A HREF="manual.html#pdf-_VERSION">_VERSION</A><BR> -<P> <A HREF="manual.html#pdf-assert">assert</A><BR> <A HREF="manual.html#pdf-collectgarbage">collectgarbage</A><BR> <A HREF="manual.html#pdf-dofile">dofile</A><BR> @@ -168,6 +167,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-xpcall">xpcall</A><BR> <P> +<A HREF="manual.html#6.7">bit32</A><BR> <A HREF="manual.html#pdf-bit32.arshift">bit32.arshift</A><BR> <A HREF="manual.html#pdf-bit32.band">bit32.band</A><BR> <A HREF="manual.html#pdf-bit32.bnot">bit32.bnot</A><BR> @@ -182,6 +182,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-bit32.rshift">bit32.rshift</A><BR> <P> +<A HREF="manual.html#6.2">coroutine</A><BR> <A HREF="manual.html#pdf-coroutine.create">coroutine.create</A><BR> <A HREF="manual.html#pdf-coroutine.resume">coroutine.resume</A><BR> <A HREF="manual.html#pdf-coroutine.running">coroutine.running</A><BR> @@ -190,6 +191,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-coroutine.yield">coroutine.yield</A><BR> <P> +<A HREF="manual.html#6.10">debug</A><BR> <A HREF="manual.html#pdf-debug.debug">debug.debug</A><BR> <A HREF="manual.html#pdf-debug.getuservalue">debug.getuservalue</A><BR> <A HREF="manual.html#pdf-debug.gethook">debug.gethook</A><BR> @@ -208,15 +210,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-debug.upvaluejoin">debug.upvaluejoin</A><BR> <P> -<A HREF="manual.html#pdf-file:close">file:close</A><BR> -<A HREF="manual.html#pdf-file:flush">file:flush</A><BR> -<A HREF="manual.html#pdf-file:lines">file:lines</A><BR> -<A HREF="manual.html#pdf-file:read">file:read</A><BR> -<A HREF="manual.html#pdf-file:seek">file:seek</A><BR> -<A HREF="manual.html#pdf-file:setvbuf">file:setvbuf</A><BR> -<A HREF="manual.html#pdf-file:write">file:write</A><BR> - -<P> +<A HREF="manual.html#6.8">io</A><BR> <A HREF="manual.html#pdf-io.close">io.close</A><BR> <A HREF="manual.html#pdf-io.flush">io.flush</A><BR> <A HREF="manual.html#pdf-io.input">io.input</A><BR> @@ -231,11 +225,19 @@ Freely available under the terms of the <A HREF="manual.html#pdf-io.tmpfile">io.tmpfile</A><BR> <A HREF="manual.html#pdf-io.type">io.type</A><BR> <A HREF="manual.html#pdf-io.write">io.write</A><BR> +<A HREF="manual.html#pdf-file:close">file:close</A><BR> +<A HREF="manual.html#pdf-file:flush">file:flush</A><BR> +<A HREF="manual.html#pdf-file:lines">file:lines</A><BR> +<A HREF="manual.html#pdf-file:read">file:read</A><BR> +<A HREF="manual.html#pdf-file:seek">file:seek</A><BR> +<A HREF="manual.html#pdf-file:setvbuf">file:setvbuf</A><BR> +<A HREF="manual.html#pdf-file:write">file:write</A><BR> </TD> <TD> <H3> </H3> <P> +<A HREF="manual.html#6.6">math</A><BR> <A HREF="manual.html#pdf-math.abs">math.abs</A><BR> <A HREF="manual.html#pdf-math.acos">math.acos</A><BR> <A HREF="manual.html#pdf-math.asin">math.asin</A><BR> @@ -267,6 +269,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-math.tanh">math.tanh</A><BR> <P> +<A HREF="manual.html#6.9">os</A><BR> <A HREF="manual.html#pdf-os.clock">os.clock</A><BR> <A HREF="manual.html#pdf-os.date">os.date</A><BR> <A HREF="manual.html#pdf-os.difftime">os.difftime</A><BR> @@ -280,6 +283,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-os.tmpname">os.tmpname</A><BR> <P> +<A HREF="manual.html#6.3">package</A><BR> <A HREF="manual.html#pdf-package.config">package.config</A><BR> <A HREF="manual.html#pdf-package.cpath">package.cpath</A><BR> <A HREF="manual.html#pdf-package.loaded">package.loaded</A><BR> @@ -290,6 +294,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-package.searchpath">package.searchpath</A><BR> <P> +<A HREF="manual.html#6.4">string</A><BR> <A HREF="manual.html#pdf-string.byte">string.byte</A><BR> <A HREF="manual.html#pdf-string.char">string.char</A><BR> <A HREF="manual.html#pdf-string.dump">string.dump</A><BR> @@ -306,6 +311,7 @@ Freely available under the terms of the <A HREF="manual.html#pdf-string.upper">string.upper</A><BR> <P> +<A HREF="manual.html#6.5">table</A><BR> <A HREF="manual.html#pdf-table.concat">table.concat</A><BR> <A HREF="manual.html#pdf-table.insert">table.insert</A><BR> <A HREF="manual.html#pdf-table.pack">table.pack</A><BR> @@ -313,6 +319,14 @@ Freely available under the terms of the <A HREF="manual.html#pdf-table.sort">table.sort</A><BR> <A HREF="manual.html#pdf-table.unpack">table.unpack</A><BR> +<H3><A NAME="env">environment<BR>variables</A></H3> +<A HREF="manual.html#pdf-LUA_CPATH">LUA_CPATH</A><BR> +<A HREF="manual.html#pdf-LUA_CPATH_5_2">LUA_CPATH_5_2</A><BR> +<A HREF="manual.html#pdf-LUA_INIT">LUA_INIT</A><BR> +<A HREF="manual.html#pdf-LUA_INIT_5_2">LUA_INIT_5_2</A><BR> +<A HREF="manual.html#pdf-LUA_PATH">LUA_PATH</A><BR> +<A HREF="manual.html#pdf-LUA_PATH_5_2">LUA_PATH_5_2</A><BR> + </TD> <TD> <H3>C API</H3> @@ -516,6 +530,67 @@ Freely available under the terms of the <A HREF="manual.html#luaL_unref">luaL_unref</A><BR> <A HREF="manual.html#luaL_where">luaL_where</A><BR> +<H3><A NAME="library">standard library</A></H3> +<P> +<A HREF="manual.html#pdf-luaopen_base">luaopen_base</A><BR> +<A HREF="manual.html#pdf-luaopen_bit32">luaopen_bit32</A><BR> +<A HREF="manual.html#pdf-luaopen_coroutine">luaopen_coroutine</A><BR> +<A HREF="manual.html#pdf-luaopen_debug">luaopen_debug</A><BR> +<A HREF="manual.html#pdf-luaopen_io">luaopen_io</A><BR> +<A HREF="manual.html#pdf-luaopen_math">luaopen_math</A><BR> +<A HREF="manual.html#pdf-luaopen_os">luaopen_os</A><BR> +<A HREF="manual.html#pdf-luaopen_package">luaopen_package</A><BR> +<A HREF="manual.html#pdf-luaopen_string">luaopen_string</A><BR> +<A HREF="manual.html#pdf-luaopen_table">luaopen_table</A><BR> + +<H3><A NAME="constants">constants</A></H3> +<A HREF="manual.html#pdf-LUA_ERRERR">LUA_ERRERR</A><BR> +<A HREF="manual.html#pdf-LUA_ERRFILE">LUA_ERRFILE</A><BR> +<A HREF="manual.html#pdf-LUA_ERRGCMM">LUA_ERRGCMM</A><BR> +<A HREF="manual.html#pdf-LUA_ERRMEM">LUA_ERRMEM</A><BR> +<A HREF="manual.html#pdf-LUA_ERRRUN">LUA_ERRRUN</A><BR> +<A HREF="manual.html#pdf-LUA_ERRSYNTAX">LUA_ERRSYNTAX</A><BR> +<A HREF="manual.html#pdf-LUA_HOOKCALL">LUA_HOOKCALL</A><BR> +<A HREF="manual.html#pdf-LUA_HOOKCOUNT">LUA_HOOKCOUNT</A><BR> +<A HREF="manual.html#pdf-LUA_HOOKLINE">LUA_HOOKLINE</A><BR> +<A HREF="manual.html#pdf-LUA_HOOKRET">LUA_HOOKRET</A><BR> +<A HREF="manual.html#pdf-LUA_HOOKTAILCALL">LUA_HOOKTAILCALL</A><BR> +<A HREF="manual.html#pdf-LUA_MASKCALL">LUA_MASKCALL</A><BR> +<A HREF="manual.html#pdf-LUA_MASKCOUNT">LUA_MASKCOUNT</A><BR> +<A HREF="manual.html#pdf-LUA_MASKLINE">LUA_MASKLINE</A><BR> +<A HREF="manual.html#pdf-LUA_MASKRET">LUA_MASKRET</A><BR> +<A HREF="manual.html#pdf-LUA_MINSTACK">LUA_MINSTACK</A><BR> +<A HREF="manual.html#pdf-LUA_MULTRET">LUA_MULTRET</A><BR> +<A HREF="manual.html#pdf-LUA_NOREF">LUA_NOREF</A><BR> +<A HREF="manual.html#pdf-LUA_OK">LUA_OK</A><BR> +<A HREF="manual.html#pdf-LUA_OPADD">LUA_OPADD</A><BR> +<A HREF="manual.html#pdf-LUA_OPDIV">LUA_OPDIV</A><BR> +<A HREF="manual.html#pdf-LUA_OPEQ">LUA_OPEQ</A><BR> +<A HREF="manual.html#pdf-LUA_OPLE">LUA_OPLE</A><BR> +<A HREF="manual.html#pdf-LUA_OPLT">LUA_OPLT</A><BR> +<A HREF="manual.html#pdf-LUA_OPMOD">LUA_OPMOD</A><BR> +<A HREF="manual.html#pdf-LUA_OPMUL">LUA_OPMUL</A><BR> +<A HREF="manual.html#pdf-LUA_OPPOW">LUA_OPPOW</A><BR> +<A HREF="manual.html#pdf-LUA_OPSUB">LUA_OPSUB</A><BR> +<A HREF="manual.html#pdf-LUA_OPUNM">LUA_OPUNM</A><BR> +<A HREF="manual.html#pdf-LUA_REFNIL">LUA_REFNIL</A><BR> +<A HREF="manual.html#pdf-LUA_REGISTRYINDEX">LUA_REGISTRYINDEX</A><BR> +<A HREF="manual.html#pdf-LUA_RIDX_GLOBALS">LUA_RIDX_GLOBALS</A><BR> +<A HREF="manual.html#pdf-LUA_RIDX_MAINTHREAD">LUA_RIDX_MAINTHREAD</A><BR> +<A HREF="manual.html#pdf-LUA_TBOOLEAN">LUA_TBOOLEAN</A><BR> +<A HREF="manual.html#pdf-LUA_TFUNCTION">LUA_TFUNCTION</A><BR> +<A HREF="manual.html#pdf-LUA_TLIGHTUSERDATA">LUA_TLIGHTUSERDATA</A><BR> +<A HREF="manual.html#pdf-LUA_TNIL">LUA_TNIL</A><BR> +<A HREF="manual.html#pdf-LUA_TNONE">LUA_TNONE</A><BR> +<A HREF="manual.html#pdf-LUA_TNUMBER">LUA_TNUMBER</A><BR> +<A HREF="manual.html#pdf-LUA_TSTRING">LUA_TSTRING</A><BR> +<A HREF="manual.html#pdf-LUA_TTABLE">LUA_TTABLE</A><BR> +<A HREF="manual.html#pdf-LUA_TTHREAD">LUA_TTHREAD</A><BR> +<A HREF="manual.html#pdf-LUA_TUSERDATA">LUA_TUSERDATA</A><BR> +<A HREF="manual.html#pdf-LUA_USE_APICHECK">LUA_USE_APICHECK</A><BR> +<A HREF="manual.html#pdf-LUA_YIELD">LUA_YIELD</A><BR> +<A HREF="manual.html#pdf-LUAL_BUFFERSIZE">LUAL_BUFFERSIZE</A><BR> + </TD> </TR> </TABLE> @@ -523,10 +598,10 @@ Freely available under the terms of the <HR> <SMALL CLASS="footer"> Last update: -Tue Mar 12 11:22:18 BRT 2013 +Mon Feb 23 22:24:36 BRT 2015 </SMALL> <!-- -Last change: revised for Lua 5.2.2 +Last change: revised for Lua 5.2.4 --> </BODY> diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/logo.gif b/Build/source/libs/lua52/lua-5.2.4/doc/logo.gif Binary files differindex 2f5e4ac2e74..2f5e4ac2e74 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/logo.gif +++ b/Build/source/libs/lua52/lua-5.2.4/doc/logo.gif diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/lua.1 b/Build/source/libs/lua52/lua-5.2.4/doc/lua.1 index 1dbf04366ce..1dbf04366ce 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/lua.1 +++ b/Build/source/libs/lua52/lua-5.2.4/doc/lua.1 diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/lua.css b/Build/source/libs/lua52/lua-5.2.4/doc/lua.css index 3d2443acffd..5dc9a8b9ea7 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/lua.css +++ b/Build/source/libs/lua52/lua-5.2.4/doc/lua.css @@ -11,6 +11,7 @@ body { background-color: #FFFFFF ; font-family: Helvetica, Arial, sans-serif ; text-align: justify ; + line-height: 1.25 ; } h1, h2, h3, h4 { @@ -53,12 +54,17 @@ a:visited { a:link:hover, a:visited:hover { color: #000080 ; background-color: #D0D0FF ; + border-radius: 4px ; } a:link:active, a:visited:active { color: #FF0000 ; } +h1 a img { + vertical-align: text-bottom ; +} + hr { border: 0 ; height: 1px ; @@ -86,11 +92,15 @@ table hr { input[type=text] { border: solid #a0a0a0 2px ; border-radius: 2em ; - -moz-border-radius: 2em ; background-image: url('images/search.png') ; - background-repeat: no-repeat; + background-repeat: no-repeat ; background-position: 4px center ; padding-left: 20px ; height: 2em ; } +pre.session { + background-color: #F8F8F8 ; + padding: 1em ; + border-radius: 8px ; +} diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/luac.1 b/Build/source/libs/lua52/lua-5.2.4/doc/luac.1 index 33a4ed00ace..33a4ed00ace 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/luac.1 +++ b/Build/source/libs/lua52/lua-5.2.4/doc/luac.1 diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/manual.css b/Build/source/libs/lua52/lua-5.2.4/doc/manual.css index ca613cd9fb1..ca613cd9fb1 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/manual.css +++ b/Build/source/libs/lua52/lua-5.2.4/doc/manual.css diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/manual.html b/Build/source/libs/lua52/lua-5.2.4/doc/manual.html index 85365363fb3..0a95e9e02fc 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/manual.html +++ b/Build/source/libs/lua52/lua-5.2.4/doc/manual.html @@ -19,7 +19,7 @@ Lua 5.2 Reference Manual by Roberto Ierusalimschy, Luiz Henrique de Figueiredo, Waldemar Celes <p> <small> -Copyright © 2011–2013 Lua.org, PUC-Rio. +Copyright © 2011–2015 Lua.org, PUC-Rio. Freely available under the terms of the <a href="http://www.lua.org/license.html">Lua license</a>. </small> @@ -33,7 +33,7 @@ Freely available under the terms of the <!-- ====================================================================== --> <p> -<!-- $Id: manual.of,v 1.103 2013/03/14 18:51:56 roberto Exp $ --> +<!-- $Id: manual.of,v 1.104 2013/06/01 00:13:11 roberto Exp $ --> @@ -2088,7 +2088,7 @@ the length of a table <code>t</code> is only defined if the table is a <em>sequence</em>, that is, the set of its positive numeric keys is equal to <em>{1..n}</em> -for some integer <em>n</em>. +for some non-negative integer <em>n</em>. In that case, <em>n</em> is its length. Note that a table like @@ -4065,7 +4065,7 @@ Note that <code>f</code> is used twice. <p> Pushes onto the stack a formatted string and returns a pointer to this string. -It is similar to the ANSI C function <code>sprintf</code>, +It is similar to the ISO C function <code>sprintf</code>, but has some important differences: <ul> @@ -7906,7 +7906,7 @@ after the two indices. <p> Returns a formatted version of its variable number of arguments following the description given in its first argument (which must be a string). -The format string follows the same rules as the ANSI C function <code>sprintf</code>. +The format string follows the same rules as the ISO C function <code>sprintf</code>. The only differences are that the options/modifiers <code>*</code>, <code>h</code>, <code>L</code>, <code>l</code>, <code>n</code>, and <code>p</code> are not supported @@ -9486,7 +9486,7 @@ if the information is not available. <p> If <code>format</code> is not "<code>*t</code>", then <code>date</code> returns the date as a string, -formatted according to the same rules as the ANSI C function <code>strftime</code>. +formatted according to the same rules as the ISO C function <code>strftime</code>. <p> @@ -9521,7 +9521,7 @@ this value is exactly <code>t2</code><em>-</em><code>t1</code>. <p> -This function is equivalent to the ANSI C function <code>system</code>. +This function is equivalent to the ISO C function <code>system</code>. It passes <code>command</code> to be executed by an operating system shell. Its first result is <b>true</b> if the command terminated successfully, @@ -9556,7 +9556,7 @@ When called without a <code>command</code>, <p> -Calls the ANSI C function <code>exit</code> to terminate the host program. +Calls the ISO C function <code>exit</code> to terminate the host program. If <code>code</code> is <b>true</b>, the returned status is <code>EXIT_SUCCESS</code>; if <code>code</code> is <b>false</b>, @@ -9893,7 +9893,7 @@ returns <b>nil</b>. Sets the given function as a hook. The string <code>mask</code> and the number <code>count</code> describe when the hook will be called. -The string mask may have the following characters, +The string mask may have any combination of the following characters, with the given meaning: <ul> @@ -9901,8 +9901,9 @@ with the given meaning: <li><b>'<code>r</code>': </b> the hook is called every time Lua returns from a function;</li> <li><b>'<code>l</code>': </b> the hook is called every time Lua enters a new line of code.</li> </ul><p> -With a <code>count</code> different from zero, -the hook is called after every <code>count</code> instructions. +Moreover, +with a <code>count</code> different from zero, +the hook is called also after every <code>count</code> instructions. <p> @@ -10497,10 +10498,10 @@ Here is the complete syntax of Lua in extended BNF. <HR> <SMALL CLASS="footer"> Last update: -Thu Mar 21 12:58:59 BRT 2013 +Mon Feb 23 22:24:44 BRT 2015 </SMALL> <!-- -Last change: revised for Lua 5.2.2 +Last change: revised for Lua 5.2.4 --> </body></html> diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/osi-certified-72x60.png b/Build/source/libs/lua52/lua-5.2.4/doc/osi-certified-72x60.png Binary files differindex 07df5f6ee7a..07df5f6ee7a 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/osi-certified-72x60.png +++ b/Build/source/libs/lua52/lua-5.2.4/doc/osi-certified-72x60.png diff --git a/Build/source/libs/lua52/lua-5.2.3/doc/readme.html b/Build/source/libs/lua52/lua-5.2.4/doc/readme.html index 8acec874caf..a4ee9919b4f 100644 --- a/Build/source/libs/lua52/lua-5.2.3/doc/readme.html +++ b/Build/source/libs/lua52/lua-5.2.4/doc/readme.html @@ -98,8 +98,8 @@ If you don't have the time or the inclination to compile Lua yourself, get a binary from <A HREF="http://lua-users.org/wiki/LuaBinaries">LuaBinaries</A>. Try also -<A HREF="http://luaforwindows.luaforge.net/">Lua for Windows</A>, -an easy-to-use distribution of Lua that includes many useful libraries. +<A HREF="http://luadist.org/">LuaDist</A>, +a multi-platform distribution of Lua that includes batteries. <H3>Building Lua</H3> @@ -110,8 +110,8 @@ Here are the details. <OL> <LI> Open a terminal window and move to -the top-level directory, which is named <TT>lua-5.2.3</TT>. -The Makefile there controls both the build process and the installation process. +the top-level directory, which is named <TT>lua-5.2.x</TT>. +The <TT>Makefile</TT> there controls both the build process and the installation process. <P> <LI> Do "<KBD>make</KBD>" and see if your platform is listed. @@ -136,11 +136,12 @@ and liblua.a (the library). <P> <LI> To check that Lua has been built correctly, do "<KBD>make test</KBD>" - after building Lua. This will run the interpreter and print its version string. + after building Lua. This will run the interpreter and print its version. </OL> <P> If you're running Linux and get compilation errors, -make sure you have installed the <TT>readline</TT> development package. +make sure you have installed the <TT>readline</TT> development package +(which is probably named <TT>libreadline-dev</TT> or <TT>readline-devel</TT>). If you get link errors after that, then try "<KBD>make linux MYLIBS=-ltermcap</KBD>". @@ -148,7 +149,7 @@ then try "<KBD>make linux MYLIBS=-ltermcap</KBD>". <P> Once you have built Lua, you may want to install it in an official place in your system. In this case, do "<KBD>make install</KBD>". The official - place and the way to install files are defined in the Makefile. You'll + place and the way to install files are defined in the <TT>Makefile</TT>. You'll probably need the right permissions to install files. <P> @@ -158,11 +159,13 @@ then try "<KBD>make linux MYLIBS=-ltermcap</KBD>". <P> To install Lua locally, do "<KBD>make local</KBD>". This will create a directory <TT>install</TT> with subdirectories - <TT>bin</TT>, <TT>include</TT>, <TT>lib</TT>, <TT>man</TT>, + <TT>bin</TT>, <TT>include</TT>, <TT>lib</TT>, <TT>man</TT>, <TT>share</TT>, and install Lua as listed below. To install Lua locally, but in some other directory, do "<KBD>make install INSTALL_TOP=xxx</KBD>", where xxx is your chosen directory. + The installation starts in the <TT>src</TT> and <TT>doc</TT> directories, + so take care if <TT>INSTALL_TOP</TT> is not an absolute path. <DL CLASS="display"> <DT> @@ -186,8 +189,8 @@ then try "<KBD>make linux MYLIBS=-ltermcap</KBD>". <P> These are the only directories you need for development. If you only want to run Lua programs, - you only need the files in bin and man. - The files in include and lib are needed for + you only need the files in <TT>bin</TT> and <TT>man</TT>. + The files in <TT>include</TT> and <TT>lib</TT> are needed for embedding Lua in C or C++ programs. <H3><A NAME="customization">Customization</A></H3> @@ -203,7 +206,7 @@ then try "<KBD>make linux MYLIBS=-ltermcap</KBD>". You don't actually need to edit the Makefiles because you may set the relevant variables in the command line when invoking make. Nevertheless, it's probably best to edit and save the Makefiles to - record the changes you need. + record the changes you've made. <P> On the other hand, if you need to customize some Lua features, you'll need @@ -254,6 +257,7 @@ compiler: be linked statically into the host program and its symbols exported for dynamic linking; <TT>src/Makefile</TT> does this for the Lua interpreter. For Windows, we recommend that the Lua library be a DLL. + In all cases, the compiler luac should be linked statically. <P> As mentioned above, you may edit <TT>src/luaconf.h</TT> to customize @@ -375,7 +379,7 @@ For details, see <A HREF="http://www.lua.org/license.html">this</A>. <BLOCKQUOTE STYLE="padding-bottom: 0em"> -Copyright © 1994–2013 Lua.org, PUC-Rio. +Copyright © 1994–2015 Lua.org, PUC-Rio. <P> Permission is hereby granted, free of charge, to any person obtaining a copy @@ -403,10 +407,10 @@ THE SOFTWARE. <HR> <SMALL CLASS="footer"> Last update: -Sat Nov 9 22:39:16 BRST 2013 +Mon Feb 23 22:25:08 BRT 2015 </SMALL> <!-- -Last change: revised for Lua 5.2.3 +Last change: revised for Lua 5.2.4 --> </BODY> diff --git a/Build/source/libs/lua52/lua-5.2.3/src/Makefile b/Build/source/libs/lua52/lua-5.2.4/src/Makefile index 7b4b2b75420..7b4b2b75420 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/Makefile +++ b/Build/source/libs/lua52/lua-5.2.4/src/Makefile diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lapi.c b/Build/source/libs/lua52/lua-5.2.4/src/lapi.c index d011431eadf..d011431eadf 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lapi.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lapi.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lapi.h b/Build/source/libs/lua52/lua-5.2.4/src/lapi.h index c7d34ad8486..c7d34ad8486 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lapi.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lapi.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.c b/Build/source/libs/lua52/lua-5.2.4/src/lauxlib.c index b00f8c70968..b00f8c70968 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lauxlib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.h b/Build/source/libs/lua52/lua-5.2.4/src/lauxlib.h index 0fb023b8e73..0fb023b8e73 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lauxlib.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lbaselib.c b/Build/source/libs/lua52/lua-5.2.4/src/lbaselib.c index 5255b3cd9b7..5255b3cd9b7 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lbaselib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lbaselib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lbitlib.c b/Build/source/libs/lua52/lua-5.2.4/src/lbitlib.c index 31c7b66f129..31c7b66f129 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lbitlib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lbitlib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lcode.c b/Build/source/libs/lua52/lua-5.2.4/src/lcode.c index 820b95c0e18..820b95c0e18 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lcode.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lcode.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lcode.h b/Build/source/libs/lua52/lua-5.2.4/src/lcode.h index 6a1424cf5a7..6a1424cf5a7 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lcode.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lcode.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lcorolib.c b/Build/source/libs/lua52/lua-5.2.4/src/lcorolib.c index ce4f6ad42c6..ce4f6ad42c6 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lcorolib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lcorolib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lctype.c b/Build/source/libs/lua52/lua-5.2.4/src/lctype.c index 93f8cadc39d..93f8cadc39d 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lctype.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lctype.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lctype.h b/Build/source/libs/lua52/lua-5.2.4/src/lctype.h index a963eb9015f..a963eb9015f 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lctype.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lctype.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ldblib.c b/Build/source/libs/lua52/lua-5.2.4/src/ldblib.c index 84fe3c7d823..bd8df9da381 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ldblib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/ldblib.c @@ -1,5 +1,5 @@ /* -** $Id: ldblib.c,v 1.132.1.1 2013/04/12 18:48:47 roberto Exp $ +** $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 */ @@ -21,6 +21,11 @@ #define HOOKKEY "_HKEY" +static void checkstack (lua_State *L, lua_State *L1, int n) { + if (L != L1 && !lua_checkstack(L1, n)) + luaL_error(L, "stack overflow"); +} + static int db_getregistry (lua_State *L) { lua_pushvalue(L, LUA_REGISTRYINDEX); @@ -114,6 +119,7 @@ static int db_getinfo (lua_State *L) { int arg; lua_State *L1 = getthread(L, &arg); const char *options = luaL_optstring(L, arg+2, "flnStu"); + checkstack(L, L1, 3); if (lua_isnumber(L, arg+1)) { if (!lua_getstack(L1, (int)lua_tointeger(L, arg+1), &ar)) { lua_pushnil(L); /* level out of range */ @@ -173,6 +179,7 @@ static int db_getlocal (lua_State *L) { else { /* stack-level argument */ if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)) /* out of range? */ return luaL_argerror(L, arg+1, "level out of range"); + checkstack(L, L1, 1); name = lua_getlocal(L1, &ar, nvar); if (name) { lua_xmove(L1, L, 1); /* push local value */ @@ -196,6 +203,7 @@ static int db_setlocal (lua_State *L) { 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); lua_pushstring(L, lua_setlocal(L1, &ar, luaL_checkint(L, arg+2))); return 1; @@ -313,6 +321,7 @@ static int db_sethook (lua_State *L) { lua_pushvalue(L, -1); lua_setmetatable(L, -2); /* setmetatable(hooktable) = hooktable */ } + checkstack(L, L1, 1); lua_pushthread(L1); lua_xmove(L1, L, 1); lua_pushvalue(L, arg+1); lua_rawset(L, -3); /* set new hook */ @@ -331,6 +340,7 @@ static int db_gethook (lua_State *L) { lua_pushliteral(L, "external hook"); else { gethooktable(L); + checkstack(L, L1, 1); lua_pushthread(L1); lua_xmove(L1, L, 1); lua_rawget(L, -2); /* get hook */ lua_remove(L, -2); /* remove hook table */ diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ldebug.c b/Build/source/libs/lua52/lua-5.2.4/src/ldebug.c index 20d663efff3..96118461d0f 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ldebug.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/ldebug.c @@ -1,5 +1,5 @@ /* -** $Id: ldebug.c,v 2.90.1.3 2013/05/16 16:04:15 roberto Exp $ +** $Id: ldebug.c,v 2.90.1.4 2015/02/19 17:05:13 roberto Exp $ ** Debug Interface ** See Copyright Notice in lua.h */ @@ -47,6 +47,16 @@ static int currentline (CallInfo *ci) { } +static void swapextra (lua_State *L) { + if (L->status == LUA_YIELD) { + CallInfo *ci = L->ci; /* get function that yielded */ + StkId temp = ci->func; /* exchange its 'func' and 'extra' values */ + ci->func = restorestack(L, ci->extra); + ci->extra = savestack(L, temp); + } +} + + /* ** this function can be called asynchronous (e.g. during a signal) */ @@ -144,6 +154,7 @@ static const char *findlocal (lua_State *L, CallInfo *ci, int n, LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) { const char *name; lua_lock(L); + swapextra(L); if (ar == NULL) { /* information about non-active function? */ if (!isLfunction(L->top - 1)) /* not a Lua function? */ name = NULL; @@ -158,6 +169,7 @@ LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) { api_incr_top(L); } } + swapextra(L); lua_unlock(L); return name; } @@ -165,11 +177,14 @@ LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) { LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) { StkId pos = 0; /* to avoid warnings */ - const char *name = findlocal(L, ar->i_ci, n, &pos); + const char *name; lua_lock(L); + swapextra(L); + name = findlocal(L, ar->i_ci, n, &pos); if (name) setobjs2s(L, pos, L->top - 1); L->top--; /* pop value */ + swapextra(L); lua_unlock(L); return name; } @@ -269,6 +284,7 @@ LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) { CallInfo *ci; StkId func; lua_lock(L); + swapextra(L); if (*what == '>') { ci = NULL; func = L->top - 1; @@ -287,6 +303,7 @@ LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) { setobjs2s(L, L->top, func); api_incr_top(L); } + swapextra(L); if (strchr(what, 'L')) collectvalidlines(L, cl); lua_unlock(L); diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ldebug.h b/Build/source/libs/lua52/lua-5.2.4/src/ldebug.h index 6445c763ea5..6445c763ea5 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ldebug.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/ldebug.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ldo.c b/Build/source/libs/lua52/lua-5.2.4/src/ldo.c index e9dd5fa9519..e9dd5fa9519 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ldo.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/ldo.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ldo.h b/Build/source/libs/lua52/lua-5.2.4/src/ldo.h index d3d3082c9ba..d3d3082c9ba 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ldo.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/ldo.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ldump.c b/Build/source/libs/lua52/lua-5.2.4/src/ldump.c index 61fa2cd892d..61fa2cd892d 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ldump.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/ldump.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lfunc.c b/Build/source/libs/lua52/lua-5.2.4/src/lfunc.c index e90e1520ce9..e90e1520ce9 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lfunc.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lfunc.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lfunc.h b/Build/source/libs/lua52/lua-5.2.4/src/lfunc.h index ca0d3a3e0b0..ca0d3a3e0b0 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lfunc.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lfunc.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lgc.c b/Build/source/libs/lua52/lua-5.2.4/src/lgc.c index 52460dcdd5a..553fd1774ed 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lgc.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lgc.c @@ -1,5 +1,5 @@ /* -** $Id: lgc.c,v 2.140.1.2 2013/04/26 18:22:05 roberto Exp $ +** $Id: lgc.c,v 2.140.1.3 2014/09/01 16:55:08 roberto Exp $ ** Garbage Collector ** See Copyright Notice in lua.h */ @@ -403,7 +403,7 @@ static int traverseephemeron (global_State *g, Table *h) { reallymarkobject(g, gcvalue(gval(n))); /* mark it now */ } } - if (prop) + if (g->gcstate != GCSatomic || prop) linktable(h, &g->ephemeron); /* have to propagate again */ else if (hasclears) /* does table have white keys? */ linktable(h, &g->allweak); /* may have to clean white keys */ diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lgc.h b/Build/source/libs/lua52/lua-5.2.4/src/lgc.h index 84bb1cdf99f..84bb1cdf99f 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lgc.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lgc.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/linit.c b/Build/source/libs/lua52/lua-5.2.4/src/linit.c index c1a38304711..c1a38304711 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/linit.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/linit.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/liolib.c b/Build/source/libs/lua52/lua-5.2.4/src/liolib.c index 481630101c0..481630101c0 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/liolib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/liolib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/llex.c b/Build/source/libs/lua52/lua-5.2.4/src/llex.c index c4b820e8332..32cdcf1cfac 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/llex.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/llex.c @@ -1,5 +1,5 @@ /* -** $Id: llex.c,v 2.63.1.2 2013/08/30 15:49:41 roberto Exp $ +** $Id: llex.c,v 2.63.1.3 2015/02/09 17:56:34 roberto Exp $ ** Lexical Analyzer ** See Copyright Notice in lua.h */ @@ -152,7 +152,7 @@ static void inclinenumber (LexState *ls) { if (currIsNewline(ls) && ls->current != old) next(ls); /* skip `\n\r' or `\r\n' */ if (++ls->linenumber >= MAX_INT) - luaX_syntaxerror(ls, "chunk has too many lines"); + lexerror(ls, "chunk has too many lines", 0); } diff --git a/Build/source/libs/lua52/lua-5.2.3/src/llex.h b/Build/source/libs/lua52/lua-5.2.4/src/llex.h index a4acdd30218..a4acdd30218 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/llex.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/llex.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/llimits.h b/Build/source/libs/lua52/lua-5.2.4/src/llimits.h index 152dd055154..152dd055154 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/llimits.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/llimits.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lmathlib.c b/Build/source/libs/lua52/lua-5.2.4/src/lmathlib.c index fe9fc5423d1..fe9fc5423d1 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lmathlib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lmathlib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lmem.c b/Build/source/libs/lua52/lua-5.2.4/src/lmem.c index ee343e3e037..ee343e3e037 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lmem.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lmem.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lmem.h b/Build/source/libs/lua52/lua-5.2.4/src/lmem.h index bd4f4e0726f..bd4f4e0726f 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lmem.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lmem.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/loadlib.c b/Build/source/libs/lua52/lua-5.2.4/src/loadlib.c index bedbea3e9a7..bedbea3e9a7 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/loadlib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/loadlib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lobject.c b/Build/source/libs/lua52/lua-5.2.4/src/lobject.c index 882d994d413..882d994d413 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lobject.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lobject.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lobject.h b/Build/source/libs/lua52/lua-5.2.4/src/lobject.h index 3a630b944c7..bc0bb69f1f4 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lobject.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lobject.h @@ -1,5 +1,5 @@ /* -** $Id: lobject.h,v 2.71.1.1 2013/04/12 18:48:47 roberto Exp $ +** $Id: lobject.h,v 2.71.1.2 2014/05/07 14:14:58 roberto Exp $ ** Type definitions for Lua objects ** See Copyright Notice in lua.h */ @@ -561,12 +561,12 @@ typedef struct Table { CommonHeader; lu_byte flags; /* 1<<p means tagmethod(p) is not present */ lu_byte lsizenode; /* log2 of size of `node' array */ - struct Table *metatable; + int sizearray; /* size of `array' array */ TValue *array; /* array part */ Node *node; Node *lastfree; /* any free position is before this position */ + struct Table *metatable; GCObject *gclist; - int sizearray; /* size of `array' array */ } Table; diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.c b/Build/source/libs/lua52/lua-5.2.4/src/lopcodes.c index 4190dc76242..4190dc76242 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lopcodes.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.h b/Build/source/libs/lua52/lua-5.2.4/src/lopcodes.h index 50a55fa6119..c801757668b 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lopcodes.h @@ -1,5 +1,5 @@ /* -** $Id: lopcodes.h,v 1.142.1.1 2013/04/12 18:48:47 roberto Exp $ +** $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 */ @@ -196,7 +196,7 @@ OP_LEN,/* A B R(A) := length of R(B) */ OP_CONCAT,/* A B C R(A) := R(B).. ... ..R(C) */ -OP_JMP,/* A sBx pc+=sBx; if (A) close all upvalues >= R(A) + 1 */ +OP_JMP,/* A sBx pc+=sBx; if (A) close all upvalues >= R(A - 1) */ OP_EQ,/* A B C if ((RK(B) == RK(C)) ~= A) then pc++ */ OP_LT,/* A B C if ((RK(B) < RK(C)) ~= A) then pc++ */ OP_LE,/* A B C if ((RK(B) <= RK(C)) ~= A) then pc++ */ diff --git a/Build/source/libs/lua52/lua-5.2.3/src/loslib.c b/Build/source/libs/lua52/lua-5.2.4/src/loslib.c index 052ba174413..052ba174413 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/loslib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/loslib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lparser.c b/Build/source/libs/lua52/lua-5.2.4/src/lparser.c index 9e1a9ca2cfe..9e1a9ca2cfe 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lparser.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lparser.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lparser.h b/Build/source/libs/lua52/lua-5.2.4/src/lparser.h index 0346e3c41a8..0346e3c41a8 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lparser.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lparser.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lstate.c b/Build/source/libs/lua52/lua-5.2.4/src/lstate.c index c7f2672be7b..c7f2672be7b 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lstate.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lstate.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lstate.h b/Build/source/libs/lua52/lua-5.2.4/src/lstate.h index daffd9aacfb..daffd9aacfb 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lstate.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lstate.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lstring.c b/Build/source/libs/lua52/lua-5.2.4/src/lstring.c index af96c89c183..af96c89c183 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lstring.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lstring.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lstring.h b/Build/source/libs/lua52/lua-5.2.4/src/lstring.h index 260e7f169bd..260e7f169bd 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lstring.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lstring.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lstrlib.c b/Build/source/libs/lua52/lua-5.2.4/src/lstrlib.c index 9261fd220db..9261fd220db 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lstrlib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lstrlib.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ltable.c b/Build/source/libs/lua52/lua-5.2.4/src/ltable.c index 5d76f97ec3c..5d76f97ec3c 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ltable.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/ltable.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ltable.h b/Build/source/libs/lua52/lua-5.2.4/src/ltable.h index d69449b2b86..d69449b2b86 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ltable.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/ltable.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ltablib.c b/Build/source/libs/lua52/lua-5.2.4/src/ltablib.c index 6001224e39b..99764d26d10 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ltablib.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/ltablib.c @@ -1,10 +1,11 @@ /* -** $Id: ltablib.c,v 1.65.1.1 2013/04/12 18:48:47 roberto Exp $ +** $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 */ +#include <limits.h> #include <stddef.h> #define ltablib_c @@ -134,13 +135,14 @@ static int pack (lua_State *L) { static int unpack (lua_State *L) { - int i, e, n; + int i, e; + unsigned int n; luaL_checktype(L, 1, LUA_TTABLE); i = luaL_optint(L, 2, 1); e = luaL_opt(L, luaL_checkint, 3, luaL_len(L, 1)); if (i > e) return 0; /* empty range */ - n = e - i + 1; /* number of elements */ - if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */ + n = (unsigned int)e - (unsigned int)i; /* number of elements minus 1 */ + if (n > (INT_MAX - 10) || !lua_checkstack(L, ++n)) return luaL_error(L, "too many results to unpack"); lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */ while (i++ < e) /* push arg[i + 1...e] */ diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ltm.c b/Build/source/libs/lua52/lua-5.2.4/src/ltm.c index 69b4ed77271..69b4ed77271 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ltm.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/ltm.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/ltm.h b/Build/source/libs/lua52/lua-5.2.4/src/ltm.h index 7f89c841f9c..7f89c841f9c 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/ltm.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/ltm.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lua.c b/Build/source/libs/lua52/lua-5.2.4/src/lua.c index 4345e554e92..4345e554e92 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lua.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lua.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lua.h b/Build/source/libs/lua52/lua-5.2.4/src/lua.h index 149a2c37bcd..ff4a10861b5 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lua.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lua.h @@ -1,5 +1,5 @@ /* -** $Id: lua.h,v 1.285.1.2 2013/11/11 12:09:16 roberto Exp $ +** $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 @@ -19,11 +19,11 @@ #define LUA_VERSION_MAJOR "5" #define LUA_VERSION_MINOR "2" #define LUA_VERSION_NUM 502 -#define LUA_VERSION_RELEASE "3" +#define LUA_VERSION_RELEASE "4" #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE -#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2013 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" @@ -418,7 +418,7 @@ struct lua_Debug { /****************************************************************************** -* Copyright (C) 1994-2013 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 diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lua.hpp b/Build/source/libs/lua52/lua-5.2.4/src/lua.hpp index ec417f59469..ec417f59469 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lua.hpp +++ b/Build/source/libs/lua52/lua-5.2.4/src/lua.hpp diff --git a/Build/source/libs/lua52/lua-5.2.3/src/luac.c b/Build/source/libs/lua52/lua-5.2.4/src/luac.c index 7409706ec72..7409706ec72 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/luac.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/luac.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/luaconf.h b/Build/source/libs/lua52/lua-5.2.4/src/luaconf.h index 18be9a9e436..1b0ff59fa00 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/luaconf.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/luaconf.h @@ -1,5 +1,5 @@ /* -** $Id: luaconf.h,v 1.176.1.1 2013/04/12 18:48:47 roberto Exp $ +** $Id: luaconf.h,v 1.176.1.2 2013/11/21 17:26:16 roberto Exp $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -326,7 +326,7 @@ /* -@@ LUA_INT32 is an signed integer with exactly 32 bits. +@@ LUA_INT32 is a signed integer with exactly 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 @@ -350,7 +350,7 @@ /* @@ 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 +** its only purpose is to stop Lua from consuming unlimited stack ** space (and to reserve some numbers for pseudo-indices). */ #if LUAI_BITSINT >= 32 diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lualib.h b/Build/source/libs/lua52/lua-5.2.4/src/lualib.h index da82005c9de..da82005c9de 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lualib.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lualib.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lundump.c b/Build/source/libs/lua52/lua-5.2.4/src/lundump.c index 4163cb5d3b0..4163cb5d3b0 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lundump.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lundump.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lundump.h b/Build/source/libs/lua52/lua-5.2.4/src/lundump.h index ede365a2272..ede365a2272 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lundump.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lundump.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lvm.c b/Build/source/libs/lua52/lua-5.2.4/src/lvm.c index 141b9fd19c3..141b9fd19c3 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lvm.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lvm.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lvm.h b/Build/source/libs/lua52/lua-5.2.4/src/lvm.h index 5380270da63..5380270da63 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lvm.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lvm.h diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lzio.c b/Build/source/libs/lua52/lua-5.2.4/src/lzio.c index 20efea98300..20efea98300 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lzio.c +++ b/Build/source/libs/lua52/lua-5.2.4/src/lzio.c diff --git a/Build/source/libs/lua52/lua-5.2.3/src/lzio.h b/Build/source/libs/lua52/lua-5.2.4/src/lzio.h index 441f7479cb1..441f7479cb1 100644 --- a/Build/source/libs/lua52/lua-5.2.3/src/lzio.h +++ b/Build/source/libs/lua52/lua-5.2.4/src/lzio.h diff --git a/Build/source/libs/lua52/version.ac b/Build/source/libs/lua52/version.ac index 555d83e4077..6909c27af33 100644 --- a/Build/source/libs/lua52/version.ac +++ b/Build/source/libs/lua52/version.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current lua52 version -m4_define([lua52_version], [5.2.3]) +m4_define([lua52_version], [5.2.4]) |