working through binaries some more

Author: leafo

Makefile

@@ -58,10 +58,26 @@ lpeg-$(LPEG_VERSION)/lptree.c:
 	curl -L -o lpeg.tar.gz https://www.inf.puc-rio.br/~roberto/lpeg/lpeg-$(LPEG_VERSION).tar.gz
 	tar -xzf lpeg.tar.gz
 
-dist/moon: lua-$(LUA_SRC_VERSION)/src/liblua.a lpeg-$(LPEG_VERSION)/lptree.c
+bin/binaries/moonscript.h: moonscript/*.lua moon/*.lua
+	bin/splat.moon -l moonscript moonscript moon > moonscript.lua
+	xxd -i moonscript.lua > $@
+	rm moonscript.lua
+
+dist/moon: lua-$(LUA_SRC_VERSION)/src/liblua.a lpeg-$(LPEG_VERSION)/lptree.c bin/binaries/moonscript.h
 	mkdir -p dist
-	gcc -static -o dist/moon -Ilua-$(LUA_SRC_VERSION)/src/ bin/binaries/moon.c lpeg-$(LPEG_VERSION)/lpvm.c lpeg-$(LPEG_VERSION)/lpcap.c lpeg-$(LPEG_VERSION)/lptree.c lpeg-$(LPEG_VERSION)/lpcode.c lpeg-$(LPEG_VERSION)/lpprint.c lua-$(LUA_SRC_VERSION)/src/liblua.a -lm -ldl
+	gcc -static -o dist/moon \
+		-Ilua-$(LUA_SRC_VERSION)/src/ \
+		-Ilpeg-$(LPEG_VERSION)/ \
+		-Ibin/binaries/ \
+		bin/binaries/moon.c \
+		bin/binaries/moonscript.c \
+		lpeg-$(LPEG_VERSION)/lpvm.c \
+		lpeg-$(LPEG_VERSION)/lpcap.c \
+		lpeg-$(LPEG_VERSION)/lptree.c \
+		lpeg-$(LPEG_VERSION)/lpcode.c \
+		lpeg-$(LPEG_VERSION)/lpprint.c \
+		lua-$(LUA_SRC_VERSION)/src/liblua.a \
+		-lm -ldl
 
 test_binary: dist/moon
-	dist/moon -h
-	dist/moon -e 'print "hello world"'
+	dist/moon

bin/binaries/moon.c

@@ -1,4 +1,31 @@
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+#include <stdio.h>
+
+// from moonscript.c
+extern int luaopen_moonscript(lua_State *l);
 
-// this does nothing until we get a build working for all deps
 int main(int argc, char **argv) {
+    lua_State *l = luaL_newstate();
+    luaL_openlibs(l);
+
+    // Load moonscript (this also loads lpeg)
+    luaopen_moonscript(l);
+    lua_pop(l, 1); // pop the return value
+
+    // Simple test: require moonscript and compile something
+    const char *test_code =
+        "local moonscript = require('moonscript')\n"
+        "local code = moonscript.to_lua('print \"hello from moonscript\"')\n"
+        "print(code)\n"
+        "loadstring(code)()\n";
+
+    if (luaL_dostring(l, test_code) != 0) {
+        fprintf(stderr, "Test failed: %s\n", lua_tostring(l, -1));
+        return 1;
+    }
+
+    lua_close(l);
+    return 0;
 }

bin/binaries/moonscript.c

@@ -0,0 +1,35 @@
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+#include <stdio.h>
+
+#include "moonscript.h"
+
+// put whatever is on top of stack into package.loaded under name if something
+// is not already there
+void setloaded(lua_State* l, const char* name) {
+	int top = lua_gettop(l);
+	lua_getglobal(l, "package");
+	lua_getfield(l, -1, "loaded");
+	lua_getfield(l, -1, name);
+	if (lua_isnil(l, -1)) {
+		lua_pop(l, 1);
+		lua_pushvalue(l, top);
+		lua_setfield(l, -2, name);
+	}
+
+	lua_settop(l, top);
+}
+
+extern int luaopen_lpeg(lua_State *l);
+
+LUALIB_API int luaopen_moonscript(lua_State *l) {
+	luaopen_lpeg(l);
+	setloaded(l, "lpeg");
+
+	if (luaL_loadbuffer(l, (const char *)moonscript_lua, moonscript_lua_len, "moonscript.lua") == 0) {
+		lua_call(l, 0, 1);
+		return 1;
+	}
+	return 0;
+}