Merge pull request #22657 from HaoZeke/fix22648

mattip · web-flow · commit 050dbc6d08a8 · 2023-08-24T12:31:00.000+03:00
BUG: Fix common block handling in f2py
diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py
@@ -614,7 +614,8 @@ def readfortrancode(ffile, dowithline=show, istop=1):
              r'endinterface|endsubroutine|endfunction')
 endpattern = re.compile(
     beforethisafter % ('', groupends, groupends, '.*'), re.I), 'end'
-endifs = r'end\s*(if|do|where|select|while|forall|associate|block|' + \
+# block, the Fortran 2008 construct needs special handling in the rest of the file
+endifs = r'end\s*(if|do|where|select|while|forall|associate|' + \
          r'critical|enum|team)'
 endifpattern = re.compile(
     beforethisafter % (r'[\w]*?', endifs, endifs, '.*'), re.I), 'endif'
diff --git a/numpy/f2py/tests/src/crackfortran/gh22648.pyf b/numpy/f2py/tests/src/crackfortran/gh22648.pyf
@@ -0,0 +1,7 @@
+python module iri16py ! in
+    interface  ! in :iri16py
+        block data  ! in :iri16py:iridreg_modified.for
+           COMMON /fircom/ eden,tabhe,tabla,tabmo,tabza,tabfl
+       end block data 
+    end interface 
+end python module iri16py
diff --git a/numpy/f2py/tests/test_crackfortran.py b/numpy/f2py/tests/test_crackfortran.py
@@ -8,6 +8,8 @@
 from . import util
 from numpy.f2py import crackfortran
 import textwrap
+import contextlib
+import io
 
 
 class TestNoSpace(util.F2PyTest):
@@ -338,3 +340,11 @@ def test_end_if_comment(self):
             crackfortran.crackfortran([str(fpath)])
         except Exception as exc:
             assert False, f"'crackfortran.crackfortran' raised an exception {exc}"
+
+
+class TestF77CommonBlockReader():
+    def test_gh22648(self, tmp_path):
+        fpath = util.getpath("tests", "src", "crackfortran", "gh22648.pyf")
+        with contextlib.redirect_stdout(io.StringIO()) as stdout_f2py:
+            mod = crackfortran.crackfortran([str(fpath)])
+        assert "Mismatch" not in stdout_f2py.getvalue()
