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

don't go set jumping if in UserCCode. Just say there is an exception.

This commit is contained in:
Vítor Santos Costa 2010-08-04 11:34:04 +01:00
parent e913087190
commit 2d425fb7b4
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
C/errors.c
View File

@ -1846,12 +1846,24 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
siglongjmp(Yap_RestartEnv,1); siglongjmp(Yap_RestartEnv,1);
} }
UNLOCK(SignalLock); UNLOCK(SignalLock);
if (type == PURE_ABORT) { /* wait if we we are in user code,
Yap_JumpToEnv(MkAtomTerm(AtomDAbort)); it's up to her to decide */
CreepFlag = LCL0-ASP;
} else if (Yap_PrologMode & UserCCallMode) {
Yap_JumpToEnv(Yap_MkApplTerm(fun, 2, nt)); if (EX) {
P = (yamop *)FAILCODE; if (!(EX = Yap_StoreTermInDB(Yap_MkApplTerm(fun, 2, nt), 0))) {
/* fat chance */
siglongjmp(Yap_RestartEnv,1);
}
}
} else {
if (type == PURE_ABORT) {
Yap_JumpToEnv(MkAtomTerm(AtomDAbort));
CreepFlag = LCL0-ASP;
} else
Yap_JumpToEnv(Yap_MkApplTerm(fun, 2, nt));
P = (yamop *)FAILCODE;
}
} else { } else {
Yap_PrologMode &= ~InErrorMode; Yap_PrologMode &= ~InErrorMode;
} }