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

Legacy macros, protected iterator, typedefs

Browse source
This commit is contained in:
Brad Kotsopoulos 2019-02-04 22:23:13 -05:00
commit d06ffe1087
4 changed files with 87 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Lib/java/std_map.i
View file

@ -46,10 +46,10 @@
namespace std { namespace std {
template<class KeyType, class ValueType, class Comparator = std::less<KeyType> > class map { template<class KeyType, class MappedType, class Comparator = std::less<KeyType> > class map {
%typemap(javabase) std::map<KeyType, ValueType, Comparator> %typemap(javabase) std::map<KeyType, MappedType, Comparator>
"java.util.AbstractMap<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>" "java.util.AbstractMap<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>"
%proxycode %{ %proxycode %{
@ -65,7 +65,7 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
return containsImpl(($typemap(jboxtype, KeyType))key); return containsImpl(($typemap(jboxtype, KeyType))key);
} }
public $typemap(jboxtype, ValueType) get(Object key) { public $typemap(jboxtype, MappedType) get(Object key) {
if (!(key instanceof $typemap(jboxtype, KeyType))) { if (!(key instanceof $typemap(jboxtype, KeyType))) {
return null; return null;
} }
@ -78,11 +78,11 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
return null; return null;
} }
public $typemap(jboxtype, ValueType) put($typemap(jboxtype, KeyType) key, public $typemap(jboxtype, MappedType) put($typemap(jboxtype, KeyType) key,
$typemap(jboxtype, ValueType) value) { $typemap(jboxtype, MappedType) value) {
Iterator itr = find(($typemap(jboxtype, KeyType)) key); Iterator itr = find(($typemap(jboxtype, KeyType)) key);
if (itr.isNot(end())) { if (itr.isNot(end())) {
$typemap(jboxtype, ValueType) oldValue = itr.getValue(); $typemap(jboxtype, MappedType) oldValue = itr.getValue();
itr.setValue(value); itr.setValue(value);
return oldValue; return oldValue;
} else { } else {
@ -91,14 +91,14 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
} }
} }
public $typemap(jboxtype, ValueType) remove(Object key) { public $typemap(jboxtype, MappedType) remove(Object key) {
if (!(key instanceof $typemap(jboxtype, KeyType))) { if (!(key instanceof $typemap(jboxtype, KeyType))) {
return null; return null;
} }
Iterator itr = find(($typemap(jboxtype, KeyType)) key); Iterator itr = find(($typemap(jboxtype, KeyType)) key);
if (itr.isNot(end())) { if (itr.isNot(end())) {
$typemap(jboxtype, ValueType) oldValue = itr.getValue(); $typemap(jboxtype, MappedType) oldValue = itr.getValue();
removeUnchecked(itr); removeUnchecked(itr);
return oldValue; return oldValue;
} else { } else {
@ -106,17 +106,17 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
} }
} }
public java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>> entrySet() { public java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>> entrySet() {
java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>> setToReturn = java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>> setToReturn =
new java.util.HashSet<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>>(); new java.util.HashSet<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>>();
Iterator itr = begin(); Iterator itr = begin();
final Iterator end = end(); final Iterator end = end();
while(itr.isNot(end)) { while(itr.isNot(end)) {
setToReturn.add(new Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>() { setToReturn.add(new Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>() {
private Iterator iterator; private Iterator iterator;
private Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)> init(Iterator iterator) { private Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)> init(Iterator iterator) {
this.iterator = iterator; this.iterator = iterator;
return this; return this;
} }
@ -125,12 +125,12 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
return iterator.getKey(); return iterator.getKey();
} }
public $typemap(jboxtype, ValueType) getValue() { public $typemap(jboxtype, MappedType) getValue() {
return iterator.getValue(); return iterator.getValue();
} }
public $typemap(jboxtype, ValueType) setValue($typemap(jboxtype, ValueType) newValue) { public $typemap(jboxtype, MappedType) setValue($typemap(jboxtype, MappedType) newValue) {
$typemap(jboxtype, ValueType) oldValue = iterator.getValue(); $typemap(jboxtype, MappedType) oldValue = iterator.getValue();
iterator.setValue(newValue); iterator.setValue(newValue);
return oldValue; return oldValue;
} }
@ -143,17 +143,24 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
%} %}
public: public:
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef KeyType key_type;
typedef MappedType mapped_type;
typedef Compare key_compare;
map(); map();
map(const map<KeyType, ValueType, Comparator >&); map(const map<KeyType, MappedType, Comparator >&);
struct iterator { struct iterator {
%typemap(javaclassmodifiers) iterator "protected class"
%extend { %extend {
std::map<KeyType, ValueType, Comparator >::iterator getNextUnchecked() { std::map<KeyType, MappedType, Comparator >::iterator getNextUnchecked() {
std::map<KeyType, ValueType, Comparator >::iterator copy = (*$self); std::map<KeyType, MappedType, Comparator >::iterator copy = (*$self);
return ++copy; return ++copy;
} }
bool isNot(const iterator other) const { bool isNot(iterator other) const {
return (*$self != other); return (*$self != other);
} }
@ -161,11 +168,11 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
return (*$self)->first; return (*$self)->first;
} }
ValueType getValue() const { MappedType getValue() const {
return (*$self)->second; return (*$self)->second;
} }
void setValue(const ValueType& newValue) { void setValue(const MappedType& newValue) {
(*$self)->second = newValue; (*$self)->second = newValue;
} }
} }
@ -188,14 +195,27 @@ template<class KeyType, class ValueType, class Comparator = std::less<KeyType> >
return (self->count(key) > 0); return (self->count(key) > 0);
} }
void putUnchecked(const KeyType& key, const ValueType& value) { void putUnchecked(const KeyType& key, const MappedType& value) {
(*self)[key] = value; (*self)[key] = value;
} }
void removeUnchecked(const std::map<KeyType, ValueType, Comparator >::iterator itr) { void removeUnchecked(const std::map<KeyType, MappedType, Comparator >::iterator itr) {
self->erase(itr); self->erase(itr);
} }
} }
}; };
// Legacy macros (deprecated)
%define specialize_std_map_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
#warning "specialize_std_map_on_key ignored - macro is deprecated and no longer necessary"
%enddef
%define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
#warning "specialize_std_map_on_value ignored - macro is deprecated and no longer necessary"
%enddef
%define specialize_std_map_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO, T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
#warning "specialize_std_map_on_both ignored - macro is deprecated and no longer necessary"
%enddef
} }

6
Lib/java/std_set.i
View file

@ -134,6 +134,7 @@ class set {
public: public:
struct iterator { struct iterator {
%typemap(javaclassmodifiers) iterator "protected class"
%extend { %extend {
void incrementUnchecked() { void incrementUnchecked() {
++(*$self); ++(*$self);
@ -149,6 +150,11 @@ class set {
} }
}; };
typedef KeyType key_type;
typedef KeyType value_type;
typedef size_t size_type;
typedef ptrdiff_t difference_type;
set(); set();
set(const set<KeyType>&); set(const set<KeyType>&);

54
Lib/java/std_unordered_map.i
View file

@ -46,10 +46,10 @@
namespace std { namespace std {
template<class KeyType, class ValueType > class unordered_map { template<class KeyType, class MappedType > class unordered_map {
%typemap(javabase) std::unordered_map<KeyType, ValueType> %typemap(javabase) std::unordered_map<KeyType, MappedType>
"java.util.AbstractMap<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>" "java.util.AbstractMap<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>"
%proxycode %{ %proxycode %{
@ -65,7 +65,7 @@ template<class KeyType, class ValueType > class unordered_map {
return containsImpl(($typemap(jboxtype, KeyType))key); return containsImpl(($typemap(jboxtype, KeyType))key);
} }
public $typemap(jboxtype, ValueType) get(Object key) { public $typemap(jboxtype, MappedType) get(Object key) {
if (!(key instanceof $typemap(jboxtype, KeyType))) { if (!(key instanceof $typemap(jboxtype, KeyType))) {
return null; return null;
} }
@ -78,11 +78,11 @@ template<class KeyType, class ValueType > class unordered_map {
return null; return null;
} }
public $typemap(jboxtype, ValueType) put($typemap(jboxtype, KeyType) key, public $typemap(jboxtype, MappedType) put($typemap(jboxtype, KeyType) key,
$typemap(jboxtype, ValueType) value) { $typemap(jboxtype, MappedType) value) {
Iterator itr = find(($typemap(jboxtype, KeyType)) key); Iterator itr = find(($typemap(jboxtype, KeyType)) key);
if (itr.isNot(end())) { if (itr.isNot(end())) {
$typemap(jboxtype, ValueType) oldValue = itr.getValue(); $typemap(jboxtype, MappedType) oldValue = itr.getValue();
itr.setValue(value); itr.setValue(value);
return oldValue; return oldValue;
} else { } else {
@ -91,14 +91,14 @@ template<class KeyType, class ValueType > class unordered_map {
} }
} }
public $typemap(jboxtype, ValueType) remove(Object key) { public $typemap(jboxtype, MappedType) remove(Object key) {
if (!(key instanceof $typemap(jboxtype, KeyType))) { if (!(key instanceof $typemap(jboxtype, KeyType))) {
return null; return null;
} }
Iterator itr = find(($typemap(jboxtype, KeyType)) key); Iterator itr = find(($typemap(jboxtype, KeyType)) key);
if (itr.isNot(end())) { if (itr.isNot(end())) {
$typemap(jboxtype, ValueType) oldValue = itr.getValue(); $typemap(jboxtype, MappedType) oldValue = itr.getValue();
removeUnchecked(itr); removeUnchecked(itr);
return oldValue; return oldValue;
} else { } else {
@ -106,17 +106,17 @@ template<class KeyType, class ValueType > class unordered_map {
} }
} }
public java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>> entrySet() { public java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>> entrySet() {
java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>> setToReturn = java.util.Set<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>> setToReturn =
new java.util.HashSet<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>>(); new java.util.HashSet<Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>>();
Iterator itr = begin(); Iterator itr = begin();
final Iterator end = end(); final Iterator end = end();
while(itr.isNot(end)) { while(itr.isNot(end)) {
setToReturn.add(new Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)>() { setToReturn.add(new Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)>() {
private Iterator iterator; private Iterator iterator;
private Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, ValueType)> init(Iterator iterator) { private Entry<$typemap(jboxtype, KeyType), $typemap(jboxtype, MappedType)> init(Iterator iterator) {
this.iterator = iterator; this.iterator = iterator;
return this; return this;
} }
@ -125,12 +125,12 @@ template<class KeyType, class ValueType > class unordered_map {
return iterator.getKey(); return iterator.getKey();
} }
public $typemap(jboxtype, ValueType) getValue() { public $typemap(jboxtype, MappedType) getValue() {
return iterator.getValue(); return iterator.getValue();
} }
public $typemap(jboxtype, ValueType) setValue($typemap(jboxtype, ValueType) newValue) { public $typemap(jboxtype, MappedType) setValue($typemap(jboxtype, MappedType) newValue) {
$typemap(jboxtype, ValueType) oldValue = iterator.getValue(); $typemap(jboxtype, MappedType) oldValue = iterator.getValue();
iterator.setValue(newValue); iterator.setValue(newValue);
return oldValue; return oldValue;
} }
@ -143,13 +143,19 @@ template<class KeyType, class ValueType > class unordered_map {
%} %}
public: public:
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef KeyType key_type;
typedef MappedType mapped_type;
unordered_map(); unordered_map();
unordered_map(const unordered_map<KeyType, ValueType >&); unordered_map(const unordered_map<KeyType, MappedType >&);
struct iterator { struct iterator {
%typemap(javaclassmodifiers) iterator "protected class"
%extend { %extend {
std::unordered_map<KeyType, ValueType >::iterator getNextUnchecked() { std::unordered_map<KeyType, MappedType >::iterator getNextUnchecked() {
std::unordered_map<KeyType, ValueType >::iterator copy = (*$self); std::unordered_map<KeyType, MappedType >::iterator copy = (*$self);
return ++copy; return ++copy;
} }
@ -161,11 +167,11 @@ template<class KeyType, class ValueType > class unordered_map {
return (*$self)->first; return (*$self)->first;
} }
ValueType getValue() const { MappedType getValue() const {
return (*$self)->second; return (*$self)->second;
} }
void setValue(const ValueType& newValue) { void setValue(const MappedType& newValue) {
(*$self)->second = newValue; (*$self)->second = newValue;
} }
} }
@ -188,11 +194,11 @@ template<class KeyType, class ValueType > class unordered_map {
return (self->count(key) > 0); return (self->count(key) > 0);
} }
void putUnchecked(const KeyType& key, const ValueType& value) { void putUnchecked(const KeyType& key, const MappedType& value) {
(*self)[key] = value; (*self)[key] = value;
} }
void removeUnchecked(const std::unordered_map<KeyType, ValueType >::iterator itr) { void removeUnchecked(const std::unordered_map<KeyType, MappedType >::iterator itr) {
self->erase(itr); self->erase(itr);
} }
} }

6
Lib/java/std_unordered_set.i
View file

@ -134,6 +134,7 @@ class unordered_set {
public: public:
struct iterator { struct iterator {
%typemap(javaclassmodifiers) iterator "protected class"
%extend { %extend {
void incrementUnchecked() { void incrementUnchecked() {
++(*$self); ++(*$self);
@ -149,6 +150,11 @@ class unordered_set {
} }
}; };
typedef KeyType key_type;
typedef KeyType value_type;
typedef size_t size_type;
typedef ptrdiff_t difference_type;
unordered_set(); unordered_set();
unordered_set(const unordered_set<KeyType>&); unordered_set(const unordered_set<KeyType>&);