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

utils.c (init_gigi_decls): Use ARRAY_SIZE in lieu of explicit array size calculation.

Browse Source 
ada:
	* utils.c (init_gigi_decls): Use ARRAY_SIZE in lieu of explicit
	array size calculation.

gcc:
	* c-decl.c (c_decode_option): Use ARRAY_SIZE in lieu of explicit
	array size calculation.
	* gengtype.c (NUM_BASE_FILES, create_file, write_gc_root):
	Likewise.

cp:
	* spew.c (remove_last_token): Use ARRAY_SIZE in lieu of explicit
	array size calculation.

From-SVN: r54842
This commit is contained in:
Kaveh R. Ghazi 2002-06-20 17:38:23 +00:00 committed by Kaveh Ghazi
parent ef9772c835
commit 62c71f4bc2
7 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,5 +1,10 @@
2002-06-20 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* c-decl.c (c_decode_option): Use ARRAY_SIZE in lieu of explicit
array size calculation.
* gengtype.c (NUM_BASE_FILES, create_file, write_gc_root):
Likewise.
* diagnostic.c (diagnostic_kind_text): Const-ify.
* gengtype.c (lang_names): Likewise.

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-20 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* utils.c (init_gigi_decls): Use ARRAY_SIZE in lieu of explicit
array size calculation.
2002-06-04 Andreas Jaeger <aj@suse.de>
* Make-lang.in (gnatbind): Readd rule that has been lost in last

7
gcc/ada/utils.c
View File

@ -625,13 +625,12 @@ init_gigi_decls (long_long_float_type, exception_type)
endlink))),
NULL_TREE, 0, 1, 1, 0);
for (i = 0; i < sizeof gnat_raise_decls / sizeof gnat_raise_decls[0];
i++)
for (i = 0; i < ARRAY_SIZE (gnat_raise_decls); i++)
gnat_raise_decls[i] = decl;
}
else
/* Otherwise, make one decl for each exception reason. */
for (i = 0; i < sizeof gnat_raise_decls / sizeof gnat_raise_decls[0]; i++)
for (i = 0; i < ARRAY_SIZE (gnat_raise_decls); i++)
{
char name[17];
@ -656,7 +655,7 @@ init_gigi_decls (long_long_float_type, exception_type)
= build_qualified_type (TREE_TYPE (raise_nodefer_decl),
TYPE_QUAL_VOLATILE);
for (i = 0; i < sizeof gnat_raise_decls / sizeof gnat_raise_decls[0]; i++)
for (i = 0; i < ARRAY_SIZE (gnat_raise_decls); i++)
{
TREE_THIS_VOLATILE (gnat_raise_decls[i]) = 1;
TREE_SIDE_EFFECTS (gnat_raise_decls[i]) = 1;

2
gcc/c-decl.c
View File

@ -697,7 +697,7 @@ c_decode_option (argc, argv)
else
{
size_t i;
for (i = 0; i < sizeof (warn_options) / sizeof (warn_options[0]); i++)
for (i = 0; i < ARRAY_SIZE (warn_options); i++)
if (strncmp (p, "-W", 2) == 0
&& warn_options[i].flag
&& (strcmp (p+2, warn_options[i].option) == 0

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-20 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* spew.c (remove_last_token): Use ARRAY_SIZE in lieu of explicit
array size calculation.
2002-06-20 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/6892

2
gcc/cp/spew.c
View File

@ -1063,7 +1063,7 @@ remove_last_token (t)
for (tc = &t->tokens; (*tc)->next != NULL; tc = &(*tc)->next)
;
*tc = NULL;
t->last_pos = sizeof ((*tc)->toks) / sizeof ((*tc)->toks[0]);
t->last_pos = ARRAY_SIZE ((*tc)->toks);
}
return result;
}

7
gcc/gengtype.c
View File

@ -525,7 +525,7 @@ enum {
static const char *const lang_names[] = {
"c", "objc", "cp", "treelang", "cobol", "f", "ada", "java"
};
#define NUM_BASE_FILES (sizeof (lang_names) / sizeof (lang_names[0]))
#define NUM_BASE_FILES ARRAY_SIZE (lang_names)
outf_p base_files[NUM_BASE_FILES];
static outf_p create_file PARAMS ((const char *, const char *));
@ -570,7 +570,7 @@ create_file (name, oname)
output_files = f;
oprintf (f, "/* Type information for %s.\n", name);
for (i = 0; i < sizeof(hdr)/sizeof(hdr[0]); i++)
for (i = 0; i < ARRAY_SIZE (hdr); i++)
oprintf (f, "%s", hdr[i]);
return f;
}
@ -1626,8 +1626,7 @@ write_gc_root (f, v, type, name, has_length, line, if_marked)
if (ap->u.a.len[0])
oprintf (f, " * (%s)", ap->u.a.len);
else if (ap == v->type)
oprintf (f, " * (sizeof (%s) / sizeof (%s[0]))",
v->name, v->name);
oprintf (f, " * ARRAY_SIZE (%s)", v->name);
oprintf (f, ",\n");
oprintf (f, " sizeof (%s", v->name);
for (ap = v->type; ap->kind == TYPE_ARRAY; ap = ap->u.a.p)