aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog10
-rw-r--r--gcc/fortran/iresolve.c124
2 files changed, 34 insertions, 100 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d000e03..db99a97 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-12 Richard Henderson <rth@redhat.com>
+
+ * iresolve.c (gfc_resolve_all, gfc_resolve_any, gfc_resolve_count,
+ gfc_resolve_cshift, gfc_resolve_dot_product, gfc_resolve_eoshift,
+ gfc_resolve_matmul, gfc_resolve_maxloc, gfc_resolve_maxval,
+ gfc_resolve_minloc, gfc_resolve_minval, gfc_resolve_pack,
+ gfc_resolve_product, gfc_resolve_reshape, gfc_resolve_shape,
+ gfc_resolve_spread, gfc_resolve_sum, gfc_resolve_transpose,
+ gfc_resolve_unpack: Use PREFIX.
+
2004-12-12 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/18869
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index d942fdd..5e0a610 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -126,7 +126,6 @@ free_strings (void)
void
gfc_resolve_abs (gfc_expr * f, gfc_expr * a)
{
-
f->ts = a->ts;
if (f->ts.type == BT_COMPLEX)
f->ts.type = BT_REAL;
@@ -139,7 +138,6 @@ gfc_resolve_abs (gfc_expr * f, gfc_expr * a)
void
gfc_resolve_acos (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__acos_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -149,7 +147,6 @@ gfc_resolve_acos (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_aimag (gfc_expr * f, gfc_expr * x)
{
-
f->ts.type = BT_REAL;
f->ts.kind = x->ts.kind;
f->value.function.name =
@@ -160,7 +157,6 @@ gfc_resolve_aimag (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_aint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = a->ts.type;
f->ts.kind = (kind == NULL) ? a->ts.kind : mpz_get_si (kind->value.integer);
@@ -181,7 +177,6 @@ gfc_resolve_dint (gfc_expr * f, gfc_expr * a)
void
gfc_resolve_all (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
{
-
f->ts = mask->ts;
if (dim != NULL)
@@ -192,7 +187,7 @@ gfc_resolve_all (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
}
f->value.function.name =
- gfc_get_string ("__all_%c%d", gfc_type_letter (mask->ts.type),
+ gfc_get_string (PREFIX("all_%c%d"), gfc_type_letter (mask->ts.type),
mask->ts.kind);
}
@@ -200,7 +195,6 @@ gfc_resolve_all (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
void
gfc_resolve_anint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = a->ts.type;
f->ts.kind = (kind == NULL) ? a->ts.kind : mpz_get_si (kind->value.integer);
@@ -221,7 +215,6 @@ gfc_resolve_dnint (gfc_expr * f, gfc_expr * a)
void
gfc_resolve_any (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
{
-
f->ts = mask->ts;
if (dim != NULL)
@@ -232,7 +225,7 @@ gfc_resolve_any (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
}
f->value.function.name =
- gfc_get_string ("__any_%c%d", gfc_type_letter (mask->ts.type),
+ gfc_get_string (PREFIX("any_%c%d"), gfc_type_letter (mask->ts.type),
mask->ts.kind);
}
@@ -240,7 +233,6 @@ gfc_resolve_any (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
void
gfc_resolve_asin (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__asin_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -250,7 +242,6 @@ gfc_resolve_asin (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_atan (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__atan_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -261,7 +252,6 @@ void
gfc_resolve_atan2 (gfc_expr * f, gfc_expr * x,
gfc_expr * y ATTRIBUTE_UNUSED)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__atan2_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -289,7 +279,6 @@ gfc_resolve_besn (gfc_expr * f, gfc_expr * n, gfc_expr * x)
void
gfc_resolve_btest (gfc_expr * f, gfc_expr * i, gfc_expr * pos)
{
-
f->ts.type = BT_LOGICAL;
f->ts.kind = gfc_default_logical_kind;
@@ -301,7 +290,6 @@ gfc_resolve_btest (gfc_expr * f, gfc_expr * i, gfc_expr * pos)
void
gfc_resolve_ceiling (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
: mpz_get_si (kind->value.integer);
@@ -315,7 +303,6 @@ gfc_resolve_ceiling (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
void
gfc_resolve_char (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = BT_CHARACTER;
f->ts.kind = (kind == NULL) ? gfc_default_character_kind
: mpz_get_si (kind->value.integer);
@@ -329,7 +316,6 @@ gfc_resolve_char (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
void
gfc_resolve_cmplx (gfc_expr * f, gfc_expr * x, gfc_expr * y, gfc_expr * kind)
{
-
f->ts.type = BT_COMPLEX;
f->ts.kind = (kind == NULL) ? gfc_default_real_kind
: mpz_get_si (kind->value.integer);
@@ -354,7 +340,6 @@ gfc_resolve_dcmplx (gfc_expr * f, gfc_expr * x, gfc_expr * y)
void
gfc_resolve_conjg (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name = gfc_get_string ("__conjg_%d", x->ts.kind);
}
@@ -363,7 +348,6 @@ gfc_resolve_conjg (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_cos (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__cos_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -373,7 +357,6 @@ gfc_resolve_cos (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_cosh (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__cosh_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -383,7 +366,6 @@ gfc_resolve_cosh (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_count (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
@@ -395,7 +377,7 @@ gfc_resolve_count (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
}
f->value.function.name =
- gfc_get_string ("__count_%d_%c%d", f->ts.kind,
+ gfc_get_string (PREFIX("count_%d_%c%d"), f->ts.kind,
gfc_type_letter (mask->ts.type), mask->ts.kind);
}
@@ -424,14 +406,13 @@ gfc_resolve_cshift (gfc_expr * f, gfc_expr * array,
gfc_convert_type_warn (dim, &shift->ts, 2, 0);
}
f->value.function.name =
- gfc_get_string ("__cshift%d_%d", n, shift->ts.kind);
+ gfc_get_string (PREFIX("cshift%d_%d"), n, shift->ts.kind);
}
void
gfc_resolve_dble (gfc_expr * f, gfc_expr * a)
{
-
f->ts.type = BT_REAL;
f->ts.kind = gfc_default_double_kind;
f->value.function.name =
@@ -443,7 +424,6 @@ void
gfc_resolve_dim (gfc_expr * f, gfc_expr * x,
gfc_expr * y ATTRIBUTE_UNUSED)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__dim_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -472,7 +452,7 @@ gfc_resolve_dot_product (gfc_expr * f, gfc_expr * a, gfc_expr * b)
}
f->value.function.name =
- gfc_get_string ("__dot_product_%c%d", gfc_type_letter (f->ts.type),
+ gfc_get_string (PREFIX("dot_product_%c%d"), gfc_type_letter (f->ts.type),
f->ts.kind);
}
@@ -513,14 +493,13 @@ gfc_resolve_eoshift (gfc_expr * f, gfc_expr * array,
gfc_convert_type_warn (dim, &shift->ts, 2, 0);
f->value.function.name =
- gfc_get_string ("__eoshift%d_%d", n, shift->ts.kind);
+ gfc_get_string (PREFIX("eoshift%d_%d"), n, shift->ts.kind);
}
void
gfc_resolve_exp (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__exp_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -530,7 +509,6 @@ gfc_resolve_exp (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_exponent (gfc_expr * f, gfc_expr * x)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
@@ -541,7 +519,6 @@ gfc_resolve_exponent (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_floor (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
: mpz_get_si (kind->value.integer);
@@ -555,7 +532,6 @@ gfc_resolve_floor (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
void
gfc_resolve_fnum (gfc_expr * f, gfc_expr * n)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
if (n->ts.kind != f->ts.kind)
@@ -567,7 +543,6 @@ gfc_resolve_fnum (gfc_expr * f, gfc_expr * n)
void
gfc_resolve_fraction (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name = gfc_get_string ("__fraction_%d", x->ts.kind);
}
@@ -640,7 +615,6 @@ gfc_resolve_iand (gfc_expr * f, gfc_expr * i, gfc_expr * j)
void
gfc_resolve_ibclr (gfc_expr * f, gfc_expr * i, gfc_expr * pos ATTRIBUTE_UNUSED)
{
-
f->ts = i->ts;
f->value.function.name = gfc_get_string ("__ibclr_%d", i->ts.kind);
}
@@ -651,7 +625,6 @@ gfc_resolve_ibits (gfc_expr * f, gfc_expr * i,
gfc_expr * pos ATTRIBUTE_UNUSED,
gfc_expr * len ATTRIBUTE_UNUSED)
{
-
f->ts = i->ts;
f->value.function.name = gfc_get_string ("__ibits_%d", i->ts.kind);
}
@@ -661,7 +634,6 @@ void
gfc_resolve_ibset (gfc_expr * f, gfc_expr * i,
gfc_expr * pos ATTRIBUTE_UNUSED)
{
-
f->ts = i->ts;
f->value.function.name = gfc_get_string ("__ibset_%d", i->ts.kind);
}
@@ -670,7 +642,6 @@ gfc_resolve_ibset (gfc_expr * f, gfc_expr * i,
void
gfc_resolve_ichar (gfc_expr * f, gfc_expr * c)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
@@ -726,7 +697,6 @@ gfc_resolve_ior (gfc_expr * f, gfc_expr * i, gfc_expr * j)
void
gfc_resolve_int (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
: mpz_get_si (kind->value.integer);
@@ -740,7 +710,6 @@ gfc_resolve_int (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
void
gfc_resolve_ishft (gfc_expr * f, gfc_expr * i, gfc_expr * shift)
{
-
f->ts = i->ts;
f->value.function.name =
gfc_get_string ("__ishft_%d_%d", i->ts.kind, shift->ts.kind);
@@ -784,7 +753,6 @@ gfc_resolve_lbound (gfc_expr * f, gfc_expr * array,
void
gfc_resolve_len (gfc_expr * f, gfc_expr * string)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
f->value.function.name = gfc_get_string ("__len_%d", string->ts.kind);
@@ -794,7 +762,6 @@ gfc_resolve_len (gfc_expr * f, gfc_expr * string)
void
gfc_resolve_len_trim (gfc_expr * f, gfc_expr * string)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
f->value.function.name = gfc_get_string ("__len_trim%d", string->ts.kind);
@@ -804,7 +771,6 @@ gfc_resolve_len_trim (gfc_expr * f, gfc_expr * string)
void
gfc_resolve_log (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__log_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -814,7 +780,6 @@ gfc_resolve_log (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_log10 (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__log10_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -824,7 +789,6 @@ gfc_resolve_log10 (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_logical (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = BT_LOGICAL;
f->ts.kind = (kind == NULL) ? gfc_default_logical_kind
: mpz_get_si (kind->value.integer);
@@ -860,7 +824,7 @@ gfc_resolve_matmul (gfc_expr * f, gfc_expr * a, gfc_expr * b)
f->rank = (a->rank == 2 && b->rank == 2) ? 2 : 1;
f->value.function.name =
- gfc_get_string ("__matmul_%c%d", gfc_type_letter (f->ts.type),
+ gfc_get_string (PREFIX("matmul_%c%d"), gfc_type_letter (f->ts.type),
f->ts.kind);
}
@@ -917,7 +881,7 @@ gfc_resolve_maxloc (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
name = mask ? "mmaxloc" : "maxloc";
f->value.function.name =
- gfc_get_string ("__%s%d_%d_%c%d", name, dim != NULL, f->ts.kind,
+ gfc_get_string (PREFIX("%s%d_%d_%c%d"), name, dim != NULL, f->ts.kind,
gfc_type_letter (array->ts.type), array->ts.kind);
}
@@ -926,7 +890,6 @@ void
gfc_resolve_maxval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
gfc_expr * mask)
{
-
f->ts = array->ts;
if (dim != NULL)
@@ -936,7 +899,7 @@ gfc_resolve_maxval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
}
f->value.function.name =
- gfc_get_string ("__%s_%c%d", mask ? "mmaxval" : "maxval",
+ gfc_get_string (PREFIX("%s_%c%d"), mask ? "mmaxval" : "maxval",
gfc_type_letter (array->ts.type), array->ts.kind);
}
@@ -946,7 +909,6 @@ gfc_resolve_merge (gfc_expr * f, gfc_expr * tsource,
gfc_expr * fsource ATTRIBUTE_UNUSED,
gfc_expr * mask ATTRIBUTE_UNUSED)
{
-
f->ts = tsource->ts;
f->value.function.name =
gfc_get_string ("__merge_%c%d", gfc_type_letter (tsource->ts.type),
@@ -980,7 +942,7 @@ gfc_resolve_minloc (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
name = mask ? "mminloc" : "minloc";
f->value.function.name =
- gfc_get_string ("__%s%d_%d_%c%d", name, dim != NULL, f->ts.kind,
+ gfc_get_string (PREFIX("%s%d_%d_%c%d"), name, dim != NULL, f->ts.kind,
gfc_type_letter (array->ts.type), array->ts.kind);
}
@@ -989,7 +951,6 @@ void
gfc_resolve_minval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
gfc_expr * mask)
{
-
f->ts = array->ts;
if (dim != NULL)
@@ -999,7 +960,7 @@ gfc_resolve_minval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
}
f->value.function.name =
- gfc_get_string ("__%s_%c%d", mask ? "mminval" : "minval",
+ gfc_get_string (PREFIX("%s_%c%d"), mask ? "mminval" : "minval",
gfc_type_letter (array->ts.type), array->ts.kind);
}
@@ -1008,7 +969,6 @@ void
gfc_resolve_mod (gfc_expr * f, gfc_expr * a,
gfc_expr * p ATTRIBUTE_UNUSED)
{
-
f->ts = a->ts;
f->value.function.name =
gfc_get_string ("__mod_%c%d", gfc_type_letter (a->ts.type), a->ts.kind);
@@ -1019,7 +979,6 @@ void
gfc_resolve_modulo (gfc_expr * f, gfc_expr * a,
gfc_expr * p ATTRIBUTE_UNUSED)
{
-
f->ts = a->ts;
f->value.function.name =
gfc_get_string ("__modulo_%c%d", gfc_type_letter (a->ts.type),
@@ -1027,10 +986,8 @@ gfc_resolve_modulo (gfc_expr * f, gfc_expr * a,
}
void
-gfc_resolve_nearest (gfc_expr * f, gfc_expr * a,
- gfc_expr *p ATTRIBUTE_UNUSED)
+gfc_resolve_nearest (gfc_expr * f, gfc_expr * a, gfc_expr *p ATTRIBUTE_UNUSED)
{
-
f->ts = a->ts;
f->value.function.name =
gfc_get_string ("__nearest_%c%d", gfc_type_letter (a->ts.type),
@@ -1040,7 +997,6 @@ gfc_resolve_nearest (gfc_expr * f, gfc_expr * a,
void
gfc_resolve_nint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
: mpz_get_si (kind->value.integer);
@@ -1053,7 +1009,6 @@ gfc_resolve_nint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
void
gfc_resolve_not (gfc_expr * f, gfc_expr * i)
{
-
f->ts = i->ts;
f->value.function.name = gfc_get_string ("__not_%d", i->ts.kind);
}
@@ -1065,14 +1020,11 @@ gfc_resolve_pack (gfc_expr * f,
gfc_expr * mask,
gfc_expr * vector ATTRIBUTE_UNUSED)
{
- static char pack[] = "__pack",
- pack_s[] = "__pack_s";
-
f->ts = array->ts;
f->rank = 1;
if (mask->rank != 0)
- f->value.function.name = pack;
+ f->value.function.name = PREFIX("pack");
else
{
/* We convert mask to default logical only in the scalar case.
@@ -1087,7 +1039,7 @@ gfc_resolve_pack (gfc_expr * f,
gfc_convert_type (mask, &ts, 2);
}
- f->value.function.name = pack_s;
+ f->value.function.name = PREFIX("pack_s");
}
}
@@ -1096,7 +1048,6 @@ void
gfc_resolve_product (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
gfc_expr * mask)
{
-
f->ts = array->ts;
if (dim != NULL)
@@ -1106,7 +1057,7 @@ gfc_resolve_product (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
}
f->value.function.name =
- gfc_get_string ("__%s_%c%d", mask ? "mproduct" : "product",
+ gfc_get_string (PREFIX("%s_%c%d"), mask ? "mproduct" : "product",
gfc_type_letter (array->ts.type), array->ts.kind);
}
@@ -1114,7 +1065,6 @@ gfc_resolve_product (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
void
gfc_resolve_real (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
{
-
f->ts.type = BT_REAL;
if (kind != NULL)
@@ -1131,9 +1081,8 @@ gfc_resolve_real (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
void
gfc_resolve_repeat (gfc_expr * f, gfc_expr * string,
- gfc_expr * ncopies ATTRIBUTE_UNUSED)
+ gfc_expr * ncopies ATTRIBUTE_UNUSED)
{
-
f->ts.type = BT_CHARACTER;
f->ts.kind = string->ts.kind;
f->value.function.name = gfc_get_string ("__repeat_%d", string->ts.kind);
@@ -1145,7 +1094,6 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape,
gfc_expr * pad ATTRIBUTE_UNUSED,
gfc_expr * order ATTRIBUTE_UNUSED)
{
- static char reshape0[] = "__reshape";
mpz_t rank;
int kind;
int i;
@@ -1178,11 +1126,11 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape,
case 8:
/* case 16: */
f->value.function.name =
- gfc_get_string ("__reshape_%d", source->ts.kind);
+ gfc_get_string (PREFIX("reshape_%d"), source->ts.kind);
break;
default:
- f->value.function.name = reshape0;
+ f->value.function.name = PREFIX("reshape");
break;
}
@@ -1217,7 +1165,6 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape,
void
gfc_resolve_rrspacing (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name = gfc_get_string ("__rrspacing_%d", x->ts.kind);
}
@@ -1226,7 +1173,6 @@ gfc_resolve_rrspacing (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_scale (gfc_expr * f, gfc_expr * x, gfc_expr * i)
{
-
f->ts = x->ts;
/* The implementation calls scalbn which takes an int as the
@@ -1250,7 +1196,6 @@ gfc_resolve_scan (gfc_expr * f, gfc_expr * string,
gfc_expr * set ATTRIBUTE_UNUSED,
gfc_expr * back ATTRIBUTE_UNUSED)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
f->value.function.name = gfc_get_string ("__scan_%d", string->ts.kind);
@@ -1260,7 +1205,6 @@ gfc_resolve_scan (gfc_expr * f, gfc_expr * string,
void
gfc_resolve_set_exponent (gfc_expr * f, gfc_expr * x, gfc_expr * i)
{
-
f->ts = x->ts;
/* The library implementation uses GFC_INTEGER_4 unconditionally,
@@ -1283,11 +1227,10 @@ gfc_resolve_set_exponent (gfc_expr * f, gfc_expr * x, gfc_expr * i)
void
gfc_resolve_shape (gfc_expr * f, gfc_expr * array)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
f->rank = 1;
- f->value.function.name = gfc_get_string ("__shape_%d", f->ts.kind);
+ f->value.function.name = gfc_get_string (PREFIX("shape_%d"), f->ts.kind);
f->shape = gfc_get_shape (1);
mpz_init_set_ui (f->shape[0], array->rank);
}
@@ -1296,7 +1239,6 @@ gfc_resolve_shape (gfc_expr * f, gfc_expr * array)
void
gfc_resolve_sign (gfc_expr * f, gfc_expr * a, gfc_expr * b ATTRIBUTE_UNUSED)
{
-
f->ts = a->ts;
f->value.function.name =
gfc_get_string ("__sign_%c%d", gfc_type_letter (a->ts.type), a->ts.kind);
@@ -1306,7 +1248,6 @@ gfc_resolve_sign (gfc_expr * f, gfc_expr * a, gfc_expr * b ATTRIBUTE_UNUSED)
void
gfc_resolve_sin (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__sin_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1316,7 +1257,6 @@ gfc_resolve_sin (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_sinh (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__sinh_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1326,7 +1266,6 @@ gfc_resolve_sinh (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_spacing (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name = gfc_get_string ("__spacing_%d", x->ts.kind);
}
@@ -1337,11 +1276,9 @@ gfc_resolve_spread (gfc_expr * f, gfc_expr * source,
gfc_expr * dim,
gfc_expr * ncopies)
{
- static char spread[] = "__spread";
-
f->ts = source->ts;
f->rank = source->rank + 1;
- f->value.function.name = spread;
+ f->value.function.name = PREFIX("spread");
gfc_resolve_index (dim, 1);
gfc_resolve_index (ncopies, 1);
@@ -1351,7 +1288,6 @@ gfc_resolve_spread (gfc_expr * f, gfc_expr * source,
void
gfc_resolve_sqrt (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__sqrt_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1364,7 +1300,6 @@ void
gfc_resolve_stat (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED,
gfc_expr * a ATTRIBUTE_UNUSED)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
f->value.function.name = gfc_get_string (PREFIX("stat_i%d"), f->ts.kind);
@@ -1374,7 +1309,6 @@ gfc_resolve_stat (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED,
void
gfc_resolve_fstat (gfc_expr * f, gfc_expr * n, gfc_expr * a ATTRIBUTE_UNUSED)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
if (n->ts.kind != f->ts.kind)
@@ -1388,7 +1322,6 @@ void
gfc_resolve_sum (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
gfc_expr * mask)
{
-
f->ts = array->ts;
if (dim != NULL)
@@ -1398,7 +1331,7 @@ gfc_resolve_sum (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
}
f->value.function.name =
- gfc_get_string ("__%s_%c%d", mask ? "msum" : "sum",
+ gfc_get_string (PREFIX("%s_%c%d"), mask ? "msum" : "sum",
gfc_type_letter (array->ts.type), array->ts.kind);
}
@@ -1417,7 +1350,6 @@ gfc_resolve_system (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED)
void
gfc_resolve_tan (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__tan_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1427,7 +1359,6 @@ gfc_resolve_tan (gfc_expr * f, gfc_expr * x)
void
gfc_resolve_tanh (gfc_expr * f, gfc_expr * x)
{
-
f->ts = x->ts;
f->value.function.name =
gfc_get_string ("__tanh_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1459,7 +1390,6 @@ gfc_resolve_transfer (gfc_expr * f, gfc_expr * source ATTRIBUTE_UNUSED,
void
gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix)
{
- static char transpose0[] = "__transpose";
int kind;
f->ts = matrix->ts;
@@ -1495,11 +1425,11 @@ gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix)
case 8:
/* case 16: */
f->value.function.name =
- gfc_get_string ("__transpose_%d", kind);
+ gfc_get_string (PREFIX("transpose_%d"), kind);
break;
default:
- f->value.function.name = transpose0;
+ f->value.function.name = PREFIX("transpose");
}
}
@@ -1507,7 +1437,6 @@ gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix)
void
gfc_resolve_trim (gfc_expr * f, gfc_expr * string)
{
-
f->ts.type = BT_CHARACTER;
f->ts.kind = string->ts.kind;
f->value.function.name = gfc_get_string ("__trim_%d", string->ts.kind);
@@ -1539,7 +1468,6 @@ gfc_resolve_ubound (gfc_expr * f, gfc_expr * array,
void
gfc_resolve_umask (gfc_expr * f, gfc_expr * n)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = n->ts.kind;
f->value.function.name = gfc_get_string (PREFIX("umask_i%d"), n->ts.kind);
@@ -1551,7 +1479,6 @@ gfc_resolve_umask (gfc_expr * f, gfc_expr * n)
void
gfc_resolve_unlink (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = 4;
f->value.function.name = gfc_get_string (PREFIX("unlink"));
@@ -1561,13 +1488,12 @@ void
gfc_resolve_unpack (gfc_expr * f, gfc_expr * vector, gfc_expr * mask,
gfc_expr * field ATTRIBUTE_UNUSED)
{
-
f->ts.type = vector->ts.type;
f->ts.kind = vector->ts.kind;
f->rank = mask->rank;
f->value.function.name =
- gfc_get_string ("__unpack%d", field->rank > 0 ? 1 : 0);
+ gfc_get_string (PREFIX("unpack%d"), field->rank > 0 ? 1 : 0);
}
@@ -1576,7 +1502,6 @@ gfc_resolve_verify (gfc_expr * f, gfc_expr * string,
gfc_expr * set ATTRIBUTE_UNUSED,
gfc_expr * back ATTRIBUTE_UNUSED)
{
-
f->ts.type = BT_INTEGER;
f->ts.kind = gfc_default_integer_kind;
f->value.function.name = gfc_get_string ("__verify_%d", string->ts.kind);
@@ -1875,6 +1800,5 @@ gfc_iresolve_init_1 (void)
void
gfc_iresolve_done_1 (void)
{
-
free_strings ();
}
generated by cgit v1.1 at 2025-01-09 08:08:35 +0000