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

Merge pull request #608 from technomancy/fennel 

Improve compilation errors and line numbering in stack traces
This commit is contained in:
Vadim Grigoruk 2018-05-28 11:16:48 +03:00 committed by GitHub
parent 239d86a741 7a40c6ec64
commit d3eee75e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/assets/fenneldemo.tic.dat
View File

@ -1 +1 @@
0x78, 0xda, 0x63, 0x5c, 0xc0, 0xc4, 0x40, 0x08, 0xfc, 0xfb, 0x0f, 0x04, 0x4a, 0x4a, 0x4a, 0xfd, 0x1d, 0x1d, 0x1d, 0xfd, 0x20, 0x1a, 0xc8, 0xed, 0xff, 0xff, 0x01, 0x8e, 0xff, 0xff, 0x7f, 0xff, 0x4e, 0x49, 0xe9, 0xff, 0xbb, 0x8e, 0x8e, 0x0f, 0xef, 0x94, 0x9a, 0x3e, 0xbc, 0xfb, 0xdf, 0xff, 0xe1, 0xff, 0x87, 0xfe, 0x0f, 0x1f, 0x60, 0x18, 0xbb, 0xfe, 0xff, 0x78, 0xf5, 0xff, 0x47, 0xd2, 0xcf, 0x30, 0x0a, 0x06, 0x14, 0x80, 0xe3, 0x0a, 0x14, 0x77, 0x60, 0xf8, 0x03, 0xcc, 0xd6, 0x07, 0xc6, 0xe3, 0x7f, 0x86, 0x0f, 0xff, 0x81, 0x71, 0xfb, 0xef, 0x7f, 0x3f, 0xc3, 0x7f, 0x60, 0xdc, 0xbd, 0xef, 0x07, 0xc6, 0x5f, 0x07, 0x14, 0x83, 0xe2, 0x93, 0xe1, 0xc3, 0xfb, 0x77, 0xff, 0xff, 0xbf, 0x7b, 0x47, 0xa9, 0x7e, 0xd6, 0x59, 0x8c, 0x0c, 0xd6, 0xd6, 0x0a, 0x25, 0x99, 0x25, 0x39, 0xa9, 0x56, 0x0a, 0x0a, 0xe9, 0x89, 0xb9, 0xa9, 0x10, 0x0e, 0x17, 0x50, 0x34, 0xb1, 0xb4, 0x24, 0x23, 0xbf, 0xc8, 0x0a, 0x22, 0x9a, 0x92, 0x5a, 0x96, 0x9a, 0x93, 0x5f, 0x90, 0x5a, 0x04, 0x92, 0x49, 0x49, 0x2d, 0x4e, 0x06, 0x2a, 0x57, 0x28, 0x06, 0xca, 0x97, 0x80, 0x79, 0x45, 0x99, 0x05, 0x25, 0x99, 0xf9, 0x79, 0x20, 0x49, 0x08, 0xc7, 0x4a, 0x21, 0x2d, 0x35, 0x2f, 0x2f, 0x35, 0x87, 0x8b, 0x4b, 0xa3, 0x2c, 0xb1, 0x48, 0xa1, 0x44, 0xc1, 0x40, 0x13, 0xc2, 0xaa, 0x50, 0xb0, 0x34, 0x83, 0x32, 0x2b, 0x15, 0x8c, 0x4c, 0x34, 0x81, 0x0a, 0xd2, 0x73, 0xf2, 0x93, 0x12, 0x73, 0x14, 0x42, 0x3c, 0x9d, 0xb9, 0x14, 0x34, 0xd2, 0xf2, 0x80, 0x2e, 0x48, 0x56, 0x88, 0x8e, 0xe5, 0x52, 0x50, 0xd0, 0x28, 0xcf, 0x48, 0xcd, 0x53, 0xd0, 0x48, 0x2a, 0xc9, 0x03, 0x6a, 0x57, 0xd0, 0x28, 0x4e, 0x2d, 0x01, 0xea, 0xd1, 0xd0, 0x05, 0x12, 0x86, 0x9a, 0x9a, 0x9a, 0xa8, 0x0a, 0x0c, 0x11, 0x0a, 0xb4, 0xb1, 0x2a, 0x30, 0x82, 0x2a, 0xa8, 0x00, 0x99, 0x50, 0x81, 0x45, 0x81, 0x31, 0x42, 0x81, 0x36, 0x92, 0x82, 0xe4, 0x9c, 0x62, 0x05, 0x43, 0x63, 0x30, 0xb3, 0xb8, 0xa0, 0x08, 0x24, 0x67, 0xa8, 0xa0, 0xa1, 0xa5, 0xa0, 0xa1, 0xaf, 0xaf, 0xa0, 0xa1, 0x0a, 0xf4, 0x98, 0x19, 0xd0, 0x69, 0xc6, 0x40, 0x6c, 0x04, 0x56, 0x0e, 0x06, 0x15, 0x20, 0x07, 0x98, 0x28, 0x18, 0x2b, 0x18, 0x00, 0xa1, 0x11, 0x50, 0x06, 0xa4, 0xb9, 0xa0, 0x28, 0x33, 0xaf, 0x44, 0x41, 0xc9, 0xc3, 0xd5, 0xc7, 0xc7, 0x5f, 0x21, 0xdc, 0x3f, 0xc8, 0xc7, 0x45, 0x51, 0x49, 0xc1, 0xc2, 0x04, 0x88, 0x20, 0x66, 0x03, 0x6d, 0x2e, 0x01, 0x99, 0x5e, 0x02, 0xb6, 0x59, 0x93, 0x8b, 0xb2, 0x94, 0xc5, 0xcc, 0xc2, 0x65, 0x00, 0x61, 0x81, 0x8a, 0x08, 0x18, 0x2d, 0x60, 0x14, 0x52, 0x36, 0x63, 0xd7, 0x9d, 0x7f, 0xef, 0xcf, 0xae, 0xee, 0x4c, 0x77, 0x55, 0x66, 0x84, 0xf1, 0x61, 0x34, 0x0f, 0x50, 0x8f, 0x08, 0x8f, 0x8c, 0x8b, 0x8a, 0x89, 0x81, 0x49, 0xae, 0x9f, 0x97, 0x5f, 0xab, 0x8f, 0x81, 0x49, 0xaa, 0xca, 0x05, 0x37, 0x8f, 0xd2, 0xc2, 0xc4, 0xc8, 0xda, 0x73, 0x97, 0x6a, 0x75, 0x5a, 0xa7, 0x2e, 0xcc, 0x5d, 0xa5, 0x73, 0x69, 0xd5, 0xcc, 0xdc, 0x43, 0xa7, 0x6e, 0x5d, 0x89, 0xbb, 0xf7, 0xee, 0x1a, 0x17, 0x00, 0x6e, 0x06, 0x4f, 0xb2,
0x78, 0xda, 0x63, 0x5c, 0xc0, 0xc4, 0x40, 0x08, 0xfc, 0xfb, 0x0f, 0x04, 0x4a, 0x4a, 0x4a, 0xfd, 0x1d, 0x1d, 0x1d, 0xfd, 0x20, 0x1a, 0xc8, 0xed, 0xff, 0xff, 0x01, 0x8e, 0xff, 0xff, 0x7f, 0xff, 0x4e, 0x49, 0xe9, 0xff, 0xbb, 0x8e, 0x8e, 0x0f, 0xef, 0x94, 0x9a, 0x3e, 0xbc, 0xfb, 0xdf, 0xff, 0xe1, 0xff, 0x87, 0xfe, 0x0f, 0x1f, 0x60, 0x18, 0xbb, 0xfe, 0xff, 0x78, 0xf5, 0xff, 0x47, 0xd2, 0xcf, 0x30, 0x0a, 0x06, 0x14, 0x80, 0xe3, 0x0a, 0x14, 0x77, 0x60, 0xf8, 0x03, 0xcc, 0xd6, 0x07, 0xc6, 0xe3, 0x7f, 0x86, 0x0f, 0xff, 0x81, 0x71, 0xfb, 0xef, 0x7f, 0x3f, 0xc3, 0x7f, 0x60, 0xdc, 0xbd, 0xef, 0x07, 0xc6, 0x5f, 0x07, 0x14, 0x83, 0xe2, 0x93, 0xe1, 0xc3, 0xfb, 0x77, 0xff, 0xff, 0xbf, 0x7b, 0x47, 0xa9, 0x7e, 0xd6, 0x59, 0x8c, 0x0c, 0xd6, 0xd6, 0x0a, 0x25, 0x99, 0x25, 0x39, 0xa9, 0x56, 0x0a, 0x0a, 0xe9, 0x89, 0xb9, 0xa9, 0x10, 0x0e, 0x17, 0x50, 0x34, 0xb1, 0xb4, 0x24, 0x23, 0xbf, 0xc8, 0x0a, 0x22, 0x9a, 0x92, 0x5a, 0x96, 0x9a, 0x93, 0x5f, 0x90, 0x5a, 0x04, 0x92, 0x49, 0x49, 0x2d, 0x4e, 0x06, 0x2a, 0x57, 0x28, 0x06, 0xca, 0x97, 0x80, 0x79, 0x45, 0x99, 0x05, 0x25, 0x99, 0xf9, 0x79, 0x20, 0x49, 0x08, 0xc7, 0x4a, 0x21, 0x2d, 0x35, 0x2f, 0x2f, 0x35, 0x87, 0x8b, 0x4b, 0xa3, 0x2c, 0xb1, 0x48, 0xa1, 0x44, 0xc1, 0x40, 0x13, 0xc2, 0xaa, 0x50, 0xb0, 0x34, 0x83, 0x32, 0x2b, 0x15, 0x8c, 0x4c, 0x34, 0x81, 0x0a, 0xd2, 0x73, 0xf2, 0x93, 0x12, 0x73, 0x14, 0x42, 0x3c, 0x9d, 0xb9, 0x14, 0x34, 0xd2, 0xf2, 0x80, 0x2e, 0x48, 0x56, 0x88, 0x8e, 0xe5, 0x52, 0x50, 0xd0, 0x28, 0xcf, 0x48, 0xcd, 0x53, 0xd0, 0x48, 0x2a, 0xc9, 0x03, 0x6a, 0x57, 0xd0, 0x28, 0x4e, 0x2d, 0x01, 0xea, 0xd1, 0xd0, 0x05, 0x12, 0x86, 0x9a, 0x9a, 0x9a, 0xa8, 0x0a, 0x0c, 0x11, 0x0a, 0xb4, 0xb1, 0x2a, 0x30, 0x82, 0x2a, 0xa8, 0x00, 0x99, 0x50, 0x81, 0x45, 0x81, 0x31, 0x42, 0x81, 0x36, 0x92, 0x82, 0xe4, 0x9c, 0x62, 0x90, 0xe3, 0x81, 0xac, 0xe2, 0x82, 0x22, 0x90, 0x94, 0xa1, 0x82, 0x86, 0x96, 0x82, 0x86, 0xbe, 0xbe, 0x82, 0x86, 0x2a, 0xd0, 0x5f, 0x66, 0x40, 0x97, 0x19, 0x03, 0xb1, 0x11, 0x58, 0x35, 0x18, 0x54, 0x80, 0xec, 0x37, 0x51, 0x30, 0x56, 0x30, 0x00, 0x42, 0x23, 0xa0, 0x0c, 0x48, 0x73, 0x41, 0x51, 0x66, 0x5e, 0x89, 0x82, 0x92, 0x87, 0xab, 0x8f, 0x8f, 0xbf, 0x42, 0xb8, 0x7f, 0x90, 0x8f, 0x8b, 0xa2, 0x92, 0x82, 0x85, 0x09, 0x10, 0x41, 0xcc, 0x06, 0x5a, 0x5c, 0x02, 0x32, 0xbd, 0x04, 0x6c, 0xb1, 0x26, 0x17, 0x65, 0x09, 0x8b, 0x99, 0x85, 0xcb, 0x00, 0xc2, 0x02, 0x95, 0x10, 0x30, 0x5a, 0xc0, 0x28, 0xa4, 0x6c, 0xc6, 0xae, 0x3b, 0xff, 0xde, 0x9f, 0x5d, 0xdd, 0x99, 0xee, 0xaa, 0xcc, 0x08, 0xe3, 0xc3, 0x68, 0x1e, 0xa0, 0x1e, 0x11, 0x1e, 0x19, 0x17, 0x15, 0x13, 0x03, 0x93, 0x5c, 0x3f, 0x2f, 0xbf, 0x56, 0x1f, 0x03, 0x93, 0x54, 0x95, 0x0b, 0x6e, 0x1e, 0xa5, 0x85, 0x89, 0x91, 0xb5, 0xe7, 0x2e, 0xd5, 0xea, 0xb4, 0x4e, 0x5d, 0x98, 0xbb, 0x4a, 0xe7, 0xd2, 0xaa, 0x99, 0xb9, 0x87, 0x4e, 0xdd, 0xba, 0x12, 0x77, 0xef, 0xdd, 0x35, 0x2e, 0x00, 0x2a, 0x6e, 0x4f, 0x7e,

BIN
demos/fenneldemo.tic
View File

Binary file not shown.

99
src/luaapi.c
View File

@ -1131,6 +1131,27 @@ static s32 lua_loadfile(lua_State *lua)
return 0;
}
static void lua_open_builtins(lua_State *lua)
{
static const luaL_Reg loadedlibs[] =
{
{ "_G", luaopen_base },
{ LUA_LOADLIBNAME, luaopen_package },
{ LUA_COLIBNAME, luaopen_coroutine },
{ LUA_TABLIBNAME, luaopen_table },
{ LUA_STRLIBNAME, luaopen_string },
{ LUA_MATHLIBNAME, luaopen_math },
{ LUA_DBLIBNAME, luaopen_debug },
{ NULL, NULL }
};
for (const luaL_Reg *lib = loadedlibs; lib->func; lib++)
{
luaL_requiref(lua, lib->name, lib->func, 1);
lua_pop(lua, 1);
}
}
static const char* const ApiKeywords[] = API_KEYWORDS;
static const lua_CFunction ApiFunc[] =
{
@ -1187,23 +1208,7 @@ static bool initLua(tic_mem* tic, const char* code)
closeLua(tic);
lua_State* lua = machine->lua = luaL_newstate();
static const luaL_Reg loadedlibs[] =
{
{ "_G", luaopen_base },
{ LUA_COLIBNAME, luaopen_coroutine },
{ LUA_TABLIBNAME, luaopen_table },
{ LUA_STRLIBNAME, luaopen_string },
{ LUA_MATHLIBNAME, luaopen_math },
{ LUA_DBLIBNAME, luaopen_debug },
{ NULL, NULL }
};
for (const luaL_Reg *lib = loadedlibs; lib->func; lib++)
{
luaL_requiref(lua, lib->name, lib->func, 1);
lua_pop(lua, 1);
}
lua_open_builtins(lua);
initAPI(machine);
@ -1462,24 +1467,7 @@ static bool initMoonscript(tic_mem* tic, const char* code)
closeLua(tic);
lua_State* lua = machine->lua = luaL_newstate();
static const luaL_Reg loadedlibs[] =
{
{ "_G", luaopen_base },
{ LUA_LOADLIBNAME, luaopen_package },
{ LUA_COLIBNAME, luaopen_coroutine },
{ LUA_TABLIBNAME, luaopen_table },
{ LUA_STRLIBNAME, luaopen_string },
{ LUA_MATHLIBNAME, luaopen_math },
{ LUA_DBLIBNAME, luaopen_debug },
{ NULL, NULL }
};
for (const luaL_Reg *lib = loadedlibs; lib->func; lib++)
{
luaL_requiref(lua, lib->name, lib->func, 1);
lua_pop(lua, 1);
}
lua_open_builtins(lua);
luaopen_lpeg(lua);
setloaded(lua, "lpeg");
@ -1620,10 +1608,8 @@ const tic_script_config* getMoonScriptConfig()
#define FENNEL_CODE(...) #__VA_ARGS__
static const char* execute_fennel_src = FENNEL_CODE(
local ok, val = pcall(require('fennel').eval, ...)
-- allow you to return a function instead of setting TIC global
if(not TIC and type(val) == "function") then TIC = val end
return val
local ok, msg = pcall(require('fennel').eval, ..., {filename="game", correlate=true})
if(not ok) then return msg end
);
static bool initFennel(tic_mem* tic, const char* code)
@ -1632,24 +1618,7 @@ static bool initFennel(tic_mem* tic, const char* code)
closeLua(tic);
lua_State* lua = machine->lua = luaL_newstate();
static const luaL_Reg loadedlibs[] =
{
{ "_G", luaopen_base },
{ LUA_LOADLIBNAME, luaopen_package },
{ LUA_COLIBNAME, luaopen_coroutine },
{ LUA_TABLIBNAME, luaopen_table },
{ LUA_STRLIBNAME, luaopen_string },
{ LUA_MATHLIBNAME, luaopen_math },
{ LUA_DBLIBNAME, luaopen_debug },
{ NULL, NULL }
};
for (const luaL_Reg *lib = loadedlibs; lib->func; lib++)
{
luaL_requiref(lua, lib->name, lib->func, 1);
lua_pop(lua, 1);
}
lua_open_builtins(lua);
initAPI(machine);
@ -1660,7 +1629,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)
{
machine->data->error(machine->data->data, "failed to load fennel.lua");
machine->data->error(machine->data->data, "failed to load fennel compiler");
return false;
}
@ -1673,15 +1642,13 @@ static bool initFennel(tic_mem* tic, const char* code)
}
lua_pushstring(fennel, code);
if (lua_pcall(fennel, 1, 1, 0) != LUA_OK)
{
const char* msg = lua_tostring(fennel, -1);
lua_call(fennel, 1, 1);
const char* err = lua_tostring(fennel, -1);
if (msg)
{
machine->data->error(machine->data->data, msg);
return false;
}
if (err)
{
machine->data->error(machine->data->data, err);
return false;
}
}