mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-01-31 03:27:39 +00:00
0dbf01bf1d
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.
57 lines
1.6 KiB
C
57 lines
1.6 KiB
C
#ifndef lfunc_h
|
|
#define lfunc_h
|
|
|
|
#include "third_party/lua/lobject.h"
|
|
|
|
|
|
#define sizeCclosure(n) (cast_int(offsetof(CClosure, upvalue)) + \
|
|
cast_int(sizeof(TValue)) * (n))
|
|
|
|
#define sizeLclosure(n) (cast_int(offsetof(LClosure, upvals)) + \
|
|
cast_int(sizeof(TValue *)) * (n))
|
|
|
|
|
|
/* test whether thread is in 'twups' list */
|
|
#define isintwups(L) (L->twups != L)
|
|
|
|
|
|
/*
|
|
** maximum number of upvalues in a closure (both C and Lua). (Value
|
|
** must fit in a VM register.)
|
|
*/
|
|
#define MAXUPVAL 255
|
|
|
|
|
|
#define upisopen(up) ((up)->v.p != &(up)->u.value)
|
|
|
|
|
|
#define uplevel(up) check_exp(upisopen(up), cast(StkId, (up)->v.p))
|
|
|
|
|
|
/*
|
|
** maximum number of misses before giving up the cache of closures
|
|
** in prototypes
|
|
*/
|
|
#define MAXMISS 10
|
|
|
|
|
|
|
|
/* special status to close upvalues preserving the top of the stack */
|
|
#define CLOSEKTOP (-1)
|
|
|
|
|
|
LUAI_FUNC Proto *luaF_newproto (lua_State *L);
|
|
LUAI_FUNC CClosure *luaF_newCclosure (lua_State *L, int nupvals);
|
|
LUAI_FUNC LClosure *luaF_newLclosure (lua_State *L, int nupvals);
|
|
LUAI_FUNC void luaF_initupvals (lua_State *L, LClosure *cl);
|
|
LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
|
|
LUAI_FUNC void luaF_newtbcupval (lua_State *L, StkId level);
|
|
LUAI_FUNC void luaF_closeupval (lua_State *L, StkId level);
|
|
LUAI_FUNC StkId luaF_close (lua_State *L, StkId level, int status, int yy);
|
|
LUAI_FUNC void luaF_unlinkupval (UpVal *uv);
|
|
LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
|
|
LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
|
|
int pc);
|
|
|
|
|
|
#endif
|