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.
134 lines
4.4 KiB
C
134 lines
4.4 KiB
C
#ifndef lvm_h
|
|
#define lvm_h
|
|
|
|
#include "third_party/lua/ldo.h"
|
|
#include "third_party/lua/lobject.h"
|
|
#include "third_party/lua/ltm.h"
|
|
|
|
|
|
#if !defined(LUA_NOCVTN2S)
|
|
#define cvt2str(o) ttisnumber(o)
|
|
#else
|
|
#define cvt2str(o) 0 /* no conversion from numbers to strings */
|
|
#endif
|
|
|
|
|
|
#if !defined(LUA_NOCVTS2N)
|
|
#define cvt2num(o) ttisstring(o)
|
|
#else
|
|
#define cvt2num(o) 0 /* no conversion from strings to numbers */
|
|
#endif
|
|
|
|
|
|
/*
|
|
** You can define LUA_FLOORN2I if you want to convert floats to integers
|
|
** by flooring them (instead of raising an error if they are not
|
|
** integral values)
|
|
*/
|
|
#if !defined(LUA_FLOORN2I)
|
|
#define LUA_FLOORN2I F2Ieq
|
|
#endif
|
|
|
|
|
|
/*
|
|
** Rounding modes for float->integer coercion
|
|
*/
|
|
typedef enum {
|
|
F2Ieq, /* no rounding; accepts only integral values */
|
|
F2Ifloor, /* takes the floor of the number */
|
|
F2Iceil /* takes the ceil of the number */
|
|
} F2Imod;
|
|
|
|
|
|
/* convert an object to a float (including string coercion) */
|
|
#define tonumber(o,n) \
|
|
(ttisfloat(o) ? (*(n) = fltvalue(o), 1) : luaV_tonumber_(o,n))
|
|
|
|
|
|
/* convert an object to a float (without string coercion) */
|
|
#define tonumberns(o,n) \
|
|
(ttisfloat(o) ? ((n) = fltvalue(o), 1) : \
|
|
(ttisinteger(o) ? ((n) = cast_num(ivalue(o)), 1) : 0))
|
|
|
|
|
|
/* convert an object to an integer (including string coercion) */
|
|
#define tointeger(o,i) \
|
|
(l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
|
|
: luaV_tointeger(o,i,LUA_FLOORN2I))
|
|
|
|
|
|
/* convert an object to an integer (without string coercion) */
|
|
#define tointegerns(o,i) \
|
|
(l_likely(ttisinteger(o)) ? (*(i) = ivalue(o), 1) \
|
|
: luaV_tointegerns(o,i,LUA_FLOORN2I))
|
|
|
|
|
|
#define intop(op,v1,v2) l_castU2S(l_castS2U(v1) op l_castS2U(v2))
|
|
|
|
#define luaV_rawequalobj(t1,t2) luaV_equalobj(NULL,t1,t2)
|
|
|
|
|
|
/*
|
|
** fast track for 'gettable': if 't' is a table and 't[k]' is present,
|
|
** return 1 with 'slot' pointing to 't[k]' (position of final result).
|
|
** Otherwise, return 0 (meaning it will have to check metamethod)
|
|
** with 'slot' pointing to an empty 't[k]' (if 't' is a table) or NULL
|
|
** (otherwise). 'f' is the raw get function to use.
|
|
*/
|
|
#define luaV_fastget(L,t,k,slot,f) \
|
|
(!ttistable(t) \
|
|
? (slot = NULL, 0) /* not a table; 'slot' is NULL and result is 0 */ \
|
|
: (slot = f(hvalue(t), k), /* else, do raw access */ \
|
|
!isempty(slot))) /* result not empty? */
|
|
|
|
|
|
/*
|
|
** Special case of 'luaV_fastget' for integers, inlining the fast case
|
|
** of 'luaH_getint'.
|
|
*/
|
|
#define luaV_fastgeti(L,t,k,slot) \
|
|
(!ttistable(t) \
|
|
? (slot = NULL, 0) /* not a table; 'slot' is NULL and result is 0 */ \
|
|
: (slot = (l_castS2U(k) - 1u < hvalue(t)->alimit) \
|
|
? &hvalue(t)->array[k - 1] : luaH_getint(hvalue(t), k), \
|
|
!isempty(slot))) /* result not empty? */
|
|
|
|
|
|
/*
|
|
** Finish a fast set operation (when fast get succeeds). In that case,
|
|
** 'slot' points to the place to put the value.
|
|
*/
|
|
#define luaV_finishfastset(L,t,slot,v) \
|
|
{ setobj2t(L, cast(TValue *,slot), v); \
|
|
luaC_barrierback(L, gcvalue(t), v); }
|
|
|
|
|
|
/*
|
|
** Shift right is the same as shift left with a negative 'y'
|
|
*/
|
|
#define luaV_shiftr(x,y) luaV_shiftl(x,intop(-, 0, y))
|
|
|
|
|
|
|
|
LUAI_FUNC int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2);
|
|
LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
|
|
LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
|
|
LUAI_FUNC int luaV_tonumber_ (const TValue *obj, lua_Number *n);
|
|
LUAI_FUNC int luaV_tointeger (const TValue *obj, lua_Integer *p, F2Imod mode);
|
|
LUAI_FUNC int luaV_tointegerns (const TValue *obj, lua_Integer *p,
|
|
F2Imod mode);
|
|
LUAI_FUNC int luaV_flttointeger (lua_Number n, lua_Integer *p, F2Imod mode);
|
|
LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
|
|
StkId val, const TValue *slot);
|
|
LUAI_FUNC void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
|
|
TValue *val, const TValue *slot);
|
|
LUAI_FUNC void luaV_finishOp (lua_State *L);
|
|
LUAI_FUNC void luaV_execute (lua_State *L, CallInfo *ci);
|
|
LUAI_FUNC void luaV_concat (lua_State *L, int total);
|
|
LUAI_FUNC lua_Integer luaV_idiv (lua_State *L, lua_Integer x, lua_Integer y);
|
|
LUAI_FUNC lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y);
|
|
LUAI_FUNC lua_Number luaV_modf (lua_State *L, lua_Number x, lua_Number y);
|
|
LUAI_FUNC lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y);
|
|
LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb);
|
|
|
|
#endif
|