aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 11:40:46 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 11:40:46 +0100
commit637a8d521b304dec1ec4db201d5d71d509efb6c1 (patch)
treefa4f7f5b0537c7f7361e4d76341b53d121c5d003
parentd3b974490cf7482b034f1a6779b65e411616f84c (diff)
downloadpaludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.gz
paludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.xz
Make use of Options init lists
-rw-r--r--doc/api/cplusplus/examples/example_dep_spec.cc5
-rw-r--r--doc/api/cplusplus/examples/example_match_package.cc8
-rw-r--r--doc/api/cplusplus/examples/example_selection.cc16
-rw-r--r--paludis/broken_linkage_finder.cc2
-rw-r--r--paludis/comma_separated_dep_parser.cc3
-rw-r--r--paludis/comma_separated_dep_printer.cc4
-rw-r--r--paludis/common_sets.cc4
-rw-r--r--paludis/dep_list.cc8
-rw-r--r--paludis/dep_list_TEST.cc66
-rw-r--r--paludis/dep_list_TEST_blockers.cc18
-rw-r--r--paludis/dep_spec_TEST.cc2
-rw-r--r--paludis/distribution.cc4
-rw-r--r--paludis/elike_use_requirement_TEST.cc260
-rw-r--r--paludis/environments/paludis/bashable_conf.cc4
-rw-r--r--paludis/environments/paludis/keywords_conf.cc11
-rw-r--r--paludis/environments/paludis/licenses_conf.cc10
-rw-r--r--paludis/environments/paludis/mirrors_conf.cc2
-rw-r--r--paludis/environments/paludis/output_conf.cc6
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc6
-rw-r--r--paludis/environments/paludis/paludis_config.cc2
-rw-r--r--paludis/environments/paludis/paludis_environment.cc11
-rw-r--r--paludis/environments/paludis/paludis_environment_TEST.cc14
-rw-r--r--paludis/environments/paludis/world_TEST.cc2
-rw-r--r--paludis/environments/portage/portage_environment.cc18
-rw-r--r--paludis/environments/portage/portage_environment_TEST.cc20
-rw-r--r--paludis/filter_TEST.cc24
-rw-r--r--paludis/fuzzy_finder.cc2
-rw-r--r--paludis/generator_TEST.cc24
-rw-r--r--paludis/hooker.cc16
-rw-r--r--paludis/install_task.cc20
-rw-r--r--paludis/merger.cc8
-rw-r--r--paludis/merger_TEST.cc20
-rw-r--r--paludis/ndbam.cc4
-rw-r--r--paludis/ndbam_unmerger.cc2
-rw-r--r--paludis/package_database.cc2
-rw-r--r--paludis/package_database_TEST.cc46
-rw-r--r--paludis/paludislike_options_conf.cc14
-rw-r--r--paludis/range_rewriter.cc2
-rw-r--r--paludis/range_rewriter_TEST.cc4
-rw-r--r--paludis/report_task.cc6
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.cc6
-rw-r--r--paludis/repositories/accounts/accounts_id.cc6
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.cc8
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc5
-rw-r--r--paludis/repositories/cran/cran_package_id.cc8
-rw-r--r--paludis/repositories/cran/cran_repository.cc2
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.cc4
-rw-r--r--paludis/repositories/cran/package_dep_spec.cc4
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc4
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc2
-rw-r--r--paludis/repositories/e/e_repository.cc24
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc54
-rw-r--r--paludis/repositories/e/e_repository_TEST_0.cc48
-rw-r--r--paludis/repositories/e/e_repository_TEST_1.cc10
-rw-r--r--paludis/repositories/e/e_repository_TEST_2.cc16
-rw-r--r--paludis/repositories/e/e_repository_TEST_3.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc24
-rw-r--r--paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc108
-rw-r--r--paludis/repositories/e/e_repository_TEST_exlibs.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc4
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_replacing.cc6
-rw-r--r--paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc2
-rw-r--r--paludis/repositories/e/e_repository_news.cc7
-rw-r--r--paludis/repositories/e/e_repository_sets.cc6
-rw-r--r--paludis/repositories/e/eapi.cc4
-rw-r--r--paludis/repositories/e/ebuild.cc5
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc90
-rw-r--r--paludis/repositories/e/ebuild_id.cc2
-rw-r--r--paludis/repositories/e/exheres_layout.cc8
-rw-r--r--paludis/repositories/e/exheres_profile.cc9
-rw-r--r--paludis/repositories/e/exndbam_repository.cc6
-rw-r--r--paludis/repositories/e/exndbam_repository_TEST.cc4
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc2
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc2
-rw-r--r--paludis/repositories/e/info_metadata_key.cc6
-rw-r--r--paludis/repositories/e/manifest2_reader.cc2
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc6
-rw-r--r--paludis/repositories/e/profile_file.cc2
-rw-r--r--paludis/repositories/e/traditional_layout.cc18
-rw-r--r--paludis/repositories/e/traditional_profile.cc17
-rw-r--r--paludis/repositories/e/use_desc.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc24
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc60
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc4
-rw-r--r--paludis/repositories/fake/fake_package_id.cc2
-rw-r--r--paludis/repositories/gems/gem_specification.cc4
-rw-r--r--paludis/repositories/gems/gem_specification_TEST.cc2
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc4
-rw-r--r--paludis/repositories/repository/repository_id.cc4
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc4
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_store.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc4
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_repository_TEST.cc26
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository_TEST.cc14
-rw-r--r--paludis/repositories/unwritten/unwritten_id.cc2
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.cc2
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_store.cc2
-rw-r--r--paludis/repositories/virtuals/package_id.cc6
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository_TEST.cc14
-rw-r--r--paludis/repository_name_cache.cc2
-rw-r--r--paludis/resolver/decider.cc32
-rw-r--r--paludis/resolver/job.cc10
-rw-r--r--paludis/resolver/package_or_block_dep_spec.cc14
-rw-r--r--paludis/resolver/resolver_TEST_blockers.cc2
-rw-r--r--paludis/resolver/resolver_TEST_continue_on_failure.cc2
-rw-r--r--paludis/resolver/resolver_TEST_uninstalls.cc2
-rw-r--r--paludis/resolver/resolver_test.cc8
-rw-r--r--paludis/selection_TEST.cc64
-rw-r--r--paludis/serialise.cc16
-rw-r--r--paludis/set_file.cc13
-rw-r--r--paludis/stringify_formatter_TEST.cc4
-rw-r--r--paludis/stripper.cc2
-rw-r--r--paludis/uninstall_list.cc14
-rw-r--r--paludis/uninstall_list_TEST.cc16
-rw-r--r--paludis/uninstall_task.cc10
-rw-r--r--paludis/user_dep_spec.cc8
-rw-r--r--paludis/user_dep_spec_TEST.cc200
-rw-r--r--paludis/util/config_file_TEST.cc60
-rw-r--r--paludis/util/dir_iterator_TEST.cc4
-rw-r--r--paludis/util/is_file_with_extension_TEST.cc18
-rw-r--r--paludis/version_spec_TEST.cc738
-rw-r--r--python/additional_tests.cc2
-rw-r--r--python/dep_spec.cc2
-rw-r--r--src/clients/adjutrix/downgrade_check.cc6
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.cc8
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc4
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc6
-rw-r--r--src/clients/adjutrix/find_stable_candidates.cc6
-rw-r--r--src/clients/adjutrix/keywords_graph.cc4
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc2
-rw-r--r--src/clients/cave/cmd_config.cc4
-rw-r--r--src/clients/cave/cmd_contents.cc4
-rw-r--r--src/clients/cave/cmd_display_resolution.cc8
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc26
-rw-r--r--src/clients/cave/cmd_find_candidates.cc2
-rw-r--r--src/clients/cave/cmd_fix_linkage.cc2
-rw-r--r--src/clients/cave/cmd_info.cc6
-rw-r--r--src/clients/cave/cmd_match.cc4
-rw-r--r--src/clients/cave/cmd_perform.cc8
-rw-r--r--src/clients/cave/cmd_print_id_actions.cc4
-rw-r--r--src/clients/cave/cmd_print_id_contents.cc4
-rw-r--r--src/clients/cave/cmd_print_id_masks.cc4
-rw-r--r--src/clients/cave/cmd_print_id_metadata.cc4
-rw-r--r--src/clients/cave/cmd_print_ids.cc4
-rw-r--r--src/clients/cave/cmd_search.cc2
-rw-r--r--src/clients/cave/cmd_show.cc15
-rw-r--r--src/clients/cave/cmd_uninstall.cc4
-rw-r--r--src/clients/cave/cmd_verify.cc4
-rw-r--r--src/clients/cave/command_factory.cc2
-rw-r--r--src/clients/cave/executables_common.cc4
-rw-r--r--src/clients/cave/resolve_common.cc74
-rw-r--r--src/clients/cave/select_format_for_spec.cc6
-rw-r--r--src/clients/inquisitio/do_search.cc2
-rw-r--r--src/clients/paludis/applets.cc18
-rw-r--r--src/clients/paludis/do_config.cc4
-rw-r--r--src/clients/paludis/do_contents.cc2
-rw-r--r--src/clients/paludis/do_executables.cc2
-rw-r--r--src/clients/paludis/info.cc8
-rw-r--r--src/clients/reconcilio/fix_linkage.cc2
-rw-r--r--src/output/console_install_task.cc20
-rw-r--r--src/output/console_query_task.cc6
169 files changed, 1483 insertions, 1498 deletions
diff --git a/doc/api/cplusplus/examples/example_dep_spec.cc b/doc/api/cplusplus/examples/example_dep_spec.cc
index c71de30..0607d66 100644
--- a/doc/api/cplusplus/examples/example_dep_spec.cc
+++ b/doc/api/cplusplus/examples/example_dep_spec.cc
@@ -54,8 +54,7 @@ int main(int argc, char * argv[])
* updso_throw_if_set and catch the GotASetNotAPackageDepSpec
* exception. If data about the spec is known at compile time,
* make_package_dep_spec() should be used instead. */
- PackageDepSpec spec(parse_user_package_dep_spec(
- *q, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec spec(parse_user_package_dep_spec(*q, env.get(), { updso_allow_wildcards }));
/* Display information about the PackageDepSpec. */
cout << "Information about '" << spec << "':" << endl;
@@ -142,7 +141,7 @@ int main(int argc, char * argv[])
/* And display packages matching that spec */
cout << " " << left << setw(24) << "Matches:" << " ";
- std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]);
+ std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(generator::Matches(spec, { }))]);
bool need_indent(false);
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
diff --git a/doc/api/cplusplus/examples/example_match_package.cc b/doc/api/cplusplus/examples/example_match_package.cc
index 782473a..9bad07c 100644
--- a/doc/api/cplusplus/examples/example_match_package.cc
+++ b/doc/api/cplusplus/examples/example_match_package.cc
@@ -54,14 +54,14 @@ int main(int argc, char * argv[])
i != i_end ; ++i)
{
/* Is it paludis? */
- if (match_package(*env, make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(
- QualifiedPackageName("sys-apps/paludis")), **i, MatchPackageOptions()))
+ if (match_package(*env, make_package_dep_spec({ }).package(
+ QualifiedPackageName("sys-apps/paludis")), **i, { }))
cout << left << setw(50) << (stringify(**i) + ":") << " " << "paludis" << endl;
/* No. Is it in system or world? */
- else if (match_package_in_set(*env, *system, **i, MatchPackageOptions()))
+ else if (match_package_in_set(*env, *system, **i, { }))
cout << left << setw(50) << (stringify(**i) + ":") << " " << "system" << endl;
- else if (match_package_in_set(*env, *world, **i, MatchPackageOptions()))
+ else if (match_package_in_set(*env, *world, **i, { }))
cout << left << setw(50) << (stringify(**i) + ":") << " " << "world" << endl;
else
cout << left << setw(50) << (stringify(**i) + ":") << " " << "nothing" << endl;
diff --git a/doc/api/cplusplus/examples/example_selection.cc b/doc/api/cplusplus/examples/example_selection.cc
index 1894152..a086b0c 100644
--- a/doc/api/cplusplus/examples/example_selection.cc
+++ b/doc/api/cplusplus/examples/example_selection.cc
@@ -62,22 +62,22 @@ int main(int argc, char * argv[])
* object used determines the number and ordering of results. In the
* simplest form, it takes a Generator as a parameter. */
show_selection(env, selection::AllVersionsSorted(
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(
- QualifiedPackageName("sys-apps/paludis")), MatchPackageOptions())));
+ generator::Matches(make_package_dep_spec({ }).package(
+ QualifiedPackageName("sys-apps/paludis")), { })));
/* Generators can be passed through a Filter. The Selection optimises
* the code internally to avoid doing excess work. */
show_selection(env, selection::AllVersionsSorted(
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(
- QualifiedPackageName("sys-apps/paludis")), MatchPackageOptions()) |
+ generator::Matches(make_package_dep_spec({ }).package(
+ QualifiedPackageName("sys-apps/paludis")), { }) |
filter::InstalledAtRoot(FSEntry("/"))));
/* Filters can be combined. Usually filter::NotMasked should be combined
* with filter::SupportsAction<InstallAction>, since installed packages
* aren't masked. */
show_selection(env, selection::AllVersionsSorted(
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(
- QualifiedPackageName("sys-apps/paludis")), MatchPackageOptions()) |
+ generator::Matches(make_package_dep_spec({ }).package(
+ QualifiedPackageName("sys-apps/paludis")), { }) |
filter::SupportsAction<InstallAction>() |
filter::NotMasked()));
@@ -85,8 +85,8 @@ int main(int argc, char * argv[])
* is no metadata cache. Consider using other Selection objects if
* you only need the best matching or some arbitrary matching ID. */
show_selection(env, selection::BestVersionOnly(
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(
- QualifiedPackageName("sys-apps/paludis")), MatchPackageOptions()) |
+ generator::Matches(make_package_dep_spec({ }).package(
+ QualifiedPackageName("sys-apps/paludis")), { }) |
filter::SupportsAction<InstallAction>() |
filter::NotMasked()));
}
diff --git a/paludis/broken_linkage_finder.cc b/paludis/broken_linkage_finder.cc
index 98f4f59..d75eabd 100644
--- a/paludis/broken_linkage_finder.cc
+++ b/paludis/broken_linkage_finder.cc
@@ -242,7 +242,7 @@ Imp<BrokenLinkageFinder>::walk_directory(const FSEntry & directory)
try
{
- std::for_each(DirIterator(directory, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), DirIterator(),
+ std::for_each(DirIterator(directory, { dio_include_dotfiles, dio_inode_sort }), DirIterator(),
std::bind(&Imp<BrokenLinkageFinder>::check_file, this, _1));
}
catch (const FSError & ex)
diff --git a/paludis/comma_separated_dep_parser.cc b/paludis/comma_separated_dep_parser.cc
index d33153b..85b4c85 100644
--- a/paludis/comma_separated_dep_parser.cc
+++ b/paludis/comma_separated_dep_parser.cc
@@ -48,8 +48,7 @@ CommaSeparatedDepParser::parse(const Environment * const env, const std::string
if (a.empty())
continue;
- std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(a, env,
- UserPackageDepSpecOptions() + updso_no_disambiguation)));
+ std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(a, env, { updso_no_disambiguation })));
result->root()->append(spec);
}
diff --git a/paludis/comma_separated_dep_printer.cc b/paludis/comma_separated_dep_printer.cc
index faccee0..a75d938 100644
--- a/paludis/comma_separated_dep_printer.cc
+++ b/paludis/comma_separated_dep_printer.cc
@@ -81,10 +81,10 @@ CommaSeparatedDepPrinter::visit(const DependencySpecTree::NodeType<PackageDepSpe
if (_imp->env)
{
- if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::InstalledAtRoot(_imp->env->root()))]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installed());
- else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::SupportsAction<InstallAction>() | filter::NotMasked())]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installable());
else
diff --git a/paludis/common_sets.cc b/paludis/common_sets.cc
index ed61f12..1fb5fe1 100644
--- a/paludis/common_sets.cc
+++ b/paludis/common_sets.cc
@@ -56,14 +56,14 @@ namespace
i != i_end ; ++i)
if (slots && (*i)->slot_key())
result->root()->append(std::make_shared<PackageDepSpec>(
- make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ make_package_dep_spec({ })
.package((*i)->name())
.slot_requirement(std::make_shared<ELikeSlotExactRequirement>(
(*i)->slot_key()->value(), false))
));
else
result->root()->append(std::make_shared<PackageDepSpec>(
- make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ make_package_dep_spec({ })
.package((*i)->name())
));
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index 0b9b528..253475c 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -82,7 +82,7 @@ DepListOptions::DepListOptions() :
installed_deps_post(dl_deps_try_post),
installed_deps_pre(dl_deps_discard),
installed_deps_runtime(dl_deps_try_post),
- match_package_options(MatchPackageOptions()),
+ match_package_options({ }),
new_slots(dl_new_slots_always),
override_masks(make_null_shared_ptr()),
reinstall(dl_reinstall_never),
@@ -863,7 +863,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<BlockDepSpec>::Typ
if (node.spec()->blocking().package_ptr())
{
- PackageDepSpec just_package(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(
+ PackageDepSpec just_package(make_package_dep_spec({ }).package(
*node.spec()->blocking().package_ptr()));
already_installed = (*d->_imp->env)[selection::AllVersionsUnsorted(
generator::Matches(just_package, d->_imp->opts->match_package_options()) |
@@ -1179,7 +1179,7 @@ DepList::add_package(const std::shared_ptr<const PackageID> & p, const std::shar
for (DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIterator i(f.begin()), i_end(f.end()) ; i != i_end ; ++i)
{
- std::shared_ptr<PackageDepSpec> pp(std::make_shared<PackageDepSpec>(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ std::shared_ptr<PackageDepSpec> pp(std::make_shared<PackageDepSpec>(make_package_dep_spec({ })
.package(*(*i)->package_ptr())
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
@@ -1703,7 +1703,7 @@ DepList::replaced(const PackageID & m) const
std::pair<MergeListIndex::const_iterator, MergeListIndex::const_iterator> p(
_imp->merge_list_index.equal_range(m.name()));
- PackageDepSpec spec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(m.name()));
+ PackageDepSpec spec(make_package_dep_spec({ }).package(m.name()));
while (p.second != ((p.first = std::find_if(p.first, p.second,
MatchDepListEntryAgainstPackageDepSpec(_imp->env, spec, _imp->opts->match_package_options())))))
{
diff --git a/paludis/dep_list_TEST.cc b/paludis/dep_list_TEST.cc
index fbec87c..2873553 100644
--- a/paludis/dep_list_TEST.cc
+++ b/paludis/dep_list_TEST.cc
@@ -1016,7 +1016,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1044,7 +1044,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1112,7 +1112,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1140,7 +1140,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1503,7 +1503,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1571,7 +1571,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1639,7 +1639,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1707,7 +1707,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1769,7 +1769,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1799,7 +1799,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1861,7 +1861,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1891,7 +1891,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target,
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -1952,12 +1952,12 @@ namespace test_cases
DepList d(&env, DepListOptions());
d.add(PackageDepSpec(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(join(d.begin(), d.end(), " "),
"cat/four-1:0::repo cat/two-1:0::repo cat/three-1:0::repo cat/one-1:0::repo");
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec("cat/five",
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK_EQUAL(join(d.begin(), d.end(), " "),
@@ -1999,12 +1999,12 @@ namespace test_cases
DepList d(&env, DepListOptions());
d.add(PackageDepSpec(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(join(d.begin(), d.end(), " "),
"cat/four-1:0::repo cat/two-1:0::repo cat/three-1:0::repo cat/one-1:0::repo");
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec("cat/five",
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK_EQUAL(join(d.begin(), d.end(), " "),
@@ -2042,7 +2042,7 @@ namespace test_cases
DepList d(&env, DepListOptions());
d.add(PackageDepSpec(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(join(d.begin(), d.end(), " "), "cat/one-1:0::repo");
}
} test_dep_list_forced_downgrade_of_installed;
@@ -2077,7 +2077,7 @@ namespace test_cases
DepList d(&env, DepListOptions());
d.options()->fall_back() = dl_fall_back_never;
TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
}
} test_dep_list_fall_back_never;
@@ -2112,9 +2112,9 @@ namespace test_cases
DepList d(&env, DepListOptions());
d.options()->fall_back() = dl_fall_back_as_needed;
d.add(PackageDepSpec(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
d.add(PackageDepSpec(parse_user_package_dep_spec("cat/two",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(join(d.begin(), d.end(), " "), "cat/two-2:0::installed_repo cat/one-1:0::repo");
}
} test_dep_list_fall_back_as_needed;
@@ -2150,29 +2150,29 @@ namespace test_cases
DepList d1(&env, DepListOptions());
d1.options()->fall_back() = dl_fall_back_as_needed_except_targets;
d1.add(PackageDepSpec(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(join(d1.begin(), d1.end(), " "), "cat/two-2:0::installed_repo cat/one-1:0::repo");
TEST_CHECK_THROWS(d1.add(PackageDepSpec(parse_user_package_dep_spec("cat/three",
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
DepList d2(&env, DepListOptions());
d2.options()->fall_back() = dl_fall_back_as_needed_except_targets;
TEST_CHECK_THROWS(d2.add(PackageDepSpec(parse_user_package_dep_spec("cat/two",
- &env, UserPackageDepSpecOptions())),
+ &env, { })),
env.default_destinations()), DepListError);
DepList d3(&env, DepListOptions());
d3.options()->fall_back() = dl_fall_back_as_needed_except_targets;
std::shared_ptr<SetSpecTree> t3(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()));
- t3->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, UserPackageDepSpecOptions())));
- t3->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/two", &env, UserPackageDepSpecOptions())));
+ t3->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, { })));
+ t3->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/two", &env, { })));
TEST_CHECK_THROWS(d3.add(*t3, env.default_destinations()), DepListError);
DepList d4(&env, DepListOptions());
std::shared_ptr<SetSpecTree> t4(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()));
- t4->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, UserPackageDepSpecOptions())));
- t4->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/three", &env, UserPackageDepSpecOptions())));
+ t4->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, { })));
+ t4->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/three", &env, { })));
TEST_CHECK_THROWS(d4.add(*t4, env.default_destinations()), DepListError);
}
} test_dep_list_fall_back_as_needed_not_targets;
@@ -2208,15 +2208,15 @@ namespace test_cases
DepList d1(&env, DepListOptions());
d1.options()->upgrade() = dl_upgrade_as_needed;
d1.add(PackageDepSpec(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(join(d1.begin(), d1.end(), " "), "cat/two-0:0::installed_repo cat/one-1:0::repo");
DepList d2(&env, DepListOptions());
d2.options()->upgrade() = dl_upgrade_as_needed;
std::shared_ptr<SetSpecTree> t2(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()));
- t2->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, UserPackageDepSpecOptions())));
- t2->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/two", &env, UserPackageDepSpecOptions())));
+ t2->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, { })));
+ t2->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/two", &env, { })));
d2.add(*t2, env.default_destinations());
TEST_CHECK_EQUAL(join(d2.begin(), d2.end(), " "), "cat/two-2:0::repo cat/one-1:0::repo");
}
@@ -2264,7 +2264,7 @@ namespace test_cases
DepList d1(&env, DepListOptions());
d1.options()->reinstall_scm() = dl_reinstall_scm_always;
d1.add(PackageDepSpec(parse_user_package_dep_spec("cat/zero",
- &env, UserPackageDepSpecOptions())), env.default_destinations());
+ &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(join(d1.begin(), d1.end(), " "), "cat/one-scm:0::repo cat/two-2:0::installed_repo "
"cat/three-live-0:0::repo cat/four-cvs-0:0::repo cat/five-svn-0:0::repo cat/six-darcs-0:0::repo "
"cat/zero-1:0::repo");
@@ -2305,11 +2305,11 @@ namespace test_cases
DepList d1(&env, DepListOptions());
d1.options()->dependency_tags() = true;
PackageDepSpec with_target_tag(parse_user_package_dep_spec("cat/one",
- &env, UserPackageDepSpecOptions()));
+ &env, { }));
with_target_tag.set_tag(std::shared_ptr<const DepTag>(std::make_shared<TargetDepTag>()));
d1.add(with_target_tag, env.default_destinations());
PackageDepSpec with_set_tag(parse_user_package_dep_spec("cat/two",
- &env, UserPackageDepSpecOptions()));
+ &env, { }));
with_set_tag.set_tag(std::shared_ptr<const DepTag>(std::make_shared<GeneralSetDepTag>(SetName("set"), "test")));
d1.add(with_set_tag, env.default_destinations());
diff --git a/paludis/dep_list_TEST_blockers.cc b/paludis/dep_list_TEST_blockers.cc
index 2e311ef..cef81eb 100644
--- a/paludis/dep_list_TEST_blockers.cc
+++ b/paludis/dep_list_TEST_blockers.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -47,12 +47,12 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
d.options()->blocks() = dl_blocks_error;
- TEST_CHECK_THROWS(d.add(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions()),
+ TEST_CHECK_THROWS(d.add(parse_user_package_dep_spec(merge_target, &env, { }),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
d.options()->blocks() = dl_blocks_accumulate;
- d.add(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions()), env.default_destinations());
+ d.add(parse_user_package_dep_spec(merge_target, &env, { }), env.default_destinations());
TEST_CHECK_EQUAL(std::distance(d.begin(), d.end()), 2);
TEST_CHECK_EQUAL(d.begin()->kind(), dlk_block);
TEST_CHECK_STRINGIFY_EQUAL(*d.begin()->package_id(), "cat/two-1:0::installed");
@@ -124,12 +124,12 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
d.options()->blocks() = dl_blocks_error;
- TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions())),
+ TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
d.options()->blocks() = dl_blocks_accumulate;
- d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions())), env.default_destinations());
+ d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, { })), env.default_destinations());
TEST_CHECK_EQUAL(std::distance(d.begin(), d.end()), 4);
TEST_CHECK_EQUAL(d.begin()->kind(), dlk_block);
TEST_CHECK_STRINGIFY_EQUAL(*d.begin()->package_id(), "virtual/two-1::installed-virtuals (virtual for other/two-1:0::installed)");
@@ -164,7 +164,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
d.options()->blocks() = dl_blocks_error;
- TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions())),
+ TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -306,7 +306,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
d.options()->blocks() = dl_blocks_error;
- TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions())),
+ TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -336,7 +336,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
d.options()->blocks() = dl_blocks_error;
- TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions())),
+ TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
@@ -365,7 +365,7 @@ namespace test_cases
TEST_CHECK(true);
DepList d(&env, DepListOptions());
d.options()->blocks() = dl_blocks_error;
- TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, UserPackageDepSpecOptions())),
+ TEST_CHECK_THROWS(d.add(PackageDepSpec(parse_user_package_dep_spec(merge_target, &env, { })),
env.default_destinations()), DepListError);
TEST_CHECK(d.begin() == d.end());
}
diff --git a/paludis/dep_spec_TEST.cc b/paludis/dep_spec_TEST.cc
index 050dbda..7925b53 100644
--- a/paludis/dep_spec_TEST.cc
+++ b/paludis/dep_spec_TEST.cc
@@ -63,7 +63,7 @@ namespace test_cases
{
TestEnvironment env;
PackageDepSpec a(parse_user_package_dep_spec("cat/pkg:1::repo[=1|>3.2][foo]",
- &env, UserPackageDepSpecOptions()));
+ &env, { }));
std::shared_ptr<PackageDepSpec> b(std::static_pointer_cast<PackageDepSpec>(a.clone()));
TEST_CHECK_STRINGIFY_EQUAL(a, *b);
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index f8cf331..9505f2f 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -56,12 +56,12 @@ namespace paludis
for (DirIterator d(getenv_with_default("PALUDIS_DISTRIBUTIONS_DIR", DATADIR "/paludis/distributions")), d_end ;
d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".conf", { }))
continue;
Context cc("When loading distribution file '" + stringify(*d) + "':");
- KeyValueConfigFile k(*d, KeyValueConfigFileOptions(), &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
+ KeyValueConfigFile k(*d, { }, &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
values.insert(std::make_pair(strip_trailing_string(d->basename(), ".conf"),
std::make_shared<Distribution>(make_named_values<Distribution>(
diff --git a/paludis/elike_use_requirement_TEST.cc b/paludis/elike_use_requirement_TEST.cc
index 6c367cc..4726ff9 100644
--- a/paludis/elike_use_requirement_TEST.cc
+++ b/paludis/elike_use_requirement_TEST.cc
@@ -70,25 +70,25 @@ namespace test_cases
set_conditionals(id, "enabled disabled");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing));
+ parse_elike_use_requirement("enabled", std::shared_ptr<const PackageID>(), { euro_strict_parsing }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[enabled]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'enabled' enabled");
TEST_CHECK(req1->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing));
+ parse_elike_use_requirement("disabled", std::shared_ptr<const PackageID>(), { euro_strict_parsing }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[disabled]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'disabled' enabled");
TEST_CHECK(! req2->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3(
- parse_elike_use_requirement("-enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing));
+ parse_elike_use_requirement("-enabled", std::shared_ptr<const PackageID>(), { euro_strict_parsing }));
TEST_CHECK_EQUAL(req3->as_raw_string(), "[-enabled]");
TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'enabled' disabled");
TEST_CHECK(! req3->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4(
- parse_elike_use_requirement("-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_strict_parsing));
+ parse_elike_use_requirement("-disabled", std::shared_ptr<const PackageID>(), { euro_strict_parsing }));
TEST_CHECK_EQUAL(req4->as_raw_string(), "[-disabled]");
TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'disabled' disabled");
TEST_CHECK(req4->requirement_met(&env, *id).first);
@@ -111,25 +111,25 @@ namespace test_cases
set_conditionals(id, "enabled disabled");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("enabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[enabled]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'enabled' enabled");
TEST_CHECK(req1->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("disabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[disabled]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'disabled' enabled");
TEST_CHECK(! req2->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3(
- parse_elike_use_requirement("-enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("-enabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req3->as_raw_string(), "[-enabled]");
TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'enabled' disabled");
TEST_CHECK(! req3->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4(
- parse_elike_use_requirement("-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("-disabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req4->as_raw_string(), "[-disabled]");
TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'disabled' disabled");
TEST_CHECK(req4->requirement_met(&env, *id).first);
@@ -152,31 +152,31 @@ namespace test_cases
set_conditionals(id, "enabled disabled");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("enabled,-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("enabled,-disabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[enabled,-disabled]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' disabled");
TEST_CHECK(req1->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("enabled,disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("enabled,disabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[enabled,disabled]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' enabled");
TEST_CHECK(! req2->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3(
- parse_elike_use_requirement("-enabled,-disabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("-enabled,-disabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req3->as_raw_string(), "[-enabled,-disabled]");
TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'enabled' disabled; Flag 'disabled' disabled");
TEST_CHECK(! req3->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4(
- parse_elike_use_requirement("enabled,-disabled,-enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("enabled,-disabled,-enabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req4->as_raw_string(), "[enabled,-disabled,-enabled]");
TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' disabled; Flag 'enabled' disabled");
TEST_CHECK(! req4->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req5(
- parse_elike_use_requirement("enabled,-disabled,enabled", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("enabled,-disabled,enabled", std::shared_ptr<const PackageID>(), { euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req5->as_raw_string(), "[enabled,-disabled,enabled]");
TEST_CHECK_EQUAL(req5->as_human_string(), "Flag 'enabled' enabled; Flag 'disabled' disabled; Flag 'enabled' enabled");
TEST_CHECK(req5->requirement_met(&env, *id).first);
@@ -201,84 +201,84 @@ namespace test_cases
set_conditionals(id2, "pkgname");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname?", id, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req1->requirement_met(&env, *id).first);
TEST_CHECK(! req1->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname?", id2, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req2->requirement_met(&env, *id).first);
TEST_CHECK(req2->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3(
- parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname?", id, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req3->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req3->requirement_met(&env, *id).first);
TEST_CHECK(req3->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4(
- parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname?", id2, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req4->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req4->requirement_met(&env, *id).first);
TEST_CHECK(req4->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req5(
- parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!?", id, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req5->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req5->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req5->requirement_met(&env, *id).first);
TEST_CHECK(req5->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req6(
- parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!?", id2, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req6->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req6->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req6->requirement_met(&env, *id).first);
TEST_CHECK(! req6->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7(
- parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname!?", id, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req7->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req7->requirement_met(&env, *id).first);
TEST_CHECK(req7->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8(
- parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname!?", id2, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req8->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req8->requirement_met(&env, *id).first);
TEST_CHECK(req8->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9(
- parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname=", id, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(req9->requirement_met(&env, *id).first);
TEST_CHECK(! req9->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10(
- parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname=", id2, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req10->requirement_met(&env, *id).first);
TEST_CHECK(req10->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11(
- parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!=", id, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req11->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req11->requirement_met(&env, *id).first);
TEST_CHECK(req11->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12(
- parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!=", id2, { euro_allow_self_deps, euro_strict_parsing }));
TEST_CHECK_EQUAL(req12->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req12->requirement_met(&env, *id).first);
@@ -304,56 +304,56 @@ namespace test_cases
set_conditionals(id2, "pkgname");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname?", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req1->requirement_met(&env, *id).first);
TEST_CHECK(! req1->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname?", id2, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req2->requirement_met(&env, *id).first);
TEST_CHECK(req2->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7(
- parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname?", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req7->requirement_met(&env, *id).first);
TEST_CHECK(req7->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8(
- parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname?", id2, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req8->requirement_met(&env, *id).first);
TEST_CHECK(req8->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9(
- parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname=", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(req9->requirement_met(&env, *id).first);
TEST_CHECK(! req9->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10(
- parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname=", id2, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req10->requirement_met(&env, *id).first);
TEST_CHECK(req10->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11(
- parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname=", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req11->requirement_met(&env, *id).first);
TEST_CHECK(req11->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12(
- parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname=", id2, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }));
TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req12->requirement_met(&env, *id).first);
@@ -379,112 +379,112 @@ namespace test_cases
set_conditionals(id2, "pkgname");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname?", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req1->requirement_met(&env, *id).first);
TEST_CHECK(! req1->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname?", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req2->requirement_met(&env, *id).first);
TEST_CHECK(req2->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7(
- parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname?", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req7->requirement_met(&env, *id).first);
TEST_CHECK(req7->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8(
- parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname?", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req8->requirement_met(&env, *id).first);
TEST_CHECK(req8->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9(
- parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname=", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(req9->requirement_met(&env, *id).first);
TEST_CHECK(! req9->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10(
- parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname=", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req10->requirement_met(&env, *id).first);
TEST_CHECK(req10->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11(
- parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname=", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req11->requirement_met(&env, *id).first);
TEST_CHECK(req11->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12(
- parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("!pkgname=", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req12->requirement_met(&env, *id).first);
TEST_CHECK(! req12->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req13(
- parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname?", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req13->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req13->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req13->requirement_met(&env, *id).first);
TEST_CHECK(req13->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req14(
- parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname?", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req14->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req14->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req14->requirement_met(&env, *id).first);
TEST_CHECK(req14->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req15(
- parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!?", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req15->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req15->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req15->requirement_met(&env, *id).first);
TEST_CHECK(req15->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req16(
- parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!?", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req16->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req16->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req16->requirement_met(&env, *id).first);
TEST_CHECK(! req16->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req17(
- parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname!?", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req17->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req17->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req17->requirement_met(&env, *id).first);
TEST_CHECK(req17->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req18(
- parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("-pkgname!?", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req18->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req18->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req18->requirement_met(&env, *id).first);
TEST_CHECK(req18->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req19(
- parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!=", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req19->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req19->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req19->requirement_met(&env, *id).first);
TEST_CHECK(req19->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req20(
- parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing));
+ parse_elike_use_requirement("pkgname!=", id2, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }));
TEST_CHECK_EQUAL(req20->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req20->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req20->requirement_met(&env, *id).first);
@@ -507,18 +507,18 @@ namespace test_cases
std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1"));
set_conditionals(id, "pkgname");
- TEST_CHECK_THROWS(parse_elike_use_requirement("", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("-", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("-?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("-!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
-
- TEST_CHECK_THROWS(parse_elike_use_requirement("!test?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("!test=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("test1,test2", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_strict_parsing), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("-", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("?", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("-?", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!?", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("-!?", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("=", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!=", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!test?", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!test=", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("test1,test2", id, { euro_allow_self_deps, euro_strict_parsing }), ELikeUseRequirementError);
}
} test_malformed_use_requirements;
@@ -537,22 +537,22 @@ namespace test_cases
std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1"));
set_conditionals(id, "pkgname");
- TEST_CHECK_THROWS(parse_elike_use_requirement("", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("-", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
-
- TEST_CHECK_THROWS(parse_elike_use_requirement(",", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("test,", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement(",test", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("test,,test", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
-
- TEST_CHECK_THROWS(parse_elike_use_requirement("test!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("-test?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("-test!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("test!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax + euro_strict_parsing), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("-", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("?", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!?", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("=", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!=", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+
+ TEST_CHECK_THROWS(parse_elike_use_requirement(",", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("test,", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement(",test", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("test,,test", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+
+ TEST_CHECK_THROWS(parse_elike_use_requirement("test!?", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("-test?", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("-test!?", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("test!=", id, { euro_allow_self_deps, euro_portage_syntax, euro_strict_parsing }), ELikeUseRequirementError);
}
} test_malformed_use_requirements_portage_syntax;
@@ -571,17 +571,17 @@ namespace test_cases
std::shared_ptr<FakePackageID> id(fake->add_version("cat", "enabled", "1"));
set_conditionals(id, "pkgname");
- TEST_CHECK_THROWS(parse_elike_use_requirement("", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("-", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
-
- TEST_CHECK_THROWS(parse_elike_use_requirement(",", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("test,", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement(",test", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
- TEST_CHECK_THROWS(parse_elike_use_requirement("test,,test", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_both_syntaxes + euro_strict_parsing), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("-", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("?", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!?", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("=", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("!=", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+
+ TEST_CHECK_THROWS(parse_elike_use_requirement(",", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("test,", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement(",test", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
+ TEST_CHECK_THROWS(parse_elike_use_requirement("test,,test", id, { euro_allow_self_deps, euro_both_syntaxes, euro_strict_parsing }), ELikeUseRequirementError);
}
} test_malformed_use_requirements_both_syntaxes;
@@ -603,112 +603,112 @@ namespace test_cases
set_conditionals(id2, "pkgname");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname?", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req1->requirement_met(&env, *id).first);
TEST_CHECK(! req1->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname?", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req2->requirement_met(&env, *id).first);
TEST_CHECK(req2->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7(
- parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("!pkgname?", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req7->requirement_met(&env, *id).first);
TEST_CHECK(req7->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8(
- parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("!pkgname?", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req8->requirement_met(&env, *id).first);
TEST_CHECK(req8->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9(
- parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname=", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(req9->requirement_met(&env, *id).first);
TEST_CHECK(! req9->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10(
- parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname=", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req10->requirement_met(&env, *id).first);
TEST_CHECK(req10->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11(
- parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("!pkgname=", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req11->requirement_met(&env, *id).first);
TEST_CHECK(req11->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12(
- parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("!pkgname=", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req12->requirement_met(&env, *id).first);
TEST_CHECK(! req12->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req13(
- parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("-pkgname?", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req13->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req13->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req13->requirement_met(&env, *id).first);
TEST_CHECK(req13->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req14(
- parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("-pkgname?", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req14->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req14->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req14->requirement_met(&env, *id).first);
TEST_CHECK(req14->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req15(
- parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname!?", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req15->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req15->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req15->requirement_met(&env, *id).first);
TEST_CHECK(req15->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req16(
- parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname!?", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req16->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req16->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req16->requirement_met(&env, *id).first);
TEST_CHECK(! req16->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req17(
- parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("-pkgname!?", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req17->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req17->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req17->requirement_met(&env, *id).first);
TEST_CHECK(req17->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req18(
- parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("-pkgname!?", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req18->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req18->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req18->requirement_met(&env, *id).first);
TEST_CHECK(req18->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req19(
- parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname!=", id, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req19->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req19->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req19->requirement_met(&env, *id).first);
TEST_CHECK(req19->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req20(
- parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps));
+ parse_elike_use_requirement("pkgname!=", id2, { euro_allow_self_deps }));
TEST_CHECK_EQUAL(req20->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req20->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req20->requirement_met(&env, *id).first);
@@ -734,112 +734,112 @@ namespace test_cases
set_conditionals(id2, "pkgname");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname?", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req1->requirement_met(&env, *id).first);
TEST_CHECK(! req1->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname?", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[pkgname?]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'pkgname' enabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req2->requirement_met(&env, *id).first);
TEST_CHECK(req2->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req7(
- parse_elike_use_requirement("!pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("!pkgname?", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req7->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req7->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req7->requirement_met(&env, *id).first);
TEST_CHECK(req7->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req8(
- parse_elike_use_requirement("!pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("!pkgname?", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req8->as_raw_string(), "[!pkgname?]");
TEST_CHECK_EQUAL(req8->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req8->requirement_met(&env, *id).first);
TEST_CHECK(req8->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req9(
- parse_elike_use_requirement("pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname=", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req9->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req9->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(req9->requirement_met(&env, *id).first);
TEST_CHECK(! req9->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req10(
- parse_elike_use_requirement("pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname=", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req10->as_raw_string(), "[pkgname=]");
TEST_CHECK_EQUAL(req10->as_human_string(), "Flag 'pkgname' enabled or disabled like it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req10->requirement_met(&env, *id).first);
TEST_CHECK(req10->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req11(
- parse_elike_use_requirement("!pkgname=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("!pkgname=", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req11->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req11->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req11->requirement_met(&env, *id).first);
TEST_CHECK(req11->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req12(
- parse_elike_use_requirement("!pkgname=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("!pkgname=", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req12->as_raw_string(), "[!pkgname=]");
TEST_CHECK_EQUAL(req12->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req12->requirement_met(&env, *id).first);
TEST_CHECK(! req12->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req13(
- parse_elike_use_requirement("-pkgname?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("-pkgname?", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req13->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req13->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req13->requirement_met(&env, *id).first);
TEST_CHECK(req13->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req14(
- parse_elike_use_requirement("-pkgname?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("-pkgname?", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req14->as_raw_string(), "[-pkgname?]");
TEST_CHECK_EQUAL(req14->as_human_string(), "Flag 'pkgname' disabled if it is enabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req14->requirement_met(&env, *id).first);
TEST_CHECK(req14->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req15(
- parse_elike_use_requirement("pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname!?", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req15->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req15->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req15->requirement_met(&env, *id).first);
TEST_CHECK(req15->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req16(
- parse_elike_use_requirement("pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname!?", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req16->as_raw_string(), "[pkgname!?]");
TEST_CHECK_EQUAL(req16->as_human_string(), "Flag 'pkgname' enabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(req16->requirement_met(&env, *id).first);
TEST_CHECK(! req16->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req17(
- parse_elike_use_requirement("-pkgname!?", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("-pkgname!?", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req17->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req17->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/enabled-1:0::fake'");
TEST_CHECK(req17->requirement_met(&env, *id).first);
TEST_CHECK(req17->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req18(
- parse_elike_use_requirement("-pkgname!?", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("-pkgname!?", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req18->as_raw_string(), "[-pkgname!?]");
TEST_CHECK_EQUAL(req18->as_human_string(), "Flag 'pkgname' disabled if it is disabled for 'cat/disabled-1:0::fake'");
TEST_CHECK(! req18->requirement_met(&env, *id).first);
TEST_CHECK(req18->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req19(
- parse_elike_use_requirement("pkgname!=", id, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname!=", id, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req19->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req19->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/enabled-1:0::fake'");
TEST_CHECK(! req19->requirement_met(&env, *id).first);
TEST_CHECK(req19->requirement_met(&env, *id2).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req20(
- parse_elike_use_requirement("pkgname!=", id2, ELikeUseRequirementOptions() + euro_allow_self_deps + euro_portage_syntax));
+ parse_elike_use_requirement("pkgname!=", id2, { euro_allow_self_deps, euro_portage_syntax }));
TEST_CHECK_EQUAL(req20->as_raw_string(), "[pkgname!=]");
TEST_CHECK_EQUAL(req20->as_human_string(), "Flag 'pkgname' enabled or disabled opposite to how it is for 'cat/disabled-1:0::fake'");
TEST_CHECK(req20->requirement_met(&env, *id).first);
@@ -863,25 +863,25 @@ namespace test_cases
set_conditionals(id, "enabled disabled");
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
- parse_elike_use_requirement("missing(+)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing));
+ parse_elike_use_requirement("missing(+)", std::shared_ptr<const PackageID>(), { euro_allow_default_values, euro_strict_parsing }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[missing(+)]");
TEST_CHECK_EQUAL(req1->as_human_string(), "Flag 'missing' enabled, assuming enabled if missing");
TEST_CHECK(req1->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
- parse_elike_use_requirement("missing(-)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing));
+ parse_elike_use_requirement("missing(-)", std::shared_ptr<const PackageID>(), { euro_allow_default_values, euro_strict_parsing }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[missing(-)]");
TEST_CHECK_EQUAL(req2->as_human_string(), "Flag 'missing' enabled, assuming disabled if missing");
TEST_CHECK(! req2->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req3(
- parse_elike_use_requirement("-missing(+)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing));
+ parse_elike_use_requirement("-missing(+)", std::shared_ptr<const PackageID>(), { euro_allow_default_values, euro_strict_parsing }));
TEST_CHECK_EQUAL(req3->as_raw_string(), "[-missing(+)]");
TEST_CHECK_EQUAL(req3->as_human_string(), "Flag 'missing' disabled, assuming enabled if missing");
TEST_CHECK(! req3->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req4(
- parse_elike_use_requirement("-missing(-)", std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions() + euro_allow_default_values + euro_strict_parsing));
+ parse_elike_use_requirement("-missing(-)", std::shared_ptr<const PackageID>(), { euro_allow_default_values, euro_strict_parsing }));
TEST_CHECK_EQUAL(req4->as_raw_string(), "[-missing(-)]");
TEST_CHECK_EQUAL(req4->as_human_string(), "Flag 'missing' disabled, assuming disabled if missing");
TEST_CHECK(req4->requirement_met(&env, *id).first);
@@ -905,13 +905,13 @@ namespace test_cases
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
parse_elike_use_requirement("foo:*", id,
- ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps));
+ { euro_allow_default_values, euro_allow_self_deps }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[foo:*]");
TEST_CHECK(! req1->requirement_met(&env, *id).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
parse_elike_use_requirement("foo:*=", id,
- ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps));
+ { euro_allow_default_values, euro_allow_self_deps }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[foo:*=]");
TEST_CHECK(req2->requirement_met(&env, *id).first);
}
@@ -938,16 +938,16 @@ namespace test_cases
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req1(
parse_elike_use_requirement("foo:*(?)=", id2,
- ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps +
- euro_allow_default_question_values));
+ { euro_allow_default_values, euro_allow_self_deps,
+ euro_allow_default_question_values }));
TEST_CHECK_EQUAL(req1->as_raw_string(), "[foo:*(?)=]");
TEST_CHECK(req1->requirement_met(&env, *id2).first);
TEST_CHECK(req1->requirement_met(&env, *id1).first);
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req2(
parse_elike_use_requirement("bar:*(?)=", id2,
- ELikeUseRequirementOptions() + euro_allow_default_values + euro_allow_self_deps +
- euro_allow_default_question_values));
+ { euro_allow_default_values, euro_allow_self_deps,
+ euro_allow_default_question_values }));
TEST_CHECK_EQUAL(req2->as_raw_string(), "[bar:*(?)=]");
TEST_CHECK(req2->requirement_met(&env, *id2).first);
TEST_CHECK(req2->requirement_met(&env, *id1).first);
diff --git a/paludis/environments/paludis/bashable_conf.cc b/paludis/environments/paludis/bashable_conf.cc
index f3a87a4..3a3f408 100644
--- a/paludis/environments/paludis/bashable_conf.cc
+++ b/paludis/environments/paludis/bashable_conf.cc
@@ -49,7 +49,7 @@ paludis::paludis_environment::make_bashable_conf(const FSEntry & f, const LineCo
std::shared_ptr<LineConfigFile> result;
- if (is_file_with_extension(f, ".bash", IsFileWithOptions()))
+ if (is_file_with_extension(f, ".bash", { }))
{
std::stringstream s;
Command cmd(Command("bash '" + stringify(f) + "'")
@@ -82,7 +82,7 @@ paludis::paludis_environment::make_bashable_kv_conf(const FSEntry & f,
std::shared_ptr<KeyValueConfigFile> result;
- if (is_file_with_extension(f, ".bash", IsFileWithOptions()))
+ if (is_file_with_extension(f, ".bash", { }))
{
std::stringstream s;
Command cmd(Command("bash '" + stringify(f) + "'")
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index 73189e3..ea26d40 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -87,7 +87,7 @@ KeywordsConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a keywords file:");
- std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions()));
+ std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, { }));
if (! f)
return;
@@ -103,8 +103,7 @@ KeywordsConf::add(const FSEntry & filename)
try
{
std::shared_ptr<PackageDepSpec> d(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
- tokens.at(0), _imp->env,
- UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set)));
+ tokens.at(0), _imp->env, { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
if (d->package_ptr())
{
KeywordsList & k(_imp->qualified[*d->package_ptr()][d]);
@@ -150,7 +149,7 @@ KeywordsConf::query(const std::shared_ptr<const KeywordNameSet> & k, const Packa
for (PDSToKeywordsList::const_iterator j(i->second.begin()), j_end(i->second.end()) ;
j != j_end ; ++j)
{
- if (! match_package(*_imp->env, *j->first, e, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *j->first, e, { }))
continue;
for (KeywordsList::const_iterator l(j->second.begin()), l_end(j->second.end()) ;
@@ -190,7 +189,7 @@ KeywordsConf::query(const std::shared_ptr<const KeywordNameSet> & k, const Packa
}
}
- if (! match_package_in_set(*_imp->env, *i->second.first, e, MatchPackageOptions()))
+ if (! match_package_in_set(*_imp->env, *i->second.first, e, { }))
continue;
for (KeywordsList::const_iterator l(i->second.second.begin()), l_end(i->second.second.end()) ;
@@ -216,7 +215,7 @@ KeywordsConf::query(const std::shared_ptr<const KeywordNameSet> & k, const Packa
for (PDSToKeywordsList::const_iterator j(_imp->unqualified.begin()), j_end(_imp->unqualified.end()) ;
j != j_end ; ++j)
{
- if (! match_package(*_imp->env, *j->first, e, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *j->first, e, { }))
continue;
for (KeywordsList::const_iterator l(j->second.begin()), l_end(j->second.end()) ;
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index 06aa3d8..d40322e 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -86,7 +86,7 @@ LicensesConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a licenses file:");
- std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions()));
+ std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, { }));
if (! f)
return;
@@ -103,7 +103,7 @@ LicensesConf::add(const FSEntry & filename)
{
std::shared_ptr<PackageDepSpec> d(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
tokens.at(0), _imp->env,
- UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set)));
+ { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
if (d->package_ptr())
{
LicensesList & k(_imp->qualified[*d->package_ptr()][d]);
@@ -143,7 +143,7 @@ LicensesConf::query(const std::string & t, const PackageID & e) const
for (PDSToLicensesList::const_iterator j(i->second.begin()), j_end(i->second.end()) ;
j != j_end ; ++j)
{
- if (! match_package(*_imp->env, *j->first, e, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *j->first, e, { }))
continue;
for (LicensesList::const_iterator l(j->second.begin()), l_end(j->second.end()) ;
@@ -182,7 +182,7 @@ LicensesConf::query(const std::string & t, const PackageID & e) const
}
}
- if (! match_package_in_set(*_imp->env, *i->second.first, e, MatchPackageOptions()))
+ if (! match_package_in_set(*_imp->env, *i->second.first, e, { }))
continue;
for (LicensesList::const_iterator l(i->second.second.begin()), l_end(i->second.second.end()) ;
@@ -208,7 +208,7 @@ LicensesConf::query(const std::string & t, const PackageID & e) const
for (PDSToLicensesList::const_iterator j(_imp->unqualified.begin()), j_end(_imp->unqualified.end()) ;
j != j_end ; ++j)
{
- if (! match_package(*_imp->env, *j->first, e, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *j->first, e, { }))
continue;
for (LicensesList::const_iterator l(j->second.begin()), l_end(j->second.end()) ;
diff --git a/paludis/environments/paludis/mirrors_conf.cc b/paludis/environments/paludis/mirrors_conf.cc
index 21934f6..56394ea 100644
--- a/paludis/environments/paludis/mirrors_conf.cc
+++ b/paludis/environments/paludis/mirrors_conf.cc
@@ -69,7 +69,7 @@ MirrorsConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a mirrors file:");
- std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions()));
+ std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, { }));
if (! f)
return;
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc
index 98cd327..b0999e6 100644
--- a/paludis/environments/paludis/output_conf.cc
+++ b/paludis/environments/paludis/output_conf.cc
@@ -132,7 +132,7 @@ namespace
rule.output_exclusivity_requirement() = destringify<OutputExclusivity>(v);
else if (k == "matches")
rule.matches_requirement() = make_shared_copy(parse_user_package_dep_spec(
- v, env, UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation));
+ v, env, { updso_allow_wildcards, updso_no_disambiguation }));
else if (k == "action")
rule.action_requirement() = v;
else if (k == "ignore_unfetched")
@@ -194,7 +194,7 @@ namespace
return false;
if (rule.matches_requirement() && ! match_package(*env, *rule.matches_requirement(),
- *i.package_id(), MatchPackageOptions()))
+ *i.package_id(), { }))
return false;
if (! rule.ignore_unfetched_requirement().is_indeterminate())
@@ -332,7 +332,7 @@ OutputConf::add(const FSEntry & filename)
std::shared_ptr<KeyValueConfigFile> f(make_bashable_kv_conf(filename,
std::make_shared<Map<std::string, std::string>>(),
- KeyValueConfigFileOptions() + kvcfo_allow_sections));
+ { kvcfo_allow_sections }));
if (! f)
return;
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index fb0bbb3..49df819 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -77,7 +77,7 @@ PackageMaskConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a package mask or unmask file:");
- std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions()));
+ std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, { }));
if (! f)
return;
@@ -88,7 +88,7 @@ PackageMaskConf::add(const FSEntry & filename)
{
_imp->masks.push_back(std::shared_ptr<PackageDepSpec>(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
*line, _imp->env,
- UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set))));
+ { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set }))));
}
catch (const GotASetNotAPackageDepSpec &)
{
@@ -124,7 +124,7 @@ PackageMaskConf::query(const PackageID & e) const
}
}
- if (match_package_in_set(*_imp->env, *it->second, e, MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *it->second, e, { }))
return true;
}
}
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 6f346c2..68007e5 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -850,7 +850,7 @@ const std::function<std::string (const std::string &)>
PaludisConfig::repo_func_from_file(const FSEntry & repo_file)
{
std::shared_ptr<KeyValueConfigFile> kv;
- if (is_file_with_extension(repo_file, ".bash", IsFileWithOptions()))
+ if (is_file_with_extension(repo_file, ".bash", { }))
{
std::stringstream s;
Command cmd(Command("bash '" + stringify(repo_file) + "'")
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 52125b4..d03a4c5 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -505,9 +505,8 @@ namespace
SetFile s(make_named_values<SetFileParams>(
n::environment() = env,
n::file_name() = f,
- n::parser() = std::bind(&parse_user_package_dep_spec,
- std::placeholders::_1, env, UserPackageDepSpecOptions() + updso_allow_wildcards,
- filter::All()),
+ n::parser() = std::bind(&parse_user_package_dep_spec, std::placeholders::_1, env,
+ UserPackageDepSpecOptions() + updso_allow_wildcards, filter::All()),
n::set_operator_mode() = mode,
n::tag() = tag,
n::type() = type
@@ -528,10 +527,10 @@ PaludisEnvironment::populate_sets() const
if (! sets_dir.exists())
return;
- for (DirIterator d(sets_dir, DirIteratorOptions() + dio_inode_sort), d_end ;
+ for (DirIterator d(sets_dir, { dio_inode_sort }), d_end ;
d != d_end ; ++d)
{
- if (is_file_with_extension(*d, ".bash", IsFileWithOptions()))
+ if (is_file_with_extension(*d, ".bash", { }))
{
SetName n(strip_trailing_string(d->basename(), ".bash"));
add_set(n, n, std::bind(&make_set, this, *d, n, sfsmo_natural, sft_paludis_bash), false);
@@ -539,7 +538,7 @@ PaludisEnvironment::populate_sets() const
SetName n_s(stringify(n) + "*");
add_set(n_s, n_s, std::bind(&make_set, this, *d, n_s, sfsmo_star, sft_paludis_bash), false);
}
- else if (is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ else if (is_file_with_extension(*d, ".conf", { }))
{
SetName n(strip_trailing_string(d->basename(), ".conf"));
add_set(n, n, std::bind(&make_set, this, *d, n, sfsmo_natural, sft_paludis_conf), false);
diff --git a/paludis/environments/paludis/paludis_environment_TEST.cc b/paludis/environments/paludis/paludis_environment_TEST.cc
index df28465..f045eeb 100644
--- a/paludis/environments/paludis/paludis_environment_TEST.cc
+++ b/paludis/environments/paludis/paludis_environment_TEST.cc
@@ -64,10 +64,10 @@ namespace test_cases
std::shared_ptr<Environment> env(std::make_shared<PaludisEnvironment>(""));
const std::shared_ptr<const PackageID> one(*(*env)[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- env.get(), UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ env.get(), { })), { }))]->begin());
const std::shared_ptr<const PackageID> three(*(*env)[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-3",
- env.get(), UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ env.get(), { })), { }))]->begin());
TEST_CHECK(get_use("foo", one));
TEST_CHECK(! get_use("foofoo", one));
@@ -98,7 +98,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*(*env)[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- env.get(), UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ env.get(), { })), { }))]->begin());
std::shared_ptr<const Choice> foo_cards;
for (Choices::ConstIterator c(id1->choices_key()->value()->begin()), c_end(id1->choices_key()->value()->end()) ;
c != c_end ; ++c)
@@ -124,10 +124,10 @@ namespace test_cases
const std::shared_ptr<const PackageID> one(*(*env)[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- env.get(), UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ env.get(), { })), { }))]->begin());
const std::shared_ptr<const PackageID> three(*(*env)[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-3",
- env.get(), UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ env.get(), { })), { }))]->begin());
TEST_CHECK(get_use("foo", one));
TEST_CHECK(! get_use("foofoo", one));
@@ -157,10 +157,10 @@ namespace test_cases
const std::shared_ptr<const PackageID> one(*(*env)[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- env.get(), UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ env.get(), { })), { }))]->begin());
const std::shared_ptr<const PackageID> three(*(*env)[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-3",
- env.get(), UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ env.get(), { })), { }))]->begin());
TEST_CHECK(get_use("foo", one));
TEST_CHECK(! get_use("foofoo", one));
diff --git a/paludis/environments/paludis/world_TEST.cc b/paludis/environments/paludis/world_TEST.cc
index 45e7846..64ea589 100644
--- a/paludis/environments/paludis/world_TEST.cc
+++ b/paludis/environments/paludis/world_TEST.cc
@@ -43,7 +43,7 @@ namespace test_cases
{
TestEnvironment env;
paludis_environment::World world(&env, w);
- world.update_config_files_for_package_move(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ world.update_config_files_for_package_move(make_package_dep_spec({ })
.package(QualifiedPackageName("cat/before")),
QualifiedPackageName("cat/after"));
}
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index b4678db..c376dc5 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -312,7 +312,7 @@ PortageEnvironment::PortageEnvironment(const std::string & s) :
if ((_imp->conf_dir / "portage" / "mirrors").exists())
{
- LineConfigFile m(_imp->conf_dir / "portage" / "mirrors", LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile m(_imp->conf_dir / "portage" / "mirrors", { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(m.begin()), line_end(m.end()) ;
line != line_end ; ++line)
{
@@ -362,7 +362,7 @@ PortageEnvironment::_load_atom_file(const FSEntry & f, I_ i, const std::string &
}
else
{
- LineConfigFile file(f, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile file(f, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
{
@@ -415,7 +415,7 @@ PortageEnvironment::_load_lined_file(const FSEntry & f, I_ i)
}
else
{
- LineConfigFile file(f, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile file(f, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
*i++ = std::shared_ptr<PackageDepSpec>(std::make_shared<PackageDepSpec>(
@@ -433,7 +433,7 @@ PortageEnvironment::_load_profile(const FSEntry & d)
{
Context context_local("When loading parent profiles:");
- LineConfigFile f(d / "parent", LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile f(d / "parent", { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
_load_profile((d / *line).realpath());
@@ -567,7 +567,7 @@ PortageEnvironment::want_choice_enabled(
for (PackageUse::const_iterator i(_imp->package_use.begin()), i_end(_imp->package_use.end()) ;
i != i_end ; ++i)
{
- if (! match_package(*this, *i->first, *id, MatchPackageOptions()))
+ if (! match_package(*this, *i->first, *id, { }))
continue;
if (i->second == stringify(f))
@@ -623,7 +623,7 @@ PortageEnvironment::accept_keywords(const std::shared_ptr <const KeywordNameSet>
for (PackageKeywords::const_iterator it(_imp->package_keywords.begin()),
it_end(_imp->package_keywords.end()); it_end != it; ++it)
{
- if (! match_package(*this, *it->first, d, MatchPackageOptions()))
+ if (! match_package(*this, *it->first, d, { }))
continue;
if ("-*" == it->second)
@@ -667,7 +667,7 @@ PortageEnvironment::unmasked_by_user(const PackageID & e) const
{
for (PackageUnmask::const_iterator i(_imp->package_unmask.begin()), i_end(_imp->package_unmask.end()) ;
i != i_end ; ++i)
- if (match_package(*this, **i, e, MatchPackageOptions()))
+ if (match_package(*this, **i, e, { }))
return true;
return false;
@@ -692,7 +692,7 @@ PortageEnvironment::known_choice_value_names(const std::shared_ptr<const Package
for (PackageUse::const_iterator i(_imp->package_use.begin()), i_end(_imp->package_use.end()) ;
i != i_end ; ++i)
{
- if (! match_package(*this, *i->first, *id, MatchPackageOptions()))
+ if (! match_package(*this, *i->first, *id, { }))
continue;
if (0 == i->second.compare(0, prefix_lower.length(), prefix_lower, 0, prefix_lower.length()))
@@ -850,7 +850,7 @@ PortageEnvironment::mask_for_user(const PackageID & d, const bool o) const
{
for (PackageMask::const_iterator i(_imp->package_mask.begin()), i_end(_imp->package_mask.end()) ;
i != i_end ; ++i)
- if (match_package(*this, **i, d, MatchPackageOptions()))
+ if (match_package(*this, **i, d, { }))
return std::make_shared<UserConfigMask>(o);
return std::shared_ptr<const Mask>();
diff --git a/paludis/environments/portage/portage_environment_TEST.cc b/paludis/environments/portage/portage_environment_TEST.cc
index c4ad45f..c18ca1f 100644
--- a/paludis/environments/portage/portage_environment_TEST.cc
+++ b/paludis/environments/portage/portage_environment_TEST.cc
@@ -84,11 +84,11 @@ namespace test_cases
const std::shared_ptr<const PackageID> idx(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-x-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(get_use("one", env, idx));
TEST_CHECK(get_use("two", env, idx));
@@ -119,7 +119,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
std::shared_ptr<const Choice> foo_cards;
for (Choices::ConstIterator c(id1->choices_key()->value()->begin()), c_end(id1->choices_key()->value()->end()) ;
c != c_end ; ++c)
@@ -142,7 +142,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> idx(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-x-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(accept_keyword(env, KeywordName("arch"), *idx));
TEST_CHECK(accept_keyword(env, KeywordName("other_arch"), *idx));
@@ -150,7 +150,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(accept_keyword(env, KeywordName("arch"), *id1));
TEST_CHECK(accept_keyword(env, KeywordName("other_arch"), *id1));
@@ -158,7 +158,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(accept_keyword(env, KeywordName("other_arch"), *id2));
TEST_CHECK(accept_keyword(env, KeywordName("arch"), *id2));
@@ -166,7 +166,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id3(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-three-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(! accept_keyword(env, KeywordName("other_arch"), *id3));
TEST_CHECK(! accept_keyword(env, KeywordName("arch"), *id3));
@@ -174,14 +174,14 @@ namespace test_cases
const std::shared_ptr<const PackageID> id4(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-four-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(accept_keyword(env, KeywordName("fred"), *id4));
std::shared_ptr<const KeywordNameSet> empty(std::make_shared<KeywordNameSet>());
TEST_CHECK(env.accept_keywords(empty, *id4));
const std::shared_ptr<const PackageID> id5(*env[selection::RequireExactlyOne(
generator::Matches(PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-five-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(accept_keyword(env, KeywordName("~foo"), *id5));
TEST_CHECK(! accept_keyword(env, KeywordName("foo"), *id5));
}
@@ -196,7 +196,7 @@ namespace test_cases
TestPortageEnvironment env("portage_environment_TEST_dir/world");
FSEntry w(FSEntry::cwd() / "portage_environment_TEST_dir" / "world" / "var" / "lib" / "portage" / "world");
- env.update_config_files_for_package_move(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ env.update_config_files_for_package_move(make_package_dep_spec({ })
.package(QualifiedPackageName("cat/before")),
QualifiedPackageName("cat/after"));
diff --git a/paludis/filter_TEST.cc b/paludis/filter_TEST.cc
index 099005d..9cb4932 100644
--- a/paludis/filter_TEST.cc
+++ b/paludis/filter_TEST.cc
@@ -74,14 +74,14 @@ namespace test_cases
env.package_database()->add_repository(10, repo2);
env.package_database()->add_repository(0, inst_repo1);
- repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", VersionSpecOptions()));
- repo1->add_version(CategoryNamePart("cat") + PackageNamePart("b"), VersionSpec("2", VersionSpecOptions()));
+ repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", { }));
+ repo1->add_version(CategoryNamePart("cat") + PackageNamePart("b"), VersionSpec("2", { }));
- repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", VersionSpecOptions()));
- repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("2", VersionSpecOptions()))->keywords_key()->set_from_string("");
- repo2->add_version(CategoryNamePart("cat") + PackageNamePart("c"), VersionSpec("3", VersionSpecOptions()));
+ repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", { }));
+ repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("2", { }))->keywords_key()->set_from_string("");
+ repo2->add_version(CategoryNamePart("cat") + PackageNamePart("c"), VersionSpec("3", { }));
- inst_repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", VersionSpecOptions()));
+ inst_repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", { }));
}
virtual std::string get_expected() const = 0;
@@ -96,7 +96,7 @@ namespace test_cases
std::shared_ptr<const PackageIDSequence> got_none(env[selection::AllVersionsSorted(
generator::Matches(parse_user_package_dep_spec("not/exist", &env,
- UserPackageDepSpecOptions()), MatchPackageOptions()) | filter)]);
+ { }), { }) | filter)]);
TEST_CHECK(bool(got_none));
TEST_CHECK_EQUAL(join(indirect_iterator(got_none->begin()), indirect_iterator(got_none->end()), ", "), "");
}
@@ -222,9 +222,9 @@ namespace test_cases
{
MatchesFilterTestCase() :
FilterTestCaseBase("matches", filter::Matches(parse_user_package_dep_spec("cat/a",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))
+ &env, { }), { }))
{
- }
+ }
virtual std::string get_expected() const
{
@@ -240,7 +240,7 @@ namespace test_cases
{
MatchesCatWildcardFilterTestCase() :
FilterTestCaseBase("matches cat wildcard", filter::Matches(parse_user_package_dep_spec("*/a",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions()))
+ &env, { updso_allow_wildcards }), { }))
{
}
@@ -258,7 +258,7 @@ namespace test_cases
{
MatchesPkgWildcardFilterTestCase() :
FilterTestCaseBase("matches pkg wildcard", filter::Matches(parse_user_package_dep_spec("cat/*",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions()))
+ &env, { updso_allow_wildcards }), { }))
{
}
@@ -279,7 +279,7 @@ namespace test_cases
MatchesAllWildcardFilterTestCase() :
FilterTestCaseBase("matches all wildcard", filter::Matches(
parse_user_package_dep_spec(">=*/*-2",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions()))
+ &env, { updso_allow_wildcards }), { }))
{
}
diff --git a/paludis/fuzzy_finder.cc b/paludis/fuzzy_finder.cc
index 848e34a..5ed6ce3 100644
--- a/paludis/fuzzy_finder.cc
+++ b/paludis/fuzzy_finder.cc
@@ -138,7 +138,7 @@ FuzzyCandidatesFinder::FuzzyCandidatesFinder(const Environment & e, const std::s
if (std::string::npos != name.find('/'))
{
- PackageDepSpec pds(parse_user_package_dep_spec(name, &e, UserPackageDepSpecOptions()));
+ PackageDepSpec pds(parse_user_package_dep_spec(name, &e, { }));
if (pds.package_ptr())
{
diff --git a/paludis/generator_TEST.cc b/paludis/generator_TEST.cc
index c8e602e..e687c30 100644
--- a/paludis/generator_TEST.cc
+++ b/paludis/generator_TEST.cc
@@ -72,14 +72,14 @@ namespace test_cases
env.package_database()->add_repository(10, repo2);
env.package_database()->add_repository(0, inst_repo1);
- repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", VersionSpecOptions()));
- repo1->add_version(CategoryNamePart("cat") + PackageNamePart("b"), VersionSpec("2", VersionSpecOptions()));
+ repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", { }));
+ repo1->add_version(CategoryNamePart("cat") + PackageNamePart("b"), VersionSpec("2", { }));
- repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", VersionSpecOptions()));
- repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("2", VersionSpecOptions()))->keywords_key()->set_from_string("");
- repo2->add_version(CategoryNamePart("cat") + PackageNamePart("c"), VersionSpec("3", VersionSpecOptions()));
+ repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", { }));
+ repo2->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("2", { }))->keywords_key()->set_from_string("");
+ repo2->add_version(CategoryNamePart("cat") + PackageNamePart("c"), VersionSpec("3", { }));
- inst_repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", VersionSpecOptions()));
+ inst_repo1->add_version(CategoryNamePart("cat") + PackageNamePart("a"), VersionSpec("1", { }));
}
virtual std::string get_expected() const = 0;
@@ -122,7 +122,7 @@ namespace test_cases
{
MatchesGeneratorTestCase() :
GeneratorTestCaseBase("matches", generator::Matches(parse_user_package_dep_spec("cat/a",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))
+ &env, { }), { }))
{
}
@@ -140,7 +140,7 @@ namespace test_cases
{
MatchesCatWildcardGeneratorTestCase() :
GeneratorTestCaseBase("matches cat wildcard", generator::Matches(parse_user_package_dep_spec("*/a",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions()))
+ &env, { updso_allow_wildcards }), { }))
{
}
@@ -158,7 +158,7 @@ namespace test_cases
{
MatchesPkgWildcardGeneratorTestCase() :
GeneratorTestCaseBase("matches pkg wildcard", generator::Matches(parse_user_package_dep_spec("cat/*",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions()))
+ &env, { updso_allow_wildcards }), { }))
{
}
@@ -179,7 +179,7 @@ namespace test_cases
MatchesAllWildcardGeneratorTestCase() :
GeneratorTestCaseBase("matches all wildcard", generator::Matches(
parse_user_package_dep_spec(">=*/*-2",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions()))
+ &env, { updso_allow_wildcards }), { }))
{
}
@@ -287,9 +287,9 @@ namespace test_cases
IntersectionGeneratorTestCase() :
GeneratorTestCaseBase("intersection", generator::Intersection(
generator::Matches(parse_user_package_dep_spec("*/a",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions()),
+ &env, { updso_allow_wildcards }), { }),
generator::Matches(parse_user_package_dep_spec("cat/*",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions())
+ &env, { updso_allow_wildcards }), { })
))
{
}
diff --git a/paludis/hooker.cc b/paludis/hooker.cc
index 204aa3b..2eeae7e 100644
--- a/paludis/hooker.cc
+++ b/paludis/hooker.cc
@@ -474,12 +474,12 @@ namespace paludis
std::shared_ptr<HookFile> hook_file;
std::string name;
- if (is_file_with_extension(*e, ".hook", IsFileWithOptions()))
+ if (is_file_with_extension(*e, ".hook", { }))
{
hook_file = std::make_shared<FancyHookFile>(*e, d->second, env);
name = strip_trailing_string(e->basename(), ".hook");
}
- else if (is_file_with_extension(*e, so_suffix, IsFileWithOptions()))
+ else if (is_file_with_extension(*e, so_suffix, { }))
{
hook_file = std::make_shared<SoHookFile>(*e, d->second, env);
name = strip_trailing_string(e->basename(), so_suffix);
@@ -574,21 +574,21 @@ Hooker::_find_hooks(const Hook & hook) const
if (ignore_hooks.find(e->basename()) != ignore_hooks.end())
continue;
- if (is_file_with_extension(*e, ".bash", IsFileWithOptions()))
+ if (is_file_with_extension(*e, ".bash", { }))
if (! hook_files.insert(std::make_pair(strip_trailing_string(e->basename(), ".bash"),
std::shared_ptr<HookFile>(std::make_shared<BashHookFile>(*e, d->second, _imp->env)))).second)
Log::get_instance()->message("hook.discarding", ll_warning, lc_context) << "Discarding hook file '" << *e
<< "' because of naming conflict with '" <<
hook_files.find(stringify(strip_trailing_string(e->basename(), ".bash")))->second->file_name() << "'";
- if (is_file_with_extension(*e, ".hook", IsFileWithOptions()))
+ if (is_file_with_extension(*e, ".hook", { }))
if (! hook_files.insert(std::make_pair(strip_trailing_string(e->basename(), ".hook"),
std::shared_ptr<HookFile>(std::make_shared<FancyHookFile>(*e, d->second, _imp->env)))).second)
Log::get_instance()->message("hook.discarding", ll_warning, lc_context) << "Discarding hook file '" << *e
<< "' because of naming conflict with '" <<
hook_files.find(stringify(strip_trailing_string(e->basename(), ".hook")))->second->file_name() << "'";
- if (is_file_with_extension(*e, so_suffix, IsFileWithOptions()))
+ if (is_file_with_extension(*e, so_suffix, { }))
if (! hook_files.insert(std::make_pair(strip_trailing_string(e->basename(), so_suffix),
std::shared_ptr<HookFile>(std::make_shared<SoHookFile>(*e, d->second, _imp->env)))).second)
Log::get_instance()->message("hook.discarding", ll_warning, lc_context) << "Discarding hook file '" << *e
@@ -596,7 +596,7 @@ Hooker::_find_hooks(const Hook & hook) const
hook_files.find(stringify(strip_trailing_string(e->basename(), so_suffix)))->second->file_name() << "'";
#ifdef ENABLE_PYTHON_HOOKS
- if (is_file_with_extension(*e, ".py", IsFileWithOptions()))
+ if (is_file_with_extension(*e, ".py", { }))
{
static bool load_try(false);
static bool load_ok(false);
@@ -648,13 +648,13 @@ Hooker::_find_hooks(const Hook & hook) const
}
}
#elif ENABLE_PYTHON
- if (is_file_with_extension(*e, ".py", IsFileWithOptions()))
+ if (is_file_with_extension(*e, ".py", { }))
{
Log::get_instance()->message("hook.python.ignoring", ll_warning, lc_context) << "Ignoring hook '" << *e << "' because"
<< " Paludis was built using a dev-libs/boost version older than 1.34.0.";
}
#else
- if (is_file_with_extension(*e, ".py", IsFileWithOptions()))
+ if (is_file_with_extension(*e, ".py", { }))
{
Log::get_instance()->message("hook.python.ignoring", ll_warning, lc_context) << "Ignoring hook '" << *e << "' because"
<< " Paludis was built without Python support (also needs >=dev-libs/boost-1.34.0).";
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 606b65f..5957fa9 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -244,13 +244,13 @@ namespace
case 'U':
return std::make_shared<DepListEntryHandledSkippedUnsatisfied>(
- parse_user_package_dep_spec(s.substr(1), env, UserPackageDepSpecOptions()));
+ parse_user_package_dep_spec(s.substr(1), env, { }));
case 'D':
return std::make_shared<DepListEntryHandledSkippedDependent>(
*(*env)[selection::RequireExactlyOne(generator::Matches(
parse_user_package_dep_spec(s.substr(1), env,
- UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ { }), { }))]->begin());
case 'F':
if (s.length() != 1)
@@ -297,7 +297,7 @@ InstallTask::set_targets_from_serialisation(const std::string & format,
throw InternalError(PALUDIS_HERE, "Serialised value '" + *s + "' too short: no package_id");
const std::shared_ptr<const PackageID> package_id(*(*_imp->env)[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec(*tokens.begin(),
- _imp->env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ _imp->env, { }), { }))]->begin());
tokens.pop_front();
if (tokens.empty())
@@ -467,7 +467,7 @@ InstallTask::_add_target(const std::string & target)
try
{
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(target,
- _imp->env, UserPackageDepSpecOptions() + updso_throw_if_set + updso_allow_wildcards,
+ _imp->env, { updso_throw_if_set, updso_allow_wildcards },
filter::SupportsAction<InstallAction>())));
bool spec_is_installed(false);
@@ -502,7 +502,7 @@ InstallTask::_add_target(const std::string & target)
else
{
std::shared_ptr<const PackageIDSequence> names((*_imp->env)[selection::BestVersionOnly(
- generator::Matches(*spec, MatchPackageOptions()) | filter::SupportsAction<InstallAction>())]);
+ generator::Matches(*spec, { }) | filter::SupportsAction<InstallAction>())]);
if (names->empty())
{
@@ -555,7 +555,7 @@ InstallTask::_add_package_id(const std::shared_ptr<const PackageID> & target)
if (! _imp->override_target_type)
_imp->dep_list.options()->target_type() = dl_target_package;
- PartiallyMadePackageDepSpec part_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec part_spec({ });
part_spec.package(target->name());
part_spec.in_repository(target->repository()->name());
part_spec.version_requirement(make_named_values<VersionRequirement>(
@@ -1179,7 +1179,7 @@ InstallTask::_do_world_updates()
{
if (s_had_package_targets)
all->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(*t, _imp->env,
- UserPackageDepSpecOptions())));
+ { })));
else
all->root()->append(std::make_shared<NamedSetDepSpec>(SetName(*t)));
}
@@ -1508,7 +1508,7 @@ namespace
void visit(const DependencySpecTree::NodeType<PackageDepSpec>::Type & node)
{
if (! failure)
- if ((*env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions())
+ if ((*env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { })
| filter::InstalledAtRoot(env->root()))]->empty())
failure = node.spec();
}
@@ -1698,7 +1698,7 @@ namespace
if (! d->handled())
continue;
- if (! match_package(*env, *node.spec(), *d->package_id(), MatchPackageOptions()))
+ if (! match_package(*env, *node.spec(), *d->package_id(), { }))
continue;
CheckHandledVisitor v;
@@ -1713,7 +1713,7 @@ namespace
/* no match on the dep list, fall back to installed packages. if
* there are no matches here it's not a problem because of or-deps. */
std::shared_ptr<const PackageIDSequence> installed((*env)[selection::AllVersionsUnsorted(
- generator::Matches(*node.spec(), MatchPackageOptions()) |
+ generator::Matches(*node.spec(), { }) |
filter::InstalledAtRoot(env->root()))]);
for (PackageIDSequence::ConstIterator i(installed->begin()), i_end(installed->end()) ;
diff --git a/paludis/merger.cc b/paludis/merger.cc
index 159f689..431746d 100644
--- a/paludis/merger.cc
+++ b/paludis/merger.cc
@@ -209,7 +209,7 @@ Merger::do_dir_recursive(bool is_check, const FSEntry & src, const FSEntry & dst
on_enter_dir(is_check, src);
- DirIterator d(src, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), d_end;
+ DirIterator d(src, { dio_include_dotfiles, dio_inode_sort }), d_end;
if (is_check && d == d_end && dst != _imp->params.root().realpath())
{
@@ -660,7 +660,7 @@ Merger::on_sym_over_misc(bool is_check, const FSEntry & src, const FSEntry & dst
void
Merger::do_ownership_fixes_recursive(const FSEntry & dir)
{
- for (DirIterator d(dir, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(dir, { dio_include_dotfiles, dio_inode_sort }), d_end ; d != d_end ; ++d)
{
std::pair<uid_t, gid_t> new_ids(_imp->params.get_new_ids_or_minus_one()(*d));
if (uid_t(-1) != new_ids.first || gid_t(-1) != new_ids.second)
@@ -887,7 +887,7 @@ Merger::rewrite_symlink_as_needed(const FSEntry & src, const FSEntry & dst_dir)
void
Merger::track_renamed_dir_recursive(const FSEntry & dst)
{
- for (DirIterator d(dst, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(dst, { dio_include_dotfiles, dio_inode_sort }), d_end ; d != d_end ; ++d)
{
MergeStatusFlags merged_how;
if (_imp->fixed_entries.end() != _imp->fixed_entries.find(_imp->params.image() / *d))
@@ -944,7 +944,7 @@ Merger::track_renamed_dir_recursive(const FSEntry & dst)
void
Merger::relabel_dir_recursive(const FSEntry & src, const FSEntry & dst)
{
- for (DirIterator d(src, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(src, { dio_include_dotfiles, dio_inode_sort }), d_end ; d != d_end ; ++d)
{
mode_t mode(d->permissions());
std::shared_ptr<const SecurityContext> secctx(
diff --git a/paludis/merger_TEST.cc b/paludis/merger_TEST.cc
index 864cb1f..35b08cf 100644
--- a/paludis/merger_TEST.cc
+++ b/paludis/merger_TEST.cc
@@ -498,12 +498,12 @@ namespace test_cases
struct MergerEmptyDirAllowedTest : MergerTest
{
- MergerEmptyDirAllowedTest() : MergerTest("empty_dir_allowed", MergerOptions() + mo_allow_empty_dirs) { }
+ MergerEmptyDirAllowedTest() : MergerTest("empty_dir_allowed", { mo_allow_empty_dirs }) { }
void run()
{
TEST_CHECK((image_dir / "empty").is_directory());
- TEST_CHECK(DirIterator(image_dir / "empty", DirIteratorOptions() + dio_include_dotfiles + dio_first_only) == DirIterator());
+ TEST_CHECK(DirIterator(image_dir / "empty", { dio_include_dotfiles, dio_first_only }) == DirIterator());
TEST_CHECK(merger.check());
}
@@ -511,12 +511,12 @@ namespace test_cases
struct MergerEmptyDirDisallowedTest : MergerTest
{
- MergerEmptyDirDisallowedTest() : MergerTest("empty_dir_disallowed", MergerOptions()) { }
+ MergerEmptyDirDisallowedTest() : MergerTest("empty_dir_disallowed", { }) { }
void run()
{
TEST_CHECK((image_dir / "empty").is_directory());
- TEST_CHECK(DirIterator(image_dir / "empty", DirIteratorOptions() + dio_include_dotfiles + dio_first_only) == DirIterator());
+ TEST_CHECK(DirIterator(image_dir / "empty", { dio_include_dotfiles, dio_first_only }) == DirIterator());
TEST_CHECK(! merger.check());
}
@@ -524,11 +524,11 @@ namespace test_cases
struct MergerEmptyRootAllowedTest : MergerTest
{
- MergerEmptyRootAllowedTest() : MergerTest("empty_root_allowed", MergerOptions() + mo_allow_empty_dirs) { }
+ MergerEmptyRootAllowedTest() : MergerTest("empty_root_allowed", { mo_allow_empty_dirs }) { }
void run()
{
- TEST_CHECK(DirIterator(image_dir, DirIteratorOptions() + dio_include_dotfiles + dio_first_only) == DirIterator());
+ TEST_CHECK(DirIterator(image_dir, { dio_include_dotfiles, dio_first_only }) == DirIterator());
TEST_CHECK(merger.check());
}
@@ -536,11 +536,11 @@ namespace test_cases
struct MergerEmptyRootDisallowedTest : MergerTest
{
- MergerEmptyRootDisallowedTest() : MergerTest("empty_root_disallowed", MergerOptions()) { }
+ MergerEmptyRootDisallowedTest() : MergerTest("empty_root_disallowed", { }) { }
void run()
{
- TEST_CHECK(DirIterator(image_dir, DirIteratorOptions() + dio_include_dotfiles + dio_first_only) == DirIterator());
+ TEST_CHECK(DirIterator(image_dir, { dio_include_dotfiles, dio_first_only }) == DirIterator());
TEST_CHECK(! merger.check());
}
@@ -548,7 +548,7 @@ namespace test_cases
struct MergerMtimesTest : MergerTest
{
- MergerMtimesTest() : MergerTest("mtimes", MergerOptions() + mo_preserve_mtimes) { }
+ MergerMtimesTest() : MergerTest("mtimes", { mo_preserve_mtimes }) { }
void run()
{
@@ -570,7 +570,7 @@ namespace test_cases
struct MergerMtimesFixTest : MergerTest
{
- MergerMtimesFixTest() : MergerTest("mtimes_fix", MergerOptions() + mo_preserve_mtimes, true) { }
+ MergerMtimesFixTest() : MergerTest("mtimes_fix", { mo_preserve_mtimes }, true) { }
void run()
{
diff --git a/paludis/ndbam.cc b/paludis/ndbam.cc
index 5583e51..687f392 100644
--- a/paludis/ndbam.cc
+++ b/paludis/ndbam.cc
@@ -110,7 +110,7 @@ NDBAM::NDBAM(const FSEntry & l,
if ((l / "ndbam.conf").exists())
{
Context cc("When reading '" + stringify(l / "ndbam.conf") + "':");
- KeyValueConfigFile k(l / "ndbam.conf", KeyValueConfigFileOptions(), &KeyValueConfigFile::no_defaults,
+ KeyValueConfigFile k(l / "ndbam.conf", { }, &KeyValueConfigFile::no_defaults,
&KeyValueConfigFile::no_transformation);
if (k.get("ndbam_format") != "1")
throw ConfigurationError("Unsupported NDBAM format '" + k.get("ndbam_format") + "'");
@@ -453,7 +453,7 @@ NDBAM::parse_contents(const PackageID & id,
return;
}
- LineConfigFile f(ff, LineConfigFileOptions());
+ LineConfigFile f(ff, { });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
{
diff --git a/paludis/ndbam_unmerger.cc b/paludis/ndbam_unmerger.cc
index fe0ac1a..bbd7eac 100644
--- a/paludis/ndbam_unmerger.cc
+++ b/paludis/ndbam_unmerger.cc
@@ -265,7 +265,7 @@ NDBAMUnmerger::check_dir(const std::shared_ptr<const ContentsEntry> & e) const
display("--- [gone ] " + stringify(f));
else if (! (_imp->options.root() / f).is_directory())
display("--- [!type] " + stringify(f));
- else if (DirIterator(_imp->options.root() / f, DirIteratorOptions() + dio_include_dotfiles + dio_first_only) != DirIterator())
+ else if (DirIterator(_imp->options.root() / f, { dio_include_dotfiles, dio_first_only }) != DirIterator())
display("--- [!empt] " + stringify(f));
else
return true;
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index cb0247c..1ed1316 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -276,7 +276,7 @@ PackageDatabase::fetch_unique_qualified_package_name(const PackageNamePart & p,
std::set<std::pair<CategoryNamePart, RepositoryName>, CategoryRepositoryNamePairComparator> checked;
std::shared_ptr<const PackageIDSequence> pkgs((*_imp->environment)[selection::AllVersionsUnsorted(
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package_name_part(p), MatchPackageOptions()) | f)]);
+ generator::Matches(make_package_dep_spec({ }).package_name_part(p), { }) | f)]);
for (IndirectIterator<PackageIDSequence::ConstIterator> it(pkgs->begin()),
it_end(pkgs->end()); it_end != it; ++it)
diff --git a/paludis/package_database_TEST.cc b/paludis/package_database_TEST.cc
index 84b012b..63c6efd 100644
--- a/paludis/package_database_TEST.cc
+++ b/paludis/package_database_TEST.cc
@@ -129,41 +129,41 @@ namespace test_cases
std::shared_ptr<FakeRepository> r1(std::make_shared<FakeRepository>(make_named_values<FakeRepositoryParams>(
n::environment() = &e,
n::name() = RepositoryName("repo1"))));
- r1->add_version(CategoryNamePart("cat-one") + PackageNamePart("pkg-one"), VersionSpec("0", VersionSpecOptions()));
- r1->add_version(CategoryNamePart("cat-one") + PackageNamePart("pkg-two"), VersionSpec("0", VersionSpecOptions()));
- r1->add_version(CategoryNamePart("cat-two") + PackageNamePart("pkg-two"), VersionSpec("0", VersionSpecOptions()));
- r1->add_version(CategoryNamePart("cat-two") + PackageNamePart("pkg-three"), VersionSpec("0", VersionSpecOptions()));
+ r1->add_version(CategoryNamePart("cat-one") + PackageNamePart("pkg-one"), VersionSpec("0", { }));
+ r1->add_version(CategoryNamePart("cat-one") + PackageNamePart("pkg-two"), VersionSpec("0", { }));
+ r1->add_version(CategoryNamePart("cat-two") + PackageNamePart("pkg-two"), VersionSpec("0", { }));
+ r1->add_version(CategoryNamePart("cat-two") + PackageNamePart("pkg-three"), VersionSpec("0", { }));
p.add_repository(10, r1);
TEST_CHECK(true);
std::shared_ptr<FakeRepository> r2(std::make_shared<FakeRepository>(make_named_values<FakeRepositoryParams>(
n::environment() = &e,
n::name() = RepositoryName("repo2"))));
- r2->add_version(CategoryNamePart("cat-three") + PackageNamePart("pkg-three"), VersionSpec("0", VersionSpecOptions()));
- r2->add_version(CategoryNamePart("cat-three") + PackageNamePart("pkg-four"), VersionSpec("0", VersionSpecOptions()));
+ r2->add_version(CategoryNamePart("cat-three") + PackageNamePart("pkg-three"), VersionSpec("0", { }));
+ r2->add_version(CategoryNamePart("cat-three") + PackageNamePart("pkg-four"), VersionSpec("0", { }));
p.add_repository(10, r2);
TEST_CHECK(true);
std::shared_ptr<FakeRepository> r3(std::make_shared<CoolFakeRepository>(&e, RepositoryName("repo3")));
- r3->add_version(CategoryNamePart("bad-cat1") + PackageNamePart("pkg-important"), VersionSpec("0", VersionSpecOptions()));
- r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-important"), VersionSpec("0", VersionSpecOptions()));
+ r3->add_version(CategoryNamePart("bad-cat1") + PackageNamePart("pkg-important"), VersionSpec("0", { }));
+ r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-important"), VersionSpec("0", { }));
- r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-installed"), VersionSpec("0", VersionSpecOptions()));
- r3->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-installed"), VersionSpec("0", VersionSpecOptions()));
+ r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-installed"), VersionSpec("0", { }));
+ r3->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-installed"), VersionSpec("0", { }));
- r3->add_version(CategoryNamePart("bad-cat1") + PackageNamePart("pkg-fail1"), VersionSpec("0", VersionSpecOptions()));
- r3->add_version(CategoryNamePart("bad-cat2") + PackageNamePart("pkg-fail1"), VersionSpec("0", VersionSpecOptions()));
+ r3->add_version(CategoryNamePart("bad-cat1") + PackageNamePart("pkg-fail1"), VersionSpec("0", { }));
+ r3->add_version(CategoryNamePart("bad-cat2") + PackageNamePart("pkg-fail1"), VersionSpec("0", { }));
- r3->add_version(CategoryNamePart("bad-cat1") + PackageNamePart("pkg-fail2"), VersionSpec("0", VersionSpecOptions()));
- r3->add_version(CategoryNamePart("bad-cat2") + PackageNamePart("pkg-fail2"), VersionSpec("0", VersionSpecOptions()));
+ r3->add_version(CategoryNamePart("bad-cat1") + PackageNamePart("pkg-fail2"), VersionSpec("0", { }));
+ r3->add_version(CategoryNamePart("bad-cat2") + PackageNamePart("pkg-fail2"), VersionSpec("0", { }));
- r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-fail3"), VersionSpec("0", VersionSpecOptions()));
- r3->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-fail3"), VersionSpec("0", VersionSpecOptions()));
+ r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-fail3"), VersionSpec("0", { }));
+ r3->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-fail3"), VersionSpec("0", { }));
- r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-fail4"), VersionSpec("0", VersionSpecOptions()));
- r3->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-fail4"), VersionSpec("0", VersionSpecOptions()));
+ r3->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-fail4"), VersionSpec("0", { }));
+ r3->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-fail4"), VersionSpec("0", { }));
- r3->add_version(CategoryNamePart("avail-cat") + PackageNamePart("pkg-foo"), VersionSpec("0", VersionSpecOptions()));
+ r3->add_version(CategoryNamePart("avail-cat") + PackageNamePart("pkg-foo"), VersionSpec("0", { }));
p.add_repository(10, r3);
TEST_CHECK(true);
@@ -174,10 +174,10 @@ namespace test_cases
n::suitable_destination() = true,
n::supports_uninstall() = true
)));
- r4->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-installed"), VersionSpec("0", VersionSpecOptions()));
- r4->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-fail4"), VersionSpec("0", VersionSpecOptions()));
- r4->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-fail4"), VersionSpec("0", VersionSpecOptions()));
- r4->add_version(CategoryNamePart("inst-cat") + PackageNamePart("pkg-foo"), VersionSpec("0", VersionSpecOptions()));
+ r4->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-installed"), VersionSpec("0", { }));
+ r4->add_version(CategoryNamePart("good-cat1") + PackageNamePart("pkg-fail4"), VersionSpec("0", { }));
+ r4->add_version(CategoryNamePart("good-cat2") + PackageNamePart("pkg-fail4"), VersionSpec("0", { }));
+ r4->add_version(CategoryNamePart("inst-cat") + PackageNamePart("pkg-foo"), VersionSpec("0", { }));
p.add_repository(10, r4);
TEST_CHECK_STRINGIFY_EQUAL(p.fetch_unique_qualified_package_name(PackageNamePart("pkg-one")),
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index dc70fd6..393ee62 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -179,7 +179,7 @@ PaludisLikeOptionsConf::add_file(const FSEntry & f)
{
Context context("When adding '" + stringify(f) + "':");
- const std::shared_ptr<const LineConfigFile> file(_imp->params.make_config_file()(f, LineConfigFileOptions()));
+ const std::shared_ptr<const LineConfigFile> file(_imp->params.make_config_file()(f, { }));
if (! file)
return;
@@ -197,7 +197,7 @@ PaludisLikeOptionsConf::add_file(const FSEntry & f)
{
std::shared_ptr<PackageDepSpec> d(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
tokens.at(0), _imp->params.environment(),
- UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set)));
+ { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
if (d->additional_requirements_ptr())
{
@@ -426,7 +426,7 @@ namespace
{
if (maybe_id)
{
- if (! match_package(*env, i->spec(), *maybe_id, MatchPackageOptions()))
+ if (! match_package(*env, i->spec(), *maybe_id, { }))
continue;
}
else
@@ -453,7 +453,7 @@ namespace
{
if (maybe_id)
{
- if (! match_package(*env, i->spec(), *maybe_id, MatchPackageOptions()))
+ if (! match_package(*env, i->spec(), *maybe_id, { }))
continue;
}
else
@@ -502,7 +502,7 @@ PaludisLikeOptionsConf::want_choice_enabled_locked(
r != r_end ; ++r)
{
if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(),
- *maybe_id, MatchPackageOptions()))
+ *maybe_id, { }))
continue;
check_values_groups(_imp->params.environment(), maybe_id, prefix, unprefixed_name, r->values_groups(),
@@ -561,7 +561,7 @@ PaludisLikeOptionsConf::value_for_choice_parameter(
for (SetNamesWithValuesGroups::const_iterator r(_imp->set_specs.begin()), r_end(_imp->set_specs.end()) ;
r != r_end ; ++r)
{
- if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(), *id, MatchPackageOptions()))
+ if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(), *id, { }))
continue;
check_values_groups(_imp->params.environment(), id, prefix, unprefixed_name, r->values_groups(),
@@ -607,7 +607,7 @@ PaludisLikeOptionsConf::known_choice_value_names(
r != r_end ; ++r)
{
if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(),
- *maybe_id, MatchPackageOptions()))
+ *maybe_id, { }))
continue;
collect_known_from_values_groups(_imp->params.environment(), maybe_id, prefix, r->values_groups(), result);
diff --git a/paludis/range_rewriter.cc b/paludis/range_rewriter.cc
index e2d908e..f5e7b8a 100644
--- a/paludis/range_rewriter.cc
+++ b/paludis/range_rewriter.cc
@@ -186,7 +186,7 @@ namespace
virtual const PartiallyMadePackageDepSpecOptions options_for_partially_made_package_dep_spec() const
{
- return PartiallyMadePackageDepSpecOptions() + pmpdso_always_use_ranged_deps;
+ return { pmpdso_always_use_ranged_deps };
}
};
}
diff --git a/paludis/range_rewriter_TEST.cc b/paludis/range_rewriter_TEST.cc
index 1ec50c1..9feb7ad 100644
--- a/paludis/range_rewriter_TEST.cc
+++ b/paludis/range_rewriter_TEST.cc
@@ -44,9 +44,9 @@ namespace test_cases
TestEnvironment env;
std::shared_ptr<DependencySpecTree> a(std::make_shared<DependencySpecTree>(std::make_shared<AllDepSpec>()));
a->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("=a/b-1",
- &env, UserPackageDepSpecOptions())));
+ &env, { })));
a->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("=a/b-2",
- &env, UserPackageDepSpecOptions())));
+ &env, { })));
RangeRewriter r;
TEST_CHECK(! r.spec());
diff --git a/paludis/report_task.cc b/paludis/report_task.cc
index efa2a23..941f6ec 100644
--- a/paludis/report_task.cc
+++ b/paludis/report_task.cc
@@ -103,7 +103,7 @@ namespace
VulnerableChecker::visit(const SetSpecTree::NodeType<PackageDepSpec>::Type & node)
{
std::shared_ptr<const PackageIDSequence> insecure(_env[selection::AllVersionsSorted(
- generator::Matches(*node.spec(), MatchPackageOptions()))]);
+ generator::Matches(*node.spec(), { }))]);
for (PackageIDSequence::ConstIterator i(insecure->begin()),
i_end(insecure->end()) ; i != i_end ; ++i)
if (node.spec()->tag() && simple_visitor_cast<const GLSADepTag>(*node.spec()->tag()))
@@ -211,12 +211,12 @@ ReportTask::execute()
std::shared_ptr<const PackageIDSequence> installable(
(*e)[selection::BestVersionOnly((
(generator::InRepository(RepositoryName(*o)) &
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ generator::Matches(make_package_dep_spec({ })
.package((*v)->name())
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
n::version_spec() = (*v)->version())),
- MatchPackageOptions())) |
+ { })) |
filter::SupportsAction<InstallAction>()))]);
if (! installable->empty())
diff --git a/paludis/repositories/accounts/accounts_dep_key.cc b/paludis/repositories/accounts/accounts_dep_key.cc
index 25e1cc7..5074531 100644
--- a/paludis/repositories/accounts/accounts_dep_key.cc
+++ b/paludis/repositories/accounts/accounts_dep_key.cc
@@ -54,7 +54,7 @@ namespace paludis
for (Set<std::string>::ConstIterator i(s->begin()), i_end(s->end()) ;
i != i_end ; ++i)
{
- std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(make_package_dep_spec({ })
.package(CategoryNamePart("group") + PackageNamePart(*i))));
specs->push_back(spec);
tree->root()->append(spec);
@@ -125,10 +125,10 @@ AccountsDepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) c
if (_imp->env)
{
- if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(**i, MatchPackageOptions()) |
+ if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(**i, { }) |
filter::InstalledAtRoot(_imp->env->root()))]->empty())
s << f.format(**i, format::Installed());
- else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(**i, MatchPackageOptions()) |
+ else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(**i, { }) |
filter::SupportsAction<InstallAction>() | filter::NotMasked())]->empty())
s << f.format(**i, format::Installable());
else
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 9d62949..baa1120 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -82,7 +82,7 @@ namespace paludis
const FSEntry & l, const bool u, const bool m) :
env(e),
name(q),
- version("0", VersionSpecOptions()),
+ version("0", { }),
repository(r),
fs_location_key(std::make_shared<LiteralMetadataValueKey<FSEntry>>("location", "Location", mkt_internal, l)),
from_repositories_key(f),
@@ -154,7 +154,7 @@ AccountsID::_need_file_keys() const
Lock lock(_imp->mutex);
- KeyValueConfigFile k(_imp->fs_location_key->value(), KeyValueConfigFileOptions(),
+ KeyValueConfigFile k(_imp->fs_location_key->value(), { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
/* also need to change the handlers if any of the raw names are changed */
@@ -283,7 +283,7 @@ PackageDepSpec
AccountsID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec(stringify(name()) + "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
diff --git a/paludis/repositories/accounts/accounts_repository_store.cc b/paludis/repositories/accounts/accounts_repository_store.cc
index 18f5527..4f0855d 100644
--- a/paludis/repositories/accounts/accounts_repository_store.cc
+++ b/paludis/repositories/accounts/accounts_repository_store.cc
@@ -165,8 +165,8 @@ AccountsRepositoryStore::_load_one_users(
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir)
{
- for (DirIterator d(dir, DirIteratorOptions()), d_end ; d != d_end ; ++d)
- if (is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ for (DirIterator d(dir, { }), d_end ; d != d_end ; ++d)
+ if (is_file_with_extension(*d, ".conf", { }))
_load_one_user(repo, from_repo, *d);
else
Log::get_instance()->message("accounts.unknown_file", ll_debug, lc_context) <<
@@ -221,8 +221,8 @@ AccountsRepositoryStore::_load_one_groups(
const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > & from_repo,
const FSEntry & dir)
{
- for (DirIterator d(dir, DirIteratorOptions()), d_end ; d != d_end ; ++d)
- if (is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ for (DirIterator d(dir, { }), d_end ; d != d_end ; ++d)
+ if (is_file_with_extension(*d, ".conf", { }))
_load_one_group(repo, from_repo, *d);
else
Log::get_instance()->message("accounts.unknown_file", ll_debug, lc_context) <<
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index b674f62..00cffeb 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -70,7 +70,7 @@ namespace paludis
const bool u) :
env(e),
name(q),
- version("0", VersionSpecOptions()),
+ version("0", { }),
repository(r),
behaviours_key(std::make_shared<LiteralMetadataStringSetKey>("behaviours", "Behaviours", mkt_internal,
behaviours_set)),
@@ -221,8 +221,7 @@ InstalledAccountsID::canonical_form(const PackageIDCanonicalForm f) const
PackageDepSpec
InstalledAccountsID::uniquely_identifying_spec() const
{
- return parse_user_package_dep_spec(stringify(name()) + "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ return parse_user_package_dep_spec(stringify(name()) + "::" + stringify(repository()->name()), _imp->env, { });
}
const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index 3233882..3cb2a37 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -82,7 +82,7 @@ namespace paludis
repository(r),
cran_repository(r),
name("cran/" + cran_name_to_internal(strip_trailing_string(f.basename(), ".DESCRIPTION"))),
- version("0", VersionSpecOptions()),
+ version("0", { }),
suggests_labels(std::make_shared<DependenciesLabelSequence>()),
depends_labels(std::make_shared<DependenciesLabelSequence>())
{
@@ -152,14 +152,14 @@ CRANPackageID::CRANPackageID(const Environment * const env, const std::shared_pt
{
Context local_context("When handling Version: key:");
Log::get_instance()->message("cran.id.broken", ll_warning, lc_context) << "No Version: key in '" << stringify(f) << "'";
- _imp->version = VersionSpec("0", VersionSpecOptions());
+ _imp->version = VersionSpec("0", { });
add_mask(std::make_shared<BrokenMask>('B', "Broken", "No Version: key"));
return;
}
else
{
Context local_context("When handling Version: key:");
- _imp->version = VersionSpec(cran_version_to_internal(file.get("Version")), VersionSpecOptions());
+ _imp->version = VersionSpec(cran_version_to_internal(file.get("Version")), { });
}
if (! file.get("License").empty())
@@ -462,7 +462,7 @@ PackageDepSpec
CRANPackageID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) + "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
namespace
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 1956646..359a062 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -220,7 +220,7 @@ CRANRepository::need_ids() const
Context context("When loading IDs for " + stringify(name()) + ":");
for (DirIterator d(_imp->params.location()), d_end ; d != d_end ; ++d)
- if (is_file_with_extension(*d, ".DESCRIPTION", IsFileWithOptions()))
+ if (is_file_with_extension(*d, ".DESCRIPTION", { }))
{
std::shared_ptr<cranrepository::CRANPackageID> id(std::make_shared<cranrepository::CRANPackageID>(_imp->params.environment(),
shared_from_this(), *d));
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.cc b/paludis/repositories/cran/dep_spec_pretty_printer.cc
index f89abab..1520937 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.cc
@@ -84,10 +84,10 @@ DepSpecPrettyPrinter::visit(const DependencySpecTree::NodeType<PackageDepSpec>::
if (_imp->env)
{
- if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::InstalledAtRoot(_imp->env->root()))]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installed());
- else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::SupportsAction<InstallAction>() | filter::NotMasked())]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installable());
else
diff --git a/paludis/repositories/cran/package_dep_spec.cc b/paludis/repositories/cran/package_dep_spec.cc
index e96b039..89ddbdc 100644
--- a/paludis/repositories/cran/package_dep_spec.cc
+++ b/paludis/repositories/cran/package_dep_spec.cc
@@ -154,7 +154,7 @@ namespace
virtual const PartiallyMadePackageDepSpecOptions options_for_partially_made_package_dep_spec() const
{
- return PartiallyMadePackageDepSpecOptions();
+ return { };
}
};
}
@@ -202,7 +202,7 @@ paludis::cranrepository::parse_cran_package_dep_spec(const std::string & ss)
throw PackageDepSpecError("Invalid () entry '" + *t + "' in '" + ss + "'");
data->version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = VersionOperator(subtokens[0]),
- n::version_spec() = VersionSpec(cran_version_to_internal(subtokens[1]), VersionSpecOptions())));
+ n::version_spec() = VersionSpec(cran_version_to_internal(subtokens[1]), { })));
}
}
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index 0c74312..fb1feab 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -318,10 +318,10 @@ DepSpecPrettyPrinter::visit(const GenericSpecTree::NodeType<PackageDepSpec>::Typ
if (_imp->env && _imp->check_conditions)
{
- if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::InstalledAtRoot(_imp->env->root()))]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installed());
- else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::SupportsAction<InstallAction>() | filter::NotMasked())]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installable());
else
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 1c276c1..ac41804 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -614,7 +614,7 @@ EInstalledRepositoryID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->environment, UserPackageDepSpecOptions());
+ _imp->environment, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 04b4912..440fb6d 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -357,7 +357,7 @@ namespace paludis
if ((params.location() / "metadata" / "about.conf").is_regular_file_or_symlink_to_regular_file())
{
Context context("When loading about.conf:");
- KeyValueConfigFile k(params.location() / "metadata" / "about.conf", KeyValueConfigFileOptions(),
+ KeyValueConfigFile k(params.location() / "metadata" / "about.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
if (! k.get("description").empty())
about_keys.push_back(std::make_shared<LiteralMetadataValueKey<std::string>>("description", "description",
@@ -414,7 +414,7 @@ namespace paludis
else
{
Context context("When loading profiles.desc file '" + stringify(profiles_desc) + "':");
- LineConfigFile f(profiles_desc, LineConfigFileOptions());
+ LineConfigFile f(profiles_desc, { });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
{
@@ -462,7 +462,7 @@ namespace
if (! name_file.is_regular_file())
break;
- LineConfigFile f(name_file, LineConfigFileOptions() + lcfo_disallow_comments + lcfo_disallow_continuations + lcfo_no_skip_blank_lines);
+ LineConfigFile f(name_file, { lcfo_disallow_comments, lcfo_disallow_continuations, lcfo_no_skip_blank_lines });
if (f.begin() == f.end())
break;
return RepositoryName(*f.begin());
@@ -648,7 +648,7 @@ ERepository::repository_masked(const PackageID & id) const
else
for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator
k(r->second.begin()), k_end(r->second.end()) ; k != k_end ; ++k)
- if (match_package(*_imp->params.environment(), *k->first, id, MatchPackageOptions()))
+ if (match_package(*_imp->params.environment(), *k->first, id, { }))
return k->second;
return std::shared_ptr<const RepositoryMaskInfo>();
@@ -671,7 +671,7 @@ ERepository::arch_flags() const
if (! p->exists())
continue;
- LineConfigFile archs(*p, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile archs(*p, { lcfo_disallow_continuations });
std::copy(archs.begin(), archs.end(), create_inserter<UnprefixedChoiceName>(_imp->arch_flags->inserter()));
found_one = true;
}
@@ -701,7 +701,7 @@ ERepository::need_mirrors() const
{
if (p->exists())
{
- LineConfigFile mirrors(*p, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile mirrors(*p, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(mirrors.begin()) ; line != mirrors.end() ; ++line)
{
std::vector<std::string> ee;
@@ -812,12 +812,12 @@ ERepository::purge_invalid_cache() const
if (master_mtime_file.exists())
master_mtime = master_mtime_file.mtim().seconds();
- for (DirIterator dc(write_cache, DirIteratorOptions() + dio_inode_sort), dc_end ; dc != dc_end ; ++dc)
+ for (DirIterator dc(write_cache, { dio_inode_sort }), dc_end ; dc != dc_end ; ++dc)
{
if (! dc->is_directory_or_symlink_to_directory())
continue;
- for (DirIterator dp(*dc, DirIteratorOptions() + dio_inode_sort), dp_end ; dp != dp_end ; ++dp)
+ for (DirIterator dp(*dc, { dio_inode_sort }), dp_end ; dp != dp_end ; ++dp)
{
if (! dp->is_regular_file_or_symlink_to_regular_file())
continue;
@@ -1229,7 +1229,7 @@ ERepository::repository_factory_create(
throw ERepositoryConfigurationError("Key 'location' must start with a / (relative paths are not allowed)");
std::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
- new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", KeyValueConfigFileOptions(),
+ new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
: 0);
@@ -1551,7 +1551,7 @@ ERepository::repository_factory_dependencies(
throw ERepositoryConfigurationError("Key 'location' not specified or empty");
std::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
- new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", KeyValueConfigFileOptions(),
+ new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
: 0);
@@ -1591,7 +1591,7 @@ ERepository::eapi_for_file(const FSEntry & f) const
Context context("When finding the EAPI to use for file '" + stringify(f) + "':");
if ((dir / "eapi").is_regular_file_or_symlink_to_regular_file())
{
- LineConfigFile file(dir / "eapi", LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile file(dir / "eapi", { lcfo_disallow_continuations });
if (file.begin() == file.end())
{
Log::get_instance()->message("e.ebuild.profile_eapi_file.empty", ll_warning, lc_no_context)
@@ -1680,7 +1680,7 @@ namespace
Suffixes() :
file(FSEntry(getenv_with_default("PALUDIS_SUFFIXES_FILE", DATADIR "/paludis/ebuild_entries_suffixes.conf")),
- KeyValueConfigFileOptions(), &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
+ { }, &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
{
}
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 6ef25fc..836b18a 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -493,7 +493,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK(simple_visitor_cast<const MetadataValueKey<std::string> >(**id1->find_metadata("EAPI")));
@@ -512,7 +512,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id2->end_metadata() != id2->find_metadata("EAPI"));
TEST_CHECK(bool(id2->short_description_key()));
@@ -528,7 +528,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id3(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-3",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id3->end_metadata() != id3->find_metadata("EAPI"));
TEST_CHECK(bool(id3->short_description_key()));
@@ -574,7 +574,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK_EQUAL(std::static_pointer_cast<const erepository::ERepositoryID>(id1)->eapi()->name(), "UNKNOWN");
@@ -618,13 +618,13 @@ namespace test_cases
const std::shared_ptr<const PackageID> p1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
const std::shared_ptr<const PackageID> p2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-two/pkg-two-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
const std::shared_ptr<const PackageID> p4(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
test_choice(p1, "flag1", true, true, false);
test_choice(p1, "flag2", false, false, true);
@@ -705,29 +705,29 @@ namespace test_cases
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-1::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-2::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-3::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-4::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-1::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-2::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-3::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-4::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
}
} test_e_repository_repository_masks;
@@ -755,13 +755,13 @@ namespace test_cases
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/masked-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/was_masked-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/not_masked-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
}
}
} test_e_repository_query_profile_masks;
@@ -939,7 +939,7 @@ namespace test_cases
TestMessageSuffix suffix("no files", true);
const std::shared_ptr<const PackageID> no_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(no_files_id));
TEST_CHECK(bool(no_files_id->short_description_key()));
TEST_CHECK_EQUAL(no_files_id->short_description_key()->value(), "The Short Description");
@@ -950,7 +950,7 @@ namespace test_cases
TestMessageSuffix suffix("fetched files", true);
const std::shared_ptr<const PackageID> fetched_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetched_files_id));
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "already-fetched.txt").is_regular_file());
fetched_files_id->perform_action(action);
@@ -962,7 +962,7 @@ namespace test_cases
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
const std::shared_ptr<const PackageID> fetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetchable_files_id));
fetchable_files_id->perform_action(action);
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
@@ -973,7 +973,7 @@ namespace test_cases
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
const std::shared_ptr<const PackageID> arrow_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/arrow-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(arrow_files_id));
arrow_files_id->perform_action(action);
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
@@ -983,7 +983,7 @@ namespace test_cases
TestMessageSuffix suffix("unfetchable files", true);
const std::shared_ptr<const PackageID> unfetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unfetchable-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(unfetchable_files_id));
TEST_CHECK_THROWS(unfetchable_files_id->perform_action(action), ActionFailedError);
}
@@ -991,7 +991,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> no_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files-restricted",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(no_files_restricted_id));
no_files_restricted_id->perform_action(action);
}
@@ -999,7 +999,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> fetched_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files-restricted",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetched_files_restricted_id));
fetched_files_restricted_id->perform_action(action);
}
@@ -1007,7 +1007,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> fetchable_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files-restricted",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetchable_files_restricted_id));
TEST_CHECK_THROWS(fetchable_files_restricted_id->perform_action(action), ActionFailedError);
}
@@ -1045,7 +1045,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
repo->make_manifest(id->name());
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_0.cc b/paludis/repositories/e/e_repository_TEST_0.cc
index fa3b7bf..8dab2f6 100644
--- a/paludis/repositories/e/e_repository_TEST_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_0.cc
@@ -161,7 +161,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=virtual/virtual-pretend-installed-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
}
#endif
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("in-ebuild die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -179,7 +179,7 @@ namespace test_cases
TestMessageSuffix suffix("in-subshell die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -188,7 +188,7 @@ namespace test_cases
TestMessageSuffix suffix("success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -197,7 +197,7 @@ namespace test_cases
TestMessageSuffix suffix("unpack die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -206,7 +206,7 @@ namespace test_cases
TestMessageSuffix suffix("econf die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -215,7 +215,7 @@ namespace test_cases
TestMessageSuffix suffix("emake fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -224,7 +224,7 @@ namespace test_cases
TestMessageSuffix suffix("emake die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -233,7 +233,7 @@ namespace test_cases
TestMessageSuffix suffix("einstall die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -242,7 +242,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -251,7 +251,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -260,7 +260,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -269,7 +269,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -278,7 +278,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -287,7 +287,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -297,7 +297,7 @@ namespace test_cases
TestMessageSuffix suffix("doman 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
@@ -307,7 +307,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_prepare 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
@@ -317,7 +317,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_configure 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
@@ -327,7 +327,7 @@ namespace test_cases
TestMessageSuffix suffix("best version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -336,7 +336,7 @@ namespace test_cases
TestMessageSuffix suffix("has version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -345,7 +345,7 @@ namespace test_cases
TestMessageSuffix suffix("match", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -354,7 +354,7 @@ namespace test_cases
TestMessageSuffix suffix("vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -363,7 +363,7 @@ namespace test_cases
TestMessageSuffix suffix("expand vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -372,7 +372,7 @@ namespace test_cases
TestMessageSuffix suffix("econf disable dependency tracking", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-disable-dependency-tracking-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_1.cc b/paludis/repositories/e/e_repository_TEST_1.cc
index b2bf570..417c7b2 100644
--- a/paludis/repositories/e/e_repository_TEST_1.cc
+++ b/paludis/repositories/e/e_repository_TEST_1.cc
@@ -140,7 +140,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -150,7 +150,7 @@ namespace test_cases
TestMessageSuffix suffix("dosym success 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -160,7 +160,7 @@ namespace test_cases
TestMessageSuffix suffix("doman 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_prepare 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -180,7 +180,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_configure 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_2.cc b/paludis/repositories/e/e_repository_TEST_2.cc
index ef6abb3..6a63c6d 100644
--- a/paludis/repositories/e/e_repository_TEST_2.cc
+++ b/paludis/repositories/e/e_repository_TEST_2.cc
@@ -140,7 +140,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -150,7 +150,7 @@ namespace test_cases
TestMessageSuffix suffix("doman 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -160,7 +160,7 @@ namespace test_cases
TestMessageSuffix suffix("src_prepare 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("src_configure 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -180,7 +180,7 @@ namespace test_cases
TestMessageSuffix suffix("default src_configure 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default-src_configure-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -190,7 +190,7 @@ namespace test_cases
TestMessageSuffix suffix("default src_compile 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default-src_compile-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -200,7 +200,7 @@ namespace test_cases
TestMessageSuffix suffix("default_src_compile 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default_src_compile-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -210,7 +210,7 @@ namespace test_cases
TestMessageSuffix suffix("src_compile via default function 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_compile-via-default-func-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_3.cc b/paludis/repositories/e/e_repository_TEST_3.cc
index 9ddd481..ee84192 100644
--- a/paludis/repositories/e/e_repository_TEST_3.cc
+++ b/paludis/repositories/e/e_repository_TEST_3.cc
@@ -140,7 +140,7 @@ namespace test_cases
TestMessageSuffix suffix("prefix", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/prefix-3",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "3");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index 6b1d966..5e801a3 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -144,7 +144,7 @@ namespace test_cases
TestMessageSuffix suffix("pkg_pretend", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg_pretend-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(pretend_action);
@@ -155,7 +155,7 @@ namespace test_cases
TestMessageSuffix suffix("pkg_pretend-failure", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg_pretend-failure-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(pretend_action);
@@ -166,7 +166,7 @@ namespace test_cases
TestMessageSuffix suffix("default_src_install 4", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default_src_install-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -176,7 +176,7 @@ namespace test_cases
TestMessageSuffix suffix("docompress 4", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/docompress-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -186,7 +186,7 @@ namespace test_cases
TestMessageSuffix suffix("dodoc -r", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dodoc-r-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -196,7 +196,7 @@ namespace test_cases
TestMessageSuffix suffix("doins symlink", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doins-symlink-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -206,7 +206,7 @@ namespace test_cases
TestMessageSuffix suffix("banned functions 4", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/banned-functions-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -216,7 +216,7 @@ namespace test_cases
TestMessageSuffix suffix("econf disable dependency tracking", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-disable-dependency-tracking-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -226,7 +226,7 @@ namespace test_cases
TestMessageSuffix suffix("strict use", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -236,7 +236,7 @@ namespace test_cases
TestMessageSuffix suffix("strict use fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-fail-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -246,7 +246,7 @@ namespace test_cases
TestMessageSuffix suffix("strict use injection", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-injection-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -256,7 +256,7 @@ namespace test_cases
TestMessageSuffix suffix("global scope use", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/global-scope-use-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
index 42b4471..704b86d 100644
--- a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
+++ b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
@@ -106,7 +106,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
StringifyFormatter ff;
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 94c33e2..f29ed9d 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -160,7 +160,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index 773fe6e..0f5d831 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -159,7 +159,7 @@ namespace test_cases
TestMessageSuffix suffix("in-ebuild die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -168,7 +168,7 @@ namespace test_cases
TestMessageSuffix suffix("in-subshell die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -177,7 +177,7 @@ namespace test_cases
TestMessageSuffix suffix("success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -186,7 +186,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -195,7 +195,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch success-dir", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-success-dir",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -204,7 +204,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -213,7 +213,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch unrecognised", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-unrecognised",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -222,7 +222,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal expatch fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -231,7 +231,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal expatch die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -240,7 +240,7 @@ namespace test_cases
TestMessageSuffix suffix("unpack die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -249,7 +249,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal unpack fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -258,7 +258,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal unpack die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -267,7 +267,7 @@ namespace test_cases
TestMessageSuffix suffix("econf fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -276,7 +276,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal econf", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -285,7 +285,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal econf die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -294,7 +294,7 @@ namespace test_cases
TestMessageSuffix suffix("emake fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -303,7 +303,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal emake", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -312,7 +312,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal emake die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -321,7 +321,7 @@ namespace test_cases
TestMessageSuffix suffix("einstall fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -330,7 +330,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal einstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -339,7 +339,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal einstall die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -348,7 +348,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -357,7 +357,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -366,7 +366,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal keepdir", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -375,7 +375,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal keepdir die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -384,7 +384,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -393,7 +393,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -402,7 +402,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -411,7 +411,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -420,7 +420,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -429,7 +429,7 @@ namespace test_cases
TestMessageSuffix suffix("herebin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/herebin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -438,7 +438,7 @@ namespace test_cases
TestMessageSuffix suffix("herebin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/herebin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -447,7 +447,7 @@ namespace test_cases
TestMessageSuffix suffix("hereconfd success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -456,7 +456,7 @@ namespace test_cases
TestMessageSuffix suffix("hereconfd fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -465,7 +465,7 @@ namespace test_cases
TestMessageSuffix suffix("hereenvd success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -474,7 +474,7 @@ namespace test_cases
TestMessageSuffix suffix("hereenvd fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -483,7 +483,7 @@ namespace test_cases
TestMessageSuffix suffix("hereinitd success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -492,7 +492,7 @@ namespace test_cases
TestMessageSuffix suffix("hereinitd fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -501,7 +501,7 @@ namespace test_cases
TestMessageSuffix suffix("hereins success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereins-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -510,7 +510,7 @@ namespace test_cases
TestMessageSuffix suffix("hereins fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereins-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -519,7 +519,7 @@ namespace test_cases
TestMessageSuffix suffix("heresbin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -528,7 +528,7 @@ namespace test_cases
TestMessageSuffix suffix("heresbin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -537,7 +537,7 @@ namespace test_cases
TestMessageSuffix suffix("best version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -546,7 +546,7 @@ namespace test_cases
TestMessageSuffix suffix("has version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -555,7 +555,7 @@ namespace test_cases
TestMessageSuffix suffix("match", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -564,7 +564,7 @@ namespace test_cases
TestMessageSuffix suffix("econf phase", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-phase-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -573,7 +573,7 @@ namespace test_cases
TestMessageSuffix suffix("econf vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -582,7 +582,7 @@ namespace test_cases
TestMessageSuffix suffix("expand vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -591,7 +591,7 @@ namespace test_cases
TestMessageSuffix suffix("doman success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-success-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -600,7 +600,7 @@ namespace test_cases
TestMessageSuffix suffix("doman nofatal", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-nonfatal-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -609,7 +609,7 @@ namespace test_cases
TestMessageSuffix suffix("doman failure", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-failure-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -618,7 +618,7 @@ namespace test_cases
TestMessageSuffix suffix("change globals", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/change-globals-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -627,7 +627,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/install-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -636,7 +636,7 @@ namespace test_cases
TestMessageSuffix suffix("install s", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/install-s-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index 518f376..9e9254f 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -154,7 +154,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
switch (expected_result)
{
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index 3914834..9a860ec 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("prefix", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/simple-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), base_eapi);
id->perform_action(bin_action);
@@ -191,7 +191,7 @@ namespace test_cases
TestMessageSuffix suffix("prefix", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/simple-1::binrepo" + base_eapi,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(),
"pbin-1+" + base_eapi);
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index f090ce4..1129c5b 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -170,7 +170,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(!! id->choices_key()->value()->find_by_name_with_prefix(
ChoiceNameWithPrefix("build_options:expensive_tests")), expect_expensive_test);
diff --git a/paludis/repositories/e/e_repository_TEST_replacing.cc b/paludis/repositories/e/e_repository_TEST_replacing.cc
index f9a8f2f..406303d 100644
--- a/paludis/repositories/e/e_repository_TEST_replacing.cc
+++ b/paludis/repositories/e/e_repository_TEST_replacing.cc
@@ -142,8 +142,8 @@ namespace
env.package_database()->add_repository(2, installed_repo);
const std::shared_ptr<const PackageIDSequence> rlist(env[selection::AllVersionsSorted(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec(replacing, &env, UserPackageDepSpecOptions())),
- MatchPackageOptions()) |
+ PackageDepSpec(parse_user_package_dep_spec(replacing, &env, { })),
+ { }) |
filter::InstalledAtRoot(env.root()))]);
InstallAction action(make_named_values<InstallActionOptions>(
@@ -156,7 +156,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()) |
+ &env, { })), { }) |
filter::SupportsAction<InstallAction>())]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
index 6ad4bb4..c8fcbb3 100644
--- a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
+++ b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
@@ -142,7 +142,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/pkg",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index ce6e1c4..aa07b19 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -131,7 +131,7 @@ ERepositoryNews::update_news() const
{
Context local_context("When handling news skip file '" + stringify(
_imp->skip_file) + "':");
- LineConfigFile s(_imp->skip_file, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile s(_imp->skip_file, { lcfo_disallow_continuations });
std::copy(s.begin(), s.end(), std::inserter(skip, skip.end()));
}
@@ -174,7 +174,7 @@ ERepositoryNews::update_news() const
generator::Matches(PackageDepSpec(parse_elike_package_dep_spec(*i,
eapi.supported()->package_dep_spec_parse_options(),
eapi.supported()->version_spec_options(),
- std::shared_ptr<const PackageID>())), MatchPackageOptions()) |
+ std::shared_ptr<const PackageID>())), { }) |
filter::InstalledAtRoot(_imp->environment->root()))]->empty())
local_show = true;
show &= local_show;
@@ -274,8 +274,7 @@ NewsFile::NewsFile(const FSEntry & our_filename) :
bool seen_content_type(false), seen_title(false), seen_author(false), seen_news_item_format(false), seen_posted(false),
seen_revision(false);
- LineConfigFile line_file(our_filename, LineConfigFileOptions() + lcfo_disallow_continuations + lcfo_no_skip_blank_lines
- + lcfo_disallow_comments);
+ LineConfigFile line_file(our_filename, { lcfo_disallow_continuations, lcfo_no_skip_blank_lines, lcfo_disallow_comments });
for (LineConfigFile::ConstIterator line(line_file.begin()), line_end(line_file.end()) ;
line != line_end ; ++line)
{
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 0bf7847..f32abff 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -264,7 +264,7 @@ ERepositorySets::security_set(bool insecurity) const
for (DirIterator f(_imp->params.securitydir()), f_end ; f != f_end; ++f)
{
- if (! is_file_with_prefix_extension(*f, "glsa-", ".xml", IsFileWithOptions()))
+ if (! is_file_with_prefix_extension(*f, "glsa-", ".xml", { }))
continue;
Context local_context("When parsing security advisory '" + stringify(*f) + "':");
@@ -308,7 +308,7 @@ ERepositorySets::security_set(bool insecurity) const
if (insecurity)
{
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
- make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ make_package_dep_spec({ })
.package((*c)->name())
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
@@ -341,7 +341,7 @@ ERepositorySets::security_set(bool insecurity) const
continue;
}
- std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(make_package_dep_spec({ })
.package((*r)->name())
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index ce9d36c..a6aee2e 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -349,11 +349,11 @@ namespace paludis
for (DirIterator d(getenv_with_default("PALUDIS_EAPIS_DIR", DATADIR "/paludis/eapis")), d_end ;
d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".conf", { }))
continue;
Context cc("When loading EAPI file '" + stringify(*d) + "':");
- KeyValueConfigFile k(*d, KeyValueConfigFileOptions(),
+ KeyValueConfigFile k(*d, { },
std::bind(&predefined, stringify(d->dirname()), std::placeholders::_1, std::placeholders::_2),
&KeyValueConfigFile::no_transformation);
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index dd59558..e643b56 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -424,9 +424,8 @@ EbuildMetadataCommand::do_run_command(const Command & cmd)
int exit_status(run_command(real_cmd));
- KeyValueConfigFile f(metadata, KeyValueConfigFileOptions() + kvcfo_disallow_continuations + kvcfo_disallow_comments
- + kvcfo_disallow_space_around_equals + kvcfo_disallow_unquoted_values + kvcfo_disallow_source
- + kvcfo_disallow_variables + kvcfo_preserve_whitespace,
+ KeyValueConfigFile f(metadata, { kvcfo_disallow_continuations, kvcfo_disallow_comments , kvcfo_disallow_space_around_equals,
+ kvcfo_disallow_unquoted_values, kvcfo_disallow_source , kvcfo_disallow_variables, kvcfo_preserve_whitespace },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
std::copy(f.begin(), f.end(), keys->inserter());
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
index 27c1eed..993ecf2 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
@@ -77,7 +77,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_list");
@@ -105,7 +105,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-stale");
@@ -134,7 +134,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-guessed-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-guessed-eapi");
@@ -162,7 +162,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_list-eclass");
@@ -193,7 +193,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-eclass-stale");
@@ -221,7 +221,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-eclass-wrong");
@@ -249,7 +249,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-eclass-gone");
@@ -277,7 +277,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-detection-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_list-detection");
@@ -305,7 +305,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash");
@@ -334,7 +334,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-guessed-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-guessed-eapi");
@@ -362,7 +362,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-guessed-eapi-extension-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-guessed-eapi-extension");
@@ -390,7 +390,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-guessed-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-no-guessed-eapi");
@@ -418,7 +418,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-empty-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "");
@@ -447,7 +447,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-stale");
@@ -475,7 +475,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "the-description-flat_hash-no-mtime");
@@ -503,7 +503,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-mtime-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-no-mtime-stale");
@@ -531,7 +531,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-bad-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-bad-mtime");
@@ -559,7 +559,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-no-eapi");
@@ -587,7 +587,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-duplicate-key-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-duplicate-key");
@@ -615,7 +615,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-eclass");
@@ -646,7 +646,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclass-stale");
@@ -674,7 +674,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclass-wrong");
@@ -701,7 +701,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclass-gone");
@@ -729,7 +729,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-full-eclass");
@@ -760,7 +760,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-nonstandard-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-full-eclass-nonstandard");
@@ -791,7 +791,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-full-eclass-stale");
@@ -819,7 +819,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-full-eclass-wrong");
@@ -847,7 +847,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-full-eclass-gone");
@@ -875,14 +875,14 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-truncated-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclasses-truncated");
std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-truncated-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id2->short_description_key()));
TEST_CHECK_EQUAL(id2->short_description_key()->value(), "The Generated Description flat_hash-eclasses-truncated-2");
@@ -910,7 +910,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-bad-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclasses-bad-mtime");
@@ -938,7 +938,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-spaces-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclasses-spaces");
@@ -967,7 +967,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-exlib");
@@ -999,7 +999,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-percat-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-exlib-percat");
@@ -1031,7 +1031,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlib-stale");
@@ -1060,7 +1060,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlib-wrong");
@@ -1089,7 +1089,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlib-gone");
@@ -1118,14 +1118,14 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-truncated-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlibs-truncated");
std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-truncated-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id2->short_description_key()));
TEST_CHECK_EQUAL(id2->short_description_key()->value(), "The Generated Description flat_hash-exlibs-truncated-2");
@@ -1154,7 +1154,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-bad-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlibs-bad-mtime");
@@ -1183,7 +1183,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-spaces-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlibs-spaces");
@@ -1218,7 +1218,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-1"));
@@ -1254,7 +1254,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-eapi1-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-eapi1-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-eapi1-1"));
@@ -1292,7 +1292,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-eclasses-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-eclasses-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-eclasses-1"));
@@ -1329,7 +1329,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-exlibs-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-exlibs-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-exlibs-1"));
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index a35c128..9456bf5 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -609,7 +609,7 @@ EbuildID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->environment, UserPackageDepSpecOptions());
+ _imp->environment, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index c2445fe..d7f36b9 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -117,7 +117,7 @@ ExheresLayout::ExheresLayout(const ERepository * const r, const FSEntry & tree_r
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".conf", { }))
continue;
std::string p(strip_trailing_string(strip_trailing_string(d->basename(), ".conf"), ".local"));
@@ -142,7 +142,7 @@ ExheresLayout::ExheresLayout(const ERepository * const r, const FSEntry & tree_r
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".conf", { }))
continue;
std::string p(strip_trailing_string(strip_trailing_string(d->basename(), ".conf"), ".local"));
@@ -191,7 +191,7 @@ ExheresLayout::need_category_names() const
if (! i->exists())
continue;
- LineConfigFile cats(*i, LineConfigFileOptions());
+ LineConfigFile cats(*i, { });
for (LineConfigFile::ConstIterator line(cats.begin()), line_end(cats.end()) ;
line != line_end ; ++line)
@@ -591,7 +591,7 @@ namespace
continue;
if (is_file_with_prefix_extension((*f),
("digest-"+stringify(qpn.package())), "",
- IsFileWithOptions()))
+ { }))
continue;
m->insert((*f), "AUX");
}
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index 7796de6..ace0fbe 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -215,7 +215,7 @@ ExheresProfile::_load_dir(const FSEntry & f)
if ((f / "parents.conf").exists())
{
- LineConfigFile file(f / "parents.conf", LineConfigFileOptions());
+ LineConfigFile file(f / "parents.conf", { });
for (LineConfigFile::ConstIterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
_load_dir((f / *line).realpath());
@@ -238,9 +238,8 @@ ExheresProfile::_load_dir(const FSEntry & f)
throw ERepositoryConfigurationError("Can't use profile directory '" + stringify(f) +
"' because it uses an unsupported EAPI");
- KeyValueConfigFile file(f / "make.defaults", KeyValueConfigFileOptions() +
- kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values +
- kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
+ KeyValueConfigFile file(f / "make.defaults", { kvcfo_disallow_source, kvcfo_disallow_space_inside_unquoted_values,
+ kvcfo_allow_inline_comments, kvcfo_allow_multiple_assigns_per_line },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
for (KeyValueConfigFile::ConstIterator k(file.begin()), k_end(file.end()) ;
@@ -366,7 +365,7 @@ ExheresProfile::profile_masked(const PackageID & id) const
{
for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()),
k_end(rr->second.end()) ; k != k_end ; ++k)
- if (match_package(*_imp->env, *k->first, id, MatchPackageOptions()))
+ if (match_package(*_imp->env, *k->first, id, { }))
return k->second;
}
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index a93af04..29b822f 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -428,7 +428,7 @@ ExndbamRepository::merge(const MergeParams & m)
if (! merger.check())
{
- for (DirIterator d(target_ver_dir, DirIteratorOptions() + dio_include_dotfiles), d_end
+ for (DirIterator d(target_ver_dir, { dio_include_dotfiles }), d_end
; d != d_end ; ++d)
FSEntry(*d).unlink();
target_ver_dir.rmdir();
@@ -599,14 +599,14 @@ ExndbamRepository::perform_uninstall(
}
}
- for (DirIterator d(ver_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(ver_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
ver_dir.rmdir();
_imp->ndbam.remove_entry(id->name(), ver_dir);
FSEntry pkg_dir(ver_dir.dirname());
- if (DirIterator() == DirIterator(pkg_dir, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort + dio_first_only))
+ if (DirIterator() == DirIterator(pkg_dir, { dio_include_dotfiles, dio_inode_sort, dio_first_only }))
{
pkg_dir.rmdir();
diff --git a/paludis/repositories/e/exndbam_repository_TEST.cc b/paludis/repositories/e/exndbam_repository_TEST.cc
index 660a51f..e4bf483 100644
--- a/paludis/repositories/e/exndbam_repository_TEST.cc
+++ b/paludis/repositories/e/exndbam_repository_TEST.cc
@@ -108,7 +108,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = exndbam_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -118,7 +118,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
diff --git a/paludis/repositories/e/fetch_visitor_TEST.cc b/paludis/repositories/e/fetch_visitor_TEST.cc
index 273a745..40b17e8 100644
--- a/paludis/repositories/e/fetch_visitor_TEST.cc
+++ b/paludis/repositories/e/fetch_visitor_TEST.cc
@@ -77,7 +77,7 @@ namespace test_cases
const std::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("exheres-0"));
FetchVisitor v(&env, *env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("=cat/pkg-1",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin(),
+ &env, { }), { }))]->begin(),
*eapi, FSEntry("fetch_visitor_TEST_dir/out"),
false, false, "test", std::make_shared<URIListedThenMirrorsLabel>("listed-then-mirrors"), false,
std::make_shared<StandardOutputManager>(), get_mirrors_fn);
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index 570b5fe..e4a517f 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -107,7 +107,7 @@ namespace
break;
std::shared_ptr<const PackageIDSequence> matches((*env)[selection::AllVersionsSorted(
- generator::Matches(*node.spec(), MatchPackageOptions()) | filter::InstalledAtRoot(FSEntry("/")))]);
+ generator::Matches(*node.spec(), { }) | filter::InstalledAtRoot(FSEntry("/")))]);
if (matches->empty())
break;
diff --git a/paludis/repositories/e/info_metadata_key.cc b/paludis/repositories/e/info_metadata_key.cc
index b8eee1a..2b1eb88 100644
--- a/paludis/repositories/e/info_metadata_key.cc
+++ b/paludis/repositories/e/info_metadata_key.cc
@@ -109,7 +109,7 @@ InfoVarsMetadataKey::value() const
if (location->is_regular_file_or_symlink_to_regular_file())
{
- LineConfigFile f(*location, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile f(*location, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
_imp->value->insert(*line);
@@ -166,7 +166,7 @@ InfoPkgsMetadataKey::need_keys_added() const
if (location->is_regular_file_or_symlink_to_regular_file())
{
std::string eapi(_imp->e_repository->eapi_for_file(*location));
- LineConfigFile p(*location, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile p(*location, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(p.begin()), line_end(p.end()) ;
line != line_end ; ++line)
info_pkgs.insert(std::make_pair(*line, eapi));
@@ -185,7 +185,7 @@ InfoPkgsMetadataKey::need_keys_added() const
generator::Matches(parse_elike_package_dep_spec(i->first,
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(),
- std::shared_ptr<const PackageID>()), MatchPackageOptions()) |
+ std::shared_ptr<const PackageID>()), { }) |
filter::InstalledAtRoot(_imp->env->root()))]);
if (q->empty())
diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc
index aa45fe5..3041aa7 100644
--- a/paludis/repositories/e/manifest2_reader.cc
+++ b/paludis/repositories/e/manifest2_reader.cc
@@ -70,7 +70,7 @@ Manifest2Reader::Manifest2Reader(const FSEntry & f) :
if (! f.exists())
return;
- LineConfigFile lines(_imp->manifest, LineConfigFileOptions());
+ LineConfigFile lines(_imp->manifest, { });
for (LineConfigFile::ConstIterator l(lines.begin()), l_end(lines.end()) ;
l != l_end ; ++l)
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index 4ca05b0..b73fce6 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -264,7 +264,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(), package_id));
std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
- generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(environment->root()))]);
+ generator::Matches(spec, { }) | filter::InstalledAtRoot(environment->root()))]);
if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()) &&
(*entries->last())->virtual_for_key())
{
@@ -305,7 +305,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(), package_id));
std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::SomeArbitraryVersion(
- generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(environment->root()))]);
+ generator::Matches(spec, { }) | filter::InstalledAtRoot(environment->root()))]);
if (entries->empty())
return "O1;";
else
@@ -329,7 +329,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(), package_id));
std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
- generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(environment->root()))]);
+ generator::Matches(spec, { }) | filter::InstalledAtRoot(environment->root()))]);
if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()))
{
std::shared_ptr<PackageIDSequence> new_entries(std::make_shared<PackageIDSequence>());
diff --git a/paludis/repositories/e/profile_file.cc b/paludis/repositories/e/profile_file.cc
index 30fbebc..f788c81 100644
--- a/paludis/repositories/e/profile_file.cc
+++ b/paludis/repositories/e/profile_file.cc
@@ -127,7 +127,7 @@ ProfileFile<F_>::add_file(const FSEntry & f)
throw ERepositoryConfigurationError("Can't use profile file '" + stringify(f) +
"' because it uses an unsupported EAPI");
- F_ file(f, LineConfigFileOptions() + lcfo_disallow_continuations);
+ F_ file(f, { lcfo_disallow_continuations });
for (typename F_::ConstIterator line(file.begin()), line_end(file.end()) ; line != line_end ; ++line)
{
const std::string key(FileEntryTraits<const typename std::remove_reference<typename F_::ConstIterator::value_type>::type>::extract_key(*line));
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 2f9c070..e9e3163 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -117,7 +117,7 @@ TraditionalLayout::TraditionalLayout(const ERepository * const repo, const FSEnt
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".desc", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".desc", { }))
continue;
_imp->use_desc_files->push_back(std::make_pair(*d, ChoicePrefixName(strip_trailing_string(d->basename(), ".desc"))));
}
@@ -139,7 +139,7 @@ TraditionalLayout::TraditionalLayout(const ERepository * const repo, const FSEnt
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".desc", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".desc", { }))
continue;
_imp->use_desc_files->push_back(std::make_pair(*d, strip_trailing_string(d->basename(), ".desc")));
}
@@ -183,7 +183,7 @@ TraditionalLayout::need_category_names() const
if (! i->exists())
continue;
- LineConfigFile cats(*i, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile cats(*i, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(cats.begin()), line_end(cats.end()) ;
line != line_end ; ++line)
@@ -207,7 +207,7 @@ TraditionalLayout::need_category_names() const
{
Log::get_instance()->message("e.traditional_layout.categories.no_file", ll_qa, lc_context)
<< "No categories file for repository at '" << _imp->tree_root << "', faking it";
- for (DirIterator d(_imp->tree_root, DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->tree_root, { dio_inode_sort }), d_end ; d != d_end ; ++d)
{
if (! d->is_directory_or_symlink_to_directory())
continue;
@@ -247,7 +247,7 @@ TraditionalLayout::need_package_ids(const QualifiedPackageName & n) const
FSEntry path(_imp->tree_root / stringify(n.category()) / stringify(n.package()));
- for (DirIterator e(path, DirIteratorOptions() + dio_inode_sort), e_end ; e != e_end ; ++e)
+ for (DirIterator e(path, { dio_inode_sort }), e_end ; e != e_end ; ++e)
{
if (! _imp->repository->is_package_file(n, *e))
continue;
@@ -373,7 +373,7 @@ TraditionalLayout::package_names(const CategoryNamePart & c) const
return std::make_shared<QualifiedPackageNameSet>();
if ((_imp->tree_root / stringify(c)).is_directory_or_symlink_to_directory())
- for (DirIterator d(_imp->tree_root / stringify(c), DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->tree_root / stringify(c), { dio_inode_sort }), d_end ; d != d_end ; ++d)
{
try
{
@@ -586,7 +586,7 @@ namespace
if (! d.exists())
return;
- std::list<FSEntry> files((DirIterator(d, DirIteratorOptions() + dio_inode_sort)),
+ std::list<FSEntry> files((DirIterator(d, { dio_inode_sort })),
DirIterator());
for (std::list<FSEntry>::iterator f(files.begin()) ;
f != files.end() ; ++f)
@@ -602,7 +602,7 @@ namespace
continue;
if (is_file_with_prefix_extension((*f),
("digest-"+stringify(qpn.package())), "",
- IsFileWithOptions()))
+ { }))
continue;
m->insert((*f), "AUX");
}
@@ -616,7 +616,7 @@ TraditionalLayout::manifest_files(const QualifiedPackageName & qpn) const
std::shared_ptr<Map<FSEntry, std::string> > result(std::make_shared<Map<FSEntry, std::string>>());
FSEntry package_dir = _imp->repository->layout()->package_directory(qpn);
- std::list<FSEntry> package_files((DirIterator(package_dir, DirIteratorOptions() + dio_inode_sort)),
+ std::list<FSEntry> package_files((DirIterator(package_dir, { dio_inode_sort })),
DirIterator());
for (std::list<FSEntry>::iterator f(package_files.begin()) ;
f != package_files.end() ; ++f)
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index a92a0d3..e8ea1ae 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -293,7 +293,7 @@ Imp<TraditionalProfile>::load_profile_parent(const FSEntry & dir)
if (! (dir / "parent").exists())
return;
- LineConfigFile file(dir / "parent", LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile file(dir / "parent", { lcfo_disallow_continuations });
LineConfigFile::ConstIterator i(file.begin()), i_end(file.end());
bool once(false);
@@ -345,8 +345,7 @@ Imp<TraditionalProfile>::load_profile_make_defaults(const FSEntry & dir)
throw ERepositoryConfigurationError("Can't use profile directory '" + stringify(dir) +
"' because it uses an unsupported EAPI");
- KeyValueConfigFile file(dir / "make.defaults", KeyValueConfigFileOptions() +
- kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
+ KeyValueConfigFile file(dir / "make.defaults", { kvcfo_disallow_source, kvcfo_disallow_space_inside_unquoted_values, kvcfo_allow_inline_comments, kvcfo_allow_multiple_assigns_per_line },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
for (KeyValueConfigFile::ConstIterator k(file.begin()), k_end(file.end()) ;
@@ -667,7 +666,7 @@ Imp<TraditionalProfile>::load_basic_use_file(const FSEntry & file, FlagStatusMap
return;
Context context("When loading basic use file '" + stringify(file) + ":");
- LineConfigFile f(file, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile f(file, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
{
@@ -706,7 +705,7 @@ Imp<TraditionalProfile>::load_spec_use_file(const EAPI & eapi, const FSEntry & f
return;
Context context("When loading specised use file '" + stringify(file) + ":");
- LineConfigFile f(file, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile f(file, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
{
@@ -871,7 +870,7 @@ TraditionalProfile::use_masked(
for (PackageFlagStatusMapList::const_iterator g(i->package_use_mask.begin()),
g_end(i->package_use_mask.end()) ; g != g_end ; ++g)
{
- if (! match_package(*_imp->env, *g->first, *id, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *g->first, *id, { }))
continue;
FlagStatusMap::const_iterator h(g->second.find(value_prefixed));
@@ -907,7 +906,7 @@ TraditionalProfile::use_forced(
for (PackageFlagStatusMapList::const_iterator g(i->package_use_force.begin()),
g_end(i->package_use_force.end()) ; g != g_end ; ++g)
{
- if (! match_package(*_imp->env, *g->first, *id, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *g->first, *id, { }))
continue;
FlagStatusMap::const_iterator h(g->second.find(value_prefixed));
@@ -936,7 +935,7 @@ TraditionalProfile::use_state_ignoring_masks(
for (PackageFlagStatusMapList::const_iterator g(i->package_use.begin()),
g_end(i->package_use.end()) ; g != g_end ; ++g)
{
- if (! match_package(*_imp->env, *g->first, *id, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *g->first, *id, { }))
continue;
FlagStatusMap::const_iterator h(g->second.find(value_prefixed));
@@ -1045,7 +1044,7 @@ TraditionalProfile::profile_masked(const PackageID & id) const
{
for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()),
k_end(rr->second.end()) ; k != k_end ; ++k)
- if (match_package(*_imp->env, *k->first, id, MatchPackageOptions()))
+ if (match_package(*_imp->env, *k->first, id, { }))
return k->second;
}
diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc
index 51bb9ca..3b85116 100644
--- a/paludis/repositories/e/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
@@ -51,7 +51,7 @@ namespace paludis
{
if (f.is_regular_file_or_symlink_to_regular_file())
{
- LineConfigFile ff(f, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile ff(f, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(ff.begin()), line_end(ff.end()) ;
line != line_end ; ++line)
{
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 85580e7..77cef49 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -520,7 +520,7 @@ VDBRepository::perform_uninstall(
}
/* remove vdb entry */
- for (DirIterator d(pkg_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(pkg_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
pkg_dir.rmdir();
@@ -956,7 +956,7 @@ VDBRepository::merge(const MergeParams & m)
if (! merger.check())
{
- for (DirIterator d(tmp_vdb_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(tmp_vdb_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
tmp_vdb_dir.rmdir();
throw ActionFailedError("Not proceeding with install due to merge sanity check failing");
@@ -1063,7 +1063,7 @@ VDBRepository::need_category_names() const
Context context("When loading category names from '" + stringify(_imp->params.location()) + "':");
- for (DirIterator d(_imp->params.location(), DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->params.location(), { dio_inode_sort }), d_end ; d != d_end ; ++d)
try
{
if (d->is_directory_or_symlink_to_directory())
@@ -1096,7 +1096,7 @@ VDBRepository::need_package_ids(const CategoryNamePart & c) const
std::shared_ptr<QualifiedPackageNameSet> q(std::make_shared<QualifiedPackageNameSet>());
- for (DirIterator d(_imp->params.location() / stringify(c), DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->params.location() / stringify(c), { dio_inode_sort }), d_end ; d != d_end ; ++d)
try
{
if (d->is_directory_or_symlink_to_directory())
@@ -1106,7 +1106,7 @@ VDBRepository::need_package_ids(const CategoryNamePart & c) const
continue;
PackageDepSpec p(parse_user_package_dep_spec("=" + stringify(c) + "/" + s,
- _imp->params.environment(), UserPackageDepSpecOptions()));
+ _imp->params.environment(), { }));
q->insert(*p.package_ptr());
IDMap::iterator i(_imp->ids.find(*p.package_ptr()));
if (_imp->ids.end() == i)
@@ -1320,7 +1320,7 @@ VDBRepository::perform_updates()
if (cache_file.is_regular_file_or_symlink_to_regular_file())
{
Context ctx2("When reading update file timestamps from '" + stringify(cache_file) + "':");
- LineConfigFile f(cache_file, LineConfigFileOptions() + lcfo_preserve_whitespace);
+ LineConfigFile f(cache_file, { lcfo_preserve_whitespace });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
@@ -1385,7 +1385,7 @@ VDBRepository::perform_updates()
continue;
}
- for (DirIterator d(k->value(), DirIteratorOptions()), d_end ;
+ for (DirIterator d(k->value(), { }), d_end ;
d != d_end ; ++d)
{
Context context_3("When performing updates from '" + stringify(*d) + "':");
@@ -1404,7 +1404,7 @@ VDBRepository::perform_updates()
std::cout << " Considering " << *d << std::endl;
- LineConfigFile f(*d, LineConfigFileOptions());
+ LineConfigFile f(*d, { });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
@@ -1447,11 +1447,11 @@ VDBRepository::perform_updates()
if (4 == tokens.size())
{
PackageDepSpec old_spec(parse_user_package_dep_spec(tokens.at(1), _imp->params.environment(),
- UserPackageDepSpecOptions()));
+ { }));
SlotName old_slot(tokens.at(2)), new_slot(tokens.at(3));
const std::shared_ptr<const PackageIDSequence> ids((*_imp->params.environment())[selection::AllVersionsSorted(
- (generator::Matches(old_spec, MatchPackageOptions()) & generator::InRepository(name())) |
+ (generator::Matches(old_spec, { }) & generator::InRepository(name())) |
filter::Slot(old_slot)
)]);
if (! ids->empty())
@@ -1531,7 +1531,7 @@ VDBRepository::perform_updates()
if (newpf != oldpf)
{
- for (DirIterator it(to_dir, DirIteratorOptions() + dio_inode_sort),
+ for (DirIterator it(to_dir, { dio_inode_sort }),
it_end; it_end != it; ++it)
{
std::string::size_type lastdot(it->basename().rfind('.'));
@@ -1601,7 +1601,7 @@ VDBRepository::perform_updates()
for (DepRewrites::const_iterator i(dep_rewrites.begin()), i_end(dep_rewrites.end()) ;
i != i_end ; ++i)
_imp->params.environment()->update_config_files_for_package_move(
- make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(i->first),
+ make_package_dep_spec({ }).package(i->first),
i->second
);
}
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index ca0b2f9..9b9e4c2 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -151,7 +151,7 @@ namespace test_cases
std::shared_ptr<const PackageID> e1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(e1->choices_key()));
TEST_CHECK(bool(e1->choices_key()->value()));
@@ -222,7 +222,7 @@ namespace test_cases
std::shared_ptr<const PackageID> e1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
ContentsGatherer gatherer;
std::for_each(indirect_iterator(e1->contents_key()->value()->begin()),
indirect_iterator(e1->contents_key()->value()->end()),
@@ -276,7 +276,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
StringifyFormatter ff;
@@ -379,7 +379,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -390,7 +390,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -401,7 +401,7 @@ namespace test_cases
TestMessageSuffix suffix("info", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(info_action);
}
@@ -410,7 +410,7 @@ namespace test_cases
TestMessageSuffix suffix("config", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(config_action);
}
@@ -419,7 +419,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(uninstall_action);
}
@@ -509,7 +509,7 @@ namespace test_cases
TestMessageSuffix suffix("vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -520,7 +520,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -531,7 +531,7 @@ namespace test_cases
TestMessageSuffix suffix("info", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(info_action);
}
@@ -540,7 +540,7 @@ namespace test_cases
TestMessageSuffix suffix("config", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(config_action);
}
@@ -549,7 +549,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(uninstall_action);
}
@@ -586,7 +586,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = vdb_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -596,7 +596,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
@@ -708,7 +708,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other slot", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -737,7 +737,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other package", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -764,7 +764,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other category", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat2/pkg1-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -779,7 +779,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -816,7 +816,7 @@ namespace test_cases
void read_cache(std::vector<FSEntry> & vec)
{
using namespace std::placeholders;
- std::remove_copy_if(DirIterator(names_cache, DirIteratorOptions() + dio_include_dotfiles),
+ std::remove_copy_if(DirIterator(names_cache, { dio_include_dotfiles }),
DirIterator(), std::back_inserter(vec),
std::bind(&std::equal_to<std::string>::operator(),
std::equal_to<std::string>(),
@@ -949,7 +949,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = vdb_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -959,7 +959,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
@@ -1079,7 +1079,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other slot", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1098,7 +1098,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other package", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1109,7 +1109,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1218,7 +1218,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1230,7 +1230,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1242,7 +1242,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall equivalent", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1275,7 +1275,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = vdb_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -1285,7 +1285,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index 447e9de..3aba094 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -286,7 +286,7 @@ VDBUnmerger::check_dir(const std::shared_ptr<const ContentsEntry> & e) const
display("--- [gone ] " + stringify(f));
else if (! (_imp->options.root() / f).is_directory())
display("--- [!type] " + stringify(f));
- else if (DirIterator(_imp->options.root() / f, DirIteratorOptions() + dio_include_dotfiles + dio_first_only) != DirIterator())
+ else if (DirIterator(_imp->options.root() / f, { dio_include_dotfiles, dio_first_only }) != DirIterator())
display("--- [!empt] " + stringify(f));
else
return true;
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index d365b6b..6ad4e02 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -128,8 +128,8 @@ namespace
n::ignore() = &ignore_nothing,
n::output_manager() = std::make_shared<StandardOutputManager>(),
n::package_id() = *env[selection::RequireExactlyOne(generator::Matches(
- parse_user_package_dep_spec("cat/" + fix(what), &env, UserPackageDepSpecOptions()),
- MatchPackageOptions()))]->begin(),
+ parse_user_package_dep_spec("cat/" + fix(what), &env, { }),
+ { }))]->begin(),
n::root() = root_dir
));
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index a470d23..81f6071 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -787,7 +787,7 @@ FakePackageID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/gems/gem_specification.cc b/paludis/repositories/gems/gem_specification.cc
index e4f8171..366e54e 100644
--- a/paludis/repositories/gems/gem_specification.cc
+++ b/paludis/repositories/gems/gem_specification.cc
@@ -316,7 +316,7 @@ PackageDepSpec
GemSpecification::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) + "::" + stringify(repository()->name()),
- _imp->environment, UserPackageDepSpecOptions());
+ _imp->environment, { });
}
const QualifiedPackageName
@@ -328,7 +328,7 @@ GemSpecification::name() const
const VersionSpec
GemSpecification::version() const
{
- return VersionSpec(_imp->version, VersionSpecOptions());
+ return VersionSpec(_imp->version, { });
}
const std::shared_ptr<const Repository>
diff --git a/paludis/repositories/gems/gem_specification_TEST.cc b/paludis/repositories/gems/gem_specification_TEST.cc
index 6d96d7f..b839ff4 100644
--- a/paludis/repositories/gems/gem_specification_TEST.cc
+++ b/paludis/repositories/gems/gem_specification_TEST.cc
@@ -64,7 +64,7 @@ namespace test_cases
TEST_CHECK(bool(spec.short_description_key()));
TEST_CHECK_EQUAL(spec.short_description_key()->value(), "This is the summary");
TEST_CHECK_EQUAL(spec.name(), QualifiedPackageName("gems/demo"));
- TEST_CHECK_EQUAL(spec.version(), VersionSpec("1.2.3", VersionSpecOptions()));
+ TEST_CHECK_EQUAL(spec.version(), VersionSpec("1.2.3", { }));
TEST_CHECK(spec.find_metadata("rubyforge_project") == spec.end_metadata());
TEST_CHECK(bool(spec.long_description_key()));
TEST_CHECK_EQUAL(spec.long_description_key()->value(), "A longer description");
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index c977d80..d7e8981 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -235,7 +235,7 @@ InstalledGemsRepository::need_ids() const
for (DirIterator d(_imp->params.install_dir() / "specifications"), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".gemspec", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".gemspec", { }))
continue;
std::string s(strip_trailing_string(d->basename(), ".gemspec"));
@@ -247,7 +247,7 @@ InstalledGemsRepository::need_ids() const
continue;
}
- VersionSpec v(s.substr(h + 1), VersionSpecOptions());
+ VersionSpec v(s.substr(h + 1), { });
PackageNamePart p(s.substr(0, h));
pkgs->insert(gems + p);
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index 962e53a..45f5413 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -53,7 +53,7 @@ namespace paludis
Imp(const RepositoryIDParams & e) :
env(e.environment()),
name(e.name()),
- version("0", VersionSpecOptions()),
+ version("0", { }),
repo(e.repository()),
behaviours_key(std::make_shared<LiteralMetadataStringSetKey>("behaviours", "behaviours", mkt_internal, behaviours_set))
{
@@ -125,7 +125,7 @@ RepositoryID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
+ "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index 11768ec..5b9f9e3 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -137,7 +137,7 @@ UnavailablePackageID::uniquely_identifying_spec() const
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()) +
"[." + _imp->from_repositories_key->raw_name() + "=" + *_imp->from_repositories_key->value()->begin() + "]",
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index 5786d2e..57a93dd 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -60,7 +60,7 @@ namespace paludis
const UnavailableRepositoryIDParams & e) :
env(e.environment()),
name(e.name()),
- version("0", VersionSpecOptions()),
+ version("0", { }),
repo(e.repository()),
dependencies_key(e.dependencies()),
description_key(e.description()),
@@ -135,7 +135,7 @@ UnavailableRepositoryID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version())
+ "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/unavailable/unavailable_repository_store.cc b/paludis/repositories/unavailable/unavailable_repository_store.cc
index 95b077e..dd4b761 100644
--- a/paludis/repositories/unavailable/unavailable_repository_store.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_store.cc
@@ -101,7 +101,7 @@ UnavailableRepositoryStore::_populate(const Environment * const env, const FSEnt
void
UnavailableRepositoryStore::_populate_one(const Environment * const env, const FSEntry & f)
{
- if (! is_file_with_extension(f, ".repository", IsFileWithOptions()))
+ if (! is_file_with_extension(f, ".repository", { }))
return;
Context context("When populating UnavailableRepository from file '" + stringify(f) + "':");
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 732216b..824987d 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -545,7 +545,7 @@ InstalledUnpackagedID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
@@ -890,7 +890,7 @@ InstalledUnpackagedID::uninstall(const bool replace,
unmerger.unmerge();
- for (DirIterator d(ver_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(ver_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
ver_dir.rmdir();
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index 1ca3795..5767fff 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -373,7 +373,7 @@ InstalledUnpackagedRepository::merge(const MergeParams & m)
if (! merger.check())
{
- for (DirIterator d(target_ver_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(target_ver_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
target_ver_dir.rmdir();
throw ActionFailedError("Not proceeding with install due to merge sanity check failing");
diff --git a/paludis/repositories/unpackaged/installed_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc
index 7fe9800..336ce39 100644
--- a/paludis/repositories/unpackaged/installed_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_repository_TEST.cc
@@ -136,9 +136,9 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("cat-one/foo:0",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ &env, { }), { }))]->begin());
- TEST_CHECK_EQUAL(id1->version(), VersionSpec("1", VersionSpecOptions()));
+ TEST_CHECK_EQUAL(id1->version(), VersionSpec("1", { }));
TEST_CHECK_EQUAL(id1->slot_key()->value(), SlotName("0"));
TEST_CHECK_EQUAL(id1->name(), QualifiedPackageName("cat-one/foo"));
TEST_CHECK_EQUAL(id1->repository()->name(), RepositoryName("installed-unpackaged"));
@@ -154,9 +154,9 @@ namespace test_cases
const std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("cat-one/foo:1",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ &env, { }), { }))]->begin());
- TEST_CHECK_EQUAL(id2->version(), VersionSpec("2", VersionSpecOptions()));
+ TEST_CHECK_EQUAL(id2->version(), VersionSpec("2", { }));
TEST_CHECK_EQUAL(id2->slot_key()->value(), SlotName("1"));
TEST_CHECK_EQUAL(id2->name(), QualifiedPackageName("cat-one/foo"));
TEST_CHECK_EQUAL(id2->repository()->name(), RepositoryName("installed-unpackaged"));
@@ -190,13 +190,13 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("cat-one/foo:0",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ &env, { }), { }))]->begin());
TEST_CHECK(! id1->masked());
const std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("cat-one/foo:1",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ &env, { }), { }))]->begin());
TEST_CHECK(! id2->masked());
}
@@ -226,7 +226,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("cat-one/foo:1",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ &env, { }), { }))]->begin());
TEST_CHECK(! id1->supports_action(SupportsActionTest<InstallAction>()));
TEST_CHECK(! id1->supports_action(SupportsActionTest<ConfigAction>()));
@@ -318,7 +318,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("cat-one/foo:fred",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
+ &env, { }), { }))]->begin());
UninstallAction action(make_named_values<UninstallActionOptions>(
n::config_protect() = "",
@@ -395,7 +395,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, source_repo);
@@ -453,7 +453,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, source_repo);
@@ -513,7 +513,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, source_repo);
@@ -577,7 +577,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
parse_user_package_dep_spec("cat/pkg4a",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin())->perform_action(action);
+ &env, { }), { }))]->begin())->perform_action(action);
TEST_CHECK(FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir/4a").is_regular_file());
@@ -623,7 +623,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
parse_user_package_dep_spec("cat/pkg4b",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin())->perform_action(action);
+ &env, { }), { }))]->begin())->perform_action(action);
TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir").is_directory());
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 3e4a75c..4017b2e 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -157,7 +157,7 @@ UnpackagedID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
index 14f1ddc..816e7bc 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
@@ -84,7 +84,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, repo);
@@ -114,14 +114,14 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, repo);
const std::shared_ptr<const PackageID> id(
*env[selection::RequireExactlyOne(generator::All())]->begin());
- TEST_CHECK_EQUAL(id->version(), VersionSpec("1.0", VersionSpecOptions()));
+ TEST_CHECK_EQUAL(id->version(), VersionSpec("1.0", { }));
TEST_CHECK_EQUAL(id->slot_key()->value(), SlotName("foo"));
TEST_CHECK_EQUAL(id->name(), QualifiedPackageName("cat/pkg"));
TEST_CHECK_EQUAL(id->repository()->name(), RepositoryName("unpackaged"));
@@ -149,7 +149,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, repo);
@@ -179,7 +179,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, repo);
@@ -220,7 +220,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, repo);
@@ -276,7 +276,7 @@ namespace test_cases
n::rewrite_ids_over_to_root() = -1,
n::run_dependencies() = "",
n::slot() = SlotName("foo"),
- n::version() = VersionSpec("1.0", VersionSpecOptions())
+ n::version() = VersionSpec("1.0", { })
)));
env.package_database()->add_repository(1, repo);
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index 9edaaa7..f21b27d 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -142,7 +142,7 @@ UnwrittenID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.cc b/paludis/repositories/unwritten/unwritten_repository_file.cc
index 487fc47..9eb04f4 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_file.cc
@@ -207,7 +207,7 @@ UnwrittenRepositoryFile::_load(const FSEntry & f)
CategoryNamePart category("x");
PackageNamePart package("x");
std::shared_ptr<MetadataValueKey<SlotName> > slot;
- VersionSpec version("0", VersionSpecOptions());
+ VersionSpec version("0", { });
std::shared_ptr<UnwrittenRepositoryFileEntry> entry;
while (std::getline(file, line))
{
diff --git a/paludis/repositories/unwritten/unwritten_repository_store.cc b/paludis/repositories/unwritten/unwritten_repository_store.cc
index d440b0a..dab8831 100644
--- a/paludis/repositories/unwritten/unwritten_repository_store.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_store.cc
@@ -96,7 +96,7 @@ UnwrittenRepositoryStore::_populate(const Environment * const env, const FSEntry
void
UnwrittenRepositoryStore::_populate_one(const Environment * const env, const FSEntry & f)
{
- if (! is_file_with_extension(f, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(f, ".conf", { }))
return;
Context context("When populating UnwrittenRepository from file '" + stringify(f) + "':");
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 1e02917..f6f6c8f 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -132,10 +132,10 @@ VirtualsDepKey::pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
if (_imp->env)
{
- if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*_imp->spec, MatchPackageOptions()) |
+ if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*_imp->spec, { }) |
filter::InstalledAtRoot(_imp->env->root()))]->empty())
return f.format(*_imp->spec, format::Installed());
- else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*_imp->spec, MatchPackageOptions()) |
+ else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*_imp->spec, { }) |
filter::SupportsAction<InstallAction>() | filter::NotMasked())]->empty())
return f.format(*_imp->spec, format::Installable());
else
@@ -252,7 +252,7 @@ VirtualsPackageID::uniquely_identifying_spec() const
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()) + "]",
- _imp->env, UserPackageDepSpecOptions());
+ _imp->env, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index 60401d9..2adc86b 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -222,7 +222,7 @@ VirtualsRepository::need_ids() const
v(_imp->names.begin()), v_end(_imp->names.end()) ; v != v_end ; ++v)
{
std::shared_ptr<const PackageIDSequence> matches((*_imp->env)[selection::AllVersionsSorted(
- generator::Matches(*v->second, MatchPackageOptions()) |
+ generator::Matches(*v->second, { }) |
filter::SupportsAction<InstallAction>())]);
if (matches->empty())
diff --git a/paludis/repositories/virtuals/virtuals_repository_TEST.cc b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
index 5d5525a..48cbbe1 100644
--- a/paludis/repositories/virtuals/virtuals_repository_TEST.cc
+++ b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
@@ -71,7 +71,7 @@ namespace test_cases
repo->add_version("cat", "pkg", "1")->provide_key()->set_from_string("virtual/pkg");
repo->add_version("cat", "pkg", "2")->provide_key()->set_from_string("virtual/pkg");
repo->add_virtual_package(QualifiedPackageName("virtual/pkg"), std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(">=cat/pkg-2", &env, { })));
TEST_CHECK(bool(repo->virtual_packages()));
TEST_CHECK_EQUAL(std::distance(repo->virtual_packages()->begin(), repo->virtual_packages()->end()), 1);
@@ -117,14 +117,14 @@ namespace test_cases
repo1->add_version("cat", "pkg", "1")->provide_key()->set_from_string("virtual/pkg");
repo1->add_version("cat", "pkg", "2")->provide_key()->set_from_string("virtual/pkg");
repo1->add_virtual_package(QualifiedPackageName("virtual/pkg"), std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(">=cat/pkg-2", &env, { })));
repo1->add_virtual_package(QualifiedPackageName("virtual/foo"), std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(">=cat/pkg-2", &env, { })));
repo2->add_virtual_package(QualifiedPackageName("virtual/pkg"), std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(">=cat/pkg-2", &env, UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(">=cat/pkg-2", &env, { })));
repo2->add_virtual_package(QualifiedPackageName("virtual/foo"), std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec("<=cat/pkg-1", &env, UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec("<=cat/pkg-1", &env, { })));
TEST_CHECK(virtuals->has_category_named(CategoryNamePart("virtual")));
TEST_CHECK(virtuals->has_package_named(QualifiedPackageName("virtual/pkg")));
@@ -161,11 +161,11 @@ namespace test_cases
repo1->add_version("virtual", "gkp", "1")->provide_key()->set_from_string("virtual/pkg");
repo1->add_virtual_package(QualifiedPackageName("virtual/pkg"), std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec("virtual/gkp", &env, UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec("virtual/gkp", &env, { })));
repo2->add_version("virtual", "pkg", "2")->provide_key()->set_from_string("virtual/pkg");
repo2->add_virtual_package(QualifiedPackageName("virtual/pkg"), std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec("virtual/pkg", &env, UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec("virtual/pkg", &env, { })));
TEST_CHECK(virtuals->has_category_named(CategoryNamePart("virtual")));
TEST_CHECK(virtuals->has_package_named(QualifiedPackageName("virtual/pkg")));
diff --git a/paludis/repository_name_cache.cc b/paludis/repository_name_cache.cc
index f9be87e..69c5069 100644
--- a/paludis/repository_name_cache.cc
+++ b/paludis/repository_name_cache.cc
@@ -219,7 +219,7 @@ RepositoryNameCache::regenerate_cache() const
+ stringify(_imp->location) + "':");
if (_imp->location.is_directory())
- for (DirIterator i(_imp->location, DirIteratorOptions() + dio_inode_sort), i_end ; i != i_end ; ++i)
+ for (DirIterator i(_imp->location, { dio_inode_sort }), i_end ; i != i_end ; ++i)
FSEntry(*i).unlink();
FSEntry main_cache_dir(_imp->location.dirname());
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index a3cb52a..b9b3834 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -313,14 +313,14 @@ namespace
for (typename C_::ConstIterator g(going_away->begin()), g_end(going_away->end()) ;
g != g_end ; ++g)
{
- if (! match_package(*env, *s.spec(), *dependent_checker_id(*g), MatchPackageOptions()))
+ if (! match_package(*env, *s.spec(), *dependent_checker_id(*g), { }))
continue;
bool any(false);
for (typename C_::ConstIterator n(newly_available->begin()), n_end(newly_available->end()) ;
n != n_end ; ++n)
{
- if (match_package(*env, *s.spec(), *dependent_checker_id(*n), MatchPackageOptions()))
+ if (match_package(*env, *s.spec(), *dependent_checker_id(*n), { }))
{
any = true;
break;
@@ -780,13 +780,13 @@ namespace
{
if (constraint.spec().if_package())
{
- if (! match_package(*env, *constraint.spec().if_package(), *chosen_id, MatchPackageOptions()))
+ if (! match_package(*env, *constraint.spec().if_package(), *chosen_id, { }))
return false;
}
else
{
if (match_package(*env, constraint.spec().if_block()->blocking(),
- *chosen_id, MatchPackageOptions()))
+ *chosen_id, { }))
return false;
}
@@ -1284,7 +1284,7 @@ Decider::find_any_score(
if (is_block)
{
const std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionOnly(
- generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements)
+ generator::Matches(spec, { mpo_ignore_additional_requirements })
| filter::SupportsAction<InstallAction>() | filter::NotMasked()
)]);
if (ids->empty())
@@ -1294,7 +1294,7 @@ Decider::find_any_score(
/* next: already installed */
{
const std::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
- generator::Matches(spec, MatchPackageOptions()) |
+ generator::Matches(spec, { }) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (! installed_ids->empty() ^ is_block)
return std::make_pair(acs_already_installed, operator_bias);
@@ -1304,7 +1304,7 @@ Decider::find_any_score(
if (! is_block && spec.additional_requirements_ptr())
{
const std::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
- generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements) |
+ generator::Matches(spec, { mpo_ignore_additional_requirements }) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (! installed_ids->empty())
return std::make_pair(acs_wrong_options_installed, operator_bias);
@@ -1348,7 +1348,7 @@ Decider::find_any_score(
if (is_block)
{
const std::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
- generator::Matches(spec, MatchPackageOptions()) |
+ generator::Matches(spec, { }) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (! installed_ids->empty())
return std::make_pair(acs_blocks_installed, operator_bias);
@@ -1358,7 +1358,7 @@ Decider::find_any_score(
if (! is_block)
{
const std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionOnly(
- generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements)
+ generator::Matches(spec, { mpo_ignore_additional_requirements })
)]);
if (! ids->empty())
return std::make_pair(acs_exists, operator_bias);
@@ -1774,9 +1774,9 @@ Decider::_find_id_for_from(
c != c_end ; ++c)
{
if ((*c)->spec().if_package())
- ok = ok && match_package(*_imp->env, *(*c)->spec().if_package(), **i, MatchPackageOptions());
+ ok = ok && match_package(*_imp->env, *(*c)->spec().if_package(), **i, { });
else
- ok = ok && ! match_package(*_imp->env, (*c)->spec().if_block()->blocking(), **i, MatchPackageOptions());
+ ok = ok && ! match_package(*_imp->env, (*c)->spec().if_block()->blocking(), **i, { });
if (! ok)
break;
@@ -1957,7 +1957,7 @@ Decider::_collect_world(
for (PackageIDSet::ConstIterator i(from->begin()), i_end(from->end()) ;
i != i_end ; ++i)
- if (match_package_in_set(*_imp->env, *set, **i, MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *set, **i, { }))
result->insert(*i);
return result;
@@ -1997,7 +1997,7 @@ Decider::_already_met(const SanitisedDependency & dep) const
generator::Matches(dep.spec().if_package() ?
*dep.spec().if_package() :
dep.spec().if_block()->blocking(),
- MatchPackageOptions()) |
+ { }) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (installed_ids->empty())
return bool(dep.spec().if_block());
@@ -2081,7 +2081,7 @@ namespace
bool is_system(false);
for (PackageIDSequence::ConstIterator i(remove_decision.ids()->begin()), i_end(remove_decision.ids()->end()) ;
i != i_end && ! is_system ; ++i)
- if (match_package_in_set(*env, *env->set(SetName("system")), **i, MatchPackageOptions()))
+ if (match_package_in_set(*env, *env->set(SetName("system")), **i, { }))
is_system = true;
if (is_system)
@@ -2177,7 +2177,7 @@ Decider::_resolve_purges()
/* to catch packages being purged that are also in world and not used
* by anything else */
- if (match_package_in_set(*_imp->env, *world, **i, MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *world, **i, { }))
continue;
const std::shared_ptr<ChangeByResolventSequence> used_to_use(std::make_shared<ChangeByResolventSequence>());
@@ -2294,7 +2294,7 @@ Decider::_collect_provided(
v != v_end ; ++v)
{
const std::shared_ptr<const PackageIDSequence> virtuals((*_imp->env)[selection::AllVersionsUnsorted(
- generator::Matches(**v, MatchPackageOptions()))]);
+ generator::Matches(**v, { }))]);
std::copy(virtuals->begin(), virtuals->end(), result->inserter());
}
}
diff --git a/paludis/resolver/job.cc b/paludis/resolver/job.cc
index 82ed868..9ada001 100644
--- a/paludis/resolver/job.cc
+++ b/paludis/resolver/job.cc
@@ -67,7 +67,7 @@ PretendJob::deserialise(Deserialisation & d)
Deserialisator v(d, "PretendJob");
return std::make_shared<PretendJob>(
parse_user_package_dep_spec(v.member<std::string>("origin_id_spec"),
- d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation)
+ d.deserialiser().environment(), { updso_no_disambiguation })
);
}
@@ -165,7 +165,7 @@ FetchJob::deserialise(Deserialisation & d)
std::shared_ptr<FetchJob> result(std::make_shared<FetchJob>(
requirements,
parse_user_package_dep_spec(v.member<std::string>("origin_id_spec"),
- d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation)
+ d.deserialiser().environment(), { updso_no_disambiguation })
));
result->set_state(v.member<std::shared_ptr<JobState> >("state"));
return result;
@@ -278,7 +278,7 @@ InstallJob::deserialise(Deserialisation & d)
Deserialisator vv(*v.find_remove_member("replacing_specs"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
replacing_specs->push_back(parse_user_package_dep_spec(vv.member<std::string>(stringify(n)),
- d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation));
+ d.deserialiser().environment(), { updso_no_disambiguation }));
}
std::shared_ptr<JobRequirements> requirements(std::make_shared<JobRequirements>());
@@ -291,7 +291,7 @@ InstallJob::deserialise(Deserialisation & d)
std::shared_ptr<InstallJob> result(std::make_shared<InstallJob>(
requirements,
parse_user_package_dep_spec(v.member<std::string>("origin_id_spec"),
- d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation),
+ d.deserialiser().environment(), { updso_no_disambiguation }),
RepositoryName(v.member<std::string>("destination_repository_name")),
destringify<DestinationType>(v.member<std::string>("destination_type")),
replacing_specs
@@ -387,7 +387,7 @@ UninstallJob::deserialise(Deserialisation & d)
Deserialisator vv(*v.find_remove_member("ids_to_remove_specs"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
ids_to_remove_specs->push_back(parse_user_package_dep_spec(vv.member<std::string>(stringify(n)),
- d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation));
+ d.deserialiser().environment(), { updso_no_disambiguation }));
}
std::shared_ptr<JobRequirements> requirements(std::make_shared<JobRequirements>());
diff --git a/paludis/resolver/package_or_block_dep_spec.cc b/paludis/resolver/package_or_block_dep_spec.cc
index 81abba3..cb96300 100644
--- a/paludis/resolver/package_or_block_dep_spec.cc
+++ b/paludis/resolver/package_or_block_dep_spec.cc
@@ -115,13 +115,13 @@ PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::shared_ptr<co
bool block(v.member<bool>("block"));
PackageDepSpec spec(parse_elike_package_dep_spec(v.member<std::string>("spec"),
- ELikePackageDepSpecOptions() + epdso_allow_tilde_greater_deps + epdso_nice_equal_star +
- epdso_allow_ranged_deps + epdso_allow_use_deps + epdso_allow_use_deps_portage +
- epdso_allow_use_dep_defaults + epdso_allow_repository_deps + epdso_allow_slot_star_deps +
- epdso_allow_slot_equal_deps + epdso_allow_slot_deps + epdso_allow_key_requirements +
- epdso_allow_use_dep_question_defaults,
- VersionSpecOptions() + vso_flexible_dashes + vso_flexible_dots + vso_ignore_case +
- vso_letters_anywhere + vso_dotted_suffixes,
+ { epdso_allow_tilde_greater_deps, epdso_nice_equal_star,
+ epdso_allow_ranged_deps, epdso_allow_use_deps, epdso_allow_use_deps_portage,
+ epdso_allow_use_dep_defaults, epdso_allow_repository_deps, epdso_allow_slot_star_deps,
+ epdso_allow_slot_equal_deps, epdso_allow_slot_deps, epdso_allow_key_requirements,
+ epdso_allow_use_dep_question_defaults },
+ { vso_flexible_dashes, vso_flexible_dots, vso_ignore_case,
+ vso_letters_anywhere, vso_dotted_suffixes },
for_id));
std::shared_ptr<MetadataSectionKey> annotations;
diff --git a/paludis/resolver/resolver_TEST_blockers.cc b/paludis/resolver/resolver_TEST_blockers.cc
index f155b90..4214649 100644
--- a/paludis/resolver/resolver_TEST_blockers.cc
+++ b/paludis/resolver/resolver_TEST_blockers.cc
@@ -187,7 +187,7 @@ namespace test_cases
{
std::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
"!target/target",
- parse_user_package_dep_spec("target/target", &env, UserPackageDepSpecOptions()),
+ parse_user_package_dep_spec("target/target", &env, { }),
false)));
check_resolved(resolved,
diff --git a/paludis/resolver/resolver_TEST_continue_on_failure.cc b/paludis/resolver/resolver_TEST_continue_on_failure.cc
index 0269b83..a9e867d 100644
--- a/paludis/resolver/resolver_TEST_continue_on_failure.cc
+++ b/paludis/resolver/resolver_TEST_continue_on_failure.cc
@@ -184,7 +184,7 @@ namespace test_cases
{
std::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
"!continue-on-failure-uninstall/target",
- parse_user_package_dep_spec("continue-on-failure-uninstall/target", &env, UserPackageDepSpecOptions()),
+ parse_user_package_dep_spec("continue-on-failure-uninstall/target", &env, { }),
false)));
check_resolved(resolved,
diff --git a/paludis/resolver/resolver_TEST_uninstalls.cc b/paludis/resolver/resolver_TEST_uninstalls.cc
index e4e4ca9..5fcc29a 100644
--- a/paludis/resolver/resolver_TEST_uninstalls.cc
+++ b/paludis/resolver/resolver_TEST_uninstalls.cc
@@ -99,7 +99,7 @@ namespace test_cases
{
std::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
"!breaking/target",
- parse_user_package_dep_spec("breaking/target", &env, UserPackageDepSpecOptions()),
+ parse_user_package_dep_spec("breaking/target", &env, { }),
false)));
if (allowed_to_remove)
diff --git a/paludis/resolver/resolver_test.cc b/paludis/resolver/resolver_test.cc
index 318308b..e553cfe 100644
--- a/paludis/resolver/resolver_test.cc
+++ b/paludis/resolver/resolver_test.cc
@@ -233,7 +233,7 @@ paludis::resolver::resolver_test::get_constraints_for_dependent_fn(
{
const std::shared_ptr<ConstraintSequence> result(std::make_shared<ConstraintSequence>());
- PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec partial_spec({ });
partial_spec.package(id->name());
if (id->slot_key())
partial_spec.slot_requirement(std::make_shared<ELikeSlotExactRequirement>(
@@ -266,7 +266,7 @@ paludis::resolver::resolver_test::get_constraints_for_purge_fn(
{
const std::shared_ptr<ConstraintSequence> result(std::make_shared<ConstraintSequence>());
- PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec partial_spec({ });
partial_spec.package(id->name());
if (id->slot_key())
partial_spec.slot_requirement(std::make_shared<ELikeSlotExactRequirement>(
@@ -292,7 +292,7 @@ paludis::resolver::resolver_test::get_constraints_for_via_binary_fn(
const std::shared_ptr<const Resolution> & resolution,
const std::shared_ptr<const Resolution> & because_resolution)
{
- PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec partial_spec({ });
partial_spec.package(resolution->resolvent().package());
PackageDepSpec spec(partial_spec);
@@ -425,7 +425,7 @@ ResolverTestCase::get_resolved(const PackageOrBlockDepSpec & target)
const std::shared_ptr<const Resolved>
ResolverTestCase::get_resolved(const std::string & target)
{
- PackageDepSpec target_spec(parse_user_package_dep_spec(target, &env, UserPackageDepSpecOptions()));
+ PackageDepSpec target_spec(parse_user_package_dep_spec(target, &env, { }));
return get_resolved(target_spec);
}
diff --git a/paludis/selection_TEST.cc b/paludis/selection_TEST.cc
index 997792a..928d2d4 100644
--- a/paludis/selection_TEST.cc
+++ b/paludis/selection_TEST.cc
@@ -68,42 +68,42 @@ namespace test_cases
env.package_database()->add_repository(10, r2);
TEST_CHECK(true);
- PackageDepSpec d1(parse_user_package_dep_spec("r1c1/r1c1p1", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q1(env[selection::AllVersionsSorted(generator::Matches(d1, MatchPackageOptions()))]);
+ PackageDepSpec d1(parse_user_package_dep_spec("r1c1/r1c1p1", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q1(env[selection::AllVersionsSorted(generator::Matches(d1, { }))]);
TEST_CHECK_EQUAL(std::distance(q1->begin(), q1->end()), 1);
- PackageDepSpec d2(parse_user_package_dep_spec("r1c1/r1c1p2", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q2(env[selection::AllVersionsSorted(generator::Matches(d2, MatchPackageOptions()))]);
+ PackageDepSpec d2(parse_user_package_dep_spec("r1c1/r1c1p2", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q2(env[selection::AllVersionsSorted(generator::Matches(d2, { }))]);
TEST_CHECK_EQUAL(std::distance(q2->begin(), q2->end()), 2);
- PackageDepSpec d3(parse_user_package_dep_spec(">=r1c1/r1c1p2-1", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q3(env[selection::AllVersionsSorted(generator::Matches(d3, MatchPackageOptions()))]);
+ PackageDepSpec d3(parse_user_package_dep_spec(">=r1c1/r1c1p2-1", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q3(env[selection::AllVersionsSorted(generator::Matches(d3, { }))]);
TEST_CHECK_EQUAL(std::distance(q3->begin(), q3->end()), 2);
- PackageDepSpec d4(parse_user_package_dep_spec(">=r1c1/r1c1p2-2", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q4(env[selection::AllVersionsSorted(generator::Matches(d4, MatchPackageOptions()))]);
+ PackageDepSpec d4(parse_user_package_dep_spec(">=r1c1/r1c1p2-2", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q4(env[selection::AllVersionsSorted(generator::Matches(d4, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q4->begin()), indirect_iterator(q4->end()), " "),
"r1c1/r1c1p2-2:0::repo1");
TEST_CHECK_EQUAL(std::distance(q4->begin(), q4->end()), 1);
- PackageDepSpec d5(parse_user_package_dep_spec(">=r1c1/r1c1p2-3", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q5(env[selection::AllVersionsSorted(generator::Matches(d5, MatchPackageOptions()))]);
+ PackageDepSpec d5(parse_user_package_dep_spec(">=r1c1/r1c1p2-3", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q5(env[selection::AllVersionsSorted(generator::Matches(d5, { }))]);
TEST_CHECK_EQUAL(std::distance(q5->begin(), q5->end()), 0);
- PackageDepSpec d6(parse_user_package_dep_spec("<r1c1/r1c1p2-3", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q6(env[selection::AllVersionsSorted(generator::Matches(d6, MatchPackageOptions()))]);
+ PackageDepSpec d6(parse_user_package_dep_spec("<r1c1/r1c1p2-3", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q6(env[selection::AllVersionsSorted(generator::Matches(d6, { }))]);
TEST_CHECK_EQUAL(std::distance(q6->begin(), q6->end()), 2);
- PackageDepSpec d7(parse_user_package_dep_spec("rac1/rac1pa", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q7(env[selection::AllVersionsSorted(generator::Matches(d7, MatchPackageOptions()))]);
+ PackageDepSpec d7(parse_user_package_dep_spec("rac1/rac1pa", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q7(env[selection::AllVersionsSorted(generator::Matches(d7, { }))]);
TEST_CHECK_EQUAL(std::distance(q7->begin(), q7->end()), 4);
- PackageDepSpec d8(parse_user_package_dep_spec("foo/bar", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q8(env[selection::AllVersionsSorted(generator::Matches(d8, MatchPackageOptions()))]);
+ PackageDepSpec d8(parse_user_package_dep_spec("foo/bar", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q8(env[selection::AllVersionsSorted(generator::Matches(d8, { }))]);
TEST_CHECK_EQUAL(std::distance(q8->begin(), q8->end()), 0);
- PackageDepSpec d9(parse_user_package_dep_spec("r1c1/r1c1p1", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q9(env[selection::AllVersionsSorted(generator::Matches(d9, MatchPackageOptions())
+ PackageDepSpec d9(parse_user_package_dep_spec("r1c1/r1c1p1", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q9(env[selection::AllVersionsSorted(generator::Matches(d9, { })
| filter::SupportsAction<InstallAction>())]);
TEST_CHECK_EQUAL(std::distance(q9->begin(), q9->end()), 1);
}
@@ -135,21 +135,21 @@ namespace test_cases
env.package_database()->add_repository(5, r2);
TEST_CHECK(true);
- PackageDepSpec d(parse_user_package_dep_spec("cat/pkg", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec d(parse_user_package_dep_spec("cat/pkg", &env, { }));
- const std::shared_ptr<const PackageIDSequence> q1(env[selection::AllVersionsSorted(generator::Matches(d, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q1(env[selection::AllVersionsSorted(generator::Matches(d, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q1->begin()), indirect_iterator(q1->end()), " "),
"cat/pkg-1:a::repo2 cat/pkg-1:a::repo1 cat/pkg-2:c::repo1 cat/pkg-3:b::repo2 cat/pkg-3:c::repo1 cat/pkg-4:a::repo1");
- const std::shared_ptr<const PackageIDSequence> q2(env[selection::AllVersionsGroupedBySlot(generator::Matches(d, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q2(env[selection::AllVersionsGroupedBySlot(generator::Matches(d, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q2->begin()), indirect_iterator(q2->end()), " "),
"cat/pkg-3:b::repo2 cat/pkg-2:c::repo1 cat/pkg-3:c::repo1 cat/pkg-1:a::repo2 cat/pkg-1:a::repo1 cat/pkg-4:a::repo1");
- const std::shared_ptr<const PackageIDSequence> q3(env[selection::BestVersionOnly(generator::Matches(d, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q3(env[selection::BestVersionOnly(generator::Matches(d, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q3->begin()), indirect_iterator(q3->end()), " "),
"cat/pkg-4:a::repo1");
- const std::shared_ptr<const PackageIDSequence> q4(env[selection::BestVersionInEachSlot(generator::Matches(d, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q4(env[selection::BestVersionInEachSlot(generator::Matches(d, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q4->begin()), indirect_iterator(q4->end()), " "),
"cat/pkg-3:b::repo2 cat/pkg-3:c::repo1 cat/pkg-4:a::repo1");
@@ -160,33 +160,33 @@ namespace test_cases
env.package_database()->add_repository(5, r3);
TEST_CHECK(true);
- PackageDepSpec c(parse_user_package_dep_spec("cat/*", &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec c(parse_user_package_dep_spec("cat/*", &env, { updso_allow_wildcards }));
- const std::shared_ptr<const PackageIDSequence> q5(env[selection::AllVersionsSorted(generator::Matches(c, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q5(env[selection::AllVersionsSorted(generator::Matches(c, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q5->begin()), indirect_iterator(q5->end()), " "),
"cat/other-1:a::repo3 cat/pkg-1:a::repo2 cat/pkg-1:a::repo1 cat/pkg-2:c::repo1 "
"cat/pkg-3:b::repo2 cat/pkg-3:c::repo1 cat/pkg-4:a::repo1");
- const std::shared_ptr<const PackageIDSequence> q6(env[selection::AllVersionsGroupedBySlot(generator::Matches(c, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q6(env[selection::AllVersionsGroupedBySlot(generator::Matches(c, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q6->begin()), indirect_iterator(q6->end()), " "),
"cat/other-1:a::repo3 cat/pkg-3:b::repo2 cat/pkg-2:c::repo1 cat/pkg-3:c::repo1 "
"cat/pkg-1:a::repo2 cat/pkg-1:a::repo1 cat/pkg-4:a::repo1");
- const std::shared_ptr<const PackageIDSequence> q7(env[selection::BestVersionOnly(generator::Matches(c, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q7(env[selection::BestVersionOnly(generator::Matches(c, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q7->begin()), indirect_iterator(q7->end()), " "),
"cat/other-1:a::repo3 cat/pkg-4:a::repo1");
- const std::shared_ptr<const PackageIDSequence> q8(env[selection::BestVersionInEachSlot(generator::Matches(c, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> q8(env[selection::BestVersionInEachSlot(generator::Matches(c, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q8->begin()), indirect_iterator(q8->end()), " "),
"cat/other-1:a::repo3 cat/pkg-3:b::repo2 cat/pkg-3:c::repo1 cat/pkg-4:a::repo1");
- PackageDepSpec b(parse_user_package_dep_spec("cat/pkg:a", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q9(env[selection::AllVersionsGroupedBySlot(generator::Matches(b, MatchPackageOptions()))]);
+ PackageDepSpec b(parse_user_package_dep_spec("cat/pkg:a", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q9(env[selection::AllVersionsGroupedBySlot(generator::Matches(b, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q9->begin()), indirect_iterator(q9->end()), " "),
"cat/pkg-1:a::repo2 cat/pkg-1:a::repo1 cat/pkg-4:a::repo1");
- PackageDepSpec a(parse_user_package_dep_spec("cat/pkg[=1|=3]", &env, UserPackageDepSpecOptions()));
- const std::shared_ptr<const PackageIDSequence> q10(env[selection::AllVersionsGroupedBySlot(generator::Matches(a, MatchPackageOptions()))]);
+ PackageDepSpec a(parse_user_package_dep_spec("cat/pkg[=1|=3]", &env, { }));
+ const std::shared_ptr<const PackageIDSequence> q10(env[selection::AllVersionsGroupedBySlot(generator::Matches(a, { }))]);
TEST_CHECK_EQUAL(join(indirect_iterator(q10->begin()), indirect_iterator(q10->end()), " "),
"cat/pkg-1:a::repo2 cat/pkg-1:a::repo1 cat/pkg-3:b::repo2 cat/pkg-3:c::repo1");
}
diff --git a/paludis/serialise.cc b/paludis/serialise.cc
index 5a26ccb..bb8c249 100644
--- a/paludis/serialise.cc
+++ b/paludis/serialise.cc
@@ -371,14 +371,14 @@ DeserialisatorHandler<std::shared_ptr<const PackageID> >::handle(Deserialisation
return *(*v.deserialiser().environment())[
selection::RequireExactlyOne(generator::Matches(
parse_elike_package_dep_spec(v.string_value(),
- ELikePackageDepSpecOptions() + epdso_allow_tilde_greater_deps + epdso_nice_equal_star +
- epdso_allow_ranged_deps + epdso_allow_use_deps + epdso_allow_use_deps_portage +
- epdso_allow_use_dep_defaults + epdso_allow_repository_deps + epdso_allow_slot_star_deps +
- epdso_allow_slot_equal_deps + epdso_allow_slot_deps + epdso_allow_key_requirements +
- epdso_allow_use_dep_question_defaults,
- VersionSpecOptions() + vso_flexible_dashes + vso_flexible_dots + vso_ignore_case +
- vso_letters_anywhere + vso_dotted_suffixes,
- make_null_shared_ptr()), MatchPackageOptions()))]->begin();
+ { epdso_allow_tilde_greater_deps, epdso_nice_equal_star,
+ epdso_allow_ranged_deps, epdso_allow_use_deps, epdso_allow_use_deps_portage,
+ epdso_allow_use_dep_defaults, epdso_allow_repository_deps, epdso_allow_slot_star_deps,
+ epdso_allow_slot_equal_deps, epdso_allow_slot_deps, epdso_allow_key_requirements,
+ epdso_allow_use_dep_question_defaults },
+ { vso_flexible_dashes, vso_flexible_dots, vso_ignore_case,
+ vso_letters_anywhere, vso_dotted_suffixes },
+ make_null_shared_ptr()), { }))]->begin();
}
template class Pimp<Deserialiser>;
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index 67da205..1b4bdd6 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -270,10 +270,10 @@ namespace
Log::get_instance()->message("set_file.bad_operator", ll_warning, lc_context)
<< "Line '" << line << "' uses ?: operator but no environment is available";
else if (! (*params.environment())[selection::SomeArbitraryVersion(generator::Matches(
- make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ make_package_dep_spec({ })
.package(*spec->package_ptr())
.slot_requirement(spec->slot_requirement_ptr()),
- MatchPackageOptions()) |
+ { }) |
filter::InstalledAtRoot(params.environment()->root()))]->empty())
result->root()->append(spec);
}
@@ -310,8 +310,7 @@ SimpleHandler::SimpleHandler(const SetFileParams & p) :
{
Context context("When loading simple set file '" + stringify(_p.file_name()) + "':");
- LineConfigFile ff(_p.file_name(), LineConfigFileOptions() + lcfo_disallow_continuations + lcfo_disallow_comments
- + lcfo_no_skip_blank_lines);
+ LineConfigFile ff(_p.file_name(), { lcfo_disallow_continuations, lcfo_disallow_comments, lcfo_no_skip_blank_lines });
for (LineConfigFile::ConstIterator line(ff.begin()), line_end(ff.end()) ;
line != line_end ; ++line)
_lines.push_back(*line);
@@ -439,8 +438,7 @@ PaludisConfHandler::PaludisConfHandler(const SetFileParams & p) :
{
Context context("When loading paludis conf set file '" + stringify(_p.file_name()) + "':");
- LineConfigFile ff(_p.file_name(), LineConfigFileOptions() + lcfo_disallow_continuations + lcfo_disallow_comments
- + lcfo_no_skip_blank_lines);
+ LineConfigFile ff(_p.file_name(), { lcfo_disallow_continuations, lcfo_disallow_comments, lcfo_no_skip_blank_lines });
for (LineConfigFile::ConstIterator line(ff.begin()), line_end(ff.end()) ;
line != line_end ; ++line)
_lines.push_back(*line);
@@ -545,8 +543,7 @@ PaludisBashHandler::PaludisBashHandler(const SetFileParams & p) :
.with_captured_stdout_stream(&s));
int exit_status(run_command(cmd));
- LineConfigFile ff(s, LineConfigFileOptions() + lcfo_disallow_continuations + lcfo_disallow_comments
- + lcfo_no_skip_blank_lines);
+ LineConfigFile ff(s, { lcfo_disallow_continuations, lcfo_disallow_comments, lcfo_no_skip_blank_lines });
for (LineConfigFile::ConstIterator line(ff.begin()), line_end(ff.end()) ;
line != line_end ; ++line)
do_one_conf_line(*line, _contents, _p);
diff --git a/paludis/stringify_formatter_TEST.cc b/paludis/stringify_formatter_TEST.cc
index 95031d6..e2e1592 100644
--- a/paludis/stringify_formatter_TEST.cc
+++ b/paludis/stringify_formatter_TEST.cc
@@ -116,10 +116,10 @@ namespace test_cases
PartialFormatter f;
StringifyFormatter ff(f);
BlockDepSpec b("!!!!!cat/pkg", parse_user_package_dep_spec("cat/pkg",
- &env, UserPackageDepSpecOptions()), false);
+ &env, { }), false);
NamedSetDepSpec u(SetName("foo"));
std::string s(format_three(
- parse_user_package_dep_spec("cat/pkg", &env, UserPackageDepSpecOptions()),
+ parse_user_package_dep_spec("cat/pkg", &env, { }),
b, u,
ff));
TEST_CHECK_EQUAL(s, "<cat/pkg> !!!!!cat/pkg foo");
diff --git a/paludis/stripper.cc b/paludis/stripper.cc
index 5bcaea6..e4608e5 100644
--- a/paludis/stripper.cc
+++ b/paludis/stripper.cc
@@ -81,7 +81,7 @@ Stripper::do_dir_recursive(const FSEntry & f)
on_enter_dir(f);
- for (DirIterator d(f, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(f, { dio_include_dotfiles, dio_inode_sort }), d_end ; d != d_end ; ++d)
{
if (d->is_symbolic_link())
continue;
diff --git a/paludis/uninstall_list.cc b/paludis/uninstall_list.cc
index d267d3c..9f285d3 100644
--- a/paludis/uninstall_list.cc
+++ b/paludis/uninstall_list.cc
@@ -172,7 +172,7 @@ UninstallList::add_errors_for_system()
continue;
bool needed(false);
- if (match_package_in_set(*_imp->env, *system, *l->package_id(), MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *system, *l->package_id(), { }))
needed = true;
if ((! needed) && l->package_id()->provide_key())
@@ -183,10 +183,10 @@ UninstallList::add_errors_for_system()
v != v_end && ! needed ; ++v)
{
const std::shared_ptr<const PackageIDSequence> virtuals((*_imp->env)[selection::AllVersionsUnsorted(
- generator::Matches(**v, MatchPackageOptions()))]);
+ generator::Matches(**v, { }))]);
for (PackageIDSequence::ConstIterator i(virtuals->begin()), i_end(virtuals->end()) ;
i != i_end && ! needed ; ++i)
- if (match_package_in_set(*_imp->env, *system, **i, MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *system, **i, { }))
needed = true;
}
}
@@ -330,8 +330,8 @@ namespace
std::shared_ptr<const PackageIDSequence> m(
best_only ?
- (*env)[selection::BestVersionOnly(generator::Matches(*node.spec(), MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))] :
- (*env)[selection::AllVersionsSorted(generator::Matches(*node.spec(), MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ (*env)[selection::BestVersionOnly(generator::Matches(*node.spec(), { }) | filter::InstalledAtRoot(env->root()))] :
+ (*env)[selection::AllVersionsSorted(generator::Matches(*node.spec(), { }) | filter::InstalledAtRoot(env->root()))]);
for (PackageIDSequence::ConstIterator it = m->begin(), it_end = m->end();
it_end != it; ++it)
matches->insert(make_named_values<DepTagEntry>(
@@ -473,7 +473,7 @@ UninstallList::add_unused_dependencies()
for (PackageIDSet::ConstIterator i(unused_dependencies->begin()),
i_end(unused_dependencies->end()) ; i != i_end ; ++i)
{
- if (match_package_in_set(*_imp->env, *world, **i, MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *world, **i, { }))
continue;
if (_imp->uninstall_list.end() != std::find_if(_imp->uninstall_list.begin(),
@@ -550,7 +550,7 @@ UninstallList::collect_world() const
for (PackageIDSet::ConstIterator i(everything->begin()),
i_end(everything->end()) ; i != i_end ; ++i)
{
- if (match_package_in_set(*_imp->env, *world, **i, MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *world, **i, { }))
result->insert(*i);
}
diff --git a/paludis/uninstall_list_TEST.cc b/paludis/uninstall_list_TEST.cc
index c3cdc0d..a501dcf 100644
--- a/paludis/uninstall_list_TEST.cc
+++ b/paludis/uninstall_list_TEST.cc
@@ -134,7 +134,7 @@ namespace test_cases
targets->push_back(
env.fetch_package_id(
QualifiedPackageName(p),
- VersionSpec(v, VersionSpecOptions()),
+ VersionSpec(v, { }),
RepositoryName("installed")));
}
@@ -390,7 +390,7 @@ namespace test_cases
UninstallListTestCaseBase("with unused deps world")
{
std::shared_ptr<SetSpecTree> world(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/moo", &env, UserPackageDepSpecOptions())));
+ world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/moo", &env, { })));
env.add_set(SetName("world"), SetName("world"), make_k<std::shared_ptr<const SetSpecTree> >(world), false);
}
@@ -429,8 +429,8 @@ namespace test_cases
UninstallListTestCaseBase("with unused deps world target")
{
std::shared_ptr<SetSpecTree> world(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/moo", &env, UserPackageDepSpecOptions())));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/bar", &env, UserPackageDepSpecOptions())));
+ world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/moo", &env, { })));
+ world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/bar", &env, { })));
env.add_set(SetName("world"), SetName("world"), make_k(world), false);
}
@@ -469,10 +469,10 @@ namespace test_cases
UninstallListTestCaseBase("with slots")
{
std::shared_ptr<SetSpecTree> world(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-a", &env, UserPackageDepSpecOptions())));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-b", &env, UserPackageDepSpecOptions())));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-c", &env, UserPackageDepSpecOptions())));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-d", &env, UserPackageDepSpecOptions())));
+ world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-a", &env, { })));
+ world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-b", &env, { })));
+ world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-c", &env, { })));
+ world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-d", &env, { })));
env.add_set(SetName("world"), SetName("world"), make_k(world), false);
}
diff --git a/paludis/uninstall_task.cc b/paludis/uninstall_task.cc
index 7d72ccb..7dcd3ca 100644
--- a/paludis/uninstall_task.cc
+++ b/paludis/uninstall_task.cc
@@ -159,7 +159,7 @@ UninstallTask::add_target(const std::string & target)
try
{
std::shared_ptr<PackageDepSpec> pds(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
- target, _imp->env, UserPackageDepSpecOptions() + updso_throw_if_set + updso_allow_wildcards,
+ target, _imp->env, { updso_throw_if_set, updso_allow_wildcards },
filter::SupportsAction<UninstallAction>())));
if (_imp->had_set_targets)
@@ -176,7 +176,7 @@ UninstallTask::add_target(const std::string & target)
{
/* blech. wildcards. */
std::shared_ptr<const PackageIDSequence> names((*_imp->env)[selection::BestVersionOnly(
- generator::Matches(*pds, MatchPackageOptions()) | filter::SupportsAction<UninstallAction>())]);
+ generator::Matches(*pds, { }) | filter::SupportsAction<UninstallAction>())]);
if (names->empty())
{
/* no match. we'll get an error from this later anyway. */
@@ -260,7 +260,7 @@ UninstallTask::execute()
Context local_context("When looking for target '" + stringify(**t) + "':");
std::shared_ptr<const PackageIDSequence> r((*_imp->env)[selection::AllVersionsSorted(
- generator::Matches(**t, MatchPackageOptions()) |
+ generator::Matches(**t, { }) |
filter::SupportsAction<UninstallAction>())]);
if (r->empty())
{
@@ -328,7 +328,7 @@ UninstallTask::execute()
{
bool remove(true);
std::shared_ptr<const PackageIDSequence> installed((*_imp->env)[selection::AllVersionsUnsorted(
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(i->first), MatchPackageOptions()) |
+ generator::Matches(make_package_dep_spec({ }).package(i->first), { }) |
filter::InstalledAtRoot(_imp->env->root())
)]);
for (PackageIDSequence::ConstIterator r(installed->begin()), r_end(installed->end()) ;
@@ -338,7 +338,7 @@ UninstallTask::execute()
if (remove)
all->root()->append(std::make_shared<PackageDepSpec>(make_package_dep_spec(
- PartiallyMadePackageDepSpecOptions()).package(i->first)));
+ { }).package(i->first)));
}
world_remove_packages(all);
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index c4bf96a..2a24214 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -74,7 +74,7 @@ namespace
if (options[updso_no_disambiguation])
throw PackageDepSpecError("Need an explicit category specified");
result.package(env->package_database()->fetch_unique_qualified_package_name(PackageNamePart(s),
- filter::And(filter, filter::Matches(result, MatchPackageOptions()))));
+ filter::And(filter, filter::Matches(result, { }))));
}
}
@@ -194,7 +194,7 @@ namespace
default:
{
std::shared_ptr<const AdditionalPackageDepSpecRequirement> req(parse_elike_use_requirement(flag,
- std::shared_ptr<const PackageID>(), ELikeUseRequirementOptions()));
+ std::shared_ptr<const PackageID>(), { }));
result.additional_requirement(req);
}
break;
@@ -786,8 +786,8 @@ UserKeyRequirement::as_raw_string() const
VersionSpecOptions
paludis::user_version_spec_options()
{
- return VersionSpecOptions() + vso_flexible_dashes + vso_flexible_dots +
- vso_ignore_case + vso_letters_anywhere + vso_dotted_suffixes;
+ return { vso_flexible_dashes, vso_flexible_dots,
+ vso_ignore_case, vso_letters_anywhere, vso_dotted_suffixes };
}
template class Pimp<UserKeyRequirement>;
diff --git a/paludis/user_dep_spec_TEST.cc b/paludis/user_dep_spec_TEST.cc
index cf41623..5d02404 100644
--- a/paludis/user_dep_spec_TEST.cc
+++ b/paludis/user_dep_spec_TEST.cc
@@ -171,59 +171,59 @@ namespace test_cases
{
TestEnvironment env;
- PackageDepSpec a(parse_user_package_dep_spec("foo/bar", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec a(parse_user_package_dep_spec("foo/bar", &env, { }));
check_spec(a, "foo/bar", "", "", "", "", "", "", "", "");
- PackageDepSpec b(parse_user_package_dep_spec(">=foo/bar-1.2.3", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec b(parse_user_package_dep_spec(">=foo/bar-1.2.3", &env, { }));
check_spec(b, "foo/bar", "", "", ">=1.2.3", "", "", "", "", "");
- PackageDepSpec c(parse_user_package_dep_spec("foo/bar:baz", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec c(parse_user_package_dep_spec("foo/bar:baz", &env, { }));
check_spec(c, "foo/bar", "", "", "", "", ":baz", "", "", "");
- PackageDepSpec d(parse_user_package_dep_spec("=foo/bar-1.2*:1.2.1", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec d(parse_user_package_dep_spec("=foo/bar-1.2*:1.2.1", &env, { }));
check_spec(d, "foo/bar", "", "", "=*1.2", "", ":1.2.1", "", "", "");
- PackageDepSpec e(parse_user_package_dep_spec("foo/bar:1.2.1", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec e(parse_user_package_dep_spec("foo/bar:1.2.1", &env, { }));
check_spec(e, "foo/bar", "", "", "", "", ":1.2.1", "", "", "");
- PackageDepSpec f(parse_user_package_dep_spec("foo/bar:0", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec f(parse_user_package_dep_spec("foo/bar:0", &env, { }));
check_spec(f, "foo/bar", "", "", "", "", ":0", "", "", "");
- PackageDepSpec g(parse_user_package_dep_spec("foo/bar-100dpi", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec g(parse_user_package_dep_spec("foo/bar-100dpi", &env, { }));
check_spec(g, "foo/bar-100dpi", "", "", "", "", "", "", "", "");
- PackageDepSpec h(parse_user_package_dep_spec(">=foo/bar-100dpi-1.23", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec h(parse_user_package_dep_spec(">=foo/bar-100dpi-1.23", &env, { }));
check_spec(h, "foo/bar-100dpi", "", "", ">=1.23", "", "", "", "", "");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("", &env, UserPackageDepSpecOptions()), PackageDepSpecError);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("=foo/bar-1.2[=1.3]", &env, UserPackageDepSpecOptions()), PackageDepSpecError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("", &env, { }), PackageDepSpecError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("=foo/bar-1.2[=1.3]", &env, { }), PackageDepSpecError);
- PackageDepSpec i(parse_user_package_dep_spec("foo/bar[one][-two]", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec i(parse_user_package_dep_spec("foo/bar[one][-two]", &env, { }));
check_spec(i, "foo/bar", "", "", "", "", "", "", "", "[-two], [one]");
- PackageDepSpec j(parse_user_package_dep_spec("=foo/bar-scm-r3", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec j(parse_user_package_dep_spec("=foo/bar-scm-r3", &env, { }));
check_spec(j, "foo/bar", "", "", "=scm-r3", "", "", "", "", "");
- PackageDepSpec k(parse_user_package_dep_spec("=foo/bar-scm", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec k(parse_user_package_dep_spec("=foo/bar-scm", &env, { }));
check_spec(k, "foo/bar", "", "", "=scm", "", "", "", "", "");
- PackageDepSpec l(parse_user_package_dep_spec("foo/bar[one][-two][>=1.2&<2.0]", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec l(parse_user_package_dep_spec("foo/bar[one][-two][>=1.2&<2.0]", &env, { }));
check_spec(l, "foo/bar", "", "", ">=1.2, <2.0", "and", "", "", "", "[-two], [one]");
- PackageDepSpec m(parse_user_package_dep_spec("foo/bar[=1.2|=1.3*|~1.4]", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec m(parse_user_package_dep_spec("foo/bar[=1.2|=1.3*|~1.4]", &env, { }));
check_spec(m, "foo/bar", "", "", "=1.2, =*1.3, ~1.4", "or", "", "", "", "");
- PackageDepSpec n(parse_user_package_dep_spec("=foo/bar--1.2.3", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec n(parse_user_package_dep_spec("=foo/bar--1.2.3", &env, { }));
check_spec(n, "foo/bar-", "", "", "=1.2.3", "", "", "", "", "");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("=foo/bar--", &env, UserPackageDepSpecOptions()), PackageDepSpecError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("=foo/bar--", &env, { }), PackageDepSpecError);
- PackageDepSpec o(parse_user_package_dep_spec("=foo/bar---1.2.3", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec o(parse_user_package_dep_spec("=foo/bar---1.2.3", &env, { }));
check_spec(o, "foo/bar--", "", "", "=1.2.3", "", "", "", "", "");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("=foo/bar[.foo]", &env, UserPackageDepSpecOptions()), PackageDepSpecError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("=foo/bar[.foo]", &env, { }), PackageDepSpecError);
- PackageDepSpec p(parse_user_package_dep_spec("foo/bar[.key=value]", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec p(parse_user_package_dep_spec("foo/bar[.key=value]", &env, { }));
check_spec(p, "foo/bar", "", "", "", "", "", "", "", "[.key=value]");
}
} test_user_package_dep_spec;
@@ -236,22 +236,22 @@ namespace test_cases
{
TestEnvironment env;
- PackageDepSpec a(parse_user_package_dep_spec("*/*", &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec a(parse_user_package_dep_spec("*/*", &env, { updso_allow_wildcards }));
check_spec(a, "", "", "", "", "", "", "", "", "");
- PackageDepSpec b(parse_user_package_dep_spec("foo/*", &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec b(parse_user_package_dep_spec("foo/*", &env, { updso_allow_wildcards }));
check_spec(b, "", "foo", "", "", "", "", "", "", "");
- PackageDepSpec c(parse_user_package_dep_spec("*/foo", &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec c(parse_user_package_dep_spec("*/foo", &env, { updso_allow_wildcards }));
check_spec(c, "", "", "foo", "", "", "", "", "", "");
- PackageDepSpec d(parse_user_package_dep_spec("~*/*-0", &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec d(parse_user_package_dep_spec("~*/*-0", &env, { updso_allow_wildcards }));
check_spec(d, "", "", "", "~0", "", "", "", "", "");
- PackageDepSpec e(parse_user_package_dep_spec(">=foo/*-1.23", &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec e(parse_user_package_dep_spec(">=foo/*-1.23", &env, { updso_allow_wildcards }));
check_spec(e, "", "foo", "", ">=1.23", "", "", "", "", "");
- PackageDepSpec f(parse_user_package_dep_spec("=*/foo-1*", &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec f(parse_user_package_dep_spec("=*/foo-1*", &env, { updso_allow_wildcards }));
check_spec(f, "", "", "foo", "=*1", "", "", "", "", "");
}
} test_user_package_dep_spec_unspecific;
@@ -265,43 +265,43 @@ namespace test_cases
TestEnvironment env;
PackageDepSpec a(parse_user_package_dep_spec("cat/pkg::repo",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(a, "cat/pkg", "", "", "", "", "", "repo", "", "");
PackageDepSpec b(parse_user_package_dep_spec("cat/pkg::->repo",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(b, "cat/pkg", "", "", "", "", "", "repo", "", "");
PackageDepSpec c(parse_user_package_dep_spec("cat/pkg::repo->",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(c, "cat/pkg", "", "", "", "", "", "", "repo", "");
PackageDepSpec d(parse_user_package_dep_spec("cat/pkg::r1->r2",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(d, "cat/pkg", "", "", "", "", "", "r2", "r1", "");
PackageDepSpec e(parse_user_package_dep_spec("cat/pkg::/",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(e, "cat/pkg", "", "", "", "", "", "", "", "", "/");
PackageDepSpec f(parse_user_package_dep_spec("cat/pkg::/path",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(f, "cat/pkg", "", "", "", "", "", "", "", "", "/path");
PackageDepSpec g(parse_user_package_dep_spec("cat/pkg::/?",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(g, "cat/pkg", "", "", "", "", "", "", "", "", "", "/", false);
PackageDepSpec h(parse_user_package_dep_spec("cat/pkg::/path?",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(h, "cat/pkg", "", "", "", "", "", "", "", "", "", "/path", false);
PackageDepSpec i(parse_user_package_dep_spec("cat/pkg::/??",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(i, "cat/pkg", "", "", "", "", "", "", "", "", "", "/", true);
PackageDepSpec j(parse_user_package_dep_spec("cat/pkg::/path??",
- &env, UserPackageDepSpecOptions() + updso_allow_wildcards));
+ &env, { updso_allow_wildcards }));
check_spec(j, "cat/pkg", "", "", "", "", "", "", "", "", "", "/path", true);
}
} test_user_package_dep_spec_repo;
@@ -331,40 +331,40 @@ namespace test_cases
fake->add_version("cat", "pkg3", "1");
fake_inst->add_version("dog", "pkg3", "1");
- PackageDepSpec a(parse_user_package_dep_spec("pkg1", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec a(parse_user_package_dep_spec("pkg1", &env, { }));
check_spec(a, "cat/pkg1", "", "", "", "", "", "", "", "");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg2", &env, UserPackageDepSpecOptions()), AmbiguousPackageNameError);
- PackageDepSpec b(parse_user_package_dep_spec("pkg3", &env, UserPackageDepSpecOptions()));
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg2", &env, { }), AmbiguousPackageNameError);
+ PackageDepSpec b(parse_user_package_dep_spec("pkg3", &env, { }));
check_spec(b, "dog/pkg3", "", "", "", "", "", "", "", "");
- PackageDepSpec c(parse_user_package_dep_spec("pkg3", &env, UserPackageDepSpecOptions(), filter::SupportsAction<InstallAction>()));
+ PackageDepSpec c(parse_user_package_dep_spec("pkg3", &env, { }, filter::SupportsAction<InstallAction>()));
check_spec(c, "cat/pkg3", "", "", "", "", "", "", "", "");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg4", &env, UserPackageDepSpecOptions()), NoSuchPackageError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg4", &env, { }), NoSuchPackageError);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg5", &env, UserPackageDepSpecOptions() + updso_no_disambiguation), PackageDepSpecError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg5", &env, { updso_no_disambiguation }), PackageDepSpecError);
- PackageDepSpec d(parse_user_package_dep_spec("=pkg1-1", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec d(parse_user_package_dep_spec("=pkg1-1", &env, { }));
TEST_CHECK_STRINGIFY_EQUAL(d, "=cat/pkg1-1");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("=pkg1-42", &env, UserPackageDepSpecOptions()), NoSuchPackageError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("=pkg1-42", &env, { }), NoSuchPackageError);
- PackageDepSpec e(parse_user_package_dep_spec("=pkg1-1:0", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec e(parse_user_package_dep_spec("=pkg1-1:0", &env, { }));
TEST_CHECK_STRINGIFY_EQUAL(e, "=cat/pkg1-1:0");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("=pkg1-42:0", &env, UserPackageDepSpecOptions()), NoSuchPackageError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("=pkg1-42:0", &env, { }), NoSuchPackageError);
- PackageDepSpec f(parse_user_package_dep_spec("pkg1:0", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec f(parse_user_package_dep_spec("pkg1:0", &env, { }));
TEST_CHECK_STRINGIFY_EQUAL(f, "cat/pkg1:0");
- PackageDepSpec g(parse_user_package_dep_spec("pkg1[-foo]", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec g(parse_user_package_dep_spec("pkg1[-foo]", &env, { }));
TEST_CHECK_STRINGIFY_EQUAL(g, "cat/pkg1[-foo]");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg1[foo]", &env, UserPackageDepSpecOptions()), NoSuchPackageError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg1[foo]", &env, { }), NoSuchPackageError);
- PackageDepSpec h(parse_user_package_dep_spec("pkg1[=1]", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec h(parse_user_package_dep_spec("pkg1[=1]", &env, { }));
TEST_CHECK_STRINGIFY_EQUAL(h, "=cat/pkg1-1");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg1[=42]", &env, UserPackageDepSpecOptions()), NoSuchPackageError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("pkg1[=42]", &env, { }), NoSuchPackageError);
- PackageDepSpec i(parse_user_package_dep_spec("pkg1::fake", &env, UserPackageDepSpecOptions()));
+ PackageDepSpec i(parse_user_package_dep_spec("pkg1::fake", &env, { }));
TEST_CHECK_STRINGIFY_EQUAL(i, "cat/pkg1::fake");
}
} test_user_package_dep_spec_disambiguation;
@@ -383,22 +383,22 @@ namespace test_cases
fake->add_version("cat", "world", "1");
fake->add_version("cat", "moon", "1");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("world", &env, UserPackageDepSpecOptions() + updso_throw_if_set), GotASetNotAPackageDepSpec);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("system", &env, UserPackageDepSpecOptions() + updso_throw_if_set), GotASetNotAPackageDepSpec);
- PackageDepSpec a(parse_user_package_dep_spec("moon", &env, UserPackageDepSpecOptions() + updso_throw_if_set));
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("world", &env, { updso_throw_if_set }), GotASetNotAPackageDepSpec);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("system", &env, { updso_throw_if_set }), GotASetNotAPackageDepSpec);
+ PackageDepSpec a(parse_user_package_dep_spec("moon", &env, { updso_throw_if_set }));
TEST_CHECK_STRINGIFY_EQUAL(a, "cat/moon");
- TEST_CHECK_THROWS(parse_user_package_dep_spec("mars", &env, UserPackageDepSpecOptions() + updso_throw_if_set), NoSuchPackageError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("mars", &env, { updso_throw_if_set }), NoSuchPackageError);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("world", &env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set), GotASetNotAPackageDepSpec);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("system", &env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set), GotASetNotAPackageDepSpec);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("moon", &env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set), GotASetNotAPackageDepSpec);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("mars", &env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set), GotASetNotAPackageDepSpec);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("world", &env, { updso_no_disambiguation, updso_throw_if_set }), GotASetNotAPackageDepSpec);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("system", &env, { updso_no_disambiguation, updso_throw_if_set }), GotASetNotAPackageDepSpec);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("moon", &env, { updso_no_disambiguation, updso_throw_if_set }), GotASetNotAPackageDepSpec);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("mars", &env, { updso_no_disambiguation, updso_throw_if_set }), GotASetNotAPackageDepSpec);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("=world-123", &env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set), PackageDepSpecError);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("world*", &env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set), GotASetNotAPackageDepSpec);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("world**", &env, UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set), PackageDepSpecError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("=world-123", &env, { updso_no_disambiguation, updso_throw_if_set }), PackageDepSpecError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("world*", &env, { updso_no_disambiguation, updso_throw_if_set }), GotASetNotAPackageDepSpec);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("world**", &env, { updso_no_disambiguation, updso_throw_if_set }), PackageDepSpecError);
- TEST_CHECK_THROWS(parse_user_package_dep_spec("system", &env, UserPackageDepSpecOptions()), NoSuchPackageError);
+ TEST_CHECK_THROWS(parse_user_package_dep_spec("system", &env, { }), NoSuchPackageError);
}
} test_user_package_dep_spec_sets;
@@ -421,53 +421,53 @@ namespace test_cases
std::shared_ptr<FakePackageID> pkg3(fake->add_version("cat", "pkg1", "3"));
pkg3->keywords_key()->set_from_string("~d");
- PackageDepSpec a(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS<~a]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(match_package(env, a, *pkg1, MatchPackageOptions()));
- TEST_CHECK(match_package(env, a, *pkg2, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, a, *pkg3, MatchPackageOptions()));
+ PackageDepSpec a(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS<~a]", &env, { }));
+ TEST_CHECK(match_package(env, a, *pkg1, { }));
+ TEST_CHECK(match_package(env, a, *pkg2, { }));
+ TEST_CHECK(! match_package(env, a, *pkg3, { }));
- PackageDepSpec b(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS<~b]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(match_package(env, b, *pkg1, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, b, *pkg2, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, b, *pkg3, MatchPackageOptions()));
+ PackageDepSpec b(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS<~b]", &env, { }));
+ TEST_CHECK(match_package(env, b, *pkg1, { }));
+ TEST_CHECK(! match_package(env, b, *pkg2, { }));
+ TEST_CHECK(! match_package(env, b, *pkg3, { }));
- PackageDepSpec c(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS<~c]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(! match_package(env, c, *pkg1, MatchPackageOptions()));
- TEST_CHECK(match_package(env, c, *pkg2, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, c, *pkg3, MatchPackageOptions()));
+ PackageDepSpec c(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS<~c]", &env, { }));
+ TEST_CHECK(! match_package(env, c, *pkg1, { }));
+ TEST_CHECK(match_package(env, c, *pkg2, { }));
+ TEST_CHECK(! match_package(env, c, *pkg3, { }));
- PackageDepSpec d(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS>~a]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(! match_package(env, d, *pkg1, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, d, *pkg2, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, d, *pkg3, MatchPackageOptions()));
+ PackageDepSpec d(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS>~a]", &env, { }));
+ TEST_CHECK(! match_package(env, d, *pkg1, { }));
+ TEST_CHECK(! match_package(env, d, *pkg2, { }));
+ TEST_CHECK(! match_package(env, d, *pkg3, { }));
- PackageDepSpec e(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS=~d]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(! match_package(env, e, *pkg1, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, e, *pkg2, MatchPackageOptions()));
- TEST_CHECK(match_package(env, e, *pkg3, MatchPackageOptions()));
+ PackageDepSpec e(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS=~d]", &env, { }));
+ TEST_CHECK(! match_package(env, e, *pkg1, { }));
+ TEST_CHECK(! match_package(env, e, *pkg2, { }));
+ TEST_CHECK(match_package(env, e, *pkg3, { }));
- PackageDepSpec f(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS=~a ~c]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(! match_package(env, f, *pkg1, MatchPackageOptions()));
- TEST_CHECK(match_package(env, f, *pkg2, MatchPackageOptions()));
- TEST_CHECK(! match_package(env, f, *pkg3, MatchPackageOptions()));
+ PackageDepSpec f(parse_user_package_dep_spec("cat/pkg1[.KEYWORDS=~a ~c]", &env, { }));
+ TEST_CHECK(! match_package(env, f, *pkg1, { }));
+ TEST_CHECK(match_package(env, f, *pkg2, { }));
+ TEST_CHECK(! match_package(env, f, *pkg3, { }));
- PackageDepSpec g(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER=42]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(match_package(env, g, *pkg1, MatchPackageOptions()));
+ PackageDepSpec g(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER=42]", &env, { }));
+ TEST_CHECK(match_package(env, g, *pkg1, { }));
- PackageDepSpec h(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER<41]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(! match_package(env, h, *pkg1, MatchPackageOptions()));
+ PackageDepSpec h(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER<41]", &env, { }));
+ TEST_CHECK(! match_package(env, h, *pkg1, { }));
- PackageDepSpec i(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER<42]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(! match_package(env, i, *pkg1, MatchPackageOptions()));
+ PackageDepSpec i(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER<42]", &env, { }));
+ TEST_CHECK(! match_package(env, i, *pkg1, { }));
- PackageDepSpec j(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER<43]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(match_package(env, j, *pkg1, MatchPackageOptions()));
+ PackageDepSpec j(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER<43]", &env, { }));
+ TEST_CHECK(match_package(env, j, *pkg1, { }));
- PackageDepSpec k(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER>42]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(! match_package(env, k, *pkg1, MatchPackageOptions()));
+ PackageDepSpec k(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER>42]", &env, { }));
+ TEST_CHECK(! match_package(env, k, *pkg1, { }));
- PackageDepSpec l(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER>41]", &env, UserPackageDepSpecOptions()));
- TEST_CHECK(match_package(env, l, *pkg1, MatchPackageOptions()));
+ PackageDepSpec l(parse_user_package_dep_spec("cat/pkg1[.HITCHHIKER>41]", &env, { }));
+ TEST_CHECK(match_package(env, l, *pkg1, { }));
}
} test_user_package_dep_spec_user_key_req;
}
diff --git a/paludis/util/config_file_TEST.cc b/paludis/util/config_file_TEST.cc
index f0f500e..810ad2e 100644
--- a/paludis/util/config_file_TEST.cc
+++ b/paludis/util/config_file_TEST.cc
@@ -82,7 +82,7 @@ namespace test_cases
s << "eight" << std::endl;
s << "nine # ten" << std::endl;
- LineConfigFile f(s, LineConfigFileOptions());
+ LineConfigFile f(s, { });
TEST_CHECK_EQUAL(std::distance(f.begin(), f.end()), 7);
std::vector<std::string> lines;
std::copy(f.begin(), f.end(), std::back_inserter(lines));
@@ -97,8 +97,7 @@ namespace test_cases
s.clear();
s.seekg(0, std::ios::beg);
- LineConfigFile g(s, LineConfigFileOptions() + lcfo_disallow_comments
- + lcfo_preserve_whitespace + lcfo_no_skip_blank_lines);
+ LineConfigFile g(s, { lcfo_disallow_comments, lcfo_preserve_whitespace, lcfo_no_skip_blank_lines });
TEST_CHECK_EQUAL(std::distance(g.begin(), g.end()), 13);
lines.clear();
std::copy(g.begin(), g.end(), std::back_inserter(lines));
@@ -119,7 +118,7 @@ namespace test_cases
s.clear();
s.seekg(0, std::ios::beg);
- LineConfigFile h(s, LineConfigFileOptions() + lcfo_allow_inline_comments);
+ LineConfigFile h(s, { lcfo_allow_inline_comments });
TEST_CHECK_EQUAL(std::distance(f.begin(), f.end()), 7);
lines.clear();
std::copy(h.begin(), h.end(), std::back_inserter(lines));
@@ -141,21 +140,21 @@ namespace test_cases
{
FSEntry ff("config_file_TEST_dir/config_file");
TEST_CHECK(ff.is_regular_file());
- LineConfigFile f(ff, LineConfigFileOptions());
+ LineConfigFile f(ff, { });
TEST_CHECK_EQUAL(std::distance(f.begin(), f.end()), 1);
TEST_CHECK_EQUAL(*f.begin(), "I am a fish.");
FSEntry ff2("config_file_TEST_dir/not_a_config_file");
TEST_CHECK(! ff2.exists());
LineConfigFile * f2(0);
- TEST_CHECK_THROWS(f2 = new LineConfigFile(ff2, LineConfigFileOptions()), ConfigFileError);
+ TEST_CHECK_THROWS(f2 = new LineConfigFile(ff2, { }), ConfigFileError);
if (0 != geteuid())
{
FSEntry ff3("config_file_TEST_dir/unreadable_file");
TEST_CHECK(ff3.is_regular_file());
LineConfigFile * f3(0);
- TEST_CHECK_THROWS(f3 = new LineConfigFile(ff3, LineConfigFileOptions()), ConfigFileError);
+ TEST_CHECK_THROWS(f3 = new LineConfigFile(ff3, { }), ConfigFileError);
}
}
} test_config_file_open_file;
@@ -172,7 +171,7 @@ namespace test_cases
s << "three=" << std::endl;
s << "four = \"fourth\" " << std::endl;
s << "five = ''" << std::endl;
- KeyValueConfigFile ff(s, KeyValueConfigFileOptions() + kvcfo_preserve_whitespace,
+ KeyValueConfigFile ff(s, { kvcfo_preserve_whitespace },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(ff.get("one"), "first");
@@ -198,7 +197,7 @@ namespace test_cases
s << "one='first" << std::endl;
s << " first " << std::endl;
s << "first'" << std::endl;
- KeyValueConfigFile ff(s, KeyValueConfigFileOptions(),
+ KeyValueConfigFile ff(s, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(ff.get("one"), "first\n first \nfirst");
@@ -219,7 +218,7 @@ namespace test_cases
s << "x=foo" << std::endl;
s << "y = \"${x}\\\\${y}\\$${z}\"" << std::endl;
s << "z = $x$y$z" << std::endl;
- KeyValueConfigFile ff(s, KeyValueConfigFileOptions(),
+ KeyValueConfigFile ff(s, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(ff.get("x"), "foo");
@@ -238,7 +237,7 @@ namespace test_cases
t << "f = " << std::endl;
t << "g = foo \\" << std::endl;
t << " bar" << std::endl;
- KeyValueConfigFile fg(t, KeyValueConfigFileOptions(),
+ KeyValueConfigFile fg(t, { },
std::bind(&predefined, t_defs, std::placeholders::_1, std::placeholders::_2),
&KeyValueConfigFile::no_transformation);
@@ -269,7 +268,7 @@ namespace test_cases
std::stringstream s;
s << "x=${foo}" << std::endl;
s << "y=${moo}" << std::endl;
- KeyValueConfigFile ff(s, KeyValueConfigFileOptions(),
+ KeyValueConfigFile ff(s, { },
std::bind(&predefined_from_config_file, std::cref(*d_ff), std::placeholders::_1, std::placeholders::_2),
&KeyValueConfigFile::no_transformation);
@@ -289,7 +288,7 @@ namespace test_cases
d_s << "seven=\"spider\"" << std::endl;
d_s << "source config_file_TEST_dir/sourced_one" << std::endl;
d_s << "eight=\"octopus\"" << std::endl;
- KeyValueConfigFile ff(d_s, KeyValueConfigFileOptions(),
+ KeyValueConfigFile ff(d_s, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(ff.get("one"), "cat");
@@ -318,7 +317,7 @@ namespace test_cases
d_s << "export bar='plugh'" << std::endl;
d_s << "baz = \"plover\"" << std::endl;
d_s << "exportfoo = \"exportxyzzy\"" << std::endl;
- KeyValueConfigFile ff(d_s, KeyValueConfigFileOptions() += kvcfo_ignore_export,
+ KeyValueConfigFile ff(d_s, { kvcfo_ignore_export },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(ff.get("foo"), "xyzzy");
@@ -328,7 +327,7 @@ namespace test_cases
std::stringstream d_s2;
d_s2 << "export = 42" << std::endl;
- KeyValueConfigFile ff2(d_s2, KeyValueConfigFileOptions(),
+ KeyValueConfigFile ff2(d_s2, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(ff2.get("export"), "42");
@@ -347,57 +346,57 @@ namespace test_cases
{
std::stringstream s1;
s1 << "x='" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s1, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s1, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s2;
s2 << "x='moo\"" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s2, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s2, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s3;
s3 << "x=${foo" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s3, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s3, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s4;
s4 << "x=$~" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s4, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s4, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s5;
s5 << "x=abc\\" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s5, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s5, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s6;
s6 << "x=$" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s6, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s6, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s7;
s7 << "x=blah \\" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s7, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s7, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s8;
s8 << "x=blah \\" << std::endl << "# foo" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s8, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s8, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s9;
s9 << "x='blah" << std::endl << "blah" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s9, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s9, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s10;
s10 << "export x=blah" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s10, KeyValueConfigFileOptions(),
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s10, { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
std::stringstream s11;
s11 << "export x = blah" << std::endl;
- TEST_CHECK_THROWS(KeyValueConfigFile ff(s11, KeyValueConfigFileOptions() + kvcfo_ignore_export + kvcfo_disallow_space_around_equals,
+ TEST_CHECK_THROWS(KeyValueConfigFile ff(s11, { kvcfo_ignore_export, kvcfo_disallow_space_around_equals },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation), ConfigurationError);
}
} test_key_value_config_file_errors;
@@ -418,7 +417,7 @@ namespace test_cases
s << "four" << std::endl;
s << "five # moo" << std::endl;
- LineConfigFile f(s, LineConfigFileOptions() + lcfo_allow_inline_comments);
+ LineConfigFile f(s, { lcfo_allow_inline_comments });
TEST_CHECK_EQUAL(std::distance(f.begin(), f.end()), 5);
std::vector<std::string> lines;
std::copy(f.begin(), f.end(), std::back_inserter(lines));
@@ -443,7 +442,7 @@ namespace test_cases
d_s << "three # bar" << std::endl;
d_s << "four = four # foo" << std::endl;
d_s << "five = five # moo" << std::endl;
- KeyValueConfigFile ff(d_s, KeyValueConfigFileOptions() + kvcfo_allow_inline_comments,
+ KeyValueConfigFile ff(d_s, { kvcfo_allow_inline_comments },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(std::distance(ff.begin(), ff.end()), 5);
@@ -467,8 +466,7 @@ namespace test_cases
d_s << "three four = \\" << std::endl;
d_s << "\"four\" # one=three" << std::endl;
d_s << "five=five # six=six" << std::endl;
- KeyValueConfigFile ff(d_s, KeyValueConfigFileOptions() + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line
- + kvcfo_disallow_space_inside_unquoted_values,
+ KeyValueConfigFile ff(d_s, { kvcfo_allow_inline_comments, kvcfo_allow_multiple_assigns_per_line, kvcfo_disallow_space_inside_unquoted_values },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(std::distance(ff.begin(), ff.end()), 5);
@@ -496,7 +494,7 @@ namespace test_cases
d_s << "[var]" << std::endl;
d_s << "b = x" << std::endl;
d_s << "a = ${a} ${b} ${c}" << std::endl;
- KeyValueConfigFile ff(d_s, KeyValueConfigFileOptions() + kvcfo_allow_sections,
+ KeyValueConfigFile ff(d_s, { kvcfo_allow_sections },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
TEST_CHECK_EQUAL(std::distance(ff.begin(), ff.end()), 6);
diff --git a/paludis/util/dir_iterator_TEST.cc b/paludis/util/dir_iterator_TEST.cc
index 2a7618f..7b87ee9 100644
--- a/paludis/util/dir_iterator_TEST.cc
+++ b/paludis/util/dir_iterator_TEST.cc
@@ -66,8 +66,8 @@ namespace test_cases
{
DirIterator iter(FSEntry("dir_iterator_TEST_dir"));
DirIterator iter1(FSEntry("dir_iterator_TEST_dir"));
- DirIterator iter2(FSEntry("dir_iterator_TEST_dir"), DirIteratorOptions() + dio_include_dotfiles);
- DirIterator iter3(FSEntry("dir_iterator_TEST_dir"), DirIteratorOptions() + dio_inode_sort);
+ DirIterator iter2(FSEntry("dir_iterator_TEST_dir"), { dio_include_dotfiles });
+ DirIterator iter3(FSEntry("dir_iterator_TEST_dir"), { dio_inode_sort });
TEST_CHECK(iter != DirIterator());
TEST_CHECK(DirIterator() != iter);
diff --git a/paludis/util/is_file_with_extension_TEST.cc b/paludis/util/is_file_with_extension_TEST.cc
index 0a4b919..fc71ce2 100644
--- a/paludis/util/is_file_with_extension_TEST.cc
+++ b/paludis/util/is_file_with_extension_TEST.cc
@@ -48,10 +48,10 @@ namespace test_cases
TEST_CHECK(d.exists());
- TEST_CHECK(! is_file_with_extension(c, "foo", IsFileWithOptions()));
- TEST_CHECK(! is_file_with_extension(d, "foo", IsFileWithOptions()));
- TEST_CHECK(! is_file_with_extension(c, "goat", IsFileWithOptions()));
- TEST_CHECK(is_file_with_extension(d, "goat", IsFileWithOptions()));
+ TEST_CHECK(! is_file_with_extension(c, "foo", { }));
+ TEST_CHECK(! is_file_with_extension(d, "foo", { }));
+ TEST_CHECK(! is_file_with_extension(c, "goat", { }));
+ TEST_CHECK(is_file_with_extension(d, "goat", { }));
}
} test_is_file_with_extension;
@@ -71,11 +71,11 @@ namespace test_cases
TEST_CHECK(e.exists());
- TEST_CHECK(! is_file_with_prefix_extension(d, "teh", "foo", IsFileWithOptions()));
- TEST_CHECK(! is_file_with_prefix_extension(e, "teh", "foo", IsFileWithOptions()));
- TEST_CHECK(! is_file_with_prefix_extension(d, "is", "goat", IsFileWithOptions()));
- TEST_CHECK(is_file_with_prefix_extension(e, "is", "goat", IsFileWithOptions()));
- TEST_CHECK(! is_file_with_prefix_extension(e, "with", "goat", IsFileWithOptions()));
+ TEST_CHECK(! is_file_with_prefix_extension(d, "teh", "foo", { }));
+ TEST_CHECK(! is_file_with_prefix_extension(e, "teh", "foo", { }));
+ TEST_CHECK(! is_file_with_prefix_extension(d, "is", "goat", { }));
+ TEST_CHECK(is_file_with_prefix_extension(e, "is", "goat", { }));
+ TEST_CHECK(! is_file_with_prefix_extension(e, "with", "goat", { }));
}
} test_is_file_with_extension_prefix;
diff --git a/paludis/version_spec_TEST.cc b/paludis/version_spec_TEST.cc
index 8a05d7d..a93c9be 100644
--- a/paludis/version_spec_TEST.cc
+++ b/paludis/version_spec_TEST.cc
@@ -45,33 +45,33 @@ namespace test_cases
void run()
{
- VersionSpec v("1", VersionSpecOptions());
- VersionSpec v1("1b", VersionSpecOptions());
- VersionSpec v2("1_alpha", VersionSpecOptions());
- VersionSpec v3("1_beta", VersionSpecOptions());
- VersionSpec v4("1_pre", VersionSpecOptions());
- VersionSpec v5("1_rc", VersionSpecOptions());
- VersionSpec v6("1_p", VersionSpecOptions());
- VersionSpec v7("1_alpha1", VersionSpecOptions());
- VersionSpec v8("1_beta1", VersionSpecOptions());
- VersionSpec v9("1_pre1", VersionSpecOptions());
- VersionSpec v10("1_rc1", VersionSpecOptions());
- VersionSpec v11("1_p1", VersionSpecOptions());
- VersionSpec v12("1_alpha-r1", VersionSpecOptions());
- VersionSpec v13("1_beta-r1", VersionSpecOptions());
- VersionSpec v14("1_pre-r1", VersionSpecOptions());
- VersionSpec v15("1_rc-r1", VersionSpecOptions());
- VersionSpec v16("1_p-r1", VersionSpecOptions());
- VersionSpec v17("1_alpha1-r1", VersionSpecOptions());
- VersionSpec v18("1_beta1-r1", VersionSpecOptions());
- VersionSpec v19("1_pre1-r1", VersionSpecOptions());
- VersionSpec v20("1_pre1-r1.2", VersionSpecOptions());
- VersionSpec v21("1_rc1-r1", VersionSpecOptions());
- VersionSpec v22("1_p1-r1", VersionSpecOptions());
- VersionSpec v23("1_alpha_p", VersionSpecOptions());
- VersionSpec v24("1_p3_alpha", VersionSpecOptions());
- VersionSpec v25("1_p4_p-r2", VersionSpecOptions());
- VersionSpec v26("scm", VersionSpecOptions());
+ VersionSpec v("1", { });
+ VersionSpec v1("1b", { });
+ VersionSpec v2("1_alpha", { });
+ VersionSpec v3("1_beta", { });
+ VersionSpec v4("1_pre", { });
+ VersionSpec v5("1_rc", { });
+ VersionSpec v6("1_p", { });
+ VersionSpec v7("1_alpha1", { });
+ VersionSpec v8("1_beta1", { });
+ VersionSpec v9("1_pre1", { });
+ VersionSpec v10("1_rc1", { });
+ VersionSpec v11("1_p1", { });
+ VersionSpec v12("1_alpha-r1", { });
+ VersionSpec v13("1_beta-r1", { });
+ VersionSpec v14("1_pre-r1", { });
+ VersionSpec v15("1_rc-r1", { });
+ VersionSpec v16("1_p-r1", { });
+ VersionSpec v17("1_alpha1-r1", { });
+ VersionSpec v18("1_beta1-r1", { });
+ VersionSpec v19("1_pre1-r1", { });
+ VersionSpec v20("1_pre1-r1.2", { });
+ VersionSpec v21("1_rc1-r1", { });
+ VersionSpec v22("1_p1-r1", { });
+ VersionSpec v23("1_alpha_p", { });
+ VersionSpec v24("1_p3_alpha", { });
+ VersionSpec v25("1_p4_p-r2", { });
+ VersionSpec v26("scm", { });
TEST_CHECK(true);
}
@@ -87,26 +87,26 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(VersionSpec v1("", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("b", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-r1_pre", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-pre", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1_blah", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1_pre-r2b", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1_pre-r2-r2", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-try-try", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-try_alpha", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-scm-scm", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-scm-try", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-scm_alpha", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-r2_pre", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1.", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1.1.", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1.-r", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1.-r1", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-r.0", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1-r1.", VersionSpecOptions()), BadVersionSpecError);
- TEST_CHECK_THROWS(VersionSpec v1("1_p1.", VersionSpecOptions()), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("b", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-r1_pre", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-pre", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1_blah", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1_pre-r2b", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1_pre-r2-r2", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-try-try", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-try_alpha", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-scm-scm", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-scm-try", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-scm_alpha", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-r2_pre", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1.", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1.1.", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1.-r", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1.-r1", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-r.0", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1-r1.", { }), BadVersionSpecError);
+ TEST_CHECK_THROWS(VersionSpec v1("1_p1.", { }), BadVersionSpecError);
}
} test_version_spec_reject;
@@ -120,14 +120,14 @@ namespace test_cases
void run()
{
- VersionSpec v("1.2.3", VersionSpecOptions());
- TEST_CHECK(v == VersionSpec("1.2.3", VersionSpecOptions()));
- VersionSpec v1("1.2_pre2-r1", VersionSpecOptions());
- TEST_CHECK(v1 == VersionSpec("1.2_pre2-r1", VersionSpecOptions()));
- VersionSpec v2("1.2_pre2_rc5_p6-r1", VersionSpecOptions());
- TEST_CHECK(v2 == VersionSpec("1.2_pre2_rc5_p6-r1", VersionSpecOptions()));
- VersionSpec v3("1.2_pre2_pre3_pre4", VersionSpecOptions());
- TEST_CHECK(v3 == VersionSpec("1.2_pre2_pre3_pre4", VersionSpecOptions()));
+ VersionSpec v("1.2.3", { });
+ TEST_CHECK(v == VersionSpec("1.2.3", { }));
+ VersionSpec v1("1.2_pre2-r1", { });
+ TEST_CHECK(v1 == VersionSpec("1.2_pre2-r1", { }));
+ VersionSpec v2("1.2_pre2_rc5_p6-r1", { });
+ TEST_CHECK(v2 == VersionSpec("1.2_pre2_rc5_p6-r1", { }));
+ VersionSpec v3("1.2_pre2_pre3_pre4", { });
+ TEST_CHECK(v3 == VersionSpec("1.2_pre2_pre3_pre4", { }));
}
} test_version_spec_parse;
@@ -141,40 +141,40 @@ namespace test_cases
void run()
{
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2.1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2.1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.2", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.59", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.5", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.59_alpha5-r1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.59_alpha", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.5", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.59", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.50", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2", VersionSpecOptions())));
-
- TEST_CHECK(! VersionSpec("01", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.02", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1.020", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.020", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1.02", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_alpha1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_alpha01", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_alpha01", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_alpha1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1_alpha01", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_alpha0", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1_pre1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_p", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1_pre-scm", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_pre", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_pre1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_pre0", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_alpha1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_alpha-r1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_alpha1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("1_beta", VersionSpecOptions())));
-
- TEST_CHECK(VersionSpec("010", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("010", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("010", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.010", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.0105", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.010", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.0135", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.010", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.010.1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.011.1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.01", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.010.1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.01.1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.011.1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.01.1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.10", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.1", VersionSpecOptions())));
+ TEST_CHECK(VersionSpec("1.2", { }).stupid_equal_star_compare(VersionSpec("1", { })));
+ TEST_CHECK(VersionSpec("1.2", { }).stupid_equal_star_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2.1", { }).stupid_equal_star_compare(VersionSpec("1", { })));
+ TEST_CHECK(VersionSpec("1.2.1", { }).stupid_equal_star_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("2.2", { }).stupid_equal_star_compare(VersionSpec("2", { })));
+ TEST_CHECK(VersionSpec("2", { }).stupid_equal_star_compare(VersionSpec("2", { })));
+ TEST_CHECK(VersionSpec("2.59", { }).stupid_equal_star_compare(VersionSpec("2.5", { })));
+ TEST_CHECK(VersionSpec("2.59_alpha5-r1", { }).stupid_equal_star_compare(VersionSpec("2.59_alpha", { })));
+ TEST_CHECK(! VersionSpec("2", { }).stupid_equal_star_compare(VersionSpec("2.5", { })));
+ TEST_CHECK(! VersionSpec("2.59", { }).stupid_equal_star_compare(VersionSpec("2.50", { })));
+ TEST_CHECK(! VersionSpec("1", { }).stupid_equal_star_compare(VersionSpec("2", { })));
+
+ TEST_CHECK(! VersionSpec("01", { }).stupid_equal_star_compare(VersionSpec("1", { })));
+ TEST_CHECK(! VersionSpec("1.02", { }).stupid_equal_star_compare(VersionSpec("1.020", { })));
+ TEST_CHECK(VersionSpec("1.020", { }).stupid_equal_star_compare(VersionSpec("1.02", { })));
+ TEST_CHECK(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_alpha01", { })));
+ TEST_CHECK(! VersionSpec("1_alpha01", { }).stupid_equal_star_compare(VersionSpec("1_alpha1", { })));
+ TEST_CHECK(VersionSpec("1_alpha01", { }).stupid_equal_star_compare(VersionSpec("1_alpha0", { })));
+ TEST_CHECK(VersionSpec("1_pre1", { }).stupid_equal_star_compare(VersionSpec("1_p", { })));
+ TEST_CHECK(VersionSpec("1_pre-scm", { }).stupid_equal_star_compare(VersionSpec("1_pre", { })));
+ TEST_CHECK(! VersionSpec("1_pre1", { }).stupid_equal_star_compare(VersionSpec("1_pre0", { })));
+ TEST_CHECK(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_alpha-r1", { })));
+ TEST_CHECK(! VersionSpec("1_alpha1", { }).stupid_equal_star_compare(VersionSpec("1_beta", { })));
+
+ TEST_CHECK(VersionSpec("010", { }).stupid_equal_star_compare(VersionSpec("010", { })));
+ TEST_CHECK(VersionSpec("010", { }).stupid_equal_star_compare(VersionSpec("01", { })));
+ TEST_CHECK(VersionSpec("2.010", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
+ TEST_CHECK(VersionSpec("2.0105", { }).stupid_equal_star_compare(VersionSpec("2.010", { })));
+ TEST_CHECK(! VersionSpec("2.0135", { }).stupid_equal_star_compare(VersionSpec("2.010", { })));
+ TEST_CHECK(VersionSpec("2.010.1", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
+ TEST_CHECK(VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01", { })));
+ TEST_CHECK(! VersionSpec("2.010.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
+ TEST_CHECK(! VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
+ TEST_CHECK(VersionSpec("2.10", { }).stupid_equal_star_compare(VersionSpec("2.1", { })));
}
} test_version_spec_stupid_star_compare;
@@ -188,40 +188,40 @@ namespace test_cases
void run()
{
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2.1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2.1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.2", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.59", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.5", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.59_alpha5-r1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.59_alpha", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.5", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.59", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.50", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2", VersionSpecOptions())));
-
- TEST_CHECK(VersionSpec("01", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.02", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1.020", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.020", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1.02", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1_alpha1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_alpha01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1_alpha01", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_alpha1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_alpha01", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_alpha0", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_pre1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_p", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1_pre-scm", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_pre", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_pre1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_pre0", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_alpha1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_alpha-r1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1_alpha1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("1_beta", VersionSpecOptions())));
-
- TEST_CHECK(VersionSpec("010", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("010", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("010", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.010", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.0105", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.010", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.0135", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.010", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.010.1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.011.1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.01", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("2.010.1", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.01.1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.011.1", VersionSpecOptions()).stupid_equal_star_compare(VersionSpec("2.01.1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.10", VersionSpecOptions()).nice_equal_star_compare(VersionSpec("2.1", VersionSpecOptions())));
+ TEST_CHECK(VersionSpec("1.2", { }).nice_equal_star_compare(VersionSpec("1", { })));
+ TEST_CHECK(VersionSpec("1.2", { }).nice_equal_star_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2.1", { }).nice_equal_star_compare(VersionSpec("1", { })));
+ TEST_CHECK(VersionSpec("1.2.1", { }).nice_equal_star_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("2.2", { }).nice_equal_star_compare(VersionSpec("2", { })));
+ TEST_CHECK(VersionSpec("2", { }).nice_equal_star_compare(VersionSpec("2", { })));
+ TEST_CHECK(! VersionSpec("2.59", { }).nice_equal_star_compare(VersionSpec("2.5", { })));
+ TEST_CHECK(VersionSpec("2.59_alpha5-r1", { }).nice_equal_star_compare(VersionSpec("2.59_alpha", { })));
+ TEST_CHECK(! VersionSpec("2", { }).nice_equal_star_compare(VersionSpec("2.5", { })));
+ TEST_CHECK(! VersionSpec("2.59", { }).nice_equal_star_compare(VersionSpec("2.50", { })));
+ TEST_CHECK(! VersionSpec("1", { }).nice_equal_star_compare(VersionSpec("2", { })));
+
+ TEST_CHECK(VersionSpec("01", { }).nice_equal_star_compare(VersionSpec("1", { })));
+ TEST_CHECK(VersionSpec("1.02", { }).nice_equal_star_compare(VersionSpec("1.020", { })));
+ TEST_CHECK(VersionSpec("1.020", { }).nice_equal_star_compare(VersionSpec("1.02", { })));
+ TEST_CHECK(VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_alpha01", { })));
+ TEST_CHECK(VersionSpec("1_alpha01", { }).nice_equal_star_compare(VersionSpec("1_alpha1", { })));
+ TEST_CHECK(! VersionSpec("1_alpha01", { }).nice_equal_star_compare(VersionSpec("1_alpha0", { })));
+ TEST_CHECK(! VersionSpec("1_pre1", { }).nice_equal_star_compare(VersionSpec("1_p", { })));
+ TEST_CHECK(VersionSpec("1_pre-scm", { }).nice_equal_star_compare(VersionSpec("1_pre", { })));
+ TEST_CHECK(! VersionSpec("1_pre1", { }).nice_equal_star_compare(VersionSpec("1_pre0", { })));
+ TEST_CHECK(! VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_alpha-r1", { })));
+ TEST_CHECK(! VersionSpec("1_alpha1", { }).nice_equal_star_compare(VersionSpec("1_beta", { })));
+
+ TEST_CHECK(VersionSpec("010", { }).nice_equal_star_compare(VersionSpec("010", { })));
+ TEST_CHECK(! VersionSpec("010", { }).nice_equal_star_compare(VersionSpec("01", { })));
+ TEST_CHECK(VersionSpec("2.010", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
+ TEST_CHECK(VersionSpec("2.0105", { }).nice_equal_star_compare(VersionSpec("2.010", { })));
+ TEST_CHECK(! VersionSpec("2.0135", { }).nice_equal_star_compare(VersionSpec("2.010", { })));
+ TEST_CHECK(VersionSpec("2.010.1", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
+ TEST_CHECK(VersionSpec("2.011.1", { }).nice_equal_star_compare(VersionSpec("2.01", { })));
+ TEST_CHECK(VersionSpec("2.010.1", { }).nice_equal_star_compare(VersionSpec("2.01.1", { })));
+ TEST_CHECK(! VersionSpec("2.011.1", { }).stupid_equal_star_compare(VersionSpec("2.01.1", { })));
+ TEST_CHECK(! VersionSpec("2.10", { }).nice_equal_star_compare(VersionSpec("2.1", { })));
}
} test_version_spec_nice_star_compare;
@@ -236,40 +236,40 @@ namespace test_cases
void run()
{
- TEST_CHECK(! VersionSpec("1.4-r1", VersionSpecOptions()).tilde_compare(VersionSpec("1.3-r1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.4", VersionSpecOptions()).tilde_compare(VersionSpec("1.3-r1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2", VersionSpecOptions()).tilde_compare(VersionSpec("1.3-r1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.3", VersionSpecOptions()).tilde_compare(VersionSpec("1.3-r1", VersionSpecOptions())));
-
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).tilde_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r1", VersionSpecOptions()).tilde_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r1.2.3", VersionSpecOptions()).tilde_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.3", VersionSpecOptions()).tilde_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r2", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r2.3", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r2", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r1", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r1.3", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r2", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r2.3", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r2.4", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r2.3", VersionSpecOptions())));
-
- TEST_CHECK(VersionSpec("1.2-r0", VersionSpecOptions()).tilde_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r1", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r0", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r0.0", VersionSpecOptions()).tilde_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0.0", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r0.0", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r0", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0.0", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r0.1", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r0", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0.1", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2-r1", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0.1", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r0.1", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r1", VersionSpecOptions())));
-
- TEST_CHECK(! VersionSpec("1.2.3", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r3", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r3", VersionSpecOptions()).tilde_compare(VersionSpec("1.2.3", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0.2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.2-r0.1", VersionSpecOptions()).tilde_compare(VersionSpec("1.2-r0.2", VersionSpecOptions())));
+ TEST_CHECK(! VersionSpec("1.4-r1", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+ TEST_CHECK(! VersionSpec("1.4", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+ TEST_CHECK(! VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+ TEST_CHECK(! VersionSpec("1.3", { }).tilde_compare(VersionSpec("1.3-r1", { })));
+
+ TEST_CHECK(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2-r1.2.3", { }).tilde_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(! VersionSpec("1.3", { }).tilde_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+ TEST_CHECK(VersionSpec("1.2-r2.3", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+ TEST_CHECK(VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r2", { })));
+ TEST_CHECK(! VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r2", { })));
+ TEST_CHECK(! VersionSpec("1.2-r1.3", { }).tilde_compare(VersionSpec("1.2-r2", { })));
+ TEST_CHECK(! VersionSpec("1.2-r2", { }).tilde_compare(VersionSpec("1.2-r2.3", { })));
+ TEST_CHECK(VersionSpec("1.2-r2.4", { }).tilde_compare(VersionSpec("1.2-r2.3", { })));
+
+ TEST_CHECK(VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+ TEST_CHECK(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+ TEST_CHECK(! VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+ TEST_CHECK(VersionSpec("1.2-r0.0", { }).tilde_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0.0", { })));
+ TEST_CHECK(VersionSpec("1.2-r0.0", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+ TEST_CHECK(VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r0.0", { })));
+ TEST_CHECK(VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r0", { })));
+ TEST_CHECK(! VersionSpec("1.2-r0", { }).tilde_compare(VersionSpec("1.2-r0.1", { })));
+ TEST_CHECK(VersionSpec("1.2-r1", { }).tilde_compare(VersionSpec("1.2-r0.1", { })));
+ TEST_CHECK(! VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r1", { })));
+
+ TEST_CHECK(! VersionSpec("1.2.3", { }).tilde_compare(VersionSpec("1.2-r3", { })));
+ TEST_CHECK(! VersionSpec("1.2-r3", { }).tilde_compare(VersionSpec("1.2.3", { })));
+ TEST_CHECK(! VersionSpec("1.2", { }).tilde_compare(VersionSpec("1.2-r0.2", { })));
+ TEST_CHECK(! VersionSpec("1.2-r0.1", { }).tilde_compare(VersionSpec("1.2-r0.2", { })));
}
} test_version_spec_tilde_compare;
@@ -283,10 +283,10 @@ namespace test_cases
void run()
{
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).tilde_greater_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(VersionSpec("1.2.1", VersionSpecOptions()).tilde_greater_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("1.1", VersionSpecOptions()).tilde_greater_compare(VersionSpec("1.2", VersionSpecOptions())));
- TEST_CHECK(! VersionSpec("2.0", VersionSpecOptions()).tilde_greater_compare(VersionSpec("1.2", VersionSpecOptions())));
+ TEST_CHECK(VersionSpec("1.2", { }).tilde_greater_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(VersionSpec("1.2.1", { }).tilde_greater_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(! VersionSpec("1.1", { }).tilde_greater_compare(VersionSpec("1.2", { })));
+ TEST_CHECK(! VersionSpec("2.0", { }).tilde_greater_compare(VersionSpec("1.2", { })));
}
} test_version_spec_tilde_greater_compare;
@@ -300,15 +300,15 @@ namespace test_cases
void run()
{
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", VersionSpecOptions()).remove_revision(), "1.2");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r", VersionSpecOptions()).remove_revision(), "1.2");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", VersionSpecOptions()).remove_revision(), "1.2");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r3.4", VersionSpecOptions()).remove_revision(), "1.2");
-
- TEST_CHECK_EQUAL(VersionSpec("1.2", VersionSpecOptions()).remove_revision(), VersionSpec("1.2", VersionSpecOptions()));
- TEST_CHECK_EQUAL(VersionSpec("1.2-r", VersionSpecOptions()).remove_revision(), VersionSpec("1.2", VersionSpecOptions()));
- TEST_CHECK_EQUAL(VersionSpec("1.2-r99", VersionSpecOptions()).remove_revision(), VersionSpec("1.2", VersionSpecOptions()));
- TEST_CHECK_EQUAL(VersionSpec("1.2-r3.4", VersionSpecOptions()).remove_revision(), VersionSpec("1.2", VersionSpecOptions()));
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", { }).remove_revision(), "1.2");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r", { }).remove_revision(), "1.2");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", { }).remove_revision(), "1.2");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r3.4", { }).remove_revision(), "1.2");
+
+ TEST_CHECK_EQUAL(VersionSpec("1.2", { }).remove_revision(), VersionSpec("1.2", { }));
+ TEST_CHECK_EQUAL(VersionSpec("1.2-r", { }).remove_revision(), VersionSpec("1.2", { }));
+ TEST_CHECK_EQUAL(VersionSpec("1.2-r99", { }).remove_revision(), VersionSpec("1.2", { }));
+ TEST_CHECK_EQUAL(VersionSpec("1.2-r3.4", { }).remove_revision(), VersionSpec("1.2", { }));
}
} test_version_remove_revision;
@@ -322,14 +322,14 @@ namespace test_cases
void run()
{
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", VersionSpecOptions()).bump(), "2");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", VersionSpecOptions()).bump(), "2");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2.3", VersionSpecOptions()).bump(), "1.3");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1", VersionSpecOptions()).bump(), "2");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.99.0", VersionSpecOptions()).bump(), "1.100");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.099.0", VersionSpecOptions()).bump(), "1.100");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.0099.0", VersionSpecOptions()).bump(), "1.0100");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("scm", VersionSpecOptions()).bump(), "scm");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", { }).bump(), "2");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", { }).bump(), "2");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2.3", { }).bump(), "1.3");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1", { }).bump(), "2");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.99.0", { }).bump(), "1.100");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.099.0", { }).bump(), "1.100");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.0099.0", { }).bump(), "1.0100");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("scm", { }).bump(), "scm");
}
} test_version_bump;
@@ -343,10 +343,10 @@ namespace test_cases
void run()
{
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", VersionSpecOptions()).revision_only(), "r0");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r", VersionSpecOptions()).revision_only(), "r0");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", VersionSpecOptions()).revision_only(), "r99");
- TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r3.4", VersionSpecOptions()).revision_only(), "r3.4");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2", { }).revision_only(), "r0");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r", { }).revision_only(), "r0");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r99", { }).revision_only(), "r99");
+ TEST_CHECK_STRINGIFY_EQUAL(VersionSpec("1.2-r3.4", { }).revision_only(), "r3.4");
}
} test_version_revision_only;
@@ -360,23 +360,23 @@ namespace test_cases
void run()
{
- TEST_CHECK(! VersionSpec("1.2", VersionSpecOptions()).is_scm());
- TEST_CHECK(VersionSpec("1.2-scm-r99", VersionSpecOptions()).is_scm());
+ TEST_CHECK(! VersionSpec("1.2", { }).is_scm());
+ TEST_CHECK(VersionSpec("1.2-scm-r99", { }).is_scm());
- TEST_CHECK(! VersionSpec("1.2-r9998", VersionSpecOptions()).is_scm());
- TEST_CHECK(VersionSpec("1.2-r9999", VersionSpecOptions()).is_scm());
+ TEST_CHECK(! VersionSpec("1.2-r9998", { }).is_scm());
+ TEST_CHECK(VersionSpec("1.2-r9999", { }).is_scm());
- TEST_CHECK(! VersionSpec("9998", VersionSpecOptions()).is_scm());
- TEST_CHECK(! VersionSpec("9999_alpha2", VersionSpecOptions()).is_scm());
- TEST_CHECK(VersionSpec("9999", VersionSpecOptions()).is_scm());
- TEST_CHECK(VersionSpec("9999-r4", VersionSpecOptions()).is_scm());
+ TEST_CHECK(! VersionSpec("9998", { }).is_scm());
+ TEST_CHECK(! VersionSpec("9999_alpha2", { }).is_scm());
+ TEST_CHECK(VersionSpec("9999", { }).is_scm());
+ TEST_CHECK(VersionSpec("9999-r4", { }).is_scm());
- TEST_CHECK(VersionSpec("99999999-r4", VersionSpecOptions()).is_scm());
- TEST_CHECK(! VersionSpec("99999998-r4", VersionSpecOptions()).is_scm());
- TEST_CHECK(! VersionSpec("999", VersionSpecOptions()).is_scm());
- TEST_CHECK(! VersionSpec("1.9999", VersionSpecOptions()).is_scm());
- TEST_CHECK(! VersionSpec("9999.1", VersionSpecOptions()).is_scm());
- TEST_CHECK(! VersionSpec("9999.9999", VersionSpecOptions()).is_scm());
+ TEST_CHECK(VersionSpec("99999999-r4", { }).is_scm());
+ TEST_CHECK(! VersionSpec("99999998-r4", { }).is_scm());
+ TEST_CHECK(! VersionSpec("999", { }).is_scm());
+ TEST_CHECK(! VersionSpec("1.9999", { }).is_scm());
+ TEST_CHECK(! VersionSpec("9999.1", { }).is_scm());
+ TEST_CHECK(! VersionSpec("9999.9999", { }).is_scm());
}
} test_version_is_scm;
@@ -391,22 +391,22 @@ namespace test_cases
void run()
{
- TEST_CHECK(! VersionSpec("1.2", VersionSpecOptions()).has_scm_part());
- TEST_CHECK(VersionSpec("1.2-scm", VersionSpecOptions()).has_scm_part());
- TEST_CHECK(VersionSpec("1.2-scm-r99", VersionSpecOptions()).has_scm_part());
- TEST_CHECK(! VersionSpec("9999", VersionSpecOptions()).has_scm_part());
- TEST_CHECK(VersionSpec("scm", VersionSpecOptions()).has_scm_part());
-
- TEST_CHECK(! VersionSpec("1", VersionSpecOptions()).has_try_part());
- TEST_CHECK(VersionSpec("1-try2", VersionSpecOptions()).has_try_part());
- TEST_CHECK(VersionSpec("1.2-try3-r4", VersionSpecOptions()).has_try_part());
-
- TEST_CHECK(! VersionSpec("1.2", VersionSpecOptions()).has_local_revision());
- TEST_CHECK(! VersionSpec("1.2-r0", VersionSpecOptions()).has_local_revision());
- TEST_CHECK(! VersionSpec("1.2-r3", VersionSpecOptions()).has_local_revision());
- TEST_CHECK(VersionSpec("1.2-r3.0", VersionSpecOptions()).has_local_revision());
- TEST_CHECK(VersionSpec("1.2-r3.4", VersionSpecOptions()).has_local_revision());
- TEST_CHECK(VersionSpec("1.2-r3.4.5", VersionSpecOptions()).has_local_revision());
+ TEST_CHECK(! VersionSpec("1.2", { }).has_scm_part());
+ TEST_CHECK(VersionSpec("1.2-scm", { }).has_scm_part());
+ TEST_CHECK(VersionSpec("1.2-scm-r99", { }).has_scm_part());
+ TEST_CHECK(! VersionSpec("9999", { }).has_scm_part());
+ TEST_CHECK(VersionSpec("scm", { }).has_scm_part());
+
+ TEST_CHECK(! VersionSpec("1", { }).has_try_part());
+ TEST_CHECK(VersionSpec("1-try2", { }).has_try_part());
+ TEST_CHECK(VersionSpec("1.2-try3-r4", { }).has_try_part());
+
+ TEST_CHECK(! VersionSpec("1.2", { }).has_local_revision());
+ TEST_CHECK(! VersionSpec("1.2-r0", { }).has_local_revision());
+ TEST_CHECK(! VersionSpec("1.2-r3", { }).has_local_revision());
+ TEST_CHECK(VersionSpec("1.2-r3.0", { }).has_local_revision());
+ TEST_CHECK(VersionSpec("1.2-r3.4", { }).has_local_revision());
+ TEST_CHECK(VersionSpec("1.2-r3.4.5", { }).has_local_revision());
}
} test_version_has_stuff;
@@ -416,11 +416,11 @@ namespace test_cases
void run()
{
- TEST_CHECK(VersionSpec("0", VersionSpecOptions()).hash() != VersionSpec("0.0", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1", VersionSpecOptions()).hash() != VersionSpec("1.0", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.0", VersionSpecOptions()).hash() != VersionSpec("1", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.0_alpha", VersionSpecOptions()).hash() != VersionSpec("1_alpha", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1_alpha", VersionSpecOptions()).hash() != VersionSpec("1.0_alpha", VersionSpecOptions()).hash());
+ TEST_CHECK(VersionSpec("0", { }).hash() != VersionSpec("0.0", { }).hash());
+ TEST_CHECK(VersionSpec("1", { }).hash() != VersionSpec("1.0", { }).hash());
+ TEST_CHECK(VersionSpec("1.0", { }).hash() != VersionSpec("1", { }).hash());
+ TEST_CHECK(VersionSpec("1.0_alpha", { }).hash() != VersionSpec("1_alpha", { }).hash());
+ TEST_CHECK(VersionSpec("1_alpha", { }).hash() != VersionSpec("1.0_alpha", { }).hash());
}
} test_version_spec_hash;
@@ -439,128 +439,128 @@ namespace test_cases
void run()
{
- TEST_CHECK(VersionSpec("1.0", VersionSpecOptions()) > VersionSpec("1", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1", VersionSpecOptions()) < VersionSpec("1.0", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.0_alpha", VersionSpecOptions()) > VersionSpec("1_alpha", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.0_alpha", VersionSpecOptions()) > VersionSpec("1", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.0_alpha", VersionSpecOptions()) < VersionSpec("1.0", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.2.0.0_alpha7-r4", VersionSpecOptions()) > VersionSpec("1.2_alpha7-r4", VersionSpecOptions()));
-
- TEST_CHECK(VersionSpec("0001", VersionSpecOptions()) == VersionSpec("1", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("01", VersionSpecOptions()) == VersionSpec("001", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("0001.1", VersionSpecOptions()) == VersionSpec("1.1", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("01.01", VersionSpecOptions()) == VersionSpec("1.01", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.010", VersionSpecOptions()) == VersionSpec("1.01", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.00", VersionSpecOptions()) == VersionSpec("1.0", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.0100", VersionSpecOptions()) == VersionSpec("1.010", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1", VersionSpecOptions()) == VersionSpec("1-r0", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1-r00", VersionSpecOptions()) == VersionSpec("1-r0", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()) == VersionSpec("1.2-r", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.2-r3", VersionSpecOptions()) == VersionSpec("1.2-r3.0", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()) == VersionSpec("1.2-r0.0", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()) != VersionSpec("1.2-r0.1", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1.2-r0.1", VersionSpecOptions()) != VersionSpec("1.2", VersionSpecOptions()));
-
- TEST_CHECK(VersionSpec("1_alpha_beta-scm", VersionSpecOptions()) == VersionSpec("1_alpha0_beta-scm", VersionSpecOptions()));
- TEST_CHECK(VersionSpec("1_alpha_beta000_rc3-scm", VersionSpecOptions()) == VersionSpec("1_alpha00_beta_rc3-scm", VersionSpecOptions()));
-
- TEST_CHECK(VersionSpec("0001", VersionSpecOptions()).hash() == VersionSpec("1", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("01", VersionSpecOptions()).hash() == VersionSpec("001", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("0001.1", VersionSpecOptions()).hash() == VersionSpec("1.1", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("01.01", VersionSpecOptions()).hash() == VersionSpec("1.01", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.010", VersionSpecOptions()).hash() == VersionSpec("1.01", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.00", VersionSpecOptions()).hash() == VersionSpec("1.0", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.0100", VersionSpecOptions()).hash() == VersionSpec("1.010", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1", VersionSpecOptions()).hash() == VersionSpec("1-r0", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).hash() == VersionSpec("1.2-r", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.2-r3", VersionSpecOptions()).hash() == VersionSpec("1.2-r3.0", VersionSpecOptions()).hash());
- TEST_CHECK(VersionSpec("1.2", VersionSpecOptions()).hash() == VersionSpec("1.2-r0.0", VersionSpecOptions()).hash());
+ TEST_CHECK(VersionSpec("1.0", { }) > VersionSpec("1", { }));
+ TEST_CHECK(VersionSpec("1", { }) < VersionSpec("1.0", { }));
+ TEST_CHECK(VersionSpec("1.0_alpha", { }) > VersionSpec("1_alpha", { }));
+ TEST_CHECK(VersionSpec("1.0_alpha", { }) > VersionSpec("1", { }));
+ TEST_CHECK(VersionSpec("1.0_alpha", { }) < VersionSpec("1.0", { }));
+ TEST_CHECK(VersionSpec("1.2.0.0_alpha7-r4", { }) > VersionSpec("1.2_alpha7-r4", { }));
+
+ TEST_CHECK(VersionSpec("0001", { }) == VersionSpec("1", { }));
+ TEST_CHECK(VersionSpec("01", { }) == VersionSpec("001", { }));
+ TEST_CHECK(VersionSpec("0001.1", { }) == VersionSpec("1.1", { }));
+ TEST_CHECK(VersionSpec("01.01", { }) == VersionSpec("1.01", { }));
+ TEST_CHECK(VersionSpec("1.010", { }) == VersionSpec("1.01", { }));
+ TEST_CHECK(VersionSpec("1.00", { }) == VersionSpec("1.0", { }));
+ TEST_CHECK(VersionSpec("1.0100", { }) == VersionSpec("1.010", { }));
+ TEST_CHECK(VersionSpec("1", { }) == VersionSpec("1-r0", { }));
+ TEST_CHECK(VersionSpec("1-r00", { }) == VersionSpec("1-r0", { }));
+ TEST_CHECK(VersionSpec("1.2", { }) == VersionSpec("1.2-r", { }));
+ TEST_CHECK(VersionSpec("1.2-r3", { }) == VersionSpec("1.2-r3.0", { }));
+ TEST_CHECK(VersionSpec("1.2", { }) == VersionSpec("1.2-r0.0", { }));
+ TEST_CHECK(VersionSpec("1.2", { }) != VersionSpec("1.2-r0.1", { }));
+ TEST_CHECK(VersionSpec("1.2-r0.1", { }) != VersionSpec("1.2", { }));
+
+ TEST_CHECK(VersionSpec("1_alpha_beta-scm", { }) == VersionSpec("1_alpha0_beta-scm", { }));
+ TEST_CHECK(VersionSpec("1_alpha_beta000_rc3-scm", { }) == VersionSpec("1_alpha00_beta_rc3-scm", { }));
+
+ TEST_CHECK(VersionSpec("0001", { }).hash() == VersionSpec("1", { }).hash());
+ TEST_CHECK(VersionSpec("01", { }).hash() == VersionSpec("001", { }).hash());
+ TEST_CHECK(VersionSpec("0001.1", { }).hash() == VersionSpec("1.1", { }).hash());
+ TEST_CHECK(VersionSpec("01.01", { }).hash() == VersionSpec("1.01", { }).hash());
+ TEST_CHECK(VersionSpec("1.010", { }).hash() == VersionSpec("1.01", { }).hash());
+ TEST_CHECK(VersionSpec("1.00", { }).hash() == VersionSpec("1.0", { }).hash());
+ TEST_CHECK(VersionSpec("1.0100", { }).hash() == VersionSpec("1.010", { }).hash());
+ TEST_CHECK(VersionSpec("1", { }).hash() == VersionSpec("1-r0", { }).hash());
+ TEST_CHECK(VersionSpec("1.2", { }).hash() == VersionSpec("1.2-r", { }).hash());
+ TEST_CHECK(VersionSpec("1.2-r3", { }).hash() == VersionSpec("1.2-r3.0", { }).hash());
+ TEST_CHECK(VersionSpec("1.2", { }).hash() == VersionSpec("1.2-r0.0", { }).hash());
std::vector<VersionSpec> v;
- v.push_back(VersionSpec("1_alpha_alpha", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha1_alpha", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha1_beta_pre", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha1_beta", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha1-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha10", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha10-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha10-r1.1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha10-r1.2", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha10-r2", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha10_p1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha10_p1-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_alpha11", VersionSpecOptions()));
- v.push_back(VersionSpec("1_beta", VersionSpecOptions()));
- v.push_back(VersionSpec("1_beta10", VersionSpecOptions()));
- v.push_back(VersionSpec("1_beta10-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_beta10_p1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_beta10_p1-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_beta11", VersionSpecOptions()));
- v.push_back(VersionSpec("1_pre", VersionSpecOptions()));
- v.push_back(VersionSpec("1_pre10", VersionSpecOptions()));
- v.push_back(VersionSpec("1_pre10-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_pre10_p1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_pre10_p1-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_pre11", VersionSpecOptions()));
- v.push_back(VersionSpec("1_rc", VersionSpecOptions()));
- v.push_back(VersionSpec("1_rc10", VersionSpecOptions()));
- v.push_back(VersionSpec("1_rc10-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_rc10_p1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_rc10_p1-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_rc11", VersionSpecOptions()));
- v.push_back(VersionSpec("1", VersionSpecOptions()));
- v.push_back(VersionSpec("1-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1_p1", VersionSpecOptions()));
- v.push_back(VersionSpec("1-try2", VersionSpecOptions()));
- v.push_back(VersionSpec("1p", VersionSpecOptions()));
- v.push_back(VersionSpec("1.0", VersionSpecOptions()));
- v.push_back(VersionSpec("1.0a", VersionSpecOptions()));
- v.push_back(VersionSpec("1.0.0", VersionSpecOptions()));
- v.push_back(VersionSpec("1.001", VersionSpecOptions()));
- v.push_back(VersionSpec("1.01", VersionSpecOptions()));
- v.push_back(VersionSpec("1.0101", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1_alpha3", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1.1", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1.1-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1.2", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.1-scm-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_alpha", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_alpha-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta_p0-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta_p1-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta_p-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta1_p-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta10", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta10_p", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta10_p1", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta10_p1-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta10_p10", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta10-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta11", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta11-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_beta-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_p3_pre", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_p3", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_p3_p", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2_p3-try4", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("1.2-scm-r1", VersionSpecOptions()));
- v.push_back(VersionSpec("1-scm", VersionSpecOptions()));
- v.push_back(VersionSpec("2_alpha", VersionSpecOptions()));
- v.push_back(VersionSpec("09", VersionSpecOptions()));
- v.push_back(VersionSpec("10", VersionSpecOptions()));
- v.push_back(VersionSpec("100", VersionSpecOptions()));
- v.push_back(VersionSpec("scm", VersionSpecOptions()));
- v.push_back(VersionSpec("scm-r3", VersionSpecOptions()));
- v.push_back(VersionSpec("scm-r3.4", VersionSpecOptions()));
+ v.push_back(VersionSpec("1_alpha_alpha", { }));
+ v.push_back(VersionSpec("1_alpha", { }));
+ v.push_back(VersionSpec("1_alpha1_alpha", { }));
+ v.push_back(VersionSpec("1_alpha1_beta_pre", { }));
+ v.push_back(VersionSpec("1_alpha1_beta", { }));
+ v.push_back(VersionSpec("1_alpha1", { }));
+ v.push_back(VersionSpec("1_alpha1-r1", { }));
+ v.push_back(VersionSpec("1_alpha10", { }));
+ v.push_back(VersionSpec("1_alpha10-r1", { }));
+ v.push_back(VersionSpec("1_alpha10-r1.1", { }));
+ v.push_back(VersionSpec("1_alpha10-r1.2", { }));
+ v.push_back(VersionSpec("1_alpha10-r2", { }));
+ v.push_back(VersionSpec("1_alpha10_p1", { }));
+ v.push_back(VersionSpec("1_alpha10_p1-r1", { }));
+ v.push_back(VersionSpec("1_alpha11", { }));
+ v.push_back(VersionSpec("1_beta", { }));
+ v.push_back(VersionSpec("1_beta10", { }));
+ v.push_back(VersionSpec("1_beta10-r1", { }));
+ v.push_back(VersionSpec("1_beta10_p1", { }));
+ v.push_back(VersionSpec("1_beta10_p1-r1", { }));
+ v.push_back(VersionSpec("1_beta11", { }));
+ v.push_back(VersionSpec("1_pre", { }));
+ v.push_back(VersionSpec("1_pre10", { }));
+ v.push_back(VersionSpec("1_pre10-r1", { }));
+ v.push_back(VersionSpec("1_pre10_p1", { }));
+ v.push_back(VersionSpec("1_pre10_p1-r1", { }));
+ v.push_back(VersionSpec("1_pre11", { }));
+ v.push_back(VersionSpec("1_rc", { }));
+ v.push_back(VersionSpec("1_rc10", { }));
+ v.push_back(VersionSpec("1_rc10-r1", { }));
+ v.push_back(VersionSpec("1_rc10_p1", { }));
+ v.push_back(VersionSpec("1_rc10_p1-r1", { }));
+ v.push_back(VersionSpec("1_rc11", { }));
+ v.push_back(VersionSpec("1", { }));
+ v.push_back(VersionSpec("1-r1", { }));
+ v.push_back(VersionSpec("1_p1", { }));
+ v.push_back(VersionSpec("1-try2", { }));
+ v.push_back(VersionSpec("1p", { }));
+ v.push_back(VersionSpec("1.0", { }));
+ v.push_back(VersionSpec("1.0a", { }));
+ v.push_back(VersionSpec("1.0.0", { }));
+ v.push_back(VersionSpec("1.001", { }));
+ v.push_back(VersionSpec("1.01", { }));
+ v.push_back(VersionSpec("1.0101", { }));
+ v.push_back(VersionSpec("1.1_alpha3", { }));
+ v.push_back(VersionSpec("1.1", { }));
+ v.push_back(VersionSpec("1.1-r1", { }));
+ v.push_back(VersionSpec("1.1.1", { }));
+ v.push_back(VersionSpec("1.1.1-scm", { }));
+ v.push_back(VersionSpec("1.1.2", { }));
+ v.push_back(VersionSpec("1.1-scm", { }));
+ v.push_back(VersionSpec("1.1-scm-r1", { }));
+ v.push_back(VersionSpec("1.2_alpha", { }));
+ v.push_back(VersionSpec("1.2_alpha-scm", { }));
+ v.push_back(VersionSpec("1.2_beta", { }));
+ v.push_back(VersionSpec("1.2_beta_p0-scm", { }));
+ v.push_back(VersionSpec("1.2_beta_p1-scm", { }));
+ v.push_back(VersionSpec("1.2_beta_p-scm", { }));
+ v.push_back(VersionSpec("1.2_beta1_p-scm", { }));
+ v.push_back(VersionSpec("1.2_beta10", { }));
+ v.push_back(VersionSpec("1.2_beta10_p", { }));
+ v.push_back(VersionSpec("1.2_beta10_p1", { }));
+ v.push_back(VersionSpec("1.2_beta10_p1-scm", { }));
+ v.push_back(VersionSpec("1.2_beta10_p10", { }));
+ v.push_back(VersionSpec("1.2_beta10-scm", { }));
+ v.push_back(VersionSpec("1.2_beta11", { }));
+ v.push_back(VersionSpec("1.2_beta11-scm", { }));
+ v.push_back(VersionSpec("1.2_beta-scm", { }));
+ v.push_back(VersionSpec("1.2", { }));
+ v.push_back(VersionSpec("1.2-r1", { }));
+ v.push_back(VersionSpec("1.2_p3_pre", { }));
+ v.push_back(VersionSpec("1.2_p3", { }));
+ v.push_back(VersionSpec("1.2_p3_p", { }));
+ v.push_back(VersionSpec("1.2_p3-try4", { }));
+ v.push_back(VersionSpec("1.2-scm", { }));
+ v.push_back(VersionSpec("1.2-scm-r1", { }));
+ v.push_back(VersionSpec("1-scm", { }));
+ v.push_back(VersionSpec("2_alpha", { }));
+ v.push_back(VersionSpec("09", { }));
+ v.push_back(VersionSpec("10", { }));
+ v.push_back(VersionSpec("100", { }));
+ v.push_back(VersionSpec("scm", { }));
+ v.push_back(VersionSpec("scm-r3", { }));
+ v.push_back(VersionSpec("scm-r3.4", { }));
std::vector<VersionSpec>::iterator v1(v.begin()), v_end(v.end());
for ( ; v1 != v_end ; ++v1)
@@ -612,7 +612,7 @@ namespace test_cases
void run()
{
- VersionSpec v1("1.2x_pre3_rc-scm", VersionSpecOptions());
+ VersionSpec v1("1.2x_pre3_rc-scm", { });
VersionSpec::ConstIterator i(v1.begin()), i_end(v1.end());
TEST_CHECK(i != i_end);
@@ -659,21 +659,21 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(VersionSpec("1.2A", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v1("1.2A", VersionSpecOptions() + vso_ignore_case);
- VersionSpec v2("1.2a", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1.2A", { }), BadVersionSpecError);
+ VersionSpec v1("1.2A", { vso_ignore_case });
+ VersionSpec v2("1.2a", { });
TEST_CHECK(v1 == v2);
TEST_CHECK(v1.hash() == v2.hash());
- TEST_CHECK_THROWS(VersionSpec("1_ALPHA3", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v3("1_ALPHA3", VersionSpecOptions() + vso_ignore_case);
- VersionSpec v4("1_alpha3", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1_ALPHA3", { }), BadVersionSpecError);
+ VersionSpec v3("1_ALPHA3", { vso_ignore_case });
+ VersionSpec v4("1_alpha3", { });
TEST_CHECK(v3 == v4);
TEST_CHECK(v3.hash() == v4.hash());
- TEST_CHECK_THROWS(VersionSpec("SCM", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v5("SCM", VersionSpecOptions() + vso_ignore_case);
- VersionSpec v6("scm", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("SCM", { }), BadVersionSpecError);
+ VersionSpec v5("SCM", { vso_ignore_case });
+ VersionSpec v6("scm", { });
TEST_CHECK(v5 == v6);
TEST_CHECK(v5.hash() == v6.hash());
}
@@ -685,27 +685,27 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(VersionSpec("1.2-alpha1", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v1("1.2-alpha1", VersionSpecOptions() + vso_flexible_dashes);
- VersionSpec v2("1.2_alpha1", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1.2-alpha1", { }), BadVersionSpecError);
+ VersionSpec v1("1.2-alpha1", { vso_flexible_dashes });
+ VersionSpec v2("1.2_alpha1", { });
TEST_CHECK(v1 == v2);
TEST_CHECK(v1.hash() == v2.hash());
- TEST_CHECK_THROWS(VersionSpec("1_scm", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v3("1_scm", VersionSpecOptions() + vso_flexible_dashes);
- VersionSpec v4("1-scm", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1_scm", { }), BadVersionSpecError);
+ VersionSpec v3("1_scm", { vso_flexible_dashes });
+ VersionSpec v4("1-scm", { });
TEST_CHECK(v3 == v4);
TEST_CHECK(v3.hash() == v4.hash());
- TEST_CHECK_THROWS(VersionSpec("1.2_r3", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v5("1.2_r3", VersionSpecOptions() + vso_flexible_dashes);
- VersionSpec v6("1.2-r3", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1.2_r3", { }), BadVersionSpecError);
+ VersionSpec v5("1.2_r3", { vso_flexible_dashes });
+ VersionSpec v6("1.2-r3", { });
TEST_CHECK(v5 == v6);
TEST_CHECK(v5.hash() == v6.hash());
- TEST_CHECK_THROWS(VersionSpec("1.23alpha4rc5", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v7("1.23alpha4rc5", VersionSpecOptions() + vso_flexible_dashes);
- VersionSpec v8("1.23_alpha4_rc5", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1.23alpha4rc5", { }), BadVersionSpecError);
+ VersionSpec v7("1.23alpha4rc5", { vso_flexible_dashes });
+ VersionSpec v8("1.23_alpha4_rc5", { });
TEST_CHECK(v7 == v8);
TEST_CHECK(v7.hash() == v8.hash());
}
@@ -717,15 +717,15 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(VersionSpec("1.2-3_alpha4", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v1("1.2-3_alpha4", VersionSpecOptions() + vso_flexible_dots);
- VersionSpec v2("1.2.3_alpha4", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1.2-3_alpha4", { }), BadVersionSpecError);
+ VersionSpec v1("1.2-3_alpha4", { vso_flexible_dots });
+ VersionSpec v2("1.2.3_alpha4", { });
TEST_CHECK(v1 == v2);
TEST_CHECK(v1.hash() == v2.hash());
- TEST_CHECK_THROWS(VersionSpec("1_2-3-4.5", VersionSpecOptions() + vso_flexible_dots), BadVersionSpecError);
- VersionSpec v3("1_2-3-4.5", VersionSpecOptions() + vso_flexible_dots + vso_flexible_dashes);
- VersionSpec v4("1.2.3.4.5", VersionSpecOptions());
+ TEST_CHECK_THROWS(VersionSpec("1_2-3-4.5", { vso_flexible_dots }), BadVersionSpecError);
+ VersionSpec v3("1_2-3-4.5", { vso_flexible_dots, vso_flexible_dashes });
+ VersionSpec v4("1.2.3.4.5", { });
TEST_CHECK(v3 == v4);
TEST_CHECK(v3.hash() == v4.hash());
@@ -738,10 +738,10 @@ namespace test_cases
void run()
{
- TEST_CHECK_THROWS(VersionSpec("v1.2.3", VersionSpecOptions()), BadVersionSpecError);
- VersionSpec v1("v1.2.3", VersionSpecOptions() + vso_ignore_leading_v);
- VersionSpec v2("1.2.3", VersionSpecOptions());
- VersionSpec v3("v.1.2.3", VersionSpecOptions() + vso_ignore_leading_v + vso_allow_leading_dot);
+ TEST_CHECK_THROWS(VersionSpec("v1.2.3", { }), BadVersionSpecError);
+ VersionSpec v1("v1.2.3", { vso_ignore_leading_v });
+ VersionSpec v2("1.2.3", { });
+ VersionSpec v3("v.1.2.3", { vso_ignore_leading_v, vso_allow_leading_dot });
TEST_CHECK(v1 == v2);
TEST_CHECK(v1.hash() == v2.hash());
TEST_CHECK(v2 == v3);
diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index 88c2f73..3087319 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -246,7 +246,7 @@ namespace formatter
void test_package_roles(CanFormat<PackageDepSpec> & f)
{
TestEnvironment e;
- PackageDepSpec p(parse_user_package_dep_spec("cat/pkg", &e, UserPackageDepSpecOptions()));
+ PackageDepSpec p(parse_user_package_dep_spec("cat/pkg", &e, { }));
f.format(p, Plain());
f.format(p, Installed());
f.format(p, Installable());
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index 7b712bf..c7a3493 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -207,7 +207,7 @@ std::shared_ptr<T_>
deep_copy(const std::shared_ptr<const T_> & x)
{
if (x)
- return std::make_shared<T_>(*x);
+ return std::shared_ptr<T_>(std::make_shared<T_>(*x));
else
return std::shared_ptr<T_>();
}
diff --git a/src/clients/adjutrix/downgrade_check.cc b/src/clients/adjutrix/downgrade_check.cc
index 46b87af..29b83ef 100644
--- a/src/clients/adjutrix/downgrade_check.cc
+++ b/src/clients/adjutrix/downgrade_check.cc
@@ -58,7 +58,7 @@ namespace
QualifiedPackageName old_package("dummy/dummy");
std::string old_slot("dummy");
- VersionSpec best_version("0", VersionSpecOptions());
+ VersionSpec best_version("0", { });
for (IndirectIterator<PackageIDSequence::ConstIterator> m(matches->begin()), m_end(matches->end()) ;
m != m_end ; ++m)
{
@@ -113,11 +113,11 @@ namespace
a(after.find(b->first));
if (after.end() == a)
{
- PartiallyMadePackageDepSpec part_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec part_spec({ });
part_spec.package(b->first.first);
if ("(none)" != b->first.second)
part_spec.slot_requirement(std::make_shared<UserSlotExactRequirement>(SlotName(b->first.second)));
- if (! env[selection::SomeArbitraryVersion(generator::Matches(part_spec, MatchPackageOptions()))]->empty())
+ if (! env[selection::SomeArbitraryVersion(generator::Matches(part_spec, { }))]->empty())
{
results.insert(std::make_pair(b->first, stringify(b->second) + " -> nothing on " + desc));
exit_status |= 2;
diff --git a/src/clients/adjutrix/find_dropped_keywords.cc b/src/clients/adjutrix/find_dropped_keywords.cc
index 2682175..e16c3e0 100644
--- a/src/clients/adjutrix/find_dropped_keywords.cc
+++ b/src/clients/adjutrix/find_dropped_keywords.cc
@@ -120,7 +120,7 @@ namespace
p += ":" + stringify(slot);
cout << " " << std::setw(col_width_package - 2) << p;
- if (best_keyworded != VersionSpec("0", VersionSpecOptions()))
+ if (best_keyworded != VersionSpec("0", { }))
cout << std::setw(col_width_best_keyworded) << best_keyworded;
else
cout << std::setw(col_width_best_keyworded) << " ";
@@ -137,7 +137,7 @@ namespace
* version for us, best stable version for anyone). */
bool is_interesting(false);
- VersionSpec worst_keyworded("99999999", VersionSpecOptions());
+ VersionSpec worst_keyworded("99999999", { });
typedef std::map<std::string, VersionsEntry> VersionsInSlots;
VersionsInSlots versions_in_slots;
@@ -151,8 +151,8 @@ namespace
/* ensure that there's an entry for this SLOT */
versions_in_slots.insert(std::make_pair(slot_as_string(*v), VersionsEntry(
make_named_values<VersionsEntry>(
- n::best_anywhere() = VersionSpec("0", VersionSpecOptions()),
- n::best_keyworded() = VersionSpec("0", VersionSpecOptions())
+ n::best_anywhere() = VersionSpec("0", { }),
+ n::best_keyworded() = VersionSpec("0", { })
))));
if ((*v)->keywords_key()->value()->end() != (*v)->keywords_key()->value()->find(keyword) ||
diff --git a/src/clients/adjutrix/find_insecure_packages.cc b/src/clients/adjutrix/find_insecure_packages.cc
index c58d0f6..925858b 100644
--- a/src/clients/adjutrix/find_insecure_packages.cc
+++ b/src/clients/adjutrix/find_insecure_packages.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -85,7 +85,7 @@ namespace
void visit(const SetSpecTree::NodeType<PackageDepSpec>::Type & node)
{
std::shared_ptr<const PackageIDSequence> insecure(_env[selection::AllVersionsSorted(
- generator::Matches(*node.spec(), MatchPackageOptions()))]);
+ generator::Matches(*node.spec(), { }))]);
for (PackageIDSequence::ConstIterator i(insecure->begin()),
i_end(insecure->end()) ; i != i_end ; ++i)
if (node.spec()->tag())
diff --git a/src/clients/adjutrix/find_reverse_deps.cc b/src/clients/adjutrix/find_reverse_deps.cc
index c898535..8ba03b6 100644
--- a/src/clients/adjutrix/find_reverse_deps.cc
+++ b/src/clients/adjutrix/find_reverse_deps.cc
@@ -161,7 +161,7 @@ namespace
ReverseDepChecker::visit(const DependencySpecTree::NodeType<PackageDepSpec>::Type & node)
{
std::shared_ptr<const PackageIDSequence> dep_entries((*_env)[selection::AllVersionsSorted(
- generator::Matches(*node.spec(), MatchPackageOptions() + mpo_ignore_additional_requirements))]);
+ generator::Matches(*node.spec(), { mpo_ignore_additional_requirements }))]);
std::shared_ptr<PackageIDSequence> matches(std::make_shared<PackageIDSequence>());
bool header_written = false;
@@ -261,7 +261,7 @@ int do_find_reverse_deps(NoConfigEnvironment & env)
try
{
spec = std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(*CommandLine::get_instance()->begin_parameters(),
- &env, UserPackageDepSpecOptions()));
+ &env, { }));
}
catch (const AmbiguousPackageNameError & e)
{
@@ -303,7 +303,7 @@ int do_find_reverse_deps(NoConfigEnvironment & env)
}
std::shared_ptr<const PackageIDSequence> entries(env[selection::AllVersionsSorted(generator::Matches(
- *spec, MatchPackageOptions()))]);
+ *spec, { }))]);
int ret(0);
if (entries->empty())
diff --git a/src/clients/adjutrix/find_stable_candidates.cc b/src/clients/adjutrix/find_stable_candidates.cc
index 82e958f..346c582 100644
--- a/src/clients/adjutrix/find_stable_candidates.cc
+++ b/src/clients/adjutrix/find_stable_candidates.cc
@@ -114,7 +114,7 @@ namespace
p += ":" + stringify(slot);
cout << " " << std::setw(col_width_package - 2) << p;
- if (our_version != VersionSpec("0", VersionSpecOptions()))
+ if (our_version != VersionSpec("0", { }))
cout << std::setw(col_width_our_version) << our_version;
else
cout << std::setw(col_width_our_version) << " ";
@@ -159,7 +159,7 @@ namespace
slots_to_versions.erase(slot_as_string(*v));
slots_to_versions.insert(std::make_pair(slot_as_string(*v),
make_named_values<SlotsEntry>(
- n::best_version() = VersionSpec("0", VersionSpecOptions()),
+ n::best_version() = VersionSpec("0", { }),
n::our_version() = (*v)->version()
)));
}
@@ -171,7 +171,7 @@ namespace
slots_to_versions.insert(std::make_pair(slot_as_string(*v),
make_named_values<SlotsEntry>(
n::best_version() = (*v)->version(),
- n::our_version() = VersionSpec("0", VersionSpecOptions())
+ n::our_version() = VersionSpec("0", { })
)));
/* update the entry to mark our current version as the best
diff --git a/src/clients/adjutrix/keywords_graph.cc b/src/clients/adjutrix/keywords_graph.cc
index 9ab1de0..7a1f643 100644
--- a/src/clients/adjutrix/keywords_graph.cc
+++ b/src/clients/adjutrix/keywords_graph.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -84,7 +84,7 @@ namespace
FindUnusedPackagesTask task(&e, &repo);
std::shared_ptr<const PackageIDSequence> packages(e[selection::AllVersionsGroupedBySlot(
generator::InRepository(repo.name()) &
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(package), MatchPackageOptions()))]);
+ generator::Matches(make_package_dep_spec({ }).package(package), { }))]);
std::shared_ptr<const PackageIDSequence> unused(task.execute(package));
if (packages->empty())
diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc
index 8ba1777..5bf4f6a 100644
--- a/src/clients/adjutrix/what_needs_keywording.cc
+++ b/src/clients/adjutrix/what_needs_keywording.cc
@@ -90,7 +90,7 @@ int do_what_needs_keywording(NoConfigEnvironment & env)
{
try
{
- d.add(parse_user_package_dep_spec(*p, &env, UserPackageDepSpecOptions()), env.default_destinations());
+ d.add(parse_user_package_dep_spec(*p, &env, { }), env.default_destinations());
}
catch (const NoSuchPackageError & e)
{
diff --git a/src/clients/cave/cmd_config.cc b/src/clients/cave/cmd_config.cc
index f004bf3..c13e0c4 100644
--- a/src/clients/cave/cmd_config.cc
+++ b/src/clients/cave/cmd_config.cc
@@ -94,9 +94,9 @@ ConfigCommand::run(
throw args::DoHelp("config takes exactly one parameter");
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
- UserPackageDepSpecOptions()));
+ { }));
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
- generator::Matches(spec, MatchPackageOptions()) | filter::SupportsAction<ConfigAction>())]);
+ generator::Matches(spec, { }) | filter::SupportsAction<ConfigAction>())]);
if (ids->empty())
throw NothingMatching(spec);
else if (1 != std::distance(ids->begin(), ids->end()))
diff --git a/src/clients/cave/cmd_contents.cc b/src/clients/cave/cmd_contents.cc
index 334e1db..3cdf700 100644
--- a/src/clients/cave/cmd_contents.cc
+++ b/src/clients/cave/cmd_contents.cc
@@ -124,10 +124,10 @@ ContentsCommand::run(
throw args::DoHelp("contents takes exactly one parameter");
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
- UserPackageDepSpecOptions(), filter::InstalledAtRoot(env->root())));
+ { }, filter::InstalledAtRoot(env->root())));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index fa20f97..c98e5c1 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -301,7 +301,7 @@ namespace
{
const std::shared_ptr<const PackageID> maybe_id(id_for_decision_or_null(decision));
if (maybe_id)
- return match_package(*env, spec, *maybe_id, MatchPackageOptions());
+ return match_package(*env, spec, *maybe_id, { });
else
{
/* could also match slot here too */
@@ -454,7 +454,7 @@ namespace
i != i_end ; ++i)
{
bool any(false);
- PackageDepSpec spec(parse_user_package_dep_spec(*i, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec spec(parse_user_package_dep_spec(*i, env.get(), { updso_allow_wildcards }));
for (ResolutionsByResolvent::ConstIterator r(resolved->resolutions_by_resolvent()->begin()),
r_end(resolved->resolutions_by_resolvent()->end()) ;
r != r_end ; ++r)
@@ -1182,8 +1182,8 @@ namespace
cout << " Did not meet " << s << endl;
if ((*c)->spec().if_package() && (*c)->spec().if_package()->additional_requirements_ptr() &&
- (! match_package(*env, *(*c)->spec().if_package(), *u->package_id(), MatchPackageOptions())) &&
- match_package(*env, *(*c)->spec().if_package(), *u->package_id(), MatchPackageOptions() + mpo_ignore_additional_requirements))
+ (! match_package(*env, *(*c)->spec().if_package(), *u->package_id(), { })) &&
+ match_package(*env, *(*c)->spec().if_package(), *u->package_id(), { mpo_ignore_additional_requirements }))
{
for (AdditionalPackageDepSpecRequirements::ConstIterator a((*c)->spec().if_package()->additional_requirements_ptr()->begin()),
a_end((*c)->spec().if_package()->additional_requirements_ptr()->end()) ;
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index 06f85f3..7b6c3a5 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -147,7 +147,7 @@ namespace
Context context("When pretending for '" + stringify(origin_id_spec) + "':");
const std::shared_ptr<const PackageID> origin_id(*(*env)[selection::RequireExactlyOne(
- generator::Matches(origin_id_spec, MatchPackageOptions()))]->begin());
+ generator::Matches(origin_id_spec, { }))]->begin());
if (0 != prev_x)
cout << std::string(stringify(prev_x).length() + stringify(y).length() + 4, '\010');
@@ -223,7 +223,7 @@ namespace
else
r.append(", ");
- const auto replacing_ids((*env)[selection::BestVersionOnly(generator::Matches(*i, MatchPackageOptions()))]);
+ const auto replacing_ids((*env)[selection::BestVersionOnly(generator::Matches(*i, { }))]);
if (replacing_ids->empty())
r.append(stringify(*i));
else if (ids->empty() || (*ids->begin())->name() != (*replacing_ids->begin())->name())
@@ -289,7 +289,7 @@ namespace
Context context("When fetching for '" + stringify(id_spec) + "':");
const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
- generator::Matches(id_spec, MatchPackageOptions()))]->begin());
+ generator::Matches(id_spec, { }))]->begin());
std::string command(cmdline.program_options.a_perform_program.argument());
if (command.empty())
@@ -363,7 +363,7 @@ namespace
JobActiveState & active_state)
{
const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
- generator::Matches(id_spec, MatchPackageOptions()))]->begin());
+ generator::Matches(id_spec, { }))]->begin());
Context context("When " + destination_string + " for '" + stringify(*id) + "':");
@@ -441,7 +441,7 @@ namespace
Context context("When removing '" + stringify(id_spec) + "':");
const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
- generator::Matches(id_spec, MatchPackageOptions()))]->begin());
+ generator::Matches(id_spec, { }))]->begin());
std::string command(cmdline.program_options.a_perform_program.argument());
if (command.empty())
@@ -560,7 +560,7 @@ namespace
continue;
}
- PackageDepSpec spec(parse_user_package_dep_spec(aa, env.get(), UserPackageDepSpecOptions() + updso_no_disambiguation));
+ PackageDepSpec spec(parse_user_package_dep_spec(aa, env.get(), { updso_no_disambiguation }));
if (package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>(
n::has_additional_requirements() = false,
n::has_category_name_part() = false,
@@ -733,7 +733,7 @@ namespace
throw InternalError(PALUDIS_HERE, "unhandled dt");
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::RequireExactlyOne(
- generator::Matches(install_item.origin_id_spec(), MatchPackageOptions()))]);
+ generator::Matches(install_item.origin_id_spec(), { }))]);
switch (part)
{
@@ -790,7 +790,7 @@ namespace
i != i_end ; ++i)
{
const std::shared_ptr<const PackageID> id(*(*env)[selection::RequireExactlyOne(
- generator::Matches(*i, MatchPackageOptions()))]->begin());
+ generator::Matches(*i, { }))]->begin());
ids->push_back(id);
}
@@ -837,7 +837,7 @@ namespace
int visit(FetchJob & fetch_item)
{
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::RequireExactlyOne(
- generator::Matches(fetch_item.origin_id_spec(), MatchPackageOptions()))]);
+ generator::Matches(fetch_item.origin_id_spec(), { }))]);
switch (part)
{
@@ -951,7 +951,7 @@ namespace
const PackageDepSpec & spec)
{
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
- generator::Matches(spec, MatchPackageOptions()))]);
+ generator::Matches(spec, { }))]);
if (ids->empty())
return stringify(spec);
else
@@ -1027,7 +1027,7 @@ namespace
std::string visit(const InstallJob & j) const
{
- const auto ids((*env)[selection::BestVersionOnly(generator::Matches(j.origin_id_spec(), MatchPackageOptions()))]);
+ const auto ids((*env)[selection::BestVersionOnly(generator::Matches(j.origin_id_spec(), { }))]);
return "installing " + stringify_id_or_spec(env, j.origin_id_spec()) + " to ::" + stringify(j.destination_repository_name())
+ maybe_replacing(env, ids, j.replacing_specs());
}
@@ -1420,7 +1420,7 @@ namespace
std::string r;
if (! j.replacing_specs()->empty())
{
- const auto origin_ids((*env)[selection::BestVersionOnly(generator::Matches(j.origin_id_spec(), MatchPackageOptions()))]);
+ const auto origin_ids((*env)[selection::BestVersionOnly(generator::Matches(j.origin_id_spec(), { }))]);
for (auto i(j.replacing_specs()->begin()), i_end(j.replacing_specs()->end()) ;
i != i_end ; ++i)
@@ -1430,7 +1430,7 @@ namespace
else
r.append(", ");
- const auto ids((*env)[selection::BestVersionOnly(generator::Matches(*i, MatchPackageOptions()))]);
+ const auto ids((*env)[selection::BestVersionOnly(generator::Matches(*i, { }))]);
if (ids->empty())
r.append(stringify(*i));
else if (origin_ids->empty() || (*origin_ids->begin())->name() != (*ids->begin())->name())
diff --git a/src/clients/cave/cmd_find_candidates.cc b/src/clients/cave/cmd_find_candidates.cc
index 3550872..3cf1789 100644
--- a/src/clients/cave/cmd_find_candidates.cc
+++ b/src/clients/cave/cmd_find_candidates.cc
@@ -214,7 +214,7 @@ FindCandidatesCommand::run_hosted(
k_end(search_options.a_matching.end_args()) ;
k != k_end ; ++k)
{
- generator::Matches m(parse_user_package_dep_spec(*k, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards), MatchPackageOptions());
+ generator::Matches m(parse_user_package_dep_spec(*k, env.get(), { updso_allow_wildcards }), { });
if (match_generator)
match_generator = std::make_shared<generator::Union>(*match_generator, m);
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index df8a474..412a8c8 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -210,7 +210,7 @@ FixLinkageCommand::run(
cout << endl;
}
- PartiallyMadePackageDepSpec part_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec part_spec({ });
part_spec.package((*pkg_it)->name());
if ((*pkg_it)->slot_key())
part_spec.slot_requirement(std::make_shared<UserSlotExactRequirement>((*pkg_it)->slot_key()->value()));
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 3de4ad5..de9ae4d 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -360,12 +360,12 @@ namespace
const std::shared_ptr<Environment> & env,
const std::string & param)
{
- PackageDepSpec spec(parse_user_package_dep_spec(param, env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec spec(parse_user_package_dep_spec(param, env.get(), { }));
const std::shared_ptr<const PackageIDSequence> installed_ids((*env)[selection::AllVersionsSorted(generator::Matches(
- spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ spec, { }) | filter::InstalledAtRoot(env->root()))]);
const std::shared_ptr<const PackageIDSequence> installable_ids((*env)[selection::BestVersionOnly(generator::Matches(
- spec, MatchPackageOptions()) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
+ spec, { }) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
if (installed_ids->empty() && installable_ids->empty())
throw NothingMatching(param);
diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc
index 115d8e9..881be22 100644
--- a/src/clients/cave/cmd_match.cc
+++ b/src/clients/cave/cmd_match.cc
@@ -360,7 +360,7 @@ MatchCommand::run(
if (capped_distance(cmdline.begin_parameters(), cmdline.end_parameters(), 2) < 2)
throw args::DoHelp("match requires at least two parameters");
- PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { }));
const std::shared_ptr<Set<std::string> > patterns(std::make_shared<Set<std::string>>());
std::copy(next(cmdline.begin_parameters()), cmdline.end_parameters(), patterns->inserter());
@@ -376,7 +376,7 @@ MatchCommand::run_hosted(
const PackageDepSpec & spec)
{
const std::shared_ptr<const PackageID> id(*((*env)[selection::RequireExactlyOne(
- generator::Matches(spec, MatchPackageOptions()))])->begin());
+ generator::Matches(spec, { }))])->begin());
std::list<std::string> texts;
diff --git a/src/clients/cave/cmd_perform.cc b/src/clients/cave/cmd_perform.cc
index f5ea726..8586faa 100644
--- a/src/clients/cave/cmd_perform.cc
+++ b/src/clients/cave/cmd_perform.cc
@@ -387,9 +387,9 @@ PerformCommand::run(
std::string action(*cmdline.begin_parameters());
PackageDepSpec spec(parse_user_package_dep_spec(*next(cmdline.begin_parameters()), env.get(),
- UserPackageDepSpecOptions()));
+ { }));
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
- generator::Matches(spec, MatchPackageOptions()))]);
+ generator::Matches(spec, { }))]);
if (ids->empty())
throw NothingMatching(spec);
else if (1 != std::distance(ids->begin(), ids->end()))
@@ -510,9 +510,9 @@ PerformCommand::run(
p_end(cmdline.a_replacing.end_args()) ;
p != p_end ; ++p)
{
- PackageDepSpec rspec(parse_user_package_dep_spec(*p, env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec rspec(parse_user_package_dep_spec(*p, env.get(), { }));
const std::shared_ptr<const PackageIDSequence> rids((*env)[selection::AllVersionsUnsorted(
- generator::Matches(rspec, MatchPackageOptions()))]);
+ generator::Matches(rspec, { }))]);
if (rids->empty())
throw NothingMatching(rspec);
else if (1 != std::distance(rids->begin(), rids->end()))
diff --git a/src/clients/cave/cmd_print_id_actions.cc b/src/clients/cave/cmd_print_id_actions.cc
index 20be20a..b9ca6d2 100644
--- a/src/clients/cave/cmd_print_id_actions.cc
+++ b/src/clients/cave/cmd_print_id_actions.cc
@@ -102,10 +102,10 @@ PrintIDActionsCommand::run(
if (1 != std::distance(cmdline.begin_parameters(), cmdline.end_parameters()))
throw args::DoHelp("print-id-actions takes exactly one parameter");
- PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { }));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, { }))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_id_contents.cc b/src/clients/cave/cmd_print_id_contents.cc
index c4b1e21..55aa430 100644
--- a/src/clients/cave/cmd_print_id_contents.cc
+++ b/src/clients/cave/cmd_print_id_contents.cc
@@ -109,10 +109,10 @@ PrintIDContentsCommand::run(
throw args::DoHelp("print-id-contents takes exactly one parameter");
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
- UserPackageDepSpecOptions(), filter::InstalledAtRoot(env->root())));
+ { }, filter::InstalledAtRoot(env->root())));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_id_masks.cc b/src/clients/cave/cmd_print_id_masks.cc
index 5ccd1b4..d8b471f 100644
--- a/src/clients/cave/cmd_print_id_masks.cc
+++ b/src/clients/cave/cmd_print_id_masks.cc
@@ -181,10 +181,10 @@ PrintIDMasksCommand::run(
if (1 != std::distance(cmdline.begin_parameters(), cmdline.end_parameters()))
throw args::DoHelp("print-id-masks takes exactly one parameter");
- PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { }));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, { }))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_id_metadata.cc b/src/clients/cave/cmd_print_id_metadata.cc
index f922839..afdbe7a 100644
--- a/src/clients/cave/cmd_print_id_metadata.cc
+++ b/src/clients/cave/cmd_print_id_metadata.cc
@@ -146,10 +146,10 @@ PrintIDMetadataCommand::run(
if (1 != std::distance(cmdline.begin_parameters(), cmdline.end_parameters()))
throw args::DoHelp("print-id-metadata takes exactly one parameter");
- PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { }));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, { }))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc
index 3b3b764..df0f52c 100644
--- a/src/clients/cave/cmd_print_ids.cc
+++ b/src/clients/cave/cmd_print_ids.cc
@@ -288,8 +288,8 @@ PrintIDsCommand::run(
m_end(cmdline.a_matching.end_args()) ;
m != m_end ; ++m)
{
- PackageDepSpec s(parse_user_package_dep_spec(*m, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards));
- g = g & generator::Matches(s, MatchPackageOptions());
+ PackageDepSpec s(parse_user_package_dep_spec(*m, env.get(), { updso_allow_wildcards }));
+ g = g & generator::Matches(s, { });
}
}
diff --git a/src/clients/cave/cmd_search.cc b/src/clients/cave/cmd_search.cc
index ee7323d..c33a0fb 100644
--- a/src/clients/cave/cmd_search.cc
+++ b/src/clients/cave/cmd_search.cc
@@ -106,7 +106,7 @@ namespace
const PackageDepSpec & spec)
{
const std::shared_ptr<const PackageID> id(*((*env)[selection::RequireExactlyOne(
- generator::Matches(spec, MatchPackageOptions()))])->begin());
+ generator::Matches(spec, { }))])->begin());
result->insert(id->name());
}
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index 59680da..854cfe8 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -199,14 +199,14 @@ namespace
{
cout << format_general_s(f::show_wildcard_heading(), stringify(s));
- const std::shared_ptr<const PackageIDSequence> names((*env)[selection::BestVersionOnly(generator::Matches(s, MatchPackageOptions()))]);
+ const std::shared_ptr<const PackageIDSequence> names((*env)[selection::BestVersionOnly(generator::Matches(s, { }))]);
if (names->empty())
throw NothingMatching(s);
for (PackageIDSequence::ConstIterator i(names->begin()), i_end(names->end()) ;
i != i_end ; ++i)
{
- PackageDepSpec name_spec(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package((*i)->name()));
+ PackageDepSpec name_spec(make_package_dep_spec({ }).package((*i)->name()));
cout << format_general_s(select_format_for_spec(env, name_spec,
f::show_wildcard_spec_installed(),
f::show_wildcard_spec_installable(),
@@ -899,7 +899,7 @@ namespace
cout << format_general_s(f::show_package_heading(), stringify(s));
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsGroupedBySlot(
- generator::Matches(s, MatchPackageOptions()))]);
+ generator::Matches(s, { }))]);
if (ids->empty())
throw NothingMatching(s);
@@ -1029,7 +1029,7 @@ namespace
const PackageDepSpec & s)
{
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(generator::Matches(s,
- MatchPackageOptions()))]);
+ { }))]);
if (ids->empty())
throw NothingMatching(s);
@@ -1072,16 +1072,15 @@ ShowCommand::run(
do_one_repository(cmdline, env, RepositoryName(*p));
else if (cmdline.a_type.argument() == "wildcard")
do_one_wildcard(env, parse_user_package_dep_spec(
- *p, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards));
+ *p, env.get(), { updso_allow_wildcards }));
else if (cmdline.a_type.argument() == "package")
do_all_packages(cmdline, env, parse_user_package_dep_spec(
- *p, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards));
+ *p, env.get(), { updso_allow_wildcards }));
else if (cmdline.a_type.argument() == "auto")
{
try
{
- PackageDepSpec spec(parse_user_package_dep_spec(*p, env.get(), UserPackageDepSpecOptions() +
- updso_throw_if_set + updso_allow_wildcards));
+ PackageDepSpec spec(parse_user_package_dep_spec(*p, env.get(), { updso_throw_if_set, updso_allow_wildcards }));
if ((! spec.package_ptr()))
do_one_wildcard(env, spec);
else
diff --git a/src/clients/cave/cmd_uninstall.cc b/src/clients/cave/cmd_uninstall.cc
index c32fbe4..80d889e 100644
--- a/src/clients/cave/cmd_uninstall.cc
+++ b/src/clients/cave/cmd_uninstall.cc
@@ -137,9 +137,9 @@ UninstallCommand::run(
for (UninstallCommandLine::ParametersConstIterator p(cmdline.begin_parameters()), p_end(cmdline.end_parameters()) ;
p != p_end ; ++p)
{
- PackageDepSpec spec(parse_user_package_dep_spec(*p, env.get(), UserPackageDepSpecOptions() + updso_allow_wildcards));
+ PackageDepSpec spec(parse_user_package_dep_spec(*p, env.get(), { updso_allow_wildcards }));
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(
- generator::Matches(spec, MatchPackageOptions()) | filter::SupportsAction<UninstallAction>())]);
+ generator::Matches(spec, { }) | filter::SupportsAction<UninstallAction>())]);
if (ids->empty())
throw NothingMatching(spec);
else if ((! cmdline.a_all_versions.specified()) && has_multiple_versions(ids))
diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc
index c682e82..ff338b3 100644
--- a/src/clients/cave/cmd_verify.cc
+++ b/src/clients/cave/cmd_verify.cc
@@ -203,10 +203,10 @@ VerifyCommand::run(
throw args::DoHelp("verify takes exactly one parameter");
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards, filter::InstalledAtRoot(env->root())));
+ { updso_allow_wildcards }, filter::InstalledAtRoot(env->root())));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/command_factory.cc b/src/clients/cave/command_factory.cc
index 825a0f8..321d5c1 100644
--- a/src/clients/cave/command_factory.cc
+++ b/src/clients/cave/command_factory.cc
@@ -121,7 +121,7 @@ CommandFactory::CommandFactory() :
if (! path.exists())
continue;
- for (DirIterator s(path, DirIteratorOptions() + dio_inode_sort), s_end ;
+ for (DirIterator s(path, { dio_inode_sort }), s_end ;
s != s_end ; ++s)
{
if (s->is_regular_file_or_symlink_to_regular_file() && s->has_permission(fs_ug_others, fs_perm_execute))
diff --git a/src/clients/cave/executables_common.cc b/src/clients/cave/executables_common.cc
index ea08d23..a1e52b0 100644
--- a/src/clients/cave/executables_common.cc
+++ b/src/clients/cave/executables_common.cc
@@ -110,9 +110,9 @@ paludis::cave::executables_common(
(*env)[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(
param, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards,
+ { updso_allow_wildcards },
filter::InstalledAtRoot(env->root()))),
- MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NoSuchPackageError(param);
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index e704ab4..da77f7a 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -273,7 +273,7 @@ namespace
if ('!' == p->first.at(0))
{
seen_packages = true;
- PackageDepSpec s(parse_user_package_dep_spec(p->first.substr(1), env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec s(parse_user_package_dep_spec(p->first.substr(1), env.get(), { }));
BlockDepSpec bs("!" + stringify(s), s, false);
result->push_back(stringify(bs));
resolver->add_target(bs, p->second);
@@ -281,7 +281,7 @@ namespace
else
{
PackageDepSpec s(parse_user_package_dep_spec(p->first, env.get(),
- UserPackageDepSpecOptions() + updso_throw_if_set));
+ { updso_throw_if_set }));
result->push_back(stringify(s));
resolver->add_target(s, p->second);
seen_packages = true;
@@ -531,7 +531,7 @@ namespace
n::destination_type() = resolvent.destination_type(),
n::nothing_is_fine_too() = true,
n::reason() = std::make_shared<PresetReason>("is scm", make_null_shared_ptr()),
- n::spec() = make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(resolvent.package()),
+ n::spec() = make_package_dep_spec({ }).package(resolvent.package()),
n::untaken() = false,
n::use_existing() = ue_only_if_transient
)));
@@ -616,7 +616,7 @@ namespace
std::shared_ptr<const PackageID> best;
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
- generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements) |
+ generator::Matches(spec, { mpo_ignore_additional_requirements }) |
filter::SupportsAction<InstallAction>() |
filter::NotMasked() |
(maybe_slot ? Filter(filter::Slot(*maybe_slot)) : Filter(filter::All())))]);
@@ -625,7 +625,7 @@ namespace
best = *ids->begin();
const std::shared_ptr<const PackageIDSequence> installed_ids((*env)[selection::BestVersionInEachSlot(
- generator::Matches(spec, MatchPackageOptions()) |
+ generator::Matches(spec, { }) |
filter::InstalledAtRoot(FSEntry("/")))]);
const args::EnumArg & arg(is_target(reason) ? resolution_options.a_target_slots : resolution_options.a_slots);
@@ -685,7 +685,7 @@ namespace
for (PackageDepSpecList::const_iterator l(list.begin()), l_end(list.end()) ;
l != l_end ; ++l)
- if (match_package(*env, *l, *id, MatchPackageOptions()))
+ if (match_package(*env, *l, *id, { }))
return true;
return false;
@@ -738,7 +738,7 @@ namespace
const std::shared_ptr<const PackageIDSequence> installed_ids(
(*env)[selection::SomeArbitraryVersion(
- generator::Matches(*dep.spec().if_package(), MatchPackageOptions()) |
+ generator::Matches(*dep.spec().if_package(), { }) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (installed_ids->empty())
return false;
@@ -851,7 +851,7 @@ namespace
{
const std::shared_ptr<const PackageIDSequence> installed_ids(
(*env)[selection::SomeArbitraryVersion(
- generator::Matches(*dep.spec().if_package(), MatchPackageOptions()) |
+ generator::Matches(*dep.spec().if_package(), { }) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (! installed_ids->empty())
return si_take;
@@ -933,7 +933,7 @@ namespace
{
for (PackageDepSpecList::const_iterator l(list.begin()), l_end(list.end()) ;
l != l_end ; ++l)
- if (match_package(*env, *l, *i, MatchPackageOptions()))
+ if (match_package(*env, *l, *i, { }))
return true;
return false;
@@ -1130,7 +1130,7 @@ namespace
for (PackageDepSpecList::const_iterator l(permit_downgrade.begin()), l_end(permit_downgrade.end()) ;
l != l_end ; ++l)
{
- if (match_package(*env, *l, *id, MatchPackageOptions()))
+ if (match_package(*env, *l, *id, { }))
return true;
}
@@ -1143,7 +1143,7 @@ namespace
for (PackageDepSpecList::const_iterator l(permit_old_version.begin()), l_end(permit_old_version.end()) ;
l != l_end ; ++l)
{
- if (match_package(*env, *l, *id, MatchPackageOptions()))
+ if (match_package(*env, *l, *id, { }))
return true;
}
@@ -1156,7 +1156,7 @@ namespace
for (PackageDepSpecList::const_iterator l(allowed_to_break_specs.begin()), l_end(allowed_to_break_specs.end()) ;
l != l_end ; ++l)
{
- if (match_package(*env, *l, *id, MatchPackageOptions()))
+ if (match_package(*env, *l, *id, { }))
return true;
}
@@ -1199,7 +1199,7 @@ namespace
spec = make_shared_copy(id->uniquely_identifying_spec());
else
{
- PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec partial_spec({ });
partial_spec.package(id->name());
if (id->slot_key())
partial_spec.slot_requirement(std::make_shared<ELikeSlotExactRequirement>(
@@ -1234,7 +1234,7 @@ namespace
{
const std::shared_ptr<ConstraintSequence> result(std::make_shared<ConstraintSequence>());
- PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec partial_spec({ });
partial_spec.package(id->name());
if (id->slot_key())
partial_spec.slot_requirement(std::make_shared<ELikeSlotExactRequirement>(
@@ -1262,7 +1262,7 @@ namespace
{
const std::shared_ptr<ConstraintSequence> result(std::make_shared<ConstraintSequence>());
- PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec partial_spec({ });
partial_spec.package(resolution->resolvent().package());
PackageDepSpec spec(partial_spec);
@@ -1620,7 +1620,7 @@ paludis::cave::resolve_common(
i_end(resolution_options.a_permit_uninstall.end_args()) ;
i != i_end ; ++i)
allowed_to_remove_specs.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_uninstalls_may_break.begin_args()),
i_end(resolution_options.a_uninstalls_may_break.end_args()) ;
@@ -1629,122 +1629,122 @@ paludis::cave::resolve_common(
allowed_to_break_system = true;
else
allowed_to_break_specs.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_remove_if_dependent.begin_args()),
i_end(resolution_options.a_remove_if_dependent.end_args()) ;
i != i_end ; ++i)
remove_if_dependent_specs.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_less_restrictive_remove_blockers.begin_args()),
i_end(resolution_options.a_less_restrictive_remove_blockers.end_args()) ;
i != i_end ; ++i)
less_restrictive_remove_blockers_specs.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_purge.begin_args()),
i_end(resolution_options.a_purge.end_args()) ;
i != i_end ; ++i)
purge_specs.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_without.begin_args()),
i_end(resolution_options.a_without.end_args()) ;
i != i_end ; ++i)
without.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_with.begin_args()),
i_end(resolution_options.a_with.end_args()) ;
i != i_end ; ++i)
with.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_take.begin_args()),
i_end(resolution_options.a_take.end_args()) ;
i != i_end ; ++i)
take.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_take_from.begin_args()),
i_end(resolution_options.a_take_from.end_args()) ;
i != i_end ; ++i)
take_from.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_ignore.begin_args()),
i_end(resolution_options.a_ignore.end_args()) ;
i != i_end ; ++i)
ignore.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_ignore_from.begin_args()),
i_end(resolution_options.a_ignore_from.end_args()) ;
i != i_end ; ++i)
ignore_from.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_favour.begin_args()),
i_end(resolution_options.a_favour.end_args()) ;
i != i_end ; ++i)
favour.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_avoid.begin_args()),
i_end(resolution_options.a_avoid.end_args()) ;
i != i_end ; ++i)
avoid.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_early.begin_args()),
i_end(resolution_options.a_early.end_args()) ;
i != i_end ; ++i)
early.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_late.begin_args()),
i_end(resolution_options.a_late.end_args()) ;
i != i_end ; ++i)
late.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_no_dependencies_from.begin_args()),
i_end(resolution_options.a_no_dependencies_from.end_args()) ;
i != i_end ; ++i)
no_dependencies_from.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_no_blockers_from.begin_args()),
i_end(resolution_options.a_no_blockers_from.end_args()) ;
i != i_end ; ++i)
no_blockers_from.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_permit_downgrade.begin_args()),
i_end(resolution_options.a_permit_downgrade.end_args()) ;
i != i_end ; ++i)
permit_downgrade.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_permit_old_version.begin_args()),
i_end(resolution_options.a_permit_old_version.end_args()) ;
i != i_end ; ++i)
permit_old_version.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
for (args::StringSetArg::ConstIterator i(resolution_options.a_not_usable.begin_args()),
i_end(resolution_options.a_not_usable.end_args()) ;
i != i_end ; ++i)
not_usable_specs.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
#ifdef ENABLE_PBINS
for (args::StringSetArg::ConstIterator i(resolution_options.a_via_binary.begin_args()),
i_end(resolution_options.a_via_binary.end_args()) ;
i != i_end ; ++i)
via_binary_specs.push_back(parse_user_package_dep_spec(*i, env.get(),
- UserPackageDepSpecOptions() + updso_allow_wildcards));
+ { updso_allow_wildcards }));
#endif
std::shared_ptr<Generator> all_binary_repos_generator, not_binary_repos_generator;
@@ -1779,7 +1779,7 @@ paludis::cave::resolve_common(
i != i_end ; ++i)
{
const std::shared_ptr<const Reason> reason(std::make_shared<PresetReason>("preset", make_null_shared_ptr()));
- PackageDepSpec spec(parse_user_package_dep_spec(*i, env.get(), UserPackageDepSpecOptions()));
+ PackageDepSpec spec(parse_user_package_dep_spec(*i, env.get(), { }));
DestinationTypes all_dts;
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
all_dts += *t;
diff --git a/src/clients/cave/select_format_for_spec.cc b/src/clients/cave/select_format_for_spec.cc
index 49c1927..d84422d 100644
--- a/src/clients/cave/select_format_for_spec.cc
+++ b/src/clients/cave/select_format_for_spec.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -38,9 +38,9 @@ paludis::cave::select_format_for_spec(
const std::string & if_unavailable
)
{
- if (! (*env)[selection::SomeArbitraryVersion(generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(FSEntry("/")))]->empty())
+ if (! (*env)[selection::SomeArbitraryVersion(generator::Matches(spec, { }) | filter::InstalledAtRoot(FSEntry("/")))]->empty())
return if_installed;
- if (! (*env)[selection::SomeArbitraryVersion(generator::Matches(spec, MatchPackageOptions()) | filter::SupportsAction<InstallAction>()
+ if (! (*env)[selection::SomeArbitraryVersion(generator::Matches(spec, { }) | filter::SupportsAction<InstallAction>()
| filter::NotMasked())]->empty())
return if_installable;
return if_unavailable;
diff --git a/src/clients/inquisitio/do_search.cc b/src/clients/inquisitio/do_search.cc
index 7b029a5..cb30866 100644
--- a/src/clients/inquisitio/do_search.cc
+++ b/src/clients/inquisitio/do_search.cc
@@ -444,7 +444,7 @@ do_search(Environment & env)
i(ids.begin()), i_end(ids.end()) ; i != i_end ; ++i)
if (i->second)
{
- task.show(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(i->first), i->second);
+ task.show(make_package_dep_spec({ }).package(i->first), i->second);
any = true;
}
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index 4b623c9..52091c0 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -186,9 +186,9 @@ int do_has_version(const std::shared_ptr<Environment> & env)
std::string query(*CommandLine::get_instance()->begin_parameters());
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(query, env.get(), UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(query, env.get(), { })));
std::shared_ptr<const PackageIDSequence> entries((*env)[selection::SomeArbitraryVersion(
- generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
return_code = 1;
@@ -204,9 +204,9 @@ int do_best_version(const std::shared_ptr<Environment> & env)
std::string query(*CommandLine::get_instance()->begin_parameters());
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(query, env.get(), UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(query, env.get(), { })));
std::shared_ptr<const PackageIDSequence> entries((*env)[selection::AllVersionsSorted(
- generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]);
/* make built_with_use work for virtuals... icky... */
while (! entries->empty())
@@ -245,9 +245,9 @@ int do_match(const std::shared_ptr<Environment> & env)
std::string query(*CommandLine::get_instance()->begin_parameters());
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(query, env.get(), UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(query, env.get(), { })));
std::shared_ptr<const PackageIDSequence> entries((*env)[selection::AllVersionsSorted(
- generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]);
while (! entries->empty())
{
@@ -289,13 +289,13 @@ int do_environment_variable(const std::shared_ptr<Environment> & env)
std::string spec_str(*CommandLine::get_instance()->begin_parameters());
std::string var_str(* next(CommandLine::get_instance()->begin_parameters()));
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
- parse_user_package_dep_spec(spec_str, env.get(), UserPackageDepSpecOptions())));
+ parse_user_package_dep_spec(spec_str, env.get(), { })));
std::shared_ptr<const PackageIDSequence> entries((*env)[selection::AllVersionsSorted(
- generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
- entries = (*env)[selection::AllVersionsSorted(generator::Matches(*spec, MatchPackageOptions()))];
+ entries = (*env)[selection::AllVersionsSorted(generator::Matches(*spec, { }))];
if (entries->empty())
throw NoSuchPackageError(spec_str);
diff --git a/src/clients/paludis/do_config.cc b/src/clients/paludis/do_config.cc
index 5639b2d..3bc40c0 100644
--- a/src/clients/paludis/do_config.cc
+++ b/src/clients/paludis/do_config.cc
@@ -77,11 +77,11 @@ namespace
Context local_context("When handling query '" + target + "':");
std::shared_ptr<PackageDepSpec> spec(
- std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(target, env.get(), UserPackageDepSpecOptions(),
+ std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(target, env.get(), { },
filter::InstalledAtRoot(env->root()))));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsUnsorted(generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ (*env)[selection::AllVersionsUnsorted(generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NoSuchPackageError(target);
diff --git a/src/clients/paludis/do_contents.cc b/src/clients/paludis/do_contents.cc
index 13c3753..d713e2b 100644
--- a/src/clients/paludis/do_contents.cc
+++ b/src/clients/paludis/do_contents.cc
@@ -87,7 +87,7 @@ do_one_contents(
filter::InstalledAtRoot(env->root()))));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NoSuchPackageError(q);
diff --git a/src/clients/paludis/do_executables.cc b/src/clients/paludis/do_executables.cc
index 51bcb08..406decb 100644
--- a/src/clients/paludis/do_executables.cc
+++ b/src/clients/paludis/do_executables.cc
@@ -139,7 +139,7 @@ do_one_executables(
filter::InstalledAtRoot(env->root()))));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]);
if (entries->empty())
throw NoSuchPackageError(q);
diff --git a/src/clients/paludis/info.cc b/src/clients/paludis/info.cc
index f5c18c5..10d47c0 100644
--- a/src/clients/paludis/info.cc
+++ b/src/clients/paludis/info.cc
@@ -219,14 +219,14 @@ int do_one_info(
Context local_context("When handling query '" + q + "':");
std::shared_ptr<PackageDepSpec> spec(
- std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(q, env.get(), UserPackageDepSpecOptions())));
+ std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(q, env.get(), { })));
std::shared_ptr<const PackageIDSequence>
- entries((*env)[selection::AllVersionsSorted(generator::Matches(*spec, MatchPackageOptions()))]),
+ entries((*env)[selection::AllVersionsSorted(generator::Matches(*spec, { }))]),
installed_entries((*env)[selection::AllVersionsSorted(
- generator::Matches(*spec, MatchPackageOptions()) | filter::InstalledAtRoot(env->root()))]),
+ generator::Matches(*spec, { }) | filter::InstalledAtRoot(env->root()))]),
installable_entries((*env)[selection::AllVersionsSorted(
- generator::Matches(*spec, MatchPackageOptions()) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
+ generator::Matches(*spec, { }) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
std::shared_ptr<PackageIDSequence> to_show_entries(std::make_shared<PackageIDSequence>());
diff --git a/src/clients/reconcilio/fix_linkage.cc b/src/clients/reconcilio/fix_linkage.cc
index 3327c57..56666a8 100644
--- a/src/clients/reconcilio/fix_linkage.cc
+++ b/src/clients/reconcilio/fix_linkage.cc
@@ -96,7 +96,7 @@ do_fix_linkage(const std::shared_ptr<Environment> & env)
std::cout << std::endl;
}
- PartiallyMadePackageDepSpec part_spec((PartiallyMadePackageDepSpecOptions()));
+ PartiallyMadePackageDepSpec part_spec({ });
part_spec.package((*pkg_it)->name());
if ((*pkg_it)->slot_key())
part_spec.slot_requirement(std::make_shared<UserSlotExactRequirement>((*pkg_it)->slot_key()->value()));
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 161b650..feb9b49 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -510,17 +510,17 @@ ConsoleInstallTask::on_display_merge_list_entry(const DepListEntry & d)
repo = std::make_shared<RepositoryName>(d.destination()->name());
std::shared_ptr<const PackageIDSequence> existing_repo((*environment())[selection::AllVersionsSorted(repo ?
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
- .package(d.package_id()->name()).in_repository(*repo), MatchPackageOptions()) :
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
- .package(d.package_id()->name()), MatchPackageOptions()) | filter::InstalledAtRoot(environment()->root())
+ generator::Matches(make_package_dep_spec({ })
+ .package(d.package_id()->name()).in_repository(*repo), { }) :
+ generator::Matches(make_package_dep_spec({ })
+ .package(d.package_id()->name()), { }) | filter::InstalledAtRoot(environment()->root())
)]);;
std::shared_ptr<const PackageIDSequence> existing_slot_repo((*environment())[selection::AllVersionsSorted((repo ?
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
- .package(d.package_id()->name()).in_repository(*repo), MatchPackageOptions()) :
- generator::Matches(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
- .package(d.package_id()->name()), MatchPackageOptions()) | filter::InstalledAtRoot(environment()->root()))
+ generator::Matches(make_package_dep_spec({ })
+ .package(d.package_id()->name()).in_repository(*repo), { }) :
+ generator::Matches(make_package_dep_spec({ })
+ .package(d.package_id()->name()), { }) | filter::InstalledAtRoot(environment()->root()))
| filter::SameSlot(d.package_id()))]);
display_merge_list_entry_start(d, m);
@@ -1444,7 +1444,7 @@ ConsoleInstallTask::display_merge_list_entry_package_tags(const DepListEntry & d
std::shared_ptr<const PackageDepSpec> spec(
std::static_pointer_cast<const DependencyDepTag>(tag->tag())->dependency());
if (d.kind() != dlk_masked && d.kind() != dlk_block && (*environment())[selection::SomeArbitraryVersion(
- generator::Matches(*spec, MatchPackageOptions()) |
+ generator::Matches(*spec, { }) |
filter::InstalledAtRoot(environment()->root()))]->empty())
unsatisfied_dependents.insert(tag->tag()->short_text());
else
@@ -1683,7 +1683,7 @@ ConsoleInstallTask::on_all_masked_error(const AllMaskedError & e)
{
std::shared_ptr<const PackageIDSequence> p(
(*environment())[selection::AllVersionsSorted(
- generator::Matches(e.query(), MatchPackageOptions())
+ generator::Matches(e.query(), { })
| filter::SupportsAction<InstallAction>())]);
if (p->empty())
{
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index fdecc5e..a110a19 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -92,7 +92,7 @@ ConsoleQueryTask::show(const PackageDepSpec & a, const std::shared_ptr<const Pac
if (! a.package_ptr())
{
std::shared_ptr<const PackageIDSequence> entries(
- (*_imp->env)[selection::BestVersionOnly(generator::Matches(a, MatchPackageOptions()))]);
+ (*_imp->env)[selection::BestVersionOnly(generator::Matches(a, { }))]);
if (entries->empty())
throw NoSuchPackageError(stringify(a));
@@ -115,9 +115,9 @@ ConsoleQueryTask::show_one(const PackageDepSpec & a, const std::shared_ptr<const
/* prefer the best installed version, then the best visible version, then
* the best version */
std::shared_ptr<const PackageIDSequence>
- entries((*_imp->env)[selection::AllVersionsSorted(generator::Matches(a, MatchPackageOptions()))]),
+ entries((*_imp->env)[selection::AllVersionsSorted(generator::Matches(a, { }))]),
preferred_entries((*_imp->env)[selection::AllVersionsSorted(
- generator::Matches(a, MatchPackageOptions()) | filter::InstalledAtRoot(_imp->env->root()))]);
+ generator::Matches(a, { }) | filter::InstalledAtRoot(_imp->env->root()))]);
if (entries->empty())
throw NoSuchPackageError(stringify(a));
if (preferred_entries->empty())