https://gcc.gnu.org/g:df00d010f4696f1fffc24c6fa9d3cb1d5161ec3b
commit df00d010f4696f1fffc24c6fa9d3cb1d5161ec3b
Author: Mikael Morin <mik...@gcc.gnu.org>
Date: Mon Sep 8 14:41:36 2025 +0200
Correction quotation macros m4
Diff:
---
libgfortran/m4/ifindloc0.m4 | 28 +++++++++++------------
libgfortran/m4/ifindloc1.m4 | 22 +++++++++----------
libgfortran/m4/ifindloc2.m4 | 26 +++++++++++-----------
libgfortran/m4/iforeach-s.m4 | 26 +++++++++++-----------
libgfortran/m4/iforeach-s2.m4 | 32 +++++++++++++--------------
libgfortran/m4/iforeach.m4 | 40 ++++++++++++++++-----------------
libgfortran/m4/ifunction-s.m4 | 34 ++++++++++++++--------------
libgfortran/m4/ifunction-s2.m4 | 44 ++++++++++++++++++-------------------
libgfortran/m4/ifunction.m4 | 38 ++++++++++++++++----------------
libgfortran/m4/ifunction_logical.m4 | 8 +++----
libgfortran/m4/iparm.m4 | 4 ++--
libgfortran/m4/maxloc0.m4 | 12 +++++-----
libgfortran/m4/maxloc1.m4 | 12 +++++-----
libgfortran/m4/maxval.m4 | 14 ++++++------
libgfortran/m4/maxval1s.m4 | 4 ++--
libgfortran/m4/minloc0.m4 | 6 ++---
libgfortran/m4/minloc1.m4 | 20 ++++++++---------
libgfortran/m4/minval.m4 | 14 ++++++------
18 files changed, 192 insertions(+), 192 deletions(-)
diff --git a/libgfortran/m4/ifindloc0.m4 b/libgfortran/m4/ifindloc0.m4
index 47f311f84d78..c484342f3cb9 100644
--- a/libgfortran/m4/ifindloc0.m4
+++ b/libgfortran/m4/ifindloc0.m4
@@ -79,7 +79,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
if (back)
{
- base = array->base_addr + (sz - 1) * 'base_mult`'`;
+ base = array->base_addr + (sz - 1) * 'base_mult`;
while (1)
{
@@ -92,7 +92,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
return;
}
- base -= sstride[0] * 'base_mult`'`;
+ base -= sstride[0] * 'base_mult`;
} while(++count[0] != extent[0]);
n = 0;
@@ -103,14 +103,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
count[n] = 0;
/* We could precalculate these products, but this is a less
frequently used path so probably not worth it. */
- base += sstride[n] * extent[n] * 'base_mult`'`;
+ base += sstride[n] * extent[n] * 'base_mult`;
n++;
if (n >= rank)
return;
else
{
count[n]++;
- base -= sstride[n] * 'base_mult`'`;
+ base -= sstride[n] * 'base_mult`;
}
} while (count[n] == extent[n]);
}
@@ -129,7 +129,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
return;
}
- base += sstride[0] * 'base_mult`'`;
+ base += sstride[0] * 'base_mult`;
} while(++count[0] != extent[0]);
n = 0;
@@ -140,14 +140,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
count[n] = 0;
/* We could precalculate these products, but this is a less
frequently used path so probably not worth it. */
- base -= sstride[n] * extent[n] * 'base_mult`'`;
+ base -= sstride[n] * extent[n] * 'base_mult`;
n++;
if (n >= rank)
return;
else
{
count[n]++;
- base += sstride[n] * 'base_mult`'`;
+ base += sstride[n] * 'base_mult`;
}
} while (count[n] == extent[n]);
}
@@ -228,7 +228,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
if (back)
{
- base = array->base_addr + (sz - 1) * 'base_mult`'`;
+ base = array->base_addr + (sz - 1) * 'base_mult`;
mbase = mbase + (sz - 1) * mask_kind;
while (1)
{
@@ -241,7 +241,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
return;
}
- base -= sstride[0] * 'base_mult`'`;
+ base -= sstride[0] * 'base_mult`;
mbase -= mstride[0];
} while(++count[0] != extent[0]);
@@ -253,7 +253,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
count[n] = 0;
/* We could precalculate these products, but this is a less
frequently used path so probably not worth it. */
- base += sstride[n] * extent[n] * 'base_mult`'`;
+ base += sstride[n] * extent[n] * 'base_mult`;
mbase -= mstride[n] * extent[n];
n++;
if (n >= rank)
@@ -261,7 +261,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
else
{
count[n]++;
- base -= sstride[n] * 'base_mult`'`;
+ base -= sstride[n] * 'base_mult`;
mbase += mstride[n];
}
} while (count[n] == extent[n]);
@@ -281,7 +281,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
return;
}
- base += sstride[0] * 'base_mult`'`;
+ base += sstride[0] * 'base_mult`;
mbase += mstride[0];
} while(++count[0] != extent[0]);
@@ -293,7 +293,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
count[n] = 0;
/* We could precalculate these products, but this is a less
frequently used path so probably not worth it. */
- base -= sstride[n] * extent[n] * 'base_mult`'`;
+ base -= sstride[n] * extent[n] * 'base_mult`;
mbase -= mstride[n] * extent[n];
n++;
if (n >= rank)
@@ -301,7 +301,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
else
{
count[n]++;
- base += sstride[n]* 'base_mult`'`;
+ base += sstride[n]* 'base_mult`;
mbase += mstride[n];
}
} while (count[n] == extent[n]);
diff --git a/libgfortran/m4/ifindloc1.m4 b/libgfortran/m4/ifindloc1.m4
index 9525152489c4..7b2c2d2a6557 100644
--- a/libgfortran/m4/ifindloc1.m4
+++ b/libgfortran/m4/ifindloc1.m4
@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- const 'atype_name`'` * restrict base;
+ const 'atype_name` * restrict base;
index_type * restrict dest;
index_type rank;
index_type n;
@@ -125,7 +125,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
base = array->base_addr;
while (continue_loop)
{
- const 'atype_name`'` * restrict src;
+ const 'atype_name` * restrict src;
index_type result;
result = 0;
@@ -134,7 +134,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
src = base + (len - 1) * delta * 'base_mult`;
for (n = len; n > 0; n--, src -= delta * 'base_mult`)
{
- if ('comparison`'`)
+ if ('comparison`)
{
result = n;
break;
@@ -146,7 +146,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
src = base;
for (n = 1; n <= len; n++, src += delta * 'base_mult`)
{
- if ('comparison`'`)
+ if ('comparison`)
{
result = n;
break;
@@ -179,14 +179,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
}
}
}
-'header2`'`
+'header2`
{
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type mstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- const 'atype_name`'` * restrict base;
+ const 'atype_name` * restrict base;
const GFC_LOGICAL_1 * restrict mbase;
index_type * restrict dest;
index_type rank;
@@ -298,7 +298,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
base = array->base_addr;
while (continue_loop)
{
- const 'atype_name`'` * restrict src;
+ const 'atype_name` * restrict src;
const GFC_LOGICAL_1 * restrict msrc;
index_type result;
@@ -309,7 +309,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
msrc = mbase + (len - 1) * mdelta;
for (n = len; n > 0; n--, src -= delta * 'base_mult`, msrc -= mdelta)
{
- if (*msrc && 'comparison`'`)
+ if (*msrc && 'comparison`)
{
result = n;
break;
@@ -322,7 +322,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
msrc = mbase;
for (n = 1; n <= len; n++, src += delta * 'base_mult`, msrc += mdelta)
{
- if (*msrc && 'comparison`'`)
+ if (*msrc && 'comparison`)
{
result = n;
break;
@@ -357,7 +357,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
}
}
}
-'header3`'`
+'header3`
{
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
@@ -371,7 +371,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
if (mask == NULL || *mask)
{
- findloc1_'atype_code`'` (retarray, array, value, pdim, back'len_arg`'`);
+ findloc1_'atype_code` (retarray, array, value, pdim, back'len_arg`);
return;
}
/* Make dim zero based to avoid confusion. */
diff --git a/libgfortran/m4/ifindloc2.m4 b/libgfortran/m4/ifindloc2.m4
index d309d8b02a4a..c90474503b3d 100644
--- a/libgfortran/m4/ifindloc2.m4
+++ b/libgfortran/m4/ifindloc2.m4
@@ -25,25 +25,25 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
#include "libgfortran.h"
-#ifdef HAVE_'atype_name`'`
-'header1`'`
+#ifdef HAVE_'atype_name`
+'header1`
{
index_type i;
index_type sstride;
index_type extent;
- const 'atype_name`'` * restrict src;
+ const 'atype_name` * restrict src;
extent = GFC_DESCRIPTOR_EXTENT(array,0);
if (extent <= 0)
return 0;
- sstride = GFC_DESCRIPTOR_STRIDE(array,0) * 'base_mult`'`;
+ sstride = GFC_DESCRIPTOR_STRIDE(array,0) * 'base_mult`;
if (back)
{
src = array->base_addr + (extent - 1) * sstride;
for (i = extent; i > 0; i--)
{
- if ('comparison`'`)
+ if ('comparison`)
return i;
src -= sstride;
}
@@ -53,7 +53,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
src = array->base_addr;
for (i = 1; i <= extent; i++)
{
- if ('comparison`'`)
+ if ('comparison`)
return i;
src += sstride;
}
@@ -61,12 +61,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
return 0;
}
-'header2`'`
+'header2`
{
index_type i;
index_type sstride;
index_type extent;
- const 'atype_name`'` * restrict src;
+ const 'atype_name` * restrict src;
const GFC_LOGICAL_1 * restrict mbase;
int mask_kind;
index_type mstride;
@@ -87,7 +87,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
else
internal_error (NULL, "Funny sized logical array");
- sstride = GFC_DESCRIPTOR_STRIDE(array,0) * 'base_mult`'`;
+ sstride = GFC_DESCRIPTOR_STRIDE(array,0) * 'base_mult`;
mstride = GFC_DESCRIPTOR_STRIDE_BYTES(mask,0);
if (back)
@@ -96,7 +96,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If
not, see
mbase += (extent - 1) * mstride;
for (i = extent; i > 0; i--)
{
- if (*mbase && ('comparison`'`))
+ if (*mbase && ('comparison`))
return i;
src -= sstride;
mbase -= mstride;
@@ -107,15 +107,15 @@ see the files COPYING3 and COPYING.RUNTIME respectively.
If not, see
src = array->base_addr;
for (i = 1; i <= extent; i++)
{
- if (*mbase && ('comparison`'`))
+ if (*mbase && ('comparison`))
return i;
- src += sstride;
+ PTR_INCREMENT_BYTES (src, sstride);
mbase += mstride;
}
}
return 0;
}
-'header3`'`
+'header3`
{
if (mask == NULL || *mask)
{
diff --git a/libgfortran/m4/iforeach-s.m4 b/libgfortran/m4/iforeach-s.m4
index b66c63201b6a..b00f900a5fd7 100644
--- a/libgfortran/m4/iforeach-s.m4
+++ b/libgfortran/m4/iforeach-s.m4
@@ -4,7 +4,7 @@ dnl This file is part of the GNU Fortran Runtime Library
(libgfortran)
dnl Distributed under the GNU GPL with exception. See COPYING for details.
define(START_FOREACH_FUNCTION,
`static inline int
-compare_fcn (const atype_name *a, const atype_name *b, gfc_charlen_type n)
+compare_fcn (const 'atype_name` *a, const 'atype_name` *b, gfc_charlen_type n)
{
if (sizeof ('atype_name`) == 1)
return memcmp (a, b, n);
@@ -13,20 +13,20 @@ compare_fcn (const atype_name *a, const atype_name *b,
gfc_charlen_type n)
}
-extern void name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+extern void 'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
'atype` * const restrict array'back_arg`, gfc_charlen_type len);
-export_proto('name`'rtype_qual`_'atype_code);
+export_proto('name`'rtype_qual`_'atype_code`);
void
-name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
'atype` * const restrict array'back_arg`, gfc_charlen_type len)
{
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride;
- const 'atype_name *base;
- rtype_name * restrict dest;
+ const 'atype_name` *base;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
@@ -39,7 +39,7 @@ name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank-1, 1);
retarray->dtype.rank = 1;
retarray->offset = 0;
- retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
+ retarray->base_addr = xmallocarray (rank, sizeof ('rtype_name`));
}
else
{
@@ -112,7 +112,7 @@ define(FINISH_FOREACH_FUNCTION,
}')dnl
define(START_MASKED_FOREACH_FUNCTION,
`
-extern void `m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+extern void m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
'atype` * const restrict, gfc_array_l1 * const restrict 'back_arg`,
gfc_charlen_type len);
export_proto(m'name`'rtype_qual`_'atype_code`);
@@ -128,8 +128,8 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
index_type sstride[GFC_MAX_DIMENSIONS];
index_type mstride[GFC_MAX_DIMENSIONS];
index_type dstride;
- 'rtype_name *dest;
- const atype_name *base;
+ 'rtype_name` *dest;
+ const 'atype_name` *base;
GFC_LOGICAL_1 *mbase;
int rank;
index_type n;
@@ -138,9 +138,9 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
if (mask == NULL)
{
#ifdef HAVE_BACK_ARG
- name`'rtype_qual`_'atype_code (retarray, array, back, len);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, back, len);
#else
- name`'rtype_qual`_'atype_code (retarray, array, len);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, len);
#endif
return;
}
@@ -154,7 +154,7 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
GFC_DESCRIPTOR_DIMENSION_SET(retarray, 0, 0, rank - 1, 1);
retarray->dtype.rank = 1;
retarray->offset = 0;
- retarray->base_addr = xmallocarray (rank, sizeof (rtype_name));
+ retarray->base_addr = xmallocarray (rank, sizeof ('rtype_name`));
}
else
{
diff --git a/libgfortran/m4/iforeach-s2.m4 b/libgfortran/m4/iforeach-s2.m4
index 63fde458ef1a..c2248f312754 100644
--- a/libgfortran/m4/iforeach-s2.m4
+++ b/libgfortran/m4/iforeach-s2.m4
@@ -4,7 +4,7 @@ dnl This file is part of the GNU Fortran Runtime Library
(libgfortran)
dnl Distributed under the GNU GPL with exception. See COPYING for details.
define(START_FOREACH_FUNCTION,
`static inline int
-compare_fcn (const atype_name *a, const atype_name *b, gfc_charlen_type n)
+compare_fcn (const 'atype_name` *a, const 'atype_name` *b, gfc_charlen_type n)
{
if (sizeof ('atype_name`) == 1)
return memcmp (a, b, n);
@@ -15,13 +15,13 @@ compare_fcn (const atype_name *a, const atype_name *b,
gfc_charlen_type n)
#define INITVAL 'initval`
-extern void 'name`'rtype_qual`_'atype_code (atype_name * restrict,
+extern void 'name`'rtype_qual`_'atype_code` ('atype_name` * restrict,
gfc_charlen_type,
- atype * const restrict array, gfc_charlen_type);
-export_proto(name`'rtype_qual`_'atype_code);
+ 'atype` * const restrict array, gfc_charlen_type);
+export_proto('name`'rtype_qual`_'atype_code`);
void
-name`'rtype_qual`_'atype_code` ('atype_name` * restrict ret,
+'name`'rtype_qual`_'atype_code` ('atype_name` * restrict ret,
gfc_charlen_type xlen,
'atype` * const restrict array, gfc_charlen_type len)
{
@@ -96,13 +96,13 @@ define(FINISH_FOREACH_FUNCTION,
}')dnl
define(START_MASKED_FOREACH_FUNCTION,
`
-extern void `m'name`'rtype_qual`_'atype_code (atype_name * restrict,
+extern void m'name`'rtype_qual`_'atype_code` ('atype_name` * restrict,
gfc_charlen_type, atype * const restrict array,
gfc_array_l1 * const restrict mask, gfc_charlen_type len);
-export_proto(`m'name`'rtype_qual`_'atype_code);
+export_proto(m'name`'rtype_qual`_'atype_code`);
void
-`m'name`'rtype_qual`_'atype_code (atype_name * const restrict ret,
+m'name`'rtype_qual`_'atype_code` ('atype_name` * const restrict ret,
gfc_charlen_type xlen, atype * const restrict array,
gfc_array_l1 * const restrict mask, gfc_charlen_type len)
{
@@ -110,7 +110,7 @@ void
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type mstride[GFC_MAX_DIMENSIONS];
- const atype_name *base;
+ const 'atype_name` *base;
GFC_LOGICAL_1 *mbase;
int rank;
index_type n;
@@ -118,7 +118,7 @@ void
if (mask == NULL)
{
- name`'rtype_qual`_'atype_code (ret, xlen, array, len);
+ 'name`'rtype_qual`_'atype_code` (ret, xlen, array, len);
return;
}
@@ -208,20 +208,20 @@ $2
FINISH_MASKED_FOREACH_FUNCTION')dnl
define(SCALAR_FOREACH_FUNCTION,
`
-extern void `s'name`'rtype_qual`_'atype_code (atype_name * restrict,
+extern void s'name`'rtype_qual`_'atype_code` ('atype_name` * restrict,
gfc_charlen_type,
- atype * const restrict array, GFC_LOGICAL_4 *, gfc_charlen_type);
-export_proto(`s'name`'rtype_qual`_'atype_code);
+ 'atype` * const restrict array, GFC_LOGICAL_4 *, gfc_charlen_type);
+export_proto(s'name`'rtype_qual`_'atype_code`);
void
-`s'name`'rtype_qual`_'atype_code (atype_name * restrict ret,
- gfc_charlen_type xlen, atype * const restrict array,
+s'name`'rtype_qual`_'atype_code` ('atype_name` * restrict ret,
+ gfc_charlen_type xlen, 'atype` * const restrict array,
GFC_LOGICAL_4 *mask, gfc_charlen_type len)
{
if (mask == NULL || *mask)
{
- name`'rtype_qual`_'atype_code (ret, xlen, array, len);
+ 'name`'rtype_qual`_'atype_code` (ret, xlen, array, len);
return;
}
memset (ret, INITVAL, sizeof (*ret) * len);
diff --git a/libgfortran/m4/iforeach.m4 b/libgfortran/m4/iforeach.m4
index 41e92e9d1b9d..04ca0302e5f4 100644
--- a/libgfortran/m4/iforeach.m4
+++ b/libgfortran/m4/iforeach.m4
@@ -4,20 +4,20 @@ dnl This file is part of the GNU Fortran Runtime Library
(libgfortran)
dnl Distributed under the GNU GPL with exception. See COPYING for details.
define(START_FOREACH_FUNCTION,
`
-extern void name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
+extern void 'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
atype * const restrict array, GFC_LOGICAL_4);
-export_proto(name`'rtype_qual`_'atype_code);
+export_proto('name`'rtype_qual`_'atype_code`);
void
-name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
- atype * const restrict array, GFC_LOGICAL_4 back)
+'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+ 'atype` * const restrict array, GFC_LOGICAL_4 back)
{
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride;
- const atype_name *base;
- rtype_name * restrict dest;
+ const 'atype_name` *base;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
@@ -101,14 +101,14 @@ define(FINISH_FOREACH_FUNCTION,
}')dnl
define(START_MASKED_FOREACH_FUNCTION,
`
-extern void `m'name`'rtype_qual`_'atype_code (rtype * const restrict,
- atype * const restrict, gfc_array_l1 * const restrict,
+extern void m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+ 'atype` * const restrict, gfc_array_l1 * const restrict,
GFC_LOGICAL_4);
-export_proto(`m'name`'rtype_qual`_'atype_code);
+export_proto(m'name`'rtype_qual`_'atype_code`);
void
-`m'name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
- atype * const restrict array,
+m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+ 'atype` * const restrict array,
gfc_array_l1 * const restrict mask, GFC_LOGICAL_4 back)
{
index_type count[GFC_MAX_DIMENSIONS];
@@ -116,8 +116,8 @@ void
index_type sstride[GFC_MAX_DIMENSIONS];
index_type mstride[GFC_MAX_DIMENSIONS];
index_type dstride;
- rtype_name *dest;
- const atype_name *base;
+ 'rtype_name` *dest;
+ const 'atype_name` *base;
GFC_LOGICAL_1 *mbase;
int rank;
index_type n;
@@ -126,7 +126,7 @@ void
if (mask == NULL)
{
- name`'rtype_qual`_'atype_code (retarray, array, back);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, back);
return;
}
@@ -240,13 +240,13 @@ $2
FINISH_MASKED_FOREACH_FUNCTION')dnl
define(SCALAR_FOREACH_FUNCTION,
`
-extern void `s'name`'rtype_qual`_'atype_code (rtype * const restrict,
- atype * const restrict, GFC_LOGICAL_4 *, GFC_LOGICAL_4);
-export_proto(`s'name`'rtype_qual`_'atype_code);
+extern void s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+ 'atype` * const restrict, GFC_LOGICAL_4 *, GFC_LOGICAL_4);
+export_proto(s'name`'rtype_qual`_'atype_code`);
void
-`s'name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
- atype * const restrict array,
+s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+ 'atype` * const restrict array,
GFC_LOGICAL_4 * mask, GFC_LOGICAL_4 back)
{
index_type rank;
@@ -256,7 +256,7 @@ void
if (mask == NULL || *mask)
{
- name`'rtype_qual`_'atype_code (retarray, array, back);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, back);
return;
}
diff --git a/libgfortran/m4/ifunction-s.m4 b/libgfortran/m4/ifunction-s.m4
index ae4cb8886cb2..61cc898c3e5d 100644
--- a/libgfortran/m4/ifunction-s.m4
+++ b/libgfortran/m4/ifunction-s.m4
@@ -22,7 +22,7 @@ define(START_ARRAY_FUNCTION,
#include <assert.h>
static inline int
-compare_fcn (const atype_name *a, const atype_name *b, gfc_charlen_type n)
+compare_fcn (const 'atype_name` *a, const 'atype_name` *b, gfc_charlen_type n)
{
if (sizeof ('atype_name`) == 1)
return memcmp (a, b, n);
@@ -30,7 +30,7 @@ compare_fcn (const atype_name *a, const atype_name *b,
gfc_charlen_type n)
return memcmp_char4 (a, b, n);
}
-extern void name`'rtype_qual`_'atype_code (rtype` * const restrict,
+extern void 'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
'atype` * const restrict, const index_type * const restrict 'back_arg`,
gfc_charlen_type);
export_proto('name`'rtype_qual`_'atype_code`);
@@ -45,8 +45,8 @@ void
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- const 'atype_name * restrict base;
- rtype_name * restrict dest;
+ const 'atype_name` * restrict base;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
index_type len;
@@ -137,8 +137,8 @@ void
continue_loop = 1;
while (continue_loop)
{
- const atype_name * restrict src;
- rtype_name result;
+ const 'atype_name` * restrict src;
+ 'rtype_name` result;
src = base;
{
')dnl
@@ -188,7 +188,7 @@ define(FINISH_ARRAY_FUNCTION,
}')dnl
define(START_MASKED_ARRAY_FUNCTION,
`
-extern void `m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+extern void m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
'atype` * const restrict, const index_type * const restrict,
gfc_array_l1 * const restrict'back_arg`, gfc_charlen_type);
export_proto(m'name`'rtype_qual`_'atype_code`);
@@ -205,8 +205,8 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
index_type mstride[GFC_MAX_DIMENSIONS];
- 'rtype_name * restrict dest;
- const atype_name * restrict base;
+ 'rtype_name` * restrict dest;
+ const 'atype_name` * restrict base;
const GFC_LOGICAL_1 * restrict mbase;
index_type rank;
index_type dim;
@@ -219,9 +219,9 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
if (mask == NULL)
{
#ifdef HAVE_BACK_ARG
- name`'rtype_qual`_'atype_code (retarray, array, pdim, back, string_len);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim, back,
string_len);
#else
- name`'rtype_qual`_'atype_code (retarray, array, pdim, string_len);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim, string_len);
#endif
return;
}
@@ -327,9 +327,9 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
while (base)
{
- const atype_name * restrict src;
+ const 'atype_name` * restrict src;
const GFC_LOGICAL_1 * restrict msrc;
- rtype_name result;
+ 'rtype_name` result;
src = base;
msrc = mbase;
{
@@ -377,7 +377,7 @@ define(FINISH_MASKED_ARRAY_FUNCTION,
}')dnl
define(SCALAR_ARRAY_FUNCTION,
`
-extern void `s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+extern void s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
'atype` * const restrict, const index_type * const restrict,
GFC_LOGICAL_4 *'back_arg`, gfc_charlen_type);
export_proto(s'name`'rtype_qual`_'atype_code`);
@@ -391,7 +391,7 @@ s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- 'rtype_name * restrict dest;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
index_type dim;
@@ -400,9 +400,9 @@ s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
if (mask == NULL || *mask)
{
#ifdef HAVE_BACK_ARG
- name`'rtype_qual`_'atype_code (retarray, array, pdim, back, string_len);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim, back,
string_len);
#else
- name`'rtype_qual`_'atype_code (retarray, array, pdim, string_len);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim, string_len);
#endif
return;
}
diff --git a/libgfortran/m4/ifunction-s2.m4 b/libgfortran/m4/ifunction-s2.m4
index c9f2a74d566f..a41f54d8513d 100644
--- a/libgfortran/m4/ifunction-s2.m4
+++ b/libgfortran/m4/ifunction-s2.m4
@@ -30,22 +30,22 @@ compare_fcn (const atype_name *a, const atype_name *b,
gfc_charlen_type n)
return memcmp_char4 (a, b, n);
}
-extern void name`'rtype_qual`_'atype_code (rtype * const restrict,
- gfc_charlen_type, atype * const restrict,
+extern void 'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+ gfc_charlen_type, 'atype` * const restrict,
const index_type * const restrict, gfc_charlen_type);
-export_proto(name`'rtype_qual`_'atype_code);
+export_proto('name`'rtype_qual`_'atype_code`);
void
-name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
- gfc_charlen_type xlen, atype * const restrict array,
+'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+ gfc_charlen_type xlen, 'atype` * const restrict array,
const index_type * const restrict pdim, gfc_charlen_type string_len)
{
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- const atype_name * restrict base;
- rtype_name * restrict dest;
+ const 'atype_name` * restrict base;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
index_type len;
@@ -189,15 +189,15 @@ define(FINISH_ARRAY_FUNCTION,
}')dnl
define(START_MASKED_ARRAY_FUNCTION,
`
-extern void `m'name`'rtype_qual`_'atype_code (rtype * const restrict,
- gfc_charlen_type, atype * const restrict,
+extern void m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+ gfc_charlen_type, 'atype` * const restrict,
const index_type * const restrict,
gfc_array_l1 * const restrict, gfc_charlen_type);
-export_proto(`m'name`'rtype_qual`_'atype_code);
+export_proto(m'name`'rtype_qual`_'atype_code`);
void
-`m'name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
- gfc_charlen_type xlen, atype * const restrict array,
+m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+ gfc_charlen_type xlen, 'atype` * const restrict array,
const index_type * const restrict pdim,
gfc_array_l1 * const restrict mask,
gfc_charlen_type string_len)
@@ -208,8 +208,8 @@ void
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
index_type mstride[GFC_MAX_DIMENSIONS];
- rtype_name * restrict dest;
- const atype_name * restrict base;
+ 'rtype_name` * restrict dest;
+ const 'atype_name` * restrict base;
const GFC_LOGICAL_1 * restrict mbase;
index_type rank;
index_type dim;
@@ -221,7 +221,7 @@ void
if (mask == NULL)
{
- name`'rtype_qual`_'atype_code (retarray, xlen, array, pdim, string_len);
+ 'name`'rtype_qual`_'atype_code` (retarray, xlen, array, pdim,
string_len);
return;
}
@@ -378,16 +378,16 @@ define(FINISH_MASKED_ARRAY_FUNCTION,
}')dnl
define(SCALAR_ARRAY_FUNCTION,
`
-void `s'name`'rtype_qual`_'atype_code (rtype * const restrict,
- gfc_charlen_type, atype * const restrict,
+void s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+ gfc_charlen_type, 'atype` * const restrict,
const index_type * const restrict,
GFC_LOGICAL_4 *, gfc_charlen_type);
-export_proto(`s'name`'rtype_qual`_'atype_code);
+export_proto(s'name`'rtype_qual`_'atype_code`);
void
-`s'name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
- gfc_charlen_type xlen, atype * const restrict array,
+s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+ gfc_charlen_type xlen, 'atype` * const restrict array,
const index_type * const restrict pdim,
GFC_LOGICAL_4 *mask, gfc_charlen_type string_len)
@@ -395,7 +395,7 @@ void
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- rtype_name * restrict dest;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
index_type dim;
@@ -403,7 +403,7 @@ void
if (mask == NULL || *mask)
{
- name`'rtype_qual`_'atype_code (retarray, xlen, array, pdim, string_len);
+ 'name`'rtype_qual`_'atype_code` (retarray, xlen, array, pdim,
string_len);
return;
}
/* Make dim zero based to avoid confusion. */
diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4
index 5bb1d303ae17..39963bf2dfc1 100644
--- a/libgfortran/m4/ifunction.m4
+++ b/libgfortran/m4/ifunction.m4
@@ -19,12 +19,12 @@ dnl You should not return or break from the inner loop of
the implementation.
dnl Care should also be taken to avoid using the names defined in iparm.m4
define(START_ARRAY_FUNCTION,
`
-extern void name`'rtype_qual`_'atype_code (rtype * const restrict,
- atype` * const restrict, const 'index_type` * const restrict'back_arg`);
-export_proto('name`'rtype_qual`_'atype_code);
+extern void 'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+ 'atype` * const restrict, const index_type * const restrict'back_arg`);
+export_proto('name`'rtype_qual`_'atype_code`);
void
-name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
'atype` * const restrict array,
const index_type * const restrict pdim'back_arg`)
{
@@ -32,8 +32,8 @@ name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
index_type extent[GFC_MAX_DIMENSIONS];
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- const 'atype_name * restrict base;
- rtype_name * restrict dest;
+ const 'atype_name` * restrict base;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
index_type len;
@@ -124,8 +124,8 @@ name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
continue_loop = 1;
while (continue_loop)
{
- const atype_name * restrict src;
- rtype_name result;
+ const 'atype_name` * restrict src;
+ 'rtype_name` result;
src = base;
{
')dnl
@@ -177,7 +177,7 @@ define(FINISH_ARRAY_FUNCTION,
}')dnl
define(START_MASKED_ARRAY_FUNCTION,
`
-extern void `m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+extern void m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
'atype` * const restrict, const 'index_type` * const restrict,
gfc_array_l1 * const restrict'back_arg`);
export_proto(m'name`'rtype_qual`_'atype_code`);
@@ -193,8 +193,8 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
index_type mstride[GFC_MAX_DIMENSIONS];
- 'rtype_name * restrict dest;
- const atype_name * restrict base;
+ 'rtype_name` * restrict dest;
+ const 'atype_name` * restrict base;
const GFC_LOGICAL_1 * restrict mbase;
index_type rank;
index_type dim;
@@ -207,9 +207,9 @@ m'name`'rtype_qual`_'atype_code` ('rtype` * const restrict
retarray,
if (mask == NULL)
{
#ifdef HAVE_BACK_ARG
- name`'rtype_qual`_'atype_code (retarray, array, pdim, back);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim, back);
#else
- name`'rtype_qual`_'atype_code (retarray, array, pdim);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim);
#endif
return;
}
@@ -365,13 +365,13 @@ define(FINISH_MASKED_ARRAY_FUNCTION,
}')dnl
define(SCALAR_ARRAY_FUNCTION,
`
-extern void `s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
+extern void s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
'atype` * const restrict, const index_type * const restrict,
GFC_LOGICAL_4 *'back_arg`);
-export_proto(s'name`'rtype_qual`_'atype_code);
+export_proto(s'name`'rtype_qual`_'atype_code`);
void
-`s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
+s'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
'atype` * const restrict array,
const index_type * const restrict pdim,
GFC_LOGICAL_4 * mask'back_arg`)
@@ -379,7 +379,7 @@ void
index_type count[GFC_MAX_DIMENSIONS];
index_type extent[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
- 'rtype_name * restrict dest;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
index_type dim;
@@ -388,9 +388,9 @@ void
if (mask == NULL || *mask)
{
#ifdef HAVE_BACK_ARG
- name`'rtype_qual`_'atype_code (retarray, array, pdim, back);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim, back);
#else
- name`'rtype_qual`_'atype_code (retarray, array, pdim);
+ 'name`'rtype_qual`_'atype_code` (retarray, array, pdim);
#endif
return;
}
diff --git a/libgfortran/m4/ifunction_logical.m4
b/libgfortran/m4/ifunction_logical.m4
index 032aa21b5327..ebf6520ea532 100644
--- a/libgfortran/m4/ifunction_logical.m4
+++ b/libgfortran/m4/ifunction_logical.m4
@@ -19,12 +19,12 @@ dnl You should not return or break from the inner loop of
the implementation.
dnl Care should also be taken to avoid using the names defined in iparm.m4
define(START_ARRAY_FUNCTION,
`
-extern void name`'rtype_qual`_'atype_code (rtype * const restrict,
+extern void 'name`'rtype_qual`_'atype_code` ('rtype` * const restrict,
gfc_array_l1 * const restrict, const index_type * const restrict);
-export_proto(name`'rtype_qual`_'atype_code);
+export_proto('name`'rtype_qual`_'atype_code`);
void
-name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
+'name`'rtype_qual`_'atype_code` ('rtype` * const restrict retarray,
gfc_array_l1 * const restrict array,
const index_type * const restrict pdim)
{
@@ -33,7 +33,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict
retarray,
index_type sstride[GFC_MAX_DIMENSIONS];
index_type dstride[GFC_MAX_DIMENSIONS];
const GFC_LOGICAL_1 * restrict base;
- rtype_name * restrict dest;
+ 'rtype_name` * restrict dest;
index_type rank;
index_type n;
index_type len;
diff --git a/libgfortran/m4/iparm.m4 b/libgfortran/m4/iparm.m4
index 2d6a376b1384..394b8e1aafbc 100644
--- a/libgfortran/m4/iparm.m4
+++ b/libgfortran/m4/iparm.m4
@@ -36,5 +36,5 @@ define(`upcase', `translit(`$*', `a-z', `A-Z')')dnl
define(`u_name',`regexp(upcase(name),`\([A-Z]*\)',`\1')')dnl
define(rtype_ccode,ifelse(rtype_letter,`i',rtype_kind,rtype_code))dnl
define(initval,ifelse(index(name,`maxval'),0,0,index(name,`minval'),0,255))dnl
-define(back_arg,ifelse(index(name,`maxloc'),0,``, GFC_LOGICAL_4 back'',dnl
-index(name,`minloc'),0,``, GFC_LOGICAL_4 back''))dnl
+define(back_arg,ifelse(index(name,`maxloc'),0,```, GFC_LOGICAL_4 back''',dnl
+index(name,`minloc'),0,```, GFC_LOGICAL_4 back'''))dnl
diff --git a/libgfortran/m4/maxloc0.m4 b/libgfortran/m4/maxloc0.m4
index ca50cbddb6f1..f60580f063e2 100644
--- a/libgfortran/m4/maxloc0.m4
+++ b/libgfortran/m4/maxloc0.m4
@@ -32,15 +32,15 @@ include(iforeach.m4)dnl
`#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)'
FOREACH_FUNCTION(
-` atype_name maxval;
+` 'atype_name` maxval;
#if defined('atype_nan`)
int fast = 0;
#endif
#if defined('atype_inf`)
- maxval = -atype_inf;
+ maxval = -'atype_inf`;
#else
- maxval = atype_min;
+ maxval = 'atype_min`;
#endif',
`#if defined('atype_nan`)
if (unlikely (!fast))
@@ -85,13 +85,13 @@ FOREACH_FUNCTION(
dest[n * dstride] = count[n] + 1;
}')
MASKED_FOREACH_FUNCTION(
-` atype_name maxval;
+` 'atype_name` maxval;
int fast = 0;
#if defined('atype_inf`)
- maxval = -atype_inf;
+ maxval = -'atype_inf`;
#else
- maxval = atype_min;
+ maxval = 'atype_min`;
#endif',
` if (unlikely (!fast))
{
diff --git a/libgfortran/m4/maxloc1.m4 b/libgfortran/m4/maxloc1.m4
index 89836c2f0979..924b6d61b81c 100644
--- a/libgfortran/m4/maxloc1.m4
+++ b/libgfortran/m4/maxloc1.m4
@@ -63,26 +63,26 @@ ARRAY_FUNCTION(0,
}', `')
MASKED_ARRAY_FUNCTION(0,
-` atype_name maxval;
+` 'atype_name` maxval;
#if defined ('atype_inf`)
- maxval = -atype_inf;
+ maxval = -'atype_inf`;
#else
- maxval = atype_min;
+ maxval = 'atype_min`;
#endif
#if defined ('atype_nan`)
- rtype_name result2 = 0;
+ 'rtype_name` result2 = 0;
#endif
result = 0;',
` if (*msrc)
{
#if defined ('atype_nan`)
if (!result2)
- result2 = (rtype_name)n + 1;
+ result2 = ('rtype_name`)n + 1;
if (*src >= maxval)
#endif
{
maxval = *src;
- result = (rtype_name)n + 1;
+ result = ('rtype_name`)n + 1;
break;
}
}
diff --git a/libgfortran/m4/maxval.m4 b/libgfortran/m4/maxval.m4
index c6caa956fbd5..a60a21ac31b6 100644
--- a/libgfortran/m4/maxval.m4
+++ b/libgfortran/m4/maxval.m4
@@ -32,16 +32,16 @@ include(ifunction.m4)dnl
ARRAY_FUNCTION(atype_min,
`#if defined ('atype_inf`)
- result = -atype_inf;
+ result = -'atype_inf`;
#else
- result = atype_min;
+ result = 'atype_min`;
#endif',
`#if defined ('atype_nan`)
if (*src >= result)
break;
}
if (unlikely (n >= len))
- result = atype_nan;
+ result = 'atype_nan`;
else for (; n < len; n++, src += delta)
{
#endif
@@ -50,9 +50,9 @@ ARRAY_FUNCTION(atype_min,
MASKED_ARRAY_FUNCTION(atype_min,
`#if defined ('atype_inf`)
- result = -atype_inf;
+ result = -'atype_inf`;
#else
- result = atype_min;
+ result = 'atype_min`;
#endif
#if defined ('atype_nan`)
int non_empty_p = 0;
@@ -70,9 +70,9 @@ MASKED_ARRAY_FUNCTION(atype_min,
if (unlikely (n >= len))
{
#if defined ('atype_nan`)
- result = non_empty_p ? atype_nan : atype_min;
+ result = non_empty_p ? 'atype_nan` : 'atype_min`;
#else
- result = atype_min;
+ result = 'atype_min`;
#endif
}
else for (; n < len; n++, src += delta, msrc += mdelta)
diff --git a/libgfortran/m4/maxval1s.m4 b/libgfortran/m4/maxval1s.m4
index 602347ab0b5c..3759754dc0d5 100644
--- a/libgfortran/m4/maxval1s.m4
+++ b/libgfortran/m4/maxval1s.m4
@@ -31,7 +31,7 @@ include(ifunction-s2.m4)dnl
`#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)'
ARRAY_FUNCTION(0,
-` const atype_name *retval;
+` const 'atype_name` *retval;
retval = base;',
` if (compare_fcn (src, retval, string_len) > 0)
{
@@ -39,7 +39,7 @@ ARRAY_FUNCTION(0,
}', `')
MASKED_ARRAY_FUNCTION(0,
-` const atype_name *retval;
+` const 'atype_name` *retval;
memset (dest, 0, sizeof (*dest) * string_len);
retval = dest;',
` if (*msrc)
diff --git a/libgfortran/m4/minloc0.m4 b/libgfortran/m4/minloc0.m4
index 310d6d88c2ea..0e1bb3b2f86c 100644
--- a/libgfortran/m4/minloc0.m4
+++ b/libgfortran/m4/minloc0.m4
@@ -32,15 +32,15 @@ include(iforeach.m4)dnl
`#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)'
FOREACH_FUNCTION(
-` atype_name minval;
+` 'atype_name` minval;
#if defined('atype_nan`)
int fast = 0;
#endif
#if defined('atype_inf`)
- minval = atype_inf;
+ minval = 'atype_inf`;
#else
- minval = atype_max;
+ minval = 'atype_max`;
#endif',
`#if defined('atype_nan`)
if (unlikely (!fast))
diff --git a/libgfortran/m4/minloc1.m4 b/libgfortran/m4/minloc1.m4
index 55eae37a7c37..b678145b51c4 100644
--- a/libgfortran/m4/minloc1.m4
+++ b/libgfortran/m4/minloc1.m4
@@ -34,11 +34,11 @@ include(ifunction.m4)dnl
#define HAVE_BACK_ARG 1
ARRAY_FUNCTION(0,
-` atype_name minval;
+` 'atype_name` minval;
#if defined ('atype_inf`)
- minval = atype_inf;
+ minval = 'atype_inf`;
#else
- minval = atype_max;
+ minval = 'atype_max`;
#endif
result = 1;',
`#if defined ('atype_nan`)
@@ -60,7 +60,7 @@ ARRAY_FUNCTION(0,
if (unlikely (*src <= minval))
{
minval = *src;
- result = (rtype_name)n + 1;
+ result = ('rtype_name`)n + 1;
}
}
else
@@ -73,26 +73,26 @@ ARRAY_FUNCTION(0,
}')
MASKED_ARRAY_FUNCTION(0,
-` atype_name minval;
+` 'atype_name` minval;
#if defined ('atype_inf`)
- minval = atype_inf;
+ minval = 'atype_inf`;
#else
- minval = atype_max;
+ minval = 'atype_max`;
#endif
#if defined ('atype_nan`)
- rtype_name result2 = 0;
+ 'rtype_name` result2 = 0;
#endif
result = 0;',
` if (*msrc)
{
#if defined ('atype_nan`)
if (!result2)
- result2 = (rtype_name)n + 1;
+ result2 = ('rtype_name`)n + 1;
if (*src <= minval)
#endif
{
minval = *src;
- result = (rtype_name)n + 1;
+ result = ('rtype_name`)n + 1;
break;
}
}
diff --git a/libgfortran/m4/minval.m4 b/libgfortran/m4/minval.m4
index 0c4d5e434580..ec6ad8d93b24 100644
--- a/libgfortran/m4/minval.m4
+++ b/libgfortran/m4/minval.m4
@@ -32,16 +32,16 @@ include(ifunction.m4)dnl
ARRAY_FUNCTION(atype_max,
`#if defined ('atype_inf`)
- result = atype_inf;
+ result = 'atype_inf`;
#else
- result = atype_max;
+ result = 'atype_max`;
#endif',
`#if defined ('atype_nan`)
if (*src <= result)
break;
}
if (unlikely (n >= len))
- result = atype_nan;
+ result = 'atype_nan`;
else for (; n < len; n++, src += delta)
{
#endif
@@ -50,9 +50,9 @@ ARRAY_FUNCTION(atype_max,
MASKED_ARRAY_FUNCTION(atype_max,
`#if defined ('atype_inf`)
- result = atype_inf;
+ result = 'atype_inf`;
#else
- result = atype_max;
+ result = 'atype_max`;
#endif
#if defined ('atype_nan`)
int non_empty_p = 0;
@@ -70,9 +70,9 @@ MASKED_ARRAY_FUNCTION(atype_max,
if (unlikely (n >= len))
{
#if defined ('atype_nan`)
- result = non_empty_p ? atype_nan : atype_max;
+ result = non_empty_p ? 'atype_nan` : 'atype_max`;
#else
- result = atype_max;
+ result = 'atype_max`;
#endif
}
else for (; n < len; n++, src += delta, msrc += mdelta)
