Author: Armin Rigo <[email protected]>
Branch: cffi-1.0
Changeset: r1821:17a39c154ed7
Date: 2015-04-25 12:36 +0200
http://bitbucket.org/cffi/cffi/changeset/17a39c154ed7/
Log: fix
diff --git a/_cffi1/recompiler.py b/_cffi1/recompiler.py
--- a/_cffi1/recompiler.py
+++ b/_cffi1/recompiler.py
@@ -532,23 +532,19 @@
self._struct_collecttype(tp)
_generate_cpy_union_collecttype = _generate_cpy_struct_collecttype
+ def _struct_names(self, tp):
+ cname = tp.get_c_name('')
+ if ' ' in cname:
+ return cname, cname.replace(' ', '_')
+ else:
+ return cname, '_' + cname
+
def _generate_cpy_struct_decl(self, tp, name):
- cname = tp._get_c_name()
- if ' ' in cname:
- prefix, declname = cname.split(' ', 1)
- else:
- prefix, declname = '', cname
- while declname.startswith('$'):
- prefix += 'D'
- declname = declname[1:]
- approxname = prefix + '_' + declname
- assert '$' not in approxname
- self._struct_decl(tp, cname, approxname)
+ self._struct_decl(tp, *self._struct_names(tp))
_generate_cpy_union_decl = _generate_cpy_struct_decl
- def _generate_cpy_struct_ctx(self, tp, name, prefix='s'):
- cname = tp.get_c_name('')
- self._struct_ctx(tp, cname, cname.replace(' ', '_'))
+ def _generate_cpy_struct_ctx(self, tp, name):
+ self._struct_ctx(tp, *self._struct_names(tp))
_generate_cpy_union_ctx = _generate_cpy_struct_ctx
# ----------
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
