diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-08-21 16:43:03 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-08-21 16:43:03 +0200 |
| commit | ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9 (patch) | |
| tree | 222b68e94768df505415a004a3e1633cc749c8f6 /erts/preloaded | |
| parent | a499a783bd7edbba856e61e490137dea4dab67e3 (diff) | |
| parent | ed5a0b9cdf6a7e87cec1a50c6e9adb29698ce8d9 (diff) | |
| download | otp-ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9.tar.gz otp-ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9.tar.bz2 otp-ae9c3f7b755d5ebf4e65146d81d04c2d48b4d9c9.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 97732 -> 97908 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 11 |
2 files changed, 10 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex fdc7401475..3bf5f42a43 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index d646bc19a5..7903901b81 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -91,7 +91,7 @@ -export([external_size/2, finish_after_on_load/2, finish_loading/1, float/1]). -export([float_to_binary/1, float_to_binary/2, float_to_list/1, float_to_list/2]). --export([fun_info/2, fun_to_list/1, function_exported/3]). +-export([fun_info/2, fun_info_mfa/1, fun_to_list/1, function_exported/3]). -export([garbage_collect/0, garbage_collect/1, garbage_collect/2]). -export([garbage_collect_message_area/0, get/0, get/1, get_keys/1]). -export([get_module_info/1, get_stacktrace/0, group_leader/0]). @@ -827,6 +827,15 @@ float_to_list(_Float, _Options) -> fun_info(_Fun, _Item) -> erlang:nif_error(undefined). +%% fun_info_mfa/1 +-spec erlang:fun_info_mfa(Fun) -> {Mod, Name, Arity} when + Fun :: function(), + Mod :: atom(), + Name :: atom(), + Arity :: non_neg_integer(). +fun_info_mfa(_Fun) -> + erlang:nif_error(undefined). + %% fun_to_list/1 -spec erlang:fun_to_list(Fun) -> string() when Fun :: function(). |