diff options
| author | Hans Bolinder <[email protected]> | 2014-04-29 09:31:15 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2014-04-29 09:31:15 +0200 |
| commit | be46e454e61c513920f9b3a8040d26d7c2bc8b9f (patch) | |
| tree | 1ff7dc60a16eca43543d7f9558158ace31b7515f /lib/edoc | |
| parent | 847e7291b2800ebd7e188be6e88114fb1e8900ce (diff) | |
| parent | eb11af7f827bbbd6597b018d777993946ac3cbc0 (diff) | |
| download | otp-be46e454e61c513920f9b3a8040d26d7c2bc8b9f.tar.gz otp-be46e454e61c513920f9b3a8040d26d7c2bc8b9f.tar.bz2 otp-be46e454e61c513920f9b3a8040d26d7c2bc8b9f.zip | |
Merge branch 'hb/type_fixes/OTP-11851'
* hb/type_fixes/OTP-11851:
[stdlib] Simplify some linter warnings about specs
Modify representation of the map type
Disallow '_' as type variable
Fix a -callback attribute bug
Allow more type names
Diffstat (limited to 'lib/edoc')
| -rw-r--r-- | lib/edoc/src/edoc_specs.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl index 211a354c74..3bf81c6503 100644 --- a/lib/edoc/src/edoc_specs.erl +++ b/lib/edoc/src/edoc_specs.erl @@ -362,7 +362,7 @@ d2e({type,_,map,any}) -> #t_map{ types = []}; d2e({type,_,map,Es}) -> #t_map{ types = d2e(Es) }; -d2e({type,_,map_field_assoc,K,V}) -> +d2e({type,_,map_field_assoc,[K,V]}) -> #t_map_field{ k_type = d2e(K), v_type=d2e(V) }; d2e({type,_,map_field_exact,K,V}) -> #t_map_field{ k_type = d2e(K), v_type=d2e(V) }; @@ -388,6 +388,9 @@ d2e({record_field,L,_Name}=F) -> d2e({type,_,Name,Types0}) -> Types = d2e(Types0), typevar_anno(#t_type{name = #t_name{name = Name}, args = Types}, Types); +d2e({user_type,_,Name,Types0}) -> + Types = d2e(Types0), + typevar_anno(#t_type{name = #t_name{name = Name}, args = Types}, Types); d2e({var,_,'_'}) -> #t_type{name = #t_name{name = ?TOP_TYPE}}; d2e({var,_,TypeName}) -> |