update

Author: LanderlYoung

backend/Python/PyEngine.cc

@@ -17,14 +17,15 @@
 
 #include "PyEngine.h"
 #include "../../src/Utils.h"
-#include "pydebug.h"
-#include "pylifecycle.h"
 
 namespace script::py_backend {
 
-PyEngine::PyEngine(std::shared_ptr<utils::MessageQueue> queue) { Py_Initialize(); }
+PyEngine::PyEngine(std::shared_ptr<utils::MessageQueue> queue)
+    : queue_(queue ? std::move(queue) : std::make_shared<utils::MessageQueue>()) {
+  Py_Initialize();
+}
 
-PyEngine::PyEngine() : PyEngine(std::shared_ptr<utils::MessageQueue>{}) {}
+PyEngine::PyEngine() : PyEngine(nullptr) {}
 
 PyEngine::~PyEngine() = default;
 
@@ -44,9 +45,7 @@ Local<Value> PyEngine::eval(const Local<String>& script, const Local<Value>& sou
   return Local<Value>();
 }
 
-std::shared_ptr<utils::MessageQueue> PyEngine::messageQueue() {
-  return std::shared_ptr<utils::MessageQueue>();
-}
+std::shared_ptr<utils::MessageQueue> PyEngine::messageQueue() { return queue_; }
 
 void PyEngine::gc() {}
 

backend/Python/PyEngine.h

@@ -25,7 +25,9 @@
 namespace script::py_backend {
 
 class PyEngine : public ScriptEngine {
- protected:
+ private:
+  std::shared_ptr<::script::utils::MessageQueue> queue_;
+
  public:
   PyEngine(std::shared_ptr<::script::utils::MessageQueue> queue);
 

backend/Python/PyHelper.h

@@ -29,6 +29,7 @@ SCRIPTX_BEGIN_INCLUDE_LIBRARY
 #define PY_SSIZE_T_CLEAN
 #endif
 #include <Python.h>
+#include <pylifecycle.h>
 SCRIPTX_END_INCLUDE_LIBRARY
 
 namespace script::py_backend {

backend/Python/trait/TraitNative.h

@@ -27,7 +27,7 @@ struct ArgumentsData {
   size_t size;
 };
 
-struct JscScriptClassState {
+struct ScriptClassState {
   ScriptEngine* scriptEngine_ = nullptr;
   Weak<Object> weakRef_;
 };
@@ -41,7 +41,7 @@ struct internal::ImplType<::script::Arguments> {
 
 template <>
 struct internal::ImplType<::script::ScriptClass> {
-  using type = py_backend::JscScriptClassState;
+  using type = py_backend::ScriptClassState;
 };
 
 }  // namespace script

backend/Python/trait/TraitScope.h

@@ -25,7 +25,7 @@ namespace py_backend {
 
 class EngineScopeImpl {
  public:
-  explicit EngineScopeImpl(PyEngine &) {
+  explicit EngineScopeImpl(PyEngine &, PyEngine *) {
     // enter engine;
   }
 

backend/Template/trait/TraitNative.h

@@ -26,7 +26,7 @@ struct ArgumentsData {
   size_t size;
 };
 
-struct JscScriptClassState {
+struct ScriptClassState {
   ScriptEngine* scriptEngine_ = nullptr;
   Weak<Object> weakRef_;
 };
@@ -40,7 +40,7 @@ struct internal::ImplType<::script::Arguments> {
 
 template <>
 struct internal::ImplType<::script::ScriptClass> {
-  using type = template_backend::JscScriptClassState;
+  using type = template_backend::ScriptClassState;
 };
 
 }  // namespace script

test/cmake/TestEnv.cmake

@@ -147,7 +147,7 @@ elseif (${SCRIPTX_BACKEND} STREQUAL QuickJs)
     set(DEVOPS_LIBS_LIBPATH QuickJs CACHE STRING "" FORCE)
 elseif (${SCRIPTX_BACKEND} STREQUAL Python)
     set(DEVOPS_LIBS_INCLUDE
-            "/usr/local/Cellar/python@3.9/3.9.4/Frameworks/Python.framework/Versions/3.9/include/python3.9/"
+            "/usr/local/Cellar/python@3.10/3.10.0_2/Frameworks/Python.framework/Headers/"
                 CACHE STRING "" FORCE)
-    set(DEVOPS_LIBS_LIBPATH "/usr/local/Cellar/python@3.9/3.9.4/Frameworks/Python.framework/Versions/3.9/lib/libpython3.9.dylib" CACHE STRING "" FORCE)
+    set(DEVOPS_LIBS_LIBPATH "/usr/local/Cellar/python@3.10/3.10.0_2/Frameworks/Python.framework/Versions/Current/lib/libpython3.10.dylib" CACHE STRING "" FORCE)
 endif ()