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

forceList: Show position info

Browse source
This commit is contained in:
Eelco Dolstra 2014-04-04 19:05:36 +02:00
parent b62d36963c
commit 96b695ccab
5 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/eval-inline.hh
View file

@ -18,6 +18,12 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v))
} }
LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v, const Pos & pos))
{
throw TypeError(format(s) % showType(v) % pos);
}
void EvalState::forceValue(Value & v) void EvalState::forceValue(Value & v)
{ {
if (v.type == tThunk) { if (v.type == tThunk) {
@ -56,4 +62,13 @@ inline void EvalState::forceList(Value & v)
throwTypeError("value is %1% while a list was expected", v); throwTypeError("value is %1% while a list was expected", v);
} }
inline void EvalState::forceList(Value & v, const Pos & pos)
{
forceValue(v);
if (v.type != tList)
throwTypeError("value is %1% while a list was expected, at %2%", v, pos);
}
} }

9
src/libexpr/eval.cc
View file

@ -294,11 +294,6 @@ LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
throw TypeError(format(s) % s1); throw TypeError(format(s) % s1);
} }
LocalNoInlineNoReturn(void throwTypeError(const char * s, const Value & v, const Pos & pos))
{
throw TypeError(format(s) % showType(v) % pos);
}
LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1, const string & s2)) LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1, const string & s2))
{ {
throw TypeError(format(s) % s1 % s2); throw TypeError(format(s) % s1 % s2);
@ -1169,11 +1164,11 @@ bool EvalState::forceBool(Value & v)
} }
void EvalState::forceFunction(Value & v) void EvalState::forceFunction(Value & v, const Pos & pos)
{ {
forceValue(v); forceValue(v);
if (v.type != tLambda && v.type != tPrimOp && v.type != tPrimOpApp) if (v.type != tLambda && v.type != tPrimOp && v.type != tPrimOpApp)
throwTypeError("value is %1% while a function was expected", v); throwTypeError("value is %1% while a function was expected, at %2%", v, pos);
} }

3
src/libexpr/eval.hh
View file

@ -162,7 +162,8 @@ public:
bool forceBool(Value & v); bool forceBool(Value & v);
inline void forceAttrs(Value & v); inline void forceAttrs(Value & v);
inline void forceList(Value & v); inline void forceList(Value & v);
void forceFunction(Value & v); // either lambda or primop inline void forceList(Value & v, const Pos & pos);
void forceFunction(Value & v, const Pos & pos); // either lambda or primop
string forceString(Value & v); string forceString(Value & v);
string forceString(Value & v, PathSet & context); string forceString(Value & v, PathSet & context);
string forceStringNoCtx(Value & v); string forceStringNoCtx(Value & v);

2
src/libexpr/get-drvs.cc
View file

@ -36,7 +36,7 @@ DrvInfo::Outputs DrvInfo::queryOutputs()
/* Get the ‘outputs’ list. */ /* Get the ‘outputs’ list. */
Bindings::iterator i; Bindings::iterator i;
if (attrs && (i = attrs->find(state->sOutputs)) != attrs->end()) { if (attrs && (i = attrs->find(state->sOutputs)) != attrs->end()) {
state->forceList(*i->value); state->forceList(*i->value, *i->pos);
/* For each output... */ /* For each output... */
for (unsigned int j = 0; j < i->value->list.length; ++j) { for (unsigned int j = 0; j < i->value->list.length; ++j) {

30
src/libexpr/primops.cc
View file

@ -84,7 +84,7 @@ static void prim_import(EvalState & state, const Pos & pos, Value * * args, Valu
w.attrs->sort(); w.attrs->sort();
Value fun; Value fun;
state.evalFile(state.findFile("nix/imported-drv-to-derivation.nix"), fun); state.evalFile(state.findFile("nix/imported-drv-to-derivation.nix"), fun);
state.forceFunction(fun); state.forceFunction(fun, pos);
mkApp(v, fun, w); mkApp(v, fun, w);
state.forceAttrs(v); state.forceAttrs(v);
} else { } else {
@ -195,7 +195,7 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
args[0]->attrs->find(state.symbols.create("startSet")); args[0]->attrs->find(state.symbols.create("startSet"));
if (startSet == args[0]->attrs->end()) if (startSet == args[0]->attrs->end())
throw EvalError(format("attribute `startSet' required, at %1%") % pos); throw EvalError(format("attribute `startSet' required, at %1%") % pos);
state.forceList(*startSet->value); state.forceList(*startSet->value, pos);
ValueList workSet; ValueList workSet;
for (unsigned int n = 0; n < startSet->value->list.length; ++n) for (unsigned int n = 0; n < startSet->value->list.length; ++n)
@ -234,7 +234,7 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
/* Call the `operator' function with `e' as argument. */ /* Call the `operator' function with `e' as argument. */
Value call; Value call;
mkApp(call, *op->value, *e); mkApp(call, *op->value, *e);
state.forceList(call); state.forceList(call, pos);
/* Add the values returned by the operator to the work set. */ /* Add the values returned by the operator to the work set. */
for (unsigned int n = 0; n < call.list.length; ++n) { for (unsigned int n = 0; n < call.list.length; ++n) {
@ -381,7 +381,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
/* The `args' attribute is special: it supplies the /* The `args' attribute is special: it supplies the
command-line arguments to the builder. */ command-line arguments to the builder. */
if (key == "args") { if (key == "args") {
state.forceList(*i->value); state.forceList(*i->value, pos);
for (unsigned int n = 0; n < i->value->list.length; ++n) { for (unsigned int n = 0; n < i->value->list.length; ++n) {
string s = state.coerceToString(*i->value->list.elems[n], context, true); string s = state.coerceToString(*i->value->list.elems[n], context, true);
drv.args.push_back(s); drv.args.push_back(s);
@ -821,7 +821,7 @@ static void prim_isAttrs(EvalState & state, const Pos & pos, Value * * args, Val
static void prim_removeAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_removeAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceAttrs(*args[0]); state.forceAttrs(*args[0]);
state.forceList(*args[1]); state.forceList(*args[1], pos);
/* Get the attribute names to be removed. */ /* Get the attribute names to be removed. */
std::set<Symbol> names; std::set<Symbol> names;
@ -848,7 +848,7 @@ static void prim_removeAttrs(EvalState & state, const Pos & pos, Value * * args,
name, the first takes precedence. */ name, the first takes precedence. */
static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceList(*args[0]); state.forceList(*args[0], pos);
state.mkAttrs(v, args[0]->list.length); state.mkAttrs(v, args[0]->list.length);
@ -943,7 +943,7 @@ static void prim_isList(EvalState & state, const Pos & pos, Value * * args, Valu
static void elemAt(EvalState & state, const Pos & pos, Value & list, int n, Value & v) static void elemAt(EvalState & state, const Pos & pos, Value & list, int n, Value & v)
{ {
state.forceList(list); state.forceList(list, pos);
if (n < 0 || n >= list.list.length) if (n < 0 || n >= list.list.length)
throw Error(format("list index %1% is out of bounds, at %2%") % n % pos); throw Error(format("list index %1% is out of bounds, at %2%") % n % pos);
state.forceValue(*list.list.elems[n]); state.forceValue(*list.list.elems[n]);
@ -970,7 +970,7 @@ static void prim_head(EvalState & state, const Pos & pos, Value * * args, Value
don't want to use it! */ don't want to use it! */
static void prim_tail(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_tail(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceList(*args[0]); state.forceList(*args[0], pos);
if (args[0]->list.length == 0) if (args[0]->list.length == 0)
throw Error(format("`tail' called on an empty list, at %1%") % pos); throw Error(format("`tail' called on an empty list, at %1%") % pos);
state.mkList(v, args[0]->list.length - 1); state.mkList(v, args[0]->list.length - 1);
@ -982,8 +982,8 @@ static void prim_tail(EvalState & state, const Pos & pos, Value * * args, Value
/* Apply a function to every element of a list. */ /* Apply a function to every element of a list. */
static void prim_map(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_map(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceFunction(*args[0]); state.forceFunction(*args[0], pos);
state.forceList(*args[1]); state.forceList(*args[1], pos);
state.mkList(v, args[1]->list.length); state.mkList(v, args[1]->list.length);
@ -998,8 +998,8 @@ static void prim_map(EvalState & state, const Pos & pos, Value * * args, Value &
returns true. */ returns true. */
static void prim_filter(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_filter(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceFunction(*args[0]); state.forceFunction(*args[0], pos);
state.forceList(*args[1]); state.forceList(*args[1], pos);
// FIXME: putting this on the stack is risky. // FIXME: putting this on the stack is risky.
Value * vs[args[1]->list.length]; Value * vs[args[1]->list.length];
@ -1028,7 +1028,7 @@ static void prim_filter(EvalState & state, const Pos & pos, Value * * args, Valu
static void prim_elem(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_elem(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
bool res = false; bool res = false;
state.forceList(*args[1]); state.forceList(*args[1], pos);
for (unsigned int n = 0; n < args[1]->list.length; ++n) for (unsigned int n = 0; n < args[1]->list.length; ++n)
if (state.eqValues(*args[0], *args[1]->list.elems[n])) { if (state.eqValues(*args[0], *args[1]->list.elems[n])) {
res = true; res = true;
@ -1041,7 +1041,7 @@ static void prim_elem(EvalState & state, const Pos & pos, Value * * args, Value
/* Concatenate a list of lists. */ /* Concatenate a list of lists. */
static void prim_concatLists(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_concatLists(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceList(*args[0]); state.forceList(*args[0], pos);
state.concatLists(v, args[0]->list.length, args[0]->list.elems); state.concatLists(v, args[0]->list.length, args[0]->list.elems);
} }
@ -1049,7 +1049,7 @@ static void prim_concatLists(EvalState & state, const Pos & pos, Value * * args,
/* Return the length of a list. This is an O(1) time operation. */ /* Return the length of a list. This is an O(1) time operation. */
static void prim_length(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_length(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceList(*args[0]); state.forceList(*args[0], pos);
mkInt(v, args[0]->list.length); mkInt(v, args[0]->list.length);
} }