diff --git a/CMakeLists.txt b/CMakeLists.txt index 4836b11..6b77c27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1) -project(lua LANGUAGES C VERSION 5.4.5) +project(lua LANGUAGES C VERSION 5.4.6) option(LUA_SUPPORT_DL "Support dynamic loading of compiled modules" OFF) option(LUA_BUILD_AS_CXX "Build lua as C++" OFF) @@ -25,8 +25,8 @@ else() option(LUA_BUILD_COMPILER "Build luac compiler" ON) endif() -add_subdirectory(lua-5.4.5) +add_subdirectory(lua-${CMAKE_PROJECT_VERSION}) if(LUA_ENABLE_TESTING) - add_test(NAME lua-testsuite COMMAND lua -e "_U=true" all.lua WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lua-5.4.5-tests) + add_test(NAME lua-testsuite COMMAND lua -e "_U=true" all.lua WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lua-${CMAKE_PROJECT_VERSION}-tests) endif() diff --git a/README.md b/README.md index dfca2e3..d8e2567 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Lua -CMake based build of Lua 5.4.5 +CMake based build of Lua 5.4.6 | Build as C | Build as C++ | | --: | --: | | ![Build Linux](https://github.com/walterschell/Lua/actions/workflows/build-linux.yml/badge.svg?branch=master) | ![Build Linux as C++](https://github.com/walterschell/Lua/actions/workflows/build-linux-cxx.yml/badge.svg?branch=master) | @@ -13,6 +13,3 @@ add_subdirectory(lua) ... target_link_libraries( lua_static) ``` - -# Important Note: -Depending on your use case, Lua v5.4.5 is API and ABI incompatible with v5.4.1-v5.4.4. A second parameter has been added to `lua_resetthread()`. See https://marc.info/?t=168182290600001&r=1&w=2 for more details. \ No newline at end of file diff --git a/lua-5.4.5-tests/all.lua b/lua-5.4.6-tests/all.lua similarity index 100% rename from lua-5.4.5-tests/all.lua rename to lua-5.4.6-tests/all.lua diff --git a/lua-5.4.5-tests/api.lua b/lua-5.4.6-tests/api.lua similarity index 100% rename from lua-5.4.5-tests/api.lua rename to lua-5.4.6-tests/api.lua diff --git a/lua-5.4.5-tests/attrib.lua b/lua-5.4.6-tests/attrib.lua similarity index 100% rename from lua-5.4.5-tests/attrib.lua rename to lua-5.4.6-tests/attrib.lua diff --git a/lua-5.4.5-tests/big.lua b/lua-5.4.6-tests/big.lua similarity index 100% rename from lua-5.4.5-tests/big.lua rename to lua-5.4.6-tests/big.lua diff --git a/lua-5.4.5-tests/bitwise.lua b/lua-5.4.6-tests/bitwise.lua similarity index 100% rename from lua-5.4.5-tests/bitwise.lua rename to lua-5.4.6-tests/bitwise.lua diff --git a/lua-5.4.5-tests/bwcoercion.lua b/lua-5.4.6-tests/bwcoercion.lua similarity index 100% rename from lua-5.4.5-tests/bwcoercion.lua rename to lua-5.4.6-tests/bwcoercion.lua diff --git a/lua-5.4.5-tests/calls.lua b/lua-5.4.6-tests/calls.lua similarity index 100% rename from lua-5.4.5-tests/calls.lua rename to lua-5.4.6-tests/calls.lua diff --git a/lua-5.4.5-tests/closure.lua b/lua-5.4.6-tests/closure.lua similarity index 100% rename from lua-5.4.5-tests/closure.lua rename to lua-5.4.6-tests/closure.lua diff --git a/lua-5.4.5-tests/code.lua b/lua-5.4.6-tests/code.lua similarity index 100% rename from lua-5.4.5-tests/code.lua rename to lua-5.4.6-tests/code.lua diff --git a/lua-5.4.5-tests/constructs.lua b/lua-5.4.6-tests/constructs.lua similarity index 100% rename from lua-5.4.5-tests/constructs.lua rename to lua-5.4.6-tests/constructs.lua diff --git a/lua-5.4.5-tests/coroutine.lua b/lua-5.4.6-tests/coroutine.lua similarity index 100% rename from lua-5.4.5-tests/coroutine.lua rename to lua-5.4.6-tests/coroutine.lua diff --git a/lua-5.4.5-tests/cstack.lua b/lua-5.4.6-tests/cstack.lua similarity index 100% rename from lua-5.4.5-tests/cstack.lua rename to lua-5.4.6-tests/cstack.lua diff --git a/lua-5.4.5-tests/db.lua b/lua-5.4.6-tests/db.lua similarity index 100% rename from lua-5.4.5-tests/db.lua rename to lua-5.4.6-tests/db.lua diff --git a/lua-5.4.5-tests/errors.lua b/lua-5.4.6-tests/errors.lua similarity index 100% rename from lua-5.4.5-tests/errors.lua rename to lua-5.4.6-tests/errors.lua diff --git a/lua-5.4.5-tests/events.lua b/lua-5.4.6-tests/events.lua similarity index 100% rename from lua-5.4.5-tests/events.lua rename to lua-5.4.6-tests/events.lua diff --git a/lua-5.4.5-tests/files.lua b/lua-5.4.6-tests/files.lua similarity index 100% rename from lua-5.4.5-tests/files.lua rename to lua-5.4.6-tests/files.lua diff --git a/lua-5.4.5-tests/gc.lua b/lua-5.4.6-tests/gc.lua similarity index 100% rename from lua-5.4.5-tests/gc.lua rename to lua-5.4.6-tests/gc.lua diff --git a/lua-5.4.5-tests/gengc.lua b/lua-5.4.6-tests/gengc.lua similarity index 100% rename from lua-5.4.5-tests/gengc.lua rename to lua-5.4.6-tests/gengc.lua diff --git a/lua-5.4.5-tests/goto.lua b/lua-5.4.6-tests/goto.lua similarity index 100% rename from lua-5.4.5-tests/goto.lua rename to lua-5.4.6-tests/goto.lua diff --git a/lua-5.4.5-tests/heavy.lua b/lua-5.4.6-tests/heavy.lua similarity index 100% rename from lua-5.4.5-tests/heavy.lua rename to lua-5.4.6-tests/heavy.lua diff --git a/lua-5.4.5-tests/libs/lib1.c b/lua-5.4.6-tests/libs/lib1.c similarity index 100% rename from lua-5.4.5-tests/libs/lib1.c rename to lua-5.4.6-tests/libs/lib1.c diff --git a/lua-5.4.5-tests/libs/lib11.c b/lua-5.4.6-tests/libs/lib11.c similarity index 100% rename from lua-5.4.5-tests/libs/lib11.c rename to lua-5.4.6-tests/libs/lib11.c diff --git a/lua-5.4.5-tests/libs/lib2.c b/lua-5.4.6-tests/libs/lib2.c similarity index 100% rename from lua-5.4.5-tests/libs/lib2.c rename to lua-5.4.6-tests/libs/lib2.c diff --git a/lua-5.4.5-tests/libs/lib21.c b/lua-5.4.6-tests/libs/lib21.c similarity index 100% rename from lua-5.4.5-tests/libs/lib21.c rename to lua-5.4.6-tests/libs/lib21.c diff --git a/lua-5.4.5-tests/libs/lib22.c b/lua-5.4.6-tests/libs/lib22.c similarity index 100% rename from lua-5.4.5-tests/libs/lib22.c rename to lua-5.4.6-tests/libs/lib22.c diff --git a/lua-5.4.5-tests/libs/makefile b/lua-5.4.6-tests/libs/makefile similarity index 100% rename from lua-5.4.5-tests/libs/makefile rename to lua-5.4.6-tests/libs/makefile diff --git a/lua-5.4.5-tests/literals.lua b/lua-5.4.6-tests/literals.lua similarity index 100% rename from lua-5.4.5-tests/literals.lua rename to lua-5.4.6-tests/literals.lua diff --git a/lua-5.4.5-tests/locals.lua b/lua-5.4.6-tests/locals.lua similarity index 100% rename from lua-5.4.5-tests/locals.lua rename to lua-5.4.6-tests/locals.lua diff --git a/lua-5.4.5-tests/ltests/ltests.c b/lua-5.4.6-tests/ltests/ltests.c similarity index 99% rename from lua-5.4.5-tests/ltests/ltests.c rename to lua-5.4.6-tests/ltests/ltests.c index 4a0a6af..7d184c0 100644 --- a/lua-5.4.5-tests/ltests/ltests.c +++ b/lua-5.4.6-tests/ltests/ltests.c @@ -1533,7 +1533,7 @@ static int runC (lua_State *L, lua_State *L1, const char *pc) { lua_newthread(L1); } else if EQ("resetthread") { - lua_pushinteger(L1, lua_resetthread(L1, L)); + lua_pushinteger(L1, lua_resetthread(L1)); /* deprecated */ } else if EQ("newuserdata") { lua_newuserdata(L1, getnum); diff --git a/lua-5.4.5-tests/ltests/ltests.h b/lua-5.4.6-tests/ltests/ltests.h similarity index 100% rename from lua-5.4.5-tests/ltests/ltests.h rename to lua-5.4.6-tests/ltests/ltests.h diff --git a/lua-5.4.5-tests/main.lua b/lua-5.4.6-tests/main.lua similarity index 100% rename from lua-5.4.5-tests/main.lua rename to lua-5.4.6-tests/main.lua diff --git a/lua-5.4.5-tests/math.lua b/lua-5.4.6-tests/math.lua similarity index 100% rename from lua-5.4.5-tests/math.lua rename to lua-5.4.6-tests/math.lua diff --git a/lua-5.4.5-tests/nextvar.lua b/lua-5.4.6-tests/nextvar.lua similarity index 100% rename from lua-5.4.5-tests/nextvar.lua rename to lua-5.4.6-tests/nextvar.lua diff --git a/lua-5.4.5-tests/pm.lua b/lua-5.4.6-tests/pm.lua similarity index 100% rename from lua-5.4.5-tests/pm.lua rename to lua-5.4.6-tests/pm.lua diff --git a/lua-5.4.5-tests/sort.lua b/lua-5.4.6-tests/sort.lua similarity index 100% rename from lua-5.4.5-tests/sort.lua rename to lua-5.4.6-tests/sort.lua diff --git a/lua-5.4.5-tests/strings.lua b/lua-5.4.6-tests/strings.lua similarity index 100% rename from lua-5.4.5-tests/strings.lua rename to lua-5.4.6-tests/strings.lua diff --git a/lua-5.4.5-tests/tpack.lua b/lua-5.4.6-tests/tpack.lua similarity index 100% rename from lua-5.4.5-tests/tpack.lua rename to lua-5.4.6-tests/tpack.lua diff --git a/lua-5.4.5-tests/tracegc.lua b/lua-5.4.6-tests/tracegc.lua similarity index 100% rename from lua-5.4.5-tests/tracegc.lua rename to lua-5.4.6-tests/tracegc.lua diff --git a/lua-5.4.5-tests/utf8.lua b/lua-5.4.6-tests/utf8.lua similarity index 100% rename from lua-5.4.5-tests/utf8.lua rename to lua-5.4.6-tests/utf8.lua diff --git a/lua-5.4.5-tests/vararg.lua b/lua-5.4.6-tests/vararg.lua similarity index 100% rename from lua-5.4.5-tests/vararg.lua rename to lua-5.4.6-tests/vararg.lua diff --git a/lua-5.4.5-tests/verybig.lua b/lua-5.4.6-tests/verybig.lua similarity index 100% rename from lua-5.4.5-tests/verybig.lua rename to lua-5.4.6-tests/verybig.lua diff --git a/lua-5.4.5/CMakeLists.txt b/lua-5.4.6/CMakeLists.txt similarity index 100% rename from lua-5.4.5/CMakeLists.txt rename to lua-5.4.6/CMakeLists.txt diff --git a/lua-5.4.5/LuaConfig.cmake.in b/lua-5.4.6/LuaConfig.cmake.in similarity index 100% rename from lua-5.4.5/LuaConfig.cmake.in rename to lua-5.4.6/LuaConfig.cmake.in diff --git a/lua-5.4.5/Makefile b/lua-5.4.6/Makefile similarity index 99% rename from lua-5.4.5/Makefile rename to lua-5.4.6/Makefile index a26e3d8..8efa2eb 100644 --- a/lua-5.4.5/Makefile +++ b/lua-5.4.6/Makefile @@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1 # Lua version and release. V= 5.4 -R= $V.5 +R= $V.6 # Targets start here. all: $(PLAT) diff --git a/lua-5.4.5/README b/lua-5.4.6/README similarity index 70% rename from lua-5.4.5/README rename to lua-5.4.6/README index f0aa064..1ae9716 100644 --- a/lua-5.4.5/README +++ b/lua-5.4.6/README @@ -1,5 +1,5 @@ -This is Lua 5.4.5, released on 18 Apr 2023. +This is Lua 5.4.6, released on 02 May 2023. For installation instructions, license details, and further information about Lua, see doc/readme.html. diff --git a/lua-5.4.5/doc/contents.html b/lua-5.4.6/doc/contents.html similarity index 100% rename from lua-5.4.5/doc/contents.html rename to lua-5.4.6/doc/contents.html diff --git a/lua-5.4.5/doc/index.css b/lua-5.4.6/doc/index.css similarity index 100% rename from lua-5.4.5/doc/index.css rename to lua-5.4.6/doc/index.css diff --git a/lua-5.4.5/doc/logo.gif b/lua-5.4.6/doc/logo.gif similarity index 100% rename from lua-5.4.5/doc/logo.gif rename to lua-5.4.6/doc/logo.gif diff --git a/lua-5.4.5/doc/lua.1 b/lua-5.4.6/doc/lua.1 similarity index 100% rename from lua-5.4.5/doc/lua.1 rename to lua-5.4.6/doc/lua.1 diff --git a/lua-5.4.5/doc/lua.css b/lua-5.4.6/doc/lua.css similarity index 100% rename from lua-5.4.5/doc/lua.css rename to lua-5.4.6/doc/lua.css diff --git a/lua-5.4.5/doc/luac.1 b/lua-5.4.6/doc/luac.1 similarity index 100% rename from lua-5.4.5/doc/luac.1 rename to lua-5.4.6/doc/luac.1 diff --git a/lua-5.4.5/doc/manual.css b/lua-5.4.6/doc/manual.css similarity index 100% rename from lua-5.4.5/doc/manual.css rename to lua-5.4.6/doc/manual.css diff --git a/lua-5.4.5/doc/manual.html b/lua-5.4.6/doc/manual.html similarity index 99% rename from lua-5.4.5/doc/manual.html rename to lua-5.4.6/doc/manual.html index 9e763a4..0af688b 100644 --- a/lua-5.4.5/doc/manual.html +++ b/lua-5.4.6/doc/manual.html @@ -3846,6 +3846,35 @@ when called through this function. +

lua_closethread

+[-0, +?, –] +

int lua_closethread (lua_State *L, lua_State *from);
+ +

+Resets a thread, cleaning its call stack and closing all pending +to-be-closed variables. +Returns a status code: +LUA_OK for no errors in the thread +(either the original error that stopped the thread or +errors in closing methods), +or an error status otherwise. +In case of error, +leaves the error object on the top of the stack. + + +

+The parameter from represents the coroutine that is resetting L. +If there is no such coroutine, +this parameter can be NULL. + + +

+(This function was introduced in release 5.4.6.) + + + + +

lua_compare

[-0, +0, e] 

int lua_compare (lua_State *L, int index1, int index2, int op);
@@ -5219,25 +5248,12 @@ and then pops the top element.

lua_resetthread

[-0, +?, –] -

int lua_resetthread (lua_State *L, lua_State *from);
+
int lua_resetthread (lua_State *L);

-Resets a thread, cleaning its call stack and closing all pending -to-be-closed variables. -Returns a status code: -LUA_OK for no errors in the thread -(either the original error that stopped the thread or -errors in closing methods), -or an error status otherwise. -In case of error, -leaves the error object on the top of the stack. - - -

-The parameter from represents the coroutine that is resetting L. -If there is no such coroutine, -this parameter can be NULL. -(This parameter was introduced in release 5.4.5.) +This function is deprecated; +it is equivalent to lua_closethread with +from being NULL. @@ -12020,10 +12036,10 @@ and LiteralString, see §3.1.)

Last update: -Tue Apr 18 12:51:25 UTC 2023 +Tue May 2 20:09:38 UTC 2023

diff --git a/lua-5.4.5/doc/osi-certified-72x60.png b/lua-5.4.6/doc/osi-certified-72x60.png similarity index 100% rename from lua-5.4.5/doc/osi-certified-72x60.png rename to lua-5.4.6/doc/osi-certified-72x60.png diff --git a/lua-5.4.5/doc/readme.html b/lua-5.4.6/doc/readme.html similarity index 98% rename from lua-5.4.5/doc/readme.html rename to lua-5.4.6/doc/readme.html index ef296ee..918ec8e 100644 --- a/lua-5.4.5/doc/readme.html +++ b/lua-5.4.6/doc/readme.html @@ -107,7 +107,7 @@ Here are the details.
  1. Open a terminal window and move to -the top-level directory, which is named lua-5.4.5. +the top-level directory, which is named lua-5.4.6. The Makefile there controls both the build process and the installation process.

  2. @@ -327,10 +327,10 @@ THE SOFTWARE.

    Last update: -Mon Mar 27 21:22:06 UTC 2023 +Tue May 2 20:08:55 UTC 2023

    diff --git a/lua-5.4.5/include/lauxlib.h b/lua-5.4.6/include/lauxlib.h similarity index 100% rename from lua-5.4.5/include/lauxlib.h rename to lua-5.4.6/include/lauxlib.h diff --git a/lua-5.4.5/include/lua.h b/lua-5.4.6/include/lua.h similarity index 98% rename from lua-5.4.5/include/lua.h rename to lua-5.4.6/include/lua.h index 01927c6..fd16cf8 100644 --- a/lua-5.4.5/include/lua.h +++ b/lua-5.4.6/include/lua.h @@ -18,10 +18,10 @@ #define LUA_VERSION_MAJOR "5" #define LUA_VERSION_MINOR "4" -#define LUA_VERSION_RELEASE "5" +#define LUA_VERSION_RELEASE "6" #define LUA_VERSION_NUM 504 -#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 5) +#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 6) #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE @@ -163,7 +163,8 @@ extern const char lua_ident[]; LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud); LUA_API void (lua_close) (lua_State *L); LUA_API lua_State *(lua_newthread) (lua_State *L); -LUA_API int (lua_resetthread) (lua_State *L, lua_State *from); +LUA_API int (lua_closethread) (lua_State *L, lua_State *from); +LUA_API int (lua_resetthread) (lua_State *L); /* Deprecated! */ LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf); diff --git a/lua-5.4.5/include/lua.hpp b/lua-5.4.6/include/lua.hpp similarity index 100% rename from lua-5.4.5/include/lua.hpp rename to lua-5.4.6/include/lua.hpp diff --git a/lua-5.4.5/include/luaconf.h b/lua-5.4.6/include/luaconf.h similarity index 100% rename from lua-5.4.5/include/luaconf.h rename to lua-5.4.6/include/luaconf.h diff --git a/lua-5.4.5/include/lualib.h b/lua-5.4.6/include/lualib.h similarity index 100% rename from lua-5.4.5/include/lualib.h rename to lua-5.4.6/include/lualib.h diff --git a/lua-5.4.5/src/Makefile b/lua-5.4.6/src/Makefile similarity index 100% rename from lua-5.4.5/src/Makefile rename to lua-5.4.6/src/Makefile diff --git a/lua-5.4.5/src/lapi.c b/lua-5.4.6/src/lapi.c similarity index 100% rename from lua-5.4.5/src/lapi.c rename to lua-5.4.6/src/lapi.c diff --git a/lua-5.4.5/src/lapi.h b/lua-5.4.6/src/lapi.h similarity index 100% rename from lua-5.4.5/src/lapi.h rename to lua-5.4.6/src/lapi.h diff --git a/lua-5.4.5/src/lauxlib.c b/lua-5.4.6/src/lauxlib.c similarity index 100% rename from lua-5.4.5/src/lauxlib.c rename to lua-5.4.6/src/lauxlib.c diff --git a/lua-5.4.5/src/lbaselib.c b/lua-5.4.6/src/lbaselib.c similarity index 100% rename from lua-5.4.5/src/lbaselib.c rename to lua-5.4.6/src/lbaselib.c diff --git a/lua-5.4.5/src/lcode.c b/lua-5.4.6/src/lcode.c similarity index 100% rename from lua-5.4.5/src/lcode.c rename to lua-5.4.6/src/lcode.c diff --git a/lua-5.4.5/src/lcode.h b/lua-5.4.6/src/lcode.h similarity index 100% rename from lua-5.4.5/src/lcode.h rename to lua-5.4.6/src/lcode.h diff --git a/lua-5.4.5/src/lcorolib.c b/lua-5.4.6/src/lcorolib.c similarity index 97% rename from lua-5.4.5/src/lcorolib.c rename to lua-5.4.6/src/lcorolib.c index 40b880b..c64adf0 100644 --- a/lua-5.4.5/src/lcorolib.c +++ b/lua-5.4.6/src/lcorolib.c @@ -76,7 +76,7 @@ static int luaB_auxwrap (lua_State *L) { if (l_unlikely(r < 0)) { /* error? */ int stat = lua_status(co); if (stat != LUA_OK && stat != LUA_YIELD) { /* error in the coroutine? */ - stat = lua_resetthread(co, L); /* close its tbc variables */ + stat = lua_closethread(co, L); /* close its tbc variables */ lua_assert(stat != LUA_OK); lua_xmove(co, L, 1); /* move error message to the caller */ } @@ -172,7 +172,7 @@ static int luaB_close (lua_State *L) { int status = auxstatus(L, co); switch (status) { case COS_DEAD: case COS_YIELD: { - status = lua_resetthread(co, L); + status = lua_closethread(co, L); if (status == LUA_OK) { lua_pushboolean(L, 1); return 1; diff --git a/lua-5.4.5/src/lctype.c b/lua-5.4.6/src/lctype.c similarity index 100% rename from lua-5.4.5/src/lctype.c rename to lua-5.4.6/src/lctype.c diff --git a/lua-5.4.5/src/lctype.h b/lua-5.4.6/src/lctype.h similarity index 100% rename from lua-5.4.5/src/lctype.h rename to lua-5.4.6/src/lctype.h diff --git a/lua-5.4.5/src/ldblib.c b/lua-5.4.6/src/ldblib.c similarity index 100% rename from lua-5.4.5/src/ldblib.c rename to lua-5.4.6/src/ldblib.c diff --git a/lua-5.4.5/src/ldebug.c b/lua-5.4.6/src/ldebug.c similarity index 100% rename from lua-5.4.5/src/ldebug.c rename to lua-5.4.6/src/ldebug.c diff --git a/lua-5.4.5/src/ldebug.h b/lua-5.4.6/src/ldebug.h similarity index 100% rename from lua-5.4.5/src/ldebug.h rename to lua-5.4.6/src/ldebug.h diff --git a/lua-5.4.5/src/ldo.c b/lua-5.4.6/src/ldo.c similarity index 100% rename from lua-5.4.5/src/ldo.c rename to lua-5.4.6/src/ldo.c diff --git a/lua-5.4.5/src/ldo.h b/lua-5.4.6/src/ldo.h similarity index 100% rename from lua-5.4.5/src/ldo.h rename to lua-5.4.6/src/ldo.h diff --git a/lua-5.4.5/src/ldump.c b/lua-5.4.6/src/ldump.c similarity index 100% rename from lua-5.4.5/src/ldump.c rename to lua-5.4.6/src/ldump.c diff --git a/lua-5.4.5/src/lfunc.c b/lua-5.4.6/src/lfunc.c similarity index 100% rename from lua-5.4.5/src/lfunc.c rename to lua-5.4.6/src/lfunc.c diff --git a/lua-5.4.5/src/lfunc.h b/lua-5.4.6/src/lfunc.h similarity index 100% rename from lua-5.4.5/src/lfunc.h rename to lua-5.4.6/src/lfunc.h diff --git a/lua-5.4.5/src/lgc.c b/lua-5.4.6/src/lgc.c similarity index 100% rename from lua-5.4.5/src/lgc.c rename to lua-5.4.6/src/lgc.c diff --git a/lua-5.4.5/src/lgc.h b/lua-5.4.6/src/lgc.h similarity index 100% rename from lua-5.4.5/src/lgc.h rename to lua-5.4.6/src/lgc.h diff --git a/lua-5.4.5/src/linit.c b/lua-5.4.6/src/linit.c similarity index 100% rename from lua-5.4.5/src/linit.c rename to lua-5.4.6/src/linit.c diff --git a/lua-5.4.5/src/liolib.c b/lua-5.4.6/src/liolib.c similarity index 100% rename from lua-5.4.5/src/liolib.c rename to lua-5.4.6/src/liolib.c diff --git a/lua-5.4.5/src/ljumptab.h b/lua-5.4.6/src/ljumptab.h similarity index 100% rename from lua-5.4.5/src/ljumptab.h rename to lua-5.4.6/src/ljumptab.h diff --git a/lua-5.4.5/src/llex.c b/lua-5.4.6/src/llex.c similarity index 100% rename from lua-5.4.5/src/llex.c rename to lua-5.4.6/src/llex.c diff --git a/lua-5.4.5/src/llex.h b/lua-5.4.6/src/llex.h similarity index 100% rename from lua-5.4.5/src/llex.h rename to lua-5.4.6/src/llex.h diff --git a/lua-5.4.5/src/llimits.h b/lua-5.4.6/src/llimits.h similarity index 100% rename from lua-5.4.5/src/llimits.h rename to lua-5.4.6/src/llimits.h diff --git a/lua-5.4.5/src/lmathlib.c b/lua-5.4.6/src/lmathlib.c similarity index 100% rename from lua-5.4.5/src/lmathlib.c rename to lua-5.4.6/src/lmathlib.c diff --git a/lua-5.4.5/src/lmem.c b/lua-5.4.6/src/lmem.c similarity index 100% rename from lua-5.4.5/src/lmem.c rename to lua-5.4.6/src/lmem.c diff --git a/lua-5.4.5/src/lmem.h b/lua-5.4.6/src/lmem.h similarity index 100% rename from lua-5.4.5/src/lmem.h rename to lua-5.4.6/src/lmem.h diff --git a/lua-5.4.5/src/loadlib.c b/lua-5.4.6/src/loadlib.c similarity index 100% rename from lua-5.4.5/src/loadlib.c rename to lua-5.4.6/src/loadlib.c diff --git a/lua-5.4.5/src/lobject.c b/lua-5.4.6/src/lobject.c similarity index 100% rename from lua-5.4.5/src/lobject.c rename to lua-5.4.6/src/lobject.c diff --git a/lua-5.4.5/src/lobject.h b/lua-5.4.6/src/lobject.h similarity index 100% rename from lua-5.4.5/src/lobject.h rename to lua-5.4.6/src/lobject.h diff --git a/lua-5.4.5/src/lopcodes.c b/lua-5.4.6/src/lopcodes.c similarity index 100% rename from lua-5.4.5/src/lopcodes.c rename to lua-5.4.6/src/lopcodes.c diff --git a/lua-5.4.5/src/lopcodes.h b/lua-5.4.6/src/lopcodes.h similarity index 100% rename from lua-5.4.5/src/lopcodes.h rename to lua-5.4.6/src/lopcodes.h diff --git a/lua-5.4.5/src/lopnames.h b/lua-5.4.6/src/lopnames.h similarity index 100% rename from lua-5.4.5/src/lopnames.h rename to lua-5.4.6/src/lopnames.h diff --git a/lua-5.4.5/src/loslib.c b/lua-5.4.6/src/loslib.c similarity index 100% rename from lua-5.4.5/src/loslib.c rename to lua-5.4.6/src/loslib.c diff --git a/lua-5.4.5/src/lparser.c b/lua-5.4.6/src/lparser.c similarity index 100% rename from lua-5.4.5/src/lparser.c rename to lua-5.4.6/src/lparser.c diff --git a/lua-5.4.5/src/lparser.h b/lua-5.4.6/src/lparser.h similarity index 100% rename from lua-5.4.5/src/lparser.h rename to lua-5.4.6/src/lparser.h diff --git a/lua-5.4.5/src/lprefix.h b/lua-5.4.6/src/lprefix.h similarity index 100% rename from lua-5.4.5/src/lprefix.h rename to lua-5.4.6/src/lprefix.h diff --git a/lua-5.4.5/src/lstate.c b/lua-5.4.6/src/lstate.c similarity index 98% rename from lua-5.4.5/src/lstate.c rename to lua-5.4.6/src/lstate.c index 1fbefb4..1e925e5 100644 --- a/lua-5.4.5/src/lstate.c +++ b/lua-5.4.6/src/lstate.c @@ -339,7 +339,7 @@ int luaE_resetthread (lua_State *L, int status) { } -LUA_API int lua_resetthread (lua_State *L, lua_State *from) { +LUA_API int lua_closethread (lua_State *L, lua_State *from) { int status; lua_lock(L); L->nCcalls = (from) ? getCcalls(from) : 0; @@ -349,6 +349,14 @@ LUA_API int lua_resetthread (lua_State *L, lua_State *from) { } +/* +** Deprecated! Use 'lua_closethread' instead. +*/ +LUA_API int lua_resetthread (lua_State *L) { + return lua_closethread(L, NULL); +} + + LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) { int i; lua_State *L; diff --git a/lua-5.4.5/src/lstate.h b/lua-5.4.6/src/lstate.h similarity index 100% rename from lua-5.4.5/src/lstate.h rename to lua-5.4.6/src/lstate.h diff --git a/lua-5.4.5/src/lstring.c b/lua-5.4.6/src/lstring.c similarity index 100% rename from lua-5.4.5/src/lstring.c rename to lua-5.4.6/src/lstring.c diff --git a/lua-5.4.5/src/lstring.h b/lua-5.4.6/src/lstring.h similarity index 100% rename from lua-5.4.5/src/lstring.h rename to lua-5.4.6/src/lstring.h diff --git a/lua-5.4.5/src/lstrlib.c b/lua-5.4.6/src/lstrlib.c similarity index 100% rename from lua-5.4.5/src/lstrlib.c rename to lua-5.4.6/src/lstrlib.c diff --git a/lua-5.4.5/src/ltable.c b/lua-5.4.6/src/ltable.c similarity index 100% rename from lua-5.4.5/src/ltable.c rename to lua-5.4.6/src/ltable.c diff --git a/lua-5.4.5/src/ltable.h b/lua-5.4.6/src/ltable.h similarity index 100% rename from lua-5.4.5/src/ltable.h rename to lua-5.4.6/src/ltable.h diff --git a/lua-5.4.5/src/ltablib.c b/lua-5.4.6/src/ltablib.c similarity index 100% rename from lua-5.4.5/src/ltablib.c rename to lua-5.4.6/src/ltablib.c diff --git a/lua-5.4.5/src/ltm.c b/lua-5.4.6/src/ltm.c similarity index 100% rename from lua-5.4.5/src/ltm.c rename to lua-5.4.6/src/ltm.c diff --git a/lua-5.4.5/src/ltm.h b/lua-5.4.6/src/ltm.h similarity index 100% rename from lua-5.4.5/src/ltm.h rename to lua-5.4.6/src/ltm.h diff --git a/lua-5.4.5/src/lua.c b/lua-5.4.6/src/lua.c similarity index 100% rename from lua-5.4.5/src/lua.c rename to lua-5.4.6/src/lua.c diff --git a/lua-5.4.5/src/luac.c b/lua-5.4.6/src/luac.c similarity index 100% rename from lua-5.4.5/src/luac.c rename to lua-5.4.6/src/luac.c diff --git a/lua-5.4.5/src/lundump.c b/lua-5.4.6/src/lundump.c similarity index 100% rename from lua-5.4.5/src/lundump.c rename to lua-5.4.6/src/lundump.c diff --git a/lua-5.4.5/src/lundump.h b/lua-5.4.6/src/lundump.h similarity index 100% rename from lua-5.4.5/src/lundump.h rename to lua-5.4.6/src/lundump.h diff --git a/lua-5.4.5/src/lutf8lib.c b/lua-5.4.6/src/lutf8lib.c similarity index 100% rename from lua-5.4.5/src/lutf8lib.c rename to lua-5.4.6/src/lutf8lib.c diff --git a/lua-5.4.5/src/lvm.c b/lua-5.4.6/src/lvm.c similarity index 100% rename from lua-5.4.5/src/lvm.c rename to lua-5.4.6/src/lvm.c diff --git a/lua-5.4.5/src/lvm.h b/lua-5.4.6/src/lvm.h similarity index 100% rename from lua-5.4.5/src/lvm.h rename to lua-5.4.6/src/lvm.h diff --git a/lua-5.4.5/src/lzio.c b/lua-5.4.6/src/lzio.c similarity index 100% rename from lua-5.4.5/src/lzio.c rename to lua-5.4.6/src/lzio.c diff --git a/lua-5.4.5/src/lzio.h b/lua-5.4.6/src/lzio.h similarity index 100% rename from lua-5.4.5/src/lzio.h rename to lua-5.4.6/src/lzio.h diff --git a/orig_sources/lua-5.4.5-tests.tar.gz b/orig_sources/lua-5.4.5-tests.tar.gz deleted file mode 100644 index 8d0f1d1..0000000 Binary files a/orig_sources/lua-5.4.5-tests.tar.gz and /dev/null differ diff --git a/orig_sources/lua-5.4.5.tar.gz b/orig_sources/lua-5.4.5.tar.gz deleted file mode 100644 index f4bf9f4..0000000 Binary files a/orig_sources/lua-5.4.5.tar.gz and /dev/null differ diff --git a/orig_sources/lua-5.4.6-tests.tar.gz b/orig_sources/lua-5.4.6-tests.tar.gz new file mode 100644 index 0000000..8ab6264 Binary files /dev/null and b/orig_sources/lua-5.4.6-tests.tar.gz differ diff --git a/orig_sources/lua-5.4.6.tar.gz b/orig_sources/lua-5.4.6.tar.gz new file mode 100644 index 0000000..5677b16 Binary files /dev/null and b/orig_sources/lua-5.4.6.tar.gz differ