diff --git a/Makefile b/Makefile index 7fd6936f9..541b0169a 100644 --- a/Makefile +++ b/Makefile @@ -135,10 +135,10 @@ include third_party/regex/regex.mk include third_party/third_party.mk include libc/testlib/testlib.mk include tool/viz/lib/vizlib.mk +include third_party/lua/lua.mk include examples/examples.mk include third_party/lz4cli/lz4cli.mk include tool/build/lib/buildlib.mk -include third_party/lua/lua.mk include third_party/chibicc/chibicc.mk include third_party/chibicc/test/test.mk include tool/build/emucrt/emucrt.mk diff --git a/examples/examples.mk b/examples/examples.mk index db0a5b502..ef6080ef1 100644 --- a/examples/examples.mk +++ b/examples/examples.mk @@ -69,6 +69,7 @@ EXAMPLES_DIRECTDEPS = \ THIRD_PARTY_DLMALLOC \ THIRD_PARTY_GDTOA \ THIRD_PARTY_GETOPT \ + THIRD_PARTY_LUA \ THIRD_PARTY_MUSL \ THIRD_PARTY_STB \ THIRD_PARTY_XED \ @@ -94,10 +95,10 @@ o/$(MODE)/examples/%.com.dbg: \ $(APE) @$(APELINK) -o/$(MODE)/examples/hellojs.com.dbg: \ +o/$(MODE)/examples/hellolua.com.dbg: \ $(EXAMPLES_DEPS) \ - o/$(MODE)/examples/hellojs.o \ - o/$(MODE)/examples/hello.js.zip.o \ + o/$(MODE)/examples/hellolua.o \ + o/$(MODE)/examples/hellolua.lua.zip.o \ o/$(MODE)/examples/examples.pkg \ $(CRT) \ $(APE) diff --git a/examples/hellolua.c b/examples/hellolua.c new file mode 100644 index 000000000..2d8be5dac --- /dev/null +++ b/examples/hellolua.c @@ -0,0 +1,30 @@ +#if 0 +/*─────────────────────────────────────────────────────────────────╗ +│ To the extent possible under law, Justine Tunney has waived │ +│ all copyright and related or neighboring rights to this file, │ +│ as it is written in the following disclaimers: │ +│ • http://unlicense.org/ │ +│ • http://creativecommons.org/publicdomain/zero/1.0/ │ +╚─────────────────────────────────────────────────────────────────*/ +#endif +#include "third_party/lua/lauxlib.h" +#include "third_party/lua/lualib.h" + +int NativeAdd(lua_State *L) { + lua_Number x, y; + x = luaL_checknumber(L, 1); + y = luaL_checknumber(L, 2); + lua_pushnumber(L, x + y); + return 1; /* number of results */ +} + +int main(int argc, char *argv[]) { + lua_State *L; + L = luaL_newstate(); + luaL_openlibs(L); + lua_pushcfunction(L, NativeAdd); + lua_setglobal(L, "NativeAdd"); + luaL_dofile(L, "zip:examples/hellolua.lua"); + lua_close(L); + return 0; +} diff --git a/examples/hellolua.lua b/examples/hellolua.lua new file mode 100644 index 000000000..38e9406e8 --- /dev/null +++ b/examples/hellolua.lua @@ -0,0 +1 @@ +print(string.format("2 + 3 = %g", NativeAdd(2, 3))) diff --git a/libc/integral/c.inc b/libc/integral/c.inc index 44c45e263..3ecf974aa 100644 --- a/libc/integral/c.inc +++ b/libc/integral/c.inc @@ -664,6 +664,7 @@ typedef uint64_t uintmax_t; #pragma GCC diagnostic ignored "-Wparentheses" /* annoying tidy */ #pragma GCC diagnostic ignored "-Wdangling-else" /* come on tidy */ #pragma GCC diagnostic ignored "-Wformat-security" /* come on tidy */ +#pragma GCC diagnostic ignored "-Wunused-value" /* breaks macros */ #ifndef __cplusplus #pragma GCC diagnostic ignored "-Wimplicit-int" #endif /* C++ */ diff --git a/third_party/lua/lua.mk b/third_party/lua/lua.mk index 191262e64..04418471b 100644 --- a/third_party/lua/lua.mk +++ b/third_party/lua/lua.mk @@ -7,6 +7,8 @@ THIRD_PARTY_LUA_FILES := $(wildcard third_party/lua/*) THIRD_PARTY_LUA_SRCS = $(filter %.c,$(THIRD_PARTY_LUA_FILES)) THIRD_PARTY_LUA_HDRS = $(filter %.h,$(THIRD_PARTY_LUA_FILES)) THIRD_PARTY_LUA_BINS = $(THIRD_PARTY_LUA_COMS) $(THIRD_PARTY_LUA_COMS:%=%.dbg) +THIRD_PARTY_LUA = $(THIRD_PARTY_LUA_DEPS) $(THIRD_PARTY_LUA_A) +THIRD_PARTY_LUA_A = o/$(MODE)/third_party/lua/lua.a THIRD_PARTY_LUA_OBJS = \ $(THIRD_PARTY_LUA_SRCS:%.c=o/$(MODE)/%.o) @@ -36,14 +38,20 @@ THIRD_PARTY_LUA_DIRECTDEPS = \ THIRD_PARTY_LUA_DEPS := \ $(call uniq,$(foreach x,$(THIRD_PARTY_LUA_DIRECTDEPS),$($(x)))) -o/$(MODE)/third_party/lua/lua.pkg: \ +$(THIRD_PARTY_LUA_A): \ + third_party/lua/ \ + $(THIRD_PARTY_LUA_A).pkg \ + $(filter-out %/lua.c,$(THIRD_PARTY_LUA_OBJS)) + +$(THIRD_PARTY_LUA_A).pkg: \ $(THIRD_PARTY_LUA_OBJS) \ $(foreach x,$(THIRD_PARTY_LUA_DIRECTDEPS),$($(x)_A).pkg) -o/$(MODE)/third_party/lua/%.com.dbg: \ +o/$(MODE)/third_party/lua/lua.com.dbg: \ $(THIRD_PARTY_LUA_DEPS) \ - $(THIRD_PARTY_LUA_OBJS) \ - o/$(MODE)/third_party/lua/lua.pkg \ + $(THIRD_PARTY_LUA_A) \ + $(THIRD_PARTY_LUA_A).pkg \ + o/$(MODE)/third_party/lua/lua.o \ $(CRT) \ $(APE) -@$(APELINK) diff --git a/third_party/lua/luaconf.h b/third_party/lua/luaconf.h index 13b8569e9..f5578c07b 100644 --- a/third_party/lua/luaconf.h +++ b/third_party/lua/luaconf.h @@ -309,7 +309,7 @@ */ #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ defined(__ELF__) /* { */ -#define LUAI_FUNC __attribute__((visibility("internal"))) extern +#define LUAI_FUNC /* __attribute__((visibility("internal"))) */ extern #else /* }{ */ #define LUAI_FUNC extern #endif /* } */