diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-01-23 15:31:45 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-01-23 15:31:45 +0100 |
| commit | 251b52eee5a36dcefc30a83c9b37ca62eedc2e71 (patch) | |
| tree | 50c29463e2ac9388be188c9987dba3710ef79b9e /lib/compiler/src/beam_utils.erl | |
| parent | 75204f98d1464c05a5b5e756a43663ad5b8b640b (diff) | |
| parent | 13696ffaaf6440c3f1e28f740679d096ddd87c17 (diff) | |
| download | otp-251b52eee5a36dcefc30a83c9b37ca62eedc2e71.tar.gz otp-251b52eee5a36dcefc30a83c9b37ca62eedc2e71.tar.bz2 otp-251b52eee5a36dcefc30a83c9b37ca62eedc2e71.zip | |
Merge branch 'egil/fix-maps-compiler-coverage/OTP-12425'
* egil/fix-maps-compiler-coverage/OTP-12425:
compiler: Rename util function to adhere to name policy
compiler: Remove get_map_elements label check in blocks
compiler: Remove unnecassary guard for get_map_elements
compiler: Remove dead code in beam_flatten
compiler: Increase Maps code coverage
Diffstat (limited to 'lib/compiler/src/beam_utils.erl')
| -rw-r--r-- | lib/compiler/src/beam_utils.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl index 84a2b782e9..26020e1d29 100644 --- a/lib/compiler/src/beam_utils.erl +++ b/lib/compiler/src/beam_utils.erl @@ -26,7 +26,7 @@ code_at/2,bif_to_test/3,is_pure_test/1, live_opt/1,delete_live_annos/1,combine_heap_needs/2]). --export([joineven/2,spliteven/1]). +-export([join_even/2,split_even/1]). -import(lists, [member/2,sort/1,reverse/1,splitwith/2]). @@ -831,14 +831,14 @@ x_live([], Regs) -> Regs. is_live(X, Regs) -> ((Regs bsr X) band 1) =:= 1. -%% spliteven/1 +%% split_even/1 %% [1,2,3,4,5,6] -> {[1,3,5],[2,4,6]} -spliteven(Rs) -> spliteven(Rs,[],[]). -spliteven([],Ss,Ds) -> {reverse(Ss),reverse(Ds)}; -spliteven([S,D|Rs],Ss,Ds) -> - spliteven(Rs,[S|Ss],[D|Ds]). +split_even(Rs) -> split_even(Rs,[],[]). +split_even([],Ss,Ds) -> {reverse(Ss),reverse(Ds)}; +split_even([S,D|Rs],Ss,Ds) -> + split_even(Rs,[S|Ss],[D|Ds]). -%% joineven/1 +%% join_even/1 %% {[1,3,5],[2,4,6]} -> [1,2,3,4,5,6] -joineven([],[]) -> []; -joineven([S|Ss],[D|Ds]) -> [S,D|joineven(Ss,Ds)]. +join_even([],[]) -> []; +join_even([S|Ss],[D|Ds]) -> [S,D|join_even(Ss,Ds)]. |