GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-24 03:52:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the offset for oracles in Haskell

Browse Source
This commit is contained in:
krasimir
2016-05-10 19:41:44 +00:00
parent 7cb772ffdb
commit 82a0634103
3 changed files with 93 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/haskell-bind/PGF2.hsc
View File

@@ -366,7 +366,7 @@ parseWithOracle lang cat sent (predict,complete,literal) =
predictPtr <- maybe (return nullFunPtr) (wrapOracleCallback . oracleWrapper) predict predictPtr <- maybe (return nullFunPtr) (wrapOracleCallback . oracleWrapper) predict
completePtr <- maybe (return nullFunPtr) (wrapOracleCallback . oracleWrapper) complete completePtr <- maybe (return nullFunPtr) (wrapOracleCallback . oracleWrapper) complete
literalPtr <- maybe (return nullFunPtr) (wrapOracleLiteralCallback . oracleLiteralWrapper) literal literalPtr <- maybe (return nullFunPtr) (wrapOracleLiteralCallback . oracleLiteralWrapper) literal
cback <- hspgf_new_oracle_callback predictPtr completePtr literalPtr parsePl cback <- hspgf_new_oracle_callback sent predictPtr completePtr literalPtr parsePl
pgf_parse_with_oracle (concr lang) cat sent cback exn parsePl exprPl pgf_parse_with_oracle (concr lang) cat sent cback exn parsePl exprPl
failed <- gu_exn_is_raised exn failed <- gu_exn_is_raised exn
if failed if failed
@@ -392,12 +392,12 @@ parseWithOracle lang cat sent (predict,complete,literal) =
exprs <- fromPgfExprEnum enum parseFPl (lang,exprFPl) exprs <- fromPgfExprEnum enum parseFPl (lang,exprFPl)
return (Right exprs) return (Right exprs)
where where
oracleWrapper oracle _ catPtr lblPtr offset = do oracleWrapper oracle catPtr lblPtr offset = do
cat <- peekCString catPtr cat <- peekCString catPtr
lbl <- peekCString lblPtr lbl <- peekCString lblPtr
return (oracle cat lbl (fromIntegral offset)) return (oracle cat lbl (fromIntegral offset))
oracleLiteralWrapper oracle _ catPtr lblPtr poffset out_pool = do oracleLiteralWrapper oracle catPtr lblPtr poffset out_pool = do
cat <- peekCString catPtr cat <- peekCString catPtr
lbl <- peekCString lblPtr lbl <- peekCString lblPtr
offset <- peek poffset offset <- peek poffset

6
src/runtime/haskell-bind/PGF2/FFI.hs
View File

@@ -180,8 +180,8 @@ foreign import ccall "pgf/pgf.h pgf_new_callbacks_map"
foreign import ccall foreign import ccall
hspgf_callbacks_map_add_literal :: Ptr PgfConcr -> Ptr PgfCallbacksMap -> CString -> FunPtr LiteralMatchCallback -> FunPtr LiteralPredictCallback -> Ptr GuPool -> IO () hspgf_callbacks_map_add_literal :: Ptr PgfConcr -> Ptr PgfCallbacksMap -> CString -> FunPtr LiteralMatchCallback -> FunPtr LiteralPredictCallback -> Ptr GuPool -> IO ()
type OracleCallback = Ptr PgfOracleCallback -> CString -> CString -> CInt -> IO Bool type OracleCallback = CString -> CString -> CInt -> IO Bool
type OracleLiteralCallback = Ptr PgfOracleCallback -> CString -> CString -> Ptr CInt -> Ptr GuPool -> IO (Ptr PgfExprProb) type OracleLiteralCallback = CString -> CString -> Ptr CInt -> Ptr GuPool -> IO (Ptr PgfExprProb)
foreign import ccall "wrapper" foreign import ccall "wrapper"
wrapOracleCallback :: OracleCallback -> IO (FunPtr OracleCallback) wrapOracleCallback :: OracleCallback -> IO (FunPtr OracleCallback)
@@ -190,7 +190,7 @@ foreign import ccall "wrapper"
wrapOracleLiteralCallback :: OracleLiteralCallback -> IO (FunPtr OracleLiteralCallback) wrapOracleLiteralCallback :: OracleLiteralCallback -> IO (FunPtr OracleLiteralCallback)
foreign import ccall foreign import ccall
hspgf_new_oracle_callback :: FunPtr OracleCallback -> FunPtr OracleCallback -> FunPtr OracleLiteralCallback -> Ptr GuPool -> IO (Ptr PgfOracleCallback) hspgf_new_oracle_callback :: CString -> FunPtr OracleCallback -> FunPtr OracleCallback -> FunPtr OracleLiteralCallback -> Ptr GuPool -> IO (Ptr PgfOracleCallback)
foreign import ccall "pgf/pgf.h pgf_parse_with_oracle" foreign import ccall "pgf/pgf.h pgf_parse_with_oracle"
pgf_parse_with_oracle :: Ptr PgfConcr -> CString -> CString -> Ptr PgfOracleCallback -> Ptr GuExn -> Ptr GuPool -> Ptr GuPool -> IO (Ptr GuEnum) pgf_parse_with_oracle :: Ptr PgfConcr -> CString -> CString -> Ptr PgfOracleCallback -> Ptr GuExn -> Ptr GuPool -> Ptr GuPool -> IO (Ptr GuEnum)

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

@@ -11,15 +11,9 @@ typedef struct {
GuFinalizer fin; GuFinalizer fin;
} HSPgfLiteralCallback; } HSPgfLiteralCallback;
static PgfExprProb* static size_t
hspgf_match_callback(PgfLiteralCallback* self, PgfConcr* concr, hspgf_offset2hs(GuString sentence, size_t offset)
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 *start = sentence;
const uint8_t *end = sentence + offset; const uint8_t *end = sentence + offset;
size_t hs_offset = 0; size_t hs_offset = 0;
@@ -27,18 +21,35 @@ hspgf_match_callback(PgfLiteralCallback* self, PgfConcr* concr,
gu_utf8_decode(&start); gu_utf8_decode(&start);
hs_offset++; hs_offset++;
} }
return hs_offset;
}
PgfExprProb* ep = static size_t
callback->match(self, lin_idx, sentence, &hs_offset, out_pool); hspgf_hs2offset(GuString sentence, size_t hs_offset)
{
start = sentence; const uint8_t *start = sentence;
end = start; const uint8_t *end = start;
while (hs_offset > 0) { while (hs_offset > 0) {
gu_utf8_decode(&end); gu_utf8_decode(&end);
hs_offset--; hs_offset--;
} }
return (end - start);
}
*poffset = (end - start); static PgfExprProb*
hspgf_match_callback(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx,
GuString sentence, size_t* poffset,
GuPool *out_pool)
{
HSPgfLiteralCallback* callback = (HSPgfLiteralCallback*) self;
size_t hs_offset =
hspgf_offset2hs(sentence, *poffset);
PgfExprProb* ep =
callback->match(self, lin_idx, sentence, &hs_offset, out_pool);
*poffset = hspgf_hs2offset(sentence, hs_offset);
return ep; return ep;
} }
@@ -70,29 +81,81 @@ hspgf_callbacks_map_add_literal(PgfConcr* concr, PgfCallbacksMap* callbacks,
typedef struct { typedef struct {
PgfOracleCallback oracle; PgfOracleCallback oracle;
GuString sentence;
bool (*predict) (PgfCId cat,
GuString label,
size_t offset);
bool (*complete)(PgfCId cat,
GuString label,
size_t offset);
PgfExprProb* (*literal)(PgfCId cat,
GuString label,
size_t* poffset,
GuPool *out_pool);
GuFinalizer fin; GuFinalizer fin;
} HSPgfOracleCallback; } HSPgfOracleCallback;
static bool
hspgf_predict_callback(PgfOracleCallback* self,
PgfCId cat,
GuString label,
size_t offset)
{
HSPgfOracleCallback* oracle = gu_container(self, HSPgfOracleCallback, oracle);
oracle->predict(cat,label,hspgf_offset2hs(oracle->sentence, offset));
}
static bool
hspgf_complete_callback(PgfOracleCallback* self,
PgfCId cat,
GuString label,
size_t offset)
{
HSPgfOracleCallback* oracle = gu_container(self, HSPgfOracleCallback, oracle);
oracle->complete(cat,label,hspgf_offset2hs(oracle->sentence, offset));
}
static PgfExprProb*
hspgf_literal_callback(PgfOracleCallback* self,
PgfCId cat,
GuString label,
size_t* poffset,
GuPool *out_pool)
{
HSPgfOracleCallback* oracle = gu_container(self, HSPgfOracleCallback, oracle);
size_t hs_offset = hspgf_offset2hs(oracle->sentence, *poffset);
PgfExprProb* ep =
oracle->literal(cat,label,&hs_offset,out_pool);
*poffset = hspgf_hs2offset(oracle->sentence, hs_offset);
return ep;
}
static void static void
hspgf_oracle_callback_fin(GuFinalizer* self) hspgf_oracle_callback_fin(GuFinalizer* self)
{ {
HSPgfOracleCallback* oracle = gu_container(self, HSPgfOracleCallback, fin); HSPgfOracleCallback* oracle = gu_container(self, HSPgfOracleCallback, fin);
if (oracle->oracle.predict != NULL) if (oracle->predict != NULL)
hs_free_fun_ptr((HsFunPtr) oracle->oracle.predict); hs_free_fun_ptr((HsFunPtr) oracle->predict);
if (oracle->oracle.complete != NULL) if (oracle->complete != NULL)
hs_free_fun_ptr((HsFunPtr) oracle->oracle.complete); hs_free_fun_ptr((HsFunPtr) oracle->complete);
if (oracle->oracle.literal != NULL) if (oracle->literal != NULL)
hs_free_fun_ptr((HsFunPtr) oracle->oracle.literal); hs_free_fun_ptr((HsFunPtr) oracle->literal);
} }
PgfOracleCallback* PgfOracleCallback*
hspgf_new_oracle_callback(HsFunPtr predict, HsFunPtr complete, HsFunPtr literal, GuPool* pool) hspgf_new_oracle_callback(GuString sentence,
HsFunPtr predict, HsFunPtr complete, HsFunPtr literal,
GuPool* pool)
{ {
HSPgfOracleCallback* oracle = gu_new(HSPgfOracleCallback, pool); HSPgfOracleCallback* oracle = gu_new(HSPgfOracleCallback, pool);
oracle->oracle.predict = (void*) predict; oracle->oracle.predict = predict ? hspgf_predict_callback : NULL;
oracle->oracle.complete = (void*) complete; oracle->oracle.complete = complete ? hspgf_complete_callback : NULL;
oracle->oracle.literal = (void*) literal; oracle->oracle.literal = literal ? hspgf_literal_callback : NULL;
oracle->sentence = sentence;
oracle->predict = (void*) predict;
oracle->complete = (void*) complete;
oracle->literal = (void*) literal;
oracle->fin.fn = hspgf_oracle_callback_fin; oracle->fin.fn = hspgf_oracle_callback_fin;
gu_pool_finally(pool, &oracle->fin); gu_pool_finally(pool, &oracle->fin);
return &oracle->oracle; return &oracle->oracle;