re PR fortran/43228 (NAMELIST I/O: Reading at 2 dimensions (rank) array values.)

2010-03-11  Tobias Burnus  <burnus@net-b.de>

        PR fortran/43228
        * io/list_read.c (nml_parse_qualifier): Disable expanded_read
        for array sections.

2010-03-11  Tobias Burnus  <burnus@net-b.de>

        PR fortran/43228
        * gfortran.dg/namelist_61.f90: New test.

From-SVN: r157389

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9a8709ae1feffdcb24f68588f19ab760ac19da35..152db47601667106ebbf9aabef83ca37e1aeca9c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-11  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/43228
+       * gfortran.dg/namelist_61.f90: New test.
+
 2010-03-11  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/43255

diff --git a/gcc/testsuite/gfortran.dg/namelist_61.f90 b/gcc/testsuite/gfortran.dg/namelist_61.f90
new file mode 100644 (file)
index 0000000..c7214dd
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/namelist_61.f90
@@ -0,0 +1,35 @@
+! { dg-do run }
+!
+! PR fortran/43228
+!
+integer :: a(3,3)
+character(len=100) :: str
+namelist /nml/a
+
+a = -1
+str = '&nml a(1,:) = 1 2 3 /'
+read(str, nml=nml)
+if (any (a(1,:) /= [1, 2, 3])) call abort ()
+if (any (a([2,3],:) /= -1)) call abort ()
+
+a = -1
+str = '&nml a(1,1) = 1 2 3 4 /'
+read(str, nml=nml)
+if (any (a(:,1) /= [1, 2, 3])) call abort ()
+if (any (a(:,2) /= [4, -1, -1])) call abort ()
+if (any (a(:,3) /= -1)) call abort ()
+
+str = '&nml a(1,:) = 1 2 3 , &
+       &    a(2,:) = 4,5,6 &
+       &    a(3,:) = 7 8 9/'
+read(str, nml=nml)
+if (any (a(1,:) /= [1, 2, 3])) call abort ()
+if (any (a(2,:) /= [4, 5, 6])) call abort ()
+if (any (a(3,:) /= [7, 8, 9])) call abort ()
+
+!print *, a(:,1)
+!print *, a(:,2)
+!print *, a(:,3)
+end
+
+

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index e496264c6bc4bf6993dbd98474da4d215491fbde..4f59525332e68f04f600e68a939495822febf191 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-11  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/43228
+       * io/list_read.c (nml_parse_qualifier): Disable expanded_read
+       for array sections.
+
 2010-03-10  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libfortran/43320

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index afd5b457f75d6368d16e124ee168e668a242cc76..830cde24d698d68fd815a161dcea72b948657ae7 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -2091,6 +2091,14 @@ nml_parse_qualifier (st_parameter_dt *dtp, descriptor_dimension *ad,
            }
        }
 
+      if (is_array_section == 1 && dtp->u.p.expanded_read == 1)
+       {
+         int i;
+         dtp->u.p.expanded_read = 0;
+         for (i = 0; i < dim; i++)
+           ls[i].end = ls[i].start;
+       }
+
       /* Check the values of the triplet indices.  */
       if ((ls[dim].start > (ssize_t) GFC_DIMENSION_UBOUND(ad[dim]))
           || (ls[dim].start < (ssize_t) GFC_DIMENSION_LBOUND(ad[dim]))