mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-08 10:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bring Lua to 5.4.6.

Browse source
This commit is contained in:
Michael Lenaghan 2023-07-28 19:34:08 -04:00
parent a0e095873c
commit 11baa5f416
37 changed files with 55 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/lua/README.cosmo vendored
View file

@ -9,14 +9,14 @@ PROVENANCE
https://github.com/lua/lua/
commit e15f1f2bb7a38a3c94519294d031e48508d65006
commit 6443185167c77adcc8552a3fee7edab7895db1a9
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Apr 18, 2023 at 8:44 AM EDT
Date: May 2, 2023 at 3:44 PM EDT
New release number (5.4.5)
New release number (5.4.6)
luac.c needed to be sourced from:
https://www.lua.org/ftp/lua-5.4.5.tar.gz
https://www.lua.org/ftp/lua-5.4.6.tar.gz
LOCAL MODIFICATIONS

2
third_party/lua/lapi.c vendored
View file

@ -47,7 +47,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lauxlib.c vendored
View file

@ -39,7 +39,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lbaselib.c vendored
View file

@ -37,7 +37,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lcode.c vendored
View file

@ -47,7 +47,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

6
third_party/lua/lcorolib.c vendored
View file

@ -36,7 +36,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");
@ -99,7 +99,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 */
}
@ -195,7 +195,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;

2
third_party/lua/ldblib.c vendored
View file

@ -37,7 +37,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/ldebug.c vendored
View file

@ -47,7 +47,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/ldo.c vendored
View file

@ -56,7 +56,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/ldump.c vendored
View file

@ -37,7 +37,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lfunc.c vendored
View file

@ -42,7 +42,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lgc.c vendored
View file

@ -45,7 +45,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/linit.c vendored
View file

@ -52,7 +52,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/liolib.c vendored
View file

@ -43,7 +43,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/llex.c vendored
View file

@ -45,7 +45,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lmathlib.c vendored
View file

@ -39,7 +39,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lmem.c vendored
View file

@ -41,7 +41,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/loadlib.c vendored
View file

@ -38,7 +38,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lobject.c vendored
View file

@ -43,7 +43,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lopcodes.c vendored
View file

@ -34,7 +34,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/loslib.c vendored
View file

@ -46,7 +46,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lparser.c vendored
View file

@ -47,7 +47,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lrepl.c vendored
View file

@ -51,7 +51,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

12
third_party/lua/lstate.c vendored
View file

@ -47,7 +47,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");
@ -370,7 +370,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;
@ -380,6 +380,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;

2
third_party/lua/lstring.c vendored
View file

@ -41,7 +41,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lstrlib.c vendored
View file

@ -39,7 +39,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/ltable.c vendored
View file

@ -43,7 +43,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/ltablib.c vendored
View file

@ -39,7 +39,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

4
third_party/lua/ltests.c vendored
View file

@ -48,7 +48,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");
@ -1551,7 +1551,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);

2
third_party/lua/ltm.c vendored
View file

@ -43,7 +43,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

7
third_party/lua/lua.h vendored
View file

@ -10,10 +10,10 @@ COSMOPOLITAN_C_START_
#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
@ -155,7 +155,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);

2
third_party/lua/lua.main.c vendored
View file

@ -55,7 +55,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/luac.main.c vendored
View file

@ -48,7 +48,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lundump.c vendored
View file

@ -43,7 +43,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lutf8lib.c vendored
View file

@ -36,7 +36,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lvm.c vendored
View file

@ -46,7 +46,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");

2
third_party/lua/lzio.c vendored
View file

@ -39,7 +39,7 @@
// clang-format off
asm(".ident\t\"\\n\\n\
Lua 5.4.5 (MIT License)\\n\
Lua 5.4.6 (MIT License)\\n\
Copyright 1994–2022 Lua.org, PUC-Rio.\"");
asm(".include \"libc/disclaimer.inc\"");