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

Jump to bottom

Prettier joining of empty comments #9

Merged
merged 1 commit into from Oct 19, 2020
Merged

Prettier joining of empty comments #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 26 additions & 4 deletions include/contracts_lite/contract_types.hpp
View file
Open in desktop
Expand Up @@ -87,6 +87,24 @@ struct ReturnStatus {

std::string comment; // TODO(jeff): use std::string_view in C++17
const bool status;

friend ReturnStatus operator&&(const ReturnStatus& rs1,
const ReturnStatus& rs2);

friend ReturnStatus operator||(const ReturnStatus& rs1,
const ReturnStatus& rs2);

private:
static std::string join_comments(const std::string& conjunction,
const std::string& comment1,
const std::string comment2) {
if (comment1.empty()) {
return comment2;
} else if (comment2.empty()) {
return comment1;
}
return (comment1 + conjunction + comment2);
}
};

/**
Expand All @@ -97,13 +115,17 @@ struct ReturnStatus {
*/
inline ReturnStatus operator&&(const ReturnStatus& rs1,
const ReturnStatus& rs2) {
return ReturnStatus(rs1.comment + "; AND " + rs2.comment,
(rs1.status && rs2.status));
const auto conjunction = "; AND ";
auto comment =
ReturnStatus::join_comments(conjunction, rs1.comment, rs2.comment);
return ReturnStatus(std::move(comment), (rs1.status && rs2.status));
}
inline ReturnStatus operator||(const ReturnStatus& rs1,
const ReturnStatus& rs2) {
return ReturnStatus(rs1.comment + "; OR " + rs2.comment,
(rs1.status || rs2.status));
const auto conjunction = "; OR ";
auto comment =
ReturnStatus::join_comments(conjunction, rs1.comment, rs2.comment);
return ReturnStatus(std::move(comment), (rs1.status || rs2.status));
}

/** @brief Data structure for information describing contract violations. */
Expand Down