Merge pull request #316 from lambdafu/lambdafu/cpp_class_redef

If cppclass is redefined, make sure the this pointer enters the correct scope

Cython/Compiler/Symtab.py

@@ -573,7 +573,7 @@ class Scope(object):
                     entry.type.scope.declare_inherited_cpp_attributes(base_class.scope)
         if entry.type.scope:
             declare_inherited_attributes(entry, base_classes)
-            entry.type.scope.declare_var(name="this", cname="this", type=PyrexTypes.CPtrType(entry.type), pos=entry.pos)
+            scope.declare_var(name="this", cname="this", type=PyrexTypes.CPtrType(entry.type), pos=entry.pos)
         if self.is_cpp_class_scope:
             entry.type.namespace = self.outer_scope.lookup(self.name).type
         return entry

tests/run/cpp_class_redef.pxd

+# tag: cpp
+
+cdef extern cppclass Foo:
+    int _foo
+    void set_foo(int foo) nogil
+    int get_foo() nogil

tests/run/cpp_class_redef.pyx

+# tag: cpp
+
+# This gives a warning, but should not give an error.
+cdef cppclass Foo:
+    int _foo
+    int get_foo():
+        return this._foo
+    void set_foo(int foo):
+        this._foo = foo
+
+def test_Foo(n):
+    """
+    >>> test_Foo(1)
+    1
+    """
+    cdef Foo* foo = NULL
+    try:
+        foo = new Foo()
+        foo.set_foo(n)
+        return foo.get_foo()
+    finally:
+        del foo