From e3c58827218544945d49238f7b4f39fa751d392a Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Tue, 27 Aug 2013 22:53:38 +0000 Subject: [PATCH] bugfix in the java binding --- src/runtime/java/jpgf.c | 4 ++-- src/runtime/java/org/grammaticalframework/pgf/Concr.java | 2 +- .../java/org/grammaticalframework/pgf/ExprIterator.java | 2 +- src/runtime/java/org/grammaticalframework/pgf/Parser.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c index 58c7eb743..eb6a8395d 100644 --- a/src/runtime/java/jpgf.c +++ b/src/runtime/java/jpgf.c @@ -220,8 +220,8 @@ Java_org_grammaticalframework_pgf_Parser_parse } jclass expiter_class = (*env)->FindClass(env, "org/grammaticalframework/pgf/ExprIterator"); - jmethodID constrId = (*env)->GetMethodID(env, expiter_class, "", "(JJJ)V"); - jobject jexpiter = (*env)->NewObject(env, expiter_class, constrId, (jlong) pool, (jlong) out_pool, (jlong) res); + jmethodID constrId = (*env)->GetMethodID(env, expiter_class, "", "(Lorg/grammaticalframework/pgf/Concr;JJJ)V"); + jobject jexpiter = (*env)->NewObject(env, expiter_class, constrId, concr, (jlong) pool, (jlong) out_pool, (jlong) res); return jexpiter; } diff --git a/src/runtime/java/org/grammaticalframework/pgf/Concr.java b/src/runtime/java/org/grammaticalframework/pgf/Concr.java index e486de906..11e131cae 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/Concr.java +++ b/src/runtime/java/org/grammaticalframework/pgf/Concr.java @@ -5,7 +5,7 @@ import java.util.*; public class Concr { public native String getName(); - + public Iterable parse(String startCat, String s) { return new Parser(this, startCat, s); } diff --git a/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java b/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java index 1ab9cae26..c2dc8438b 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java +++ b/src/runtime/java/org/grammaticalframework/pgf/ExprIterator.java @@ -22,7 +22,7 @@ class ExprIterator implements Iterator { private void fetch() { if (!fetched) { - ep = fetchExprProb(enumRef, out_pool); + ep = fetchExprProb(ref, out_pool); fetched = true; } } diff --git a/src/runtime/java/org/grammaticalframework/pgf/Parser.java b/src/runtime/java/org/grammaticalframework/pgf/Parser.java index 5e068b2e3..636deb521 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/Parser.java +++ b/src/runtime/java/org/grammaticalframework/pgf/Parser.java @@ -21,5 +21,5 @@ class Parser implements Iterable { return iter; } - public static native ExprIterator parse(Concr concr, String startCat, String s); + static native ExprIterator parse(Concr concr, String startCat, String s); }