From f5d4b3509725b5c021dd46c528f71c1865d2852b Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 13 Jan 2023 16:29:56 +0000 Subject: [PATCH] Updated Toy to 0.7.0 --- Toy | 2 +- core/core_common.h | 2 ++ core/engine_node.c | 2 +- core/lib_engine.c | 2 -- core/lib_node.c | 2 -- core/lib_standard.c | 4 +++- core/lib_timer.c | 3 ++- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Toy b/Toy index bf64275..3498baa 160000 --- a/Toy +++ b/Toy @@ -1 +1 @@ -Subproject commit bf64275aa9bd225d3f4117d27e4b7404a0fa0e36 +Subproject commit 3498baad9b81cf7bb3a812578af4929e5eb8f397 diff --git a/core/core_common.h b/core/core_common.h index 2a7a9a9..00e5d4b 100644 --- a/core/core_common.h +++ b/core/core_common.h @@ -10,8 +10,10 @@ //platform exports/imports #if defined(__linux__) #define CORE_API extern + #else #define CORE_API + #endif #include diff --git a/core/engine_node.c b/core/engine_node.c index 2543f89..0109f82 100644 --- a/core/engine_node.c +++ b/core/engine_node.c @@ -38,7 +38,7 @@ void initEngineNode(EngineNode* node, Interpreter* interpreter, void* tb, size_t continue; } - //if this variable is a function + //if this variable is a function (this outmodes import and export) _entry* entry = &variablesPtr->entries[i]; if (IS_FUNCTION(entry->value)) { //save a copy diff --git a/core/lib_engine.c b/core/lib_engine.c index b400a16..bd204ff 100644 --- a/core/lib_engine.c +++ b/core/lib_engine.c @@ -127,8 +127,6 @@ static int nativeLoadRootNode(Interpreter* interpreter, LiteralArray* arguments) inner.depth = interpreter->depth + 1; inner.panic = false; initLiteralArray(&inner.stack); - inner.exports = interpreter->exports; - inner.exportTypes = interpreter->exportTypes; inner.hooks = interpreter->hooks; setInterpreterPrint(&inner, interpreter->printOutput); setInterpreterAssert(&inner, interpreter->assertOutput); diff --git a/core/lib_node.c b/core/lib_node.c index 6aae282..cca078e 100644 --- a/core/lib_node.c +++ b/core/lib_node.c @@ -51,8 +51,6 @@ static int nativeLoadNode(Interpreter* interpreter, LiteralArray* arguments) { inner.depth = interpreter->depth + 1; inner.panic = false; initLiteralArray(&inner.stack); - inner.exports = interpreter->exports; - inner.exportTypes = interpreter->exportTypes; inner.hooks = interpreter->hooks; setInterpreterPrint(&inner, interpreter->printOutput); setInterpreterAssert(&inner, interpreter->assertOutput); diff --git a/core/lib_standard.c b/core/lib_standard.c index 3224e37..22f7aa1 100644 --- a/core/lib_standard.c +++ b/core/lib_standard.c @@ -1,8 +1,10 @@ #include "lib_standard.h" -#include "toy_common.h" #include "memory.h" +#include +#include + static int nativeClock(Interpreter* interpreter, LiteralArray* arguments) { //no arguments if (arguments->count != 0) { diff --git a/core/lib_timer.c b/core/lib_timer.c index cd098c7..fbda56f 100644 --- a/core/lib_timer.c +++ b/core/lib_timer.c @@ -1,9 +1,10 @@ #include "lib_timer.h" -#include "toy_common.h" #include "memory.h" #include +#include +#include //GOD DAMN IT: https://stackoverflow.com/questions/15846762/timeval-subtract-explanation int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y) {