lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* dirOf: return a path if the argument is a path.

Browse source
This commit is contained in:
Eelco Dolstra 2006-10-17 11:05:34 +00:00
parent cf705eaf78
commit cba913c521
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/primops.cc
View file

@ -316,11 +316,15 @@ static Expr primBaseNameOf(EvalState & state, const ATermVector & args)
/* Return the directory of the given path, i.e., everything before the /* Return the directory of the given path, i.e., everything before the
last slash. */ last slash. Return either a path or a string depending on the type
of the argument. */
static Expr primDirOf(EvalState & state, const ATermVector & args) static Expr primDirOf(EvalState & state, const ATermVector & args)
{ {
PathSet context; PathSet context;
return makeStr(dirOf(coerceToPath(state, args[0], context)), context); Expr e = evalExpr(state, args[0]); ATerm dummy;
bool isPath = matchPath(e, dummy);
Path dir = dirOf(coerceToPath(state, e, context));
return isPath ? makePath(toATerm(dir)) : makeStr(dir, context);
} }