From 1a01a016f2e8e0a1eab1071314cdd852cef1e9bb Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Fri, 22 Apr 2022 22:38:19 +0200 Subject: [PATCH] Remove unnecessary function --- src/vm.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/vm.cpp b/src/vm.cpp index 977f960..6057f86 100644 --- a/src/vm.cpp +++ b/src/vm.cpp @@ -36,19 +36,6 @@ namespace wren { void load_module_complete_fn (WrenVM* wvm, const char* name, struct WrenLoadModuleResult result); - WrenLoadModuleResult to_wren_load_module_result ( - const char* source, - const detail::Callbacks& cb, - void* user_data - ) { - assert(cb.owner); - return ::WrenLoadModuleResult{ - .source = source, - .onComplete = (cb.load_module_complete_fn ? &load_module_complete_fn : nullptr), - .userData = user_data - }; - } - void write_fn (WrenVM* wvm, const char* text) { auto cb = static_cast(wrenGetUserData(wvm)); assert(cb); @@ -82,7 +69,13 @@ namespace wren { auto cb = static_cast(user_data); assert(cb); assert(cb->load_module_fn and cb->config_obj and cb->owner); - return to_wren_load_module_result(cb->load_module_fn(*cb->config_obj, cb->owner, name), *cb, user_data); + + char* const source = cb->load_module_fn(*cb->config_obj, cb->owner, name); + return ::WrenLoadModuleResult{ + .source = source, + .onComplete = (cb->load_module_complete_fn ? &load_module_complete_fn : nullptr), + .userData = user_data + }; } WrenForeignMethodFn foreign_method_fn (WrenVM* wvm, const char* module, const char* class_name, bool is_static, const char* signature) {