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

we had args already (no need for argv0)

Browse Source 
improve error handling in YAP_ReadBuffer
This commit is contained in:
Vitor Santos Costa 2009-10-26 10:42:19 +00:00
parent 96da71b514
commit 4c8eb33e06
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
C/c_interface.c
View File

@ -1417,8 +1417,39 @@ YAP_ReadBuffer(char *s, Term *tp)
BACKUP_H();
while ((t = Yap_StringToTerm(s,tp)) == 0L) {
if (!dogc())
return FALSE;
if (Yap_ErrorMessage) {
if (!strcmp(Yap_ErrorMessage,"Stack Overflow")) {
if (!dogc()) {
*tp = MkAtomTerm(Yap_LookupAtom(Yap_ErrorMessage));
Yap_ErrorMessage = NULL;
RECOVER_H();
return 0L;
}
} else if (!strcmp(Yap_ErrorMessage,"Heap Overflow")) {
if (!Yap_growheap(FALSE, 0, NULL)) {
*tp = MkAtomTerm(Yap_LookupAtom(Yap_ErrorMessage));
Yap_ErrorMessage = NULL;
RECOVER_H();
return 0L;
}
} else if (!strcmp(Yap_ErrorMessage,"Trail Overflow")) {
if (!Yap_growtrail (0, FALSE)) {
*tp = MkAtomTerm(Yap_LookupAtom(Yap_ErrorMessage));
Yap_ErrorMessage = NULL;
RECOVER_H();
return 0L;
}
} else {
*tp = MkAtomTerm(Yap_LookupAtom(Yap_ErrorMessage));
Yap_ErrorMessage = NULL;
RECOVER_H();
return 0L;
}
Yap_ErrorMessage = NULL;
continue;
} else {
break;
}
}
RECOVER_H();
return t;

2
C/iopreds.c
View File

@ -6130,7 +6130,7 @@ Yap_StringToTerm(char *s,Term *tp)
}
t = Yap_Parse();
TR = TR_before_parse;
if (Yap_ErrorMessage) {
if (!t && !Yap_ErrorMessage) {
if (tp) {
*tp = syntax_error(tokstart, sno);
}

1
console/yap.c
View File

@ -765,7 +765,6 @@ init_standard_system(int argc, char *argv[], YAP_init_args *iap)
iap->ErrorNo = 0;
iap->ErrorCause = NULL;
iap->QuietMode = FALSE;
iap->Argv0 = argv[0];
BootMode = parse_yap_arguments(argc,argv,iap);

2
include/yap_structs.h
View File

@ -142,8 +142,6 @@ typedef struct {
int ErrorNo;
/* errorstring */
char *ErrorCause;
/* argv[0] */
char *Argv0;
} YAP_init_args;