refactor: factor out getValue

NixOS · May 19, 2022 · 7534798 · 7534798
1 parent 9f8c118
commit 7534798
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
@@ -920,18 +920,22 @@ struct CmdRepl : InstallablesCommand
  void run(ref<Store> store) override
  {
  auto state = getEvalState();
- auto repl = std::make_unique<NixRepl>(searchPath, openStore(),state
- ,[&]()->NixRepl::AnnotatedValues{
- auto installables = load();
- NixRepl::AnnotatedValues values;
- for (auto & installable: installables){
- auto [val, pos] = installable->toValue(*state);
- auto what = installable->what();
- values.push_back( {val,what} );
- }
- return values;
- }
- );
+ auto getValues = [&]()->NixRepl::AnnotatedValues{
+ auto installables = load();
+ NixRepl::AnnotatedValues values;
+ for (auto & installable: installables){
+ auto [val, pos] = installable->toValue(*state);
+ auto what = installable->what();
+ values.push_back( {val,what} );
+ }
+ return values;
+ };
+ auto repl = std::make_unique<NixRepl>(
+ searchPath,
+ openStore(),
+ state,
+ getValues
+ );
  repl->autoArgs = getAutoArgs(*repl->state);
  repl->mainLoop();
  }