minor changes

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@142 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2001-08-27 14:44:07 +00:00
parent 5390e2e92f
commit 41cc6c0f4e
5 changed files with 27 additions and 9 deletions

View File

@ -1242,6 +1242,18 @@ absmi(int inp)
}
}
break;
case _trie_retry_var:
case _trie_retry_val:
case _trie_retry_atom:
case _trie_retry_list:
case _trie_retry_struct:
case _trie_trust_var:
case _trie_trust_val:
case _trie_trust_atom:
case _trie_trust_list:
case _trie_trust_struct:
low_level_trace(retry_table_consumer, NULL, NULL);
break;
case _table_retry_me:
case _table_trust_me:
low_level_trace(retry_pred, (PredEntry *)(PREG->u.lds.p), (CELL *)(((gen_cp_ptr)B)+1));

View File

@ -133,7 +133,7 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
/* if (vsc_count < 2518) return; */
/* if (vsc_count > 500000) exit(0); */
/* if (gc_calls < 1) return;*/
YP_fprintf(YP_stderr,"%lu (%x,%d)", vsc_count, CreepFlag,yap_flags[SPY_CREEP_FLAG]);
YP_fprintf(YP_stderr,"%lu (%d)", vsc_count, CurrentModule);
/* check_trail_consistency(); */
if (pred == NULL) {
return;

View File

@ -399,9 +399,12 @@ void rebind_variables(tr_fr_ptr rebind_tr, tr_fr_ptr end_tr) {
TABLING_ERROR_MESSAGE("rebind_tr < end_tr (function rebind_variables)");
#endif /* TABLING_ERRORS */
/* rebind loop */
printf("LCL0 is %p TR %p\n", LCL0, TR);
NEW_MAHASH((ma_h_inner_struct *)H);
printf("new cicle from %p at %p\n", rebind_tr, end_tr);
while (rebind_tr != end_tr) {
CELL ref = (CELL) TrailTerm(--rebind_tr);
printf("doing %x at %p\n", ref, rebind_tr);
/* check for global or local variables */
if (IsVarTerm(ref)) {
/* rebind variable */
@ -421,15 +424,13 @@ void rebind_variables(tr_fr_ptr rebind_tr, tr_fr_ptr end_tr) {
#ifdef MULTI_ASSIGNMENT_VARIABLES
} else {
CELL *cell_ptr = RepAppl(ref);
CELL *trp;
if (!lookup_ma_var(cell_ptr)) {
/* first time we found the variable, let's put the new value */
*cell_ptr = TrailVal(rebind_tr);
}
/* skip the old value */
trp = (CELL *)rebind_tr;
rebind_tr = (tr_fr_ptr)(trp-1);
rebind_tr--;
#endif
}
}

View File

@ -16,6 +16,8 @@
<h2>Yap-4.3.20:</h2>
<ul>
<li>FIXED: avoid unnecessary choice-point in
yap_flag(user_*,Who) (report from Nicos Angelopoulos).</li>
<li>FIXED: flush should work with readline.</li>
<li>FIXED: reset alarm at top-level.</li>
<li>FIXED: do signal(ALARM) immediately.</li>

View File

@ -462,24 +462,27 @@ yap_flag(write_strings,X) :-
yap_flag(user_input,OUT) :-
var(OUT), !,
stream_property(OUT,[alias(user_input)]).
'$flag_check_alias'(OUT, user_input).
yap_flag(user_input,Stream) :-
'$change_alias_to_stream'(user_input,Stream).
yap_flag(user_output,OUT) :-
var(OUT), !,
stream_property(OUT,[alias(user_output)]).
'$flag_check_alias'(OUT, user_output).
yap_flag(user_output,Stream) :-
'$change_alias_to_stream'(user_output,Stream).
yap_flag(user_error,OUT) :-
var(OUT), !,
stream_property(OUT,[alias(user_error)]).
'$flag_check_alias'(OUT, user_error).
yap_flag(user_error,Stream) :-
'$change_alias_to_stream'(user_error,Stream).
'$flag_check_alias'(OUT, Alias) :-
stream_property(OUT,[alias(Alias)]), !.
yap_flag(debugger_print_options,OUT) :-
var(OUT),
'$recorded'('$print_options','$debugger'(OUT),_), !.