mirror of
https://gitcode.com/JianFeeeee/LuaCangjia_api.git
synced 2026-09-20 17:08:12 +00:00
feat: 适配 Lua 5.5.1 最新版 (lua_5.5.1 分支)
- lib/lua 替换为 Lua 5.5.1 官方源码(2026-07 发布, 当前最新) - luaconf.h LUA_EXTRASPACE 扩为 272 字节(与 5.4.8 同方案) - C API 完全兼容, 桥接层零改动 - PackagePathConfig 测试沿用跨版本语义断言(5.4+ require 返回 loader data 路径) - 验证: GTest 44/44 通过
This commit is contained in:
JianFeeeee
177
lib/lua/luaconf.h
Executable file → Normal file
177
lib/lua/luaconf.h
Executable file → Normal file
@ -58,15 +58,28 @@
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
** When POSIX DLL ('LUA_USE_DLOPEN') is enabled, the Lua stand-alone
|
||||
** application will try to dynamically link a 'readline' facility
|
||||
** for its REPL. In that case, LUA_READLINELIB is the name of the
|
||||
** library it will look for those facilities. If lua.c cannot open
|
||||
** the specified library, it will generate a warning and then run
|
||||
** without 'readline'. If that macro is not defined, lua.c will not
|
||||
** use 'readline'.
|
||||
*/
|
||||
#if defined(LUA_USE_LINUX)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
|
||||
#if !defined(LUA_READLINELIB)
|
||||
#define LUA_READLINELIB "libreadline.so"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_USE_MACOSX)
|
||||
#define LUA_USE_POSIX
|
||||
#define LUA_USE_DLOPEN /* MacOS does not need -ldl */
|
||||
#define LUA_USE_DLOPEN /* macOS does not need -ldl */
|
||||
#define LUA_USE_READLINE /* needs an extra library: -lreadline */
|
||||
#endif
|
||||
|
||||
|
||||
@ -76,6 +89,11 @@
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_USE_C89) && defined(LUA_USE_POSIX)
|
||||
#error "POSIX is not compatible with C89"
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_IS32INT is true iff 'int' has (at least) 32 bits.
|
||||
*/
|
||||
@ -122,7 +140,7 @@
|
||||
/*
|
||||
@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats.
|
||||
*/
|
||||
#define LUA_32BITS 0
|
||||
/* #define LUA_32BITS */
|
||||
|
||||
|
||||
/*
|
||||
@ -137,7 +155,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
#if LUA_32BITS /* { */
|
||||
#if defined(LUA_32BITS) /* { */
|
||||
/*
|
||||
** 32-bit integers and 'float'
|
||||
*/
|
||||
@ -208,17 +226,17 @@
|
||||
|
||||
#if !defined(LUA_PATH_DEFAULT)
|
||||
#define LUA_PATH_DEFAULT \
|
||||
LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
|
||||
LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua;" \
|
||||
LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
|
||||
LUA_LDIR "?.lua;" LUA_LDIR "?\\init.lua;" \
|
||||
LUA_CDIR "?.lua;" LUA_CDIR "?\\init.lua;" \
|
||||
LUA_SHRDIR "?.lua;" LUA_SHRDIR "?\\init.lua;" \
|
||||
".\\?.lua;" ".\\?\\init.lua"
|
||||
#endif
|
||||
|
||||
#if !defined(LUA_CPATH_DEFAULT)
|
||||
#define LUA_CPATH_DEFAULT \
|
||||
LUA_CDIR"?.dll;" \
|
||||
LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
|
||||
LUA_CDIR"loadall.dll;" ".\\?.dll"
|
||||
LUA_CDIR "?.dll;" \
|
||||
LUA_CDIR "..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
|
||||
LUA_CDIR "loadall.dll;" ".\\?.dll"
|
||||
#endif
|
||||
|
||||
#else /* }{ */
|
||||
@ -229,14 +247,14 @@
|
||||
|
||||
#if !defined(LUA_PATH_DEFAULT)
|
||||
#define LUA_PATH_DEFAULT \
|
||||
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
|
||||
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
|
||||
LUA_LDIR "?.lua;" LUA_LDIR "?/init.lua;" \
|
||||
LUA_CDIR "?.lua;" LUA_CDIR "?/init.lua;" \
|
||||
"./?.lua;" "./?/init.lua"
|
||||
#endif
|
||||
|
||||
#if !defined(LUA_CPATH_DEFAULT)
|
||||
#define LUA_CPATH_DEFAULT \
|
||||
LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
|
||||
LUA_CDIR "?.so;" LUA_CDIR "loadall.so;" "./?.so"
|
||||
#endif
|
||||
|
||||
#endif /* } */
|
||||
@ -303,32 +321,13 @@
|
||||
** More often than not the libs go together with the core.
|
||||
*/
|
||||
#define LUALIB_API LUA_API
|
||||
|
||||
#if defined(__cplusplus)
|
||||
/* Lua uses the "C name" when calling open functions */
|
||||
#define LUAMOD_API extern "C"
|
||||
#else
|
||||
#define LUAMOD_API LUA_API
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_FUNC is a mark for all extern functions that are not to be
|
||||
** exported to outside modules.
|
||||
@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables,
|
||||
** none of which to be exported to outside modules (LUAI_DDEF for
|
||||
** definitions and LUAI_DDEC for declarations).
|
||||
** CHANGE them if you need to mark them in some special way. Elf/gcc
|
||||
** (versions 3.2 and later) mark them as "hidden" to optimize access
|
||||
** when Lua is compiled as a shared library. Not all elf targets support
|
||||
** this attribute. Unfortunately, gcc does not offer a way to check
|
||||
** whether the target offers that support, and those without support
|
||||
** give a warning about it. To avoid these warnings, change to the
|
||||
** default definition.
|
||||
*/
|
||||
#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
|
||||
defined(__ELF__) /* { */
|
||||
#define LUAI_FUNC __attribute__((visibility("internal"))) extern
|
||||
#else /* }{ */
|
||||
#define LUAI_FUNC extern
|
||||
#endif /* } */
|
||||
|
||||
#define LUAI_DDEC(dec) LUAI_FUNC dec
|
||||
#define LUAI_DDEF /* empty */
|
||||
#endif
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
@ -340,11 +339,12 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ LUA_COMPAT_5_3 controls other macros for compatibility with Lua 5.3.
|
||||
** You can define it to get all options, or change specific options
|
||||
** to fit your specific needs.
|
||||
@@ LUA_COMPAT_GLOBAL avoids 'global' being a reserved word
|
||||
*/
|
||||
#if defined(LUA_COMPAT_5_3) /* { */
|
||||
#if !defined(LUA_COMPAT_GLOBAL)
|
||||
#define LUA_COMPAT_GLOBAL 1
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated
|
||||
@ -352,23 +352,7 @@
|
||||
** (These functions were already officially removed in 5.3;
|
||||
** nevertheless they are still available here.)
|
||||
*/
|
||||
#define LUA_COMPAT_MATHLIB
|
||||
|
||||
/*
|
||||
@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for
|
||||
** manipulating other integer types (lua_pushunsigned, lua_tounsigned,
|
||||
** luaL_checkint, luaL_checklong, etc.)
|
||||
** (These macros were also officially removed in 5.3, but they are still
|
||||
** available here.)
|
||||
*/
|
||||
#define LUA_COMPAT_APIINTCASTS
|
||||
|
||||
|
||||
/*
|
||||
@@ LUA_COMPAT_LT_LE controls the emulation of the '__le' metamethod
|
||||
** using '__lt'.
|
||||
*/
|
||||
#define LUA_COMPAT_LT_LE
|
||||
/* #define LUA_COMPAT_MATHLIB */
|
||||
|
||||
|
||||
/*
|
||||
@ -385,8 +369,6 @@
|
||||
#define lua_equal(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPEQ)
|
||||
#define lua_lessthan(L,idx1,idx2) lua_compare(L,(idx1),(idx2),LUA_OPLT)
|
||||
|
||||
#endif /* } */
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
|
||||
@ -405,35 +387,23 @@
|
||||
@@ l_floatatt(x) corrects float attribute 'x' to the proper float type
|
||||
** by prefixing it with one of FLT/DBL/LDBL.
|
||||
@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
|
||||
@@ LUA_NUMBER_FMT is the format for writing floats.
|
||||
@@ lua_number2str converts a float to a string.
|
||||
@@ LUA_NUMBER_FMT is the format for writing floats with the maximum
|
||||
** number of digits that respects tostring(tonumber(numeral)) == numeral.
|
||||
** (That would be floor(log10(2^n)), where n is the number of bits in
|
||||
** the float mantissa.)
|
||||
@@ LUA_NUMBER_FMT_N is the format for writing floats with the minimum
|
||||
** number of digits that ensures tonumber(tostring(number)) == number.
|
||||
** (That would be LUA_NUMBER_FMT+2.)
|
||||
@@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
|
||||
@@ l_floor takes the floor of a float.
|
||||
@@ lua_str2number converts a decimal numeral to a number.
|
||||
*/
|
||||
|
||||
|
||||
/* The following definitions are good for most cases here */
|
||||
/* The following definition is good for most cases here */
|
||||
|
||||
#define l_floor(x) (l_mathop(floor)(x))
|
||||
|
||||
#define lua_number2str(s,sz,n) \
|
||||
l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n))
|
||||
|
||||
/*
|
||||
@@ lua_numbertointeger converts a float number with an integral value
|
||||
** to an integer, or returns 0 if float is not within the range of
|
||||
** a lua_Integer. (The range comparisons are tricky because of
|
||||
** rounding. The tests here assume a two-complement representation,
|
||||
** where MININTEGER always has an exact representation as a float;
|
||||
** MAXINTEGER may not have one, and therefore its conversion to float
|
||||
** may have an ill-defined value.)
|
||||
*/
|
||||
#define lua_numbertointeger(n,p) \
|
||||
((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
|
||||
(n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
|
||||
(*(p) = (LUA_INTEGER)(n), 1))
|
||||
|
||||
|
||||
/* now the variable definitions */
|
||||
|
||||
@ -447,6 +417,7 @@
|
||||
|
||||
#define LUA_NUMBER_FRMLEN ""
|
||||
#define LUA_NUMBER_FMT "%.7g"
|
||||
#define LUA_NUMBER_FMT_N "%.9g"
|
||||
|
||||
#define l_mathop(op) op##f
|
||||
|
||||
@ -463,6 +434,7 @@
|
||||
|
||||
#define LUA_NUMBER_FRMLEN "L"
|
||||
#define LUA_NUMBER_FMT "%.19Lg"
|
||||
#define LUA_NUMBER_FMT_N "%.21Lg"
|
||||
|
||||
#define l_mathop(op) op##l
|
||||
|
||||
@ -477,7 +449,8 @@
|
||||
#define LUAI_UACNUMBER double
|
||||
|
||||
#define LUA_NUMBER_FRMLEN ""
|
||||
#define LUA_NUMBER_FMT "%.14g"
|
||||
#define LUA_NUMBER_FMT "%.15g"
|
||||
#define LUA_NUMBER_FMT_N "%.17g"
|
||||
|
||||
#define l_mathop(op) op
|
||||
|
||||
@ -680,7 +653,7 @@
|
||||
*/
|
||||
#if !defined(luai_likely)
|
||||
|
||||
#if defined(__GNUC__) && !defined(LUA_NOBUILTIN)
|
||||
#if !defined(LUA_NOBUILTIN) && defined(__GNUC__) && (__GNUC__ >= 3)
|
||||
#define luai_likely(x) (__builtin_expect(((x) != 0), 1))
|
||||
#define luai_unlikely(x) (__builtin_expect(((x) != 0), 0))
|
||||
#else
|
||||
@ -691,13 +664,6 @@
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(LUA_CORE) || defined(LUA_LIB)
|
||||
/* shorter names for Lua's own use */
|
||||
#define l_likely(x) luai_likely(x)
|
||||
#define l_unlikely(x) luai_unlikely(x)
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
@ -722,10 +688,7 @@
|
||||
@@ LUA_USE_APICHECK turns on several consistency checks on the C API.
|
||||
** Define it as a help when debugging C code.
|
||||
*/
|
||||
#if defined(LUA_USE_APICHECK)
|
||||
#include <assert.h>
|
||||
#define luai_apicheck(l,e) assert(e)
|
||||
#endif
|
||||
/* #define LUA_USE_APICHECK */
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
@ -738,26 +701,11 @@
|
||||
** =====================================================================
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ LUAI_MAXSTACK limits the size of the Lua stack.
|
||||
** CHANGE it if you need a different limit. This limit is arbitrary;
|
||||
** its only purpose is to stop Lua from consuming unlimited stack
|
||||
** space (and to reserve some numbers for pseudo-indices).
|
||||
** (It must fit into max(size_t)/32 and max(int)/2.)
|
||||
*/
|
||||
#if LUAI_IS32INT
|
||||
#define LUAI_MAXSTACK 1000000
|
||||
#else
|
||||
#define LUAI_MAXSTACK 15000
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
@@ LUA_EXTRASPACE defines the size of a raw memory area associated with
|
||||
** a Lua state with very fast access.
|
||||
** CHANGE it if you need a different size.
|
||||
*/
|
||||
|
||||
#define LUA_EXTRASPACE (272)
|
||||
|
||||
|
||||
@ -777,10 +725,17 @@
|
||||
|
||||
|
||||
/*
|
||||
@@ LUAI_MAXALIGN defines fields that, when used in a union, ensure
|
||||
** maximum alignment for the other items in that union.
|
||||
@@ LUAI_MAXALIGN defines fields that ensure proper alignment for
|
||||
** memory areas offered by Lua (e.g., userdata memory).
|
||||
** Add fields to it if you need alignment for non-ISO objects.
|
||||
*/
|
||||
#if defined(LLONG_MAX)
|
||||
/* use ISO C99 stuff */
|
||||
#define LUAI_MAXALIGN long double u; void *s; long long l
|
||||
#else
|
||||
/* use only C89 stuff */
|
||||
#define LUAI_MAXALIGN lua_Number n; double u; void *s; lua_Integer i; long l
|
||||
#endif
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
@ -797,7 +752,5 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user