nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Formatting

Browse source
This commit is contained in:
Eelco Dolstra 2020-10-07 16:33:19 +02:00
parent 5257a2559e
commit 27ca87c46a
3 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/error.hh
View file

@ -107,7 +107,7 @@ struct Trace {
struct ErrorInfo { struct ErrorInfo {
Verbosity level; Verbosity level;
string name; string name;
string description; string description; // FIXME: remove? it seems to be barely used
std::optional<hintformat> hint; std::optional<hintformat> hint;
std::optional<ErrPos> errPos; std::optional<ErrPos> errPos;
std::list<Trace> traces; std::list<Trace> traces;
@ -169,7 +169,7 @@ public:
#endif #endif
const string & msg() const { return calcWhat(); } const string & msg() const { return calcWhat(); }
const ErrorInfo & info() { calcWhat(); return err; } const ErrorInfo & info() const { calcWhat(); return err; }
template<typename... Args> template<typename... Args>
BaseError & addTrace(std::optional<ErrPos> e, const string &fs, const Args & ... args) BaseError & addTrace(std::optional<ErrPos> e, const string &fs, const Args & ... args)

4
src/libutil/fmt.hh
View file

@ -112,6 +112,10 @@ public:
: fmt(hf.fmt) : fmt(hf.fmt)
{ } { }
hintformat(format && fmt)
: fmt(std::move(fmt))
{ }
template<class T> template<class T>
hintformat & operator%(const T & value) hintformat & operator%(const T & value)
{ {