From ed158ba6dcbab06380385a7fb83399575d044be6 Mon Sep 17 00:00:00 2001 From: Michael Lenaghan Date: Sat, 15 Jun 2024 19:21:43 -0400 Subject: [PATCH] Final tweaks. --- third_party/lua/README.cosmo | 2 +- third_party/lua/lauxlib.h | 1 + third_party/lua/lctype.h | 1 + third_party/lua/ltests.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/third_party/lua/README.cosmo b/third_party/lua/README.cosmo index cb2e3a2c3..a460911b9 100644 --- a/third_party/lua/README.cosmo +++ b/third_party/lua/README.cosmo @@ -157,4 +157,4 @@ NOTES The more things like that we do — the easier we can make it to quickly and correctly read diffs — the easier we'll make it to - keep Cosmo's Lua in sync with the latest Lua. \ No newline at end of file + keep Cosmo's Lua in sync with the latest Lua. diff --git a/third_party/lua/lauxlib.h b/third_party/lua/lauxlib.h index a220de389..c828e8f66 100644 --- a/third_party/lua/lauxlib.h +++ b/third_party/lua/lauxlib.h @@ -168,6 +168,7 @@ LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname, #if defined LUAI_ASSERT #define lua_assert(c) assert(c) #else + // [jart] #define lua_assert(c) unassert(c) #endif diff --git a/third_party/lua/lctype.h b/third_party/lua/lctype.h index af3c2e8d7..563e31475 100644 --- a/third_party/lua/lctype.h +++ b/third_party/lua/lctype.h @@ -14,6 +14,7 @@ check_exp(('A' <= (c) && (c) <= 'Z') || (c) == ((c) | ('A' ^ 'a')), \ (c) | ('A' ^ 'a')) +// [jart] #define lisdigit(C) \ ({ \ unsigned char c_ = (C); \ diff --git a/third_party/lua/ltests.c b/third_party/lua/ltests.c index 8159c3b28..8a9a66347 100644 --- a/third_party/lua/ltests.c +++ b/third_party/lua/ltests.c @@ -1259,7 +1259,7 @@ static int panicback (lua_State *L) { b = (struct Aux *)lua_touserdata(L, -1); lua_pop(L, 1); /* remove 'Aux' struct */ runC(b->L, L, b->paniccode); /* run optional panic code */ - _gclongjmp(b->jb, 1); // [jart] + gclongjmp(b->jb, 1); // [jart] return 1; /* to avoid warnings */ }