summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2008-10-09 04:02:35 +0000
committerjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2008-10-09 04:02:35 +0000
commitfd8af31eeaf16fc045dd5a4ae04aadd26ebdb8d3 (patch)
tree0c68202426e4623c50601bb8b2569470eac69879
parentec2637a0d86599776b173afeafeeb383c6fd10f6 (diff)
downloadppe42-gcc-fd8af31eeaf16fc045dd5a4ae04aadd26ebdb8d3.tar.gz
ppe42-gcc-fd8af31eeaf16fc045dd5a4ae04aadd26ebdb8d3.zip
2008-10-08 Jerry DeLisle <jvdelisle@gcc.gnu.org
PR libfortran/37707 * io/list_read.c (nml_get_obj_data): If the first namelist object rank is greater than zero, call nml_object_read with the first object rather than the sub-object. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140995 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libgfortran/ChangeLog7
-rw-r--r--libgfortran/io/list_read.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1130bdf602c..4e115957144 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-08 Jerry DeLisle <jvdelisle@gcc.gnu.org
+
+ PR libfortran/37707
+ * io/list_read.c (nml_get_obj_data): If the first namelist object rank is
+ greater than zero, call nml_object_read with the first object rather
+ than the sub-object.
+
2008-09-26 Peter O'Gorman <pogma@thewrittenword.com>
Steve Ellcey <sje@cup.hp.com>
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index bcde3e1d49b..76634a3ee25 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -2839,6 +2839,9 @@ get_name:
goto nml_err_ret;
}
+ if (first_nl != NULL && first_nl->var_rank > 0)
+ nl = first_nl;
+
if (nml_read_obj (dtp, nl, 0, pprev_nl, nml_err_msg, nml_err_msg_size,
clow, chigh) == FAILURE)
goto nml_err_ret;
OpenPOWER on IntegriCloud