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

Better variable naming consistency in STL containers

Browse source
This commit is contained in:
William S Fulton 2017-05-26 22:36:23 +01:00
commit fdca8e9829
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/csharp/std_array.i
View file

@ -174,7 +174,7 @@
bool empty() const; bool empty() const;
%rename(Fill) fill; %rename(Fill) fill;
void fill(const value_type& val); void fill(const value_type& value);
%rename(Swap) swap; %rename(Swap) swap;
void swap(array& other); void swap(array& other);
@ -192,9 +192,9 @@
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
void setitem(int index, const_reference val) throw (std::out_of_range) { void setitem(int index, const_reference value) throw (std::out_of_range) {
if (index>=0 && index<(int)$self->size()) if (index>=0 && index<(int)$self->size())
(*$self)[index] = val; (*$self)[index] = value;
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }

4
Lib/csharp/std_map.i
View file

@ -239,11 +239,11 @@
return iter != $self->end(); return iter != $self->end();
} }
void Add(const key_type& key, const mapped_type& val) throw (std::out_of_range) { void Add(const key_type& key, const mapped_type& value) throw (std::out_of_range) {
std::map< K, T, C >::iterator iter = $self->find(key); std::map< K, T, C >::iterator iter = $self->find(key);
if (iter != $self->end()) if (iter != $self->end())
throw std::out_of_range("key already exists"); throw std::out_of_range("key already exists");
$self->insert(std::pair< K, T >(key, val)); $self->insert(std::pair< K, T >(key, value));
} }
bool Remove(const key_type& key) { bool Remove(const key_type& key) {

4
Lib/csharp/std_vector.i
View file

@ -231,9 +231,9 @@
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }
void setitem(int index, CTYPE const& val) throw (std::out_of_range) { void setitem(int index, CTYPE const& value) throw (std::out_of_range) {
if (index>=0 && index<(int)$self->size()) if (index>=0 && index<(int)$self->size())
(*$self)[index] = val; (*$self)[index] = value;
else else
throw std::out_of_range("index"); throw std::out_of_range("index");
} }

8
Lib/d/std_vector.i
View file

@ -165,11 +165,11 @@ public void capacity(size_t value) {
// generation issue when using const pointers as vector elements (like // generation issue when using const pointers as vector elements (like
// std::vector< const int* >). // std::vector< const int* >).
%extend { %extend {
void setElement(size_type index, CTYPE const& val) throw (std::out_of_range) { void setElement(size_type index, CTYPE const& value) throw (std::out_of_range) {
if ((index < 0) || ($self->size() <= index)) { if ((index < 0) || ($self->size() <= index)) {
throw std::out_of_range("Tried to set value of element with invalid index."); throw std::out_of_range("Tried to set value of element with invalid index.");
} }
(*$self)[index] = val; (*$self)[index] = value;
} }
} }
@ -517,11 +517,11 @@ int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg)
// generation issue when using const pointers as vector elements (like // generation issue when using const pointers as vector elements (like
// std::vector< const int* >). // std::vector< const int* >).
%extend { %extend {
void setElement(size_type index, CTYPE const& val) throw (std::out_of_range) { void setElement(size_type index, CTYPE const& value) throw (std::out_of_range) {
if ((index < 0) || ($self->size() <= index)) { if ((index < 0) || ($self->size() <= index)) {
throw std::out_of_range("Tried to set value of element with invalid index."); throw std::out_of_range("Tried to set value of element with invalid index.");
} }
(*$self)[index] = val; (*$self)[index] = value;
} }
} }

4
Lib/java/std_array.i
View file

@ -29,10 +29,10 @@ namespace std {
else else
throw std::out_of_range("array index out of range"); throw std::out_of_range("array index out of range");
} }
void set(int i, const value_type& val) throw (std::out_of_range) { void set(int i, const value_type& value) 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)
(*self)[i] = val; (*self)[i] = value;
else else
throw std::out_of_range("array index out of range"); throw std::out_of_range("array index out of range");
} }

4
Lib/java/std_vector.i
View file

@ -130,11 +130,11 @@ int size_as_int(std::size_t sz) {
throw std::out_of_range("vector index out of range"); throw std::out_of_range("vector index out of range");
} }
value_type doSet(int i, const value_type& val) throw (std::out_of_range) { value_type doSet(int i, const value_type& value) throw (std::out_of_range) {
const int size = size_as_int(self->size()); const int size = size_as_int(self->size());
if (i>=0 && i<size) { if (i>=0 && i<size) {
CTYPE const old_value = (*self)[i]; CTYPE const old_value = (*self)[i];
(*self)[i] = val; (*self)[i] = value;
return old_value; return old_value;
} }
else else