Fix indirection of workspace roots in precomputed roots

1 files changed, 19 insertions, 11 deletions

diff --git a/src/other_tools/just_mr/setup_utils.cpp b/src/other_tools/just_mr/setup_utils.cpp
index 63f555d8..07498441 100644
--- a/src/other_tools/just_mr/setup_utils.cpp
+++ b/src/other_tools/just_mr/setup_utils.cpp
@@ -59,13 +59,22 @@ void WarnUnknownKeys(std::string const& name, ExpressionPtr const& repo_def) {
     }
 }
 
-[[nodiscard]] auto GetTargetRepoIfPrecomputed(ExpressionPtr const& repo)
+[[nodiscard]] auto GetTargetRepoIfPrecomputed(ExpressionPtr const& repos,
+                                              std::string const& name)
     -> std::optional<std::string> {
-    if (not repo.IsNotNull() or not repo->IsMap()) {
-        return std::nullopt;
+    // Resolve indirections while the root's workspace root is declared
+    // implicitly:
+    ExpressionPtr root{name};
+    while (root.IsNotNull() and root->IsString()) {
+        auto const repo = repos->Get(root->String(), Expression::none_t{});
+        if (not repo.IsNotNull() or not repo->IsMap()) {
+            return std::nullopt;
+        }
+        root = repo->Get("repository", Expression::none_t{});
     }
-    auto const repository = repo->Get("repository", Expression::none_t{});
-    if (auto const precomputed = ParsePrecomputedRoot(repository)) {
+
+    // Check the root is a precomputed root:
+    if (auto const precomputed = ParsePrecomputedRoot(root)) {
         return precomputed->GetReferencedRepository();
     }
     return std::nullopt;
@@ -100,9 +109,8 @@ void ReachableRepositories(
         WarnUnknownKeys(repo_name, repos_repo_name);
 
         // If the current repo is a computed one, process its target repo
-        if (auto computed_target =
-                GetTargetRepoIfPrecomputed(repos_repo_name)) {
-            to_process.push(*std::move(computed_target));
+        if (auto precomputed = GetTargetRepoIfPrecomputed(repos, repo_name)) {
+            to_process.push(*std::move(precomputed));
         }
 
         // check bindings
@@ -125,9 +133,9 @@ void ReachableRepositories(
 
                 // If the overlay repo is a computed one, process its target
                 // repo
-                if (auto computed_target = GetTargetRepoIfPrecomputed(
-                        repos->Get(layer_repo_name, Expression::none_t{}))) {
-                    to_process.push(*std::move(computed_target));
+                if (auto precomputed =
+                        GetTargetRepoIfPrecomputed(repos, layer_repo_name)) {
+                    to_process.push(*std::move(precomputed));
                 }
             }
         }