From unknown Mon Aug 18 17:56:42 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73218: [PATCH] Fix Fortran indent below do_not_a_loop=42 Resent-From: Ken Mankoff Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Sep 2024 03:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73218 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 73218@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172619991328556 (code B ref -1); Fri, 13 Sep 2024 03:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Sep 2024 03:58:33 +0000 Received: from localhost ([127.0.0.1]:42178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soxS0-0007QQ-WB for submit@debbugs.gnu.org; Thu, 12 Sep 2024 23:58:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:35012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soooN-0002TH-Cr for submit@debbugs.gnu.org; Thu, 12 Sep 2024 14:45:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soooE-0000f6-Sl for bug-gnu-emacs@gnu.org; Thu, 12 Sep 2024 14:44:50 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soooC-0002uZ-JE for bug-gnu-emacs@gnu.org; Thu, 12 Sep 2024 14:44:50 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20570b42f24so15563815ad.1 for ; Thu, 12 Sep 2024 11:44:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726166686; x=1726771486; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=qIUkvcR5HioN9ozhxWeVGgmHP7RQi2DIgBZSiQ5ZBuQ=; b=Q4q20O70v0mjOVzewc1rSzV2E0NGULCZKar2y56iLvt9n7OmCs5iWBPFBTBrrtKWUS Qc/yWI5Mj3hcInc6nQqYE7bhSjziD2gxrS3kN1K35D2jxVA2QedXCMyJpQCL/j5p2Vob 2KAJUJWQ8ljiNI8xFMLIa0S0HoZYyMZtx68oU0EwdVahpXQWfnSdgeHQwVItTrIkIK14 87HY5VB1pwHQl4k7GGJKcquZCtszIUtj98tCi6kr92o75P79sDaySMhXUJNSXQPOC2E2 oAkNtHYqT+wjQFHlzGgOvx3mbFPQF7Xo8vBwbYYROXsWUWUOvloeknd5CezXvHz4Tl6a qZyw== X-Gm-Message-State: AOJu0YwXnNtXihlwLLfByibPQzwkjF+07UKL1AFaUh0/BgQqf1pr9v+N u8Pdf1ybSyS+jDc9nCUp3G8+DaVvI7MRGDoyHA5+8hfQIthSgVwmFBH9Iw== X-Google-Smtp-Source: AGHT+IFBhDOvDmTwEYQjRdqjIz1LOCSK+CqNaNm6sRE1IUAbZ5RYi0JediZa67jOOhDXarIN155MNg== X-Received: by 2002:a17:902:e548:b0:205:894b:b5b0 with SMTP id d9443c01a7336-2076e38f0e8mr48397515ad.33.1726166685856; Thu, 12 Sep 2024 11:44:45 -0700 (PDT) Received: from t480 (97-126-4-246.tukw.qwest.net. [97.126.4.246]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2076b01aee5sm17191065ad.300.2024.09.12.11.44.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 11:44:44 -0700 (PDT) From: Ken Mankoff Date: Thu, 12 Sep 2024 11:44:44 -0700 Message-ID: <87o74semoz.fsf@kenmankoff.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=209.85.214.176; envelope-from=mankoff@gmail.com; helo=mail-pl1-f176.google.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Mailman-Approved-At: Thu, 12 Sep 2024 23:58:28 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) --=-=-= Content-Type: text/plain Tags: patch Hello, Following up from https://lists.gnu.org/archive/html/emacs-devel/2024-08/msg00904.html I'm submitting a patch to fix Fortran indentation due to an overly aggressive match for do loops. In GNU Emacs 29.3 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.33, cairo version 1.16.0) of 2024-08-20 built on t480 Repository revision: ae8f815613c2e072e92aa8fe7b4bcf2fdabc7408 Repository branch: HEAD Windowing system distributor 'The X.Org Foundation', version 11.0.12101004 System Description: Ubuntu 22.04.5 LTS Configured using: 'configure --prefix=/home/kdm/local/emacs' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fix-Fortran-indent-below-do_not_a_loop-42.patch >From ee63122df9d4ad4904030568d56d0ab9f2d200ea Mon Sep 17 00:00:00 2001 From: "Kenneth D. Mankoff" Date: Thu, 12 Sep 2024 11:34:38 -0700 Subject: [PATCH] Fix Fortran indent below do_not_a_loop=42 --- lisp/progmodes/fortran.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 8a726dfe66e..0643df64f65 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -1631,7 +1631,7 @@ fortran-calculate-indent (setq icol (+ icol fortran-if-indent))) ((looking-at "where[ \t]*(.*)[ \t]*\n") (setq icol (+ icol fortran-if-indent))) - ((looking-at "do\\b") + ((looking-at "do[\\ |0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*") (setq icol (+ icol fortran-do-indent))) ((looking-at "\\(structure\\|union\\|map\\|interface\\)\ -- 2.34.1 --=-=-=-- From unknown Mon Aug 18 17:56:42 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73218: [PATCH] Fix Fortran indent below do_not_a_loop=42 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Sep 2024 06:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73218 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Ken Mankoff Cc: 73218@debbugs.gnu.org Received: via spool by 73218-submit@debbugs.gnu.org id=B73218.172620818726647 (code B ref 73218); Fri, 13 Sep 2024 06:17:02 +0000 Received: (at 73218) by debbugs.gnu.org; 13 Sep 2024 06:16:27 +0000 Received: from localhost ([127.0.0.1]:42241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sozbW-0006vf-NI for submit@debbugs.gnu.org; Fri, 13 Sep 2024 02:16:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sozbS-0006vG-L9 for 73218@debbugs.gnu.org; Fri, 13 Sep 2024 02:16:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sozbE-0007yf-B6; Fri, 13 Sep 2024 02:16:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=qO9LylT4CyVwXbEm2AmsPh9FLrcTvjBwPwD3ppkxi4Y=; b=b0ohVZQUz2Rp LWntN7SQTbIUDM+cwAc/pi/arzDrVBVhLOp/CXGkfklgsLZ3KPq0mzA50+1RlnNoSp9Lp2hxTdVko +TbHc+YCEx3Vvww1X+VclnkcpSbsnIKvXVJXTYzfnoXrSmw5qj2ij8LbX8mstuDhi7aIQCBZe3M25 YC6pvcuR7gavdHwkqoGnxudbdX+8alsgSx1py9pBaKTwelxa/C4HZLme54mRZgHugRavmGoP8H/Ub gsbuvz2kuUcxzBgxw3moptHKOK+zZCrtyVq3bY0yT2wkU1VK+pzgY5s9swF++R2K5gyo4CP7sBJtr jgT67kUR+dOSiPqZ6Qq6sA==; Date: Fri, 13 Sep 2024 09:16:05 +0300 Message-Id: <86y13wjcyi.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <87o74semoz.fsf@kenmankoff.com> (message from Ken Mankoff on Thu, 12 Sep 2024 11:44:44 -0700) References: <87o74semoz.fsf@kenmankoff.com> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Ken Mankoff > Date: Thu, 12 Sep 2024 11:44:44 -0700 > > Following up from https://lists.gnu.org/archive/html/emacs-devel/2024-08/msg00904.html I'm submitting a patch to fix Fortran indentation due to an overly aggressive match for do loops. Thanks. > --- a/lisp/progmodes/fortran.el > +++ b/lisp/progmodes/fortran.el > @@ -1631,7 +1631,7 @@ fortran-calculate-indent > (setq icol (+ icol fortran-if-indent))) > ((looking-at "where[ \t]*(.*)[ \t]*\n") > (setq icol (+ icol fortran-if-indent))) > - ((looking-at "do\\b") > + ((looking-at "do[\\ |0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*") What do you intend with the likes of "[\\ |0-9]+" ? Is this a character alternative, or is that an alternative of matches? If the former, there's no need to escape a backslash, but then why is '|' there? IOW, can you please describe in plain English what did you intend this regexp to match? Thanks. From unknown Mon Aug 18 17:56:42 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73218: [PATCH] Fix Fortran indent below do_not_a_loop=42 Resent-From: Ken Mankoff Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 13 Sep 2024 15:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73218 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 73218@debbugs.gnu.org Received: via spool by 73218-submit@debbugs.gnu.org id=B73218.172624230426608 (code B ref 73218); Fri, 13 Sep 2024 15:46:02 +0000 Received: (at 73218) by debbugs.gnu.org; 13 Sep 2024 15:45:04 +0000 Received: from localhost ([127.0.0.1]:44063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp8To-0006v6-1C for submit@debbugs.gnu.org; Fri, 13 Sep 2024 11:45:04 -0400 Received: from mail-pg1-f173.google.com ([209.85.215.173]:47426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp8Tm-0006uJ-6f for 73218@debbugs.gnu.org; Fri, 13 Sep 2024 11:45:02 -0400 Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7c3e1081804so1359038a12.3 for <73218@debbugs.gnu.org>; Fri, 13 Sep 2024 08:44:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726242287; x=1726847087; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DI/n85lXk01/dwJwF38n8XJHaFcCSXwgpdq3E/+xe5U=; b=V+Hu3jXsERhsV1Q0+ArxJUnKeDCS8wCNN0gSFnPDL5b24OVGlH1oMSnCnVGluU0r9C 2rLK+WCTz6eFkGkqFbEZHStMyFsXs9QUfTu0lnSnTcvyRCEimUJaiFOAHYmqPMmcj/D6 5HIXIJckpx76yJxY4sfLKXtz0CrKEelbRL1eX9GVwvOrxDJCUYLqt77RqPkKxaK+lTIY QfFcXN7tU/G6ZL2nuVAVIOZucKrD8J6ubQvoI3ou6M39vync/7FIbpn56CAFCeD8Iarh LDySxM0yxrZ3YTWFDPc/RrPW1AghOCvLq6IctR2m1QFX6o9KQr7SkG5AWxckLGOIyeqF +NvQ== X-Gm-Message-State: AOJu0Yw1tQFQjHGt9DaEw/DD2JTB0fecrEhskG6w/JwRLJ6tP/Fk5FGf XvsPAC825728xH5qX5/aDPla/AkdVQrNMHYty0u632cNYhvTl8Z6g6p1ZQ== X-Google-Smtp-Source: AGHT+IGLLXB+rAA3eiCbcdH020xxUz0KsCDwKDN3KkYD4Eak3F62Ze7UtG7Sp4DdkjuQp+XDQNPUBQ== X-Received: by 2002:a05:6a21:60c4:b0:1cf:2cae:eb0a with SMTP id adf61e73a8af0-1cf7635901fmr9741163637.31.1726242286934; Fri, 13 Sep 2024 08:44:46 -0700 (PDT) Received: from t480 (97-126-4-246.tukw.qwest.net. [97.126.4.246]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2dbb9d93a3fsm1899847a91.50.2024.09.13.08.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 08:44:46 -0700 (PDT) From: Ken Mankoff In-Reply-To: <86y13wjcyi.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 13 Sep 2024 09:16:05 +0300") References: <87o74semoz.fsf@kenmankoff.com> <86y13wjcyi.fsf@gnu.org> Date: Fri, 13 Sep 2024 08:44:45 -0700 Message-ID: <877cbfeexe.fsf@kenmankoff.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hi Eli, On 2024-09-12 at 23:16 -07, Eli Zaretskii wrote... >> --- a/lisp/progmodes/fortran.el >> +++ b/lisp/progmodes/fortran.el >> @@ -1631,7 +1631,7 @@ fortran-calculate-indent >> (setq icol (+ icol fortran-if-indent))) >> ((looking-at "where[ \t]*(.*)[ \t]*\n") >> (setq icol (+ icol fortran-if-indent))) >> - ((looking-at "do\\b") >> + ((looking-at "do[\\ |0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*") > > What do you intend with the likes of "[\\ |0-9]+" ? Is this a > character alternative, or is that an alternative of matches? If the > former, there's no need to escape a backslash, but then why is '|' > there? I agree the '|' is not needed. I'm not sure what 'character alternative' or 'alternative of matches' means. I meant the '|' as an "OR" (is that an alterntative?), but realize now it is not needed. I now suggest "do[\\ 0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*" The pattern attempts to match "do", then either (space, numbers, or nothing), then equal sign, then something that looks like two numbers or valid variable names separated by a comma. I used these as tests: do42I=1,42 ! match do_foo = bar() do i = 1,42 ! match do i = 1,n ! match do i_var = a_var,b_var ! match do i_var5 = a_var,b_var ! match do42i_var = a_var,b_var ! match DO42 = [1,2] DO6I=5 7 DO6I=5,7 ! match do_not_loop = [a,b] donot_loop = (/4,5/) donotloop = 42 do_notloop = 42 Should I submit an updated patch? Or is the patch applier able to make this small change? Thanks, -k. From unknown Mon Aug 18 17:56:42 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73218: [PATCH] Fix Fortran indent below do_not_a_loop=42 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 14 Sep 2024 11:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73218 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Ken Mankoff Cc: 73218@debbugs.gnu.org Received: via spool by 73218-submit@debbugs.gnu.org id=B73218.172631255326285 (code B ref 73218); Sat, 14 Sep 2024 11:16:01 +0000 Received: (at 73218) by debbugs.gnu.org; 14 Sep 2024 11:15:53 +0000 Received: from localhost ([127.0.0.1]:44945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spQkr-0006pt-1n for submit@debbugs.gnu.org; Sat, 14 Sep 2024 07:15:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spQko-0006pc-RE for 73218@debbugs.gnu.org; Sat, 14 Sep 2024 07:15:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1spQkY-0003Yf-Fk; Sat, 14 Sep 2024 07:15:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=1kP1Vu8z8zsGNAD5Nn74dLiBvTlgWdxy657xPWEtNQk=; b=CWxDhsTDTlVZ fbZrIFCcQ90mksPiqc73W/2i+ZS8DbkLv4h3cde4u6vsbDE2zcCslvxtxIZSqus6av35L95wCRRnM cH68ClozdjdE38y7rMkeWW2duzCf3mhpXX9KZCjdhzT28nq+55somsiJ3SPnl8t4GH6v2fD0wWvvt O0jurx+JEknp3/1Gfio8gYUa56AFNWba3HKOnhwPNkcwFL/5Per8hsRcg5sLS2DQ+nNCC3pybWi9O dOlZ0OHWhoeA3OWKwFhKRJ57kDVQLDL3gKJPuiKuLbdltJ6+Wm+1VZq0zUVzjYWhvZ8dPmbRnBjyW sY0bJuuCHy7W48VmnmJ81g==; Date: Sat, 14 Sep 2024 14:15:32 +0300 Message-Id: <864j6ih4ff.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <877cbfeexe.fsf@kenmankoff.com> (message from Ken Mankoff on Fri, 13 Sep 2024 08:44:45 -0700) References: <87o74semoz.fsf@kenmankoff.com> <86y13wjcyi.fsf@gnu.org> <877cbfeexe.fsf@kenmankoff.com> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Ken Mankoff > Cc: 73218@debbugs.gnu.org > Date: Fri, 13 Sep 2024 08:44:45 -0700 > > >> --- a/lisp/progmodes/fortran.el > >> +++ b/lisp/progmodes/fortran.el > >> @@ -1631,7 +1631,7 @@ fortran-calculate-indent > >> (setq icol (+ icol fortran-if-indent))) > >> ((looking-at "where[ \t]*(.*)[ \t]*\n") > >> (setq icol (+ icol fortran-if-indent))) > >> - ((looking-at "do\\b") > >> + ((looking-at "do[\\ |0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*") > > > > What do you intend with the likes of "[\\ |0-9]+" ? Is this a > > character alternative, or is that an alternative of matches? If the > > former, there's no need to escape a backslash, but then why is '|' > > there? > > I agree the '|' is not needed. I'm not sure what 'character alternative' or 'alternative of matches' means. I meant the '|' as an "OR" (is that an alterntative?), but realize now it is not needed. I now suggest > > "do[\\ 0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*" Why do we need a backslashes before SPC? Since the SPC is optional in Fortran, how about the following instead? "do *[0-9]* *[a-z0-9_]+ *= *[a-z0-9_]+ *, *[a-z0-9_]+" > The pattern attempts to match "do", then either (space, numbers, or nothing), then equal sign, then something that looks like two numbers or valid variable names separated by a comma. I used these as tests: > > do42I=1,42 ! match > do_foo = bar() > do i = 1,42 ! match > do i = 1,n ! match > do i_var = a_var,b_var ! match > do i_var5 = a_var,b_var ! match > do42i_var = a_var,b_var ! match > DO42 = [1,2] > DO6I=5 7 > DO6I=5,7 ! match > do_not_loop = [a,b] > donot_loop = (/4,5/) > donotloop = 42 > do_notloop = 42 Please use the above to test my suggestion. > Should I submit an updated patch? Or is the patch applier able to make this small change? An updated patch would be better, but let's first find the correct regexp to use. Thanks. From unknown Mon Aug 18 17:56:42 2025 X-Loop: help-debbugs@gnu.org Subject: bug#73218: [PATCH] Fix Fortran indent below do_not_a_loop=42 Resent-From: Ken Mankoff Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 14 Sep 2024 14:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73218 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 73218@debbugs.gnu.org Received: via spool by 73218-submit@debbugs.gnu.org id=B73218.17263229642576 (code B ref 73218); Sat, 14 Sep 2024 14:10:02 +0000 Received: (at 73218) by debbugs.gnu.org; 14 Sep 2024 14:09:24 +0000 Received: from localhost ([127.0.0.1]:47457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spTSl-0000fU-J1 for submit@debbugs.gnu.org; Sat, 14 Sep 2024 10:09:23 -0400 Received: from mail-pl1-f181.google.com ([209.85.214.181]:57413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spTSj-0000fD-6Y for 73218@debbugs.gnu.org; Sat, 14 Sep 2024 10:09:22 -0400 Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-207115e3056so28680695ad.2 for <73218@debbugs.gnu.org>; Sat, 14 Sep 2024 07:09:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726322945; x=1726927745; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TTDHnPTM9+7+gPIV2JBqN1EV1zAnvtqXOPgKoETwJXU=; b=EE33Wf3ugRyeX2tzecN6yYbWr/Ala1pb3XxUFXnK3Q2d1VOi+Rzjrh2bXtLumevbrZ OSJcTle8vmvPSdfdCW493F+KIKOOx3Zff076YslaGPBvtxsb1ruEaDbn9gf/wJ8udYPa EgP2elTP57cVRrYuy3atC7QQONMoR4I93HvRRmHSVXI7Dsr7++Xwz9Yjm18m1/y9nPSC MbZP2MUrk7/ov+HctkrEA9ymFi0zyt5zLeAELU8ch7L991l+1V0nhJlGCyobFbzXPLZt Fe9p9pbiliXoxALyVx4mm8aPcS/s5fZqJ0WNuQsjp13Te4k0FkIyYra5g8HLQUtcQktt PL7A== X-Gm-Message-State: AOJu0YycHKk91nStBfZyjrbUHgt3QB8bG45KhBTyFcjKVwWQh3tGpLJS 7zbvaLYPrhquuy+h+DVX75xwk084JuDzj53ZEMHSRMZtNP8AqfmFEvqpWQ== X-Google-Smtp-Source: AGHT+IEhqkBBLuCNLJIgNbIZ5PFsXfkE/PtQdHGqyO4wmhdYtb5vZBGZRMFDFIb/26O/kB5i5bUFEQ== X-Received: by 2002:a17:902:f543:b0:207:6ef:d8ab with SMTP id d9443c01a7336-2076e48346emr155708895ad.49.1726322944700; Sat, 14 Sep 2024 07:09:04 -0700 (PDT) Received: from t480 (97-126-4-246.tukw.qwest.net. [97.126.4.246]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-207945dc504sm9970385ad.26.2024.09.14.07.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Sep 2024 07:09:04 -0700 (PDT) From: Ken Mankoff In-Reply-To: <864j6ih4ff.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 14 Sep 2024 14:15:32 +0300") References: <87o74semoz.fsf@kenmankoff.com> <86y13wjcyi.fsf@gnu.org> <877cbfeexe.fsf@kenmankoff.com> <864j6ih4ff.fsf@gnu.org> Date: Sat, 14 Sep 2024 07:09:02 -0700 Message-ID: <874j6iba4h.fsf@kenmankoff.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) Hi Eli, On 2024-09-14 at 04:15 -07, Eli Zaretskii wrote... >> From: Ken Mankoff >> Cc: 73218@debbugs.gnu.org >> Date: Fri, 13 Sep 2024 08:44:45 -0700 >> >> >> --- a/lisp/progmodes/fortran.el >> >> +++ b/lisp/progmodes/fortran.el >> >> @@ -1631,7 +1631,7 @@ fortran-calculate-indent >> >> (setq icol (+ icol fortran-if-indent))) >> >> ((looking-at "where[ \t]*(.*)[ \t]*\n") >> >> (setq icol (+ icol fortran-if-indent))) >> >> - ((looking-at "do\\b") >> >> + ((looking-at "do[\\ |0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*") > > Since the SPC is optional in Fortran, how about the following instead? > > "do *[0-9]* *[a-z0-9_]+ *= *[a-z0-9_]+ *, *[a-z0-9_]+" > Yes this pattern works. -k. From unknown Mon Aug 18 17:56:42 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ken Mankoff Subject: bug#73218: closed (Re: bug#73218: [PATCH] Fix Fortran indent below do_not_a_loop=42) Message-ID: References: <86mskafhbi.fsf@gnu.org> <87o74semoz.fsf@kenmankoff.com> X-Gnu-PR-Message: they-closed 73218 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 73218@debbugs.gnu.org Date: Sat, 14 Sep 2024 14:21:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1726323662-5669-1" This is a multi-part message in MIME format... ------------=_1726323662-5669-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #73218: [PATCH] Fix Fortran indent below do_not_a_loop=3D42 which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 73218@debbugs.gnu.org. --=20 73218: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73218 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1726323662-5669-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 73218-done) by debbugs.gnu.org; 14 Sep 2024 14:20:23 +0000 Received: from localhost ([127.0.0.1]:47505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spTdP-0001SC-Fg for submit@debbugs.gnu.org; Sat, 14 Sep 2024 10:20:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spTdN-0001MA-0R for 73218-done@debbugs.gnu.org; Sat, 14 Sep 2024 10:20:21 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1spTd6-0002Sg-N2; Sat, 14 Sep 2024 10:20:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=+eHK7lc0Mbebj4fkFXo3SrT9bXFlg3ESe7MaTMHFSU0=; b=ogGtfMcvv8e0 YZEkshuDabyg7bHEg89p2Z8fmunLh489j1j5qzBTnGVXGYxR6lcW4SQIP1RAyVFqGU6/6IHY3HVRa Xton+m64Sihc+Sz5Tt6O3D+ILjY+TuH1NU3c3nnNHhOpMJQlZvSwLIjaPXcaTno9/LayJFlWQ/U+/ v1WjodEqUTHgffu4WCbwalFigMHSP/l8hAXQHMWWafuvVL3thvFIYgBRmT3SH0fEUjXbGATZ+z/eY yLoYkxh07qIQ6u4h+0+9cXumyEctG0a/h9kb4gAI7GV2lEpCG/1Mk8lUpv/t3nYQJ6aDDTblit1Rp 3IrQOdHgi8e6bJpz64B/5w==; Date: Sat, 14 Sep 2024 17:20:01 +0300 Message-Id: <86mskafhbi.fsf@gnu.org> From: Eli Zaretskii To: Ken Mankoff In-Reply-To: <874j6iba4h.fsf@kenmankoff.com> (message from Ken Mankoff on Sat, 14 Sep 2024 07:09:02 -0700) Subject: Re: bug#73218: [PATCH] Fix Fortran indent below do_not_a_loop=42 References: <87o74semoz.fsf@kenmankoff.com> <86y13wjcyi.fsf@gnu.org> <877cbfeexe.fsf@kenmankoff.com> <864j6ih4ff.fsf@gnu.org> <874j6iba4h.fsf@kenmankoff.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 73218-done Cc: 73218-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Ken Mankoff > Cc: 73218@debbugs.gnu.org > Date: Sat, 14 Sep 2024 07:09:02 -0700 > > Hi Eli, > > On 2024-09-14 at 04:15 -07, Eli Zaretskii wrote... > >> From: Ken Mankoff > >> Cc: 73218@debbugs.gnu.org > >> Date: Fri, 13 Sep 2024 08:44:45 -0700 > >> > >> >> --- a/lisp/progmodes/fortran.el > >> >> +++ b/lisp/progmodes/fortran.el > >> >> @@ -1631,7 +1631,7 @@ fortran-calculate-indent > >> >> (setq icol (+ icol fortran-if-indent))) > >> >> ((looking-at "where[ \t]*(.*)[ \t]*\n") > >> >> (setq icol (+ icol fortran-if-indent))) > >> >> - ((looking-at "do\\b") > >> >> + ((looking-at "do[\\ |0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*") > > > > Since the SPC is optional in Fortran, how about the following instead? > > > > "do *[0-9]* *[a-z0-9_]+ *= *[a-z0-9_]+ *, *[a-z0-9_]+" > > > > Yes this pattern works. Thanks, so I've now installed this on the master branch, and I'm closing this bug. ------------=_1726323662-5669-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Sep 2024 03:58:33 +0000 Received: from localhost ([127.0.0.1]:42178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soxS0-0007QQ-WB for submit@debbugs.gnu.org; Thu, 12 Sep 2024 23:58:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:35012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soooN-0002TH-Cr for submit@debbugs.gnu.org; Thu, 12 Sep 2024 14:45:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1soooE-0000f6-Sl for bug-gnu-emacs@gnu.org; Thu, 12 Sep 2024 14:44:50 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1soooC-0002uZ-JE for bug-gnu-emacs@gnu.org; Thu, 12 Sep 2024 14:44:50 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20570b42f24so15563815ad.1 for ; Thu, 12 Sep 2024 11:44:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726166686; x=1726771486; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=qIUkvcR5HioN9ozhxWeVGgmHP7RQi2DIgBZSiQ5ZBuQ=; b=Q4q20O70v0mjOVzewc1rSzV2E0NGULCZKar2y56iLvt9n7OmCs5iWBPFBTBrrtKWUS Qc/yWI5Mj3hcInc6nQqYE7bhSjziD2gxrS3kN1K35D2jxVA2QedXCMyJpQCL/j5p2Vob 2KAJUJWQ8ljiNI8xFMLIa0S0HoZYyMZtx68oU0EwdVahpXQWfnSdgeHQwVItTrIkIK14 87HY5VB1pwHQl4k7GGJKcquZCtszIUtj98tCi6kr92o75P79sDaySMhXUJNSXQPOC2E2 oAkNtHYqT+wjQFHlzGgOvx3mbFPQF7Xo8vBwbYYROXsWUWUOvloeknd5CezXvHz4Tl6a qZyw== X-Gm-Message-State: AOJu0YwXnNtXihlwLLfByibPQzwkjF+07UKL1AFaUh0/BgQqf1pr9v+N u8Pdf1ybSyS+jDc9nCUp3G8+DaVvI7MRGDoyHA5+8hfQIthSgVwmFBH9Iw== X-Google-Smtp-Source: AGHT+IFBhDOvDmTwEYQjRdqjIz1LOCSK+CqNaNm6sRE1IUAbZ5RYi0JediZa67jOOhDXarIN155MNg== X-Received: by 2002:a17:902:e548:b0:205:894b:b5b0 with SMTP id d9443c01a7336-2076e38f0e8mr48397515ad.33.1726166685856; Thu, 12 Sep 2024 11:44:45 -0700 (PDT) Received: from t480 (97-126-4-246.tukw.qwest.net. [97.126.4.246]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2076b01aee5sm17191065ad.300.2024.09.12.11.44.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 11:44:44 -0700 (PDT) From: Ken Mankoff To: bug-gnu-emacs@gnu.org Subject: [PATCH] Fix Fortran indent below do_not_a_loop=42 Date: Thu, 12 Sep 2024 11:44:44 -0700 Message-ID: <87o74semoz.fsf@kenmankoff.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=209.85.214.176; envelope-from=mankoff@gmail.com; helo=mail-pl1-f176.google.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 12 Sep 2024 23:58:28 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) --=-=-= Content-Type: text/plain Tags: patch Hello, Following up from https://lists.gnu.org/archive/html/emacs-devel/2024-08/msg00904.html I'm submitting a patch to fix Fortran indentation due to an overly aggressive match for do loops. In GNU Emacs 29.3 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.33, cairo version 1.16.0) of 2024-08-20 built on t480 Repository revision: ae8f815613c2e072e92aa8fe7b4bcf2fdabc7408 Repository branch: HEAD Windowing system distributor 'The X.Org Foundation', version 11.0.12101004 System Description: Ubuntu 22.04.5 LTS Configured using: 'configure --prefix=/home/kdm/local/emacs' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Fix-Fortran-indent-below-do_not_a_loop-42.patch >From ee63122df9d4ad4904030568d56d0ab9f2d200ea Mon Sep 17 00:00:00 2001 From: "Kenneth D. Mankoff" Date: Thu, 12 Sep 2024 11:34:38 -0700 Subject: [PATCH] Fix Fortran indent below do_not_a_loop=42 --- lisp/progmodes/fortran.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 8a726dfe66e..0643df64f65 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -1631,7 +1631,7 @@ fortran-calculate-indent (setq icol (+ icol fortran-if-indent))) ((looking-at "where[ \t]*(.*)[ \t]*\n") (setq icol (+ icol fortran-if-indent))) - ((looking-at "do\\b") + ((looking-at "do[\\ |0-9]+.*=[\\ a-z0-9_]*,[\\ a-z0-9_]*") (setq icol (+ icol fortran-do-indent))) ((looking-at "\\(structure\\|union\\|map\\|interface\\)\ -- 2.34.1 --=-=-=-- ------------=_1726323662-5669-1--