diff --git a/examples/conf/simple/prog/Main.hs b/examples/conf/simple/prog/Main.hs index 7c4fca0..8d0dae6 100644 --- a/examples/conf/simple/prog/Main.hs +++ b/examples/conf/simple/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API conf = "../Mailrc.conf" diff --git a/examples/dynload/io/TestIO.hs b/examples/dynload/io/TestIO.hs index 979e2d2..f7c3597 100644 --- a/examples/dynload/io/TestIO.hs +++ b/examples/dynload/io/TestIO.hs @@ -7,7 +7,7 @@ module TestIO ( resource_dyn ) where import API -import AltData +import AltData.Dynamic import System.IO import System.Posix.Types ( ProcessID, Fd ) diff --git a/examples/dynload/io/api/API.hs b/examples/dynload/io/api/API.hs index 6e9bdbd..4536913 100644 --- a/examples/dynload/io/api/API.hs +++ b/examples/dynload/io/api/API.hs @@ -2,7 +2,7 @@ module API where -import AltData +import AltData.Typeable data TestIO = TestIO { field :: IO String diff --git a/examples/dynload/io/prog/Main.hs b/examples/dynload/io/prog/Main.hs index 7c8a70c..93f7915 100644 --- a/examples/dynload/io/prog/Main.hs +++ b/examples/dynload/io/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API main = do diff --git a/examples/dynload/poly/Plugin.hs b/examples/dynload/poly/Plugin.hs index bf99cde..98f545e 100644 --- a/examples/dynload/poly/Plugin.hs +++ b/examples/dynload/poly/Plugin.hs @@ -1,7 +1,7 @@ module Plugin where import API -import AltData +import AltData.Dynamic my_fun = plugin { equals = \x y -> (x /= y) -- a strange equals function :) diff --git a/examples/dynload/poly/api/API.hs b/examples/dynload/poly/api/API.hs index 0181ef3..909e5df 100644 --- a/examples/dynload/poly/api/API.hs +++ b/examples/dynload/poly/api/API.hs @@ -2,7 +2,7 @@ module API where -import AltData +import AltData.Typeable data Interface = Interface { equals :: forall t. Eq t => t -> t -> Bool diff --git a/examples/dynload/poly/prog/Main.hs b/examples/dynload/poly/prog/Main.hs index ff91b2e..5d3d614 100644 --- a/examples/dynload/poly/prog/Main.hs +++ b/examples/dynload/poly/prog/Main.hs @@ -2,7 +2,7 @@ #include "../../../../config.h" -import Plugins +import System.Plugins import API main = do diff --git a/examples/dynload/should_fail/Plugin.hs b/examples/dynload/should_fail/Plugin.hs index adad70e..2b6fb20 100644 --- a/examples/dynload/should_fail/Plugin.hs +++ b/examples/dynload/should_fail/Plugin.hs @@ -2,7 +2,7 @@ module Plugin where import API -import AltData +import AltData.Dynamic v :: Int v = 0xdeadbeef diff --git a/examples/dynload/should_fail/api/API.hs b/examples/dynload/should_fail/api/API.hs index ee11e76..f8dac60 100644 --- a/examples/dynload/should_fail/api/API.hs +++ b/examples/dynload/should_fail/api/API.hs @@ -2,7 +2,7 @@ module API where -import AltData +import AltData.Typeable data Interface = Interface { function :: String diff --git a/examples/dynload/should_fail/prog/Main.hs b/examples/dynload/should_fail/prog/Main.hs index 3759159..c35d7f9 100644 --- a/examples/dynload/should_fail/prog/Main.hs +++ b/examples/dynload/should_fail/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API main = do diff --git a/examples/dynload/should_fail_1/Plugin.hs b/examples/dynload/should_fail_1/Plugin.hs index 5e57fad..82a20c1 100644 --- a/examples/dynload/should_fail_1/Plugin.hs +++ b/examples/dynload/should_fail_1/Plugin.hs @@ -5,7 +5,7 @@ module Plugin where import API -import AltData +import AltData.Dynamic v :: Int -> Int v = \x -> 0xdeadbeef diff --git a/examples/dynload/should_fail_1/api/API.hs b/examples/dynload/should_fail_1/api/API.hs index ee11e76..f8dac60 100644 --- a/examples/dynload/should_fail_1/api/API.hs +++ b/examples/dynload/should_fail_1/api/API.hs @@ -2,7 +2,7 @@ module API where -import AltData +import AltData.Typeable data Interface = Interface { function :: String diff --git a/examples/dynload/should_fail_1/prog/Main.hs b/examples/dynload/should_fail_1/prog/Main.hs index cf8f647..0bcd25b 100644 --- a/examples/dynload/should_fail_1/prog/Main.hs +++ b/examples/dynload/should_fail_1/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API main = do diff --git a/examples/dynload/should_fail_2/Plugin.in b/examples/dynload/should_fail_2/Plugin.in index 8de0ab7..eadc86b 100644 --- a/examples/dynload/should_fail_2/Plugin.in +++ b/examples/dynload/should_fail_2/Plugin.in @@ -9,7 +9,7 @@ module Plugin where import API -import AltData +import AltData.Typeable import GHC.Base v :: Int diff --git a/examples/dynload/should_fail_2/Plugin.stub b/examples/dynload/should_fail_2/Plugin.stub index efc2f53..0106f56 100644 --- a/examples/dynload/should_fail_2/Plugin.stub +++ b/examples/dynload/should_fail_2/Plugin.stub @@ -3,7 +3,7 @@ module Plugin ( resource_dyn ) where import API -import AltData +import AltData.Dynamic resource = plugin diff --git a/examples/dynload/should_fail_2/api/API.hs b/examples/dynload/should_fail_2/api/API.hs index 85ece49..e64e751 100644 --- a/examples/dynload/should_fail_2/api/API.hs +++ b/examples/dynload/should_fail_2/api/API.hs @@ -2,7 +2,7 @@ module API where -import AltData +import AltData.Typeable import GHC.Base data Interface = Interface { diff --git a/examples/dynload/should_fail_2/prog/Main.hs b/examples/dynload/should_fail_2/prog/Main.hs index ea9b05c..0a5e442 100644 --- a/examples/dynload/should_fail_2/prog/Main.hs +++ b/examples/dynload/should_fail_2/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API conf = "../Plugin.in" diff --git a/examples/dynload/should_fail_2/prog/expected.604 b/examples/dynload/should_fail_2/prog/expected.604 index 91d4886..c3f5417 100644 --- a/examples/dynload/should_fail_2/prog/expected.604 +++ b/examples/dynload/should_fail_2/prog/expected.604 @@ -1,5 +1,5 @@ -../Plugin.in:18:15: +../Plugin.in:13:15: Couldn't match `Dynamic' against `(a, b)' Expected type: Dynamic Inferred type: (a, b) diff --git a/examples/dynload/should_fail_3/Plugin.in b/examples/dynload/should_fail_3/Plugin.in index 0a4449d..34f8dce 100644 --- a/examples/dynload/should_fail_3/Plugin.in +++ b/examples/dynload/should_fail_3/Plugin.in @@ -9,7 +9,7 @@ module Plugin where import API -import AltData +import AltData.Typeable import GHC.Base v :: Int diff --git a/examples/dynload/should_fail_3/api/API.hs b/examples/dynload/should_fail_3/api/API.hs index 7989891..7b3f9e0 100644 --- a/examples/dynload/should_fail_3/api/API.hs +++ b/examples/dynload/should_fail_3/api/API.hs @@ -2,7 +2,7 @@ module API where -import AltData +import AltData.Typeable import GHC.Base data Interface = Interface { diff --git a/examples/dynload/should_fail_3/prog/Main.hs b/examples/dynload/should_fail_3/prog/Main.hs index d67d64c..8edc386 100644 --- a/examples/dynload/should_fail_3/prog/Main.hs +++ b/examples/dynload/should_fail_3/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API conf = "../Plugin.in" diff --git a/examples/dynload/should_fail_3/prog/expected.604 b/examples/dynload/should_fail_3/prog/expected.604 index 47d4d61..a0c3be1 100644 --- a/examples/dynload/should_fail_3/prog/expected.604 +++ b/examples/dynload/should_fail_3/prog/expected.604 @@ -1,5 +1,5 @@ -../Plugin.in:18:15: +../Plugin.in:12:15: Couldn't match `Dynamic' against `(a, b)' Expected type: Dynamic Inferred type: (a, b) diff --git a/examples/dynload/simple/Plugin.hs b/examples/dynload/simple/Plugin.hs index 3850eb7..c6fb4e5 100644 --- a/examples/dynload/simple/Plugin.hs +++ b/examples/dynload/simple/Plugin.hs @@ -2,7 +2,7 @@ module Plugin where import API -import AltData +import AltData.Dynamic my_fun = plugin { function = "plugin says \"hello\"" } diff --git a/examples/dynload/simple/api/API.hs b/examples/dynload/simple/api/API.hs index 93035aa..ea04720 100644 --- a/examples/dynload/simple/api/API.hs +++ b/examples/dynload/simple/api/API.hs @@ -2,7 +2,7 @@ module API where -import AltData +import AltData.Typeable data Interface = Interface { function :: String diff --git a/examples/dynload/simple/prog/Main.hs b/examples/dynload/simple/prog/Main.hs index eabd02c..7d6d8e4 100644 --- a/examples/dynload/simple/prog/Main.hs +++ b/examples/dynload/simple/prog/Main.hs @@ -2,7 +2,7 @@ #include "../../../../config.h" -import Plugins +import System.Plugins import API main = do diff --git a/examples/eval.mk b/examples/eval.mk index 879c8f6..4c081e0 100644 --- a/examples/eval.mk +++ b/examples/eval.mk @@ -1,7 +1,7 @@ include $(TOP)/config.mk include $(TOP)/examples/check.mk -PKGFLAGS= -package-conf $(TOP)/plugins.conf.inplace -package eval -package plugins -package printf +PKGFLAGS= -package-conf $(TOP)/plugins.conf.inplace -package plugins BIN=a.out SRC=Main.hs @@ -24,4 +24,4 @@ $(BIN): $(SRC) $(OBJS) @$(GHC) $(INCLUDES) $(PKGFLAGS) $(GHCFLAGS) $(EXTRAFLAGS) -c $< clean: - rm -rf *.hi *.o *~ $(BIN) + @rm -rf *.hi *.o *~ $(BIN) diff --git a/examples/eval/eval1/Main.hs b/examples/eval/eval1/Main.hs index d7fb14c..973b9cd 100644 --- a/examples/eval/eval1/Main.hs +++ b/examples/eval/eval1/Main.hs @@ -1,5 +1,5 @@ -import Eval.Haskell +import System.Eval.Haskell main = do i <- eval "1 + 6 :: Int" [] :: IO (Maybe Int) if isJust i then putStrLn $ show (fromJust i) else return () diff --git a/examples/eval/eval2/Main.hs b/examples/eval/eval2/Main.hs index ff75eac..d64b986 100644 --- a/examples/eval/eval2/Main.hs +++ b/examples/eval/eval2/Main.hs @@ -1,4 +1,4 @@ -import Eval.Haskell +import System.Eval.Haskell main = do m_s <- eval "map toUpper \"haskell\"" ["Data.Char"] case m_s of diff --git a/examples/eval/eval3/Main.hs b/examples/eval/eval3/Main.hs index 69b0903..1082a84 100644 --- a/examples/eval/eval3/Main.hs +++ b/examples/eval/eval3/Main.hs @@ -10,7 +10,7 @@ #include "../../../config.h" -import Eval.Haskell +import System.Eval.Haskell import AltData.Dynamic -- import Data.Dynamic diff --git a/examples/eval/eval_/Main.hs b/examples/eval/eval_/Main.hs index 6bea135..91a0c46 100644 --- a/examples/eval/eval_/Main.hs +++ b/examples/eval/eval_/Main.hs @@ -1,5 +1,5 @@ -import Eval.Haskell +import System.Eval.Haskell main = do i <- eval_ "Just (7 :: Int)" ["Maybe"] diff --git a/examples/eval/eval_fn/Main.hs b/examples/eval/eval_fn/Main.hs index 794aee8..2285693 100644 --- a/examples/eval/eval_fn/Main.hs +++ b/examples/eval/eval_fn/Main.hs @@ -4,7 +4,7 @@ -- -- needs unsafeEval because eval has a broken Dynamic check -- -import Eval.Haskell +import System.Eval.Haskell main = do fn <- unsafeEval "(\\x -> (x,x::Int))" [] :: IO (Maybe (Int -> (Int,Int))) when (isJust fn) $ putStrLn $ show $ (fromJust fn) 7 diff --git a/examples/eval/eval_fn1/Main.hs b/examples/eval/eval_fn1/Main.hs index f106fe2..4903304 100644 --- a/examples/eval/eval_fn1/Main.hs +++ b/examples/eval/eval_fn1/Main.hs @@ -6,7 +6,7 @@ module Main where import Poly -import Eval.Haskell +import System.Eval.Haskell main = do m_f <- eval "Fn (\\x y -> x == y)" ["Poly"] when (isJust m_f) $ do diff --git a/examples/eval/unsafeidir/Main.hs b/examples/eval/unsafeidir/Main.hs index 72d47d0..57f29c3 100644 --- a/examples/eval/unsafeidir/Main.hs +++ b/examples/eval/unsafeidir/Main.hs @@ -1,6 +1,6 @@ -import Plugins.Make -import Eval.Haskell +import System.Plugins.Make +import System.Eval.Haskell main = do make "a/Extra.hs" [] diff --git a/examples/foreign.mk b/examples/foreign.mk index 6958ac9..848a230 100644 --- a/examples/foreign.mk +++ b/examples/foreign.mk @@ -3,7 +3,7 @@ include $(TOP)/examples/check.mk INCLUDES= -I$(TOP) -PKGFLAGS= -package-conf $(TOP)/plugins.conf.inplace -package eval +PKGFLAGS= -package-conf $(TOP)/plugins.conf.inplace -package plugins # compile with GHC to save us setting all the necessary include and # lib flags. use ghc -v to find out what these are if you wish to go diff --git a/examples/hier/hier1/prog/Main.hs b/examples/hier/hier1/prog/Main.hs index ded0247..404152a 100644 --- a/examples/hier/hier1/prog/Main.hs +++ b/examples/hier/hier1/prog/Main.hs @@ -5,7 +5,7 @@ module Main where -import Plugins +import System.Plugins import API import Modules.Flags as Flags diff --git a/examples/hier/hier2/prog/Main.hs b/examples/hier/hier2/prog/Main.hs index afeb097..ea93225 100644 --- a/examples/hier/hier2/prog/Main.hs +++ b/examples/hier/hier2/prog/Main.hs @@ -6,7 +6,7 @@ module Main where -import Plugins +import System.Plugins main = do status <- load "../A/B/C/Module.o" [".."] [] "symbol" diff --git a/examples/hier/hier3/Main.hs b/examples/hier/hier3/Main.hs index ae4a152..b1c244c 100644 --- a/examples/hier/hier3/Main.hs +++ b/examples/hier/hier3/Main.hs @@ -1,6 +1,6 @@ module Main where -import Plugins +import System.Plugins main = do diff --git a/examples/hier/hier4/Main.hs b/examples/hier/hier4/Main.hs index 9a3d660..db8216f 100644 --- a/examples/hier/hier4/Main.hs +++ b/examples/hier/hier4/Main.hs @@ -1,6 +1,6 @@ module Main where -import Plugins +import System.Plugins main = do diff --git a/examples/iface/null/Main.hs b/examples/iface/null/Main.hs index f3cee4c..6c31b1b 100644 --- a/examples/iface/null/Main.hs +++ b/examples/iface/null/Main.hs @@ -1,6 +1,6 @@ module Main ( main ) where -import Hi.Parser +import Language.Hi.Parser import A import B diff --git a/examples/load/io/prog/Main.hs b/examples/load/io/prog/Main.hs index 76d6f1e..8f1e1b6 100644 --- a/examples/load/io/prog/Main.hs +++ b/examples/load/io/prog/Main.hs @@ -2,7 +2,7 @@ #include "../../../../config.h" -import Plugins +import System.Plugins import API main :: IO () diff --git a/examples/load/load_0/prog/Main.hs b/examples/load/load_0/prog/Main.hs index cb8aa5f..fd31d92 100644 --- a/examples/load/load_0/prog/Main.hs +++ b/examples/load/load_0/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API main = do diff --git a/examples/load/loadpkg/Main.hs b/examples/load/loadpkg/Main.hs index 1956cfc..604756b 100644 --- a/examples/load/loadpkg/Main.hs +++ b/examples/load/loadpkg/Main.hs @@ -1,4 +1,4 @@ -import Plugins +import System.Plugins main = loadPackageWith "posix" [] diff --git a/examples/load/null/prog/Main.hs b/examples/load/null/prog/Main.hs index 53faefd..fdad4a0 100644 --- a/examples/load/null/prog/Main.hs +++ b/examples/load/null/prog/Main.hs @@ -2,7 +2,7 @@ #include "../../../../config.h" -import Plugins +import System.Plugins import API -- an example where we just want to load an object and run it diff --git a/examples/load/thiemann0/prog/Main.hs b/examples/load/thiemann0/prog/Main.hs index d49fbe2..1fc815d 100644 --- a/examples/load/thiemann0/prog/Main.hs +++ b/examples/load/thiemann0/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API main = do diff --git a/examples/load/thiemann2/prog/Main.hs b/examples/load/thiemann2/prog/Main.hs index 422f7fa..4694a06 100644 --- a/examples/load/thiemann2/prog/Main.hs +++ b/examples/load/thiemann2/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API import A diff --git a/examples/load/unloadpkg/Main.hs b/examples/load/unloadpkg/Main.hs index c5fcae4..38236c0 100644 --- a/examples/load/unloadpkg/Main.hs +++ b/examples/load/unloadpkg/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins main = do loadPackage "posix" unloadPackage "posix" diff --git a/examples/make/makeall001/prog/Main.hs b/examples/make/makeall001/prog/Main.hs index 3130f48..a1d77f7 100644 --- a/examples/make/makeall001/prog/Main.hs +++ b/examples/make/makeall001/prog/Main.hs @@ -2,7 +2,7 @@ -- little more complex. use the path to the obj file we get back from -- 'make'. load() uses this to find the .hi file -import Plugins +import System.Plugins import API main = do diff --git a/examples/make/null/prog/Main.hs b/examples/make/null/prog/Main.hs index d33ec27..73e343a 100644 --- a/examples/make/null/prog/Main.hs +++ b/examples/make/null/prog/Main.hs @@ -1,7 +1,7 @@ -- an example where we want to compile and load a file -import Plugins +import System.Plugins import API main = do diff --git a/examples/make/o/prog/Main.hs b/examples/make/o/prog/Main.hs index d73883e..291323f 100644 --- a/examples/make/o/prog/Main.hs +++ b/examples/make/o/prog/Main.hs @@ -1,4 +1,4 @@ -import Plugins +import System.Plugins import API import System.Directory diff --git a/examples/make/odir/prog/Main.hs b/examples/make/odir/prog/Main.hs index 48825a0..d1975ca 100644 --- a/examples/make/odir/prog/Main.hs +++ b/examples/make/odir/prog/Main.hs @@ -1,4 +1,4 @@ -import Plugins +import System.Plugins import API import System.Directory diff --git a/examples/make/remake001/Main.hs b/examples/make/remake001/Main.hs index 29e42fe..ef415da 100644 --- a/examples/make/remake001/Main.hs +++ b/examples/make/remake001/Main.hs @@ -7,7 +7,7 @@ -- False -- -import Plugins +import System.Plugins import System.Directory main = do diff --git a/examples/make/remake001_should_fail/Main.hs b/examples/make/remake001_should_fail/Main.hs index d3dcbc7..e4401cb 100644 --- a/examples/make/remake001_should_fail/Main.hs +++ b/examples/make/remake001_should_fail/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import System.Directory diff --git a/examples/make/simple/prog/Main.hs b/examples/make/simple/prog/Main.hs index 032c744..329bc64 100644 --- a/examples/make/simple/prog/Main.hs +++ b/examples/make/simple/prog/Main.hs @@ -2,7 +2,7 @@ -- little more complex. use the path to the obj file we get back from -- 'make'. load() uses this to find the .hi file -import Plugins +import System.Plugins import API main = do diff --git a/examples/makewith/global_pragma/Plugin.hs b/examples/makewith/global_pragma/Plugin.hs index 8e1530e..eb4b839 100644 --- a/examples/makewith/global_pragma/Plugin.hs +++ b/examples/makewith/global_pragma/Plugin.hs @@ -2,8 +2,8 @@ module M ( resource ) where -import System.IO.Unsafe import API +import System.IO.Unsafe import System.Process import System.IO diff --git a/examples/makewith/global_pragma/prog/Main.hs b/examples/makewith/global_pragma/prog/Main.hs index e31a6ed..6138fb6 100644 --- a/examples/makewith/global_pragma/prog/Main.hs +++ b/examples/makewith/global_pragma/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API conf = "../Plugin.hs" diff --git a/examples/makewith/io/prog/Main.hs b/examples/makewith/io/prog/Main.hs index 36d3dc3..8ba3d54 100644 --- a/examples/makewith/io/prog/Main.hs +++ b/examples/makewith/io/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API conf = "../TestIO.conf" diff --git a/examples/makewith/merge00/Main.hs b/examples/makewith/merge00/Main.hs index 7e88c1e..2612b3d 100644 --- a/examples/makewith/merge00/Main.hs +++ b/examples/makewith/merge00/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import System.Directory diff --git a/examples/makewith/mergeto0/Main.hs b/examples/makewith/mergeto0/Main.hs index a6beb82..c828d51 100644 --- a/examples/makewith/mergeto0/Main.hs +++ b/examples/makewith/mergeto0/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import System.Directory diff --git a/examples/makewith/module_name/Main.hs b/examples/makewith/module_name/Main.hs index 10d4a73..404930d 100644 --- a/examples/makewith/module_name/Main.hs +++ b/examples/makewith/module_name/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import System.Directory diff --git a/examples/makewith/multi_make/Main.hs b/examples/makewith/multi_make/Main.hs index 1720d88..8b44b1c 100644 --- a/examples/makewith/multi_make/Main.hs +++ b/examples/makewith/multi_make/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import System.Directory diff --git a/examples/makewith/should_fail_0/prog/Main.hs b/examples/makewith/should_fail_0/prog/Main.hs index 94b4f06..405b8cf 100644 --- a/examples/makewith/should_fail_0/prog/Main.hs +++ b/examples/makewith/should_fail_0/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API conf = "../Plugin.in" diff --git a/examples/makewith/tiny/prog/Main.hs b/examples/makewith/tiny/prog/Main.hs index a95d0ea..4782cb5 100644 --- a/examples/makewith/tiny/prog/Main.hs +++ b/examples/makewith/tiny/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API import Data.Either diff --git a/examples/makewith/unsafeio/prog/Main.hs b/examples/makewith/unsafeio/prog/Main.hs index b9920b7..af84e50 100644 --- a/examples/makewith/unsafeio/prog/Main.hs +++ b/examples/makewith/unsafeio/prog/Main.hs @@ -1,4 +1,4 @@ -import Plugins +import System.Plugins import API import Data.Either diff --git a/examples/misc/mkstemps/Main.hs b/examples/misc/mkstemps/Main.hs index a471bae..cac25d5 100644 --- a/examples/misc/mkstemps/Main.hs +++ b/examples/misc/mkstemps/Main.hs @@ -1,5 +1,5 @@ -import Plugins.MkTemp +import System.MkTemp import Data.Maybe diff --git a/examples/multi/3plugins/prog/Main.hs b/examples/multi/3plugins/prog/Main.hs index 9ef6175..5b48ab0 100644 --- a/examples/multi/3plugins/prog/Main.hs +++ b/examples/multi/3plugins/prog/Main.hs @@ -1,4 +1,4 @@ -import Plugins +import System.Plugins import API main = do diff --git a/examples/objc/expression_parser/PluginEvalAux.hs b/examples/objc/expression_parser/PluginEvalAux.hs index 3ffbefb..4a12c89 100644 --- a/examples/objc/expression_parser/PluginEvalAux.hs +++ b/examples/objc/expression_parser/PluginEvalAux.hs @@ -2,9 +2,9 @@ module PluginEvalAux where -import Plugins.Make -import Plugins.Load -import Plugins.Utils +import System.Plugins.Make +import System.Plugins.Load +import System.Plugins.Utils import Foreign.C import Control.Exception ( evaluate ) diff --git a/examples/pdynload/badint/prog/Main.hs b/examples/pdynload/badint/prog/Main.hs index e60e2bf..1f0eb43 100644 --- a/examples/pdynload/badint/prog/Main.hs +++ b/examples/pdynload/badint/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/null/prog/Main.hs b/examples/pdynload/null/prog/Main.hs index 3c3f831..874a8ea 100644 --- a/examples/pdynload/null/prog/Main.hs +++ b/examples/pdynload/null/prog/Main.hs @@ -1,6 +1,6 @@ -import Plugins -import Plugins.Utils +import System.Plugins +-- import System.Plugins.Utils import API src = "../Plugin.hs" diff --git a/examples/pdynload/numclass/prog/Main.hs b/examples/pdynload/numclass/prog/Main.hs index 0f4f515..1b4aeae 100644 --- a/examples/pdynload/numclass/prog/Main.hs +++ b/examples/pdynload/numclass/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/poly/prog/Main.hs b/examples/pdynload/poly/prog/Main.hs index 00c61a1..e85f041 100644 --- a/examples/pdynload/poly/prog/Main.hs +++ b/examples/pdynload/poly/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/poly1/prog/Main.hs b/examples/pdynload/poly1/prog/Main.hs index 98c72e7..ef1b644 100644 --- a/examples/pdynload/poly1/prog/Main.hs +++ b/examples/pdynload/poly1/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/should_fail0/prog/Main.hs b/examples/pdynload/should_fail0/prog/Main.hs index ed9bb2c..409aa4f 100644 --- a/examples/pdynload/should_fail0/prog/Main.hs +++ b/examples/pdynload/should_fail0/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/should_fail1/prog/Main.hs b/examples/pdynload/should_fail1/prog/Main.hs index 5b02b81..cc40736 100644 --- a/examples/pdynload/should_fail1/prog/Main.hs +++ b/examples/pdynload/should_fail1/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/small/prog/Main.hs b/examples/pdynload/small/prog/Main.hs index 001c5da..c59ef1c 100644 --- a/examples/pdynload/small/prog/Main.hs +++ b/examples/pdynload/small/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/spj1/prog/Main.hs b/examples/pdynload/spj1/prog/Main.hs index 7cea83c..87fcb9e 100644 --- a/examples/pdynload/spj1/prog/Main.hs +++ b/examples/pdynload/spj1/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/spj2/prog/Main.hs b/examples/pdynload/spj2/prog/Main.hs index 3eb236e..af16dae 100644 --- a/examples/pdynload/spj2/prog/Main.hs +++ b/examples/pdynload/spj2/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/spj3/prog/Main.hs b/examples/pdynload/spj3/prog/Main.hs index 98c72e7..ef1b644 100644 --- a/examples/pdynload/spj3/prog/Main.hs +++ b/examples/pdynload/spj3/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/spj4/prog/Main.hs b/examples/pdynload/spj4/prog/Main.hs index 7a138e1..f4b7e14 100644 --- a/examples/pdynload/spj4/prog/Main.hs +++ b/examples/pdynload/spj4/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/typealias/prog/Main.hs b/examples/pdynload/typealias/prog/Main.hs index 9f30df5..1471d0b 100644 --- a/examples/pdynload/typealias/prog/Main.hs +++ b/examples/pdynload/typealias/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pdynload/univquant/prog/Main.hs b/examples/pdynload/univquant/prog/Main.hs index 7aca2d4..41f8df5 100644 --- a/examples/pdynload/univquant/prog/Main.hs +++ b/examples/pdynload/univquant/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API src = "../Plugin.hs" diff --git a/examples/pkgconf/null/prog/Main.hs b/examples/pkgconf/null/prog/Main.hs index cbe81ac..9eb9b68 100644 --- a/examples/pkgconf/null/prog/Main.hs +++ b/examples/pkgconf/null/prog/Main.hs @@ -2,7 +2,7 @@ #include "../../../../config.h" -import Plugins +import System.Plugins import API main = do diff --git a/examples/plugs/plugs/Main.hs b/examples/plugs/plugs/Main.hs index 2d977ad..c603efd 100644 --- a/examples/plugs/plugs/Main.hs +++ b/examples/plugs/plugs/Main.hs @@ -3,8 +3,8 @@ -- GPL version 2 or later (see http://www.gnu.org/copyleft/gpl.html) -- -import Eval.Haskell -import Plugins.Load +import System.Eval.Haskell +import System.Plugins.Load import System.Exit ( ExitCode(..), exitWith ) import System.IO diff --git a/examples/plugs/plugs/Makefile b/examples/plugs/plugs/Makefile index aa21db8..d1bd03d 100644 --- a/examples/plugs/plugs/Makefile +++ b/examples/plugs/plugs/Makefile @@ -1,6 +1,6 @@ GHCFLAGS= -O PKGFLAGS= -package-conf $(TOP)/plugins.conf.inplace -PKGFLAGS+= -package eval -package readline +PKGFLAGS+= -package plugins -package readline all: build diff --git a/examples/plugs/runplugs/Main.hs b/examples/plugs/runplugs/Main.hs index 585cdfe..11f878b 100644 --- a/examples/plugs/runplugs/Main.hs +++ b/examples/plugs/runplugs/Main.hs @@ -8,7 +8,7 @@ -- | Runplugs: use hs-plugins to run a Haskell expression under -- controlled conditions. -- -import Eval.Haskell (unsafeEval) +import System.Eval.Haskell (unsafeEval) import Data.Maybe (isJust, fromJust) import Control.Monad (when) diff --git a/examples/plugs/runplugs/Makefile b/examples/plugs/runplugs/Makefile index 8ea2f06..3d4b7e0 100644 --- a/examples/plugs/runplugs/Makefile +++ b/examples/plugs/runplugs/Makefile @@ -1,6 +1,6 @@ GHCFLAGS= -O PKGFLAGS= -package-conf $(TOP)/plugins.conf.inplace -PKGFLAGS+= -package eval -package unix +PKGFLAGS+= -package plugins -package unix all: build diff --git a/examples/popen/test1/Main.hs b/examples/popen/test1/Main.hs deleted file mode 100644 index befda24..0000000 --- a/examples/popen/test1/Main.hs +++ /dev/null @@ -1,10 +0,0 @@ --- --- test the popen function --- - -import Plugins.Utils -import System.IO - -main = do - (sout,serr) <- exec "date" [] - mapM_ putStrLn serr diff --git a/examples/popen/test1/Makefile b/examples/popen/test1/Makefile deleted file mode 100644 index f775e10..0000000 --- a/examples/popen/test1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -TOP=../../.. -include ../../eval.mk diff --git a/examples/popen/test1/expected b/examples/popen/test1/expected deleted file mode 100644 index e69de29..0000000 diff --git a/examples/reload/null/prog/Main.hs b/examples/reload/null/prog/Main.hs index c30251f..a1031c1 100644 --- a/examples/reload/null/prog/Main.hs +++ b/examples/reload/null/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API -- an example where we just want to load an object and run it diff --git a/examples/shell/shell/Main.hs b/examples/shell/shell/Main.hs index 67f4767..7a7874d 100644 --- a/examples/shell/shell/Main.hs +++ b/examples/shell/shell/Main.hs @@ -2,7 +2,7 @@ -- a simple shell for loading plugins and evaluating their functions -- -import Plugins +import System.Plugins import API import Data.Either diff --git a/examples/shell/simple/Main.hs b/examples/shell/simple/Main.hs index b3f26b1..cd947a7 100644 --- a/examples/shell/simple/Main.hs +++ b/examples/shell/simple/Main.hs @@ -1,4 +1,4 @@ -import Plugins +import System.Plugins import StringProcessorAPI import System.Console.Readline import System.Exit diff --git a/examples/typecase/000/Main.hs b/examples/typecase/000/Main.hs index f1a6b87..7143bb6 100644 --- a/examples/typecase/000/Main.hs +++ b/examples/typecase/000/Main.hs @@ -1,4 +1,4 @@ -import AltData +import AltData.Dynamic import Data.Char main = putStrLn f diff --git a/examples/unload/null/prog/Main.hs b/examples/unload/null/prog/Main.hs index fb52951..7c64db3 100644 --- a/examples/unload/null/prog/Main.hs +++ b/examples/unload/null/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API -- an example where we just want to load an object and run it diff --git a/examples/unload/sjwtrap/prog/Main.hs b/examples/unload/sjwtrap/prog/Main.hs index 00bdc21..d51012d 100644 --- a/examples/unload/sjwtrap/prog/Main.hs +++ b/examples/unload/sjwtrap/prog/Main.hs @@ -1,5 +1,5 @@ -import Plugins +import System.Plugins import API --