diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-10-16 12:23:02 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-10-16 12:23:02 -0600 |
| commit | f6a028cbf740969ec96e319b858483c0c4d4c68d (patch) | |
| tree | 09ba1d2c801146e3b0f20d4e394ac38b545c9ddb | |
| parent | b7f20d911b9c34c2c0a5b7e7026b21fc8c5c9191 (diff) | |
| parent | f8edf9e397808bfa4db94dab12fd564080239d92 (diff) | |
| download | numpy-f6a028cbf740969ec96e319b858483c0c4d4c68d.tar.gz | |
Merge pull request #6487 from charris/cleanup-6307
Cleanup of 6307: BUG: Allow nested use of parameters for array dimensions in f2py.
| -rwxr-xr-x | numpy/f2py/crackfortran.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index 8c0247342..f392f946c 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -2624,11 +2624,12 @@ def analyzevars(block): if d in params: d = str(params[d]) for p in list(params.keys()): - m = re.match( - r'(?P<before>.*?)\b' + p + r'\b(?P<after>.*)', d, re.I) - if m: + re_1 = re.compile(r'(?P<before>.*?)\b' + p + r'\b(?P<after>.*)', re.I) + m = re_1.match(d) + while m: d = m.group('before') + \ str(params[p]) + m.group('after') + m = re_1.match(d) if d == star: dl = [star] else: |