mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1828 from zimbatm/isPath

Browse source 
Add isPath primop
This commit is contained in:
Eelco Dolstra 2019-03-25 19:58:11 +01:00 committed by GitHub
commit 5c05c238e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/manual/expressions/builtins.xml
View file

@ -861,6 +861,14 @@ x: x + 456</programlisting>
</varlistentry> </varlistentry>
<varlistentry><term><function>builtins.isPath</function>
<replaceable>e</replaceable></term>
<listitem><para>Return <literal>true</literal> if
<replaceable>e</replaceable> evaluates to a path, and
<literal>false</literal> otherwise.</para></listitem>
</varlistentry>
<varlistentry xml:id='builtin-isNull'> <varlistentry xml:id='builtin-isNull'>
<term><function>isNull</function> <term><function>isNull</function>

7
src/libexpr/primops.cc
View file

@ -315,6 +315,12 @@ static void prim_isBool(EvalState & state, const Pos & pos, Value * * args, Valu
mkBool(v, args[0]->type == tBool); mkBool(v, args[0]->type == tBool);
} }
/* Determine whether the argument is a path. */
static void prim_isPath(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
state.forceValue(*args[0]);
mkBool(v, args[0]->type == tPath);
}
struct CompareValues struct CompareValues
{ {
@ -2169,6 +2175,7 @@ void EvalState::createBaseEnv()
addPrimOp("__isInt", 1, prim_isInt); addPrimOp("__isInt", 1, prim_isInt);
addPrimOp("__isFloat", 1, prim_isFloat); addPrimOp("__isFloat", 1, prim_isFloat);
addPrimOp("__isBool", 1, prim_isBool); addPrimOp("__isBool", 1, prim_isBool);
addPrimOp("__isPath", 1, prim_isPath);
addPrimOp("__genericClosure", 1, prim_genericClosure); addPrimOp("__genericClosure", 1, prim_genericClosure);
addPrimOp("abort", 1, prim_abort); addPrimOp("abort", 1, prim_abort);
addPrimOp("__addErrorContext", 2, prim_addErrorContext); addPrimOp("__addErrorContext", 2, prim_addErrorContext);

2
tests/lang/eval-okay-types.nix
View file

@ -20,6 +20,8 @@ with builtins;
(isFloat (1 - 2.0)) (isFloat (1 - 2.0))
(isBool (true && false)) (isBool (true && false))
(isBool null) (isBool null)
(isPath /nix/store)
(isPath ./.)
(isAttrs { x = 123; }) (isAttrs { x = 123; })
(isAttrs null) (isAttrs null)
(typeOf (3 * 4)) (typeOf (3 * 4))