From b3680b60258372baa1d5e606026760ef223641b9 Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 3 Jul 2015 11:53:52 +0000 Subject: merge the states for reasoning and evaluation into a single structure --- src/runtime/haskell-bind/PGF2.hsc | 3 ++- src/runtime/haskell-bind/PGF2/FFI.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/runtime/haskell-bind') diff --git a/src/runtime/haskell-bind/PGF2.hsc b/src/runtime/haskell-bind/PGF2.hsc index dc3566627..3d9c44488 100644 --- a/src/runtime/haskell-bind/PGF2.hsc +++ b/src/runtime/haskell-bind/PGF2.hsc @@ -113,7 +113,8 @@ generateAll p cat = do genPl <- gu_new_pool exprPl <- gu_new_pool enum <- withCString cat $ \cat -> - pgf_generate_all (pgf p) cat genPl + exn <- gu_new_exn genPl + pgf_generate_all (pgf p) cat exn genPl exprPl genFPl <- newForeignPtr gu_pool_finalizer genPl exprFPl <- newForeignPtr gu_pool_finalizer exprPl fromPgfExprEnum enum genFPl (p,exprFPl) diff --git a/src/runtime/haskell-bind/PGF2/FFI.hs b/src/runtime/haskell-bind/PGF2/FFI.hs index 4f7618388..295c1fde9 100644 --- a/src/runtime/haskell-bind/PGF2/FFI.hs +++ b/src/runtime/haskell-bind/PGF2/FFI.hs @@ -209,7 +209,7 @@ foreign import ccall "pgf/expr.h pgf_print_expr" pgf_print_expr :: PgfExpr -> Ptr PgfPrintContext -> CInt -> Ptr GuOut -> Ptr GuExn -> IO () foreign import ccall "pgf/pgf.h pgf_generate_all" - pgf_generate_all :: Ptr PgfPGF -> CString -> Ptr GuPool -> IO (Ptr GuEnum) + pgf_generate_all :: Ptr PgfPGF -> CString -> Ptr GuExn -> Ptr GuPool -> Ptr GuPool -> IO (Ptr GuEnum) foreign import ccall "pgf/pgf.h pgf_print" pgf_print :: Ptr PgfPGF -> Ptr GuOut -> Ptr GuExn -> IO () -- cgit v1.2.3