File parse_trans-3.4.0-git.patch of Package parse_trans

Overview Repositories Revisions Requests Users Attributes Meta

File parse_trans-3.4.0-git.patch of Package parse_trans (Revision 6efebce6ce38cae50e2deac04fb99773)

Currently displaying revision 6efebce6ce38cae50e2deac04fb99773 , Show latest

diff --git a/examples/ct_expand_test.erl b/examples/ct_expand_test.erl
index d8ae3b8..d33ac63 100644
--- a/examples/ct_expand_test.erl
+++ b/examples/ct_expand_test.erl
@@ -1,8 +1,9 @@
 -module(ct_expand_test).
 
--export([f/0]).
+-export([f/0, g/0, h/0, i/0, fixture/0]).
 
 -compile({parse_transform, ct_expand}).
+-compile({ct_expand_trace, [x]}).
 -pt_pp_src(true).
 
 f() ->
@@ -29,7 +30,8 @@ fixture() ->
 jsx_consult("my_file.json", _) ->
     M0 = maps:from_list([]),
     M0#{<<"k">> => [42]
-       ,#{1=>1} => {"s", 4.2}
+       , 1 => a
+       ,#{2=>2, 1=>1} => {"s", 4.2}
        }.
 
 zip([H1|T1], [H2|T2]) ->
diff --git a/examples/lc.erl b/examples/lc.erl
index 77e0e7b..7e38734 100644
--- a/examples/lc.erl
+++ b/examples/lc.erl
@@ -1,7 +1,7 @@
 -module(lc).
 -export([f/1]).
 
-f(X) ->
+f(_X) ->
     [fun(_) ->
-	     erlang:now()
-     end || {Y1,Y2} <- [{1,a},{2,b}]].
+	     erlang:timestamp()
+     end || {_Y1,_Y2} <- [{1,a},{2,b}]].
diff --git a/src/ct_expand.erl b/src/ct_expand.erl
index a4d4bb0..ce41b45 100644
--- a/src/ct_expand.erl
+++ b/src/ct_expand.erl
@@ -71,7 +71,7 @@ parse_transform(Forms, Options) ->
 ct_trace_opt(Options, Forms) ->
     case proplists:get_value(ct_expand_trace, Options) of
         undefined ->
-            case [Opt || {attribute,_,ct_expand_trace,Opt} <- Forms] of
+            case [Opt || {attribute,_,compile,{ct_expand_trace,Opt}} <- Forms] of
                 [] ->
                     [];
                 [_|_] = L ->
@@ -153,10 +153,16 @@ pp_function(F, []) ->
     atom_to_list(F) ++ "()";
 pp_function(F, [A|As]) ->
     lists:flatten([atom_to_list(F), "(",
-                   [io_lib:fwrite("~w", [erl_parse:normalise(A)]) |
-                    [[",", io_lib:fwrite("~w", [erl_parse:normalise(A_)])] || A_ <- As]],
+                   [pp_term(A) |
+                    [[",", pp_term(A_)] || A_ <- As]],
                    ")"]).
 
+pp_term({'fun',_, {clauses,_}} = F) ->
+    %% erl_parse:normalise/1 doesn't handle this
+    io_lib:fwrite("~s", [erl_prettypr:format(F)]);
+pp_term(F) ->
+    io_lib:fwrite("~p", [erl_parse:normalise(F)]).
+
 ret_trace(false, _, _, _, _) -> ok;
 ret_trace(true, L, F, Args, Res) ->
     io:fwrite("ct_expand (~w): returned from ~w/~w: ~w~n",
@@ -231,7 +237,7 @@ abstract_list([], _A) ->
 
 abstract_map(Map, A) ->
     [{map_field_assoc,A,abstract(K, A),abstract(V, A)}
-     || {K,V} <- maps:to_list(Map)
+     || {K,V} <- lists:sort(maps:to_list(Map))
     ].
 
 abstract_byte(Byte, Line) when is_integer(Byte) ->
diff --git a/src/parse_trans_codegen.erl b/src/parse_trans_codegen.erl
index 9835233..deb0efa 100644
--- a/src/parse_trans_codegen.erl
+++ b/src/parse_trans_codegen.erl
@@ -376,23 +376,32 @@ abstract(ClauseForms) ->
 
 substitute({tuple,L0,
             [{atom,_,tuple},
-             {integer,_,L},
+             Loc,
              {cons,_,
-              {tuple,_,[{atom,_,atom},{integer,_,_},{atom,_,'$var'}]},
+              {tuple,_,[{atom,_,atom},_LocA,{atom,_,'$var'}]},
               {cons,_,
-               {tuple,_,[{atom,_,var},{integer,_,_},{atom,_,V}]},
-               {nil,_}}}]}) ->
+               {tuple,_,[{atom,_,var},_LocB,{atom,_,V}]},
+               {nil,_}}}]}) when element(1, Loc) == tuple; % Erlang 24+
+                                 element(1, Loc) == integer ->
+    AbstConcreteLoc =
+        case Loc of
+            {integer, _, L} ->
+                {integer, L0, L};
+            {tuple, _, [{integer, _, L}, {integer, _, C}]} ->
+                {tuple, L0, [{integer, L0, L}, {integer, L0, C}]}
+        end,
     {call, L0, {remote,L0,{atom,L0,erl_parse},
                 {atom,L0,abstract}},
-     [{var, L0, V}, {integer, L0, L}]};
-substitute({tuple,L0,
+     [{var, L0, V}, AbstConcreteLoc]};
+substitute({tuple,L0, % Erlang 24: {Line,Col}
             [{atom,_,tuple},
-             {integer,_,_},
+             Loc,
              {cons,_,
-              {tuple,_,[{atom,_,atom},{integer,_,_},{atom,_,'$form'}]},
+              {tuple,_,[{atom,_,atom},_LocA,{atom,_,'$form'}]},
               {cons,_,
-               {tuple,_,[{atom,_,var},{integer,_,_},{atom,_,F}]},
-               {nil,_}}}]}) ->
+               {tuple,_,[{atom,_,var},_LocB,{atom,_,F}]},
+               {nil,_}}}]}) when element(1, Loc) == tuple; % Erlang 24+
+                                 element(1, Loc) == integer ->
     {var, L0, F};
 substitute([]) ->
     [];

Places

File parse_trans-3.4.0-git.patch of Package parse_trans (Revision 6efebce6ce38cae50e2deac04fb99773)

Places