Update examples to use new module names

examples/conf/simple/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 conf    = "../Mailrc.conf"

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 )

examples/dynload/io/api/API.hs

@@ -2,7 +2,7 @@
 
 module API where
 
-import AltData
+import AltData.Typeable
 
 data TestIO = TestIO { 
                 field :: IO String 

examples/dynload/io/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 main = do

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 :)

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

examples/dynload/poly/prog/Main.hs

@@ -2,7 +2,7 @@
 
 #include "../../../../config.h"
 
-import Plugins
+import System.Plugins
 import API
 
 main = do 

examples/dynload/should_fail/Plugin.hs

@@ -2,7 +2,7 @@
 module Plugin where
 
 import API
-import AltData
+import AltData.Dynamic
 
 v :: Int
 v = 0xdeadbeef

examples/dynload/should_fail/api/API.hs

@@ -2,7 +2,7 @@
 
 module API where
 
-import AltData
+import AltData.Typeable
 
 data Interface = Interface { 
         function :: String

examples/dynload/should_fail/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 main = do 

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

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

examples/dynload/should_fail_1/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 main = do 

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

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
 

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 { 

examples/dynload/should_fail_2/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 conf    = "../Plugin.in"

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)

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

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 { 

examples/dynload/should_fail_3/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 conf    = "../Plugin.in"

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)

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\"" }
 

examples/dynload/simple/api/API.hs

@@ -2,7 +2,7 @@
 
 module API where
 
-import AltData
+import AltData.Typeable
 
 data Interface = Interface { 
         function :: String

examples/dynload/simple/prog/Main.hs

@@ -2,7 +2,7 @@
 
 #include "../../../../config.h"
 
-import Plugins
+import System.Plugins
 import API
 
 main = do 

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)

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 ()

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

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

examples/eval/eval_/Main.hs

@@ -1,5 +1,5 @@
 
-import Eval.Haskell
+import System.Eval.Haskell
 
 main = do i <- eval_ "Just (7 :: Int)" 
                      ["Maybe"] 

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

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

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" []
         

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

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
 

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"

examples/hier/hier3/Main.hs

@@ -1,6 +1,6 @@
 module Main where
 
-import Plugins
+import System.Plugins
 
 main = do
 

examples/hier/hier4/Main.hs

@@ -1,6 +1,6 @@
 module Main where
 
-import Plugins
+import System.Plugins
 
 main = do
 

examples/iface/null/Main.hs

@@ -1,6 +1,6 @@
 module Main ( main ) where
 
-import Hi.Parser
+import Language.Hi.Parser
 
 import A
 import B

examples/load/io/prog/Main.hs

@@ -2,7 +2,7 @@
 
 #include "../../../../config.h"
 
-import Plugins
+import System.Plugins
 import API
 
 main :: IO ()

examples/load/load_0/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 main = do

examples/load/loadpkg/Main.hs

@@ -1,4 +1,4 @@
 
-import Plugins
+import System.Plugins
 
 main = loadPackageWith "posix" []

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

examples/load/thiemann0/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 main = do

examples/load/thiemann2/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 import A

examples/load/unloadpkg/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 
 main = do loadPackage "posix"
           unloadPackage  "posix"

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

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 

examples/make/o/prog/Main.hs

@@ -1,4 +1,4 @@
-import Plugins
+import System.Plugins
 import API
 
 import System.Directory

examples/make/odir/prog/Main.hs

@@ -1,4 +1,4 @@
-import Plugins
+import System.Plugins
 import API
 import System.Directory
 

examples/make/remake001/Main.hs

@@ -7,7 +7,7 @@
 -- False
 --
 
-import Plugins
+import System.Plugins
 import System.Directory
    
 main = do

examples/make/remake001_should_fail/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 
 import System.Directory
    

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

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
 

examples/makewith/global_pragma/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 conf    = "../Plugin.hs"

examples/makewith/io/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 conf    = "../TestIO.conf"

examples/makewith/merge00/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 
 import System.Directory
 

examples/makewith/mergeto0/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 
 import System.Directory
 

examples/makewith/module_name/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 
 import System.Directory
 

examples/makewith/multi_make/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 
 import System.Directory
 

examples/makewith/should_fail_0/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 conf    = "../Plugin.in"

examples/makewith/tiny/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 import Data.Either
 

examples/makewith/unsafeio/prog/Main.hs

@@ -1,4 +1,4 @@
-import Plugins
+import System.Plugins
 import API
 import Data.Either
 

examples/misc/mkstemps/Main.hs

@@ -1,5 +1,5 @@
  
-import Plugins.MkTemp
+import System.MkTemp
 
 import Data.Maybe
 

examples/multi/3plugins/prog/Main.hs

@@ -1,4 +1,4 @@
-import Plugins
+import System.Plugins
 import API
 
 main = do

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 )

examples/pdynload/badint/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

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"

examples/pdynload/numclass/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/poly/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/poly1/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/should_fail0/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/should_fail1/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/small/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/spj1/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/spj2/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/spj3/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/spj4/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/typealias/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pdynload/univquant/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 src     = "../Plugin.hs"

examples/pkgconf/null/prog/Main.hs

@@ -2,7 +2,7 @@
 
 #include "../../../../config.h"
 
-import Plugins
+import System.Plugins
 import API
 
 main = do 

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

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
 

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) 

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
 

examples/popen/test1/Main.hs

@@ -1,10 +0,0 @@
---
--- test the popen function
---
-
-import Plugins.Utils
-import System.IO
-
-main = do
-        (sout,serr) <- exec "date" [] 
-        mapM_ putStrLn serr

examples/popen/test1/Makefile

@@ -1,2 +0,0 @@
-TOP=../../..
-include ../../eval.mk

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

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

examples/shell/simple/Main.hs

@@ -1,4 +1,4 @@
-import Plugins
+import System.Plugins
 import StringProcessorAPI
 import System.Console.Readline
 import System.Exit

examples/typecase/000/Main.hs

@@ -1,4 +1,4 @@
-import AltData
+import AltData.Dynamic
 import Data.Char
 
 main = putStrLn f

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

examples/unload/sjwtrap/prog/Main.hs

@@ -1,5 +1,5 @@
 
-import Plugins
+import System.Plugins
 import API
 
 --