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

Merge branch 'master' of ssh://ssh.dcc.fc.up.pt:31064/home/vsc/yap

Browse Source
This commit is contained in:
Vitor Santos Costa
2019-01-31 12:08:28 +00:00
parent b71b4f6fca c1dc6b7fb2
commit f6b16ca505
8 changed files with 71 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
C/exec.c
View File

@@ -1734,6 +1734,11 @@ bool Yap_execute_pred(PredEntry *ppe, CELL *pt, bool pass_ex USES_REGS) {
// should we catch the exception or pass it through?
// We'll pass it through
if (pass_ex && Yap_HasException()) {
if ((LOCAL_PrologMode & BootMode) || !CurrentModule ) {
Yap_ResetException(LOCAL_ActiveError);
return false;
}
Yap_RaiseException();
return false;
}
@@ -1756,6 +1761,10 @@ bool Yap_execute_pred(PredEntry *ppe, CELL *pt, bool pass_ex USES_REGS) {
// should we catch the exception or pass it through?
// We'll pass it through
if (pass_ex) {
if ((LOCAL_PrologMode & BootMode) || !CurrentModule ) {
Yap_ResetException(LOCAL_ActiveError);
return false;
}
Yap_RaiseException();
}
return false;