From 51cbf8f11f15062f23317d676364ca690b1edc92 Mon Sep 17 00:00:00 2001
From: Alberto Sartori <alberto.sartori@huawei.com>
Date: Mon, 28 Mar 2022 11:59:10 +0200
Subject: refactor EntityName

EntityName now clearly expresses its double identity:
 - NamedTarget
 - AnonymousTarget

The usage of std::variant<NamedTarget,AnonymousTarget> guarantees that
EntityName, internally, is not a mix of the two - like could happen
before this patch.

NamedTarget features an enum ReferenceType to express the type of the
target, namely, "normal target" or an "explicit file reference".

Thanks to this refactoring, the introduction of new targets type
should be easier, since the design is more modular.

NamedTarget
---
 .../build_engine/base_maps/source_map.cpp          | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'src/buildtool/build_engine/base_maps/source_map.cpp')

diff --git a/src/buildtool/build_engine/base_maps/source_map.cpp b/src/buildtool/build_engine/base_maps/source_map.cpp
index 6a6d49c0..39976016 100644
--- a/src/buildtool/build_engine/base_maps/source_map.cpp
+++ b/src/buildtool/build_engine/base_maps/source_map.cpp
@@ -13,8 +13,8 @@ namespace {
 
 auto as_target(const BuildMaps::Base::EntityName& key, ExpressionPtr artifact)
     -> AnalysedTargetPtr {
-    auto stage =
-        ExpressionPtr{Expression::map_t{key.name, std::move(artifact)}};
+    auto stage = ExpressionPtr{
+        Expression::map_t{key.GetNamedTarget().name, std::move(artifact)}};
     return std::make_shared<AnalysedTarget>(
         TargetResult{stage, Expression::kEmptyMap, stage},
         std::vector<ActionDescription::Ptr>{},
@@ -34,43 +34,46 @@ auto CreateSourceTargetMap(const gsl::not_null<DirectoryEntriesMap*>& dirs,
                                     auto /* unused */,
                                     auto const& key) {
         using std::filesystem::path;
-        auto name = path(key.name).lexically_normal();
+        const auto& target = key.GetNamedTarget();
+        auto name = path(target.name).lexically_normal();
         if (name.is_absolute() or *name.begin() == "..") {
             (*logger)(
                 fmt::format("Source file reference outside current module: {}",
-                            key.name),
+                            target.name),
                 true);
             return;
         }
-        auto dir = (path(key.module) / name).parent_path();
+        auto dir = (path(target.module) / name).parent_path();
         auto const* ws_root =
-            RepositoryConfig::Instance().WorkspaceRoot(key.repository);
+            RepositoryConfig::Instance().WorkspaceRoot(target.repository);
 
         auto src_file_reader = [ts, key, name, setter, logger, dir, ws_root](
                                    bool exists_in_ws_root) {
             if (ws_root != nullptr and exists_in_ws_root) {
                 if (auto desc = ws_root->ToArtifactDescription(
-                        path(key.module) / name, key.repository)) {
+                        path(key.GetNamedTarget().module) / name,
+                        key.GetNamedTarget().repository)) {
                     (*setter)(as_target(key, ExpressionPtr{std::move(*desc)}));
                     return;
                 }
             }
-            (*logger)(fmt::format("Cannot determine source file {}",
-                                  path(key.name).filename().string()),
+            (*logger)(fmt::format(
+                          "Cannot determine source file {}",
+                          path(key.GetNamedTarget().name).filename().string()),
                       true);
         };
 
         if (ws_root != nullptr and ws_root->HasFastDirectoryLookup()) {
             // by-pass directory map and directly attempt to read from ws_root
-            src_file_reader(ws_root->IsFile(path(key.module) / name));
+            src_file_reader(ws_root->IsFile(path(target.module) / name));
             return;
         }
         dirs->ConsumeAfterKeysReady(
             ts,
-            {ModuleName{key.repository, dir.string()}},
+            {ModuleName{target.repository, dir.string()}},
             [key, src_file_reader](auto values) {
-                src_file_reader(
-                    values[0]->Contains(path(key.name).filename().string()));
+                src_file_reader(values[0]->Contains(
+                    path(key.GetNamedTarget().name).filename().string()));
             },
             [logger, dir](auto msg, auto fatal) {
                 (*logger)(
-- 
cgit v1.2.3