diff options
| author | Rohit Goswami <rog32@hi.is> | 2023-04-16 17:26:54 +0000 |
|---|---|---|
| committer | Rohit Goswami <rog32@hi.is> | 2023-05-12 17:41:24 +0000 |
| commit | a44c60466ef477e120611f7a32433f8b1a34aaea (patch) | |
| tree | 9aae04ea961ccbf3fc9f6228a21d6232bfecfc97 | |
| parent | aa5b9d6665709d5ca8a098c2e4f9ce2f5c8a25b7 (diff) | |
| download | numpy-a44c60466ef477e120611f7a32433f8b1a34aaea.tar.gz | |
BUG: Fix matching endifs with comments
Harmonizes patterns a bit as well
| -rwxr-xr-x | numpy/f2py/crackfortran.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index c0a79bcae..4871d2628 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -613,15 +613,15 @@ beginpattern90 = re.compile( groupends = (r'end|endprogram|endblockdata|endmodule|endpythonmodule|' r'endinterface|endsubroutine|endfunction') endpattern = re.compile( - beforethisafter % ('', groupends, groupends, r'.*'), re.I), 'end' + beforethisafter % ('', groupends, groupends, '.*'), re.I), 'end' endifs = r'end\s*(if|do|where|select|while|forall|associate|block|' + \ r'critical|enum|team)' endifpattern = re.compile( - beforethisafter % (r'[\w]*?', endifs, endifs, r'[\w\s]*'), re.I), 'endif' + beforethisafter % (r'[\w]*?', endifs, endifs, '.*'), re.I), 'endif' # moduleprocedures = r'module\s*procedure' moduleprocedurepattern = re.compile( - beforethisafter % ('', moduleprocedures, moduleprocedures, r'.*'), re.I), \ + beforethisafter % ('', moduleprocedures, moduleprocedures, '.*'), re.I), \ 'moduleprocedure' implicitpattern = re.compile( beforethisafter % ('', 'implicit', 'implicit', '.*'), re.I), 'implicit' |