Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small cleanups #20

Merged
merged 4 commits into from
Feb 29, 2024
Merged

Small cleanups #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a3f1b0
loader: string should be identifier
dcbaker Feb 28, 2024
b7c85da
tests/runner: print the name instead of the cps file
dcbaker Feb 28, 2024
f656a15
tests/runner: Print the command run for the test
dcbaker Feb 28, 2024
6860386
clang-format: use reasonable line width
dcbaker Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
QualifierAlignment: Leave
CompactNamespaces: false
Expand Down
12 changes: 6 additions & 6 deletions src/error.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

#include <tl/expected.hpp>

#define TRY(expr) \
({ \
auto && t_expect = (expr); \
if (not t_expect) \
return tl::unexpected(std::move(t_expect.error())); \
std::move(t_expect.value()); \
#define TRY(expr) \
({ \
auto && t_expect = (expr); \
if (not t_expect) \
return tl::unexpected(std::move(t_expect.error())); \
std::move(t_expect.value()); \
})
183 changes: 67 additions & 116 deletions src/loader.cpp
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 8 additions & 14 deletions src/loader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#pragma once

#include "error.hpp"
#include "version.hpp"
#include <filesystem>
#include <optional>
#include <string>
#include <tl/expected.hpp>
#include <unordered_map>
#include <vector>
#include "version.hpp"

namespace loader {

Expand Down Expand Up @@ -55,19 +55,16 @@ namespace loader {
bool define;
};

using LangValues =
std::unordered_map<KnownLanguages, std::vector<std::string>>;
using LangValues = std::unordered_map<KnownLanguages, std::vector<std::string>>;

using Defines = std::unordered_map<KnownLanguages, std::vector<Define>>;

class Component {
public:
Component();
Component(Type type, LangValues cflags, LangValues includes,
Defines defines, std::vector<std::string> link_libraries,
std::optional<std::string> location,
std::optional<std::string> link_location,
std::vector<std::string> require);
Component(Type type, LangValues cflags, LangValues includes, Defines defines,
std::vector<std::string> link_libraries, std::optional<std::string> location,
std::optional<std::string> link_location, std::vector<std::string> require);

Type type;
LangValues compile_flags;
Expand Down Expand Up @@ -134,12 +131,9 @@ namespace loader {
class Package {
public:
Package();
Package(std::string name, std::string cps_version,
std::unordered_map<std::string, Component> && components,
std::string cps_path,
std::optional<std::vector<std::string>> && default_comps,
Requires require, std::optional<std::string> version,
version::Schema schema);
Package(std::string name, std::string cps_version, std::unordered_map<std::string, Component> && components,
std::string cps_path, std::optional<std::vector<std::string>> && default_comps, Requires require,
std::optional<std::string> version, version::Schema schema);

std::string name;
std::string cps_version;
Expand Down
6 changes: 2 additions & 4 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

int main(int argc, char * argv[]) {
if (argc < 2) {
fmt::println(stderr, "Error: Got {} arguments, expected at least 2",
argc);
fmt::println(stderr, "Error: Got {} arguments, expected at least 2", argc);
return 1;
}

Expand Down Expand Up @@ -58,8 +57,7 @@ int main(int argc, char * argv[]) {
}
}

auto && p =
search::find_package(argv[1], components, components.empty());
auto && p = search::find_package(argv[1], components, components.empty());
if (!p) {
fmt::println(p.error());
return 1;
Expand Down
28 changes: 10 additions & 18 deletions src/printer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,46 +27,38 @@ namespace printer {
}

if (conf.includes) {
if (auto && f = r.includes.find(loader::KnownLanguages::C);
f != r.includes.end() && !f->second.empty()) {
std::transform(
f->second.begin(), f->second.end(),
std::back_inserter(args),
[](std::string_view s) { return fmt::format("-I{}", s); });
if (auto && f = r.includes.find(loader::KnownLanguages::C); f != r.includes.end() && !f->second.empty()) {
std::transform(f->second.begin(), f->second.end(), std::back_inserter(args),
[](std::string_view s) { return fmt::format("-I{}", s); });
}
}

if (conf.defines) {
if (auto && f = r.defines.find(loader::KnownLanguages::C);
f != r.defines.end() && !f->second.empty()) {
if (auto && f = r.defines.find(loader::KnownLanguages::C); f != r.defines.end() && !f->second.empty()) {
auto && transformer = [](auto && d) {
if (d.is_define()) {
return fmt::format("-D{}", d.get_name());
} else if (d.is_undefine()) {
return fmt::format("-U{}", d.get_name());
} else {
return fmt::format("-D{}={}", d.get_name(),
d.get_value());
return fmt::format("-D{}={}", d.get_name(), d.get_value());
}
};
args.reserve(args.size() + f->second.size());
std::transform(f->second.begin(), f->second.end(),
std::back_inserter(args), transformer);
std::transform(f->second.begin(), f->second.end(), std::back_inserter(args), transformer);
}
}

if (conf.libs_link) {
if (auto && f = r.link_location; !f.empty()) {
args.reserve(args.size() + f.size());
std::transform(
f.begin(), f.end(), std::back_inserter(args),
[](std::string_view s) { return fmt::format("-l{}", s); });
std::transform(f.begin(), f.end(), std::back_inserter(args),
[](std::string_view s) { return fmt::format("-l{}", s); });
}
if (auto && f = r.link_libraries; !f.empty()) {
args.reserve(args.size() + f.size());
std::transform(
f.begin(), f.end(), std::back_inserter(args),
[](std::string_view s) { return fmt::format("-l{}", s); });
std::transform(f.begin(), f.end(), std::back_inserter(args),
[](std::string_view s) { return fmt::format("-l{}", s); });
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/printer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ namespace printer {

int pkgconf(const search::Result & dag, const Config & conf);

}
} // namespace printer
84 changes: 27 additions & 57 deletions src/search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ namespace search {
/// load
class Dependency {
public:
Dependency(loader::Package && obj,
std::vector<std::string> && comps)
Dependency(loader::Package && obj, std::vector<std::string> && comps)
: package{std::move(obj)}, components{std::move(comps)} {};

/// @brief The loaded CPS file
Expand All @@ -39,15 +38,13 @@ namespace search {
class Node {
public:
Node(Dependency obj) : data{std::move(obj)} {};
Node(loader::Package obj, std::vector<std::string> comps)
: data{std::move(obj), std::move(comps)} {};
Node(loader::Package obj, std::vector<std::string> comps) : data{std::move(obj), std::move(comps)} {};

Dependency data;
std::vector<std::shared_ptr<Node>> depends;
};

void dfs(const std::shared_ptr<Node> & node,
std::unordered_set<std::shared_ptr<Node>> & visited,
void dfs(const std::shared_ptr<Node> & node, std::unordered_set<std::shared_ptr<Node>> & visited,
std::deque<std::shared_ptr<Node>> & sorted) {
visited.emplace(node);
for (auto && d : node->depends) {
Expand All @@ -61,8 +58,7 @@ namespace search {
/// @brief Perform a topological sort of the DAG
/// @param root The root Node
/// @return A linear topological sorting of the DAG
std::vector<std::shared_ptr<Node>>
tsort(const std::shared_ptr<Node> & root) {
std::vector<std::shared_ptr<Node>> tsort(const std::shared_ptr<Node> & root) {
std::deque<std::shared_ptr<Node>> sorted;
std::unordered_set<std::shared_ptr<Node>> visited;
dfs(root, visited, sorted);
Expand Down Expand Up @@ -107,8 +103,7 @@ namespace search {
/// @brief Find all possible paths for a given CPS name
/// @param name The name of the CPS file to find
/// @return A vector of paths which patch the given name, or an error
tl::expected<std::vector<fs::path>, std::string>
find_paths(std::string_view name) {
tl::expected<std::vector<fs::path>, std::string> find_paths(std::string_view name) {
// If a path is passed, then just return that.
if (fs::is_regular_file(name)) {
return std::vector<fs::path>{name};
Expand Down Expand Up @@ -137,8 +132,7 @@ namespace search {
}

if (found.empty()) {
return tl::unexpected(
fmt::format("Could not find a CPS file for {}", name));
return tl::unexpected(fmt::format("Could not find a CPS file for {}", name));
}
return found;
}
Expand All @@ -148,8 +142,7 @@ namespace search {
bool defaults;

ProcessedRequires(bool d) : defaults{d} {};
ProcessedRequires(std::string s)
: components{{std::move(s)}}, defaults{false} {};
ProcessedRequires(std::string s) : components{{std::move(s)}}, defaults{false} {};
};

/// @brief Extract all required dependencies with their components
Expand Down Expand Up @@ -184,27 +177,21 @@ namespace search {
}

tl::expected<std::shared_ptr<Node>, std::string>
build_node(std::string_view name,
const std::vector<std::string> & components,
bool default_components) {
build_node(std::string_view name, const std::vector<std::string> & components, bool default_components) {
const std::vector<fs::path> paths = TRY(find_paths(name));
for (auto && path : paths) {

loader::Package p = TRY(loader::load(path));

std::vector<std::string> comps = components;
if (default_components && p.default_components) {
comps.insert(comps.end(),
p.default_components.value().begin(),
p.default_components.value().end());
comps.insert(comps.end(), p.default_components.value().begin(), p.default_components.value().end());
}

// If we don't have all of the components requested this isn't a
// valid candidate
if (!std::all_of(
comps.begin(), comps.end(), [&](const std::string & s) {
return p.components.find(s) != p.components.end();
})) {
if (!std::all_of(comps.begin(), comps.end(),
[&](const std::string & s) { return p.components.find(s) != p.components.end(); })) {
continue;
}

Expand All @@ -221,17 +208,14 @@ namespace search {
auto && split = process_requires(comp.require);
for (auto && req : split) {
if (req.first == "") {
node->data.components.insert(
node->data.components.end(),
req.second.components.begin(),
req.second.components.end());
node->data.components.insert(node->data.components.end(), req.second.components.begin(),
req.second.components.end());
continue;
}
// XXX: This loop needs to be transactional, if any of
// the nodes is an error, then we need to throw away all
// of the work and go back and try again.
auto && n = build_node(req.first, req.second.components,
req.second.defaults);
auto && n = build_node(req.first, req.second.components, req.second.defaults);
if (n.has_value()) {
node->depends.emplace_back(std::move(n.value()));
}
Expand All @@ -241,8 +225,7 @@ namespace search {
return node;
}

return tl::unexpected(
fmt::format("Could not find a dependency to satisfy {}", name));
return tl::unexpected(fmt::format("Could not find a dependency to satisfy {}", name));
}

template <typename T, typename U>
Expand All @@ -258,20 +241,15 @@ namespace search {
std::unordered_map<T, std::vector<U>> & output,
const std::function<U(const U &)> transformer) {
for (auto && [l, vals] : input) {
std::transform(vals.begin(), vals.end(),
std::back_inserter(output[l]), transformer);
std::transform(vals.begin(), vals.end(), std::back_inserter(output[l]), transformer);
}
}

template <typename T>
void merge_result(const std::vector<T> & input,
std::vector<T> & output) {
template <typename T> void merge_result(const std::vector<T> & input, std::vector<T> & output) {
output.insert(output.end(), input.begin(), input.end());
}

template <typename T>
void merge_result(const std::optional<T> & input,
std::vector<T> & output) {
template <typename T> void merge_result(const std::optional<T> & input, std::vector<T> & output) {
if (input) {
output.emplace_back(input.value());
}
Expand Down Expand Up @@ -305,14 +283,10 @@ namespace search {

Result::Result(){};

tl::expected<Result, std::string> find_package(std::string_view name) {
return find_package(name, {}, true);
}
tl::expected<Result, std::string> find_package(std::string_view name) { return find_package(name, {}, true); }

tl::expected<Result, std::string>
find_package(std::string_view name,
const std::vector<std::string> & components,
bool default_components) {
tl::expected<Result, std::string> find_package(std::string_view name, const std::vector<std::string> & components,
bool default_components) {
// XXX: do we need process_requires here?
auto && root = TRY(build_node(name, components, default_components));
auto && flat = tsort(root);
Expand All @@ -323,8 +297,7 @@ namespace search {

for (auto && node : flat) {

const auto && prefix_replacer =
[&](const std::string & s) -> std::string {
const auto && prefix_replacer = [&](const std::string & s) -> std::string {
// TODO: Windows…
auto && split = utils::split(s, "/");
if (split[0] == "@prefix@") {
Expand All @@ -340,25 +313,22 @@ namespace search {
for (const auto & c_name : node->data.components) {
// We should have already errored if this is not the case
auto && f = node->data.package.components.find(c_name);
assert_fn(
f != node->data.package.components.end(),
fmt::format("Could not find component {} of pacakge {}",
c_name, node->data.package.name));
assert_fn(f != node->data.package.components.end(),
fmt::format("Could not find component {} of pacakge {}", c_name, node->data.package.name));
auto && comp = f->second;

// Convert prefix at this point because:
// 1. we are about to lose which CPS file the information came
// from
// 2. if we do it at the search point we have to plumb overrides
// deep into that
merge_result<loader::KnownLanguages, std::string>(
comp.includes, result.includes, prefix_replacer);
merge_result<loader::KnownLanguages, std::string>(comp.includes, result.includes, prefix_replacer);
merge_result(comp.defines, result.defines);
merge_result(comp.compile_flags, result.compile_flags);
merge_result(comp.link_libraries, result.link_libraries);
if (comp.type != loader::Type::INTERFACE) {
result.link_location.emplace_back(prefix_replacer(
comp.link_location.value_or(comp.location.value())));
result.link_location.emplace_back(
prefix_replacer(comp.link_location.value_or(comp.location.value())));
}
}
}
Expand Down
Loading
Loading