Merge branch 'master' of ssh://git.code.sf.net/p/yap/yap-6.3
This commit is contained in:
commit
36087849f0
@ -690,6 +690,7 @@ message_queue_property(Id, Prop) :-
|
|||||||
var(Term), !,
|
var(Term), !,
|
||||||
'$do_error'(instantiation_error, Goal).
|
'$do_error'(instantiation_error, Goal).
|
||||||
'$check_message_queue_or_alias'(Term, Goal) :-
|
'$check_message_queue_or_alias'(Term, Goal) :-
|
||||||
|
\+ integer(Term),
|
||||||
\+ atom(Term),
|
\+ atom(Term),
|
||||||
Term \= '$message_queue'(_), !,
|
Term \= '$message_queue'(_), !,
|
||||||
'$do_error'(domain_error(queue_or_alias, Term), Goal).
|
'$do_error'(domain_error(queue_or_alias, Term), Goal).
|
||||||
@ -697,7 +698,6 @@ message_queue_property(Id, Prop) :-
|
|||||||
\+ recorded('$queue', q(_,_,_,I,_), _), !,
|
\+ recorded('$queue', q(_,_,_,I,_), _), !,
|
||||||
'$do_error'(existence_error(queue, '$message_queue'(I)), Goal).
|
'$do_error'(existence_error(queue, '$message_queue'(I)), Goal).
|
||||||
'$check_message_queue_or_alias'(Term, Goal) :-
|
'$check_message_queue_or_alias'(Term, Goal) :-
|
||||||
atom(Term),
|
|
||||||
\+ recorded('$queue', q(Term,_,_,_,_), _), !,
|
\+ recorded('$queue', q(Term,_,_,_,_), _), !,
|
||||||
'$do_error'(existence_error(queue, Term), Goal).
|
'$do_error'(existence_error(queue, Term), Goal).
|
||||||
'$check_message_queue_or_alias'(_, _).
|
'$check_message_queue_or_alias'(_, _).
|
||||||
@ -871,7 +871,7 @@ thread_property(Id, Prop) :-
|
|||||||
'$enumerate_threads'(Id) :-
|
'$enumerate_threads'(Id) :-
|
||||||
'$max_threads'(Max),
|
'$max_threads'(Max),
|
||||||
Max1 is Max-1,
|
Max1 is Max-1,
|
||||||
'$between'(0,Max1,Id),
|
between(0,Max1,Id),
|
||||||
'$thread_stacks'(Id, _, _, _).
|
'$thread_stacks'(Id, _, _, _).
|
||||||
|
|
||||||
'$thread_property'(Id, alias(Alias)) :-
|
'$thread_property'(Id, alias(Alias)) :-
|
||||||
|
Reference in New Issue
Block a user