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

bad call order in dopeek

Browse Source
This commit is contained in:
Vítor Santos Costa 2015-10-08 10:17:57 +01:00
parent 6169bbb3ad
commit e1f7333e2e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
os/charsio.c
View File

@ -104,6 +104,7 @@ plUnGetc( int sno, int ch )
static Int dopeek( int sno ) static Int dopeek( int sno )
{ {
CACHE_REGS
Int ocharcount, olinecount, olinepos; Int ocharcount, olinecount, olinepos;
StreamDesc *s; StreamDesc *s;
Int ch; Int ch;
@ -117,13 +118,13 @@ static Int dopeek( int sno )
s->linecount = olinecount; s->linecount = olinecount;
s->linepos = olinepos; s->linepos = olinepos;
/* buffer the character */ /* buffer the character */
if (s->encoding == LOCAL_encoding)) { if (s->encoding == LOCAL_encoding) {
ungetwc( ch, s-> file ); ungetwc( ch, s-> file );
} else { } else {
/* do the ungetc as if a write .. */ /* do the ungetc as if a write .. */
int (*f)(int, int) = s->stream_putc; int (*f)(int, int) = s->stream_putc;
s->stream_putc = plUnGetc; s->stream_putc = plUnGetc;
put_wchar( ch, sno ); put_wchar( sno, ch );
s->stream_putc = f; s->stream_putc = f;
} }
return ch; return ch;
@ -826,8 +827,10 @@ peek_code_1 ( USES_REGS1 )
Yap_Error(PERMISSION_ERROR_INPUT_BINARY_STREAM, ARG1, "peek_code/2"); Yap_Error(PERMISSION_ERROR_INPUT_BINARY_STREAM, ARG1, "peek_code/2");
return FALSE; return FALSE;
} }
if ((ch = dopeek( sno )) < 0) if ((ch = dopeek( sno )) < 0) {
UNLOCK(GLOBAL_Stream[sno].streamlock);
return false; return false;
}
UNLOCK(GLOBAL_Stream[sno].streamlock); UNLOCK(GLOBAL_Stream[sno].streamlock);
return(Yap_unify_constant(ARG1,MkIntTerm(ch))); return(Yap_unify_constant(ARG1,MkIntTerm(ch)));
} }