Commit ff8734c4 authored by gsamain's avatar gsamain Committed by Xavier Thompson

Automatically delete cypclass members in cypclass destructor

parent f8c90d47
...@@ -990,9 +990,14 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -990,9 +990,14 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
self.generate_cyp_class_wrapper_definitions(scope.sue_entries, code) self.generate_cyp_class_wrapper_definitions(scope.sue_entries, code)
py_attrs = [e for e in scope.entries.values() py_attrs = [e for e in scope.entries.values()
if e.type.is_pyobject and not e.is_inherited] if e.type.is_pyobject and not e.is_inherited]
cypclass_attrs = [e for e in scope.entries.values()
if e.type.is_cyp_class and not e.name == "this"
and not e.is_type]
has_virtual_methods = False has_virtual_methods = False
constructor = None constructor = None
destructor = None destructor = None
if type.is_cyp_class:
has_virtual_methods = True
for attr in scope.var_entries: for attr in scope.var_entries:
cname = attr.cname cname = attr.cname
if attr.type.is_cfunction and attr.type.is_static_method: if attr.type.is_cfunction and attr.type.is_static_method:
...@@ -1051,6 +1056,8 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1051,6 +1056,8 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.put("virtual ") code.put("virtual ")
if is_implementing: if is_implementing:
code.putln("~%s() {" % type.cname) code.putln("~%s() {" % type.cname)
for cypattr in cypclass_attrs:
code.put_cyxdecref(cypattr.cname)
if py_attrs: if py_attrs:
code.put_ensure_gil() code.put_ensure_gil()
if destructor: if destructor:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment