re PR libfortran/38097 (I/O with blanks in exponent fails; blank="NULL", BN edit...

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

	PR libfortran/38097
	* io/read.c (read_f): Initialize exponent. Fix comment. Set loop
	conditions for BZ/BN.
	* io/unit.c (get_internal_unit): Initialize flags.blank.
	* io/transfer.c (data_transfer_init): Fix whitespace.

From-SVN: r141919

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 42aca0ce1e3476f3a6905147493212c00e5cf50a..1fd0263e4806d3f30856d9b170847af810fa75fa 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-16  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libfortran/38097
+       * io/read.c (read_f): Initialize exponent. Fix comment. Set loop
+       conditions for BZ/BN.
+       * io/unit.c (get_internal_unit): Initialize flags.blank.
+       * io/transfer.c (data_transfer_init): Fix whitespace.
+
 2008-11-15  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libfortran/37294

diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c
index 5fb1e3cb98ffa425a6b37ae2f04e7b3943eeb48b..fb39877012cc4f6536e7ef298b9f69023c010ec9 100644 (file)
--- a/libgfortran/io/read.c
+++ b/libgfortran/io/read.c
@@ -956,14 +956,9 @@ read_f (st_parameter_dt *dtp, const fnode *f, char *dest, int length)
      of the exponent in order to take account of the scale factor and
      the d parameter before explict conversion takes place. */
  exp2:
-  if (!isdigit (*p))
-    goto bad_float;
-
-  exponent = *p - '0';
-  p++;
-  w--;
-
-  if (dtp->u.p.blank_status == BLANK_UNSPECIFIED) /* Normal processing of exponent */
+  /* Normal processing of exponent */
+  exponent = 0;
+  if (dtp->u.p.blank_status == BLANK_UNSPECIFIED)
     {
       while (w > 0 && isdigit (*p))
         {
@@ -984,7 +979,7 @@ read_f (st_parameter_dt *dtp, const fnode *f, char *dest, int length)
     }    
   else  /* BZ or BN status is enabled */
     {
-      while (w > 0)
+      while (w > 0 && (isdigit (*p) || *p == ' '))
         {
           if (*p == ' ')
             {

diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 8d4f785e49a437d26df6769dbe8dd62fd895d206..500cce95e408f4ead8eb23a95801e2150c9d4b20 100644 (file)
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -2102,7 +2102,7 @@ data_transfer_init (st_parameter_dt *dtp, int read_flag)
   
   if (dtp->u.p.blank_status == BLANK_UNSPECIFIED)
        dtp->u.p.blank_status = dtp->u.p.current_unit->flags.blank;
-  
+
   /* Check the delim mode.  */
   dtp->u.p.current_unit->delim_status
        = !(cf & IOPARM_DT_HAS_DELIM) ? DELIM_UNSPECIFIED :

diff --git a/libgfortran/io/unit.c b/libgfortran/io/unit.c
index 69563187553348d1b85714647aa10de61c93b0e6..a5d660c392d7a379d174f3a639a901dcf47d61ee 100644 (file)
--- a/libgfortran/io/unit.c
+++ b/libgfortran/io/unit.c
@@ -437,6 +437,7 @@ get_internal_unit (st_parameter_dt *dtp)
 
   iunit->flags.access = ACCESS_SEQUENTIAL;
   iunit->flags.action = ACTION_READWRITE;
+  iunit->flags.blank = BLANK_UNSPECIFIED;
   iunit->flags.form = FORM_FORMATTED;
   iunit->flags.pad = PAD_YES;
   iunit->flags.status = STATUS_UNSPECIFIED;
@@ -448,7 +449,6 @@ get_internal_unit (st_parameter_dt *dtp)
   /* Initialize the data transfer parameters.  */
 
   dtp->u.p.advance_status = ADVANCE_YES;
-  dtp->u.p.blank_status = BLANK_UNSPECIFIED;
   dtp->u.p.seen_dollar = 0;
   dtp->u.p.skips = 0;
   dtp->u.p.pending_spaces = 0;