diff options
| author | Stavros Aronis <[email protected]> | 2011-02-27 17:48:54 +0200 |
|---|---|---|
| committer | Stavros Aronis <[email protected]> | 2011-02-28 17:08:49 +0200 |
| commit | 8bbf860b2f21571a4675a1a031cb95f25a10f391 (patch) | |
| tree | 7a09ac62bec8cdf0c90a6e0cf499b93b82ff02c1 | |
| parent | 8b7546d447c1ba866906d6926d82b58fa88d5791 (diff) | |
| download | otp-8bbf860b2f21571a4675a1a031cb95f25a10f391.tar.gz otp-8bbf860b2f21571a4675a1a031cb95f25a10f391.tar.bz2 otp-8bbf860b2f21571a4675a1a031cb95f25a10f391.zip | |
Add 'apps' option to the erlang interface
| -rw-r--r-- | lib/dialyzer/src/dialyzer_cl_parse.erl | 7 | ||||
| -rw-r--r-- | lib/dialyzer/src/dialyzer_options.erl | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lib/dialyzer/src/dialyzer_cl_parse.erl b/lib/dialyzer/src/dialyzer_cl_parse.erl index 5ca7599b35..2867b522fd 100644 --- a/lib/dialyzer/src/dialyzer_cl_parse.erl +++ b/lib/dialyzer/src/dialyzer_cl_parse.erl @@ -22,7 +22,7 @@ %% Avoid warning for local function error/1 clashing with autoimported BIF. -compile({no_auto_import,[error/1]}). --export([start/0]). +-export([start/0, get_lib_dir/1]). -export([collect_args/1]). % used also by typer_options.erl -include("dialyzer.hrl"). @@ -55,7 +55,7 @@ cl(["--add_to_plt"|T]) -> put(dialyzer_options_analysis_type, plt_add), cl(T); cl(["--apps"|T]) -> - T1 = get_lib_dir(T, []), + T1 = get_lib_dir(T), {Args, T2} = collect_args(T1), append_var(dialyzer_options_files_rec, Args), cl(T2); @@ -299,6 +299,9 @@ common_options() -> %%----------------------------------------------------------------------- +get_lib_dir(Apps) -> + get_lib_dir(Apps, []). + get_lib_dir([H|T], Acc) -> NewElem = case code:lib_dir(list_to_atom(H)) of diff --git a/lib/dialyzer/src/dialyzer_options.erl b/lib/dialyzer/src/dialyzer_options.erl index 2c0afa6e2b..d64e44a814 100644 --- a/lib/dialyzer/src/dialyzer_options.erl +++ b/lib/dialyzer/src/dialyzer_options.erl @@ -120,12 +120,18 @@ build_options([{OptName, undefined}|Rest], Options) when is_atom(OptName) -> build_options(Rest, Options); build_options([{OptionName, Value} = Term|Rest], Options) -> case OptionName of + apps -> + OldValues = Options#options.files_rec, + AppDirs = get_app_dirs(Value), + assert_filenames(Term, AppDirs), + build_options(Rest, Options#options{files_rec = AppDirs ++ OldValues}); files -> assert_filenames(Term, Value), build_options(Rest, Options#options{files = Value}); files_rec -> + OldValues = Options#options.files_rec, assert_filenames(Term, Value), - build_options(Rest, Options#options{files_rec = Value}); + build_options(Rest, Options#options{files_rec = Value ++ OldValues}); analysis_type -> NewOptions = case Value of @@ -188,6 +194,11 @@ build_options([{OptionName, Value} = Term|Rest], Options) -> build_options([], Options) -> Options. +get_app_dirs(Apps) when is_list(Apps) -> + dialyzer_cl_parse:get_lib_dir([atom_to_list(A) || A <- Apps]); +get_app_dirs(Apps) -> + bad_option("Use a list of otp applications", Apps). + assert_filenames(Term, [FileName|Left]) when length(FileName) >= 0 -> case filelib:is_file(FileName) orelse filelib:is_dir(FileName) of true -> ok; |