Add std::array container wrappers for Python
These work much like any of the other STL containers except Python slicing is somewhat limited because the array is a fixed size. Only slices of the full size are supported.
This commit is contained in:
parent
4e8ea4e853
commit
55bbf68512
8 changed files with 500 additions and 57 deletions
88
Lib/std/std_array.i
Normal file
88
Lib/std/std_array.i
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
//
|
||||
// std::array
|
||||
//
|
||||
|
||||
%include <std_container.i>
|
||||
|
||||
%define %std_array_methods(array...)
|
||||
%std_sequence_methods_non_resizable(array)
|
||||
void fill(const value_type& u);
|
||||
%enddef
|
||||
|
||||
|
||||
%define %std_array_methods_val(array...)
|
||||
%std_sequence_methods_non_resizable_val(array)
|
||||
void fill(const value_type& u);
|
||||
%enddef
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// std::array
|
||||
//
|
||||
// The aim of all that follows would be to integrate std::array with
|
||||
// as much as possible, namely, to allow the user to pass and
|
||||
// be returned tuples or lists.
|
||||
// const declarations are used to guess the intent of the function being
|
||||
// exported; therefore, the following rationale is applied:
|
||||
//
|
||||
// -- f(std::array<T, N>), f(const std::array<T, N>&):
|
||||
// the parameter being read-only, either a sequence or a
|
||||
// previously wrapped std::array<T, N> can be passed.
|
||||
// -- f(std::array<T, N>&), f(std::array<T, N>*):
|
||||
// the parameter may be modified; therefore, only a wrapped std::array
|
||||
// can be passed.
|
||||
// -- std::array<T, N> f(), const std::array<T, N>& f():
|
||||
// the array is returned by copy; therefore, a sequence of T:s
|
||||
// is returned which is most easily used in other functions
|
||||
// -- std::array<T, N>& f(), std::array<T, N>* f():
|
||||
// the array is returned by reference; therefore, a wrapped std::array
|
||||
// is returned
|
||||
// -- const std::array<T, N>* f(), f(const std::array<T, N>*):
|
||||
// for consistency, they expect and return a plain array pointer.
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
%{
|
||||
#include <array>
|
||||
%}
|
||||
|
||||
// exported classes
|
||||
|
||||
namespace std {
|
||||
|
||||
template<class _Tp, size_t _Nm >
|
||||
class array {
|
||||
public:
|
||||
typedef size_t size_type;
|
||||
typedef ptrdiff_t difference_type;
|
||||
typedef _Tp value_type;
|
||||
typedef value_type* pointer;
|
||||
typedef const value_type* const_pointer;
|
||||
typedef _Tp& reference;
|
||||
typedef const _Tp& const_reference;
|
||||
|
||||
%traits_swigtype(_Tp);
|
||||
%traits_enum(_Tp);
|
||||
|
||||
%fragment(SWIG_Traits_frag(std::array<_Tp, _Nm >), "header",
|
||||
fragment=SWIG_Traits_frag(_Tp),
|
||||
fragment="StdArrayTraits") {
|
||||
namespace swig {
|
||||
template <> struct traits<std::array<_Tp, _Nm > > {
|
||||
typedef pointer_category category;
|
||||
static const char* type_name() {
|
||||
return "std::array<" #_Tp "," #_Nm " >";
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
%typemap_traits_ptr(SWIG_TYPECHECK_STDARRAY, std::array<_Tp, _Nm >);
|
||||
|
||||
#ifdef %swig_array_methods
|
||||
// Add swig/language extra methods
|
||||
%swig_array_methods(std::array<_Tp, _Nm >);
|
||||
#endif
|
||||
|
||||
%std_array_methods(array);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -6,20 +6,17 @@
|
|||
#include <algorithm>
|
||||
%}
|
||||
|
||||
// Common container methods
|
||||
// Common non-resizable container methods
|
||||
|
||||
%define %std_container_methods_non_resizable(container...)
|
||||
|
||||
%define %std_container_methods(container...)
|
||||
container();
|
||||
container(const container&);
|
||||
|
||||
bool empty() const;
|
||||
size_type size() const;
|
||||
void clear();
|
||||
|
||||
void swap(container& v);
|
||||
|
||||
allocator_type get_allocator() const;
|
||||
|
||||
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
||||
class iterator;
|
||||
class reverse_iterator;
|
||||
|
|
@ -34,17 +31,27 @@
|
|||
|
||||
%enddef
|
||||
|
||||
// Common container methods
|
||||
|
||||
%define %std_container_methods(container...)
|
||||
%std_container_methods_non_resizable(%arg(container))
|
||||
|
||||
void clear();
|
||||
allocator_type get_allocator() const;
|
||||
|
||||
%enddef
|
||||
|
||||
// Common sequence
|
||||
|
||||
%define %std_sequence_methods_common(sequence)
|
||||
|
||||
|
||||
%std_container_methods(%arg(sequence));
|
||||
|
||||
|
||||
sequence(size_type size);
|
||||
void pop_back();
|
||||
|
||||
|
||||
void resize(size_type new_size);
|
||||
|
||||
|
||||
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
||||
%extend {
|
||||
// %extend wrapper used for differing definitions of these methods introduced in C++11
|
||||
|
|
@ -52,24 +59,31 @@
|
|||
iterator erase(iterator first, iterator last) { return $self->erase(first, last); }
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
%enddef
|
||||
|
||||
%define %std_sequence_methods_non_resizable(sequence)
|
||||
|
||||
%define %std_sequence_methods(sequence)
|
||||
|
||||
%std_sequence_methods_common(%arg(sequence));
|
||||
|
||||
sequence(size_type size, const value_type& value);
|
||||
void push_back(const value_type& x);
|
||||
%std_container_methods_non_resizable(%arg(sequence))
|
||||
|
||||
const value_type& front() const;
|
||||
const value_type& back() const;
|
||||
|
||||
void assign(size_type n, const value_type& x);
|
||||
|
||||
%enddef
|
||||
|
||||
%define %std_sequence_methods(sequence)
|
||||
|
||||
%std_sequence_methods_common(%arg(sequence));
|
||||
|
||||
sequence(size_type size, const value_type& value);
|
||||
void push_back(const value_type& x);
|
||||
|
||||
const value_type& front() const;
|
||||
const value_type& back() const;
|
||||
|
||||
void assign(size_type n, const value_type& x);
|
||||
void resize(size_type new_size, const value_type& x);
|
||||
|
||||
|
||||
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
||||
%extend {
|
||||
// %extend wrapper used for differing definitions of these methods introduced in C++11
|
||||
|
|
@ -77,23 +91,33 @@
|
|||
void insert(iterator pos, size_type n, const value_type& x) { $self->insert(pos, n, x); }
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
%enddef
|
||||
|
||||
%define %std_sequence_methods_val(sequence...)
|
||||
|
||||
%std_sequence_methods_common(%arg(sequence));
|
||||
|
||||
sequence(size_type size, value_type value);
|
||||
void push_back(value_type x);
|
||||
%define %std_sequence_methods_non_resizable_val(sequence...)
|
||||
|
||||
%std_container_methods_non_resizable(%arg(sequence))
|
||||
|
||||
value_type front() const;
|
||||
value_type back() const;
|
||||
|
||||
void assign(size_type n, value_type x);
|
||||
|
||||
#endif
|
||||
|
||||
%enddef
|
||||
|
||||
%define %std_sequence_methods_val(sequence...)
|
||||
|
||||
%std_sequence_methods_common(%arg(sequence));
|
||||
|
||||
sequence(size_type size, value_type value);
|
||||
void push_back(value_type x);
|
||||
|
||||
value_type front() const;
|
||||
value_type back() const;
|
||||
|
||||
void assign(size_type n, value_type x);
|
||||
void resize(size_type new_size, value_type x);
|
||||
|
||||
|
||||
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
||||
%extend {
|
||||
// %extend wrapper used for differing definitions of these methods introduced in C++11
|
||||
|
|
@ -101,7 +125,7 @@
|
|||
void insert(iterator pos, size_type n, value_type x) { $self->insert(pos, n, x); }
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
%enddef
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue