Add missing parameter names in STL container wrappers

Mostly in STL copy constructors.

Best to have parameter names as they make their way into the wrappers in
some target languages.
This commit is contained in:
William S Fulton 2019-02-12 22:04:58 +00:00
commit 6d0c495fd0
49 changed files with 72 additions and 74 deletions

View file

@ -36,7 +36,7 @@ namespace std{
list();
list(unsigned int size, const T& value = T());
list(const list<T> &);
list(const list<T> &other);
~list();
void assign(unsigned int n, const T& value);

View file

@ -24,7 +24,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -28,7 +28,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -219,7 +219,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C> &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;
@ -435,7 +435,7 @@ namespace std {
%rename("has-key?") has_key;
public:
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;
@ -641,7 +641,7 @@ namespace std {
%rename("has-key?") has_key;
public:
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;
@ -849,7 +849,7 @@ namespace std {
%rename("has-key?") has_key;
public:
map();
map(const map< K, T, C> &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -189,7 +189,7 @@ namespace std {
public:
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector<T>&);
vector(const vector<T>& other);
%rename(length) size;
unsigned int size() const;
%rename("empty?") empty;
@ -353,7 +353,7 @@ namespace std {
public:
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector<T>&);
vector(const vector<T>& other);
%rename(length) size;
unsigned int size() const;
%rename("empty?") empty;

View file

@ -154,7 +154,7 @@ template<class KeyType, class MappedType, class Comparator = std::less<KeyType>
typedef const value_type& const_reference;
map();
map(const map<KeyType, MappedType, Comparator >&);
map(const map<KeyType, MappedType, Comparator >& other);
struct iterator {
%typemap(javaclassmodifiers) iterator "protected class"
@ -185,7 +185,7 @@ template<class KeyType, class MappedType, class Comparator = std::less<KeyType>
%rename(isEmpty) empty;
bool empty() const;
void clear();
iterator find(const KeyType&);
iterator find(const KeyType& key);
iterator begin();
iterator end();
%extend {

View file

@ -160,7 +160,7 @@ class set {
typedef const value_type& const_reference;
set();
set(const set<T>&);
set(const set<T>& other);
%rename(isEmpty) empty;
bool empty() const;

View file

@ -153,7 +153,7 @@ template<class KeyType, class MappedType > class unordered_map {
typedef const value_type& const_reference;
unordered_map();
unordered_map(const unordered_map<KeyType, MappedType >&);
unordered_map(const unordered_map<KeyType, MappedType >& other);
struct iterator {
%typemap(javaclassmodifiers) iterator "protected class"
@ -184,7 +184,7 @@ template<class KeyType, class MappedType > class unordered_map {
%rename(isEmpty) empty;
bool empty() const;
void clear();
iterator find(const KeyType&);
iterator find(const KeyType& key);
iterator begin();
iterator end();
%extend {

View file

@ -160,7 +160,7 @@ class unordered_set {
typedef const value_type& const_reference;
unordered_set();
unordered_set(const unordered_set<T>&);
unordered_set(const unordered_set<T>& other);
%rename(isEmpty) empty;
bool empty() const;

View file

@ -28,7 +28,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -28,7 +28,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -28,7 +28,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C> &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -37,6 +37,6 @@ namespace std {
};
template <class T, class U >
pair<T,U> make_pair(const T&,const U&);
pair<T,U> make_pair(const T& t,const U& u);
}

View file

@ -109,7 +109,6 @@ as this is overloaded by the const char* version
public:
string();
string(const char*);
//string(const string&);
unsigned int size() const;
unsigned int length() const;
bool empty() const;
@ -119,7 +118,6 @@ as this is overloaded by the const char* version
// assign does not return a copy of this object
// (no point in a scripting language)
void assign(const char*);
//void assign(const string&);
// no support for all the other features
// it's probably better to do it in lua
};

View file

@ -27,7 +27,7 @@ namespace std {
public:
vector();
vector(unsigned int);
vector(const vector&);
vector(const vector& other);
vector(unsigned int,T);
unsigned int size() const;
unsigned int max_size() const;

View file

@ -222,7 +222,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;
@ -442,7 +442,7 @@ namespace std {
%rename("has-key?") has_key;
public:
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;
@ -654,7 +654,7 @@ namespace std {
%rename("has-key?") has_key;
public:
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;
@ -866,7 +866,7 @@ namespace std {
%rename("has-key?") has_key;
public:
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -191,7 +191,7 @@ namespace std {
public:
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector<T>&);
vector(const vector<T>& other);
%rename(length) size;
unsigned int size() const;
%rename("empty?") empty;
@ -367,7 +367,7 @@ namespace std {
public:
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector<T>&);
vector(const vector<T>& other);
%rename(length) size;
unsigned int size() const;
%rename("empty?") empty;

View file

@ -25,7 +25,7 @@ namespace std{
list();
list(unsigned int size, const T& value = T());
list(const list<T> &);
list(const list<T>& other);
~list();
void assign(unsigned int n, const T& value);

View file

@ -27,7 +27,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -43,7 +43,7 @@ namespace std {
public:
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector<T>&);
vector(const vector<T>& other);
unsigned int size() const;
bool empty() const;
void clear();

View file

@ -12,7 +12,7 @@
template <class T>
struct traits_from<std::deque<T> > {
static octave_value from(const std::deque<T> & vec) {
static octave_value from(const std::deque<T>& vec) {
return traits_from_stdseq<std::deque<T> >::from(vec);
}
};

View file

@ -12,7 +12,7 @@
template <class T>
struct traits_from<std::list<T> > {
static octave_value *from(const std::list<T> & vec) {
static octave_value *from(const std::list<T>& vec) {
return traits_from_stdseq<std::list<T> >::from(vec);
}
};

View file

@ -193,7 +193,7 @@ namespace std {
typedef const value_type& const_reference;
list();
list(const list<T> &);
list(const list<T>& other);
unsigned int size() const;
bool empty() const;
@ -346,7 +346,7 @@ namespace std {
typedef const value_type& const_reference;
list();
list(const list<T> &);
list(const list<T>& other);
unsigned int size() const;
bool empty() const;

View file

@ -28,7 +28,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -185,7 +185,7 @@ namespace std {
typedef const value_type& const_reference;
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector<T> &);
vector(const vector<T>& other);
unsigned int size() const;
bool empty() const;
@ -357,7 +357,7 @@ namespace std {
typedef const value_type& const_reference;
vector(unsigned int size = 0);
vector(unsigned int size, T *value);
vector(const vector<T *> &);
vector(const vector<T *>& other);
unsigned int size() const;
bool empty() const;
@ -528,7 +528,7 @@ namespace std {
typedef const value_type& const_reference;
vector(unsigned int size = 0);
vector(unsigned int size, T value);
vector(const vector<T> &);
vector(const vector<T>& other);
unsigned int size() const;
bool empty() const;

View file

@ -28,7 +28,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
void clear();

View file

@ -14,7 +14,7 @@
template <class T>
struct traits_from<std::deque<T> > {
static PyObject *from(const std::deque<T> & vec) {
static PyObject *from(const std::deque<T>& vec) {
return traits_from_stdseq<std::deque<T> >::from(vec);
}
};

View file

@ -14,7 +14,7 @@
template <class T>
struct traits_from<std::list<T> > {
static PyObject *from(const std::list<T> & vec) {
static PyObject *from(const std::list<T>& vec) {
return traits_from_stdseq<std::list<T> >::from(vec);
}
};

View file

@ -943,7 +943,7 @@ namespace swig
}
}
catch( const std::invalid_argument & )
catch(const std::invalid_argument &)
{
rb_raise( rb_eArgError, "%s",
Ruby_Format_TypeError( "",
@ -970,7 +970,7 @@ namespace swig
Sequence::value_type val = swig::as<Sequence::value_type>( elem );
$self->insert( start, val );
}
catch( const std::invalid_argument & )
catch(const std::invalid_argument &)
{
rb_raise( rb_eArgError, "%s",
Ruby_Format_TypeError( "",

View file

@ -69,7 +69,7 @@
*i = swig::as< Type >( r );
}
}
catch ( const std::invalid_argument& )
catch (const std::invalid_argument&)
{
rb_raise(rb_eTypeError,
"Yield block did not return a valid element for " "Container");

View file

@ -14,7 +14,7 @@
template <class T>
struct traits_from<std::deque<T> > {
static VALUE from(const std::deque<T> & vec) {
static VALUE from(const std::deque<T>& vec) {
return traits_from_stdseq<std::deque<T> >::from(vec);
}
};

View file

@ -14,7 +14,7 @@
template <class T>
struct traits_from<std::list<T> > {
static VALUE from(const std::list<T> & vec) {
static VALUE from(const std::list<T>& vec) {
return traits_from_stdseq<std::list<T> >::from(vec);
}
};

View file

@ -14,7 +14,7 @@
template <class T>
struct traits_from<std::queue<T> > {
static VALUE from(const std::queue<T> & vec) {
static VALUE from(const std::queue<T>& vec) {
return traits_from_stdseq<std::queue<T> >::from(vec);
}
};

View file

@ -14,7 +14,7 @@
template <class T>
struct traits_from<std::stack<T> > {
static VALUE from(const std::stack<T> & vec) {
static VALUE from(const std::stack<T>& vec) {
return traits_from_stdseq<std::stack<T> >::from(vec);
}
};

View file

@ -23,7 +23,7 @@ namespace std {
// add typemaps here
public:
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -31,9 +31,9 @@ namespace std
allocator() throw();
allocator(const allocator&) throw();
allocator(const allocator& other) throw();
template<typename _Tp1>
allocator(const allocator<_Tp1>&) throw();
allocator(const allocator<_Tp1>& other) throw();
~allocator() throw();

View file

@ -11,7 +11,7 @@
%define %std_container_methods_non_resizable(container...)
container();
container(const container&);
container(const container& other);
bool empty() const;
size_type size() const;

View file

@ -153,10 +153,10 @@ namespace std {
//50. Copy constructor and assignment operator of ios_base
private:
ios_base(const ios_base&);
ios_base(const ios_base& other);
ios_base&
operator=(const ios_base&);
operator=(const ios_base& other);
};
template<typename _CharT, typename _Traits = char_traits<_CharT> >
@ -242,10 +242,10 @@ namespace std {
// 27.4.5.1 basic_ios constructors
basic_ios();
private:
basic_ios(const basic_ios&);
basic_ios(const basic_ios& other);
basic_ios&
operator=(const basic_ios&);
operator=(const basic_ios& other);
};
}

View file

@ -306,15 +306,15 @@ namespace std
template<typename _CharT, typename _Traits = char_traits<_CharT> >
std::basic_ostream<_CharT, _Traits>&
endl(std::basic_ostream<_CharT, _Traits>&);
endl(std::basic_ostream<_CharT, _Traits>& value);
template<typename _CharT, typename _Traits = char_traits<_CharT> >
std::basic_ostream<_CharT, _Traits>&
ends(std::basic_ostream<_CharT, _Traits>&);
ends(std::basic_ostream<_CharT, _Traits>& value);
template<typename _CharT, typename _Traits = char_traits<_CharT> >
std::basic_ostream<_CharT, _Traits>&
flush(std::basic_ostream<_CharT, _Traits>&);
flush(std::basic_ostream<_CharT, _Traits>& value);
}
namespace std {

View file

@ -113,7 +113,7 @@ namespace std {
%typemap_traits_ptr(SWIG_TYPECHECK_MAP, std::map< _Key, _Tp, _Compare, _Alloc >);
map( const _Compare& );
map(const _Compare& other);
#ifdef %swig_map_methods
// Add swig/language extra methods

View file

@ -89,7 +89,7 @@ namespace std {
%typemap_traits_ptr(SWIG_TYPECHECK_MULTIMAP, std::multimap< _Key, _Tp, _Compare, _Alloc >);
multimap( const _Compare& );
multimap(const _Compare& other);
#ifdef %swig_multimap_methods
// Add swig/language extra methods

View file

@ -71,7 +71,7 @@ namespace std {
%typemap_traits_ptr(SWIG_TYPECHECK_MULTISET, std::multiset< _Key, _Compare, _Alloc >);
multiset( const _Compare& );
multiset(const _Compare& other);
#ifdef %swig_multiset_methods
// Add swig/language extra methods

View file

@ -13,14 +13,14 @@
%define %std_queue_methods(queue...)
queue();
queue( const _Sequence& );
queue(const _Sequence& other);
bool empty() const;
size_type size() const;
const value_type& front() const;
const value_type& back() const;
void pop();
void push( const value_type& );
void push(const value_type& value);
%enddef
%define %std_queue_methods_val(queue...)

View file

@ -8,7 +8,7 @@
// Set
%define %std_set_methods_common(set...)
set();
set( const set& );
set(const set& other);
bool empty() const;
size_type size() const;
@ -110,7 +110,7 @@ namespace std {
%typemap_traits_ptr(SWIG_TYPECHECK_SET, std::set< _Key, _Compare, _Alloc >);
set( const _Compare& );
set(const _Compare& other);
#ifdef %swig_set_methods
// Add swig/language extra methods

View file

@ -13,13 +13,13 @@
%define %std_stack_methods(stack...)
stack();
stack( const _Sequence& );
stack(const _Sequence& other);
bool empty() const;
size_type size() const;
const value_type& top() const;
void pop();
void push( const value_type& );
void push(const value_type& value);
%enddef
%define %std_stack_methods_val(stack...)

View file

@ -81,7 +81,7 @@ namespace std {
basic_streambuf();
private:
basic_streambuf(const basic_streambuf&);
basic_streambuf(const basic_streambuf& other);
};
}

View file

@ -8,7 +8,7 @@
// Unordered Set
%define %std_unordered_set_methods_common(unordered_set...)
unordered_set();
unordered_set( const unordered_set& );
unordered_set(const unordered_set& other);
bool empty() const;
size_type size() const;

View file

@ -27,7 +27,7 @@ namespace std {
typedef K key_type;
typedef T mapped_type;
map();
map(const map< K, T, C > &);
map(const map< K, T, C >& other);
unsigned int size() const;
bool empty() const;

View file

@ -210,7 +210,7 @@ namespace std {
public:
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector< T > &);
vector(const vector< T >& other);
unsigned int size() const;
bool empty() const;
@ -361,7 +361,7 @@ namespace std {
public:
vector(unsigned int size = 0);
vector(unsigned int size, const T& value);
vector(const vector< T > &);
vector(const vector< T >& other);
unsigned int size() const;
bool empty() const;