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

simplify absf

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-03-09 12:26:07 +00:00
parent 9408c8a866
commit 265bc20f90
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pl/absf.yap
View File

@ -154,14 +154,12 @@ absolute_file_name(File,Opts,TrueFileName) :-
fail. fail.
'$find_in_path'(S, Opts, NewFile, Call) :- '$find_in_path'(S, Opts, NewFile, Call) :-
S =.. [Name,File0], S =.. [Name,File0],
'$cat_file_name'(File0,File1), !, '$cat_file_name'(File0,File), !,
'$expand_file_name'(File1, File),
'$dir_separator'(D), '$dir_separator'(D),
atom_codes(A,[D]), atom_codes(A,[D]),
'$extend_path_directory'(Name, A, File, Opts, NewFile, Call). '$extend_path_directory'(Name, A, File, Opts, NewFile, Call).
'$find_in_path'(File0,Opts,NewFile,_) :- '$find_in_path'(File0,Opts,NewFile,_) :-
'$cat_file_name'(File0,File1), !, '$cat_file_name'(File0,File), !,
'$expand_file_name'(File1, File),
'$add_path'(File,PFile), '$add_path'(File,PFile),
'$get_abs_file'(PFile,Opts,AbsFile), '$get_abs_file'(PFile,Opts,AbsFile),
'$search_in_path'(AbsFile,Opts,NewFile). '$search_in_path'(AbsFile,Opts,NewFile).
@ -186,28 +184,28 @@ absolute_file_name(File,Opts,TrueFileName) :-
'$to_list_of_atoms'(Bs, L2, LF). '$to_list_of_atoms'(Bs, L2, LF).
'$get_abs_file'(File,opts(_,RelTo,_,_,_,Expand,_),AbsFile) :- '$get_abs_file'(File,opts(_,RelTo,_,_,_,Expand,_),AbsFile) :-
(
nonvar(RelTo)
->
( is_absolute_file_name(File) ->
ActualFile = File
;
'$dir_separator'(D),
atom_codes(DA,[D]),
atom_concat([RelTo, DA, File], ActualFile)
)
;
ActualFile = File
),
'$swi_current_prolog_flag'(file_name_variables, OldF), '$swi_current_prolog_flag'(file_name_variables, OldF),
'$swi_set_prolog_flag'(file_name_variables, Expand), '$swi_set_prolog_flag'(file_name_variables, Expand),
( (
'$absolute_file_name'(ActualFile,AbsFile) '$absolute_file_name'(File,ExpFile)
-> ->
'$swi_set_prolog_flag'(file_name_variables, OldF) '$swi_set_prolog_flag'(file_name_variables, OldF)
; ;
'$swi_set_prolog_flag'(file_name_variables, OldF), '$swi_set_prolog_flag'(file_name_variables, OldF),
fail fail
),
(
nonvar(RelTo)
->
( is_absolute_file_name(ExpFile) ->
AbsFile = ExpFile
;
'$dir_separator'(D),
atom_codes(DA,[D]),
atom_concat([RelTo, DA, ExpFile], AbsFile)
)
;
AbsFile = ExpFile
). ).
@ -284,8 +282,8 @@ absolute_file_name(File,Opts,TrueFileName) :-
% not installed on registry % not installed on registry
'$system_library_directories'(Library, Dir) :- '$system_library_directories'(Library, Dir) :-
'$yap_paths'(_DLLs, ODir1, OBinDir ), '$yap_paths'(_DLLs, ODir1, OBinDir ),
'$expand_file_name'( ODir1, Dir1 ), '$absolute_file_name'( ODir1, Dir1 ),
'$expand_file_name'( OBinDir, BinDir ), '$absolute_file_name'( OBinDir, BinDir ),
% '$swi_current_prolog_flag'(executable, Bin1), % '$swi_current_prolog_flag'(executable, Bin1),
% prolog_to_os_filename( Bin2, Bin1 ), % prolog_to_os_filename( Bin2, Bin1 ),
% file_directory_name( Bin2, BinDir1 ), % file_directory_name( Bin2, BinDir1 ),