re PR fortran/38439 (I/O PD edit descriptor inconsistency)

2009-10-11  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/38439
	* io/format.c (parse_format_list): Correct logic for FMT_F reading vs
	writing. Code clean-up.

From-SVN: r152657

libgfortran/ChangeLog

 2009-10-11  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/38439
+	* io/format.c (parse_format_list): Correct logic for FMT_F reading vs
+	writing. Code clean-up.
+
+2009-10-11  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libgfortran/38439
 	* io/format.c (parse_format_list): Add check for tokens not allowed
 	after P specifier. Fix comments.  Remove un-needed code. Fix the
 	default exponent list. Correct pointer assignment error.

libgfortran/io/format.c

@@ -933,7 +933,7 @@ parse_format_list (st_parameter_dt *dtp, bool *save_ok)
 	  tail->u.real.d = fmt->value;
 	  break;
 	}
-      if (t == FMT_F || dtp->u.p.mode == WRITING)
+      if (t == FMT_F && dtp->u.p.mode == WRITING)
 	{
 	  if (u != FMT_POSINT && u != FMT_ZERO)
 	    {
@@ -941,13 +941,10 @@ parse_format_list (st_parameter_dt *dtp, bool *save_ok)
 	      goto finished;
 	    }
 	}
-      else
+      else if (u != FMT_POSINT)
 	{
-	  if (u != FMT_POSINT)
-	    {
-	      fmt->error = posint_required;
-	      goto finished;
-	    }
+	  fmt->error = posint_required;
+	  goto finished;
 	}
 
       tail->u.real.w = fmt->value;