aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-11-10 06:43:05 +0100
committerBjörn Gustavsson <[email protected]>2015-11-10 06:43:05 +0100
commit765df80e59c6d5397483518f6770c0fd3f9f9412 (patch)
treed177b26beab29b6ecdb9df2227d875425c923c80 /lib/compiler
parentbd60ac17406d0cd4c12cc92944dfc1fdc068a746 (diff)
downloadotp-765df80e59c6d5397483518f6770c0fd3f9f9412.tar.gz
otp-765df80e59c6d5397483518f6770c0fd3f9f9412.tar.bz2
otp-765df80e59c6d5397483518f6770c0fd3f9f9412.zip
sys_pre_expand: Remove imports of ordsets functions
Importing from_list/1 and union/2 from the 'ordsets', while at the same time making calls explicit calls to the functions with same name in the 'gb_sets' module is confusing. Make all calls to 'ordsets' explicit.
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/src/sys_pre_expand.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index bd37859bc2..aa1b04b631 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -29,7 +29,6 @@
%% Main entry point.
-export([module/2]).
--import(ordsets, [from_list/1,union/2]).
-import(lists, [member/2,foldl/3,foldr/3]).
-type fa() :: {atom(), arity()}.
@@ -127,7 +126,7 @@ module_predef_func_beh_info(#expand{callbacks=Callbacks,
PreExp=PreDef,
{[gen_beh_info(Callbacks, OptionalCallbacks)],
St#expand{defined=gb_sets:union(gb_sets:from_list(PreDef), Defined),
- exports=union(from_list(PreExp), Exports)}}.
+ exports=ordsets:union(ordsets:from_list(PreExp), Exports)}}.
gen_beh_info(Callbacks, OptionalCallbacks) ->
List = make_list(Callbacks),
@@ -167,7 +166,8 @@ module_predef_funcs_mod_info(St) ->
[{atom,0,St#expand.module},{var,0,'X'}]}]}]}],
St#expand{defined=gb_sets:union(gb_sets:from_list(PreDef),
St#expand.defined),
- exports=union(from_list(PreExp), St#expand.exports)}}.
+ exports=ordsets:union(ordsets:from_list(PreExp),
+ St#expand.exports)}}.
%% forms(Forms, State) ->
%% {TransformedForms,State'}
@@ -194,7 +194,8 @@ attribute(module, Module, _L, St) ->
true = is_atom(Module),
St#expand{module=Module};
attribute(export, Es, _L, St) ->
- St#expand{exports=union(from_list(Es), St#expand.exports)};
+ St#expand{exports=ordsets:union(ordsets:from_list(Es),
+ St#expand.exports)};
attribute(import, Is, _L, St) ->
import(Is, St);
attribute(compile, _C, _L, St) ->
@@ -652,7 +653,7 @@ string_to_conses(Line, Cs, Tail) ->
import({Mod,Fs}, St) ->
true = is_atom(Mod),
- Mfs = from_list(Fs),
+ Mfs = ordsets:from_list(Fs),
St#expand{imports=add_imports(Mod, Mfs, St#expand.imports)}.
add_imports(Mod, [F|Fs], Is) ->