diff options
| author | Tyler Reddy <tyler.je.reddy@gmail.com> | 2020-12-26 16:30:23 -0700 |
|---|---|---|
| committer | Tyler Reddy <tyler.je.reddy@gmail.com> | 2020-12-26 16:30:23 -0700 |
| commit | cb7b26d4e18583d7b010425264b9a9a379554606 (patch) | |
| tree | e49d269c75fbf479f1e300b1b99470d9baa6d3a9 /numpy/f2py | |
| parent | ce82028409c1147a6df62d8f7437e0a9262ee2b7 (diff) | |
| download | numpy-cb7b26d4e18583d7b010425264b9a9a379554606.tar.gz | |
MAINT: exprtype regex simplify
* `determineexprtype_re_1` was modified to remove extraneous
character class markers around a single `,`
* a similar change was applied for the word metacharacter
in `determineexprtype_re_2` and `determineexprtype_re_3`
* the third character class in `determineexprtype_re_3` was
simplified to remove an escape sequence--by placing the
`-` at the start of the character class its metacharacter
status can be avoided
Diffstat (limited to 'numpy/f2py')
| -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 2e95e4596..2d2960c1c 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) |