* Provide @Virtual(subclasses=false) to prevent Generator from s…

…ubclassing subclasses (pull #660)
bytedeco · Apr 1, 2023 · 940221e · 940221e
1 parent f9b0746
commit 940221e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Provide `@Virtual(subclasses=false)` to prevent `Generator` from subclassing subclasses ([pull #660](https://github.com/bytedeco/javacpp/pull/660))
  * Fix `Loader.getPlatform()` detection for `linux-armhf` with Temurin JDK ([issue bytedeco/javacv#2001](https://github.com/bytedeco/javacv/issues/2001))
  * Fix `Parser` ignoring `Info.skip` for enumerators that do not get translated ([issue bytedeco/javacpp-presets#1315](https://github.com/bytedeco/javacpp-presets/issues/1315))
  * Fix `Parser` error on C++17 style namespace declarations containing `::` separators ([issue #595](https://github.com/bytedeco/javacpp/issues/595))

diff --git a/src/main/java/org/bytedeco/javacpp/annotation/Virtual.java b/src/main/java/org/bytedeco/javacpp/annotation/Virtual.java
@@ -20,4 +20,5 @@
 public @interface Virtual {
     /** Pure (abstract) or not. */
     boolean value() default false;
+    boolean subclasses() default true;
 }
diff --git a/src/main/java/org/bytedeco/javacpp/tools/Generator.java b/src/main/java/org/bytedeco/javacpp/tools/Generator.java
@@ -2091,7 +2091,7 @@ boolean methods(Class<?> cls) {
         while (c != null && c != Object.class && !Modifier.isAbstract(cls.getModifiers())) {
             // consider non-duplicate virtual functions from superclasses as well, unless abstract anyway
             for (Method m : c.getDeclaredMethods()) {
-                if (m.isAnnotationPresent(Virtual.class)) {
+                if (m.isAnnotationPresent(Virtual.class) && m.getAnnotation(Virtual.class).subclasses()) {
                     boolean found = false;
                     String name = m.getName();
                     Class<?>[] types = m.getParameterTypes();

diff --git a/src/main/java/org/bytedeco/javacpp/tools/Parser.java b/src/main/java/org/bytedeco/javacpp/tools/Parser.java
@@ -2357,7 +2357,7 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
 
         type = functionAfter(context, decl, dcl, type);
         context = new Context(context);
-        context.virtualize &= type.virtual;
+        context.virtualize = (context.virtualize && type.virtual) || (info != null && info.virtualize);
 
         List<Declarator> prevDcl = new ArrayList<Declarator>();
         boolean first = true;
@@ -2516,7 +2516,7 @@ boolean function(Context context, DeclarationList declList) throws ParserExcepti
             }
 
             // add @Virtual annotation on user request only, inherited through context
-            if (context.virtualize) {
+            if (context.virtualize && !type.annotations.contains("@Virtual")) {
                 modifiers = "@Virtual" + (decl.abstractMember ? "(true) " : " ")
                           + (context.inaccessible ? "protected native " : "public native ");
             }