From a0a9bde8d7a98c5a117dd3c79bf91f9c54daa8e5 Mon Sep 17 00:00:00 2001 From: blueloveTH Date: Wed, 1 Feb 2023 20:15:40 +0800 Subject: [PATCH] up up --- plugins/flutter/src/pocketpy.h | 13 ++++--------- plugins/godot/godot-cpp | 2 +- src/common.h | 2 -- src/main.cpp | 4 ++-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/plugins/flutter/src/pocketpy.h b/plugins/flutter/src/pocketpy.h index a4a96a0e..87a8828c 100644 --- a/plugins/flutter/src/pocketpy.h +++ b/plugins/flutter/src/pocketpy.h @@ -6616,7 +6616,6 @@ extern "C" { /// /// !!! /// If the pointer is not allocated by `pkpy_xxx_xxx`, the behavior is undefined. - /// For char*, you can also use trivial `delete` in your language. /// !!! void pkpy_delete(void* p){ for(int i = 0; i < _pkLookupTable.size(); i++){ @@ -6685,7 +6684,10 @@ extern "C" { vm->_lazy_modules[name] = source; } - void __vm_init(VM* vm){ + __EXPORT + /// Create a virtual machine. + VM* pkpy_new_vm(bool use_stdio){ + VM* vm = pkpy_allocate(VM, use_stdio); __initializeBuiltinFunctions(vm); __add_module_sys(vm); __add_module_time(vm); @@ -6699,13 +6701,6 @@ extern "C" { vm->_exec(code, vm->builtins, pkpy::make_shared()); pkpy_vm_add_module(vm, "random", __RANDOM_CODE); - } - - __EXPORT - /// Create a virtual machine. - VM* pkpy_new_vm(bool use_stdio){ - VM* vm = pkpy_allocate(VM, use_stdio); - __vm_init(vm); return vm; } diff --git a/plugins/godot/godot-cpp b/plugins/godot/godot-cpp index c951825d..e426f6bf 160000 --- a/plugins/godot/godot-cpp +++ b/plugins/godot/godot-cpp @@ -1 +1 @@ -Subproject commit c951825d2533b000213d57f027569fc08ed7f02a +Subproject commit e426f6bf9393c4e49de64bbd13b5736ba3aae0e0 diff --git a/src/common.h b/src/common.h index ba821afd..53631f4c 100644 --- a/src/common.h +++ b/src/common.h @@ -21,8 +21,6 @@ #include #include #include - -#include #include #include "hash_table8.hpp" diff --git a/src/main.cpp b/src/main.cpp index 24de86f8..5faea247 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,13 +25,13 @@ int main(int argc, char** argv){ return line.c_str(); }); if(argc == 1){ - REPL repl(vm); + REPL* repl = pkpy_new_repl(vm); int result = -1; while(true){ (*vm->_stdout) << (result==0 ? "... " : ">>> "); std::string line; std::getline(std::cin, line); - result = pkpy_repl_input(&repl, line.c_str()); + result = pkpy_repl_input(repl, line.c_str()); } pkpy_delete(vm); return 0;