mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-14 02:06:16 +02:00
add nullable Expr argument
This commit is contained in:
parent
aad27143c6
commit
2ee1fa4afd
4 changed files with 74 additions and 63 deletions
|
@ -97,7 +97,7 @@ EvalCommand::EvalCommand()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// extern std::function<void(const Error & error, const std::map<std::string, Value *> & env)> debuggerHook;
|
// extern std::function<void(const Error & error, const std::map<std::string, Value *> & env)> debuggerHook;
|
||||||
extern std::function<void(const Error & error, const Env & env)> debuggerHook;
|
extern std::function<void(const Error & error, const Env & env, const Expr & expr)> debuggerHook;
|
||||||
|
|
||||||
ref<EvalState> EvalCommand::getEvalState()
|
ref<EvalState> EvalCommand::getEvalState()
|
||||||
{
|
{
|
||||||
|
@ -105,7 +105,7 @@ ref<EvalState> EvalCommand::getEvalState()
|
||||||
if (!evalState) {
|
if (!evalState) {
|
||||||
evalState = std::make_shared<EvalState>(searchPath, getStore());
|
evalState = std::make_shared<EvalState>(searchPath, getStore());
|
||||||
if (startReplOnEvalErrors)
|
if (startReplOnEvalErrors)
|
||||||
debuggerHook = [evalState{ref<EvalState>(evalState)}](const Error & error, const Env & env) {
|
debuggerHook = [evalState{ref<EvalState>(evalState)}](const Error & error, const Env & env, const Expr & expr) {
|
||||||
printError("%s\n\n" ANSI_BOLD "Starting REPL to allow you to inspect the current state of the evaluator.\n" ANSI_NORMAL, error.what());
|
printError("%s\n\n" ANSI_BOLD "Starting REPL to allow you to inspect the current state of the evaluator.\n" ANSI_NORMAL, error.what());
|
||||||
// printEnvPosChain(env);
|
// printEnvPosChain(env);
|
||||||
printEnvBindings(env);
|
printEnvBindings(env);
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
namespace nix {
|
namespace nix {
|
||||||
|
|
||||||
// std::function<void(const Error & error, const std::map<std::string, Value *> & env)> debuggerHook;
|
// std::function<void(const Error & error, const std::map<std::string, Value *> & env)> debuggerHook;
|
||||||
std::function<void(const Error & error, const Env & env)> debuggerHook;
|
std::function<void(const Error & error, const Env & env, const Expr & expr)> debuggerHook;
|
||||||
|
|
||||||
static char * dupString(const char * s)
|
static char * dupString(const char * s)
|
||||||
{
|
{
|
||||||
|
@ -806,17 +806,17 @@ valmap * mapEnvBindings(const Env &env)
|
||||||
evaluator. So here are some helper functions for throwing
|
evaluator. So here are some helper functions for throwing
|
||||||
exceptions. */
|
exceptions. */
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, Env & env))
|
LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = EvalError(s, s2);
|
auto error = EvalError(s, s2);
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2, Env & env))
|
LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = EvalError({
|
auto error = EvalError({
|
||||||
|
@ -824,22 +824,24 @@ LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3, Env & env))
|
LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = EvalError(s, s2, s3);
|
auto error = EvalError(s, s2, s3);
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2, const string & s3, Env & env))
|
LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2, const string & s3, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = EvalError({
|
auto error = EvalError({
|
||||||
|
@ -847,12 +849,13 @@ LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwEvalError(const Pos & p1, const char * s, const Symbol & sym, const Pos & p2, Env & env))
|
LocalNoInlineNoReturn(void throwEvalError(const Pos & p1, const char * s, const Symbol & sym, const Pos & p2, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// p1 is where the error occurred; p2 is a position mentioned in the message.
|
// p1 is where the error occurred; p2 is a position mentioned in the message.
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
|
@ -861,12 +864,13 @@ LocalNoInlineNoReturn(void throwEvalError(const Pos & p1, const char * s, const
|
||||||
.errPos = p1
|
.errPos = p1
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, Env & env))
|
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = TypeError({
|
auto error = TypeError({
|
||||||
|
@ -874,12 +878,13 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, Env &
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const Value & v, Env & env))
|
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const Value & v, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = TypeError({
|
auto error = TypeError({
|
||||||
|
@ -887,12 +892,13 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const string &s2, Env & env))
|
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const string &s2, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = TypeError({
|
auto error = TypeError({
|
||||||
|
@ -900,12 +906,13 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2, Env & env))
|
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = TypeError({
|
auto error = TypeError({
|
||||||
|
@ -913,12 +920,13 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwAssertionError(const Pos & pos, const char * s, const string & s1, Env & env))
|
LocalNoInlineNoReturn(void throwAssertionError(const Pos & pos, const char * s, const string & s1, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = AssertionError({
|
auto error = AssertionError({
|
||||||
|
@ -926,12 +934,13 @@ LocalNoInlineNoReturn(void throwAssertionError(const Pos & pos, const char * s,
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwUndefinedVarError(const Pos & pos, const char * s, const string & s1, Env & env))
|
LocalNoInlineNoReturn(void throwUndefinedVarError(const Pos & pos, const char * s, const string & s1, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
std::cout << "throwUndefinedVarError" << std::endl;
|
std::cout << "throwUndefinedVarError" << std::endl;
|
||||||
|
|
||||||
|
@ -943,12 +952,13 @@ LocalNoInlineNoReturn(void throwUndefinedVarError(const Pos & pos, const char *
|
||||||
|
|
||||||
std::cout << "pre debuggerHook" << std::endl;
|
std::cout << "pre debuggerHook" << std::endl;
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalNoInlineNoReturn(void throwMissingArgumentError(const Pos & pos, const char * s, const string & s1, Env & env))
|
LocalNoInlineNoReturn(void throwMissingArgumentError(const Pos & pos, const char * s, const string & s1, Env & env, Expr *expr))
|
||||||
{
|
{
|
||||||
// auto delenv = std::unique_ptr<valmap>(env);
|
// auto delenv = std::unique_ptr<valmap>(env);
|
||||||
auto error = MissingArgumentError({
|
auto error = MissingArgumentError({
|
||||||
|
@ -956,8 +966,9 @@ LocalNoInlineNoReturn(void throwMissingArgumentError(const Pos & pos, const char
|
||||||
.errPos = pos
|
.errPos = pos
|
||||||
});
|
});
|
||||||
|
|
||||||
if (debuggerHook)
|
if (debuggerHook && expr)
|
||||||
debuggerHook(error, env);
|
debuggerHook(error, env, *expr);
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1020,7 +1031,7 @@ inline Value * EvalState::lookupVar(Env * env, const ExprVar & var, bool noEval)
|
||||||
}
|
}
|
||||||
if (!env->prevWith) {
|
if (!env->prevWith) {
|
||||||
std::cout << "pre throwUndefinedVarError" << std::endl;
|
std::cout << "pre throwUndefinedVarError" << std::endl;
|
||||||
throwUndefinedVarError(var.pos, "undefined variable '%1%'", var.name, *env);
|
throwUndefinedVarError(var.pos, "undefined variable '%1%'", var.name, *env, 0);
|
||||||
}
|
}
|
||||||
for (size_t l = env->prevWith; l; --l, env = env->up) ;
|
for (size_t l = env->prevWith; l; --l, env = env->up) ;
|
||||||
}
|
}
|
||||||
|
@ -1354,7 +1365,7 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v)
|
||||||
Bindings::iterator j = v.attrs->find(nameSym);
|
Bindings::iterator j = v.attrs->find(nameSym);
|
||||||
if (j != v.attrs->end())
|
if (j != v.attrs->end())
|
||||||
throwEvalError(i.pos, "dynamic attribute '%1%' already defined at %2%", nameSym, *j->pos,
|
throwEvalError(i.pos, "dynamic attribute '%1%' already defined at %2%", nameSym, *j->pos,
|
||||||
env);
|
env, this);
|
||||||
// map1("value", &v)); // TODO dynamicAttrs to env?
|
// map1("value", &v)); // TODO dynamicAttrs to env?
|
||||||
|
|
||||||
i.valueExpr->setName(nameSym);
|
i.valueExpr->setName(nameSym);
|
||||||
|
@ -1445,7 +1456,7 @@ void ExprSelect::eval(EvalState & state, Env & env, Value & v)
|
||||||
} else {
|
} else {
|
||||||
state.forceAttrs(*vAttrs, pos);
|
state.forceAttrs(*vAttrs, pos);
|
||||||
if ((j = vAttrs->attrs->find(name)) == vAttrs->attrs->end())
|
if ((j = vAttrs->attrs->find(name)) == vAttrs->attrs->end())
|
||||||
throwEvalError(pos, "attribute '%1%' missing", name, env);
|
throwEvalError(pos, "attribute '%1%' missing", name, env, this);
|
||||||
// mapBindings(*vAttrs->attrs));
|
// mapBindings(*vAttrs->attrs));
|
||||||
}
|
}
|
||||||
vAttrs = j->value;
|
vAttrs = j->value;
|
||||||
|
@ -1573,7 +1584,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
|
||||||
pos,
|
pos,
|
||||||
"attempt to call something which is not a function but %1%",
|
"attempt to call something which is not a function but %1%",
|
||||||
showType(fun).c_str(),
|
showType(fun).c_str(),
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// fun.env);
|
// fun.env);
|
||||||
// map2("fun", &fun, "arg", &arg));
|
// map2("fun", &fun, "arg", &arg));
|
||||||
}
|
}
|
||||||
|
@ -1612,7 +1623,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
|
||||||
"%1% called without required argument '%2%'",
|
"%1% called without required argument '%2%'",
|
||||||
lambda,
|
lambda,
|
||||||
i.name,
|
i.name,
|
||||||
*fun.lambda.env);
|
*fun.lambda.env, &lambda);
|
||||||
// map2("fun", &fun, "arg", &arg));
|
// map2("fun", &fun, "arg", &arg));
|
||||||
env2.values[displ++] = i.def->maybeThunk(*this, env2);
|
env2.values[displ++] = i.def->maybeThunk(*this, env2);
|
||||||
} else {
|
} else {
|
||||||
|
@ -1633,7 +1644,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v, const Pos & po
|
||||||
"%1% called with unexpected argument '%2%'",
|
"%1% called with unexpected argument '%2%'",
|
||||||
lambda,
|
lambda,
|
||||||
i.name,
|
i.name,
|
||||||
*fun.lambda.env);
|
*fun.lambda.env, &lambda);
|
||||||
// map2("fun", &fun, "arg", &arg));
|
// map2("fun", &fun, "arg", &arg));
|
||||||
abort(); // can't happen
|
abort(); // can't happen
|
||||||
}
|
}
|
||||||
|
@ -1711,7 +1722,7 @@ this case it must have its arguments supplied either by default
|
||||||
values, or passed explicitly with '--arg' or '--argstr'. See
|
values, or passed explicitly with '--arg' or '--argstr'. See
|
||||||
https://nixos.org/manual/nix/stable/#ss-functions.)",
|
https://nixos.org/manual/nix/stable/#ss-functions.)",
|
||||||
i.name,
|
i.name,
|
||||||
*fun.lambda.env);
|
*fun.lambda.env, fun.lambda.fun);
|
||||||
// mapBindings(args));
|
// mapBindings(args));
|
||||||
// map1("fun", &fun)); // todo add bindings + fun
|
// map1("fun", &fun)); // todo add bindings + fun
|
||||||
}
|
}
|
||||||
|
@ -1761,7 +1772,7 @@ void ExprAssert::eval(EvalState & state, Env & env, Value & v)
|
||||||
if (!state.evalBool(env, cond, pos)) {
|
if (!state.evalBool(env, cond, pos)) {
|
||||||
std::ostringstream out;
|
std::ostringstream out;
|
||||||
cond->show(out);
|
cond->show(out);
|
||||||
throwAssertionError(pos, "assertion '%1%' failed", out.str(), env);
|
throwAssertionError(pos, "assertion '%1%' failed", out.str(), env, this);
|
||||||
}
|
}
|
||||||
body->eval(state, env, v);
|
body->eval(state, env, v);
|
||||||
}
|
}
|
||||||
|
@ -1915,7 +1926,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
|
||||||
} else {
|
} else {
|
||||||
std::cerr << "envtype: " << showType(env.values[0]->type()) << std::endl;
|
std::cerr << "envtype: " << showType(env.values[0]->type()) << std::endl;
|
||||||
|
|
||||||
throwEvalError(pos, "cannot add %1% to an integer", showType(vTmp), env);
|
throwEvalError(pos, "cannot add %1% to an integer", showType(vTmp), env, this);
|
||||||
}
|
}
|
||||||
} else if (firstType == nFloat) {
|
} else if (firstType == nFloat) {
|
||||||
if (vTmp.type() == nInt) {
|
if (vTmp.type() == nInt) {
|
||||||
|
@ -1923,7 +1934,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
|
||||||
} else if (vTmp.type() == nFloat) {
|
} else if (vTmp.type() == nFloat) {
|
||||||
nf += vTmp.fpoint;
|
nf += vTmp.fpoint;
|
||||||
} else
|
} else
|
||||||
throwEvalError(pos, "cannot add %1% to a float", showType(vTmp), env);
|
throwEvalError(pos, "cannot add %1% to a float", showType(vTmp), env, this);
|
||||||
} else
|
} else
|
||||||
s << state.coerceToString(pos, vTmp, context, false, firstType == nString);
|
s << state.coerceToString(pos, vTmp, context, false, firstType == nString);
|
||||||
}
|
}
|
||||||
|
@ -1984,7 +1995,7 @@ NixInt EvalState::forceInt(Value & v, const Pos & pos)
|
||||||
forceValue(v, pos);
|
forceValue(v, pos);
|
||||||
if (v.type() != nInt)
|
if (v.type() != nInt)
|
||||||
throwTypeError(pos, "value is %1% while an integer was expected", v,
|
throwTypeError(pos, "value is %1% while an integer was expected", v,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
return v.integer;
|
return v.integer;
|
||||||
}
|
}
|
||||||
|
@ -1997,7 +2008,7 @@ NixFloat EvalState::forceFloat(Value & v, const Pos & pos)
|
||||||
return v.integer;
|
return v.integer;
|
||||||
else if (v.type() != nFloat)
|
else if (v.type() != nFloat)
|
||||||
throwTypeError(pos, "value is %1% while a float was expected", v,
|
throwTypeError(pos, "value is %1% while a float was expected", v,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
return v.fpoint;
|
return v.fpoint;
|
||||||
}
|
}
|
||||||
|
@ -2008,7 +2019,7 @@ bool EvalState::forceBool(Value & v, const Pos & pos)
|
||||||
forceValue(v, pos);
|
forceValue(v, pos);
|
||||||
if (v.type() != nBool)
|
if (v.type() != nBool)
|
||||||
throwTypeError(pos, "value is %1% while a Boolean was expected", v,
|
throwTypeError(pos, "value is %1% while a Boolean was expected", v,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
return v.boolean;
|
return v.boolean;
|
||||||
}
|
}
|
||||||
|
@ -2025,7 +2036,7 @@ void EvalState::forceFunction(Value & v, const Pos & pos)
|
||||||
forceValue(v, pos);
|
forceValue(v, pos);
|
||||||
if (v.type() != nFunction && !isFunctor(v))
|
if (v.type() != nFunction && !isFunctor(v))
|
||||||
throwTypeError(pos, "value is %1% while a function was expected", v,
|
throwTypeError(pos, "value is %1% while a function was expected", v,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2035,7 +2046,7 @@ string EvalState::forceString(Value & v, const Pos & pos)
|
||||||
forceValue(v, pos);
|
forceValue(v, pos);
|
||||||
if (v.type() != nString) {
|
if (v.type() != nString) {
|
||||||
throwTypeError(pos, "value is %1% while a string was expected", v,
|
throwTypeError(pos, "value is %1% while a string was expected", v,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
}
|
}
|
||||||
return string(v.string.s);
|
return string(v.string.s);
|
||||||
|
@ -2089,13 +2100,13 @@ string EvalState::forceStringNoCtx(Value & v, const Pos & pos)
|
||||||
throwEvalError(pos, "the string '%1%' is not allowed to refer to a store path (such as '%2%')",
|
throwEvalError(pos, "the string '%1%' is not allowed to refer to a store path (such as '%2%')",
|
||||||
v.string.s, v.string.context[0],
|
v.string.s, v.string.context[0],
|
||||||
// b.has_value() ? mapBindings(*b.get()) : map0());
|
// b.has_value() ? mapBindings(*b.get()) : map0());
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
else
|
else
|
||||||
throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%')",
|
throwEvalError("the string '%1%' is not allowed to refer to a store path (such as '%2%')",
|
||||||
v.string.s, v.string.context[0],
|
v.string.s, v.string.context[0],
|
||||||
// b.has_value() ? mapBindings(*b.get()) : map0());
|
// b.has_value() ? mapBindings(*b.get()) : map0());
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
}
|
}
|
||||||
return s;
|
return s;
|
||||||
|
@ -2169,7 +2180,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
|
||||||
auto i = v.attrs->find(sOutPath);
|
auto i = v.attrs->find(sOutPath);
|
||||||
if (i == v.attrs->end())
|
if (i == v.attrs->end())
|
||||||
throwTypeError(pos, "cannot coerce a set to a string",
|
throwTypeError(pos, "cannot coerce a set to a string",
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
return coerceToString(pos, *i->value, context, coerceMore, copyToStore);
|
return coerceToString(pos, *i->value, context, coerceMore, copyToStore);
|
||||||
}
|
}
|
||||||
|
@ -2201,7 +2212,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
|
||||||
}
|
}
|
||||||
|
|
||||||
throwTypeError(pos, "cannot coerce %1% to a string", v,
|
throwTypeError(pos, "cannot coerce %1% to a string", v,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2211,7 +2222,7 @@ string EvalState::copyPathToStore(PathSet & context, const Path & path)
|
||||||
if (nix::isDerivation(path))
|
if (nix::isDerivation(path))
|
||||||
throwEvalError("file names are not allowed to end in '%1%'",
|
throwEvalError("file names are not allowed to end in '%1%'",
|
||||||
drvExtension,
|
drvExtension,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map0());
|
// map0());
|
||||||
|
|
||||||
Path dstPath;
|
Path dstPath;
|
||||||
|
@ -2237,7 +2248,7 @@ Path EvalState::coerceToPath(const Pos & pos, Value & v, PathSet & context)
|
||||||
string path = coerceToString(pos, v, context, false, false);
|
string path = coerceToString(pos, v, context, false, false);
|
||||||
if (path == "" || path[0] != '/')
|
if (path == "" || path[0] != '/')
|
||||||
throwEvalError(pos, "string '%1%' doesn't represent an absolute path", path,
|
throwEvalError(pos, "string '%1%' doesn't represent an absolute path", path,
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map1("value", &v));
|
// map1("value", &v));
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
@ -2320,7 +2331,7 @@ bool EvalState::eqValues(Value & v1, Value & v2)
|
||||||
throwEvalError("cannot compare %1% with %2%",
|
throwEvalError("cannot compare %1% with %2%",
|
||||||
showType(v1),
|
showType(v1),
|
||||||
showType(v2),
|
showType(v2),
|
||||||
fakeEnv(1));
|
fakeEnv(1), 0);
|
||||||
// map2("value1", &v1, "value2", &v2));
|
// map2("value1", &v1, "value2", &v2));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ enum RepairFlag : bool;
|
||||||
|
|
||||||
typedef void (* PrimOpFun) (EvalState & state, const Pos & pos, Value * * args, Value & v);
|
typedef void (* PrimOpFun) (EvalState & state, const Pos & pos, Value * * args, Value & v);
|
||||||
|
|
||||||
extern std::function<void(const Error & error, const Env & env)> debuggerHook;
|
extern std::function<void(const Error & error, const Env & env, const Expr & expr)> debuggerHook;
|
||||||
|
|
||||||
struct PrimOp
|
struct PrimOp
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@ MakeError(UndefinedVarError, Error);
|
||||||
MakeError(MissingArgumentError, EvalError);
|
MakeError(MissingArgumentError, EvalError);
|
||||||
MakeError(RestrictedPathError, Error);
|
MakeError(RestrictedPathError, Error);
|
||||||
|
|
||||||
extern std::function<void(const Error & error, const Env & env)> debuggerHook;
|
extern std::function<void(const Error & error, const Env & env, const Expr & expr)> debuggerHook;
|
||||||
|
|
||||||
/* Position objects. */
|
/* Position objects. */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue