From 7f692b4cb4eb0b8b575e0dd9887d63668d9ee9eb Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 31 Jul 2023 11:15:10 +1000 Subject: [PATCH] Renamed the about library to toy_version_info library, resovled #81 --- repl/lib_about.h | 5 ----- repl/{lib_about.c => lib_toy_version_info.c} | 10 +++++----- repl/lib_toy_version_info.h | 5 +++++ repl/repl_main.c | 4 ++-- repl/repl_tools.c | 4 ++-- repl/repl_tools.h | 2 +- test/scripts/lib/{about.toy => toy_version_info.toy} | 4 ++-- test/test_libraries.c | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 repl/lib_about.h rename repl/{lib_about.c => lib_toy_version_info.c} (96%) create mode 100644 repl/lib_toy_version_info.h rename test/scripts/lib/{about.toy => toy_version_info.toy} (55%) diff --git a/repl/lib_about.h b/repl/lib_about.h deleted file mode 100644 index c7ba214..0000000 --- a/repl/lib_about.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "toy_interpreter.h" - -int Toy_hookAbout(Toy_Interpreter* interpreter, Toy_Literal identifier, Toy_Literal alias); diff --git a/repl/lib_about.c b/repl/lib_toy_version_info.c similarity index 96% rename from repl/lib_about.c rename to repl/lib_toy_version_info.c index b9cda17..cf323a9 100644 --- a/repl/lib_about.c +++ b/repl/lib_toy_version_info.c @@ -1,23 +1,23 @@ -#include "lib_about.h" +#include "lib_toy_version_info.h" #include "toy_memory.h" -int Toy_hookAbout(Toy_Interpreter* interpreter, Toy_Literal identifier, Toy_Literal alias) { - //the about keys +int Toy_hookToyVersionInfo(Toy_Interpreter* interpreter, Toy_Literal identifier, Toy_Literal alias) { + //the info keys Toy_Literal majorKeyLiteral = TOY_TO_STRING_LITERAL(Toy_createRefString("major")); Toy_Literal minorKeyLiteral = TOY_TO_STRING_LITERAL(Toy_createRefString("minor")); Toy_Literal patchKeyLiteral = TOY_TO_STRING_LITERAL(Toy_createRefString("patch")); Toy_Literal buildKeyLiteral = TOY_TO_STRING_LITERAL(Toy_createRefString("build")); Toy_Literal authorKeyLiteral = TOY_TO_STRING_LITERAL(Toy_createRefString("author")); - //the about identifiers + //the info identifiers Toy_Literal majorIdentifierLiteral = TOY_TO_IDENTIFIER_LITERAL(Toy_createRefString("major")); Toy_Literal minorIdentifierLiteral = TOY_TO_IDENTIFIER_LITERAL(Toy_createRefString("minor")); Toy_Literal patchIdentifierLiteral = TOY_TO_IDENTIFIER_LITERAL(Toy_createRefString("patch")); Toy_Literal buildIdentifierLiteral = TOY_TO_IDENTIFIER_LITERAL(Toy_createRefString("build")); Toy_Literal authorIdentifierLiteral = TOY_TO_IDENTIFIER_LITERAL(Toy_createRefString("author")); - //the about values + //the info values Toy_Literal majorLiteral = TOY_TO_INTEGER_LITERAL(TOY_VERSION_MAJOR); Toy_Literal minorLiteral = TOY_TO_INTEGER_LITERAL(TOY_VERSION_MINOR); Toy_Literal patchLiteral = TOY_TO_INTEGER_LITERAL(TOY_VERSION_PATCH); diff --git a/repl/lib_toy_version_info.h b/repl/lib_toy_version_info.h new file mode 100644 index 0000000..1dd3fa0 --- /dev/null +++ b/repl/lib_toy_version_info.h @@ -0,0 +1,5 @@ +#pragma once + +#include "toy_interpreter.h" + +int Toy_hookToyVersionInfo(Toy_Interpreter* interpreter, Toy_Literal identifier, Toy_Literal alias); diff --git a/repl/repl_main.c b/repl/repl_main.c index 4992dad..2c07562 100644 --- a/repl/repl_main.c +++ b/repl/repl_main.c @@ -1,6 +1,6 @@ #include "repl_tools.h" #include "drive_system.h" -#include "lib_about.h" +#include "lib_toy_version_info.h" #include "lib_standard.h" #include "lib_random.h" #include "lib_runner.h" @@ -26,7 +26,7 @@ void repl(const char* initialInput) { Toy_initInterpreter(&interpreter); //inject the libs - Toy_injectNativeHook(&interpreter, "about", Toy_hookAbout); + Toy_injectNativeHook(&interpreter, "toy_version_info", Toy_hookToyVersionInfo); Toy_injectNativeHook(&interpreter, "standard", Toy_hookStandard); Toy_injectNativeHook(&interpreter, "random", Toy_hookRandom); Toy_injectNativeHook(&interpreter, "runner", Toy_hookRunner); diff --git a/repl/repl_tools.c b/repl/repl_tools.c index 63090f9..6e58a44 100644 --- a/repl/repl_tools.c +++ b/repl/repl_tools.c @@ -1,5 +1,5 @@ #include "repl_tools.h" -#include "lib_about.h" +#include "lib_toy_version_info.h" #include "lib_standard.h" #include "lib_random.h" #include "lib_runner.h" @@ -111,7 +111,7 @@ void Toy_runBinary(const unsigned char* tb, size_t size) { Toy_initInterpreter(&interpreter); //inject the libs - Toy_injectNativeHook(&interpreter, "about", Toy_hookAbout); + Toy_injectNativeHook(&interpreter, "toy_version_info", Toy_hookToyVersionInfo); Toy_injectNativeHook(&interpreter, "standard", Toy_hookStandard); Toy_injectNativeHook(&interpreter, "random", Toy_hookRandom); Toy_injectNativeHook(&interpreter, "runner", Toy_hookRunner); diff --git a/repl/repl_tools.h b/repl/repl_tools.h index d589a20..c8c464c 100644 --- a/repl/repl_tools.h +++ b/repl/repl_tools.h @@ -46,7 +46,7 @@ const unsigned char* Toy_compileString(const char* source, size_t* size); This function takes a bytecode array of `size` size, and executes it. The libraries available to the code are currently: -* lib_about +* lib_toy_version_info * lib_standard * lib_random * lib_runner diff --git a/test/scripts/lib/about.toy b/test/scripts/lib/toy_version_info.toy similarity index 55% rename from test/scripts/lib/about.toy rename to test/scripts/lib/toy_version_info.toy index 51de8c1..87a4c3a 100644 --- a/test/scripts/lib/about.toy +++ b/test/scripts/lib/toy_version_info.toy @@ -1,5 +1,5 @@ -import about as about; -import about; +import toy_version_info as toy_version_info; +import toy_version_info; assert author == "Kayne Ruse, KR Game Studios", "Author failed"; diff --git a/test/test_libraries.c b/test/test_libraries.c index ce3c9d3..58c9e77 100644 --- a/test/test_libraries.c +++ b/test/test_libraries.c @@ -14,10 +14,10 @@ #include "../repl/repl_tools.h" #include "../repl/drive_system.h" -#include "../repl/lib_about.h" +#include "../repl/lib_toy_version_info.h" +#include "../repl/lib_standard.h" #include "../repl/lib_random.h" #include "../repl/lib_runner.h" -#include "../repl/lib_standard.h" //supress the print output static void noPrintFn(const char* output) { @@ -72,7 +72,7 @@ int main() { //run each file in test/scripts Payload payloads[] = { {"interactions.toy", "standard", Toy_hookStandard}, //interactions needs standard - {"about.toy", "about", Toy_hookAbout}, + {"toy_version_info.toy", "toy_version_info", Toy_hookToyVersionInfo}, {"standard.toy", "standard", Toy_hookStandard}, {"runner.toy", "runner", Toy_hookRunner}, {"random.toy", "random", Toy_hookRandom},