diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-04 18:51:36 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-04 19:08:52 +0100 |
| commit | 1670e9d90acaea7ecba79a5f1cacfd54a7c6d87d (patch) | |
| tree | 814380281cd380f4c1a7cf51cbcac76ce95452ac /erts/emulator/beam/atom.names | |
| parent | c4fd58a394f427edf54fae75288c3b9159f9cc1a (diff) | |
| parent | 8067992954f9b882ffd7332ee669a254c000f1b2 (diff) | |
| download | otp-1670e9d90acaea7ecba79a5f1cacfd54a7c6d87d.tar.gz otp-1670e9d90acaea7ecba79a5f1cacfd54a7c6d87d.tar.bz2 otp-1670e9d90acaea7ecba79a5f1cacfd54a7c6d87d.zip | |
Merge branch 'sverk/binary_split_bif'
OTP-13082
* sverk/binary_split_bif:
erts: Minor refactor for binary find BIF backend
erts: Refactor BIF for binary:match,matches,split
erts: Refactor backend of binary:split
erts: Replace 0 with THE_NON_VALUE
stdlib: Add BIF option 'trim_all' to binary:split/3
stdlib: Add BIF binary:split/2 and binary:split/3
Conflicts:
bootstrap/lib/stdlib/ebin/binary.beam
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 3ad428e368..967cf013f0 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -117,10 +117,9 @@ atom bif_timer_server atom binary atom binary_bin_to_list_trap atom binary_copy_trap +atom binary_find_trap atom binary_longest_prefix_trap atom binary_longest_suffix_trap -atom binary_match_trap -atom binary_matches_trap atom binary_to_list_continue atom binary_to_term_trap atom block @@ -578,6 +577,8 @@ atom trace trace_ts traced atom trace_control_word atom tracer atom trap_exit +atom trim +atom trim_all atom try_clause atom true atom tuple |