Add helper macro to avoid duplication in Java vector typemaps
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:
parent
7268f58c4c
commit
7c4109c701
1 changed files with 12 additions and 37 deletions
|
|
@ -9,13 +9,11 @@
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
%}
|
%}
|
||||||
|
|
||||||
namespace std {
|
%define SWIG_STD_VECTOR_MINIMUM_INTERNAL(CTYPE, CREF_TYPE)
|
||||||
|
public:
|
||||||
template<class T> class vector {
|
|
||||||
public:
|
|
||||||
typedef size_t size_type;
|
typedef size_t size_type;
|
||||||
typedef T value_type;
|
typedef CTYPE value_type;
|
||||||
typedef const value_type& const_reference;
|
typedef CREF_TYPE const_reference;
|
||||||
vector();
|
vector();
|
||||||
vector(size_type n);
|
vector(size_type n);
|
||||||
size_type size() const;
|
size_type size() const;
|
||||||
|
|
@ -27,7 +25,7 @@ namespace std {
|
||||||
%rename(add) push_back;
|
%rename(add) push_back;
|
||||||
void push_back(const value_type& x);
|
void push_back(const value_type& x);
|
||||||
%extend {
|
%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());
|
int size = int(self->size());
|
||||||
if (i>=0 && i<size)
|
if (i>=0 && i<size)
|
||||||
return (*self)[i];
|
return (*self)[i];
|
||||||
|
|
@ -42,40 +40,17 @@ namespace std {
|
||||||
throw std::out_of_range("vector index out of range");
|
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
|
// bool specialization
|
||||||
template<> class vector<bool> {
|
template<> class vector<bool> {
|
||||||
public:
|
SWIG_STD_VECTOR_MINIMUM_INTERNAL(bool, bool)
|
||||||
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");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue