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

fix error handling in syntax_error (don't assume ARG2 has the output).

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-10-26 22:56:18 +00:00
parent 4c8eb33e06
commit 36a7e5c59e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
C/iopreds.c
View File

@ -3704,7 +3704,7 @@ clean_vars(VarEntry *p)
} }
static Term static Term
syntax_error (TokEntry * tokptr, int sno) syntax_error (TokEntry * tokptr, int sno, Term *outp)
{ {
Term info; Term info;
int count = 0, out = 0; int count = 0, out = 0;
@ -3798,7 +3798,7 @@ syntax_error (TokEntry * tokptr, int sno)
} }
tokptr = tokptr->TokNext; tokptr = tokptr->TokNext;
} }
tf[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomRead,1),1,&ARG2); tf[0] = Yap_MkApplTerm(Yap_MkFunctor(AtomRead,1),1,outp);
{ {
Term t[3]; Term t[3];
@ -4048,7 +4048,7 @@ static Int
/* try again */ /* try again */
goto repeat_cycle; goto repeat_cycle;
} else { } else {
Term terr = syntax_error(tokstart, inp_stream); Term terr = syntax_error(tokstart, inp_stream, &ARG2);
if (Yap_ErrorMessage == NULL) if (Yap_ErrorMessage == NULL)
Yap_ErrorMessage = "SYNTAX ERROR"; Yap_ErrorMessage = "SYNTAX ERROR";
@ -6132,7 +6132,8 @@ Yap_StringToTerm(char *s,Term *tp)
TR = TR_before_parse; TR = TR_before_parse;
if (!t && !Yap_ErrorMessage) { if (!t && !Yap_ErrorMessage) {
if (tp) { if (tp) {
*tp = syntax_error(tokstart, sno); t = MkVarTerm();
*tp = syntax_error(tokstart, sno, &t);
} }
Yap_clean_tokenizer(tokstart, Yap_VarTable, Yap_AnonVarTable); Yap_clean_tokenizer(tokstart, Yap_VarTable, Yap_AnonVarTable);
/* cannot actually use CloseStream, because we didn't allocate the buffer */ /* cannot actually use CloseStream, because we didn't allocate the buffer */