Move libman parsing into a new directory/namespace

src/dds/archive.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <dds/util.hpp>
+
+#include <vector>
+
+namespace dds {
+
+struct archive_rules {
+    std::vector<fs::path> objects;
+    fs::path              out;
+};
+
+}  // namespace dds

src/dds/build.cpp

@@ -5,7 +5,7 @@
 #include <dds/proc.hpp>
 #include <dds/source.hpp>
 #include <dds/toolchain.hpp>
-#include <dds/lm_parse.hpp>
+#include <libman/parse.hpp>
 
 #include <algorithm>
 #include <chrono>
@@ -65,19 +65,19 @@ void generate_export(const build_params& params,
         copy_headers(header_root, header_dest, sources);
     }
 
-    std::vector<lm_pair> lm_pairs;
+    std::vector<lm::pair> lm_pairs;
     lm_pairs.emplace_back("Type", "Package");
     lm_pairs.emplace_back("Name", params.export_name);
     lm_pairs.emplace_back("Namespace", params.export_name);
     lm_pairs.emplace_back("Library", "lib.lml");
-    lm_write_pairs(export_root / "package.lmp", lm_pairs);
+    lm::write_pairs(export_root / "package.lmp", lm_pairs);
 
     lm_pairs.clear();
     lm_pairs.emplace_back("Type", "Library");
     lm_pairs.emplace_back("Name", params.export_name);
     lm_pairs.emplace_back("Path", fs::relative(archive_dest, export_root).string());
     lm_pairs.emplace_back("Include-Path", fs::relative(header_dest, export_root).string());
-    lm_write_pairs(export_root / "lib.lml", lm_pairs);
+    lm::write_pairs(export_root / "lib.lml", lm_pairs);
 }
 
 fs::path

src/dds/ddslim.main.cpp

@@ -1,5 +1,5 @@
 #include <dds/build.hpp>
-#include <dds/lm_parse.hpp>
+#include <libman/parse.hpp>
 #include <dds/logging.hpp>
 #include <dds/util.hpp>
 

src/dds/manifest.cpp

@@ -1,23 +1,27 @@
 #include "./manifest.hpp"
 
-#include <dds/lm_parse.hpp>
+#include <libman/parse.hpp>
 
 #include <spdlog/fmt/fmt.h>
 
 using namespace dds;
 
 library_manifest library_manifest::load_from_file(const fs::path& fpath) {
-    auto             kvs = lm_parse_file(fpath);
+    auto             kvs = lm::parse_file(fpath);
     library_manifest ret;
     for (auto& pair : kvs.items()) {
         if (pair.key() == "Private-Include") {
             ret.private_includes.emplace_back(pair.value());
         } else if (pair.key() == "Private-Define") {
             ret.private_defines.emplace_back(pair.value());
+        } else if (pair.key() == "Uses") {
+            ret.uses.emplace_back(pair.value());
+        } else if (pair.key() == "Links") {
+            ret.uses.emplace_back(pair.value());
         } else {
             throw std::runtime_error(
                 fmt::format("Unknown key in file '{}': {}", fpath.string(), pair.key()));
         }
     }
     return ret;
-}
+}

src/dds/manifest.hpp

@@ -8,6 +8,8 @@ namespace dds {
 struct library_manifest {
     std::vector<fs::path>    private_includes;
     std::vector<std::string> private_defines;
+    std::vector<std::string> uses;
+    std::vector<std::string> links;
 
     static library_manifest load_from_file(const fs::path&);
 };

src/dds/toolchain.cpp

@@ -1,6 +1,6 @@
 #include "./toolchain.hpp"
 
-#include <dds/lm_parse.hpp>
+#include <libman/parse.hpp>
 
 #include <spdlog/fmt/fmt.h>
 
@@ -45,7 +45,7 @@ toolchain toolchain::load_from_file(fs::path p) {
         }
     };
 
-    auto kvs = lm_parse_file(p);
+    auto kvs = lm::parse_file(p);
     for (auto&& pair : kvs.items()) {
         auto& key   = pair.key();
         auto& value = pair.value();
@@ -238,7 +238,13 @@ vector<string> toolchain::create_link_executable_command(const link_exe_spec& sp
 std::optional<toolchain> toolchain::get_builtin(std::string_view s) noexcept {
     toolchain ret;
 
-    using namespace std::string_literals;
+    using namespace std::literals;
+
+    if (starts_with(s, "ccache:")) {
+        s = s.substr("ccache:"sv.length());
+        ret._c_compile.push_back("ccache");
+        ret._cxx_compile.push_back("ccache");
+    }
 
     if (starts_with(s, "gcc") || starts_with(s, "clang")) {
         ret._inc_template     = {"-isystem", "<PATH>"};

src/dds/util.hpp

@@ -9,6 +9,8 @@ namespace dds {
 
 namespace fs = std::filesystem;
 
+using path_ref = const fs::path&;
+
 std::fstream open(const fs::path& filepath, std::ios::openmode mode, std::error_code& ec);
 std::string  slurp_file(const fs::path& path, std::error_code& ec);
 

src/dds/util.test.hpp

@@ -24,7 +24,7 @@ struct requirement_failed {};
             ++::dds::S_failed_checks;                                                              \
             std::cerr << "Check failed at " << __FILE__ << ':' << __LINE__ << ": " << #__VA_ARGS__ \
                       << "\n";                                                                     \
-            throw requirement_failed();                                                            \
+            throw ::dds::requirement_failed();                                                     \
         }                                                                                          \
     } while (0)
 
@@ -32,8 +32,8 @@ struct requirement_failed {};
     int main() {                                                                                   \
         try {                                                                                      \
             run_tests();                                                                           \
-        } catch (const requirement_failed&) {                                                      \
-            return S_failed_checks;                                                                \
+        } catch (const ::dds::requirement_failed&) {                                               \
+            return ::dds::S_failed_checks;                                                         \
         } catch (const std::exception& e) {                                                        \
             std::cerr << "An unhandled exception occured: " << e.what() << '\n';                   \
             return 2;                                                                              \

src/dds/lm_parse.cpp → src/libman/parse.cpp

@@ -1,4 +1,4 @@
-#include "./lm_parse.hpp"
+#include "./parse.hpp"
 
 #include <dds/util.hpp>
 
@@ -11,7 +11,7 @@ namespace fs = std::filesystem;
 
 using namespace std::literals;
 
-using namespace dds;
+using namespace lm;
 
 namespace {
 
@@ -34,7 +34,7 @@ std::string_view trim(std::string_view s) {
     return sview(iter, new_end);
 }
 
-void parse_line(std::vector<lm_pair>& pairs, const std::string_view whole_line) {
+void parse_line(std::vector<pair>& pairs, const std::string_view whole_line) {
     const auto line = trim(whole_line);
     if (line.empty() || line[0] == '#') {
         return;
@@ -72,8 +72,8 @@ void parse_line(std::vector<lm_pair>& pairs, const std::string_view whole_line)
 
 }  // namespace
 
-dds::lm_kv_pairs dds::lm_parse_string(std::string_view s) {
-    std::vector<lm_pair> pairs;
+pair_list lm::parse_string(std::string_view s) {
+    std::vector<pair> pairs;
 
     auto line_begin = s.begin();
     auto iter       = line_begin;
@@ -90,13 +90,13 @@ dds::lm_kv_pairs dds::lm_parse_string(std::string_view s) {
     if (line_begin != end) {
         parse_line(pairs, sview(line_begin, end));
     }
-    return lm_kv_pairs(std::move(pairs));
+    return pair_list(std::move(pairs));
 }
 
-dds::lm_kv_pairs dds::lm_parse_file(fs::path fpath) { return lm_parse_string(slurp_file(fpath)); }
+lm::pair_list lm::parse_file(fs::path fpath) { return parse_string(dds::slurp_file(fpath)); }
 
-void dds::lm_write_pairs(fs::path fpath, const std::vector<lm_pair>& pairs) {
-    auto fstream = open(fpath, std::ios::out | std::ios::binary);
+void lm::write_pairs(fs::path fpath, const std::vector<pair>& pairs) {
+    auto fstream = dds::open(fpath, std::ios::out | std::ios::binary);
     for (auto& pair : pairs) {
         fstream << pair.key() << ": " << pair.value() << '\n';
     }

src/dds/lm_parse.hpp → src/libman/parse.hpp

@@ -1,5 +1,4 @@
-#ifndef DDS_LM_PARSE_HPP_INCLUDED
-#define DDS_LM_PARSE_HPP_INCLUDED
+#pragma once
 
 #include <cassert>
 #include <filesystem>
@@ -7,14 +6,14 @@
 #include <utility>
 #include <vector>
 
-namespace dds {
+namespace lm {
 
-class lm_pair {
+class pair {
     std::string _key;
     std::string _value;
 
 public:
-    lm_pair(std::string_view k, std::string_view v)
+    pair(std::string_view k, std::string_view v)
         : _key(k)
         , _value(v) {}
 
@@ -22,8 +21,8 @@ public:
     auto& value() const noexcept { return _value; }
 };
 
-struct kv_pair_iterator {
-    using vec_type  = std::vector<lm_pair>;
+class pair_iterator {
+    using vec_type  = std::vector<pair>;
     using base_iter = vec_type::const_iterator;
     base_iter   _iter;
     base_iter   _end;
@@ -36,9 +35,9 @@ public:
     using pointer           = vec_type::pointer;
     using reference         = vec_type::reference;
 
-    inline kv_pair_iterator(base_iter, base_iter, std::string_view k);
+    inline pair_iterator(base_iter, base_iter, std::string_view k);
 
-    kv_pair_iterator& operator++() & noexcept {
+    pair_iterator& operator++() & noexcept {
         assert(_iter != _end);
         ++_iter;
         while (_iter != _end && _iter->key() != _key) {
@@ -47,34 +46,34 @@ public:
         return *this;
     }
 
-    const lm_pair* operator->() const noexcept {
+    const pair* operator->() const noexcept {
         assert(_iter != _end);
         return _iter.operator->();
     }
 
-    const lm_pair& operator*() const noexcept {
+    const pair& operator*() const noexcept {
         assert(_iter != _end);
         return *_iter;
     }
 
-    inline bool operator!=(const kv_pair_iterator& o) const noexcept { return _iter != o._iter; }
+    inline bool operator!=(const pair_iterator& o) const noexcept { return _iter != o._iter; }
 
     auto begin() const noexcept { return *this; }
-    auto end() const noexcept { return kv_pair_iterator(_end, _end, _key); }
+    auto end() const noexcept { return pair_iterator(_end, _end, _key); }
 
     explicit operator bool() const noexcept { return *this != end(); }
 };
 
-class lm_kv_pairs {
-    std::vector<lm_pair> _kvs;
+class pair_list {
+    std::vector<pair> _kvs;
 
 public:
-    explicit lm_kv_pairs(std::vector<lm_pair> kvs)
+    explicit pair_list(std::vector<pair> kvs)
         : _kvs(kvs) {}
 
     auto& items() const noexcept { return _kvs; }
 
-    const lm_pair* find(const std::string_view& key) const noexcept {
+    const pair* find(const std::string_view& key) const noexcept {
         for (auto&& item : items()) {
             if (item.key() == key) {
                 return &item;
@@ -83,36 +82,34 @@ public:
         return nullptr;
     }
 
-    kv_pair_iterator iter(std::string_view key) const noexcept {
+    pair_iterator iter(std::string_view key) const noexcept {
         auto       iter = items().begin();
         const auto end  = items().end();
         while (iter != end && iter->key() != key) {
             ++iter;
         }
-        return kv_pair_iterator{iter, end, key};
+        return pair_iterator{iter, end, key};
     }
 
-    std::vector<lm_pair> all_of(std::string_view key) const noexcept {
+    std::vector<pair> all_of(std::string_view key) const noexcept {
         auto iter = this->iter(key);
-        return std::vector<lm_pair>(iter, iter.end());
+        return std::vector<pair>(iter, iter.end());
     }
 
     auto size() const noexcept { return _kvs.size(); }
 };
 
-inline kv_pair_iterator::kv_pair_iterator(base_iter it, base_iter end, std::string_view k)
+inline pair_iterator::pair_iterator(base_iter it, base_iter end, std::string_view k)
     : _iter{it}
     , _end{end}
     , _key{k} {}
 
-lm_kv_pairs lm_parse_string(std::string_view);
-lm_kv_pairs lm_parse_file(std::filesystem::path);
-void        lm_write_pairs(std::filesystem::path, const std::vector<lm_pair>&);
+pair_list parse_string(std::string_view);
+pair_list parse_file(std::filesystem::path);
+void      write_pairs(std::filesystem::path, const std::vector<pair>&);
 
-inline void lm_write_pairs(const std::filesystem::path& fpath, const lm_kv_pairs& pairs) {
-    lm_write_pairs(fpath, pairs.items());
+inline void write_pairs(const std::filesystem::path& fpath, const pair_list& pairs) {
+    write_pairs(fpath, pairs.items());
 }
 
-}  // namespace dds
-
-#endif  // DDS_LM_PARSE_HPP_INCLUDED
+}  // namespace lm

src/dds/lm_parse.test.cpp → src/libman/parse.test.cpp

@@ -1,31 +1,31 @@
-#include <dds/lm_parse.hpp>
 #include <dds/util.test.hpp>
+#include <libman/parse.hpp>
 
 #include <iostream>
 
-using namespace dds;
+using namespace lm;
 
 void test_simple() {
     auto lm_src = "";
-    auto kvs    = lm_parse_string(lm_src);
+    auto kvs    = parse_string(lm_src);
     CHECK(kvs.size() == 0);
 
     lm_src = "foo: bar";
-    kvs    = lm_parse_string(lm_src);
+    kvs    = parse_string(lm_src);
     CHECK(kvs.size() == 1);
     REQUIRE(kvs.find("foo"));
     CHECK(kvs.find("foo")->value() == "bar");
 
     lm_src = "foo:bar: baz";
-    kvs    = lm_parse_string(lm_src);
+    kvs    = parse_string(lm_src);
     CHECK(kvs.size() == 1);
     REQUIRE(kvs.find("foo:bar"));
     CHECK(kvs.find("foo:bar")->value() == "baz");
 
-    CHECK(lm_parse_string("#comment").size() == 0);
-    CHECK(lm_parse_string("\n\n").size() == 0);
-    CHECK(lm_parse_string("\n#comment").size() == 0);
-    CHECK(lm_parse_string("#comment\n\n").size() == 0);
+    CHECK(parse_string("#comment").size() == 0);
+    CHECK(parse_string("\n\n").size() == 0);
+    CHECK(parse_string("\n#comment").size() == 0);
+    CHECK(parse_string("#comment\n\n").size() == 0);
 
     std::vector<std::string_view> empty_foos = {
         "Foo:",
@@ -39,27 +39,27 @@ void test_simple() {
         "Foo   :\n",
     };
     for (auto s : empty_foos) {
-        kvs = lm_parse_string(s);
+        kvs = parse_string(s);
         CHECK(kvs.size() == 1);
         REQUIRE(kvs.find("Foo"));
         CHECK(kvs.find("Foo")->value() == "");
     }
 
-    kvs = lm_parse_string("foo: # Not a comment");
+    kvs = parse_string("foo: # Not a comment");
     CHECK(kvs.size() == 1);
     REQUIRE(kvs.find("foo"));
     CHECK(kvs.find("foo")->value() == "# Not a comment");
 }
 
 void test_multi() {
-    auto kvs = lm_parse_string("Foo: bar\nbaz: qux");
+    auto kvs = parse_string("Foo: bar\nbaz: qux");
     CHECK(kvs.size() == 2);
     REQUIRE(kvs.find("Foo"));
     CHECK(kvs.find("Foo")->value() == "bar");
     REQUIRE(kvs.find("baz"));
     CHECK(kvs.find("baz")->value() == "qux");
 
-    kvs = lm_parse_string("foo: first\nfoo: second\n");
+    kvs = parse_string("foo: first\nfoo: second\n");
     CHECK(kvs.size() == 2);
     auto iter = kvs.iter("foo");
     REQUIRE(iter);