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

put tracer.c back to normal.

Browse Source
This commit is contained in:
Vitor Santos Costa 2008-09-14 05:11:35 +01:00
parent f4100a8095
commit 473012316a
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
C/tracer.c
View File

@ -50,34 +50,39 @@ send_tracer_message(char *start, char *name, Int arity, char *mname, CELL *args)
int i; int i;
if (arity) { if (arity) {
fprintf(Yap_stderr, "%s %s:%s(", start, mname, name); if (args)
fprintf(Yap_stderr, "%s %s:%s(", start, mname, name);
else
fprintf(Yap_stderr, "%s %s:%s/%d", start, mname, name, arity);
} else { } else {
fprintf(Yap_stderr, "%s %s:%s", start, mname, name); fprintf(Yap_stderr, "%s %s:%s", start, mname, name);
} }
for (i= 0; i < arity; i++) { if (args) {
if (i > 0) fprintf(Yap_stderr, ","); for (i= 0; i < arity; i++) {
if (i > 0) fprintf(Yap_stderr, ",");
#if DEBUG #if DEBUG
#if COROUTINING #if COROUTINING
Yap_Portray_delays = FALSE; Yap_Portray_delays = FALSE;
#endif #endif
#endif #endif
omax_depth = max_depth; omax_depth = max_depth;
omax_list = max_list; omax_list = max_list;
omax_write_args = max_write_args; omax_write_args = max_write_args;
max_depth = 5; max_depth = 5;
max_list = 5; max_list = 5;
max_write_args = 10; max_write_args = 10;
Yap_plwrite(args[i], TracePutchar, Handle_vars_f); Yap_plwrite(args[i], TracePutchar, Handle_vars_f);
max_depth = omax_depth; max_depth = omax_depth;
max_list = omax_list; max_list = omax_list;
max_write_args = omax_write_args; max_write_args = omax_write_args;
#if DEBUG #if DEBUG
#if COROUTINING #if COROUTINING
Yap_Portray_delays = FALSE; Yap_Portray_delays = FALSE;
#endif #endif
#endif #endif
}
fprintf(Yap_stderr, ")");
} }
if (arity) fprintf(Yap_stderr, ")");
} }
fprintf(Yap_stderr, "\n"); fprintf(Yap_stderr, "\n");
} }
@ -308,11 +313,13 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
send_tracer_message("FAIL ", NULL, 0, NULL, args); send_tracer_message("FAIL ", NULL, 0, NULL, args);
mname = RepAtom(AtomOfTerm(Yap_Module_Name(pred)))->StrOfAE; mname = RepAtom(AtomOfTerm(Yap_Module_Name(pred)))->StrOfAE;
arity = pred->ArityOfPE; arity = pred->ArityOfPE;
if (arity == 0) if (arity == 0) {
s = RepAtom((Atom)pred->FunctorOfPred)->StrOfAE; s = RepAtom((Atom)pred->FunctorOfPred)->StrOfAE;
else send_tracer_message("RETRY CONSUMER: ", s, 0, mname, NULL);
} else {
s = RepAtom(NameOfFunctor((pred->FunctorOfPred)))->StrOfAE; s = RepAtom(NameOfFunctor((pred->FunctorOfPred)))->StrOfAE;
send_tracer_message("RETRY CONSUMER: ", s, 0, mname, NULL); send_tracer_message("RETRY CONSUMER: ", s, pred->ArityOfPE, mname, NULL);
}
break; break;
case retry_table_loader: case retry_table_loader:
send_tracer_message("FAIL ", NULL, 0, NULL, args); send_tracer_message("FAIL ", NULL, 0, NULL, args);