libgfortran: [PR114304] Revert portion of PR105347 change.

	PR libfortran/105437
	PR libfortran/114304

libgfortran/ChangeLog:

	* io/list_read.c (eat_separator): Remove check for decimal
	point mode and semicolon used as a seprator. Removes
	the regression.

gcc/testsuite/ChangeLog:

	* gfortran.dg/pr105473.f90: Add additional checks to address
	the case of semicolon at the end of a line.

diff --git a/gcc/testsuite/gfortran.dg/pr105473.f90 b/gcc/testsuite/gfortran.dg/pr105473.f90
index b309217540d0941bbd111b64d506fff754582d22..2679f6bb4475412e672cd4cda1d4866613c094a1 100644 (file)
--- a/gcc/testsuite/gfortran.dg/pr105473.f90
+++ b/gcc/testsuite/gfortran.dg/pr105473.f90
@@ -3,44 +3,51 @@
   implicit none
   integer n,m,ios
   real r
+  real :: x(3)
   complex z
   character(40):: testinput
   n = 999; m = 777; r=1.2345
   z = cmplx(0.0,0.0)
 
-! Check that semi-colon is not allowed as separator with decimal=point.
+! Check that semi-colon is allowed as separator with decimal=point.
   ios=0
   testinput = '1;17;3.14159'
   read(testinput,*,decimal='point',iostat=ios) n, m, r
-  if (ios /= 5010) print *, "stop 1"
+  if (ios /= 0) stop 1
 
+! Check that semi-colon allowed as a separator with decimal=point.
+  ios=0
+  testinput = '1.23435 1243.24 13.24 ;'
+  read(testinput, *, iostat=ios) x
+  if (ios /= 0) stop 2
+  
 ! Check that comma is not allowed as a separator with decimal=comma.
   ios=0
   testinput = '1,17,3,14159'
   read(testinput,*,decimal='comma',iostat=ios) n, m, r
-  if (ios /= 5010) print *, "stop 2"
+  if (ios /= 5010) stop 3
 
 ! Check a good read.
   ios=99
   testinput = '1;17;3,14159'
   read(testinput,*,decimal='comma',iostat=ios) n, m, r
-  if (ios /= 0) print *, "stop 3"
+  if (ios /= 0) stop 4
 
 ! Check that comma is not allowed as a separator with decimal=comma.
   ios=99; z = cmplx(0.0,0.0)
   testinput = '1,17, (3,14159, 1,7182)'
   read(testinput,*,decimal='comma', iostat=ios) n, m, z
-  if (ios /= 5010) stop 4
+  if (ios /= 5010) stop 5
 
 ! Check that semi-colon is not allowed as separator with decimal=point.
   ios=99; z = cmplx(0.0,0.0)
   testinput = '1,17; (3.14159; 1.7182)'
   read(testinput,*,decimal='point', iostat=ios) n, m, z
-  if (ios /= 5010) stop 5
+  if (ios /= 5010) stop 6
 
 ! Check a good read.
   ios=99;z = cmplx(0.0,0.0)
   testinput = '1;17; (3,14159; 1,7182)'
   read(testinput,*,decimal='comma', iostat=ios) n, m, z
-  if (ios /= 0) stop 6
+  if (ios /= 0) stop 7
 end program

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index e38e9a84976545e799bc677ef3fc49ef6f6d6832..fb3f7dbc34d8878a8a907b4058b6e143744454c9 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -476,18 +476,8 @@ eat_separator (st_parameter_dt *dtp)
          unget_char (dtp, c);
          break;
        }
-      dtp->u.p.comma_flag = 1;
-      eat_spaces (dtp);
-      break;
-
+    /* Fall through. */
     case ';':
-      if (dtp->u.p.current_unit->decimal_status == DECIMAL_POINT)
-       {
-         generate_error (&dtp->common, LIBERROR_READ_VALUE,
-          "Semicolon not allowed as separator with DECIMAL='point'");
-         unget_char (dtp, c);
-         break;
-       }
       dtp->u.p.comma_flag = 1;
       eat_spaces (dtp);
       break;