Commit 50f38a7d authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #330 from monaka/pr-fix-parser-y-to-supress-warning-array-subscript

Supress "warning: array subscript has type ‘char’"
parents 7c64a2be cd5476c6
...@@ -3201,9 +3201,9 @@ toklen(parser_state *p) ...@@ -3201,9 +3201,9 @@ toklen(parser_state *p)
#define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1)) #define IS_LABEL_SUFFIX(n) (peek_n(p, ':',(n)) && !peek_n(p, ':', (n)+1))
static unsigned long static unsigned long
scan_oct(const char *start, int len, int *retlen) scan_oct(const int *start, int len, int *retlen)
{ {
const char *s = start; const int *s = start;
unsigned long retval = 0; unsigned long retval = 0;
while (len-- && *s >= '0' && *s <= '7') { while (len-- && *s >= '0' && *s <= '7') {
...@@ -3215,10 +3215,10 @@ scan_oct(const char *start, int len, int *retlen) ...@@ -3215,10 +3215,10 @@ scan_oct(const char *start, int len, int *retlen)
} }
static unsigned long static unsigned long
scan_hex(const char *start, int len, int *retlen) scan_hex(const int *start, int len, int *retlen)
{ {
static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF"; static const char hexdigit[] = "0123456789abcdef0123456789ABCDEF";
register const char *s = start; register const int *s = start;
register unsigned long retval = 0; register unsigned long retval = 0;
char *tmp; char *tmp;
...@@ -3264,7 +3264,7 @@ read_escape(parser_state *p) ...@@ -3264,7 +3264,7 @@ read_escape(parser_state *p)
case '0': case '1': case '2': case '3': /* octal constant */ case '0': case '1': case '2': case '3': /* octal constant */
case '4': case '5': case '6': case '7': case '4': case '5': case '6': case '7':
{ {
char buf[3]; int buf[3];
int i; int i;
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
...@@ -3281,7 +3281,7 @@ read_escape(parser_state *p) ...@@ -3281,7 +3281,7 @@ read_escape(parser_state *p)
case 'x': /* hex constant */ case 'x': /* hex constant */
{ {
char buf[2]; int buf[2];
int i; int i;
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
...@@ -4542,7 +4542,7 @@ parser_yylex(parser_state *p) ...@@ -4542,7 +4542,7 @@ parser_yylex(parser_state *p)
pushback(p, c); pushback(p, c);
} }
} }
if (result == 0 && isupper(tok(p)[0])) { if (result == 0 && isupper((int)tok(p)[0])) {
result = tCONSTANT; result = tCONSTANT;
} }
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment