This commit is contained in:
Vitor Santos Costa 2018-08-09 02:07:57 +01:00
parent 3b186a064a
commit 4a28e5861a
2 changed files with 6 additions and 2 deletions

View File

@ -1347,8 +1347,11 @@ account the following observations:
*/ */
'$reexport'( TOpts, File, Reexport, Imports, OldF ) :- '$reexport'( TOpts, File, Reexport, Imports, OldF ) :-
( Reexport == false -> true ; ( Reexport == false -> true ;
'$lf_opt'('$parent_topts', TOpts, OldTOpts), ( '$lf_opt'('$parent_topts', TOpts, OldTOpts),
'$lf_opt'('$context_module', OldTOpts, OldContextModule), '$lf_opt'('$context_module', OldTOpts, OldContextModule)
;
OldContextModule = user
),
'$import_to_current_module'(File, OldContextModule, Imports, _, TOpts), '$import_to_current_module'(File, OldContextModule, Imports, _, TOpts),
'$extend_exports'(File, Imports, OldF ) '$extend_exports'(File, Imports, OldF )
). ).

View File

@ -429,6 +429,7 @@ export_list(Module, List) :-
'$do_import'(T, Module, ContextModule), '$do_import'(T, Module, ContextModule),
'$add_to_imports'(Tab, Module, ContextModule). '$add_to_imports'(Tab, Module, ContextModule).
%'$do_import'(K, _, _) :- writeln(K), fail.
'$do_import'(op(Prio,Assoc,Name), _Mod, ContextMod) :- '$do_import'(op(Prio,Assoc,Name), _Mod, ContextMod) :-
op(Prio,Assoc,ContextMod:Name). op(Prio,Assoc,ContextMod:Name).
'$do_import'(N0/K0-N0/K0, Mod, Mod) :- !. '$do_import'(N0/K0-N0/K0, Mod, Mod) :- !.