diff options
| author | Lukas Larsson <[email protected]> | 2016-01-26 10:32:12 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-01-26 10:32:12 +0100 |
| commit | 55ba47ec1511ea4ed5728c4c8ce15f339227e4a5 (patch) | |
| tree | 0a9d569694e9f9f497d8479710b9543696f2fe62 | |
| parent | fa89f452f528321114593e0c79efba87fc4478d7 (diff) | |
| parent | 42d798aef0f435d0027c836949a26cc699e7e9ae (diff) | |
| download | otp-55ba47ec1511ea4ed5728c4c8ce15f339227e4a5.tar.gz otp-55ba47ec1511ea4ed5728c4c8ce15f339227e4a5.tar.bz2 otp-55ba47ec1511ea4ed5728c4c8ce15f339227e4a5.zip | |
Merge branch 'maint'
* maint:
erl_docgen: Fix spec anno's for maps
| -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(_) -> []. |