aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgkm <gkm@138bc75d-0d04-0410-961f-82ee72b054a4>2000-08-24 20:34:39 +0000
committergkm <gkm@138bc75d-0d04-0410-961f-82ee72b054a4>2000-08-24 20:34:39 +0000
commitdd5811085f24d75a2e7592fe4ad783a8f77082ce (patch)
treec331c005c51c3b68d885b8e1659b8e4c43a63329
parent294112db746fb7e74bfef4a20e68593161033561 (diff)
* lang.c (lang_decode_option): Use ARRAY_SIZE.
* parse.y (BINOP_LOOKUP): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35951 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/lang.c5
-rw-r--r--gcc/java/parse.y3
3 files changed, 7 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1addb289e19..a7b75b4d5f8 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-24 Greg McGary <greg@mcgary.org>
+
+ * lang.c (lang_decode_option): Use ARRAY_SIZE.
+ * parse.y (BINOP_LOOKUP): Likewise.
+
2000-08-21 Nix <nix@esperi.demon.co.uk>
* lang-specs.h: Do not process -o or run the assembler if
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index ae038967c68..5f95f2d9c57 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -232,10 +232,7 @@ lang_decode_option (argc, argv)
p += 2;
- for (j = 0;
- !found
- && j < (int)(sizeof (lang_f_options) / sizeof (lang_f_options[0]));
- j++)
+ for (j = 0; !found && j < (int) ARRAY_SIZE (lang_f_options); j++)
{
if (!strcmp (p, lang_f_options[j].string))
{
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index dcebab9d01e..d63d16d64e8 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -355,8 +355,7 @@ static enum tree_code binop_lookup[19] =
EQ_EXPR, NE_EXPR, GT_EXPR, GE_EXPR, LT_EXPR, LE_EXPR,
};
#define BINOP_LOOKUP(VALUE) \
- binop_lookup [((VALUE) - PLUS_TK)% \
- (sizeof (binop_lookup) / sizeof (binop_lookup[0]))]
+ binop_lookup [((VALUE) - PLUS_TK) % ARRAY_SIZE (binop_lookup)]
/* This is the end index for binary operators that can also be used
in compound assignements. */