Merge branch 'master' of ../yap-6.2

This commit is contained in:
Vítor Santos Costa 2010-12-13 20:39:44 +00:00
commit 9bea8b5f82
2 changed files with 8 additions and 3 deletions

View File

@ -1002,6 +1002,8 @@ exec_absmi(int top)
Yap_PrologMode = UserMode;
}
Yap_CloseSlots();
YENV = ASP;
YENV[E_CB] = Unsigned (B);
out = Yap_absmi(0);
Yap_StartSlots();
/* make sure we don't leave a FAIL signal hanging around */
@ -1019,6 +1021,9 @@ init_stack(int arity, CELL *pt, int top, choiceptr saved_b)
collection is going up in the environment chain it doesn't get
confused */
EX = NULL;
/* always have an empty slots for people to use */
CurSlot = 0;
Yap_StartSlots();
// sl = Yap_InitSlot(t);
YENV = ASP;
YENV[E_CP] = (CELL)P;
@ -1054,9 +1059,9 @@ init_stack(int arity, CELL *pt, int top, choiceptr saved_b)
#if defined(YAPOR) || defined(THREADS)
WPP = NULL;
#endif
YENV[E_CB] = Unsigned (B);
CP = YESCODE;
/* start with some slots so that we can use them */
Yap_StartSlots();
CP = YESCODE;
}
static Term

View File

@ -177,7 +177,7 @@ no_style_check([H|T]) :- no_style_check(H), no_style_check(T).
'$ground_vars'(V2L).
'$sv_list'([],[]).
'$sv_list'([[[95|_]|_]|T],L) :-
'$sv_list'([[95|_]._|T],L) :- !,
'$sv_list'(T,L).
'$sv_list'([_|V].T,L) :- nonvar(V), !,
'$sv_list'(T,L).