GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-14 05:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

bugfix and tiny optimization for callbacks from Haskell

Browse Source
This commit is contained in:
kr.angelov
2014-12-19 10:14:41 +00:00
parent 856683f79f
commit 13f4af4910
3 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/runtime/haskell-bind/utils.c
View File

@@ -1,18 +1,55 @@
#include <HsFFI.h>
#include <pgf/pgf.h>
#include <gu/utf8.h>
typedef struct {
PgfLiteralCallback callback;
PgfExprProb* (*match)(PgfLiteralCallback* self,
size_t lin_idx,
GuString sentence, size_t* poffset,
GuPool *out_pool);
GuFinalizer fin;
} HSPgfLiteralCallback;
static void
static PgfExprProb*
hspgf_match_callback(PgfLiteralCallback* self,
size_t lin_idx,
GuString sentence, size_t* poffset,
GuPool *out_pool)
{
HSPgfLiteralCallback* callback = (HSPgfLiteralCallback*) self;
size_t offset = *poffset;
const uint8_t *start = sentence;
const uint8_t *end = sentence + offset;
size_t hs_offset = 0;
while (start < end) {
gu_utf8_decode(&start);
hs_offset++;
}
PgfExprProb* ep =
callback->match(self, lin_idx, sentence, &hs_offset, out_pool);
start = sentence;
end = start;
while (hs_offset > 0) {
gu_utf8_decode(&end);
hs_offset--;
}
*poffset = (end - start);
return ep;
}
static void
hspgf_literal_callback_fin(GuFinalizer* self)
{
HSPgfLiteralCallback* callback = gu_container(self, HSPgfLiteralCallback, fin);
if (callback->callback.match != NULL)
hs_free_fun_ptr((HsFunPtr) callback->callback.match);
hs_free_fun_ptr((HsFunPtr) callback->match);
if (callback->callback.predict != NULL)
hs_free_fun_ptr((HsFunPtr) callback->callback.predict);
}
@@ -23,8 +60,9 @@ hspgf_callbacks_map_add_literal(PgfConcr* concr, PgfCallbacksMap* callbacks,
GuPool* pool)
{
HSPgfLiteralCallback* callback = gu_new(HSPgfLiteralCallback, pool);
callback->callback.match = (void*) match;
callback->callback.match = hspgf_match_callback;
callback->callback.predict = (void*) predict;
callback->match = (void*) match;
callback->fin.fn = hspgf_literal_callback_fin;
gu_pool_finally(pool, &callback->fin);
pgf_callbacks_map_add_literal(concr, callbacks, cat, &callback->callback);