Eolian: Use the new contracted function name api in generator
This commit is contained in:
parent
45e43df37c
commit
7a0f756ba8
|
@ -101,16 +101,6 @@ def conv_cls_name(name):
|
|||
return name, name
|
||||
|
||||
|
||||
def conv_func_name(prefix, func_name):
|
||||
p = prefix.split("_")
|
||||
f = func_name.split("_")
|
||||
if p[-1] == f[0]:
|
||||
p.pop()
|
||||
prefix = "_".join(p)
|
||||
func_name = "_".join(f)
|
||||
return "_".join((prefix, func_name))
|
||||
|
||||
|
||||
def remove_type_prefixes(ctype):
|
||||
for t in "const ", "unsigned ", "short ":
|
||||
ctype = ctype.replace(t, "")
|
||||
|
@ -252,9 +242,9 @@ class Method(object):
|
|||
self.py_name += "_"
|
||||
|
||||
if self.eo_prefix:
|
||||
self.c_name = conv_func_name(self.eo_prefix, func.name)
|
||||
self.c_name = func.full_c_name_get(self.eo_prefix)
|
||||
elif self.legacy_prefix:
|
||||
self.c_name = conv_func_name(self.legacy_prefix, func.name)
|
||||
self.c_name = func.full_c_name_get(self.legacy_prefix)
|
||||
else:
|
||||
raise ValueError("No prefix found for function %r" % (func))
|
||||
|
||||
|
@ -468,10 +458,10 @@ class Property(object):
|
|||
m = self.setter = Method(eo_prefix, legacy_prefix)
|
||||
m.py_name = "__set__"
|
||||
if eo_prefix:
|
||||
fname = conv_func_name(eo_prefix, func.name)
|
||||
fname = func.full_c_name_get(eo_prefix)
|
||||
m.c_name = "_".join((fname, "set"))
|
||||
elif legacy_prefix:
|
||||
fname = conv_func_name(legacy_prefix, func.name)
|
||||
fname = func.full_c_name_get(legacy_prefix)
|
||||
m.c_name = "_".join((fname, "set"))
|
||||
else:
|
||||
raise ValueError("No prefix found for %r" % (func))
|
||||
|
@ -515,10 +505,10 @@ class Property(object):
|
|||
m = self.getter = Method(eo_prefix, legacy_prefix)
|
||||
m.py_name = "__get__"
|
||||
if eo_prefix:
|
||||
fname = conv_func_name(eo_prefix, func.name)
|
||||
fname = func.full_c_name_get(eo_prefix)
|
||||
m.c_name = "_".join((fname, "get"))
|
||||
elif legacy_prefix:
|
||||
fname = conv_func_name(legacy_prefix, func.name)
|
||||
fname = func.full_c_name_get(legacy_prefix)
|
||||
m.c_name = "_".join((fname, "get"))
|
||||
else:
|
||||
raise ValueError("No prefix found for %r" % (func))
|
||||
|
|
Loading…
Reference in New Issue