diff options
| author | Lukas Larsson <[email protected]> | 2013-02-14 15:44:39 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-02-14 15:44:39 +0100 |
| commit | 67eca074f81f00724125c3c868201ee7df3cf842 (patch) | |
| tree | 672b44c68bfad998ff3d4f6f82d9b56dc91b8a77 /lib/stdlib | |
| parent | 15a41e9ef18f093b5ed46c4b9bece3c71eabe30f (diff) | |
| parent | 2f3526bb1c4c915a8528cd7d36c3a5b793e0ca3f (diff) | |
| download | otp-67eca074f81f00724125c3c868201ee7df3cf842.tar.gz otp-67eca074f81f00724125c3c868201ee7df3cf842.tar.bz2 otp-67eca074f81f00724125c3c868201ee7df3cf842.zip | |
Merge branch 'lukas/erts/binary_conv_bifs/OTP-10300'
* lukas/erts/binary_conv_bifs/OTP-10300:
erts: Remove ?line macro from hash_SUITE
Add float_to_binary and binary_to_float
Add new binary conversion bifs
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/erl_internal.erl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl index 254384e877..378e629ac9 100644 --- a/lib/stdlib/src/erl_internal.erl +++ b/lib/stdlib/src/erl_internal.erl @@ -254,6 +254,9 @@ bif(binary_part, 2) -> true; bif(binary_part, 3) -> true; bif(binary_to_atom, 2) -> true; bif(binary_to_existing_atom, 2) -> true; +bif(binary_to_integer, 1) -> true; +bif(binary_to_integer, 2) -> true; +bif(binary_to_float, 1) -> true; bif(binary_to_list, 1) -> true; bif(binary_to_list, 3) -> true; bif(binary_to_term, 1) -> true; @@ -279,6 +282,8 @@ bif(exit, 2) -> true; bif(float, 1) -> true; bif(float_to_list, 1) -> true; bif(float_to_list, 2) -> true; +bif(float_to_binary, 1) -> true; +bif(float_to_binary, 2) -> true; bif(garbage_collect, 0) -> true; bif(garbage_collect, 1) -> true; bif(get, 0) -> true; @@ -290,6 +295,8 @@ bif(halt, 0) -> true; bif(halt, 1) -> true; bif(halt, 2) -> true; bif(hd, 1) -> true; +bif(integer_to_binary, 1) -> true; +bif(integer_to_binary, 2) -> true; bif(integer_to_list, 1) -> true; bif(integer_to_list, 2) -> true; bif(iolist_size, 1) -> true; |