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

Merge pull request #2551 from KaiHa/kaiha/libreadline_option

Browse source 
repl: give user the choice between libeditline and libreadline
This commit is contained in:
Eelco Dolstra 2018-11-20 16:16:31 +01:00 committed by GitHub
commit 338fcec779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nix/repl.cc
View file

@ -5,7 +5,12 @@
#include <setjmp.h> #include <setjmp.h>
#ifdef READLINE
#include <readline/history.h>
#include <readline/readline.h>
#else
#include <editline.h> #include <editline.h>
#endif
#include "shared.hh" #include "shared.hh"
#include "eval.hh" #include "eval.hh"
@ -202,13 +207,15 @@ void NixRepl::mainLoop(const std::vector<std::string> & files)
// Allow nix-repl specific settings in .inputrc // Allow nix-repl specific settings in .inputrc
rl_readline_name = "nix-repl"; rl_readline_name = "nix-repl";
createDirs(dirOf(historyFile)); createDirs(dirOf(historyFile));
#ifndef READLINE
el_hist_size = 1000; el_hist_size = 1000;
#endif
read_history(historyFile.c_str()); read_history(historyFile.c_str());
// rl_initialize();
// linenoiseSetCompletionCallback(completionCallback);
curRepl = this; curRepl = this;
#ifndef READLINE
rl_set_complete_func(completionCallback); rl_set_complete_func(completionCallback);
rl_set_list_possib_func(listPossibleCallback); rl_set_list_possib_func(listPossibleCallback);
#endif
std::string input; std::string input;