aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/fake/dep_parser.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-28 22:19:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 03:57:52 +0000
commit92f0a95d1854442e744f707eaae9add7fd92ff67 (patch)
tree9d403328a07f89c1598b4d3cb0079b292d82729e /paludis/repositories/fake/dep_parser.cc
parent092228a814cd6700b97112b5dcf931c80b6b9431 (diff)
downloadpaludis-92f0a95d1854442e744f707eaae9add7fd92ff67.tar.gz
paludis-92f0a95d1854442e744f707eaae9add7fd92ff67.tar.xz
Pass env, id to ConditionalDepSpec members
Diffstat (limited to 'paludis/repositories/fake/dep_parser.cc')
-rw-r--r--paludis/repositories/fake/dep_parser.cc25
1 files changed, 12 insertions, 13 deletions
diff --git a/paludis/repositories/fake/dep_parser.cc b/paludis/repositories/fake/dep_parser.cc
index 806115edd..00330889f 100644
--- a/paludis/repositories/fake/dep_parser.cc
+++ b/paludis/repositories/fake/dep_parser.cc
@@ -139,11 +139,10 @@ namespace
}
template <typename T_>
- void use_handler(typename ParseStackTypes<T_>::Stack & stack, const std::string & u,
- const Environment * const env, const std::shared_ptr<const PackageID> & id)
+ void use_handler(typename ParseStackTypes<T_>::Stack & stack, const std::string & u)
{
stack.push_front((*stack.begin())->append(
- std::make_shared<ConditionalDepSpec>(parse_elike_conditional_dep_spec(u, env, id, false))));
+ std::make_shared<ConditionalDepSpec>(parse_elike_conditional_dep_spec(u, false))));
}
template <typename T_>
@@ -172,7 +171,7 @@ namespace
std::shared_ptr<DependencySpecTree>
paludis::fakerepository::parse_depend(const std::string & s,
- const Environment * const env, const std::shared_ptr<const PackageID> & id)
+ const Environment * const, const std::shared_ptr<const PackageID> & id)
{
using namespace std::placeholders;
@@ -192,7 +191,7 @@ paludis::fakerepository::parse_depend(const std::string & s,
n::on_pop() = std::bind(&pop_handler<DependencySpecTree>, std::ref(stack), s),
n::on_should_be_empty() = std::bind(&should_be_empty_handler<DependencySpecTree>, std::ref(stack), s),
n::on_string() = std::bind(&package_or_block_dep_spec_string_handler<DependencySpecTree>, std::ref(stack), _1, id),
- n::on_use() = std::bind(&use_handler<DependencySpecTree>, std::ref(stack), _1, env, id),
+ n::on_use() = std::bind(&use_handler<DependencySpecTree>, std::ref(stack), _1),
n::on_use_under_any() = &do_nothing
));
@@ -203,7 +202,7 @@ paludis::fakerepository::parse_depend(const std::string & s,
std::shared_ptr<ProvideSpecTree>
paludis::fakerepository::parse_provide(const std::string & s,
- const Environment * const env, const std::shared_ptr<const PackageID> & id)
+ const Environment * const, const std::shared_ptr<const PackageID> & id)
{
using namespace std::placeholders;
@@ -223,7 +222,7 @@ paludis::fakerepository::parse_provide(const std::string & s,
n::on_pop() = std::bind(&pop_handler<ProvideSpecTree>, std::ref(stack), s),
n::on_should_be_empty() = std::bind(&should_be_empty_handler<ProvideSpecTree>, std::ref(stack), s),
n::on_string() = std::bind(&package_dep_spec_string_handler<ProvideSpecTree>, std::ref(stack), _1, id),
- n::on_use() = std::bind(&use_handler<ProvideSpecTree>, std::ref(stack), _1, env, id),
+ n::on_use() = std::bind(&use_handler<ProvideSpecTree>, std::ref(stack), _1),
n::on_use_under_any() = &do_nothing
));
@@ -234,7 +233,7 @@ paludis::fakerepository::parse_provide(const std::string & s,
std::shared_ptr<FetchableURISpecTree>
paludis::fakerepository::parse_fetchable_uri(const std::string & s,
- const Environment * const env, const std::shared_ptr<const PackageID> & id)
+ const Environment * const, const std::shared_ptr<const PackageID> &)
{
using namespace std::placeholders;
@@ -254,7 +253,7 @@ paludis::fakerepository::parse_fetchable_uri(const std::string & s,
n::on_pop() = std::bind(&pop_handler<FetchableURISpecTree>, std::ref(stack), s),
n::on_should_be_empty() = std::bind(&should_be_empty_handler<FetchableURISpecTree>, std::ref(stack), s),
n::on_string() = std::bind(&arrow_handler<FetchableURISpecTree>, std::ref(stack), _1, ""),
- n::on_use() = std::bind(&use_handler<FetchableURISpecTree>, std::ref(stack), _1, env, id),
+ n::on_use() = std::bind(&use_handler<FetchableURISpecTree>, std::ref(stack), _1),
n::on_use_under_any() = &do_nothing
));
@@ -265,7 +264,7 @@ paludis::fakerepository::parse_fetchable_uri(const std::string & s,
std::shared_ptr<SimpleURISpecTree>
paludis::fakerepository::parse_simple_uri(const std::string & s,
- const Environment * const env, const std::shared_ptr<const PackageID> & id)
+ const Environment * const, const std::shared_ptr<const PackageID> &)
{
using namespace std::placeholders;
@@ -285,7 +284,7 @@ paludis::fakerepository::parse_simple_uri(const std::string & s,
n::on_pop() = std::bind(&pop_handler<SimpleURISpecTree>, std::ref(stack), s),
n::on_should_be_empty() = std::bind(&should_be_empty_handler<SimpleURISpecTree>, std::ref(stack), s),
n::on_string() = std::bind(&simple_uri_handler<SimpleURISpecTree>, std::ref(stack), _1),
- n::on_use() = std::bind(&use_handler<SimpleURISpecTree>, std::ref(stack), _1, env, id),
+ n::on_use() = std::bind(&use_handler<SimpleURISpecTree>, std::ref(stack), _1),
n::on_use_under_any() = &do_nothing
));
@@ -296,7 +295,7 @@ paludis::fakerepository::parse_simple_uri(const std::string & s,
std::shared_ptr<LicenseSpecTree>
paludis::fakerepository::parse_license(const std::string & s,
- const Environment * const env, const std::shared_ptr<const PackageID> & id)
+ const Environment * const, const std::shared_ptr<const PackageID> &)
{
using namespace std::placeholders;
@@ -316,7 +315,7 @@ paludis::fakerepository::parse_license(const std::string & s,
n::on_pop() = std::bind(&pop_handler<LicenseSpecTree>, std::ref(stack), s),
n::on_should_be_empty() = std::bind(&should_be_empty_handler<LicenseSpecTree>, std::ref(stack), s),
n::on_string() = std::bind(&license_handler<LicenseSpecTree>, std::ref(stack), _1),
- n::on_use() = std::bind(&use_handler<LicenseSpecTree>, std::ref(stack), _1, env, id),
+ n::on_use() = std::bind(&use_handler<LicenseSpecTree>, std::ref(stack), _1),
n::on_use_under_any() = &do_nothing
));