Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7cf874c17d46
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 550e11f077ae
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 2, 2020

  1. nix repl: Fix handling of multi-line expressions

    @edolstra
    edolstra committed Nov 2, 2020
    Copy the full SHA
    550e11f View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/nix/repl.cc
6 changes: 3 additions & 3 deletions src/nix/repl.cc
View file
Original file line number Diff line number Diff line change
@@ -212,17 +212,17 @@ void NixRepl::mainLoop(const std::vector<std::string> & files)
try {
if (!removeWhitespace(input).empty() && !processLine(input)) return;
} catch (ParseError & e) {
if (e.msg().find("unexpected $end") != std::string::npos) {
if (e.msg().find("unexpected end of file") != 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, e.msg());
}
} catch (Error & e) {
printMsg(lvlError, e.msg());
printMsg(lvlError, e.msg());
} catch (Interrupted & e) {
printMsg(lvlError, e.msg());
printMsg(lvlError, e.msg());
}

// We handled the current input fully, so we should clear it