aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--find-modules/sip_generator.py2
-rw-r--r--tests/GenerateSipBindings/cpplib.cpp20
-rw-r--r--tests/GenerateSipBindings/cpplib.h20
-rw-r--r--tests/GenerateSipBindings/testscript.py5
4 files changed, 47 insertions, 0 deletions
diff --git a/find-modules/sip_generator.py b/find-modules/sip_generator.py
index 55220e2f..1d807641 100644
--- a/find-modules/sip_generator.py
+++ b/find-modules/sip_generator.py
@@ -223,6 +223,8 @@ class SipGenerator(object):
if member.kind in [CursorKind.CXX_METHOD, CursorKind.FUNCTION_DECL, CursorKind.FUNCTION_TEMPLATE,
CursorKind.CONSTRUCTOR, CursorKind.DESTRUCTOR, CursorKind.CONVERSION_FUNCTION]:
decl = self._fn_get(container, member, level + 1)
+ if member.is_pure_virtual_method():
+ sip["annotations"].add("Abstract")
elif member.kind == CursorKind.ENUM_DECL:
decl = self._enum_get(container, member, level + 1) + ";\n"
elif member.kind == CursorKind.CXX_ACCESS_SPEC_DECL:
diff --git a/tests/GenerateSipBindings/cpplib.cpp b/tests/GenerateSipBindings/cpplib.cpp
index 47370ca0..8ecedcbc 100644
--- a/tests/GenerateSipBindings/cpplib.cpp
+++ b/tests/GenerateSipBindings/cpplib.cpp
@@ -239,3 +239,23 @@ Shared::Shared(const Shared& other)
{
}
+
+int Abstract::callableMultiply(int i, int j)
+{
+ return i * j;
+}
+
+Abstract::~Abstract()
+{
+
+}
+
+int Concrete::callableAdd(int i, int j)
+{
+ return i + j;
+}
+
+void Concrete::virtualInterface()
+{
+
+}
diff --git a/tests/GenerateSipBindings/cpplib.h b/tests/GenerateSipBindings/cpplib.h
index 958b8750..82e795a1 100644
--- a/tests/GenerateSipBindings/cpplib.h
+++ b/tests/GenerateSipBindings/cpplib.h
@@ -219,3 +219,23 @@ class NO_EXPORT Invisible
public:
int someApi() { return 1; }
};
+
+class Abstract
+{
+public:
+ virtual ~Abstract();
+
+ int callableMultiply(int i, int j);
+
+protected:
+ virtual void virtualInterface() = 0;
+};
+
+class Concrete : public Abstract
+{
+public:
+ int callableAdd(int i, int j);
+
+protected:
+ void virtualInterface() override;
+};
diff --git a/tests/GenerateSipBindings/testscript.py b/tests/GenerateSipBindings/testscript.py
index b388841f..f1bef91e 100644
--- a/tests/GenerateSipBindings/testscript.py
+++ b/tests/GenerateSipBindings/testscript.py
@@ -135,3 +135,8 @@ try:
assert False
except AttributeError as e:
assert str(e) == "module 'PyTest.CppLib' has no attribute 'Invisible'"
+
+concrete = PyTest.CppLib.Concrete()
+
+assert(concrete.callableMultiply(2, 3) == 6)
+assert(concrete.callableAdd(2, 3) == 5)