debugging fixes

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2238 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2008-05-15 18:31:02 +00:00
parent 316811d2cd
commit 511181b472
3 changed files with 9 additions and 7 deletions

View File

@ -262,7 +262,7 @@ copy_execn_to_heap(Functor f, CELL *pt, unsigned int n, unsigned int arity, Term
*H++ = pt[i]; *H++ = pt[i];
} }
for (i=0; i< n; i++) { for (i=0; i< n; i++) {
*H++ = h0[i-n]; *H++ = h0[(int)(i-n)];
} }
tf = AbsPair(h0); tf = AbsPair(h0);
} else { } else {
@ -271,7 +271,7 @@ copy_execn_to_heap(Functor f, CELL *pt, unsigned int n, unsigned int arity, Term
*H++ = pt[i]; *H++ = pt[i];
} }
for (i=0; i< n; i++) { for (i=0; i< n; i++) {
*H++ = h0[i-n]; *H++ = h0[(int)(i-n)];
} }
tf = AbsAppl(h0); tf = AbsAppl(h0);
} }
@ -326,7 +326,6 @@ do_execute_n(Term t, Term mod, unsigned int n)
if (IsExtensionFunctor(f)) { if (IsExtensionFunctor(f)) {
return CallError(TYPE_ERROR_CALLABLE, mod); return CallError(TYPE_ERROR_CALLABLE, mod);
} }
arity = ArityOfFunctor(f);
if (PRED_GOAL_EXPANSION_ALL) { if (PRED_GOAL_EXPANSION_ALL) {
LOCK(SignalLock); LOCK(SignalLock);
@ -384,9 +383,9 @@ EnterCreepMode(Term t, Term mod) {
} }
PredCreep = RepPredProp(PredPropByFunc(FunctorCreep,1)); PredCreep = RepPredProp(PredPropByFunc(FunctorCreep,1));
if (mod) { if (mod) {
ARG1 = MkPairTerm(mod,ARG1); ARG1 = MkPairTerm(mod,t);
} else { } else {
ARG1 = MkPairTerm(TermProlog,ARG1); ARG1 = MkPairTerm(TermProlog,t);
} }
LOCK(SignalLock); LOCK(SignalLock);
CreepFlag = CalculateStackGap(); CreepFlag = CalculateStackGap();

View File

@ -17,6 +17,8 @@ xb
<h2>Yap-5.1.3:</h2> <h2>Yap-5.1.3:</h2>
<ul> <ul>
<li> FIXED: make sure we return to system mode on failing yesno.</li>
<li> FIXED: debugger was broken on call/n.</li>
<li> FIXED: user:expand_goal should be called before import, <li> FIXED: user:expand_goal should be called before import,
not after.</li> not after.</li>
<li> NEW: add apply SWI library to apply_macros.</li> <li> NEW: add apply SWI library to apply_macros.</li>

View File

@ -497,7 +497,8 @@ true :- true.
), ),
fail. fail.
'$yes_no'(_,_) :- '$yes_no'(_,_) :-
'$out_neg_answer'. '$enter_system_mode',
'$out_neg_answer'.
'$add_env_and_fail' :- fail. '$add_env_and_fail' :- fail.
@ -513,7 +514,7 @@ true :- true.
'$do_yes_no'(G, M) :- '$do_yes_no'(G, M) :-
'$exit_system_mode', '$exit_system_mode',
'$execute'(M:G), '$execute'(M:G),
( '$enter_system_mode' ; '$exit_system_mode', fail ). ( '$enter_system_mode' ; '$exit_system_mode', fail).
'$write_query_answer_true'([]) :- !, '$write_query_answer_true'([]) :- !,
format(user_error,'~ntrue',[]). format(user_error,'~ntrue',[]).