Merge pull request #93 from bzz/load-impl-encode

JVM object encode implementation
bblfsh · Jul 5, 2019 · 2d844e9 · 2d844e9
2 parents 5b81fbb + 54ea17b
commit 2d844e9
Show file tree

Hide file tree

Showing 11 changed files with 266 additions and 128 deletions.
diff --git a/src/main/native/jni_utils.cc b/src/main/native/jni_utils.cc
@@ -20,8 +20,9 @@ JNIEnv *getJNIEnv() {
   return pEnv;
 }
 
+// Class fully qualified names
 const char CLS_NODE[] = "org/bblfsh/client/v2/Node";
-const char CLS_CTX[] = "org/bblfsh/client/v2/Context";
+const char CLS_CTX[] = "org/bblfsh/client/v2/ContextExt";
 const char CLS_OBJ[] = "java/lang/Object";
 const char CLS_RE[] = "java/lang/RuntimeException";
 const char CLS_JNODE[] = "org/bblfsh/client/v2/JNode";
@@ -34,6 +35,7 @@ const char CLS_JUINT[] = "org/bblfsh/client/v2/JUint";
 const char CLS_JARR[] = "org/bblfsh/client/v2/JArray";
 const char CLS_JOBJ[] = "org/bblfsh/client/v2/JObject";
 
+// Method signatures
 const char METHOD_JNODE_KEY_AT[] = "(I)Ljava/lang/String;";
 const char METHOD_JNODE_VALUE_AT[] = "(I)Lorg/bblfsh/client/v2/JNode;";
 const char METHOD_JOBJ_ADD[] =
@@ -126,8 +128,8 @@ jfieldID getField(JNIEnv *env, jobject obj, const char *name) {
   return jfid;
 }
 
-static jmethodID MethodID(JNIEnv *env, const char *method,
-                          const char *signature, const char *className) {
+jmethodID MethodID(JNIEnv *env, const char *method, const char *signature,
+                   const char *className) {
   jclass cls = env->FindClass(className);
   checkJvmException(std::string("failed to find a class ").append(className));
 
@@ -171,7 +173,7 @@ jobject ObjectMethod(JNIEnv *env, const char *method, const char *signature,
   va_start(varargs, object);
   jobject res = env->CallObjectMethodV(*object, mId, varargs);
   va_end(varargs);
-  checkJvmException(std::string("failed get varargs for ")
+  checkJvmException(std::string("failed to get varargs for ")
                         .append(className)
                         .append(".")
                         .append(method));

diff --git a/src/main/native/jni_utils.h b/src/main/native/jni_utils.h
@@ -44,4 +44,5 @@ jint IntMethod(JNIEnv *, const char *, const char *, const char *,
 jobject ObjectMethod(JNIEnv *, const char *, const char *, const char *,
                      const jobject *, ...);
 
+jmethodID MethodID(JNIEnv *, const char *, const char *, const char *);
 #endif
diff --git a/src/main/native/org_bblfsh_client_v2_Context.h b/src/main/native/org_bblfsh_client_v2_Context.h
diff --git a/src/main/native/org_bblfsh_client_v2_ContextExt.h b/src/main/native/org_bblfsh_client_v2_ContextExt.h