maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

isFunctor: Simplify

Browse source
This commit is contained in:
Eelco Dolstra 2015-10-08 13:22:11 +02:00
parent 8a87521636
commit 51cf4455b2
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,15 +78,4 @@ inline void EvalState::forceList(Value & v, const Pos & pos)
throwTypeError("value is %1% while a list was expected, at %2%", v, pos); throwTypeError("value is %1% while a list was expected, at %2%", v, pos);
} }
inline bool EvalState::isFunctor(Value& fun)
{
if (fun.type == tAttrs) {
auto found = fun.attrs->find(sFunctor);
if (found != fun.attrs->end()) {
return true;
}
}
return false;
}
} }

6
src/libexpr/eval.cc
View file

@ -1291,6 +1291,12 @@ bool EvalState::forceBool(Value & v)
} }
bool EvalState::isFunctor(Value & fun)
{
return fun.type == tAttrs && fun.attrs->find(sFunctor) != fun.attrs->end();
}
void EvalState::forceFunction(Value & v, const Pos & pos) void EvalState::forceFunction(Value & v, const Pos & pos)
{ {
forceValue(v); forceValue(v);