2021-03-02 05:51:10 -08:00
|
|
|
#ifndef lundump_h
|
|
|
|
#define lundump_h
|
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-15 20:13:08 -04:00
|
|
|
|
2021-03-07 13:26:57 -08:00
|
|
|
#include "third_party/lua/llimits.h"
|
|
|
|
#include "third_party/lua/lobject.h"
|
|
|
|
#include "third_party/lua/lzio.h"
|
2021-03-02 05:51:10 -08:00
|
|
|
|
|
|
|
|
|
|
|
/* data to catch conversion errors */
|
|
|
|
#define LUAC_DATA "\x19\x93\r\n\x1a\n"
|
|
|
|
|
|
|
|
#define LUAC_INT 0x5678
|
|
|
|
#define LUAC_NUM cast_num(370.5)
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Encode major-minor version in one byte, one nibble for each
|
|
|
|
*/
|
|
|
|
#define MYINT(s) (s[0]-'0') /* assume one-digit numerals */
|
|
|
|
#define LUAC_VERSION (MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR))
|
|
|
|
|
|
|
|
#define LUAC_FORMAT 0 /* this is the official format */
|
|
|
|
|
|
|
|
/* load one chunk; from lundump.c */
|
|
|
|
LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name);
|
|
|
|
|
|
|
|
/* dump one chunk; from ldump.c */
|
|
|
|
LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w,
|
|
|
|
void* data, int strip);
|
|
|
|
|
|
|
|
#endif
|