Support multiline input by detecting "unfinished" parse errors.
Fixes #4,
This commit is contained in:
parent
dc8b51754b
commit
2d729e4f6f
1 changed files with 23 additions and 5 deletions
28
nix-repl.cc
28
nix-repl.cc
|
@ -41,7 +41,7 @@ struct NixRepl
|
||||||
NixRepl(const Strings & searchPath);
|
NixRepl(const Strings & searchPath);
|
||||||
void mainLoop(const Strings & files);
|
void mainLoop(const Strings & files);
|
||||||
void completePrefix(string prefix);
|
void completePrefix(string prefix);
|
||||||
bool getLine(string & line);
|
bool getLine(string & line, const char * prompt);
|
||||||
bool processLine(string line);
|
bool processLine(string line);
|
||||||
void loadFile(const Path & path);
|
void loadFile(const Path & path);
|
||||||
void initEnv();
|
void initEnv();
|
||||||
|
@ -96,21 +96,39 @@ void NixRepl::mainLoop(const Strings & files)
|
||||||
using_history();
|
using_history();
|
||||||
read_history(0);
|
read_history(0);
|
||||||
|
|
||||||
|
string input;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
|
// When continuing input from a previous, don't print a prompt, just align to the same
|
||||||
|
// number of chars as the prompt.
|
||||||
|
const char * prompt = input.empty() ? "nix-repl> " : " ";
|
||||||
string line;
|
string line;
|
||||||
if (!getLine(line)) {
|
if (!getLine(line, prompt)) {
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input.append(removeWhitespace(line));
|
||||||
|
input.push_back('\n');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (!processLine(removeWhitespace(line))) return;
|
if (!processLine(input)) return;
|
||||||
|
} catch (ParseError & e) {
|
||||||
|
if (e.msg().find("unexpected $end") != std::string::npos) {
|
||||||
|
// For parse errors on incomplete input, we continue waiting for the next line of
|
||||||
|
// input without clearing the input so far.
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
printMsg(lvlError, "error: " + e.msg());
|
||||||
|
}
|
||||||
} catch (Error & e) {
|
} catch (Error & e) {
|
||||||
printMsg(lvlError, "error: " + e.msg());
|
printMsg(lvlError, "error: " + e.msg());
|
||||||
} catch (Interrupted & e) {
|
} catch (Interrupted & e) {
|
||||||
printMsg(lvlError, "error: " + e.msg());
|
printMsg(lvlError, "error: " + e.msg());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We handled the current input fully, so we should clear it and read brand new input.
|
||||||
|
input.clear();
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -149,7 +167,7 @@ char * completerThunk(const char * s, int state)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool NixRepl::getLine(string & line)
|
bool NixRepl::getLine(string & line, const char * prompt)
|
||||||
{
|
{
|
||||||
struct sigaction act, old;
|
struct sigaction act, old;
|
||||||
act.sa_handler = sigintHandler;
|
act.sa_handler = sigintHandler;
|
||||||
|
@ -164,7 +182,7 @@ bool NixRepl::getLine(string & line)
|
||||||
curRepl = this;
|
curRepl = this;
|
||||||
rl_completion_entry_function = completerThunk;
|
rl_completion_entry_function = completerThunk;
|
||||||
|
|
||||||
char * s = readline("nix-repl> ");
|
char * s = readline(prompt);
|
||||||
if (!s) return false;
|
if (!s) return false;
|
||||||
line = chomp(string(s));
|
line = chomp(string(s));
|
||||||
free(s);
|
free(s);
|
||||||
|
|
Loading…
Reference in a new issue