More cabalisation improvements
This commit is contained in:
parent
13be765f32
commit
5321754614
7
Makefile
7
Makefile
@ -3,13 +3,6 @@
|
|||||||
|
|
||||||
# cut down reimplementation of $fptools/mk directory
|
# cut down reimplementation of $fptools/mk directory
|
||||||
|
|
||||||
.PHONY: build all
|
|
||||||
|
|
||||||
all: build EvalHaskell.h
|
|
||||||
|
|
||||||
EvalHaskell.h: build
|
|
||||||
cp System/Eval/Haskell_stub.h $@
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# installing
|
# installing
|
||||||
#
|
#
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
{-# OPTIONS -fglasgow-exts -fffi #-}
|
|
||||||
--
|
--
|
||||||
-- Copyright (C) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons
|
-- Copyright (C) 2004-5 Don Stewart - http://www.cse.unsw.edu.au/~dons
|
||||||
--
|
--
|
||||||
@ -30,10 +29,12 @@ module System.Eval.Haskell (
|
|||||||
typeOf,
|
typeOf,
|
||||||
mkHsValues,
|
mkHsValues,
|
||||||
|
|
||||||
|
{-
|
||||||
hs_eval_b, -- return a Bool
|
hs_eval_b, -- return a Bool
|
||||||
hs_eval_c, -- return a CChar
|
hs_eval_c, -- return a CChar
|
||||||
hs_eval_i, -- return a CInt
|
hs_eval_i, -- return a CInt
|
||||||
hs_eval_s, -- return a CString
|
hs_eval_s, -- return a CString
|
||||||
|
-}
|
||||||
|
|
||||||
module System.Eval.Utils,
|
module System.Eval.Utils,
|
||||||
|
|
||||||
@ -207,6 +208,7 @@ wrap expr nm mods =
|
|||||||
"resource = let { v = \n" ++
|
"resource = let { v = \n" ++
|
||||||
"{-# LINE 1 \"<Plugins.Eval>\" #-}\n" ++ expr ++ ";} in v"
|
"{-# LINE 1 \"<Plugins.Eval>\" #-}\n" ++ expr ++ ";} in v"
|
||||||
|
|
||||||
|
{-
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
--
|
--
|
||||||
-- And for our friends in foreign parts
|
-- And for our friends in foreign parts
|
||||||
@ -257,3 +259,4 @@ eval_cstring :: Typeable a => CString -> IO (Maybe a)
|
|||||||
eval_cstring cs = do s <- peekCString cs
|
eval_cstring cs = do s <- peekCString cs
|
||||||
eval s [] -- TODO use eval()
|
eval s [] -- TODO use eval()
|
||||||
|
|
||||||
|
-}
|
||||||
|
@ -33,6 +33,5 @@ c-sources:
|
|||||||
Language/Hi/hschooks.c
|
Language/Hi/hschooks.c
|
||||||
includes: Linker.h
|
includes: Linker.h
|
||||||
extensions: CPP, ForeignFunctionInterface
|
extensions: CPP, ForeignFunctionInterface
|
||||||
Build-Depends: base, haskell98, Cabal, haskell-src
|
Build-Depends: base, Cabal, haskell-src
|
||||||
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures
|
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@ exposed-modules:
|
|||||||
c-sources:
|
c-sources:
|
||||||
Language/Hi/hschooks.c
|
Language/Hi/hschooks.c
|
||||||
includes: Linker.h
|
includes: Linker.h
|
||||||
Build-Depends: base, haskell98, Cabal, haskell-src-exts
|
extensions: CPP, ForeignFunctionInterface
|
||||||
|
Build-Depends: base, Cabal, haskell-src-exts
|
||||||
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures
|
ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user