2022-04-24 16:59:22 +00:00
|
|
|
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
|
|
|
│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi │
|
|
|
|
╚──────────────────────────────────────────────────────────────────────────────╝
|
|
|
|
│ │
|
|
|
|
│ Lua │
|
Bring Lua to 5.4.6. (#1214)
This essentially re-does the work of #875 on top of master.
This is what I did to check that Cosmo's Lua extensions still worked:
```
$ build/bootstrap/make MODE=aarch64 o/aarch64/third_party/lua/lua
$ ape o/aarch64/third_party/lua/lua
>: 10
10
>: 010
8
>: 0b10
2
>: string.byte("\e")
27
>: "Hello, %s" % {"world"}
Hello, world
>: "*" * 3
***
```
`luaL_traceback2` was used to show the stack trace with parameter
values; it's used in `LuaCallWithTrace`, which is used in Redbean to run
Lua code. You should be able to see the extended stack trace by running
something like this: `redbean -e "function a(b)c()end a(2)"` (with
"params" indicating the extended stack trace):
```
stack traceback:
[string "function a(b)c()end a(2)"]:1: in function 'a', params: b = 2;
[string "function a(b)c()end a(2)"]:1: in main chunk
```
@pkulchenko confirmed that I get the expected result with the updated
code.
This is what I did to check that Lua itself still worked:
```
$ cd third_party/lua/test/
$ ape ../../../o/aarch64/third_party/lua/lua all.lua
```
There's one test failure, in `files.lua`:
```
***** FILE 'files.lua'*****
testing i/o
../../../o/aarch64/third_party/lua/lua: files.lua:84: assertion failed!
stack traceback:
[C]: in function 'assert'
files.lua:84: in main chunk
(...tail calls...)
all.lua:195: in main chunk
[C]: in ?
.>>> closing state <<<
```
That isn't a result of these changes; the same test is failing in
master.
The failure is here:
```lua
if not _port then -- invalid seek
local status, msg, code = io.stdin:seek("set", 1000)
assert(not status and type(msg) == "string" and type(code) == "number")
end
```
The test expects a seek to offset 1,000 on stdin to fail — but it
doesn't. `status` ends up being the new offset rather than `nil`.
If I comment out that one test, the remaining tests succeed.
2024-06-16 00:13:08 +00:00
|
|
|
│ Copyright © 2004-2023 Lua.org, PUC-Rio. │
|
2022-04-24 16:59:22 +00:00
|
|
|
│ │
|
|
|
|
│ 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: │
|
|
|
|
│ │
|
|
|
|
│ The above copyright notice and this permission notice shall be │
|
|
|
|
│ included in all copies or substantial portions of the Software. │
|
|
|
|
│ │
|
|
|
|
│ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, │
|
|
|
|
│ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF │
|
|
|
|
│ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. │
|
|
|
|
│ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY │
|
|
|
|
│ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, │
|
|
|
|
│ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE │
|
|
|
|
│ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │
|
|
|
|
│ │
|
|
|
|
╚─────────────────────────────────────────────────────────────────────────────*/
|
2021-03-02 13:51:10 +00:00
|
|
|
#define ldblib_c
|
|
|
|
#define LUA_LIB
|
Bring Lua to 5.4.6. (#1214)
This essentially re-does the work of #875 on top of master.
This is what I did to check that Cosmo's Lua extensions still worked:
```
$ build/bootstrap/make MODE=aarch64 o/aarch64/third_party/lua/lua
$ ape o/aarch64/third_party/lua/lua
>: 10
10
>: 010
8
>: 0b10
2
>: string.byte("\e")
27
>: "Hello, %s" % {"world"}
Hello, world
>: "*" * 3
***
```
`luaL_traceback2` was used to show the stack trace with parameter
values; it's used in `LuaCallWithTrace`, which is used in Redbean to run
Lua code. You should be able to see the extended stack trace by running
something like this: `redbean -e "function a(b)c()end a(2)"` (with
"params" indicating the extended stack trace):
```
stack traceback:
[string "function a(b)c()end a(2)"]:1: in function 'a', params: b = 2;
[string "function a(b)c()end a(2)"]:1: in main chunk
```
@pkulchenko confirmed that I get the expected result with the updated
code.
This is what I did to check that Lua itself still worked:
```
$ cd third_party/lua/test/
$ ape ../../../o/aarch64/third_party/lua/lua all.lua
```
There's one test failure, in `files.lua`:
```
***** FILE 'files.lua'*****
testing i/o
../../../o/aarch64/third_party/lua/lua: files.lua:84: assertion failed!
stack traceback:
[C]: in function 'assert'
files.lua:84: in main chunk
(...tail calls...)
all.lua:195: in main chunk
[C]: in ?
.>>> closing state <<<
```
That isn't a result of these changes; the same test is failing in
master.
The failure is here:
```lua
if not _port then -- invalid seek
local status, msg, code = io.stdin:seek("set", 1000)
assert(not status and type(msg) == "string" and type(code) == "number")
end
```
The test expects a seek to offset 1,000 on stdin to fail — but it
doesn't. `status` ends up being the new offset rather than `nil`.
If I comment out that one test, the remaining tests succeed.
2024-06-16 00:13:08 +00:00
|
|
|
|
2022-08-11 07:15:29 +00:00
|
|
|
#include "libc/str/str.h"
|
2022-04-24 16:59:22 +00:00
|
|
|
#include "third_party/lua/lauxlib.h"
|
2021-03-07 21:26:57 +00:00
|
|
|
#include "third_party/lua/lprefix.h"
|
|
|
|
#include "third_party/lua/lua.h"
|
|
|
|
#include "third_party/lua/lualib.h"
|
Release Cosmopolitan v3.3
This change upgrades to GCC 12.3 and GNU binutils 2.42. The GNU linker
appears to have changed things so that only a single de-duplicated str
table is present in the binary, and it gets placed wherever the linker
wants, regardless of what the linker script says. To cope with that we
need to stop using .ident to embed licenses. As such, this change does
significant work to revamp how third party licenses are defined in the
codebase, using `.section .notice,"aR",@progbits`.
This new GCC 12.3 toolchain has support for GNU indirect functions. It
lets us support __target_clones__ for the first time. This is used for
optimizing the performance of libc string functions such as strlen and
friends so far on x86, by ensuring AVX systems favor a second codepath
that uses VEX encoding. It shaves some latency off certain operations.
It's a useful feature to have for scientific computing for the reasons
explained by the test/libcxx/openmp_test.cc example which compiles for
fifteen different microarchitectures. Thanks to the upgrades, it's now
also possible to use newer instruction sets, such as AVX512FP16, VNNI.
Cosmo now uses the %gs register on x86 by default for TLS. Doing it is
helpful for any program that links `cosmo_dlopen()`. Such programs had
to recompile their binaries at startup to change the TLS instructions.
That's not great, since it means every page in the executable needs to
be faulted. The work of rewriting TLS-related x86 opcodes, is moved to
fixupobj.com instead. This is great news for MacOS x86 users, since we
previously needed to morph the binary every time for that platform but
now that's no longer necessary. The only platforms where we need fixup
of TLS x86 opcodes at runtime are now Windows, OpenBSD, and NetBSD. On
Windows we morph TLS to point deeper into the TIB, based on a TlsAlloc
assignment, and on OpenBSD/NetBSD we morph %gs back into %fs since the
kernels do not allow us to specify a value for the %gs register.
OpenBSD users are now required to use APE Loader to run Cosmo binaries
and assimilation is no longer possible. OpenBSD kernel needs to change
to allow programs to specify a value for the %gs register, or it needs
to stop marking executable pages loaded by the kernel as mimmutable().
This release fixes __constructor__, .ctor, .init_array, and lastly the
.preinit_array so they behave the exact same way as glibc.
We no longer use hex constants to define math.h symbols like M_PI.
2024-02-20 19:12:09 +00:00
|
|
|
__static_yoink("lua_notice");
|
2021-03-02 13:51:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** The hook table at registry[HOOKKEY] maps threads to their current
|
|
|
|
** hook function.
|
|
|
|
*/
|
|
|
|
static const char *const HOOKKEY = "_HOOKKEY";
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** If L1 != L, L1 can be in any state, and therefore there are no
|
|
|
|
** guarantees about its stack space; any push in L1 must be
|
|
|
|
** checked.
|
|
|
|
*/
|
|
|
|
static void checkstack (lua_State *L, lua_State *L1, int n) {
|
2021-07-28 16:26:35 +00:00
|
|
|
if (l_unlikely(L != L1 && !lua_checkstack(L1, n)))
|
2021-03-02 13:51:10 +00:00
|
|
|
luaL_error(L, "stack overflow");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_getregistry (lua_State *L) {
|
|
|
|
lua_pushvalue(L, LUA_REGISTRYINDEX);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_getmetatable (lua_State *L) {
|
|
|
|
luaL_checkany(L, 1);
|
|
|
|
if (!lua_getmetatable(L, 1)) {
|
|
|
|
lua_pushnil(L); /* no metatable */
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_setmetatable (lua_State *L) {
|
|
|
|
int t = lua_type(L, 2);
|
|
|
|
luaL_argexpected(L, t == LUA_TNIL || t == LUA_TTABLE, 2, "nil or table");
|
|
|
|
lua_settop(L, 2);
|
|
|
|
lua_setmetatable(L, 1);
|
|
|
|
return 1; /* return 1st argument */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_getuservalue (lua_State *L) {
|
|
|
|
int n = (int)luaL_optinteger(L, 2, 1);
|
|
|
|
if (lua_type(L, 1) != LUA_TUSERDATA)
|
|
|
|
luaL_pushfail(L);
|
|
|
|
else if (lua_getiuservalue(L, 1, n) != LUA_TNONE) {
|
|
|
|
lua_pushboolean(L, 1);
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_setuservalue (lua_State *L) {
|
|
|
|
int n = (int)luaL_optinteger(L, 3, 1);
|
|
|
|
luaL_checktype(L, 1, LUA_TUSERDATA);
|
|
|
|
luaL_checkany(L, 2);
|
|
|
|
lua_settop(L, 2);
|
|
|
|
if (!lua_setiuservalue(L, 1, n))
|
|
|
|
luaL_pushfail(L);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Auxiliary function used by several library functions: check for
|
|
|
|
** an optional thread as function's first argument and set 'arg' with
|
|
|
|
** 1 if this argument is present (so that functions can skip it to
|
|
|
|
** access their other arguments)
|
|
|
|
*/
|
|
|
|
static lua_State *getthread (lua_State *L, int *arg) {
|
|
|
|
if (lua_isthread(L, 1)) {
|
|
|
|
*arg = 1;
|
|
|
|
return lua_tothread(L, 1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*arg = 0;
|
|
|
|
return L; /* function will operate over current thread */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Variations of 'lua_settable', used by 'db_getinfo' to put results
|
|
|
|
** from 'lua_getinfo' into result table. Key is always a string;
|
|
|
|
** value can be a string, an int, or a boolean.
|
|
|
|
*/
|
|
|
|
static void settabss (lua_State *L, const char *k, const char *v) {
|
|
|
|
lua_pushstring(L, v);
|
|
|
|
lua_setfield(L, -2, k);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void settabsi (lua_State *L, const char *k, int v) {
|
|
|
|
lua_pushinteger(L, v);
|
|
|
|
lua_setfield(L, -2, k);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void settabsb (lua_State *L, const char *k, int v) {
|
|
|
|
lua_pushboolean(L, v);
|
|
|
|
lua_setfield(L, -2, k);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** In function 'db_getinfo', the call to 'lua_getinfo' may push
|
|
|
|
** results on the stack; later it creates the result table to put
|
|
|
|
** these objects. Function 'treatstackoption' puts the result from
|
|
|
|
** 'lua_getinfo' on top of the result table so that it can call
|
|
|
|
** 'lua_setfield'.
|
|
|
|
*/
|
|
|
|
static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
|
|
|
|
if (L == L1)
|
|
|
|
lua_rotate(L, -2, 1); /* exchange object and table */
|
|
|
|
else
|
|
|
|
lua_xmove(L1, L, 1); /* move object to the "main" stack */
|
|
|
|
lua_setfield(L, -2, fname); /* put object into table */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Calls 'lua_getinfo' and collects all results in a new table.
|
|
|
|
** L1 needs stack space for an optional input (function) plus
|
|
|
|
** two optional outputs (function and line table) from function
|
|
|
|
** 'lua_getinfo'.
|
|
|
|
*/
|
|
|
|
static int db_getinfo (lua_State *L) {
|
|
|
|
lua_Debug ar;
|
|
|
|
int arg;
|
|
|
|
lua_State *L1 = getthread(L, &arg);
|
|
|
|
const char *options = luaL_optstring(L, arg+2, "flnSrtu");
|
|
|
|
checkstack(L, L1, 3);
|
|
|
|
luaL_argcheck(L, options[0] != '>', arg + 2, "invalid option '>'");
|
|
|
|
if (lua_isfunction(L, arg + 1)) { /* info about a function? */
|
|
|
|
options = lua_pushfstring(L, ">%s", options); /* add '>' to 'options' */
|
|
|
|
lua_pushvalue(L, arg + 1); /* move function to 'L1' stack */
|
|
|
|
lua_xmove(L, L1, 1);
|
|
|
|
}
|
|
|
|
else { /* stack level */
|
|
|
|
if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar)) {
|
|
|
|
luaL_pushfail(L); /* level out of range */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!lua_getinfo(L1, options, &ar))
|
|
|
|
return luaL_argerror(L, arg+2, "invalid option");
|
|
|
|
lua_newtable(L); /* table to collect results */
|
|
|
|
if (strchr(options, 'S')) {
|
|
|
|
lua_pushlstring(L, ar.source, ar.srclen);
|
|
|
|
lua_setfield(L, -2, "source");
|
|
|
|
settabss(L, "short_src", ar.short_src);
|
|
|
|
settabsi(L, "linedefined", ar.linedefined);
|
|
|
|
settabsi(L, "lastlinedefined", ar.lastlinedefined);
|
|
|
|
settabss(L, "what", ar.what);
|
|
|
|
}
|
|
|
|
if (strchr(options, 'l'))
|
|
|
|
settabsi(L, "currentline", ar.currentline);
|
|
|
|
if (strchr(options, 'u')) {
|
|
|
|
settabsi(L, "nups", ar.nups);
|
|
|
|
settabsi(L, "nparams", ar.nparams);
|
|
|
|
settabsb(L, "isvararg", ar.isvararg);
|
|
|
|
}
|
|
|
|
if (strchr(options, 'n')) {
|
|
|
|
settabss(L, "name", ar.name);
|
|
|
|
settabss(L, "namewhat", ar.namewhat);
|
|
|
|
}
|
|
|
|
if (strchr(options, 'r')) {
|
|
|
|
settabsi(L, "ftransfer", ar.ftransfer);
|
|
|
|
settabsi(L, "ntransfer", ar.ntransfer);
|
|
|
|
}
|
|
|
|
if (strchr(options, 't'))
|
|
|
|
settabsb(L, "istailcall", ar.istailcall);
|
|
|
|
if (strchr(options, 'L'))
|
|
|
|
treatstackoption(L, L1, "activelines");
|
|
|
|
if (strchr(options, 'f'))
|
|
|
|
treatstackoption(L, L1, "func");
|
|
|
|
return 1; /* return table */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_getlocal (lua_State *L) {
|
|
|
|
int arg;
|
|
|
|
lua_State *L1 = getthread(L, &arg);
|
|
|
|
int nvar = (int)luaL_checkinteger(L, arg + 2); /* local-variable index */
|
|
|
|
if (lua_isfunction(L, arg + 1)) { /* function argument? */
|
|
|
|
lua_pushvalue(L, arg + 1); /* push function */
|
|
|
|
lua_pushstring(L, lua_getlocal(L, NULL, nvar)); /* push local name */
|
|
|
|
return 1; /* return only name (there is no value) */
|
|
|
|
}
|
|
|
|
else { /* stack-level argument */
|
|
|
|
lua_Debug ar;
|
|
|
|
const char *name;
|
|
|
|
int level = (int)luaL_checkinteger(L, arg + 1);
|
2021-07-28 16:26:35 +00:00
|
|
|
if (l_unlikely(!lua_getstack(L1, level, &ar))) /* out of range? */
|
2021-03-02 13:51:10 +00:00
|
|
|
return luaL_argerror(L, arg+1, "level out of range");
|
|
|
|
checkstack(L, L1, 1);
|
|
|
|
name = lua_getlocal(L1, &ar, nvar);
|
|
|
|
if (name) {
|
|
|
|
lua_xmove(L1, L, 1); /* move local value */
|
|
|
|
lua_pushstring(L, name); /* push name */
|
|
|
|
lua_rotate(L, -2, 1); /* re-order */
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
luaL_pushfail(L); /* no name (nor value) */
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_setlocal (lua_State *L) {
|
|
|
|
int arg;
|
|
|
|
const char *name;
|
|
|
|
lua_State *L1 = getthread(L, &arg);
|
|
|
|
lua_Debug ar;
|
|
|
|
int level = (int)luaL_checkinteger(L, arg + 1);
|
|
|
|
int nvar = (int)luaL_checkinteger(L, arg + 2);
|
2021-07-28 16:26:35 +00:00
|
|
|
if (l_unlikely(!lua_getstack(L1, level, &ar))) /* out of range? */
|
2021-03-02 13:51:10 +00:00
|
|
|
return luaL_argerror(L, arg+1, "level out of range");
|
|
|
|
luaL_checkany(L, arg+3);
|
|
|
|
lua_settop(L, arg+3);
|
|
|
|
checkstack(L, L1, 1);
|
|
|
|
lua_xmove(L, L1, 1);
|
|
|
|
name = lua_setlocal(L1, &ar, nvar);
|
|
|
|
if (name == NULL)
|
|
|
|
lua_pop(L1, 1); /* pop value (if not popped by 'lua_setlocal') */
|
|
|
|
lua_pushstring(L, name);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** get (if 'get' is true) or set an upvalue from a closure
|
|
|
|
*/
|
|
|
|
static int auxupvalue (lua_State *L, int get) {
|
|
|
|
const char *name;
|
|
|
|
int n = (int)luaL_checkinteger(L, 2); /* upvalue index */
|
|
|
|
luaL_checktype(L, 1, LUA_TFUNCTION); /* closure */
|
|
|
|
name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
|
|
|
|
if (name == NULL) return 0;
|
|
|
|
lua_pushstring(L, name);
|
|
|
|
lua_insert(L, -(get+1)); /* no-op if get is false */
|
|
|
|
return get + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_getupvalue (lua_State *L) {
|
|
|
|
return auxupvalue(L, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_setupvalue (lua_State *L) {
|
|
|
|
luaL_checkany(L, 3);
|
|
|
|
return auxupvalue(L, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Check whether a given upvalue from a given closure exists and
|
|
|
|
** returns its index
|
|
|
|
*/
|
|
|
|
static void *checkupval (lua_State *L, int argf, int argnup, int *pnup) {
|
|
|
|
void *id;
|
|
|
|
int nup = (int)luaL_checkinteger(L, argnup); /* upvalue index */
|
|
|
|
luaL_checktype(L, argf, LUA_TFUNCTION); /* closure */
|
|
|
|
id = lua_upvalueid(L, argf, nup);
|
|
|
|
if (pnup) {
|
|
|
|
luaL_argcheck(L, id != NULL, argnup, "invalid upvalue index");
|
|
|
|
*pnup = nup;
|
|
|
|
}
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_upvalueid (lua_State *L) {
|
|
|
|
void *id = checkupval(L, 1, 2, NULL);
|
|
|
|
if (id != NULL)
|
|
|
|
lua_pushlightuserdata(L, id);
|
|
|
|
else
|
|
|
|
luaL_pushfail(L);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_upvaluejoin (lua_State *L) {
|
|
|
|
int n1, n2;
|
|
|
|
checkupval(L, 1, 2, &n1);
|
|
|
|
checkupval(L, 3, 4, &n2);
|
|
|
|
luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
|
|
|
|
luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
|
|
|
|
lua_upvaluejoin(L, 1, n1, 3, n2);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Call hook function registered at hook table for the current
|
|
|
|
** thread (if there is one)
|
|
|
|
*/
|
|
|
|
static void hookf (lua_State *L, lua_Debug *ar) {
|
|
|
|
static const char *const hooknames[] =
|
|
|
|
{"call", "return", "line", "count", "tail call"};
|
|
|
|
lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
|
|
|
|
lua_pushthread(L);
|
|
|
|
if (lua_rawget(L, -2) == LUA_TFUNCTION) { /* is there a hook function? */
|
|
|
|
lua_pushstring(L, hooknames[(int)ar->event]); /* push event name */
|
|
|
|
if (ar->currentline >= 0)
|
|
|
|
lua_pushinteger(L, ar->currentline); /* push current line */
|
|
|
|
else lua_pushnil(L);
|
|
|
|
lua_assert(lua_getinfo(L, "lS", ar));
|
|
|
|
lua_call(L, 2, 0); /* call hook function */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Convert a string mask (for 'sethook') into a bit mask
|
|
|
|
*/
|
|
|
|
static int makemask (const char *smask, int count) {
|
|
|
|
int mask = 0;
|
|
|
|
if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
|
|
|
|
if (strchr(smask, 'r')) mask |= LUA_MASKRET;
|
|
|
|
if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
|
|
|
|
if (count > 0) mask |= LUA_MASKCOUNT;
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Convert a bit mask (for 'gethook') into a string mask
|
|
|
|
*/
|
|
|
|
static char *unmakemask (int mask, char *smask) {
|
|
|
|
int i = 0;
|
|
|
|
if (mask & LUA_MASKCALL) smask[i++] = 'c';
|
|
|
|
if (mask & LUA_MASKRET) smask[i++] = 'r';
|
|
|
|
if (mask & LUA_MASKLINE) smask[i++] = 'l';
|
|
|
|
smask[i] = '\0';
|
|
|
|
return smask;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_sethook (lua_State *L) {
|
|
|
|
int arg, mask, count;
|
|
|
|
lua_Hook func;
|
|
|
|
lua_State *L1 = getthread(L, &arg);
|
|
|
|
if (lua_isnoneornil(L, arg+1)) { /* no hook? */
|
|
|
|
lua_settop(L, arg+1);
|
|
|
|
func = NULL; mask = 0; count = 0; /* turn off hooks */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const char *smask = luaL_checkstring(L, arg+2);
|
|
|
|
luaL_checktype(L, arg+1, LUA_TFUNCTION);
|
|
|
|
count = (int)luaL_optinteger(L, arg + 3, 0);
|
|
|
|
func = hookf; mask = makemask(smask, count);
|
|
|
|
}
|
|
|
|
if (!luaL_getsubtable(L, LUA_REGISTRYINDEX, HOOKKEY)) {
|
|
|
|
/* table just created; initialize it */
|
|
|
|
lua_pushliteral(L, "k");
|
|
|
|
lua_setfield(L, -2, "__mode"); /** hooktable.__mode = "k" */
|
|
|
|
lua_pushvalue(L, -1);
|
|
|
|
lua_setmetatable(L, -2); /* metatable(hooktable) = hooktable */
|
|
|
|
}
|
|
|
|
checkstack(L, L1, 1);
|
|
|
|
lua_pushthread(L1); lua_xmove(L1, L, 1); /* key (thread) */
|
|
|
|
lua_pushvalue(L, arg + 1); /* value (hook function) */
|
|
|
|
lua_rawset(L, -3); /* hooktable[L1] = new Lua hook */
|
|
|
|
lua_sethook(L1, func, mask, count);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_gethook (lua_State *L) {
|
|
|
|
int arg;
|
|
|
|
lua_State *L1 = getthread(L, &arg);
|
|
|
|
char buff[5];
|
|
|
|
int mask = lua_gethookmask(L1);
|
|
|
|
lua_Hook hook = lua_gethook(L1);
|
|
|
|
if (hook == NULL) { /* no hook? */
|
|
|
|
luaL_pushfail(L);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else if (hook != hookf) /* external hook? */
|
|
|
|
lua_pushliteral(L, "external hook");
|
|
|
|
else { /* hook table must exist */
|
|
|
|
lua_getfield(L, LUA_REGISTRYINDEX, HOOKKEY);
|
|
|
|
checkstack(L, L1, 1);
|
|
|
|
lua_pushthread(L1); lua_xmove(L1, L, 1);
|
|
|
|
lua_rawget(L, -2); /* 1st result = hooktable[L1] */
|
|
|
|
lua_remove(L, -2); /* remove hook table */
|
|
|
|
}
|
|
|
|
lua_pushstring(L, unmakemask(mask, buff)); /* 2nd result = mask */
|
|
|
|
lua_pushinteger(L, lua_gethookcount(L1)); /* 3rd result = count */
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_debug (lua_State *L) {
|
|
|
|
for (;;) {
|
|
|
|
char buffer[250];
|
|
|
|
lua_writestringerror("%s", "lua_debug> ");
|
|
|
|
if (fgets(buffer, sizeof(buffer), stdin) == NULL ||
|
|
|
|
strcmp(buffer, "cont\n") == 0)
|
|
|
|
return 0;
|
|
|
|
if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
|
|
|
|
lua_pcall(L, 0, 0, 0))
|
|
|
|
lua_writestringerror("%s\n", luaL_tolstring(L, -1, NULL));
|
|
|
|
lua_settop(L, 0); /* remove eventual returns */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_traceback (lua_State *L) {
|
|
|
|
int arg;
|
|
|
|
lua_State *L1 = getthread(L, &arg);
|
|
|
|
const char *msg = lua_tostring(L, arg + 1);
|
|
|
|
if (msg == NULL && !lua_isnoneornil(L, arg + 1)) /* non-string 'msg'? */
|
|
|
|
lua_pushvalue(L, arg + 1); /* return it untouched */
|
|
|
|
else {
|
|
|
|
int level = (int)luaL_optinteger(L, arg + 2, (L == L1) ? 1 : 0);
|
|
|
|
luaL_traceback(L, L1, msg, level);
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int db_setcstacklimit (lua_State *L) {
|
|
|
|
int limit = (int)luaL_checkinteger(L, 1);
|
|
|
|
int res = lua_setcstacklimit(L, limit);
|
|
|
|
lua_pushinteger(L, res);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static const luaL_Reg dblib[] = {
|
|
|
|
{"debug", db_debug},
|
|
|
|
{"getuservalue", db_getuservalue},
|
|
|
|
{"gethook", db_gethook},
|
|
|
|
{"getinfo", db_getinfo},
|
|
|
|
{"getlocal", db_getlocal},
|
|
|
|
{"getregistry", db_getregistry},
|
|
|
|
{"getmetatable", db_getmetatable},
|
|
|
|
{"getupvalue", db_getupvalue},
|
|
|
|
{"upvaluejoin", db_upvaluejoin},
|
|
|
|
{"upvalueid", db_upvalueid},
|
|
|
|
{"setuservalue", db_setuservalue},
|
|
|
|
{"sethook", db_sethook},
|
|
|
|
{"setlocal", db_setlocal},
|
|
|
|
{"setmetatable", db_setmetatable},
|
|
|
|
{"setupvalue", db_setupvalue},
|
|
|
|
{"traceback", db_traceback},
|
|
|
|
{"setcstacklimit", db_setcstacklimit},
|
|
|
|
{NULL, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
LUAMOD_API int luaopen_debug (lua_State *L) {
|
|
|
|
luaL_newlib(L, dblib);
|
|
|
|
return 1;
|
|
|
|
}
|
Bring Lua to 5.4.6. (#1214)
This essentially re-does the work of #875 on top of master.
This is what I did to check that Cosmo's Lua extensions still worked:
```
$ build/bootstrap/make MODE=aarch64 o/aarch64/third_party/lua/lua
$ ape o/aarch64/third_party/lua/lua
>: 10
10
>: 010
8
>: 0b10
2
>: string.byte("\e")
27
>: "Hello, %s" % {"world"}
Hello, world
>: "*" * 3
***
```
`luaL_traceback2` was used to show the stack trace with parameter
values; it's used in `LuaCallWithTrace`, which is used in Redbean to run
Lua code. You should be able to see the extended stack trace by running
something like this: `redbean -e "function a(b)c()end a(2)"` (with
"params" indicating the extended stack trace):
```
stack traceback:
[string "function a(b)c()end a(2)"]:1: in function 'a', params: b = 2;
[string "function a(b)c()end a(2)"]:1: in main chunk
```
@pkulchenko confirmed that I get the expected result with the updated
code.
This is what I did to check that Lua itself still worked:
```
$ cd third_party/lua/test/
$ ape ../../../o/aarch64/third_party/lua/lua all.lua
```
There's one test failure, in `files.lua`:
```
***** FILE 'files.lua'*****
testing i/o
../../../o/aarch64/third_party/lua/lua: files.lua:84: assertion failed!
stack traceback:
[C]: in function 'assert'
files.lua:84: in main chunk
(...tail calls...)
all.lua:195: in main chunk
[C]: in ?
.>>> closing state <<<
```
That isn't a result of these changes; the same test is failing in
master.
The failure is here:
```lua
if not _port then -- invalid seek
local status, msg, code = io.stdin:seek("set", 1000)
assert(not status and type(msg) == "string" and type(code) == "number")
end
```
The test expects a seek to offset 1,000 on stdin to fail — but it
doesn't. `status` ends up being the new offset rather than `nil`.
If I comment out that one test, the remaining tests succeed.
2024-06-16 00:13:08 +00:00
|
|
|
|