Use `file_deps` to name file interdependencies

src/dds/build/deps.cpp → src/dds/build/file_deps.cpp

@@ -1,4 +1,4 @@
-#include "./deps.hpp"
+#include "./file_deps.hpp"
 
 #include <dds/db/database.hpp>
 #include <dds/proc.hpp>
@@ -11,13 +11,13 @@
 
 using namespace dds;
 
-deps_info dds::parse_mkfile_deps_file(path_ref where) {
+file_deps_info dds::parse_mkfile_deps_file(path_ref where) {
     auto content = slurp_file(where);
     return parse_mkfile_deps_str(content);
 }
 
-deps_info dds::parse_mkfile_deps_str(std::string_view str) {
-    deps_info ret;
+file_deps_info dds::parse_mkfile_deps_str(std::string_view str) {
+    file_deps_info ret;
 
     // Remove escaped newlines
     auto no_newlines = replace(str, "\\\n", " ");
@@ -45,9 +45,9 @@ deps_info dds::parse_mkfile_deps_str(std::string_view str) {
 }
 
 msvc_deps_info dds::parse_msvc_output_for_deps(std::string_view output, std::string_view leader) {
-    auto        lines = split_view(output, "\n");
-    std::string cleaned_output;
-    deps_info   deps;
+    auto           lines = split_view(output, "\n");
+    std::string    cleaned_output;
+    file_deps_info deps;
     for (const auto full_line : lines) {
         auto trimmed = trim_view(full_line);
         if (!starts_with(trimmed, leader)) {
@@ -65,7 +65,7 @@ msvc_deps_info dds::parse_msvc_output_for_deps(std::string_view output, std::str
     return {deps, cleaned_output};
 }
 
-void dds::update_deps_info(database& db, const deps_info& deps) {
+void dds::update_deps_info(database& db, const file_deps_info& deps) {
     db.store_file_command(deps.output, {deps.command, deps.command_output});
     db.forget_inputs_of(deps.output);
     for (auto&& inp : deps.inputs) {

src/dds/build/deps.hpp → src/dds/build/file_deps.hpp

@@ -3,18 +3,18 @@
 #include <dds/util/fs.hpp>
 
 #include <string>
-#include <vector>
 #include <string_view>
+#include <vector>
 
 namespace dds {
 
-enum class deps_mode {
+enum class file_deps_mode {
     none,
     msvc,
     gnu,
 };
 
-struct deps_info {
+struct file_deps_info {
     fs::path              output;
     std::vector<fs::path> inputs;
     std::string           command;
@@ -23,17 +23,17 @@ struct deps_info {
 
 class database;
 
-deps_info parse_mkfile_deps_file(path_ref where);
-deps_info parse_mkfile_deps_str(std::string_view str);
+file_deps_info parse_mkfile_deps_file(path_ref where);
+file_deps_info parse_mkfile_deps_str(std::string_view str);
 
 struct msvc_deps_info {
-    struct deps_info deps_info;
-    std::string      cleaned_output;
+    struct file_deps_info deps_info;
+    std::string           cleaned_output;
 };
 
 msvc_deps_info parse_msvc_output_for_deps(std::string_view output, std::string_view leader);
 
-void update_deps_info(database& db, const deps_info&);
+void update_deps_info(database& db, const file_deps_info&);
 
 struct deps_rebuild_info {
     std::vector<fs::path> newer_inputs;

src/dds/build/deps.test.cpp → src/dds/build/file_deps.test.cpp

@@ -1,4 +1,4 @@
-#include <dds/build/deps.hpp>
+#include <dds/build/file_deps.hpp>
 
 #include <catch2/catch.hpp>
 
@@ -42,9 +42,9 @@ Something else
     CHECK(new_output == "\nOther line\n    indented line\nSomething else\n");
     CHECK(deps.inputs
           == std::vector<dds::fs::path>({
-                 "C:\\foo\\bar\\filepath/thing.hpp",
-                 "C:\\foo\\bar\\filepath/baz.h",
-                 "C:\\foo\\bar\\filepath/quux.h",
-                 "C:\\foo\\bar\\filepath/cats/quux.h",
-             }));
+              "C:\\foo\\bar\\filepath/thing.hpp",
+              "C:\\foo\\bar\\filepath/baz.h",
+              "C:\\foo\\bar\\filepath/quux.h",
+              "C:\\foo\\bar\\filepath/cats/quux.h",
+          }));
 }

src/dds/build/params.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
+#include <dds/sdist.hpp>
 #include <dds/toolchain/toolchain.hpp>
 #include <dds/util/fs.hpp>
-#include <dds/sdist.hpp>
 
 #include <optional>
 

src/dds/build/plan/compile_exec.cpp

@@ -1,6 +1,6 @@
 #include "./compile_exec.hpp"
 
-#include <dds/build/deps.hpp>
+#include <dds/build/file_deps.hpp>
 #include <dds/proc.hpp>
 #include <dds/util/string.hpp>
 #include <dds/util/time.hpp>
@@ -93,7 +93,7 @@ struct compile_counter {
  * @param env The build environment
  * @param counter A thread-safe counter for display progress to the user
  */
-std::optional<deps_info>
+std::optional<file_deps_info>
 do_compile(const compile_file_full& cf, build_env_ref env, compile_counter& counter) {
     // Create the parent directory
     fs::create_directories(cf.object_file_path.parent_path());
@@ -122,9 +122,9 @@ do_compile(const compile_file_full& cf, build_env_ref env, compile_counter& coun
     std::string compiler_output = std::move(proc_res.output);
 
     // Build dependency information, if applicable to the toolchain
-    std::optional<deps_info> ret_deps_info;
+    std::optional<file_deps_info> ret_deps_info;
 
-    if (env.toolchain.deps_mode() == deps_mode::gnu) {
+    if (env.toolchain.deps_mode() == file_deps_mode::gnu) {
         // GNU-style deps using Makefile generation
         assert(cf.cmd_info.gnu_depfile_path.has_value());
         auto& df_path = *cf.cmd_info.gnu_depfile_path;
@@ -140,7 +140,7 @@ do_compile(const compile_file_full& cf, build_env_ref env, compile_counter& coun
             dep_info.command_output = compiler_output;
             ret_deps_info           = std::move(dep_info);
         }
-    } else if (env.toolchain.deps_mode() == deps_mode::msvc) {
+    } else if (env.toolchain.deps_mode() == file_deps_mode::msvc) {
         // Uglier deps generation by parsing the output from cl.exe
         /// TODO: Handle different #include Note: prefixes, since those are localized
         auto msvc_deps = parse_msvc_output_for_deps(compiler_output, "Note: including file:");
@@ -250,8 +250,8 @@ bool dds::detail::compile_all(const ref_vector<const compile_file_plan>& compile
     compile_counter counter{{1}, total, max_digits};
 
     // Ass we execute, accumulate new dependency information from successful compilations
-    std::vector<deps_info> all_new_deps;
-    std::mutex             mut;
+    std::vector<file_deps_info> all_new_deps;
+    std::mutex                  mut;
     // Do it!
     auto okay = parallel_run(each_realized, njobs, [&](const compile_file_full& full) {
         auto new_dep = do_compile(full, env, counter);

src/dds/toolchain/from_dds.cpp

@@ -173,21 +173,21 @@ toolchain dds::parse_toolchain_dds(const lm::pair_list& pairs, strv context) {
     bool is_msvc     = compiler_id_e == msvc;
     bool is_gnu_like = is_gnu || is_clang;
 
-    const enum deps_mode deps_mode = [&] {
+    const enum file_deps_mode deps_mode = [&] {
         if (!deps_mode_str.has_value()) {
             if (is_gnu_like) {
-                return deps_mode::gnu;
+                return file_deps_mode::gnu;
             } else if (is_msvc) {
-                return deps_mode::msvc;
+                return file_deps_mode::msvc;
             } else {
-                return deps_mode::none;
+                return file_deps_mode::none;
             }
         } else if (deps_mode_str == "GNU") {
-            return deps_mode::gnu;
+            return file_deps_mode::gnu;
         } else if (deps_mode_str == "MSVC") {
-            return deps_mode::msvc;
+            return file_deps_mode::msvc;
         } else if (deps_mode_str == "None") {
-            return deps_mode::none;
+            return file_deps_mode::none;
         } else {
             fail(context, "Unknown Deps-Mode '{}'", *deps_mode_str);
         }

src/dds/toolchain/prep.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <dds/build/deps.hpp>
+#include <dds/build/file_deps.hpp>
 
 #include <string>
 #include <vector>
@@ -26,7 +26,7 @@ struct toolchain_prep {
     std::string exe_prefix;
     std::string exe_suffix;
 
-    enum deps_mode deps_mode;
+    enum file_deps_mode deps_mode;
 
     toolchain realize() const;
 };

src/dds/toolchain/toolchain.cpp

@@ -78,7 +78,7 @@ compile_command_info toolchain::create_compile_command(const compile_file_spec&
 
     std::optional<fs::path> gnu_depfile_path;
 
-    if (_deps_mode == deps_mode::gnu) {
+    if (_deps_mode == file_deps_mode::gnu) {
         gnu_depfile_path = spec.out_path;
         gnu_depfile_path->replace_extension(gnu_depfile_path->extension().string() + ".d");
         extend(flags,
@@ -87,7 +87,7 @@ compile_command_info toolchain::create_compile_command(const compile_file_spec&
                 std::string_view(gnu_depfile_path->string()),
                 "-MT"sv,
                 std::string_view(spec.out_path.string())});
-    } else if (_deps_mode == deps_mode::msvc) {
+    } else if (_deps_mode == file_deps_mode::msvc) {
         flags.push_back("/showIncludes");
     }
 
@@ -150,9 +150,9 @@ std::optional<toolchain> toolchain::get_builtin(std::string_view tc_id) noexcept
     }
 
 #define CXX_VER_TAG(str, version)                                                                  \
-    if (starts_with(tc_id, str)) {                                                         \
+    if (starts_with(tc_id, str)) {                                                                 \
         tc_id = tc_id.substr(std::string_view(str).length());                                      \
-        tc_content += "C++-Version: "s + version + "\n";                                                  \
+        tc_content += "C++-Version: "s + version + "\n";                                           \
     }                                                                                              \
     static_assert(true)
 

src/dds/toolchain/toolchain.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <dds/build/deps.hpp>
+#include <dds/build/file_deps.hpp>
 #include <dds/util/fs.hpp>
 
 #include <optional>
@@ -60,7 +60,7 @@ class toolchain {
     std::string _exe_prefix;
     std::string _exe_suffix;
 
-    enum deps_mode _deps_mode;
+    enum file_deps_mode _deps_mode;
 
 public:
     toolchain() = default;