alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sexp: allow for some prettified string output

Browse Source 
Allow for adding newlines between list items
This commit is contained in:
Dirk-Jan C. Binnema
2022-05-06 22:07:15 +03:00
parent 2a5c1e239c
commit da8489d0f6
5 changed files with 86 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils/mu-sexp.cc
View File

@ -188,6 +188,9 @@ Sexp::to_sexp_string() const
first = false;
}
sstrm << ')';
if (any_of(formatting_opts & FormattingOptions::SplitList))
sstrm << '\n';
break;
}
case Type::String:
@ -225,6 +228,8 @@ Sexp::to_json_string() const
first = false;
}
sstrm << "}";
if (any_of(formatting_opts & FormattingOptions::SplitList))
sstrm << '\n';
} else { // other lists become arrays.
sstrm << '[';
bool first{true};
@ -233,6 +238,8 @@ Sexp::to_json_string() const
first = false;
}
sstrm << ']';
if (any_of(formatting_opts & FormattingOptions::SplitList))
sstrm << '\n';
}
break;
}

29
lib/utils/mu-sexp.hh
View File

@ -342,6 +342,14 @@ struct Sexp {
return is_prop_list(list().begin() + 1, list().end());
}
enum struct FormattingOptions {
Default = 0, /**< Nothing in particular */
SplitList = 1 << 0, /**< Insert newline after list item */
};
FormattingOptions formatting_opts{}; /**< Formatting option for the
* string output */
private:
Sexp(Type typearg, std::string&& valuearg) : type_{typearg}, value_{std::move(valuearg)} {
if (is_list())
@ -395,11 +403,21 @@ static inline std::ostream&
operator<<(std::ostream& os, Sexp::Type id)
{
switch (id) {
case Sexp::Type::List: os << "list"; break;
case Sexp::Type::String: os << "string"; break;
case Sexp::Type::Number: os << "number"; break;
case Sexp::Type::Symbol: os << "symbol"; break;
case Sexp::Type::Empty: os << "empty"; break;
case Sexp::Type::List:
os << "list";
break;
case Sexp::Type::String:
os << "string";
break;
case Sexp::Type::Number:
os << "number";
break;
case Sexp::Type::Symbol:
os << "symbol";
break;
case Sexp::Type::Empty:
os << "empty";
break;
default: throw std::runtime_error("unknown node type");
}
@ -419,6 +437,7 @@ operator<<(std::ostream& os, const Sexp::List& sexp)
os << Sexp::make_list(Sexp::List(sexp));
return os;
}
MU_ENABLE_BITOPS(Sexp::FormattingOptions);
} // namespace Mu