aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/virtuals
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-12 14:28:03 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-12 14:45:22 +0100
commit120c58323950219e16d8fe22693af221d2887f9b (patch)
tree2df48534abea1af807750dbbd0ce3ac9922bd44b /paludis/repositories/virtuals
parent271074eb112e276d5ba25f91785431911ee3443f (diff)
downloadpaludis-120c58323950219e16d8fe22693af221d2887f9b.tar.gz
paludis-120c58323950219e16d8fe22693af221d2887f9b.tar.xz
MetadataKey value -> parse_value
Diffstat (limited to 'paludis/repositories/virtuals')
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc2
-rw-r--r--paludis/repositories/virtuals/package_id.cc28
-rw-r--r--paludis/repositories/virtuals/package_id.hh2
3 files changed, 16 insertions, 16 deletions
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 88ee2a538..8aeb5811e 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -355,7 +355,7 @@ bool
InstalledVirtualsRepository::is_suitable_destination_for(const std::shared_ptr<const PackageID> & id) const
{
auto repo(_imp->env->fetch_repository(id->repository_name()));
- std::string f(repo->format_key() ? repo->format_key()->value() : "");
+ std::string f(repo->format_key() ? repo->format_key()->parse_value() : "");
return f == "virtuals";
}
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index f90a77995..419c7bf94 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -75,7 +75,7 @@ namespace paludis
MutablePackageDepSpecData({ })
.require_package(v->name())
.require_version(vrc_and, vo_equal, v->version())
- .require_exact_slot(v->slot_key() ? v->slot_key()->value() : SlotName("UNKNOWN"), false)
+ .require_exact_slot(v->slot_key() ? v->slot_key()->parse_value() : SlotName("UNKNOWN"), false)
.require_in_repository(v->repository_name()))
:
std::make_shared<PackageDepSpec>(
@@ -104,7 +104,7 @@ VirtualsDepKey::~VirtualsDepKey()
}
const std::shared_ptr<const DependencySpecTree>
-VirtualsDepKey::value() const
+VirtualsDepKey::parse_value() const
{
return _imp->value;
}
@@ -217,18 +217,18 @@ VirtualsPackageID::canonical_form(const PackageIDCanonicalForm f) const
{
case idcf_full:
return stringify(_imp->name) + "-" + stringify(_imp->version) + "::" + stringify(_imp->repository_name) +
- " (virtual for " + stringify(*_imp->virtual_for->value()) + ")";
+ " (virtual for " + stringify(*_imp->virtual_for->parse_value()) + ")";
case idcf_no_version:
return stringify(_imp->name) + "::" + stringify(_imp->repository_name) +
- " (virtual for " + _imp->virtual_for->value()->canonical_form(idcf_no_version) + ")";
+ " (virtual for " + _imp->virtual_for->parse_value()->canonical_form(idcf_no_version) + ")";
case idcf_version:
- return stringify(_imp->version) + " (for " + stringify(_imp->virtual_for->value()->canonical_form(idcf_no_version)) + ")";
+ return stringify(_imp->version) + " (for " + stringify(_imp->virtual_for->parse_value()->canonical_form(idcf_no_version)) + ")";
case idcf_no_name:
return stringify(_imp->version) + "::" + stringify(_imp->repository_name) +
- " (virtual for " + stringify(*_imp->virtual_for->value()) + ")";
+ " (virtual for " + stringify(*_imp->virtual_for->parse_value()) + ")";
case last_idcf:
break;
@@ -241,10 +241,10 @@ PackageDepSpec
VirtualsPackageID::uniquely_identifying_spec() const
{
/* hack: ensure the slot key's loaded, so that stringify returns the full form */
- _imp->virtual_for->value()->slot_key();
+ _imp->virtual_for->parse_value()->slot_key();
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
- (slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository_name()) +
- "[." + _imp->virtual_for->raw_name() + "=" + stringify(*_imp->virtual_for->value()) + "]",
+ (slot_key() ? ":" + stringify(slot_key()->parse_value()) : "") + "::" + stringify(repository_name()) +
+ "[." + _imp->virtual_for->raw_name() + "=" + stringify(*_imp->virtual_for->parse_value()) + "]",
_imp->env, { });
}
@@ -360,14 +360,14 @@ bool
VirtualsPackageID::arbitrary_less_than_comparison(const PackageID & a) const
{
if (a.virtual_for_key())
- return PackageIDSetComparator()(_imp->virtual_for->value(), a.virtual_for_key()->value());
+ return PackageIDSetComparator()(_imp->virtual_for->parse_value(), a.virtual_for_key()->parse_value());
return false;
}
std::size_t
VirtualsPackageID::extra_hash_value() const
{
- return Hash<PackageID>()(*_imp->virtual_for->value());
+ return Hash<PackageID>()(*_imp->virtual_for->parse_value());
}
void
@@ -493,8 +493,8 @@ VirtualsPackageID::need_masks_added() const
if (_imp->has_masks)
return;
- if (_imp->virtual_for->value()->masked())
- add_mask(std::make_shared<VirtualsAssociationMask>(_imp->virtual_for->value()->uniquely_identifying_spec()));
+ if (_imp->virtual_for->parse_value()->masked())
+ add_mask(std::make_shared<VirtualsAssociationMask>(_imp->virtual_for->parse_value()->uniquely_identifying_spec()));
_imp->has_masks = true;
}
@@ -526,7 +526,7 @@ VirtualsPackageID::fs_location_key() const
const std::shared_ptr<const MetadataValueKey<SlotName> >
VirtualsPackageID::slot_key() const
{
- return _imp->virtual_for->value()->slot_key();
+ return _imp->virtual_for->parse_value()->slot_key();
}
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index 3c179158d..ca54e941b 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -41,7 +41,7 @@ namespace paludis
const bool);
~VirtualsDepKey();
- virtual const std::shared_ptr<const DependencySpecTree> value() const
+ virtual const std::shared_ptr<const DependencySpecTree> parse_value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::shared_ptr<const DependenciesLabelSequence> initial_labels() const