diff options
| author | Lukas Larsson <[email protected]> | 2016-01-26 10:32:01 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-01-26 10:32:01 +0100 |
| commit | 42d798aef0f435d0027c836949a26cc699e7e9ae (patch) | |
| tree | a3a6183ba5717aa8fb56b6cfd5d588934ef6e77a /lib/erl_docgen | |
| parent | 448978562afbf77202034b018bf56775212f1ae6 (diff) | |
| parent | f4f0d3641264b75f2d4c465ed93e2d06e0961e4c (diff) | |
| download | otp-42d798aef0f435d0027c836949a26cc699e7e9ae.tar.gz otp-42d798aef0f435d0027c836949a26cc699e7e9ae.tar.bz2 otp-42d798aef0f435d0027c836949a26cc699e7e9ae.zip | |
Merge branch 'lukas/erl_docget/maps_anno_tags/OTP-12955' into maint
* lukas/erl_docget/maps_anno_tags/OTP-12955:
erl_docgen: Fix spec anno's for maps
Diffstat (limited to 'lib/erl_docgen')
| -rw-r--r-- | lib/erl_docgen/src/docgen_otp_specs.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl index 37baa7c2f9..e154323f07 100644 --- a/lib/erl_docgen/src/docgen_otp_specs.erl +++ b/lib/erl_docgen/src/docgen_otp_specs.erl @@ -729,5 +729,9 @@ annos_type([E=#xmlElement{name = typevar}]) -> annos_elem(E); annos_type([#xmlElement{name = paren, content = Es}]) -> annos(get_elem(type, Es)); +annos_type([#xmlElement{name = map, content = Es}]) -> + lists:flatmap(fun(E) -> annos_type([E]) end, Es); +annos_type([#xmlElement{name = map_field, content = Es}]) -> + lists:flatmap(fun annos_elem/1, get_elem(type,Es)); annos_type(_) -> []. |