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

fix handling of end_of_file before end_of_term

Browse Source 
fix overflow in constructing syntax error term.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@447 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-04-19 14:42:58 +00:00
parent d3942df58c
commit 4824e0f247
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
C/iopreds.c
View File

@ -2688,12 +2688,20 @@ syntax_error (TokEntry * tokptr)
Int start, err = 0, end; Int start, err = 0, end;
Term tf[6]; Term tf[6];
Term *error = tf+3; Term *error = tf+3;
CELL *Hi = H;
start = tokptr->TokPos; start = tokptr->TokPos;
clean_vars(VarTable); clean_vars(VarTable);
while (1) { while (1) {
Term ts[2]; Term ts[2];
if (H > ASP-1024) {
H = Hi;
tf[3] = TermNil;
err = 0;
end = 0;
break;
}
if (tokptr == toktide) { if (tokptr == toktide) {
err = tokptr->TokPos; err = tokptr->TokPos;
out = count; out = count;
@ -2727,7 +2735,6 @@ syntax_error (TokEntry * tokptr)
case String_tok: case String_tok:
{ {
Term t0 = StringToList((char *)info); Term t0 = StringToList((char *)info);
fprintf(stderr,"looking at string %s\n", (char *)info);
ts[0] = MkApplTerm(MkFunctor(LookupAtom("string"),1),1,&t0); ts[0] = MkApplTerm(MkFunctor(LookupAtom("string"),1),1,&t0);
} }
break; break;
@ -2916,7 +2923,7 @@ p_read (void)
} }
/* we need to force the next reading to also give end of file.*/ /* we need to force the next reading to also give end of file.*/
Stream[c_input_stream].status |= Push_Eof_Stream_f; Stream[c_input_stream].status |= Push_Eof_Stream_f;
ErrorMessage = "[ Error: end of file found before end of term ]"; ErrorMessage = "end of file found before end of term";
} else { } else {
/* restore TR */ /* restore TR */
TR = old_TR; TR = old_TR;
@ -2938,9 +2945,10 @@ p_read (void)
if (parser_error_style == QUIET_ON_PARSER_ERROR) { if (parser_error_style == QUIET_ON_PARSER_ERROR) {
return(FALSE); return(FALSE);
} }
if (ErrorMessage) if (ErrorMessage) {
YP_fprintf (YP_stderr, "%s", ErrorMessage); Error(SYNTAX_ERROR,syntax_error(tokstart),ErrorMessage);
else { return(FALSE);
} else {
Error(SYNTAX_ERROR,syntax_error(tokstart),"SYNTAX ERROR"); Error(SYNTAX_ERROR,syntax_error(tokstart),"SYNTAX ERROR");
return(FALSE); return(FALSE);
} }
@ -4842,8 +4850,8 @@ InitIOPreds(void)
InitCPred ("$put_byte", 2, p_put_byte, SafePredFlag|SyncPredFlag); InitCPred ("$put_byte", 2, p_put_byte, SafePredFlag|SyncPredFlag);
InitCPred ("$set_read_error_handler", 1, p_set_read_error_handler, SafePredFlag|SyncPredFlag); InitCPred ("$set_read_error_handler", 1, p_set_read_error_handler, SafePredFlag|SyncPredFlag);
InitCPred ("$get_read_error_handler", 1, p_get_read_error_handler, SafePredFlag|SyncPredFlag); InitCPred ("$get_read_error_handler", 1, p_get_read_error_handler, SafePredFlag|SyncPredFlag);
InitCPred ("$read", 3, p_read, SafePredFlag|SyncPredFlag); InitCPred ("$read", 3, p_read, SyncPredFlag);
InitCPred ("$read", 4, p_read2, SafePredFlag|SyncPredFlag); InitCPred ("$read", 4, p_read2, SyncPredFlag);
InitCPred ("$set_input", 1, p_set_input, SafePredFlag|SyncPredFlag); InitCPred ("$set_input", 1, p_set_input, SafePredFlag|SyncPredFlag);
InitCPred ("$set_output", 1, p_set_output, SafePredFlag|SyncPredFlag); InitCPred ("$set_output", 1, p_set_output, SafePredFlag|SyncPredFlag);
InitCPred ("$skip", 2, p_skip, SafePredFlag|SyncPredFlag); InitCPred ("$skip", 2, p_skip, SafePredFlag|SyncPredFlag);