diff options
| author | pb <pb@9f8f72e9-4bf4-416e-b76e-7d4203597157> | 2010-03-28 11:09:30 +0000 |
|---|---|---|
| committer | pb <pb@9f8f72e9-4bf4-416e-b76e-7d4203597157> | 2010-03-28 11:09:30 +0000 |
| commit | 80ff91aa5d6cda6adc1c97dc39b950dd7daed9d5 (patch) | |
| tree | 4b1ad4310067e9ee9b5dcbae027844ed596e015f /HsBot | |
| parent | 7a7302c5b86e89f3fc2fbc3476db731dfd6ed11b (diff) | |
git-svn-id: https://ssl.buetow.org/repos/hsbot/trunk@50 9f8f72e9-4bf4-416e-b76e-7d4203597157
Diffstat (limited to 'HsBot')
| -rw-r--r-- | HsBot/Base.hs (renamed from HsBot/Start.hs) | 16 | ||||
| -rw-r--r-- | HsBot/Base/Cmd.hs (renamed from HsBot/Cmd.hs) | 4 | ||||
| -rw-r--r-- | HsBot/Base/Conf.hs (renamed from HsBot/Conf.hs) | 2 | ||||
| -rw-r--r-- | HsBot/Base/Env.hs (renamed from HsBot/Env.hs) | 6 | ||||
| -rw-r--r-- | HsBot/Base/State.hs (renamed from HsBot/State.hs) | 2 | ||||
| -rw-r--r-- | HsBot/IRC.hs | 6 | ||||
| -rw-r--r-- | HsBot/Logics.hs | 2 |
7 files changed, 19 insertions, 19 deletions
diff --git a/HsBot/Start.hs b/HsBot/Base.hs index 97466d8..a349fad 100644 --- a/HsBot/Start.hs +++ b/HsBot/Base.hs @@ -1,17 +1,17 @@ -module HsBot.Start (start) where +module HsBot.Base (startBase) where import System -import HsBot.Cmd -import HsBot.Conf -import HsBot.Env +import HsBot.Base.Cmd +import HsBot.Base.Conf +import HsBot.Base.Env +import HsBot.Base.State +import HsBot.General.Tools import HsBot.IRC import HsBot.Logics -import HsBot.State -import HsBot.General.Tools -start :: IO () -start = do +startBase :: IO () +startBase = do let conf = makeConf databaseFile <- get "databaseFile" conf let state = stateLoad databaseFile diff --git a/HsBot/Cmd.hs b/HsBot/Base/Cmd.hs index 7de643e..c4963ac 100644 --- a/HsBot/Cmd.hs +++ b/HsBot/Base/Cmd.hs @@ -1,6 +1,6 @@ -module HsBot.Cmd where +module HsBot.Base.Cmd where -import HsBot.State +import HsBot.Base.State data Cmd = Cmd String String (State -> IO ()) diff --git a/HsBot/Conf.hs b/HsBot/Base/Conf.hs index 2faed0b..54749ba 100644 --- a/HsBot/Conf.hs +++ b/HsBot/Base/Conf.hs @@ -1,4 +1,4 @@ -module HsBot.Conf where +module HsBot.Base.Conf where import qualified Data.Map as M diff --git a/HsBot/Env.hs b/HsBot/Base/Env.hs index e8f6092..58b2347 100644 --- a/HsBot/Env.hs +++ b/HsBot/Base/Env.hs @@ -1,7 +1,7 @@ -module HsBot.Env where +module HsBot.Base.Env where -import HsBot.Conf -import HsBot.State +import HsBot.Base.Conf +import HsBot.Base.State type Dispatch = String -> (String -> IO ()) -> Env -> IO Env data Env = DispatchEnv State Conf Dispatch | Env State Conf diff --git a/HsBot/State.hs b/HsBot/Base/State.hs index 9d1fa87..abcf479 100644 --- a/HsBot/State.hs +++ b/HsBot/Base/State.hs @@ -1,4 +1,4 @@ -module HsBot.State where +module HsBot.Base.State where import qualified Data.Map as M diff --git a/HsBot/IRC.hs b/HsBot/IRC.hs index 7efb732..cf1a1e8 100644 --- a/HsBot/IRC.hs +++ b/HsBot/IRC.hs @@ -7,9 +7,9 @@ import System import System.IO import Text.Printf -import HsBot.Conf -import HsBot.Env -import HsBot.State +import HsBot.Base.Conf +import HsBot.Base.Env +import HsBot.Base.State import HsBot.General.Tools import HsBot.IRC.User diff --git a/HsBot/Logics.hs b/HsBot/Logics.hs index 01eda7c..d27c96f 100644 --- a/HsBot/Logics.hs +++ b/HsBot/Logics.hs @@ -1,6 +1,6 @@ module HsBot.Logics (logicsRun) where -import HsBot.Env +import HsBot.Base.Env logicsRun :: String -> Env -> IO Env logicsRun str env = return (env) |