mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-01-31 11:37:35 +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.
86 lines
3.9 KiB
C
86 lines
3.9 KiB
C
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
|
│ vi: set et ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi │
|
|
╚──────────────────────────────────────────────────────────────────────────────╝
|
|
│ │
|
|
│ Lua │
|
|
│ Copyright © 2004-2023 Lua.org, PUC-Rio. │
|
|
│ │
|
|
│ Permission is hereby granted, free of charge, to any person obtaining │
|
|
│ a copy of this software and associated documentation files (the │
|
|
│ "Software"), to deal in the Software without restriction, including │
|
|
│ without limitation the rights to use, copy, modify, merge, publish, │
|
|
│ distribute, sublicense, and/or sell copies of the Software, and to │
|
|
│ permit persons to whom the Software is furnished to do so, subject to │
|
|
│ the following conditions: │
|
|
│ │
|
|
│ The above copyright notice and this permission notice shall be │
|
|
│ included in all copies or substantial portions of the Software. │
|
|
│ │
|
|
│ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, │
|
|
│ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF │
|
|
│ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. │
|
|
│ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY │
|
|
│ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, │
|
|
│ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE │
|
|
│ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. │
|
|
│ │
|
|
╚─────────────────────────────────────────────────────────────────────────────*/
|
|
#define lzio_c
|
|
#define LUA_CORE
|
|
|
|
#include "libc/str/str.h"
|
|
#include "third_party/lua/llimits.h"
|
|
#include "third_party/lua/lmem.h"
|
|
#include "third_party/lua/lprefix.h"
|
|
#include "third_party/lua/lstate.h"
|
|
#include "third_party/lua/lua.h"
|
|
#include "third_party/lua/lzio.h"
|
|
__static_yoink("lua_notice");
|
|
|
|
|
|
int luaZ_fill (ZIO *z) {
|
|
size_t size;
|
|
lua_State *L = z->L;
|
|
const char *buff;
|
|
lua_unlock(L);
|
|
buff = z->reader(L, z->data, &size);
|
|
lua_lock(L);
|
|
if (buff == NULL || size == 0)
|
|
return EOZ;
|
|
z->n = size - 1; /* discount char being returned */
|
|
z->p = buff;
|
|
return cast_uchar(*(z->p++));
|
|
}
|
|
|
|
|
|
void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
|
|
z->L = L;
|
|
z->reader = reader;
|
|
z->data = data;
|
|
z->n = 0;
|
|
z->p = NULL;
|
|
}
|
|
|
|
|
|
/* --------------------------------------------------------------- read --- */
|
|
size_t luaZ_read (ZIO *z, void *b, size_t n) {
|
|
while (n) {
|
|
size_t m;
|
|
if (z->n == 0) { /* no bytes in buffer? */
|
|
if (luaZ_fill(z) == EOZ) /* try to read more */
|
|
return n; /* no more input; return number of missing bytes */
|
|
else {
|
|
z->n++; /* luaZ_fill consumed first byte; put it back */
|
|
z->p--;
|
|
}
|
|
}
|
|
m = (n <= z->n) ? n : z->n; /* min. between n and z->n */
|
|
memcpy(b, z->p, m);
|
|
z->n -= m;
|
|
z->p += m;
|
|
b = (char *)b + m;
|
|
n -= m;
|
|
}
|
|
return 0;
|
|
}
|
|
|