Merge pull request #88 from inaka/elbrujohalcon.fix.spec

[Fix #87] Fix parse-reverting of -define attributes

Author: elbrujohalcon

rebar.config

@@ -8,7 +8,7 @@
 {profiles,
  [{test, [{cover_enabled, true}, {cover_opts, [verbose]}, {ct_opts, [{verbose, true}]}]}]}.
 
-{alias, [{test, [compile, lint, xref, dialyzer, ct, cover, ex_doc]}]}.
+{alias, [{test, [compile, lint, xref, dialyzer, ct, cover]}]}.
 
 %% == Dependencies and plugins ==
 

src/ktn_code.erl

@@ -12,16 +12,19 @@
 
 -export_type([tree_node/0, tree_node_type/0, beam_lib_beam/0]).
 
+%% NOTE: we use atom() below, because erl_scan:category() is not exported.
+%%       In fact, this type ends up being just atom() for dialyzer,
+%%       since it has too many options and it's compressed.
 -type tree_node_type() ::
-    root | function | clause | match | tuple | atom | integer | float | string | char |
-    binary | binary_element | var | call | remote | 'case' | case_expr | case_clauses |
-    'fun' | named_fun | query | 'try' | try_catch | try_case | try_after | 'if' | 'catch' |
-    'receive' | receive_after | receive_case | nil | cons | map | map_field_assoc |
-    map_field_exact | lc | lc_expr | generate | bc | bc_expr | b_generate | op |
-    record_field | record_index | block | module | export | import | compile | vsn | on_load |
-    behaviour | behavior | callback | record | include | include_lib | define | undef |
-    ifdef | ifndef | 'else' | endif | elif | error | warning | file | line | type | opaque |
-    export_type | remote_type | ann_type | paren_type | any.
+    'case' | 'catch' | 'else' | 'fun' | 'if' | 'maybe' | 'receive' | 'try' | any | atom |
+    b_generate | bc | bc_expr | binary | binary_element | block | call | callback |
+    case_clauses | case_expr | char | clause | comment | cons | default | define | export |
+    float | function | generate | import | integer | lc | lc_expr | m_generate | macro | map |
+    map_field_assoc | map_field_exact | match | maybe_match | mc | mc_expr | module |
+    named_fun | nil | nominal | op | opaque | query | receive_after | receive_case | record |
+    record_attr | record_field | record_index | remote | remote_type | root | spec | string |
+    try_after | try_case | try_catch | tuple | type | type_attr | type_map_field |
+    typed_record_field | user_type | var | atom().
 -type tree_node() ::
     #{type => tree_node_type(),
       attrs => map(),
@@ -126,7 +129,15 @@ revert(attribute, Node0) ->
     Gs = [[erl_syntax:revert(X) || X <- L] || L <- Subs],
     Node = erl_syntax:update_tree(Node0, Gs),
 
-    Name = erl_syntax:attribute_name(Node),
+    Name =
+        try
+            erl_syntax:atom_value(
+                erl_syntax:attribute_name(Node))
+        catch
+            _:_ ->
+                erl_syntax:attribute_name(Node)
+        end,
+
     Args = erl_syntax:attribute_arguments(Node),
     Pos = erl_syntax:get_pos(Node),
     {attribute, Pos, Name, Args};
@@ -184,7 +195,7 @@ consult(Source) ->
 
 %% Getters
 
--spec type(tree_node()) -> atom().
+-spec type(tree_node()) -> undefined | tree_node_type().
 type(#{type := Type}) ->
     Type;
 type(undefined) ->