From 9f9b23d0dddd3b61e4289cfbcf08241deddc65de Mon Sep 17 00:00:00 2001 From: krasimir Date: Thu, 19 Nov 2015 13:18:19 +0000 Subject: added mkInt and mkFloat in the Haskell binding to make it easy to create literal expressions --- src/runtime/haskell-bind/PGF2/Expr.hsc | 16 ++++++++++++++++ src/runtime/haskell-bind/PGF2/FFI.hs | 6 ++++++ 2 files changed, 22 insertions(+) (limited to 'src/runtime/haskell-bind/PGF2') diff --git a/src/runtime/haskell-bind/PGF2/Expr.hsc b/src/runtime/haskell-bind/PGF2/Expr.hsc index d6cf8670a..5914500de 100644 --- a/src/runtime/haskell-bind/PGF2/Expr.hsc +++ b/src/runtime/haskell-bind/PGF2/Expr.hsc @@ -67,6 +67,22 @@ mkStr str = exprFPl <- newForeignPtr gu_pool_finalizer exprPl return (Expr c_expr exprFPl) +mkInt :: Int -> Expr +mkInt val = + unsafePerformIO $ do + exprPl <- gu_new_pool + c_expr <- pgf_expr_int (fromIntegral val) exprPl + exprFPl <- newForeignPtr gu_pool_finalizer exprPl + return (Expr c_expr exprFPl) + +mkFloat :: Double -> Expr +mkFloat val = + unsafePerformIO $ do + exprPl <- gu_new_pool + c_expr <- pgf_expr_float (realToFrac val) exprPl + exprFPl <- newForeignPtr gu_pool_finalizer exprPl + return (Expr c_expr exprFPl) + readExpr :: String -> Maybe Expr readExpr str = unsafePerformIO $ diff --git a/src/runtime/haskell-bind/PGF2/FFI.hs b/src/runtime/haskell-bind/PGF2/FFI.hs index 15001c2c9..6321067c2 100644 --- a/src/runtime/haskell-bind/PGF2/FFI.hs +++ b/src/runtime/haskell-bind/PGF2/FFI.hs @@ -204,6 +204,12 @@ foreign import ccall "pgf/pgf.h pgf_expr_apply" foreign import ccall "pgf/pgf.h pgf_expr_string" pgf_expr_string :: CString -> Ptr GuPool -> IO PgfExpr +foreign import ccall "pgf/pgf.h pgf_expr_int" + pgf_expr_int :: CInt -> Ptr GuPool -> IO PgfExpr + +foreign import ccall "pgf/pgf.h pgf_expr_float" + pgf_expr_float :: CDouble -> Ptr GuPool -> IO PgfExpr + foreign import ccall "pgf/pgf.h pgf_expr_unapply" pgf_expr_unapply :: PgfExpr -> Ptr GuPool -> IO (Ptr PgfApplication) -- cgit v1.2.3