Skip to content

No longer wrap expression in binary as Erlang/OTP 20+ does it by default #8530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josevalim merged 2 commits into from
Dec 16, 2018
Merged

No longer wrap expression in binary as Erlang/OTP 20+ does it by default #8530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a29330f
No longer wrap expression in binary as Erlang/OTP 20+ does it by default
Dec 16, 2018
72729ec
fixup!
Dec 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions lib/elixir/src/elixir_erl_for.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ translate(Meta, Args, Return, S) ->
{TExpr, SE} = elixir_erl_pass:translate(wrap_expr(Expr, TInto), SC),
SF = elixir_erl_var:mergec(SI, SE),

case comprehension_expr(TInto, TExpr) of
{inline, TIntoExpr} ->
build_inline(Ann, TCases, TIntoExpr, TInto, TUniq, SF);
{into, TIntoExpr} ->
build_into(Ann, TCases, TIntoExpr, TInto, TUniq, SF)
case inline_or_into(TInto) of
inline -> build_inline(Ann, TCases, TExpr, TInto, TUniq, SF);
into -> build_into(Ann, TCases, TExpr, TInto, TUniq, SF)
end.

%% In case we have no return, we wrap the expression
Expand Down Expand Up @@ -88,7 +86,6 @@ collect_filters([H | T], Acc) ->
collect_filters([], Acc) ->
{Acc, []}.


build_inline(Ann, Clauses, Expr, Into, Uniq, S) ->
case not Uniq and lists:all(fun(Clause) -> element(1, Clause) == bin end, Clauses) of
true -> {build_comprehension(Ann, Clauses, Expr, Into), S};
Expand Down Expand Up @@ -294,8 +291,6 @@ no_var_expr(Ann, _) -> [{var, Ann, '_'}].
no_var_size({var, _, _}) -> throw(unbound_size);
no_var_size(Size) -> Size.

build_comprehension(Ann, Clauses, Expr, false) ->
{lc, Ann, Expr, comprehension_clause(Clauses)};
build_comprehension(Ann, Clauses, Expr, Into) ->
{comprehension_kind(Into), Ann, Expr, comprehension_clause(Clauses)}.

Expand All @@ -307,23 +302,17 @@ comprehension_clause([{Kind, Meta, Left, Right, Filters} | T]) ->
comprehension_clause([]) ->
[].

comprehension_kind(false) -> lc;
comprehension_kind({nil, _}) -> lc;
comprehension_kind({bin, _, []}) -> bc.

comprehension_generator(enum) -> generate;
comprehension_generator(bin) -> b_generate.

comprehension_expr({bin, _, []}, {bin, _, _} = Expr) ->
{inline, Expr};
comprehension_expr({bin, Ann, []}, Expr) ->
BinExpr = {bin, Ann, [{bin_element, Ann, Expr, default, [bitstring]}]},
{inline, BinExpr};
comprehension_expr({nil, _}, Expr) ->
{inline, Expr};
comprehension_expr(false, Expr) ->
{inline, Expr};
comprehension_expr(_, Expr) ->
{into, Expr}.
inline_or_into({bin, _, []}) -> inline;
inline_or_into({nil, _}) -> inline;
inline_or_into(false) -> inline;
inline_or_into(_) -> into.

comprehension_filter(Ann, Filters) ->
[join_filter(Ann, Filter, {atom, Ann, true}, {atom, Ann, false}) ||
Expand Down