bye

IRC/Plugins/Loader.hs

@@ -5,6 +5,8 @@ module IRC.Plugins.Loader ( load ) where
 
 import qualified Data.HashMap.Lazy as M
 
+import IRC.Plugins.Plugin
+
 import Control.Exception  ( catch, ErrorCall )
 import GHC.Exts           ( addrToAny# )
 import GHC.Ptr            ( Ptr(..) )
@@ -12,26 +14,26 @@ import System.Info        ( os, arch )
 import GHCi.ObjLink
 import Encoding
 
-type PluginSet = M.HashMap String Plugin
+load :: PluginSet -> String -> IO (Either String PluginSet)
+load set path = do
+    initObjLinker RetainCAFs
+    loadObj "Plugin.o"
+    _ret <- resolveObjs
+    ptr <- lookupSymbol (mangleSymbol Nothing "Plugin" "f")
+    case ptr of
+      Nothing -> return $ Left "Couldn’t load symbol"
+      Just (Ptr addr) -> case addrToAny# addr of
+                           (# f #) -> return $ Right f
 
-data Plugin = Plugin { wew :: Int,
-                       lad :: Int }
+unload :: PluginSet -> String -> IO PluginSet
+unload set plugin = catch unloadPlugin exceptionHandler
+    where exceptionHandler :: ErrorCall -> IO PluginSet
+          exceptionHandler _  = return set
 
-load :: PluginSet -> IO (Either String (IO PluginSet))
-load = do initObjLinker RetainCAFs
-          loadObj "Plugin.o"
-          _ret <- resolveObjs
-          ptr <- lookupSymbol (mangleSymbol Nothing "Plugin" "f")
-          case ptr of
-            Nothing -> return $ Left "Couldn’t load symbol"
-            Just (Ptr addr) -> case addrToAny# addr of
-                                 (# f #) -> return $ Right f
-
-unload :: String -> IO PluginSet
-unload plugin = catch (unloadObj $ plugin <> ".o") exceptionHandler
-
-exceptionHandler :: ErrorCall -> IO PluginSet
-exceptionHandler _ = return ()
+          unloadPlugin :: IO PluginSet
+          unloadPlugin = do
+              unloadObj $ plugin <> ".o"
+              return $ M.delete plugin set
 
 mangleSymbol :: Maybe String -> String -> String -> String
 mangleSymbol pkg module' valsym =

IRC/Plugins/Plugin.hs

@@ -0,0 +1,8 @@
+module IRC.Plugins.Plugin ( PluginSet, Plugin(..) ) where
+
+import qualified Data.HashMap.Lazy as M
+
+type PluginSet = M.HashMap String Plugin
+
+data Plugin = Plugin { pluginEvent :: String, -- e.g. PRIVMSG
+                       pluginEntry :: Int }

IRC/Plugins/Tupfile

@@ -1,3 +1,4 @@
 include_rules
 
-: foreach *.hs |> ghc $(GHCFLAGS) -c %f |> %B.o %B.hi
+: Plugin.hs |> ghc $(GHCFLAGS) -c %f |> %B.o %B.hi
+: Loader.hs | Plugin.hi |> ghc $(GHCFLAGS) -c %f |> %B.o %B.hi

Tupfile

@@ -1,4 +1,4 @@
 include_rules
 
-: foreach *.hs | IRC/*.hi |> ghc $(GHCFLAGS) -c %f |> %B.o %B.hi
-: *.o IRC/*.o |> ghc -o Main %f |> Main
+: foreach *.hs | IRC/*.hi IRC/Plugins/*.hi |> ghc $(GHCFLAGS) -c %f |> %B.o %B.hi
+: *.o IRC/*.o IRC/Plugins/*.o |> ghc -o Main %f |> Main

Tuprules.tup

@@ -1 +1 @@
-GHCFLAGS += -Wall -O3
+GHCFLAGS += -i$(CWD) -Wall -O3

make.sh

@@ -9,6 +9,8 @@ if ! command -v tup >/dev/null; then
     exit 1
 fi
 
+export CWD="$(readlink -f .)"
+
 case $1 in
     run)
         $0 build >&2 || exit 1
@@ -22,7 +24,7 @@ case $1 in
         tup >&2
         ;;
     clean)
-        rm -f Main *.o *.hi IRC/*.o IRC/*.hi
+        rm -f Main *.o *.hi IRC/*.o IRC/*.hi IRC/Plugins/*.o IRC/Plugins/*.hi
         ;;
     *)
         usage