Author: Wim Lavrijsen <[email protected]>
Branch: cppyy-packaging
Changeset: r94766:ebebd445c6d1
Date: 2018-06-14 13:56 -0700
http://bitbucket.org/pypy/pypy/changeset/ebebd445c6d1/
Log: naming consistency with CPython/cppyy
diff --git a/pypy/module/_cppyy/converter.py b/pypy/module/_cppyy/converter.py
--- a/pypy/module/_cppyy/converter.py
+++ b/pypy/module/_cppyy/converter.py
@@ -706,7 +706,7 @@
"no overload found matching %s", self.signature)
-class SmartPointerConverter(TypeConverter):
+class SmartPtrConverter(TypeConverter):
_immutable_fields = ['typecode', 'smartdecl', 'rawdecl', 'deref']
typecode = 'V'
@@ -753,7 +753,7 @@
return interp_cppyy.wrap_cppinstance(space, address,
self.rawdecl, smartdecl=self.smartdecl, deref=self.deref,
do_cast=False)
-class SmartPointerPtrConverter(SmartPointerConverter):
+class SmartPtrPtrConverter(SmartPtrConverter):
typecode = 'o'
def from_memory(self, space, w_obj, w_pycppclass, offset):
@@ -763,7 +763,7 @@
self._is_abstract(space)
-class SmartPointerRefConverter(SmartPointerPtrConverter):
+class SmartPtrRefConverter(SmartPtrPtrConverter):
typecode = 'V'
@@ -823,11 +823,11 @@
check_smart = capi.c_smartptr_info(space, clean_name)
if check_smart[0]:
if compound == '':
- return SmartPointerConverter(space, clsdecl, check_smart[1],
check_smart[2])
+ return SmartPtrConverter(space, clsdecl, check_smart[1],
check_smart[2])
elif compound == '*':
- return SmartPointerPtrConverter(space, clsdecl,
check_smart[1], check_smart[2])
+ return SmartPtrPtrConverter(space, clsdecl, check_smart[1],
check_smart[2])
elif compound == '&':
- return SmartPointerRefConverter(space, clsdecl,
check_smart[1], check_smart[2])
+ return SmartPtrRefConverter(space, clsdecl, check_smart[1],
check_smart[2])
# fall through: can still return smart pointer in non-smart way
# type check for the benefit of the annotator
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
