aboutsummaryrefslogtreecommitdiff
path: root/src/libcmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/libcmd')
-rw-r--r--src/libcmd/command.cc3
-rw-r--r--src/libcmd/installables.cc18
-rw-r--r--src/libcmd/repl.cc1
3 files changed, 1 insertions, 21 deletions
diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
index 8d5098bc7..8a6dd71b2 100644
--- a/src/libcmd/command.cc
+++ b/src/libcmd/command.cc
@@ -67,7 +67,6 @@ extern std::function<void(const Error & error, const Env & env, const Expr & exp
ref<EvalState> EvalCommand::getEvalState()
{
- std::cout << "EvalCommand::getEvalState()" << startReplOnEvalErrors << std::endl;
if (!evalState) {
evalState = std::make_shared<EvalState>(searchPath, getStore());
if (startReplOnEvalErrors)
@@ -80,7 +79,7 @@ ref<EvalState> EvalCommand::getEvalState()
expr.show(std::cout);
std::cout << std::endl;
- if (expr.staticenv)
+ if (expr.staticenv)
{
auto vm = mapStaticEnvBindings(*expr.staticenv.get(), env);
runRepl(evalState, *vm);
diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index c3436acf9..7f7a89b37 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -249,20 +249,6 @@ void completeFlakeRefWithFragment(
completeFlakeRef(evalState->store, prefix);
}
-/*
-ref<EvalState> EvalCommand::getEvalState()
-{
- if (!evalState)
- evalState = std::make_shared<EvalState>(searchPath, getStore());
- return ref<EvalState>(evalState);
-}
-
-EvalCommand::~EvalCommand()
-{
- if (evalState)
- evalState->printStats();
-}
-*/
void completeFlakeRef(ref<Store> store, std::string_view prefix)
{
@@ -618,11 +604,7 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
if (file)
state->evalFile(lookupFileArg(*state, *file), *vFile);
else {
- // std::cout << "pre parseExprFromString" << std::endl;
auto e = state->parseExprFromString(*expr, absPath("."));
-
- // std::cout << "pre eval" << std::endl;
-
state->eval(e, *vFile);
}
diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc
index e1b58cc76..bfc131d27 100644
--- a/src/libcmd/repl.cc
+++ b/src/libcmd/repl.cc
@@ -54,7 +54,6 @@ struct NixRepl
const static int envSize = 32768;
std::shared_ptr<StaticEnv> staticEnv;
- // StaticEnv staticEnv;
Env * env;
int displ;
StringSet varNames;