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.
58 lines
1.4 KiB
C
58 lines
1.4 KiB
C
#ifndef lzio_h
|
|
#define lzio_h
|
|
|
|
#include "third_party/lua/lmem.h"
|
|
#include "third_party/lua/lua.h"
|
|
|
|
|
|
#define EOZ (-1) /* end of stream */
|
|
|
|
typedef struct Zio ZIO;
|
|
|
|
#define zgetc(z) (((z)->n--)>0 ? cast_uchar(*(z)->p++) : luaZ_fill(z))
|
|
|
|
|
|
typedef struct Mbuffer {
|
|
char *buffer;
|
|
size_t n;
|
|
size_t buffsize;
|
|
} Mbuffer;
|
|
|
|
#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
|
|
|
|
#define luaZ_buffer(buff) ((buff)->buffer)
|
|
#define luaZ_sizebuffer(buff) ((buff)->buffsize)
|
|
#define luaZ_bufflen(buff) ((buff)->n)
|
|
|
|
#define luaZ_buffremove(buff,i) ((buff)->n -= (i))
|
|
#define luaZ_resetbuffer(buff) ((buff)->n = 0)
|
|
|
|
|
|
#define luaZ_resizebuffer(L, buff, size) \
|
|
((buff)->buffer = luaM_reallocvchar(L, (buff)->buffer, \
|
|
(buff)->buffsize, size), \
|
|
(buff)->buffsize = size)
|
|
|
|
#define luaZ_freebuffer(L, buff) luaZ_resizebuffer(L, buff, 0)
|
|
|
|
|
|
LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
|
|
void *data);
|
|
LUAI_FUNC size_t luaZ_read (ZIO* z, void *b, size_t n); /* read next n bytes */
|
|
|
|
|
|
|
|
/* --------- Private Part ------------------ */
|
|
|
|
struct Zio {
|
|
size_t n; /* bytes still unread */
|
|
const char *p; /* current position in buffer */
|
|
lua_Reader reader; /* reader function */
|
|
void *data; /* additional data */
|
|
lua_State *L; /* Lua state (for reader) */
|
|
};
|
|
|
|
|
|
LUAI_FUNC int luaZ_fill (ZIO *z);
|
|
|
|
#endif
|