From e50fa8e71482160e31d99a3561a433d06217f4c7 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 9 Apr 2008 11:53:02 +0000 Subject: Fix issue 587 --- numpy/f2py/auxfuncs.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'numpy/f2py/auxfuncs.py') diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py index e033e5630..fb82c28df 100644 --- a/numpy/f2py/auxfuncs.py +++ b/numpy/f2py/auxfuncs.py @@ -148,16 +148,36 @@ def isint1array(var): and get_kind(var)=='1' def isunsigned_chararray(var): - return isarray(var) and var.get('typespec')=='integer' and get_kind(var)=='-1' + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='-1' def isunsigned_shortarray(var): - return isarray(var) and var.get('typespec')=='integer' and get_kind(var)=='-2' + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='-2' def isunsignedarray(var): - return isarray(var) and var.get('typespec')=='integer' and get_kind(var)=='-4' + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='-4' def isunsigned_long_longarray(var): - return isarray(var) and var.get('typespec')=='integer' and get_kind(var)=='-8' + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='-8' + +def issigned_chararray(var): + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='1' + +def issigned_shortarray(var): + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='2' + +def issigned_array(var): + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='4' + +def issigned_long_longarray(var): + return isarray(var) and var.get('typespec') in ['integer', 'logical']\ + and get_kind(var)=='8' def isallocatable(var): return 'attrspec' in var and 'allocatable' in var['attrspec'] -- cgit v1.2.1