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.
71 lines
2.5 KiB
C
71 lines
2.5 KiB
C
#ifndef ltm_h
|
|
#define ltm_h
|
|
|
|
#include "third_party/lua/lobject.h"
|
|
#include "third_party/lua/lstate.h"
|
|
#include "third_party/lua/luaconf.h"
|
|
#include "third_party/lua/tms.h"
|
|
|
|
|
|
/*
|
|
* WARNING: if you change the order of this enumeration,
|
|
* grep "ORDER TM" and "ORDER OP"
|
|
*/
|
|
// [jart] moved to tms.h
|
|
|
|
/*
|
|
** Mask with 1 in all fast-access methods. A 1 in any of these bits
|
|
** in the flag of a (meta)table means the metatable does not have the
|
|
** corresponding metamethod field. (Bit 7 of the flag is used for
|
|
** 'isrealasize'.)
|
|
*/
|
|
#define maskflags (~(~0u << (TM_EQ + 1)))
|
|
|
|
|
|
/*
|
|
** Test whether there is no tagmethod.
|
|
** (Because tagmethods use raw accesses, the result may be an "empty" nil.)
|
|
*/
|
|
#define notm(tm) ttisnil(tm)
|
|
|
|
|
|
#define gfasttm(g,et,e) ((et) == NULL ? NULL : \
|
|
((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
|
|
|
|
#define fasttm(l,et,e) gfasttm(G(l), et, e)
|
|
|
|
#define ttypename(x) luaT_typenames_[(x) + 1]
|
|
|
|
LUAI_DDEC(const char *const luaT_typenames_[LUA_TOTALTYPES];)
|
|
|
|
|
|
LUAI_FUNC const char *luaT_objtypename (lua_State *L, const TValue *o);
|
|
|
|
LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
|
|
LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
|
|
TMS event);
|
|
LUAI_FUNC void luaT_init (lua_State *L);
|
|
|
|
LUAI_FUNC void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
|
|
const TValue *p2, const TValue *p3);
|
|
LUAI_FUNC void luaT_callTMres (lua_State *L, const TValue *f,
|
|
const TValue *p1, const TValue *p2, StkId p3);
|
|
LUAI_FUNC void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
|
|
StkId res, TMS event);
|
|
LUAI_FUNC void luaT_tryconcatTM (lua_State *L);
|
|
LUAI_FUNC void luaT_trybinassocTM (lua_State *L, const TValue *p1,
|
|
const TValue *p2, int inv, StkId res, TMS event);
|
|
LUAI_FUNC void luaT_trybiniTM (lua_State *L, const TValue *p1, lua_Integer i2,
|
|
int inv, StkId res, TMS event);
|
|
LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
|
|
const TValue *p2, TMS event);
|
|
LUAI_FUNC int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
|
|
int inv, int isfloat, TMS event);
|
|
|
|
LUAI_FUNC void luaT_adjustvarargs (lua_State *L, int nfixparams,
|
|
CallInfo *ci, const Proto *p);
|
|
LUAI_FUNC void luaT_getvarargs (lua_State *L, CallInfo *ci,
|
|
StkId where, int wanted);
|
|
|
|
|
|
#endif
|