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

facilitate peek processing when using system locale.

Browse Source
This commit is contained in:
Vítor Santos Costa
2016-02-20 21:50:06 +00:00
parent ef06ebe698
commit b7ee47ce46
65 changed files with 491165 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
os/charsio.c
View File

@@ -112,24 +112,25 @@ Int Yap_peek(int sno) {
return ch;
}
#endif
ocharcount = s->charcount;
/* buffer the character */
if (s->encoding == LOCAL_encoding) {
ch = fgetwc(s->file);
ungetwc(ch, s->file);
return ch;
} else {
ocharcount = s->charcount;
olinecount = s->linecount;
olinepos = s->linepos;
ch = s->stream_wgetc(sno);
s->och = ch;
if (ch == EOFCHAR) {
ch = s->stream_wgetc(sno);
if (ch == EOFCHAR) {
s->stream_getc = EOFPeek;
s->stream_wgetc = EOFWPeek;
s->status |= Push_Eof_Stream_f;
return ch;
}
s->charcount = ocharcount;
s->linecount = olinecount;
s->linepos = olinepos;
/* buffer the character */
if (s->encoding == LOCAL_encoding) {
ungetwc(ch, s->file);
} else if (s->encoding == ENC_OCTET || s->encoding == ENC_ISO_LATIN1 ||
}
if (s->encoding == ENC_OCTET || s->encoding == ENC_ISO_LATIN1 ||
s->encoding == ENC_ISO_ASCII) {
ungetc(ch, s->file);
} else if (s->encoding == ENC_ISO_UTF8) {
@@ -185,7 +186,10 @@ Int Yap_peek(int sno) {
ungetc(ch / 256, s->file);
ungetc(ch % 256, s->file);
}
return ch;
s->charcount = ocharcount;
s->linecount = olinecount;
s->linepos = olinepos;
return ch;
}
static Int dopeek_byte(int sno) {