diff options
Diffstat (limited to 'common/pybindings.h')
-rw-r--r-- | common/pybindings.h | 52 |
1 files changed, 3 insertions, 49 deletions
diff --git a/common/pybindings.h b/common/pybindings.h index 5b2adc6a..3dfadeee 100644 --- a/common/pybindings.h +++ b/common/pybindings.h @@ -20,6 +20,9 @@ #ifndef COMMON_PYBINDINGS_H #define COMMON_PYBINDINGS_H + +#include "pycontainers.h" + #include <utility> #include <stdexcept> #include <boost/python.hpp> @@ -27,54 +30,6 @@ #include <boost/python/suite/indexing/map_indexing_suite.hpp> #include <boost/python/suite/indexing/map_indexing_suite.hpp> using namespace boost::python; -/* -A wrapper for a Pythonised nextpnr Iterator. The actual class wrapped is a -pair<Iterator, Iterator> containing (current, end) -*/ - -template<typename T> -struct iterator_wrapper { - typedef decltype(*(std::declval<T>())) value_t; - - static value_t next(std::pair<T, T> &iter) { - if (iter.first != iter.second) { - value_t val = *iter.first; - ++iter.first; - return val; - } else { - PyErr_SetString(PyExc_StopIteration, "End of range reached"); - boost::python::throw_error_already_set(); - // Should be unreachable, but prevent control may reach end of non-void - throw std::runtime_error("unreachable"); - } - } - - static void wrap(const char *python_name) { - class_<std::pair<T, T>>(python_name, no_init) - .def("__next__", next); - } -}; - -/* -A wrapper for a nextpnr Range. Ranges should have two functions, begin() -and end() which return iterator-like objects supporting ++, * and != -Full STL iterator semantics are not required, unlike the standard Boost wrappers -*/ - -template<typename T> -struct range_wrapper { - typedef decltype(std::declval<T>().begin()) iterator_t; - - static std::pair<iterator_t, iterator_t> iter(T &range) { - return std::make_pair(range.begin(), range.end()); - } - - static void wrap(const char *range_name, const char *iter_name) { - class_<T>(range_name, no_init) - .def("__iter__", iter); - iterator_wrapper<iterator_t>().wrap(iter_name); - } -}; /* A wrapper to enable custom type/ID to/from string conversions @@ -124,7 +79,6 @@ template <typename T> struct string_wrapper { }; }; -#define WRAP_RANGE(t) range_wrapper<t##Range>().wrap(#t "Range", #t "Iterator") void init_python(const char *executable); void deinit_python(); |