max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 22:46:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move repl.cc to libcmd for linkage

Browse source
This commit is contained in:
Ben Burdette 2021-04-28 15:50:11 -06:00
parent 57c2dd5d85
commit f32c687f03
3 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/libcmd/command.cc
View file

@ -54,6 +54,7 @@ void StoreCommand::run()
run(getStore());
}
/*
EvalCommand::EvalCommand()
{
addFlag({
@ -77,6 +78,42 @@ ref<EvalState> EvalCommand::getEvalState()
}
return ref<EvalState>(evalState);
}
*/
EvalCommand::EvalCommand()
{
addFlag({
.longName = "debugger",
.description = "start an interactive environment if evaluation fails",
.handler = {&startReplOnEvalErrors, true},
});
}
// ref<EvalState> EvalCommand::getEvalState()
// {
// if (!evalState)
// evalState = std::make_shared<EvalState>(searchPath, getStore());
// return ref<EvalState>(evalState);
// }
extern std::function<void(const Error & error, const std::map<std::string, Value *> & env)> debuggerHook;
ref<EvalState> EvalCommand::getEvalState()
{
if (!evalState) {
evalState = std::make_shared<EvalState>(searchPath, getStore());
if (startReplOnEvalErrors)
debuggerHook = [evalState{ref<EvalState>(evalState)}](const Error & error, const std::map<std::string, Value *> & env) {
printError("%s\n\n" ANSI_BOLD "Starting REPL to allow you to inspect the current state of the evaluator.\n" ANSI_NORMAL, error.what());
runRepl(evalState, env);
};
}
return ref<EvalState>(evalState);
}
EvalCommand::~EvalCommand()
{
if (evalState)
evalState->printStats();
}
RealisedPathsCommand::RealisedPathsCommand(bool recursive)
: recursive(recursive)

6
src/libcmd/local.mk
View file

@ -6,10 +6,10 @@ libcmd_DIR := $(d)
libcmd_SOURCES := $(wildcard $(d)/*.cc)
libcmd_CXXFLAGS += -I src/libutil -I src/libstore -I src/libexpr -I src/libmain -I src/libfetchers
libcmd_CXXFLAGS += -I src/libutil -I src/libstore -I src/libexpr -I src/libmain -I src/libfetchers -I src/nix
libcmd_LDFLAGS = -llowdown
libcmd_LDFLAGS = $(EDITLINE_LIBS) -llowdown
libcmd_LIBS = libstore libutil libexpr libmain libfetchers
libcmd_LIBS = libstore libutil libexpr libmain libfetchers libnix libwut
$(eval $(call install-file-in, $(d)/nix-cmd.pc, $(prefix)/lib/pkgconfig, 0644))

0
src/nix/repl.cc → src/libcmd/repl.cc
View file