Rename things to try to make the code more readable

Author: mrexodia

include/cmake.hpp

@@ -8,7 +8,7 @@
 #include <vector>
 
 namespace cmkr {
-namespace cmake {
+namespace parser {
 
 struct Setting {
     std::string name;
@@ -110,7 +110,7 @@ struct Install {
     std::string destination;
 };
 
-struct CMake {
+struct Project {
     // This is the CMake version required to use all cmkr versions.
     std::string cmake_version = "3.15";
     std::string cmkr_include = "cmkr.cmake";
@@ -141,8 +141,8 @@ struct CMake {
     std::vector<Install> installs;
     tsl::ordered_map<std::string, std::string> conditions;
 
-    CMake(const std::string &path, bool build);
+    Project(const std::string &path, bool build);
 };
 
-} // namespace cmake
+} // namespace parser
 } // namespace cmkr

src/build.cpp

@@ -14,33 +14,33 @@ namespace cmkr {
 namespace build {
 
 int run(int argc, char **argv) {
-    cmake::CMake cmake(".", true);
+    parser::Project project(".", true);
     if (argc > 2) {
         for (int i = 2; i < argc; ++i) {
-            cmake.build_args.push_back(argv[i]);
+            project.build_args.push_back(argv[i]);
         }
     }
     std::stringstream ss;
 
     if (gen::generate_cmake(fs::current_path().string().c_str()))
         throw std::runtime_error("CMake generation failure!");
 
-    ss << "cmake -S. -B" << cmake.build_dir << " ";
+    ss << "cmake -S. -B" << project.build_dir << " ";
 
-    if (!cmake.generator.empty()) {
-        ss << "-G \"" << cmake.generator << "\" ";
+    if (!project.generator.empty()) {
+        ss << "-G \"" << project.generator << "\" ";
     }
-    if (!cmake.config.empty()) {
-        ss << "-DCMAKE_BUILD_TYPE=" << cmake.config << " ";
+    if (!project.config.empty()) {
+        ss << "-DCMAKE_BUILD_TYPE=" << project.config << " ";
     }
-    if (!cmake.gen_args.empty()) {
-        for (const auto &arg : cmake.gen_args) {
+    if (!project.gen_args.empty()) {
+        for (const auto &arg : project.gen_args) {
             ss << "-D" << arg << " ";
         }
     }
-    ss << "&& cmake --build " << cmake.build_dir << " --parallel";
+    ss << "&& cmake --build " << project.build_dir << " --parallel";
     if (argc > 2) {
-        for (const auto &arg : cmake.build_args) {
+        for (const auto &arg : project.build_args) {
             ss << " " << arg;
         }
     }
@@ -50,17 +50,17 @@ int run(int argc, char **argv) {
 
 int clean() {
     bool ret = false;
-    cmake::CMake cmake(".", true);
-    if (fs::exists(cmake.build_dir)) {
-        ret = fs::remove_all(cmake.build_dir);
-        fs::create_directory(cmake.build_dir);
+    parser::Project project(".", true);
+    if (fs::exists(project.build_dir)) {
+        ret = fs::remove_all(project.build_dir);
+        fs::create_directory(project.build_dir);
     }
     return !ret;
 }
 
 int install() {
-    cmake::CMake cmake(".", false);
-    auto cmd = "cmake --install " + cmake.build_dir;
+    parser::Project project(".", false);
+    auto cmd = "cmake --install " + project.build_dir;
     return ::system(cmd.c_str());
 }
 } // namespace build

src/cmake.cpp

@@ -7,10 +7,10 @@
 #include <tsl/ordered_map.h>
 
 template <>
-const char *enumStrings<cmkr::cmake::TargetType>::data[] = {"executable", "library", "shared", "static", "interface", "custom"};
+const char *enumStrings<cmkr::parser::TargetType>::data[] = {"executable", "library", "shared", "static", "interface", "custom"};
 
 namespace cmkr {
-namespace cmake {
+namespace parser {
 
 using TomlBasicValue = toml::basic_value<toml::preserve_comments, tsl::ordered_map, std::vector>;
 
@@ -61,7 +61,7 @@ static void get_optional(const TomlBasicValue &v, const toml::key &ky, T &destin
     }
 }
 
-CMake::CMake(const std::string &path, bool build) {
+Project::Project(const std::string &path, bool build) {
     if (!fs::exists(fs::path(path) / "cmake.toml")) {
         throw std::runtime_error("No cmake.toml was found!");
     }
@@ -311,5 +311,5 @@ CMake::CMake(const std::string &path, bool build) {
         }
     }
 }
-} // namespace cmake
+} // namespace parser
 } // namespace cmkr