From patchwork Fri Jul 29 21:09:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 56447 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D4739384F01F for ; Fri, 29 Jul 2022 21:10:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D4739384F01F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1659129014; bh=GPi9LoZYUclET2KH9XDncmHRAZI3c3D7G5TdFUiAFt8=; h=Date:Subject:To:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=lYO0HJ+GqOcatyN+DeCZbCOxopznFmb9/7680lKNENfUrdKb/Jurw3rs/WuGqTsGC 3FMVjOnGrV+M1eUulow7PeG4INuqvlLx3w6zTZ8XJnKcRJVxVSkrVtbP0LsETxPU/6 vGQc1QMK4/8YW39o7kj8+aayB4zsM/NceA+wWN5k= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by sourceware.org (Postfix) with ESMTPS id EBCE83857363; Fri, 29 Jul 2022 21:09:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EBCE83857363 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.178.29] ([93.207.83.167]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MBlxW-1o9rCs3G04-00CAVB; Fri, 29 Jul 2022 23:09:26 +0200 Message-ID: Date: Fri, 29 Jul 2022 23:09:21 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: [PATCH, v3] Fortran: detect blanks within literal constants in free-form mode [PR92805] Content-Language: en-US To: Mikael Morin , fortran@gcc.gnu.org Newsgroups: gmane.comp.gcc.fortran,gmane.comp.gcc.patches References: <46cc765d-469e-d6e8-23c5-dc470028d881@orange.fr> In-Reply-To: <46cc765d-469e-d6e8-23c5-dc470028d881@orange.fr> X-Provags-ID: V03:K1:xwhkLLzH3082C7uFEouiZzT0qZFnhcwKvu/eN026+DbeRuse4JW 5YTXq0Wo01+BRIPlb8/4+0L1GVhTrhkS63aRpfDDlzCLpB7UlZ3x/ckzeCQKWM8VKjlIEfC eWNWR1EqlJRjg+dUrhkefU+DrkVHHIveVV3XQ2owCKXsIZ8MhMUtNx3nIuTDcXUWIe6Gxsv WBl1sG3vVVa9ZwBnnNkdQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:8AAbZaXO5n0=:NVdSknSTZfGR7oVv6WmecL 3vCrn3wvz0kkmKSUObqDoq/lyOj35uXAzHwaY8KcYb1YdNxhbAsI6UTh6G8LGGUgJtWnYCiC9 YEs2gO6iQ3QuDNbGq3qc7hcPI1le1RmHSqdL49e3heD9sLaNwE695ZPXb63Qrwr3z5U+JEaRV unan0fSl22zwLqBwXJXM9O8wcqCCZ2IXPcYAMYnaQAtg2GEAZTLgee+UODgOg64N0Kh7s7188 cAEsOgqQCP/7nWaGKChHQ0Lph2jn6KNLLW+eTSQIoPpSP5vm9KYfAsQUgPkscf4GRf7N5oLOt Tf7y1W2ERfzE2EKCbNHQVe4aZZ+aZ9cVYPqerksGro++XU0Vd+5UhESVzVNzazvZ8so9uEGdP DBB5PdPZBWFDUyaDEQ+xNrRjy0xct6H03bw76SMVMbF8tExSjUabUBUJ2uNnCFgCuwr15/KqV cpq9eRe5jva/Wn2/4HLC/BXj/AefFa/EkHCw8WapWx3HW1vekN1OIF/8XHfP2oVr2GDRoAW2D vOu9K5EeqSI1cvW19XwkfeK+w2sPr4QCdepzETEm0Xb24kIqcLjTcrR8JWyLuNWu+oYp8OMJL KAyEwrvdcwspte4tycweKsllham8Pza1JAY6/3uw/eOx9jDmYjIGRFj/Q2lKWw/M61657JuhB Pearv7WZT9cIrWtOhYJ0zpGUvS5OApN34/emwfdaKAFhatVM2dV90Gpm+ruyCJYRS8WFmYFP7 1GYVZYV2fhXEd97bgGDOg/zqHNs9q9I1lJVSLUMbHWQ6GvuqE6nHm96jVV6ax76ArV8p/QM75 DQBGLT9hZsXiQHYohxwo/lO0fjbWlOmpezpB8M0W2hXY9tCpyD+ZiVrjiVAM26yPJryE+e5jN AjI6rx4MFMYsDHHxETR4uqh8SDZtGqGjWNf6i+fl4TBCqoKKmQ/MPC5kpub3hDAPI/MqLEH3e hoBiSEKI3ukjrsMbmYXgvqDZPU3aSPfMlKt4plzhP7AaL9fHlWCRn3sUX0wm14KlcLoSZbxbB Ql02wp/f+RwMBGwGpWLYtVU5SQtB0cBNxR861YUatnvzPCIJC0SUWReq+7U6AENX3TssmS/1/ 6RPPr+sM+VuS+ntIaAW1zzHSKqr047K9RV82HqXD0qgPD4ZNfJgf9eU5Q== X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Cc: gcc-patches@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi Mikael, Am 29.07.22 um 22:36 schrieb Mikael Morin: > Indeed, I overlooked that, but my opinion remains that we shouldn’t play > with fixed vs free form considerations here. > So the options I can see are: >  - handle the locus in get_kind; we do it a lot already in matching > functions, so it wouldn’t be different here. >  - implement a variant of gfc_match_char without space gobbling. >  - use gfc_match(...), which is a bit heavy weight to match a single > char string, but otherwise would keep things concise. > > My preference goes to the third option, but I’m fine with either of them > if you have a different one. > how about the attached? This introduces the helper function gfc_match_next_char, which is your second option. Thanks, Harald From 0a95d103e4855fbcc20fd24d44b97b690d570333 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 28 Jul 2022 22:07:02 +0200 Subject: [PATCH] Fortran: detect blanks within literal constants in free-form mode [PR92805] gcc/fortran/ChangeLog: PR fortran/92805 * gfortran.h (gfc_match_next_char): Declare it. * primary.cc (get_kind): Do not skip over blanks in free-form mode. (match_string_constant): Likewise. * scanner.cc (gfc_match_next_char): New. Match next character of input, treating whitespace depending on fixed or free form. gcc/testsuite/ChangeLog: PR fortran/92805 * gfortran.dg/literal_constants.f: New test. * gfortran.dg/literal_constants.f90: New test. Co-authored-by: Steven G. Kargl --- gcc/fortran/gfortran.h | 1 + gcc/fortran/primary.cc | 17 +++++-------- gcc/fortran/scanner.cc | 17 +++++++++++++ gcc/testsuite/gfortran.dg/literal_constants.f | 20 ++++++++++++++++ .../gfortran.dg/literal_constants.f90 | 24 +++++++++++++++++++ 5 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/literal_constants.f create mode 100644 gcc/testsuite/gfortran.dg/literal_constants.f90 diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 696aadd7db6..645a30e7d49 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -3209,6 +3209,7 @@ gfc_char_t gfc_next_char (void); char gfc_next_ascii_char (void); gfc_char_t gfc_peek_char (void); char gfc_peek_ascii_char (void); +match gfc_match_next_char (gfc_char_t); void gfc_error_recovery (void); void gfc_gobble_whitespace (void); void gfc_new_file (void); diff --git a/gcc/fortran/primary.cc b/gcc/fortran/primary.cc index 3f01f67cd49..9fa6779200f 100644 --- a/gcc/fortran/primary.cc +++ b/gcc/fortran/primary.cc @@ -92,14 +92,17 @@ get_kind (int *is_iso_c) { int kind; match m; + char c; *is_iso_c = 0; - if (gfc_match_char ('_') != MATCH_YES) + if (gfc_match_next_char ('_') != MATCH_YES) return -2; - m = match_kind_param (&kind, is_iso_c); - if (m == MATCH_NO) + m = MATCH_NO; + c = gfc_peek_ascii_char (); + if ((gfc_current_form == FORM_FREE && gfc_is_whitespace (c)) + || (m = match_kind_param (&kind, is_iso_c)) == MATCH_NO) gfc_error ("Missing kind-parameter at %C"); return (m == MATCH_YES) ? kind : -1; @@ -1074,17 +1077,9 @@ match_string_constant (gfc_expr **result) c = gfc_next_char (); } - if (c == ' ') - { - gfc_gobble_whitespace (); - c = gfc_next_char (); - } - if (c != '_') goto no_match; - gfc_gobble_whitespace (); - c = gfc_next_char (); if (c != '\'' && c != '"') goto no_match; diff --git a/gcc/fortran/scanner.cc b/gcc/fortran/scanner.cc index 2dff2514700..2d1980c074c 100644 --- a/gcc/fortran/scanner.cc +++ b/gcc/fortran/scanner.cc @@ -1690,6 +1690,23 @@ gfc_peek_ascii_char (void) } +/* Match next character of input. In fixed form mode, we also ignore + spaces. */ + +match +gfc_match_next_char (gfc_char_t c) +{ + locus where; + + where = gfc_current_locus; + if (gfc_next_char () == c) + return MATCH_YES; + + gfc_current_locus = where; + return MATCH_NO; +} + + /* Recover from an error. We try to get past the current statement and get lined up for the next. The next statement follows a '\n' or a ';'. We also assume that we are not within a character diff --git a/gcc/testsuite/gfortran.dg/literal_constants.f b/gcc/testsuite/gfortran.dg/literal_constants.f new file mode 100644 index 00000000000..4d1f1b7eb4c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/literal_constants.f @@ -0,0 +1,20 @@ +! { dg-do compile } +! { dg-options "-ffixed-form" } +! PR fortran/92805 - blanks within literal constants in fixed-form mode + + implicit none + integer, parameter :: ck = kind ("a") ! default character kind + integer, parameter :: rk = kind (1.0) ! default real kind + print *, 1_"abc" + print *, 1 _"abc" + print *, 1_ "abc" + print *, ck_"a" + print *, ck _"ab" + print *, ck_ "ab" + print *, 3.1415_4 + print *, 3.1415 _4 + print *, 3.1415_ 4 + print *, 3.1415_rk + print *, 3.1415 _rk + print *, 3.1415_ rk + end diff --git a/gcc/testsuite/gfortran.dg/literal_constants.f90 b/gcc/testsuite/gfortran.dg/literal_constants.f90 new file mode 100644 index 00000000000..f8908f9ad76 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/literal_constants.f90 @@ -0,0 +1,24 @@ +! { dg-do compile } +! { dg-options "-ffree-form" } +! PR fortran/92805 - blanks within literal constants in free-form mode + + implicit none + integer, parameter :: ck = kind ("a") ! default character kind + integer, parameter :: rk = kind (1.0) ! default real kind + print *, 1_"abc" + print *, 1 _"abc" ! { dg-error "Syntax error" } + print *, 1_ "abc" ! { dg-error "Missing kind-parameter" } + print *, 1 _ "abc" ! { dg-error "Syntax error" } + print *, ck_"a" + print *, ck _"ab" ! { dg-error "Syntax error" } + print *, ck_ "ab" ! { dg-error "Syntax error" } + print *, ck _ "ab" ! { dg-error "Syntax error" } + print *, 3.1415_4 + print *, 3.1415 _4 ! { dg-error "Syntax error" } + print *, 3.1415_ 4 ! { dg-error "Missing kind-parameter" } + print *, 3.1415 _ 4 ! { dg-error "Syntax error" } + print *, 3.1415_rk + print *, 3.1415 _rk ! { dg-error "Syntax error" } + print *, 3.1415_ rk ! { dg-error "Missing kind-parameter" } + print *, 3.141 _ rk ! { dg-error "Syntax error" } + end -- 2.35.3