Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
This commit is contained in:
commit
5aa652d21e
@ -696,7 +696,7 @@ absolute_file_name(File,Opts,TrueFileName) :-
|
|||||||
;
|
;
|
||||||
nb:nb_queue_close(Ref, FileNames, [])
|
nb:nb_queue_close(Ref, FileNames, [])
|
||||||
),
|
),
|
||||||
'$absolute_file_names'(Solutions, FileNames, FError, TrueFileName, File, G).
|
'$absolute_file_names'(Solutions, FileNames, FErrors, TrueFileName, File, G).
|
||||||
|
|
||||||
'$absolute_file_names'(Solutions, [], error, _, File, G) :- !,
|
'$absolute_file_names'(Solutions, [], error, _, File, G) :- !,
|
||||||
'$do_error'(existence_error(file,File),G).
|
'$do_error'(existence_error(file,File),G).
|
||||||
|
@ -213,7 +213,7 @@ yap_flag(associate,X) :-
|
|||||||
yap_flag(associate,X) :-
|
yap_flag(associate,X) :-
|
||||||
atom(X), !,
|
atom(X), !,
|
||||||
set_value('$associate',X).
|
set_value('$associate',X).
|
||||||
yap_flag(bounded,X) :-
|
yap_flag(associate,X) :-
|
||||||
'$do_error'(type_error(atom,X),associate(X)).
|
'$do_error'(type_error(atom,X),associate(X)).
|
||||||
|
|
||||||
yap_flag(bounded,X) :-
|
yap_flag(bounded,X) :-
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
:- meta_predicate
|
:- meta_predicate
|
||||||
parallel(:),
|
parallel(:),
|
||||||
parallel_findall(?,:,?).
|
parallel_findall(?,:,?),
|
||||||
parallel_once(:).
|
parallel_once(:).
|
||||||
|
|
||||||
|
|
||||||
@ -161,7 +161,7 @@ parallel_once(Goal) :-
|
|||||||
|
|
||||||
'$parallel_once_query'(Goal) :-
|
'$parallel_once_query'(Goal) :-
|
||||||
'$c_yapor_start',
|
'$c_yapor_start',
|
||||||
'$execute'(Goal), !,
|
'$execute'(once(Goal)),
|
||||||
recordz(parallel_once,Goal,_),
|
recordz(parallel_once,Goal,_),
|
||||||
fail.
|
fail.
|
||||||
'$parallel_once_query'(_).
|
'$parallel_once_query'(_).
|
||||||
|
Reference in New Issue
Block a user