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.
45 lines
1.3 KiB
C
45 lines
1.3 KiB
C
#ifndef lapi_h
|
|
#define lapi_h
|
|
|
|
#include "third_party/lua/llimits.h"
|
|
#include "third_party/lua/lstate.h"
|
|
|
|
|
|
/* Increments 'L->top.p', checking for stack overflows */
|
|
#define api_incr_top(L) {L->top.p++; \
|
|
api_check(L, L->top.p <= L->ci->top.p, \
|
|
"stack overflow");}
|
|
|
|
|
|
/*
|
|
** If a call returns too many multiple returns, the callee may not have
|
|
** stack space to accommodate all results. In this case, this macro
|
|
** increases its stack space ('L->ci->top.p').
|
|
*/
|
|
#define adjustresults(L,nres) \
|
|
{ if ((nres) <= LUA_MULTRET && L->ci->top.p < L->top.p) \
|
|
L->ci->top.p = L->top.p; }
|
|
|
|
|
|
/* Ensure the stack has at least 'n' elements */
|
|
#define api_checknelems(L,n) \
|
|
api_check(L, (n) < (L->top.p - L->ci->func.p), \
|
|
"not enough elements in the stack")
|
|
|
|
|
|
/*
|
|
** To reduce the overhead of returning from C functions, the presence of
|
|
** to-be-closed variables in these functions is coded in the CallInfo's
|
|
** field 'nresults', in a way that functions with no to-be-closed variables
|
|
** with zero, one, or "all" wanted results have no overhead. Functions
|
|
** with other number of wanted results, as well as functions with
|
|
** variables to be closed, have an extra check.
|
|
*/
|
|
|
|
#define hastocloseCfunc(n) ((n) < LUA_MULTRET)
|
|
|
|
/* Map [-1, inf) (range of 'nresults') into (-inf, -2] */
|
|
#define codeNresults(n) (-(n) - 3)
|
|
#define decodeNresults(n) (-(n) - 3)
|
|
|
|
#endif
|