dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull in new Fennel compiler; tell it to correlate line numbers.

This commit is contained in:
Phil Hagelberg 2018-05-25 20:09:49 -07:00
parent bd3d9cfbd7
commit bae4cfb2ef
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rd-party

@ -1 +1 @@
Subproject commit 18298814404110bad0aba611bcc901fe6c59a085 Subproject commit fa4a9f2ae3d53f3fc5145923e3924e2d53989e5c

22
src/luaapi.c
View File

@ -1620,10 +1620,8 @@ const tic_script_config* getMoonScriptConfig()
#define FENNEL_CODE(...) #__VA_ARGS__ #define FENNEL_CODE(...) #__VA_ARGS__
static const char* execute_fennel_src = FENNEL_CODE( static const char* execute_fennel_src = FENNEL_CODE(
local ok, val = pcall(require('fennel').eval, ...) local ok, msg = pcall(require('fennel').eval, ..., {filename="game", correlate=true})
-- allow you to return a function instead of setting TIC global if(not ok) then return msg end
if(not TIC and type(val) == "function") then TIC = val end
return val
); );
static bool initFennel(tic_mem* tic, const char* code) static bool initFennel(tic_mem* tic, const char* code)
@ -1660,7 +1658,7 @@ static bool initFennel(tic_mem* tic, const char* code)
if (luaL_loadbuffer(fennel, (const char *)fennel_lua, fennel_lua_len, "fennel.lua") != LUA_OK) if (luaL_loadbuffer(fennel, (const char *)fennel_lua, fennel_lua_len, "fennel.lua") != LUA_OK)
{ {
machine->data->error(machine->data->data, "failed to load fennel.lua"); machine->data->error(machine->data->data, "failed to load fennel compiler");
return false; return false;
} }
@ -1673,15 +1671,13 @@ static bool initFennel(tic_mem* tic, const char* code)
} }
lua_pushstring(fennel, code); lua_pushstring(fennel, code);
if (lua_pcall(fennel, 1, 1, 0) != LUA_OK) lua_call(fennel, 1, 1);
{ const char* err = lua_tostring(fennel, -1);
const char* msg = lua_tostring(fennel, -1);
if (msg) if (err)
{ {
machine->data->error(machine->data->data, msg); machine->data->error(machine->data->data, err);
return false; return false;
}
} }
} }