diff options
| author | Matti Picus <matti.picus@gmail.com> | 2021-02-15 22:43:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 22:43:54 +0200 |
| commit | 002611249a38b45e691219567f7ecee4d1250b4b (patch) | |
| tree | 79e95e385909c1ce8619adfbf8ef386c72e7b492 /numpy | |
| parent | 46e984e9f93774570b9d15288f3c24f5e0cae63e (diff) | |
| parent | e6dab4ff15f25793c81b808d49d5359b8901809f (diff) | |
| download | numpy-002611249a38b45e691219567f7ecee4d1250b4b.tar.gz | |
Merge pull request #18415 from pearu/gh-2763
MAINT: Update END statements parsing for recent Fortran standards.
Diffstat (limited to 'numpy')
| -rwxr-xr-x | numpy/f2py/crackfortran.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index 1bf724d12..660cdd206 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -574,8 +574,7 @@ groupends = (r'end|endprogram|endblockdata|endmodule|endpythonmodule|' r'endinterface|endsubroutine|endfunction') endpattern = re.compile( beforethisafter % ('', groupends, groupends, r'[\w\s]*'), re.I), 'end' -# endifs='end\s*(if|do|where|select|while|forall)' -endifs = r'(end\s*(if|do|where|select|while|forall))|(module\s*procedure)' +endifs = r'(end\s*(if|do|where|select|while|forall|associate|block|critical|enum|team))|(module\s*procedure)' endifpattern = re.compile( beforethisafter % (r'[\w]*?', endifs, endifs, r'[\w\s]*'), re.I), 'endif' # |