WIP

Author: JonathanFeenstra

src/mobase/wrappers/basic_classes.cpp

@@ -201,7 +201,7 @@ namespace mo2::python {
             .def("library", &ExecutableForcedLoadSetting::library)
             .def("process", &ExecutableForcedLoadSetting::process);
 
-        py::class_<IExecutable, std::shared_ptr<IExecutable>>(m, "IExecutable")
+        py::class_<IExecutable>(m, "IExecutable")
             .def("title", &IExecutable::title)
             .def("binaryInfo", &IExecutable::binaryInfo)
             .def("arguments", &IExecutable::arguments)
@@ -213,10 +213,13 @@ namespace mo2::python {
             .def("hide", &IExecutable::hide);
 
         py::class_<IExecutablesList>(m, "IExecutablesList")
-            .def("executables", &IExecutablesList::executables)
+            .def("executables",
+                 [](IExecutablesList* executablesList) {
+                     return make_generator(executablesList->executables());
+                 })
             .def("getByTitle", &IExecutablesList::getByTitle, "title"_a)
             .def("getByBinary", &IExecutablesList::getByBinary, "info"_a)
-            .def("titleExists", &IExecutablesList::titleExists, "title"_a);
+            .def("titleExists", &IExecutablesList::contains, "title"_a);
     }
 
     void add_modinterface_classes(py::module_ m)

src/pybind11-utils/include/pybind11_utils/generator.h

@@ -34,9 +34,9 @@ namespace mo2::python {
                      [](state& s) -> state& {
                          return s;
                      })
-                .def("__next__", [](state& s) {
+                .def("__next__", [](state& s) -> decltype(auto) {
                     if (s.it != s.g.end()) {
-                        const auto v = *s.it;
+                        decltype(auto) v = *s.it;
                         s.it++;
                         return v;
                     }