mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
Support Erlang 25 in "make options": returns attribute with simpler syntax
This was introduced in Erlang/OTP 25.0-rc1 https://erlang.org/download/otp_src_25.0-rc1.readme https://github.com/erlang/otp/pull/5509 OTP-17894 Application(s): syntax_tools Related Id(s): PR-5509 The erl_syntax_lib:analyze_attribute/1 function would return {Name, {Name, Value}} instead of {Name, Value} (which is the documented return value).
This commit is contained in:
parent
d4f288d3c6
commit
231dfd776f
@ -524,6 +524,8 @@ fold_opt(File, Fun, Acc, AbsCode) ->
|
|||||||
Fun(File, {#state.defaults, Form}, Acc1);
|
Fun(File, {#state.defaults, Form}, Acc1);
|
||||||
{attribute, {spec, {spec, {{options, 0}, Spec}}}} ->
|
{attribute, {spec, {spec, {{options, 0}, Spec}}}} ->
|
||||||
Fun(File, {#state.specs, hd(Spec)}, Acc1);
|
Fun(File, {#state.specs, hd(Spec)}, Acc1);
|
||||||
|
{attribute, {spec, {{options, 0}, Spec}}} ->
|
||||||
|
Fun(File, {#state.specs, hd(Spec)}, Acc1);
|
||||||
_ ->
|
_ ->
|
||||||
Acc1
|
Acc1
|
||||||
end
|
end
|
||||||
@ -539,6 +541,8 @@ fold_mod_opt(File, Fun, Acc, AbsCode) ->
|
|||||||
Fun(File, {#state.mod_defaults, Form}, Acc1);
|
Fun(File, {#state.mod_defaults, Form}, Acc1);
|
||||||
{attribute, {spec, {spec, {{mod_options, 1}, Spec}}}} ->
|
{attribute, {spec, {spec, {{mod_options, 1}, Spec}}}} ->
|
||||||
Fun(File, {#state.mod_specs, hd(Spec)}, Acc1);
|
Fun(File, {#state.mod_specs, hd(Spec)}, Acc1);
|
||||||
|
{attribute, {spec, {{mod_options, 1}, Spec}}} ->
|
||||||
|
Fun(File, {#state.mod_specs, hd(Spec)}, Acc1);
|
||||||
_ ->
|
_ ->
|
||||||
Acc1
|
Acc1
|
||||||
end
|
end
|
||||||
@ -572,6 +576,8 @@ is_behaviour(AbsCode, Mod) ->
|
|||||||
{attribute, {Attr, {_, Mod}}}
|
{attribute, {Attr, {_, Mod}}}
|
||||||
when Attr == behaviour orelse Attr == behavior ->
|
when Attr == behaviour orelse Attr == behavior ->
|
||||||
true;
|
true;
|
||||||
|
{attribute, {behaviour, Mod}} ->
|
||||||
|
true;
|
||||||
_ ->
|
_ ->
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user