Commit dbf9d2b6 authored by Xavier Thompson's avatar Xavier Thompson

Remove obsolete 'c_mangle' method

parent f6004d0d
...@@ -460,9 +460,6 @@ class Scope(object): ...@@ -460,9 +460,6 @@ class Scope(object):
else: else:
return self.parent_scope.mangle(prefix, self.name) return self.parent_scope.mangle(prefix, self.name)
# mangle cypclass related C names in the global namespace
c_mangle = mangle
def mangle_internal(self, name): def mangle_internal(self, name):
# Mangle an internal name so as not to clash with any # Mangle an internal name so as not to clash with any
# user-defined name in this scope. # user-defined name in this scope.
...@@ -2737,13 +2734,6 @@ class CppClassScope(Scope): ...@@ -2737,13 +2734,6 @@ class CppClassScope(Scope):
self.inherited_var_entries = [] self.inherited_var_entries = []
self.inherited_type_entries = [] self.inherited_type_entries = []
self.reifying_entries = [] self.reifying_entries = []
# _scope_prefix is used interally for mangling in cases where c++ namespaces aren't used
# it is used in conjunction with 'c_mangle'
if (outer_scope):
outer_prefix = outer_scope._scope_prefix if outer_scope.is_cpp_class_scope else outer_scope.scope_prefix
self._scope_prefix = outer_prefix + self.scope_prefix
else:
self._scope_prefix = self.scope_prefix
if templates is not None: if templates is not None:
for T in templates: for T in templates:
template_entry = self.declare( template_entry = self.declare(
...@@ -3109,20 +3099,6 @@ class CppClassScope(Scope): ...@@ -3109,20 +3099,6 @@ class CppClassScope(Scope):
name = 'operator ' + as_operator_name name = 'operator ' + as_operator_name
return super(CppClassScope,self).lookup_here(name) return super(CppClassScope,self).lookup_here(name)
# mangle names in the global namespace.
# Normally 'mangle' would be used for this, but CppClassScope doesn't
# have a parent_scope, and therefore no qualified 'scope_prefix':
# unneeded thanks to C++ namespaces.
# '_scope_prefix' is used instead to use a scope-qualified name
# only when required.
def c_mangle(self, prefix, name = None):
if name:
return "%s%s%s" % (prefix, self._scope_prefix, name)
elif self.outer_scope:
return self.outer_scope.mangle(prefix, self.name)
else:
return self.mangle(prefix, name)
class PropertyScope(Scope): class PropertyScope(Scope):
# Scope holding the __get__, __set__ and __del__ methods for # Scope holding the __get__, __set__ and __del__ methods for
......
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