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

relative paths.

Browse Source
This commit is contained in:
Vítor Santos Costa 2016-01-31 10:43:42 +00:00
parent ae771e70e2
commit 32f6c44dea
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pl/absf.yap
View File

@ -238,7 +238,7 @@ absolute_file_name(File0,File) :-
'$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,File), !, '$cat_file_name'(File0,File), !,
'$add_path'(File, PFile), '$add_path'(File, Opts, PFile),
'$get_abs_file'(PFile,Opts,AbsFile), '$get_abs_file'(PFile,Opts,AbsFile),
'$absf_trace'('~w to ~w', [PFile, NewFile] ), '$absf_trace'('~w to ~w', [PFile, NewFile] ),
'$search_in_path'(AbsFile,Opts,NewFile). '$search_in_path'(AbsFile,Opts,NewFile).
@ -304,7 +304,7 @@ absolute_file_name(File0,File) :-
atom_concat( [File1, DA, Glob], File2 ), atom_concat( [File1, DA, Glob], File2 ),
expand_file_name(File2, ExpFiles), expand_file_name(File2, ExpFiles),
% glob is not very much into failing % glob is not very much into failing
[File2] \== ExpFiles, %[File2] \== ExpFiles,
'$enumerate_glob'(File2, ExpFiles, ExpFile) '$enumerate_glob'(File2, ExpFiles, ExpFile)
; ;
Expand == true Expand == true
@ -317,9 +317,9 @@ absolute_file_name(File0,File) :-
'$absf_trace'(' With globbing (glob=~q;expand=~a): ~w', [Glob,Expand,ExpFile] ). '$absf_trace'(' With globbing (glob=~q;expand=~a): ~w', [Glob,Expand,ExpFile] ).
'$enumerate_glob'(File1, [ExpFile], ExpFile) :- '$enumerate_glob'(_File1, [ExpFile], ExpFile) :-
!. !.
'$enumerate_glob'(File1, ExpFiles, ExpFile) :- '$enumerate_glob'(_File1, ExpFiles, ExpFile) :-
lists:member(ExpFile, ExpFiles), lists:member(ExpFile, ExpFiles),
file_base_name( ExpFile, Base ), file_base_name( ExpFile, Base ),
Base \= '.', Base \= '.',
@ -357,10 +357,14 @@ absolute_file_name(File0,File) :-
'$add_type_extensions'(_,File,File) :- '$add_type_extensions'(_,File,File) :-
'$absf_trace'(' wo extension ~w?', [File] ). '$absf_trace'(' wo extension ~w?', [File] ).
'$add_path'(File, File) :- '$add_path'(File, _, File) :-
is_absolute_file_name(File), !. is_absolute_file_name(File), !.
'$add_path'(File, File) :- '$add_path'(File, Opts, File) :-
working_directory(Dir, Dir), ( get_abs_file_parameter( relative_to, Opts, Dir ) ->
true
;
working_directory(Dir, Dir)
),
'$dir_separator'( D ), '$dir_separator'( D ),
atom_codes( DSep, [D] ), atom_codes( DSep, [D] ),
atomic_concat([Dir, DSep,File],PFile), atomic_concat([Dir, DSep,File],PFile),