diff options
Diffstat (limited to 'src/runtime/java')
| -rw-r--r-- | src/runtime/java/jpgf.c | 7 | ||||
| -rw-r--r-- | src/runtime/java/org/grammaticalframework/pgf/Concr.java | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/runtime/java/jpgf.c b/src/runtime/java/jpgf.c index d91709082..f1396e526 100644 --- a/src/runtime/java/jpgf.c +++ b/src/runtime/java/jpgf.c @@ -1107,8 +1107,11 @@ Java_org_grammaticalframework_pgf_Lexicon_lookupWordPrefix GuPool* pool = gu_new_pool(); GuExn* err = gu_new_exn(pool); - GuEnum* en = pgf_lookup_word_prefix(get_ref(env, jconcr), j2gu_string(env, prefix, pool), - pool, err); + GuEnum* en = + (prefix == NULL) ? pgf_fullform_lexicon(get_ref(env, jconcr), + pool) + : pgf_lookup_word_prefix(get_ref(env, jconcr), j2gu_string(env, prefix, pool), + pool, err); if (!gu_ok(err)) { if (gu_exn_caught(err, PgfExn)) { GuString msg = (GuString) gu_exn_caught_data(err); diff --git a/src/runtime/java/org/grammaticalframework/pgf/Concr.java b/src/runtime/java/org/grammaticalframework/pgf/Concr.java index 0c905bc5f..5ca90bf36 100644 --- a/src/runtime/java/org/grammaticalframework/pgf/Concr.java +++ b/src/runtime/java/org/grammaticalframework/pgf/Concr.java @@ -70,7 +70,9 @@ public class Concr { public native List<MorphoAnalysis> lookupMorpho(String sentence); /** Creates an iterable over the full form lexicon in the grammar */ - public native Iterable<FullFormEntry> fullFormLexicon(); + public Iterable<FullFormEntry> fullFormLexicon() { + return new Lexicon(this, null); + } /** Returns an iterable enumerating all words in the lexicon * starting with a given prefix. |