piegames/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix filterSource

Browse source
This commit is contained in:
Eelco Dolstra 2017-10-31 16:14:25 +01:00
parent 72cd52c3cd
commit cd532a9251
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/libexpr/primops.cc
View file

@ -1009,22 +1009,21 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
} }
struct FilterFromExpr : PathFilter static void prim_filterSource(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
EvalState & state; PathSet context;
Value & filter; Path path = state.coerceToPath(pos, *args[1], context);
Pos pos; if (!context.empty())
throw EvalError(format("string '%1%' cannot refer to other paths, at %2%") % path % pos);
FilterFromExpr(EvalState & state, Value & filter, const Pos & pos) state.forceValue(*args[0]);
: state(state), filter(filter), pos(pos) if (args[0]->type != tLambda)
{ throw TypeError(format("first argument in call to 'filterSource' is not a function but %1%, at %2%") % showType(*args[0]) % pos);
}
bool operator () (const Path & path) path = state.checkSourcePath(path);
{
struct stat st; PathFilter filter = [&](const Path & path) {
if (lstat(path.c_str(), &st)) auto st = lstat(path);
throw SysError(format("getting attributes of path '%1%'") % path);
/* Call the filter function. The first argument is the path, /* Call the filter function. The first argument is the path,
the second is a string indicating the type of the file. */ the second is a string indicating the type of the file. */
@ -1032,7 +1031,7 @@ struct FilterFromExpr : PathFilter
mkString(arg1, path); mkString(arg1, path);
Value fun2; Value fun2;
state.callFunction(filter, arg1, fun2, noPos); state.callFunction(*args[0], arg1, fun2, noPos);
Value arg2; Value arg2;
mkString(arg2, mkString(arg2,
@ -1045,25 +1044,8 @@ struct FilterFromExpr : PathFilter
state.callFunction(fun2, arg2, res, noPos); state.callFunction(fun2, arg2, res, noPos);
return state.forceBool(res, pos); return state.forceBool(res, pos);
}
}; };
static void prim_filterSource(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
PathSet context;
Path path = state.coerceToPath(pos, *args[1], context);
if (!context.empty())
throw EvalError(format("string '%1%' cannot refer to other paths, at %2%") % path % pos);
state.forceValue(*args[0]);
if (args[0]->type != tLambda)
throw TypeError(format("first argument in call to 'filterSource' is not a function but %1%, at %2%") % showType(*args[0]) % pos);
FilterFromExpr filter(state, *args[0], pos);
path = state.checkSourcePath(path);
Path dstPath = settings.readOnlyMode Path dstPath = settings.readOnlyMode
? state.store->computeStorePathForPath(path, true, htSHA256, filter).first ? state.store->computeStorePathForPath(path, true, htSHA256, filter).first
: state.store->addToStore(baseNameOf(path), path, true, htSHA256, filter, state.repair); : state.store->addToStore(baseNameOf(path), path, true, htSHA256, filter, state.repair);