mirror of
https://gitcode.com/JianFeeeee/LuaCangjia_api.git
synced 2026-09-21 01:18:10 +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
203
lib/lua/lua.c
Executable file → Normal file
203
lib/lua/lua.c
Executable file → Normal file
@ -19,6 +19,7 @@
|
||||
|
||||
#include "lauxlib.h"
|
||||
#include "lualib.h"
|
||||
#include "llimits.h"
|
||||
|
||||
|
||||
#if !defined(LUA_PROGNAME)
|
||||
@ -29,6 +30,12 @@
|
||||
#define LUA_INIT_VAR "LUA_INIT"
|
||||
#endif
|
||||
|
||||
/* Name of the environment variable with the name of the readline library */
|
||||
#if !defined(LUA_RLLIB_VAR)
|
||||
#define LUA_RLLIB_VAR "LUA_READLINELIB"
|
||||
#endif
|
||||
|
||||
|
||||
#define LUA_INITVARVERSION LUA_INIT_VAR LUA_VERSUFFIX
|
||||
|
||||
|
||||
@ -200,12 +207,12 @@ static int dochunk (lua_State *L, int status) {
|
||||
|
||||
|
||||
static int dofile (lua_State *L, const char *name) {
|
||||
return dochunk(L, luaL_loadfile(L, name));
|
||||
return dochunk(L, luaL_loadfilex(L, name, "bt"));
|
||||
}
|
||||
|
||||
|
||||
static int dostring (lua_State *L, const char *s, const char *name) {
|
||||
return dochunk(L, luaL_loadbuffer(L, s, strlen(s), name));
|
||||
return dochunk(L, luaL_loadbufferx(L, s, strlen(s), name, "t"));
|
||||
}
|
||||
|
||||
|
||||
@ -259,7 +266,7 @@ static int handle_script (lua_State *L, char **argv) {
|
||||
const char *fname = argv[0];
|
||||
if (strcmp(fname, "-") == 0 && strcmp(argv[-1], "--") != 0)
|
||||
fname = NULL; /* stdin */
|
||||
status = luaL_loadfile(L, fname);
|
||||
status = luaL_loadfilex(L, fname, "bt");
|
||||
if (status == LUA_OK) {
|
||||
int n = pushargs(L); /* push arguments to script */
|
||||
status = docall(L, n, LUA_MULTRET);
|
||||
@ -302,7 +309,8 @@ static int collectargs (char **argv, int *first) {
|
||||
case '-': /* '--' */
|
||||
if (argv[i][2] != '\0') /* extra characters after '--'? */
|
||||
return has_error; /* invalid option */
|
||||
*first = i + 1;
|
||||
/* if there is a script name, it comes after '--' */
|
||||
*first = (argv[i + 1] != NULL) ? i + 1 : 0;
|
||||
return args;
|
||||
case '\0': /* '-' */
|
||||
return args; /* script "name" is '-' */
|
||||
@ -347,6 +355,7 @@ static int collectargs (char **argv, int *first) {
|
||||
*/
|
||||
static int runargs (lua_State *L, char **argv, int n) {
|
||||
int i;
|
||||
lua_warning(L, "@off", 0); /* by default, Lua stand-alone has warnings off */
|
||||
for (i = 1; i < n; i++) {
|
||||
int option = argv[i][1];
|
||||
lua_assert(argv[i][0] == '-'); /* already checked */
|
||||
@ -371,12 +380,21 @@ static int runargs (lua_State *L, char **argv, int n) {
|
||||
}
|
||||
|
||||
|
||||
static char *(*l_getenv)(const char *name);
|
||||
|
||||
/* Function to ignore environment variables, used by option -E */
|
||||
static char *no_getenv (const char *name) {
|
||||
UNUSED(name);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static int handle_luainit (lua_State *L) {
|
||||
const char *name = "=" LUA_INITVARVERSION;
|
||||
const char *init = getenv(name + 1);
|
||||
const char *init = l_getenv(name + 1);
|
||||
if (init == NULL) {
|
||||
name = "=" LUA_INIT_VAR;
|
||||
init = getenv(name + 1); /* try alternative name */
|
||||
init = l_getenv(name + 1); /* try alternative name */
|
||||
}
|
||||
if (init == NULL) return LUA_OK;
|
||||
else if (init[0] == '@')
|
||||
@ -431,30 +449,97 @@ static int handle_luainit (lua_State *L) {
|
||||
|
||||
|
||||
/*
|
||||
** lua_readline defines how to show a prompt and then read a line from
|
||||
** the standard input.
|
||||
** lua_saveline defines how to "save" a read line in a "history".
|
||||
** lua_freeline defines how to free a line read by lua_readline.
|
||||
** * lua_initreadline initializes the readline system.
|
||||
** * lua_readline defines how to show a prompt and then read a line from
|
||||
** the standard input.
|
||||
** * lua_saveline defines how to "save" a read line in a "history".
|
||||
** * lua_freeline defines how to free a line read by lua_readline.
|
||||
*/
|
||||
|
||||
#if !defined(lua_readline) /* { */
|
||||
/* Otherwise, all previously listed functions should be defined. */
|
||||
|
||||
#if defined(LUA_USE_READLINE) /* { */
|
||||
/* Lua will be linked with '-lreadline' */
|
||||
|
||||
#include <readline/readline.h>
|
||||
#include <readline/history.h>
|
||||
|
||||
#define lua_initreadline(L) ((void)L, rl_readline_name="lua")
|
||||
#define lua_readline(L,b,p) ((void)L, ((b)=readline(p)) != NULL)
|
||||
#define lua_saveline(L,line) ((void)L, add_history(line))
|
||||
#define lua_freeline(L,b) ((void)L, free(b))
|
||||
#define lua_readline(buff,prompt) ((void)buff, readline(prompt))
|
||||
#define lua_saveline(line) add_history(line)
|
||||
#define lua_freeline(line) free(line)
|
||||
|
||||
#else /* }{ */
|
||||
#else /* }{ */
|
||||
/* use dynamically loaded readline (or nothing) */
|
||||
|
||||
#define lua_initreadline(L) ((void)L)
|
||||
#define lua_readline(L,b,p) \
|
||||
((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \
|
||||
fgets(b, LUA_MAXINPUT, stdin) != NULL) /* get line */
|
||||
#define lua_saveline(L,line) { (void)L; (void)line; }
|
||||
#define lua_freeline(L,b) { (void)L; (void)b; }
|
||||
/* pointer to 'readline' function (if any) */
|
||||
typedef char *(*l_readlineT) (const char *prompt);
|
||||
static l_readlineT l_readline = NULL;
|
||||
|
||||
/* pointer to 'add_history' function (if any) */
|
||||
typedef void (*l_addhistT) (const char *string);
|
||||
static l_addhistT l_addhist = NULL;
|
||||
|
||||
|
||||
static char *lua_readline (char *buff, const char *prompt) {
|
||||
if (l_readline != NULL) /* is there a 'readline'? */
|
||||
return (*l_readline)(prompt); /* use it */
|
||||
else { /* emulate 'readline' over 'buff' */
|
||||
fputs(prompt, stdout);
|
||||
fflush(stdout); /* show prompt */
|
||||
return fgets(buff, LUA_MAXINPUT, stdin); /* read line */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void lua_saveline (const char *line) {
|
||||
if (l_addhist != NULL) /* is there an 'add_history'? */
|
||||
(*l_addhist)(line); /* use it */
|
||||
/* else nothing to be done */
|
||||
}
|
||||
|
||||
|
||||
static void lua_freeline (char *line) {
|
||||
if (l_readline != NULL) /* is there a 'readline'? */
|
||||
free(line); /* free line created by it */
|
||||
/* else 'lua_readline' used an automatic buffer; nothing to free */
|
||||
}
|
||||
|
||||
|
||||
#if defined(LUA_USE_DLOPEN) && defined(LUA_READLINELIB) /* { */
|
||||
/* try to load 'readline' dynamically */
|
||||
|
||||
#include <dlfcn.h>
|
||||
|
||||
static void lua_initreadline (lua_State *L) {
|
||||
const char *rllib = l_getenv(LUA_RLLIB_VAR); /* name of readline library */
|
||||
void *lib; /* library handle */
|
||||
if (rllib == NULL) /* no environment variable? */
|
||||
rllib = LUA_READLINELIB; /* use default name */
|
||||
lib = dlopen(rllib, RTLD_NOW | RTLD_LOCAL);
|
||||
if (lib != NULL) {
|
||||
const char **name = cast(const char**, dlsym(lib, "rl_readline_name"));
|
||||
if (name != NULL)
|
||||
*name = "lua";
|
||||
l_readline = cast(l_readlineT, cast_func(dlsym(lib, "readline")));
|
||||
l_addhist = cast(l_addhistT, cast_func(dlsym(lib, "add_history")));
|
||||
if (l_readline != NULL) /* could load readline function? */
|
||||
return; /* everything ok */
|
||||
/* else emit a warning */
|
||||
}
|
||||
lua_warning(L, "unable to load readline library '", 1);
|
||||
lua_warning(L, rllib, 1);
|
||||
lua_warning(L, "'", 0);
|
||||
}
|
||||
|
||||
#else /* }{ */
|
||||
/* no dlopen or LUA_READLINELIB undefined */
|
||||
|
||||
/* Leave pointers with NULL */
|
||||
#define lua_initreadline(L) ((void)L)
|
||||
|
||||
#endif /* } */
|
||||
|
||||
#endif /* } */
|
||||
|
||||
@ -502,21 +587,17 @@ static int incomplete (lua_State *L, int status) {
|
||||
*/
|
||||
static int pushline (lua_State *L, int firstline) {
|
||||
char buffer[LUA_MAXINPUT];
|
||||
char *b = buffer;
|
||||
size_t l;
|
||||
const char *prmt = get_prompt(L, firstline);
|
||||
int readstatus = lua_readline(L, b, prmt);
|
||||
char *b = lua_readline(buffer, prmt);
|
||||
lua_pop(L, 1); /* remove prompt */
|
||||
if (readstatus == 0)
|
||||
if (b == NULL)
|
||||
return 0; /* no input */
|
||||
l = strlen(b);
|
||||
if (l > 0 && b[l-1] == '\n') /* line ends with newline? */
|
||||
b[--l] = '\0'; /* remove it */
|
||||
if (firstline && b[0] == '=') /* for compatibility with 5.2, ... */
|
||||
lua_pushfstring(L, "return %s", b + 1); /* change '=' to 'return' */
|
||||
else
|
||||
lua_pushlstring(L, b, l);
|
||||
lua_freeline(L, b);
|
||||
lua_pushlstring(L, b, l);
|
||||
lua_freeline(b);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -528,34 +609,45 @@ static int pushline (lua_State *L, int firstline) {
|
||||
static int addreturn (lua_State *L) {
|
||||
const char *line = lua_tostring(L, -1); /* original line */
|
||||
const char *retline = lua_pushfstring(L, "return %s;", line);
|
||||
int status = luaL_loadbuffer(L, retline, strlen(retline), "=stdin");
|
||||
if (status == LUA_OK) {
|
||||
int status = luaL_loadbufferx(L, retline, strlen(retline), "=stdin", "t");
|
||||
if (status == LUA_OK)
|
||||
lua_remove(L, -2); /* remove modified line */
|
||||
if (line[0] != '\0') /* non empty? */
|
||||
lua_saveline(L, line); /* keep history */
|
||||
}
|
||||
else
|
||||
lua_pop(L, 2); /* pop result from 'luaL_loadbuffer' and modified line */
|
||||
lua_pop(L, 2); /* pop result from 'luaL_loadbufferx' and modified line */
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
static void checklocal (const char *line) {
|
||||
static const size_t szloc = sizeof("local") - 1;
|
||||
static const char space[] = " \t";
|
||||
line += strspn(line, space); /* skip spaces */
|
||||
if (strncmp(line, "local", szloc) == 0 && /* "local"? */
|
||||
strchr(space, *(line + szloc)) != NULL) { /* followed by a space? */
|
||||
lua_writestringerror("%s\n",
|
||||
"warning: locals do not survive across lines in interactive mode");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
** Read multiple lines until a complete Lua statement
|
||||
** Read multiple lines until a complete Lua statement or an error not
|
||||
** for an incomplete statement. Start with first line already read in
|
||||
** the stack.
|
||||
*/
|
||||
static int multiline (lua_State *L) {
|
||||
size_t len;
|
||||
const char *line = lua_tolstring(L, 1, &len); /* get first line */
|
||||
checklocal(line);
|
||||
for (;;) { /* repeat until gets a complete statement */
|
||||
size_t len;
|
||||
const char *line = lua_tolstring(L, 1, &len); /* get what it has */
|
||||
int status = luaL_loadbuffer(L, line, len, "=stdin"); /* try it */
|
||||
if (!incomplete(L, status) || !pushline(L, 0)) {
|
||||
lua_saveline(L, line); /* keep history */
|
||||
int status = luaL_loadbufferx(L, line, len, "=stdin", "t"); /* try it */
|
||||
if (!incomplete(L, status) || !pushline(L, 0))
|
||||
return status; /* should not or cannot try to add continuation line */
|
||||
}
|
||||
lua_remove(L, -2); /* remove error message (from incomplete line) */
|
||||
lua_pushliteral(L, "\n"); /* add newline... */
|
||||
lua_insert(L, -2); /* ...between the two lines */
|
||||
lua_concat(L, 3); /* join them */
|
||||
line = lua_tolstring(L, 1, &len); /* get what is has */
|
||||
}
|
||||
}
|
||||
|
||||
@ -567,12 +659,16 @@ static int multiline (lua_State *L) {
|
||||
** in the top of the stack.
|
||||
*/
|
||||
static int loadline (lua_State *L) {
|
||||
const char *line;
|
||||
int status;
|
||||
lua_settop(L, 0);
|
||||
if (!pushline(L, 1))
|
||||
return -1; /* no input */
|
||||
if ((status = addreturn(L)) != LUA_OK) /* 'return ...' did not work? */
|
||||
status = multiline(L); /* try as command, maybe with continuation lines */
|
||||
line = lua_tostring(L, 1);
|
||||
if (line[0] != '\0') /* non empty? */
|
||||
lua_saveline(line); /* keep history */
|
||||
lua_remove(L, 1); /* remove line from the stack */
|
||||
lua_assert(lua_gettop(L) == 1);
|
||||
return status;
|
||||
@ -617,6 +713,16 @@ static void doREPL (lua_State *L) {
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
#if !defined(luai_openlibs)
|
||||
#if defined(LUA_NODEBUGLIB)
|
||||
/* With this option, code must require the debug library before using it */
|
||||
#define luai_openlibs(L) luaL_openselectedlibs(L, ~LUA_DBLIBK, LUA_DBLIBK)
|
||||
#else
|
||||
/* The default is to open all standard libraries */
|
||||
#define luai_openlibs(L) luaL_openselectedlibs(L, ~0, 0)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
** Main body of stand-alone interpreter (to be called in protected mode).
|
||||
@ -636,18 +742,19 @@ static int pmain (lua_State *L) {
|
||||
if (args & has_v) /* option '-v'? */
|
||||
print_version();
|
||||
if (args & has_E) { /* option '-E'? */
|
||||
l_getenv = &no_getenv; /* program will ignore environment variables */
|
||||
lua_pushboolean(L, 1); /* signal for libraries to ignore env. vars. */
|
||||
lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
|
||||
}
|
||||
luaL_openlibs(L); /* open standard libraries */
|
||||
else
|
||||
l_getenv = &getenv;
|
||||
luai_openlibs(L); /* open standard libraries */
|
||||
createargtable(L, argv, argc, script); /* create table 'arg' */
|
||||
lua_gc(L, LUA_GCRESTART); /* start GC... */
|
||||
lua_gc(L, LUA_GCGEN, 0, 0); /* ...in generational mode */
|
||||
if (!(args & has_E)) { /* no option '-E'? */
|
||||
if (handle_luainit(L) != LUA_OK) /* run LUA_INIT */
|
||||
return 0; /* error running LUA_INIT */
|
||||
}
|
||||
if (!runargs(L, argv, optlim)) /* execute arguments -e and -l */
|
||||
lua_gc(L, LUA_GCGEN); /* ...in generational mode */
|
||||
if (handle_luainit(L) != LUA_OK) /* run LUA_INIT */
|
||||
return 0; /* error running LUA_INIT */
|
||||
if (!runargs(L, argv, optlim)) /* execute arguments -e, -l, and -W */
|
||||
return 0; /* something failed */
|
||||
if (script > 0) { /* execute main script (if there is one) */
|
||||
if (handle_script(L, argv + script) != LUA_OK)
|
||||
|
||||
Reference in New Issue
Block a user