From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Thu, 2 Jul 2009 07:05:24 +0000 (-0700)
Subject: Minor changes to del
X-Git-Tag: 0.13.beta0~353^2~72
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bd035eac5a3759eb44c781f2f748f43d8bd87dd;p=cython.git

Minor changes to del
---

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 793cd91a..19790c36 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -3386,10 +3386,12 @@ class DelStatNode(StatNode):
     def analyse_expressions(self, env):
         for arg in self.args:
             arg.analyse_target_expression(env, None)
-            if arg.type.is_pyobject or (arg.type.is_ptr and arg.type.base_type.is_cpp_class):
+            if arg.type.is_pyobject:
                 self.gil_check(env)
+            elif arg.type.is_ptr and arg.type.base_type.is_cpp_class:
+                pass
             else:
-                error(arg.pos, "Deletion of non-Python object")
+                error(arg.pos, "Deletion of non-Python, non-C++ object")
             #arg.release_target_temp(env)
 
     gil_message = "Deleting Python object"
@@ -3399,7 +3401,8 @@ class DelStatNode(StatNode):
             if arg.type.is_pyobject:
                 arg.generate_deletion_code(code)
             elif arg.type.is_ptr and arg.type.base_type.is_cpp_class:
-                code.putln("delete %s" % arg.name)
+                arg.generate_result_code()
+                code.putln("delete %s" % arg.result())
             # else error reported earlier
 
     def annotate(self, code):