diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-07 12:24:58 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-07 12:24:58 +0000 |
commit | 371f7657572dbd472b707c32448d5b5f92663078 (patch) | |
tree | e345c4554402dc8edc33c0f35b4c866988f06cb2 /Build | |
parent | 3bbd721df0882f2147bb324f257b66754476fcbf (diff) |
lua 5.2.3
git-svn-id: svn://tug.org/texlive/trunk@32352 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/libs/README | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/libs/lua52/configure | 24 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog (renamed from Build/source/libs/lua52/lua-5.2.2-PATCHES/ChangeLog) | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/Makefile (renamed from Build/source/libs/lua52/lua-5.2.2/Makefile) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/README (renamed from Build/source/libs/lua52/lua-5.2.2/README) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/contents.html (renamed from Build/source/libs/lua52/lua-5.2.2/doc/contents.html) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/logo.gif (renamed from Build/source/libs/lua52/lua-5.2.2/doc/logo.gif) | bin | 4232 -> 4232 bytes | |||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/lua.1 (renamed from Build/source/libs/lua52/lua-5.2.2/doc/lua.1) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/lua.css (renamed from Build/source/libs/lua52/lua-5.2.2/doc/lua.css) | 31 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/luac.1 (renamed from Build/source/libs/lua52/lua-5.2.2/doc/luac.1) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/manual.css (renamed from Build/source/libs/lua52/lua-5.2.2/doc/manual.css) | 9 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/manual.html (renamed from Build/source/libs/lua52/lua-5.2.2/doc/manual.html) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/osi-certified-72x60.png (renamed from Build/source/libs/lua52/lua-5.2.2/doc/osi-certified-72x60.png) | bin | 3774 -> 3774 bytes | |||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/doc/readme.html (renamed from Build/source/libs/lua52/lua-5.2.2/doc/readme.html) | 7 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/Makefile (renamed from Build/source/libs/lua52/lua-5.2.2/src/Makefile) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lapi.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lapi.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lapi.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lapi.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lauxlib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lauxlib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lauxlib.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lauxlib.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lbaselib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lbaselib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lbitlib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lbitlib.c) | 5 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lcode.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lcode.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lcode.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lcode.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lcorolib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lcorolib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lctype.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lctype.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lctype.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lctype.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ldblib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/ldblib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ldebug.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/ldebug.c) | 31 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ldebug.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/ldebug.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ldo.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/ldo.c) | 18 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ldo.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/ldo.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ldump.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/ldump.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lfunc.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lfunc.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lfunc.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lfunc.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lgc.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lgc.c) | 13 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lgc.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lgc.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/linit.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/linit.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/liolib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/liolib.c) | 23 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/llex.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/llex.c) | 5 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/llex.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/llex.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/llimits.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/llimits.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lmathlib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lmathlib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lmem.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lmem.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lmem.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lmem.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/loadlib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/loadlib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lobject.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lobject.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lobject.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lobject.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lopcodes.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lopcodes.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lopcodes.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lopcodes.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/loslib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/loslib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lparser.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lparser.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lparser.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lparser.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lstate.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lstate.c) | 11 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lstate.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lstate.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lstring.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lstring.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lstring.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lstring.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lstrlib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lstrlib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ltable.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/ltable.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ltable.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/ltable.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ltablib.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/ltablib.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ltm.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/ltm.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/ltm.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/ltm.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lua.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lua.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lua.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lua.h) | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lua.hpp (renamed from Build/source/libs/lua52/lua-5.2.2/src/lua.hpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/luac.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/luac.c) | 4 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/luaconf.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/luaconf.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lualib.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lualib.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lundump.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lundump.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lundump.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lundump.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lvm.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lvm.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lvm.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lvm.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lzio.c (renamed from Build/source/libs/lua52/lua-5.2.2/src/lzio.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/lua-5.2.3/src/lzio.h (renamed from Build/source/libs/lua52/lua-5.2.2/src/lzio.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/lua52/version.ac | 2 |
76 files changed, 184 insertions, 122 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README index 9ff89e5aa5c..50b92761db1 100644 --- a/Build/source/libs/README +++ b/Build/source/libs/README @@ -31,7 +31,7 @@ libpng 1.5.17 - checked 29jun13 (1.6.2 does not work) http://www.libpng.org/ - used by many http://www.libpng.org/pub/png/pngcode.html -lua 5.2.2 - checked 28mar13 +lua 5.2.3 - checked 7dec13 http://www.lua.org/ftp/ paper 1.1.24+nmu2 - checked 24oct13 diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog index 6c17e1098e9..0a2b42b8e74 100644 --- a/Build/source/libs/lua52/ChangeLog +++ b/Build/source/libs/lua52/ChangeLog @@ -1,3 +1,8 @@ +2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import lua-5.2.3. + * version.ac: Adjust. + 2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use ../../am/rebuild.am. diff --git a/Build/source/libs/lua52/configure b/Build/source/libs/lua52/configure index ec66982fa8e..fcb505b3efc 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.2. +# Generated by GNU Autoconf 2.69 for lua52 (TeX Live) 5.2.3. # # Report bugs to <tex-k@tug.org>. # @@ -580,12 +580,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='lua52 (TeX Live)' PACKAGE_TARNAME='lua52--tex-live-' -PACKAGE_VERSION='5.2.2' -PACKAGE_STRING='lua52 (TeX Live) 5.2.2' +PACKAGE_VERSION='5.2.3' +PACKAGE_STRING='lua52 (TeX Live) 5.2.3' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="lua-5.2.2/src/lua.c" +ac_unique_file="lua-5.2.3/src/lua.c" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1280,7 +1280,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.2 to adapt to many kinds of systems. +\`configure' configures lua52 (TeX Live) 5.2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1347,7 +1347,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lua52 (TeX Live) 5.2.2:";; + short | recursive ) echo "Configuration of lua52 (TeX Live) 5.2.3:";; esac cat <<\_ACEOF @@ -1445,7 +1445,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lua52 (TeX Live) configure 5.2.2 +lua52 (TeX Live) configure 5.2.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1656,7 +1656,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.2, which was +It was created by lua52 (TeX Live) $as_me 5.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3579,7 +3579,7 @@ fi # Define the identity of the package. PACKAGE='lua52--tex-live-' - VERSION='5.2.2' + VERSION='5.2.3' cat >>confdefs.h <<_ACEOF @@ -5475,7 +5475,7 @@ case $ac_cv_sys_largefile_source in #( esac -LUA52_TREE=lua-5.2.2 +LUA52_TREE=lua-5.2.3 ac_config_files="$ac_config_files Makefile include/Makefile" @@ -6023,7 +6023,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.2, which was +This file was extended by lua52 (TeX Live) $as_me 5.2.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6089,7 +6089,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.2 +lua52 (TeX Live) config.status 5.2.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/lua52/lua-5.2.2-PATCHES/ChangeLog b/Build/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog index de6eba36072..f79e6607061 100644 --- a/Build/source/libs/lua52/lua-5.2.2-PATCHES/ChangeLog +++ b/Build/source/libs/lua52/lua-5.2.3-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2012-12-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import lua-5.2.3/ from http://www.lua.org/ftp/lua-5.2.3.tar.gz. + 2012-06-25 Peter Breitenlohner <peb@mppmu.mpg.de> Import lua-5.2.2/ from http://www.lua.org/ftp/lua-5.2.2.tar.gz. diff --git a/Build/source/libs/lua52/lua-5.2.2/Makefile b/Build/source/libs/lua52/lua-5.2.3/Makefile index bd9515fd84d..d2c7db4a2da 100644 --- a/Build/source/libs/lua52/lua-5.2.2/Makefile +++ b/Build/source/libs/lua52/lua-5.2.3/Makefile @@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1 # Lua version and release. V= 5.2 -R= $V.1 +R= $V.3 # Targets start here. all: $(PLAT) diff --git a/Build/source/libs/lua52/lua-5.2.2/README b/Build/source/libs/lua52/lua-5.2.3/README index 6e2aee6ce3e..49033adb5bf 100644 --- a/Build/source/libs/lua52/lua-5.2.2/README +++ b/Build/source/libs/lua52/lua-5.2.3/README @@ -1,5 +1,5 @@ -This is Lua 5.2.2, released on 21 Mar 2013. +This is Lua 5.2.3, released on 11 Nov 2013. For installation instructions, license details, and further information about Lua, see doc/readme.html. diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/contents.html b/Build/source/libs/lua52/lua-5.2.3/doc/contents.html index 0ce297da19c..0ce297da19c 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/contents.html +++ b/Build/source/libs/lua52/lua-5.2.3/doc/contents.html diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/logo.gif b/Build/source/libs/lua52/lua-5.2.3/doc/logo.gif Binary files differindex 2f5e4ac2e74..2f5e4ac2e74 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/logo.gif +++ b/Build/source/libs/lua52/lua-5.2.3/doc/logo.gif diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/lua.1 b/Build/source/libs/lua52/lua-5.2.3/doc/lua.1 index 1dbf04366ce..1dbf04366ce 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/lua.1 +++ b/Build/source/libs/lua52/lua-5.2.3/doc/lua.1 diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/lua.css b/Build/source/libs/lua52/lua-5.2.3/doc/lua.css index 240e85eb8b0..3d2443acffd 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/lua.css +++ b/Build/source/libs/lua52/lua-5.2.3/doc/lua.css @@ -1,30 +1,37 @@ +html { + background-color: #F8F8F8 ; +} + body { + border: solid #a0a0a0 1px ; + border-radius: 20px ; + padding: 26px ; + margin: 16px ; color: #000000 ; background-color: #FFFFFF ; font-family: Helvetica, Arial, sans-serif ; text-align: justify ; - margin-right: 30px ; - margin-left: 30px ; } h1, h2, h3, h4 { font-family: Verdana, Geneva, sans-serif ; font-weight: normal ; - font-style: italic ; + font-style: normal ; } h2 { padding-top: 0.4em ; padding-bottom: 0.4em ; - padding-left: 1em ; - padding-right: 1em ; - background-color: #E0E0FF ; + padding-left: 0.8em ; + padding-right: 0.8em ; + background-color: #D0D0FF ; border-radius: 8px ; + border: solid #a0a0a0 1px ; } h3 { padding-left: 0.5em ; - border-left: solid #E0E0FF 1em ; + border-left: solid #D0D0FF 1em ; } table h3 { @@ -45,7 +52,7 @@ a:visited { a:link:hover, a:visited:hover { color: #000080 ; - background-color: #E0E0FF ; + background-color: #D0D0FF ; } a:link:active, a:visited:active { @@ -57,17 +64,23 @@ hr { height: 1px ; color: #a0a0a0 ; background-color: #a0a0a0 ; + display: none ; +} + +table hr { + display: block ; } :target { background-color: #F8F8F8 ; padding: 8px ; border: solid #a0a0a0 2px ; + border-radius: 8px ; } .footer { color: gray ; - font-size: small ; + font-size: x-small ; } input[type=text] { diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/luac.1 b/Build/source/libs/lua52/lua-5.2.3/doc/luac.1 index 33a4ed00ace..33a4ed00ace 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/luac.1 +++ b/Build/source/libs/lua52/lua-5.2.3/doc/luac.1 diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/manual.css b/Build/source/libs/lua52/lua-5.2.3/doc/manual.css index 269bd4358e6..ca613cd9fb1 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/manual.css +++ b/Build/source/libs/lua52/lua-5.2.3/doc/manual.css @@ -16,11 +16,12 @@ span.apii { } p+h1, ul+h1 { + font-style: normal ; padding-top: 0.4em ; padding-bottom: 0.4em ; - padding-left: 24px ; - margin-left: -24px ; - background-color: #E0E0FF ; + padding-left: 16px ; + margin-left: -16px ; + background-color: #D0D0FF ; border-radius: 8px ; + border: solid #000080 1px ; } - diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/manual.html b/Build/source/libs/lua52/lua-5.2.3/doc/manual.html index 85365363fb3..85365363fb3 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/manual.html +++ b/Build/source/libs/lua52/lua-5.2.3/doc/manual.html diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/osi-certified-72x60.png b/Build/source/libs/lua52/lua-5.2.3/doc/osi-certified-72x60.png Binary files differindex 07df5f6ee7a..07df5f6ee7a 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/osi-certified-72x60.png +++ b/Build/source/libs/lua52/lua-5.2.3/doc/osi-certified-72x60.png diff --git a/Build/source/libs/lua52/lua-5.2.2/doc/readme.html b/Build/source/libs/lua52/lua-5.2.3/doc/readme.html index 5b9e47ecba8..8acec874caf 100644 --- a/Build/source/libs/lua52/lua-5.2.2/doc/readme.html +++ b/Build/source/libs/lua52/lua-5.2.3/doc/readme.html @@ -7,6 +7,7 @@ <STYLE TYPE="text/css"> blockquote, .display { border: solid #a0a0a0 2px ; + border-radius: 8px ; padding: 1em ; margin: 0px ; } @@ -109,7 +110,7 @@ Here are the details. <OL> <LI> Open a terminal window and move to -the top-level directory, which is named <TT>lua-5.2.2</TT>. +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. <P> <LI> @@ -402,10 +403,10 @@ THE SOFTWARE. <HR> <SMALL CLASS="footer"> Last update: -Fri Feb 22 09:24:20 BRT 2013 +Sat Nov 9 22:39:16 BRST 2013 </SMALL> <!-- -Last change: revised for Lua 5.2.2 +Last change: revised for Lua 5.2.3 --> </BODY> diff --git a/Build/source/libs/lua52/lua-5.2.2/src/Makefile b/Build/source/libs/lua52/lua-5.2.3/src/Makefile index fea895bc065..7b4b2b75420 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/Makefile +++ b/Build/source/libs/lua52/lua-5.2.3/src/Makefile @@ -106,7 +106,7 @@ linux: $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" macosx: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc mingw: $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lapi.c b/Build/source/libs/lua52/lua-5.2.3/src/lapi.c index 791d85454fb..d011431eadf 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lapi.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lapi.c @@ -1,5 +1,5 @@ /* -** $Id: lapi.c,v 2.171 2013/03/16 21:10:18 roberto Exp $ +** $Id: lapi.c,v 2.171.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua API ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lapi.h b/Build/source/libs/lua52/lua-5.2.3/src/lapi.h index 0909a3911d2..c7d34ad8486 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lapi.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lapi.h @@ -1,5 +1,5 @@ /* -** $Id: lapi.h,v 2.7 2009/11/27 15:37:59 roberto Exp $ +** $Id: lapi.h,v 2.7.1.1 2013/04/12 18:48:47 roberto Exp $ ** Auxiliary functions from Lua API ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lauxlib.c b/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.c index 2e989d661b8..b00f8c70968 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lauxlib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.c @@ -1,5 +1,5 @@ /* -** $Id: lauxlib.c,v 1.248 2013/03/21 13:54:57 roberto Exp $ +** $Id: lauxlib.c,v 1.248.1.1 2013/04/12 18:48:47 roberto Exp $ ** Auxiliary functions for building Lua libraries ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lauxlib.h b/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.h index ac4d15fbb94..0fb023b8e73 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lauxlib.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lauxlib.h @@ -1,5 +1,5 @@ /* -** $Id: lauxlib.h,v 1.120 2011/11/29 15:55:08 roberto Exp $ +** $Id: lauxlib.h,v 1.120.1.1 2013/04/12 18:48:47 roberto Exp $ ** Auxiliary functions for building Lua libraries ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lbaselib.c b/Build/source/libs/lua52/lua-5.2.3/src/lbaselib.c index 540e9a5cc03..5255b3cd9b7 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lbaselib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lbaselib.c @@ -1,5 +1,5 @@ /* -** $Id: lbaselib.c,v 1.276 2013/02/21 13:44:53 roberto Exp $ +** $Id: lbaselib.c,v 1.276.1.1 2013/04/12 18:48:47 roberto Exp $ ** Basic library ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lbitlib.c b/Build/source/libs/lua52/lua-5.2.3/src/lbitlib.c index 9637532e3d8..31c7b66f129 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lbitlib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lbitlib.c @@ -1,5 +1,5 @@ /* -** $Id: lbitlib.c,v 1.18 2013/03/19 13:19:12 roberto Exp $ +** $Id: lbitlib.c,v 1.18.1.2 2013/07/09 18:01:41 roberto Exp $ ** Standard library for bitwise operations ** See Copyright Notice in lua.h */ @@ -129,7 +129,8 @@ static int b_rot (lua_State *L, int i) { b_uint r = luaL_checkunsigned(L, 1); i &= (LUA_NBITS - 1); /* i = i % NBITS */ r = trim(r); - r = (r << i) | (r >> (LUA_NBITS - i)); + if (i != 0) /* avoid undefined shift of LUA_NBITS when i == 0 */ + r = (r << i) | (r >> (LUA_NBITS - i)); lua_pushunsigned(L, trim(r)); return 1; } diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lcode.c b/Build/source/libs/lua52/lua-5.2.3/src/lcode.c index 56c26ac8aac..820b95c0e18 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lcode.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lcode.c @@ -1,5 +1,5 @@ /* -** $Id: lcode.c,v 2.62 2012/08/16 17:34:28 roberto Exp $ +** $Id: lcode.c,v 2.62.1.1 2013/04/12 18:48:47 roberto Exp $ ** Code generator for Lua ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lcode.h b/Build/source/libs/lua52/lua-5.2.3/src/lcode.h index 5a1fa9feac6..6a1424cf5a7 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lcode.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lcode.h @@ -1,5 +1,5 @@ /* -** $Id: lcode.h,v 1.58 2011/08/30 16:26:41 roberto Exp $ +** $Id: lcode.h,v 1.58.1.1 2013/04/12 18:48:47 roberto Exp $ ** Code generator for Lua ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lcorolib.c b/Build/source/libs/lua52/lua-5.2.3/src/lcorolib.c index 1326c8146c5..ce4f6ad42c6 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lcorolib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lcorolib.c @@ -1,5 +1,5 @@ /* -** $Id: lcorolib.c,v 1.5 2013/02/21 13:44:53 roberto Exp $ +** $Id: lcorolib.c,v 1.5.1.1 2013/04/12 18:48:47 roberto Exp $ ** Coroutine Library ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lctype.c b/Build/source/libs/lua52/lua-5.2.3/src/lctype.c index 55e433a5dd7..93f8cadc39d 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lctype.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lctype.c @@ -1,5 +1,5 @@ /* -** $Id: lctype.c,v 1.11 2011/10/03 16:19:23 roberto Exp $ +** $Id: lctype.c,v 1.11.1.1 2013/04/12 18:48:47 roberto Exp $ ** 'ctype' functions for Lua ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lctype.h b/Build/source/libs/lua52/lua-5.2.3/src/lctype.h index 99c7d122376..b09b21a337c 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lctype.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lctype.h @@ -1,5 +1,5 @@ /* -** $Id: lctype.h,v 1.12 2011/07/15 12:50:29 roberto Exp $ +** $Id: lctype.h,v 1.12.1.1 2013/04/12 18:48:47 roberto Exp $ ** 'ctype' functions for Lua ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ldblib.c b/Build/source/libs/lua52/lua-5.2.3/src/ldblib.c index c0226945737..84fe3c7d823 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ldblib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/ldblib.c @@ -1,5 +1,5 @@ /* -** $Id: ldblib.c,v 1.132 2012/01/19 20:14:44 roberto Exp $ +** $Id: ldblib.c,v 1.132.1.1 2013/04/12 18:48:47 roberto Exp $ ** Interface from Lua to its debug API ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ldebug.c b/Build/source/libs/lua52/lua-5.2.3/src/ldebug.c index 7e04f9d09f8..20d663efff3 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ldebug.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/ldebug.c @@ -1,5 +1,5 @@ /* -** $Id: ldebug.c,v 2.90 2012/08/16 17:34:28 roberto Exp $ +** $Id: ldebug.c,v 2.90.1.3 2013/05/16 16:04:15 roberto Exp $ ** Debug Interface ** See Copyright Notice in lua.h */ @@ -327,12 +327,20 @@ static void kname (Proto *p, int pc, int c, const char **name) { } +static int filterpc (int pc, int jmptarget) { + if (pc < jmptarget) /* is code conditional (inside a jump)? */ + return -1; /* cannot know who sets that register */ + else return pc; /* current position sets that register */ +} + + /* ** try to find last instruction before 'lastpc' that modified register 'reg' */ static int findsetreg (Proto *p, int lastpc, int reg) { int pc; int setreg = -1; /* keep last instruction that changed 'reg' */ + int jmptarget = 0; /* any code before this address is conditional */ for (pc = 0; pc < lastpc; pc++) { Instruction i = p->code[pc]; OpCode op = GET_OPCODE(i); @@ -341,33 +349,38 @@ static int findsetreg (Proto *p, int lastpc, int reg) { case OP_LOADNIL: { int b = GETARG_B(i); if (a <= reg && reg <= a + b) /* set registers from 'a' to 'a+b' */ - setreg = pc; + setreg = filterpc(pc, jmptarget); break; } case OP_TFORCALL: { - if (reg >= a + 2) setreg = pc; /* affect all regs above its base */ + if (reg >= a + 2) /* affect all regs above its base */ + setreg = filterpc(pc, jmptarget); break; } case OP_CALL: case OP_TAILCALL: { - if (reg >= a) setreg = pc; /* affect all registers above base */ + if (reg >= a) /* affect all registers above base */ + setreg = filterpc(pc, jmptarget); break; } case OP_JMP: { int b = GETARG_sBx(i); int dest = pc + 1 + b; /* jump is forward and do not skip `lastpc'? */ - if (pc < dest && dest <= lastpc) - pc += b; /* do the jump */ + if (pc < dest && dest <= lastpc) { + if (dest > jmptarget) + jmptarget = dest; /* update 'jmptarget' */ + } break; } case OP_TEST: { - if (reg == a) setreg = pc; /* jumped code can change 'a' */ + if (reg == a) /* jumped code can change 'a' */ + setreg = filterpc(pc, jmptarget); break; } default: if (testAMode(op) && reg == a) /* any instruction that set A */ - setreg = pc; + setreg = filterpc(pc, jmptarget); break; } } @@ -518,7 +531,7 @@ l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) { l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) { if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; - lua_assert(!ttisstring(p1) && !ttisnumber(p2)); + lua_assert(!ttisstring(p1) && !ttisnumber(p1)); luaG_typeerror(L, p1, "concatenate"); } diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ldebug.h b/Build/source/libs/lua52/lua-5.2.3/src/ldebug.h index fe39556b062..6445c763ea5 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ldebug.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/ldebug.h @@ -1,5 +1,5 @@ /* -** $Id: ldebug.h,v 2.7 2011/10/07 20:45:19 roberto Exp $ +** $Id: ldebug.h,v 2.7.1.1 2013/04/12 18:48:47 roberto Exp $ ** Auxiliary functions from Debug Interface module ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ldo.c b/Build/source/libs/lua52/lua-5.2.3/src/ldo.c index aafa3dca234..e9dd5fa9519 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ldo.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/ldo.c @@ -1,5 +1,5 @@ /* -** $Id: ldo.c,v 2.108 2012/10/01 14:05:04 roberto Exp $ +** $Id: ldo.c,v 2.108.1.3 2013/11/08 18:22:50 roberto Exp $ ** Stack and Call structure of Lua ** See Copyright Notice in lua.h */ @@ -260,6 +260,7 @@ static StkId adjust_varargs (lua_State *L, Proto *p, int actual) { StkId base, fixed; lua_assert(actual >= nfixargs); /* move fixed parameters to final position */ + luaD_checkstack(L, p->maxstacksize); /* check again for new 'base' */ fixed = L->top - actual; /* first fixed argument */ base = L->top; /* final position of first argument */ for (i=0; i<nfixargs; i++) { @@ -324,12 +325,18 @@ int luaD_precall (lua_State *L, StkId func, int nresults) { case LUA_TLCL: { /* Lua function: prepare its call */ StkId base; Proto *p = clLvalue(func)->p; - luaD_checkstack(L, p->maxstacksize); - func = restorestack(L, funcr); n = cast_int(L->top - func) - 1; /* number of real arguments */ + luaD_checkstack(L, p->maxstacksize); for (; n < p->numparams; n++) setnilvalue(L->top++); /* complete missing arguments */ - base = (!p->is_vararg) ? func + 1 : adjust_varargs(L, p, n); + if (!p->is_vararg) { + func = restorestack(L, funcr); + base = func + 1; + } + else { + base = adjust_varargs(L, p, n); + func = restorestack(L, funcr); /* previous call can change stack */ + } ci = next_ci(L); /* now 'enter' new function */ ci->nresults = nresults; ci->func = func; @@ -527,6 +534,7 @@ static void resume (lua_State *L, void *ud) { LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) { int status; + int oldnny = L->nny; /* save 'nny' */ lua_lock(L); luai_userstateresume(L, nargs); L->nCcalls = (from) ? from->nCcalls + 1 : 1; @@ -548,7 +556,7 @@ LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) { } lua_assert(status == L->status); } - L->nny = 1; /* do not allow yields */ + L->nny = oldnny; /* restore 'nny' */ L->nCcalls--; lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0)); lua_unlock(L); diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ldo.h b/Build/source/libs/lua52/lua-5.2.3/src/ldo.h index 27b837d999e..d3d3082c9ba 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ldo.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/ldo.h @@ -1,5 +1,5 @@ /* -** $Id: ldo.h,v 2.20 2011/11/29 15:55:08 roberto Exp $ +** $Id: ldo.h,v 2.20.1.1 2013/04/12 18:48:47 roberto Exp $ ** Stack and Call structure of Lua ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ldump.c b/Build/source/libs/lua52/lua-5.2.3/src/ldump.c index d5e6a47cb38..61fa2cd892d 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ldump.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/ldump.c @@ -1,5 +1,5 @@ /* -** $Id: ldump.c,v 2.17 2012/01/23 23:02:10 roberto Exp $ +** $Id: ldump.c,v 2.17.1.1 2013/04/12 18:48:47 roberto Exp $ ** save precompiled Lua chunks ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lfunc.c b/Build/source/libs/lua52/lua-5.2.3/src/lfunc.c index c2128405b9a..e90e1520ce9 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lfunc.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lfunc.c @@ -1,5 +1,5 @@ /* -** $Id: lfunc.c,v 2.30 2012/10/03 12:36:46 roberto Exp $ +** $Id: lfunc.c,v 2.30.1.1 2013/04/12 18:48:47 roberto Exp $ ** Auxiliary functions to manipulate prototypes and closures ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lfunc.h b/Build/source/libs/lua52/lua-5.2.3/src/lfunc.h index e236a717c65..ca0d3a3e0b0 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lfunc.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lfunc.h @@ -1,5 +1,5 @@ /* -** $Id: lfunc.h,v 2.8 2012/05/08 13:53:33 roberto Exp $ +** $Id: lfunc.h,v 2.8.1.1 2013/04/12 18:48:47 roberto Exp $ ** Auxiliary functions to manipulate prototypes and closures ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lgc.c b/Build/source/libs/lua52/lua-5.2.3/src/lgc.c index 535e988ae02..52460dcdd5a 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lgc.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lgc.c @@ -1,5 +1,5 @@ /* -** $Id: lgc.c,v 2.140 2013/03/16 21:10:18 roberto Exp $ +** $Id: lgc.c,v 2.140.1.2 2013/04/26 18:22:05 roberto Exp $ ** Garbage Collector ** See Copyright Notice in lua.h */ @@ -493,17 +493,24 @@ static lu_mem traverseLclosure (global_State *g, LClosure *cl) { static lu_mem traversestack (global_State *g, lua_State *th) { + int n = 0; StkId o = th->stack; if (o == NULL) return 1; /* stack not completely built yet */ - for (; o < th->top; o++) + for (; o < th->top; o++) /* mark live elements in the stack */ markvalue(g, o); if (g->gcstate == GCSatomic) { /* final traversal? */ StkId lim = th->stack + th->stacksize; /* real end of stack */ for (; o < lim; o++) /* clear not-marked stack slice */ setnilvalue(o); } - return sizeof(lua_State) + sizeof(TValue) * th->stacksize; + else { /* count call infos to compute size */ + CallInfo *ci; + for (ci = &th->base_ci; ci != th->ci; ci = ci->next) + n++; + } + return sizeof(lua_State) + sizeof(TValue) * th->stacksize + + sizeof(CallInfo) * n; } diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lgc.h b/Build/source/libs/lua52/lua-5.2.3/src/lgc.h index dee270b4dcb..84bb1cdf99f 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lgc.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lgc.h @@ -1,5 +1,5 @@ /* -** $Id: lgc.h,v 2.58 2012/09/11 12:53:08 roberto Exp $ +** $Id: lgc.h,v 2.58.1.1 2013/04/12 18:48:47 roberto Exp $ ** Garbage Collector ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/linit.c b/Build/source/libs/lua52/lua-5.2.3/src/linit.c index 8d3aa6576fc..c1a38304711 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/linit.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/linit.c @@ -1,5 +1,5 @@ /* -** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $ +** $Id: linit.c,v 1.32.1.1 2013/04/12 18:48:47 roberto Exp $ ** Initialization of libraries for lua.c and other clients ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/liolib.c b/Build/source/libs/lua52/lua-5.2.3/src/liolib.c index 3f80db1927f..2a4ec4aa344 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/liolib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/liolib.c @@ -1,17 +1,17 @@ /* -** $Id: liolib.c,v 2.111 2013/03/21 13:57:27 roberto Exp $ +** $Id: liolib.c,v 2.112.1.1 2013/04/12 18:48:47 roberto Exp $ ** Standard I/O (and system) library ** See Copyright Notice in lua.h */ /* -** POSIX idiosyncrasy! ** This definition must come before the inclusion of 'stdio.h'; it ** should not affect non-POSIX systems */ #if !defined(_FILE_OFFSET_BITS) -#define _FILE_OFFSET_BITS 64 +#define _LARGEFILE_SOURCE 1 +#define _FILE_OFFSET_BITS 64 #endif @@ -80,36 +80,37 @@ /* ** {====================================================== -** lua_fseek/lua_ftell: configuration for longer offsets +** lua_fseek: configuration for longer offsets ** ======================================================= */ -#if !defined(lua_fseek) /* { */ +#if !defined(lua_fseek) && !defined(LUA_ANSI) /* { */ -#if defined(LUA_USE_POSIX) +#if defined(LUA_USE_POSIX) /* { */ #define l_fseek(f,o,w) fseeko(f,o,w) #define l_ftell(f) ftello(f) #define l_seeknum off_t #elif defined(LUA_WIN) && !defined(_CRTIMP_TYPEINFO) \ - && defined(_MSC_VER) && (_MSC_VER >= 1400) + && defined(_MSC_VER) && (_MSC_VER >= 1400) /* }{ */ /* Windows (but not DDK) and Visual C++ 2005 or higher */ #define l_fseek(f,o,w) _fseeki64(f,o,w) #define l_ftell(f) _ftelli64(f) #define l_seeknum __int64 -#else +#endif /* } */ +#endif /* } */ + + +#if !defined(l_fseek) /* default definitions */ #define l_fseek(f,o,w) fseek(f,o,w) #define l_ftell(f) ftell(f) #define l_seeknum long - #endif -#endif /* } */ - /* }====================================================== */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/llex.c b/Build/source/libs/lua52/lua-5.2.3/src/llex.c index 1a32e348b0b..c4b820e8332 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/llex.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/llex.c @@ -1,5 +1,5 @@ /* -** $Id: llex.c,v 2.63 2013/03/16 21:10:18 roberto Exp $ +** $Id: llex.c,v 2.63.1.2 2013/08/30 15:49:41 roberto Exp $ ** Lexical Analyzer ** See Copyright Notice in lua.h */ @@ -133,6 +133,9 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) { setbvalue(o, 1); /* t[string] = true */ luaC_checkGC(L); } + else { /* string already present */ + ts = rawtsvalue(keyfromval(o)); /* re-use value previously stored */ + } L->top--; /* remove string from stack */ return ts; } diff --git a/Build/source/libs/lua52/lua-5.2.2/src/llex.h b/Build/source/libs/lua52/lua-5.2.3/src/llex.h index 9ca8a29948c..a4acdd30218 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/llex.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/llex.h @@ -1,5 +1,5 @@ /* -** $Id: llex.h,v 1.72 2011/11/30 12:43:51 roberto Exp $ +** $Id: llex.h,v 1.72.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lexical Analyzer ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/llimits.h b/Build/source/libs/lua52/lua-5.2.3/src/llimits.h index 1b8c79bda2b..152dd055154 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/llimits.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/llimits.h @@ -1,5 +1,5 @@ /* -** $Id: llimits.h,v 1.103 2013/02/20 14:08:56 roberto Exp $ +** $Id: llimits.h,v 1.103.1.1 2013/04/12 18:48:47 roberto Exp $ ** Limits, basic types, and some other `installation-dependent' definitions ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lmathlib.c b/Build/source/libs/lua52/lua-5.2.3/src/lmathlib.c index a49f1fd25a2..fe9fc5423d1 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lmathlib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lmathlib.c @@ -1,5 +1,5 @@ /* -** $Id: lmathlib.c,v 1.83 2013/03/07 18:21:32 roberto Exp $ +** $Id: lmathlib.c,v 1.83.1.1 2013/04/12 18:48:47 roberto Exp $ ** Standard mathematical library ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lmem.c b/Build/source/libs/lua52/lua-5.2.3/src/lmem.c index 3f88496e09d..ee343e3e037 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lmem.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lmem.c @@ -1,5 +1,5 @@ /* -** $Id: lmem.c,v 1.84 2012/05/23 15:41:53 roberto Exp $ +** $Id: lmem.c,v 1.84.1.1 2013/04/12 18:48:47 roberto Exp $ ** Interface to Memory Manager ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lmem.h b/Build/source/libs/lua52/lua-5.2.3/src/lmem.h index 5f850999a9d..bd4f4e0726f 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lmem.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lmem.h @@ -1,5 +1,5 @@ /* -** $Id: lmem.h,v 1.40 2013/02/20 14:08:21 roberto Exp $ +** $Id: lmem.h,v 1.40.1.1 2013/04/12 18:48:47 roberto Exp $ ** Interface to Memory Manager ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/loadlib.c b/Build/source/libs/lua52/lua-5.2.3/src/loadlib.c index a9959277bd8..bedbea3e9a7 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/loadlib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/loadlib.c @@ -1,5 +1,5 @@ /* -** $Id: loadlib.c,v 1.111 2012/05/30 12:33:44 roberto Exp $ +** $Id: loadlib.c,v 1.111.1.1 2013/04/12 18:48:47 roberto Exp $ ** Dynamic library loader for Lua ** See Copyright Notice in lua.h ** diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lobject.c b/Build/source/libs/lua52/lua-5.2.3/src/lobject.c index c152785a5a7..882d994d413 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lobject.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lobject.c @@ -1,5 +1,5 @@ /* -** $Id: lobject.c,v 2.58 2013/02/20 14:08:56 roberto Exp $ +** $Id: lobject.c,v 2.58.1.1 2013/04/12 18:48:47 roberto Exp $ ** Some generic functions over Lua objects ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lobject.h b/Build/source/libs/lua52/lua-5.2.3/src/lobject.h index dd23b9143cd..3a630b944c7 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lobject.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lobject.h @@ -1,5 +1,5 @@ /* -** $Id: lobject.h,v 2.71 2012/09/11 18:21:44 roberto Exp $ +** $Id: lobject.h,v 2.71.1.1 2013/04/12 18:48:47 roberto Exp $ ** Type definitions for Lua objects ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lopcodes.c b/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.c index ef73692754e..4190dc76242 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lopcodes.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.c @@ -1,5 +1,5 @@ /* -** $Id: lopcodes.c,v 1.49 2012/05/14 13:34:18 roberto Exp $ +** $Id: lopcodes.c,v 1.49.1.1 2013/04/12 18:48:47 roberto Exp $ ** Opcodes for Lua virtual machine ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lopcodes.h b/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.h index 07d2b3f39aa..51f57915455 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lopcodes.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lopcodes.h @@ -1,5 +1,5 @@ /* -** $Id: lopcodes.h,v 1.142 2011/07/15 12:50:29 roberto Exp $ +** $Id: lopcodes.h,v 1.142.1.1 2013/04/12 18:48:47 roberto Exp $ ** Opcodes for Lua virtual machine ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/loslib.c b/Build/source/libs/lua52/lua-5.2.3/src/loslib.c index 5170fd0d0fc..052ba174413 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/loslib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/loslib.c @@ -1,5 +1,5 @@ /* -** $Id: loslib.c,v 1.40 2012/10/19 15:54:02 roberto Exp $ +** $Id: loslib.c,v 1.40.1.1 2013/04/12 18:48:47 roberto Exp $ ** Standard Operating System library ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lparser.c b/Build/source/libs/lua52/lua-5.2.3/src/lparser.c index d8f5b4ffc5f..9e1a9ca2cfe 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lparser.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lparser.c @@ -1,5 +1,5 @@ /* -** $Id: lparser.c,v 2.130 2013/02/06 13:37:39 roberto Exp $ +** $Id: lparser.c,v 2.130.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua Parser ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lparser.h b/Build/source/libs/lua52/lua-5.2.3/src/lparser.h index 301167d4f5c..0346e3c41a8 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lparser.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lparser.h @@ -1,5 +1,5 @@ /* -** $Id: lparser.h,v 1.70 2012/05/08 13:53:33 roberto Exp $ +** $Id: lparser.h,v 1.70.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua Parser ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lstate.c b/Build/source/libs/lua52/lua-5.2.3/src/lstate.c index 207a106d5ba..c7f2672be7b 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lstate.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lstate.c @@ -1,5 +1,5 @@ /* -** $Id: lstate.c,v 2.99 2012/10/02 17:40:53 roberto Exp $ +** $Id: lstate.c,v 2.99.1.2 2013/11/08 17:45:31 roberto Exp $ ** Global State ** See Copyright Notice in lua.h */ @@ -192,6 +192,8 @@ static void f_luaopen (lua_State *L, void *ud) { g->memerrmsg = luaS_newliteral(L, MEMERRMSG); luaS_fix(g->memerrmsg); /* it should never be collected */ g->gcrunning = 1; /* allow gc */ + g->version = lua_version(NULL); + luai_userstateopen(L); } @@ -222,6 +224,8 @@ static void close_state (lua_State *L) { global_State *g = G(L); luaF_close(L, L->stack); /* close all upvalues for this thread */ luaC_freeallobjects(L); /* collect all objects */ + if (g->version) /* closing a fully built state? */ + luai_userstateclose(L); luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size); luaZ_freebuffer(L, &g->buff); freestack(L); @@ -287,7 +291,7 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) { setnilvalue(&g->l_registry); luaZ_initbuffer(L, &g->buff); g->panic = NULL; - g->version = lua_version(NULL); + g->version = NULL; g->gcstate = GCSpause; g->allgc = NULL; g->finobj = NULL; @@ -306,8 +310,6 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) { close_state(L); L = NULL; } - else - luai_userstateopen(L); return L; } @@ -315,7 +317,6 @@ LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) { LUA_API void lua_close (lua_State *L) { L = G(L)->mainthread; /* only the main thread can be closed */ lua_lock(L); - luai_userstateclose(L); close_state(L); } diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lstate.h b/Build/source/libs/lua52/lua-5.2.3/src/lstate.h index c8a31f5c0b8..daffd9aacfb 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lstate.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lstate.h @@ -1,5 +1,5 @@ /* -** $Id: lstate.h,v 2.82 2012/07/02 13:37:04 roberto Exp $ +** $Id: lstate.h,v 2.82.1.1 2013/04/12 18:48:47 roberto Exp $ ** Global State ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lstring.c b/Build/source/libs/lua52/lua-5.2.3/src/lstring.c index 8b5af0b2e77..af96c89c183 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lstring.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lstring.c @@ -1,5 +1,5 @@ /* -** $Id: lstring.c,v 2.26 2013/01/08 13:50:10 roberto Exp $ +** $Id: lstring.c,v 2.26.1.1 2013/04/12 18:48:47 roberto Exp $ ** String table (keeps all strings handled by Lua) ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lstring.h b/Build/source/libs/lua52/lua-5.2.3/src/lstring.h index d312ff3d2b1..260e7f169bd 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lstring.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lstring.h @@ -1,5 +1,5 @@ /* -** $Id: lstring.h,v 1.49 2012/02/01 21:57:15 roberto Exp $ +** $Id: lstring.h,v 1.49.1.1 2013/04/12 18:48:47 roberto Exp $ ** String table (keep all strings handled by Lua) ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lstrlib.c b/Build/source/libs/lua52/lua-5.2.3/src/lstrlib.c index fcc61c9a624..9261fd220db 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lstrlib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lstrlib.c @@ -1,5 +1,5 @@ /* -** $Id: lstrlib.c,v 1.178 2012/08/14 18:12:34 roberto Exp $ +** $Id: lstrlib.c,v 1.178.1.1 2013/04/12 18:48:47 roberto Exp $ ** Standard library for string operations and pattern-matching ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ltable.c b/Build/source/libs/lua52/lua-5.2.3/src/ltable.c index 420391fc745..5d76f97ec3c 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ltable.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/ltable.c @@ -1,5 +1,5 @@ /* -** $Id: ltable.c,v 2.72 2012/09/11 19:37:16 roberto Exp $ +** $Id: ltable.c,v 2.72.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua tables (hash) ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ltable.h b/Build/source/libs/lua52/lua-5.2.3/src/ltable.h index 2f6f5c2dc85..d69449b2b86 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ltable.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/ltable.h @@ -1,5 +1,5 @@ /* -** $Id: ltable.h,v 2.16 2011/08/17 20:26:47 roberto Exp $ +** $Id: ltable.h,v 2.16.1.2 2013/08/30 15:49:41 roberto Exp $ ** Lua tables (hash) ** See Copyright Notice in lua.h */ @@ -17,6 +17,10 @@ #define invalidateTMcache(t) ((t)->flags = 0) +/* returns the key, given the value of a table entry */ +#define keyfromval(v) \ + (gkey(cast(Node *, cast(char *, (v)) - offsetof(Node, i_val)))) + LUAI_FUNC const TValue *luaH_getint (Table *t, int key); LUAI_FUNC void luaH_setint (lua_State *L, Table *t, int key, TValue *value); diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ltablib.c b/Build/source/libs/lua52/lua-5.2.3/src/ltablib.c index ad798b4e2aa..6001224e39b 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ltablib.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/ltablib.c @@ -1,5 +1,5 @@ /* -** $Id: ltablib.c,v 1.65 2013/03/07 18:17:24 roberto Exp $ +** $Id: ltablib.c,v 1.65.1.1 2013/04/12 18:48:47 roberto Exp $ ** Library for Table Manipulation ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ltm.c b/Build/source/libs/lua52/lua-5.2.3/src/ltm.c index e70006dd7f6..69b4ed77271 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ltm.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/ltm.c @@ -1,5 +1,5 @@ /* -** $Id: ltm.c,v 2.14 2011/06/02 19:31:40 roberto Exp $ +** $Id: ltm.c,v 2.14.1.1 2013/04/12 18:48:47 roberto Exp $ ** Tag methods ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/ltm.h b/Build/source/libs/lua52/lua-5.2.3/src/ltm.h index 89bdc19a1e1..7f89c841f9c 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/ltm.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/ltm.h @@ -1,5 +1,5 @@ /* -** $Id: ltm.h,v 2.11 2011/02/28 17:32:10 roberto Exp $ +** $Id: ltm.h,v 2.11.1.1 2013/04/12 18:48:47 roberto Exp $ ** Tag methods ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lua.c b/Build/source/libs/lua52/lua-5.2.3/src/lua.c index 6a007129202..4345e554e92 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lua.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lua.c @@ -1,5 +1,5 @@ /* -** $Id: lua.c,v 1.206 2012/09/29 20:07:06 roberto Exp $ +** $Id: lua.c,v 1.206.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lua.h b/Build/source/libs/lua52/lua-5.2.3/src/lua.h index eb0482b8f47..149a2c37bcd 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lua.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lua.h @@ -1,5 +1,5 @@ /* -** $Id: lua.h,v 1.285 2013/03/15 13:04:22 roberto Exp $ +** $Id: lua.h,v 1.285.1.2 2013/11/11 12:09:16 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,7 +19,7 @@ #define LUA_VERSION_MAJOR "5" #define LUA_VERSION_MINOR "2" #define LUA_VERSION_NUM 502 -#define LUA_VERSION_RELEASE "2" +#define LUA_VERSION_RELEASE "3" #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lua.hpp b/Build/source/libs/lua52/lua-5.2.3/src/lua.hpp index ec417f59469..ec417f59469 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lua.hpp +++ b/Build/source/libs/lua52/lua-5.2.3/src/lua.hpp diff --git a/Build/source/libs/lua52/lua-5.2.2/src/luac.c b/Build/source/libs/lua52/lua-5.2.3/src/luac.c index 5081836d4cb..7409706ec72 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/luac.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/luac.c @@ -203,7 +203,7 @@ int main(int argc, char* argv[]) } /* -** $Id: print.c,v 1.68 2011/09/30 10:21:20 lhf Exp $ +** $Id: print.c,v 1.69 2013/07/04 01:03:46 lhf Exp $ ** print bytecodes ** See Copyright Notice in lua.h */ @@ -251,7 +251,7 @@ static void PrintString(const TString* ts) static void PrintConstant(const Proto* f, int i) { const TValue* o=&f->k[i]; - switch (ttype(o)) + switch (ttypenv(o)) { case LUA_TNIL: printf("nil"); diff --git a/Build/source/libs/lua52/lua-5.2.2/src/luaconf.h b/Build/source/libs/lua52/lua-5.2.3/src/luaconf.h index df802c9526f..18be9a9e436 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/luaconf.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/luaconf.h @@ -1,5 +1,5 @@ /* -** $Id: luaconf.h,v 1.176 2013/03/16 21:10:18 roberto Exp $ +** $Id: luaconf.h,v 1.176.1.1 2013/04/12 18:48:47 roberto Exp $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lualib.h b/Build/source/libs/lua52/lua-5.2.3/src/lualib.h index 9fd126bf78e..da82005c9de 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lualib.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lualib.h @@ -1,5 +1,5 @@ /* -** $Id: lualib.h,v 1.43 2011/12/08 12:11:37 roberto Exp $ +** $Id: lualib.h,v 1.43.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua standard libraries ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lundump.c b/Build/source/libs/lua52/lua-5.2.3/src/lundump.c index 54de011a45d..4163cb5d3b0 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lundump.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lundump.c @@ -1,5 +1,5 @@ /* -** $Id: lundump.c,v 2.22 2012/05/08 13:53:33 roberto Exp $ +** $Id: lundump.c,v 2.22.1.1 2013/04/12 18:48:47 roberto Exp $ ** load precompiled Lua chunks ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lundump.h b/Build/source/libs/lua52/lua-5.2.3/src/lundump.h index 2b8accecb8a..5255db259df 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lundump.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lundump.h @@ -1,5 +1,5 @@ /* -** $Id: lundump.h,v 1.39 2012/05/08 13:53:33 roberto Exp $ +** $Id: lundump.h,v 1.39.1.1 2013/04/12 18:48:47 roberto Exp $ ** load precompiled Lua chunks ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lvm.c b/Build/source/libs/lua52/lua-5.2.3/src/lvm.c index 657d5c456a7..141b9fd19c3 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lvm.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lvm.c @@ -1,5 +1,5 @@ /* -** $Id: lvm.c,v 2.155 2013/03/16 21:10:18 roberto Exp $ +** $Id: lvm.c,v 2.155.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua virtual machine ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lvm.h b/Build/source/libs/lua52/lua-5.2.3/src/lvm.h index 07e25f9c64b..5380270da63 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lvm.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lvm.h @@ -1,5 +1,5 @@ /* -** $Id: lvm.h,v 2.18 2013/01/08 14:06:55 roberto Exp $ +** $Id: lvm.h,v 2.18.1.1 2013/04/12 18:48:47 roberto Exp $ ** Lua virtual machine ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lzio.c b/Build/source/libs/lua52/lua-5.2.3/src/lzio.c index 8b77054e0b8..20efea98300 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lzio.c +++ b/Build/source/libs/lua52/lua-5.2.3/src/lzio.c @@ -1,5 +1,5 @@ /* -** $Id: lzio.c,v 1.35 2012/05/14 13:34:18 roberto Exp $ +** $Id: lzio.c,v 1.35.1.1 2013/04/12 18:48:47 roberto Exp $ ** Buffered streams ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/lua-5.2.2/src/lzio.h b/Build/source/libs/lua52/lua-5.2.3/src/lzio.h index 08682301e8a..441f7479cb1 100644 --- a/Build/source/libs/lua52/lua-5.2.2/src/lzio.h +++ b/Build/source/libs/lua52/lua-5.2.3/src/lzio.h @@ -1,5 +1,5 @@ /* -** $Id: lzio.h,v 1.26 2011/07/15 12:48:03 roberto Exp $ +** $Id: lzio.h,v 1.26.1.1 2013/04/12 18:48:47 roberto Exp $ ** Buffered streams ** See Copyright Notice in lua.h */ diff --git a/Build/source/libs/lua52/version.ac b/Build/source/libs/lua52/version.ac index 81ad4b69d80..555d83e4077 100644 --- a/Build/source/libs/lua52/version.ac +++ b/Build/source/libs/lua52/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current lua52 version -m4_define([lua52_version], [5.2.2]) +m4_define([lua52_version], [5.2.3]) |