wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

refactor: repl prompts are now the job of the interacter

Browse source
This commit is contained in:
Jade Lovelace 2024-02-26 00:43:44 -08:00
parent 70a6ce139b
commit ea31b8a117
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libcmd/repl-interacter.cc
View file

@ -1,5 +1,3 @@
#include "file-system.hh"
#include "libcmd/repl.hh"
#include <cstdio>
#ifdef USE_READLINE
@ -19,6 +17,8 @@ extern "C" {
#include "signals.hh"
#include "finally.hh"
#include "repl-interacter.hh"
#include "file-system.hh"
#include "libcmd/repl.hh"
namespace nix {
@ -124,7 +124,18 @@ ReadlineLikeInteracter::Guard ReadlineLikeInteracter::init(detail::ReplCompleter
return restoreRepl;
}
bool ReadlineLikeInteracter::getLine(std::string & input, const std::string & prompt)
static constexpr const char * promptForType(ReplPromptType promptType)
{
switch (promptType) {
case ReplPromptType::ReplPrompt:
return "nix-repl> ";
case ReplPromptType::ContinuationPrompt:
return " ";
}
assert(false);
}
bool ReadlineLikeInteracter::getLine(std::string & input, ReplPromptType promptType)
{
struct sigaction act, old;
sigset_t savedSignalMask, set;
@ -150,7 +161,7 @@ bool ReadlineLikeInteracter::getLine(std::string & input, const std::string & pr
};
setupSignals();
char * s = readline(prompt.c_str());
char * s = readline(promptForType(promptType));
Finally doFree([&]() { free(s); });
restoreSignals();