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

ENV may not be in scope of catch in very special cases (eg, call counter).

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-06-26 09:15:19 -05:00
parent ff20a23e64
commit 15f9a68a35
1 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
C/exec.c
View File

@ -1570,49 +1570,36 @@ JumpToEnv(Term t) {
if (!(t = Yap_SaveTerm(t))) if (!(t = Yap_SaveTerm(t)))
return FALSE; return FALSE;
} }
do { /* find the first choicepoint that may be a catch */
/* find the first choicepoint that may be a catch */ while (B != NULL && B->cp_ap != pos) {
while (B != NULL && B->cp_ap != pos) { /* we are already doing a catch */
/* we are already doing a catch */ if (B->cp_ap == catchpos) {
if (B->cp_ap == catchpos) { P = (yamop *)FAILCODE;
P = (yamop *)FAILCODE; if (first_func != NULL) {
if (first_func != NULL) { B = first_func;
B = first_func;
}
return(FALSE);
} }
if (B->cp_ap == NOCODE) { return(FALSE);
/* up to the C-code to deal with this! */
UncaughtThrow = TRUE;
B->cp_h = H;
EX = t;
return FALSE;
}
B = B->cp_b;
} }
/* uncaught throw */ if (B->cp_ap == NOCODE) {
if (B == NULL) { /* up to the C-code to deal with this! */
UncaughtThrow = TRUE; UncaughtThrow = TRUE;
B = B0; B->cp_h = H;
#if PUSH_REGS EX = t;
restore_absmi_regs(&Yap_standard_regs); return FALSE;
#endif
siglongjmp(Yap_RestartEnv,1);
} }
/* is it a continuation? */
env = B->cp_env;
while (env > ENV) {
ENV = ENV_Parent(ENV);
}
/* yes, we found it ! */
// while (env < ENV)
// env = ENV_Parent(env);
if (env == ENV) {
break;
}
/* oops, try next */
B = B->cp_b; B = B->cp_b;
} while (TRUE); }
/* uncaught throw */
if (B == NULL) {
UncaughtThrow = TRUE;
B = B0;
#if PUSH_REGS
restore_absmi_regs(&Yap_standard_regs);
#endif
siglongjmp(Yap_RestartEnv,1);
}
/* is it a continuation? */
env = ENV = B->cp_env;
/* step one environment above, otherwise we'll redo the original goal */ /* step one environment above, otherwise we'll redo the original goal */
B->cp_cp = (yamop *)env[E_CP]; B->cp_cp = (yamop *)env[E_CP];
B->cp_env = (CELL *)env[E_E]; B->cp_env = (CELL *)env[E_E];