Skip to content

First stab at auto downcast feat for @Adapter annotation #542

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

First stab at auto downcast feat for @Adapter annotation #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/java/org/bytedeco/javacpp/annotation/Adapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
/** The number of arguments that {@link Generator} takes from the method as
* arguments to the adapter constructor. */
int argc() default 1;
boolean downcast() default false;
}
9 changes: 5 additions & 4 deletions src/main/java/org/bytedeco/javacpp/tools/AdapterInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
* @author Samuel Audet
*/
class AdapterInformation {
String name;
int argc;
String cast, cast2;
boolean constant;
String name;
int argc;
String cast, cast2;
boolean constant;
boolean downcast;
}
10 changes: 7 additions & 3 deletions 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 @@ -2801,7 +2801,10 @@ void returnAfter(MethodInformation methodInfo) {
}
}
out.println( "if (rptr != NULL) {");
out.println(indent + " rarg = JavaCPP_createPointer(env, " + jclasses.index(methodInfo.returnType) +
if (adapterInfo!=null && adapterInfo.downcast)
out.println(indent + " rarg = radapter.createPointer(env);");
else
out.println(indent + " rarg = JavaCPP_createPointer(env, " + jclasses.index(methodInfo.returnType) +
(methodInfo.parameterTypes.length > 0 && methodInfo.parameterTypes[0] == Class.class ? ", arg0);" : ");"));
out.println(indent + " if (rarg != NULL) {");
if (needInit) {
Expand Down Expand Up @@ -2875,7 +2878,7 @@ void parametersAfter(MethodInformation methodInfo) {
if ("void*".equals(typeName[0]) && !methodInfo.parameterTypes[j].isAnnotationPresent(Opaque.class)) {
typeName[0] = "char*";
}

// If const array, then use JNI_ABORT to avoid copying unmodified data back to JVM
final String releaseArrayFlag;
if (cast.contains(" const *") || cast.startsWith("(const ")) {
Expand Down Expand Up @@ -3851,6 +3854,7 @@ AdapterInformation adapterInformation(boolean out, String valueTypeName, Annotat
adapterInfo = new AdapterInformation();
adapterInfo.name = adapter.value();
adapterInfo.argc = adapter.argc();
adapterInfo.downcast = adapter.downcast();
if (a != adapter) {
try {
Class cls = a.annotationType();
Expand Down Expand Up @@ -3880,7 +3884,7 @@ AdapterInformation adapterInformation(boolean out, String valueTypeName, Annotat
cast2 = c.value()[2];
}
}
} catch (Exception ex) {
} catch (Exception ex) {
logger.warn("Could not invoke the value() method on annotation \"" + a + "\": " + ex);
}
if (valueTypeName != null && valueTypeName.length() > 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/bytedeco/javacpp/tools/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ Type type(Context context, boolean definition) throws ParserException {
}
type.cppName += separator;
Info info = infoMap.getFirst(t.cppName);
String s = info != null && info.cppTypes != null ? info.cppTypes[0] : t.cppName;
String s = info != null && info.cppTypes != null && info.cppTypes.length>0 ? info.cppTypes[0] : t.cppName;
if (t.constValue && !s.startsWith("const ")) {
s = "const " + s;
}
Expand Down