Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion lib/elixir/src/elixir_quote.erl
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,11 @@ do_escape([], _) ->
[];

do_escape([H | T], #elixir_quote{unquote=false} = Q) ->
do_quote_simple_list(T, do_escape(H, Q), Q);
case is_list(T) of
true -> [do_escape(H, Q) | do_escape(T, Q)];
% improper list
false -> [{'|', [], [do_escape(H, Q), do_escape(T, Q)]}]
end;

do_escape([H | T], Q) ->
%% The improper case is inefficient, but improper lists are rare.
Expand Down
3 changes: 3 additions & 0 deletions lib/elixir/test/elixir/macro_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ defmodule MacroTest do
test "escapes the content of :quote tuples" do
assert Macro.escape({:quote, [%{}], [{}]}) ==
{:{}, [], [:quote, [{:%{}, [], []}], [{:{}, [], []}]]}

assert Macro.escape([:foo, {:quote, [%{}], [{}]}]) ==
[:foo, {:{}, [], [:quote, [{:%{}, [], []}], [{:{}, [], []}]]}]
end

test "escape container when a reference cannot be escaped" do
Expand Down