From b229826e1495f36a998aa128988df5d8bebf5d50 Mon Sep 17 00:00:00 2001 From: Michael Nolan Date: Thu, 11 May 2023 06:34:42 -0500 Subject: [PATCH] Fix getarraynode.c --- CMakeLists.txt | 9 +++++++++ libtlang/CMakeLists.txt | 3 ++- libtlang/src/getarraynode.c | 2 +- tlang/CMakeLists.txt | 4 +++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df4c44d..700ed95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,3 +3,12 @@ project(TLangInterperter) add_subdirectory(libtlang) add_subdirectory(tlang) +install(TARGETS tlang RUNTIME DESTINATION bin) +set(CPACK_PACKAGE_NAME "tlang") +set(CPACK_PROJECT_NAME "tlang") + +set(CPACK_PACKAGE_VERSION_MAJOR 0) +set(CPACK_PACKAGE_VERSION_MINOR 0) +set(CPACK_PACKAGE_VERSION_PATCH 0) +set(CPACK_PACKAGE_VERSION_PATCH 1) +include(CPack) diff --git a/libtlang/CMakeLists.txt b/libtlang/CMakeLists.txt index 86bf615..a45cd2e 100644 --- a/libtlang/CMakeLists.txt +++ b/libtlang/CMakeLists.txt @@ -1,6 +1,7 @@ project(tlanginterp) -add_library(tlanginterp STATIC src/addnode.c src/bit.c src/bitwiseand.c src/bitwiseor.c src/breaknode.c src/bwnot.c src/closurenode.c src/constnode.c src/curl.c src/dict.c src/dirittr.c src/dividenode.c src/eachnode.c src/eq.c src/forloop.c src/fs.c src/functioncallnode.c src/getarraynode.c src/getmembernode.c src/getvariablenode.c src/getvariablenode.c src/greaterthan.c src/greaterthanequal.c src/if.c src/ittr.c src/json.c src/leftshift.c src/lessthan.c src/lessthanequal.c src/lexer.c src/lextokenlist.c src/listittr.c src/logicaland.c src/logicalor.c src/mbed.c src/methodcallnode.c src/modulonode.c src/multiplynode.c src/neg.c src/neq.c src/net.c src/nodetwo.c src/not.c src/parser.c src/postfixdecrementnode.c src/postfixincrementnode.c src/rand.c src/returnnode.c src/rightshift.c src/runtime.c src/scope.c src/scopenode.c src/sdl2.c src/setvariablenode.c src/stream.c src/string.c src/stringittr.c src/subnode.c src/switch.c src/threading.c src/tobject.c src/whileloop.c src/wpad-wii.c src/xor.c include/FreeMonoBold.h include/myfeatures.h include/tlang_version.h include/tlang.h) add_definitions(-DCMAKE_TLANG_BUILD) +add_library(tlanginterp STATIC src/addnode.c src/bit.c src/bitwiseand.c src/bitwiseor.c src/breaknode.c src/bwnot.c src/closurenode.c src/constnode.c src/curl.c src/dict.c src/dirittr.c src/dividenode.c src/eachnode.c src/eq.c src/forloop.c src/fs.c src/functioncallnode.c src/getarraynode.c src/getmembernode.c src/getvariablenode.c src/getvariablenode.c src/greaterthan.c src/greaterthanequal.c src/if.c src/ittr.c src/json.c src/leftshift.c src/lessthan.c src/lessthanequal.c src/lexer.c src/lextokenlist.c src/listittr.c src/logicaland.c src/logicalor.c src/mbed.c src/methodcallnode.c src/modulonode.c src/multiplynode.c src/neg.c src/neq.c src/net.c src/nodetwo.c src/not.c src/parser.c src/postfixdecrementnode.c src/postfixincrementnode.c src/rand.c src/returnnode.c src/rightshift.c src/runtime.c src/scope.c src/scopenode.c src/sdl2.c src/setvariablenode.c src/stream.c src/string.c src/stringittr.c src/subnode.c src/switch.c src/threading.c src/tobject.c src/whileloop.c src/wpad-wii.c src/xor.c include/FreeMonoBold.h include/myfeatures.h include/tlang_version.h include/tlang.h) + option(USE_SDL "Enable SDL2" ON) option(USE_NETWORK "Enable Networking" ON) option(USE_CURL "Enable curl" ON) diff --git a/libtlang/src/getarraynode.c b/libtlang/src/getarraynode.c index d185316..7c29a50 100644 --- a/libtlang/src/getarraynode.c +++ b/libtlang/src/getarraynode.c @@ -96,7 +96,7 @@ tobject_t* __node_getarray_execute(node_t* n,scope_t* s,retarg_t* retArg) } void __kvp_set(tobject_t* parent_obj,tobject_t* argument_obj,tobject_t* variable) { - if(parent_obj->type != tdict) return NULL; + if(parent_obj->type != tdict) return; if(argument_obj->type == tstring) { char* p = string_dupp(argument_obj->data.string); diff --git a/tlang/CMakeLists.txt b/tlang/CMakeLists.txt index 896d516..fa7099d 100644 --- a/tlang/CMakeLists.txt +++ b/tlang/CMakeLists.txt @@ -1,3 +1,5 @@ project(tlang) add_executable(tlang src/main.c) -target_link_libraries(tlang tlanginterp) \ No newline at end of file + +target_link_libraries(tlang tlanginterp) +