merge

Cython/Compiler/AnalysedTreeTransforms.py

@@ -10,7 +10,7 @@ import Naming
 class AutoTestDictTransform(ScopeTrackingTransform):
     # Handles autotestdict directive
 
-    blacklist = ['__cinit__', '__dealloc__', '__richcmp__']
+    blacklist = ['__cinit__', '__dealloc__', '__richcmp__', '__nonzero__']
 
     def visit_ModuleNode(self, node):
         self.scope_type = 'module'

Cython/Compiler/Nodes.py

@@ -16,7 +16,7 @@ from Errors import error, warning, InternalError
 import Naming
 import PyrexTypes
 import TypeSlots
-from PyrexTypes import py_object_type, error_type, CTypedefType, CFuncType
+from PyrexTypes import py_object_type, error_type, CFuncType
 from Symtab import ModuleScope, LocalScope, GeneratorLocalScope, \
     StructOrUnionScope, PyClassScope, CClassScope
 from Cython.Utils import open_new_file, replace_suffix

Cython/Compiler/PyrexTypes.py

@@ -150,6 +150,15 @@ class PyrexType(BaseType):
         # type information of the struct.
         return 1
 
+
+def create_typedef_type(cname, base_type, is_external=0):
+    if base_type.is_complex:
+        if is_external:
+            raise ValueError("Complex external typedefs not supported")
+        return base_type
+    else:
+        return CTypedefType(cname, base_type, is_external)
+
 class CTypedefType(BaseType):
     #
     #  Pseudo-type defined with a ctypedef statement in a
@@ -170,6 +179,7 @@ class CTypedefType(BaseType):
     
     
     def __init__(self, cname, base_type, is_external=0):
+        assert not base_type.is_complex
         self.typedef_cname = cname
         self.typedef_base_type = base_type
         self.typedef_is_external = is_external
@@ -877,8 +887,6 @@ class CComplexType(CNumericType):
                     None,
                     visibility="extern")
             scope.parent_type = self
-
-            
             scope.declare_var("real", self.real_type, None, "real", is_cdef=True)
             scope.declare_var("imag", self.real_type, None, "imag", is_cdef=True)
             entry = scope.declare_cfunction(

Cython/Compiler/Symtab.py

@@ -342,7 +342,11 @@ class Scope(object):
                 cname = name
             else:
                 cname = self.mangle(Naming.type_prefix, name)
-        type = PyrexTypes.CTypedefType(cname, base_type, (visibility == 'extern'))
+        try:
+            type = PyrexTypes.create_typedef_type(cname, base_type, (visibility == 'extern'))
+        except ValueError, e:
+            error(pos, e.message)
+            type = PyrexTypes.error_type
         entry = self.declare_type(name, type, pos, cname, visibility)
         type.qualified_name = entry.qualified_name
         return entry

Cython/Includes/numpy.pxd

@@ -293,12 +293,6 @@ cdef extern from "numpy/arrayobject.h":
     ctypedef long double  npy_float96
     ctypedef long double  npy_float128
 
-    ctypedef float complex        npy_complex64
-    ctypedef double complex       npy_complex128
-    ctypedef long double complex  npy_complex120
-    ctypedef long double complex  npy_complex192
-    ctypedef long double complex  npy_complex256
-
     ctypedef struct npy_cfloat:
         double real
         double imag
@@ -311,6 +305,26 @@ cdef extern from "numpy/arrayobject.h":
         double real
         double imag
 
+    ctypedef struct npy_complex64:
+        double real
+        double imag
+
+    ctypedef struct npy_complex128:
+        double real
+        double imag
+
+    ctypedef struct npy_complex160:
+        double real
+        double imag
+
+    ctypedef struct npy_complex192:
+        double real
+        double imag
+        
+    ctypedef struct npy_complex256:
+        double real
+        double imag
+
     ctypedef struct PyArray_Dims:
         npy_intp *ptr
         int len

tests/run/autotestdict.pyx

@@ -102,5 +102,12 @@ cdef class MyCdefClass:
         False
         """
 
+    def __nonzero__(self):
+        """
+        Should not be included, as it can't be looked up with getattr in Py 3.1
+
+        >>> True
+        False
+        """
 
 

tests/run/buffer.pyx

@@ -11,11 +11,15 @@ if sys.version_info[0] >= 3:
 b'abcdefg'
 
 >>> m1 = memoryview(b1)
+__getbuffer__ called
 >>> m1.tobytes()
+__getbuffer__ called
 b'abcdefg'
 
 >>> m2 = memoryview(b2)
+__getbuffer__ called
 >>> m2.tobytes()
+__getbuffer__ called
 releasing!
 b'abcdefg'
 
@@ -24,10 +28,11 @@ b'abcdefg'
 releasing!
 """
 
-s = "abcdefg"
+s = b"abcdefg"
 
 cdef class TestBuffer:
     def __getbuffer__(self, Py_buffer* buffer, int flags):
+        print u"__getbuffer__ called"
         buffer.buf = <char*>s
         buffer.obj = self
         buffer.len = len(s)

tests/run/complex_numbers_T305.pyx

@@ -116,3 +116,8 @@ def test_conjugate(float complex z):
 
 def test_conjugate_double(double complex z):
     return z.conjugate()
+
+ctypedef double complex cdouble
+def test_conjugate_typedef(cdouble z):
+    return z.conjugate()
+