7df33f4a5c
Multiple packages are already supported, but only as if each packages were bound in isolation. This CL lets a bound package refer to other bound packages in its exported functions, types and fields. In Java, the JNI class jclass and constructor jmethodID are exported so other packages can construct proxies of other packages' interfaces. In ObjC, the class @interface declarations are moved from the package .m file to its .h file to allow other packages to constructs its interface proxies. Add a supporting test package, secondpkg, and add Java and ObjC tests for the new cross package functionality. Also add simplepkg for testing corner cases where the generated Go file must not include its bound package. While we're here, stop generating Go proxy types for struct types; only Go interfaces can be implemented in the foreign language. Change-Id: Icbfa739c893703867d38a9100ed0928fbd7a660d Reviewed-on: https://go-review.googlesource.com/20575 Reviewed-by: David Crawshaw <crawshaw@golang.org>
72 lines
2.9 KiB
Plaintext
72 lines
2.9 KiB
Plaintext
// JNI functions for the Go <=> Java bridge.
|
|
// gobind -lang=java issue12403
|
|
//
|
|
// File is generated by gobind. Do not edit.
|
|
|
|
#include <android/log.h>
|
|
#include <stdint.h>
|
|
#include "seq.h"
|
|
#include "_cgo_export.h"
|
|
#include "issue12403.h"
|
|
|
|
jclass proxy_class_issue12403_Parsable;
|
|
jmethodID proxy_class_issue12403_Parsable_cons;
|
|
static jmethodID mid_Parsable_FromJSON;
|
|
static jmethodID mid_Parsable_ToJSON;
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_go_issue12403_Issue12403_init(JNIEnv *env, jclass _unused) {
|
|
jclass clazz;
|
|
clazz = (*env)->FindClass(env, "go/issue12403/Issue12403$Parsable$Proxy");
|
|
proxy_class_issue12403_Parsable = (*env)->NewGlobalRef(env, clazz);
|
|
proxy_class_issue12403_Parsable_cons = (*env)->GetMethodID(env, clazz, "<init>", "(Lgo/Seq$Ref;)V");
|
|
clazz = (*env)->FindClass(env, "go/issue12403/Issue12403$Parsable");
|
|
mid_Parsable_FromJSON = (*env)->GetMethodID(env, clazz, "FromJSON", "(Ljava/lang/String;)Ljava/lang/String;");
|
|
mid_Parsable_ToJSON = (*env)->GetMethodID(env, clazz, "ToJSON", "()Ljava/lang/String;");
|
|
|
|
}
|
|
|
|
JNIEXPORT jstring JNICALL
|
|
Java_go_issue12403_Issue12403_00024Parsable_00024Proxy_FromJSON(JNIEnv* env, jobject this, jstring jstr) {
|
|
int32_t o = go_seq_to_refnum(env, this);
|
|
nstring _jstr = go_seq_from_java_string(env, jstr);
|
|
nstring r0 = proxyissue12403_Parsable_FromJSON(o, _jstr);
|
|
jstring _r0 = go_seq_to_java_string(env, r0);
|
|
return _r0;
|
|
}
|
|
|
|
nstring cproxyissue12403_Parsable_FromJSON(int32_t refnum, nstring jstr) {
|
|
JNIEnv *env = go_seq_push_local_frame(12);
|
|
jobject o = go_seq_from_refnum(env, refnum, proxy_class_issue12403_Parsable, proxy_class_issue12403_Parsable_cons);
|
|
jstring _jstr = go_seq_to_java_string(env, jstr);
|
|
jstring res = (*env)->CallObjectMethod(env, o, mid_Parsable_FromJSON, _jstr);
|
|
nstring _res = go_seq_from_java_string(env, res);
|
|
go_seq_pop_local_frame(env);
|
|
return _res;
|
|
}
|
|
|
|
JNIEXPORT jstring JNICALL
|
|
Java_go_issue12403_Issue12403_00024Parsable_00024Proxy_ToJSON(JNIEnv* env, jobject this) {
|
|
int32_t o = go_seq_to_refnum(env, this);
|
|
struct proxyissue12403_Parsable_ToJSON_return res = proxyissue12403_Parsable_ToJSON(o);
|
|
jstring _r0 = go_seq_to_java_string(env, res.r0);
|
|
jstring _r1 = go_seq_to_java_string(env, res.r1);
|
|
go_seq_maybe_throw_exception(env, _r1);
|
|
return _r0;
|
|
}
|
|
|
|
struct cproxyissue12403_Parsable_ToJSON_return cproxyissue12403_Parsable_ToJSON(int32_t refnum) {
|
|
JNIEnv *env = go_seq_push_local_frame(10);
|
|
jobject o = go_seq_from_refnum(env, refnum, proxy_class_issue12403_Parsable, proxy_class_issue12403_Parsable_cons);
|
|
jstring res = (*env)->CallObjectMethod(env, o, mid_Parsable_ToJSON);
|
|
nstring _res = go_seq_from_java_string(env, res);
|
|
jstring exc = go_seq_get_exception_message(env);
|
|
nstring _exc = go_seq_from_java_string(env, exc);
|
|
cproxyissue12403_Parsable_ToJSON_return sres = {
|
|
_res, _exc
|
|
};
|
|
go_seq_pop_local_frame(env);
|
|
return sres;
|
|
}
|
|
|