diff options
| author | Henrik Nord <[email protected]> | 2011-10-18 16:20:28 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-10-18 16:20:28 +0200 |
| commit | 02ec67177b2f5d2de371362e5bb3c9b9771fb0b8 (patch) | |
| tree | 1a7e5332778088276b289afc5a560062bec6972f /erts/emulator/test/nif_SUITE_data | |
| parent | 852827dab8fa74167f9a000998304e3961010797 (diff) | |
| parent | 8db78b0c92a26e2a7766f8ece2f0ed7abb5db791 (diff) | |
| download | otp-02ec67177b2f5d2de371362e5bb3c9b9771fb0b8.tar.gz otp-02ec67177b2f5d2de371362e5bb3c9b9771fb0b8.tar.bz2 otp-02ec67177b2f5d2de371362e5bb3c9b9771fb0b8.zip | |
Merge branch 'fm/enif_is_number'
* fm/enif_is_number:
Add NIF function enif_is_number
Conflicts:
erts/emulator/beam/erl_nif_api_funcs.h
OTP-9629
Diffstat (limited to 'erts/emulator/test/nif_SUITE_data')
| -rw-r--r-- | erts/emulator/test/nif_SUITE_data/nif_SUITE.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c index cf2ec4aaf0..35f54d62c5 100644 --- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c +++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c @@ -832,6 +832,7 @@ static ERL_NIF_TERM release_resource(ErlNifEnv* env, int argc, const ERL_NIF_TER * argv[7] an empty list * argv[8] a non-empty list * argv[9] a tuple + * argv[10] a number (small, big integer or float) */ static ERL_NIF_TERM check_is(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { @@ -848,6 +849,7 @@ static ERL_NIF_TERM check_is(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[] if (!enif_is_list(env, argv[7])) return enif_make_badarg(env); if (!enif_is_list(env, argv[8])) return enif_make_badarg(env); if (!enif_is_tuple(env, argv[9])) return enif_make_badarg(env); + if (!enif_is_number(env, argv[10])) return enif_make_badarg(env); return ok_atom; } @@ -1455,7 +1457,7 @@ static ErlNifFunc nif_funcs[] = {"release_resource", 1, release_resource}, {"last_resource_dtor_call", 0, last_resource_dtor_call}, {"make_new_resource", 2, make_new_resource}, - {"check_is", 10, check_is}, + {"check_is", 11, check_is}, {"check_is_exception", 0, check_is_exception}, {"length_test", 5, length_test}, {"make_atoms", 0, make_atoms}, |