forked from lix-project/lix
eldritch horrors
08252967a8
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:
|
||
|---|---|---|
| .. | ||
| flake | ||
| primops | ||
| value | ||
| attr-path.cc | ||
| attr-path.hh | ||
| attr-set.cc | ||
| attr-set.hh | ||
| eval-cache.cc | ||
| eval-cache.hh | ||
| eval-error.cc | ||
| eval-error.hh | ||
| eval-inline.hh | ||
| eval-settings.cc | ||
| eval-settings.hh | ||
| eval.cc | ||
| eval.hh | ||
| fetchurl.nix | ||
| function-trace.cc | ||
| function-trace.hh | ||
| gc-small-vector.hh | ||
| get-drvs.cc | ||
| get-drvs.hh | ||
| imported-drv-to-derivation.nix | ||
| json-to-value.cc | ||
| json-to-value.hh | ||
| lexer.l | ||
| local.mk | ||
| nix-expr.pc.in | ||
| nixexpr.cc | ||
| nixexpr.hh | ||
| parser-state.hh | ||
| parser.y | ||
| paths.cc | ||
| pos-idx.hh | ||
| pos-table.hh | ||
| primops.cc | ||
| primops.hh | ||
| print-ambiguous.cc | ||
| print-ambiguous.hh | ||
| print-options.hh | ||
| print.cc | ||
| print.hh | ||
| search-path.cc | ||
| search-path.hh | ||
| symbol-table.hh | ||
| value-to-json.cc | ||
| value-to-json.hh | ||
| value-to-xml.cc | ||
| value-to-xml.hh | ||
| value.hh | ||