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

fix repl bug

Browse source
This commit is contained in:
Ben Burdette 2022-05-05 21:23:03 -06:00
parent dea998b2f2
commit 99d69ac23f
1 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libcmd/repl.cc
View file

@ -506,16 +506,14 @@ bool NixRepl::processLine(std::string line)
} }
else if (debuggerHook) { else if (debuggerHook && (command == ":bt" || command == ":backtrace")) {
if (command == ":bt" || command == ":backtrace") {
for (const auto & [idx, i] : enumerate(state->debugTraces)) { for (const auto & [idx, i] : enumerate(state->debugTraces)) {
std::cout << "\n" << ANSI_BLUE << idx << ANSI_NORMAL << ": "; std::cout << "\n" << ANSI_BLUE << idx << ANSI_NORMAL << ": ";
showDebugTrace(std::cout, state->positions, i); showDebugTrace(std::cout, state->positions, i);
} }
} }
else if (command == ":env") { else if (debuggerHook && (command == ":env")) {
for (const auto & [idx, i] : enumerate(state->debugTraces)) { for (const auto & [idx, i] : enumerate(state->debugTraces)) {
if (idx == debugTraceIndex) { if (idx == debugTraceIndex) {
printEnvBindings(state->symbols, i.expr, i.env); printEnvBindings(state->symbols, i.expr, i.env);
@ -524,7 +522,7 @@ bool NixRepl::processLine(std::string line)
} }
} }
else if (command == ":st") { else if (debuggerHook && (command == ":st")) {
try { try {
// change the DebugTrace index. // change the DebugTrace index.
debugTraceIndex = stoi(arg); debugTraceIndex = stoi(arg);
@ -542,18 +540,17 @@ bool NixRepl::processLine(std::string line)
} }
} }
else if (command == ":s" || command == ":step") { else if (debuggerHook && (command == ":s" || command == ":step")) {
// set flag to stop at next DebugTrace; exit repl. // set flag to stop at next DebugTrace; exit repl.
state->debugStop = true; state->debugStop = true;
return false; return false;
} }
else if (command == ":c" || command == ":continue") { else if (debuggerHook && (command == ":c" || command == ":continue")) {
// set flag to run to next breakpoint or end of program; exit repl. // set flag to run to next breakpoint or end of program; exit repl.
state->debugStop = false; state->debugStop = false;
return false; return false;
} }
}
else if (command == ":a" || command == ":add") { else if (command == ":a" || command == ":add") {
Value v; Value v;