aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories')
-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
37 files changed, 159 insertions, 159 deletions
diff --git a/paludis/repositories/accounts/accounts_dep_key.cc b/paludis/repositories/accounts/accounts_dep_key.cc
index 3b3d15a0f..24c879bcf 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 e96d4886f..2ae206b09 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 677859e0b..19766a132 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 1aee8aaea..5def6da68 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 6b39e3337..4ad722c3e 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 d526312f0..5da1710eb 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 5f083cc38..74192cebd 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 579081dbb..8c49cd97a 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 7fb6a36e0..4626c1bff 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 90054b660..49db72f32 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 602085db6..8c04dd413 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 389b024f5..e8acece92 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 f2add9419..f8880b1fa 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 919b2da14..ece977730 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 704b86db4..90609044f 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 dd4cede94..9c678ea78 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 308214c00..a4a36198d 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 5b6a97607..759fea44a 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 90105b7c2..eab91c3bf 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 692be4339..6528c20f1 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 ace0fbeba..4c6e63774 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 40b17e82a..13b359fde 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 4cfa73f4e..072101f7a 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 56f8709f3..74f37103b 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 b73fce65b..500623f51 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 e8ea1ae4e..feb8e3028 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 51138c9c4..0d89b4327 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 99759746a..0178626f1 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 d2e3465b0..3941a5dae 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 ff738d00e..89b6ee1d8 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 4ab7d3408..04feae231 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 03ce38c5f..ce92f3a33 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 5914e8520..345731882 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 a323725f2..0df950cf8 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 268c62a65..6f84a3a79 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 261345ae0..15cce4971 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 709a549e0..093d8b085 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);
}
};
}