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

fix reloading of foreign files: don't allow it even if you are

Browse Source 
reconsulting, it makes no sense.
This commit is contained in:
Vitor Santos Costa 2014-10-10 12:52:03 +01:00
parent 946f6cebf3
commit 96149d991f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pl/load_foreign.yap
View File

@ -56,8 +56,9 @@ load_foreign_files(Objs,Libs,Entry) :-
'$check_objs_for_load_foreign_files'(Objs,NewObjs,load_foreign_files(Objs,Libs,Entry)), '$check_objs_for_load_foreign_files'(Objs,NewObjs,load_foreign_files(Objs,Libs,Entry)),
'$check_libs_for_load_foreign_files'(Libs,NewLibs,load_foreign_files(Objs,Libs,Entry)), '$check_libs_for_load_foreign_files'(Libs,NewLibs,load_foreign_files(Objs,Libs,Entry)),
'$check_entry_for_load_foreign_files'(Entry,load_foreign_files(Objs,Libs,Entry)), '$check_entry_for_load_foreign_files'(Entry,load_foreign_files(Objs,Libs,Entry)),
'$current_module'( M ), (
recordzifnot( '$foreign', M:'$foreign'(Objs,Libs,Entry), _), recordzifnot( '$foreign', M:'$foreign'(Objs,Libs,Entry), _)
->
'$load_foreign_files'(NewObjs,NewLibs,Entry), '$load_foreign_files'(NewObjs,NewLibs,Entry),
( (
prolog_load_context(file, F) prolog_load_context(file, F)
@ -65,7 +66,11 @@ load_foreign_files(Objs,Libs,Entry) :-
ignore( recordzifnot( '$load_foreign_done', [F, M], _) ) ignore( recordzifnot( '$load_foreign_done', [F, M], _) )
; ;
true true
), !. )
;
true
),
!.
'$check_objs_for_load_foreign_files'(V,_,G) :- var(V), !, '$check_objs_for_load_foreign_files'(V,_,G) :- var(V), !,
'$do_error'(instantiation_error,G). '$do_error'(instantiation_error,G).