summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2011-10-15 22:09:28 +0200
committerPaul Buetow <paul@buetow.org>2011-10-15 22:09:28 +0200
commit985413d54772605485c52d93518e02ab7615c542 (patch)
tree4d3108bd7f3212a805a2e47ca19dbd049f68b1d6
parent5fbbc84cbfb4831a9b08969b982b44a09d845ab0 (diff)
removed compile errors
-rw-r--r--HsBot/Base/Conf.hs12
-rw-r--r--Makefile2
2 files changed, 9 insertions, 5 deletions
diff --git a/HsBot/Base/Conf.hs b/HsBot/Base/Conf.hs
index 3eada1d..774f473 100644
--- a/HsBot/Base/Conf.hs
+++ b/HsBot/Base/Conf.hs
@@ -22,11 +22,15 @@ makeConf = M.fromList
]
get :: (Monad m) => String -> Conf -> m String
-get = M.lookup
-
+get key conf = case M.lookup key conf of
+ Just val -> return (val)
+ Nothing -> return ("")
+
getUnwrappedInt :: String -> Conf -> Int
getUnwrappedInt key conf = read (getUnwrapped key conf) :: Int
getUnwrapped :: String -> Conf -> String
-getUnwrapped key conf = do { val <- get key conf; val }
-
+getUnwrapped key conf =
+ case M.lookup key conf of
+ Just val -> val
+ Nothing -> ""
diff --git a/Makefile b/Makefile
index 7e5341d..5f80669 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
all:
ghc --make Main.hs -o hsbot
clean:
- rm hsbot
find . -name \*.o | xargs rm
find . -name \*.hi | xargs rm
+ rm hsbot