Added proper each(), printing and other methods to map

and multimap.




git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9733 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Gonzalo Garramuno 2007-05-01 05:43:30 +00:00
commit c0a7c7e081
5 changed files with 104 additions and 50 deletions

View file

@ -86,9 +86,28 @@
}
%define %swig_multimap_methods(MultiMap...)
%swig_map_common(MultiMap);
%swig_container_methods(%arg(MultiMap));
%swig_map_common(%arg(MultiMap));
%extend {
VALUE __getitem__(const key_type& key) const {
MultiMap::const_iterator i = self->find(key);
if ( i != self->end() )
{
MultiMap::const_iterator e = $self->upper_bound(key);
VALUE ary = rb_ary_new();
for ( ; i != e; ++i )
{
rb_ary_push( ary, swig::from<MultiMap::mapped_type>( i->second ) );
}
if ( RARRAY_LEN(ary) == 1 )
return RARRAY_PTR(ary)[0];
return ary;
}
else
return Qnil;
}
void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
self->insert(MultiMap::value_type(key,x));
}
@ -106,6 +125,7 @@
const MultiMap::key_type& oldkey = key;
tmp = swig::from( key );
str = rb_str_buf_append( str, rb_inspect(tmp) );
str = rb_str_cat2( str, "=>" );
VALUE vals = rb_ary_new();
for ( ; i != e && key == oldkey; ++i )
@ -191,5 +211,18 @@
}
%enddef
#if defined(SWIG_RUBY_AUTORENAME)
%mixin std::multimap "Enumerable";
%rename("empty?") std::multimap::empty;
#else
%mixin std::multimap "Enumerable";
%rename("empty?") std::multimap::empty;
#endif
%include <std/std_multimap.i>