aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Richard Brown <rbrown@exherbo.org> 2007-07-05 16:00:48 +0000
committerAvatar Richard Brown <rbrown@exherbo.org> 2007-07-05 16:00:48 +0000
commitf2f25559128cf4a93848b2a81904e522b33fb1de (patch)
treed4e92bb53f7dedf4097bca8bdee263a9feb74710
parentc9f239feaa0aefed8ccf33f0ad0ba0baff91b380 (diff)
downloadpaludis-f2f25559128cf4a93848b2a81904e522b33fb1de.tar.gz
paludis-f2f25559128cf4a93848b2a81904e522b33fb1de.tar.xz
(ruby) New collection fixes.
-rw-r--r--ruby/dep_list.cc1
-rw-r--r--ruby/dep_spec.cc1
-rw-r--r--ruby/environment.cc8
-rw-r--r--ruby/find_unused_packages_task.cc1
-rw-r--r--ruby/package_database.cc1
-rw-r--r--ruby/package_id.cc81
-rw-r--r--ruby/package_id_TEST.rb16
-rw-r--r--ruby/repository.cc26
8 files changed, 70 insertions, 65 deletions
diff --git a/ruby/dep_list.cc b/ruby/dep_list.cc
index 1c2e92f..ee15001 100644
--- a/ruby/dep_list.cc
+++ b/ruby/dep_list.cc
@@ -19,7 +19,6 @@
#include <paludis_ruby.hh>
#include <paludis/dep_list/dep_list.hh>
-#include <paludis/util/collection_concrete.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <ruby.h>
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index 22744c3..93f4a27 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -24,6 +24,7 @@
#include <paludis/version_operator.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/sequence.hh>
#include <ruby.h>
using namespace paludis;
diff --git a/ruby/environment.cc b/ruby/environment.cc
index ce79d00..1e82ef9 100644
--- a/ruby/environment.cc
+++ b/ruby/environment.cc
@@ -23,9 +23,9 @@
#include <paludis/environments/no_config/no_config_environment.hh>
#include <paludis/environments/adapted/adapted_environment.hh>
#include <paludis/environments/environment_maker.hh>
-#include <paludis/util/collection_concrete.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/set.hh>
#include <ruby.h>
using namespace paludis;
@@ -193,7 +193,7 @@ namespace
{
try
{
- tr1::shared_ptr<KeywordNameCollection> knc (new KeywordNameCollection::Concrete);
+ tr1::shared_ptr<KeywordNameSet> knc (new KeywordNameSet);
long len = NUM2LONG(rb_funcall(keywords,rb_intern("length"),0));
for (long i = 0; i < len; i++)
{
@@ -231,9 +231,9 @@ namespace
VALUE
environment_default_destinations(VALUE self)
{
- tr1::shared_ptr<const DestinationsCollection> dc (value_to_environment(self)->default_destinations());
+ tr1::shared_ptr<const DestinationsSet> dc (value_to_environment(self)->default_destinations());
VALUE result(rb_ary_new());
- for (DestinationsCollection::Iterator i(dc->begin()), i_end(dc->end()) ; i != i_end ; ++i)
+ for (DestinationsSet::Iterator i(dc->begin()), i_end(dc->end()) ; i != i_end ; ++i)
rb_ary_push(result, repository_to_value(*i));
return result;
diff --git a/ruby/find_unused_packages_task.cc b/ruby/find_unused_packages_task.cc
index 41098ca..e19d7ba 100644
--- a/ruby/find_unused_packages_task.cc
+++ b/ruby/find_unused_packages_task.cc
@@ -21,6 +21,7 @@
#include <paludis/tasks/find_unused_packages_task.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/sequence-impl.hh>
#include <ruby.h>
using namespace paludis;
diff --git a/ruby/package_database.cc b/ruby/package_database.cc
index 5b7d92e..5916f96 100644
--- a/ruby/package_database.cc
+++ b/ruby/package_database.cc
@@ -22,6 +22,7 @@
#include <paludis/util/stringify.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/sequence.hh>
#include <ruby.h>
using namespace paludis;
diff --git a/ruby/package_id.cc b/ruby/package_id.cc
index b7b9ac9..716ac4b 100644
--- a/ruby/package_id.cc
+++ b/ruby/package_id.cc
@@ -18,10 +18,11 @@
*/
#include <paludis_ruby.hh>
-#include <paludis/util/visitor-impl.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
+#include <paludis/util/set.hh>
#include <ruby.h>
using namespace paludis;
@@ -38,10 +39,10 @@ namespace
static VALUE c_metadata_string_key;
static VALUE c_metadata_time_key;
static VALUE c_metadata_contents_key;
- static VALUE c_metadata_keyword_name_collection_key;
- static VALUE c_metadata_use_flag_name_collection_key;
- static VALUE c_metadata_iuse_flag_collection_key;
- static VALUE c_metadata_inherited_collection_key;
+ static VALUE c_metadata_keyword_name_set_key;
+ static VALUE c_metadata_use_flag_name_set_key;
+ static VALUE c_metadata_iuse_flag_set_key;
+ static VALUE c_metadata_inherited_set_key;
static VALUE c_metadata_key_type;
struct V :
@@ -79,28 +80,28 @@ namespace
new tr1::shared_ptr<const MetadataContentsKey>(tr1::static_pointer_cast<const MetadataContentsKey>(mm)));
}
- void visit(const MetadataCollectionKey<KeywordNameCollection> &)
+ void visit(const MetadataSetKey<KeywordNameSet> &)
{
- value = Data_Wrap_Struct(c_metadata_keyword_name_collection_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<KeywordNameCollection> > >::free,
- new tr1::shared_ptr<const MetadataCollectionKey<KeywordNameCollection> >(tr1::static_pointer_cast<const MetadataCollectionKey<KeywordNameCollection> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_keyword_name_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> > >::free,
+ new tr1::shared_ptr<const MetadataSetKey<KeywordNameSet> >(tr1::static_pointer_cast<const MetadataSetKey<KeywordNameSet> >(mm)));
}
- void visit(const MetadataCollectionKey<UseFlagNameCollection> &)
+ void visit(const MetadataSetKey<UseFlagNameSet> &)
{
- value = Data_Wrap_Struct(c_metadata_use_flag_name_collection_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameCollection> > >::free,
- new tr1::shared_ptr<const MetadataCollectionKey<UseFlagNameCollection> >(tr1::static_pointer_cast<const MetadataCollectionKey<UseFlagNameCollection> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_use_flag_name_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<UseFlagNameSet> > >::free,
+ new tr1::shared_ptr<const MetadataSetKey<UseFlagNameSet> >(tr1::static_pointer_cast<const MetadataSetKey<UseFlagNameSet> >(mm)));
}
- void visit(const MetadataCollectionKey<IUseFlagCollection> &)
+ void visit(const MetadataSetKey<IUseFlagSet> &)
{
- value = Data_Wrap_Struct(c_metadata_iuse_flag_collection_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<IUseFlagCollection> > >::free,
- new tr1::shared_ptr<const MetadataCollectionKey<IUseFlagCollection> >(tr1::static_pointer_cast<const MetadataCollectionKey<IUseFlagCollection> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_iuse_flag_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> > >::free,
+ new tr1::shared_ptr<const MetadataSetKey<IUseFlagSet> >(tr1::static_pointer_cast<const MetadataSetKey<IUseFlagSet> >(mm)));
}
- void visit(const MetadataCollectionKey<InheritedCollection> &)
+ void visit(const MetadataSetKey<InheritedSet> &)
{
- value = Data_Wrap_Struct(c_metadata_inherited_collection_key, 0, &Common<tr1::shared_ptr<const MetadataCollectionKey<InheritedCollection> > >::free,
- new tr1::shared_ptr<const MetadataCollectionKey<InheritedCollection> >(tr1::static_pointer_cast<const MetadataCollectionKey<InheritedCollection> >(mm)));
+ value = Data_Wrap_Struct(c_metadata_inherited_set_key, 0, &Common<tr1::shared_ptr<const MetadataSetKey<InheritedSet> > >::free,
+ new tr1::shared_ptr<const MetadataSetKey<InheritedSet> >(tr1::static_pointer_cast<const MetadataSetKey<InheritedSet> >(mm)));
}
void visit(const MetadataSpecTreeKey<LicenseSpecTree> &)
@@ -250,7 +251,7 @@ namespace
* Document-method: keywords_key
*
* call-seq:
- * keywords_key -> MetadataCollectionKey
+ * keywords_key -> MetadataSetKey
*
* Our keywords
*/
@@ -258,7 +259,7 @@ namespace
* Document-method: use_key
*
* call-seq:
- * use_key -> MetadataCollectionKey
+ * use_key -> MetadataSetKey
*
* Our use flags
*/
@@ -266,7 +267,7 @@ namespace
* Document-method: iuse_key
*
* call-seq:
- * iuse_key -> MetadataCollectionKey
+ * iuse_key -> MetadataSetKey
*
* Our iuse flags
*/
@@ -274,7 +275,7 @@ namespace
* Document-method: inherited_key
*
* call-seq:
- * inherited_key -> MetadataCollectionKey
+ * inherited_key -> MetadataSetKey
*
* Our inherited
*/
@@ -402,13 +403,13 @@ namespace
}
template <typename T_>
- struct CollectionValue
+ struct SetValue
{
static VALUE
fetch(VALUE self)
{
- tr1::shared_ptr<const MetadataCollectionKey<T_> > * self_ptr;
- Data_Get_Struct(self, tr1::shared_ptr<const MetadataCollectionKey<T_> >, self_ptr);
+ tr1::shared_ptr<const MetadataSetKey<T_> > * self_ptr;
+ Data_Get_Struct(self, tr1::shared_ptr<const MetadataSetKey<T_> >, self_ptr);
tr1::shared_ptr<const T_> c = (*self_ptr)->value();
VALUE result (rb_ary_new());
for (typename T_::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
@@ -433,10 +434,10 @@ namespace
rb_define_method(c_package_id, "repository", RUBY_FUNC_CAST(&package_id_repository), 0);
rb_define_method(c_package_id, "eapi", RUBY_FUNC_CAST(&package_id_eapi), 0);
rb_define_method(c_package_id, "==", RUBY_FUNC_CAST(&package_id_equal), 1);
- rb_define_method(c_package_id, "keywords_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<KeywordNameCollection>,&PackageID::keywords_key>::fetch)), 0);
- rb_define_method(c_package_id, "use_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<UseFlagNameCollection>,&PackageID::use_key>::fetch)), 0);
- rb_define_method(c_package_id, "iuse_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<IUseFlagCollection>,&PackageID::iuse_key>::fetch)), 0);
- rb_define_method(c_package_id, "inherited_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<InheritedCollection>,&PackageID::inherited_key>::fetch)), 0);
+ rb_define_method(c_package_id, "keywords_key", RUBY_FUNC_CAST((&KeyValue<MetadataSetKey<KeywordNameSet>,&PackageID::keywords_key>::fetch)), 0);
+ rb_define_method(c_package_id, "use_key", RUBY_FUNC_CAST((&KeyValue<MetadataSetKey<UseFlagNameSet>,&PackageID::use_key>::fetch)), 0);
+ rb_define_method(c_package_id, "iuse_key", RUBY_FUNC_CAST((&KeyValue<MetadataSetKey<IUseFlagSet>,&PackageID::iuse_key>::fetch)), 0);
+ rb_define_method(c_package_id, "inherited_key", RUBY_FUNC_CAST((&KeyValue<MetadataSetKey<InheritedSet>,&PackageID::inherited_key>::fetch)), 0);
rb_define_method(c_package_id, "short_description_key", RUBY_FUNC_CAST((&KeyValue<MetadataStringKey,&PackageID::short_description_key>::fetch)), 0);
rb_define_method(c_package_id, "long_description_key", RUBY_FUNC_CAST((&KeyValue<MetadataStringKey,&PackageID::long_description_key>::fetch)), 0);
rb_define_method(c_package_id, "contents_key", RUBY_FUNC_CAST((&KeyValue<MetadataContentsKey,&PackageID::contents_key>::fetch)), 0);
@@ -500,36 +501,36 @@ namespace
rb_define_method(c_metadata_contents_key, "value", RUBY_FUNC_CAST(&metadata_contents_key_value), 0);
/*
- * Document-class: Paludis::MetadataKeywordNameCollectionKey
+ * Document-class: Paludis::MetadataKeywordNameSetKey
*
* Metadata class for Use flag names
*/
- c_metadata_keyword_name_collection_key = rb_define_class_under(paludis_module(), "MetadataKeywordNameCollectionKey", c_metadata_key);
- rb_define_method(c_metadata_keyword_name_collection_key, "value", RUBY_FUNC_CAST((&CollectionValue<KeywordNameCollection>::fetch)), 0);
+ c_metadata_keyword_name_set_key = rb_define_class_under(paludis_module(), "MetadataKeywordNameSetKey", c_metadata_key);
+ rb_define_method(c_metadata_keyword_name_set_key, "value", RUBY_FUNC_CAST((&SetValue<KeywordNameSet>::fetch)), 0);
/*
- * Document-class: Paludis::MetadataUseFlagNameCollectionKey
+ * Document-class: Paludis::MetadataUseFlagNameSetKey
*
* Metadata class for Use flag names
*/
- c_metadata_use_flag_name_collection_key = rb_define_class_under(paludis_module(), "MetadataUseFlagNameCollectionKey", c_metadata_key);
- rb_define_method(c_metadata_use_flag_name_collection_key, "value", RUBY_FUNC_CAST((&CollectionValue<UseFlagNameCollection>::fetch)), 0);
+ c_metadata_use_flag_name_set_key = rb_define_class_under(paludis_module(), "MetadataUseFlagNameSetKey", c_metadata_key);
+ rb_define_method(c_metadata_use_flag_name_set_key, "value", RUBY_FUNC_CAST((&SetValue<UseFlagNameSet>::fetch)), 0);
/*
- * Document-class: Paludis::MetadataIUseFlagCollectionKey
+ * Document-class: Paludis::MetadataIUseFlagSetKey
*
* Metadata class for IUse flags
*/
- c_metadata_iuse_flag_collection_key = rb_define_class_under(paludis_module(), "MetadataIUseFlagCollectionKey", c_metadata_key);
- rb_define_method(c_metadata_iuse_flag_collection_key, "value", RUBY_FUNC_CAST((&CollectionValue<IUseFlagCollection>::fetch)), 0);
+ c_metadata_iuse_flag_set_key = rb_define_class_under(paludis_module(), "MetadataIUseFlagSetKey", c_metadata_key);
+ rb_define_method(c_metadata_iuse_flag_set_key, "value", RUBY_FUNC_CAST((&SetValue<IUseFlagSet>::fetch)), 0);
/*
- * Document-class: Paludis::MetadataInheritedCollectionKey
+ * Document-class: Paludis::MetadataInheritedSetKey
*
* Metadata class for Inherited
*/
- c_metadata_inherited_collection_key = rb_define_class_under(paludis_module(), "MetadataInheritedCollectionKey", c_metadata_key);
- rb_define_method(c_metadata_inherited_collection_key, "value", RUBY_FUNC_CAST((&CollectionValue<InheritedCollection>::fetch)), 0);
+ c_metadata_inherited_set_key = rb_define_class_under(paludis_module(), "MetadataInheritedSetKey", c_metadata_key);
+ rb_define_method(c_metadata_inherited_set_key, "value", RUBY_FUNC_CAST((&SetValue<InheritedSet>::fetch)), 0);
/*
* Document-module: Paludis::MetadataKeyType
diff --git a/ruby/package_id_TEST.rb b/ruby/package_id_TEST.rb
index 7909ebd..0fab703 100644
--- a/ruby/package_id_TEST.rb
+++ b/ruby/package_id_TEST.rb
@@ -52,7 +52,7 @@ module Paludis
include TestStuff
def classes
- [MetadataStringKey, MetadataContentsKey, MetadataTimeKey, MetadataUseFlagNameCollectionKey, MetadataKeywordNameCollectionKey, MetadataIUseFlagCollectionKey, MetadataInheritedCollectionKey]
+ [MetadataStringKey, MetadataContentsKey, MetadataTimeKey, MetadataUseFlagNameSetKey, MetadataKeywordNameSetKey, MetadataIUseFlagSetKey, MetadataInheritedSetKey]
end
def all_classes
@@ -178,27 +178,27 @@ module Paludis
end
def test_keywords_key
- assert_kind_of MetadataKeywordNameCollectionKey, pid_testrepo.keywords_key
+ assert_kind_of MetadataKeywordNameSetKey, pid_testrepo.keywords_key
assert_kind_of Array, pid_testrepo.keywords_key.value
assert_equal ['test'], pid_testrepo.keywords_key.value
end
def test_use_key
assert_nil pid_testrepo.use_key
- #assert_kind_of MetadataUseFlagNameCollectionKey, pid_testrepo.use_key
+ #assert_kind_of MetadataUseFlagNameSetKey, pid_testrepo.use_key
#assert_kind_of Array, pid_testrepo.use_key.value
#assert_equal ['test'], pid_testrepo.use_key.value
end
def test_iuse_key
- assert_kind_of MetadataIUseFlagCollectionKey, pid_testrepo.iuse_key
+ assert_kind_of MetadataIUseFlagSetKey, pid_testrepo.iuse_key
assert_kind_of Array, pid_testrepo.iuse_key.value
assert_equal ['testflag'], pid_testrepo.iuse_key.value
end
def test_inherited_key
assert_nil pid_testrepo.inherited_key
- #assert_kind_of MetadataInheritCollectionKey, pid_testrepo.inherited_key
+ #assert_kind_of MetadataInheritSetKey, pid_testrepo.inherited_key
#assert_kind_of Array, pid_testrepo.iuse_key.value
#assert_equal ['testflag'], pid_testrepo.iuse_key.value
end
@@ -267,19 +267,19 @@ module Paludis
end
def test_use_key
- assert_kind_of MetadataUseFlagNameCollectionKey, pid_installed.use_key
+ assert_kind_of MetadataUseFlagNameSetKey, pid_installed.use_key
assert_kind_of Array, pid_installed.use_key.value
assert_equal ['test', 'test_use'], pid_installed.use_key.value
end
def test_iuse_key
- assert_kind_of MetadataIUseFlagCollectionKey, pid_installed.iuse_key
+ assert_kind_of MetadataIUseFlagSetKey, pid_installed.iuse_key
assert_kind_of Array, pid_installed.iuse_key.value
assert_equal ['test', 'test_iuse'], pid_installed.iuse_key.value
end
def test_inherited_key
- assert_kind_of MetadataInheritedCollectionKey, pid_installed.inherited_key
+ assert_kind_of MetadataInheritedSetKey, pid_installed.inherited_key
assert_kind_of Array, pid_installed.inherited_key.value
assert_equal ['test_inherited'], pid_installed.inherited_key.value
end
diff --git a/ruby/repository.cc b/ruby/repository.cc
index 81788eb..16a550b 100644
--- a/ruby/repository.cc
+++ b/ruby/repository.cc
@@ -27,6 +27,8 @@
#include <paludis/util/stringify.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/set.hh>
+#include <paludis/util/sequence.hh>
#include <ruby.h>
using namespace paludis;
@@ -169,14 +171,14 @@ namespace
Data_Get_Struct(self, tr1::shared_ptr<Repository>, self_ptr);
if (rb_block_given_p())
{
- tr1::shared_ptr<const CategoryNamePartCollection> c((*self_ptr)->category_names());
- for (CategoryNamePartCollection::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
+ tr1::shared_ptr<const CategoryNamePartSet> c((*self_ptr)->category_names());
+ for (CategoryNamePartSet::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
rb_yield(rb_str_new2(stringify(*i).c_str()));
return Qnil;
}
VALUE result(rb_ary_new());
- tr1::shared_ptr<const CategoryNamePartCollection> c((*self_ptr)->category_names());
- for (CategoryNamePartCollection::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
+ tr1::shared_ptr<const CategoryNamePartSet> c((*self_ptr)->category_names());
+ for (CategoryNamePartSet::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
rb_ary_push(result, rb_str_new2(stringify(*i).c_str()));
return result;
}
@@ -205,14 +207,14 @@ namespace
if (rb_block_given_p())
{
- tr1::shared_ptr<const CategoryNamePartCollection> c((*self_ptr)->category_names_containing_package(package));
- for (CategoryNamePartCollection::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
+ tr1::shared_ptr<const CategoryNamePartSet> c((*self_ptr)->category_names_containing_package(package));
+ for (CategoryNamePartSet::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
rb_yield(rb_str_new2(stringify(*i).c_str()));
return Qnil;
}
VALUE result(rb_ary_new());
- tr1::shared_ptr<const CategoryNamePartCollection> c((*self_ptr)->category_names_containing_package(package));
- for (CategoryNamePartCollection::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
+ tr1::shared_ptr<const CategoryNamePartSet> c((*self_ptr)->category_names_containing_package(package));
+ for (CategoryNamePartSet::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
rb_ary_push(result, rb_str_new2(stringify(*i).c_str()));
return result;
}
@@ -241,14 +243,14 @@ namespace
if (rb_block_given_p())
{
- tr1::shared_ptr<const QualifiedPackageNameCollection> c((*self_ptr)->package_names(category));
- for (QualifiedPackageNameCollection::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
+ tr1::shared_ptr<const QualifiedPackageNameSet> c((*self_ptr)->package_names(category));
+ for (QualifiedPackageNameSet::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
rb_yield(qualified_package_name_to_value(*i));
return Qnil;
}
VALUE result(rb_ary_new());
- tr1::shared_ptr<const QualifiedPackageNameCollection> c((*self_ptr)->package_names(category));
- for (QualifiedPackageNameCollection::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
+ tr1::shared_ptr<const QualifiedPackageNameSet> c((*self_ptr)->package_names(category));
+ for (QualifiedPackageNameSet::Iterator i(c->begin()), i_end(c->end()) ; i != i_end ; ++i)
rb_ary_push(result, qualified_package_name_to_value(*i));
return result;
}