diff options
author | Patrik Nyblom <[email protected]> | 2010-09-10 14:37:02 +0200 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2010-09-10 14:37:02 +0200 |
commit | 6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02 (patch) | |
tree | 07492ef6b7f98ef05ecc47518038980173996480 /lib/stdlib/src/erl_internal.erl | |
parent | bf276aef756681bd2ccb31aff54b646ff6a68d73 (diff) | |
parent | 19a3f0c5bab37ba261abbca6c0253c1e3cb4d3ac (diff) | |
download | otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.gz otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.bz2 otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.zip |
Merge branch 'pan/added-autoimports/OTP-8763' into dev
* pan/added-autoimports/OTP-8763:
Remove warnings for clashes with new autoimported BIFs
Add testcase for autoimport and the erlang.xml doc consistency
Correct erlang.xml regarding autoimports
Add new autoimports for R14B
Diffstat (limited to 'lib/stdlib/src/erl_internal.erl')
-rw-r--r-- | lib/stdlib/src/erl_internal.erl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl index bf6e5bc5ca..b30b02a96f 100644 --- a/lib/stdlib/src/erl_internal.erl +++ b/lib/stdlib/src/erl_internal.erl @@ -247,10 +247,14 @@ bif(check_process_code, 2) -> true; bif(concat_binary, 1) -> true; bif(date, 0) -> true; bif(delete_module, 1) -> true; +bif(demonitor, 1) -> true; +bif(demonitor, 2) -> true; bif(disconnect_node, 1) -> true; bif(element, 2) -> true; bif(erase, 0) -> true; bif(erase, 1) -> true; +bif(error, 1) -> true; +bif(error, 2) -> true; bif(exit, 1) -> true; bif(exit, 2) -> true; bif(float, 1) -> true; @@ -266,6 +270,7 @@ bif(halt, 0) -> true; bif(halt, 1) -> true; bif(hd, 1) -> true; bif(integer_to_list, 1) -> true; +bif(integer_to_list, 2) -> true; bif(iolist_size, 1) -> true; bif(iolist_to_binary, 1) -> true; bif(is_alive, 0) -> true; @@ -295,6 +300,7 @@ bif(list_to_bitstring, 1) -> true; bif(list_to_existing_atom, 1) -> true; bif(list_to_float, 1) -> true; bif(list_to_integer, 1) -> true; +bif(list_to_integer, 2) -> true; bif(list_to_pid, 1) -> true; bif(list_to_tuple, 1) -> true; bif(load_module, 2) -> true; @@ -302,6 +308,8 @@ bif(make_ref, 0) -> true; bif(max,2) -> true; bif(min,2) -> true; bif(module_loaded, 1) -> true; +bif(monitor, 2) -> true; +bif(monitor, 3) -> true; bif(monitor_node, 2) -> true; bif(node, 0) -> true; bif(node, 1) -> true; |