lang.c (lang_decode_option): Use ARRAY_SIZE.

	* lang.c (lang_decode_option): Use ARRAY_SIZE.
	* parse.y (BINOP_LOOKUP): Likewise.

From-SVN: r35951

gcc/java/ChangeLog

+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

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))
 	    {

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. */