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

Rename ProcessLineResult variants

Browse source 
(cherry picked from commit 8e71883e3f59100479e96aa1883ef52dbaa03fd3)
Change-Id: If7d8b75eaec623dac106ce2363fa148af37d150c
This commit is contained in:
eldritch horrors 2024-03-08 09:19:27 +01:00
parent 992d99592f
commit 030c8aa833
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libcmd/repl.cc
View file

@ -58,16 +58,16 @@ enum class ProcessLineResult {
* program or evaluation (e.g., if the REPL was acting as the debugger) * program or evaluation (e.g., if the REPL was acting as the debugger)
* should also exit. * should also exit.
*/ */
QuitAll, Quit,
/** /**
* The user exited with `:continue`. The REPL should exit, but the program * The user exited with `:continue`. The REPL should exit, but the program
* should continue running. * should continue running.
*/ */
QuitOnce, Continue,
/** /**
* The user did not exit. The REPL should request another line of input. * The user did not exit. The REPL should request another line of input.
*/ */
Continue, PromptAgain,
}; };
struct NixRepl struct NixRepl
@ -315,11 +315,11 @@ ReplExitStatus NixRepl::mainLoop()
logger->resume(); logger->resume();
try { try {
switch (processLine(input)) { switch (processLine(input)) {
case ProcessLineResult::QuitAll: case ProcessLineResult::Quit:
return ReplExitStatus::QuitAll; return ReplExitStatus::QuitAll;
case ProcessLineResult::QuitOnce:
return ReplExitStatus::Continue;
case ProcessLineResult::Continue: case ProcessLineResult::Continue:
return ReplExitStatus::Continue;
case ProcessLineResult::PromptAgain:
break; break;
default: default:
abort(); abort();
@ -514,7 +514,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
{ {
line = trim(line); line = trim(line);
if (line.empty()) if (line.empty())
return ProcessLineResult::Continue; return ProcessLineResult::PromptAgain;
_isInterrupted = false; _isInterrupted = false;
@ -609,13 +609,13 @@ ProcessLineResult NixRepl::processLine(std::string line)
else if (state->debugRepl && (command == ":s" || command == ":step")) { else if (state->debugRepl && (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 ProcessLineResult::QuitOnce; return ProcessLineResult::Continue;
} }
else if (state->debugRepl && (command == ":c" || command == ":continue")) { else if (state->debugRepl && (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 ProcessLineResult::QuitOnce; return ProcessLineResult::Continue;
} }
else if (command == ":a" || command == ":add") { else if (command == ":a" || command == ":add") {
@ -758,7 +758,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
else if (command == ":q" || command == ":quit") { else if (command == ":q" || command == ":quit") {
state->debugStop = false; state->debugStop = false;
return ProcessLineResult::QuitAll; return ProcessLineResult::Quit;
} }
else if (command == ":doc") { else if (command == ":doc") {
@ -819,7 +819,7 @@ ProcessLineResult NixRepl::processLine(std::string line)
} }
} }
return ProcessLineResult::Continue; return ProcessLineResult::PromptAgain;
} }
void NixRepl::loadFile(const Path & path) void NixRepl::loadFile(const Path & path)