diff options
| -rw-r--r-- | gcc/java/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/java/lex.c | 2 | ||||
| -rw-r--r-- | gcc/java/parse.y | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e7a82e4..fe89b75 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,8 @@ 2002-06-26 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + * lex.c (java_init_lex): Avoid incorrect hardcoded constant 11. + * parse.y (mark_parser_ctxt): Likewise. + * lex.c (java_read_char): Avoid "comparison is always true" warning. diff --git a/gcc/java/lex.c b/gcc/java/lex.c index 3810096..d350e99 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -128,7 +128,7 @@ java_init_lex (finput, encoding) CPC_INITIALIZER_LIST (ctxp) = CPC_STATIC_INITIALIZER_LIST (ctxp) = CPC_INSTANCE_INITIALIZER_LIST (ctxp) = NULL_TREE; - memset ((PTR) ctxp->modifier_ctx, 0, 11*sizeof (ctxp->modifier_ctx[0])); + memset ((PTR) ctxp->modifier_ctx, 0, sizeof (ctxp->modifier_ctx)); memset ((PTR) current_jcf, 0, sizeof (JCF)); ctxp->current_parsed_class = NULL; ctxp->package = NULL_TREE; diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 7f37384..f064782 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -16148,13 +16148,15 @@ mark_parser_ctxt (p) void *p; { struct parser_ctxt *pc = *((struct parser_ctxt **) p); - int i; +#ifndef JC1_LITE + size_t i; +#endif if (!pc) return; #ifndef JC1_LITE - for (i = 0; i < 11; ++i) + for (i = 0; i < ARRAY_SIZE (pc->modifier_ctx); ++i) ggc_mark_tree (pc->modifier_ctx[i]); ggc_mark_tree (pc->class_type); ggc_mark_tree (pc->function_decl); |