diff options
| author | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-07 15:43:06 +0100 |
| commit | 5c8338fcadd68589814a7098e001b036109c5ee7 (patch) | |
| tree | 4a89c1feb52b8ec862cfa46c8b502ea3880217be /lib/dialyzer/src/dialyzer_cl.erl | |
| parent | f39098ac6f487f7142e4597930ee3bb709362c4a (diff) | |
| parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
| download | otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.gz otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.bz2 otp-5c8338fcadd68589814a7098e001b036109c5ee7.zip | |
Merge branch 'dev' into bmk/inets/httpd/dont_send_empty_chunk/OTP-9091
Diffstat (limited to 'lib/dialyzer/src/dialyzer_cl.erl')
| -rw-r--r-- | lib/dialyzer/src/dialyzer_cl.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl index 1987c1732c..86f1ba4696 100644 --- a/lib/dialyzer/src/dialyzer_cl.erl +++ b/lib/dialyzer/src/dialyzer_cl.erl @@ -2,7 +2,7 @@ %%------------------------------------------------------------------- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2010. All Rights Reserved. +%% Copyright Ericsson AB 2006-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -46,7 +46,8 @@ legal_warnings = ordsets:new() :: [dial_warn_tag()], mod_deps = dict:new() :: dict(), output = standard_io :: io:device(), - output_format = formatted :: 'raw' | 'formatted', + output_format = formatted :: format(), + filename_opt = basename :: fopt(), output_plt = none :: 'none' | file:filename(), plt_info = none :: 'none' | dialyzer_plt:plt_info(), report_mode = normal :: rep_mode(), @@ -532,8 +533,10 @@ hc(Mod) -> new_state() -> #cl_state{}. -init_output(State0, #options{output_file = OutFile, output_format = OutFormat}) -> - State = State0#cl_state{output_format = OutFormat}, +init_output(State0, #options{output_file = OutFile, + output_format = OutFormat, + filename_opt = FOpt}) -> + State = State0#cl_state{output_format = OutFormat, filename_opt = FOpt}, case OutFile =:= none of true -> State; @@ -766,6 +769,7 @@ print_warnings(#cl_state{stored_warnings = []}) -> ok; print_warnings(#cl_state{output = Output, output_format = Format, + filename_opt = FOpt, stored_warnings = Warnings}) -> PrWarnings = process_warnings(Warnings), case PrWarnings of @@ -773,7 +777,7 @@ print_warnings(#cl_state{output = Output, [_|_] -> S = case Format of formatted -> - [dialyzer:format_warning(W) || W <- PrWarnings]; + [dialyzer:format_warning(W, FOpt) || W <- PrWarnings]; raw -> [io_lib:format("~p. \n", [W]) || W <- PrWarnings] end, |