Merge pull request #92 from paulo-ferraz-oliveira/fix/post-otp28-support

fix: Add missing `epp_dodger` compare details

Author: elbrujohalcon

src/ktn_dodger.erl

@@ -539,6 +539,8 @@ quickscan_macros([{'?', _}, {Type, _, _} = N | [{'(', _} | _] = Ts], [{':', _} |
                   Ts2;
               {_, [{'when', _} | _] = Ts2} ->
                   Ts2;
+              {_, [{':', _} | _] = Ts2} ->
+                  Ts2;
               _ ->
                   Ts    %% assume macro without arguments
           end,
@@ -661,13 +663,8 @@ default_prefix(#opt{parse_macro_definitions = false, compact_strings = true}) ->
     end.
 
 scan_form([{'-', _Anno}, {atom, AnnoA, define} | Ts], #opt{parse_macro_definitions = false}) ->
-    [
-        {atom, AnnoA, ?pp_form},
-        {'(', AnnoA},
-        {')', AnnoA},
-        {'->', AnnoA},
-        {atom, AnnoA, define}
-    | Ts];
+    [{atom, AnnoA, ?pp_form}, {'(', AnnoA}, {')', AnnoA}, {'->', AnnoA}, {atom, AnnoA, define}
+     | Ts];
 scan_form([{'-', _Anno}, {atom, AnnoA, define} | Ts], Opt) ->
     [{atom, AnnoA, ?pp_form}, {'(', AnnoA}, {')', AnnoA}, {'->', AnnoA}, {atom, AnnoA, define}
      | scan_macros(Ts, Opt)];
@@ -780,23 +777,28 @@ macro_call([{'(', _}, {')', _}], Anno, {_, AnnoN, _} = N, Rest, As, Opt) ->
     {Open, Close} = parentheses(As),
     do_scan_macros([],
                   Rest,
+                  %% {'?macro_call', N }
                   lists:reverse(
                     Open ++
-                    [{atom, Anno, ?macro_call}, {'(', Anno}, N, {')', AnnoN}] ++
+                    [{'{', Anno}, {atom, Anno, ?macro_call}, {',', Anno}, N, {'}', AnnoN}] ++
                     Close,
                     As),
                   Opt);
-macro_call([{'(', _} | Args], L, {_, Ln, _} = N, Rest, As, Opt) ->
+macro_call([{'(', _} | Args], Anno, {_, AnnoN, _} = N, Rest, As, Opt) ->
     {Open, Close} = parentheses(As),
     %% drop closing parenthesis
 
     %% assert
     {')', _} = lists:last(Args),
     Args1 = lists:droplast(Args),
     %% note that we must scan the argument list; it may not be skipped
-    do_scan_macros(Args1 ++ [{'}', Ln} | Close],
+    do_scan_macros(Args1 ++ [{'}', AnnoN} | Close],
                   Rest,
-                  lists:reverse(Open ++ [{atom, L, ?macro_call}, {'(', L}, N, {',', Ln}], As),
+                  %% {'?macro_call', N, Arg1, ... }
+                  lists:reverse(
+                    Open ++
+                    [{'{', Anno}, {atom, Anno, ?macro_call}, {',', Anno}, N, {',', AnnoN}],
+                    As),
                   Opt).
 
 macro_atom(atom, A) ->
@@ -911,8 +913,8 @@ fix_form([{atom, _, ?pp_form}, {'(', _}, {')', _}, {'->', _}, {atom, _, define},
     case lists:reverse(Ts) of
         [{dot, _}, {')', _} | _] ->
             {retry, Ts, fun fix_stringyfied_macros/1};
-        [{dot, L} | Ts1] ->
-            Ts2 = lists:reverse([{dot, L}, {')', L} | Ts1]),
+        [{dot, Anno} | Ts1] ->
+            Ts2 = lists:reverse([{dot, Anno}, {')', Anno} | Ts1]),
             {retry, Ts2, fun fix_stringyfied_macros/1};
         _ ->
             no_fix
@@ -974,7 +976,7 @@ fix_contiguous_strings([{string, L1, S1} = First, {string, L2, S2} = Second | Re
         {T1, T2} when is_list(T1), is_list(T2) ->
             Separator =
                 case {erl_anno:location(L1), erl_anno:location(L2)} of
-                    {L, L} ->
+                    {Anno, Anno} ->
                         $\s;
                     {_, _} ->
                         $\n % different lines