msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

pgf_lookup_morpho and pgf_lookup_word_prefix are now also case insensitive if case_sensitive=off

Browse Source
This commit is contained in:
krasimir
2015-05-18 14:20:35 +00:00
parent 87b8118db1
commit 8cfd46b9bb
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/runtime/c/pgf/parser.c
View File

@@ -2216,15 +2216,20 @@ pgf_morpho_iter(PgfProductionIdx* idx,
} }
} }
typedef struct {
GuOrder order;
bool case_sensitive;
} PgfSequenceOrder;
static int static int
pgf_sequence_cmp_fn(GuOrder* self, const void* p1, const void* p2) pgf_sequence_cmp_fn(GuOrder* order, const void* p1, const void* p2)
{ {
(void) self; PgfSequenceOrder* self = gu_container(order, PgfSequenceOrder, order);
GuString sent = (GuString) p1; GuString sent = (GuString) p1;
const PgfSequence* sp2 = p2; const PgfSequence* sp2 = p2;
BIND_TYPE bind = BIND_HARD; BIND_TYPE bind = BIND_HARD;
int res = pgf_symbols_cmp(&sent, &bind, sp2->syms, true); int res = pgf_symbols_cmp(&sent, &bind, sp2->syms, self->case_sensitive);
if (res == 0 && *sent != 0) { if (res == 0 && *sent != 0) {
res = 1; res = 1;
} }
@@ -2232,8 +2237,6 @@ pgf_sequence_cmp_fn(GuOrder* self, const void* p1, const void* p2)
return res; return res;
} }
static GuOrder pgf_sequence_order[1] = { { pgf_sequence_cmp_fn } };
void void
pgf_lookup_morpho(PgfConcr *concr, GuString sentence, pgf_lookup_morpho(PgfConcr *concr, GuString sentence,
PgfMorphoCallback* callback, GuExn* err) PgfMorphoCallback* callback, GuExn* err)
@@ -2246,8 +2249,12 @@ pgf_lookup_morpho(PgfConcr *concr, GuString sentence,
} }
} }
bool case_sensitive =
(gu_seq_binsearch(concr->cflags, pgf_flag_order, PgfFlag, "case_sensitive") == NULL);
PgfSequenceOrder order = { { pgf_sequence_cmp_fn }, case_sensitive };
PgfSequence* seq = (PgfSequence*) PgfSequence* seq = (PgfSequence*)
gu_seq_binsearch(concr->sequences, pgf_sequence_order, gu_seq_binsearch(concr->sequences, &order.order,
PgfSequence, (void*) sentence); PgfSequence, (void*) sentence);
if (seq != NULL && seq->idx != NULL) if (seq != NULL && seq->idx != NULL)
@@ -2341,7 +2348,11 @@ pgf_lookup_word_prefix(PgfConcr *concr, GuString prefix,
state->prefix = prefix; state->prefix = prefix;
state->seq_idx = 0; state->seq_idx = 0;
if (!gu_seq_binsearch_index(concr->sequences, pgf_sequence_order, bool case_sensitive =
(gu_seq_binsearch(concr->cflags, pgf_flag_order, PgfFlag, "case_sensitive") == NULL);
PgfSequenceOrder order = { { pgf_sequence_cmp_fn }, case_sensitive };
if (!gu_seq_binsearch_index(concr->sequences, &order.order,
PgfSequence, (void*) prefix, PgfSequence, (void*) prefix,
&state->seq_idx)) { &state->seq_idx)) {
state->seq_idx++; state->seq_idx++;