aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorTobias Schlüter <tobi@gcc.gnu.org>2007-03-22 16:37:25 +0100
committerTobias Schlüter <tobi@gcc.gnu.org>2007-03-22 16:37:25 +0100
commit1e863adf8376bff6e3ec741101eae39063f1a98d (patch)
tree882cdd13c2d34e1457116a52cec83aa37b6143f0 /gcc/fortran
parent8766652c6e5781bf288ebbacf678fce26204d519 (diff)
downloadgcc-1e863adf8376bff6e3ec741101eae39063f1a98d.zip
gcc-1e863adf8376bff6e3ec741101eae39063f1a98d.tar.gz
gcc-1e863adf8376bff6e3ec741101eae39063f1a98d.tar.bz2
re PR fortran/20897 (derived type name shall not be same as intrinsic type name)
PR fortran/20897 fortran/ * decl.c (gfc_match_derived_decl): Reliably reject 'doubleprecision' and 'doublecomplex' as type names. testsuite/ * gfortran.dg/derived_name_1.f90: New. * gfortran.dg/derived_name_2.f: New. From-SVN: r123129
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/decl.c8
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3f4ab3c..c32304b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-22 Tobias Schlüter <tobi@gcc.gnu.org>
+
+ PR fortran/20897
+ * decl.c (gfc_match_derived_decl): Reliably reject
+ 'doubleprecision' and 'doublecomplex' as type names.
+
2007-03-19 Francois-Xavier Coudert <coudert@clipper.ens.fr>
PR fortran/31203
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 09ded01..570a036 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -4341,12 +4341,16 @@ loop:
return m;
/* Make sure the name isn't the name of an intrinsic type. The
- 'double precision' type doesn't get past the name matcher. */
+ 'double {precision,complex}' types don't get past the name
+ matcher, unless they're written as a single word or in fixed
+ form. */
if (strcmp (name, "integer") == 0
|| strcmp (name, "real") == 0
|| strcmp (name, "character") == 0
|| strcmp (name, "logical") == 0
- || strcmp (name, "complex") == 0)
+ || strcmp (name, "complex") == 0
+ || strcmp (name, "doubleprecision") == 0
+ || strcmp (name, "doublecomplex") == 0)
{
gfc_error ("Type name '%s' at %C cannot be the same as an intrinsic "
"type", name);