From: Jerry DeLisle <jvdelisle@charter.net>
To: gfortran <fortran@gcc.gnu.org>
Cc: gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [patch, libgfortran] PR98825 Unexpected behavior of FORTRAN FORMAT expressions when suppressing new line with '$'
Date: Sun, 7 Feb 2021 05:34:13 -0800 [thread overview]
Message-ID: <e50d0c65-87be-d383-93ee-135469e0bc09@charter.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 624 bytes --]
Hello all,
Attached patch fixes this and adds a test case. The "$" edit descriptor
was being completely ignored when next_record_w is processed. Fixed by
adding a simple check.
OK for trunk and backport to 10 since it is simple enough?
Regards,
Jerry
libgfortran: Do not emit end-of-record if seen_dollar.
2021-02-07 Jerry DeLisle <jvdelisle@gcc.gnu.org>
libgfortran/ChangeLog:
PR libgfortran/98825
* io/transfer.c (next_record_w): Insert check for seen_dollar and if
so, skip issueing next record.
gcc/testsuite/ChangeLog:
* gfortran.dg/dollar_edit_descriptor_4.f: New test.
[-- Attachment #2: pr98825.diff --]
[-- Type: text/x-patch, Size: 1117 bytes --]
diff --git a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_4.f b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_4.f
new file mode 100644
index 00000000000..c8453ce6bc8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_4.f
@@ -0,0 +1,16 @@
+! { dg-do run }
+! { dg-options "-std=gnu" }
+! PR98825 Test for fix of '$' edit descriptor.
+ character(30) :: line
+ 10 format (i3,$)
+
+ open(10, status='scratch')
+ write (10,10) 1
+ write (10,10) 2,3,4,5
+! Check the result.
+ line = 'abcdefg'
+ rewind(10)
+ read(10, '(a)') line
+ close(10)
+ if (line .ne. ' 1 2 3 4 5') call abort
+ end
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 8ab0583dd55..27bee9d4e01 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -4020,6 +4020,8 @@ next_record_w (st_parameter_dt *dtp, int done)
}
}
}
+ else if (dtp->u.p.seen_dollar == 1)
+ break;
/* Handle legacy CARRIAGECONTROL line endings. */
else if (dtp->u.p.current_unit->flags.cc == CC_FORTRAN)
next_record_cc (dtp);
next reply other threads:[~2021-02-07 13:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-07 13:34 Jerry DeLisle [this message]
2021-02-07 17:07 ` Thomas Koenig
2021-02-11 3:48 ` Jerry DeLisle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e50d0c65-87be-d383-93ee-135469e0bc09@charter.net \
--to=jvdelisle@charter.net \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).