diff options
| author | Hans Bolinder <[email protected]> | 2014-02-03 10:27:39 +0100 | 
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2014-02-23 15:01:29 +0100 | 
| commit | b66e75c285cba469c5225f3394da149456d17d16 (patch) | |
| tree | 3b11b80782cff70e478e8f11017bfc26745843cd /lib/syntax_tools/src | |
| parent | 85a5aca047ea4c3dcdeb1e47cdf523a48140bf18 (diff) | |
| download | otp-b66e75c285cba469c5225f3394da149456d17d16.tar.gz otp-b66e75c285cba469c5225f3394da149456d17d16.tar.bz2 otp-b66e75c285cba469c5225f3394da149456d17d16.zip | |
Deprecate pre-defined built-in types
The types array(), dict(), digraph(), gb_set(), gb_tree(), queue(),
set(), and tid() have been deprecated. They will be removed in OTP 18.0.
Instead the types array:array(), dict:dict(), digraph:graph(),
gb_set:set(), gb_tree:tree(), queue:queue(), sets:set(), and ets:tid()
can be used. (Note: it has always been necessary to use ets:tid().)
It is allowed in OTP 17.0 to locally re-define the types array(), dict(),
and so on.
New types array:array/1, dict:dict/2, gb_sets:set/1, gb_trees:tree/2,
queue:queue/1, and sets:set/1 have been added.
Diffstat (limited to 'lib/syntax_tools/src')
| -rw-r--r-- | lib/syntax_tools/src/erl_syntax_lib.erl | 10 | ||||
| -rw-r--r-- | lib/syntax_tools/src/erl_tidy.erl | 14 | ||||
| -rw-r--r-- | lib/syntax_tools/src/igor.erl | 20 | 
3 files changed, 22 insertions, 22 deletions
| diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl index e4665b99fc..2f0488abec 100644 --- a/lib/syntax_tools/src/erl_syntax_lib.erl +++ b/lib/syntax_tools/src/erl_syntax_lib.erl @@ -288,7 +288,7 @@ mapfoldl(_, S, []) ->  %%  %% @see //stdlib/sets --spec variables(erl_syntax:syntaxTree()) -> set(). +-spec variables(erl_syntax:syntaxTree()) -> sets:set(atom()).  variables(Tree) ->      variables(Tree, sets:new()). @@ -343,7 +343,7 @@ default_variable_name(N) ->  %%  %% @see new_variable_name/2 --spec new_variable_name(set()) -> atom(). +-spec new_variable_name(sets:set(atom())) -> atom().  new_variable_name(S) ->      new_variable_name(fun default_variable_name/1, S). @@ -369,7 +369,7 @@ new_variable_name(S) ->  %% @see //stdlib/sets  %% @see //stdlib/random --spec new_variable_name(fun((integer()) -> atom()), set()) -> atom(). +-spec new_variable_name(fun((integer()) -> atom()), sets:set(atom())) -> atom().  new_variable_name(F, S) ->      R = start_range(S), @@ -416,7 +416,7 @@ generate(_Key, Range) ->  %%   %% @see new_variable_name/1 --spec new_variable_names(integer(), set()) -> [atom()]. +-spec new_variable_names(integer(), sets:set(atom())) -> [atom()].  new_variable_names(N, S) ->      new_variable_names(N, fun default_variable_name/1, S). @@ -432,7 +432,7 @@ new_variable_names(N, S) ->  %%   %% @see new_variable_name/2 --spec new_variable_names(integer(), fun((integer()) -> atom()), set()) -> +-spec new_variable_names(integer(), fun((integer()) -> atom()), sets:set(atom())) ->  	[atom()].  new_variable_names(N, F, S) when is_integer(N) -> diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl index 7444d8dc67..38e0c2099b 100644 --- a/lib/syntax_tools/src/erl_tidy.erl +++ b/lib/syntax_tools/src/erl_tidy.erl @@ -14,7 +14,7 @@  %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  %% USA  %% -%% @copyright 1999-2006 Richard Carlsson +%% @copyright 1999-2014 Richard Carlsson  %% @author Richard Carlsson <[email protected]>  %% @end  %% ===================================================================== @@ -958,7 +958,7 @@ hidden_uses_2(Tree, Used) ->  -record(env, {file		       :: file:filename(),                module                   :: atom(),                current                  :: fa(), -              imports = dict:new()     :: dict(), +              imports = dict:new()     :: dict:dict(atom(), atom()),                context = normal	       :: context(),                verbosity = 1	       :: 0 | 1 | 2,                quiet = false            :: boolean(), @@ -970,12 +970,12 @@ hidden_uses_2(Tree, Used) ->  	      old_guard_tests = false  :: boolean()}).  -record(st, {varc              :: non_neg_integer(), -	     used = sets:new() :: set(), -	     imported          :: set(), -	     vars              :: set(), -	     functions         :: set(), +	     used = sets:new() :: sets:set({atom(), arity()}), +	     imported          :: sets:set({atom(), arity()}), +	     vars              :: sets:set(atom()), +	     functions         :: sets:set({atom(), arity()}),  	     new_forms = []    :: [erl_syntax:syntaxTree()], -	     rename            :: dict()}). +	     rename            :: dict:dict(mfa(), {atom(), atom()})}).  visit_used(Names, Defs, Roots, Imports, Module, Opts) ->      File = proplists:get_value(file, Opts, ""), diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl index 19b1cd592f..e6aff7b20a 100644 --- a/lib/syntax_tools/src/igor.erl +++ b/lib/syntax_tools/src/igor.erl @@ -14,7 +14,7 @@  %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  %% USA  %% -%% @copyright 1998-2006 Richard Carlsson +%% @copyright 1998-2014 Richard Carlsson  %% @author Richard Carlsson <[email protected]>  %% @end  %% ===================================================================== @@ -695,7 +695,7 @@ merge_files1(Files, Opts) ->  		preserved  :: boolean(),  		no_headers :: boolean(),  		notes      :: notes(), -		redirect   :: dict(),	% = dict(atom(), atom()) +		redirect   :: dict:dict(atom(), atom()),  		no_imports :: ordsets:ordset(atom()),  		options	   :: [option()]  	       }). @@ -727,7 +727,7 @@ merge_sources(Name, Sources, Opts) ->  %% Data structure for keeping state during transformation. --record(state, {export :: set()}). +-record(state, {export :: sets:set(atom(), arity())}).  state__add_export(Name, Arity, S) ->      S#state{export = sets:add_element({Name, Arity}, @@ -1039,7 +1039,7 @@ make_stub(M, Map, Env) ->  -type atts()      :: 'delete' | 'kill'.  -type file_atts() :: 'delete' | 'keep' | 'kill'. --record(filter, {records         :: set(), +-record(filter, {records         :: sets:set(atom()),  		 file_attributes :: file_atts(),  		 attributes      :: atts()}). @@ -1588,17 +1588,17 @@ alias_expansions_2(Modules, Table) ->  -record(code, {module     :: atom(),  	       target     :: atom(), -	       sources    :: set(),	% set(atom()), -	       static     :: set(),	% set(atom()), -	       safe       :: set(),	% set(atom()), +	       sources    :: sets:set(atom()), +	       static     :: sets:set(atom()), +	       safe       :: sets:set(atom()),  	       preserved  :: boolean(),  	       no_headers :: boolean(),  	       notes      :: notes(),  	       map        :: map_fun(),  	       renaming   :: fun((atom()) -> map_fun()), -	       expand     :: dict(),	% = dict({atom(), integer()}, -					%      {atom(), {atom(), integer()}}) -	       redirect	  :: dict()	% = dict(atom(), atom()) +	       expand     :: dict:dict({atom(), integer()}, +                                       {atom(), {atom(), integer()}}), +	       redirect	  :: dict:dict(atom(), atom())  	      }).  %% `Trees' must be a list of syntax trees of type `form_list'. The | 
