diff options
| author | Hans Bolinder <[email protected]> | 2014-03-24 09:32:37 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2014-03-24 09:32:37 +0100 |
| commit | 6a6bbabb9a2d112d4381e6e5a99143d13b931c6e (patch) | |
| tree | 736387955a34b4347c15bed52dcf0860be2ddcc5 /lib/hipe | |
| parent | f725839f502c90ee14f5e2fb48a2393c29f0532d (diff) | |
| parent | 1a4668ddd61802f0936e762f2f85007845e1441e (diff) | |
| download | otp-6a6bbabb9a2d112d4381e6e5a99143d13b931c6e.tar.gz otp-6a6bbabb9a2d112d4381e6e5a99143d13b931c6e.tar.bz2 otp-6a6bbabb9a2d112d4381e6e5a99143d13b931c6e.zip | |
Merge branch 'hb/stdlib/erl_lint_map_fix'
* hb/stdlib/erl_lint_map_fix:
stdlib: warn if the type map() is redefined
Diffstat (limited to 'lib/hipe')
| -rw-r--r-- | lib/hipe/cerl/erl_types.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl index 2c6a1aa506..ae333f4b1a 100644 --- a/lib/hipe/cerl/erl_types.erl +++ b/lib/hipe/cerl/erl_types.erl @@ -4257,8 +4257,8 @@ t_from_form({type, _L, list, []}, _TypeNames, _RecDict, _VarDict) -> t_from_form({type, _L, list, [Type]}, TypeNames, RecDict, VarDict) -> {T, R} = t_from_form(Type, TypeNames, RecDict, VarDict), {t_list(T), R}; -t_from_form({type, _L, map, _}, _TypeNames, _RecDict, _VarDict) -> - {t_map([]), []}; +t_from_form({type, _L, map, _}, TypeNames, RecDict, VarDict) -> + builtin_type(map, t_map([]), TypeNames, RecDict, VarDict); t_from_form({type, _L, mfa, []}, _TypeNames, _RecDict, _VarDict) -> {t_mfa(), []}; t_from_form({type, _L, module, []}, _TypeNames, _RecDict, _VarDict) -> |