From d74ee78d804c85a4c63f3e7bd278faaa101f9ac5 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Tue, 27 Feb 2024 17:08:02 -0500 Subject: [PATCH] fix trailing return rule (was removing all lines with return) --- .github/common/update_fortran_style.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/common/update_fortran_style.py b/.github/common/update_fortran_style.py index ca4bedbbb97..5d42481224d 100644 --- a/.github/common/update_fortran_style.py +++ b/.github/common/update_fortran_style.py @@ -85,10 +85,15 @@ def trailing_returns(path, check, diff): "!return" ]: continue - elif "return" in line: - continue - else: - flines.extend(lines) + elif "end subroutine" in line or "end function" in line: + for i, fl in enumerate(reversed(flines)): + l = fl.strip() + if not any(l): + continue + elif l == "return": + del flines[len(flines) - i - 1] + break + flines.extend(lines) if check: warn("Check mode not implemented yet")