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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

60
Lib/ruby/std_map.i
View file

@ -132,18 +132,12 @@
}
%define %swig_map_common(Map...)
// %swig_sequence_methods_common(Map);
// %swig_sequence_iterator(Map);
%swig_container_methods(%arg(Map));
// %swig_sequence_iterator(%arg(Map));
%extend {
VALUE __getitem__(const key_type& key) const {
Map::const_iterator i = self->find(key);
if ( i != self->end() )
return swig::from( i->second );
else
return Qnil;
}
%rename("delete") __delitem__;
VALUE __delitem__(const key_type& key) {
Map::iterator i = self->find(key);
if (i != self->end()) {
@ -179,6 +173,27 @@
return ary;
}
Map* each()
{
if ( !rb_block_given_p() )
rb_raise( rb_eArgError, "no block given");
VALUE k, v;
Map::iterator i = self->begin();
Map::iterator e = self->end();
for ( ; i != e; ++i )
{
const Map::key_type& key = i->first;
const Map::mapped_type& val = i->second;
k = swig::from<Map::key_type>(key);
v = swig::from<Map::mapped_type>(val);
rb_yield_values(2, k, v);
}
return self;
}
Map* each_key()
{
if ( !rb_block_given_p() )
@ -271,6 +286,13 @@
%define %swig_map_methods(Map...)
%swig_map_common(Map)
%extend {
VALUE __getitem__(const key_type& key) const {
Map::const_iterator i = self->find(key);
if ( i != self->end() )
return swig::from<Map::mapped_type>( i->second );
else
return Qnil;
}
void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
(*self)[key] = x;
@ -287,9 +309,11 @@
for ( ; i != e; ++i, comma = true )
{
if (comma) str = rb_str_cat2( str, "," );
// @todo: improve -- this should just be swig::from(*i)
tmp = swig::from< std::pair<Map::key_type,
Map::mapped_type> >( *i );
tmp = swig::from< Map::key_type >( i->first );
tmp = rb_obj_as_string( tmp );
str = rb_str_buf_append( str, tmp );
str = rb_str_cat2( str, "=>" );
tmp = swig::from< Map::mapped_type >( i->second );
tmp = rb_obj_as_string( tmp );
str = rb_str_buf_append( str, tmp );
}
@ -334,4 +358,16 @@
%enddef
#if defined(SWIG_RUBY_AUTORENAME)
%mixin std::map "Enumerable";
%rename("empty?") std::map::empty;
#else
%mixin std::map "Enumerable";
%rename("empty?") std::map::empty;
#endif
%include <std/std_map.i>