Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add explicitUpcast #671

Merged
merged 13 commits into from
Apr 21, 2023
Merged

Add explicitUpcast #671

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
af930e4
Add explicitUpcast
HGuillemet Mar 20, 2023
5922450
Revert detection of virtual inheritance
HGuillemet Apr 12, 2023
b82097f
Fix asX capitalization
HGuillemet Apr 12, 2023
fc1d881
Remove smart-pointer-specific code
HGuillemet Apr 14, 2023
b9b12a5
Remove now unused Type.explicitUpcast
HGuillemet Apr 14, 2023
ebd44cf
In explicitCast, copy annotations from constructor
HGuillemet Apr 14, 2023
354b5b4
Remove @Cast in explicitCast
HGuillemet Apr 15, 2023
93404e2
Rename explicit(up)cast to upcast
HGuillemet Apr 16, 2023
d3c40a1
Rename Virtual.javaName to Virtual.method
HGuillemet Apr 16, 2023
56dcf8a
Rename needWrapper as needUpcast
HGuillemet Apr 17, 2023
31f6102
Update CHANGELOG.md and fix nits
saudet Apr 18, 2023
8055b84
Revert a nit
HGuillemet Apr 19, 2023
497f49b
Rename nativeModifiers to modifiers2
HGuillemet Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/bytedeco/javacpp/annotation/Virtual.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@
/** Pure (abstract) or not. */
boolean value() default false;
boolean subclasses() default true;
}
String javaName() default "";
HGuillemet marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 2 additions & 0 deletions src/main/java/org/bytedeco/javacpp/tools/Context.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class Context {
templateMap = c.templateMap;
usingList = c.usingList;
namespaceMap = c.namespaceMap;
explicitUpcast = c.explicitUpcast;
HGuillemet marked this conversation as resolved.
Show resolved Hide resolved
}

String namespace = null;
Expand All @@ -71,6 +72,7 @@ class Context {
TemplateMap templateMap = null;
List<String> usingList = null;
Map<String,String> namespaceMap = null;
boolean explicitUpcast = false;

/** Return all likely combinations of namespaces and template arguments for this C++ type */
String[] qualify(String cppName) {
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/bytedeco/javacpp/tools/Generator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3406,8 +3406,10 @@ void callback(Class<?> cls, Method callbackMethod, String callbackName, int allo
}

if (methodInfo != null) {
Virtual virtualAnnotation = callbackMethod.getAnnotation(Virtual.class);
String javaName = (virtualAnnotation != null && virtualAnnotation.javaName().length() > 0) ? virtualAnnotation.javaName() : methodInfo.method.getName();
out.println(" if (" + fieldName + " == NULL) {");
out.println(" " + fieldName + " = JavaCPP_getMethodID(env, " + jclasses.index(cls) + ", \"" + methodInfo.method.getName() + "\", \"(" +
out.println(" " + fieldName + " = JavaCPP_getMethodID(env, " + jclasses.index(cls) + ", \"" + javaName + "\", \"(" +
signature(methodInfo.method.getParameterTypes()) + ")" + signature(methodInfo.method.getReturnType()) + "\");");
out.println(" }");
out.println(" jmethodID mid = " + fieldName + ";");
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/bytedeco/javacpp/tools/Info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ public Info(Info i) {
String cppText = null;
/** Outputs the given code, instead of the result parsed from the declaration of C++ identifiers. */
String javaText = null;
/** Whether an explicit static_cast is needed to upcast a pointer to this cppName.
* This is necessary for polymorphic classes that are virtually inherited from. */
boolean explicitUpcast = false;



public Info cppNames(String... cppNames) { this.cppNames = cppNames; return this; }
public Info javaNames(String... javaNames) { this.javaNames = javaNames; return this; }
Expand Down Expand Up @@ -161,4 +166,6 @@ public Info(Info i) {
public Info base(String base) { this.base = base; return this; }
public Info cppText(String cppText) { this.cppText = cppText; return this; }
public Info javaText(String javaText) { this.javaText = javaText; return this; }
public Info explicitUpcast() { this.explicitUpcast = true; return this; }
public Info explicitUpcast(boolean eu) { this.explicitUpcast = eu; return this; }
}
Loading