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

make should only look at reconsulted files, it makes no sense to use make for

Browse Source 
consulted files.
This commit is contained in:
Vítor Manuel de Morais Santos Costa 2009-10-16 08:31:23 +01:00
parent fc3c3b4e29
commit 0f4b64d199
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pl/consult.yap
View File

@ -208,7 +208,7 @@ use_module(M,F,Is) :-
nb_setval('$if_level',0), nb_setval('$if_level',0),
( nb_getval('$system_mode', OldMode) -> true ; OldMode = off), ( nb_getval('$system_mode', OldMode) -> true ; OldMode = off),
( OldMode == off -> '$enter_system_mode' ; true ), ( OldMode == off -> '$enter_system_mode' ; true ),
'$record_loaded'(Stream, ContextModule), '$record_loaded'(Stream, ContextModule, Reconsult),
'$current_module'(OldModule,ContextModule), '$current_module'(OldModule,ContextModule),
getcwd(OldD), getcwd(OldD),
nb_getval('$consulting_file',OldF), nb_getval('$consulting_file',OldF),
@ -411,11 +411,11 @@ prolog_load_context(term_position, Position) :-
'$ensure_file_loaded'(F, M, Imports) :- '$ensure_file_loaded'(F, M, Imports) :-
recorded('$module','$module'(F1,NM,P),_), recorded('$module','$module'(F1,NM,P),_),
recorded('$lf_loaded','$lf_loaded'(F1,_,_),_), recorded('$lf_loaded','$lf_loaded'(F1,_,_,_),_),
'$same_file'(F1,F), !, '$same_file'(F1,F), !,
'$use_preds'(Imports,P, NM, M). '$use_preds'(Imports,P, NM, M).
'$ensure_file_loaded'(F, M, _) :- '$ensure_file_loaded'(F, M, _) :-
recorded('$lf_loaded','$lf_loaded'(F1,M,_),_), recorded('$lf_loaded','$lf_loaded'(F1,M,_,_),_),
'$same_file'(F1,F), !. '$same_file'(F1,F), !.
@ -427,12 +427,12 @@ prolog_load_context(term_position, Position) :-
'$ensure_file_unchanged'(F, M, Imports) :- '$ensure_file_unchanged'(F, M, Imports) :-
recorded('$module','$module'(F1,NM,P),_), recorded('$module','$module'(F1,NM,P),_),
recorded('$lf_loaded','$lf_loaded'(F1,_,Age),R), recorded('$lf_loaded','$lf_loaded'(F1,_,Age,_),R),
'$same_file'(F1,F), !, '$same_file'(F1,F), !,
'$file_is_unchanged'(F, R, Age), '$file_is_unchanged'(F, R, Age),
'$use_preds'(Imports, P, NM, M). '$use_preds'(Imports, P, NM, M).
'$ensure_file_unchanged'(F, M, _) :- '$ensure_file_unchanged'(F, M, _) :-
recorded('$lf_loaded','$lf_loaded'(F1,M,Age),R), recorded('$lf_loaded','$lf_loaded'(F1,M,Age,_),R),
'$same_file'(F1,F), !, '$same_file'(F1,F), !,
'$file_is_unchanged'(F, R, Age). '$file_is_unchanged'(F, R, Age).
@ -516,16 +516,16 @@ remove_from_path(New) :- '$check_path'(New,Path),
file_directory_name(F, Dir), file_directory_name(F, Dir),
cd(Dir). cd(Dir).
'$record_loaded'(Stream, M) :- '$record_loaded'(Stream, M, Reconsult) :-
Stream \= user, Stream \= user,
Stream \= user_input, Stream \= user_input,
'$file_name'(Stream,F), '$file_name'(Stream,F),
( recorded('$lf_loaded','$lf_loaded'(F,M,_),R), erase(R), fail ; true ), ( recorded('$lf_loaded','$lf_loaded'(F,M,_,_),R), erase(R), fail ; true ),
'$file_age'(F,Age), '$file_age'(F,Age),
recorda('$lf_loaded','$lf_loaded'(F,M,Age),_), recorda('$lf_loaded','$lf_loaded'(F,M,Age,Reconsult),_),
fail. fail.
'$record_loaded'(_, _). '$record_loaded'(_, _, _).
% %
% encoding stuff: what I believe SWI does. % encoding stuff: what I believe SWI does.
@ -927,7 +927,7 @@ absolute_file_name(File,Opts,TrueFileName) :-
'$fetch_comp_status'(compact). '$fetch_comp_status'(compact).
make :- make :-
recorded('$lf_loaded','$lf_loaded'(F1,M,_),_), recorded('$lf_loaded','$lf_loaded'(F1,M,_,reconsult),_),
'$load_files'(F1, [if(changed)],make), '$load_files'(F1, [if(changed)],make),
fail. fail.
make. make.

2
pl/modules.yap
View File

@ -608,7 +608,7 @@ abolish_module(_).
(recorded('$import','$import'(Mod,Module,G,G1,N0,K0),_), writeln('$import'(Mod,Module,G,G1,N0,K0)), fail; true), (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,_,_),_),
recorded('$module', '$module'(CurrentFile, Module, ModExports), Ref), recorded('$module', '$module'(CurrentFile, Module, ModExports), Ref),
erase(Ref), erase(Ref),
lists:append(ModExports, MyExports, AllExports), lists:append(ModExports, MyExports, AllExports),