jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add helper macro to avoid duplication in Java vector typemaps

Browse source 
No real changes yet, just use a C#-like macro in Java std::vector<> typemaps
too to avoid having to repeat almost exactly the same class declaration for
the general case and for the bool specialization.
This commit is contained in:
Vadim Zeitlin 2016-11-28 21:32:00 +01:00
commit 7c4109c701
1 changed files with 12 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Lib/java/std_vector.i
View file

@ -9,13 +9,11 @@
#include <stdexcept>
%}
namespace std {
template<class T> class vector {
public:
%define SWIG_STD_VECTOR_MINIMUM_INTERNAL(CTYPE, CREF_TYPE)
public:
typedef size_t size_type;
typedef T value_type;
typedef const value_type& const_reference;
typedef CTYPE value_type;
typedef CREF_TYPE const_reference;
vector();
vector(size_type n);
size_type size() const;
@ -27,7 +25,7 @@ namespace std {
%rename(add) push_back;
void push_back(const value_type& x);
%extend {
const_reference get(int i) throw (std::out_of_range) {
CREF_TYPE get(int i) throw (std::out_of_range) {
int size = int(self->size());
if (i>=0 && i<size)
return (*self)[i];
@ -42,40 +40,17 @@ namespace std {
throw std::out_of_range("vector index out of range");
}
}
%enddef
namespace std {
template<class T> class vector {
SWIG_STD_VECTOR_MINIMUM_INTERNAL(T, const T&)
};
// bool specialization
template<> class vector<bool> {
public:
typedef size_t size_type;
typedef bool value_type;
typedef bool const_reference;
vector();
vector(size_type n);
size_type size() const;
size_type capacity() const;
void reserve(size_type n);
%rename(isEmpty) empty;
bool empty() const;
void clear();
%rename(add) push_back;
void push_back(const value_type& x);
%extend {
bool get(int i) throw (std::out_of_range) {
int size = int(self->size());
if (i>=0 && i<size)
return (*self)[i];
else
throw std::out_of_range("vector index out of range");
}
void set(int i, const value_type& val) throw (std::out_of_range) {
int size = int(self->size());
if (i>=0 && i<size)
(*self)[i] = val;
else
throw std::out_of_range("vector index out of range");
}
}
SWIG_STD_VECTOR_MINIMUM_INTERNAL(bool, bool)
};
}