diff options
author | Björn Gustavsson <[email protected]> | 2016-05-13 06:55:09 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2016-05-13 10:52:26 +0200 |
commit | c4336b7ba8e39589f395f2bc86089a34b81d3cb7 (patch) | |
tree | 6b646fa95c54edd098f0e9717ceeaff247ede0aa | |
parent | 94feb3f8f9c5e7b67ee06c84ea68932bbebc12e6 (diff) | |
download | otp-c4336b7ba8e39589f395f2bc86089a34b81d3cb7.tar.gz otp-c4336b7ba8e39589f395f2bc86089a34b81d3cb7.tar.bz2 otp-c4336b7ba8e39589f395f2bc86089a34b81d3cb7.zip |
beam_utils: Correct break in conventions for split_even/1 and join_even/1
Exported functions in this file should appear at the top of the file.
Also add missing spaces after commas.
-rw-r--r-- | lib/compiler/src/beam_utils.erl | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl index eed30ad6b7..47703b4aa3 100644 --- a/lib/compiler/src/beam_utils.erl +++ b/lib/compiler/src/beam_utils.erl @@ -25,9 +25,8 @@ is_not_used/3,is_not_used_at/3, empty_label_index/0,index_label/3,index_labels/1, code_at/2,bif_to_test/3,is_pure_test/1, - live_opt/1,delete_live_annos/1,combine_heap_needs/2]). - --export([join_even/2,split_even/1]). + live_opt/1,delete_live_annos/1,combine_heap_needs/2, + join_even/2,split_even/1]). -import(lists, [member/2,sort/1,reverse/1,splitwith/2]). @@ -228,6 +227,17 @@ combine_heap_needs(Words, {alloc,Alloc}) when is_integer(Words) -> combine_heap_needs(H1, H2) when is_integer(H1), is_integer(H2) -> H1+H2. +%% split_even/1 +%% [1,2,3,4,5,6] -> {[1,3,5],[2,4,6]} + +split_even(Rs) -> split_even(Rs, [], []). + +%% join_even/1 +%% {[1,3,5],[2,4,6]} -> [1,2,3,4,5,6] + +join_even([], []) -> []; +join_even([S|Ss], [D|Ds]) -> [S,D|join_even(Ss, Ds)]. + %%% %%% Local functions. %%% @@ -838,14 +848,7 @@ x_live([], Regs) -> Regs. is_live(X, Regs) -> ((Regs bsr X) band 1) =:= 1. -%% split_even/1 -%% [1,2,3,4,5,6] -> {[1,3,5],[2,4,6]} -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]). - -%% join_even/1 -%% {[1,3,5],[2,4,6]} -> [1,2,3,4,5,6] -join_even([],[]) -> []; -join_even([S|Ss],[D|Ds]) -> [S,D|join_even(Ss,Ds)]. +split_even([], Ss, Ds) -> + {reverse(Ss),reverse(Ds)}; +split_even([S,D|Rs], Ss, Ds) -> + split_even(Rs, [S|Ss], [D|Ds]). |