wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1244875 - Update binding generator; r=snorp

Browse Source 
Update the automatic binding generator to match the JNI template
changes.
This commit is contained in:
Jim Chen 2016-02-09 17:27:28 -05:00
parent cb5f6cf03a
commit fc59c0a8e8
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/annotationProcessors/CodeGenerator.java
View File

@ -27,6 +27,7 @@ public class CodeGenerator {
private final Class<?> cls;
private final String clsName;
private boolean isMultithreaded;
private final HashSet<String> takenMethodNames = new HashSet<String>();
@ -36,30 +37,26 @@ public class CodeGenerator {
final String unqualifiedName = Utils.getUnqualifiedName(clsName);
header.append(
"class " + clsName + " : public mozilla::jni::Class<" + unqualifiedName + ">\n" +
"class " + clsName + " : public mozilla::jni::ObjectBase<" +
unqualifiedName + ", jobject>\n" +
"{\n" +
"public:\n" +
" typedef mozilla::jni::Ref<" + unqualifiedName + "> Ref;\n" +
" typedef mozilla::jni::LocalRef<" + unqualifiedName + "> LocalRef;\n" +
" typedef mozilla::jni::GlobalRef<" + unqualifiedName + "> GlobalRef;\n" +
" typedef const mozilla::jni::Param<" + unqualifiedName + ">& Param;\n" +
"\n" +
" static constexpr char name[] =\n" +
" \"" + cls.getName().replace('.', '/') + "\";\n" +
"\n" +
"protected:\n" +
" " + unqualifiedName + "(jobject instance) : Class(instance) {}\n" +
" explicit " + unqualifiedName + "(const Context& ctx) : ObjectBase<" +
unqualifiedName + ", jobject>(ctx) {}\n" +
"\n");
cpp.append(
"constexpr char " + clsName + "::name[];\n" +
"template<> const char mozilla::jni::Context<" +
clsName + ", jobject>::name[] =\n" +
" \"" + cls.getName().replace('.', '/') + "\";\n" +
"\n");
natives.append(
"template<class Impl>\n" +
"class " + clsName + "::Natives : " +
"public mozilla::jni::NativeImpl<" + unqualifiedName + ", Impl>\n" +
"{\n");
"{\n" +
"public:\n");
}
private String getTraitsName(String uniqueName, boolean includeScope) {
@ -113,7 +110,6 @@ public class CodeGenerator {
}
header.append(
"public:\n" +
" struct " + getTraitsName(uniqueName, /* includeScope */ false) + " {\n" +
" typedef " + Utils.getUnqualifiedName(clsName) + " Owner;\n" +
" typedef " + getNativeReturnType(type, info) + " ReturnType;\n" +
@ -124,7 +120,6 @@ public class CodeGenerator {
" static constexpr char signature[] =\n" +
" \"" + Utils.getSignature(member) + "\";\n" +
" static const bool isStatic = " + Utils.isStatic(member) + ";\n" +
" static const bool isMultithreaded = " + info.isMultithreaded + ";\n" +
" static const mozilla::jni::ExceptionMode exceptionMode =\n" +
" " + (
info.catchException ? "mozilla::jni::ExceptionMode::NSRESULT" :
@ -139,6 +134,8 @@ public class CodeGenerator {
"constexpr char " + getTraitsName(uniqueName, /* includeScope */ true) +
"::signature[];\n" +
"\n");
this.isMultithreaded |= info.isMultithreaded;
}
private String getUniqueMethodName(String basename) {
@ -261,7 +258,8 @@ public class CodeGenerator {
// Generate a call, e.g., Method<Traits>::Call(a0, a1, a2);
def.append(accessorName).append("(")
.append(isStatic ? "nullptr" : "this");
.append(Utils.getUnqualifiedName(clsName) +
(isStatic ? "::Context()" : "::mCtx"));
if (info.catchException) {
def.append(", &rv");
@ -400,7 +398,6 @@ public class CodeGenerator {
if (val != null && type.isPrimitive()) {
// For static final primitive fields, we can use a "static const" declaration.
header.append(
"public:\n" +
" static const " + Utils.getNativeReturnType(type, info) +
' ' + info.wrapperName + " = " + getLiteral(val, info) + ";\n" +
"\n");
@ -410,7 +407,6 @@ public class CodeGenerator {
final String nativeType = info.narrowChars ? "char" : "char16_t";
header.append(
"public:\n" +
" static const " + nativeType + ' ' + info.wrapperName + "[];\n" +
"\n");
@ -519,8 +515,6 @@ public class CodeGenerator {
return;
}
header.append(
"public:\n");
for (final ClassWithOptions cls : classes) {
// Extract "Inner" from "Outer::Inner".
header.append(
@ -544,9 +538,12 @@ public class CodeGenerator {
* @return The bytes to be written to the header file.
*/
public String getHeaderFileContents() {
header.append(
" static const bool isMultithreaded = " + this.isMultithreaded + ";\n" +
"\n");
if (nativesInits.length() > 0) {
header.append(
"public:\n" +
" template<class Impl> class Natives;\n");
}
header.append(
@ -565,7 +562,6 @@ public class CodeGenerator {
return "";
}
natives.append(
"public:\n" +
" static constexpr JNINativeMethod methods[] = {" + nativesInits + '\n' +
" };\n" +
"};\n" +

4
build/annotationProcessors/utils/Utils.java
View File

@ -88,7 +88,7 @@ public class Utils {
if (type.equals(Class.class)) {
// You're doing reflection on Java objects from inside C, returning Class objects
// to C, generating the corresponding code using this Java program. Really?!
return "mozilla::jni::ClassObject::Param";
return "mozilla::jni::Class::Param";
}
if (type.equals(Throwable.class)) {
@ -120,7 +120,7 @@ public class Utils {
if (type.equals(Class.class)) {
// You're doing reflection on Java objects from inside C, returning Class objects
// to C, generating the corresponding code using this Java program. Really?!
return "mozilla::jni::ClassObject::LocalRef";
return "mozilla::jni::Class::LocalRef";
}
if (type.equals(Throwable.class)) {