conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

suppress warning in compiling read.c

This commit is contained in:
Yuichi Nishiwaki 2014-09-27 20:43:31 +09:00
parent 0403ca5570
commit 1b37102676
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
read.c
View File

@ -209,7 +209,7 @@ read_symbol(pic_state *pic, struct pic_port *port, const char *str)
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
if (pic->reader->typecase == PIC_CASE_FOLD) { if (pic->reader->typecase == PIC_CASE_FOLD) {
buf[i] = tolower(str[i]); buf[i] = (char)tolower(str[i]);
} else { } else {
buf[i] = str[i]; buf[i] = str[i];
} }
@ -222,7 +222,7 @@ read_symbol(pic_state *pic, struct pic_port *port, const char *str)
} }
len += 1; len += 1;
buf = pic_realloc(pic, buf, len + 1); buf = pic_realloc(pic, buf, len + 1);
buf[len - 1] = c; buf[len - 1] = (char)c;
} }
sym = pic_intern(pic, buf, len); sym = pic_intern(pic, buf, len);
@ -240,9 +240,9 @@ read_uinteger(pic_state *pic, struct pic_port *port, int c, char buf[])
read_error(pic, "expected one or more digits"); read_error(pic, "expected one or more digits");
} }
buf[i++] = c; buf[i++] = (char)c;
while (isdigit(c = peek(port))) { while (isdigit(c = peek(port))) {
buf[i++] = next(port); buf[i++] = (char)next(port);
} }
buf[i] = '\0'; buf[i] = '\0';
@ -262,12 +262,12 @@ read_suffix(pic_state *pic, struct pic_port *port, char buf[])
return i; return i;
} }
buf[i++] = next(port); buf[i++] = (char)next(port);
switch ((c = next(port))) { switch ((c = next(port))) {
case '-': case '-':
case '+': case '+':
buf[i++] = c; buf[i++] = (char)c;
c = next(port); c = next(port);
default: default:
return i + read_uinteger(pic, port, c, buf + i); return i + read_uinteger(pic, port, c, buf + i);
@ -284,14 +284,14 @@ read_unsigned(pic_state *pic, struct pic_port *port, int c)
switch (peek(port)) { switch (peek(port)) {
case '.': case '.':
buf[i++] = next(port); buf[i++] = (char)next(port);
i += read_uinteger(pic, port, next(port), buf + i); i += read_uinteger(pic, port, next(port), buf + i);
read_suffix(pic, port, buf + i); read_suffix(pic, port, buf + i);
return pic_float_value(atof(buf)); return pic_float_value(atof(buf));
default: default:
read_suffix(pic, port, buf + i); read_suffix(pic, port, buf + i);
return pic_int_value((int)atof(buf)); return pic_int_value((int)(atof(buf)));
} }
} }
@ -404,7 +404,7 @@ read_char(pic_state *pic, struct pic_port *port, const char *str)
} }
} }
return pic_char_value(c); return pic_char_value((char)c);
fail: fail:
read_error(pic, "unexpected character while reading character literal"); read_error(pic, "unexpected character while reading character literal");
@ -436,7 +436,7 @@ read_string(pic_state *pic, struct pic_port *port, const char *name)
case 'r': c = '\r'; break; case 'r': c = '\r'; break;
} }
} }
buf[cnt++] = c; buf[cnt++] = (char)c;
if (cnt >= size) { if (cnt >= size) {
buf = pic_realloc(pic, buf, size *= 2); buf = pic_realloc(pic, buf, size *= 2);
} }
@ -474,15 +474,15 @@ read_pipe(pic_state *pic, struct pic_port *port, const char *str)
case 'r': c = '\r'; break; case 'r': c = '\r'; break;
case 'x': case 'x':
i = 0; i = 0;
while ((HEX_BUF[i++] = next(port)) != ';') { while ((HEX_BUF[i++] = (char)next(port)) != ';') {
if (i >= sizeof HEX_BUF) if (i >= sizeof HEX_BUF)
read_error(pic, "expected ';'"); read_error(pic, "expected ';'");
} }
c = strtol(HEX_BUF, NULL, 16); c = (char)strtol(HEX_BUF, NULL, 16);
break; break;
} }
} }
buf[cnt++] = c; buf[cnt++] = (char)c;
if (cnt >= size) { if (cnt >= size) {
buf = pic_realloc(pic, buf, size *= 2); buf = pic_realloc(pic, buf, size *= 2);
} }
@ -500,7 +500,8 @@ read_blob(pic_state *pic, struct pic_port *port, const char *str)
{ {
int nbits, n, c; int nbits, n, c;
size_t len, i; size_t len, i;
char *dat, buf[256]; char buf[256];
unsigned char *dat;
pic_blob *blob; pic_blob *blob;
UNUSED(str); UNUSED(str);
@ -530,7 +531,7 @@ read_blob(pic_state *pic, struct pic_port *port, const char *str)
} }
len += 1; len += 1;
dat = pic_realloc(pic, dat, len); dat = pic_realloc(pic, dat, len);
dat[len - 1] = n; dat[len - 1] = (unsigned char)n;
c = next(port); c = next(port);
} }
@ -710,7 +711,7 @@ read_nullable(pic_state *pic, struct pic_port *port, int c)
read_error(pic, "invalid character at the seeker head"); read_error(pic, "invalid character at the seeker head");
} }
buf[i++] = c; buf[i++] = (char)c;
while (i < sizeof buf) { while (i < sizeof buf) {
trie = trie->table[c]; trie = trie->table[c];
@ -721,7 +722,7 @@ read_nullable(pic_state *pic, struct pic_port *port, int c)
if (trie->table[c] == NULL) { if (trie->table[c] == NULL) {
break; break;
} }
buf[i++] = next(port); buf[i++] = (char)next(port);
} }
if (i == sizeof buf) { if (i == sizeof buf) {
read_error(pic, "too long dispatch string"); read_error(pic, "too long dispatch string");