From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18260 invoked by alias); 3 Jul 2011 21:57:34 -0000 Received: (qmail 18242 invoked by uid 22791); 3 Jul 2011 21:57:33 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-pv0-f175.google.com (HELO mail-pv0-f175.google.com) (74.125.83.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 03 Jul 2011 21:57:18 +0000 Received: by pvf24 with SMTP id 24so4466057pvf.20 for ; Sun, 03 Jul 2011 14:57:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.39.38 with SMTP id m6mr7340053pbk.150.1309730237556; Sun, 03 Jul 2011 14:57:17 -0700 (PDT) Received: by 10.68.62.103 with HTTP; Sun, 3 Jul 2011 14:57:17 -0700 (PDT) Date: Sun, 03 Jul 2011 21:57:00 -0000 Message-ID: Subject: [Patch, libfortran] PR 49296 List read of file without EOR From: Janne Blomqvist To: Fortran List , GCC Patches Content-Type: multipart/mixed; boundary=bcaec520e8cf8fa7d604a7315503 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-07/txt/msg00158.txt.bz2 --bcaec520e8cf8fa7d604a7315503 Content-Type: text/plain; charset=UTF-8 Content-length: 587 Hi, the attached patch fixes the remaining cases of handling input that ends in EOF instead of a normal separator for list formatted read of the primitive types. Ok for trunk and 4.6? 2011-07-04 Janne Blomqvist PR libfortran/49296 * io/list_read.c (read_logical): Don't error out if a valid value is followed by EOF instead of a normal separator. (read_integer): Likewise. testsuite: 2011-07-04 Janne Blomqvist PR libfortran/49296 * gfortran.dg/read_list_eof_1.f90: Add tests for integer, real, and logical reads. -- Janne Blomqvist --bcaec520e8cf8fa7d604a7315503 Content-Type: text/x-patch; charset=US-ASCII; name="read_list_eof_2.diff" Content-Disposition: attachment; filename="read_list_eof_2.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gpojg10y0 Content-length: 1509 ZGlmZiAtLWdpdCBhL2xpYmdmb3J0cmFuL2lvL2xpc3RfcmVhZC5jIGIvbGli Z2ZvcnRyYW4vaW8vbGlzdF9yZWFkLmMKaW5kZXggYmFmMmY1NC4uYzg4ZjIz MiAxMDA2NDQKLS0tIGEvbGliZ2ZvcnRyYW4vaW8vbGlzdF9yZWFkLmMKKysr IGIvbGliZ2ZvcnRyYW4vaW8vbGlzdF9yZWFkLmMKQEAgLTY1NywyMiArNjU3 LDIwIEBAIHJlYWRfbG9naWNhbCAoc3RfcGFyYW1ldGVyX2R0ICpkdHAsIGlu dCBsZW5ndGgpCiAgICAgewogICAgIGNhc2UgJ3QnOgogICAgICAgdiA9IDE7 Ci0gICAgICBpZiAoKGMgPSBuZXh0X2NoYXIgKGR0cCkpID09IEVPRikKLQln b3RvIGJhZF9sb2dpY2FsOworICAgICAgYyA9IG5leHRfY2hhciAoZHRwKTsK ICAgICAgIGxfcHVzaF9jaGFyIChkdHAsIGMpOwogCi0gICAgICBpZiAoIWlz X3NlcGFyYXRvcihjKSkKKyAgICAgIGlmICghaXNfc2VwYXJhdG9yKGMpICYm IGMgIT0gRU9GKQogCWdvdG8gcG9zc2libGVfbmFtZTsKIAogICAgICAgdW5n ZXRfY2hhciAoZHRwLCBjKTsKICAgICAgIGJyZWFrOwogICAgIGNhc2UgJ2Yn OgogICAgICAgdiA9IDA7Ci0gICAgICBpZiAoKGMgPSBuZXh0X2NoYXIgKGR0 cCkpID09IEVPRikKLQlnb3RvIGJhZF9sb2dpY2FsOworICAgICAgYyA9IG5l eHRfY2hhciAoZHRwKTsKICAgICAgIGxfcHVzaF9jaGFyIChkdHAsIGMpOwog Ci0gICAgICBpZiAoIWlzX3NlcGFyYXRvcihjKSkKKyAgICAgIGlmICghaXNf c2VwYXJhdG9yKGMpICYmIGMgIT0gRU9GKQogCWdvdG8gcG9zc2libGVfbmFt ZTsKIAogICAgICAgdW5nZXRfY2hhciAoZHRwLCBjKTsKQEAgLTgzNyw2ICs4 MzUsNyBAQCByZWFkX2ludGVnZXIgKHN0X3BhcmFtZXRlcl9kdCAqZHRwLCBp bnQgbGVuZ3RoKQogCSAgZ290byByZXBlYXQ7CiAKIAlDQVNFX1NFUEFSQVRP UlM6CS8qIE5vdCBhIHJlcGVhdCBjb3VudC4gICovCisJY2FzZSBFT0Y6CiAJ ICBnb3RvIGRvbmU7CiAKIAlkZWZhdWx0OgpAQCAtODg2LDYgKzg4NSw3IEBA IHJlYWRfaW50ZWdlciAoc3RfcGFyYW1ldGVyX2R0ICpkdHAsIGludCBsZW5n dGgpCiAJICBicmVhazsKIAogCUNBU0VfU0VQQVJBVE9SUzoKKwljYXNlIEVP RjoKIAkgIGdvdG8gZG9uZTsKIAogCWRlZmF1bHQ6Cg== --bcaec520e8cf8fa7d604a7315503 Content-Type: text/x-fortran; charset=US-ASCII; name="read_list_eof_1.f90" Content-Disposition: attachment; filename="read_list_eof_1.f90" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gpojg9g21 Content-length: 1786 ISB7IGRnLWRvIHJ1biB9CiEgUFIgNDkyOTYgTGlzdCBmb3JtYXR0ZWQgcmVh ZCBvZiBmaWxlIHdpdGhvdXQgRU9SIG1hcmtlciAoXG4pLgpwcm9ncmFtIHJl YWRfbGlzdF9lb2ZfMQogIGltcGxpY2l0IG5vbmUKICBjaGFyYWN0ZXIobGVu PTEwMCkgOjogcwogIGludGVnZXIgOjogaWkKICByZWFsIDo6IHJyCiAgbG9n aWNhbCA6OiBsbAoKICBjYWxsIGdlbmZpbCAoJ2EnKQogIG9wZW4gKHVuaXQ9 MjAsIGZpbGU9J3JlYWQuZGF0JywgZm9ybT0nRk9STUFUVEVEJywgYWN0aW9u PSdSRUFEJywgJgogICAgICAgc3RhdHVzPSdPTEQnKQogIHJlYWQgKDIwLCBm bXQ9KikgcwogIGNsb3NlICgyMCwgc3RhdHVzPSdkZWxldGUnKQogIGlmICh0 cmltKHMpIC89ICJhIikgdGhlbgogICAgIGNhbGwgYWJvcnQgKCkKICBlbmQg aWYKCiAgY2FsbCBnZW5maWwgKCcxJykKICBvcGVuICh1bml0PTIwLCBmaWxl PSdyZWFkLmRhdCcsIGZvcm09J0ZPUk1BVFRFRCcsIGFjdGlvbj0nUkVBRCcs ICYKICAgICAgIHN0YXR1cz0nT0xEJykKICByZWFkICgyMCwgZm10PSopIGlp CiAgY2xvc2UgKDIwLCBzdGF0dXM9J2RlbGV0ZScpCiAgaWYgKGlpIC89IDEp IHRoZW4KICAgICBjYWxsIGFib3J0ICgpCiAgZW5kIGlmCgogIGNhbGwgZ2Vu ZmlsICgnMS41JykKICBvcGVuICh1bml0PTIwLCBmaWxlPSdyZWFkLmRhdCcs IGZvcm09J0ZPUk1BVFRFRCcsIGFjdGlvbj0nUkVBRCcsICYKICAgICAgIHN0 YXR1cz0nT0xEJykKICByZWFkICgyMCwgZm10PSopIHJyCiAgY2xvc2UgKDIw LCBzdGF0dXM9J2RlbGV0ZScpCiAgaWYgKHJyIC89IDEuNSkgdGhlbgogICAg IGNhbGwgYWJvcnQgKCkKICBlbmQgaWYKCiAgY2FsbCBnZW5maWwgKCdUJykK ICBvcGVuICh1bml0PTIwLCBmaWxlPSdyZWFkLmRhdCcsIGZvcm09J0ZPUk1B VFRFRCcsIGFjdGlvbj0nUkVBRCcsICYKICAgICAgIHN0YXR1cz0nT0xEJykK ICByZWFkICgyMCwgZm10PSopIGxsCiAgY2xvc2UgKDIwLCBzdGF0dXM9J2Rl bGV0ZScpCiAgaWYgKC5ub3QuIGxsKSB0aGVuCiAgICAgY2FsbCBhYm9ydCAo KQogIGVuZCBpZgoKY29udGFpbnMKICBzdWJyb3V0aW5lIGdlbmZpbChzdHIp CiAgICBjaGFyYWN0ZXIobGVuPSopLCBpbnRlbnQoaW4pIDo6IHN0cgogICAg b3BlbigxMCwgZmlsZT0ncmVhZC5kYXQnLCBmb3JtPSd1bmZvcm1hdHRlZCcs IGFjdGlvbj0nd3JpdGUnLCAmCiAgICAgICAgIHN0YXR1cz0ncmVwbGFjZScs IGFjY2Vzcz0nc3RyZWFtJykKICAgIHdyaXRlKDEwKSBzdHIKICAgIGNsb3Nl KDEwKQogIGVuZCBzdWJyb3V0aW5lIGdlbmZpbAplbmQgcHJvZ3JhbSByZWFk X2xpc3RfZW9mXzEK --bcaec520e8cf8fa7d604a7315503--