mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 15:41:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

arith.c (gfc_enum_initializer): Move function ...

Browse Source 
2009-06-12  Steven G. Kargl  <kargls@comcast.net>

	* arith.c (gfc_enum_initializer): Move function ...
	* decl.c: ... here.  Remove gfc_ prefix and make static.
	(enumerator_decl): Update function call.
	* gfortran.h:  Remove gfc_enum_initializer prototype.

From-SVN: r148441
This commit is contained in:
Steven G. Kargl 2009-06-12 21:14:42 +00:00
parent d1d919c362
commit 312243969e
3 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gcc/fortran/arith.c
View File

@ -2627,48 +2627,3 @@ gfc_hollerith2logical (gfc_expr *src, int kind)
return result;
}
/* Returns an initializer whose value is one higher than the value of the
LAST_INITIALIZER argument. If the argument is NULL, the
initializers value will be set to zero. The initializer's kind
will be set to gfc_c_int_kind.
If -fshort-enums is given, the appropriate kind will be selected
later after all enumerators have been parsed. A warning is issued
here if an initializer exceeds gfc_c_int_kind. */
gfc_expr *
gfc_enum_initializer (gfc_expr *last_initializer, locus where)
{
gfc_expr *result;
result = gfc_get_expr ();
result->expr_type = EXPR_CONSTANT;
result->ts.type = BT_INTEGER;
result->ts.kind = gfc_c_int_kind;
result->where = where;
mpz_init (result->value.integer);
if (last_initializer != NULL)
{
mpz_add_ui (result->value.integer, last_initializer->value.integer, 1);
result->where = last_initializer->where;
if (gfc_check_integer_range (result->value.integer,
gfc_c_int_kind) != ARITH_OK)
{
gfc_error ("Enumerator exceeds the C integer type at %C");
return NULL;
}
}
else
{
/* Control comes here, if it's the very first enumerator and no
initializer has been given. It will be initialized to zero. */
mpz_set_si (result->value.integer, 0);
}
return result;
}

47
gcc/fortran/decl.c
View File

@ -6812,6 +6812,51 @@ gfc_match_enum (void)
}
/* Returns an initializer whose value is one higher than the value of the
LAST_INITIALIZER argument. If the argument is NULL, the
initializers value will be set to zero. The initializer's kind
will be set to gfc_c_int_kind.
If -fshort-enums is given, the appropriate kind will be selected
later after all enumerators have been parsed. A warning is issued
here if an initializer exceeds gfc_c_int_kind. */
static gfc_expr *
enum_initializer (gfc_expr *last_initializer, locus where)
{
gfc_expr *result;
result = gfc_get_expr ();
result->expr_type = EXPR_CONSTANT;
result->ts.type = BT_INTEGER;
result->ts.kind = gfc_c_int_kind;
result->where = where;
mpz_init (result->value.integer);
if (last_initializer != NULL)
{
mpz_add_ui (result->value.integer, last_initializer->value.integer, 1);
result->where = last_initializer->where;
if (gfc_check_integer_range (result->value.integer,
gfc_c_int_kind) != ARITH_OK)
{
gfc_error ("Enumerator exceeds the C integer type at %C");
return NULL;
}
}
else
{
/* Control comes here, if it's the very first enumerator and no
initializer has been given. It will be initialized to zero. */
mpz_set_si (result->value.integer, 0);
}
return result;
}
/* Match a variable name with an optional initializer. When this
subroutine is called, a variable is expected to be parsed next.
Depending on what is happening at the moment, updates either the
@ -6872,7 +6917,7 @@ enumerator_decl (void)
previous enumerator (stored in last_initializer) is incremented
by 1 and is used to initialize the current enumerator. */
if (initializer == NULL)
initializer = gfc_enum_initializer (last_initializer, old_locus);
initializer = enum_initializer (last_initializer, old_locus);
if (initializer == NULL || initializer->ts.type != BT_INTEGER)
{

1
gcc/fortran/gfortran.h
View File

@ -2249,7 +2249,6 @@ void gfc_get_errors (int *, int *);
/* arith.c */
void gfc_arith_init_1 (void);
void gfc_arith_done_1 (void);
gfc_expr *gfc_enum_initializer (gfc_expr *, locus);
arith gfc_check_integer_range (mpz_t p, int kind);
bool gfc_check_character_range (gfc_char_t, int);