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

mostly indenting

Browse Source
This commit is contained in:
Vítor Santos Costa 2016-03-05 12:30:49 +00:00
parent 0fc0e96306
commit 0522720ff4
1 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
os/charsio.c
View File

@ -112,26 +112,25 @@ Int Yap_peek(int sno) {
return ch; return ch;
} }
#endif #endif
/* buffer the character */ /* buffer the character */
if (s->encoding == LOCAL_encoding) { if (s->encoding == LOCAL_encoding) {
ch = fgetwc(s->file); ch = fgetwc(s->file);
ungetwc(ch, s->file); ungetwc(ch, s->file);
return ch; return ch;
} else { } else {
ocharcount = s->charcount; ocharcount = s->charcount;
olinecount = s->linecount; olinecount = s->linecount;
olinepos = s->linepos; olinepos = s->linepos;
ch = s->stream_wgetc(sno); ch = s->stream_wgetc(sno);
if (ch == EOFCHAR) { if (ch == EOFCHAR) {
s->stream_getc = EOFPeek; s->stream_getc = EOFPeek;
s->stream_wgetc = EOFWPeek; s->stream_wgetc = EOFWPeek;
s->status |= Push_Eof_Stream_f; s->status |= Push_Eof_Stream_f;
return ch; return ch;
} }
} }
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) { s->encoding == ENC_ISO_ASCII) {
ungetc(ch, s->file); ungetc(ch, s->file);
} else if (s->encoding == ENC_ISO_UTF8) { } else if (s->encoding == ENC_ISO_UTF8) {
unsigned char cs[8]; unsigned char cs[8];
@ -140,56 +139,56 @@ Int Yap_peek(int sno) {
ungetc(cs[n - 1], s->file); ungetc(cs[n - 1], s->file);
} }
} else if (s->encoding == ENC_UTF16_BE) { } else if (s->encoding == ENC_UTF16_BE) {
/* do the ungetc as if a write .. */ /* do the ungetc as if a write .. */
// computations // computations
if (ch < 0x10000) { if (ch < 0x10000) {
ungetc(ch % 256, s->file); ungetc(ch % 256, s->file);
ungetc(ch / 256, s->file); ungetc(ch / 256, s->file);
} else { } else {
uint16_t lead = LEAD_OFFSET + (ch >> 10); uint16_t lead = LEAD_OFFSET + (ch >> 10);
uint16_t trail = 0xDC00 + (ch & 0x3FF); uint16_t trail = 0xDC00 + (ch & 0x3FF);
ungetc(lead % 256, s->file); ungetc(lead % 256, s->file);
ungetc(lead / 256, s->file); ungetc(lead / 256, s->file);
ungetc(trail % 256, s->file); ungetc(trail % 256, s->file);
ungetc(trail / 256, s->file); ungetc(trail / 256, s->file);
} }
} else if (s->encoding == ENC_UTF16_LE) { } else if (s->encoding == ENC_UTF16_LE) {
if (ch < 0x10000) { if (ch < 0x10000) {
ungetc(ch / 256, s->file); ungetc(ch / 256, s->file);
ungetc(ch % 256, s->file); ungetc(ch % 256, s->file);
} else { } else {
uint16_t lead = LEAD_OFFSET + (ch >> 10); uint16_t lead = LEAD_OFFSET + (ch >> 10);
uint16_t trail = 0xDC00 + (ch & 0x3FF); uint16_t trail = 0xDC00 + (ch & 0x3FF);
ungetc(trail / 256, s->file); ungetc(trail / 256, s->file);
ungetc(trail % 256, s->file); ungetc(trail % 256, s->file);
ungetc(lead / 256, s->file); ungetc(lead / 256, s->file);
ungetc(lead % 256, s->file); ungetc(lead % 256, s->file);
} }
} else if (s->encoding == ENC_ISO_UTF32_LE) { } else if (s->encoding == ENC_ISO_UTF32_LE) {
ungetc( (ch >> 24) & 0xff, s->file); ungetc((ch >> 24) & 0xff, s->file);
ungetc( (ch >> 16) & 0xff, s->file); ungetc((ch >> 16) & 0xff, s->file);
ungetc( (ch >> 8) & 0xff, s->file); ungetc((ch >> 8) & 0xff, s->file);
ungetc( ch & 0xff, s->file); ungetc(ch & 0xff, s->file);
} else if (s->encoding == ENC_ISO_UTF32_BE) { } else if (s->encoding == ENC_ISO_UTF32_BE) {
ungetc( ch & 0xff, s->file); ungetc(ch & 0xff, s->file);
ungetc( (ch >> 8) & 0xff, s->file); ungetc((ch >> 8) & 0xff, s->file);
ungetc( (ch >> 16) & 0xff, s->file); ungetc((ch >> 16) & 0xff, s->file);
ungetc( (ch >> 24) & 0xff, s->file); ungetc((ch >> 24) & 0xff, s->file);
} else if (s->encoding == ENC_UCS2_BE) { } else if (s->encoding == ENC_UCS2_BE) {
/* do the ungetc as if a write .. */ /* do the ungetc as if a write .. */
// computations // computations
ungetc(ch % 256, s->file); ungetc(ch % 256, s->file);
ungetc(ch / 256, s->file); ungetc(ch / 256, s->file);
} else if (s->encoding == ENC_UCS2_LE) { } else if (s->encoding == ENC_UCS2_LE) {
ungetc(ch / 256, s->file); ungetc(ch / 256, s->file);
ungetc(ch % 256, s->file); ungetc(ch % 256, s->file);
} }
s->charcount = ocharcount; s->charcount = ocharcount;
s->linecount = olinecount; s->linecount = olinecount;
s->linepos = olinepos; s->linepos = olinepos;
return ch; return ch;
} }
static Int dopeek_byte(int sno) { static Int dopeek_byte(int sno) {
@ -1135,9 +1134,9 @@ leaving the current stream position unaltered.
*/ */
void Yap_flush(void) { CACHE_REGS(void)flush_all_streams(PASS_REGS1); } void Yap_flush(void) { CACHE_REGS(void) flush_all_streams(PASS_REGS1); }
void Yap_FlushStreams(void) { CACHE_REGS(void)flush_all_streams(PASS_REGS1); } void Yap_FlushStreams(void) { CACHE_REGS(void) flush_all_streams(PASS_REGS1); }
void Yap_InitCharsio(void) { void Yap_InitCharsio(void) {
Yap_InitCPred("get", 2, get, SafePredFlag | SyncPredFlag); Yap_InitCPred("get", 2, get, SafePredFlag | SyncPredFlag);