OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpplib.c (_cpp_init_stacks): Cast enum for comparison.

Browse Source 
* cpplib.c (_cpp_init_stacks): Cast enum for comparison.
	* cppexp.c (lex): Cast enums for comparison.
	* cppinit.c (parse_option): Cast enum for comparison.
	* cpplex.c (cpp_spell_token): Cast enums to int for minus.
	(cpp_output_token): Likewise.
	(cpp_can_paste): Cast enums for comparsion and plus/minus.
	(cpp_avoid_paste): Cast enums for minus and comparison.

From-SVN: r40174
This commit is contained in:
John David Anglin 2001-03-02 01:11:50 +00:00 committed by John David Anglin
parent f71434274c
commit 37b8524ce8
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2001-03-01 John David Anglin <dave@hiauly1.hia.nrc.ca>
* cpplib.c (_cpp_init_stacks): Cast enum for comparison.
* cppexp.c (lex): Cast enums for comparison.
* cppinit.c (parse_option): Cast enum for comparison.
* cpplex.c (cpp_spell_token): Cast enums to int for minus.
(cpp_output_token): Likewise.
(cpp_can_paste): Cast enums for comparsion and plus/minus.
(cpp_avoid_paste): Cast enums for minus and comparison.
2001-03-01 Zack Weinberg <zackw@stanford.edu>
* gcc.c, objc/lang-specs.h: Add zero initializer for cpp_spec

3
gcc/cppexp.c
View File

@ -477,7 +477,8 @@ lex (pfile, skip_evaluation, token)
/* Fall through. */
default:
if ((token->type > CPP_EQ && token->type < CPP_PLUS_EQ)
if (((int) token->type > (int) CPP_EQ
&& (int) token->type < (int) CPP_PLUS_EQ)
|| token->type == CPP_EOF)
{
op.op = token->type;

2
gcc/cppinit.c
View File

@ -1191,7 +1191,7 @@ parse_option (input)
Otherwise, return the longest option-accepting match.
This loops no more than twice with current options. */
mx = md;
for (; mn < N_OPTS; mn++)
for (; mn < (unsigned int) N_OPTS; mn++)
{
opt_len = cl_options[mn].opt_len;
if (memcmp (input, cl_options[mn].opt_text, opt_len))

14
gcc/cpplex.c
View File

@ -1321,7 +1321,8 @@ cpp_spell_token (pfile, token, buffer)
unsigned char c;
if (token->flags & DIGRAPH)
spelling = digraph_spellings[token->type - CPP_FIRST_DIGRAPH];
spelling
= digraph_spellings[(int) token->type - (int) CPP_FIRST_DIGRAPH];
else if (token->flags & NAMED_OP)
goto spell_ident;
else
@ -1413,7 +1414,8 @@ cpp_output_token (token, fp)
const unsigned char *spelling;
if (token->flags & DIGRAPH)
spelling = digraph_spellings[token->type - CPP_FIRST_DIGRAPH];
spelling
= digraph_spellings[(int) token->type - (int) CPP_FIRST_DIGRAPH];
else if (token->flags & NAMED_OP)
goto spell_ident;
else
@ -1523,8 +1525,8 @@ cpp_can_paste (pfile, token1, token2, digraph)
if (token2->flags & NAMED_OP)
b = CPP_NAME;
if (a <= CPP_LAST_EQ && b == CPP_EQ)
return a + (CPP_EQ_EQ - CPP_EQ);
if ((int) a <= (int) CPP_LAST_EQ && b == CPP_EQ)
return (enum cpp_ttype) ((int) a + ((int) CPP_EQ_EQ - (int) CPP_EQ));
switch (a)
{
@ -1637,12 +1639,12 @@ cpp_avoid_paste (pfile, token1, token2)
c = EOF;
if (token2->flags & DIGRAPH)
c = digraph_spellings[b - CPP_FIRST_DIGRAPH][0];
c = digraph_spellings[(int) b - (int) CPP_FIRST_DIGRAPH][0];
else if (token_spellings[b].category == SPELL_OPERATOR)
c = token_spellings[b].name[0];
/* Quickly get everything that can paste with an '='. */
if (a <= CPP_LAST_EQ && c == '=')
if ((int) a <= (int) CPP_LAST_EQ && c == '=')
return 1;
switch (a)

2
gcc/cpplib.c
View File

@ -1879,7 +1879,7 @@ _cpp_init_stacks (pfile)
obstack_init (pfile->buffer_ob);
/* Register the directives. */
for (i = 0; i < N_DIRECTIVES; i++)
for (i = 0; i < (unsigned int) N_DIRECTIVES; i++)
{
node = cpp_lookup (pfile, dtable[i].name, dtable[i].length);
node->directive_index = i + 1;