aboutsummaryrefslogtreecommitdiff
path: root/src/libutil/error.hh
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-03-08 07:09:48 +0100
committereldritch horrors <pennae@lix.systems>2024-03-09 04:47:05 -0700
commit08252967a8c2ab15f3fb8bdfb848f007d4032d50 (patch)
tree909ec8357654d4d179f0f8e7dfc5d3d623256b46 /src/libutil/error.hh
parentd4c738fe4c587c3f09b0fda899f419f2de97ee2f (diff)
libexpr: Support structured error classes
While preparing PRs like #9753, I've had to change error messages in dozens of code paths. It would be nice if instead of EvalError("expected 'boolean' but found '%1%'", showType(v)) we could write TypeError(v, "boolean") or similar. Then, changing the error message could be a mechanical refactor with the compiler pointing out places the constructor needs to be changed, rather than the error-prone process of grepping through the codebase. Structured errors would also help prevent the "same" error from having multiple slightly different messages, and could be a first step towards error codes / an error index. This PR reworks the exception infrastructure in `libexpr` to support exception types with different constructor signatures than `BaseError`. Actually refactoring the exceptions to use structured data will come in a future PR (this one is big enough already, as it has to touch every exception in `libexpr`). The core design is in `eval-error.hh`. Generally, errors like this: state.error("'%s' is not a string", getAttrPathStr()) .debugThrow<TypeError>() are transformed like this: state.error<TypeError>("'%s' is not a string", getAttrPathStr()) .debugThrow() The type annotation has moved from `ErrorBuilder::debugThrow` to `EvalState::error`. (cherry picked from commit c6a89c1a1659b31694c0fbcd21d78a6dd521c732) Change-Id: Iced91ba4e00ca9e801518071fb43798936cbd05a
Diffstat (limited to 'src/libutil/error.hh')
-rw-r--r--src/libutil/error.hh27
1 files changed, 22 insertions, 5 deletions
diff --git a/src/libutil/error.hh b/src/libutil/error.hh
index 234cbe1f6..00dbd7ae2 100644
--- a/src/libutil/error.hh
+++ b/src/libutil/error.hh
@@ -84,9 +84,14 @@ inline bool operator>=(const Trace& lhs, const Trace& rhs);
struct ErrorInfo {
Verbosity level;
hintformat msg;
- std::shared_ptr<Pos> errPos;
+ std::shared_ptr<Pos> pos;
std::list<Trace> traces;
+ /**
+ * Exit status.
+ */
+ unsigned int status = 1;
+
Suggestions suggestions;
static std::optional<std::string> programName;
@@ -103,18 +108,21 @@ class BaseError : public std::exception
protected:
mutable ErrorInfo err;
+ /**
+ * Cached formatted contents of `err.msg`.
+ */
mutable std::optional<std::string> what_;
+ /**
+ * Format `err.msg` and set `what_` to the resulting value.
+ */
const std::string & calcWhat() const;
public:
- unsigned int status = 1; // exit status
-
BaseError(const BaseError &) = default;
template<typename... Args>
BaseError(unsigned int status, const Args & ... args)
- : err { .level = lvlError, .msg = hintfmt(args...) }
- , status(status)
+ : err { .level = lvlError, .msg = hintfmt(args...), .status = status }
{ }
template<typename... Args>
@@ -149,6 +157,15 @@ public:
const std::string & msg() const { return calcWhat(); }
const ErrorInfo & info() const { calcWhat(); return err; }
+ void withExitStatus(unsigned int status)
+ {
+ err.status = status;
+ }
+
+ void atPos(std::shared_ptr<Pos> pos) {
+ err.pos = pos;
+ }
+
void pushTrace(Trace trace)
{
err.traces.push_front(trace);