mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 11:42:49 -06:00
added readTriple in libsg and its Haskell binding
This commit is contained in:
@@ -840,7 +840,7 @@ pgf_read_expr(GuIn* in, GuPool* pool, GuExn* err)
|
|||||||
|
|
||||||
int
|
int
|
||||||
pgf_read_expr_tuple(GuIn* in,
|
pgf_read_expr_tuple(GuIn* in,
|
||||||
int n_exprs, PgfExpr exprs[],
|
size_t n_exprs, PgfExpr exprs[],
|
||||||
GuPool* pool, GuExn* err)
|
GuPool* pool, GuExn* err)
|
||||||
{
|
{
|
||||||
GuPool* tmp_pool = gu_new_pool();
|
GuPool* tmp_pool = gu_new_pool();
|
||||||
@@ -1332,6 +1332,19 @@ pgf_print_type(PgfType *type, PgfPrintContext* ctxt, int prec,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
pgf_print_expr_tuple(size_t n_exprs, PgfExpr exprs[], PgfPrintContext* ctxt,
|
||||||
|
GuOut* out, GuExn* err)
|
||||||
|
{
|
||||||
|
gu_putc('<', out, err);
|
||||||
|
for (size_t i = 0; i < n_exprs; i++) {
|
||||||
|
if (i > 0)
|
||||||
|
gu_putc(',', out, err);
|
||||||
|
pgf_print_expr(exprs[i], ctxt, 0, out, err);
|
||||||
|
}
|
||||||
|
gu_putc('>', out, err);
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
pgf_type_eq(PgfType* t1, PgfType* t2)
|
pgf_type_eq(PgfType* t1, PgfType* t2)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ pgf_read_expr(GuIn* in, GuPool* pool, GuExn* err);
|
|||||||
|
|
||||||
int
|
int
|
||||||
pgf_read_expr_tuple(GuIn* in,
|
pgf_read_expr_tuple(GuIn* in,
|
||||||
int n_exprs, PgfExpr exprs[],
|
size_t n_exprs, PgfExpr exprs[],
|
||||||
GuPool* pool, GuExn* err);
|
GuPool* pool, GuExn* err);
|
||||||
|
|
||||||
PgfType*
|
PgfType*
|
||||||
@@ -206,4 +206,8 @@ void
|
|||||||
pgf_print_type(PgfType *type, PgfPrintContext* ctxt, int prec,
|
pgf_print_type(PgfType *type, PgfPrintContext* ctxt, int prec,
|
||||||
GuOut* out, GuExn *err);
|
GuOut* out, GuExn *err);
|
||||||
|
|
||||||
|
void
|
||||||
|
pgf_print_expr_tuple(size_t n_exprs, PgfExpr exprs[], PgfPrintContext* ctxt,
|
||||||
|
GuOut* out, GuExn* err);
|
||||||
|
|
||||||
#endif /* EXPR_H_ */
|
#endif /* EXPR_H_ */
|
||||||
|
|||||||
@@ -219,6 +219,9 @@ foreign import ccall "pgf/expr.h pgf_expr_arity"
|
|||||||
foreign import ccall "pgf/expr.h pgf_print_expr"
|
foreign import ccall "pgf/expr.h pgf_print_expr"
|
||||||
pgf_print_expr :: PgfExpr -> Ptr PgfPrintContext -> CInt -> Ptr GuOut -> Ptr GuExn -> IO ()
|
pgf_print_expr :: PgfExpr -> Ptr PgfPrintContext -> CInt -> Ptr GuOut -> Ptr GuExn -> IO ()
|
||||||
|
|
||||||
|
foreign import ccall "pgf/expr.h pgf_print_expr_tuple"
|
||||||
|
pgf_print_expr_tuple :: CInt -> Ptr PgfExpr -> Ptr PgfPrintContext -> Ptr GuOut -> Ptr GuExn -> IO ()
|
||||||
|
|
||||||
foreign import ccall "pgf/pgf.h pgf_generate_all"
|
foreign import ccall "pgf/pgf.h pgf_generate_all"
|
||||||
pgf_generate_all :: Ptr PgfPGF -> CString -> Ptr GuExn -> Ptr GuPool -> Ptr GuPool -> IO (Ptr GuEnum)
|
pgf_generate_all :: Ptr PgfPGF -> CString -> Ptr GuExn -> Ptr GuPool -> Ptr GuPool -> IO (Ptr GuEnum)
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ module SG( SG, openSG, closeSG
|
|||||||
, beginTrans, commit, rollback, inTransaction
|
, beginTrans, commit, rollback, inTransaction
|
||||||
, SgId
|
, SgId
|
||||||
, insertExpr, getExpr
|
, insertExpr, getExpr
|
||||||
, readTriple, insertTriple, getTriple
|
, readTriple, showTriple
|
||||||
|
, insertTriple, getTriple
|
||||||
, queryTriple
|
, queryTriple
|
||||||
) where
|
) where
|
||||||
|
|
||||||
@@ -128,6 +129,21 @@ readTriple str =
|
|||||||
else do gu_pool_free exprPl
|
else do gu_pool_free exprPl
|
||||||
return Nothing
|
return Nothing
|
||||||
|
|
||||||
|
showTriple :: Expr -> Expr -> Expr -> String
|
||||||
|
showTriple (Expr expr1 _) (Expr expr2 _) (Expr expr3 _) =
|
||||||
|
unsafePerformIO $
|
||||||
|
withGuPool $ \tmpPl ->
|
||||||
|
withTriple $ \triple -> do
|
||||||
|
(sb,out) <- newOut tmpPl
|
||||||
|
let printCtxt = nullPtr
|
||||||
|
exn <- gu_new_exn tmpPl
|
||||||
|
pokeElemOff triple 0 expr1
|
||||||
|
pokeElemOff triple 1 expr2
|
||||||
|
pokeElemOff triple 2 expr3
|
||||||
|
pgf_print_expr_tuple 3 triple printCtxt out exn
|
||||||
|
s <- gu_string_buf_freeze sb tmpPl
|
||||||
|
peekCString s
|
||||||
|
|
||||||
insertTriple :: SG -> Expr -> Expr -> Expr -> IO SgId
|
insertTriple :: SG -> Expr -> Expr -> Expr -> IO SgId
|
||||||
insertTriple (SG sg) (Expr expr1 _) (Expr expr2 _) (Expr expr3 _) =
|
insertTriple (SG sg) (Expr expr1 _) (Expr expr2 _) (Expr expr3 _) =
|
||||||
withGuPool $ \tmpPl ->
|
withGuPool $ \tmpPl ->
|
||||||
|
|||||||
Reference in New Issue
Block a user