Commit 33db1ad9 authored by Dag Sverre Seljebotn's avatar Dag Sverre Seljebotn Committed by Mark Florisson

fixup Revert disturbing the mangling

The extra mangling was needed for closures with identical names, etc.
parent d38afdba
...@@ -2273,14 +2273,11 @@ class DefNode(FuncDefNode): ...@@ -2273,14 +2273,11 @@ class DefNode(FuncDefNode):
entry = env.declare_pyfunction(name, self.pos, allow_redefine=not self.is_wrapper) entry = env.declare_pyfunction(name, self.pos, allow_redefine=not self.is_wrapper)
self.entry = entry self.entry = entry
prefix = env.next_id(env.scope_prefix) prefix = env.next_id(env.scope_prefix)
entry.func_cname = \ entry.func_cname = Naming.pyfunc_prefix + prefix + name
env.mangle(Naming.pyfunc_prefix, prefix + name) entry.pymethdef_cname = Naming.pymethdef_prefix + prefix + name
entry.pymethdef_cname = \
env.mangle(Naming.pymethdef_prefix, prefix + name)
if Options.docstrings: if Options.docstrings:
entry.doc = embed_position(self.pos, self.doc) entry.doc = embed_position(self.pos, self.doc)
entry.doc_cname = \ entry.doc_cname = Naming.funcdoc_prefix + prefix + name
env.mangle(Naming.funcdoc_prefix, prefix + name)
if entry.is_special: if entry.is_special:
if entry.name in TypeSlots.invisible or not entry.doc or (entry.name in '__getattr__' and env.directives['fast_getattr']): if entry.name in TypeSlots.invisible or not entry.doc or (entry.name in '__getattr__' and env.directives['fast_getattr']):
entry.wrapperbase_cname = None entry.wrapperbase_cname = None
......
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