re PR fortran/29625 (Octal edit descriptors allow real variables, even with -std=f95)

2006-10-28 Tobias Burnus <burnus@net-b.de>

	PR fortran/29625
	* io/transfer.c (formatted_transfer_scalar): Allow binary edit
	  descriptors for real variables; give error for BOZ edit
	  descriptor for non-integers when using -std=f*.

From-SVN: r118111

libgfortran/ChangeLog

+2006-10-28 Tobias Burnus <burnus@net-b.de>
+
+	PR fortran/29625
+	* io/transfer.c (formatted_transfer_scalar): Allow binary edit
+	  descriptors for real variables; give error for BOZ edit
+	  descriptor for non-integers when using -std=f*.
+
 2006-10-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/29563

libgfortran/io/transfer.c

@@ -844,7 +844,9 @@ formatted_transfer_scalar (st_parameter_dt *dtp, bt type, void *p, int len,
 	case FMT_B:
 	  if (n == 0)
 	    goto need_data;
-	  if (require_type (dtp, BT_INTEGER, type, f))
+
+	  if (compile_options.allow_std < GFC_STD_GNU
+              && require_type (dtp, BT_INTEGER, type, f))
 	    return;
 
 	  if (dtp->u.p.mode == READING)
@@ -856,7 +858,11 @@ formatted_transfer_scalar (st_parameter_dt *dtp, bt type, void *p, int len,
 
 	case FMT_O:
 	  if (n == 0)
-	    goto need_data;
+	    goto need_data; 
+
+	  if (compile_options.allow_std < GFC_STD_GNU
+              && require_type (dtp, BT_INTEGER, type, f))
+	    return;
 
 	  if (dtp->u.p.mode == READING)
 	    read_radix (dtp, f, p, len, 8);
@@ -869,6 +875,10 @@ formatted_transfer_scalar (st_parameter_dt *dtp, bt type, void *p, int len,
 	  if (n == 0)
 	    goto need_data;
 
+	  if (compile_options.allow_std < GFC_STD_GNU
+              && require_type (dtp, BT_INTEGER, type, f))
+	    return;
+
 	  if (dtp->u.p.mode == READING)
 	    read_radix (dtp, f, p, len, 16);
 	  else