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

fixes to warning and complicated cases where warnings are called insidewarning

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-07-22 19:04:22 -05:00
parent 1c6a138ce2
commit 69344f26d1
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
C/errors.c
View File

@ -1,3 +1,4 @@
/************************************************************************* /*************************************************************************
* * * *
* Yap Prolog * * Yap Prolog *
@ -29,6 +30,8 @@
#endif #endif
#include "Foreign.h" #include "Foreign.h"
static bool handled_exception( USES_REGS1 );
#if DEBUG #if DEBUG
void void
Yap_PrintPredName( PredEntry *ap ) Yap_PrintPredName( PredEntry *ap )
@ -107,13 +110,18 @@ Yap_PrintWarning( Term twarning )
bool rc; bool rc;
Term ts[2]; Term ts[2];
if (LOCAL_within_print_message) if (LOCAL_within_print_message) {
return false; /* error within error */
fprintf(stderr,"%% WARNING WITHIN WARNING\n");
Yap_RestartYap( 1 );
}
LOCAL_DoingUndefp = true;
LOCAL_within_print_message = true; LOCAL_within_print_message = true;
if (pred->OpcodeOfPred == UNDEF_OPCODE) { if (pred->OpcodeOfPred == UNDEF_OPCODE) {
fprintf(stderr, "warning message:\n"); fprintf(stderr, "warning message:\n");
Yap_DebugPlWrite( twarning ); Yap_DebugPlWrite( twarning );
fprintf(stderr, "\n"); fprintf(stderr, "\n");
LOCAL_DoingUndefp = false;
LOCAL_within_print_message = false; LOCAL_within_print_message = false;
return true; return true;
} }
@ -121,6 +129,7 @@ Yap_PrintWarning( Term twarning )
ts[1] = twarning; ts[1] = twarning;
rc = Yap_execute_pred( pred, ts , true PASS_REGS); rc = Yap_execute_pred( pred, ts , true PASS_REGS);
LOCAL_within_print_message = false; LOCAL_within_print_message = false;
LOCAL_DoingUndefp = false;
return rc; return rc;
} }
@ -452,11 +461,11 @@ detect_bug_location(yamop *yap_pc, find_pred_type where_from, char *tp, int psiz
} }
} }
static int static bool
handled_exception( USES_REGS1 ) handled_exception( USES_REGS1 )
{ {
yamop *pos = NEXTOP(PredDollarCatch->cs.p_code.TrueCodeOfPred,l); yamop *pos = NEXTOP(PredDollarCatch->cs.p_code.TrueCodeOfPred,l);
int found_handler = FALSE; bool found_handler = false;
choiceptr gc_b; choiceptr gc_b;
gc_b = B; gc_b = B;
@ -464,11 +473,11 @@ handled_exception( USES_REGS1 )
yamop *ap = gc_b->cp_ap; yamop *ap = gc_b->cp_ap;
if (ap == NOCODE) { if (ap == NOCODE) {
/* C-code: let they deal with that */ /* C-code: let they deal with that */
return FALSE; return false;
} else if (ap == pos) { } else if (ap == pos) {
if (found_handler) if (found_handler)
return TRUE; /* we have two handlers */ return TRUE; /* we have two handlers */
found_handler = TRUE; found_handler = true;
} }
gc_b = gc_b->cp_b; gc_b = gc_b->cp_b;
} }
@ -665,7 +674,24 @@ Yap_Error(yap_error_number type, Term where, const char *format,...)
} }
va_end (ap); va_end (ap);
fprintf(stderr,"%% ERROR WITHIN ERROR %d: %s\n", LOCAL_CurrentError, tmpbuf); fprintf(stderr,"%% ERROR WITHIN ERROR %d: %s\n", LOCAL_CurrentError, tmpbuf);
exit(1); Yap_RestartYap( 1 );
}
if (LOCAL_within_print_message) {
/* error within error */
va_start (ap, format);
/* now build the error string */
if (format != NULL) {
#if HAVE_VSNPRINTF
(void) vsnprintf(tmpbuf, YAP_BUF_SIZE, format, ap);
#else
(void) vsprintf(tmpbuf, format, ap);
#endif
} else {
tmpbuf[0] = '\0';
}
va_end (ap);
fprintf(stderr,"%% ERROR WITHIN WARNING %d: %s\n", LOCAL_CurrentError, tmpbuf);
Yap_RestartYap( 1 );
} }
/* must do this here */ /* must do this here */
if (type == FATAL_ERROR if (type == FATAL_ERROR