Merge pull request #759 from GrahamClemo/add-squirrel

Add squirrel language support to TIC-80

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.9)
 
-project(TIC-80 C)
+project(TIC-80 C CXX)
 message("Building for target : ${CMAKE_SYSTEM_NAME}")
 
 if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID)
@@ -133,6 +133,40 @@ target_include_directories(wren PRIVATE 3rd-party/wren-0.1.0/src/include)
 target_include_directories(wren PRIVATE 3rd-party/wren-0.1.0/src/optional)
 target_include_directories(wren PRIVATE 3rd-party/wren-0.1.0/src/vm)
 
+################################
+# SQUIRREL
+################################
+
+set(SQUIRREL_DIR 3rd-party/squirrel3.1)
+set(SQUIRREL_SRC
+    ${SQUIRREL_DIR}/squirrel/sqapi.cpp
+    ${SQUIRREL_DIR}/squirrel/sqbaselib.cpp
+    ${SQUIRREL_DIR}/squirrel/sqclass.cpp
+    ${SQUIRREL_DIR}/squirrel/sqcompiler.cpp
+    ${SQUIRREL_DIR}/squirrel/sqdebug.cpp
+    ${SQUIRREL_DIR}/squirrel/sqfuncstate.cpp
+    ${SQUIRREL_DIR}/squirrel/sqlexer.cpp
+    ${SQUIRREL_DIR}/squirrel/sqmem.cpp
+    ${SQUIRREL_DIR}/squirrel/sqobject.cpp
+    ${SQUIRREL_DIR}/squirrel/sqstate.cpp
+    ${SQUIRREL_DIR}/squirrel/sqtable.cpp
+    ${SQUIRREL_DIR}/squirrel/sqvm.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdaux.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdblob.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdio.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdmath.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdrex.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdstream.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdstring.cpp
+    ${SQUIRREL_DIR}/sqstdlib/sqstdsystem.cpp
+)
+
+add_library(squirrel STATIC ${SQUIRREL_SRC})
+set_target_properties(squirrel PROPERTIES LINKER_LANGUAGE CXX)
+target_include_directories(squirrel PRIVATE 3rd-party/squirrel3.1/include)
+target_include_directories(squirrel PRIVATE 3rd-party/squirrel3.1/squirrel)
+target_include_directories(squirrel PRIVATE 3rd-party/squirrel3.1/sqstdlib)
+
 ################################
 # GIFLIB
 ################################
@@ -162,6 +196,7 @@ set(TIC80CORE_SRC
 	${TIC80CORE_DIR}/jsapi.c 
 	${TIC80CORE_DIR}/luaapi.c 
 	${TIC80CORE_DIR}/wrenapi.c 
+        ${TIC80CORE_DIR}/squirrelapi.c
 	${TIC80CORE_DIR}/ext/gif.c
 	3rd-party/blip-buf/blip_buf.c # TODO: link it as lib?
 	3rd-party/duktape-2.2.0/src/duktape.c # TODO: link it as lib?
@@ -175,11 +210,12 @@ target_include_directories(tic80core PRIVATE 3rd-party/duktape-2.2.0/src)
 target_include_directories(tic80core PRIVATE 3rd-party/lua-5.3.1/src)
 target_include_directories(tic80core PRIVATE 3rd-party/giflib-5.1.4/lib)
 target_include_directories(tic80core PRIVATE 3rd-party/wren-0.1.0/src/include)
+target_include_directories(tic80core PRIVATE 3rd-party/squirrel3.1/include)
 target_include_directories(tic80core PRIVATE 3rd-party/moonscript)
 target_include_directories(tic80core PRIVATE 3rd-party/fennel)
 
-add_dependencies(tic80core lua lpeg wren giflib)
+add_dependencies(tic80core lua lpeg wren squirrel giflib)
-target_link_libraries(tic80core lua lpeg wren giflib)
+target_link_libraries(tic80core lua lpeg wren squirrel giflib)
 
 ################################
 # SDL2

bin/assets/squirreldemo.tic.dat

@@ -0,0 +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, 0x56, 0x1d, 0x46, 0x06, 0x7d, 0x7d, 0x85, 0x92, 0xcc, 0x92, 0x9c, 0x54, 0x2b, 0x05, 0x85, 0xf4, 0xc4, 0xdc, 0x54, 0x08, 0x87, 0x0b, 0x28, 0x9a, 0x58, 0x5a, 0x92, 0x91, 0x5f, 0x64, 0x05, 0x11, 0x4d, 0x49, 0x2d, 0x4b, 0xcd, 0xc9, 0x2f, 0x48, 0x2d, 0x02, 0xc9, 0xa4, 0xa4, 0x16, 0x27, 0x03, 0x95, 0x2b, 0x14, 0x03, 0xe5, 0x4b, 0xc0, 0xbc, 0xa2, 0xcc, 0x82, 0x92, 0xcc, 0xfc, 0x3c, 0x90, 0x24, 0x84, 0x63, 0xa5, 0x50, 0x5c, 0x58, 0x9a, 0x59, 0x54, 0x94, 0x9a, 0xc3, 0xc5, 0x55, 0x62, 0xa3, 0x6b, 0xc0, 0x55, 0x61, 0xa3, 0x6b, 0x69, 0xc6, 0x55, 0x69, 0xa3, 0x6b, 0x64, 0xc2, 0xc5, 0x95, 0x56, 0x9a, 0x97, 0x0c, 0x52, 0xaf, 0x10, 0xe2, 0xe9, 0xac, 0xa1, 0xc9, 0x55, 0xcd, 0xc5, 0x99, 0x99, 0xa6, 0xa0, 0x91, 0x54, 0x92, 0xa7, 0x61, 0xa0, 0xa9, 0xa9, 0x50, 0x69, 0x5b, 0xa9, 0x6b, 0x68, 0x8d, 0x10, 0x33, 0x84, 0x88, 0x69, 0x23, 0x8b, 0x19, 0x01, 0xc5, 0x2a, 0x6c, 0x2b, 0x50, 0xd4, 0x19, 0x43, 0xc4, 0x40, 0xea, 0xb8, 0x38, 0x93, 0x73, 0x8a, 0x35, 0x0c, 0x8d, 0x35, 0xb9, 0x38, 0x8b, 0x0b, 0x8a, 0x34, 0x0c, 0xb5, 0x35, 0x34, 0x4a, 0x54, 0xcd, 0x0c, 0x34, 0xf5, 0x8d, 0x0d, 0x34, 0xb5, 0x8c, 0x74, 0x2a, 0x74, 0x2a, 0x75, 0x0c, 0x4d, 0x74, 0x8c, 0x75, 0x0c, 0x80, 0xd0, 0x48, 0xc7, 0x08, 0xa8, 0xac, 0xa0, 0x28, 0x33, 0xaf, 0x44, 0x43, 0xc9, 0xc3, 0xd5, 0xc7, 0xc7, 0x5f, 0x21, 0xdc, 0x3f, 0xc8, 0xc7, 0x45, 0x51, 0x49, 0xc7, 0xc2, 0x04, 0x88, 0x80, 0x92, 0x25, 0xb6, 0x25, 0xda, 0x86, 0x5c, 0xb5, 0x5c, 0x9c, 0x76, 0x94, 0xc5, 0x37, 0x33, 0x0b, 0x97, 0x01, 0x84, 0x05, 0xca, 0xb8, 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, 0x00, 0x34, 0x53, 0x38, 0x01, 

build/windows/studio/studio.vcxproj.user

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>

include/tic80_config.h

@@ -27,6 +27,7 @@
 #define TIC_BUILD_WITH_FENNEL 	1
 #define TIC_BUILD_WITH_JS 		1
 #define TIC_BUILD_WITH_WREN 	1
+#define TIC_BUILD_WITH_SQUIRREL 1
 
 #if defined(__APPLE__)
 // TODO: this disables macos config 

src/machine.h

@@ -131,6 +131,11 @@ typedef struct
 #if defined(TIC_BUILD_WITH_WREN)
 		struct WrenVM* wren;
 #endif	
+
+#if defined(TIC_BUILD_WITH_SQUIRREL)
+		struct SQVM* squirrel;
+#endif
+
 	};
 
 	struct
@@ -171,6 +176,10 @@ s32 drawSpriteFont(tic_mem* memory, u8 symbol, s32 x, s32 y, s32 width, s32 heig
 s32 drawFixedSpriteFont(tic_mem* memory, u8 index, s32 x, s32 y, s32 width, s32 height, u8 chromakey, s32 scale, bool alt);
 void parseCode(const tic_script_config* config, const char* start, u8* color, const tic_code_theme* theme);
 
+#if defined(TIC_BUILD_WITH_SQUIRREL)
+const tic_script_config* getSquirrelScriptConfig();
+#endif
+
 #if defined(TIC_BUILD_WITH_LUA)
 const tic_script_config* getLuaScriptConfig();
 

src/studio.c

@@ -1164,7 +1164,7 @@ static void processGamepadMapping()
 
 	for(s32 i = 0; i < KEYMAP_COUNT; i++)
 		if(impl.keycodes[i] && tic->api.key(tic, impl.keycodes[i]))
-			tic->ram.input.gamepads.data |= 1 << i;
+ 			tic->ram.input.gamepads.data |= 1 << i;
 }
 
 static bool isGameMenu()

src/studio.h

@@ -59,6 +59,7 @@
 #define PROJECT_MOON_EXT ".moon"
 #define PROJECT_JS_EXT ".js"
 #define PROJECT_WREN_EXT ".wren"
+#define PROJECT_SQUIRREL_EXT ".nut"
 
 typedef enum
 {

src/tic.c

@@ -574,6 +574,10 @@ void tic_close(tic_mem* memory)
 
 	machine->state.initialized = false;
 
+#if defined(TIC_BUILD_WITH_SQUIRREL)
+	getSquirrelScriptConfig()->close(memory);
+#endif
+
 #if defined(TIC_BUILD_WITH_LUA)
 	getLuaScriptConfig()->close(memory);
 
@@ -1619,12 +1623,19 @@ static const tic_script_config* getScriptConfig(const char* code)
 		return getWrenScriptConfig();
 #endif
 
+#if defined(TIC_BUILD_WITH_SQUIRREL)
+	if (compareMetatag(code, "script", "squirrel", getSquirrelScriptConfig()->singleComment))
+		return getSquirrelScriptConfig();
+#endif
+
 #if defined(TIC_BUILD_WITH_LUA)
 	return getLuaScriptConfig();
 #elif defined(TIC_BUILD_WITH_JS)
 	return getJsScriptConfig();
 #elif defined(TIC_BUILD_WITH_WREN)
 	return getWrenScriptConfig();
+#elif defined(TIC_BUILD_WITH_SQUIRREL)
+	return getSquirrelScriptConfig();
 #endif
 }