aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc/src/edoc_specs.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-06-09 10:10:04 +0200
committerHans Bolinder <[email protected]>2016-06-09 10:10:04 +0200
commit6c6cdb99b2f80630816089ad5f75d8a81266b5cc (patch)
tree3676db6a83474555078212cb3d70f11497734e7e /lib/edoc/src/edoc_specs.erl
parent6fe86a5858d2894887ea4c0f343c2c38283cf556 (diff)
parent5e7542d6f7cd1964839f6214915c7f9b7d7f8866 (diff)
downloadotp-6c6cdb99b2f80630816089ad5f75d8a81266b5cc.tar.gz
otp-6c6cdb99b2f80630816089ad5f75d8a81266b5cc.tar.bz2
otp-6c6cdb99b2f80630816089ad5f75d8a81266b5cc.zip
Merge branch 'hasse/edoc/fix_maps_type/PR-1014'
* hasse/edoc/fix_maps_type/PR-1014: edoc: Fix new Maps syntax
Diffstat (limited to 'lib/edoc/src/edoc_specs.erl')
-rw-r--r--lib/edoc/src/edoc_specs.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index faee8adf7b..c15dfd328f 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -369,11 +369,11 @@ d2e({type,_,map,any}, _Prec) ->
d2e({type,_,map,Es}, _Prec) ->
#t_map{types = d2e(Es) };
d2e({type,_,map_field_assoc,[K,V]}, Prec) ->
- T = #t_map_field{k_type = d2e(K), v_type=d2e(V) },
+ T = #t_map_field{assoc_type = assoc, k_type = d2e(K), v_type=d2e(V) },
{P,_R} = erl_parse:type_preop_prec('#'),
maybe_paren(P, Prec, T);
-d2e({type,_,map_field_exact,K,V}, Prec) ->
- T = #t_map_field{k_type = d2e(K), v_type=d2e(V) },
+d2e({type,_,map_field_exact,[K,V]}, Prec) ->
+ T = #t_map_field{assoc_type = exact, k_type = d2e(K), v_type=d2e(V) },
{P,_R} = erl_parse:type_preop_prec('#'),
maybe_paren(P, Prec, T);
d2e({type,_,tuple,Ts0}, _Prec) ->