hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed the variadic field from the moo_pfinfo_t structure.

Browse Source 
defined variadic Integer>>bitAnd, Integer>>bitOr, Integer>>bitXor methods
This commit is contained in:
hyunghwan.chung
2019-10-28 12:55:32 +00:00
parent 5004b39125
commit 044177fa61
11 changed files with 94 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
moo/lib/exec.c
View File

@ -3747,8 +3747,9 @@ static moo_pfrc_t pf_integer_bitat (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
static moo_pfrc_t pf_integer_bitand (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
{
moo_oop_t rcv, arg, res;
moo_oow_t i;
MOO_ASSERT (moo, nargs == 1);
MOO_ASSERT (moo, nargs >= 1);
rcv = MOO_STACK_GETRCV(moo, nargs);
arg = MOO_STACK_GETARG(moo, nargs, 0);
@ -3756,6 +3757,13 @@ static moo_pfrc_t pf_integer_bitand (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs
res = moo_bitandints(moo, rcv, arg);
if (!res) return (moo->errnum == MOO_EINVAL? MOO_PF_FAILURE: MOO_PF_HARD_FAILURE);
for (i = 1; i < nargs; i++)
{
arg = MOO_STACK_GETARG(moo, nargs, i);
res = moo_bitandints(moo, res, arg);
if (!res) return (moo->errnum == MOO_EINVAL? MOO_PF_FAILURE: MOO_PF_HARD_FAILURE);
}
MOO_STACK_SETRET (moo, nargs, res);
return MOO_PF_SUCCESS;
}
@ -3763,8 +3771,9 @@ static moo_pfrc_t pf_integer_bitand (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs
static moo_pfrc_t pf_integer_bitor (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
{
moo_oop_t rcv, arg, res;
moo_oow_t i;
MOO_ASSERT (moo, nargs == 1);
MOO_ASSERT (moo, nargs >= 1);
rcv = MOO_STACK_GETRCV(moo, nargs);
arg = MOO_STACK_GETARG(moo, nargs, 0);
@ -3772,6 +3781,13 @@ static moo_pfrc_t pf_integer_bitor (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
res = moo_bitorints(moo, rcv, arg);
if (!res) return (moo->errnum == MOO_EINVAL? MOO_PF_FAILURE: MOO_PF_HARD_FAILURE);
for (i = 1; i < nargs; i++)
{
arg = MOO_STACK_GETARG(moo, nargs, i);
res = moo_bitorints(moo, res, arg);
if (!res) return (moo->errnum == MOO_EINVAL? MOO_PF_FAILURE: MOO_PF_HARD_FAILURE);
}
MOO_STACK_SETRET (moo, nargs, res);
return MOO_PF_SUCCESS;
}
@ -3779,8 +3795,9 @@ static moo_pfrc_t pf_integer_bitor (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
static moo_pfrc_t pf_integer_bitxor (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
{
moo_oop_t rcv, arg, res;
moo_oow_t i;
MOO_ASSERT (moo, nargs == 1);
MOO_ASSERT (moo, nargs >= 1);
rcv = MOO_STACK_GETRCV(moo, nargs);
arg = MOO_STACK_GETARG(moo, nargs, 0);
@ -3788,6 +3805,13 @@ static moo_pfrc_t pf_integer_bitxor (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs
res = moo_bitxorints(moo, rcv, arg);
if (!res) return (moo->errnum == MOO_EINVAL? MOO_PF_FAILURE: MOO_PF_HARD_FAILURE);
for (i = 1; i < nargs; i++)
{
arg = MOO_STACK_GETARG(moo, nargs, i);
res = moo_bitxorints(moo, res, arg);
if (!res) return (moo->errnum == MOO_EINVAL? MOO_PF_FAILURE: MOO_PF_HARD_FAILURE);
}
MOO_STACK_SETRET (moo, nargs, res);
return MOO_PF_SUCCESS;
}
@ -4366,12 +4390,12 @@ static pf_t pftab[] =
{ "FixedPointDecimal_scale:", { pf_number_scale, 1, 1 } },
{ "Integer_add", { pf_integer_add, 1, 1 } },
{ "Integer_bitand", { pf_integer_bitand, 1, 1 } },
{ "Integer_bitand", { pf_integer_bitand, 1, MA } },
{ "Integer_bitat", { pf_integer_bitat, 1, 1 } },
{ "Integer_bitinv", { pf_integer_bitinv, 0, 0 } },
{ "Integer_bitor", { pf_integer_bitor, 1, 1 } },
{ "Integer_bitor", { pf_integer_bitor, 1, MA } },
{ "Integer_bitshift", { pf_integer_bitshift, 1, 1 } },
{ "Integer_bitxor", { pf_integer_bitxor, 1, 1 } },
{ "Integer_bitxor", { pf_integer_bitxor, 1, MA } },
{ "Integer_div", { pf_integer_div, 1, 1 } },
{ "Integer_eq", { pf_integer_eq, 1, 1 } },
{ "Integer_ge", { pf_integer_ge, 1, 1 } },