diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't import everything in a module by default when reexporting it #134

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-06-14 12:16:54 -05:00
parent b4ff9b492a
commit a22f66a4fa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pl/modules.yap
View File

@ -602,9 +602,10 @@ abolish_module(_).
Goal = reexport(ModuleSource,Spec) Goal = reexport(ModuleSource,Spec)
), ),
absolute_file_name(ModuleSource, File), absolute_file_name(ModuleSource, File),
'$load_files'(File, [if(not_loaded)], Goal), '$load_files'(File, [if(not_loaded),imports([])], Goal),
recorded('$module', '$module'(FullFile, Mod, Exports),_), recorded('$module', '$module'(FullFile, Mod, Exports),_),
atom_concat(File, _, FullFile), !, atom_concat(File, _, FullFile), !,
(recorded('$import','$import'(Mod,Module,G,G1,N0,K0),_), writeln('$import'(Mod,Module,G,G1,N0,K0)), fail; true),
'$convert_for_reexport'(Spec, Exports, Tab, MyExports, Goal), '$convert_for_reexport'(Spec, Exports, Tab, MyExports, Goal),
'$add_to_imports'(Tab, Module, Mod), '$add_to_imports'(Tab, Module, Mod),
recorded('$lf_loaded','$lf_loaded'(TopFile,TopModule,_),_), recorded('$lf_loaded','$lf_loaded'(TopFile,TopModule,_),_),
@ -632,7 +633,7 @@ abolish_module(_).
'$clean_conversion'([(N1/A1 as N2)|Ps], List, [N1/A1-N2/A1|Tab], [N2/A1|MyExports], Goal) :- '$clean_conversion'([(N1/A1 as N2)|Ps], List, [N1/A1-N2/A1|Tab], [N2/A1|MyExports], Goal) :-
lists:memberchk(N1/A1, List), !, lists:memberchk(N1/A1, List), !,
'$clean_conversion'(Ps, List, Tab, MyExports, Goal). '$clean_conversion'(Ps, List, Tab, MyExports, Goal).
'$clean_conversion'([P|_], _, _, _, Goal) :- '$clean_conversion'([P|_], _List, _, _, Goal) :-
'$do_error'(domain_error(module_reexport_predicates,P), Goal). '$do_error'(domain_error(module_reexport_predicates,P), Goal).
'$neg_conversion'([], _, [], [], _). '$neg_conversion'([], _, [], [], _).
@ -646,11 +647,11 @@ abolish_module(_).
'$neg_conversion'(Ps, List, Tab, MyExports, Goal). '$neg_conversion'(Ps, List, Tab, MyExports, Goal).
'$add_to_imports'([], _, _). '$add_to_imports'([], _, _).
'$add_to_imports'([N0/K0-N1/_|Tab], Mod, ModR) :- '$add_to_imports'([N0/K0-N1/K1|Tab], Mod, ModR) :-
functor(G,N0,K0), functor(G,N0,K0),
G=..[N0|Args], G=..[N0|Args],
G1=..[N1|Args], G1=..[N1|Args],
recordaifnot('$import','$import'(ModR,Mod,G,G1,N0,K0),_), recordaifnot('$import','$import'(ModR,Mod,G,G1,N0,K0),_), !,
'$add_to_imports'(Tab, Mod, ModR). '$add_to_imports'(Tab, Mod, ModR).
% I assume the clause has been processed, so the % I assume the clause has been processed, so the