re PR libfortran/37294 (Namelist I/O to array character internal units)

2008-11-15  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libfortran/37294
	* io/write.c (namelist_write_newline): Use array loop specification to
	advance to next internal array unit record. (namelist_write): Adjust to
	accomodate the internal array unit behavior.

From-SVN: r141892

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 2903760cb8c5b7fc7f6b048ea0f0ad884cf7e532..42aca0ce1e3476f3a6905147493212c00e5cf50a 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-15  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libfortran/37294
+       * io/write.c (namelist_write_newline): Use array loop specification to
+       advance to next internal array unit record. (namelist_write): Adjust to
+       accomodate the internal array unit behavior.
+
 2008-11-01  Dennis Wassel  <dennis.wassel@gmail.com>
 
        PR fortran/37159

diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c
index 12ff2953c6215903328741c92c4485d51c2ece7b..32c58471bb8c1b92ca8d4b38a739d3c9a7f30420 100644 (file)
--- a/libgfortran/io/write.c
+++ b/libgfortran/io/write.c
@@ -1146,6 +1146,35 @@ namelist_write_newline (st_parameter_dt *dtp)
 #else
       write_character (dtp, "\n", 1, 1);
 #endif
+      return;
+    }
+
+  if (is_array_io (dtp))
+    {
+      gfc_offset record;
+      int finished, length;
+
+      length = (int) dtp->u.p.current_unit->bytes_left;
+             
+      /* Now that the current record has been padded out,
+        determine where the next record in the array is. */
+      record = next_array_record (dtp, dtp->u.p.current_unit->ls,
+                                 &finished);
+      if (finished)
+       dtp->u.p.current_unit->endfile = AT_ENDFILE;
+      else
+       {
+         /* Now seek to this record */
+         record = record * dtp->u.p.current_unit->recl;
+
+         if (sseek (dtp->u.p.current_unit->s, record) == FAILURE)
+           {
+             generate_error (&dtp->common, LIBERROR_INTERNAL_UNIT, NULL);
+             return;
+           }
+
+         dtp->u.p.current_unit->bytes_left = dtp->u.p.current_unit->recl;
+       }
     }
   else
     write_character (dtp, " ", 1, 1);
@@ -1467,8 +1496,8 @@ namelist_write (st_parameter_dt *dtp)
        }
     }
 
-  write_character (dtp, "  /", 1, 3);
   namelist_write_newline (dtp);
+  write_character (dtp, " /", 1, 2);
   /* Restore the original delimiter.  */
   dtp->u.p.current_unit->delim_status = tmp_delim;
 }