diff options
| author | Kostis Sagonas <[email protected]> | 2010-02-10 10:54:18 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-02-14 12:23:03 +0100 |
| commit | eab3576f33ec8c8fa5302bc07f55c20ffc9e51b0 (patch) | |
| tree | fd900273c377b4a5d9ed8a0b2ded849713816b91 | |
| parent | 63c13786ec04bba57acaea6dee1f2fbc77c7b5e1 (diff) | |
| download | otp-eab3576f33ec8c8fa5302bc07f55c20ffc9e51b0.tar.gz otp-eab3576f33ec8c8fa5302bc07f55c20ffc9e51b0.tar.bz2 otp-eab3576f33ec8c8fa5302bc07f55c20ffc9e51b0.zip | |
typer: New version for the R13B04 release
| -rw-r--r-- | lib/typer/src/typer_annotator.erl | 4 | ||||
| -rw-r--r-- | lib/typer/vsn.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/typer/src/typer_annotator.erl b/lib/typer/src/typer_annotator.erl index 17eeeb6dfe..a68360604d 100644 --- a/lib/typer/src/typer_annotator.erl +++ b/lib/typer/src/typer_annotator.erl @@ -227,6 +227,8 @@ get_type({{M, F, A} = MFA, Range, Arg}, CodeServer, RecMap) -> Sig = erl_types:t_fun(Arg, Range), case dialyzer_contracts:check_contract(Contract, Sig) of ok -> {{F, A}, {contract, Contract}}; + {error, {extra_range, _, _}} -> + {{F, A}, {contract, Contract}}; {error, invalid_contract} -> CString = dialyzer_contracts:contract_to_string(Contract), SigString = dialyzer_utils:format_sig(Sig, RecMap), @@ -235,7 +237,7 @@ get_type({{M, F, A} = MFA, Range, Arg}, CodeServer, RecMap) -> "\t The contract is: " ++ CString ++ "\n" ++ "\t but the inferred signature is: ~s", [M, F, A, SigString])); - {error, Msg} -> + {error, Msg} when is_list(Msg) -> % Msg is a string() typer:error( io_lib:format("Error in contract of function ~w:~w/~w: ~s", [M, F, A, Msg])) diff --git a/lib/typer/vsn.mk b/lib/typer/vsn.mk index 9558412375..285fa62da3 100644 --- a/lib/typer/vsn.mk +++ b/lib/typer/vsn.mk @@ -1 +1 @@ -TYPER_VSN = 0.1.7.3 +TYPER_VSN = 0.1.7.4 |