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 /erts/emulator/beam/bif.tab | |
| 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 'erts/emulator/beam/bif.tab')
| -rw-r--r-- | erts/emulator/beam/bif.tab | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index e313188901..b74dc5c3fe 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -561,6 +561,13 @@ bif erlang:prepare_loading/2 bif erlang:finish_loading/1 bif erlang:insert_element/3 bif erlang:delete_element/2 +bif erlang:binary_to_integer/1 +bif erlang:binary_to_integer/2 +bif erlang:integer_to_binary/1 +bif erlang:list_to_integer/2 +bif erlang:float_to_binary/1 +bif erlang:float_to_binary/2 +bif erlang:binary_to_float/1 # # Obsolete |