Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e87242e0def2
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 743359bc8a2f
Choose a head ref
  • 6 commits
  • 4 files changed
  • 3 contributors

Commits on May 12, 2018

  1. add `mod' and bitwise builtins

    volth committed May 12, 2018
    Copy the full SHA
    8a6a14e View commit details

Commits on May 16, 2018

  1. add `mod' and bitwise builtins: remove infix functions

    volth authored May 16, 2018
    Copy the full SHA
    49b7cf1 View commit details

  2. add mod' and bitwise builtins: remove mod' and shifts

    volth authored May 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f3c090f View commit details

  3. add `mod' and bitwise builtins: camel-case function names

    volth authored May 16, 2018
    Copy the full SHA
    6cc28c0 View commit details

Commits on May 24, 2018

  1. add docs and tests

    volth committed May 24, 2018
    Copy the full SHA
    88c1ea3 View commit details

  2. Merge pull request #2157 from volth/bitwise 

    add builtins: __bitAnd,  __bitOr,  __bitXor
    @edolstra
    edolstra authored May 24, 2018
    Copy the full SHA
    743359b View commit details
Showing with 52 additions and 1 deletion.
  1. +30 −0 doc/manual/expressions/builtins.xml
  2. +17 −0 src/libexpr/primops.cc
  3. +1 −1 tests/lang/eval-okay-arithmetic.exp
  4. +4 −0 tests/lang/eval-okay-arithmetic.nix
30 changes: 30 additions & 0 deletions doc/manual/expressions/builtins.xml
View file
Original file line number Diff line number Diff line change
@@ -92,6 +92,36 @@ available as <function>builtins.derivation</function>.</para>
</varlistentry>


<varlistentry><term><function>builtins.bitAnd</function>
<replaceable>e1</replaceable> <replaceable>e2</replaceable></term>

<listitem><para>Return the bitwise AND of the integers
<replaceable>e1</replaceable> and
<replaceable>e2</replaceable>.</para></listitem>

</varlistentry>


<varlistentry><term><function>builtins.bitOr</function>
<replaceable>e1</replaceable> <replaceable>e2</replaceable></term>

<listitem><para>Return the bitwise OR of the integers
<replaceable>e1</replaceable> and
<replaceable>e2</replaceable>.</para></listitem>

</varlistentry>


<varlistentry><term><function>builtins.bitXor</function>
<replaceable>e1</replaceable> <replaceable>e2</replaceable></term>

<listitem><para>Return the bitwise XOR of the integers
<replaceable>e1</replaceable> and
<replaceable>e2</replaceable>.</para></listitem>

</varlistentry>


<varlistentry><term><varname>builtins</varname></term>

<listitem><para>The set <varname>builtins</varname> contains all
17 changes: 17 additions & 0 deletions src/libexpr/primops.cc
View file
Original file line number Diff line number Diff line change
@@ -1676,6 +1676,20 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
}
}

static void prim_bitAnd(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
mkInt(v, state.forceInt(*args[0], pos) & state.forceInt(*args[1], pos));
}

static void prim_bitOr(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
mkInt(v, state.forceInt(*args[0], pos) | state.forceInt(*args[1], pos));
}

static void prim_bitXor(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
mkInt(v, state.forceInt(*args[0], pos) ^ state.forceInt(*args[1], pos));
}

static void prim_lessThan(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
@@ -2221,6 +2235,9 @@ void EvalState::createBaseEnv()
addPrimOp("__sub", 2, prim_sub);
addPrimOp("__mul", 2, prim_mul);
addPrimOp("__div", 2, prim_div);
addPrimOp("__bitAnd", 2, prim_bitAnd);
addPrimOp("__bitOr", 2, prim_bitOr);
addPrimOp("__bitXor", 2, prim_bitXor);
addPrimOp("__lessThan", 2, prim_lessThan);

// String manipulation
2 changes: 1 addition & 1 deletion tests/lang/eval-okay-arithmetic.exp
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2188
2216
4 changes: 4 additions & 0 deletions tests/lang/eval-okay-arithmetic.nix
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,10 @@ let {
(56088 / 123 / 2)
(3 + 4 * const 5 0 - 6 / id 2)

(builtins.bitAnd 12 10) # 0b1100 & 0b1010 = 8
(builtins.bitOr 12 10) # 0b1100 | 0b1010 = 14
(builtins.bitXor 12 10) # 0b1100 ^ 0b1010 = 6

(if 3 < 7 then 1 else err)
(if 7 < 3 then err else 1)
(if 3 < 3 then err else 1)