aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-13 11:24:45 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-13 11:24:45 +0100
commite7e7b6edd8ccb6f314cef1f6d7abf8352616b38e (patch)
tree33f3ab4fc93139e364e08178a5503022169476a9
parente37860d45510f9fc35649e9c00ced04900457f14 (diff)
downloadpaludis-e7e7b6edd8ccb6f314cef1f6d7abf8352616b38e.tar.gz
paludis-e7e7b6edd8ccb6f314cef1f6d7abf8352616b38e.tar.xz
Rename spec tree root to top
-rw-r--r--doc/api/cplusplus/examples/example_dep_label.cc2
-rw-r--r--doc/api/cplusplus/examples/example_dep_spec_flattener.cc6
-rw-r--r--doc/api/cplusplus/examples/example_dep_tag.cc2
-rw-r--r--paludis/comma_separated_dep_parser.cc2
-rw-r--r--paludis/comma_separated_dep_parser_TEST.cc2
-rw-r--r--paludis/common_sets.cc4
-rw-r--r--paludis/dep_spec_flattener.cc2
-rw-r--r--paludis/environment_implementation.cc12
-rw-r--r--paludis/legacy/dep_list.cc40
-rw-r--r--paludis/legacy/dep_list_TEST.cc12
-rw-r--r--paludis/legacy/install_task.cc44
-rw-r--r--paludis/legacy/query_visitor.cc10
-rw-r--r--paludis/legacy/range_rewriter_TEST.cc6
-rw-r--r--paludis/legacy/show_suggest_visitor.cc2
-rw-r--r--paludis/legacy/uninstall_task.cc6
-rw-r--r--paludis/match_package.cc2
-rw-r--r--paludis/report_task.cc4
-rw-r--r--paludis/repositories/accounts/accounts_dep_key.cc2
-rw-r--r--paludis/repositories/cran/cran_dep_parser.cc2
-rw-r--r--paludis/repositories/cran/cran_dep_parser_TEST.cc12
-rw-r--r--paludis/repositories/cran/keys.cc4
-rw-r--r--paludis/repositories/e/aa_visitor_TEST.cc2
-rw-r--r--paludis/repositories/e/can_skip_phase.cc2
-rw-r--r--paludis/repositories/e/dep_parser.cc14
-rw-r--r--paludis/repositories/e/dep_parser_TEST.cc88
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer_TEST.cc22
-rw-r--r--paludis/repositories/e/e_choices_key.cc2
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc2
-rw-r--r--paludis/repositories/e/e_key.cc30
-rw-r--r--paludis/repositories/e/e_repository.cc32
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc8
-rw-r--r--paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc6
-rw-r--r--paludis/repositories/e/e_repository_sets.cc4
-rw-r--r--paludis/repositories/e/e_repository_sets_TEST.cc6
-rw-r--r--paludis/repositories/e/ebuild.cc2
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc6
-rw-r--r--paludis/repositories/e/ebuild_id.cc4
-rw-r--r--paludis/repositories/e/exheres_profile.cc2
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc2
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc4
-rw-r--r--paludis/repositories/e/fix_locked_dependencies_TEST.cc8
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc4
-rw-r--r--paludis/repositories/e/traditional_profile.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc4
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc6
-rw-r--r--paludis/repositories/fake/dep_parser.cc10
-rw-r--r--paludis/repositories/fake/dep_parser_TEST.cc2
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc2
-rw-r--r--paludis/repositories/fake/fake_package_id.cc2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc4
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc4
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.cc4
-rw-r--r--paludis/repositories/unwritten/unwritten_repository_file.cc6
-rw-r--r--paludis/repositories/virtuals/package_id.cc2
-rw-r--r--paludis/resolver/decider.cc24
-rw-r--r--paludis/resolver/resolver.cc4
-rw-r--r--paludis/resolver/sanitised_dependencies.cc8
-rw-r--r--paludis/resolver/spec_rewriter.cc4
-rw-r--r--paludis/set_file.cc12
-rw-r--r--paludis/set_file_TEST.cc16
-rw-r--r--paludis/spec_tree.cc12
-rw-r--r--paludis/spec_tree.hh6
-rw-r--r--paludis/uninstall_list.cc20
-rw-r--r--paludis/uninstall_list_TEST.cc14
-rw-r--r--paludis/user_dep_spec.cc14
-rw-r--r--python/dep_list.cc2
-rw-r--r--python/dep_spec.cc4
-rw-r--r--ruby/dep_spec.cc6
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc4
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc4
-rw-r--r--src/clients/cave/cmd_match.cc12
-rw-r--r--src/clients/cave/cmd_print_set.cc4
-rw-r--r--src/clients/cave/cmd_show.cc4
-rw-r--r--src/clients/inquisitio/key_extractor.cc14
-rw-r--r--src/clients/paludis/query.cc2
-rw-r--r--src/output/console_query_task.cc2
76 files changed, 334 insertions, 334 deletions
diff --git a/doc/api/cplusplus/examples/example_dep_label.cc b/doc/api/cplusplus/examples/example_dep_label.cc
index 8c01e97..3dcbfc0 100644
--- a/doc/api/cplusplus/examples/example_dep_label.cc
+++ b/doc/api/cplusplus/examples/example_dep_label.cc
@@ -176,7 +176,7 @@ int main(int argc, char * argv[])
/* Create a visitor that will collect distfiles, and do the collecting. */
DistfilesCollector collector(results, is_initial_label_restricted.result);
- (*i)->fetches_key()->value()->root()->accept(collector);
+ (*i)->fetches_key()->value()->top()->accept(collector);
}
/* Display summary of results */
diff --git a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
index d930853..a1a2720 100644
--- a/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
+++ b/doc/api/cplusplus/examples/example_dep_spec_flattener.cc
@@ -60,7 +60,7 @@ int main(int argc, char * argv[])
DepSpecFlattener<ProvideSpecTree, PackageDepSpec> provides(env.get());
/* Populate it by making it visit the key's value */
- (*i)->provide_key()->value()->root()->accept(provides);
+ (*i)->provide_key()->value()->top()->accept(provides);
/* The results are available through DepSpecFlattener::begin()
* and ::end(). These return an iterator to a std::shared_ptr<>,
@@ -74,7 +74,7 @@ int main(int argc, char * argv[])
if ((*i)->homepage_key())
{
DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec> homepages(env.get());
- (*i)->homepage_key()->value()->root()->accept(homepages);
+ (*i)->homepage_key()->value()->top()->accept(homepages);
cout << " " << left << setw(24) << "Homepages:" << " "
<< join(indirect_iterator(homepages.begin()), indirect_iterator(homepages.end()), " ")
@@ -93,7 +93,7 @@ int main(int argc, char * argv[])
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(env.get());
simple_visitor_cast<const MetadataSpecTreeKey<PlainTextSpecTree> >(
- **(*i)->find_metadata("RESTRICT"))->value()->root()->accept(restricts);
+ **(*i)->find_metadata("RESTRICT"))->value()->top()->accept(restricts);
cout << " " << left << setw(24) << "Restricts:" << " "
<< join(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()), " ")
diff --git a/doc/api/cplusplus/examples/example_dep_tag.cc b/doc/api/cplusplus/examples/example_dep_tag.cc
index e3b85ac..4c50a36 100644
--- a/doc/api/cplusplus/examples/example_dep_tag.cc
+++ b/doc/api/cplusplus/examples/example_dep_tag.cc
@@ -90,7 +90,7 @@ namespace
/* The set isn't necessarily flat. We use DepSpecFlattener to make it
* so, rather than writing a full visitor ourselves. */
DepSpecFlattener<SetSpecTree, PackageDepSpec> set_flat(env.get());
- set->root()->accept(set_flat);
+ set->top()->accept(set_flat);
cout << "Set '" << name << "':" << endl;
diff --git a/paludis/comma_separated_dep_parser.cc b/paludis/comma_separated_dep_parser.cc
index 85b4c85..3eb6d89 100644
--- a/paludis/comma_separated_dep_parser.cc
+++ b/paludis/comma_separated_dep_parser.cc
@@ -49,7 +49,7 @@ CommaSeparatedDepParser::parse(const Environment * const env, const std::string
continue;
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(a, env, { updso_no_disambiguation })));
- result->root()->append(spec);
+ result->top()->append(spec);
}
return result;
diff --git a/paludis/comma_separated_dep_parser_TEST.cc b/paludis/comma_separated_dep_parser_TEST.cc
index e4506e7..79817c8 100644
--- a/paludis/comma_separated_dep_parser_TEST.cc
+++ b/paludis/comma_separated_dep_parser_TEST.cc
@@ -40,7 +40,7 @@ namespace test_cases
CommaSeparatedDepParser::parse(&env, "cat/one , cat/two, cat/three\n"));
StringifyFormatter f;
CommaSeparatedDepPrinter p(&env, f, true);
- spec->root()->accept(p);
+ spec->top()->accept(p);
TEST_CHECK_EQUAL(p.result(), "cat/one, cat/two, cat/three");
}
} test_dep_parser;
diff --git a/paludis/common_sets.cc b/paludis/common_sets.cc
index f5871fa..183c2a4 100644
--- a/paludis/common_sets.cc
+++ b/paludis/common_sets.cc
@@ -56,14 +56,14 @@ namespace
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
if (slots && (*i)->slot_key())
- result->root()->append(std::make_shared<PackageDepSpec>(
+ result->top()->append(std::make_shared<PackageDepSpec>(
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>(
+ result->top()->append(std::make_shared<PackageDepSpec>(
make_package_dep_spec({ })
.package((*i)->name())
));
diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc
index bf9835b..6cfb6b4 100644
--- a/paludis/dep_spec_flattener.cc
+++ b/paludis/dep_spec_flattener.cc
@@ -255,7 +255,7 @@ DepSpecFlattener<Heirarchy_, Item_>::handle_named_set(const NamedSetDepSpec & sp
if (! set)
throw NoSuchSetError(stringify(spec.name()));
- set->root()->accept(*this);
+ set->top()->accept(*this);
_imp->recursing_sets.erase(spec.name());
}
diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc
index 594f770..1fda482 100644
--- a/paludis/environment_implementation.cc
+++ b/paludis/environment_implementation.cc
@@ -49,22 +49,22 @@ namespace
struct CombineSets
{
- std::shared_ptr<AllDepSpec> root;
+ std::shared_ptr<AllDepSpec> top;
std::shared_ptr<SetSpecTree> tree;
void add(const SetName & s)
{
- tree->root()->append(std::make_shared<NamedSetDepSpec>(s));
+ tree->top()->append(std::make_shared<NamedSetDepSpec>(s));
}
CombineSets() :
- root(std::make_shared<AllDepSpec>()),
- tree(std::make_shared<SetSpecTree>(root))
+ top(std::make_shared<AllDepSpec>()),
+ tree(std::make_shared<SetSpecTree>(top))
{
}
CombineSets(const CombineSets & other) :
- root(other.root),
+ top(other.top),
tree(other.tree)
{
}
@@ -320,7 +320,7 @@ namespace
<< "The 'everything' set is deprecated. Use either 'installed-packages' or 'installed-slots' instead";
std::shared_ptr<SetSpecTree> result(std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>()));
- result->root()->append(std::make_shared<NamedSetDepSpec>(SetName("installed-packages")));
+ result->top()->append(std::make_shared<NamedSetDepSpec>(SetName("installed-packages")));
return result;
}
}
diff --git a/paludis/legacy/dep_list.cc b/paludis/legacy/dep_list.cc
index 8558dbb..f945bb0 100644
--- a/paludis/legacy/dep_list.cc
+++ b/paludis/legacy/dep_list.cc
@@ -702,7 +702,7 @@ DepList::AddVisitor::visit(const DependencySpecTree::NodeType<NamedSetDepSpec>::
throw RecursivelyDefinedSetError(stringify(node.spec()->name()));
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
recursing_sets.erase(node.spec()->name());
}
@@ -1108,7 +1108,7 @@ DepList::add(const SetSpecTree & spec, const std::shared_ptr<const DestinationsS
_imp->current_top_level_target ? _imp->current_top_level_target : &spec);
AddVisitor visitor(this, false, destinations);
- spec.root()->accept(visitor);
+ spec.top()->accept(visitor);
transaction.commit();
}
@@ -1116,7 +1116,7 @@ void
DepList::add(const PackageDepSpec & spec, const std::shared_ptr<const DestinationsSet> & destinations)
{
SetSpecTree tree(std::make_shared<AllDepSpec>());
- tree.root()->append(std::make_shared<PackageDepSpec>(spec));
+ tree.top()->append(std::make_shared<PackageDepSpec>(spec));
add(tree, destinations);
}
@@ -1171,7 +1171,7 @@ DepList::add_package(const std::shared_ptr<const PackageID> & p, const std::shar
if (p->provide_key())
{
DepSpecFlattener<ProvideSpecTree, PackageDepSpec> f(_imp->env);
- p->provide_key()->value()->root()->accept(f);
+ p->provide_key()->value()->top()->accept(f);
if (f.begin() != f.end() && ! (*DistributionData::get_instance()->distribution_from_string(
_imp->env->distribution())).support_old_style_virtuals())
@@ -1223,7 +1223,7 @@ DepList::add_package(const std::shared_ptr<const PackageID> & p, const std::shar
Save<MergeList::iterator> suggest_save_merge_list_insert_position(&_imp->merge_list_insert_position,
next(our_merge_entry_position));
ShowSuggestVisitor visitor(this, destinations, _imp->env, _imp->current_package_id(), _imp->opts->dependency_tags(), false);
- p->suggested_dependencies_key()->value()->root()->accept(visitor);
+ p->suggested_dependencies_key()->value()->top()->accept(visitor);
}
/* add suggests in post depend too */
@@ -1233,34 +1233,34 @@ DepList::add_package(const std::shared_ptr<const PackageID> & p, const std::shar
Save<MergeList::iterator> suggest_save_merge_list_insert_position(&_imp->merge_list_insert_position,
next(our_merge_entry_position));
ShowSuggestVisitor visitor(this, destinations, _imp->env, _imp->current_package_id(), _imp->opts->dependency_tags(), true);
- p->post_dependencies_key()->value()->root()->accept(visitor);
+ p->post_dependencies_key()->value()->top()->accept(visitor);
}
/* add pre dependencies */
if (p->build_dependencies_key())
- add_predeps(*p->build_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_pre(), "build", destinations, false);
+ add_predeps(*p->build_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_pre(), "build", destinations, false);
if (p->run_dependencies_key())
- add_predeps(*p->run_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_runtime(), "run", destinations, false);
+ add_predeps(*p->run_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_runtime(), "run", destinations, false);
if (p->post_dependencies_key())
- add_predeps(*p->post_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_post(), "post", destinations,
+ add_predeps(*p->post_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_post(), "post", destinations,
(_imp->opts->suggested() == dl_suggested_install) ? false : true);
if (_imp->opts->suggested() == dl_suggested_install && p->suggested_dependencies_key())
- add_predeps(*p->suggested_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_suggested(), "suggest", destinations, false);
+ add_predeps(*p->suggested_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_suggested(), "suggest", destinations, false);
our_merge_entry_position->state() = dle_has_pre_deps;
_imp->merge_list_insert_position = next(our_merge_entry_post_position);
/* add post dependencies */
if (p->build_dependencies_key())
- add_postdeps(*p->build_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_pre(), "build", destinations, false);
+ add_postdeps(*p->build_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_pre(), "build", destinations, false);
if (p->run_dependencies_key())
- add_postdeps(*p->run_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_runtime(), "run", destinations, false);
+ add_postdeps(*p->run_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_runtime(), "run", destinations, false);
if (p->post_dependencies_key())
- add_postdeps(*p->post_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_post(), "post", destinations,
+ add_postdeps(*p->post_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_post(), "post", destinations,
(_imp->opts->suggested() == dl_suggested_install) ? false : true);
if (_imp->opts->suggested() == dl_suggested_install && p->suggested_dependencies_key())
- add_postdeps(*p->suggested_dependencies_key()->value()->root(), _imp->opts->uninstalled_deps_suggested(), "suggest", destinations, false);
+ add_postdeps(*p->suggested_dependencies_key()->value()->top(), _imp->opts->uninstalled_deps_suggested(), "suggest", destinations, false);
our_merge_entry_position->state() = dle_has_all_deps;
}
@@ -1437,21 +1437,21 @@ DepList::add_already_installed_package(const std::shared_ptr<const PackageID> &
our_merge_entry);
if (p->build_dependencies_key())
- add_predeps(*p->build_dependencies_key()->value()->root(), _imp->opts->installed_deps_pre(), "build", destinations, false);
+ add_predeps(*p->build_dependencies_key()->value()->top(), _imp->opts->installed_deps_pre(), "build", destinations, false);
if (p->run_dependencies_key())
- add_predeps(*p->run_dependencies_key()->value()->root(), _imp->opts->installed_deps_runtime(), "run", destinations, false);
+ add_predeps(*p->run_dependencies_key()->value()->top(), _imp->opts->installed_deps_runtime(), "run", destinations, false);
if (p->post_dependencies_key())
- add_predeps(*p->post_dependencies_key()->value()->root(), _imp->opts->installed_deps_post(), "post", destinations, true);
+ add_predeps(*p->post_dependencies_key()->value()->top(), _imp->opts->installed_deps_post(), "post", destinations, true);
our_merge_entry->state() = dle_has_pre_deps;
_imp->merge_list_insert_position = next(our_merge_entry);
if (p->build_dependencies_key())
- add_postdeps(*p->build_dependencies_key()->value()->root(), _imp->opts->installed_deps_pre(), "build", destinations, false);
+ add_postdeps(*p->build_dependencies_key()->value()->top(), _imp->opts->installed_deps_pre(), "build", destinations, false);
if (p->run_dependencies_key())
- add_postdeps(*p->run_dependencies_key()->value()->root(), _imp->opts->installed_deps_runtime(), "run", destinations, false);
+ add_postdeps(*p->run_dependencies_key()->value()->top(), _imp->opts->installed_deps_runtime(), "run", destinations, false);
if (p->post_dependencies_key())
- add_postdeps(*p->post_dependencies_key()->value()->root(), _imp->opts->installed_deps_post(), "post", destinations, true);
+ add_postdeps(*p->post_dependencies_key()->value()->top(), _imp->opts->installed_deps_post(), "post", destinations, true);
}
namespace
diff --git a/paludis/legacy/dep_list_TEST.cc b/paludis/legacy/dep_list_TEST.cc
index 2873553..487f16f 100644
--- a/paludis/legacy/dep_list_TEST.cc
+++ b/paludis/legacy/dep_list_TEST.cc
@@ -2165,14 +2165,14 @@ namespace test_cases
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, { })));
- t3->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/two", &env, { })));
+ t3->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, { })));
+ t3->top()->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, { })));
- t4->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/three", &env, { })));
+ t4->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, { })));
+ t4->top()->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;
@@ -2215,8 +2215,8 @@ namespace test_cases
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, { })));
- t2->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/two", &env, { })));
+ t2->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/one", &env, { })));
+ t2->top()->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");
}
diff --git a/paludis/legacy/install_task.cc b/paludis/legacy/install_task.cc
index 7d8cd55..a4d93d2 100644
--- a/paludis/legacy/install_task.cc
+++ b/paludis/legacy/install_task.cc
@@ -499,7 +499,7 @@ InstallTask::_add_target(const std::string & target)
{
/* no wildcards */
spec->set_tag(std::shared_ptr<const DepTag>(std::make_shared<TargetDepTag>()));
- _imp->targets->root()->append(spec);
+ _imp->targets->top()->append(spec);
}
else
{
@@ -510,7 +510,7 @@ InstallTask::_add_target(const std::string & target)
{
/* no match. we'll get an error from this later anyway. */
spec->set_tag(std::shared_ptr<const DepTag>(std::make_shared<TargetDepTag>()));
- _imp->targets->root()->append(spec);
+ _imp->targets->top()->append(spec);
}
else
for (PackageIDSequence::ConstIterator i(names->begin()), i_end(names->end()) ;
@@ -520,7 +520,7 @@ InstallTask::_add_target(const std::string & target)
p.package((*i)->name());
std::shared_ptr<PackageDepSpec> specn(std::make_shared<PackageDepSpec>(p));
specn->set_tag(std::shared_ptr<const DepTag>(std::make_shared<TargetDepTag>()));
- _imp->targets->root()->append(specn);
+ _imp->targets->top()->append(specn);
}
}
@@ -534,7 +534,7 @@ InstallTask::_add_target(const std::string & target)
throw HadBothPackageAndSetTargets();
_imp->had_set_targets = true;
- _imp->targets->root()->append(std::make_shared<NamedSetDepSpec>(SetName(target)));
+ _imp->targets->top()->append(std::make_shared<NamedSetDepSpec>(SetName(target)));
if (! _imp->override_target_type)
_imp->dep_list.options()->target_type() = dl_target_set;
@@ -569,7 +569,7 @@ InstallTask::_add_package_id(const std::shared_ptr<const PackageID> & target)
std::shared_ptr<PackageDepSpec> spec(make_shared_copy(PackageDepSpec(part_spec)));
spec->set_tag(std::shared_ptr<const DepTag>(std::make_shared<TargetDepTag>()));
- _imp->targets->root()->append(spec);
+ _imp->targets->top()->append(spec);
_imp->raw_targets.push_back(stringify(*spec));
}
@@ -1190,10 +1190,10 @@ InstallTask::_do_world_updates()
t != t_end ; ++t)
{
if (s_had_package_targets)
- all->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(*t, _imp->env,
+ all->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(*t, _imp->env,
{ })));
else
- all->root()->append(std::make_shared<NamedSetDepSpec>(SetName(*t)));
+ all->top()->append(std::make_shared<NamedSetDepSpec>(SetName(*t)));
}
if (s_had_package_targets)
@@ -1476,7 +1476,7 @@ void
InstallTask::world_update_packages(const std::shared_ptr<const SetSpecTree> & a)
{
WorldTargetFinder w(_imp->env, this);
- a->root()->accept(w);
+ a->top()->accept(w);
}
bool
@@ -1570,7 +1570,7 @@ namespace
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
recursing_sets.erase(node.spec()->name());
}
@@ -1587,23 +1587,23 @@ InstallTask::_unsatisfied(const DepListEntry & e) const
if (dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_pre() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_pre())
if (e.package_id()->build_dependencies_key())
- e.package_id()->build_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->build_dependencies_key()->value()->top()->accept(v);
if (dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_runtime() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_runtime())
if (e.package_id()->run_dependencies_key())
- e.package_id()->run_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->run_dependencies_key()->value()->top()->accept(v);
if (dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_post() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_post())
if (e.package_id()->post_dependencies_key())
- e.package_id()->post_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->post_dependencies_key()->value()->top()->accept(v);
if ((dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_suggested() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_suggested())
&& dl_suggested_install == _imp->dep_list.options()->suggested())
if (e.package_id()->suggested_dependencies_key())
- e.package_id()->suggested_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->suggested_dependencies_key()->value()->top()->accept(v);
return v.failure;
}
@@ -1744,23 +1744,23 @@ namespace
if (dl_deps_pre == dep_list.options()->uninstalled_deps_pre() ||
dl_deps_pre_or_post == dep_list.options()->uninstalled_deps_pre())
if ((*i)->build_dependencies_key())
- (*i)->build_dependencies_key()->value()->root()->accept(v);
+ (*i)->build_dependencies_key()->value()->top()->accept(v);
if (dl_deps_pre == dep_list.options()->uninstalled_deps_runtime() ||
dl_deps_pre_or_post == dep_list.options()->uninstalled_deps_runtime())
if ((*i)->run_dependencies_key())
- (*i)->run_dependencies_key()->value()->root()->accept(v);
+ (*i)->run_dependencies_key()->value()->top()->accept(v);
if (dl_deps_pre == dep_list.options()->uninstalled_deps_post() ||
dl_deps_pre_or_post == dep_list.options()->uninstalled_deps_post())
if ((*i)->post_dependencies_key())
- (*i)->post_dependencies_key()->value()->root()->accept(v);
+ (*i)->post_dependencies_key()->value()->top()->accept(v);
if ((dl_deps_pre == dep_list.options()->uninstalled_deps_suggested() ||
dl_deps_pre_or_post == dep_list.options()->uninstalled_deps_suggested())
&& dl_suggested_install == dep_list.options()->suggested())
if ((*i)->suggested_dependencies_key())
- (*i)->suggested_dependencies_key()->value()->root()->accept(v);
+ (*i)->suggested_dependencies_key()->value()->top()->accept(v);
if (v.failure)
{
@@ -1794,7 +1794,7 @@ namespace
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
recursing_sets.erase(node.spec()->name());
}
@@ -1828,23 +1828,23 @@ InstallTask::_dependent(const DepListEntry & e) const
if (dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_pre() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_pre())
if (e.package_id()->build_dependencies_key())
- e.package_id()->build_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->build_dependencies_key()->value()->top()->accept(v);
if (dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_runtime() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_runtime())
if (e.package_id()->run_dependencies_key())
- e.package_id()->run_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->run_dependencies_key()->value()->top()->accept(v);
if (dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_post() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_post())
if (e.package_id()->post_dependencies_key())
- e.package_id()->post_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->post_dependencies_key()->value()->top()->accept(v);
if ((dl_deps_pre == _imp->dep_list.options()->uninstalled_deps_suggested() ||
dl_deps_pre_or_post == _imp->dep_list.options()->uninstalled_deps_suggested())
&& dl_suggested_install == _imp->dep_list.options()->suggested())
if (e.package_id()->suggested_dependencies_key())
- e.package_id()->suggested_dependencies_key()->value()->root()->accept(v);
+ e.package_id()->suggested_dependencies_key()->value()->top()->accept(v);
return v.failure;
}
diff --git a/paludis/legacy/query_visitor.cc b/paludis/legacy/query_visitor.cc
index 9755ef9..d089b70 100644
--- a/paludis/legacy/query_visitor.cc
+++ b/paludis/legacy/query_visitor.cc
@@ -129,7 +129,7 @@ QueryVisitor::visit(const DependencySpecTree::NodeType<NamedSetDepSpec>::Type &
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
_imp->recursing_sets.erase(node.spec()->name());
}
@@ -166,8 +166,8 @@ QueryVisitor::visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type & node)
if (r.spec())
{
DependencySpecTree tree(std::make_shared<AllDepSpec>());
- tree.root()->append(r.spec());
- tree.root()->accept(*this);
+ tree.top()->append(r.spec());
+ tree.top()->accept(*this);
}
else
for (DependencySpecTree::NodeType<AnyDepSpec>::Type::ConstIterator c(node.begin()), c_end(node.end()) ;
@@ -186,8 +186,8 @@ void
QueryVisitor::visit(const DependencySpecTree::NodeType<BlockDepSpec>::Type & node)
{
DependencySpecTree tree(std::make_shared<AllDepSpec>());
- tree.root()->append(std::static_pointer_cast<const PackageDepSpec>(node.spec()->blocking().clone()));
- tree.root()->accept(*this);
+ tree.top()->append(std::static_pointer_cast<const PackageDepSpec>(node.spec()->blocking().clone()));
+ tree.top()->accept(*this);
_imp->result = !_imp->result;
}
diff --git a/paludis/legacy/range_rewriter_TEST.cc b/paludis/legacy/range_rewriter_TEST.cc
index 9cadfbf..e97f24d 100644
--- a/paludis/legacy/range_rewriter_TEST.cc
+++ b/paludis/legacy/range_rewriter_TEST.cc
@@ -44,14 +44,14 @@ 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",
+ a->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("=a/b-1",
&env, { })));
- a->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("=a/b-2",
+ a->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("=a/b-2",
&env, { })));
RangeRewriter r;
TEST_CHECK(! r.spec());
- std::for_each(indirect_iterator(a->root()->begin()), indirect_iterator(a->root()->end()), accept_visitor(r));
+ std::for_each(indirect_iterator(a->top()->begin()), indirect_iterator(a->top()->end()), accept_visitor(r));
TEST_CHECK(bool(r.spec()));
TEST_CHECK(bool(r.spec()));
diff --git a/paludis/legacy/show_suggest_visitor.cc b/paludis/legacy/show_suggest_visitor.cc
index cbb6363..9266135 100644
--- a/paludis/legacy/show_suggest_visitor.cc
+++ b/paludis/legacy/show_suggest_visitor.cc
@@ -254,7 +254,7 @@ ShowSuggestVisitor::visit(const DependencySpecTree::NodeType<NamedSetDepSpec>::T
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
_imp->recursing_sets.erase(node.spec()->name());
}
diff --git a/paludis/legacy/uninstall_task.cc b/paludis/legacy/uninstall_task.cc
index 5026aaa..888f056 100644
--- a/paludis/legacy/uninstall_task.cc
+++ b/paludis/legacy/uninstall_task.cc
@@ -209,7 +209,7 @@ UninstallTask::add_target(const std::string & target)
std::shared_ptr<const SetSpecTree> spec(_imp->env->set(SetName(target)));
DepSpecFlattener<SetSpecTree, PackageDepSpec> f(_imp->env);
- spec->root()->accept(f);
+ spec->top()->accept(f);
std::copy(f.begin(), f.end(), std::back_inserter(_imp->targets));
}
@@ -339,7 +339,7 @@ UninstallTask::execute()
remove = false;
if (remove)
- all->root()->append(std::make_shared<PackageDepSpec>(make_package_dep_spec(
+ all->top()->append(std::make_shared<PackageDepSpec>(make_package_dep_spec(
{ }).package(i->first)));
}
@@ -484,7 +484,7 @@ void
UninstallTask::world_remove_packages(const std::shared_ptr<const SetSpecTree> & a)
{
WorldTargetFinder w(_imp->env, this);
- a->root()->accept(w);
+ a->top()->accept(w);
}
template class WrappedForwardIterator<AmbiguousUnmergeTargetError::ConstIteratorTag, const std::shared_ptr<const PackageID> >;
diff --git a/paludis/match_package.cc b/paludis/match_package.cc
index 429f680..4b770d5 100644
--- a/paludis/match_package.cc
+++ b/paludis/match_package.cc
@@ -234,7 +234,7 @@ paludis::match_package_in_set(
using namespace std::placeholders;
DepSpecFlattener<SetSpecTree, PackageDepSpec> f(&env);
- target.root()->accept(f);
+ target.top()->accept(f);
return indirect_iterator(f.end()) != std::find_if(
indirect_iterator(f.begin()), indirect_iterator(f.end()),
std::bind(&match_package, std::cref(env), _1, std::cref(entry), std::cref(options)));
diff --git a/paludis/report_task.cc b/paludis/report_task.cc
index 2515e94..22abd8a 100644
--- a/paludis/report_task.cc
+++ b/paludis/report_task.cc
@@ -89,7 +89,7 @@ namespace
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
_recursing_sets.erase(node.spec()->name());
}
@@ -152,7 +152,7 @@ ReportTask::execute()
{
std::shared_ptr<const SetSpecTree> insecure(_imp->env->set(SetName("insecurity")));
if (insecure)
- insecure->root()->accept(vuln);
+ insecure->top()->accept(vuln);
}
catch (const NotAvailableError &)
{
diff --git a/paludis/repositories/accounts/accounts_dep_key.cc b/paludis/repositories/accounts/accounts_dep_key.cc
index 3b3d15a..24c879b 100644
--- a/paludis/repositories/accounts/accounts_dep_key.cc
+++ b/paludis/repositories/accounts/accounts_dep_key.cc
@@ -58,7 +58,7 @@ namespace paludis
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);
+ tree->top()->append(spec);
}
initial_labels->push_back(std::make_shared<DependenciesBuildLabel>("build", return_literal_function(true)));
diff --git a/paludis/repositories/cran/cran_dep_parser.cc b/paludis/repositories/cran/cran_dep_parser.cc
index e96d488..2ae206b 100644
--- a/paludis/repositories/cran/cran_dep_parser.cc
+++ b/paludis/repositories/cran/cran_dep_parser.cc
@@ -68,7 +68,7 @@ cranrepository::parse_depends(const std::string & s)
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(cranrepository::parse_cran_package_dep_spec(
strip_leading(strip_trailing(*a, " \r\n\t"), " \r\n\t"))));
- result->root()->append(spec);
+ result->top()->append(spec);
}
return result;
diff --git a/paludis/repositories/cran/cran_dep_parser_TEST.cc b/paludis/repositories/cran/cran_dep_parser_TEST.cc
index 677859e..19766a1 100644
--- a/paludis/repositories/cran/cran_dep_parser_TEST.cc
+++ b/paludis/repositories/cran/cran_dep_parser_TEST.cc
@@ -44,29 +44,29 @@ namespace test_cases
// test R dependency
std::string dep1("R (>= 2.0.0)");
- cranrepository::parse_depends(dep1)->root()->accept(d1);
+ cranrepository::parse_depends(dep1)->top()->accept(d1);
TEST_CHECK_EQUAL(stringify(d1), "R (>= 2.0.0)");
// test varying whitespaces
std::string dep2("testpackage1 \t(<1.9)");
- cranrepository::parse_depends(dep2)->root()->accept(d2);
+ cranrepository::parse_depends(dep2)->top()->accept(d2);
TEST_CHECK_EQUAL(stringify(d2), "testpackage1 (< 1.9)");
// test for package-name and version normalisation
std::string dep3("R.matlab (>= 2.3-1)");
- cranrepository::parse_depends(dep3)->root()->accept(d3);
+ cranrepository::parse_depends(dep3)->top()->accept(d3);
TEST_CHECK_EQUAL(stringify(d3), "R.matlab (>= 2.3.1)");
std::string dep4("foo (>= 2, <3)");
- cranrepository::parse_depends(dep4)->root()->accept(d4);
+ cranrepository::parse_depends(dep4)->top()->accept(d4);
TEST_CHECK_EQUAL(stringify(d4), "foo (>= 2, < 3)");
std::string dep5("foo (>= 2), bar (<=3)");
- cranrepository::parse_depends(dep5)->root()->accept(d5);
+ cranrepository::parse_depends(dep5)->top()->accept(d5);
TEST_CHECK_EQUAL(stringify(d5), "foo (>= 2), bar (<= 3)");
std::string dep6("foo (>= 2, <= 4), bar (<=3)");
- cranrepository::parse_depends(dep6)->root()->accept(d6);
+ cranrepository::parse_depends(dep6)->top()->accept(d6);
TEST_CHECK_EQUAL(stringify(d6), "foo (>= 2, <= 4), bar (<= 3)");
}
} test_cran_dep_parser;
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index 1aee8aa..5def6da 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -212,7 +212,7 @@ DepKey::pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, ff, 12, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -221,7 +221,7 @@ DepKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, ff, 0, false);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
diff --git a/paludis/repositories/e/aa_visitor_TEST.cc b/paludis/repositories/e/aa_visitor_TEST.cc
index 6b39e33..4ad722c 100644
--- a/paludis/repositories/e/aa_visitor_TEST.cc
+++ b/paludis/repositories/e/aa_visitor_TEST.cc
@@ -49,7 +49,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
AAVisitor p1;
- parse_fetchable_uri("( a -> b c x? ( d e ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p1);
+ parse_fetchable_uri("( a -> b c x? ( d e ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p1);
TEST_CHECK_EQUAL(join(p1.begin(), p1.end(), " "), "b c d e");
}
} test_aa_visitor;
diff --git a/paludis/repositories/e/can_skip_phase.cc b/paludis/repositories/e/can_skip_phase.cc
index d526312..5da1710 100644
--- a/paludis/repositories/e/can_skip_phase.cc
+++ b/paludis/repositories/e/can_skip_phase.cc
@@ -88,7 +88,7 @@ paludis::erepository::can_skip_phase(const std::shared_ptr<const ERepositoryID>
if (id->fetches_key())
{
FindAnyFetchesFinder f;
- id->fetches_key()->value()->root()->accept(f);
+ id->fetches_key()->value()->top()->accept(f);
if (! f.result)
return false;
}
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 5f083cc..74192ce 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -326,7 +326,7 @@ paludis::erepository::parse_depend(const std::string & s,
std::shared_ptr<DepSpec> thing_to_annotate(spec);
std::shared_ptr<DependencySpecTree> top(std::make_shared<DependencySpecTree>(spec));
stack.push_front(make_named_values<ParseStackTypes<DependencySpecTree>::Item>(
- n::item() = top->root(),
+ n::item() = top->top(),
n::spec() = spec
));
@@ -369,7 +369,7 @@ paludis::erepository::parse_provide(const std::string & s,
std::shared_ptr<DepSpec> thing_to_annotate(spec);
std::shared_ptr<ProvideSpecTree> top(std::make_shared<ProvideSpecTree>(spec));
stack.push_front(make_named_values<ParseStackTypes<ProvideSpecTree>::Item>(
- n::item() = top->root(),
+ n::item() = top->top(),
n::spec() = spec
));
@@ -408,7 +408,7 @@ paludis::erepository::parse_fetchable_uri(const std::string & s,
std::shared_ptr<DepSpec> thing_to_annotate(spec);
std::shared_ptr<FetchableURISpecTree> top(std::make_shared<FetchableURISpecTree>(spec));
stack.push_front(make_named_values<ParseStackTypes<FetchableURISpecTree>::Item>(
- n::item() = top->root(),
+ n::item() = top->top(),
n::spec() = spec
));
@@ -451,7 +451,7 @@ paludis::erepository::parse_simple_uri(const std::string & s,
std::shared_ptr<DepSpec> thing_to_annotate(spec);
std::shared_ptr<SimpleURISpecTree> top(std::make_shared<SimpleURISpecTree>(spec));
stack.push_front(make_named_values<ParseStackTypes<SimpleURISpecTree>::Item>(
- n::item() = top->root(),
+ n::item() = top->top(),
n::spec() = spec
));
@@ -490,7 +490,7 @@ paludis::erepository::parse_license(const std::string & s,
std::shared_ptr<DepSpec> thing_to_annotate(spec);
std::shared_ptr<LicenseSpecTree> top(std::make_shared<LicenseSpecTree>(spec));
stack.push_front(make_named_values<ParseStackTypes<LicenseSpecTree>::Item>(
- n::item() = top->root(),
+ n::item() = top->top(),
n::spec() = spec
));
@@ -529,7 +529,7 @@ paludis::erepository::parse_plain_text(const std::string & s,
std::shared_ptr<DepSpec> thing_to_annotate(spec);
std::shared_ptr<PlainTextSpecTree> top(std::make_shared<PlainTextSpecTree>(spec));
stack.push_front(make_named_values<ParseStackTypes<PlainTextSpecTree>::Item>(
- n::item() = top->root(),
+ n::item() = top->top(),
n::spec() = spec
));
@@ -568,7 +568,7 @@ paludis::erepository::parse_myoptions(const std::string & s,
std::shared_ptr<DepSpec> thing_to_annotate(spec);
std::shared_ptr<PlainTextSpecTree> top(std::make_shared<PlainTextSpecTree>(spec));
stack.push_front(make_named_values<ParseStackTypes<PlainTextSpecTree>::Item>(
- n::item() = top->root(),
+ n::item() = top->top(),
n::spec() = spec
));
diff --git a/paludis/repositories/e/dep_parser_TEST.cc b/paludis/repositories/e/dep_parser_TEST.cc
index 579081d..8c49cd9 100644
--- a/paludis/repositories/e/dep_parser_TEST.cc
+++ b/paludis/repositories/e/dep_parser_TEST.cc
@@ -62,7 +62,7 @@ namespace test_cases
StringifyFormatter ff;
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "");
}
} test_dep_spec_parser_empty;
@@ -88,7 +88,7 @@ namespace test_cases
StringifyFormatter ff;
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(" \n \t",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "");
}
} test_dep_spec_parser_blank;
@@ -114,7 +114,7 @@ namespace test_cases
StringifyFormatter ff;
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("app-editors/vim",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "app-editors/vim");
}
} test_dep_spec_parser_package;
@@ -140,17 +140,17 @@ namespace test_cases
DepSpecPrettyPrinter d1(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(">=app-editors/vim-6.4_alpha",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d1);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d1);
TEST_CHECK_EQUAL(stringify(d1), ">=app-editors/vim-6.4_alpha");
DepSpecPrettyPrinter d2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("=app-editors/vim-6.4_alpha-r1",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d2);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d2);
TEST_CHECK_EQUAL(stringify(d2), "=app-editors/vim-6.4_alpha-r1");
DepSpecPrettyPrinter d3(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(">=app-editors/vim-6.4_alpha:one",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d3);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d3);
TEST_CHECK_EQUAL(stringify(d3), ">=app-editors/vim-6.4_alpha:one");
}
} test_dep_spec_parser_decorated_package;
@@ -176,7 +176,7 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("app-editors/vim app-misc/hilite \nsys-apps/findutils",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "app-editors/vim app-misc/hilite sys-apps/findutils");
}
} test_dep_spec_parser_packages;
@@ -198,7 +198,7 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("|| ( one/one two/two )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "|| ( one/one two/two )");
}
} test_dep_spec_parser_any;
@@ -220,15 +220,15 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("|| ( one/one foo? ( two/two ) )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "|| ( one/one foo? ( two/two ) )");
TEST_CHECK_THROWS(parse_depend("|| ( one/one foo? ( two/two ) )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
DepSpecPrettyPrinter e(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("|| ( one/one ( foo? ( two/two ) ) )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(e);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(e);
TEST_CHECK_EQUAL(stringify(e), "|| ( one/one ( foo? ( two/two ) ) )");
}
} test_dep_spec_parser_any_use;
@@ -254,7 +254,7 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend(" ( one/one two/two ) ",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "one/one two/two");
}
} test_dep_spec_parser_all;
@@ -279,7 +279,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- parse_depend("foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ parse_depend("foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "foo? ( one/one )");
}
} test_dep_spec_parser_use;
@@ -304,7 +304,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- parse_depend("!foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ parse_depend("!foo? ( one/one )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "!foo? ( one/one )");
}
} test_dep_spec_parser_inv_use;
@@ -325,15 +325,15 @@ namespace test_cases
std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, true, false);
- parse_fetchable_uri("a\n->\tb", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ parse_fetchable_uri("a\n->\tb", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "a -> b\n");
DepSpecPrettyPrinter e(0, std::shared_ptr<const PackageID>(), ff, 0, true, false);
- parse_fetchable_uri("a-> b", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(e);
+ parse_fetchable_uri("a-> b", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(e);
TEST_CHECK_EQUAL(stringify(e), "a->\nb\n");
TEST_CHECK_THROWS(parse_fetchable_uri("a -> b",
- &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->top()->accept(d), Exception);
}
} test_dep_spec_parser_uri;
@@ -358,15 +358,15 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK_THROWS(parse_depend("!foo? ( one/one",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("!foo? ( one/one ) )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("( ( ( ) )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("( ( ( ) ) ) )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend(")",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
}
} test_dep_spec_parser_bad_nesting;
@@ -391,38 +391,38 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK_THROWS(parse_depend("||",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("|| ",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("foo?",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("!? ( )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("!foo? ||",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("(((",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend(")",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_depend("(foo/bar)",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_license("a -> b",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_fetchable_uri("( -> )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_fetchable_uri("( -> )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_fetchable_uri("foo? -> bar",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_fetchable_uri("a ->",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_fetchable_uri("a -> ( )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_fetchable_uri("a -> )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
TEST_CHECK_THROWS(parse_fetchable_uri("a -> || ( )",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d), Exception);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d), Exception);
}
} test_dep_spec_parser_bad_values;
@@ -446,10 +446,10 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("build: one/one",
- &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "build: one/one");
TEST_CHECK_THROWS(parse_depend("build: one/one",
- &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->root()->accept(d), EDepParseError);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("0"))->top()->accept(d), EDepParseError);
}
} test_dep_spec_parser_labels;
@@ -470,10 +470,10 @@ namespace test_cases
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_fetchable_uri("http://foo/bar manual: two",
- &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "http://foo/bar manual: two");
TEST_CHECK_THROWS(parse_fetchable_uri("http://foo/bar monkey: two",
- &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(d), EDepParseError);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->top()->accept(d), EDepParseError);
}
} test_dep_spec_parser_exheres_0_uri_labels;
@@ -494,12 +494,12 @@ namespace test_cases
StringifyFormatter ff;
DepSpecPrettyPrinter d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("cat/first [[ foo = bar bar = baz ]] cat/second cat/third [[ moo = oink ]]",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(d);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(d);
TEST_CHECK_EQUAL(stringify(d), "cat/first [[ bar = [ baz ] foo = [ bar ] ]] cat/second cat/third [[ moo = [ oink ] ]]");
DepSpecPrettyPrinter e(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_depend("bar? ( foo? ( cat/first [[ for = first ]] ) [[ for = foo ]] baz? ( ) [[ for = baz ]] ) [[ for = bar ]]",
- &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(e);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(e);
TEST_CHECK_EQUAL(stringify(e), "bar? ( foo? ( cat/first [[ for = [ first ] ]] ) "
"[[ for = [ foo ] ]] baz? ( ) [[ for = [ baz ] ]] ) [[ for = [ bar ] ]]");
}
diff --git a/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc b/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
index 7fb6a36..4626c1b 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
@@ -51,28 +51,28 @@ namespace test_cases
std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
DepSpecPrettyPrinter p1(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p1);
+ parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, "foo/bar bar/baz");
DepSpecPrettyPrinter p2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p2);
+ parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, "foo/bar moo? ( bar/baz )");
DepSpecPrettyPrinter p3(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p3);
+ parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, "|| ( a/b ( c/d e/f ) )");
DepSpecPrettyPrinter p4(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p4);
+ parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p4);
TEST_CHECK_STRINGIFY_EQUAL(p4, "a b");
DepSpecPrettyPrinter p5(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- parse_fetchable_uri("( a -> b c x? ( d e ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p5);
+ parse_fetchable_uri("( a -> b c x? ( d e ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p5);
TEST_CHECK_STRINGIFY_EQUAL(p5, "a -> b c x? ( d e )");
DepSpecPrettyPrinter p6(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
parse_fetchable_uri("a manual: b x? ( c mirrors-first: d manual: e ) f",
- &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(p6);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->top()->accept(p6);
TEST_CHECK_STRINGIFY_EQUAL(p6, "a manual: b x? ( c mirrors-first: d manual: e ) f");
}
} test_pretty_printer_no_indent;
@@ -93,25 +93,25 @@ namespace test_cases
std::shared_ptr<const PackageID> id(repo->add_version("cat", "pkg", "1"));
DepSpecPrettyPrinter p1(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
- parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p1);
+ parse_depend("foo/bar bar/baz", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p1);
TEST_CHECK_STRINGIFY_EQUAL(p1, " foo/bar\n bar/baz\n");
DepSpecPrettyPrinter p2(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
- parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p2);
+ parse_depend("foo/bar moo? ( bar/baz )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p2);
TEST_CHECK_STRINGIFY_EQUAL(p2, " foo/bar\n moo? (\n bar/baz\n )\n");
DepSpecPrettyPrinter p3(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
- parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p3);
+ parse_depend("|| ( a/b ( c/d e/f ) )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p3);
TEST_CHECK_STRINGIFY_EQUAL(p3, " || (\n a/b\n (\n c/d\n"
" e/f\n )\n )\n");
DepSpecPrettyPrinter p4(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
- parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->root()->accept(p4);
+ parse_license("( ( ( ) a ) b )", &env, id, *EAPIData::get_instance()->eapi_from_string("paludis-1"))->top()->accept(p4);
TEST_CHECK_STRINGIFY_EQUAL(p4, " a\n b\n");
DepSpecPrettyPrinter p5(0, std::shared_ptr<const PackageID>(), ff, 1, true, false);
parse_fetchable_uri("a manual: b x? ( c mirrors-first: d manual: e ) f",
- &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(p5);
+ &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->top()->accept(p5);
TEST_CHECK_STRINGIFY_EQUAL(p5, " a\n manual:\n b\n x? (\n c\n"
" mirrors-first:\n d\n manual:\n e\n )\n f\n");
}
diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc
index 90054b6..49db72f 100644
--- a/paludis/repositories/e/e_choices_key.cc
+++ b/paludis/repositories/e/e_choices_key.cc
@@ -311,7 +311,7 @@ EChoicesKey::populate_myoptions() const
/* yay. myoptions is easy. */
MyOptionsFinder myoptions;
- _imp->id->raw_myoptions_key()->value()->root()->accept(myoptions);
+ _imp->id->raw_myoptions_key()->value()->top()->accept(myoptions);
if (_imp->id->raw_use_expand_key())
for (Set<std::string>::ConstIterator u(_imp->id->raw_use_expand_key()->value()->begin()),
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 602085d..8c04dd4 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -317,7 +317,7 @@ EInstalledRepositoryID::need_keys_added() const
std::string raw_deps_str(file_contents(_imp->dir / vars->dependencies()->name()));
std::shared_ptr<DependencySpecTree> raw_deps(parse_depend(raw_deps_str,
_imp->environment, shared_from_this(), *eapi()));
- raw_deps->root()->accept(rewriter);
+ raw_deps->top()->accept(rewriter);
_imp->keys->raw_dependencies = std::make_shared<EDependenciesKey>(_imp->environment, shared_from_this(), vars->dependencies()->name(),
vars->dependencies()->description(), raw_deps_str, _imp->build_dependencies_labels, mkt_dependencies);
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 389b024..e8acece 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -171,7 +171,7 @@ EDependenciesKey::pretty_print(const DependencySpecTree::ItemFormatter & f) cons
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -180,7 +180,7 @@ EDependenciesKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f)
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -258,7 +258,7 @@ ELicenseKey::pretty_print(const LicenseSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -267,7 +267,7 @@ ELicenseKey::pretty_print_flat(const LicenseSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -346,7 +346,7 @@ EFetchableURIKey::pretty_print(const FetchableURISpecTree::ItemFormatter & f) co
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -355,7 +355,7 @@ EFetchableURIKey::pretty_print_flat(const FetchableURISpecTree::ItemFormatter &
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -368,7 +368,7 @@ EFetchableURIKey::initial_label() const
{
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> f(_imp->env);
if (_imp->id->restrict_key())
- _imp->id->restrict_key()->value()->root()->accept(f);
+ _imp->id->restrict_key()->value()->top()->accept(f);
for (DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIterator i(f.begin()), i_end(f.end()) ;
i != i_end ; ++i)
{
@@ -471,7 +471,7 @@ ESimpleURIKey::pretty_print(const SimpleURISpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -480,7 +480,7 @@ ESimpleURIKey::pretty_print_flat(const SimpleURISpecTree::ItemFormatter & f) con
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -558,7 +558,7 @@ EPlainTextSpecKey::pretty_print(const PlainTextSpecTree::ItemFormatter & f) cons
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -567,7 +567,7 @@ EPlainTextSpecKey::pretty_print_flat(const PlainTextSpecTree::ItemFormatter & f)
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -646,7 +646,7 @@ EMyOptionsKey::pretty_print(const PlainTextSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -655,7 +655,7 @@ EMyOptionsKey::pretty_print_flat(const PlainTextSpecTree::ItemFormatter & f) con
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -733,7 +733,7 @@ EProvideKey::pretty_print(const ProvideSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, true, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
@@ -742,7 +742,7 @@ EProvideKey::pretty_print_flat(const ProvideSpecTree::ItemFormatter & f) const
{
StringifyFormatter ff(f);
DepSpecPrettyPrinter p(_imp->env, _imp->id, ff, 0, false, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return stringify(p);
}
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index f2add94..f8880b1 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1125,7 +1125,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
if (! id->fetches_key())
continue;
AAVisitor aa;
- id->fetches_key()->value()->root()->accept(aa);
+ id->fetches_key()->value()->top()->accept(aa);
for (AAVisitor::ConstIterator d(aa.begin()) ;
d != aa.end() ; ++d)
@@ -1137,7 +1137,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn)
FSEntry f(params().distdir() / *d);
if (! f.is_regular_file_or_symlink_to_regular_file())
- throw MissingDistfileError("Distfile '" + f.basename() + "' does not exist");
+ throw MissingDistfileError("Distfile '" + f.basename() + "' does not exist");
SafeIFStream file_stream(f);
@@ -1933,7 +1933,7 @@ ERepository::fetch(const std::shared_ptr<const ERepositoryID> & id,
{
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment());
if (id->restrict_key())
- id->restrict_key()->value()->root()->accept(restricts);
+ id->restrict_key()->value()->top()->accept(restricts);
for (DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIterator i(restricts.begin()), i_end(restricts.end()) ;
i != i_end ; ++i)
@@ -1958,7 +1958,7 @@ ERepository::fetch(const std::shared_ptr<const ERepositoryID> & id,
/* make A */
AFinder f(_imp->params.environment(), id);
if (id->fetches_key())
- id->fetches_key()->value()->root()->accept(f);
+ id->fetches_key()->value()->top()->accept(f);
for (AFinder::ConstIterator i(f.begin()), i_end(f.end()) ; i != i_end ; ++i)
{
@@ -1977,7 +1977,7 @@ ERepository::fetch(const std::shared_ptr<const ERepositoryID> & id,
{
AAVisitor g;
if (id->fetches_key())
- id->fetches_key()->value()->root()->accept(g);
+ id->fetches_key()->value()->top()->accept(g);
std::set<std::string> already_in_all_archives;
for (AAVisitor::ConstIterator gg(g.begin()), gg_end(g.end()) ; gg != gg_end ; ++gg)
@@ -2029,10 +2029,10 @@ ERepository::fetch(const std::shared_ptr<const ERepositoryID> & id,
fetch_userpriv_ok, mirrors_name,
id->fetches_key()->initial_label(), fetch_action.options.safe_resume(),
output_manager, std::bind(&get_mirrors_fn, std::placeholders::_1, std::cref(_imp->mirrors)));
- id->fetches_key()->value()->root()->accept(f);
+ id->fetches_key()->value()->top()->accept(f);
}
- id->fetches_key()->value()->root()->accept(c);
+ id->fetches_key()->value()->top()->accept(c);
}
if ( (fetch_action.options.fetch_parts()[fp_extras]) && ((c.need_nofetch()) ||
@@ -2198,7 +2198,7 @@ ERepository::pretend_fetch(const std::shared_ptr<const ERepositoryID> & id,
PretendFetchVisitor f(_imp->params.environment(), id, *id->eapi(),
params().distdir(), a.options.fetch_parts()[fp_unneeded],
id->fetches_key()->initial_label(), a);
- id->fetches_key()->value()->root()->accept(f);
+ id->fetches_key()->value()->top()->accept(f);
}
}
@@ -2282,7 +2282,7 @@ ERepository::install(const std::shared_ptr<const ERepositoryID> & id,
{
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment());
if (id->restrict_key())
- id->restrict_key()->value()->root()->accept(restricts);
+ id->restrict_key()->value()->top()->accept(restricts);
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
@@ -2308,7 +2308,7 @@ ERepository::install(const std::shared_ptr<const ERepositoryID> & id,
/* make A */
AFinder f(_imp->params.environment(), id);
if (id->fetches_key())
- id->fetches_key()->value()->root()->accept(f);
+ id->fetches_key()->value()->top()->accept(f);
for (AFinder::ConstIterator i(f.begin()), i_end(f.end()) ; i != i_end ; ++i)
{
@@ -2327,7 +2327,7 @@ ERepository::install(const std::shared_ptr<const ERepositoryID> & id,
{
AAVisitor g;
if (id->fetches_key())
- id->fetches_key()->value()->root()->accept(g);
+ id->fetches_key()->value()->top()->accept(g);
std::set<std::string> already_in_all_archives;
for (AAVisitor::ConstIterator gg(g.begin()), gg_end(g.end()) ; gg != gg_end ; ++gg)
@@ -2348,7 +2348,7 @@ ERepository::install(const std::shared_ptr<const ERepositoryID> & id,
{
AcceptLicenseFinder g;
if (id->license_key())
- id->license_key()->value()->root()->accept(g);
+ id->license_key()->value()->top()->accept(g);
accept_license = g.s.str();
}
@@ -2606,7 +2606,7 @@ ERepository::info(const std::shared_ptr<const ERepositoryID> & id,
{
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment());
if (id->restrict_key())
- id->restrict_key()->value()->root()->accept(restricts);
+ id->restrict_key()->value()->top()->accept(restricts);
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
@@ -2698,7 +2698,7 @@ ERepository::get_environment_variable(
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment());
if (id->restrict_key())
- id->restrict_key()->value()->root()->accept(restricts);
+ id->restrict_key()->value()->top()->accept(restricts);
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
@@ -2916,7 +2916,7 @@ ERepository::pretend(
{
DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec> restricts(_imp->params.environment());
if (id->restrict_key())
- id->restrict_key()->value()->root()->accept(restricts);
+ id->restrict_key()->value()->top()->accept(restricts);
userpriv_restrict =
indirect_iterator(restricts.end()) != std::find_if(indirect_iterator(restricts.begin()), indirect_iterator(restricts.end()),
@@ -2938,7 +2938,7 @@ ERepository::pretend(
if (id->raw_myoptions_key())
{
MyOptionsRequirementsVerifier verifier(id);
- id->raw_myoptions_key()->value()->root()->accept(verifier);
+ id->raw_myoptions_key()->value()->top()->accept(verifier);
if (verifier.unmet_requirements() && ! verifier.unmet_requirements()->empty())
{
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 919b2da..ece9777 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -504,11 +504,11 @@ namespace test_cases
StringifyFormatter ff;
erepository::DepSpecPrettyPrinter pd(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id1->build_dependencies_key()));
- id1->build_dependencies_key()->value()->root()->accept(pd);
+ id1->build_dependencies_key()->value()->top()->accept(pd);
TEST_CHECK_STRINGIFY_EQUAL(pd, "foo/bar");
erepository::DepSpecPrettyPrinter pr(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id1->run_dependencies_key()));
- id1->run_dependencies_key()->value()->root()->accept(pr);
+ id1->run_dependencies_key()->value()->top()->accept(pr);
TEST_CHECK_STRINGIFY_EQUAL(pr, "foo/bar");
const std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
@@ -520,11 +520,11 @@ namespace test_cases
TEST_CHECK_EQUAL(id2->short_description_key()->value(), "dquote \" squote ' backslash \\ dollar $");
erepository::DepSpecPrettyPrinter pd2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id2->build_dependencies_key()));
- id2->build_dependencies_key()->value()->root()->accept(pd2);
+ id2->build_dependencies_key()->value()->top()->accept(pd2);
TEST_CHECK_STRINGIFY_EQUAL(pd2, "foo/bar bar/baz");
erepository::DepSpecPrettyPrinter pr2(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id2->run_dependencies_key()));
- id2->run_dependencies_key()->value()->root()->accept(pr2);
+ id2->run_dependencies_key()->value()->top()->accept(pr2);
TEST_CHECK_STRINGIFY_EQUAL(pr2, "foo/bar");
const std::shared_ptr<const PackageID> id3(*env[selection::RequireExactlyOne(generator::Matches(
diff --git a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
index 704b86d..9060904 100644
--- a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
+++ b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
@@ -112,17 +112,17 @@ namespace test_cases
erepository::DepSpecPrettyPrinter pd(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id->build_dependencies_key()));
- id->build_dependencies_key()->value()->root()->accept(pd);
+ id->build_dependencies_key()->value()->top()->accept(pd);
TEST_CHECK_STRINGIFY_EQUAL(pd, "( cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pr(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id->run_dependencies_key()));
- id->run_dependencies_key()->value()->root()->accept(pr);
+ id->run_dependencies_key()->value()->top()->accept(pr);
TEST_CHECK_STRINGIFY_EQUAL(pr, "( cat/pkg1 build: build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pp(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id->post_dependencies_key()));
- id->post_dependencies_key()->value()->root()->accept(pp);
+ id->post_dependencies_key()->value()->top()->accept(pp);
TEST_CHECK_STRINGIFY_EQUAL(pp, "( build: build+run: suggestion: cat/pkg4 post: cat/pkg5 )");
}
} test_e_repository_dependencies_rewriter;
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index dd4cede..9c678ea 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -318,7 +318,7 @@ ERepositorySets::security_set(bool insecurity) const
n::version_spec() = (*c)->version()))
.in_repository((*c)->repository()->name())));
spec->set_tag(glsa_tags.find(glsa->id())->second);
- security_packages->root()->append(spec);
+ security_packages->top()->append(spec);
}
else
{
@@ -351,7 +351,7 @@ ERepositorySets::security_set(bool insecurity) const
n::version_spec() = (*r)->version()))
.in_repository((*r)->repository()->name())));
spec->set_tag(glsa_tags.find(glsa->id())->second);
- security_packages->root()->append(spec);
+ security_packages->top()->append(spec);
ok = true;
break;
}
diff --git a/paludis/repositories/e/e_repository_sets_TEST.cc b/paludis/repositories/e/e_repository_sets_TEST.cc
index 308214c..a4a3619 100644
--- a/paludis/repositories/e/e_repository_sets_TEST.cc
+++ b/paludis/repositories/e/e_repository_sets_TEST.cc
@@ -105,7 +105,7 @@ namespace test_cases
TEST_CHECK(bool(set1));
StringifyFormatter ff;
erepository::DepSpecPrettyPrinter pretty(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- set1->root()->accept(pretty);
+ set1->top()->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "cat-one/foo >=cat-two/bar-2");
}
} test_e_repository_sets_maintainer_defined_sets_list;
@@ -135,7 +135,7 @@ namespace test_cases
std::shared_ptr<const SetSpecTree> insecurity(env.set(SetName("insecurity::test-repo-1")));
StringifyFormatter ff;
erepository::DepSpecPrettyPrinter pretty(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- insecurity->root()->accept(pretty);
+ insecurity->top()->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-four/xyzzy-2.0.1::test-repo-1 =cat-four/xyzzy-2.0.2::test-repo-1 =cat-one/foo-1::test-repo-1 =cat-two/bar-1.5::test-repo-1 "
"=cat-two/bar-1.5.1::test-repo-1 =cat-three/baz-1.0::test-repo-1 "
"=cat-three/baz-1.1-r2::test-repo-1 =cat-three/baz-1.2::test-repo-1");
@@ -179,7 +179,7 @@ namespace test_cases
std::shared_ptr<const SetSpecTree> security(env.set(SetName("security::test-repo-1")));
StringifyFormatter ff;
erepository::DepSpecPrettyPrinter pretty(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- security->root()->accept(pretty);
+ security->top()->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-four/xyzzy-2.0.3::test-repo-1 =cat-two/bar-2.0::test-repo-1 =cat-three/baz-1.3::test-repo-1");
}
} test_e_repository_sets_security_set;
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 5b6a976..759fea4 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -534,7 +534,7 @@ EbuildMetadataCommand::load(const std::shared_ptr<const EbuildID> & id)
{
DependenciesRewriter rewriter;
std::string dep_s(get(keys, m.dependencies()->name()));
- parse_depend(dep_s, params.environment(), id, *id->eapi())->root()->accept(rewriter);
+ parse_depend(dep_s, params.environment(), id, *id->eapi())->top()->accept(rewriter);
id->load_raw_depend(m.dependencies()->name(), m.dependencies()->description(), dep_s);
id->load_build_depend(m.dependencies()->name() + ".DEPEND", m.dependencies()->description() + " (build)", rewriter.depend(), true);
id->load_run_depend(m.dependencies()->name() + ".RDEPEND", m.dependencies()->description() + " (run)", rewriter.rdepend(), true);
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index 90105b7..eab91c3 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -172,7 +172,7 @@ namespace
if (-1 != m.dependencies()->flat_list_index() && ! m.dependencies()->name().empty())
{
DependenciesRewriter rewriter;
- parse_depend(lines.at(m.dependencies()->flat_list_index()), _imp->env, id, *id->eapi())->root()->accept(rewriter);
+ parse_depend(lines.at(m.dependencies()->flat_list_index()), _imp->env, id, *id->eapi())->top()->accept(rewriter);
id->load_raw_depend(m.dependencies()->name(), m.dependencies()->description(),
lines.at(m.dependencies()->flat_list_index()));
id->load_build_depend(m.dependencies()->name() + ".DEPEND", m.dependencies()->description() + " (build)", rewriter.depend(), true);
@@ -515,7 +515,7 @@ EbuildFlatMetadataCache::load(const std::shared_ptr<const EbuildID> & id, const
if (! m.dependencies()->name().empty())
{
DependenciesRewriter rewriter;
- parse_depend(keys[m.dependencies()->name()], _imp->env, id, *id->eapi())->root()->accept(rewriter);
+ parse_depend(keys[m.dependencies()->name()], _imp->env, id, *id->eapi())->top()->accept(rewriter);
id->load_raw_depend(m.dependencies()->name(), m.dependencies()->description(),
keys[m.dependencies()->name()]);
id->load_build_depend(m.dependencies()->name() + ".DEPEND", m.dependencies()->description() + " (build)", rewriter.depend(), true);
@@ -662,7 +662,7 @@ namespace
{
StringifyFormatter ff;
DepSpecPrettyPrinter p(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- d->root()->accept(p);
+ d->top()->accept(p);
return stringify(p);
}
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 692be43..6528c20 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -528,7 +528,7 @@ EbuildID::need_masks_added() const
if (license_key())
{
LicenceChecker c(_imp->environment, &Environment::accept_license, this);
- license_key()->value()->root()->accept(c);
+ license_key()->value()->top()->accept(c);
if (! c.ok)
add_mask(std::make_shared<EUnacceptedMask>('L',
DistributionData::get_instance()->distribution_from_string(
@@ -1486,7 +1486,7 @@ EbuildID::add_build_options(const std::shared_ptr<Choices> & choices) const
if (restrict_key())
{
UnconditionalRestrictFinder f;
- restrict_key()->value()->root()->accept(f);
+ restrict_key()->value()->top()->accept(f);
may_be_unrestricted_test = f.s.end() == f.s.find("test");
may_be_unrestricted_strip = f.s.end() == f.s.find("strip");
}
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index ace0fbe..4c6e637 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -162,7 +162,7 @@ ExheresProfile::ExheresProfile(
std::shared_ptr<const PackageID>())));
spec->set_tag(_imp->system_tag);
- _imp->system_packages->root()->append(spec);
+ _imp->system_packages->top()->append(spec);
}
for (ProfileFile<MaskFile>::ConstIterator line(_imp->package_mask_file.begin()), line_end(_imp->package_mask_file.end()) ;
diff --git a/paludis/repositories/e/fetch_visitor_TEST.cc b/paludis/repositories/e/fetch_visitor_TEST.cc
index 40b17e8..13b359f 100644
--- a/paludis/repositories/e/fetch_visitor_TEST.cc
+++ b/paludis/repositories/e/fetch_visitor_TEST.cc
@@ -81,7 +81,7 @@ namespace test_cases
*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);
- parse_fetchable_uri("file:///" + stringify(FSEntry("fetch_visitor_TEST_dir/in/input1").realpath()), &env, id, *eapi)->root()->accept(v);
+ parse_fetchable_uri("file:///" + stringify(FSEntry("fetch_visitor_TEST_dir/in/input1").realpath()), &env, id, *eapi)->top()->accept(v);
TEST_CHECK(FSEntry("fetch_visitor_TEST_dir/out/input1").is_regular_file());
SafeIFStream f(FSEntry("fetch_visitor_TEST_dir/out/input1"));
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index 4cfa73f..072101f 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -68,7 +68,7 @@ namespace
eapi(a),
id(i)
{
- stack.push_front(result->root());
+ stack.push_front(result->top());
}
void visit(const DependencySpecTree::NodeType<AllDepSpec>::Type & node)
@@ -151,7 +151,7 @@ paludis::erepository::fix_locked_dependencies(
const std::shared_ptr<const DependencySpecTree> & b)
{
Fixer f(env, e, id);
- b->root()->accept(f);
+ b->top()->accept(f);
return f.result;
}
diff --git a/paludis/repositories/e/fix_locked_dependencies_TEST.cc b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
index 56f8709..74f3710 100644
--- a/paludis/repositories/e/fix_locked_dependencies_TEST.cc
+++ b/paludis/repositories/e/fix_locked_dependencies_TEST.cc
@@ -71,8 +71,8 @@ namespace test_cases
DepSpecPrettyPrinter
a(0, std::shared_ptr<const PackageID>(), ff, 0, false, false),
b(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- aa->root()->accept(a);
- bb->root()->accept(b);
+ aa->top()->accept(a);
+ bb->top()->accept(b);
TEST_CHECK_STRINGIFY_EQUAL(a, b);
@@ -83,8 +83,8 @@ namespace test_cases
DepSpecPrettyPrinter
c(0, std::shared_ptr<const PackageID>(), ff, 0, false, false),
d(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- cc->root()->accept(c);
- dd->root()->accept(d);
+ cc->top()->accept(c);
+ dd->top()->accept(d);
TEST_CHECK_STRINGIFY_EQUAL(c, "foo/bar:= cat/installed:= >=cat/installed-1.2:= <=cat/installed-1.2:=");
TEST_CHECK_STRINGIFY_EQUAL(d, "foo/bar:= cat/installed:=monkey >=cat/installed-1.2:= <=cat/installed-1.2:=monkey");
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index b73fce6..500623f 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -448,7 +448,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
environment, *eapi, package_id, before));
StringifyFormatter ff;
DepSpecPrettyPrinter p(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
- after->root()->accept(p);
+ after->top()->accept(p);
return "O0;" + stringify(p);
}
else if (var == eapi->supported()->ebuild_metadata_variables()->myoptions()->name())
@@ -468,7 +468,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
MyOptionsRewriter p(package_id,
eapi->supported()->annotations()->myoptions_description(),
std::string(1, eapi->supported()->choices_options()->use_expand_separator()));
- mm->value()->root()->accept(p);
+ mm->value()->top()->accept(p);
return "O0;" + p.str.str();
}
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index e8ea1ae..feb8e30 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -582,7 +582,7 @@ Imp<TraditionalProfile>::make_vars_from_file_vars()
std::shared_ptr<const PackageID>())));
spec->set_tag(system_tag);
- system_packages->root()->append(spec);
+ system_packages->top()->append(spec);
}
}
catch (const InternalError &)
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 51138c9..0d89b43 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -714,7 +714,7 @@ VDBRepository::provides_from_package_id(const PackageID & id) const
std::shared_ptr<const ProvideSpecTree> provide(id.provide_key()->value());
DepSpecFlattener<ProvideSpecTree, PackageDepSpec> f(_imp->params.environment());
- provide->root()->accept(f);
+ provide->top()->accept(f);
std::shared_ptr<std::list<QualifiedPackageName> > qpns(std::make_shared<std::list<QualifiedPackageName>>());
@@ -1291,7 +1291,7 @@ namespace
const DepRewrites & rewrites)
{
DepRewriter v(rewrites);
- key->value()->root()->accept(v);
+ key->value()->top()->accept(v);
if (v.changed)
{
std::cout << " Rewriting " << f << std::endl;
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 9975974..0178626 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -283,17 +283,17 @@ namespace test_cases
erepository::DepSpecPrettyPrinter pd(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id->build_dependencies_key()));
- id->build_dependencies_key()->value()->root()->accept(pd);
+ id->build_dependencies_key()->value()->top()->accept(pd);
TEST_CHECK_STRINGIFY_EQUAL(pd, "( cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pr(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id->run_dependencies_key()));
- id->run_dependencies_key()->value()->root()->accept(pr);
+ id->run_dependencies_key()->value()->top()->accept(pr);
TEST_CHECK_STRINGIFY_EQUAL(pr, "( cat/pkg1 build: build+run: cat/pkg3 suggestion: post: )");
erepository::DepSpecPrettyPrinter pp(0, std::shared_ptr<const PackageID>(), ff, 0, false, false);
TEST_CHECK(bool(id->post_dependencies_key()));
- id->post_dependencies_key()->value()->root()->accept(pp);
+ id->post_dependencies_key()->value()->top()->accept(pp);
TEST_CHECK_STRINGIFY_EQUAL(pp, "( build: build+run: suggestion: cat/pkg4 post: cat/pkg5 )");
}
} test_vdb_repository_dependencies_rewriter;
diff --git a/paludis/repositories/fake/dep_parser.cc b/paludis/repositories/fake/dep_parser.cc
index d2e3465..3941a5d 100644
--- a/paludis/repositories/fake/dep_parser.cc
+++ b/paludis/repositories/fake/dep_parser.cc
@@ -171,7 +171,7 @@ paludis::fakerepository::parse_depend(const std::string & s,
ParseStackTypes<DependencySpecTree>::Stack stack;
std::shared_ptr<DependencySpecTree> top(std::make_shared<DependencySpecTree>(std::make_shared<AllDepSpec>()));
- stack.push_front(top->root());
+ stack.push_front(top->top());
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
@@ -201,7 +201,7 @@ paludis::fakerepository::parse_provide(const std::string & s,
ParseStackTypes<ProvideSpecTree>::Stack stack;
std::shared_ptr<ProvideSpecTree> top(std::make_shared<ProvideSpecTree>(std::make_shared<AllDepSpec>()));
- stack.push_front(top->root());
+ stack.push_front(top->top());
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
@@ -231,7 +231,7 @@ paludis::fakerepository::parse_fetchable_uri(const std::string & s,
ParseStackTypes<FetchableURISpecTree>::Stack stack;
std::shared_ptr<FetchableURISpecTree> top(std::make_shared<FetchableURISpecTree>(std::make_shared<AllDepSpec>()));
- stack.push_front(top->root());
+ stack.push_front(top->top());
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
@@ -261,7 +261,7 @@ paludis::fakerepository::parse_simple_uri(const std::string & s,
ParseStackTypes<SimpleURISpecTree>::Stack stack;
std::shared_ptr<SimpleURISpecTree> top(std::make_shared<SimpleURISpecTree>(std::make_shared<AllDepSpec>()));
- stack.push_front(top->root());
+ stack.push_front(top->top());
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
@@ -291,7 +291,7 @@ paludis::fakerepository::parse_license(const std::string & s,
ParseStackTypes<LicenseSpecTree>::Stack stack;
std::shared_ptr<LicenseSpecTree> top(std::make_shared<LicenseSpecTree>(std::make_shared<AllDepSpec>()));
- stack.push_front(top->root());
+ stack.push_front(top->top());
ELikeDepParserCallbacks callbacks(
make_named_values<ELikeDepParserCallbacks>(
diff --git a/paludis/repositories/fake/dep_parser_TEST.cc b/paludis/repositories/fake/dep_parser_TEST.cc
index ff738d0..89b6ee1 100644
--- a/paludis/repositories/fake/dep_parser_TEST.cc
+++ b/paludis/repositories/fake/dep_parser_TEST.cc
@@ -91,7 +91,7 @@ namespace test_cases
"( ( a/a b/b ) )", &env, std::shared_ptr<const PackageID>()));
QuickPrinter p;
- d->root()->accept(p);
+ d->top()->accept(p);
TEST_CHECK_EQUAL(p.str.str(), "all<all<all<p<a/a>p<b/b>>>>");
}
} dep_parser_test;
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 4ab7d34..04feae2 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -105,7 +105,7 @@ FakeInstalledRepository::provided_packages() const
continue;
DepSpecFlattener<ProvideSpecTree, PackageDepSpec> f(environment());
- (*v)->provide_key()->value()->root()->accept(f);
+ (*v)->provide_key()->value()->top()->accept(f);
for (DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIterator q(f.begin()), q_end(f.end()) ; q != q_end ; ++q)
result->push_back(make_named_values<RepositoryProvidesEntry>(
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 03ce38c..ce92f3a 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -1146,7 +1146,7 @@ FakePackageID::need_masks_added() const
if (license_key())
{
LicenceChecker c(_imp->env, &Environment::accept_license, this);
- license_key()->value()->root()->accept(c);
+ license_key()->value()->top()->accept(c);
if (! c.ok)
add_mask(std::make_shared<FakeUnacceptedMask>('L', "license", license_key()));
}
diff --git a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
index 5914e85..3457318 100644
--- a/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_dependencies_key.cc
@@ -98,7 +98,7 @@ std::string
UnavailableRepositoryDependenciesKey::pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
CommaSeparatedDepPrinter p(_imp->env, f, false);
- _imp->value->root()->accept(p);
+ _imp->value->top()->accept(p);
return p.result();
}
@@ -106,7 +106,7 @@ std::string
UnavailableRepositoryDependenciesKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
{
CommaSeparatedDepPrinter p(_imp->env, f, true);
- _imp->value->root()->accept(p);
+ _imp->value->top()->accept(p);
return p.result();
}
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index a323725..0df950c 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -362,7 +362,7 @@ namespace
pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
CommaSeparatedDepPrinter p(_env, f, false);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return p.result();
}
@@ -370,7 +370,7 @@ namespace
pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
{
CommaSeparatedDepPrinter p(_env, f, true);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return p.result();
}
diff --git a/paludis/repositories/unpackaged/unpackaged_key.cc b/paludis/repositories/unpackaged/unpackaged_key.cc
index 268c62a..6f84a3a 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.cc
+++ b/paludis/repositories/unpackaged/unpackaged_key.cc
@@ -100,7 +100,7 @@ std::string
UnpackagedDependencyKey::pretty_print(const DependencySpecTree::ItemFormatter & f) const
{
CommaSeparatedDepPrinter p(_imp->env, f, false);
- _imp->value->root()->accept(p);
+ _imp->value->top()->accept(p);
return p.result();
}
@@ -108,7 +108,7 @@ std::string
UnpackagedDependencyKey::pretty_print_flat(const DependencySpecTree::ItemFormatter & f) const
{
CommaSeparatedDepPrinter p(_imp->env, f, true);
- _imp->value->root()->accept(p);
+ _imp->value->top()->accept(p);
return p.result();
}
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.cc b/paludis/repositories/unwritten/unwritten_repository_file.cc
index 261345a..15cce49 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.cc
+++ b/paludis/repositories/unwritten/unwritten_repository_file.cc
@@ -142,14 +142,14 @@ namespace
std::string pretty_print(const SimpleURISpecTree::ItemFormatter & f) const
{
UnwrittenHomepagePrinter p(f);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return p.s.str();
}
std::string pretty_print_flat(const SimpleURISpecTree::ItemFormatter & f) const
{
UnwrittenHomepagePrinter p(f);
- value()->root()->accept(p);
+ value()->top()->accept(p);
return p.s.str();
}
@@ -311,7 +311,7 @@ UnwrittenRepositoryFile::_load(const FSEntry & f)
tokenise_whitespace(token2, std::back_inserter(tokens));
for (std::list<std::string>::const_iterator t(tokens.begin()), t_end(tokens.end()) ;
t != t_end ; ++t)
- tree->root()->append(std::make_shared<SimpleURIDepSpec>(*t));
+ tree->top()->append(std::make_shared<SimpleURIDepSpec>(*t));
entry->homepage() = std::make_shared<UnwrittenHomepageKey>("homepage", "Homepage", mkt_normal, tree);
}
else if (token == "comment")
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 709a549..093d8b0 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -86,7 +86,7 @@ namespace paludis
raw_name(r),
human_name(h)
{
- value->root()->append(spec);
+ value->top()->append(spec);
}
};
}
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 5ac83f2..a253f60 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -343,7 +343,7 @@ namespace
void visit(const DependencySpecTree::NodeType<NamedSetDepSpec>::Type & s)
{
const std::shared_ptr<const SetSpecTree> set(env->set(s.spec()->name()));
- set->root()->accept(*this);
+ set->top()->accept(*this);
}
void visit(const DependencySpecTree::NodeType<PackageDepSpec>::Type & s)
@@ -429,17 +429,17 @@ Decider::_dependent_upon(
{
DependentChecker<ChangeByResolventSequence> c(_imp->env, going_away, staying, not_changing_slots);
if (id->dependencies_key())
- id->dependencies_key()->value()->root()->accept(c);
+ id->dependencies_key()->value()->top()->accept(c);
else
{
if (id->build_dependencies_key())
- id->build_dependencies_key()->value()->root()->accept(c);
+ id->build_dependencies_key()->value()->top()->accept(c);
if (id->run_dependencies_key())
- id->run_dependencies_key()->value()->root()->accept(c);
+ id->run_dependencies_key()->value()->top()->accept(c);
if (id->post_dependencies_key())
- id->post_dependencies_key()->value()->root()->accept(c);
+ id->post_dependencies_key()->value()->top()->accept(c);
if (id->suggested_dependencies_key())
- id->suggested_dependencies_key()->value()->root()->accept(c);
+ id->suggested_dependencies_key()->value()->top()->accept(c);
}
return c.result;
@@ -2541,17 +2541,17 @@ Decider::_collect_depped_upon(
{
DependentChecker<PackageIDSequence> c(_imp->env, candidates, std::make_shared<PackageIDSequence>(), not_changing_slots);
if (id->dependencies_key())
- id->dependencies_key()->value()->root()->accept(c);
+ id->dependencies_key()->value()->top()->accept(c);
else
{
if (id->build_dependencies_key())
- id->build_dependencies_key()->value()->root()->accept(c);
+ id->build_dependencies_key()->value()->top()->accept(c);
if (id->run_dependencies_key())
- id->run_dependencies_key()->value()->root()->accept(c);
+ id->run_dependencies_key()->value()->top()->accept(c);
if (id->post_dependencies_key())
- id->post_dependencies_key()->value()->root()->accept(c);
+ id->post_dependencies_key()->value()->top()->accept(c);
if (id->suggested_dependencies_key())
- id->suggested_dependencies_key()->value()->root()->accept(c);
+ id->suggested_dependencies_key()->value()->top()->accept(c);
}
const std::shared_ptr<PackageIDSet> result(std::make_shared<PackageIDSet>());
@@ -2568,7 +2568,7 @@ Decider::_collect_provided(
if (id->provide_key())
{
DepSpecFlattener<ProvideSpecTree, PackageDepSpec> f(_imp->env);
- id->provide_key()->value()->root()->accept(f);
+ id->provide_key()->value()->top()->accept(f);
for (DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIterator v(f.begin()), v_end(f.end()) ;
v != v_end ; ++v)
diff --git a/paludis/resolver/resolver.cc b/paludis/resolver/resolver.cc
index 52e4b6f..082afe9 100644
--- a/paludis/resolver/resolver.cc
+++ b/paludis/resolver/resolver.cc
@@ -131,7 +131,7 @@ namespace
if (! set)
throw NoSuchSetError(stringify(n.spec()->name()));
- set->root()->accept(SetExpander(env, decider,
+ set->top()->accept(SetExpander(env, decider,
std::make_shared<SetReason>(n.spec()->name(), reason), recurse));
recurse.erase(n.spec()->name());
@@ -160,7 +160,7 @@ Resolver::add_target(const SetName & set_name, const std::string & extra_informa
throw NoSuchSetError(stringify(set_name));
RecursingNames recurse;
- set->root()->accept(SetExpander(_imp->env, _imp->decider, std::make_shared<TargetReason>(extra_information), recurse));
+ set->top()->accept(SetExpander(_imp->env, _imp->decider, std::make_shared<TargetReason>(extra_information), recurse));
}
void
diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc
index d88b1bd..877b969 100644
--- a/paludis/resolver/sanitised_dependencies.cc
+++ b/paludis/resolver/sanitised_dependencies.cc
@@ -147,7 +147,7 @@ namespace
const std::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(spec,
make_shared_copy(our_resolution->resolvent())));
if (if_rewritten)
- if_rewritten->as_spec_tree()->root()->accept(*this);
+ if_rewritten->as_spec_tree()->top()->accept(*this);
else
{
if (active_sublist)
@@ -345,7 +345,7 @@ namespace
const std::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(dep.spec(),
make_shared_copy(our_resolution->resolvent())));
if (if_rewritten)
- if_rewritten->as_spec_tree()->root()->accept(*this);
+ if_rewritten->as_spec_tree()->top()->accept(*this);
else
sanitised_dependencies.add(dep);
}
@@ -418,7 +418,7 @@ namespace
{
const std::shared_ptr<const SetSpecTree> set(env->set(node.spec()->name()));
if (set)
- set->root()->accept(*this);
+ set->top()->accept(*this);
else
throw NoSuchSetError(stringify(node.spec()->name()));
}
@@ -470,7 +470,7 @@ SanitisedDependencies::_populate_one(
Finder f(env, decider, resolution, id, changed, *this, ((*id).*pmf)()->initial_labels(), ((*id).*pmf)()->raw_name(),
((*id).*pmf)()->human_name(), "");
- ((*id).*pmf)()->value()->root()->accept(f);
+ ((*id).*pmf)()->value()->top()->accept(f);
}
void
diff --git a/paludis/resolver/spec_rewriter.cc b/paludis/resolver/spec_rewriter.cc
index 3213764..d920842 100644
--- a/paludis/resolver/spec_rewriter.cc
+++ b/paludis/resolver/spec_rewriter.cc
@@ -55,9 +55,9 @@ RewrittenSpec::as_spec_tree() const
for (Sequence<PackageOrBlockDepSpec>::ConstIterator i(specs()->begin()), i_end(specs()->end()) ;
i != i_end ; ++i)
if (i->if_package())
- result->root()->append(i->if_package());
+ result->top()->append(i->if_package());
else
- result->root()->append(i->if_block());
+ result->top()->append(i->if_block());
return result;
}
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index b944c32..ca37994 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -215,14 +215,14 @@ namespace
if (! spec)
throw InternalError(PALUDIS_HERE, "Bad params.set_name_suffix");
- result->root()->append(spec);
+ result->top()->append(spec);
}
else
{
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(params.parser()(tokens.at(1))));
if (params.tag())
spec->set_tag(params.tag());
- result->root()->append(spec);
+ result->top()->append(spec);
}
}
else if ("?" == tokens.at(0))
@@ -246,7 +246,7 @@ namespace
else if (! (*params.environment())[selection::SomeArbitraryVersion(
generator::Package(*spec->package_ptr()) |
filter::InstalledAtRoot(params.environment()->root()))]->empty())
- result->root()->append(spec);
+ result->top()->append(spec);
}
else
Log::get_instance()->message("set_file.bad_operator", ll_warning, lc_context)
@@ -276,7 +276,7 @@ namespace
.slot_requirement(spec->slot_requirement_ptr()),
{ }) |
filter::InstalledAtRoot(params.environment()->root()))]->empty())
- result->root()->append(spec);
+ result->top()->append(spec);
}
else
Log::get_instance()->message("set_file.bad_operator", ll_warning, lc_context)
@@ -339,14 +339,14 @@ SimpleHandler::_create_contents() const
if (std::string::npos == i->find('/'))
{
std::shared_ptr<NamedSetDepSpec> p(std::make_shared<NamedSetDepSpec>(SetName(*i)));
- _contents->root()->append(p);
+ _contents->top()->append(p);
}
else
{
std::shared_ptr<PackageDepSpec> p(std::make_shared<PackageDepSpec>(_p.parser()(stringify(*i))));
if (_p.tag())
p->set_tag(_p.tag());
- _contents->root()->append(p);
+ _contents->top()->append(p);
}
}
catch (const InternalError &)
diff --git a/paludis/set_file_TEST.cc b/paludis/set_file_TEST.cc
index 6fe81a4..ee05b5a 100644
--- a/paludis/set_file_TEST.cc
+++ b/paludis/set_file_TEST.cc
@@ -83,7 +83,7 @@ namespace test_cases
{
SetSpecStringifier p;
- f.contents()->root()->accept(p);
+ f.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( foo/bar >=bar/baz-1.23 ) ");
}
@@ -91,7 +91,7 @@ namespace test_cases
f.add("moo/oink");
{
SetSpecStringifier p;
- f.contents()->root()->accept(p);
+ f.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( foo/bar >=bar/baz-1.23 moo/oink ) ");
}
@@ -109,7 +109,7 @@ namespace test_cases
{
SetSpecStringifier p;
- f.contents()->root()->accept(p);
+ f.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( foo/bar moo/oink ) ");
}
@@ -150,7 +150,7 @@ namespace test_cases
{
SetSpecStringifier p;
- f.contents()->root()->accept(p);
+ f.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( >=bar/baz-1.23 set ) ");
}
@@ -160,7 +160,7 @@ namespace test_cases
f.add("couch");
{
SetSpecStringifier p;
- f.contents()->root()->accept(p);
+ f.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( >=bar/baz-1.23 set moo/oink couch ) ");
}
@@ -179,7 +179,7 @@ namespace test_cases
{
SetSpecStringifier p;
- f.contents()->root()->accept(p);
+ f.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( moo/oink couch ) ");
}
@@ -220,7 +220,7 @@ namespace test_cases
{
SetSpecStringifier p;
- f.contents()->root()->accept(p);
+ f.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( >=bar/bar-1.23 set set2* ) ");
}
@@ -235,7 +235,7 @@ namespace test_cases
{
SetSpecStringifier p;
- fstar.contents()->root()->accept(p);
+ fstar.contents()->top()->accept(p);
TEST_CHECK_STRINGIFY_EQUAL(p.s.str(), "( foo/foo >=bar/bar-1.23 >=baz/baz-1.23 set* set2* ) ");
}
diff --git a/paludis/spec_tree.cc b/paludis/spec_tree.cc
index cf25e29..9825165 100644
--- a/paludis/spec_tree.cc
+++ b/paludis/spec_tree.cc
@@ -108,28 +108,28 @@ InnerNode<Tree_, Item_>::spec() const
template <typename NodeList_, typename RootNode_>
SpecTree<NodeList_, RootNode_>::SpecTree(const std::shared_ptr<RootNode_> & spec) :
- _root(std::make_shared<typename InnerNodeType<RootNode_>::Type>(spec))
+ _top(std::make_shared<typename InnerNodeType<RootNode_>::Type>(spec))
{
}
template <typename NodeList_, typename RootNode_>
SpecTree<NodeList_, RootNode_>::SpecTree(const std::shared_ptr<const RootNode_> & spec) :
- _root(std::make_shared<typename InnerNodeType<RootNode_>::Type>(spec))
+ _top(std::make_shared<typename InnerNodeType<RootNode_>::Type>(spec))
{
}
template <typename NodeList_, typename RootNode_>
const std::shared_ptr<typename SpecTree<NodeList_, RootNode_>::template InnerNodeType<RootNode_>::Type>
-SpecTree<NodeList_, RootNode_>::root()
+SpecTree<NodeList_, RootNode_>::top()
{
- return _root;
+ return _top;
}
template <typename NodeList_, typename RootNode_>
const std::shared_ptr<const typename SpecTree<NodeList_, RootNode_>::template InnerNodeType<RootNode_>::Type>
-SpecTree<NodeList_, RootNode_>::root() const
+SpecTree<NodeList_, RootNode_>::top() const
{
- return _root;
+ return _top;
}
namespace
diff --git a/paludis/spec_tree.hh b/paludis/spec_tree.hh
index ab36c10..f9c405a 100644
--- a/paludis/spec_tree.hh
+++ b/paludis/spec_tree.hh
@@ -170,9 +170,9 @@ namespace paludis
explicit SpecTree(const std::shared_ptr<const RootNode_> & spec);
- const std::shared_ptr<typename InnerNodeType<RootNode_>::Type> root();
+ const std::shared_ptr<typename InnerNodeType<RootNode_>::Type> top();
- const std::shared_ptr<const typename InnerNodeType<RootNode_>::Type> root() const;
+ const std::shared_ptr<const typename InnerNodeType<RootNode_>::Type> top() const;
typedef Formatter<
typename Select<TypeListContains<VisitableTypeList, typename NodeType<PackageDepSpec>::Type>::value,
@@ -200,7 +200,7 @@ namespace paludis
> ItemFormatter;
private:
- const std::shared_ptr<typename InnerNodeType<RootNode_>::Type> _root;
+ const std::shared_ptr<typename InnerNodeType<RootNode_>::Type> _top;
};
extern template class WrappedForwardIterator<spec_tree_internals::BasicInnerNode<GenericSpecTree>::ConstIteratorTag,
diff --git a/paludis/uninstall_list.cc b/paludis/uninstall_list.cc
index 9f285d3..d8129bf 100644
--- a/paludis/uninstall_list.cc
+++ b/paludis/uninstall_list.cc
@@ -178,7 +178,7 @@ UninstallList::add_errors_for_system()
if ((! needed) && l->package_id()->provide_key())
{
DepSpecFlattener<ProvideSpecTree, PackageDepSpec> f(_imp->env);
- l->package_id()->provide_key()->value()->root()->accept(f);
+ l->package_id()->provide_key()->value()->top()->accept(f);
for (DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIterator v(f.begin()), v_end(f.end()) ;
v != v_end && ! needed ; ++v)
{
@@ -380,7 +380,7 @@ namespace
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
recursing_sets.erase(node.spec()->name());
}
@@ -406,13 +406,13 @@ UninstallList::collect_depped_upon(std::shared_ptr<const PackageIDSet> targets)
{
DepCollector c(_imp->env, *i);
if ((*i)->build_dependencies_key())
- (*i)->build_dependencies_key()->value()->root()->accept(c);
+ (*i)->build_dependencies_key()->value()->top()->accept(c);
if ((*i)->run_dependencies_key())
- (*i)->run_dependencies_key()->value()->root()->accept(c);
+ (*i)->run_dependencies_key()->value()->top()->accept(c);
if ((*i)->post_dependencies_key())
- (*i)->post_dependencies_key()->value()->root()->accept(c);
+ (*i)->post_dependencies_key()->value()->top()->accept(c);
if ((*i)->suggested_dependencies_key())
- (*i)->suggested_dependencies_key()->value()->root()->accept(c);
+ (*i)->suggested_dependencies_key()->value()->top()->accept(c);
cache = _imp->dep_collector_cache.insert(std::make_pair(*i,
std::shared_ptr<const DepListEntryTags>(c.matches))).first;
@@ -506,13 +506,13 @@ UninstallList::add_dependencies(const PackageID & e, const bool error)
{
DepCollector c(_imp->env, *i);
if ((*i)->build_dependencies_key())
- (*i)->build_dependencies_key()->value()->root()->accept(c);
+ (*i)->build_dependencies_key()->value()->top()->accept(c);
if ((*i)->run_dependencies_key())
- (*i)->run_dependencies_key()->value()->root()->accept(c);
+ (*i)->run_dependencies_key()->value()->top()->accept(c);
if ((*i)->post_dependencies_key())
- (*i)->post_dependencies_key()->value()->root()->accept(c);
+ (*i)->post_dependencies_key()->value()->top()->accept(c);
if ((*i)->suggested_dependencies_key())
- (*i)->suggested_dependencies_key()->value()->root()->accept(c);
+ (*i)->suggested_dependencies_key()->value()->top()->accept(c);
cache = _imp->dep_collector_cache.insert(std::make_pair(*i,
std::shared_ptr<const DepListEntryTags>(c.matches))).first;
}
diff --git a/paludis/uninstall_list_TEST.cc b/paludis/uninstall_list_TEST.cc
index a501dcf..6e3d5bf 100644
--- a/paludis/uninstall_list_TEST.cc
+++ b/paludis/uninstall_list_TEST.cc
@@ -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, { })));
+ world->top()->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, { })));
- world->root()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/bar", &env, { })));
+ world->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("foo/moo", &env, { })));
+ world->top()->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, { })));
- 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, { })));
+ world->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-a", &env, { })));
+ world->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-b", &env, { })));
+ world->top()->append(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec("cat/needs-c", &env, { })));
+ world->top()->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/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 327cea5..cf8f8f5 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -592,7 +592,7 @@ namespace
case '=':
return false;
case '<':
- return s.value()->root()->accept_returning<bool>(SpecTreeSearcher(pattern));
+ return s.value()->top()->accept_returning<bool>(SpecTreeSearcher(pattern));
}
return false;
@@ -605,7 +605,7 @@ namespace
case '=':
return false;
case '<':
- return s.value()->root()->accept_returning<bool>(SpecTreeSearcher(pattern));
+ return s.value()->top()->accept_returning<bool>(SpecTreeSearcher(pattern));
}
return false;
@@ -618,7 +618,7 @@ namespace
case '=':
return false;
case '<':
- return s.value()->root()->accept_returning<bool>(SpecTreeSearcher(pattern));
+ return s.value()->top()->accept_returning<bool>(SpecTreeSearcher(pattern));
}
return false;
@@ -631,7 +631,7 @@ namespace
case '=':
return false;
case '<':
- return s.value()->root()->accept_returning<bool>(SpecTreeSearcher(pattern));
+ return s.value()->top()->accept_returning<bool>(SpecTreeSearcher(pattern));
}
return false;
@@ -644,7 +644,7 @@ namespace
case '=':
return false;
case '<':
- return s.value()->root()->accept_returning<bool>(SpecTreeSearcher(pattern));
+ return s.value()->top()->accept_returning<bool>(SpecTreeSearcher(pattern));
}
return false;
@@ -657,7 +657,7 @@ namespace
case '=':
return false;
case '<':
- return s.value()->root()->accept_returning<bool>(SpecTreeSearcher(pattern));
+ return s.value()->top()->accept_returning<bool>(SpecTreeSearcher(pattern));
}
return false;
@@ -670,7 +670,7 @@ namespace
case '=':
return false;
case '<':
- return s.value()->root()->accept_returning<bool>(SpecTreeSearcher(pattern));
+ return s.value()->top()->accept_returning<bool>(SpecTreeSearcher(pattern));
}
return false;
diff --git a/python/dep_list.cc b/python/dep_list.cc
index c8ba1e6..3a83dd4 100644
--- a/python/dep_list.cc
+++ b/python/dep_list.cc
@@ -42,7 +42,7 @@ struct DepListWrapper
already_installed(const DepList & self, std::shared_ptr<const DependencySpecTree> st,
std::shared_ptr<const DestinationsSet> & d)
{
- return self.already_installed(*st->root(), d);
+ return self.already_installed(*st->top(), d);
}
};
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index 91c1bd4..7d01468 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -733,7 +733,7 @@ void dispatch(SpecTreeFromPython<H_> * const v, const PyD_ & d)
template <typename H_>
SpecTreeFromPython<H_>::SpecTreeFromPython() :
_result(std::make_shared<H_>(std::make_shared<AllDepSpec>())),
- _add_to(_result->root())
+ _add_to(_result->top())
{
}
@@ -946,7 +946,7 @@ struct RegisterSpecTreeToPython
convert(const std::shared_ptr<const T_> & n)
{
SpecTreeToPython v;
- n->root()->accept(v);
+ n->top()->accept(v);
return bp::incref(bp::object(v.result()).ptr());
}
};
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index b16ae4b..6f66361 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -297,7 +297,7 @@ namespace
result(r)
{
if (result)
- add_to = result->root();
+ add_to = result->top();
std::shared_ptr<WrappedSpecBase> * p;
Data_Get_Struct(val, std::shared_ptr<WrappedSpecBase>, p);
@@ -357,7 +357,7 @@ namespace
static void handle(ValueToTree<H_> * const t, const WrappedSpec<AllDepSpec> & spec)
{
t->result.reset(new H_(spec.spec()));
- t->add_to = t->result->root();
+ t->add_to = t->result->top();
}
};
@@ -1415,7 +1415,7 @@ paludis::ruby::dep_tree_to_value(const std::shared_ptr<const T_> & m)
try
{
TreeToValue v;
- m->root()->accept(v);
+ m->top()->accept(v);
std::shared_ptr<const WrappedSpecBase> * ptr(new std::shared_ptr<const WrappedSpecBase>(v.wrapped));
return Data_Wrap_Struct(v.klass, 0, &Common<std::shared_ptr<const WrappedSpecBase> >::free, ptr);
}
diff --git a/src/clients/adjutrix/find_insecure_packages.cc b/src/clients/adjutrix/find_insecure_packages.cc
index 6f6d580..377e231 100644
--- a/src/clients/adjutrix/find_insecure_packages.cc
+++ b/src/clients/adjutrix/find_insecure_packages.cc
@@ -115,7 +115,7 @@ namespace
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
recursing_sets.erase(node.spec()->name());
}
@@ -174,7 +174,7 @@ void do_find_insecure_packages(const NoConfigEnvironment & env)
write_repository_header(r->name());
ListInsecureVisitor v(env);
- all_insecure->root()->accept(v);
+ all_insecure->top()->accept(v);
cout << v << endl;
}
}
diff --git a/src/clients/adjutrix/find_reverse_deps.cc b/src/clients/adjutrix/find_reverse_deps.cc
index e2c2ac9..66c45d1 100644
--- a/src/clients/adjutrix/find_reverse_deps.cc
+++ b/src/clients/adjutrix/find_reverse_deps.cc
@@ -85,7 +85,7 @@ namespace
void check(const std::shared_ptr<const DependencySpecTree> & tree, const std::string & depname)
{
_depname = depname;
- tree->root()->accept(*this);
+ tree->top()->accept(*this);
}
bool found_matches()
@@ -126,7 +126,7 @@ namespace
return;
}
- set->root()->accept(*this);
+ set->top()->accept(*this);
_recursing_sets.erase(node.spec()->name());
}
diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc
index 8b40512..430eae8 100644
--- a/src/clients/cave/cmd_match.cc
+++ b/src/clients/cave/cmd_match.cc
@@ -281,37 +281,37 @@ namespace
void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
SpecTreeAsString m = { texts };
- k.value()->root()->accept(m);
+ k.value()->top()->accept(m);
}
void visit(const MetadataSpecTreeKey<DependencySpecTree> & k)
{
SpecTreeAsString m = { texts };
- k.value()->root()->accept(m);
+ k.value()->top()->accept(m);
}
void visit(const MetadataSpecTreeKey<LicenseSpecTree> & k)
{
SpecTreeAsString m = { texts };
- k.value()->root()->accept(m);
+ k.value()->top()->accept(m);
}
void visit(const MetadataSpecTreeKey<ProvideSpecTree> & k)
{
SpecTreeAsString m = { texts };
- k.value()->root()->accept(m);
+ k.value()->top()->accept(m);
}
void visit(const MetadataSpecTreeKey<SimpleURISpecTree> & k)
{
SpecTreeAsString m = { texts };
- k.value()->root()->accept(m);
+ k.value()->top()->accept(m);
}
void visit(const MetadataSpecTreeKey<FetchableURISpecTree> & k)
{
SpecTreeAsString m = { texts };
- k.value()->root()->accept(m);
+ k.value()->top()->accept(m);
}
void visit(const MetadataCollectionKey<Sequence<FSEntry> > & k)
diff --git a/src/clients/cave/cmd_print_set.cc b/src/clients/cave/cmd_print_set.cc
index c144c22..9b44a45 100644
--- a/src/clients/cave/cmd_print_set.cc
+++ b/src/clients/cave/cmd_print_set.cc
@@ -107,7 +107,7 @@ namespace
if (! set)
throw NoSuchSetError(stringify(name));
- set->root()->accept(*this);
+ set->top()->accept(*this);
recursing.erase(name);
}
@@ -145,7 +145,7 @@ PrintSetCommand::run(
throw NothingMatching(*cmdline.begin_parameters());
std::set<SetName> recursing;
- set->root()->accept(SetPrinter(env, cmdline, recursing));
+ set->top()->accept(SetPrinter(env, cmdline, recursing));
return EXIT_SUCCESS;
}
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index f3bfd67..a17d270 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -175,7 +175,7 @@ namespace
throw RecursivelyDefinedSetError(stringify(node.spec()->name()));
++indent;
- set->root()->accept(*this);
+ set->top()->accept(*this);
recursing_sets.erase(node.spec()->name());
--indent;
@@ -196,7 +196,7 @@ namespace
throw NoSuchSetError(stringify(s));
SetDisplayer d(env, 1);
- set->root()->accept(d);
+ set->top()->accept(d);
cout << endl;
}
diff --git a/src/clients/inquisitio/key_extractor.cc b/src/clients/inquisitio/key_extractor.cc
index d5af664..1dcd1b2 100644
--- a/src/clients/inquisitio/key_extractor.cc
+++ b/src/clients/inquisitio/key_extractor.cc
@@ -343,7 +343,7 @@ namespace
else
{
TreeVisitor v(_key, _visible_only, _env, _id, _m);
- s.value()->root()->accept(v);
+ s.value()->top()->accept(v);
result = v.result;
}
}
@@ -358,7 +358,7 @@ namespace
else
{
TreeVisitor v(_key, _visible_only, _env, _id, _m);
- s.value()->root()->accept(v);
+ s.value()->top()->accept(v);
result = v.result;
}
}
@@ -373,7 +373,7 @@ namespace
else
{
TreeVisitor v(_key, _visible_only, _env, _id, _m);
- s.value()->root()->accept(v);
+ s.value()->top()->accept(v);
result = v.result;
}
}
@@ -388,7 +388,7 @@ namespace
else
{
TreeVisitor v(_key, _visible_only, _env, _id, _m);
- s.value()->root()->accept(v);
+ s.value()->top()->accept(v);
result = v.result;
}
}
@@ -403,7 +403,7 @@ namespace
else
{
TreeVisitor v(_key, _visible_only, _env, _id, _m);
- s.value()->root()->accept(v);
+ s.value()->top()->accept(v);
result = v.result;
}
}
@@ -418,7 +418,7 @@ namespace
else
{
TreeVisitor v(_key, _visible_only, _env, _id, _m);
- s.value()->root()->accept(v);
+ s.value()->top()->accept(v);
result = v.result;
}
}
@@ -433,7 +433,7 @@ namespace
else
{
TreeVisitor v(_key, _visible_only, _env, _id, _m);
- s.value()->root()->accept(v);
+ s.value()->top()->accept(v);
result = v.result;
}
}
diff --git a/src/clients/paludis/query.cc b/src/clients/paludis/query.cc
index 08c7b2a..3e4ee61 100644
--- a/src/clients/paludis/query.cc
+++ b/src/clients/paludis/query.cc
@@ -113,7 +113,7 @@ void do_one_set_query(
{
cout << "* " << colour(cl_package_name, q) << endl;
SetPrettyPrinter packages;
- set->root()->accept(packages);
+ set->top()->accept(packages);
cout << " " << std::setw(22) << std::left << "Packages:" << std::setw(0)
<< endl << packages.stream.str() << endl;
}
diff --git a/src/output/console_query_task.cc b/src/output/console_query_task.cc
index 38ee187..27c1999 100644
--- a/src/output/console_query_task.cc
+++ b/src/output/console_query_task.cc
@@ -472,7 +472,7 @@ namespace
{
task->output_left_column(k.human_name() + ":", in);
ComplexLicenseFinder is_complex;
- k.value()->root()->accept(is_complex);
+ k.value()->top()->accept(is_complex);
if (is_complex)
{
task->output_right_column("");