diff options
| author | Thomas Hallgren <th-github@altocumulus.org> | 2018-03-29 14:56:07 +0200 |
|---|---|---|
| committer | Thomas Hallgren <th-github@altocumulus.org> | 2018-03-29 14:56:07 +0200 |
| commit | a9135c9b7ecf78dc4e78fd604969538ebd1b1ad4 (patch) | |
| tree | 58fb973158ac40375bb9e069a4917794e14d79a2 /src/runtime/c/pgf/lookup.c | |
| parent | 31ef32a815f129002380a58d9a50e827d71800fc (diff) | |
| parent | bb4218433fe8afabbc5239b2ca41731bb3e2da4b (diff) | |
Merge branch 'master' of www.grammaticalframework.org:/usr/local/www/GF
Diffstat (limited to 'src/runtime/c/pgf/lookup.c')
| -rw-r--r-- | src/runtime/c/pgf/lookup.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/runtime/c/pgf/lookup.c b/src/runtime/c/pgf/lookup.c index 21c82450f..5918275c1 100644 --- a/src/runtime/c/pgf/lookup.c +++ b/src/runtime/c/pgf/lookup.c @@ -119,7 +119,7 @@ typedef struct { static PgfAbsProduction* pgf_lookup_new_production(PgfAbsFun* fun, GuPool *pool) { - size_t n_hypos = gu_seq_length(fun->type->hypos); + size_t n_hypos = fun->type->hypos ? gu_seq_length(fun->type->hypos) : 0; PgfAbsProduction* prod = gu_new_flex(pool, PgfAbsProduction, args, n_hypos); prod->fun = fun; prod->count = 0; @@ -699,8 +699,12 @@ pgf_lookup_tokenize(GuMap* lexicon_idx, GuString sentence, GuPool* pool) break; const uint8_t* start = p-1; - while (c != 0 && !gu_ucs_is_space(c)) { + if (strchr(".!?,:",c) != NULL) c = gu_utf8_decode(&p); + else { + while (c != 0 && strchr(".!?,:",c) == NULL && !gu_ucs_is_space(c)) { + c = gu_utf8_decode(&p); + } } const uint8_t* end = p-1; |