diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-12-26 17:45:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-26 17:45:17 -0700 |
| commit | f5f845b7bd0b737740e419826698ab4a9e61564d (patch) | |
| tree | db3c7bc58a8a526679fc2c4d04178c98b93852c5 | |
| parent | caa27a907ed9dc65ace7c1a14954ae6b75b086d8 (diff) | |
| parent | cb7b26d4e18583d7b010425264b9a9a379554606 (diff) | |
| download | numpy-f5f845b7bd0b737740e419826698ab4a9e61564d.tar.gz | |
Merge pull request #18074 from tylerjereddy/treddy_exprtype_regex_simplify
MAINT: exprtype regex simplify
| -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 733336032..ab15bc09b 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -2988,10 +2988,10 @@ def analyzeargs(block): block['vars'][block['result']] = {} return block -determineexprtype_re_1 = re.compile(r'\A\(.+?[,].+?\)\Z', re.I) -determineexprtype_re_2 = re.compile(r'\A[+-]?\d+(_(?P<name>[\w]+)|)\Z', re.I) +determineexprtype_re_1 = re.compile(r'\A\(.+?,.+?\)\Z', re.I) +determineexprtype_re_2 = re.compile(r'\A[+-]?\d+(_(?P<name>\w+)|)\Z', re.I) determineexprtype_re_3 = re.compile( - r'\A[+-]?[\d.]+[\d+\-de.]*(_(?P<name>[\w]+)|)\Z', re.I) + r'\A[+-]?[\d.]+[-\d+de.]*(_(?P<name>\w+)|)\Z', re.I) determineexprtype_re_4 = re.compile(r'\A\(.*\)\Z', re.I) determineexprtype_re_5 = re.compile(r'\A(?P<name>\w+)\s*\(.*?\)\s*\Z', re.I) |