Merge branch 'master' of /mnt/hgfs/vsc/git/yap-6.3
This commit is contained in:
commit
77d3101bd8
@ -766,6 +766,8 @@ static Int cont_current_predicate(USES_REGS1) {
|
|||||||
PredEntry *pp;
|
PredEntry *pp;
|
||||||
t1 = Yap_YapStripModule(t1, &t2);
|
t1 = Yap_YapStripModule(t1, &t2);
|
||||||
t3 = Yap_YapStripModule(t3, &t2);
|
t3 = Yap_YapStripModule(t3, &t2);
|
||||||
|
t1 = Deref(t1);
|
||||||
|
t2 = Deref(t2);
|
||||||
task = Deref(ARG4);
|
task = Deref(ARG4);
|
||||||
|
|
||||||
pp = AddressOfTerm(EXTRA_CBACK_ARG(4, 1));
|
pp = AddressOfTerm(EXTRA_CBACK_ARG(4, 1));
|
||||||
|
@ -292,7 +292,7 @@ abolish(X0) :-
|
|||||||
|
|
||||||
'$new_abolish'(V,M) :- var(V), !,
|
'$new_abolish'(V,M) :- var(V), !,
|
||||||
'$abolish_all'(M).
|
'$abolish_all'(M).
|
||||||
'$new_abolish'(A,M) :- atom(A), !,
|
'$new_abolish'(A/V,M) :- atom(A), var(V), !,
|
||||||
'$abolish_all_atoms'(A,M).
|
'$abolish_all_atoms'(A,M).
|
||||||
'$new_abolish'(Na//Ar1, M) :-
|
'$new_abolish'(Na//Ar1, M) :-
|
||||||
integer(Ar1),
|
integer(Ar1),
|
||||||
|
Reference in New Issue
Block a user