wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 11:43:15 +02:00
Code Activity

add DebugTrace for the current error

Browse source
This commit is contained in:
Ben Burdette 2021-12-27 17:35:27 -07:00
parent 6801a423fc
commit 9760fa8661
5 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libexpr/eval.cc
View file

@ -38,21 +38,6 @@ namespace nix {
std::function<void(const Error & error, const Env & env, const Expr & expr)> debuggerHook;
class DebugTraceStacker {
public:
DebugTraceStacker(EvalState &evalState, DebugTrace t)
:evalState(evalState), trace(t)
{
evalState.debugTraces.push_front(t);
}
~DebugTraceStacker() {
// assert(evalState.debugTraces.front() == trace);
evalState.debugTraces.pop_front();
}
EvalState &evalState;
DebugTrace trace;
};
static char * dupString(const char * s)
{
char * t;
@ -701,7 +686,7 @@ void printStaticEnvBindings(const StaticEnv &se, int lvl)
std::cout << std::endl;
if (se.up) {
printStaticEnvBindings(*se.up, ++lvl);
printStaticEnvBindings(*se.up, ++lvl);
}
}

18
src/libexpr/eval.hh
View file

@ -76,11 +76,10 @@ std::shared_ptr<RegexCache> makeRegexCache();
struct DebugTrace {
std::optional<ErrPos> pos;
Expr &expr;
const Expr &expr;
hintformat hint;
};
class EvalState
{
public:
@ -406,6 +405,21 @@ private:
friend void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v);
};
class DebugTraceStacker {
public:
DebugTraceStacker(EvalState &evalState, DebugTrace t)
:evalState(evalState), trace(t)
{
evalState.debugTraces.push_front(t);
}
~DebugTraceStacker()
{
// assert(evalState.debugTraces.front() == trace);
evalState.debugTraces.pop_front();
}
EvalState &evalState;
DebugTrace trace;
};
/* Return a string representing the type of the value `v'. */
string showType(ValueType type);