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

fix frame stuff

Browse Source 
small interface fix.
This commit is contained in:
ubu32 2011-02-14 06:58:03 -08:00
parent 1717b113b3
commit c277229aa9
1 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
library/dialect/swi/fli/swi.c
View File

@ -2061,6 +2061,9 @@ X_API void PL_predicate_info(predicate_t p,atom_t *name, int *arity, module_t *m
*name = AtomToSWIAtom(aname); *name = AtomToSWIAtom(aname);
} }
#undef S_YREG
X_API fid_t X_API fid_t
PL_open_foreign_frame(void) PL_open_foreign_frame(void)
{ {
@ -2072,36 +2075,67 @@ PL_open_foreign_frame(void)
new->cp = CP; new->cp = CP;
new->p = P; new->p = P;
new->slots = CurSlot; new->slots = CurSlot;
Yap_StartSlots();
execution = new; execution = new;
{
/* initialise a new marker choicepoint */
choiceptr cp_b = ((choiceptr)ASP)-1;
cp_b->cp_tr = TR;
cp_b->cp_h = H;
cp_b->cp_b = B;
cp_b->cp_cp = CP;
cp_b->cp_env = ENV;
cp_b->cp_ap = NOCODE;
HB = H;
B = cp_b;
ASP = (CELL *)B;
Yap_StartSlots();
}
return (fid_t)new; return (fid_t)new;
} }
X_API void X_API void
PL_close_foreign_frame(fid_t f) PL_close_foreign_frame(fid_t f)
{ {
execution = (open_query *)f; open_query *env = (open_query *)f;
CP = execution->cp; CP = env->cp;
P = execution->p; P = env->p;
CurSlot = execution->slots; CurSlot = env->slots;
execution = execution->old; ASP = (CELL *)(B+1);
B = B->cp_b;
execution = env->old;
free(env);
}
static void
backtrack(void)
{
P = FAILCODE;
Yap_absmi(0);
H = HB = B->cp_h;
TR = B->cp_tr;
TR = B->cp_tr;
} }
X_API void X_API void
PL_rewind_foreign_frame(fid_t f) PL_rewind_foreign_frame(fid_t f)
{ {
execution = (open_query *)f; open_query *env = (open_query *)f;
CurSlot = execution->slots; CurSlot = env->slots;
backtrack();
} }
X_API void X_API void
PL_discard_foreign_frame(fid_t f) PL_discard_foreign_frame(fid_t f)
{ {
execution = (open_query *)f; open_query *env = (open_query *)f;
CP = execution->cp; CurSlot = env->slots;
P = execution->p; backtrack();
CurSlot = execution->slots; CP = env->cp;
P = env->p;
execution = execution->old; execution = execution->old;
ASP = (CELL *)(B+1);
B = B->cp_b;
free(env);
} }
X_API qid_t PL_open_query(module_t ctx, int flags, predicate_t p, term_t t0) X_API qid_t PL_open_query(module_t ctx, int flags, predicate_t p, term_t t0)
@ -2654,14 +2688,15 @@ typedef int (*GetStreamF)(term_t, int, int, IOSTREAM **s);
int int
Yap_get_stream_handle(Term t0, int read_mode, int write_mode, void *s){ Yap_get_stream_handle(Term t0, int read_mode, int write_mode, void *s){
term_t t; atom_t t;
GetStreamF f = (GetStreamF)SWIGetStream; GetStreamF f = (GetStreamF)SWIGetStream;
if (t0 == MkAtomTerm(AtomUserOut) && write_mode && !read_mode) { Atom at = AtomOfTerm(t0);
if (at == AtomUserOut && write_mode && !read_mode) {
t = 0; t = 0;
} else if (t0 == MkAtomTerm(AtomUserIn) && !write_mode && read_mode) { } else if (at == AtomUserIn && !write_mode && read_mode) {
t = 0; t = 0;
} else { } else {
t = (term_t)YAP_InitSlot(t0); t = AtomToSWIAtom(at);
} }
return (*f)(t, read_mode, write_mode, s); return (*f)(t, read_mode, write_mode, s);
} }