Skip to content

Commit 389bc6c

Browse files
committed
update lua to 5.4.7
1 parent 2fe7447 commit 389bc6c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1633
-1147
lines changed

doc/licenses/lua/license.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 1994–2020 Lua.org, PUC-Rio.
1+
Copyright © 1994–2024 Lua.org, PUC-Rio.
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
44

src/3rdparty/lua/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ endif()
3131
# LIBRARY
3232
###########################
3333

34-
set(LUA_SRC_PATH "lua-5.4.4/src")
34+
set(LUA_SRC_PATH "lua-5.4.7/src")
3535

3636
set(LUA_SRC_LIST "${LUA_SRC_PATH}/lapi.c" "${LUA_SRC_PATH}/lauxlib.c" "${LUA_SRC_PATH}/lbaselib.c" "${LUA_SRC_PATH}/lcode.c" "${LUA_SRC_PATH}/lcorolib.c" "${LUA_SRC_PATH}/lctype.c" "${LUA_SRC_PATH}/ldblib.c" "${LUA_SRC_PATH}/ldebug.c" "${LUA_SRC_PATH}/ldo.c" "${LUA_SRC_PATH}/ldump.c" "${LUA_SRC_PATH}/lfunc.c" "${LUA_SRC_PATH}/lgc.c" "${LUA_SRC_PATH}/linit.c" "${LUA_SRC_PATH}/liolib.c" "${LUA_SRC_PATH}/llex.c" "${LUA_SRC_PATH}/lmathlib.c" "${LUA_SRC_PATH}/lmem.c" "${LUA_SRC_PATH}/loadlib.c" "${LUA_SRC_PATH}/lobject.c" "${LUA_SRC_PATH}/lopcodes.c" "${LUA_SRC_PATH}/loslib.c" "${LUA_SRC_PATH}/lparser.c" "${LUA_SRC_PATH}/lstate.c" "${LUA_SRC_PATH}/lstring.c" "${LUA_SRC_PATH}/lstrlib.c" "${LUA_SRC_PATH}/ltable.c" "${LUA_SRC_PATH}/ltablib.c" "${LUA_SRC_PATH}/ltm.c" "${LUA_SRC_PATH}/lundump.c" "${LUA_SRC_PATH}/lutf8lib.c" "${LUA_SRC_PATH}/lvm.c" "${LUA_SRC_PATH}/lzio.c")
3737

Binary file not shown.

src/3rdparty/lua/lua-5.4.4/Makefile renamed to src/3rdparty/lua/lua-5.4.7/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RM= rm -f
3636
# == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
3737

3838
# Convenience platforms targets.
39-
PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
39+
PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris
4040

4141
# What to install.
4242
TO_BIN= lua luac
@@ -46,7 +46,7 @@ TO_MAN= lua.1 luac.1
4646

4747
# Lua version and release.
4848
V= 5.4
49-
R= $V.4
49+
R= $V.7
5050

5151
# Targets start here.
5252
all: $(PLAT)

src/3rdparty/lua/lua-5.4.4/README renamed to src/3rdparty/lua/lua-5.4.7/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
This is Lua 5.4.4, released on 13 Jan 2022.
2+
This is Lua 5.4.7, released on 13 Jun 2024.
33

44
For installation instructions, license details, and
55
further information about Lua, see doc/readme.html.
Loading

src/3rdparty/lua/lua-5.4.4/doc/contents.html renamed to src/3rdparty/lua/lua-5.4.7/doc/contents.html

+12-8
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<BODY>
1111

1212
<H1>
13-
<A HREF="http://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
13+
<A HREF="https://www.lua.org/"><IMG SRC="logo.gif" ALT="Lua"></A>
1414
Lua 5.4 Reference Manual
1515
</H1>
1616

1717
<P>
1818
The reference manual is the official definition of the Lua language.
1919
<BR>
2020
For a complete introduction to Lua programming, see the book
21-
<A HREF="http://www.lua.org/pil/">Programming in Lua</A>.
21+
<A HREF="https://www.lua.org/pil/">Programming in Lua</A>.
2222

2323
<DIV CLASS="menubar">
2424
<A HREF="manual.html">start</A>
@@ -27,14 +27,14 @@ <H1>
2727
&middot;
2828
<A HREF="#index">index</A>
2929
&middot;
30-
<A HREF="http://www.lua.org/manual/">other versions</A>
30+
<A HREF="https://www.lua.org/manual/">other versions</A>
3131
</DIV>
3232

3333
<P>
3434
<SMALL>
35-
Copyright &copy; 2020&ndash;2022 Lua.org, PUC-Rio.
35+
Copyright &copy; 2020&ndash;2024 Lua.org, PUC-Rio.
3636
Freely available under the terms of the
37-
<A HREF="http://www.lua.org/license.html">Lua license</A>.
37+
<A HREF="https://www.lua.org/license.html">Lua license</A>.
3838
</SMALL>
3939

4040
<H2><A NAME="contents">Contents</A></H2>
@@ -85,6 +85,8 @@ <H2><A NAME="contents">Contents</A></H2>
8585
<LI><A HREF="manual.html#3.4.9">3.4.9 &ndash; Table Constructors</A>
8686
<LI><A HREF="manual.html#3.4.10">3.4.10 &ndash; Function Calls</A>
8787
<LI><A HREF="manual.html#3.4.11">3.4.11 &ndash; Function Definitions</A>
88+
<LI><A HREF="manual.html#3.4.12">3.4.12 &ndash; Lists of expressions, multiple results, and adjustment<A>
89+
8890
</UL>
8991
<LI><A HREF="manual.html#3.5">3.5 &ndash; Visibility Rules</A>
9092
</UL>
@@ -613,7 +615,7 @@ <H3><A NAME="constants">constants</A></H3>
613615
<A HREF="manual.html#pdf-LUA_HOOKLINE">LUA_HOOKLINE</A><BR>
614616
<A HREF="manual.html#pdf-LUA_HOOKRET">LUA_HOOKRET</A><BR>
615617
<A HREF="manual.html#pdf-LUA_HOOKTAILCALL">LUA_HOOKTAILCALL</A><BR>
616-
<A HREF="manual.html#pdf-LUAL_BUFFERSIZE">LUAL_BUFFERSIZE</A><BR>
618+
<A HREF="manual.html#pdf-LUA_LOADED_TABLE">LUA_LOADED_TABLE</A><BR>
617619
<A HREF="manual.html#pdf-LUA_MASKCALL">LUA_MASKCALL</A><BR>
618620
<A HREF="manual.html#pdf-LUA_MASKCOUNT">LUA_MASKCOUNT</A><BR>
619621
<A HREF="manual.html#pdf-LUA_MASKLINE">LUA_MASKLINE</A><BR>
@@ -641,6 +643,7 @@ <H3><A NAME="constants">constants</A></H3>
641643
<A HREF="manual.html#pdf-LUA_OPSHR">LUA_OPSHR</A><BR>
642644
<A HREF="manual.html#pdf-LUA_OPSUB">LUA_OPSUB</A><BR>
643645
<A HREF="manual.html#pdf-LUA_OPUNM">LUA_OPUNM</A><BR>
646+
<A HREF="manual.html#pdf-LUA_PRELOAD_TABLE">LUA_PRELOAD_TABLE</A><BR>
644647
<A HREF="manual.html#pdf-LUA_REFNIL">LUA_REFNIL</A><BR>
645648
<A HREF="manual.html#pdf-LUA_REGISTRYINDEX">LUA_REGISTRYINDEX</A><BR>
646649
<A HREF="manual.html#pdf-LUA_RIDX_GLOBALS">LUA_RIDX_GLOBALS</A><BR>
@@ -657,17 +660,18 @@ <H3><A NAME="constants">constants</A></H3>
657660
<A HREF="manual.html#pdf-LUA_TUSERDATA">LUA_TUSERDATA</A><BR>
658661
<A HREF="manual.html#pdf-LUA_USE_APICHECK">LUA_USE_APICHECK</A><BR>
659662
<A HREF="manual.html#pdf-LUA_YIELD">LUA_YIELD</A><BR>
663+
<A HREF="manual.html#pdf-LUAL_BUFFERSIZE">LUAL_BUFFERSIZE</A><BR>
660664

661665
</TD>
662666
</TR>
663667
</TABLE>
664668

665669
<P CLASS="footer">
666670
Last update:
667-
Thu Jan 13 11:32:22 UTC 2022
671+
Thu May 9 14:47:09 UTC 2024
668672
</P>
669673
<!--
670-
Last change: revised for Lua 5.4.4
674+
Last change: revised for Lua 5.4.7
671675
-->
672676

673677
</BODY>

src/3rdparty/lua/lua-5.4.4/doc/lua.1 renamed to src/3rdparty/lua/lua-5.4.7/doc/lua.1

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.\" $Id: lua.man,v 1.14 2020/05/21 19:31:21 lhf Exp $
2-
.TH LUA 1 "$Date: 2020/05/21 19:31:21 $"
1+
.\" $Id: lua.man,v 1.14 2024/05/08 18:48:27 lhf Exp $
2+
.TH LUA 1 "$Date: 2024/05/08 18:48:27 $"
33
.SH NAME
44
lua \- Lua interpreter
55
.SH SYNOPSIS
@@ -86,11 +86,17 @@ execute statement
8686
enter interactive mode after executing
8787
.IR script .
8888
.TP
89-
.BI \-l " name"
89+
.BI \-l " mod"
9090
require library
91-
.I name
91+
.I mod
9292
into global
93-
.IR name .
93+
.IR mod .
94+
.TP
95+
.BI \-l " g=mod"
96+
require library
97+
.I mod
98+
into global
99+
.IR g .
94100
.TP
95101
.B \-v
96102
show version information.
@@ -117,7 +123,7 @@ and the version-neutral variants are ignored.
117123
Code to be executed before command line options and scripts.
118124
.TP
119125
.B LUA_PATH, LUA_PATH_5_4
120-
Initial value of package.cpath,
126+
Initial value of package.path,
121127
the path used by require to search for Lua loaders.
122128
.TP
123129
.B LUA_CPATH, LUA_CPATH_5_4

src/3rdparty/lua/lua-5.4.4/doc/lua.css renamed to src/3rdparty/lua/lua-5.4.7/doc/lua.css

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ table.book td.cover {
143143

144144
table.book img {
145145
border: solid #000080 1px ;
146+
border-radius: 2px ;
146147
}
147148

148149
table.book span {

0 commit comments

Comments
 (0)