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

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

Browse source
This commit is contained in:
volth 2018-05-16 06:57:11 +00:00 committed by GitHub
parent 49b7cf1813
commit f3c090f91c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/libexpr/primops.cc
View file

@ -1676,23 +1676,6 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
} }
} }
static void prim_mod(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
NixFloat f2 = state.forceFloat(*args[1], pos);
if (f2 == 0) throw EvalError(format("division by zero, at %1%") % pos);
if (args[0]->type == tFloat || args[1]->type == tFloat) {
mkFloat(v, state.forceFloat(*args[0], pos) % state.forceFloat(*args[1], pos));
} else {
NixInt i1 = state.forceInt(*args[0], pos);
NixInt i2 = state.forceInt(*args[1], pos);
/* Avoid division overflow as it might raise SIGFPE. */
if (i1 == std::numeric_limits<NixInt>::min() && i2 == -1)
throw EvalError(format("overflow in integer division, at %1%") % pos);
mkInt(v, i1 % i2);
}
}
static void prim_bin_and(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_bin_and(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
mkInt(v, state.forceInt(*args[0], pos) & state.forceInt(*args[1], pos)); mkInt(v, state.forceInt(*args[0], pos) & state.forceInt(*args[1], pos));
@ -1708,21 +1691,6 @@ static void prim_bin_xor(EvalState & state, const Pos & pos, Value * * args, Val
mkInt(v, state.forceInt(*args[0], pos) ^ state.forceInt(*args[1], pos)); mkInt(v, state.forceInt(*args[0], pos) ^ state.forceInt(*args[1], pos));
} }
static void prim_bin_shl(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
mkInt(v, state.forceInt(*args[0], pos) << (state.forceInt(*args[1], pos) & 63));
}
static void prim_bin_unsigned_shr(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
mkInt(v, (unsigned long)state.forceInt(*args[0], pos) >> (state.forceInt(*args[1], pos) & 63));
}
static void prim_bin_signed_shr(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
mkInt(v, (signed long)state.forceInt(*args[0], pos) >> (state.forceInt(*args[1], pos) & 63));
}
static void prim_lessThan(EvalState & state, const Pos & pos, Value * * args, Value & v) static void prim_lessThan(EvalState & state, const Pos & pos, Value * * args, Value & v)
{ {
state.forceValue(*args[0]); state.forceValue(*args[0]);
@ -2267,13 +2235,9 @@ void EvalState::createBaseEnv()
addPrimOp("__sub", 2, prim_sub); addPrimOp("__sub", 2, prim_sub);
addPrimOp("__mul", 2, prim_mul); addPrimOp("__mul", 2, prim_mul);
addPrimOp("__div", 2, prim_div); addPrimOp("__div", 2, prim_div);
addPrimOp("__mod", 2, prim_mod);
addPrimOp("__bin_and", 2, prim_bin_and); addPrimOp("__bin_and", 2, prim_bin_and);
addPrimOp("__bin_or", 2, prim_bin_or); addPrimOp("__bin_or", 2, prim_bin_or);
addPrimOp("__bin_xor", 2, prim_bin_xor); addPrimOp("__bin_xor", 2, prim_bin_xor);
addPrimOp("__bin_shl", 2, prim_bin_shl);
addPrimOp("__bin_unsigned_shr", 2, prim_bin_unsigned_shr);
addPrimOp("__bin_signed_shr", 2, prim_bin_signed_shr);
addPrimOp("__lessThan", 2, prim_lessThan); addPrimOp("__lessThan", 2, prim_lessThan);
// String manipulation // String manipulation