This commit is contained in:
Vitor Santos Costa 2016-08-04 10:25:07 -05:00
parent b8045f1a39
commit 0029fdd0b4
2 changed files with 7 additions and 6 deletions

View File

@ -291,8 +291,8 @@ private(_).
'$early_print_message'(Context, Msg). '$early_print_message'(Context, Msg).
'$bootstrap_predicate'(print_message(Context, Msg), _M, _) :- !, '$bootstrap_predicate'(print_message(Context, Msg), _M, _) :- !,
'$early_print_message'(Context, Msg). '$early_print_message'(Context, Msg).
'$bootstrap_predicate'(prolog_file_type(A,B), _, prolog_file_type(A,prolog)) :- !. '$bootstrap_predicate'(prolog_file_type(A,B), _, prolog_file_type(A,B)) :- !, B = prolog.
'$bootstrap_predicate'(file_search_path(_A,B), _, _ ) :- !, fail. '$bootstrap_predicate'(file_search_path(_A,_B), _, _ ) :- !, fail.
'$bootstrap_predicate'(meta_predicate(G), M, _) :- !, '$bootstrap_predicate'(meta_predicate(G), M, _) :- !,
strip_module(M:G, M1, G1), strip_module(M:G, M1, G1),
'$meta_predicate'(M1:G1). '$meta_predicate'(M1:G1).
@ -369,12 +369,14 @@ true :- true.
( (
current_prolog_flag(saved_program, false) current_prolog_flag(saved_program, false)
-> ->
prolog_flag(verbose_load, OldVL, silent),
prolog_flag(verbose, OldV, silent), prolog_flag(verbose, OldV, silent),
prolog_flag(resource_database, RootPath), prolog_flag(resource_database, RootPath),
file_directory_name( RootPath, Dir ), file_directory_name( RootPath, Dir ),
atom_concat( Dir, '/init.yap' , Init), atom_concat( Dir, '/init.yap' , Init),
bootstrap(Init), bootstrap(Init),
% set_prolog_flag(verbose, OldV), prolog_flag(verbose, OldV, silent),
set_prolog_flag(verbose_load, OldVL),
module( user ), module( user ),
'$make_saved_state' '$make_saved_state'
; ;
@ -1327,7 +1329,7 @@ not(G) :- \+ '$execute'(G).
bootstrap(F) :- bootstrap(F) :-
% '$open'(F, '$csult', Stream, 0, 0, F), % '$open'(F, '$csult', Stream, 0, 0, F),
% '$file_name'(Stream,File), % '$file_name'(Stream,File),
% yap_flag(verbose_load, Old, silent), yap_flag(verbose_load, Old, silent),
open(F, read, Stream), open(F, read, Stream),
stream_property(Stream, [file_name(File)]), stream_property(Stream, [file_name(File)]),
'$start_consult'(consult, File, LC), '$start_consult'(consult, File, LC),

View File

@ -469,7 +469,6 @@ load_files(Files,Opts) :-
open( F, read, Stream , [type(binary)] ), open( F, read, Stream , [type(binary)] ),
( (
'$q_header'( Stream, Type ), '$q_header'( Stream, Type ),
writeln(File:Type),
Type == file Type == file
-> ->
! !