aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/erlang.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-09-09 14:42:33 +0200
committerBjörn-Egil Dahlberg <[email protected]>2014-09-09 14:42:33 +0200
commite3590a3f87f02022eb6e608ae5c3fc93bcd025d0 (patch)
treeaa06ccfe946f277729add7ac4227fd9184823805 /erts/preloaded/src/erlang.erl
parent88c54fc500096d326a87414af1e936890655024f (diff)
parent6ec6493dcca2724493700e7d269d2984efe30b38 (diff)
downloadotp-e3590a3f87f02022eb6e608ae5c3fc93bcd025d0.tar.gz
otp-e3590a3f87f02022eb6e608ae5c3fc93bcd025d0.tar.bz2
otp-e3590a3f87f02022eb6e608ae5c3fc93bcd025d0.zip
Merge branch 'egil/erlang-get_keys/OTP-12151'
* egil/erlang-get_keys/OTP-12151: Update preloaded erlang.beam erts: Document erlang:get_keys/0 stdlib: Auto-import erlang:get_keys/0 erts: Add spec for erlang:get_keys/0 kernel: Test BIF erlang:get_keys/0 erts: Add BIF erlang:get_keys/0
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
-rw-r--r--erts/preloaded/src/erlang.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 7903901b81..b96a601792 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -93,7 +93,7 @@
float_to_list/1, float_to_list/2]).
-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([garbage_collect_message_area/0, get/0, get/1, get_keys/0, get_keys/1]).
-export([get_module_info/1, get_stacktrace/0, group_leader/0]).
-export([group_leader/2, halt/0, halt/1, halt/2, hash/2, hibernate/3]).
-export([insert_element/3]).
@@ -931,6 +931,12 @@ get() ->
get(_Key) ->
erlang:nif_error(undefined).
+%% get_keys/0
+-spec get_keys() -> [Key] when
+ Key :: term().
+get_keys() ->
+ erlang:nif_error(undefined).
+
%% get_keys/1
-spec get_keys(Val) -> [Key] when
Val :: term(),