aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.tab
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/emulator/beam/bif.tab
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/emulator/beam/bif.tab')
-rw-r--r--erts/emulator/beam/bif.tab11
1 files changed, 9 insertions, 2 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index e68b8e6274..55ac778475 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -578,7 +578,7 @@ bif io:printable_range/0
bif os:unsetenv/1
#
-# New in R17A
+# New in 17.0
#
bif re:inspect/2
@@ -601,9 +601,16 @@ bif maps:values/1
bif erts_internal:cmp_term/2
#
-# New in 17.1.
+# New in 17.1
#
+
bif erlang:fun_info_mfa/1
+
+# New in 18.0
+#
+
+bif erlang:get_keys/0
+
#
# Obsolete
#