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

handle :-use_module on non module.

Browse Source 
improve handling of redefinitions.
This commit is contained in:
Vítor Santos Costa 2014-05-25 20:51:42 +01:00
parent eaef6aba9a
commit 2c7e62ad71
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pl/modules.yap
View File

@ -128,9 +128,9 @@ module(N) :-
'$do_error'(type_error(atom,N),module(N)). '$do_error'(type_error(atom,N),module(N)).
'$module_dec'(N, Ps) :- '$module_dec'(N, Ps) :-
'$current_module'(_,N),
source_location(F, _), source_location(F, _),
'$add_module_on_file'(N, F, Ps). '$add_module_on_file'(N, F, Ps),
'$current_module'(_,N).
'$add_module_on_file'(Mod, F, Exports) :- '$add_module_on_file'(Mod, F, Exports) :-
recorded('$module','$module'(F0,Mod,_,_),R), !, recorded('$module','$module'(F0,Mod,_,_),R), !,
@ -159,12 +159,23 @@ module(N) :-
'$add_exports'( NewExports, OriginalExports, Exports ). '$add_exports'( NewExports, OriginalExports, Exports ).
% redefining a previously-defined file, no problem. % redefining the same previously-defined file, no problem.
'$add_preexisting_module_on_file'(F, F, Mod, Exports, R) :- !, '$add_preexisting_module_on_file'(F, F, Mod, Exports, R) :- !,
erase(R), erase(R),
( recorded('$import','$import'(Mod,_,_,_,_,_),R), erase(R), fail; true), ( recorded('$import','$import'(Mod,_,_,_,_,_),R), erase(R), fail; true),
( source_location(_, Line) -> true ; Line = 0 ), ( source_location(_, Line) -> true ; Line = 0 ),
recorda('$module','$module'(F,Mod,Exports, Line),_). recorda('$module','$module'(F,Mod,Exports, Line),_).
'$add_preexisting_module_on_file'(F,F0,Mod,Exports,R) :-
b_getval('$lf_status', TOpts),
'$lf_opt'(redefine_module, TOpts, RM),
( RM == false
->
'$do_error'(permission_error(module,redefined,Mod),module(Mod,Exports)), !
;
RM == true
->
'$add_preexisting_module_on_file'(F, F, Mod, Exports, R), !
).
'$add_preexisting_module_on_file'(F,F0,Mod,Exports,R) :- '$add_preexisting_module_on_file'(F,F0,Mod,Exports,R) :-
repeat, repeat,
format(user_error, "The module ~a is being redefined.~n Old file: ~a~n New file: ~a~nDo you really want to redefine it? (y or n)",[Mod,F0,F]), format(user_error, "The module ~a is being redefined.~n Old file: ~a~n New file: ~a~nDo you really want to redefine it? (y or n)",[Mod,F0,F]),