Merge branch 'master' of yap.dcc.fc.up.pt:yap-6

Conflicts:
	C/absmi.c
This commit is contained in:
Vitor Santos Costa 2010-10-12 23:22:23 +01:00
commit 755a57fdbd

View File

@ -2694,7 +2694,7 @@ Yap_absmi(int inp)
(PREG->opc != Yap_opcode(_procceed) && (PREG->opc != Yap_opcode(_procceed) &&
PREG->opc != Yap_opcode(_cut_e))) { PREG->opc != Yap_opcode(_cut_e))) {
GONext(); GONext();
} }
PP = PREG->u.p.p; PP = PREG->u.p.p;
ASP = YREG+E_CB; ASP = YREG+E_CB;
/* cut_e */ /* cut_e */