This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch, libgfortran] PR56743 Namelist bug with comment and no blank


The attached patch works by adding the comment character to the set of characters treated as separators. This works because a namelist comment abstractly can be though of as equivalent to an end of line character. For namelist the '!' character is already handled in the 'eat_separators' helper function, so the patch s really trivial.

The patch does not address character data that is not quote delimited. Besides the fact that using character data in namelists without quotes leaves a very bad taste in my mouth, I have not had time to look into it further in that area.

Regression tested on x86-64. I will dejanuize the test case attached.

OK for trunk?

Jerry

2015-04-17 Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/56743
	* io/list_read.c (CASE_SEPARATORS): Add case for '!'.
	(is_separator): Add condition for '!'.
Index: io/list_read.c
===================================================================
--- io/list_read.c	(revision 222194)
+++ io/list_read.c	(working copy)
@@ -53,12 +53,12 @@ typedef unsigned char uchar;
                       case '5': case '6': case '7': case '8': case '9'
 
 #define CASE_SEPARATORS  case ' ': case ',': case '/': case '\n': case '\t': \
-                         case '\r': case ';'
+                         case '\r': case ';': case '!'
 
 /* This macro assumes that we're operating on a variable.  */
 
 #define is_separator(c) (c == '/' ||  c == ',' || c == '\n' || c == ' ' \
-                         || c == '\t' || c == '\r' || c == ';')
+                         || c == '\t' || c == '\r' || c == ';' || c == '!')
 
 /* Maximum repeat count.  Less than ten times the maximum signed int32.  */
 
! { dg-do run }
!
! PR fortran/56743
!
! Contributed by Kai Gallmeister
!
! Note that Fortran 2008 (Section 10.11.3.6) requires that there is
! a value separator between the value and the "!".  Thus, all examples
! in this file are invalid; they should either by accepted as vendor
! extension or lead to a run-time error (iostat /=0).
!
! For the c1 and c2 character example, please note that the Fortran
! standard (F2008, 10.11.3.3) requires delimiters; accepting
! a single word (in spirit of list-directed I/O) would be possible
! as vendor extension. But the current run-time failure is fine as well.
!
implicit none
integer :: i = -1
real :: r1 = -2
real :: r2 = -3
real :: r3 = -4
real :: r4 = -5
real :: r5 = -6
complex :: c = (-7,-7)
logical :: ll = .false.
character :: c1 = 'X'
character(3) :: c2 = 'YYY'
character(3) :: c3 = 'ZZZ'
namelist /nml/ i, r1,r2,r3,r4,r5,c,ll,c1,c2,c3

write (*, nml=nml)
open (99, file='nml.dat', status="replace")
write(99,*) "&nml"
write(99,*) "  i=42!11"         ! BUG: wrong result: Unmodified, no error
write(99,*) "  r1=43!11"        ! BUG: wrong result: Unmodified, no error
write(99,*) "  r2=43.!11"       ! BUG: wrong result: Unmodified, no error
write(99,*) "  r3=inf!11"       ! OK:  run-time error (Cannot match namelist object)
write(99,*) "  r4=NaN(0x33)!11" ! OK:  run-time error (Cannot match namelist object)
write(99,*) "  r5=3.e5!11"      ! BUG: wrong result: Unmodified, no error
write(99,*) "  c=(4,2)!11"      ! OK:  value accepted as vendor extension
write(99,*) "  ll=.true.!11"    ! OK:  value accepted as vendor extension
write(99,*) "  c1='a'!11"       ! OK:  run-time error (Cannot match namelist object)
write(99,*) "  c2='bc'!11"      ! OK:  run-time error (Cannot match namelist object)
write(99,*) "  c3='ax'!11"      ! OK:  value accepted as vendor extension
write(99,*) "/"

rewind(99)
read (99, nml=nml)
write (*, nml=nml)
close (99)

  if (r1 /= 43) call abort ()
  if (r2 /= 43) call abort ()
  if (r3 /= r3 .or. r3 <= huge(r3)) call abort ()
  if (r4 == r4) call abort ()
  if (r5 /= 300000) call abort ()
  if (c /= cmplx(4,2)) call abort ()
  if (.not. ll) call abort ()
  if (c1 /= "a") call abort ()
  if (c2 /= "bc") call abort ()
  if (c3 /= "ax") call abort ()
end

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]