1 files changed, 66 insertions, 1 deletions

diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c
index ba9dee203..c64854eb8 100644
--- a/src/runtime/java/jpgf.c
+++ b/src/runtime/java/jpgf.c
@@ -172,7 +172,7 @@ Java_org_grammaticalframework_pgf_PGF_getFunctionType(JNIEnv* env, jobject self,
 		return NULL;
 
 	jclass type_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/Type");
-	jmethodID constrId = (*env)->GetMethodID(env, type_class, "<init>", "(Lorg/grammaticalframework/pgf/PGF;J)V");
+	jmethodID constrId = (*env)->GetMethodID(env, type_class, "<init>", "(Ljava/lang/Object;J)V");
 	jobject jtype = (*env)->NewObject(env, type_class, constrId, self, p2l(tp));
 
 	return jtype;
@@ -1191,6 +1191,24 @@ Java_org_grammaticalframework_pgf_Type_getCategory(JNIEnv* env, jobject self)
 	return gu2j_string(env, tp->cid);
 }
 
+JNIEXPORT jstring JNICALL
+Java_org_grammaticalframework_pgf_Type_toString(JNIEnv* env, jobject self)
+{
+	GuPool* tmp_pool = gu_local_pool();
+
+	GuExn* err = gu_exn(tmp_pool);
+	GuStringBuf* sbuf = gu_string_buf(tmp_pool);
+	GuOut* out = gu_string_buf_out(sbuf);
+
+	pgf_print_type(get_ref(env, self), NULL, 0, out, err);
+
+	GuString str = gu_string_buf_freeze(sbuf, tmp_pool);
+	jstring jstr = gu2j_string(env, str);
+
+	gu_pool_free(tmp_pool);
+	return jstr;
+}
+
 JNIEXPORT jobject JNICALL
 Java_org_grammaticalframework_pgf_Generator_generateAll(JNIEnv* env, jclass clazz, jobject jpgf, jstring jstartCat)
 {
@@ -1247,3 +1265,50 @@ Java_org_grammaticalframework_pgf_PGF_compute(JNIEnv* env, jobject self, jobject
 
 	return jexpr;
 }
+
+JNIEXPORT jobject JNICALL
+Java_org_grammaticalframework_pgf_PGF_inferExpr(JNIEnv* env, jobject self, jobject jexpr)
+{
+	GuPool* pool = gu_new_pool();
+	GuPool* tmp_pool = gu_local_pool();
+	GuExn* err = gu_exn(tmp_pool);
+
+	PgfExpr expr =
+		gu_variant_from_ptr((void*) get_ref(env, jexpr));
+	PgfType* tp  =
+		pgf_infer_expr(get_ref(env, self), &expr, err, pool);
+	if (!gu_ok(err)) {
+		if (gu_exn_caught(err, PgfExn)) {
+			GuString msg = (GuString) gu_exn_caught_data(err);
+			throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", msg);
+		} else if (gu_exn_caught(err, PgfTypeError)) {
+			GuString msg = (GuString) gu_exn_caught_data(err);
+			throw_string_exception(env, "org/grammaticalframework/pgf/TypeError", msg);
+ 		} else {
+			throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", "The type cannot be inferred");
+		}
+		gu_pool_free(tmp_pool);
+		gu_pool_free(pool);
+		return NULL;
+	}
+
+	gu_pool_free(tmp_pool);
+
+	jclass pool_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/Pool");
+	jmethodID pool_constrId = (*env)->GetMethodID(env, pool_class, "<init>", "(J)V");
+	jobject jpool = (*env)->NewObject(env, pool_class, pool_constrId, p2l(pool));
+
+	jclass expr_class  = (*env)->GetObjectClass(env, jexpr);
+	jmethodID expr_constrId = (*env)->GetMethodID(env, expr_class, "<init>", "(Lorg/grammaticalframework/pgf/Pool;Ljava/lang/Object;J)V");
+	jexpr = (*env)->NewObject(env, expr_class, expr_constrId, jpool, NULL, p2l(gu_variant_to_ptr(expr)));
+
+	jclass type_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/Type");
+	jmethodID type_constrId = (*env)->GetMethodID(env, type_class, "<init>", "(Ljava/lang/Object;J)V");
+	jobject jtype = (*env)->NewObject(env, type_class, type_constrId, jpool, p2l(tp));
+	
+	jclass typed_expr_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/TypedExpr");
+	jmethodID typed_expr_constrId = (*env)->GetMethodID(env, typed_expr_class, "<init>", "(Lorg/grammaticalframework/pgf/Expr;Lorg/grammaticalframework/pgf/Type;)V");
+	jobject jtyped_expr = (*env)->NewObject(env, typed_expr_class, typed_expr_constrId, jexpr, jtype);
+
+	return jtyped_expr;
+}