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

Add Fennel as an option for creating games.

Browse Source
This commit is contained in:
Phil Hagelberg
2018-05-15 20:33:57 -07:00
parent 7606c2dcc4
commit bd3d9cfbd7
9 changed files with 231 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/console.c
View File

@@ -56,6 +56,10 @@ typedef enum
MoonScript,
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
Fennel,
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
#if defined(TIC_BUILD_WITH_JS)
@@ -97,6 +101,10 @@ static const char DefaultLuaTicPath[] = TIC_LOCAL "default.tic";
static const char DefaultMoonTicPath[] = TIC_LOCAL "default_moon.tic";
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
static const char DefaultFennelTicPath[] = TIC_LOCAL "default_fennel.tic";
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
#if defined(TIC_BUILD_WITH_JS)
@@ -470,6 +478,10 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size)
case MoonScript: strcpy(path, DefaultMoonTicPath); break;
# endif
# if defined(TIC_BUILD_WITH_MOON)
case Fennel: strcpy(path, DefaultFennelTicPath); break;
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
#if defined(TIC_BUILD_WITH_JS)
@@ -519,6 +531,20 @@ static void* getDemoCart(Console* console, ScriptLang script, s32* size)
break;
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
case Fennel:
{
static const u8 FennelDemoRom[] =
{
#include "../bin/assets/fenneldemo.tic.dat"
};
demo = FennelDemoRom;
romSize = sizeof FennelDemoRom;
}
break;
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
@@ -584,6 +610,11 @@ static void onConsoleLoadDemoCommandConfirmed(Console* console, const char* para
data = getDemoCart(console, MoonScript, &size);
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
if(strcmp(param, DefaultFennelTicPath) == 0)
data = getDemoCart(console, Fennel, &size);
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
#if defined(TIC_BUILD_WITH_JS)
@@ -1166,6 +1197,14 @@ static void onConsoleNewCommandConfirmed(Console* console, const char* param)
}
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
if(strcmp(param, "fennel") == 0)
{
loadDemo(console, Fennel);
done = true;
}
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
#if defined(TIC_BUILD_WITH_JS)
@@ -1460,6 +1499,13 @@ static void onConsoleConfigCommand(Console* console, const char* param)
}
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
else if(strcmp(param, "default fennel") == 0)
{
onConsoleLoadDemoCommand(console, DefaultFennelTicPath);
}
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
#if defined(TIC_BUILD_WITH_JS)

163
src/luaapi.c
View File

@@ -1613,4 +1613,167 @@ const tic_script_config* getMoonScriptConfig()
#endif /* defined(TIC_BUILD_WITH_MOON) */
#if defined(TIC_BUILD_WITH_FENNEL)
#include "fennel.h"
#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
);
static bool initFennel(tic_mem* tic, const char* code)
{
tic_machine* machine = (tic_machine*)tic;
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);
}
initAPI(machine);
{
lua_State* fennel = machine->lua;
lua_settop(fennel, 0);
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");
return false;
}
lua_call(fennel, 0, 0);
if (luaL_loadbuffer(fennel, execute_fennel_src, strlen(execute_fennel_src), "execute_fennel") != LUA_OK)
{
machine->data->error(machine->data->data, "failed to load fennel compiler");
return false;
}
lua_pushstring(fennel, code);
if (lua_pcall(fennel, 1, 1, 0) != LUA_OK)
{
const char* msg = lua_tostring(fennel, -1);
if (msg)
{
machine->data->error(machine->data->data, msg);
return false;
}
}
}
return true;
}
static const char* const FennelKeywords [] =
{
"do", "values", "if", "when", "each", "for", "fn", "lambda", "partial",
"while", "set", "global", "var", "local", "let", "tset",
"or", "and", "true", "false", "nil", "#", ":", "->", "->>"
};
static const tic_outline_item* getFennelOutline(const char* code, s32* size)
{
enum{Size = sizeof(tic_outline_item)};
*size = 0;
static tic_outline_item* items = NULL;
if(items)
{
free(items);
items = NULL;
}
const char* ptr = code;
while(true)
{
static const char FuncString[] = "fn"; /* this probably doesn't work */
ptr = strstr(ptr, FuncString);
if(ptr)
{
const char* end = ptr;
ptr += sizeof FuncString - 1;
while(end >= code && !isalnum_(*end)) end--;
const char* start = end;
for (const char* val = start-1; val >= code && (isalnum_(*val)); val--, start--);
if(end > start)
{
items = items ? realloc(items, (*size + 1) * Size) : malloc(Size);
items[*size].pos = start - code;
items[*size].size = end - start + 1;
(*size)++;
}
}
else break;
}
return items;
}
static const tic_script_config FennelSyntaxConfig =
{
.init = initFennel,
.close = closeLua,
.tick = callLuaTick,
.scanline = callLuaScanline,
.overline = callLuaOverline,
.getOutline = getFennelOutline,
.parse = parseCode,
.blockCommentStart = NULL,
.blockCommentEnd = NULL,
.blockStringStart = NULL,
.blockStringEnd = NULL,
.singleComment = ";",
.keywords = FennelKeywords,
.keywordsCount = COUNT_OF(FennelKeywords),
.api = ApiKeywords,
.apiCount = COUNT_OF(ApiKeywords),
};
const tic_script_config* getFennelConfig()
{
return &FennelSyntaxConfig;
}
#endif /* defined(TIC_BUILD_WITH_FENNEL) */
#endif /* defined(TIC_BUILD_WITH_LUA) */

6
src/machine.h
View File

@@ -123,7 +123,7 @@ typedef struct
struct
{
#if defined(TIC_BUILD_WITH_LUA) || defined(TIC_BUILD_WITH_MOON)
#if defined(TIC_BUILD_WITH_LUA) || defined(TIC_BUILD_WITH_MOON) || defined(TIC_BUILD_WITH_FENNEL)
struct lua_State* lua;
#endif
@@ -176,6 +176,10 @@ const tic_script_config* getLuaScriptConfig();
const tic_script_config* getMoonScriptConfig();
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
const tic_script_config* getFennelConfig();
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */

9
src/tic.c
View File

@@ -566,6 +566,10 @@ void tic_close(tic_mem* tic)
getMoonScriptConfig()->close(tic);
# endif
# if defined(TIC_BUILD_WITH_FENNEL)
getFennelConfig()->close(tic);
# endif
#endif /* defined(TIC_BUILD_WITH_LUA) */
@@ -1566,6 +1570,11 @@ static const tic_script_config* getScriptConfig(const char* code)
return getMoonScriptConfig();
#endif
#if defined(TIC_BUILD_WITH_FENNEL)
if(compareMetatag(code, "script", "fennel", getFennelConfig()->singleComment))
return getFennelConfig();
#endif
#if defined(TIC_BUILD_WITH_JS)
if(compareMetatag(code, "script", "js", getJsScriptConfig()->singleComment) ||
compareMetatag(code, "script", "javascript", getJsScriptConfig()->singleComment))