diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2011-05-18 23:46:45 +0300 |
|---|---|---|
| committer | Pearu Peterson <pearu.peterson@gmail.com> | 2011-05-18 23:46:45 +0300 |
| commit | 026bc920296f8f3fbab22697a92dec8b844de59f (patch) | |
| tree | f459246de6e17e7ef95bc2978773acb86a07d4d8 /numpy/f2py | |
| parent | 651a9421b6b869ef07d37336ddef791e96182bb5 (diff) | |
| download | numpy-026bc920296f8f3fbab22697a92dec8b844de59f.tar.gz | |
BUG: fix f2py size variadic macro for Visual C++ 2008 compiler. Also be verbose on unspecified use modules.
Diffstat (limited to 'numpy/f2py')
| -rw-r--r-- | numpy/f2py/cfuncs.py | 2 | ||||
| -rwxr-xr-x | numpy/f2py/crackfortran.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index 99515b42b..9410a9f27 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -256,7 +256,7 @@ cppmacros['len..']="""\ #define old_size(var) PyArray_SIZE((PyArrayObject *)(capi_ ## var ## _tmp)) /* #define index(i) capi_i ## i */ #define slen(var) capi_ ## var ## _len -#define size(var, dim...) f2py_size((PyArrayObject *)(capi_ ## var ## _tmp), ##dim, -1) +#define size(var, ...) f2py_size((PyArrayObject *)(capi_ ## var ## _tmp), ## __VA_ARGS__, -1) """ needs['f2py_size']=['stdarg.h'] cfuncs['f2py_size']="""\ diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index 6292bdd1a..fa7bbe13d 100755 --- a/numpy/f2py/crackfortran.py +++ b/numpy/f2py/crackfortran.py @@ -1149,7 +1149,6 @@ def analyzeline(m,case,line): groupcache[groupcounter]['use'][name]['map']=rl else: pass - else: print m.groupdict() outmess('analyzeline: Could not crack the use statement.\n') @@ -1492,6 +1491,7 @@ def get_useparameters(block, param_map=None): for usename,mapping in usedict.items(): usename = usename.lower() if usename not in f90modulevars: + outmess('get_useparameters: no module %s info used by %s\n' % (usename, block.get('name'))) continue mvars = f90modulevars[usename] params = get_parameters(mvars) @@ -1505,6 +1505,7 @@ def get_useparameters(block, param_map=None): outmess('get_useparameters: overriding parameter %s with'\ ' value from module %s' % (`k`,`usename`)) param_map[k] = v + return param_map def postcrack2(block,tab='',param_map=None): |