-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
40 changed files
with
675 additions
and
558 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| #include "eval-error.hh" | ||
| #include "eval.hh" | ||
|
|
||
| namespace nix { | ||
|
|
||
| template<class T> | ||
| EvalErrorBuilder<T> & EvalErrorBuilder<T>::withExitStatus(unsigned int exitStatus) | ||
| { | ||
| error.withExitStatus(exitStatus); | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| EvalErrorBuilder<T> & EvalErrorBuilder<T>::atPos(PosIdx pos) | ||
| { | ||
| error.err.pos = error.state.positions[pos]; | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| EvalErrorBuilder<T> & EvalErrorBuilder<T>::withTrace(PosIdx pos, const std::string_view text) | ||
| { | ||
| error.err.traces.push_front( | ||
| Trace{.pos = error.state.positions[pos], .hint = hintformat(std::string(text)), .frame = false}); | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| EvalErrorBuilder<T> & EvalErrorBuilder<T>::withFrameTrace(PosIdx pos, const std::string_view text) | ||
| { | ||
| error.err.traces.push_front( | ||
| Trace{.pos = error.state.positions[pos], .hint = hintformat(std::string(text)), .frame = true}); | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| EvalErrorBuilder<T> & EvalErrorBuilder<T>::withSuggestions(Suggestions & s) | ||
| { | ||
| error.err.suggestions = s; | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| EvalErrorBuilder<T> & EvalErrorBuilder<T>::withFrame(const Env & env, const Expr & expr) | ||
| { | ||
| // NOTE: This is abusing side-effects. | ||
| // TODO: check compatibility with nested debugger calls. | ||
| // TODO: What side-effects?? | ||
| error.state.debugTraces.push_front(DebugTrace{ | ||
| .pos = error.state.positions[expr.getPos()], | ||
| .expr = expr, | ||
| .env = env, | ||
| .hint = hintformat("Fake frame for debugging purposes"), | ||
| .isError = true}); | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| EvalErrorBuilder<T> & EvalErrorBuilder<T>::addTrace(PosIdx pos, hintformat hint, bool frame) | ||
| { | ||
| error.addTrace(error.state.positions[pos], hint, frame); | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| template<typename... Args> | ||
| EvalErrorBuilder<T> & | ||
| EvalErrorBuilder<T>::addTrace(PosIdx pos, std::string_view formatString, const Args &... formatArgs) | ||
| { | ||
|
|
||
| addTrace(error.state.positions[pos], hintfmt(std::string(formatString), formatArgs...)); | ||
| return *this; | ||
| } | ||
|
|
||
| template<class T> | ||
| void EvalErrorBuilder<T>::debugThrow() | ||
| { | ||
| if (error.state.debugRepl && !error.state.debugTraces.empty()) { | ||
| const DebugTrace & last = error.state.debugTraces.front(); | ||
| const Env * env = &last.env; | ||
| const Expr * expr = &last.expr; | ||
| error.state.runDebugRepl(&error, *env, *expr); | ||
| } | ||
|
|
||
| throw error; | ||
| } | ||
|
|
||
| template class EvalErrorBuilder<EvalError>; | ||
| template class EvalErrorBuilder<AssertionError>; | ||
| template class EvalErrorBuilder<ThrownError>; | ||
| template class EvalErrorBuilder<Abort>; | ||
| template class EvalErrorBuilder<TypeError>; | ||
| template class EvalErrorBuilder<UndefinedVarError>; | ||
| template class EvalErrorBuilder<MissingArgumentError>; | ||
| template class EvalErrorBuilder<InfiniteRecursionError>; | ||
| template class EvalErrorBuilder<CachedEvalError>; | ||
| template class EvalErrorBuilder<InvalidPathError>; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| #pragma once | ||
|
|
||
| #include "error.hh" | ||
|
|
||
| namespace nix { | ||
|
|
||
| class PosIdx; | ||
| struct Env; | ||
| struct Expr; | ||
|
|
||
| class EvalState; | ||
| template<class T> | ||
| class EvalErrorBuilder; | ||
|
|
||
| class EvalError : public Error | ||
| { | ||
| template<class T> | ||
| friend class EvalErrorBuilder; | ||
| public: | ||
| EvalState & state; | ||
|
|
||
| EvalError(EvalState & state, ErrorInfo && errorInfo) | ||
| : Error(errorInfo) | ||
| , state(state) | ||
| { | ||
| } | ||
|
|
||
| template<typename... Args> | ||
| explicit EvalError(EvalState & state, const std::string & formatString, const Args &... formatArgs) | ||
| : Error(formatString, formatArgs...) | ||
| , state(state) | ||
| { | ||
| } | ||
| }; | ||
|
|
||
| MakeError(ParseError, Error); | ||
| MakeError(AssertionError, EvalError); | ||
| MakeError(ThrownError, AssertionError); | ||
| MakeError(Abort, EvalError); | ||
| MakeError(TypeError, EvalError); | ||
| MakeError(UndefinedVarError, EvalError); | ||
| MakeError(MissingArgumentError, EvalError); | ||
| MakeError(CachedEvalError, EvalError); | ||
| MakeError(InfiniteRecursionError, EvalError); | ||
|
|
||
| struct InvalidPathError : public EvalError | ||
| { | ||
| public: | ||
| Path path; | ||
| InvalidPathError(EvalState & state, const Path & path) | ||
| : EvalError(state, "path '%s' is not valid", path) | ||
| { | ||
| } | ||
| #ifdef EXCEPTION_NEEDS_THROW_SPEC | ||
| ~InvalidPathError() throw(){}; | ||
| #endif | ||
| }; | ||
|
|
||
| template<class T> | ||
| class EvalErrorBuilder | ||
| { | ||
| public: | ||
| T error; | ||
|
|
||
| template<typename... Args> | ||
| explicit EvalErrorBuilder(EvalState & state, const Args &... args) | ||
| : error(T(state, args...)) | ||
| { | ||
| } | ||
|
|
||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & withExitStatus(unsigned int exitStatus); | ||
|
|
||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & atPos(PosIdx pos); | ||
|
|
||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & withTrace(PosIdx pos, const std::string_view text); | ||
|
|
||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & withFrameTrace(PosIdx pos, const std::string_view text); | ||
|
|
||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & withSuggestions(Suggestions & s); | ||
|
|
||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & withFrame(const Env & e, const Expr & ex); | ||
|
|
||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & addTrace(PosIdx pos, hintformat hint, bool frame = false); | ||
|
|
||
| template<typename... Args> | ||
| [[nodiscard, gnu::noinline]] EvalErrorBuilder<T> & | ||
| addTrace(PosIdx pos, std::string_view formatString, const Args &... formatArgs); | ||
|
|
||
| [[gnu::noinline, gnu::noreturn]] virtual void debugThrow(); | ||
| }; | ||
|
|
||
| } |
Oops, something went wrong.